LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix misbehaviour handling for solo machine (#7515)

Browse Source 
* add timestamp to SignatureAndData

Add timestamp field to signature and data. Add ValidateBasic check for timestamp. Add ValidateBasic test. Update misbehaviour handler to use supplied timestamp.

* fix typo

* add timestamp check

* fix lint

Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
This commit is contained in:
colin axnér 2020-10-13 14:02:24 +02:00 committed by GitHub
parent 037a32bc91
commit 3589a3c799
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 173 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
proto/ibc/lightclients/solomachine/v1/solomachine.proto
View File

@ -63,6 +63,7 @@ message SignatureAndData {
bytes signature = 1;
DataType data_type = 2 [(gogoproto.moretags) = "yaml:\"data_type\""];
bytes data = 3;
uint64 timestamp = 4;
}
// TimestampedSignatureData contains the signature data and the timestamp of the

3
x/ibc/light-clients/06-solomachine/types/misbehaviour.go
View File

@ -85,6 +85,9 @@ func (sd SignatureAndData) ValidateBasic() error {
if sd.DataType == UNSPECIFIED {
return sdkerrors.Wrap(ErrInvalidSignatureAndData, "data type cannot be UNSPECIFIED")
}
if sd.Timestamp == 0 {
return sdkerrors.Wrap(ErrInvalidSignatureAndData, "timestamp cannot be 0")
}
return nil
}

11
x/ibc/light-clients/06-solomachine/types/misbehaviour_handle.go
View File

@ -49,8 +49,15 @@ func (cs ClientState) CheckMisbehaviourAndUpdateState(
// verifySignatureAndData verifies that the currently registered public key has signed
// over the provided data and that the data is valid. The data is valid if it can be
// unmarshaled into the specified data type.
// unmarshaled into the specified data type or the timestamp of the signature is less
// than the consensus state timestamp.
func verifySignatureAndData(cdc codec.BinaryMarshaler, clientState ClientState, misbehaviour *Misbehaviour, sigAndData *SignatureAndData) error {
// timestamp less than consensus state would always fail and not succeed in fooling the
// light client
if sigAndData.Timestamp < clientState.ConsensusState.Timestamp {
return sdkerrors.Wrapf(clienttypes.ErrInvalidMisbehaviour, "timestamp is less than consensus state timestamp (%d < %d)", sigAndData.Timestamp, clientState.ConsensusState.Timestamp)
}
// ensure data can be unmarshaled to the specified data type
if _, err := UnmarshalDataByType(cdc, sigAndData.DataType, sigAndData.Data); err != nil {
return err
@ -58,7 +65,7 @@ func verifySignatureAndData(cdc codec.BinaryMarshaler, clientState ClientState,
data, err := MisbehaviourSignBytes(
cdc,
misbehaviour.Sequence, clientState.ConsensusState.Timestamp,
misbehaviour.Sequence, sigAndData.Timestamp,
clientState.ConsensusState.Diversifier,
sigAndData.DataType,
sigAndData.Data,

28
x/ibc/light-clients/06-solomachine/types/misbehaviour_handle_test.go
View File

@ -75,6 +75,34 @@ func (suite *SoloMachineTestSuite) TestCheckMisbehaviourAndUpdateState() {
misbehaviour = m
}, false,
},
{
"invalid SignatureOne timestamp",
func() {
clientState = solomachine.ClientState()
m := solomachine.CreateMisbehaviour()
m.SignatureOne.Timestamp = 1000000000000
misbehaviour = m
}, false,
},
{
"invalid SignatureTwo timestamp",
func() {
clientState = solomachine.ClientState()
m := solomachine.CreateMisbehaviour()
m.SignatureTwo.Timestamp = 1000000000000
misbehaviour = m
}, false,
},
{
"timestamp is less than consensus state timestamp",
func() {
clientState = solomachine.ClientState()
solomachine.Time = solomachine.Time - 5
misbehaviour = solomachine.CreateMisbehaviour()
}, false,
},
{
"invalid first signature data",
func() {

12
x/ibc/light-clients/06-solomachine/types/misbehaviour_test.go
View File

@ -96,6 +96,18 @@ func (suite *SoloMachineTestSuite) TestMisbehaviourValidateBasic() {
misbehaviour.SignatureTwo.DataType = types.UNSPECIFIED
}, false,
},
{
"timestamp for SignatureOne is zero",
func(misbehaviour *types.Misbehaviour) {
misbehaviour.SignatureOne.Timestamp = 0
}, false,
},
{
"timestamp for SignatureTwo is zero",
func(misbehaviour *types.Misbehaviour) {
misbehaviour.SignatureTwo.Timestamp = 0
}, false,
},
}
for _, tc := range testCases {

202
x/ibc/light-clients/06-solomachine/types/solomachine.pb.go
View File

@ -267,6 +267,7 @@ type SignatureAndData struct {
Signature []byte `protobuf:"bytes,1,opt,name=signature,proto3" json:"signature,omitempty"`
DataType DataType `protobuf:"varint,2,opt,name=data_type,json=dataType,proto3,enum=ibc.lightclients.solomachine.v1.DataType" json:"data_type,omitempty" yaml:"data_type"`
Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
Timestamp uint64 `protobuf:"varint,4,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
}
func (m *SignatureAndData) Reset() { *m = SignatureAndData{} }
@ -819,93 +820,93 @@ func init() {
}
var fileDescriptor_6cc2ee18f7f86d4e = []byte{
// 1361 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4f, 0x8f, 0xdb, 0x54,
0x10, 0x5f, 0xa7, 0xe9, 0x76, 0x33, 0xd9, 0x66, 0x83, 0x9b, 0xb6, 0x59, 0xb7, 0x4a, 0x8c, 0x11,
0x65, 0x41, 0x34, 0x61, 0x8b, 0xa8, 0x50, 0x85, 0x00, 0xc7, 0x31, 0x34, 0xed, 0xae, 0x37, 0x38,
0x5e, 0xa0, 0x15, 0x92, 0xe5, 0xd8, 0x6f, 0x13, 0x6b, 0x13, 0x3b, 0xc4, 0x4e, 0xd2, 0x20, 0x21,
0x21, 0x4e, 0x25, 0xe2, 0xc0, 0x91, 0x4b, 0x24, 0x04, 0x42, 0xe2, 0xa3, 0x20, 0x71, 0x29, 0x37,
0x4e, 0x01, 0xb5, 0xdf, 0x20, 0x9f, 0x00, 0xd9, 0xef, 0x39, 0xb6, 0xb3, 0x6c, 0x56, 0xfc, 0x3b,
0xe5, 0xbd, 0x99, 0xdf, 0xfc, 0x66, 0xde, 0xbc, 0xc9, 0xbc, 0x31, 0xec, 0x9a, 0x4d, 0xbd, 0xdc,
0x31, 0x5b, 0x6d, 0x57, 0xef, 0x98, 0xc8, 0x72, 0x9d, 0xb2, 0x63, 0x77, 0xec, 0xae, 0xa6, 0xb7,
0x4d, 0x0b, 0x95, 0x87, 0xbb, 0xd1, 0x6d, 0xa9, 0xd7, 0xb7, 0x5d, 0x9b, 0x2e, 0x9a, 0x4d, 0xbd,
0x14, 0x35, 0x29, 0x45, 0x31, 0xc3, 0x5d, 0xe6, 0x25, 0x8f, 0x53, 0xb7, 0xfb, 0xa8, 0xac, 0xdb,
0x96, 0x85, 0x74, 0xd7, 0xb4, 0x2d, 0x8f, 0x2a, 0xdc, 0x61, 0x26, 0xe6, 0xf9, 0x10, 0xd8, 0xd6,
0x2c, 0x0b, 0x75, 0x7c, 0x14, 0x5e, 0x12, 0x48, 0xae, 0x65, 0xb7, 0x6c, 0x7f, 0x59, 0xf6, 0x56,
0x44, 0xba, 0xdd, 0xb2, 0xed, 0x56, 0x07, 0x95, 0xfd, 0x5d, 0x73, 0x70, 0x54, 0xd6, 0xac, 0x31,
0x56, 0x71, 0xbf, 0x26, 0x20, 0x2d, 0xf8, 0x71, 0x35, 0x5c, 0xcd, 0x45, 0x34, 0x03, 0x1b, 0x0e,
0xfa, 0x74, 0x80, 0x2c, 0x1d, 0xe5, 0x29, 0x96, 0xda, 0x49, 0xca, 0x8b, 0x3d, 0x2d, 0xc0, 0xd6,
0x51, 0xdf, 0xfe, 0x0c, 0x59, 0xea, 0x02, 0x92, 0xf0, 0x20, 0x15, 0x66, 0x3e, 0x2b, 0x5e, 0x19,
0x6b, 0xdd, 0xce, 0x1d, 0x6e, 0x09, 0xc0, 0xc9, 0x19, 0x2c, 0x69, 0x04, 0x24, 0x2e, 0x6c, 0xe9,
0xb6, 0xe5, 0x20, 0xcb, 0x19, 0x38, 0xaa, 0xe3, 0xf9, 0xcc, 0x9f, 0x63, 0xa9, 0x9d, 0xf4, 0xad,
0x72, 0xe9, 0x8c, 0x44, 0x95, 0x84, 0xc0, 0xce, 0x0f, 0x35, 0xea, 0x75, 0x89, 0x91, 0x93, 0x33,
0x7a, 0x0c, 0x4b, 0x23, 0xb8, 0xa6, 0x75, 0x3a, 0xf6, 0x48, 0x1d, 0xf4, 0x0c, 0xcd, 0x45, 0xaa,
0x76, 0xe4, 0xa2, 0xbe, 0xda, 0xeb, 0xdb, 0x3d, 0xdb, 0xd1, 0x3a, 0xf9, 0x24, 0x4b, 0xed, 0x6c,
0x54, 0x6e, 0xcc, 0x67, 0x45, 0x0e, 0x13, 0xae, 0x00, 0x73, 0x72, 0xde, 0xd7, 0x1e, 0xfa, 0x4a,
0xde, 0xd3, 0xd5, 0x89, 0xea, 0x4e, 0xf2, 0xf1, 0x77, 0xc5, 0x35, 0xee, 0x7b, 0x0a, 0x32, 0xf1,
0x58, 0xe9, 0x7b, 0x00, 0xbd, 0x41, 0xb3, 0x63, 0xea, 0xea, 0x31, 0x1a, 0xfb, 0x89, 0x4d, 0xdf,
0xca, 0x95, 0xf0, 0xb5, 0x94, 0x82, 0x6b, 0x29, 0xf1, 0xd6, 0xb8, 0x72, 0x79, 0x3e, 0x2b, 0x3e,
0x87, 0x83, 0x08, 0x2d, 0x38, 0x39, 0x85, 0x37, 0xf7, 0xd1, 0x98, 0x66, 0x21, 0x6d, 0x98, 0x43,
0xd4, 0x77, 0xcc, 0x23, 0x13, 0xf5, 0xfd, 0x2b, 0x48, 0xc9, 0x51, 0x11, 0x7d, 0x1d, 0x52, 0xae,
0xd9, 0x45, 0x8e, 0xab, 0x75, 0x7b, 0x7e, 0x76, 0x93, 0x72, 0x28, 0x20, 0x41, 0x7e, 0x99, 0x80,
0xf5, 0xbb, 0x48, 0x33, 0x50, 0x7f, 0xe5, 0x9d, 0xc7, 0xa8, 0x12, 0x4b, 0x54, 0x9e, 0xd6, 0x31,
0x5b, 0x96, 0xe6, 0x0e, 0xfa, 0xf8, 0x1a, 0x37, 0xe5, 0x50, 0x40, 0x1f, 0x42, 0xc6, 0x42, 0x23,
0x35, 0x72, 0xf0, 0xe4, 0x8a, 0x83, 0x6f, 0xcf, 0x67, 0xc5, 0xcb, 0xf8, 0xe0, 0x71, 0x2b, 0x4e,
0xde, 0xb4, 0xd0, 0xa8, 0xbe, 0x38, 0xbf, 0x00, 0x5b, 0x1e, 0x20, 0x9a, 0x83, 0xf3, 0x5e, 0x0e,
0xa2, 0x05, 0xb1, 0x04, 0xe0, 0x64, 0x2f, 0x92, 0x6a, 0x28, 0x20, 0x49, 0xf8, 0x25, 0x01, 0x9b,
0xfb, 0xa6, 0xd3, 0x44, 0x6d, 0x6d, 0x68, 0xda, 0x83, 0x3e, 0xbd, 0x0b, 0x29, 0x5c, 0x7c, 0xaa,
0x69, 0xf8, 0xb9, 0x48, 0x55, 0x72, 0xf3, 0x59, 0x31, 0x4b, 0xca, 0x2c, 0x50, 0x71, 0xf2, 0x06,
0x5e, 0xd7, 0x8c, 0x58, 0xf6, 0x12, 0x4b, 0xd9, 0xeb, 0xc1, 0xc5, 0x45, 0x3a, 0x54, 0xdb, 0x0a,
0x4a, 0x7d, 0xf7, 0xcc, 0x52, 0x6f, 0x04, 0x56, 0xbc, 0x65, 0x54, 0x35, 0x57, 0xab, 0xe4, 0xe7,
0xb3, 0x62, 0x0e, 0x47, 0x11, 0x63, 0xe4, 0xe4, 0xcd, 0xc5, 0xfe, 0xc0, 0x5a, 0xf2, 0xe8, 0x8e,
0x6c, 0x92, 0xf2, 0xff, 0xca, 0xa3, 0x3b, 0xb2, 0xa3, 0x1e, 0x95, 0x91, 0x7d, 0x67, 0xc3, 0xcb,
0xe4, 0xb7, 0x5e, 0x36, 0x7f, 0xa2, 0x20, 0xbb, 0x4c, 0x13, 0x2f, 0x11, 0x6a, 0xb9, 0x44, 0x3e,
0x81, 0x94, 0xa1, 0xb9, 0x9a, 0xea, 0x8e, 0x7b, 0x38, 0x7b, 0x99, 0x5b, 0x2f, 0x9f, 0x19, 0xaa,
0xc7, 0xab, 0x8c, 0x7b, 0x28, 0x7a, 0x35, 0x0b, 0x16, 0x4e, 0xde, 0x30, 0x88, 0x9e, 0xa6, 0x21,
0xe9, 0xad, 0x49, 0x65, 0xfa, 0x6b, 0x72, 0xf1, 0x5f, 0x50, 0x90, 0x57, 0x82, 0x32, 0x46, 0xc6,
0x22, 0x6a, 0x3f, 0xe4, 0x77, 0x21, 0x13, 0x9e, 0xd8, 0x27, 0xf0, 0xe3, 0x8e, 0x56, 0x68, 0x5c,
0xcf, 0xc9, 0x61, 0xd2, 0x83, 0x43, 0x9f, 0xfe, 0xaf, 0x21, 0x21, 0xfc, 0x4e, 0x41, 0xca, 0xf3,
0x5b, 0x19, 0xbb, 0xc8, 0xf9, 0x17, 0xff, 0xc1, 0xa5, 0x76, 0x70, 0xee, 0x64, 0x3b, 0x88, 0x25,
0x39, 0xf9, 0x7f, 0x25, 0xf9, 0xfc, 0x89, 0x24, 0xff, 0x48, 0x01, 0xe0, 0x16, 0xe3, 0x27, 0x65,
0x0f, 0xd2, 0xe4, 0x8f, 0x7d, 0x66, 0x13, 0xbc, 0x32, 0x9f, 0x15, 0xe9, 0x58, 0x2f, 0x20, 0x5d,
0x10, 0x37, 0x82, 0x53, 0xba, 0x40, 0xe2, 0x1f, 0x76, 0x81, 0xcf, 0x61, 0x2b, 0xf2, 0x04, 0xfa,
0xb1, 0xd2, 0x90, 0xec, 0x69, 0x6e, 0x9b, 0x14, 0xac, 0xbf, 0xa6, 0xeb, 0xb0, 0x49, 0x1a, 0x00,
0x7e, 0xb6, 0x12, 0x2b, 0x0e, 0x70, 0x75, 0x3e, 0x2b, 0x5e, 0x8a, 0x35, 0x0d, 0xf2, 0x30, 0xa5,
0xf5, 0xd0, 0x13, 0x71, 0xff, 0x15, 0x05, 0x74, 0xfc, 0xb9, 0x38, 0x35, 0x84, 0x07, 0x27, 0x1f,
0xcf, 0x55, 0x51, 0xfc, 0x8d, 0x17, 0x92, 0xc4, 0x32, 0x84, 0x4b, 0xc2, 0x62, 0xec, 0x58, 0x1d,
0x8b, 0x08, 0x10, 0x4e, 0x28, 0x24, 0x8c, 0x17, 0xfd, 0xb2, 0xf2, 0x46, 0x94, 0x52, 0x64, 0x7a,
0xc1, 0x4f, 0x37, 0xd9, 0x89, 0x96, 0x21, 0x47, 0x0c, 0x89, 0x5f, 0x03, 0xb2, 0x02, 0x1e, 0x64,
0x56, 0x3b, 0xbd, 0x0d, 0x17, 0xc8, 0xc0, 0x43, 0x3c, 0x5e, 0x8f, 0x78, 0x24, 0x93, 0x90, 0xe7,
0x0e, 0x2f, 0xe5, 0x00, 0x4c, 0xbc, 0xdc, 0x83, 0x5c, 0x5d, 0xd3, 0x8f, 0x91, 0x2b, 0xd8, 0xdd,
0xae, 0xe9, 0x76, 0x91, 0xe5, 0x9e, 0xea, 0xa9, 0xe0, 0x1d, 0x2f, 0x40, 0xf9, 0xce, 0x36, 0xe5,
0x88, 0x84, 0x7b, 0x00, 0xdb, 0x98, 0x8b, 0xd7, 0x8f, 0x2d, 0x7b, 0xd4, 0x41, 0x46, 0x0b, 0xad,
0x24, 0xdc, 0x81, 0x2d, 0x2d, 0x0e, 0x25, 0xac, 0xcb, 0x62, 0xae, 0x04, 0x79, 0x4c, 0x2d, 0x23,
0x1d, 0x99, 0x3d, 0x97, 0x6f, 0x3a, 0x5e, 0x1f, 0x38, 0x8d, 0x99, 0x6b, 0x43, 0x4e, 0x42, 0x8f,
0xdc, 0x60, 0xc4, 0x92, 0x91, 0x3e, 0x3c, 0x35, 0x8a, 0xb7, 0xe0, 0xa2, 0x85, 0x1e, 0xb9, 0xde,
0x80, 0xa6, 0xf6, 0x91, 0x3e, 0x24, 0x13, 0x5c, 0xa4, 0xd9, 0xc7, 0xd4, 0x9c, 0x9c, 0xb6, 0x30,
0xb5, 0xc7, 0xfa, 0xca, 0xd7, 0x49, 0xd8, 0x08, 0x1a, 0x03, 0xfd, 0x26, 0xbc, 0x50, 0xe5, 0x15,
0x5e, 0x55, 0x1e, 0xd4, 0x45, 0xf5, 0x50, 0xaa, 0x49, 0x35, 0xa5, 0xc6, 0xef, 0xd5, 0x1e, 0x8a,
0x55, 0xf5, 0x50, 0x6a, 0xd4, 0x45, 0xa1, 0xf6, 0x5e, 0x4d, 0xac, 0x66, 0xd7, 0x98, 0xad, 0xc9,
0x94, 0x4d, 0x47, 0x44, 0xf4, 0x0d, 0xb8, 0x12, 0x5a, 0x0a, 0x7b, 0x35, 0x51, 0x52, 0xd4, 0x86,
0xc2, 0x2b, 0x62, 0x96, 0x62, 0x60, 0x32, 0x65, 0xd7, 0xb1, 0x8c, 0x7e, 0x15, 0xb6, 0x23, 0xb8,
0x03, 0xa9, 0x21, 0x4a, 0x8d, 0xc3, 0x06, 0x81, 0x26, 0x98, 0x8b, 0x93, 0x29, 0x9b, 0x5a, 0x88,
0xe9, 0x12, 0x30, 0x31, 0xb4, 0x24, 0x0a, 0x4a, 0xed, 0x40, 0x22, 0xf0, 0x73, 0x4c, 0x66, 0x32,
0x65, 0x21, 0x94, 0xd3, 0x3b, 0x70, 0x35, 0x82, 0xbf, 0xcb, 0x4b, 0x92, 0xb8, 0x47, 0xc0, 0x49,
0x26, 0x3d, 0x99, 0xb2, 0x17, 0x88, 0x90, 0x7e, 0x03, 0xae, 0x85, 0xc8, 0x3a, 0x2f, 0xdc, 0x17,
0x15, 0x55, 0x38, 0xd8, 0xdf, 0xaf, 0x29, 0xfb, 0xa2, 0xa4, 0x64, 0xcf, 0x33, 0xb9, 0xc9, 0x94,
0xcd, 0x62, 0x45, 0x28, 0xa7, 0xdf, 0x01, 0xf6, 0x84, 0x19, 0x2f, 0xdc, 0x97, 0x0e, 0x3e, 0xda,
0x13, 0xab, 0xef, 0x8b, 0xbe, 0xed, 0x3a, 0xb3, 0x3d, 0x99, 0xb2, 0x97, 0xb1, 0x76, 0x49, 0x49,
0xbf, 0xfd, 0x17, 0x04, 0xb2, 0x28, 0x88, 0xb5, 0xba, 0xa2, 0xf2, 0x95, 0x86, 0x28, 0x09, 0x62,
0xf6, 0x02, 0x93, 0x9f, 0x4c, 0xd9, 0x1c, 0xd6, 0x12, 0x25, 0xd1, 0xd1, 0xb7, 0xe1, 0x7a, 0x68,
0x2f, 0x89, 0x1f, 0x2b, 0x6a, 0x43, 0xfc, 0xe0, 0xd0, 0x53, 0x79, 0x34, 0x1f, 0x66, 0x37, 0x70,
0xe0, 0x9e, 0x26, 0x50, 0x78, 0x72, 0x9a, 0x85, 0x6c, 0x68, 0x77, 0x57, 0xe4, 0xab, 0xa2, 0x9c,
0x4d, 0xe1, 0x9b, 0xc1, 0x3b, 0x26, 0xf9, 0xf8, 0x87, 0xc2, 0x5a, 0x45, 0xfd, 0xf9, 0x69, 0x81,
0x7a, 0xf2, 0xb4, 0x40, 0xfd, 0xf1, 0xb4, 0x40, 0x7d, 0xf3, 0xac, 0xb0, 0xf6, 0xe4, 0x59, 0x61,
0xed, 0xb7, 0x67, 0x85, 0xb5, 0x87, 0x62, 0xcb, 0x74, 0xdb, 0x83, 0x66, 0x49, 0xb7, 0xbb, 0x65,
0xdd, 0x76, 0xba, 0xb6, 0x43, 0x7e, 0x6e, 0x3a, 0xc6, 0x71, 0xf9, 0x51, 0x79, 0xf1, 0x19, 0x75,
0x33, 0xf8, 0x8e, 0x7a, 0xed, 0xf6, 0xcd, 0xe8, 0xa7, 0x94, 0xf7, 0xca, 0x38, 0xcd, 0x75, 0xbf,
0x9d, 0xbd, 0xfe, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x07, 0xb2, 0xd0, 0x69, 0x77, 0x0d, 0x00,
0x00,
// 1368 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdf, 0x8f, 0xdb, 0xc4,
0x13, 0x3f, 0xa7, 0xe9, 0xf5, 0x32, 0xb9, 0xe6, 0xf2, 0x75, 0xd3, 0x36, 0xe7, 0x56, 0x89, 0xbf,
0x46, 0x94, 0x03, 0xd1, 0x84, 0x2b, 0xa2, 0x42, 0x15, 0x02, 0x1c, 0xc7, 0xd0, 0xb4, 0x77, 0xbe,
0xe0, 0xf8, 0x80, 0x56, 0x48, 0x96, 0xe3, 0xec, 0x25, 0xd6, 0x25, 0x76, 0x88, 0x9d, 0xa4, 0x41,
0x42, 0x42, 0x3c, 0x95, 0x88, 0x07, 0x1e, 0x79, 0x89, 0x84, 0x40, 0xfc, 0x2b, 0x08, 0x89, 0x97,
0xf2, 0xc6, 0x53, 0x40, 0xed, 0x7f, 0x90, 0xbf, 0x00, 0xad, 0x77, 0x13, 0xdb, 0xb9, 0x5e, 0x4e,
0xfc, 0x7a, 0xca, 0xee, 0xcc, 0x67, 0x3e, 0x33, 0x3b, 0x33, 0x99, 0x5d, 0xc3, 0xae, 0x55, 0x37,
0x8b, 0x6d, 0xab, 0xd9, 0xf2, 0xcc, 0xb6, 0x85, 0x6c, 0xcf, 0x2d, 0xba, 0x4e, 0xdb, 0xe9, 0x18,
0x66, 0xcb, 0xb2, 0x51, 0x71, 0xb0, 0x1b, 0xde, 0x16, 0xba, 0x3d, 0xc7, 0x73, 0xd8, 0xbc, 0x55,
0x37, 0x0b, 0x61, 0x93, 0x42, 0x18, 0x33, 0xd8, 0xe5, 0x5e, 0xc2, 0x9c, 0xa6, 0xd3, 0x43, 0x45,
0xd3, 0xb1, 0x6d, 0x64, 0x7a, 0x96, 0x63, 0x63, 0xaa, 0x60, 0x47, 0x98, 0xb8, 0xff, 0x07, 0xc0,
0x96, 0x61, 0xdb, 0xa8, 0xed, 0xa3, 0xc8, 0x92, 0x42, 0x32, 0x4d, 0xa7, 0xe9, 0xf8, 0xcb, 0x22,
0x5e, 0x51, 0xe9, 0x76, 0xd3, 0x71, 0x9a, 0x6d, 0x54, 0xf4, 0x77, 0xf5, 0xfe, 0x51, 0xd1, 0xb0,
0x47, 0x44, 0x25, 0xfc, 0x1a, 0x83, 0xa4, 0xe4, 0xc7, 0x55, 0xf3, 0x0c, 0x0f, 0xb1, 0x1c, 0x6c,
0xb8, 0xe8, 0xd3, 0x3e, 0xb2, 0x4d, 0x94, 0x65, 0x78, 0x66, 0x27, 0xae, 0x2e, 0xf6, 0xac, 0x04,
0x5b, 0x47, 0x3d, 0xe7, 0x33, 0x64, 0xeb, 0x0b, 0x48, 0x0c, 0x43, 0x4a, 0xdc, 0x6c, 0x9a, 0xbf,
0x32, 0x32, 0x3a, 0xed, 0x3b, 0xc2, 0x12, 0x40, 0x50, 0x53, 0x44, 0x52, 0x9b, 0x93, 0x78, 0xb0,
0x65, 0x3a, 0xb6, 0x8b, 0x6c, 0xb7, 0xef, 0xea, 0x2e, 0xf6, 0x99, 0x3d, 0xc7, 0x33, 0x3b, 0xc9,
0x5b, 0xc5, 0xc2, 0x19, 0x89, 0x2a, 0x48, 0x73, 0x3b, 0x3f, 0xd4, 0xb0, 0xd7, 0x25, 0x46, 0x41,
0x4d, 0x99, 0x11, 0x2c, 0x8b, 0xe0, 0x9a, 0xd1, 0x6e, 0x3b, 0x43, 0xbd, 0xdf, 0x6d, 0x18, 0x1e,
0xd2, 0x8d, 0x23, 0x0f, 0xf5, 0xf4, 0x6e, 0xcf, 0xe9, 0x3a, 0xae, 0xd1, 0xce, 0xc6, 0x79, 0x66,
0x67, 0xa3, 0x74, 0x63, 0x36, 0xcd, 0x0b, 0x84, 0x70, 0x05, 0x58, 0x50, 0xb3, 0xbe, 0xf6, 0xd0,
0x57, 0x8a, 0x58, 0x57, 0xa5, 0xaa, 0x3b, 0xf1, 0xc7, 0xdf, 0xe5, 0xd7, 0x84, 0xef, 0x19, 0x48,
0x45, 0x63, 0x65, 0xef, 0x01, 0x74, 0xfb, 0xf5, 0xb6, 0x65, 0xea, 0xc7, 0x68, 0xe4, 0x27, 0x36,
0x79, 0x2b, 0x53, 0x20, 0x65, 0x29, 0xcc, 0xcb, 0x52, 0x10, 0xed, 0x51, 0xe9, 0xf2, 0x6c, 0x9a,
0xff, 0x1f, 0x09, 0x22, 0xb0, 0x10, 0xd4, 0x04, 0xd9, 0xdc, 0x47, 0x23, 0x96, 0x87, 0x64, 0xc3,
0x1a, 0xa0, 0x9e, 0x6b, 0x1d, 0x59, 0xa8, 0xe7, 0x97, 0x20, 0xa1, 0x86, 0x45, 0xec, 0x75, 0x48,
0x78, 0x56, 0x07, 0xb9, 0x9e, 0xd1, 0xe9, 0xfa, 0xd9, 0x8d, 0xab, 0x81, 0x80, 0x06, 0xf9, 0x65,
0x0c, 0xd6, 0xef, 0x22, 0xa3, 0x81, 0x7a, 0x2b, 0x6b, 0x1e, 0xa1, 0x8a, 0x2d, 0x51, 0x61, 0xad,
0x6b, 0x35, 0x6d, 0xc3, 0xeb, 0xf7, 0x48, 0x19, 0x37, 0xd5, 0x40, 0xc0, 0x1e, 0x42, 0xca, 0x46,
0x43, 0x3d, 0x74, 0xf0, 0xf8, 0x8a, 0x83, 0x6f, 0xcf, 0xa6, 0xf9, 0xcb, 0xe4, 0xe0, 0x51, 0x2b,
0x41, 0xdd, 0xb4, 0xd1, 0xb0, 0xba, 0x38, 0xbf, 0x04, 0x5b, 0x18, 0x10, 0xce, 0xc1, 0x79, 0x9c,
0x83, 0x70, 0x43, 0x2c, 0x01, 0x04, 0x15, 0x47, 0x52, 0x0e, 0x04, 0x34, 0x09, 0xbf, 0xc4, 0x60,
0x73, 0xdf, 0x72, 0xeb, 0xa8, 0x65, 0x0c, 0x2c, 0xa7, 0xdf, 0x63, 0x77, 0x21, 0x41, 0x9a, 0x4f,
0xb7, 0x1a, 0x7e, 0x2e, 0x12, 0xa5, 0xcc, 0x6c, 0x9a, 0x4f, 0xd3, 0x36, 0x9b, 0xab, 0x04, 0x75,
0x83, 0xac, 0x2b, 0x8d, 0x48, 0xf6, 0x62, 0x4b, 0xd9, 0xeb, 0xc2, 0xc5, 0x45, 0x3a, 0x74, 0xc7,
0x9e, 0xb7, 0xfa, 0xee, 0x99, 0xad, 0x5e, 0x9b, 0x5b, 0x89, 0x76, 0xa3, 0x6c, 0x78, 0x46, 0x29,
0x3b, 0x9b, 0xe6, 0x33, 0x24, 0x8a, 0x08, 0xa3, 0xa0, 0x6e, 0x2e, 0xf6, 0x07, 0xf6, 0x92, 0x47,
0x6f, 0xe8, 0xd0, 0x94, 0xff, 0x5b, 0x1e, 0xbd, 0xa1, 0x13, 0xf6, 0xa8, 0x0d, 0x9d, 0x3b, 0x1b,
0x38, 0x93, 0xdf, 0xe2, 0x6c, 0xfe, 0xc4, 0x40, 0x7a, 0x99, 0x26, 0xda, 0x22, 0xcc, 0x72, 0x8b,
0x7c, 0x02, 0x89, 0x86, 0xe1, 0x19, 0xba, 0x37, 0xea, 0x92, 0xec, 0xa5, 0x6e, 0xbd, 0x7c, 0x66,
0xa8, 0x98, 0x57, 0x1b, 0x75, 0x51, 0xb8, 0x34, 0x0b, 0x16, 0x41, 0xdd, 0x68, 0x50, 0x3d, 0xcb,
0x42, 0x1c, 0xaf, 0x69, 0x67, 0xfa, 0xeb, 0x68, 0x43, 0xc7, 0x9f, 0xff, 0xdf, 0xf8, 0x82, 0x81,
0xac, 0x36, 0x97, 0xa1, 0xc6, 0xe2, 0x4c, 0xfe, 0x81, 0xde, 0x85, 0x54, 0x90, 0x0f, 0x9f, 0xde,
0x3f, 0x55, 0xb8, 0x7f, 0xa3, 0x7a, 0x41, 0x0d, 0x4a, 0x52, 0x3e, 0x11, 0x42, 0xec, 0xf9, 0x21,
0xfc, 0xce, 0x40, 0x02, 0xfb, 0x2d, 0x8d, 0x3c, 0xe4, 0xfe, 0x83, 0x7f, 0xe8, 0xd2, 0xb0, 0x38,
0x77, 0x72, 0x58, 0x44, 0x4a, 0x10, 0xff, 0xaf, 0x4a, 0x70, 0x3e, 0x28, 0x01, 0x3d, 0xe1, 0x8f,
0x0c, 0x00, 0x19, 0x40, 0x7e, 0x52, 0xf6, 0x20, 0x49, 0xff, 0xf6, 0x67, 0x8e, 0xc8, 0x2b, 0xb3,
0x69, 0x9e, 0x8d, 0x4c, 0x0a, 0x3a, 0x23, 0xc9, 0x98, 0x38, 0x65, 0x46, 0xc4, 0xfe, 0xe6, 0x8c,
0xf8, 0x1c, 0xb6, 0x42, 0x17, 0xa4, 0x1f, 0x2b, 0x0b, 0xf1, 0xae, 0xe1, 0xb5, 0x68, 0x3b, 0xfb,
0x6b, 0xb6, 0x0a, 0x9b, 0x74, 0x3c, 0x90, 0x4b, 0x2d, 0xb6, 0xe2, 0x00, 0x57, 0x67, 0xd3, 0xfc,
0xa5, 0xc8, 0x48, 0xa1, 0xd7, 0x56, 0xd2, 0x0c, 0x3c, 0x51, 0xf7, 0x5f, 0x31, 0xc0, 0x46, 0x2f,
0x93, 0x53, 0x43, 0x78, 0x70, 0xf2, 0x6a, 0x5d, 0x15, 0xc5, 0x5f, 0xb8, 0x3f, 0x69, 0x2c, 0x03,
0xb8, 0x24, 0x2d, 0x1e, 0x25, 0xab, 0x63, 0x91, 0x01, 0x82, 0xf7, 0x0b, 0x0d, 0xe3, 0x45, 0xbf,
0xad, 0xf0, 0x03, 0xa6, 0x10, 0x7a, 0xdb, 0x90, 0x8b, 0x9d, 0xee, 0x64, 0xbb, 0xa1, 0x86, 0x0c,
0xa9, 0xdf, 0x06, 0xa4, 0x25, 0xf2, 0xcc, 0x59, 0xed, 0xf4, 0x36, 0x5c, 0xa0, 0xcf, 0x21, 0xea,
0xf1, 0x7a, 0xc8, 0x23, 0x7d, 0x27, 0x61, 0x77, 0x64, 0xa9, 0xce, 0xc1, 0xd4, 0xcb, 0x3d, 0xc8,
0x54, 0x0d, 0xf3, 0x18, 0x79, 0x92, 0xd3, 0xe9, 0x58, 0x5e, 0x07, 0xd9, 0xde, 0xa9, 0x9e, 0x72,
0xf8, 0x78, 0x73, 0x94, 0xef, 0x6c, 0x53, 0x0d, 0x49, 0x84, 0x07, 0xb0, 0x4d, 0xb8, 0x44, 0xf3,
0xd8, 0x76, 0x86, 0x6d, 0xd4, 0x68, 0xa2, 0x95, 0x84, 0x3b, 0xb0, 0x65, 0x44, 0xa1, 0x94, 0x75,
0x59, 0x2c, 0x14, 0x20, 0x4b, 0xa8, 0x55, 0x64, 0x22, 0xab, 0xeb, 0x89, 0x75, 0x17, 0xcf, 0x81,
0xd3, 0x98, 0x85, 0x16, 0x64, 0x14, 0xf4, 0xc8, 0x9b, 0x3f, 0xc0, 0x54, 0x64, 0x0e, 0x4e, 0x8d,
0xe2, 0x2d, 0xb8, 0x68, 0xa3, 0x47, 0x1e, 0x7e, 0xbe, 0xe9, 0x3d, 0x64, 0x0e, 0xe8, 0xfb, 0x2e,
0x74, 0x15, 0x44, 0xd4, 0x82, 0x9a, 0xb4, 0x09, 0x35, 0x66, 0x7d, 0xe5, 0xeb, 0x38, 0x6c, 0xcc,
0x07, 0x03, 0xfb, 0x26, 0xbc, 0x50, 0x16, 0x35, 0x51, 0xd7, 0x1e, 0x54, 0x65, 0xfd, 0x50, 0xa9,
0x28, 0x15, 0xad, 0x22, 0xee, 0x55, 0x1e, 0xca, 0x65, 0xfd, 0x50, 0xa9, 0x55, 0x65, 0xa9, 0xf2,
0x5e, 0x45, 0x2e, 0xa7, 0xd7, 0xb8, 0xad, 0xf1, 0x84, 0x4f, 0x86, 0x44, 0xec, 0x0d, 0xb8, 0x12,
0x58, 0x4a, 0x7b, 0x15, 0x59, 0xd1, 0xf4, 0x9a, 0x26, 0x6a, 0x72, 0x9a, 0xe1, 0x60, 0x3c, 0xe1,
0xd7, 0x89, 0x8c, 0x7d, 0x15, 0xb6, 0x43, 0xb8, 0x03, 0xa5, 0x26, 0x2b, 0xb5, 0xc3, 0x1a, 0x85,
0xc6, 0xb8, 0x8b, 0xe3, 0x09, 0x9f, 0x58, 0x88, 0xd9, 0x02, 0x70, 0x11, 0xb4, 0x22, 0x4b, 0x5a,
0xe5, 0x40, 0xa1, 0xf0, 0x73, 0x5c, 0x6a, 0x3c, 0xe1, 0x21, 0x90, 0xb3, 0x3b, 0x70, 0x35, 0x84,
0xbf, 0x2b, 0x2a, 0x8a, 0xbc, 0x47, 0xc1, 0x71, 0x2e, 0x39, 0x9e, 0xf0, 0x17, 0xa8, 0x90, 0x7d,
0x03, 0xae, 0x05, 0xc8, 0xaa, 0x28, 0xdd, 0x97, 0x35, 0x5d, 0x3a, 0xd8, 0xdf, 0xaf, 0x68, 0xfb,
0xb2, 0xa2, 0xa5, 0xcf, 0x73, 0x99, 0xf1, 0x84, 0x4f, 0x13, 0x45, 0x20, 0x67, 0xdf, 0x01, 0xfe,
0x84, 0x99, 0x28, 0xdd, 0x57, 0x0e, 0x3e, 0xda, 0x93, 0xcb, 0xef, 0xcb, 0xbe, 0xed, 0x3a, 0xb7,
0x3d, 0x9e, 0xf0, 0x97, 0x89, 0x76, 0x49, 0xc9, 0xbe, 0xfd, 0x1c, 0x02, 0x55, 0x96, 0xe4, 0x4a,
0x55, 0xd3, 0xc5, 0x52, 0x4d, 0x56, 0x24, 0x39, 0x7d, 0x81, 0xcb, 0x8e, 0x27, 0x7c, 0x86, 0x68,
0xa9, 0x92, 0xea, 0xd8, 0xdb, 0x70, 0x3d, 0xb0, 0x57, 0xe4, 0x8f, 0x35, 0xbd, 0x26, 0x7f, 0x70,
0x88, 0x55, 0x98, 0xe6, 0xc3, 0xf4, 0x06, 0x09, 0x1c, 0x6b, 0xe6, 0x0a, 0x2c, 0x67, 0x79, 0x48,
0x07, 0x76, 0x77, 0x65, 0xb1, 0x2c, 0xab, 0xe9, 0x04, 0xa9, 0x0c, 0xd9, 0x71, 0xf1, 0xc7, 0x3f,
0xe4, 0xd6, 0x4a, 0xfa, 0xcf, 0x4f, 0x73, 0xcc, 0x93, 0xa7, 0x39, 0xe6, 0x8f, 0xa7, 0x39, 0xe6,
0x9b, 0x67, 0xb9, 0xb5, 0x27, 0xcf, 0x72, 0x6b, 0xbf, 0x3d, 0xcb, 0xad, 0x3d, 0x94, 0x9b, 0x96,
0xd7, 0xea, 0xd7, 0x0b, 0xa6, 0xd3, 0x29, 0x9a, 0x8e, 0xdb, 0x71, 0x5c, 0xfa, 0x73, 0xd3, 0x6d,
0x1c, 0x17, 0x1f, 0x15, 0x17, 0x1f, 0x59, 0x37, 0xe7, 0x5f, 0x59, 0xaf, 0xdd, 0xbe, 0x19, 0xfe,
0xd0, 0xc2, 0xb7, 0x8c, 0x5b, 0x5f, 0xf7, 0xc7, 0xd9, 0xeb, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff,
0x20, 0x84, 0x51, 0xf7, 0x95, 0x0d, 0x00, 0x00,
}
func (m *ClientState) Marshal() (dAtA []byte, err error) {
@ -1148,6 +1149,11 @@ func (m *SignatureAndData) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
if m.Timestamp != 0 {
i = encodeVarintSolomachine(dAtA, i, uint64(m.Timestamp))
i--
dAtA[i] = 0x20
}
if len(m.Data) > 0 {
i -= len(m.Data)
copy(dAtA[i:], m.Data)
@ -1727,6 +1733,9 @@ func (m *SignatureAndData) Size() (n int) {
if l > 0 {
n += 1 + l + sovSolomachine(uint64(l))
}
if m.Timestamp != 0 {
n += 1 + sovSolomachine(uint64(m.Timestamp))
}
return n
}
@ -2698,6 +2707,25 @@ func (m *SignatureAndData) Unmarshal(dAtA []byte) error {
m.Data = []byte{}
}
iNdEx = postIndex
case 4:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Timestamp", wireType)
}
m.Timestamp = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowSolomachine
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
m.Timestamp |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
}
default:
iNdEx = preIndex
skippy, err := skipSolomachine(dAtA[iNdEx:])

5
x/ibc/testing/solomachine.go
View File

@ -181,8 +181,12 @@ func (solo *Solomachine) CreateMisbehaviour() *solomachinetypes.Misbehaviour {
Signature: sig,
DataType: solomachinetypes.CLIENT,
Data: dataOne,
Timestamp: solo.Time,
}
// misbehaviour signaturess can have different timestamps
solo.Time++
signBytes = &solomachinetypes.SignBytes{
Sequence: solo.Sequence,
Timestamp: solo.Time,
@ -199,6 +203,7 @@ func (solo *Solomachine) CreateMisbehaviour() *solomachinetypes.Misbehaviour {
Signature: sig,
DataType: solomachinetypes.CONSENSUS,
Data: dataTwo,
Timestamp: solo.Time,
}
return &solomachinetypes.Misbehaviour{