feat: sign proposal

applications/tari_validator_node/src/consensus/spec.rs

@@ -20,8 +20,8 @@ impl ConsensusSpec for TariConsensusSpec {
     type Addr = PeerAddress;
     type EpochManager = EpochManagerHandle<Self::Addr>;
     type LeaderStrategy = RoundRobinLeaderStrategy;
+    type SignatureService = TariSignatureService;
     type StateManager = TariStateManager;
     type StateStore = SqliteStateStore<Self::Addr>;
     type SyncManager = CommsRpcStateSyncManager<Self::EpochManager, Self::StateStore>;
-    type VoteSignatureService = TariSignatureService;
 }

dan_layer/consensus/src/block_validations.rs

@@ -42,6 +42,30 @@ pub fn check_proposed_by_leader<TAddr: DerivableFromPublicKey, TLeaderStrategy:
     Ok(())
 }
 
+pub fn check_signature(candidate_block: &Block) -> Result<(), ProposalValidationError> {
+    if candidate_block.is_dummy() {
+        // Dummy blocks don't have signatures
+        return Ok(());
+    }
+    if candidate_block.is_genesis() {
+        // Genesis block doesn't have signatures
+        return Ok(());
+    }
+    let validator_signature = candidate_block
+        .get_signature()
+        .ok_or(ProposalValidationError::MissingSignature {
+            block_id: *candidate_block.id(),
+            height: candidate_block.height(),
+        })?;
+    if !validator_signature.verify(candidate_block.proposed_by(), candidate_block.id()) {
+        return Err(ProposalValidationError::InvalidSignature {
+            block_id: *candidate_block.id(),
+            height: candidate_block.height(),
+        });
+    }
+    Ok(())
+}
+
 pub fn check_quorum_certificate<TAddr: NodeAddressable>(
     _local_committee: &Committee<TAddr>,
     candidate_block: &Block,

dan_layer/consensus/src/hotstuff/error.rs

@@ -148,4 +148,8 @@ pub enum ProposalValidationError {
     },
     #[error("Proposed block {block_id} {height} already has been processed")]
     BlockAlreadyProcessed { block_id: BlockId, height: NodeHeight },
+    #[error("Proposed block {block_id} {height} doesn't have signature")]
+    MissingSignature { block_id: BlockId, height: NodeHeight },
+    #[error("Proposed block {block_id} {height} has invalid signature")]
+    InvalidSignature { block_id: BlockId, height: NodeHeight },
 }

dan_layer/consensus/src/hotstuff/on_inbound_message.rs

@@ -19,7 +19,7 @@ use tari_transaction::TransactionId;
 use tokio::{sync::mpsc, time};
 
 use crate::{
-    block_validations::{check_hash_and_height, check_proposed_by_leader, check_quorum_certificate},
+    block_validations::{check_hash_and_height, check_proposed_by_leader, check_quorum_certificate, check_signature},
     hotstuff::{error::HotStuffError, pacemaker_handle::PaceMakerHandle},
     messages::{HotstuffMessage, ProposalMessage, RequestMissingTransactionsMessage},
     traits::ConsensusSpec,
@@ -163,6 +163,7 @@ where TConsensusSpec: ConsensusSpec
             .get_committee_by_validator_public_key(block.epoch(), block.proposed_by())
             .await?;
         check_proposed_by_leader(&self.leader_strategy, &committee_for_block, &block)?;
+        check_signature(&block)?;
         check_quorum_certificate(&committee_for_block, &block)?;
 
         let Some(ready_block) = self.handle_missing_transactions(block).await? else {

dan_layer/consensus/src/hotstuff/on_propose.rs

@@ -35,7 +35,7 @@ use super::common::CommitteeAndMessage;
 use crate::{
     hotstuff::{common::EXHAUST_DIVISOR, error::HotStuffError, proposer},
     messages::{HotstuffMessage, ProposalMessage},
-    traits::ConsensusSpec,
+    traits::{ConsensusSpec, ValidatorSignatureService},
 };
 
 const LOG_TARGET: &str = "tari::dan::consensus::hotstuff::on_propose_locally";
@@ -44,6 +44,7 @@ pub struct OnPropose<TConsensusSpec: ConsensusSpec> {
     store: TConsensusSpec::StateStore,
     epoch_manager: TConsensusSpec::EpochManager,
     transaction_pool: TransactionPool<TConsensusSpec::StateStore>,
+    signing_service: TConsensusSpec::SignatureService,
     tx_broadcast: mpsc::Sender<CommitteeAndMessage<TConsensusSpec::Addr>>,
 }
 
@@ -54,12 +55,14 @@ where TConsensusSpec: ConsensusSpec
         store: TConsensusSpec::StateStore,
         epoch_manager: TConsensusSpec::EpochManager,
         transaction_pool: TransactionPool<TConsensusSpec::StateStore>,
+        signing_service: TConsensusSpec::SignatureService,
         tx_broadcast: mpsc::Sender<CommitteeAndMessage<TConsensusSpec::Addr>>,
     ) -> Self {
         Self {
             store,
             epoch_manager,
             transaction_pool,
+            signing_service,
             tx_broadcast,
         }
     }
@@ -262,14 +265,12 @@ where TConsensusSpec: ConsensusSpec
             local_committee_shard.bucket(),
         )?;
 
-        // let mut foreign_indexes = HashMap::new();
-
         let foreign_indexes = non_local_buckets
             .iter()
             .map(|bucket| (*bucket, foreign_counters.increment_counter(*bucket)))
             .collect();
 
-        let next_block = Block::new(
+        let mut next_block = Block::new(
             *parent_block.block_id(),
             high_qc,
             parent_block.height() + NodeHeight(1),
@@ -278,8 +279,12 @@ where TConsensusSpec: ConsensusSpec
             commands,
             total_leader_fee,
             foreign_indexes,
+            None,
         );
 
+        let signature = self.signing_service.sign(next_block.id());
+        next_block.set_signature(signature);
+
         Ok(next_block)
     }
 }

dan_layer/consensus/src/hotstuff/on_ready_to_vote_on_local_block.rs

@@ -52,7 +52,7 @@ pub struct OnReadyToVoteOnLocalBlock<TConsensusSpec: ConsensusSpec> {
     validator_addr: TConsensusSpec::Addr,
     store: TConsensusSpec::StateStore,
     epoch_manager: TConsensusSpec::EpochManager,
-    vote_signing_service: TConsensusSpec::VoteSignatureService,
+    vote_signing_service: TConsensusSpec::SignatureService,
     leader_strategy: TConsensusSpec::LeaderStrategy,
     state_manager: TConsensusSpec::StateManager,
     transaction_pool: TransactionPool<TConsensusSpec::StateStore>,
@@ -68,7 +68,7 @@ where TConsensusSpec: ConsensusSpec
         validator_addr: TConsensusSpec::Addr,
         store: TConsensusSpec::StateStore,
         epoch_manager: TConsensusSpec::EpochManager,
-        vote_signing_service: TConsensusSpec::VoteSignatureService,
+        vote_signing_service: TConsensusSpec::SignatureService,
         leader_strategy: TConsensusSpec::LeaderStrategy,
         state_manager: TConsensusSpec::StateManager,
         transaction_pool: TransactionPool<TConsensusSpec::StateStore>,

dan_layer/consensus/src/hotstuff/on_receive_local_proposal.rs

@@ -52,7 +52,7 @@ impl<TConsensusSpec: ConsensusSpec> OnReceiveProposalHandler<TConsensusSpec> {
         leader_strategy: TConsensusSpec::LeaderStrategy,
         pacemaker: PaceMakerHandle,
         tx_leader: mpsc::Sender<(TConsensusSpec::Addr, HotstuffMessage)>,
-        vote_signing_service: TConsensusSpec::VoteSignatureService,
+        vote_signing_service: TConsensusSpec::SignatureService,
         state_manager: TConsensusSpec::StateManager,
         transaction_pool: TransactionPool<TConsensusSpec::StateStore>,
         tx_events: broadcast::Sender<HotstuffEvent>,

dan_layer/consensus/src/hotstuff/vote_receiver.rs

@@ -25,7 +25,7 @@ pub struct VoteReceiver<TConsensusSpec: ConsensusSpec> {
     store: TConsensusSpec::StateStore,
     leader_strategy: TConsensusSpec::LeaderStrategy,
     epoch_manager: TConsensusSpec::EpochManager,
-    vote_signature_service: TConsensusSpec::VoteSignatureService,
+    vote_signature_service: TConsensusSpec::SignatureService,
     pacemaker: PaceMakerHandle,
 }
 
@@ -36,7 +36,7 @@ where TConsensusSpec: ConsensusSpec
         store: TConsensusSpec::StateStore,
         leader_strategy: TConsensusSpec::LeaderStrategy,
         epoch_manager: TConsensusSpec::EpochManager,
-        vote_signature_service: TConsensusSpec::VoteSignatureService,
+        vote_signature_service: TConsensusSpec::SignatureService,
         pacemaker: PaceMakerHandle,
     ) -> Self {
         Self {

dan_layer/consensus/src/hotstuff/worker.rs

@@ -79,7 +79,7 @@ impl<TConsensusSpec: ConsensusSpec> HotstuffWorker<TConsensusSpec> {
         state_store: TConsensusSpec::StateStore,
         epoch_manager: TConsensusSpec::EpochManager,
         leader_strategy: TConsensusSpec::LeaderStrategy,
-        signing_service: TConsensusSpec::VoteSignatureService,
+        signing_service: TConsensusSpec::SignatureService,
         state_manager: TConsensusSpec::StateManager,
         transaction_pool: TransactionPool<TConsensusSpec::StateStore>,
         tx_broadcast: mpsc::Sender<CommitteeAndMessage<TConsensusSpec::Addr>>,
@@ -127,7 +127,7 @@ impl<TConsensusSpec: ConsensusSpec> HotstuffWorker<TConsensusSpec> {
                 leader_strategy.clone(),
                 pacemaker.clone_handle(),
                 tx_leader.clone(),
-                signing_service,
+                signing_service.clone(),
                 state_manager,
                 transaction_pool.clone(),
                 tx_events,
@@ -157,6 +157,7 @@ impl<TConsensusSpec: ConsensusSpec> HotstuffWorker<TConsensusSpec> {
                 state_store.clone(),
                 epoch_manager.clone(),
                 transaction_pool.clone(),
+                signing_service,
                 tx_broadcast,
             ),
 

dan_layer/consensus/src/traits/mod.rs

@@ -21,7 +21,7 @@ pub trait ConsensusSpec: Send + Sync + Clone + 'static {
     type StateStore: StateStore<Addr = Self::Addr> + Send + Sync + Clone + 'static;
     type EpochManager: EpochManagerReader<Addr = Self::Addr> + Send + Sync + Clone + 'static;
     type LeaderStrategy: LeaderStrategy<Self::Addr> + Send + Sync + Clone + 'static;
-    type VoteSignatureService: VoteSignatureService + Send + Sync + Clone + 'static;
+    type SignatureService: VoteSignatureService + ValidatorSignatureService + Send + Sync + Clone + 'static;
     type StateManager: StateManager<Self::StateStore> + Send + Sync + 'static;
     type SyncManager: SyncManager + Send + Sync + 'static;
 }

dan_layer/consensus_tests/src/support/signing_service.rs

@@ -4,9 +4,11 @@
 use rand::rngs::OsRng;
 use tari_common_types::types::{FixedHash, PrivateKey, PublicKey};
 use tari_consensus::traits::{ValidatorSignatureService, VoteSignatureService};
-use tari_crypto::keys::PublicKey as _;
+use tari_crypto::keys::SecretKey;
 use tari_dan_storage::consensus_models::{BlockId, QuorumDecision, ValidatorSchnorrSignature, ValidatorSignature};
 
+use super::TestAddress;
+
 #[derive(Debug, Clone)]
 pub struct TestVoteSignatureService {
     pub public_key: PublicKey,
@@ -15,8 +17,10 @@ pub struct TestVoteSignatureService {
 }
 
 impl TestVoteSignatureService {
-    pub fn new(public_key: PublicKey) -> Self {
-        let (secret_key, _public_key) = PublicKey::random_keypair(&mut OsRng);
+    pub fn new(public_key: PublicKey, addr: TestAddress) -> Self {
+        let mut bytes = [0u8; 64];
+        bytes[0..addr.0.as_bytes().len()].copy_from_slice(addr.0.as_bytes());
+        let secret_key = PrivateKey::from_uniform_bytes(&bytes).unwrap();
         Self {
             public_key,
             secret_key,

dan_layer/consensus_tests/src/support/spec.rs

@@ -20,8 +20,8 @@ impl ConsensusSpec for TestConsensusSpec {
     type Addr = TestAddress;
     type EpochManager = TestEpochManager;
     type LeaderStrategy = RoundRobinLeaderStrategy;
+    type SignatureService = TestVoteSignatureService;
     type StateManager = NoopStateManager;
     type StateStore = SqliteStateStore<Self::Addr>;
     type SyncManager = AlwaysSyncedSyncManager;
-    type VoteSignatureService = TestVoteSignatureService;
 }

dan_layer/consensus_tests/src/support/validator/builder.rs

@@ -83,7 +83,7 @@ impl ValidatorBuilder {
         let (tx_mempool, rx_mempool) = mpsc::unbounded_channel();
 
         let store = SqliteStateStore::connect(&self.sql_url).unwrap();
-        let signing_service = TestVoteSignatureService::new(self.public_key.clone());
+        let signing_service = TestVoteSignatureService::new(self.public_key.clone(), self.address.clone());
         let transaction_pool = TransactionPool::new();
         let noop_state_manager = NoopStateManager::new();
         let (tx_events, _) = broadcast::channel(100);

dan_layer/state_store_sqlite/migrations/2023-06-08-091819_create_state_store/up.sql

@@ -26,6 +26,7 @@ create table blocks
     is_processed     boolean   not NULL,
     is_dummy         boolean   not NULL,
     foreign_indexes  text      not NULL,
+    signature        text      NULL,
     created_at       timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
     FOREIGN KEY (qc_id) REFERENCES quorum_certificates (qc_id)
 );
@@ -46,6 +47,7 @@ create table parked_blocks
     commands         text      not NULL,
     total_leader_fee bigint    not NULL,
     foreign_indexes  text      not NULL,
+    signature        text      NULL,
     created_at       timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 

dan_layer/state_store_sqlite/src/schema.rs

@@ -16,6 +16,7 @@ diesel::table! {
         is_processed -> Bool,
         is_dummy -> Bool,
         foreign_indexes -> Text,
+        signature -> Nullable<Text>,
         created_at -> Timestamp,
     }
 }
@@ -149,6 +150,7 @@ diesel::table! {
         commands -> Text,
         total_leader_fee -> BigInt,
         foreign_indexes -> Text,
+        signature -> Nullable<Text>,
         created_at -> Timestamp,
     }
 }

dan_layer/state_store_sqlite/src/sql_models/block.rs

@@ -30,6 +30,7 @@ pub struct Block {
     pub is_processed: bool,
     pub is_dummy: bool,
     pub foreign_indexes: String,
+    pub signature: Option<String>,
     pub created_at: PrimitiveDateTime,
 }
 
@@ -54,6 +55,7 @@ impl Block {
             self.is_processed,
             self.is_committed,
             deserialize_json(&self.foreign_indexes)?,
+            self.signature.map(|val| deserialize_json(&val)).transpose()?,
             self.created_at,
         ))
     }
@@ -72,6 +74,7 @@ pub struct ParkedBlock {
     pub commands: String,
     pub total_leader_fee: i64,
     pub foreign_indexes: String,
+    pub signature: Option<String>,
     pub created_at: PrimitiveDateTime,
 }
 
@@ -98,6 +101,7 @@ impl TryFrom<ParkedBlock> for consensus_models::Block {
             false,
             false,
             deserialize_json(&value.foreign_indexes)?,
+            value.signature.map(|val| deserialize_json(&val)).transpose()?,
             value.created_at,
         ))
     }

dan_layer/state_store_sqlite/tests/tests.rs

@@ -58,6 +58,7 @@ mod confirm_all_transitions {
             [Command::Prepare(atom1.clone())].into_iter().collect(),
             Default::default(),
             HashMap::new(),
+            None,
         );
         block1.insert(&mut tx).unwrap();