Remove unnecessary address parameter from CanonicalVoteExtension

Signed-off-by: Thane Thomson <connect@thanethomson.com>
2026-02-10 14:00:33 +00:00 · 2022-04-13 13:50:48 -04:00
parent 8104cf5188
commit b3b74dfa3a
3 changed files with 38 additions and 92 deletions
--- a/proto/tendermint/types/canonical.pb.go
+++ b/proto/tendermint/types/canonical.pb.go
@@ -308,13 +308,13 @@ func (m *CanonicalVote) GetChainID() string {
 	return ""
 }

-// CanonicalVoteExtension
+// CanonicalVoteExtension provides us a way to serialize a vote extension from
+// a particular validator such that we can sign over those serialized bytes.
 type CanonicalVoteExtension struct {
 	Extension []byte `protobuf:"bytes,1,opt,name=extension,proto3" json:"extension,omitempty"`
 	Height    int64  `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"`
 	Round     int32  `protobuf:"varint,3,opt,name=round,proto3" json:"round,omitempty"`
 	ChainId   string `protobuf:"bytes,4,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
-	Address   []byte `protobuf:"bytes,5,opt,name=address,proto3" json:"address,omitempty"`
 }

 func (m *CanonicalVoteExtension) Reset()         { *m = CanonicalVoteExtension{} }
@@ -378,13 +378,6 @@ func (m *CanonicalVoteExtension) GetChainId() string {
 	return ""
 }

-func (m *CanonicalVoteExtension) GetAddress() []byte {
-	if m != nil {
-		return m.Address
-	}
-	return nil
-}
-
 func init() {
 	proto.RegisterType((*CanonicalBlockID)(nil), "tendermint.types.CanonicalBlockID")
 	proto.RegisterType((*CanonicalPartSetHeader)(nil), "tendermint.types.CanonicalPartSetHeader")
@@ -396,41 +389,40 @@ func init() {
 func init() { proto.RegisterFile("tendermint/types/canonical.proto", fileDescriptor_8d1a1a84ff7267ed) }

 var fileDescriptor_8d1a1a84ff7267ed = []byte{
-	// 542 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xcd, 0x6e, 0xd3, 0x40,
-	0x10, 0xce, 0xa6, 0xf9, 0xdd, 0x26, 0x10, 0x56, 0x55, 0x65, 0xa2, 0xca, 0x8e, 0x7c, 0x40, 0xe6,
-	0x62, 0x4b, 0xed, 0x81, 0xbb, 0x0b, 0x12, 0x41, 0x20, 0xca, 0xb6, 0xea, 0x81, 0x4b, 0xb4, 0xb1,
-	0x17, 0xdb, 0xc2, 0xf1, 0x5a, 0xf6, 0x46, 0xa2, 0x17, 0x9e, 0xa1, 0x57, 0x5e, 0x81, 0x27, 0xe9,
-	0xb1, 0x47, 0xb8, 0x04, 0xe4, 0xbc, 0x08, 0xda, 0xf5, 0xaf, 0xd2, 0xaa, 0x17, 0x10, 0x17, 0x6b,
-	0xbe, 0x99, 0x6f, 0x67, 0x3e, 0x7f, 0x63, 0x2f, 0x9c, 0x71, 0x1a, 0xb9, 0x34, 0x59, 0x05, 0x11,
-	0xb7, 0xf8, 0x55, 0x4c, 0x53, 0xcb, 0x21, 0x11, 0x8b, 0x02, 0x87, 0x84, 0x66, 0x9c, 0x30, 0xce,
-	0xd0, 0xa4, 0x66, 0x98, 0x92, 0x31, 0x3d, 0xf0, 0x98, 0xc7, 0x64, 0xd1, 0x12, 0x51, 0xce, 0x9b,
-	0x1e, 0xdd, 0xe9, 0x24, 0x9f, 0x45, 0x55, 0xf3, 0x18, 0xf3, 0x42, 0x6a, 0x49, 0xb4, 0x5c, 0x7f,
-	0xb2, 0x78, 0xb0, 0xa2, 0x29, 0x27, 0xab, 0x38, 0x27, 0xe8, 0x5f, 0xe1, 0xe4, 0xb4, 0x9c, 0x6c,
-	0x87, 0xcc, 0xf9, 0x3c, 0x7f, 0x89, 0x10, 0xec, 0xf8, 0x24, 0xf5, 0x15, 0x30, 0x03, 0xc6, 0x08,
-	0xcb, 0x18, 0x5d, 0xc2, 0xc7, 0x31, 0x49, 0xf8, 0x22, 0xa5, 0x7c, 0xe1, 0x53, 0xe2, 0xd2, 0x44,
-	0x69, 0xcf, 0x80, 0xb1, 0x7f, 0x6c, 0x98, 0xbb, 0x42, 0xcd, 0xaa, 0xe1, 0x19, 0x49, 0xf8, 0x39,
-	0xe5, 0xaf, 0x25, 0xdf, 0xee, 0xdc, 0x6c, 0xb4, 0x16, 0x1e, 0xc7, 0xcd, 0xa4, 0x6e, 0xc3, 0xc3,
-	0xfb, 0xe9, 0xe8, 0x00, 0x76, 0x39, 0xe3, 0x24, 0x94, 0x32, 0xc6, 0x38, 0x07, 0x95, 0xb6, 0x76,
-	0xad, 0x4d, 0xff, 0xd9, 0x86, 0x4f, 0xea, 0x26, 0x09, 0x8b, 0x59, 0x4a, 0x42, 0x74, 0x02, 0x3b,
-	0x42, 0x8e, 0x3c, 0xfe, 0xe8, 0x58, 0xbb, 0x2b, 0xf3, 0x3c, 0xf0, 0x22, 0xea, 0xbe, 0x4b, 0xbd,
-	0x8b, 0xab, 0x98, 0x62, 0x49, 0x46, 0x87, 0xb0, 0xe7, 0xd3, 0xc0, 0xf3, 0xb9, 0x1c, 0x30, 0xc1,
-	0x05, 0x12, 0x62, 0x12, 0xb6, 0x8e, 0x5c, 0x65, 0x4f, 0xa6, 0x73, 0x80, 0x9e, 0xc3, 0x61, 0xcc,
-	0xc2, 0x45, 0x5e, 0xe9, 0xcc, 0x80, 0xb1, 0x67, 0x8f, 0xb2, 0x8d, 0x36, 0x38, 0x7b, 0xff, 0x16,
-	0x8b, 0x1c, 0x1e, 0xc4, 0x2c, 0x94, 0x11, 0x7a, 0x03, 0x07, 0x4b, 0x61, 0xef, 0x22, 0x70, 0x95,
-	0xae, 0x34, 0x4e, 0x7f, 0xc0, 0xb8, 0x62, 0x13, 0xf6, 0x7e, 0xb6, 0xd1, 0xfa, 0x05, 0xc0, 0x7d,
-	0xd9, 0x60, 0xee, 0x22, 0x1b, 0x0e, 0xab, 0x35, 0x2a, 0x3d, 0xd9, 0x6c, 0x6a, 0xe6, 0x8b, 0x36,
-	0xcb, 0x45, 0x9b, 0x17, 0x25, 0xc3, 0x1e, 0x08, 0xdf, 0xaf, 0x7f, 0x69, 0x00, 0xd7, 0xc7, 0xd0,
-	0x33, 0x38, 0x70, 0x7c, 0x12, 0x44, 0x42, 0x4f, 0x7f, 0x06, 0x8c, 0x61, 0x3e, 0xeb, 0x54, 0xe4,
-	0xc4, 0x2c, 0x59, 0x9c, 0xbb, 0xfa, 0xf7, 0x36, 0x1c, 0x57, 0xb2, 0x2e, 0x19, 0xa7, 0xff, 0xc3,
-	0xd7, 0xa6, 0x59, 0x9d, 0x7f, 0x69, 0x56, 0xf7, 0xef, 0xcd, 0xea, 0x3d, 0x60, 0xd6, 0x37, 0xd0,
-	0xf8, 0x9a, 0x85, 0x59, 0xaf, 0xbe, 0x70, 0x1a, 0xa5, 0x01, 0x8b, 0xd0, 0x11, 0x1c, 0xd2, 0x12,
-	0x14, 0x3f, 0x56, 0x9d, 0xd8, 0xb1, 0x67, 0xef, 0x7e, 0x7b, 0xba, 0xa5, 0x3d, 0x4f, 0x1b, 0x72,
-	0x84, 0x3d, 0xc3, 0x4a, 0x01, 0x52, 0x60, 0x9f, 0xb8, 0x6e, 0x42, 0xd3, 0x54, 0xbe, 0xeb, 0x08,
-	0x97, 0xd0, 0xfe, 0x70, 0x93, 0xa9, 0xe0, 0x36, 0x53, 0xc1, 0xef, 0x4c, 0x05, 0xd7, 0x5b, 0xb5,
-	0x75, 0xbb, 0x55, 0x5b, 0x3f, 0xb6, 0x6a, 0xeb, 0xe3, 0x0b, 0x2f, 0xe0, 0xfe, 0x7a, 0x69, 0x3a,
-	0x6c, 0x65, 0x35, 0x2f, 0x93, 0x3a, 0xcc, 0x2f, 0x9d, 0xdd, 0x8b, 0x66, 0xd9, 0x93, 0xf9, 0x93,
-	0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5f, 0xba, 0xba, 0x40, 0xcd, 0x04, 0x00, 0x00,
+	// 528 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x94, 0xcf, 0x6e, 0xd3, 0x40,
+	0x10, 0xc6, 0xe3, 0xc4, 0x49, 0xec, 0x6d, 0x03, 0x61, 0x55, 0x55, 0x26, 0xaa, 0x6c, 0xcb, 0x07,
+	0x64, 0x2e, 0xb6, 0xd4, 0x1e, 0xb8, 0xbb, 0x20, 0x11, 0x04, 0xa2, 0xb8, 0x55, 0x0f, 0x5c, 0xa2,
+	0x8d, 0xbd, 0xd8, 0x16, 0x8e, 0xd7, 0xb2, 0x37, 0x12, 0xbd, 0xc0, 0x2b, 0xf4, 0x39, 0x78, 0x92,
+	0x1e, 0x7b, 0x84, 0x4b, 0x40, 0xce, 0x8b, 0xa0, 0x5d, 0xff, 0x55, 0x5a, 0xf5, 0x02, 0xe2, 0x12,
+	0xed, 0xcc, 0x7c, 0x3b, 0xf3, 0xe9, 0x37, 0xf1, 0x02, 0x9d, 0xe2, 0xc4, 0xc7, 0xd9, 0x2a, 0x4a,
+	0xa8, 0x4d, 0xaf, 0x52, 0x9c, 0xdb, 0x1e, 0x4a, 0x48, 0x12, 0x79, 0x28, 0xb6, 0xd2, 0x8c, 0x50,
+	0x02, 0xa7, 0xad, 0xc2, 0xe2, 0x8a, 0xd9, 0x41, 0x40, 0x02, 0xc2, 0x8b, 0x36, 0x3b, 0x95, 0xba,
+	0xd9, 0xd1, 0x9d, 0x4e, 0xfc, 0xb7, 0xaa, 0x6a, 0x01, 0x21, 0x41, 0x8c, 0x6d, 0x1e, 0x2d, 0xd7,
+	0x9f, 0x6c, 0x1a, 0xad, 0x70, 0x4e, 0xd1, 0x2a, 0x2d, 0x05, 0xc6, 0x57, 0x30, 0x3d, 0xad, 0x27,
+	0x3b, 0x31, 0xf1, 0x3e, 0xcf, 0x5f, 0x42, 0x08, 0xc4, 0x10, 0xe5, 0xa1, 0x22, 0xe8, 0x82, 0xb9,
+	0xef, 0xf2, 0x33, 0xbc, 0x04, 0x8f, 0x53, 0x94, 0xd1, 0x45, 0x8e, 0xe9, 0x22, 0xc4, 0xc8, 0xc7,
+	0x99, 0xd2, 0xd7, 0x05, 0x73, 0xef, 0xd8, 0xb4, 0x76, 0x8d, 0x5a, 0x4d, 0xc3, 0x33, 0x94, 0xd1,
+	0x73, 0x4c, 0x5f, 0x73, 0xbd, 0x23, 0xde, 0x6c, 0xb4, 0x9e, 0x3b, 0x49, 0xbb, 0x49, 0xc3, 0x01,
+	0x87, 0xf7, 0xcb, 0xe1, 0x01, 0x18, 0x52, 0x42, 0x51, 0xcc, 0x6d, 0x4c, 0xdc, 0x32, 0x68, 0xbc,
+	0xf5, 0x5b, 0x6f, 0xc6, 0xcf, 0x3e, 0x78, 0xd2, 0x36, 0xc9, 0x48, 0x4a, 0x72, 0x14, 0xc3, 0x13,
+	0x20, 0x32, 0x3b, 0xfc, 0xfa, 0xa3, 0x63, 0xed, 0xae, 0xcd, 0xf3, 0x28, 0x48, 0xb0, 0xff, 0x2e,
+	0x0f, 0x2e, 0xae, 0x52, 0xec, 0x72, 0x31, 0x3c, 0x04, 0xa3, 0x10, 0x47, 0x41, 0x48, 0xf9, 0x80,
+	0xa9, 0x5b, 0x45, 0xcc, 0x4c, 0x46, 0xd6, 0x89, 0xaf, 0x0c, 0x78, 0xba, 0x0c, 0xe0, 0x73, 0x20,
+	0xa7, 0x24, 0x5e, 0x94, 0x15, 0x51, 0x17, 0xcc, 0x81, 0xb3, 0x5f, 0x6c, 0x34, 0xe9, 0xec, 0xfd,
+	0x5b, 0x97, 0xe5, 0x5c, 0x29, 0x25, 0x31, 0x3f, 0xc1, 0x37, 0x40, 0x5a, 0x32, 0xbc, 0x8b, 0xc8,
+	0x57, 0x86, 0x1c, 0x9c, 0xf1, 0x00, 0xb8, 0x6a, 0x13, 0xce, 0x5e, 0xb1, 0xd1, 0xc6, 0x55, 0xe0,
+	0x8e, 0x79, 0x83, 0xb9, 0x0f, 0x1d, 0x20, 0x37, 0x6b, 0x54, 0x46, 0xbc, 0xd9, 0xcc, 0x2a, 0x17,
+	0x6d, 0xd5, 0x8b, 0xb6, 0x2e, 0x6a, 0x85, 0x23, 0x31, 0xee, 0xd7, 0xbf, 0x34, 0xc1, 0x6d, 0xaf,
+	0xc1, 0x67, 0x40, 0xf2, 0x42, 0x14, 0x25, 0xcc, 0xcf, 0x58, 0x17, 0x4c, 0xb9, 0x9c, 0x75, 0xca,
+	0x72, 0x6c, 0x16, 0x2f, 0xce, 0x7d, 0xe3, 0x7b, 0x1f, 0x4c, 0x1a, 0x5b, 0x97, 0x84, 0xe2, 0xff,
+	0xc1, 0xb5, 0x0b, 0x4b, 0xfc, 0x97, 0xb0, 0x86, 0x7f, 0x0f, 0x6b, 0xf4, 0x00, 0xac, 0x6f, 0x9d,
+	0x3f, 0x33, 0x63, 0xf5, 0xea, 0x0b, 0xc5, 0x49, 0x1e, 0x91, 0x04, 0x1e, 0x01, 0x19, 0xd7, 0x41,
+	0xf5, 0x5d, 0xb5, 0x89, 0x1d, 0x3a, 0x83, 0xfb, 0xe9, 0x0c, 0x6b, 0x3a, 0x4f, 0x3b, 0x6e, 0x18,
+	0x1d, 0xb9, 0x31, 0xe0, 0x7c, 0xb8, 0x29, 0x54, 0xe1, 0xb6, 0x50, 0x85, 0xdf, 0x85, 0x2a, 0x5c,
+	0x6f, 0xd5, 0xde, 0xed, 0x56, 0xed, 0xfd, 0xd8, 0xaa, 0xbd, 0x8f, 0x2f, 0x82, 0x88, 0x86, 0xeb,
+	0xa5, 0xe5, 0x91, 0x95, 0xdd, 0x7d, 0x31, 0xda, 0x63, 0xf9, 0xb2, 0xec, 0xbe, 0x26, 0xcb, 0x11,
+	0xcf, 0x9f, 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xa0, 0x6a, 0x61, 0xb2, 0x04, 0x00, 0x00,
 }

 func (m *CanonicalBlockID) Marshal() (dAtA []byte, err error) {
@@ -667,13 +659,6 @@ func (m *CanonicalVoteExtension) MarshalToSizedBuffer(dAtA []byte) (int, error)
 	_ = i
 	var l int
 	_ = l
-	if len(m.Address) > 0 {
-		i -= len(m.Address)
-		copy(dAtA[i:], m.Address)
-		i = encodeVarintCanonical(dAtA, i, uint64(len(m.Address)))
-		i--
-		dAtA[i] = 0x2a
-	}
 	if len(m.ChainId) > 0 {
 		i -= len(m.ChainId)
 		copy(dAtA[i:], m.ChainId)
@@ -822,10 +807,6 @@ func (m *CanonicalVoteExtension) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovCanonical(uint64(l))
 	}
-	l = len(m.Address)
-	if l > 0 {
-		n += 1 + l + sovCanonical(uint64(l))
-	}
 	return n
 }

@@ -1587,40 +1568,6 @@ func (m *CanonicalVoteExtension) Unmarshal(dAtA []byte) error {
 			}
 			m.ChainId = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 5:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType)
-			}
-			var byteLen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowCanonical
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				byteLen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if byteLen < 0 {
-				return ErrInvalidLengthCanonical
-			}
-			postIndex := iNdEx + byteLen
-			if postIndex < 0 {
-				return ErrInvalidLengthCanonical
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Address = append(m.Address[:0], dAtA[iNdEx:postIndex]...)
-			if m.Address == nil {
-				m.Address = []byte{}
-			}
-			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipCanonical(dAtA[iNdEx:])
--- a/proto/tendermint/types/canonical.proto
+++ b/proto/tendermint/types/canonical.proto
@@ -36,11 +36,11 @@ message CanonicalVote {
  string                    chain_id  = 6 [(gogoproto.customname) = "ChainID"];
 }

-// CanonicalVoteExtension
+// CanonicalVoteExtension provides us a way to serialize a vote extension from
+// a particular validator such that we can sign over those serialized bytes.
 message CanonicalVoteExtension {
  bytes  extension = 1;
  int64  height    = 2;
  int32  round     = 3;
  string chain_id  = 4;
-  bytes  address   = 5;
 }
--- a/types/canonical.go
+++ b/types/canonical.go
@@ -74,7 +74,6 @@ func CanonicalizeVoteExtension(chainID string, vote *tmproto.Vote) tmproto.Canon
 		Height:    vote.Height,
 		Round:     vote.Round,
 		ChainId:   chainID,
-		Address:   vote.ValidatorAddress,
 	}
 }