fix(consensus): Makes sure that proposer is this node. (nervosnetwork…

…#281)
homura · Jun 13, 2019 · d7f4e50 · d7f4e50
1 parent f6a58d0
commit d7f4e50
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/transaction-pool/src/lib.rs b/components/transaction-pool/src/lib.rs
@@ -222,8 +222,6 @@ where
                     sig_txs.push(tx);
                 } else if let Some(tx) = callback_cache.get(hash) {
                     sig_txs.push(tx);
-                } else {
-                    return Err(TransactionPoolError::NotExpected);
                 }
             }
 

diff --git a/core/consensus/Cargo.toml b/core/consensus/Cargo.toml
@@ -21,8 +21,7 @@ tokio = "0.1"
 futures-timer = "0.1"
 # compat is required for tokio timer
 futures-preview = { version = "0.3.0-alpha.16", features = [ "compat" ] }
-# TODO: upgrade bft-rs
-bft-rs = { git = "https://github.com/cryptape/bft-rs.git", features = [ "verify_req" ], rev = "861aa4f" }
+bft-rs = { git = "https://github.com/cryptape/bft-rs.git", features = [ "verify_req" ], branch = "bft_for_muta" }
 rayon = "1.0"
 
 [dev-dependencies]

diff --git a/core/consensus/src/bft/support.rs b/core/consensus/src/bft/support.rs
@@ -95,12 +95,6 @@ where
                 .await?
                 .try_into()?;
 
-            // Ignore the self proposal
-            let status = self.engine.get_status();
-            if proposal.proposer == status.node_address {
-                return Ok(());
-            }
-
             let ctx = Context::new();
             self.engine.verify_proposal(ctx.clone(), &proposal)?;
             Ok(())
@@ -121,6 +115,7 @@ where
         signed_proposal_hash: &[u8],
         _height: u64,
         _round: u64,
+        proposer: &[u8],
     ) -> Result<(), Self::Error> {
         let fut = async move {
             let proposal: Proposal = AsyncCodec::decode::<SerProposal>(proposal.to_vec())
@@ -132,8 +127,9 @@ where
             }
 
             // Ignore the self proposal
+            let proposer = Address::from_bytes(proposer)?;
             let status = self.engine.get_status();
-            if proposal.proposer == status.node_address {
+            if proposer == status.node_address {
                 return Ok(());
             }
 

diff --git a/core/runtime/Cargo.toml b/core/runtime/Cargo.toml
@@ -13,5 +13,4 @@ core-serialization = { path = "../serialization" }
 
 bytes = "0.4"
 cita-vm = "0.1"
-# TODO: upgrade bft-rs
-bft-rs = { git = "https://github.com/cryptape/bft-rs.git", features = [ "verify_req" ], rev = "861aa4f" }
+bft-rs = { git = "https://github.com/cryptape/bft-rs.git", features = [ "verify_req" ], branch = "bft_for_muta" }