fixed <nil> block id signing

tomtau · Nov 9, 2020 · e834853 · e834853
1 parent 2fa1678
commit e834853
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/src/amino_types/proposal.rs b/src/amino_types/proposal.rs
@@ -140,11 +140,9 @@ impl SignableMsg for SignProposalRequest {
 
             cp.encode_length_delimited(sign_bytes)?;
         } else {
-            let cp = ProtoCanonicalProposal {
-                chain_id: chain_id.to_string(),
-                r#type: SignedMsgType::Proposal.to_u32() as i32,
-                height: proposal.height,
-                block_id: proposal.block_id.as_ref().map(|x| ProtoCanonicalBlockId {
+            let block_id = match proposal.block_id.as_ref() {
+                Some(x) if x.hash.is_empty() => None,
+                Some(x) => Some(ProtoCanonicalBlockId {
                     hash: x.hash.clone(),
                     part_set_header: x
                         .parts_header
@@ -154,6 +152,13 @@ impl SignableMsg for SignProposalRequest {
                             hash: y.hash.clone(),
                         }),
                 }),
+                None => None,
+            };
+            let cp = ProtoCanonicalProposal {
+                chain_id: chain_id.to_string(),
+                r#type: SignedMsgType::Proposal.to_u32() as i32,
+                height: proposal.height,
+                block_id,
                 pol_round: proposal.pol_round,
                 round: proposal.round,
                 timestamp: proposal.timestamp.map(Into::into),

diff --git a/src/amino_types/vote.rs b/src/amino_types/vote.rs
@@ -200,11 +200,9 @@ impl SignableMsg for SignVoteRequest {
 
             cv.encode_length_delimited(sign_bytes)?;
         } else {
-            let cv = ProtoCanonicalVote {
-                r#type: vote.vote_type as i32,
-                height: vote.height,
-                round: vote.round as i64,
-                block_id: vote.block_id.as_ref().map(|x| ProtoCanonicalBlockId {
+            let block_id = match vote.block_id.as_ref() {
+                Some(x) if x.hash.is_empty() => None,
+                Some(x) => Some(ProtoCanonicalBlockId {
                     hash: x.hash.clone(),
                     part_set_header: x
                         .parts_header
@@ -214,6 +212,14 @@ impl SignableMsg for SignVoteRequest {
                             hash: y.hash.clone(),
                         }),
                 }),
+                None => None,
+            };
+
+            let cv = ProtoCanonicalVote {
+                r#type: vote.vote_type as i32,
+                height: vote.height,
+                round: vote.round as i64,
+                block_id,
                 timestamp: vote.timestamp.map(Into::into),
                 chain_id: chain_id.to_string(),
             };