feat: sign proposal

tari-project · Dec 29, 2023 · 3eb5ce1 · 3eb5ce1
1 parent cd0f704
commit 3eb5ce1
Show file tree

Hide file tree

Showing 18 changed files with 81 additions and 17 deletions.
diff --git a/applications/tari_validator_node/src/consensus/spec.rs b/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;
 }
diff --git a/dan_layer/consensus/src/block_validations.rs b/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,

diff --git a/dan_layer/consensus/src/hotstuff/error.rs b/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 },
 }
diff --git a/dan_layer/consensus/src/hotstuff/on_inbound_message.rs b/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 {

diff --git a/dan_layer/consensus/src/hotstuff/on_propose.rs b/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,
         }
     }
@@ -269,7 +272,7 @@ where TConsensusSpec: ConsensusSpec
             .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 +281,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)
     }
 }
diff --git a/dan_layer/consensus/src/hotstuff/on_ready_to_vote_on_local_block.rs b/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>,

diff --git a/dan_layer/consensus/src/hotstuff/on_receive_local_proposal.rs b/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>,

diff --git a/dan_layer/consensus/src/hotstuff/vote_receiver.rs b/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 {

diff --git a/dan_layer/consensus/src/hotstuff/worker.rs b/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,
             ),
 

diff --git a/dan_layer/consensus/src/traits/mod.rs b/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;
 }
diff --git a/dan_layer/consensus_tests/src/support/spec.rs b/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;
 }
diff --git a/dan_layer/state_store_sqlite/migrations/2023-06-08-091819_create_state_store/up.sql b/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)
 );

diff --git a/dan_layer/state_store_sqlite/src/schema.rs b/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,
     }
 }

diff --git a/dan_layer/state_store_sqlite/src/sql_models/block.rs b/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,
         ))
     }

diff --git a/dan_layer/storage/src/consensus_models/block.rs b/dan_layer/storage/src/consensus_models/block.rs
@@ -23,7 +23,7 @@ use tari_dan_common_types::{
 use tari_transaction::TransactionId;
 use time::PrimitiveDateTime;
 
-use super::{ForeignProposal, QuorumCertificate};
+use super::{ForeignProposal, QuorumCertificate, ValidatorSchnorrSignature};
 use crate::{
     consensus_models::{
         Command,
@@ -72,6 +72,8 @@ pub struct Block {
     foreign_indexes: HashMap<ShardBucket, u64>,
     /// Timestamp when was this stored.
     stored_at: Option<PrimitiveDateTime>,
+    /// Signature of block by the proposer.
+    signature: Option<ValidatorSchnorrSignature>,
 }
 
 impl Block {
@@ -84,6 +86,7 @@ impl Block {
         commands: BTreeSet<Command>,
         total_leader_fee: u64,
         foreign_indexes: HashMap<ShardBucket, u64>,
+        signature: Option<ValidatorSchnorrSignature>,
     ) -> Self {
         let mut block = Self {
             id: BlockId::genesis(),
@@ -101,6 +104,7 @@ impl Block {
             is_committed: false,
             foreign_indexes,
             stored_at: None,
+            signature,
         };
         block.id = block.calculate_hash().into();
         block
@@ -119,6 +123,7 @@ impl Block {
         is_processed: bool,
         is_committed: bool,
         foreign_indexes: HashMap<ShardBucket, u64>,
+        signature: Option<ValidatorSchnorrSignature>,
         created_at: PrimitiveDateTime,
     ) -> Self {
         Self {
@@ -137,6 +142,7 @@ impl Block {
             is_committed,
             foreign_indexes,
             stored_at: Some(created_at),
+            signature,
         }
     }
 
@@ -150,6 +156,7 @@ impl Block {
             Default::default(),
             0,
             HashMap::new(),
+            None,
         )
     }
 
@@ -170,6 +177,7 @@ impl Block {
             is_committed: true,
             foreign_indexes: HashMap::new(),
             stored_at: None,
+            signature: None,
         }
     }
 
@@ -189,6 +197,7 @@ impl Block {
             Default::default(),
             0,
             HashMap::new(),
+            None,
         );
         block.is_dummy = true;
         block.is_processed = false;
@@ -326,6 +335,14 @@ impl Block {
     pub fn get_foreign_indexes(&self) -> &HashMap<ShardBucket, u64> {
         &self.foreign_indexes
     }
+
+    pub fn get_signature(&self) -> Option<&ValidatorSchnorrSignature> {
+        self.signature.as_ref()
+    }
+
+    pub fn set_signature(&mut self, signature: ValidatorSchnorrSignature) {
+        self.signature = Some(signature);
+    }
 }
 
 impl Block {

diff --git a/dan_layer/validator_node_rpc/proto/consensus.proto b/dan_layer/validator_node_rpc/proto/consensus.proto
@@ -50,6 +50,7 @@ message Block {
   repeated Command commands = 8;
   uint64 total_leader_fee = 9;
   bytes foreign_indexes = 10;
+  tari.dan.common.Signature signature = 11;
 }
 
 message Command {

diff --git a/dan_layer/validator_node_rpc/src/conversions/common.rs b/dan_layer/validator_node_rpc/src/conversions/common.rs
@@ -43,8 +43,8 @@ impl<H: DomainSeparation> TryFrom<proto::common::Signature> for SchnorrSignature
     }
 }
 
-impl<H: DomainSeparation> From<SchnorrSignature<PublicKey, PrivateKey, H>> for proto::common::Signature {
-    fn from(sig: SchnorrSignature<PublicKey, PrivateKey, H>) -> Self {
+impl<H: DomainSeparation> From<&SchnorrSignature<PublicKey, PrivateKey, H>> for proto::common::Signature {
+    fn from(sig: &SchnorrSignature<PublicKey, PrivateKey, H>) -> Self {
         Self {
             public_nonce: sig.get_public_nonce().to_vec(),
             signature: sig.get_signature().to_vec(),

diff --git a/dan_layer/validator_node_rpc/src/conversions/consensus.rs b/dan_layer/validator_node_rpc/src/conversions/consensus.rs
@@ -259,6 +259,7 @@ impl From<&tari_dan_storage::consensus_models::Block> for proto::consensus::Bloc
             total_leader_fee: value.total_leader_fee(),
             commands: value.commands().iter().map(Into::into).collect(),
             foreign_indexes: encode(value.get_foreign_indexes()).unwrap(),
+            signature: value.get_signature().map(Into::into),
         }
     }
 }
@@ -284,6 +285,7 @@ impl TryFrom<proto::consensus::Block> for tari_dan_storage::consensus_models::Bl
                 .collect::<Result<_, _>>()?,
             value.total_leader_fee,
             decode_exact(&value.foreign_indexes)?,
+            value.signature.map(TryInto::try_into).transpose()?,
         ))
     }
 }
@@ -505,7 +507,7 @@ impl From<ValidatorMetadata> for proto::consensus::ValidatorMetadata {
         Self {
             public_key: msg.public_key.to_vec(),
             vn_shard_key: msg.vn_shard_key.as_bytes().to_vec(),
-            signature: Some(msg.signature.into()),
+            signature: Some((&msg.signature).into()),
         }
     }
 }