diff --git a/.changelog/unreleased/improvements/2496-privval-ext-signature.md b/.changelog/unreleased/improvements/2496-privval-ext-signature.md index becd6d3596e..d23573f3f7f 100644 --- a/.changelog/unreleased/improvements/2496-privval-ext-signature.md +++ b/.changelog/unreleased/improvements/2496-privval-ext-signature.md @@ -1,4 +1,4 @@ - `[privval]` DO NOT require extension signature from privval if vote extensions are disabled. Remote signers can skip signing the extension if - `skip_sign_extension` flag in `SignVoteRequest` is true. + `skip_extension_signing` flag in `SignVoteRequest` is true. [\#2496](https://github.com/cometbft/cometbft/pull/2496) diff --git a/.changelog/unreleased/improvements/2522-privval-skip-extension-signing.md b/.changelog/unreleased/improvements/2522-privval-skip-extension-signing.md new file mode 100644 index 00000000000..1c51c5eebbf --- /dev/null +++ b/.changelog/unreleased/improvements/2522-privval-skip-extension-signing.md @@ -0,0 +1,2 @@ +- `[proto]` Add `skip_extension_signing` field to the `SignVoteRequest` message + in privval ([\#2522](https://github.com/cometbft/cometbft/pull/2522)) \ No newline at end of file diff --git a/api/cometbft/privval/v1/types.pb.go b/api/cometbft/privval/v1/types.pb.go index d3b1494bf8f..809e1879975 100644 --- a/api/cometbft/privval/v1/types.pb.go +++ b/api/cometbft/privval/v1/types.pb.go @@ -178,9 +178,9 @@ func (m *PubKeyResponse) GetError() *RemoteSignerError { // SignVoteRequest is a request to sign a vote type SignVoteRequest struct { - Vote *v11.Vote `protobuf:"bytes,1,opt,name=vote,proto3" json:"vote,omitempty"` - ChainId string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - SkipSignExtension bool `protobuf:"varint,3,opt,name=skip_sign_extension,json=skipSignExtension,proto3" json:"skip_sign_extension,omitempty"` + Vote *v11.Vote `protobuf:"bytes,1,opt,name=vote,proto3" json:"vote,omitempty"` + ChainId string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + SkipExtensionSigning bool `protobuf:"varint,3,opt,name=skip_extension_signing,json=skipExtensionSigning,proto3" json:"skip_extension_signing,omitempty"` } func (m *SignVoteRequest) Reset() { *m = SignVoteRequest{} } @@ -230,9 +230,9 @@ func (m *SignVoteRequest) GetChainId() string { return "" } -func (m *SignVoteRequest) GetSkipSignExtension() bool { +func (m *SignVoteRequest) GetSkipExtensionSigning() bool { if m != nil { - return m.SkipSignExtension + return m.SkipExtensionSigning } return false } @@ -652,51 +652,51 @@ func init() { func init() { proto.RegisterFile("cometbft/privval/v1/types.proto", fileDescriptor_00b969dcac92905e) } var fileDescriptor_00b969dcac92905e = []byte{ - // 695 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xcb, 0x6e, 0xd3, 0x4c, - 0x14, 0xc7, 0xed, 0x36, 0x69, 0xd2, 0x93, 0xa6, 0xfd, 0xea, 0xf4, 0x2b, 0xa5, 0xa8, 0x69, 0x30, - 0x08, 0x22, 0x2a, 0x39, 0x4a, 0x41, 0x62, 0x53, 0x36, 0x95, 0x2a, 0xb9, 0x2a, 0x97, 0x68, 0x90, - 0x58, 0x80, 0x44, 0x94, 0xcb, 0xe0, 0x8e, 0xda, 0x7a, 0x06, 0xcf, 0xc4, 0x22, 0x0f, 0xc0, 0x02, - 0x89, 0x05, 0x1b, 0x5e, 0x86, 0x27, 0xe8, 0xb2, 0x4b, 0x56, 0x08, 0x35, 0x2f, 0x82, 0x3c, 0x33, - 0xb6, 0x93, 0xd4, 0x8d, 0x40, 0xdd, 0xcd, 0xe5, 0xcc, 0xff, 0xfc, 0xfe, 0x67, 0xce, 0x68, 0x60, - 0xbb, 0x47, 0xcf, 0xb0, 0xe8, 0x7e, 0x10, 0x0d, 0x16, 0x90, 0x30, 0xec, 0x9c, 0x36, 0xc2, 0x66, - 0x43, 0x0c, 0x19, 0xe6, 0x0e, 0x0b, 0xa8, 0xa0, 0x56, 0x25, 0x0e, 0x70, 0x74, 0x80, 0x13, 0x36, - 0x37, 0xb7, 0x92, 0x53, 0xbd, 0x60, 0xc8, 0x04, 0x8d, 0x0e, 0x9d, 0xe0, 0xa1, 0x3e, 0x33, 0xb6, - 0x2d, 0x95, 0xa6, 0x24, 0x37, 0xd7, 0x3c, 0xea, 0x51, 0x39, 0x6c, 0x44, 0x23, 0xb5, 0x6a, 0x1f, - 0xc2, 0x2a, 0xc2, 0x67, 0x54, 0xe0, 0xd7, 0xc4, 0xf3, 0x71, 0x70, 0x10, 0x04, 0x34, 0xb0, 0x2c, - 0xc8, 0xf5, 0x68, 0x1f, 0x6f, 0x98, 0x35, 0xb3, 0x9e, 0x47, 0x72, 0x6c, 0xd5, 0xa0, 0xd4, 0xc7, - 0xbc, 0x17, 0x10, 0x26, 0x08, 0xf5, 0x37, 0xe6, 0x6a, 0x66, 0x7d, 0x11, 0x8d, 0x2f, 0xd9, 0x8f, - 0xa0, 0xdc, 0x1a, 0x74, 0x8f, 0xf0, 0x10, 0xe1, 0x8f, 0x03, 0xcc, 0x85, 0x75, 0x1b, 0x8a, 0xbd, - 0xe3, 0x0e, 0xf1, 0xdb, 0xa4, 0x2f, 0xa5, 0x16, 0x51, 0x41, 0xce, 0x0f, 0xfb, 0xf6, 0x57, 0x13, - 0x96, 0xe3, 0x60, 0xce, 0xa8, 0xcf, 0xb1, 0xb5, 0x07, 0x05, 0x36, 0xe8, 0xb6, 0x4f, 0xf0, 0x50, - 0x06, 0x97, 0x76, 0xb7, 0x9c, 0xa4, 0x08, 0xca, 0xaf, 0x13, 0x36, 0x9d, 0xd6, 0xa0, 0x7b, 0x4a, - 0x7a, 0x47, 0x78, 0xb8, 0x9f, 0x3b, 0xff, 0xb5, 0x6d, 0xa0, 0x05, 0x26, 0x55, 0xac, 0x3d, 0xc8, - 0xe3, 0x88, 0x5d, 0x82, 0x95, 0x76, 0x1f, 0x38, 0x19, 0x05, 0x74, 0xae, 0x38, 0x45, 0xea, 0x90, - 0xfd, 0xc5, 0x84, 0x95, 0x68, 0xf9, 0x0d, 0x15, 0x38, 0xa6, 0xdf, 0x81, 0x5c, 0x48, 0x05, 0xd6, - 0x30, 0xb7, 0x52, 0x41, 0x55, 0xd4, 0xb0, 0xe9, 0xc8, 0x68, 0x19, 0x34, 0x61, 0x75, 0x6e, 0xc2, - 0xaa, 0xe5, 0x40, 0x85, 0x9f, 0x10, 0xd6, 0xe6, 0xc4, 0xf3, 0xdb, 0xf8, 0x93, 0xc0, 0x3e, 0x8f, - 0x0a, 0x38, 0x5f, 0x33, 0xeb, 0x45, 0xb4, 0x1a, 0x6d, 0x45, 0x99, 0x0f, 0xe2, 0x0d, 0xfb, 0xb3, - 0x09, 0x96, 0x44, 0xec, 0x2b, 0x1a, 0x5d, 0x9e, 0xe6, 0x5f, 0xe1, 0xe8, 0xaa, 0x28, 0xa8, 0x9b, - 0xd5, 0x84, 0x40, 0x25, 0x5a, 0x6d, 0x05, 0x94, 0x51, 0xde, 0x39, 0x8d, 0xcb, 0xf2, 0x14, 0x8a, - 0x4c, 0x2f, 0x69, 0x96, 0x3b, 0x19, 0x2c, 0xc9, 0xa9, 0x24, 0x78, 0x46, 0x89, 0xec, 0xef, 0x26, - 0xac, 0x2b, 0xcb, 0x69, 0x36, 0x6d, 0xfb, 0xd9, 0x3f, 0xa5, 0xd3, 0xf6, 0xd3, 0xa4, 0x37, 0x2b, - 0x41, 0x19, 0x4a, 0x2d, 0xe2, 0x7b, 0xda, 0xba, 0xbd, 0x0c, 0x4b, 0x6a, 0xaa, 0xd8, 0xec, 0x1f, - 0x79, 0x28, 0xbc, 0xc0, 0x9c, 0x77, 0x3c, 0x6c, 0x3d, 0x87, 0x15, 0xdd, 0xbd, 0xed, 0x40, 0x85, - 0x6b, 0x5c, 0x3b, 0x33, 0xe5, 0xc4, 0x43, 0x71, 0x0d, 0x54, 0x66, 0x13, 0x2f, 0xe7, 0x15, 0xfc, - 0x97, 0xaa, 0xa9, 0x6c, 0xda, 0xc1, 0xbd, 0x99, 0x72, 0x2a, 0xd4, 0x35, 0xd0, 0x32, 0x9b, 0x7c, - 0x5c, 0x08, 0x56, 0x65, 0xff, 0x45, 0x7d, 0x91, 0x00, 0xce, 0x4b, 0xc5, 0xfb, 0x99, 0x8a, 0x53, - 0xaf, 0xc1, 0x35, 0xd0, 0x0a, 0x9f, 0x7a, 0x20, 0xef, 0x60, 0x8d, 0xcb, 0x4b, 0x8b, 0x55, 0x35, - 0x68, 0x4e, 0xca, 0x3e, 0xbc, 0x56, 0x76, 0xb2, 0xb1, 0x5d, 0x03, 0x59, 0xfc, 0x6a, 0xbb, 0xbf, - 0x87, 0xff, 0x25, 0x70, 0x7c, 0x93, 0x09, 0x74, 0x5e, 0xaa, 0xd7, 0xaf, 0x55, 0x9f, 0xea, 0x57, - 0xd7, 0x40, 0x15, 0x9e, 0xd1, 0xc6, 0x1e, 0x6c, 0x68, 0xf8, 0xb1, 0x0c, 0xda, 0xc0, 0x82, 0x4c, - 0xb1, 0x33, 0xc3, 0xc0, 0x74, 0x9b, 0xba, 0x06, 0x5a, 0xe7, 0xd9, 0x0d, 0x7c, 0x00, 0x4b, 0x8c, - 0xf8, 0x5e, 0xc2, 0x5f, 0x90, 0xe2, 0xb5, 0xec, 0x6b, 0x4c, 0x9b, 0xcd, 0x35, 0x50, 0x89, 0xa5, - 0x53, 0xcb, 0x85, 0xb2, 0x96, 0xd1, 0x90, 0x45, 0xa9, 0x73, 0x77, 0x86, 0x4e, 0x82, 0xb6, 0xc4, - 0xc6, 0xe6, 0xfb, 0x79, 0x98, 0xe7, 0x83, 0xb3, 0xfd, 0x97, 0xe7, 0x97, 0x55, 0xf3, 0xe2, 0xb2, - 0x6a, 0xfe, 0xbe, 0xac, 0x9a, 0xdf, 0x46, 0x55, 0xe3, 0x62, 0x54, 0x35, 0x7e, 0x8e, 0xaa, 0xc6, - 0xdb, 0x27, 0x1e, 0x11, 0xc7, 0x83, 0x6e, 0xa4, 0xdc, 0x48, 0x7f, 0x9c, 0x78, 0xd0, 0x61, 0xa4, - 0x91, 0xf1, 0x7b, 0x75, 0x17, 0xe4, 0x7f, 0xf2, 0xf8, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x67, - 0x1a, 0x8e, 0xe6, 0xdb, 0x06, 0x00, 0x00, + // 699 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x5d, 0x4f, 0x13, 0x4d, + 0x14, 0xc7, 0x77, 0xa1, 0xa5, 0xe5, 0x94, 0xc2, 0xc3, 0xc2, 0x83, 0x15, 0x43, 0xa9, 0xab, 0xd1, + 0x46, 0x92, 0x6d, 0x8a, 0x24, 0xde, 0xe0, 0x0d, 0x09, 0xc9, 0x12, 0x7c, 0x69, 0x86, 0xc4, 0x0b, + 0x4d, 0x6c, 0xfa, 0x32, 0x2e, 0x13, 0x60, 0x67, 0xdc, 0x99, 0x6e, 0xec, 0x07, 0xf0, 0xce, 0x44, + 0x6f, 0xfc, 0x32, 0x7e, 0x02, 0x2e, 0xb9, 0xf4, 0xca, 0x18, 0xf8, 0x22, 0x66, 0x67, 0x66, 0x77, + 0xdb, 0xb2, 0x34, 0x1a, 0xee, 0xe6, 0xe5, 0xcc, 0xff, 0xfc, 0xfe, 0x67, 0xce, 0x64, 0x60, 0xb3, + 0x47, 0xcf, 0xb0, 0xe8, 0x7e, 0x10, 0x0d, 0x16, 0x90, 0x30, 0xec, 0x9c, 0x36, 0xc2, 0x66, 0x43, + 0x0c, 0x19, 0xe6, 0x0e, 0x0b, 0xa8, 0xa0, 0xd6, 0x4a, 0x1c, 0xe0, 0xe8, 0x00, 0x27, 0x6c, 0xae, + 0x6f, 0x24, 0xa7, 0x7a, 0xc1, 0x90, 0x09, 0x1a, 0x1d, 0x3a, 0xc1, 0x43, 0x7d, 0x66, 0x64, 0x5b, + 0x2a, 0x4d, 0x48, 0xae, 0xaf, 0x7a, 0xd4, 0xa3, 0x72, 0xd8, 0x88, 0x46, 0x6a, 0xd5, 0x3e, 0x80, + 0x65, 0x84, 0xcf, 0xa8, 0xc0, 0x47, 0xc4, 0xf3, 0x71, 0xb0, 0x1f, 0x04, 0x34, 0xb0, 0x2c, 0xc8, + 0xf5, 0x68, 0x1f, 0x57, 0xcc, 0x9a, 0x59, 0xcf, 0x23, 0x39, 0xb6, 0x6a, 0x50, 0xea, 0x63, 0xde, + 0x0b, 0x08, 0x13, 0x84, 0xfa, 0x95, 0x99, 0x9a, 0x59, 0x9f, 0x47, 0xa3, 0x4b, 0xf6, 0x13, 0x28, + 0xb7, 0x06, 0xdd, 0x43, 0x3c, 0x44, 0xf8, 0xe3, 0x00, 0x73, 0x61, 0xdd, 0x85, 0x62, 0xef, 0xb8, + 0x43, 0xfc, 0x36, 0xe9, 0x4b, 0xa9, 0x79, 0x54, 0x90, 0xf3, 0x83, 0xbe, 0xfd, 0xc5, 0x84, 0xc5, + 0x38, 0x98, 0x33, 0xea, 0x73, 0x6c, 0xed, 0x42, 0x81, 0x0d, 0xba, 0xed, 0x13, 0x3c, 0x94, 0xc1, + 0xa5, 0xed, 0x0d, 0x27, 0x29, 0x82, 0xf2, 0xeb, 0x84, 0x4d, 0xa7, 0x35, 0xe8, 0x9e, 0x92, 0xde, + 0x21, 0x1e, 0xee, 0xe5, 0xce, 0x7f, 0x6d, 0x1a, 0x68, 0x8e, 0x49, 0x15, 0x6b, 0x17, 0xf2, 0x38, + 0x62, 0x97, 0x60, 0xa5, 0xed, 0x47, 0x4e, 0x46, 0x01, 0x9d, 0x6b, 0x4e, 0x91, 0x3a, 0x64, 0x7f, + 0x35, 0x61, 0x29, 0x5a, 0x7e, 0x43, 0x05, 0x8e, 0xe9, 0xb7, 0x20, 0x17, 0x52, 0x81, 0x35, 0xcc, + 0x9d, 0x54, 0x50, 0x15, 0x35, 0x6c, 0x3a, 0x32, 0x5a, 0x06, 0x8d, 0x59, 0x9d, 0x19, 0xb3, 0x6a, + 0xed, 0xc0, 0x1a, 0x3f, 0x21, 0xac, 0x8d, 0x3f, 0x09, 0xec, 0x73, 0x42, 0xfd, 0x36, 0x27, 0x9e, + 0x4f, 0x7c, 0xaf, 0x32, 0x5b, 0x33, 0xeb, 0x45, 0xb4, 0x1a, 0xed, 0xee, 0xc7, 0x9b, 0x47, 0x6a, + 0xcf, 0xfe, 0x6c, 0x82, 0x25, 0x41, 0xfb, 0x8a, 0x49, 0x17, 0xa9, 0xf9, 0x57, 0x50, 0xba, 0x36, + 0x0a, 0xed, 0x76, 0x95, 0x21, 0xb0, 0x12, 0xad, 0xb6, 0x02, 0xca, 0x28, 0xef, 0x9c, 0xc6, 0xc5, + 0x79, 0x06, 0x45, 0xa6, 0x97, 0x34, 0xcb, 0xbd, 0x0c, 0x96, 0xe4, 0x54, 0x12, 0x3c, 0xa5, 0x50, + 0xf6, 0x77, 0x13, 0xd6, 0x94, 0xe5, 0x34, 0x9b, 0xb6, 0xfd, 0xfc, 0x9f, 0xd2, 0x69, 0xfb, 0x69, + 0xd2, 0xdb, 0x95, 0xa0, 0x0c, 0xa5, 0x16, 0xf1, 0x3d, 0x6d, 0xdd, 0x5e, 0x84, 0x05, 0x35, 0x55, + 0x6c, 0xf6, 0x8f, 0x3c, 0x14, 0x5e, 0x62, 0xce, 0x3b, 0x1e, 0xb6, 0x5e, 0xc0, 0x92, 0xee, 0xe1, + 0x76, 0xa0, 0xc2, 0x35, 0xae, 0x9d, 0x99, 0x72, 0xec, 0xb9, 0xb8, 0x06, 0x2a, 0xb3, 0xb1, 0xf7, + 0xf3, 0x1a, 0xfe, 0x4b, 0xd5, 0x54, 0x36, 0xed, 0xe0, 0xc1, 0x54, 0x39, 0x15, 0xea, 0x1a, 0x68, + 0x91, 0x8d, 0x3f, 0x31, 0x04, 0xcb, 0x51, 0xef, 0xb5, 0xa3, 0xbe, 0x48, 0x00, 0x67, 0xa5, 0xe2, + 0xc3, 0x4c, 0xc5, 0x89, 0x37, 0xe1, 0x1a, 0x68, 0x89, 0x4f, 0x3c, 0x93, 0x77, 0xb0, 0xca, 0xe5, + 0xa5, 0xc5, 0xaa, 0x1a, 0x34, 0x27, 0x65, 0x1f, 0xdf, 0x28, 0x3b, 0xde, 0xd8, 0xae, 0x81, 0x2c, + 0x7e, 0xbd, 0xdd, 0xdf, 0xc3, 0xff, 0x12, 0x38, 0xbe, 0xc9, 0x04, 0x3a, 0x2f, 0xd5, 0xeb, 0x37, + 0xaa, 0x4f, 0xf4, 0xab, 0x6b, 0xa0, 0x15, 0x9e, 0xd1, 0xc6, 0x1e, 0x54, 0x34, 0xfc, 0x48, 0x06, + 0x6d, 0x60, 0x4e, 0xa6, 0xd8, 0x9a, 0x62, 0x60, 0xb2, 0x4d, 0x5d, 0x03, 0xad, 0xf1, 0xec, 0x06, + 0xde, 0x87, 0x05, 0x46, 0x7c, 0x2f, 0xe1, 0x2f, 0x48, 0xf1, 0x5a, 0xf6, 0x35, 0xa6, 0xcd, 0xe6, + 0x1a, 0xa8, 0xc4, 0xd2, 0xa9, 0xe5, 0x42, 0x59, 0xcb, 0x68, 0xc8, 0xa2, 0xd4, 0xb9, 0x3f, 0x45, + 0x27, 0x41, 0x5b, 0x60, 0x23, 0xf3, 0xbd, 0x3c, 0xcc, 0xf2, 0xc1, 0xd9, 0xde, 0xab, 0xf3, 0xcb, + 0xaa, 0x79, 0x71, 0x59, 0x35, 0x7f, 0x5f, 0x56, 0xcd, 0x6f, 0x57, 0x55, 0xe3, 0xe2, 0xaa, 0x6a, + 0xfc, 0xbc, 0xaa, 0x1a, 0x6f, 0x77, 0x3c, 0x22, 0x8e, 0x07, 0xdd, 0x48, 0xb9, 0x91, 0xfe, 0x3b, + 0xf1, 0xa0, 0xc3, 0x48, 0x23, 0xe3, 0x0f, 0xeb, 0xce, 0xc9, 0x5f, 0xe5, 0xe9, 0x9f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x73, 0xd7, 0xb2, 0x94, 0xe1, 0x06, 0x00, 0x00, } func (m *RemoteSignerError) Marshal() (dAtA []byte, err error) { @@ -829,9 +829,9 @@ func (m *SignVoteRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.SkipSignExtension { + if m.SkipExtensionSigning { i-- - if m.SkipSignExtension { + if m.SkipExtensionSigning { dAtA[i] = 1 } else { dAtA[i] = 0 @@ -1308,7 +1308,7 @@ func (m *SignVoteRequest) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } - if m.SkipSignExtension { + if m.SkipExtensionSigning { n += 2 } return n @@ -1895,7 +1895,7 @@ func (m *SignVoteRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field SkipSignExtension", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SkipExtensionSigning", wireType) } var v int for shift := uint(0); ; shift += 7 { @@ -1912,7 +1912,7 @@ func (m *SignVoteRequest) Unmarshal(dAtA []byte) error { break } } - m.SkipSignExtension = bool(v != 0) + m.SkipExtensionSigning = bool(v != 0) default: iNdEx = preIndex skippy, err := skipTypes(dAtA[iNdEx:]) diff --git a/privval/signer_client.go b/privval/signer_client.go index 06f6e719e18..d78bb957acf 100644 --- a/privval/signer_client.go +++ b/privval/signer_client.go @@ -93,7 +93,7 @@ func (sc *SignerClient) GetPubKey() (crypto.PubKey, error) { // SignVote requests a remote signer to sign a vote. func (sc *SignerClient) SignVote(chainID string, vote *cmtproto.Vote, signExtension bool) error { - response, err := sc.endpoint.SendRequest(mustWrapMsg(&pvproto.SignVoteRequest{Vote: vote, ChainId: chainID, SkipSignExtension: !signExtension})) + response, err := sc.endpoint.SendRequest(mustWrapMsg(&pvproto.SignVoteRequest{Vote: vote, ChainId: chainID, SkipExtensionSigning: !signExtension})) if err != nil { return err } diff --git a/privval/signer_requestHandler.go b/privval/signer_requestHandler.go index 66394b748d0..3fee912791a 100644 --- a/privval/signer_requestHandler.go +++ b/privval/signer_requestHandler.go @@ -62,7 +62,7 @@ func DefaultValidationRequestHandler( vote := r.SignVoteRequest.Vote - err = privVal.SignVote(chainID, vote, !r.SignVoteRequest.SkipSignExtension) + err = privVal.SignVote(chainID, vote, !r.SignVoteRequest.SkipExtensionSigning) if err != nil { res = mustWrapMsg(&pvproto.SignedVoteResponse{ Vote: cmtproto.Vote{}, Error: &pvproto.RemoteSignerError{Code: 0, Description: err.Error()}, diff --git a/proto/cometbft/privval/v1/types.proto b/proto/cometbft/privval/v1/types.proto index 51be076bab5..1ffc6a5386d 100644 --- a/proto/cometbft/privval/v1/types.proto +++ b/proto/cometbft/privval/v1/types.proto @@ -26,9 +26,9 @@ message PubKeyResponse { // SignVoteRequest is a request to sign a vote message SignVoteRequest { - cometbft.types.v1.Vote vote = 1; - string chain_id = 2; - bool skip_sign_extension = 3; // if true, the signer may skip signing the extension bytes. + cometbft.types.v1.Vote vote = 1; + string chain_id = 2; + bool skip_extension_signing = 3; // if true, the signer may skip signing the extension bytes. } // SignedVoteResponse is a response containing a signed vote or an error diff --git a/proto/tendermint/privval/types.proto b/proto/tendermint/privval/types.proto index b93ca68aaab..6716d7d6b46 100644 --- a/proto/tendermint/privval/types.proto +++ b/proto/tendermint/privval/types.proto @@ -32,8 +32,9 @@ message PubKeyResponse { // SignVoteRequest is a request to sign a vote message SignVoteRequest { - tendermint.types.Vote vote = 1; - string chain_id = 2; + tendermint.types.Vote vote = 1; + string chain_id = 2; + bool skip_extension_signing = 3; // if true, the signer may skip signing the extension bytes. } // SignedVoteResponse is a response containing a signed vote or an error