fix: vote extension marshal panic

dashpay · Dec 21, 2023 · 615251a · 615251a
1 parent 9e1d9a1
commit 615251a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 30 deletions.
diff --git a/abci/types/types.go b/abci/types/types.go
@@ -374,17 +374,19 @@ func (m *RequestFinalizeBlock) ToCanonicalVote() (types.CanonicalVote, error) {
 // Convert to proto.types.VoteExtension.
 // Signature field will be nil, as ExtendVoteExtension doesn't have it.
 func (m *ExtendVoteExtension) ToVoteExtension() types.VoteExtension {
-	var requestID *types.VoteExtension_SignRequestId
+	ve := types.VoteExtension{
+		Type:      m.Type,
+		Extension: m.Extension,
+	}
+
+	// workaround for a bug in gogoproto
 	if m.XSignRequestId != nil {
 		src := m.GetSignRequestId()
 
-		requestID = &types.VoteExtension_SignRequestId{
+		ve.XSignRequestId = &types.VoteExtension_SignRequestId{
 			SignRequestId: bytes.Clone(src),
 		}
 	}
-	return types.VoteExtension{
-		Type:           m.Type,
-		Extension:      m.Extension,
-		XSignRequestId: requestID,
-	}
+
+	return ve
 }
diff --git a/proto/tendermint/types/dash.go b/proto/tendermint/types/dash.go
@@ -28,20 +28,19 @@ func (v *VoteExtension) Clone() VoteExtension {
 		panic("cannot clone nil vote-extension")
 	}
 
-	var xSignRequestID isVoteExtension_XSignRequestId
+	ve := VoteExtension{
+		Type:      v.Type,
+		Extension: v.Extension,
+		Signature: v.Signature,
+	}
 
 	if v.XSignRequestId != nil && v.XSignRequestId.Size() > 0 {
-		xSignRequestID = &VoteExtension_SignRequestId{
+		ve.XSignRequestId = &VoteExtension_SignRequestId{
 			SignRequestId: v.GetSignRequestId(),
 		}
 	}
 
-	return VoteExtension{
-		Type:           v.Type,
-		Extension:      v.Extension,
-		Signature:      v.Signature,
-		XSignRequestId: xSignRequestID,
-	}
+	return ve
 }
 
 // Copy returns a deep copy of current vote-extension.
@@ -50,20 +49,19 @@ func (v *VoteExtension) Copy() VoteExtension {
 		panic("cannot copy nil vote-extension")
 	}
 
-	var xSignRequestID isVoteExtension_XSignRequestId
+	ve := VoteExtension{
+		Type:      v.Type,
+		Extension: bytes.Clone(v.Extension),
+		Signature: bytes.Clone(v.Signature),
+	}
 
 	if v.XSignRequestId != nil && v.XSignRequestId.Size() > 0 {
-		xSignRequestID = &VoteExtension_SignRequestId{
+		ve.XSignRequestId = &VoteExtension_SignRequestId{
 			SignRequestId: bytes.Clone(v.GetSignRequestId()),
 		}
 	}
 
-	return VoteExtension{
-		Type:           v.Type,
-		Extension:      bytes.Clone(v.Extension),
-		Signature:      bytes.Clone(v.Signature),
-		XSignRequestId: xSignRequestID,
-	}
+	return ve
 }
 
 func (v *VoteExtension) Equal(other *VoteExtension) bool {

diff --git a/types/vote_extension.go b/types/vote_extension.go
@@ -123,21 +123,20 @@ func (e VoteExtensions) ToExtendProto() []*abci.ExtendVoteExtension {
 		}
 
 		pb := ext.ToProto()
+		eve := &abci.ExtendVoteExtension{
+			Type:      pb.Type,
+			Extension: pb.Extension,
+		}
 
-		var requestID *abci.ExtendVoteExtension_SignRequestId
 		if pb.XSignRequestId != nil {
 			if src := pb.GetSignRequestId(); len(src) > 0 {
-				requestID = &abci.ExtendVoteExtension_SignRequestId{
+				eve.XSignRequestId = &abci.ExtendVoteExtension_SignRequestId{
 					SignRequestId: bytes.Clone(src),
 				}
 			}
 		}
 
-		proto = append(proto, &abci.ExtendVoteExtension{
-			Type:           pb.Type,
-			Extension:      pb.Extension,
-			XSignRequestId: requestID,
-		})
+		proto = append(proto, eve)
 	}
 
 	return proto