diff --git a/proto/sedachain/batching/v1/batching.proto b/proto/sedachain/batching/v1/batching.proto index dfaf0a4e..d2c6ae32 100644 --- a/proto/sedachain/batching/v1/batching.proto +++ b/proto/sedachain/batching/v1/batching.proto @@ -50,15 +50,6 @@ message BatchSignatures { bytes secp256k1_signature = 2; } -// Params is a list of parameters which can be changed through governance. -message Params { - option (gogoproto.equal) = true; - - // validator_set_trim_percent is the percentage of the validator - // set to store in the validator merkle tree in the batch. - uint32 validator_set_trim_percent = 1; -} - // DataResult represents the result of a resolved data request. message DataResult { // id is the Keccack-256 hash of the data result. diff --git a/proto/sedachain/batching/v1/genesis.proto b/proto/sedachain/batching/v1/genesis.proto index 3f95dbdc..5f5d0912 100644 --- a/proto/sedachain/batching/v1/genesis.proto +++ b/proto/sedachain/batching/v1/genesis.proto @@ -16,7 +16,6 @@ message GenesisState { repeated DataResult data_results = 4 [ (gogoproto.nullable) = false ]; repeated BatchAssignment batch_assignments = 5 [ (gogoproto.nullable) = false ]; - Params params = 6 [ (gogoproto.nullable) = false ]; } // BatchAssignment represents a batch assignment for genesis export diff --git a/x/batching/keeper/genesis.go b/x/batching/keeper/genesis.go index 4cb887c2..a4e206ed 100644 --- a/x/batching/keeper/genesis.go +++ b/x/batching/keeper/genesis.go @@ -31,9 +31,6 @@ func (k Keeper) InitGenesis(ctx sdk.Context, data types.GenesisState) { } } } - if err := k.setParams(ctx, data.Params); err != nil { - panic(err) - } } // ExportGenesis extracts all data from store to genesis state. @@ -62,9 +59,5 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) types.GenesisState { } batchData[i] = data } - params, err := k.GetParams(ctx) - if err != nil { - panic(err) - } - return types.NewGenesisState(curBatchNum, batches, batchData, dataResults, batchAssignments, params) + return types.NewGenesisState(curBatchNum, batches, batchData, dataResults, batchAssignments) } diff --git a/x/batching/keeper/keeper.go b/x/batching/keeper/keeper.go index 6c843099..c7adf22e 100644 --- a/x/batching/keeper/keeper.go +++ b/x/batching/keeper/keeper.go @@ -37,7 +37,6 @@ type Keeper struct { validatorTreeEntries collections.Map[collections.Pair[uint64, []byte], types.ValidatorTreeEntry] dataResultTreeEntries collections.Map[uint64, types.DataResultTreeEntries] batchSignatures collections.Map[collections.Pair[uint64, []byte], types.BatchSignatures] - params collections.Item[types.Params] } func NewKeeper( @@ -68,7 +67,6 @@ func NewKeeper( validatorTreeEntries: collections.NewMap(sb, types.ValidatorTreeEntriesKeyPrefix, "validator_tree_entries", collections.PairKeyCodec(collections.Uint64Key, collections.BytesKey), codec.CollValue[types.ValidatorTreeEntry](cdc)), dataResultTreeEntries: collections.NewMap(sb, types.DataResultTreeEntriesKeyPrefix, "data_result_tree_entries", collections.Uint64Key, codec.CollValue[types.DataResultTreeEntries](cdc)), batchSignatures: collections.NewMap(sb, types.BatchSignaturesKeyPrefix, "batch_signatures", collections.PairKeyCodec(collections.Uint64Key, collections.BytesKey), codec.CollValue[types.BatchSignatures](cdc)), - params: collections.NewItem(sb, types.ParamsKey, "params", codec.CollValue[types.Params](cdc)), } schema, err := sb.Build() diff --git a/x/batching/keeper/params.go b/x/batching/keeper/params.go deleted file mode 100644 index da9ba569..00000000 --- a/x/batching/keeper/params.go +++ /dev/null @@ -1,20 +0,0 @@ -package keeper - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - - "github.com/sedaprotocol/seda-chain/x/batching/types" -) - -func (k Keeper) setParams(ctx sdk.Context, params types.Params) error { - return k.params.Set(ctx, params) -} - -func (k Keeper) GetParams(ctx sdk.Context) (types.Params, error) { - return k.params.Get(ctx) -} - -func (k Keeper) GetValSetTrimPercent(ctx sdk.Context) (uint32, error) { - params, err := k.params.Get(ctx) - return params.ValidatorSetTrimPercent, err -} diff --git a/x/batching/types/batching.pb.go b/x/batching/types/batching.pb.go index 90d30356..815823b6 100644 --- a/x/batching/types/batching.pb.go +++ b/x/batching/types/batching.pb.go @@ -290,53 +290,6 @@ func (m *BatchSignatures) GetSecp256K1Signature() []byte { return nil } -// Params is a list of parameters which can be changed through governance. -type Params struct { - // validator_set_trim_percent is the percentage of the validator - // set to store in the validator merkle tree in the batch. - ValidatorSetTrimPercent uint32 `protobuf:"varint,1,opt,name=validator_set_trim_percent,json=validatorSetTrimPercent,proto3" json:"validator_set_trim_percent,omitempty"` -} - -func (m *Params) Reset() { *m = Params{} } -func (m *Params) String() string { return proto.CompactTextString(m) } -func (*Params) ProtoMessage() {} -func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_5b2a028024867de2, []int{4} -} -func (m *Params) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Params.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 *Params) XXX_Merge(src proto.Message) { - xxx_messageInfo_Params.Merge(m, src) -} -func (m *Params) XXX_Size() int { - return m.Size() -} -func (m *Params) XXX_DiscardUnknown() { - xxx_messageInfo_Params.DiscardUnknown(m) -} - -var xxx_messageInfo_Params proto.InternalMessageInfo - -func (m *Params) GetValidatorSetTrimPercent() uint32 { - if m != nil { - return m.ValidatorSetTrimPercent - } - return 0 -} - // DataResult represents the result of a resolved data request. type DataResult struct { // id is the Keccack-256 hash of the data result. @@ -349,7 +302,8 @@ type DataResult struct { Version string `protobuf:"bytes,4,opt,name=version,proto3" json:"version"` // block_height is the height at which the data request was tallied. BlockHeight uint64 `protobuf:"varint,5,opt,name=block_height,json=blockHeight,proto3" json:"block_height"` - // block_timestamp is the unix timestamp in seconds of when the data request was tallied. + // block_timestamp is the unix timestamp in seconds of when the data request + // was tallied. BlockTimestamp uint64 `protobuf:"varint,6,opt,name=block_timestamp,json=blockTimestamp,proto3" json:"block_timestamp"` // exit_code is the exit code of the tally wasm binary execution. ExitCode uint32 `protobuf:"varint,7,opt,name=exit_code,json=exitCode,proto3" json:"exit_code"` @@ -371,7 +325,7 @@ func (m *DataResult) Reset() { *m = DataResult{} } func (m *DataResult) String() string { return proto.CompactTextString(m) } func (*DataResult) ProtoMessage() {} func (*DataResult) Descriptor() ([]byte, []int) { - return fileDescriptor_5b2a028024867de2, []int{5} + return fileDescriptor_5b2a028024867de2, []int{4} } func (m *DataResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -489,7 +443,6 @@ func init() { proto.RegisterType((*DataResultTreeEntries)(nil), "sedachain.batching.v1.DataResultTreeEntries") proto.RegisterType((*ValidatorTreeEntry)(nil), "sedachain.batching.v1.ValidatorTreeEntry") proto.RegisterType((*BatchSignatures)(nil), "sedachain.batching.v1.BatchSignatures") - proto.RegisterType((*Params)(nil), "sedachain.batching.v1.Params") proto.RegisterType((*DataResult)(nil), "sedachain.batching.v1.DataResult") } @@ -498,84 +451,57 @@ func init() { } var fileDescriptor_5b2a028024867de2 = []byte{ - // 802 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x4f, 0x6f, 0xe3, 0x44, - 0x14, 0xaf, 0xd3, 0x34, 0x7f, 0x5e, 0x92, 0xb6, 0xcc, 0x6e, 0xc1, 0xec, 0x21, 0x0e, 0x11, 0x2b, - 0x02, 0xa8, 0x0d, 0xa1, 0x02, 0x24, 0x96, 0x0b, 0x06, 0x24, 0x56, 0x68, 0x51, 0x35, 0x5b, 0xf6, - 0xc0, 0x01, 0x6b, 0xe2, 0x19, 0x39, 0xa3, 0xc6, 0x1e, 0x6b, 0x66, 0x12, 0xb6, 0xdf, 0x82, 0x2f, - 0x80, 0x84, 0xf8, 0x0c, 0x7c, 0x07, 0x38, 0xee, 0x91, 0x93, 0x85, 0xda, 0x0b, 0xf2, 0x47, 0xe0, - 0x84, 0xfc, 0xec, 0x38, 0x6d, 0x38, 0x73, 0xf2, 0x7b, 0xbf, 0xdf, 0xef, 0xcd, 0xbc, 0x79, 0x9e, - 0xdf, 0xc0, 0xdb, 0x46, 0x70, 0x16, 0x2e, 0x98, 0x4c, 0xa6, 0x73, 0x66, 0xc3, 0x85, 0x4c, 0xa2, - 0xe9, 0x7a, 0x56, 0xc7, 0x67, 0xa9, 0x56, 0x56, 0x91, 0x93, 0x5a, 0x75, 0x56, 0x33, 0xeb, 0xd9, - 0xa3, 0x87, 0x91, 0x8a, 0x14, 0x2a, 0xa6, 0x45, 0x54, 0x8a, 0xc7, 0x3f, 0x37, 0xe0, 0xc0, 0x2f, - 0x54, 0xe4, 0x2d, 0xe8, 0xa3, 0x3c, 0x48, 0x56, 0xf1, 0x5c, 0x68, 0xd7, 0x19, 0x39, 0x93, 0x26, - 0xed, 0x21, 0xf6, 0x2d, 0x42, 0x28, 0x59, 0xaa, 0xf0, 0x2a, 0x58, 0x08, 0x19, 0x2d, 0xac, 0xdb, - 0x18, 0x39, 0x93, 0x7d, 0xda, 0x43, 0xec, 0x6b, 0x84, 0xc8, 0x27, 0xe0, 0x86, 0x2b, 0xad, 0x45, - 0x62, 0x03, 0xce, 0x2c, 0x0b, 0xb4, 0x30, 0xab, 0xa5, 0x0d, 0xb4, 0x52, 0xd6, 0xdd, 0x1f, 0x39, - 0x93, 0x2e, 0x3d, 0xa9, 0xf8, 0x2f, 0x99, 0x65, 0x14, 0x59, 0xaa, 0x94, 0x25, 0x13, 0x38, 0xfe, - 0x4f, 0x41, 0x13, 0x0b, 0x0e, 0xf9, 0x7d, 0xe5, 0x63, 0x38, 0x5c, 0xb3, 0xa5, 0xe4, 0xcc, 0x2a, - 0x5d, 0xea, 0x0e, 0x50, 0x37, 0xa8, 0x51, 0x94, 0xbd, 0x09, 0x9d, 0xf2, 0x3c, 0x92, 0xbb, 0xad, - 0x91, 0x33, 0xe9, 0xd3, 0x36, 0xe6, 0x4f, 0x39, 0x79, 0x17, 0x8e, 0x53, 0xad, 0xd6, 0x32, 0x89, - 0x82, 0x58, 0x58, 0x56, 0xac, 0xef, 0xb6, 0x51, 0x72, 0x54, 0xe1, 0xcf, 0x2a, 0x78, 0x3c, 0x83, - 0x93, 0x6d, 0xa3, 0x97, 0x5a, 0x88, 0xaf, 0x12, 0xab, 0xa5, 0x30, 0xc4, 0x85, 0xb6, 0x28, 0x43, - 0xd7, 0x19, 0xed, 0x17, 0xab, 0x57, 0xe9, 0xf8, 0x77, 0x07, 0xc8, 0x8b, 0x4d, 0x2b, 0x9b, 0x92, - 0x6b, 0xf2, 0x03, 0xbc, 0xb6, 0x6d, 0x9b, 0x71, 0xae, 0x85, 0x31, 0x38, 0xe4, 0xbe, 0x3f, 0xfb, - 0x27, 0xf3, 0x4e, 0x23, 0x69, 0x17, 0xab, 0xf9, 0x59, 0xa8, 0xe2, 0x69, 0xa8, 0x4c, 0xac, 0x4c, - 0xf5, 0x39, 0x35, 0xfc, 0x6a, 0x6a, 0xaf, 0x53, 0x61, 0xce, 0x5e, 0xb0, 0xe5, 0xe7, 0x65, 0x21, - 0x3d, 0xae, 0xd7, 0xaa, 0x10, 0xf2, 0x01, 0x3c, 0x5c, 0x2b, 0x5b, 0x9c, 0x29, 0x55, 0x3f, 0x0a, - 0x1d, 0xa4, 0x42, 0x87, 0x22, 0x29, 0x7f, 0xd2, 0x80, 0x92, 0x92, 0xbb, 0x28, 0xa8, 0x8b, 0x92, - 0x21, 0x1e, 0xf4, 0x84, 0x5d, 0xd4, 0xbd, 0xec, 0xe3, 0x04, 0x40, 0xd8, 0x45, 0xb5, 0xe4, 0xf8, - 0x57, 0x07, 0x8e, 0xf0, 0x72, 0x3c, 0x97, 0x51, 0xc2, 0xec, 0x4a, 0x0b, 0xf3, 0xbf, 0x1f, 0x63, - 0x0a, 0x0f, 0x8c, 0x08, 0xd3, 0x0f, 0x3f, 0xfa, 0xf8, 0x6a, 0x16, 0x98, 0xcd, 0xbe, 0x78, 0x8a, - 0x3e, 0x25, 0x35, 0x55, 0x77, 0x34, 0xfe, 0x06, 0x5a, 0x17, 0x4c, 0xb3, 0xd8, 0x90, 0x27, 0xf0, - 0x68, 0xdb, 0x9a, 0x11, 0x36, 0xb0, 0x5a, 0xc6, 0xf5, 0x1c, 0x1c, 0x9c, 0xc3, 0x1b, 0xb5, 0xe2, - 0xb9, 0xb0, 0x97, 0x5a, 0xc6, 0xd5, 0x30, 0x3e, 0x6d, 0xfe, 0xfd, 0x8b, 0xe7, 0x8c, 0x7f, 0x6b, - 0x02, 0x6c, 0xff, 0x37, 0x79, 0x1d, 0x1a, 0x92, 0x63, 0x65, 0xd7, 0x6f, 0xe5, 0x99, 0xd7, 0x90, - 0x9c, 0x36, 0x24, 0x27, 0x43, 0x38, 0xe0, 0xba, 0xb8, 0x58, 0x0d, 0xa4, 0xba, 0x79, 0xe6, 0x95, - 0x00, 0x6d, 0x72, 0xfd, 0x94, 0x93, 0x27, 0x70, 0xc4, 0x75, 0x70, 0xcf, 0x2b, 0xc5, 0x74, 0x9b, - 0xfe, 0x83, 0x3c, 0xf3, 0x76, 0x29, 0x3a, 0xe0, 0xda, 0xbf, 0x63, 0xa1, 0xc7, 0xd0, 0x5e, 0x0b, - 0x6d, 0xa4, 0x4a, 0x4a, 0x03, 0xf8, 0xbd, 0x3c, 0xf3, 0x36, 0x10, 0xdd, 0x04, 0xe4, 0x7c, 0xc7, - 0x8c, 0x07, 0xb8, 0xc1, 0x71, 0x9e, 0x79, 0xf7, 0xf0, 0xfb, 0xf6, 0xfc, 0x0c, 0x8e, 0x4a, 0xd2, - 0xca, 0x58, 0x18, 0xcb, 0xe2, 0x14, 0xbd, 0x51, 0x35, 0xb6, 0x43, 0xd1, 0x43, 0x04, 0x2e, 0x37, - 0x39, 0x79, 0x0f, 0xba, 0xe2, 0xa5, 0xb4, 0x41, 0xa8, 0xb8, 0x40, 0xc3, 0x0c, 0xfc, 0x41, 0x9e, - 0x79, 0x5b, 0x90, 0x76, 0x8a, 0xf0, 0x0b, 0xc5, 0x05, 0x79, 0x07, 0x3a, 0x11, 0x33, 0xc1, 0xca, - 0x08, 0xee, 0x76, 0x70, 0x8b, 0x7e, 0x9e, 0x79, 0x35, 0x46, 0xdb, 0x11, 0x33, 0xdf, 0x19, 0xc1, - 0xc9, 0x18, 0x5a, 0xa5, 0xe7, 0xdd, 0x2e, 0xde, 0x22, 0xc8, 0x33, 0xaf, 0x42, 0x68, 0xf5, 0x2d, - 0xda, 0x4e, 0xd9, 0xf5, 0x9c, 0x85, 0x57, 0xf5, 0x95, 0x03, 0x1c, 0x0d, 0xb6, 0xbd, 0x43, 0xd1, - 0xc3, 0x0a, 0xd8, 0x5c, 0xa9, 0x73, 0xe8, 0x17, 0x4f, 0x62, 0x90, 0xb2, 0xeb, 0xa5, 0x62, 0xdc, - 0xed, 0x61, 0x29, 0x4e, 0xea, 0x2e, 0x4e, 0x7b, 0x45, 0x76, 0x51, 0x26, 0xe4, 0x7d, 0xe8, 0x86, - 0x2a, 0x31, 0x22, 0x31, 0x2b, 0xe3, 0xf6, 0x47, 0xce, 0xa4, 0x53, 0x9e, 0xb5, 0x06, 0xe9, 0x36, - 0xf4, 0x9f, 0xfd, 0x71, 0x33, 0x74, 0x5e, 0xdd, 0x0c, 0x9d, 0xbf, 0x6e, 0x86, 0xce, 0x4f, 0xb7, - 0xc3, 0xbd, 0x57, 0xb7, 0xc3, 0xbd, 0x3f, 0x6f, 0x87, 0x7b, 0xdf, 0x9f, 0xdf, 0xf1, 0x43, 0xb1, - 0x3c, 0xbe, 0xba, 0xa1, 0x5a, 0x62, 0x72, 0x5a, 0xbe, 0xe5, 0x2f, 0xb7, 0xaf, 0x39, 0x1a, 0x64, - 0xde, 0x42, 0xd5, 0xf9, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x04, 0x47, 0xa5, 0x07, 0xf0, 0x05, - 0x00, 0x00, -} - -func (this *Params) Equal(that interface{}) bool { - if that == nil { - return this == nil - } - - that1, ok := that.(*Params) - if !ok { - that2, ok := that.(Params) - if ok { - that1 = &that2 - } else { - return false - } - } - if that1 == nil { - return this == nil - } else if this == nil { - return false - } - if this.ValidatorSetTrimPercent != that1.ValidatorSetTrimPercent { - return false - } - return true + // 757 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcd, 0x6e, 0xeb, 0x44, + 0x14, 0xae, 0xf3, 0x9f, 0xc9, 0x2f, 0xd3, 0x16, 0x19, 0x16, 0x71, 0x88, 0xa8, 0x08, 0xa0, 0x26, + 0x84, 0x08, 0x58, 0xc0, 0x06, 0x03, 0x12, 0x5d, 0x14, 0x55, 0x43, 0xe9, 0x82, 0x05, 0xd6, 0xc4, + 0x33, 0x72, 0xac, 0x24, 0x1e, 0x6b, 0x66, 0x12, 0x9a, 0xb7, 0xe0, 0x05, 0xd8, 0xf0, 0x0c, 0xbc, + 0xc3, 0xbd, 0xcb, 0x2e, 0xef, 0xca, 0xba, 0x6a, 0x77, 0x7e, 0x84, 0xbb, 0xba, 0xf2, 0xb1, 0xe3, + 0x34, 0xb9, 0xeb, 0xbb, 0xf2, 0x39, 0xdf, 0xf7, 0xcd, 0xf8, 0x9c, 0x33, 0xdf, 0x0c, 0xfa, 0x54, + 0x71, 0x46, 0xdd, 0x39, 0xf5, 0x83, 0xf1, 0x8c, 0x6a, 0x77, 0xee, 0x07, 0xde, 0x78, 0x33, 0xc9, + 0xe3, 0x51, 0x28, 0x85, 0x16, 0xf8, 0x3c, 0x57, 0x8d, 0x72, 0x66, 0x33, 0xf9, 0xf8, 0xcc, 0x13, + 0x9e, 0x00, 0xc5, 0x38, 0x89, 0x52, 0xf1, 0xe0, 0xdf, 0x02, 0x2a, 0xdb, 0x89, 0x0a, 0x7f, 0x82, + 0x9a, 0x20, 0x77, 0x82, 0xf5, 0x6a, 0xc6, 0xa5, 0x69, 0xf4, 0x8d, 0x61, 0x89, 0x34, 0x00, 0xfb, + 0x0d, 0x20, 0x90, 0x2c, 0x85, 0xbb, 0x70, 0xe6, 0xdc, 0xf7, 0xe6, 0xda, 0x2c, 0xf4, 0x8d, 0x61, + 0x91, 0x34, 0x00, 0xfb, 0x15, 0x20, 0xfc, 0x1d, 0x32, 0xdd, 0xb5, 0x94, 0x3c, 0xd0, 0x0e, 0xa3, + 0x9a, 0x3a, 0x92, 0xab, 0xf5, 0x52, 0x3b, 0x52, 0x08, 0x6d, 0x16, 0xfb, 0xc6, 0xb0, 0x4e, 0xce, + 0x33, 0xfe, 0x67, 0xaa, 0x29, 0x01, 0x96, 0x08, 0xa1, 0xf1, 0x10, 0x75, 0xdf, 0x59, 0x50, 0x82, + 0x05, 0x6d, 0x76, 0xa8, 0xbc, 0x40, 0xed, 0x0d, 0x5d, 0xfa, 0x8c, 0x6a, 0x21, 0x53, 0x5d, 0x19, + 0x74, 0xad, 0x1c, 0x05, 0xd9, 0x47, 0xa8, 0x96, 0xf6, 0xe3, 0x33, 0xb3, 0xd2, 0x37, 0x86, 0x4d, + 0x52, 0x85, 0xfc, 0x8a, 0xe1, 0xcf, 0x51, 0x37, 0x94, 0x62, 0xe3, 0x07, 0x9e, 0xb3, 0xe2, 0x9a, + 0x26, 0xfb, 0x9b, 0x55, 0x90, 0x74, 0x32, 0xfc, 0x3a, 0x83, 0x07, 0x13, 0x74, 0xbe, 0x2f, 0xf4, + 0x56, 0x72, 0xfe, 0x4b, 0xa0, 0xa5, 0xcf, 0x15, 0x36, 0x51, 0x95, 0xa7, 0xa1, 0x69, 0xf4, 0x8b, + 0xc9, 0xee, 0x59, 0x3a, 0x78, 0x61, 0x20, 0x7c, 0xb7, 0x2b, 0x65, 0xb7, 0x64, 0x8b, 0xff, 0x42, + 0x1f, 0xec, 0xcb, 0xa6, 0x8c, 0x49, 0xae, 0x14, 0x0c, 0xb9, 0x69, 0x4f, 0xde, 0x44, 0xd6, 0xa5, + 0xe7, 0xeb, 0xf9, 0x7a, 0x36, 0x72, 0xc5, 0x6a, 0xec, 0x0a, 0xb5, 0x12, 0x2a, 0xfb, 0x5c, 0x2a, + 0xb6, 0x18, 0xeb, 0x6d, 0xc8, 0xd5, 0xe8, 0x8e, 0x2e, 0x7f, 0x4c, 0x17, 0x92, 0x6e, 0xbe, 0x57, + 0x86, 0xe0, 0xaf, 0xd0, 0xd9, 0x46, 0xe8, 0xa4, 0xa7, 0x50, 0xfc, 0xcd, 0xa5, 0x13, 0x72, 0xe9, + 0xf2, 0x20, 0x3d, 0xa4, 0x16, 0xc1, 0x29, 0x77, 0x93, 0x50, 0x37, 0x29, 0x83, 0x2d, 0xd4, 0xe0, + 0x7a, 0x9e, 0xd7, 0x52, 0x84, 0x09, 0x20, 0xae, 0xe7, 0xd9, 0x96, 0x83, 0xff, 0x0c, 0xd4, 0x01, + 0x73, 0xfc, 0xee, 0x7b, 0x01, 0xd5, 0x6b, 0xc9, 0xd5, 0x7b, 0x6f, 0x63, 0x8c, 0x4e, 0x15, 0x77, + 0xc3, 0xaf, 0xbf, 0xf9, 0x76, 0x31, 0x71, 0xd4, 0xee, 0xbf, 0xd0, 0x45, 0x93, 0xe0, 0x9c, 0xca, + 0x2b, 0x1a, 0xfc, 0x5f, 0x42, 0x68, 0x7f, 0x44, 0xf8, 0x43, 0x54, 0xf0, 0x19, 0x14, 0x54, 0xb7, + 0x2b, 0x71, 0x64, 0x15, 0x7c, 0x46, 0x0a, 0x3e, 0xc3, 0x3d, 0x54, 0x66, 0x32, 0xf1, 0x42, 0x01, + 0xa8, 0x7a, 0x1c, 0x59, 0x29, 0x40, 0x4a, 0x4c, 0x5e, 0x31, 0xfc, 0x3d, 0xea, 0x30, 0xe9, 0x1c, + 0xd8, 0x3b, 0x19, 0x48, 0xc9, 0x3e, 0x8d, 0x23, 0xeb, 0x98, 0x22, 0x2d, 0x26, 0xed, 0x67, 0xae, + 0xbf, 0x40, 0xd5, 0x0d, 0x97, 0xca, 0x17, 0x41, 0xea, 0x59, 0xbb, 0x11, 0x47, 0xd6, 0x0e, 0x22, + 0xbb, 0x00, 0x4f, 0x8f, 0xee, 0x4f, 0x19, 0x7e, 0xd0, 0x8d, 0x23, 0xeb, 0x00, 0x3f, 0xbc, 0x51, + 0x3f, 0xa0, 0x4e, 0x4a, 0x6a, 0x7f, 0xc5, 0x95, 0xa6, 0xab, 0x10, 0xec, 0x9c, 0x15, 0x76, 0x44, + 0x91, 0x36, 0x00, 0xb7, 0xbb, 0x1c, 0x7f, 0x81, 0xea, 0xfc, 0xde, 0xd7, 0x8e, 0x2b, 0x18, 0x07, + 0x8f, 0xb7, 0xec, 0x56, 0x1c, 0x59, 0x7b, 0x90, 0xd4, 0x92, 0xf0, 0x27, 0xc1, 0x38, 0xfe, 0x0c, + 0xd5, 0x3c, 0xaa, 0x9c, 0xb5, 0xe2, 0xcc, 0xac, 0xc1, 0x2f, 0x9a, 0x71, 0x64, 0xe5, 0x18, 0xa9, + 0x7a, 0x54, 0xfd, 0xa1, 0x38, 0xc3, 0x03, 0x54, 0x49, 0xaf, 0xa9, 0x59, 0x87, 0x83, 0x47, 0x71, + 0x64, 0x65, 0x08, 0xc9, 0xbe, 0x49, 0xd9, 0x21, 0xdd, 0xce, 0xa8, 0xbb, 0xc8, 0x5d, 0x82, 0x60, + 0x34, 0x50, 0xf6, 0x11, 0x45, 0xda, 0x19, 0xb0, 0x73, 0xc1, 0x14, 0x35, 0x93, 0x57, 0xcc, 0x09, + 0xe9, 0x76, 0x29, 0x28, 0x33, 0x1b, 0xb0, 0x14, 0x26, 0xf5, 0x1c, 0x27, 0x8d, 0x24, 0xbb, 0x49, + 0x13, 0xfc, 0x25, 0xaa, 0xbb, 0x22, 0x50, 0x3c, 0x50, 0x6b, 0x65, 0x36, 0xfb, 0xc6, 0xb0, 0x96, + 0xf6, 0x9a, 0x83, 0x64, 0x1f, 0xda, 0xd7, 0x2f, 0x1f, 0x7b, 0xc6, 0xc3, 0x63, 0xcf, 0x78, 0xfd, + 0xd8, 0x33, 0xfe, 0x79, 0xea, 0x9d, 0x3c, 0x3c, 0xf5, 0x4e, 0x5e, 0x3d, 0xf5, 0x4e, 0xfe, 0x9c, + 0x3e, 0xb3, 0x70, 0xb2, 0x3d, 0x3c, 0x94, 0xae, 0x58, 0x42, 0x72, 0x99, 0x3e, 0xbf, 0xf7, 0xfb, + 0x07, 0x18, 0x3c, 0x3d, 0xab, 0x80, 0x6a, 0xfa, 0x36, 0x00, 0x00, 0xff, 0xff, 0x07, 0x49, 0xdb, + 0xf5, 0xa3, 0x05, 0x00, 0x00, } + func (m *Batch) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -755,34 +681,6 @@ func (m *BatchSignatures) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *Params) 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 *Params) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.ValidatorSetTrimPercent != 0 { - i = encodeVarintBatching(dAtA, i, uint64(m.ValidatorSetTrimPercent)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - func (m *DataResult) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -981,18 +879,6 @@ func (m *BatchSignatures) Size() (n int) { return n } -func (m *Params) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ValidatorSetTrimPercent != 0 { - n += 1 + sovBatching(uint64(m.ValidatorSetTrimPercent)) - } - return n -} - func (m *DataResult) Size() (n int) { if m == nil { return 0 @@ -1639,75 +1525,6 @@ func (m *BatchSignatures) Unmarshal(dAtA []byte) error { } return nil } -func (m *Params) 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 ErrIntOverflowBatching - } - 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: Params: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Params: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ValidatorSetTrimPercent", wireType) - } - m.ValidatorSetTrimPercent = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowBatching - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ValidatorSetTrimPercent |= uint32(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipBatching(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthBatching - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *DataResult) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/x/batching/types/genesis.go b/x/batching/types/genesis.go index 24b2604e..fc23f7c1 100644 --- a/x/batching/types/genesis.go +++ b/x/batching/types/genesis.go @@ -9,7 +9,6 @@ func NewGenesisState( batchData []BatchData, dataResults []DataResult, batchAssignments []BatchAssignment, - params Params, ) GenesisState { return GenesisState{ CurrentBatchNumber: curBatchNum, @@ -17,13 +16,12 @@ func NewGenesisState( BatchData: batchData, DataResults: dataResults, BatchAssignments: batchAssignments, - Params: params, } } // DefaultGenesisState creates a default GenesisState object. func DefaultGenesisState() *GenesisState { - state := NewGenesisState(collections.DefaultSequenceStart, nil, nil, nil, nil, DefaultParams()) + state := NewGenesisState(collections.DefaultSequenceStart, nil, nil, nil, nil) return &state } diff --git a/x/batching/types/genesis.pb.go b/x/batching/types/genesis.pb.go index 668c2aa6..f8be3b8e 100644 --- a/x/batching/types/genesis.pb.go +++ b/x/batching/types/genesis.pb.go @@ -32,7 +32,6 @@ type GenesisState struct { BatchData []BatchData `protobuf:"bytes,3,rep,name=batch_data,json=batchData,proto3" json:"batch_data"` DataResults []DataResult `protobuf:"bytes,4,rep,name=data_results,json=dataResults,proto3" json:"data_results"` BatchAssignments []BatchAssignment `protobuf:"bytes,5,rep,name=batch_assignments,json=batchAssignments,proto3" json:"batch_assignments"` - Params Params `protobuf:"bytes,6,opt,name=params,proto3" json:"params"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -103,13 +102,6 @@ func (m *GenesisState) GetBatchAssignments() []BatchAssignment { return nil } -func (m *GenesisState) GetParams() Params { - if m != nil { - return m.Params - } - return Params{} -} - // BatchAssignment represents a batch assignment for genesis export // and import. type BatchAssignment struct { @@ -244,38 +236,37 @@ func init() { } var fileDescriptor_eccca5d98d3cb479 = []byte{ - // 495 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x51, 0x8b, 0xd3, 0x40, - 0x10, 0xc7, 0x9b, 0xb6, 0x56, 0x3a, 0xad, 0xd4, 0xae, 0x27, 0x84, 0x43, 0x63, 0xae, 0xca, 0x51, - 0x41, 0x13, 0xef, 0xee, 0x51, 0x5f, 0x3c, 0x3c, 0x44, 0x41, 0x91, 0x9e, 0x28, 0xca, 0x41, 0xd8, - 0x4d, 0x96, 0x34, 0xd0, 0x26, 0x75, 0x77, 0x53, 0xbc, 0x6f, 0xe1, 0xd7, 0xf0, 0x9b, 0x9c, 0x6f, - 0xf7, 0xe8, 0x93, 0x48, 0xfb, 0x45, 0x24, 0xb3, 0x9b, 0xdc, 0x79, 0xb4, 0xd5, 0xb7, 0x64, 0xe6, - 0x3f, 0xbf, 0xff, 0xee, 0xcc, 0x0e, 0xdc, 0x97, 0x3c, 0xa2, 0xe1, 0x98, 0x26, 0xa9, 0xcf, 0xa8, - 0x0a, 0xc7, 0x49, 0x1a, 0xfb, 0xf3, 0x3d, 0x3f, 0xe6, 0x29, 0x97, 0x89, 0xf4, 0x66, 0x22, 0x53, - 0x19, 0xb9, 0x5d, 0x89, 0xbc, 0x52, 0xe4, 0xcd, 0xf7, 0xb6, 0xb7, 0xe2, 0x2c, 0xce, 0x50, 0xe1, - 0x17, 0x5f, 0x5a, 0xbc, 0xfd, 0x60, 0x35, 0xb1, 0x2a, 0x44, 0xd5, 0xe0, 0x7b, 0x03, 0xba, 0x2f, - 0xb5, 0xc9, 0xb1, 0xa2, 0x8a, 0x93, 0x27, 0xb0, 0x15, 0xe6, 0x42, 0xf0, 0x54, 0x05, 0x28, 0x0d, - 0xd2, 0x7c, 0xca, 0xb8, 0xb0, 0x2d, 0xd7, 0x1a, 0x36, 0x47, 0xc4, 0xe4, 0x0e, 0x8b, 0xd4, 0x5b, - 0xcc, 0x90, 0x67, 0x70, 0x1d, 0x95, 0x5c, 0xda, 0x75, 0xb7, 0x31, 0xec, 0xec, 0xdf, 0xf1, 0x56, - 0x9e, 0xd3, 0xc3, 0xa2, 0xc3, 0xe6, 0xd9, 0xaf, 0x7b, 0xb5, 0x51, 0x59, 0x42, 0x8e, 0x00, 0xb4, - 0x4f, 0x44, 0x15, 0xb5, 0x1b, 0x08, 0x70, 0x37, 0x01, 0x5e, 0x50, 0x45, 0x0d, 0xa4, 0xcd, 0xca, - 0x00, 0x79, 0x0d, 0xdd, 0x02, 0x10, 0x08, 0x2e, 0xf3, 0x89, 0x92, 0x76, 0x13, 0x41, 0x3b, 0x6b, - 0x40, 0x45, 0xc9, 0x08, 0x95, 0x86, 0xd4, 0x89, 0xaa, 0x88, 0x24, 0x9f, 0xa0, 0xaf, 0x8f, 0x44, - 0xa5, 0x4c, 0xe2, 0x74, 0xca, 0x53, 0x25, 0xed, 0x6b, 0x08, 0xdc, 0xdd, 0x74, 0xb2, 0xe7, 0x95, - 0xdc, 0x50, 0x6f, 0xb2, 0xbf, 0xc3, 0x92, 0x3c, 0x85, 0xd6, 0x8c, 0x0a, 0x3a, 0x95, 0x76, 0xcb, - 0xb5, 0x86, 0x9d, 0xfd, 0xbb, 0x6b, 0x78, 0xef, 0x50, 0x64, 0x30, 0xa6, 0x64, 0x70, 0x02, 0xbd, - 0x2b, 0x3e, 0x64, 0x07, 0xba, 0x2b, 0xa6, 0xd4, 0x61, 0x97, 0xc6, 0xb3, 0x0b, 0x3d, 0xd3, 0x99, - 0x2f, 0x39, 0x97, 0x2a, 0x48, 0x22, 0xbb, 0xee, 0x5a, 0xc3, 0xf6, 0xe8, 0x86, 0xbe, 0x33, 0x46, - 0x5f, 0x45, 0x83, 0x1f, 0x75, 0x68, 0x57, 0x0d, 0xfe, 0x1f, 0x30, 0x83, 0x5b, 0x97, 0x5a, 0x1e, - 0xf0, 0x54, 0x89, 0x04, 0xdf, 0x40, 0x71, 0xb1, 0x47, 0xff, 0xec, 0xfc, 0x7b, 0xc1, 0xf9, 0x91, - 0xae, 0x31, 0xf7, 0xec, 0x5f, 0x0c, 0xc1, 0x24, 0xc8, 0x09, 0xf4, 0xe7, 0x74, 0x92, 0x44, 0x54, - 0x65, 0xa2, 0x72, 0xd0, 0x8f, 0xe4, 0xe1, 0x1a, 0x87, 0x0f, 0xa5, 0xbe, 0x34, 0x38, 0x2d, 0xa7, - 0x51, 0x91, 0x4a, 0xfa, 0x47, 0xd0, 0x13, 0x0a, 0x8a, 0x7e, 0x52, 0x95, 0x0b, 0x5e, 0x3e, 0x9c, - 0x8d, 0x73, 0x3e, 0xae, 0xd4, 0x86, 0xdc, 0x63, 0x57, 0xc2, 0x6f, 0xce, 0x16, 0x8e, 0x75, 0xbe, - 0x70, 0xac, 0xdf, 0x0b, 0xc7, 0xfa, 0xb6, 0x74, 0x6a, 0xe7, 0x4b, 0xa7, 0xf6, 0x73, 0xe9, 0xd4, - 0x3e, 0x1f, 0xc4, 0x89, 0x1a, 0xe7, 0xcc, 0x0b, 0xb3, 0xa9, 0x5f, 0x58, 0xe0, 0x16, 0x86, 0xd9, - 0x04, 0x7f, 0x1e, 0xeb, 0x75, 0xfd, 0x7a, 0xb1, 0xb0, 0xea, 0x74, 0xc6, 0x25, 0x6b, 0xa1, 0xea, - 0xe0, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xaf, 0xeb, 0x98, 0x25, 0x25, 0x04, 0x00, 0x00, + // 470 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xcf, 0x6b, 0xd4, 0x40, + 0x14, 0xc7, 0x37, 0xdb, 0x55, 0xd9, 0xc9, 0xca, 0xba, 0x63, 0x85, 0x50, 0x24, 0xa6, 0xab, 0x94, + 0x08, 0x9a, 0xd8, 0xf6, 0xea, 0xc5, 0x62, 0x11, 0x05, 0x3d, 0xa4, 0xa2, 0x28, 0x85, 0x30, 0x93, + 0x0c, 0xd9, 0x81, 0xdd, 0x49, 0x9d, 0x99, 0x2c, 0xf6, 0xbf, 0xf0, 0xcf, 0xaa, 0xb7, 0x1e, 0x3d, + 0x89, 0xec, 0x5e, 0xfd, 0x23, 0x24, 0xf3, 0xab, 0xb5, 0x6c, 0x57, 0x6f, 0xc9, 0x7b, 0xdf, 0xf7, + 0x79, 0x6f, 0xbe, 0x8f, 0x07, 0x1e, 0x0a, 0x52, 0xa2, 0x62, 0x82, 0x28, 0x4b, 0x31, 0x92, 0xc5, + 0x84, 0xb2, 0x2a, 0x9d, 0xef, 0xa6, 0x15, 0x61, 0x44, 0x50, 0x91, 0x9c, 0xf0, 0x5a, 0xd6, 0xf0, + 0x9e, 0x13, 0x25, 0x56, 0x94, 0xcc, 0x77, 0xb7, 0x36, 0xab, 0xba, 0xaa, 0x95, 0x22, 0x6d, 0xbf, + 0xb4, 0x78, 0xeb, 0xd1, 0x6a, 0xa2, 0x2b, 0x54, 0xaa, 0xf1, 0xef, 0x2e, 0x18, 0xbc, 0xd2, 0x4d, + 0x8e, 0x24, 0x92, 0x04, 0x3e, 0x03, 0x9b, 0x45, 0xc3, 0x39, 0x61, 0x32, 0x57, 0xd2, 0x9c, 0x35, + 0x33, 0x4c, 0x78, 0xe0, 0x45, 0x5e, 0xdc, 0xcb, 0xa0, 0xc9, 0x1d, 0xb4, 0xa9, 0x77, 0x2a, 0x03, + 0x9f, 0x83, 0x5b, 0x4a, 0x49, 0x44, 0xd0, 0x8d, 0x36, 0x62, 0x7f, 0xef, 0x7e, 0xb2, 0x72, 0xce, + 0x44, 0x15, 0x1d, 0xf4, 0xce, 0x7e, 0x3e, 0xe8, 0x64, 0xb6, 0x04, 0x1e, 0x02, 0xa0, 0xfb, 0x94, + 0x48, 0xa2, 0x60, 0x43, 0x01, 0xa2, 0x75, 0x80, 0x97, 0x48, 0x22, 0x03, 0xe9, 0x63, 0x1b, 0x80, + 0x6f, 0xc0, 0xa0, 0x05, 0xe4, 0x9c, 0x88, 0x66, 0x2a, 0x45, 0xd0, 0x53, 0xa0, 0xed, 0x6b, 0x40, + 0x6d, 0x49, 0xa6, 0x94, 0x86, 0xe4, 0x97, 0x2e, 0x22, 0xe0, 0x27, 0x30, 0xd2, 0x23, 0x21, 0x21, + 0x68, 0xc5, 0x66, 0x84, 0x49, 0x11, 0xdc, 0x50, 0xc0, 0x9d, 0x75, 0x93, 0xbd, 0x70, 0x72, 0x43, + 0xbd, 0x83, 0xff, 0x0e, 0x8b, 0xf1, 0x31, 0x18, 0x5e, 0x91, 0xc2, 0x6d, 0x30, 0x58, 0x61, 0xb4, + 0x8f, 0x2f, 0x39, 0xbc, 0x03, 0x86, 0xe6, 0x71, 0x5f, 0x1a, 0x22, 0x64, 0x4e, 0xcb, 0xa0, 0x1b, + 0x79, 0x71, 0x3f, 0xbb, 0xad, 0xc7, 0x56, 0xd1, 0xd7, 0xe5, 0xf8, 0x7b, 0x17, 0xf4, 0x9d, 0x47, + 0xff, 0x03, 0xc6, 0xe0, 0xee, 0x25, 0xd7, 0x72, 0xc2, 0x24, 0xa7, 0x6a, 0x8d, 0x5e, 0xec, 0xef, + 0x3d, 0xf9, 0xa7, 0x79, 0xef, 0x39, 0x21, 0x87, 0xba, 0xc6, 0xbc, 0x78, 0x74, 0xe1, 0xa3, 0x49, + 0xc0, 0x63, 0x30, 0x9a, 0xa3, 0x29, 0x2d, 0x91, 0xac, 0xb9, 0xeb, 0xa0, 0xf7, 0xfc, 0xf8, 0x9a, + 0x0e, 0x1f, 0xac, 0xde, 0x36, 0x38, 0xb5, 0x86, 0x3a, 0x92, 0xa5, 0x7f, 0x04, 0xda, 0xe4, 0xbc, + 0xf5, 0x13, 0xc9, 0x86, 0x13, 0xbb, 0xfb, 0xb5, 0xab, 0x3a, 0x72, 0x6a, 0x43, 0x1e, 0xe2, 0x2b, + 0xe1, 0xb7, 0x67, 0x8b, 0xd0, 0x3b, 0x5f, 0x84, 0xde, 0xaf, 0x45, 0xe8, 0x7d, 0x5b, 0x86, 0x9d, + 0xf3, 0x65, 0xd8, 0xf9, 0xb1, 0x0c, 0x3b, 0x9f, 0xf7, 0x2b, 0x2a, 0x27, 0x0d, 0x4e, 0x8a, 0x7a, + 0x96, 0xb6, 0x2d, 0xd4, 0x21, 0x15, 0xf5, 0x54, 0xfd, 0x3c, 0xd5, 0x17, 0xf7, 0xf5, 0xe2, 0xe6, + 0xe4, 0xe9, 0x09, 0x11, 0xf8, 0xa6, 0x52, 0xed, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x7a, + 0xd7, 0xd5, 0xe8, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -298,16 +289,6 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - { - size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 if len(m.BatchAssignments) > 0 { for iNdEx := len(m.BatchAssignments) - 1; iNdEx >= 0; iNdEx-- { { @@ -517,8 +498,6 @@ func (m *GenesisState) Size() (n int) { n += 1 + l + sovGenesis(uint64(l)) } } - l = m.Params.Size() - n += 1 + l + sovGenesis(uint64(l)) return n } @@ -754,39 +733,6 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenesis(dAtA[iNdEx:]) diff --git a/x/batching/types/params.go b/x/batching/types/params.go deleted file mode 100644 index 73f6e5c9..00000000 --- a/x/batching/types/params.go +++ /dev/null @@ -1,26 +0,0 @@ -package types - -import ( - errorsmod "cosmossdk.io/errors" - - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" -) - -const ( - DefaultValSetTrimPercent uint32 = 95 // 95% -) - -// DefaultParams returns default batching module parameters. -func DefaultParams() Params { - return Params{ - ValidatorSetTrimPercent: DefaultValSetTrimPercent, - } -} - -// Validate validates the batching module parameters. -func (p *Params) Validate() error { - if p.ValidatorSetTrimPercent > 100 { - return errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "validator set trim percent %d must be between 0 and 100", p.ValidatorSetTrimPercent) - } - return nil -}