From 8fb2d25c84c3d9e8cbde28de3f5309269979876c Mon Sep 17 00:00:00 2001 From: Sergi Rene Date: Mon, 21 Oct 2024 19:13:28 +0200 Subject: [PATCH] feat(rollapp): move DRS version to be part of the block descriptor (#1311) --- app/apptesting/test_suite.go | 3 +- .../dymension/rollapp/block_descriptor.proto | 2 + .../dymension/rollapp/state_info.proto | 2 - proto/dymensionxyz/dymension/rollapp/tx.proto | 2 - .../msg_server_mark_vulnerable_rollapps.go | 7 +- x/rollapp/keeper/msg_server_update_state.go | 23 +-- x/rollapp/types/block_descriptor.pb.go | 94 +++++++-- x/rollapp/types/errors.go | 1 + x/rollapp/types/message_update_state.go | 14 +- x/rollapp/types/state_info.go | 2 - x/rollapp/types/state_info.pb.go | 123 ++++-------- x/rollapp/types/tx.pb.go | 186 +++++++----------- 12 files changed, 207 insertions(+), 252 deletions(-) diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go index f1b5d4d42..182afa563 100644 --- a/app/apptesting/test_suite.go +++ b/app/apptesting/test_suite.go @@ -124,7 +124,7 @@ func (s *KeeperTestHelper) PostStateUpdateWithDRSVersion(ctx sdk.Context, rollap var bds rollapptypes.BlockDescriptors bds.BD = make([]rollapptypes.BlockDescriptor, numOfBlocks) for k := uint64(0); k < numOfBlocks; k++ { - bds.BD[k] = rollapptypes.BlockDescriptor{Height: startHeight + k, Timestamp: time.Now().UTC()} + bds.BD[k] = rollapptypes.BlockDescriptor{Height: startHeight + k, Timestamp: time.Now().UTC(), DrsVersion: drsVersion} } updateState := rollapptypes.MsgUpdateState{ @@ -135,7 +135,6 @@ func (s *KeeperTestHelper) PostStateUpdateWithDRSVersion(ctx sdk.Context, rollap DAPath: "", BDs: bds, Last: false, - DrsVersion: drsVersion, } msgServer := rollappkeeper.NewMsgServerImpl(*s.App.RollappKeeper) _, err = msgServer.UpdateState(ctx, &updateState) diff --git a/proto/dymensionxyz/dymension/rollapp/block_descriptor.proto b/proto/dymensionxyz/dymension/rollapp/block_descriptor.proto index c7b26fb23..2fb49c1f7 100644 --- a/proto/dymensionxyz/dymension/rollapp/block_descriptor.proto +++ b/proto/dymensionxyz/dymension/rollapp/block_descriptor.proto @@ -15,6 +15,8 @@ message BlockDescriptor { bytes stateRoot = 2; // timestamp is the time from the block header google.protobuf.Timestamp timestamp = 3 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; + // DrsVersion is a DRS version used by the rollapp. + string drs_version = 4; } // BlockDescriptors defines list of BlockDescriptor. diff --git a/proto/dymensionxyz/dymension/rollapp/state_info.proto b/proto/dymensionxyz/dymension/rollapp/state_info.proto index a8ade3d99..1794e2224 100644 --- a/proto/dymensionxyz/dymension/rollapp/state_info.proto +++ b/proto/dymensionxyz/dymension/rollapp/state_info.proto @@ -53,8 +53,6 @@ message StateInfo { (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"created_at\"" ]; - // DrsVersion is a DRS version used by the rollapp. - string drs_version = 11; } // StateInfoSummary is a compact representation of StateInfo diff --git a/proto/dymensionxyz/dymension/rollapp/tx.proto b/proto/dymensionxyz/dymension/rollapp/tx.proto index f416152e8..ac31e4da7 100644 --- a/proto/dymensionxyz/dymension/rollapp/tx.proto +++ b/proto/dymensionxyz/dymension/rollapp/tx.proto @@ -89,8 +89,6 @@ message MsgUpdateState { BlockDescriptors BDs = 7 [(gogoproto.nullable) = false]; // last is true if this is the last batch of the sequencer bool last = 8; - // DrsVersion is a DRS version used by the rollapp. - string drs_version = 9; } message MsgUpdateStateResponse { diff --git a/x/rollapp/keeper/msg_server_mark_vulnerable_rollapps.go b/x/rollapp/keeper/msg_server_mark_vulnerable_rollapps.go index 8ad9d0464..3fc4120e6 100644 --- a/x/rollapp/keeper/msg_server_mark_vulnerable_rollapps.go +++ b/x/rollapp/keeper/msg_server_mark_vulnerable_rollapps.go @@ -62,13 +62,16 @@ func (k Keeper) MarkVulnerableRollapps(ctx sdk.Context, drsVersions []string) (i logger.With("rollapp_id", rollapp.RollappId).Info("no latest state info for rollapp") continue } + + // check only last block descriptor DRS, since if that last is not vulnerable it means the rollapp already upgraded and is not vulnerable anymore + bd := info.BDs.BD[len(info.BDs.BD)-1] // TODO: this check may be deleted once empty DRS version is marked vulnerable // https://github.com/dymensionxyz/dymension/issues/1233 - if info.DrsVersion == "" { + if bd.DrsVersion == "" { logger.With("rollapp_id", rollapp.RollappId).Info("no DRS version set for rollapp") } - _, vulnerable := vulnerableVersions[info.DrsVersion] + _, vulnerable := vulnerableVersions[bd.DrsVersion] if vulnerable { err := k.MarkRollappAsVulnerable(ctx, rollapp.RollappId) if err != nil { diff --git a/x/rollapp/keeper/msg_server_update_state.go b/x/rollapp/keeper/msg_server_update_state.go index 3fd41c361..25b752383 100644 --- a/x/rollapp/keeper/msg_server_update_state.go +++ b/x/rollapp/keeper/msg_server_update_state.go @@ -34,17 +34,19 @@ func (k msgServer) UpdateState(goCtx context.Context, msg *types.MsgUpdateState) return nil, errorsmod.Wrap(err, "before update state") } - // verify the DRS version is not vulnerable - if k.IsDRSVersionVulnerable(ctx, msg.DrsVersion) { - // the rollapp is not marked as vulnerable yet, mark it now - err := k.MarkRollappAsVulnerable(ctx, msg.RollappId) - if err != nil { - return nil, fmt.Errorf("mark rollapp vulnerable: %w", err) + for _, bd := range msg.BDs.BD { + // verify the DRS version is not vulnerable + if k.IsDRSVersionVulnerable(ctx, bd.DrsVersion) { + // the rollapp is not marked as vulnerable yet, mark it now + err := k.MarkRollappAsVulnerable(ctx, msg.RollappId) + if err != nil { + return nil, fmt.Errorf("mark rollapp vulnerable: %w", err) + } + k.Logger(ctx).With("rollapp_id", msg.RollappId, "drs_version", bd.DrsVersion). + Info("non-frozen rollapp tried to submit MsgUpdateState with the vulnerable DRS version, mark the rollapp as vulnerable") + // we must return non-error if we want the changes to be saved + return &types.MsgUpdateStateResponse{}, nil } - k.Logger(ctx).With("rollapp_id", msg.RollappId, "drs_version", msg.DrsVersion). - Info("non-frozen rollapp tried to submit MsgUpdateState with the vulnerable DRS version, mark the rollapp as vulnerable") - // we must return non-error if we want the changes to be saved - return &types.MsgUpdateStateResponse{}, nil } // retrieve last updating index @@ -107,7 +109,6 @@ func (k msgServer) UpdateState(goCtx context.Context, msg *types.MsgUpdateState) creationHeight, msg.BDs, blockTime, - msg.DrsVersion, ) // Write new state information to the store indexed by k.SetStateInfo(ctx, *stateInfo) diff --git a/x/rollapp/types/block_descriptor.pb.go b/x/rollapp/types/block_descriptor.pb.go index 746dc5b83..271e6296c 100644 --- a/x/rollapp/types/block_descriptor.pb.go +++ b/x/rollapp/types/block_descriptor.pb.go @@ -35,6 +35,8 @@ type BlockDescriptor struct { StateRoot []byte `protobuf:"bytes,2,opt,name=stateRoot,proto3" json:"stateRoot,omitempty"` // timestamp is the time from the block header Timestamp time.Time `protobuf:"bytes,3,opt,name=timestamp,proto3,stdtime" json:"timestamp"` + // DrsVersion is a DRS version used by the rollapp. + DrsVersion string `protobuf:"bytes,4,opt,name=drs_version,json=drsVersion,proto3" json:"drs_version,omitempty"` } func (m *BlockDescriptor) Reset() { *m = BlockDescriptor{} } @@ -91,6 +93,13 @@ func (m *BlockDescriptor) GetTimestamp() time.Time { return time.Time{} } +func (m *BlockDescriptor) GetDrsVersion() string { + if m != nil { + return m.DrsVersion + } + return "" +} + // BlockDescriptors defines list of BlockDescriptor. type BlockDescriptors struct { BD []BlockDescriptor `protobuf:"bytes,1,rep,name=BD,proto3" json:"BD"` @@ -146,26 +155,28 @@ func init() { } var fileDescriptor_6eb4c1d0c21c2e68 = []byte{ - // 303 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0x4e, 0xc2, 0x30, - 0x18, 0xc7, 0x57, 0x20, 0x44, 0x8a, 0x89, 0x66, 0x31, 0x66, 0x21, 0xa6, 0x2c, 0x9c, 0x76, 0x6a, - 0x13, 0xd0, 0x17, 0x68, 0xf0, 0xea, 0x61, 0xf1, 0xa2, 0x17, 0xc3, 0xa0, 0x96, 0xc5, 0x8d, 0xaf, - 0x59, 0x8b, 0x61, 0xbe, 0x82, 0x17, 0x1e, 0x8b, 0x23, 0x47, 0x4f, 0x6a, 0xb6, 0x17, 0x31, 0xdb, - 0x60, 0x18, 0x12, 0xbd, 0xf5, 0xdf, 0xfc, 0x7f, 0xfd, 0xb5, 0xfd, 0xf0, 0xcd, 0x2c, 0x8d, 0xc5, - 0x42, 0x87, 0xb0, 0x58, 0xa5, 0x6f, 0xac, 0x0e, 0x2c, 0x81, 0x28, 0x9a, 0x28, 0xc5, 0x82, 0x08, - 0xa6, 0x2f, 0x4f, 0x33, 0xa1, 0xa7, 0x49, 0xa8, 0x0c, 0x24, 0x54, 0x25, 0x60, 0xc0, 0x26, 0xbf, - 0x31, 0x5a, 0x07, 0xba, 0xc3, 0x7a, 0x17, 0x12, 0x24, 0x94, 0x55, 0x56, 0xac, 0x2a, 0xaa, 0xd7, - 0x97, 0x00, 0x32, 0x12, 0xac, 0x4c, 0xc1, 0xf2, 0x99, 0x99, 0x30, 0x16, 0xda, 0x4c, 0x62, 0x55, - 0x15, 0x06, 0xef, 0x08, 0x9f, 0xf1, 0xc2, 0x38, 0xae, 0x85, 0xf6, 0x25, 0x6e, 0xcf, 0x45, 0x28, - 0xe7, 0xc6, 0x41, 0x2e, 0xf2, 0x5a, 0xfe, 0x2e, 0xd9, 0x57, 0xb8, 0xa3, 0xcd, 0xc4, 0x08, 0x1f, - 0xc0, 0x38, 0x0d, 0x17, 0x79, 0xa7, 0xfe, 0x61, 0xc3, 0xe6, 0xb8, 0x53, 0x1f, 0xee, 0x34, 0x5d, - 0xe4, 0x75, 0x87, 0x3d, 0x5a, 0xe9, 0xe9, 0x5e, 0x4f, 0xef, 0xf7, 0x0d, 0x7e, 0xb2, 0xf9, 0xec, - 0x5b, 0xeb, 0xaf, 0x3e, 0xf2, 0x0f, 0xd8, 0xe0, 0x01, 0x9f, 0x1f, 0x5d, 0x46, 0xdb, 0xb7, 0xb8, - 0xc1, 0xc7, 0x0e, 0x72, 0x9b, 0x5e, 0x77, 0xc8, 0xe8, 0xff, 0xbf, 0x40, 0x8f, 0x68, 0xde, 0x2a, - 0x2c, 0x7e, 0x83, 0x8f, 0xf9, 0xdd, 0x26, 0x23, 0x68, 0x9b, 0x11, 0xf4, 0x9d, 0x11, 0xb4, 0xce, - 0x89, 0xb5, 0xcd, 0x89, 0xf5, 0x91, 0x13, 0xeb, 0xf1, 0x5a, 0x86, 0x66, 0xbe, 0x0c, 0xe8, 0x14, - 0x62, 0xf6, 0xc7, 0x6c, 0x5e, 0x47, 0x6c, 0x55, 0x0f, 0xc8, 0xa4, 0x4a, 0xe8, 0xa0, 0x5d, 0xbe, - 0x69, 0xf4, 0x13, 0x00, 0x00, 0xff, 0xff, 0x4b, 0x62, 0xb7, 0x2c, 0xcf, 0x01, 0x00, 0x00, + // 327 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xcf, 0x6a, 0xf2, 0x40, + 0x14, 0xc5, 0x33, 0x2a, 0xf2, 0x39, 0x7e, 0xd0, 0x12, 0x4a, 0x09, 0x52, 0x26, 0xc1, 0x55, 0x56, + 0x33, 0xa0, 0xed, 0x0b, 0x0c, 0x76, 0xdb, 0x45, 0x28, 0x85, 0x76, 0x23, 0xc6, 0x4c, 0x63, 0x68, + 0xe2, 0x1d, 0x66, 0x46, 0xd1, 0x3e, 0x85, 0x0f, 0xd2, 0x07, 0x71, 0xe9, 0xb2, 0xab, 0xb6, 0xe8, + 0x8b, 0x94, 0x24, 0x1a, 0x8b, 0xd0, 0xee, 0xe6, 0x5c, 0xce, 0x6f, 0xce, 0xfd, 0x83, 0x6f, 0xa2, + 0x65, 0x26, 0xa6, 0x3a, 0x81, 0xe9, 0x62, 0xf9, 0xca, 0x2a, 0xc1, 0x14, 0xa4, 0xe9, 0x48, 0x4a, + 0x16, 0xa6, 0x30, 0x7e, 0x19, 0x46, 0x42, 0x8f, 0x55, 0x22, 0x0d, 0x28, 0x2a, 0x15, 0x18, 0xb0, + 0xc9, 0x4f, 0x8c, 0x56, 0x82, 0xee, 0xb1, 0xce, 0x45, 0x0c, 0x31, 0x14, 0x56, 0x96, 0xbf, 0x4a, + 0xaa, 0xe3, 0xc6, 0x00, 0x71, 0x2a, 0x58, 0xa1, 0xc2, 0xd9, 0x33, 0x33, 0x49, 0x26, 0xb4, 0x19, + 0x65, 0xb2, 0x34, 0x74, 0xdf, 0x10, 0x3e, 0xe3, 0x79, 0xe2, 0xa0, 0x0a, 0xb4, 0x2f, 0x71, 0x73, + 0x22, 0x92, 0x78, 0x62, 0x1c, 0xe4, 0x21, 0xbf, 0x11, 0xec, 0x95, 0x7d, 0x85, 0x5b, 0xda, 0x8c, + 0x8c, 0x08, 0x00, 0x8c, 0x53, 0xf3, 0x90, 0xff, 0x3f, 0x38, 0x16, 0x6c, 0x8e, 0x5b, 0xd5, 0xe7, + 0x4e, 0xdd, 0x43, 0x7e, 0xbb, 0xd7, 0xa1, 0x65, 0x3c, 0x3d, 0xc4, 0xd3, 0xfb, 0x83, 0x83, 0xff, + 0x5b, 0x7f, 0xb8, 0xd6, 0xea, 0xd3, 0x45, 0xc1, 0x11, 0xb3, 0x5d, 0xdc, 0x8e, 0x94, 0x1e, 0xce, + 0x85, 0xca, 0x67, 0x73, 0x1a, 0x1e, 0xf2, 0x5b, 0x01, 0x8e, 0x94, 0x7e, 0x28, 0x2b, 0xdd, 0x47, + 0x7c, 0x7e, 0xd2, 0xad, 0xb6, 0x6f, 0x71, 0x8d, 0x0f, 0x1c, 0xe4, 0xd5, 0xfd, 0x76, 0x8f, 0xd1, + 0xbf, 0xd7, 0x44, 0x4f, 0x68, 0xde, 0xc8, 0xdb, 0x08, 0x6a, 0x7c, 0xc0, 0xef, 0xd6, 0x5b, 0x82, + 0x36, 0x5b, 0x82, 0xbe, 0xb6, 0x04, 0xad, 0x76, 0xc4, 0xda, 0xec, 0x88, 0xf5, 0xbe, 0x23, 0xd6, + 0xd3, 0x75, 0x9c, 0x98, 0xc9, 0x2c, 0xa4, 0x63, 0xc8, 0xd8, 0x2f, 0xc7, 0x9b, 0xf7, 0xd9, 0xa2, + 0xba, 0xa0, 0x59, 0x4a, 0xa1, 0xc3, 0x66, 0x31, 0x74, 0xff, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x7e, + 0xea, 0xf2, 0xd1, 0xf0, 0x01, 0x00, 0x00, } func (m *BlockDescriptor) Marshal() (dAtA []byte, err error) { @@ -188,6 +199,13 @@ func (m *BlockDescriptor) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.DrsVersion) > 0 { + i -= len(m.DrsVersion) + copy(dAtA[i:], m.DrsVersion) + i = encodeVarintBlockDescriptor(dAtA, i, uint64(len(m.DrsVersion))) + i-- + dAtA[i] = 0x22 + } n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.Timestamp, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp):]) if err1 != nil { return 0, err1 @@ -274,6 +292,10 @@ func (m *BlockDescriptor) Size() (n int) { } l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.Timestamp) n += 1 + l + sovBlockDescriptor(uint64(l)) + l = len(m.DrsVersion) + if l > 0 { + n += 1 + l + sovBlockDescriptor(uint64(l)) + } return n } @@ -413,6 +435,38 @@ func (m *BlockDescriptor) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DrsVersion", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBlockDescriptor + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthBlockDescriptor + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthBlockDescriptor + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DrsVersion = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipBlockDescriptor(dAtA[iNdEx:]) diff --git a/x/rollapp/types/errors.go b/x/rollapp/types/errors.go index ec235e24f..c0a8851e7 100644 --- a/x/rollapp/types/errors.go +++ b/x/rollapp/types/errors.go @@ -55,4 +55,5 @@ var ( ErrDisputeAlreadyReverted = errorsmod.Register(ModuleName, 2001, "disputed height already reverted") ErrWrongClientId = errorsmod.Register(ModuleName, 2002, "client id does not match the rollapp") ErrWrongProposerAddr = errorsmod.Register(ModuleName, 2003, "wrong proposer address") + ErrInvalidDRSVersion = errorsmod.Register(ModuleName, 2004, "wrong DRS version") ) diff --git a/x/rollapp/types/message_update_state.go b/x/rollapp/types/message_update_state.go index 3bccf16c5..4899c25a4 100644 --- a/x/rollapp/types/message_update_state.go +++ b/x/rollapp/types/message_update_state.go @@ -7,7 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -const TypeMsgUpdateState = "update_state" +const ( + TypeMsgUpdateState = "update_state" + DRSVersionLength = 40 +) var _ sdk.Msg = &MsgUpdateState{} @@ -68,11 +71,14 @@ func (msg *MsgUpdateState) ValidateBasic() error { return errorsmod.Wrapf(ErrWrongBlockHeight, "StartHeight must be greater than zero") } - // TODO: add a validation for DrsVersion once empty DRS version is marked vulnerable - // https://github.com/dymensionxyz/dymension/issues/1233 - // check that the blocks are sequential by height for bdIndex := uint64(0); bdIndex < msg.NumBlocks; bdIndex += 1 { + + // TODO: by now DRS version can be empty, but it will be deprecated + // https://github.com/dymensionxyz/dymension/issues/1233 + if msg.BDs.BD[bdIndex].DrsVersion != "" && len(msg.BDs.BD[bdIndex].DrsVersion) != DRSVersionLength { + return ErrInvalidDRSVersion + } if msg.BDs.BD[bdIndex].Height != msg.StartHeight+bdIndex { return ErrInvalidBlockSequence } diff --git a/x/rollapp/types/state_info.go b/x/rollapp/types/state_info.go index 7f094f6e5..b724eb545 100644 --- a/x/rollapp/types/state_info.go +++ b/x/rollapp/types/state_info.go @@ -19,7 +19,6 @@ func NewStateInfo( height uint64, BDs BlockDescriptors, createdAt time.Time, - drsVersion string, ) *StateInfo { stateInfoIndex := StateInfoIndex{RollappId: rollappId, Index: newIndex} status := common.Status_PENDING @@ -33,7 +32,6 @@ func NewStateInfo( Status: status, BDs: BDs, CreatedAt: createdAt, - DrsVersion: drsVersion, } } diff --git a/x/rollapp/types/state_info.pb.go b/x/rollapp/types/state_info.pb.go index 36748d303..6c357435a 100644 --- a/x/rollapp/types/state_info.pb.go +++ b/x/rollapp/types/state_info.pb.go @@ -112,8 +112,6 @@ type StateInfo struct { BDs BlockDescriptors `protobuf:"bytes,9,opt,name=BDs,proto3" json:"BDs"` // created_at is the timestamp at which the StateInfo was created CreatedAt time.Time `protobuf:"bytes,10,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at" yaml:"created_at"` - // DrsVersion is a DRS version used by the rollapp. - DrsVersion string `protobuf:"bytes,11,opt,name=drs_version,json=drsVersion,proto3" json:"drs_version,omitempty"` } func (m *StateInfo) Reset() { *m = StateInfo{} } @@ -212,13 +210,6 @@ func (m *StateInfo) GetCreatedAt() time.Time { return time.Time{} } -func (m *StateInfo) GetDrsVersion() string { - if m != nil { - return m.DrsVersion - } - return "" -} - // StateInfoSummary is a compact representation of StateInfo type StateInfoSummary struct { // stateInfoIndex defines what rollapp the state belongs to @@ -352,43 +343,42 @@ func init() { } var fileDescriptor_750f3a9f16533ec4 = []byte{ - // 568 bytes of a gzipped FileDescriptorProto + // 549 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x41, 0x6a, 0xdb, 0x40, - 0x14, 0xf5, 0xd8, 0x8e, 0x13, 0x8d, 0xc1, 0x24, 0x43, 0x28, 0xc2, 0xb4, 0xb2, 0x11, 0xb4, 0x98, - 0x2e, 0xa4, 0x92, 0xb4, 0x9b, 0x42, 0x17, 0x31, 0xa6, 0xc4, 0x5d, 0x94, 0x56, 0x09, 0xa5, 0x94, - 0x82, 0x91, 0xad, 0xb1, 0x2c, 0x2a, 0xcd, 0xa8, 0x33, 0xa3, 0x60, 0xe7, 0x14, 0xe9, 0x3d, 0x7a, - 0x90, 0x2c, 0xb3, 0x6b, 0x57, 0x69, 0xb1, 0x6f, 0xd0, 0x13, 0x94, 0x19, 0x29, 0x52, 0xe2, 0xd8, - 0x0d, 0x04, 0xba, 0xd3, 0x7f, 0xfa, 0xef, 0xf1, 0xfe, 0xfb, 0x9f, 0x81, 0xb6, 0x37, 0x8b, 0x30, - 0xe1, 0x01, 0x25, 0xd3, 0xd9, 0x69, 0x51, 0xd8, 0x8c, 0x86, 0xa1, 0x1b, 0xc7, 0x36, 0x17, 0xae, - 0xc0, 0x83, 0x80, 0x8c, 0xa9, 0x15, 0x33, 0x2a, 0x28, 0x32, 0xae, 0x13, 0xac, 0xbc, 0xb0, 0x32, - 0x42, 0x73, 0xd7, 0xa7, 0x3e, 0x55, 0xad, 0xb6, 0xfc, 0x4a, 0x59, 0xcd, 0x96, 0x4f, 0xa9, 0x1f, - 0x62, 0x5b, 0x55, 0xc3, 0x64, 0x6c, 0x8b, 0x20, 0xc2, 0x5c, 0xb8, 0x51, 0x9c, 0x35, 0xbc, 0xb8, - 0xc3, 0xc7, 0x30, 0xa4, 0xa3, 0x2f, 0x03, 0x0f, 0xf3, 0x11, 0x0b, 0x62, 0x41, 0x59, 0x46, 0x7b, - 0xba, 0x86, 0x36, 0xa2, 0x51, 0x44, 0x89, 0x72, 0x9f, 0xf0, 0xb4, 0xd7, 0xec, 0xc1, 0xc6, 0x91, - 0x9c, 0xa6, 0x4f, 0xc6, 0xb4, 0x4f, 0x3c, 0x3c, 0x45, 0x0f, 0xa1, 0x96, 0xe9, 0xf7, 0x3d, 0x1d, - 0xb4, 0x41, 0x47, 0x73, 0x0a, 0x00, 0xed, 0xc2, 0x8d, 0x40, 0xb6, 0xe9, 0xe5, 0x36, 0xe8, 0x54, - 0x9d, 0xb4, 0x30, 0xbf, 0x55, 0xa1, 0x96, 0xcb, 0xa0, 0xcf, 0xb0, 0xc1, 0x6f, 0x68, 0x2a, 0x99, - 0xfa, 0x9e, 0x65, 0xfd, 0x3b, 0x26, 0xeb, 0xa6, 0x93, 0x6e, 0xf5, 0xfc, 0xb2, 0x55, 0x72, 0x96, - 0xb4, 0xa4, 0x3f, 0x8e, 0xbf, 0x26, 0x98, 0x8c, 0x30, 0x53, 0x2e, 0x34, 0xa7, 0x00, 0x50, 0x1b, - 0xd6, 0xb9, 0x70, 0x99, 0x38, 0xc4, 0x81, 0x3f, 0x11, 0x7a, 0x45, 0xb9, 0xbc, 0x0e, 0x49, 0x3e, - 0x49, 0xa2, 0xae, 0x8c, 0x8e, 0xeb, 0x55, 0xf5, 0xbf, 0x00, 0xd0, 0x03, 0x58, 0xeb, 0x1d, 0xbc, - 0x73, 0xc5, 0x44, 0xdf, 0x50, 0xd2, 0x59, 0x85, 0x9e, 0xc0, 0xc6, 0x88, 0x61, 0x57, 0x04, 0x94, - 0x64, 0xd2, 0x9b, 0x8a, 0xba, 0x84, 0xa2, 0x57, 0xb0, 0x96, 0xe6, 0xab, 0x6f, 0xb5, 0x41, 0xa7, - 0xb1, 0xf7, 0x78, 0xdd, 0xcc, 0xe9, 0x32, 0xd4, 0xc8, 0x09, 0x77, 0x32, 0x12, 0x3a, 0x84, 0x95, - 0x6e, 0x8f, 0xeb, 0x9a, 0xca, 0xeb, 0xd9, 0x5d, 0x79, 0x29, 0xcf, 0xbd, 0x7c, 0xfd, 0x3c, 0x4b, - 0x4c, 0x4a, 0xa0, 0x8f, 0x10, 0x2a, 0x6b, 0xd8, 0x1b, 0xb8, 0x42, 0x87, 0x4a, 0xb0, 0x69, 0xa5, - 0x17, 0x67, 0x5d, 0x5d, 0x9c, 0x75, 0x7c, 0x75, 0x71, 0xdd, 0x47, 0x92, 0xfa, 0xe7, 0xb2, 0xb5, - 0x33, 0x73, 0xa3, 0xf0, 0xa5, 0x59, 0x70, 0xcd, 0xb3, 0x5f, 0x2d, 0xe0, 0x68, 0x19, 0x70, 0x20, - 0x50, 0x0b, 0xd6, 0x3d, 0xc6, 0x07, 0x27, 0x98, 0x49, 0x33, 0x7a, 0x5d, 0xe5, 0x04, 0x3d, 0xc6, - 0x3f, 0xa4, 0xc8, 0x9b, 0xea, 0x56, 0x6d, 0x7b, 0xd3, 0xfc, 0x01, 0xe0, 0x76, 0xbe, 0xd0, 0xa3, - 0x24, 0x8a, 0x5c, 0x36, 0xfb, 0xcf, 0xa7, 0x51, 0x84, 0x5f, 0xbe, 0x4f, 0xf8, 0xb7, 0x77, 0x5c, - 0x59, 0xb5, 0x63, 0xf3, 0x3b, 0x80, 0x86, 0x8a, 0x3e, 0xad, 0x8f, 0xe9, 0xeb, 0x80, 0xb8, 0x61, - 0x70, 0xaa, 0x7a, 0xde, 0x27, 0x38, 0xc1, 0x2b, 0xa4, 0xc0, 0xca, 0x73, 0x19, 0xc2, 0x9d, 0xf1, - 0x32, 0x59, 0x2f, 0xb7, 0x2b, 0xf7, 0x8e, 0xe4, 0xb6, 0x5c, 0xf7, 0xed, 0xf9, 0xdc, 0x00, 0x17, - 0x73, 0x03, 0xfc, 0x9e, 0x1b, 0xe0, 0x6c, 0x61, 0x94, 0x2e, 0x16, 0x46, 0xe9, 0xe7, 0xc2, 0x28, - 0x7d, 0x7a, 0xee, 0x07, 0x62, 0x92, 0x0c, 0x65, 0x1c, 0xeb, 0x9e, 0xbc, 0x93, 0x7d, 0x7b, 0x9a, - 0xbf, 0x37, 0x62, 0x16, 0x63, 0x3e, 0xac, 0xa9, 0xeb, 0xd9, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, - 0x8a, 0x35, 0x1b, 0xf6, 0x26, 0x05, 0x00, 0x00, + 0x14, 0xf5, 0xd8, 0x8e, 0x13, 0x4d, 0xc0, 0x24, 0x43, 0x28, 0xc2, 0xb4, 0xb2, 0x11, 0xb4, 0x98, + 0x2e, 0xa4, 0x92, 0xb4, 0x9b, 0x42, 0x17, 0x31, 0xa6, 0xc4, 0x5d, 0x94, 0x56, 0xc9, 0xa2, 0x94, + 0x82, 0x19, 0x5b, 0x63, 0x79, 0xa8, 0x34, 0xa3, 0x6a, 0x46, 0xc5, 0xca, 0x29, 0x72, 0x90, 0x1e, + 0x24, 0xcb, 0xec, 0xda, 0x55, 0x5a, 0xec, 0x0b, 0x94, 0x9e, 0xa0, 0x68, 0xa4, 0x48, 0x89, 0x63, + 0x37, 0x10, 0xe8, 0x4e, 0xff, 0xeb, 0xbf, 0xc7, 0xfb, 0xef, 0x7d, 0x06, 0xda, 0x6e, 0x12, 0x10, + 0x26, 0x28, 0x67, 0xb3, 0xe4, 0xb4, 0x2c, 0xec, 0x88, 0xfb, 0x3e, 0x0e, 0x43, 0x5b, 0x48, 0x2c, + 0xc9, 0x90, 0xb2, 0x09, 0xb7, 0xc2, 0x88, 0x4b, 0x8e, 0x8c, 0xeb, 0x00, 0xab, 0x28, 0xac, 0x1c, + 0xd0, 0xda, 0xf3, 0xb8, 0xc7, 0xd5, 0xa8, 0x9d, 0x7e, 0x65, 0xa8, 0x56, 0xdb, 0xe3, 0xdc, 0xf3, + 0x89, 0xad, 0xaa, 0x51, 0x3c, 0xb1, 0x25, 0x0d, 0x88, 0x90, 0x38, 0x08, 0xf3, 0x81, 0x17, 0x77, + 0xe8, 0x18, 0xf9, 0x7c, 0xfc, 0x79, 0xe8, 0x12, 0x31, 0x8e, 0x68, 0x28, 0x79, 0x94, 0xc3, 0x9e, + 0xae, 0x81, 0x8d, 0x79, 0x10, 0x70, 0xa6, 0xd4, 0xc7, 0x22, 0x9b, 0x35, 0xfb, 0xb0, 0x79, 0x9c, + 0x6e, 0x33, 0x60, 0x13, 0x3e, 0x60, 0x2e, 0x99, 0xa1, 0x87, 0x50, 0xcb, 0xf9, 0x07, 0xae, 0x0e, + 0x3a, 0xa0, 0xab, 0x39, 0x65, 0x03, 0xed, 0xc1, 0x0d, 0x9a, 0x8e, 0xe9, 0xd5, 0x0e, 0xe8, 0xd6, + 0x9d, 0xac, 0x30, 0x7f, 0xd7, 0xa0, 0x56, 0xd0, 0xa0, 0x4f, 0xb0, 0x29, 0x6e, 0x70, 0x2a, 0x9a, + 0xed, 0x7d, 0xcb, 0xfa, 0xb7, 0x4d, 0xd6, 0x4d, 0x25, 0xbd, 0xfa, 0xf9, 0x65, 0xbb, 0xe2, 0x2c, + 0x71, 0xa5, 0xfa, 0x04, 0xf9, 0x12, 0x13, 0x36, 0x26, 0x91, 0x52, 0xa1, 0x39, 0x65, 0x03, 0x75, + 0xe0, 0xb6, 0x90, 0x38, 0x92, 0x47, 0x84, 0x7a, 0x53, 0xa9, 0xd7, 0x94, 0xca, 0xeb, 0xad, 0x14, + 0xcf, 0xe2, 0xa0, 0x97, 0x5a, 0x27, 0xf4, 0xba, 0xfa, 0x5f, 0x36, 0xd0, 0x03, 0xd8, 0xe8, 0x1f, + 0xbe, 0xc3, 0x72, 0xaa, 0x6f, 0x28, 0xea, 0xbc, 0x42, 0x4f, 0x60, 0x73, 0x1c, 0x11, 0x2c, 0x29, + 0x67, 0x39, 0xf5, 0xa6, 0x82, 0x2e, 0x75, 0xd1, 0x2b, 0xd8, 0xc8, 0xfc, 0xd5, 0xb7, 0x3a, 0xa0, + 0xdb, 0xdc, 0x7f, 0xbc, 0x6e, 0xe7, 0x2c, 0x0c, 0xb5, 0x72, 0x2c, 0x9c, 0x1c, 0x84, 0x8e, 0x60, + 0xad, 0xd7, 0x17, 0xba, 0xa6, 0xfc, 0x7a, 0x76, 0x97, 0x5f, 0x4a, 0x73, 0xbf, 0x88, 0x5f, 0xe4, + 0x8e, 0xa5, 0x14, 0xe8, 0x03, 0x84, 0x4a, 0x1a, 0x71, 0x87, 0x58, 0xea, 0x50, 0x11, 0xb6, 0xac, + 0xec, 0xe2, 0xac, 0xab, 0x8b, 0xb3, 0x4e, 0xae, 0x2e, 0xae, 0xf7, 0x28, 0x85, 0xfe, 0xb9, 0x6c, + 0xef, 0x26, 0x38, 0xf0, 0x5f, 0x9a, 0x25, 0xd6, 0x3c, 0xfb, 0xd9, 0x06, 0x8e, 0x96, 0x37, 0x0e, + 0xe5, 0x9b, 0xfa, 0x56, 0x63, 0x67, 0xd3, 0xfc, 0x0e, 0xe0, 0x4e, 0x91, 0xd7, 0x71, 0x1c, 0x04, + 0x38, 0x4a, 0xfe, 0x73, 0xf2, 0xa5, 0xb7, 0xd5, 0xfb, 0x78, 0x7b, 0x3b, 0xc2, 0xda, 0xaa, 0x08, + 0xcd, 0x6f, 0x00, 0x1a, 0xca, 0xd9, 0xac, 0x3e, 0xe1, 0xaf, 0x29, 0xc3, 0x3e, 0x3d, 0x55, 0x33, + 0xef, 0x63, 0x12, 0x93, 0x15, 0x54, 0x60, 0xe5, 0x35, 0x8c, 0xe0, 0xee, 0x64, 0x19, 0xac, 0x57, + 0x3b, 0xb5, 0x7b, 0x5b, 0x72, 0x9b, 0xae, 0xf7, 0xf6, 0x7c, 0x6e, 0x80, 0x8b, 0xb9, 0x01, 0x7e, + 0xcd, 0x0d, 0x70, 0xb6, 0x30, 0x2a, 0x17, 0x0b, 0xa3, 0xf2, 0x63, 0x61, 0x54, 0x3e, 0x3e, 0xf7, + 0xa8, 0x9c, 0xc6, 0xa3, 0xd4, 0x8e, 0x75, 0x2f, 0xda, 0xd7, 0x03, 0x7b, 0x56, 0x3c, 0x27, 0x32, + 0x09, 0x89, 0x18, 0x35, 0xd4, 0x71, 0x1c, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x90, 0x75, + 0x3b, 0x05, 0x05, 0x00, 0x00, } func (m *StateInfoIndex) Marshal() (dAtA []byte, err error) { @@ -446,13 +436,6 @@ func (m *StateInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.DrsVersion) > 0 { - i -= len(m.DrsVersion) - copy(dAtA[i:], m.DrsVersion) - i = encodeVarintStateInfo(dAtA, i, uint64(len(m.DrsVersion))) - i-- - dAtA[i] = 0x5a - } n1, err1 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CreatedAt):]) if err1 != nil { return 0, err1 @@ -662,10 +645,6 @@ func (m *StateInfo) Size() (n int) { n += 1 + l + sovStateInfo(uint64(l)) l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CreatedAt) n += 1 + l + sovStateInfo(uint64(l)) - l = len(m.DrsVersion) - if l > 0 { - n += 1 + l + sovStateInfo(uint64(l)) - } return n } @@ -1079,38 +1058,6 @@ func (m *StateInfo) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 11: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DrsVersion", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStateInfo - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthStateInfo - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthStateInfo - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DrsVersion = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipStateInfo(dAtA[iNdEx:]) diff --git a/x/rollapp/types/tx.pb.go b/x/rollapp/types/tx.pb.go index cd7535e29..a3da34554 100644 --- a/x/rollapp/types/tx.pb.go +++ b/x/rollapp/types/tx.pb.go @@ -306,8 +306,6 @@ type MsgUpdateState struct { BDs BlockDescriptors `protobuf:"bytes,7,opt,name=BDs,proto3" json:"BDs"` // last is true if this is the last batch of the sequencer Last bool `protobuf:"varint,8,opt,name=last,proto3" json:"last,omitempty"` - // DrsVersion is a DRS version used by the rollapp. - DrsVersion string `protobuf:"bytes,9,opt,name=drs_version,json=drsVersion,proto3" json:"drs_version,omitempty"` } func (m *MsgUpdateState) Reset() { *m = MsgUpdateState{} } @@ -392,13 +390,6 @@ func (m *MsgUpdateState) GetLast() bool { return false } -func (m *MsgUpdateState) GetDrsVersion() string { - if m != nil { - return m.DrsVersion - } - return "" -} - type MsgUpdateStateResponse struct { } @@ -1032,73 +1023,73 @@ func init() { } var fileDescriptor_1a86300fb8647ecb = []byte{ - // 1053 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0xda, 0x8e, 0x63, 0x3f, 0x3b, 0x21, 0x19, 0xa2, 0xb0, 0xb8, 0xc5, 0x75, 0x1d, 0x21, - 0x02, 0x2d, 0x36, 0x49, 0x03, 0x82, 0xc0, 0x25, 0x69, 0xa4, 0xb6, 0x20, 0x53, 0xd8, 0x86, 0x1c, - 0xb8, 0x58, 0x1b, 0xef, 0x64, 0xb3, 0xaa, 0x77, 0x67, 0x99, 0x19, 0x3b, 0x31, 0xdc, 0x90, 0x10, - 0x07, 0x24, 0xc4, 0x89, 0x13, 0x1f, 0x02, 0x09, 0x3e, 0x03, 0xea, 0xb1, 0x47, 0xb8, 0x20, 0x94, - 0x1c, 0xf8, 0x1a, 0x68, 0x66, 0x67, 0xc7, 0x4e, 0x62, 0x7b, 0x37, 0xa1, 0xa7, 0x9d, 0x79, 0xf3, - 0x7b, 0xff, 0x7e, 0x6f, 0xde, 0x1b, 0x2d, 0xbc, 0xe1, 0x0c, 0x7c, 0x1c, 0x30, 0x8f, 0x04, 0x27, - 0x83, 0xaf, 0x9b, 0x7a, 0xd3, 0xa4, 0xa4, 0xdb, 0xb5, 0xc3, 0xb0, 0xc9, 0x4f, 0x1a, 0x21, 0x25, - 0x9c, 0xa0, 0xea, 0x28, 0xb0, 0xa1, 0x37, 0x0d, 0x05, 0xac, 0xbc, 0xd2, 0x21, 0xcc, 0x27, 0xac, - 0xe9, 0x33, 0xb7, 0xd9, 0x5f, 0x17, 0x9f, 0x48, 0xb1, 0xf2, 0x6e, 0x82, 0x87, 0x83, 0x2e, 0xe9, - 0x3c, 0x6d, 0x3b, 0x98, 0x75, 0xa8, 0x17, 0x72, 0x42, 0x95, 0xda, 0xdd, 0x04, 0x35, 0xf5, 0x55, - 0xe8, 0xb7, 0x13, 0xd0, 0x3e, 0xe6, 0xb6, 0x63, 0x73, 0x5b, 0xc1, 0xd7, 0x13, 0xe0, 0x2e, 0x0e, - 0x30, 0xf3, 0x58, 0xdb, 0x0b, 0x0e, 0x89, 0x52, 0x59, 0x76, 0x89, 0x4b, 0xe4, 0xb2, 0x29, 0x56, - 0x91, 0xb4, 0xfe, 0x63, 0x16, 0x16, 0x5b, 0xcc, 0xbd, 0x4f, 0xb1, 0xcd, 0xb1, 0x15, 0x69, 0x23, - 0x13, 0xe6, 0x3a, 0x42, 0x40, 0xa8, 0x69, 0xd4, 0x8c, 0xb5, 0xa2, 0x15, 0x6f, 0xd1, 0x6b, 0x00, - 0xca, 0x45, 0xdb, 0x73, 0xcc, 0x8c, 0x3c, 0x2c, 0x2a, 0xc9, 0x23, 0x07, 0xdd, 0x81, 0x25, 0x2f, - 0xf0, 0xb8, 0x67, 0x77, 0xdb, 0x0c, 0x7f, 0xd5, 0xc3, 0x41, 0x07, 0x53, 0xb3, 0x24, 0x51, 0x8b, - 0xea, 0xe0, 0x49, 0x2c, 0x47, 0xcb, 0x30, 0x6b, 0x77, 0x3d, 0x9b, 0x99, 0x65, 0x09, 0x88, 0x36, - 0xe8, 0x13, 0x28, 0xc4, 0xb9, 0x9a, 0xf3, 0x35, 0x63, 0xad, 0xb4, 0xd1, 0x6c, 0x4c, 0xaf, 0x5c, - 0x43, 0x85, 0xdd, 0x52, 0x6a, 0x96, 0x36, 0x80, 0xf6, 0xa0, 0x3c, 0xca, 0x84, 0xb9, 0x20, 0x0d, - 0xde, 0x49, 0x32, 0xf8, 0x20, 0xd2, 0x79, 0x14, 0x1c, 0x92, 0x9d, 0xdc, 0xb3, 0xbf, 0x6f, 0x19, - 0x56, 0xc9, 0x1d, 0x8a, 0xd0, 0x03, 0x98, 0xeb, 0xfb, 0x6d, 0x3e, 0x08, 0xb1, 0xf9, 0x52, 0xcd, - 0x58, 0x5b, 0xd8, 0x68, 0xa4, 0x8c, 0xb0, 0xb1, 0xdf, 0xda, 0x1b, 0x84, 0xd8, 0xca, 0xf7, 0x7d, - 0xf1, 0xdd, 0x2a, 0x7f, 0xfb, 0xef, 0xaf, 0x6f, 0xc5, 0xdc, 0x7e, 0x9c, 0x2b, 0x64, 0x17, 0x4b, - 0xf5, 0x0a, 0x98, 0x17, 0xeb, 0x61, 0x61, 0x16, 0x92, 0x80, 0xe1, 0xfa, 0xef, 0x19, 0xb8, 0xd1, - 0x62, 0xee, 0x17, 0xa1, 0x33, 0x3c, 0x14, 0x11, 0x51, 0xdf, 0xe6, 0x1e, 0x09, 0x04, 0xa3, 0xe4, - 0x38, 0xc0, 0x71, 0xd5, 0xa2, 0xcd, 0xb5, 0x6a, 0x96, 0x9d, 0x50, 0xb3, 0xcf, 0x47, 0xaa, 0x33, - 0x7b, 0xad, 0xea, 0x28, 0x42, 0x27, 0xd7, 0x28, 0xff, 0x22, 0x6a, 0xb4, 0x05, 0x82, 0xda, 0x88, - 0x80, 0xfa, 0xeb, 0xb0, 0x3a, 0x85, 0x35, 0xcd, 0xee, 0x6f, 0x19, 0x58, 0xd0, 0xb8, 0x27, 0xdc, - 0xe6, 0x78, 0x4a, 0x23, 0xdc, 0x84, 0x21, 0x85, 0x97, 0x39, 0xad, 0x41, 0x89, 0x71, 0x9b, 0xf2, - 0x87, 0xd8, 0x73, 0x8f, 0xb8, 0x64, 0x33, 0x67, 0x8d, 0x8a, 0x84, 0x7e, 0xd0, 0xf3, 0x77, 0xc4, - 0xe8, 0x60, 0x66, 0x4e, 0x9e, 0x0f, 0x05, 0x68, 0x05, 0xf2, 0xbb, 0xdb, 0x9f, 0xd9, 0xfc, 0x48, - 0x92, 0x5c, 0xb4, 0xd4, 0x0e, 0x3d, 0x84, 0xec, 0xce, 0x2e, 0x33, 0xe7, 0x24, 0x45, 0xef, 0x24, - 0x51, 0x24, 0x8d, 0xed, 0xea, 0xb9, 0xc4, 0x24, 0x4f, 0x33, 0x96, 0x30, 0x81, 0x10, 0xe4, 0xba, - 0x36, 0xe3, 0x66, 0xa1, 0x66, 0xac, 0x15, 0x2c, 0xb9, 0x46, 0xb7, 0xa0, 0xe4, 0x50, 0xd6, 0xee, - 0x63, 0x2a, 0xcc, 0x98, 0x45, 0xe9, 0x1a, 0x1c, 0xca, 0xf6, 0x23, 0xc9, 0xa5, 0xfb, 0x9a, 0x5f, - 0x9c, 0xab, 0x9b, 0xb0, 0x72, 0x9e, 0x34, 0xcd, 0xe7, 0x0f, 0x06, 0x2c, 0xb7, 0x98, 0xbb, 0x47, - 0xed, 0x80, 0x1d, 0x62, 0xfa, 0x58, 0xd4, 0x82, 0x1d, 0x79, 0x21, 0x5a, 0x85, 0xf9, 0x4e, 0x8f, - 0x52, 0x1c, 0xf0, 0xf6, 0xe8, 0x75, 0x2d, 0x2b, 0xa1, 0x04, 0xa2, 0x1b, 0x50, 0x0c, 0xf0, 0xb1, - 0x02, 0x44, 0x04, 0x17, 0x02, 0x7c, 0xfc, 0x78, 0xcc, 0x95, 0xce, 0x5e, 0xa0, 0x7f, 0x0b, 0x89, - 0x38, 0xcf, 0xfb, 0xa8, 0x57, 0xe1, 0xe6, 0xb8, 0x60, 0x74, 0xb4, 0x7f, 0x18, 0x50, 0x6c, 0x31, - 0x77, 0xdb, 0x71, 0xb6, 0xa7, 0x4e, 0x40, 0x04, 0xb9, 0xc0, 0xf6, 0xb1, 0x0a, 0x49, 0xae, 0x13, - 0xc2, 0x11, 0xb7, 0x21, 0x7e, 0x1d, 0x04, 0xaf, 0x39, 0x79, 0x3e, 0x2a, 0x12, 0x8d, 0xeb, 0xf9, - 0xb6, 0x8b, 0x55, 0xb9, 0xa3, 0x0d, 0x5a, 0x84, 0x6c, 0x8f, 0x76, 0x65, 0x43, 0x14, 0x2d, 0xb1, - 0x94, 0x0d, 0x4e, 0x1d, 0x4c, 0xe5, 0x0d, 0x98, 0xb5, 0xa2, 0xcd, 0xf9, 0xb2, 0xd4, 0x5f, 0x86, - 0x25, 0x9d, 0x87, 0xce, 0xee, 0x2f, 0x03, 0xca, 0xba, 0x4c, 0xd3, 0x13, 0x5c, 0x80, 0x8c, 0x1a, - 0x13, 0x39, 0x2b, 0xe3, 0x39, 0x3a, 0xe1, 0xec, 0xc4, 0x84, 0x73, 0x09, 0x09, 0xcf, 0x4e, 0x49, - 0x38, 0x3f, 0x26, 0xe1, 0xb9, 0x31, 0x09, 0x17, 0x26, 0x27, 0xbc, 0x22, 0xaf, 0x99, 0x4e, 0x4d, - 0xe7, 0x8c, 0x65, 0xca, 0x16, 0xf6, 0x49, 0xff, 0x8a, 0x29, 0x27, 0x5c, 0xaf, 0x71, 0xee, 0xb5, - 0x1b, 0xed, 0xbe, 0x0b, 0xaf, 0xb6, 0x98, 0xdb, 0xb2, 0xe9, 0xd3, 0xfd, 0x5e, 0x37, 0xc0, 0xd4, - 0x3e, 0xe8, 0xc6, 0xd3, 0x87, 0x89, 0xf6, 0xb7, 0x7b, 0xfc, 0x88, 0x50, 0x8f, 0x0f, 0x54, 0x34, - 0x43, 0x01, 0xba, 0x0d, 0xe5, 0x91, 0x46, 0x64, 0x66, 0xa6, 0x96, 0x95, 0x04, 0xea, 0x4e, 0x64, - 0x5b, 0x0b, 0x22, 0x86, 0xa1, 0x4a, 0x7d, 0x15, 0x6e, 0x4f, 0xf4, 0x16, 0x87, 0xb4, 0xf1, 0x5d, - 0x01, 0xb2, 0x2d, 0xe6, 0xa2, 0x6f, 0x60, 0xfe, 0xfc, 0x83, 0x9f, 0x38, 0x4a, 0x2e, 0x3e, 0x49, - 0x95, 0xf7, 0xaf, 0xaa, 0x11, 0x07, 0x81, 0x7e, 0x31, 0xc0, 0x9c, 0xf8, 0x82, 0x7d, 0x98, 0xc2, - 0xec, 0x24, 0xe5, 0xca, 0xfd, 0xff, 0xa1, 0xac, 0xc3, 0xeb, 0x41, 0x69, 0xf4, 0x05, 0x68, 0xa4, - 0xb6, 0x29, 0xf1, 0x95, 0xf7, 0xae, 0x86, 0xd7, 0x6e, 0xbf, 0x37, 0x60, 0xe9, 0xf2, 0xa4, 0xdc, - 0x4c, 0x61, 0xed, 0x92, 0x56, 0xe5, 0xa3, 0xeb, 0x68, 0xe9, 0x48, 0x0e, 0x21, 0xaf, 0x86, 0xe0, - 0x9b, 0x29, 0xec, 0x44, 0xd0, 0xca, 0x7a, 0x6a, 0xa8, 0xf6, 0x43, 0xa0, 0x38, 0x1c, 0x47, 0x77, - 0x53, 0xd3, 0x26, 0xbc, 0x6d, 0x5e, 0x05, 0x3d, 0xea, 0x70, 0x38, 0x0c, 0xd2, 0x38, 0xd4, 0xe8, - 0x54, 0x0e, 0x2f, 0x4d, 0x00, 0xf4, 0xb3, 0x01, 0x2b, 0x13, 0xfa, 0xff, 0x83, 0x14, 0x06, 0xc7, - 0xab, 0x56, 0xb6, 0xaf, 0xad, 0x1a, 0x07, 0xb6, 0xf3, 0xe9, 0xb3, 0xd3, 0xaa, 0xf1, 0xfc, 0xb4, - 0x6a, 0xfc, 0x73, 0x5a, 0x35, 0x7e, 0x3a, 0xab, 0xce, 0x3c, 0x3f, 0xab, 0xce, 0xfc, 0x79, 0x56, - 0x9d, 0xf9, 0x72, 0xd3, 0xf5, 0xf8, 0x51, 0xef, 0xa0, 0xd1, 0x21, 0x7e, 0x73, 0xc2, 0x2f, 0x46, - 0xff, 0x5e, 0xf3, 0x64, 0xf8, 0x77, 0x35, 0x08, 0x31, 0x3b, 0xc8, 0xcb, 0x7f, 0x89, 0x7b, 0xff, - 0x05, 0x00, 0x00, 0xff, 0xff, 0x0e, 0xe5, 0x7b, 0x6d, 0x8c, 0x0d, 0x00, 0x00, + // 1041 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4f, 0x6f, 0xe3, 0x44, + 0x14, 0xaf, 0x93, 0x34, 0x4d, 0x5e, 0xb2, 0x25, 0x1d, 0xaa, 0x62, 0xb2, 0x4b, 0xc8, 0xa6, 0x42, + 0x14, 0x76, 0x49, 0x68, 0xb7, 0x20, 0x28, 0x5c, 0xda, 0xad, 0xb4, 0xbb, 0xa0, 0xb0, 0xe0, 0x2d, + 0x3d, 0x70, 0x89, 0xdc, 0x78, 0xea, 0x58, 0x6b, 0x7b, 0xcc, 0xcc, 0x24, 0x6d, 0xe0, 0x86, 0x84, + 0x38, 0x20, 0x21, 0xc4, 0x81, 0x13, 0x1f, 0x82, 0x03, 0x9f, 0x01, 0xed, 0x71, 0x8f, 0x70, 0x41, + 0xa8, 0x3d, 0xf0, 0x35, 0x90, 0xc7, 0xe3, 0x49, 0xda, 0xfc, 0xb1, 0x5b, 0x38, 0x79, 0xe6, 0xf9, + 0xf7, 0x7b, 0x7f, 0x7e, 0x6f, 0xe6, 0x59, 0x86, 0xd7, 0xad, 0xa1, 0x87, 0x7d, 0xe6, 0x10, 0xff, + 0x74, 0xf8, 0x55, 0x4b, 0x6d, 0x5a, 0x94, 0xb8, 0xae, 0x19, 0x04, 0x2d, 0x7e, 0xda, 0x0c, 0x28, + 0xe1, 0x04, 0xd5, 0xc6, 0x81, 0x4d, 0xb5, 0x69, 0x4a, 0x60, 0xf5, 0xa5, 0x2e, 0x61, 0x1e, 0x61, + 0x2d, 0x8f, 0xd9, 0xad, 0xc1, 0x66, 0xf8, 0x88, 0x88, 0xd5, 0x77, 0x12, 0x22, 0x1c, 0xb9, 0xa4, + 0xfb, 0xb4, 0x63, 0x61, 0xd6, 0xa5, 0x4e, 0xc0, 0x09, 0x95, 0xb4, 0xbb, 0x09, 0x34, 0xf9, 0x94, + 0xe8, 0xb7, 0x12, 0xd0, 0x1e, 0xe6, 0xa6, 0x65, 0x72, 0x53, 0xc2, 0x37, 0x13, 0xe0, 0x36, 0xf6, + 0x31, 0x73, 0x58, 0xc7, 0xf1, 0x8f, 0x89, 0xa4, 0xac, 0xda, 0xc4, 0x26, 0x62, 0xd9, 0x0a, 0x57, + 0x91, 0xb5, 0xf1, 0x43, 0x16, 0x2a, 0x6d, 0x66, 0xdf, 0xa7, 0xd8, 0xe4, 0xd8, 0x88, 0xd8, 0x48, + 0x87, 0xa5, 0x6e, 0x68, 0x20, 0x54, 0xd7, 0xea, 0xda, 0x46, 0xd1, 0x88, 0xb7, 0xe8, 0x15, 0x00, + 0x19, 0xa2, 0xe3, 0x58, 0x7a, 0x46, 0xbc, 0x2c, 0x4a, 0xcb, 0x23, 0x0b, 0xdd, 0x81, 0x15, 0xc7, + 0x77, 0xb8, 0x63, 0xba, 0x1d, 0x86, 0xbf, 0xec, 0x63, 0xbf, 0x8b, 0xa9, 0x5e, 0x12, 0xa8, 0x8a, + 0x7c, 0xf1, 0x24, 0xb6, 0xa3, 0x55, 0x58, 0x34, 0x5d, 0xc7, 0x64, 0x7a, 0x59, 0x00, 0xa2, 0x0d, + 0xfa, 0x18, 0x0a, 0x71, 0xad, 0xfa, 0x8d, 0xba, 0xb6, 0x51, 0xda, 0x6a, 0x35, 0xe7, 0x77, 0xae, + 0x29, 0xd3, 0x6e, 0x4b, 0x9a, 0xa1, 0x1c, 0xa0, 0x03, 0x28, 0x8f, 0x2b, 0xa1, 0x2f, 0x0b, 0x87, + 0x77, 0x92, 0x1c, 0x3e, 0x88, 0x38, 0x8f, 0xfc, 0x63, 0xb2, 0x97, 0x7b, 0xf6, 0xd7, 0xab, 0x9a, + 0x51, 0xb2, 0x47, 0x26, 0xf4, 0x00, 0x96, 0x06, 0x5e, 0x87, 0x0f, 0x03, 0xac, 0xbf, 0x50, 0xd7, + 0x36, 0x96, 0xb7, 0x9a, 0x29, 0x33, 0x6c, 0x1e, 0xb6, 0x0f, 0x86, 0x01, 0x36, 0xf2, 0x03, 0x2f, + 0x7c, 0xee, 0x94, 0xbf, 0xf9, 0xe7, 0xd7, 0x37, 0x63, 0x6d, 0x3f, 0xca, 0x15, 0xb2, 0x95, 0x52, + 0xa3, 0x0a, 0xfa, 0xe5, 0x7e, 0x18, 0x98, 0x05, 0xc4, 0x67, 0xb8, 0xf1, 0x5b, 0x06, 0x6e, 0xb6, + 0x99, 0xfd, 0x79, 0x60, 0x8d, 0x5e, 0x86, 0x19, 0x51, 0xcf, 0xe4, 0x0e, 0xf1, 0x43, 0x45, 0xc9, + 0x89, 0x8f, 0xe3, 0xae, 0x45, 0x9b, 0x6b, 0xf5, 0x2c, 0x3b, 0xa3, 0x67, 0x9f, 0x8d, 0x75, 0x67, + 0xf1, 0x5a, 0xdd, 0x91, 0x82, 0xce, 0xee, 0x51, 0xfe, 0xff, 0xe8, 0xd1, 0x0e, 0x84, 0xd2, 0x46, + 0x02, 0x34, 0x5e, 0x83, 0xf5, 0x39, 0xaa, 0x29, 0x75, 0x7f, 0xca, 0xc0, 0xb2, 0xc2, 0x3d, 0xe1, + 0x26, 0xc7, 0x73, 0x2e, 0xc2, 0x2d, 0x18, 0x49, 0x38, 0xa9, 0x69, 0x1d, 0x4a, 0x8c, 0x9b, 0x94, + 0x3f, 0xc4, 0x8e, 0xdd, 0xe3, 0x42, 0xcd, 0x9c, 0x31, 0x6e, 0x0a, 0xf9, 0x7e, 0xdf, 0xdb, 0x0b, + 0x47, 0x07, 0xd3, 0x73, 0xe2, 0xfd, 0xc8, 0x80, 0xd6, 0x20, 0xbf, 0xbf, 0xfb, 0xa9, 0xc9, 0x7b, + 0x42, 0xe4, 0xa2, 0x21, 0x77, 0xe8, 0x21, 0x64, 0xf7, 0xf6, 0x99, 0xbe, 0x24, 0x24, 0x7a, 0x3b, + 0x49, 0x22, 0xe1, 0x6c, 0x5f, 0xcd, 0x25, 0x26, 0x74, 0x5a, 0x30, 0x42, 0x17, 0x08, 0x41, 0xce, + 0x35, 0x19, 0xd7, 0x0b, 0x75, 0x6d, 0xa3, 0x60, 0x88, 0xf5, 0xc4, 0x71, 0xcc, 0x57, 0x96, 0x1a, + 0x3a, 0xac, 0x5d, 0xd4, 0x44, 0xc9, 0xf5, 0xbd, 0x06, 0xab, 0x6d, 0x66, 0x1f, 0x50, 0xd3, 0x67, + 0xc7, 0x98, 0x3e, 0x0e, 0xa5, 0x66, 0x3d, 0x27, 0x40, 0xeb, 0x70, 0xa3, 0xdb, 0xa7, 0x14, 0xfb, + 0xbc, 0x33, 0x7e, 0x1a, 0xcb, 0xd2, 0x28, 0x80, 0xe8, 0x26, 0x14, 0x7d, 0x7c, 0x22, 0x01, 0x91, + 0x7e, 0x05, 0x1f, 0x9f, 0x3c, 0x9e, 0x72, 0x62, 0xb3, 0x97, 0xd4, 0xdd, 0x41, 0x61, 0x9e, 0x17, + 0x63, 0x34, 0x6a, 0x70, 0x6b, 0x5a, 0x32, 0x2a, 0xdb, 0xdf, 0x35, 0x28, 0xb6, 0x99, 0xbd, 0x6b, + 0x59, 0xbb, 0x73, 0x07, 0x1c, 0x82, 0x9c, 0x6f, 0x7a, 0x58, 0xa6, 0x24, 0xd6, 0x09, 0xe9, 0x84, + 0xcd, 0x8e, 0x87, 0xbf, 0x43, 0x7c, 0xd1, 0xcc, 0xa2, 0x31, 0x6e, 0x0a, 0xef, 0xa5, 0xe3, 0x99, + 0x36, 0x96, 0xdd, 0x8c, 0x36, 0xa8, 0x02, 0xd9, 0x3e, 0x75, 0xc5, 0x79, 0x2f, 0x1a, 0xe1, 0x52, + 0xdc, 0x5f, 0x6a, 0x61, 0x2a, 0x1a, 0xbc, 0x68, 0x44, 0x9b, 0x8b, 0x6d, 0x69, 0xbc, 0x08, 0x2b, + 0xaa, 0x0e, 0x55, 0xdd, 0x9f, 0x1a, 0x94, 0x55, 0x9b, 0xe6, 0x17, 0xb8, 0x0c, 0x19, 0x39, 0x05, + 0x72, 0x46, 0xc6, 0xb1, 0x54, 0xc1, 0xd9, 0x99, 0x05, 0xe7, 0x12, 0x0a, 0x5e, 0x9c, 0x53, 0x70, + 0x7e, 0x4a, 0xc1, 0x4b, 0x53, 0x0a, 0x2e, 0xcc, 0x2e, 0x78, 0x4d, 0x1c, 0x33, 0x55, 0x9a, 0xaa, + 0x19, 0x8b, 0x92, 0x0d, 0xec, 0x91, 0xc1, 0x15, 0x4b, 0x4e, 0x38, 0x5e, 0xd3, 0xc2, 0xab, 0x30, + 0x2a, 0xbc, 0x0b, 0x2f, 0xb7, 0x99, 0xdd, 0x36, 0xe9, 0xd3, 0xc3, 0xbe, 0xeb, 0x63, 0x6a, 0x1e, + 0xb9, 0xf1, 0x70, 0x61, 0xe1, 0xed, 0x36, 0xfb, 0xbc, 0x47, 0xa8, 0xc3, 0x87, 0x32, 0x9b, 0x91, + 0x01, 0xdd, 0x86, 0xb2, 0x45, 0x59, 0x67, 0x80, 0x69, 0x78, 0x5d, 0x99, 0x9e, 0xa9, 0x67, 0x85, + 0x80, 0x94, 0x1d, 0x4a, 0xd3, 0xce, 0x72, 0x98, 0xc3, 0x88, 0xd2, 0x58, 0x87, 0xdb, 0x33, 0xa3, + 0xc5, 0x29, 0x6d, 0x7d, 0x5b, 0x80, 0x6c, 0x9b, 0xd9, 0xe8, 0x6b, 0xb8, 0x71, 0xf1, 0x7b, 0x9e, + 0x38, 0x29, 0x2e, 0x7f, 0x71, 0xaa, 0xef, 0x5d, 0x95, 0x11, 0x27, 0x81, 0x7e, 0xd1, 0x40, 0x9f, + 0xf9, 0x81, 0xfa, 0x20, 0x85, 0xdb, 0x59, 0xe4, 0xea, 0xfd, 0xff, 0x40, 0x56, 0xe9, 0xf5, 0xa1, + 0x34, 0x3e, 0xe0, 0x9b, 0xa9, 0x7d, 0x0a, 0x7c, 0xf5, 0xdd, 0xab, 0xe1, 0x55, 0xd8, 0xef, 0x34, + 0x58, 0x99, 0x9c, 0x94, 0xdb, 0x29, 0xbc, 0x4d, 0xb0, 0xaa, 0x1f, 0x5e, 0x87, 0xa5, 0x32, 0x39, + 0x86, 0xbc, 0x1c, 0x82, 0x6f, 0xa4, 0xf0, 0x13, 0x41, 0xab, 0x9b, 0xa9, 0xa1, 0x2a, 0x0e, 0x81, + 0xe2, 0x68, 0x1c, 0xdd, 0x4d, 0x2d, 0x5b, 0x18, 0x6d, 0xfb, 0x2a, 0xe8, 0xf1, 0x80, 0xa3, 0x61, + 0x90, 0x26, 0xa0, 0x42, 0xa7, 0x0a, 0x38, 0x31, 0x01, 0xd0, 0xcf, 0x1a, 0xac, 0xcd, 0xb8, 0xff, + 0xef, 0xa7, 0x70, 0x38, 0x9d, 0x5a, 0xdd, 0xbd, 0x36, 0x35, 0x4e, 0x6c, 0xef, 0x93, 0x67, 0x67, + 0x35, 0xed, 0xf9, 0x59, 0x4d, 0xfb, 0xfb, 0xac, 0xa6, 0xfd, 0x78, 0x5e, 0x5b, 0x78, 0x7e, 0x5e, + 0x5b, 0xf8, 0xe3, 0xbc, 0xb6, 0xf0, 0xc5, 0xb6, 0xed, 0xf0, 0x5e, 0xff, 0xa8, 0xd9, 0x25, 0x5e, + 0x6b, 0xc6, 0x1f, 0xc4, 0xe0, 0x5e, 0xeb, 0x74, 0xf4, 0xf3, 0x34, 0x0c, 0x30, 0x3b, 0xca, 0x8b, + 0x5f, 0x85, 0x7b, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x56, 0xf3, 0x18, 0x6b, 0x0d, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1647,13 +1638,6 @@ func (m *MsgUpdateState) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.DrsVersion) > 0 { - i -= len(m.DrsVersion) - copy(dAtA[i:], m.DrsVersion) - i = encodeVarintTx(dAtA, i, uint64(len(m.DrsVersion))) - i-- - dAtA[i] = 0x4a - } if m.Last { i-- if m.Last { @@ -2239,10 +2223,6 @@ func (m *MsgUpdateState) Size() (n int) { if m.Last { n += 2 } - l = len(m.DrsVersion) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } return n } @@ -3244,38 +3224,6 @@ func (m *MsgUpdateState) Unmarshal(dAtA []byte) error { } } m.Last = bool(v != 0) - case 9: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DrsVersion", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthTx - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthTx - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DrsVersion = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:])