From 3076a8b12ec351efef648fb01297daccabc5153b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?colin=20axn=C3=A9r?= <25233464+colin-axner@users.noreply.github.com> Date: Thu, 6 Aug 2020 11:21:56 +0200 Subject: [PATCH] Migrate tendermint consensus state to proto (#6957) * migrate tm consensus state to proto * update con state * register con state * add confio to proto lint exclude * Update proto/ibc/tendermint/tendermint.proto * casttype to hexbytes Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com> --- buf.yaml | 1 + proto/ibc/tendermint/tendermint.proto | 20 + x/ibc/07-tendermint/types/codec.go | 4 + x/ibc/07-tendermint/types/consensus_state.go | 13 +- .../types/consensus_state_test.go | 2 +- x/ibc/07-tendermint/types/tendermint.pb.go | 377 ++++++++++++++++-- 6 files changed, 370 insertions(+), 47 deletions(-) diff --git a/buf.yaml b/buf.yaml index 2a32feaf6300..0d8660242ab4 100644 --- a/buf.yaml +++ b/buf.yaml @@ -18,6 +18,7 @@ lint: - tendermint - gogoproto - cosmos_proto + - confio breaking: use: - FILE diff --git a/proto/ibc/tendermint/tendermint.proto b/proto/ibc/tendermint/tendermint.proto index 685e0113944b..ac1038b72936 100644 --- a/proto/ibc/tendermint/tendermint.proto +++ b/proto/ibc/tendermint/tendermint.proto @@ -5,6 +5,8 @@ option go_package = "github.com/cosmos/cosmos-sdk/x/ibc/07-tendermint/types"; import "confio/proofs.proto"; import "google/protobuf/duration.proto"; +import "google/protobuf/timestamp.proto"; +import "ibc/commitment/commitment.proto"; import "gogoproto/gogo.proto"; // ClientState from Tendermint tracks the current validator set, latest height, @@ -45,6 +47,24 @@ message ClientState { [(gogoproto.moretags) = "yaml:\"proof_specs\""]; } +// ConsensusState defines the consensus state from Tendermint. +message ConsensusState { + option (gogoproto.goproto_getters) = false; + + // timestamp that corresponds to the block height in which the ConsensusState + // was stored. + google.protobuf.Timestamp timestamp = 1 + [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; + // commitment root (i.e app hash) + ibc.commitment.MerkleRoot root = 2 [(gogoproto.nullable) = false]; + // height at which the consensus state was stored. + uint64 height = 3; + bytes next_validators_hash = 4 [ + (gogoproto.casttype) = "github.com/tendermint/tendermint/libs/bytes.HexBytes", + (gogoproto.moretags) = "yaml:\"next_validators_hash\"" + ]; +} + // Fraction defines the protobuf message type for tmmath.Fraction message Fraction { int64 numerator = 1; diff --git a/x/ibc/07-tendermint/types/codec.go b/x/ibc/07-tendermint/types/codec.go index ce7917392e98..06b75aa40c3b 100644 --- a/x/ibc/07-tendermint/types/codec.go +++ b/x/ibc/07-tendermint/types/codec.go @@ -26,6 +26,10 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { (*clientexported.ClientState)(nil), &ClientState{}, ) + registry.RegisterImplementations( + (*clientexported.ConsensusState)(nil), + &ConsensusState{}, + ) } var ( diff --git a/x/ibc/07-tendermint/types/consensus_state.go b/x/ibc/07-tendermint/types/consensus_state.go index b2a542611367..d70abb6da9b0 100644 --- a/x/ibc/07-tendermint/types/consensus_state.go +++ b/x/ibc/07-tendermint/types/consensus_state.go @@ -10,19 +10,12 @@ import ( clientexported "github.com/cosmos/cosmos-sdk/x/ibc/02-client/exported" clienttypes "github.com/cosmos/cosmos-sdk/x/ibc/02-client/types" commitmentexported "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/exported" + commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" ) -// ConsensusState defines a Tendermint consensus state -type ConsensusState struct { - Timestamp time.Time `json:"timestamp" yaml:"timestamp"` - Root commitmentexported.Root `json:"root" yaml:"root"` - Height uint64 `json:"height" yaml:"height"` - NextValidatorsHash tmbytes.HexBytes `json:"next_validators_hash"` // validators hash for the next block -} - // NewConsensusState creates a new ConsensusState instance. func NewConsensusState( - timestamp time.Time, root commitmentexported.Root, height uint64, + timestamp time.Time, root commitmenttypes.MerkleRoot, height uint64, nextValsHash tmbytes.HexBytes, ) ConsensusState { return ConsensusState{ @@ -55,7 +48,7 @@ func (cs ConsensusState) GetTimestamp() uint64 { // ValidateBasic defines a basic validation for the tendermint consensus state. func (cs ConsensusState) ValidateBasic() error { - if cs.Root == nil || cs.Root.Empty() { + if cs.Root.Empty() { return sdkerrors.Wrap(clienttypes.ErrInvalidConsensus, "root cannot be empty") } if err := tmtypes.ValidateHash(cs.NextValidatorsHash); err != nil { diff --git a/x/ibc/07-tendermint/types/consensus_state_test.go b/x/ibc/07-tendermint/types/consensus_state_test.go index 2fdce5b20987..d2ad8b0ae9f1 100644 --- a/x/ibc/07-tendermint/types/consensus_state_test.go +++ b/x/ibc/07-tendermint/types/consensus_state_test.go @@ -26,7 +26,7 @@ func (suite *TendermintTestSuite) TestConsensusStateValidateBasic() { ibctmtypes.ConsensusState{ Timestamp: suite.now, Height: height, - Root: nil, + Root: commitmenttypes.MerkleRoot{}, NextValidatorsHash: suite.valsHash, }, false}, diff --git a/x/ibc/07-tendermint/types/tendermint.pb.go b/x/ibc/07-tendermint/types/tendermint.pb.go index 841f5f75c72c..7f3a29b61964 100644 --- a/x/ibc/07-tendermint/types/tendermint.pb.go +++ b/x/ibc/07-tendermint/types/tendermint.pb.go @@ -6,10 +6,13 @@ package types import ( fmt "fmt" _go "github.com/confio/ics23/go" + types "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "github.com/golang/protobuf/ptypes/duration" + _ "github.com/golang/protobuf/ptypes/timestamp" + github_com_tendermint_tendermint_libs_bytes "github.com/tendermint/tendermint/libs/bytes" io "io" math "math" math_bits "math/bits" @@ -81,6 +84,51 @@ func (m *ClientState) XXX_DiscardUnknown() { var xxx_messageInfo_ClientState proto.InternalMessageInfo +// ConsensusState defines the consensus state from Tendermint. +type ConsensusState struct { + // timestamp that corresponds to the block height in which the ConsensusState + // was stored. + Timestamp time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + // commitment root (i.e app hash) + Root types.MerkleRoot `protobuf:"bytes,2,opt,name=root,proto3" json:"root"` + // height at which the consensus state was stored. + Height uint64 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"` + NextValidatorsHash github_com_tendermint_tendermint_libs_bytes.HexBytes `protobuf:"bytes,4,opt,name=next_validators_hash,json=nextValidatorsHash,proto3,casttype=github.com/tendermint/tendermint/libs/bytes.HexBytes" json:"next_validators_hash,omitempty" yaml:"next_validators_hash"` +} + +func (m *ConsensusState) Reset() { *m = ConsensusState{} } +func (m *ConsensusState) String() string { return proto.CompactTextString(m) } +func (*ConsensusState) ProtoMessage() {} +func (*ConsensusState) Descriptor() ([]byte, []int) { + return fileDescriptor_76a953d5a747dd66, []int{1} +} +func (m *ConsensusState) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ConsensusState) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ConsensusState.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ConsensusState) XXX_Merge(src proto.Message) { + xxx_messageInfo_ConsensusState.Merge(m, src) +} +func (m *ConsensusState) XXX_Size() int { + return m.Size() +} +func (m *ConsensusState) XXX_DiscardUnknown() { + xxx_messageInfo_ConsensusState.DiscardUnknown(m) +} + +var xxx_messageInfo_ConsensusState proto.InternalMessageInfo + // Fraction defines the protobuf message type for tmmath.Fraction type Fraction struct { Numerator int64 `protobuf:"varint,1,opt,name=numerator,proto3" json:"numerator,omitempty"` @@ -91,7 +139,7 @@ func (m *Fraction) Reset() { *m = Fraction{} } func (m *Fraction) String() string { return proto.CompactTextString(m) } func (*Fraction) ProtoMessage() {} func (*Fraction) Descriptor() ([]byte, []int) { - return fileDescriptor_76a953d5a747dd66, []int{1} + return fileDescriptor_76a953d5a747dd66, []int{2} } func (m *Fraction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -136,47 +184,59 @@ func (m *Fraction) GetDenominator() int64 { func init() { proto.RegisterType((*ClientState)(nil), "ibc.tendermint.ClientState") + proto.RegisterType((*ConsensusState)(nil), "ibc.tendermint.ConsensusState") proto.RegisterType((*Fraction)(nil), "ibc.tendermint.Fraction") } func init() { proto.RegisterFile("ibc/tendermint/tendermint.proto", fileDescriptor_76a953d5a747dd66) } var fileDescriptor_76a953d5a747dd66 = []byte{ - // 541 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x31, 0x6f, 0xd3, 0x40, - 0x18, 0x8d, 0x9b, 0xb4, 0x49, 0xcf, 0x6d, 0x53, 0x99, 0xaa, 0x98, 0x08, 0xd9, 0x91, 0x91, 0x50, - 0x96, 0xda, 0x28, 0x95, 0x40, 0xaa, 0xc4, 0xe2, 0x44, 0x88, 0x20, 0x86, 0xc8, 0x15, 0x0b, 0x8b, - 0x65, 0x9f, 0xcf, 0xce, 0xa9, 0xf6, 0x9d, 0xe5, 0x3b, 0xa3, 0x94, 0x5f, 0xc0, 0xc8, 0x82, 0xc4, - 0xc8, 0xcf, 0xe9, 0xd8, 0x91, 0x29, 0xa0, 0xe4, 0x1f, 0xf4, 0x17, 0x20, 0x9f, 0x1d, 0xe2, 0x64, - 0x41, 0x4c, 0xbe, 0xf7, 0xde, 0xf7, 0xbe, 0x77, 0x9f, 0xfc, 0x1d, 0xd0, 0xb1, 0x0f, 0x2d, 0x8e, - 0x48, 0x80, 0xb2, 0x04, 0x13, 0x5e, 0x3b, 0x9a, 0x69, 0x46, 0x39, 0x55, 0x4e, 0xb0, 0x0f, 0xcd, - 0x0d, 0xdb, 0x7b, 0x04, 0x29, 0x09, 0x31, 0xb5, 0xd2, 0x8c, 0xd2, 0x90, 0x95, 0x45, 0x3d, 0x2d, - 0xa2, 0x34, 0x8a, 0x91, 0x25, 0x90, 0x9f, 0x87, 0x56, 0x90, 0x67, 0x1e, 0xc7, 0x94, 0x54, 0xfa, - 0x59, 0x44, 0x23, 0x2a, 0x8e, 0x56, 0x71, 0x2a, 0x59, 0xe3, 0xdb, 0x3e, 0x90, 0x47, 0x31, 0x46, - 0x84, 0x5f, 0x73, 0x8f, 0x23, 0xe5, 0x39, 0xe8, 0xc0, 0x99, 0x87, 0x89, 0x8b, 0x03, 0x55, 0xea, - 0x4b, 0x83, 0x43, 0x5b, 0x5e, 0x2e, 0xf4, 0xf6, 0xa8, 0xe0, 0x26, 0x63, 0xa7, 0x2d, 0xc4, 0x49, - 0xa0, 0x7c, 0x00, 0x32, 0xcf, 0x72, 0xc6, 0xdd, 0x18, 0x7d, 0x42, 0xb1, 0xba, 0xd7, 0x97, 0x06, - 0xf2, 0x50, 0x35, 0xb7, 0x2f, 0x6a, 0xbe, 0xc9, 0x3c, 0x58, 0x5c, 0xc1, 0xee, 0xdd, 0x2d, 0xf4, - 0xc6, 0xc3, 0x42, 0x57, 0x6e, 0xbd, 0x24, 0xbe, 0x32, 0x6a, 0x56, 0xc3, 0x01, 0x02, 0xbd, 0x2f, - 0x80, 0x12, 0x82, 0xae, 0x40, 0x98, 0x44, 0x6e, 0x8a, 0x32, 0x4c, 0x03, 0xb5, 0x29, 0x5a, 0x3f, - 0x31, 0xcb, 0xf1, 0xcc, 0xf5, 0x78, 0xe6, 0xb8, 0x1a, 0xcf, 0x36, 0xaa, 0xde, 0xe7, 0xb5, 0xde, - 0x1b, 0xbf, 0xf1, 0xfd, 0x97, 0x2e, 0x39, 0x27, 0x6b, 0x76, 0x2a, 0x48, 0x05, 0x83, 0xd3, 0x9c, - 0xf8, 0x94, 0x04, 0xb5, 0xa0, 0xd6, 0xbf, 0x82, 0x9e, 0x55, 0x41, 0x8f, 0xcb, 0xa0, 0xdd, 0x06, - 0x65, 0x52, 0xf7, 0x2f, 0x5d, 0x45, 0x21, 0xd0, 0x4d, 0xbc, 0xb9, 0x0b, 0x63, 0x0a, 0x6f, 0xdc, - 0x20, 0xc3, 0x21, 0x57, 0xf7, 0xff, 0x73, 0xa4, 0x1d, 0x7f, 0x19, 0x74, 0x9c, 0x78, 0xf3, 0x51, - 0x41, 0x8e, 0x0b, 0x4e, 0x79, 0x0d, 0x8e, 0xc3, 0x8c, 0x7e, 0x46, 0xc4, 0x9d, 0x21, 0x1c, 0xcd, - 0xb8, 0x7a, 0xd0, 0x97, 0x06, 0x2d, 0x5b, 0x7d, 0x58, 0xe8, 0x67, 0x65, 0x97, 0x2d, 0xd9, 0x70, - 0x8e, 0x4a, 0xfc, 0x56, 0xc0, 0xc2, 0x1e, 0x7b, 0x1c, 0x31, 0xbe, 0xb6, 0xb7, 0x77, 0xed, 0x5b, - 0xb2, 0xe1, 0x1c, 0x95, 0xb8, 0xb2, 0x4f, 0x80, 0x2c, 0x96, 0xd1, 0x65, 0x29, 0x82, 0x4c, 0xed, - 0xf4, 0x9b, 0x03, 0x79, 0x78, 0x6a, 0x62, 0xc8, 0x86, 0x97, 0xe6, 0xb4, 0x50, 0xae, 0x53, 0x04, - 0xed, 0xf3, 0xcd, 0x0a, 0xd4, 0xca, 0x0d, 0x07, 0xa4, 0xeb, 0x12, 0x76, 0xd5, 0xfa, 0xf2, 0x43, - 0x6f, 0x18, 0xef, 0x40, 0x67, 0xbd, 0x3c, 0xca, 0x53, 0x70, 0x48, 0xf2, 0x04, 0x65, 0x1e, 0xa7, - 0x99, 0x58, 0xca, 0xa6, 0xb3, 0x21, 0x94, 0x3e, 0x90, 0x03, 0x44, 0x68, 0x82, 0x89, 0xd0, 0xf7, - 0x84, 0x5e, 0xa7, 0xec, 0xe9, 0xdd, 0x52, 0x93, 0xee, 0x97, 0x9a, 0xf4, 0x7b, 0xa9, 0x49, 0x5f, - 0x57, 0x5a, 0xe3, 0x7e, 0xa5, 0x35, 0x7e, 0xae, 0xb4, 0xc6, 0xc7, 0x97, 0x11, 0xe6, 0xb3, 0xdc, - 0x37, 0x21, 0x4d, 0x2c, 0x48, 0x59, 0x42, 0x59, 0xf5, 0xb9, 0x60, 0xc1, 0x8d, 0x35, 0xb7, 0x8a, - 0x87, 0xf9, 0xe2, 0xd5, 0x45, 0xfd, 0x6d, 0xde, 0xa6, 0x88, 0xf9, 0x07, 0xe2, 0x97, 0x5d, 0xfe, - 0x09, 0x00, 0x00, 0xff, 0xff, 0x5b, 0xb0, 0x3c, 0xfa, 0xba, 0x03, 0x00, 0x00, + // 710 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcd, 0x6a, 0xdb, 0x4c, + 0x14, 0xb5, 0x12, 0x27, 0x71, 0x46, 0xf9, 0x43, 0x5f, 0xc8, 0xa7, 0xba, 0xc5, 0x32, 0x2a, 0x14, + 0x6f, 0x22, 0x15, 0x27, 0xb4, 0x10, 0xe8, 0x46, 0x0e, 0x25, 0x29, 0x2d, 0x04, 0xa5, 0x3f, 0xd0, + 0x8d, 0xd0, 0xcf, 0x58, 0x1a, 0x22, 0xcd, 0x08, 0xcd, 0x28, 0x38, 0x7d, 0x82, 0x76, 0x97, 0x4d, + 0xa1, 0xcb, 0x3e, 0x44, 0x1f, 0x22, 0xcb, 0x2c, 0xbb, 0x72, 0x8b, 0xf3, 0x06, 0x59, 0x76, 0x55, + 0x66, 0x24, 0xc5, 0x8a, 0x1b, 0x28, 0x5d, 0xf9, 0xde, 0x73, 0xef, 0xb9, 0x57, 0xf7, 0xf8, 0x48, + 0x40, 0x43, 0x9e, 0x6f, 0x32, 0x88, 0x03, 0x98, 0x25, 0x08, 0xb3, 0x5a, 0x68, 0xa4, 0x19, 0x61, + 0x44, 0x59, 0x43, 0x9e, 0x6f, 0x4c, 0xd1, 0xf6, 0x7f, 0x3e, 0xc1, 0x43, 0x44, 0xcc, 0x34, 0x23, + 0x64, 0x48, 0x8b, 0xa6, 0x76, 0x27, 0x24, 0x24, 0x8c, 0xa1, 0x29, 0x32, 0x2f, 0x1f, 0x9a, 0x41, + 0x9e, 0xb9, 0x0c, 0x11, 0x5c, 0xd6, 0xb5, 0xd9, 0x3a, 0x43, 0x09, 0xa4, 0xcc, 0x4d, 0xd2, 0xaa, + 0x81, 0x3f, 0x86, 0x4f, 0x92, 0x04, 0xb1, 0x04, 0x62, 0x56, 0x0b, 0xcb, 0x86, 0xcd, 0x90, 0x84, + 0x44, 0x84, 0x26, 0x8f, 0x0a, 0x54, 0xff, 0xbc, 0x00, 0xe4, 0x41, 0x8c, 0x20, 0x66, 0xc7, 0xcc, + 0x65, 0x50, 0x79, 0x04, 0x5a, 0x7e, 0xe4, 0x22, 0xec, 0xa0, 0x40, 0x95, 0xba, 0x52, 0x6f, 0xd9, + 0x92, 0x27, 0x63, 0x6d, 0x69, 0xc0, 0xb1, 0xc3, 0x7d, 0x7b, 0x49, 0x14, 0x0f, 0x03, 0xe5, 0x0d, + 0x90, 0x59, 0x96, 0x53, 0xe6, 0xc4, 0xf0, 0x14, 0xc6, 0xea, 0x5c, 0x57, 0xea, 0xc9, 0x7d, 0xd5, + 0xb8, 0x7d, 0xaa, 0xf1, 0x3c, 0x73, 0x7d, 0x7e, 0x84, 0xd5, 0xbe, 0x18, 0x6b, 0x8d, 0xeb, 0xb1, + 0xa6, 0x9c, 0xb9, 0x49, 0xbc, 0xa7, 0xd7, 0xa8, 0xba, 0x0d, 0x44, 0xf6, 0x92, 0x27, 0xca, 0x10, + 0xac, 0x8b, 0x0c, 0xe1, 0xd0, 0x49, 0x61, 0x86, 0x48, 0xa0, 0xce, 0x8b, 0xd1, 0xf7, 0x8c, 0x42, + 0x00, 0xa3, 0x12, 0xc0, 0xd8, 0x2f, 0x05, 0xb2, 0xf4, 0x72, 0xf6, 0x56, 0x6d, 0xf6, 0x94, 0xaf, + 0x7f, 0xf9, 0xa1, 0x49, 0xf6, 0x5a, 0x85, 0x1e, 0x09, 0x50, 0x41, 0x60, 0x23, 0xc7, 0x1e, 0xc1, + 0x41, 0x6d, 0x51, 0xf3, 0x6f, 0x8b, 0x1e, 0x96, 0x8b, 0xfe, 0x2f, 0x16, 0xcd, 0x0e, 0x28, 0x36, + 0xad, 0xdf, 0xc0, 0xe5, 0x2a, 0x08, 0xd6, 0x13, 0x77, 0xe4, 0xf8, 0x31, 0xf1, 0x4f, 0x9c, 0x20, + 0x43, 0x43, 0xa6, 0x2e, 0xfc, 0xe3, 0x49, 0x33, 0xfc, 0x62, 0xd1, 0x6a, 0xe2, 0x8e, 0x06, 0x1c, + 0xdc, 0xe7, 0x98, 0xf2, 0x0c, 0xac, 0x0e, 0x33, 0xf2, 0x01, 0x62, 0x27, 0x82, 0x28, 0x8c, 0x98, + 0xba, 0xd8, 0x95, 0x7a, 0x4d, 0x4b, 0xbd, 0x1e, 0x6b, 0x9b, 0xc5, 0x94, 0x5b, 0x65, 0xdd, 0x5e, + 0x29, 0xf2, 0x03, 0x91, 0x72, 0x7a, 0xec, 0x32, 0x48, 0x59, 0x45, 0x5f, 0x9a, 0xa5, 0xdf, 0x2a, + 0xeb, 0xf6, 0x4a, 0x91, 0x97, 0xf4, 0x43, 0x20, 0x0b, 0x3b, 0x3b, 0x34, 0x85, 0x3e, 0x55, 0x5b, + 0xdd, 0xf9, 0x9e, 0xdc, 0xdf, 0x30, 0x90, 0x4f, 0xfb, 0x3b, 0xc6, 0x11, 0xaf, 0x1c, 0xa7, 0xd0, + 0xb7, 0xb6, 0xa6, 0x16, 0xa8, 0xb5, 0xeb, 0x36, 0x48, 0xab, 0x16, 0xba, 0xd7, 0xfc, 0xf8, 0x55, + 0x6b, 0xe8, 0xdf, 0xe6, 0xc0, 0xda, 0x80, 0x60, 0x0a, 0x31, 0xcd, 0x69, 0x61, 0x4d, 0x0b, 0x2c, + 0xdf, 0x98, 0x5e, 0x78, 0x53, 0xee, 0xb7, 0xff, 0x90, 0xf0, 0x75, 0xd5, 0x61, 0xb5, 0xb8, 0x86, + 0xe7, 0x5c, 0xa9, 0x29, 0x4d, 0xd9, 0x05, 0xcd, 0x8c, 0x10, 0x56, 0xfa, 0xb5, 0x2d, 0xfc, 0x5a, + 0x7b, 0x53, 0x5e, 0xc1, 0xec, 0x24, 0x86, 0x36, 0x21, 0xcc, 0x6a, 0x72, 0xba, 0x2d, 0xba, 0x95, + 0x2d, 0xb0, 0x58, 0xaa, 0xc2, 0xcd, 0xd8, 0xb4, 0xcb, 0x4c, 0xf9, 0x24, 0x81, 0x4d, 0x0c, 0x47, + 0xcc, 0x39, 0x75, 0x63, 0x14, 0xb8, 0x8c, 0x64, 0xd4, 0x89, 0x5c, 0x1a, 0x09, 0x2b, 0xad, 0x58, + 0xef, 0xae, 0xc7, 0xda, 0xfd, 0xe2, 0xda, 0xbb, 0xba, 0xf4, 0x5f, 0x63, 0x6d, 0x37, 0x44, 0x2c, + 0xca, 0x3d, 0xfe, 0x0c, 0x77, 0x7f, 0x43, 0xcc, 0x18, 0x79, 0xd4, 0xf4, 0xce, 0x18, 0xa4, 0xc6, + 0x01, 0x1c, 0x59, 0x3c, 0xb0, 0x15, 0x3e, 0xee, 0xed, 0xcd, 0xb4, 0x03, 0x97, 0x46, 0xa5, 0x6c, + 0x2f, 0x40, 0xab, 0x7a, 0xe7, 0x94, 0x07, 0x60, 0x19, 0xe7, 0x09, 0xcc, 0x78, 0x8f, 0xd0, 0x6b, + 0xde, 0x9e, 0x02, 0x4a, 0x17, 0xc8, 0x01, 0xc4, 0x24, 0x41, 0x58, 0xd4, 0xe7, 0x44, 0xbd, 0x0e, + 0x59, 0x47, 0x17, 0x93, 0x8e, 0x74, 0x39, 0xe9, 0x48, 0x3f, 0x27, 0x1d, 0xe9, 0xfc, 0xaa, 0xd3, + 0xb8, 0xbc, 0xea, 0x34, 0xbe, 0x5f, 0x75, 0x1a, 0xef, 0x9f, 0xd4, 0x9e, 0xda, 0x27, 0x34, 0x21, + 0xb4, 0xfc, 0xd9, 0xa6, 0xc1, 0x89, 0x39, 0x32, 0xf9, 0xa7, 0xe8, 0xf1, 0xd3, 0xed, 0xfa, 0x41, + 0x67, 0x29, 0xa4, 0xde, 0xa2, 0xf8, 0x9b, 0x76, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x81, + 0xb1, 0x35, 0x33, 0x05, 0x00, 0x00, } func (m *ClientState) Marshal() (dAtA []byte, err error) { @@ -267,6 +327,59 @@ func (m *ClientState) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *ConsensusState) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *ConsensusState) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ConsensusState) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.NextValidatorsHash) > 0 { + i -= len(m.NextValidatorsHash) + copy(dAtA[i:], m.NextValidatorsHash) + i = encodeVarintTendermint(dAtA, i, uint64(len(m.NextValidatorsHash))) + i-- + dAtA[i] = 0x22 + } + if m.Height != 0 { + i = encodeVarintTendermint(dAtA, i, uint64(m.Height)) + i-- + dAtA[i] = 0x18 + } + { + size, err := m.Root.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTendermint(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + n6, err6 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp):]) + if err6 != nil { + return 0, err6 + } + i -= n6 + i = encodeVarintTendermint(dAtA, i, uint64(n6)) + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + func (m *Fraction) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -344,6 +457,26 @@ func (m *ClientState) Size() (n int) { return n } +func (m *ConsensusState) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = github_com_gogo_protobuf_types.SizeOfStdTime(m.Timestamp) + n += 1 + l + sovTendermint(uint64(l)) + l = m.Root.Size() + n += 1 + l + sovTendermint(uint64(l)) + if m.Height != 0 { + n += 1 + sovTendermint(uint64(m.Height)) + } + l = len(m.NextValidatorsHash) + if l > 0 { + n += 1 + l + sovTendermint(uint64(l)) + } + return n +} + func (m *Fraction) Size() (n int) { if m == nil { return 0 @@ -654,6 +787,178 @@ func (m *ClientState) Unmarshal(dAtA []byte) error { } return nil } +func (m *ConsensusState) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTendermint + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: ConsensusState: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ConsensusState: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Timestamp", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTendermint + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTendermint + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTendermint + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.Timestamp, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Root", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTendermint + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTendermint + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTendermint + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Root.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + } + m.Height = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTendermint + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Height |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NextValidatorsHash", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTendermint + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTendermint + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTendermint + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.NextValidatorsHash = append(m.NextValidatorsHash[:0], dAtA[iNdEx:postIndex]...) + if m.NextValidatorsHash == nil { + m.NextValidatorsHash = []byte{} + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTendermint(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthTendermint + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthTendermint + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *Fraction) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0