From 68e1a218f1889ec8fe5876ea95fd5af951635596 Mon Sep 17 00:00:00 2001 From: zale144 Date: Mon, 23 Sep 2024 09:46:12 +0200 Subject: [PATCH 1/2] Make GenesisInfo nullable --- app/apptesting/test_suite.go | 2 +- app/upgrades/v4/upgrade.go | 2 +- ibctesting/utils_test.go | 2 +- .../dymension/rollapp/query.proto | 2 +- .../dymension/rollapp/rollapp.proto | 2 +- proto/dymensionxyz/dymension/rollapp/tx.proto | 4 +- x/denommetadata/ibc_middleware.go | 4 + x/denommetadata/ibc_middleware_test.go | 8 +- x/denommetadata/types/expected_keepers.go | 2 + x/dymns/keeper/keeper_suite_test.go | 2 +- x/dymns/keeper/rollapp_test.go | 6 +- x/incentives/client/cli/query_test.go | 2 +- x/incentives/keeper/suite_test.go | 2 +- x/rollapp/client/cli/tx_create_rollapp.go | 16 +- x/rollapp/keeper/liveness_test.go | 2 +- .../keeper/msg_server_create_rollapp_test.go | 2 +- .../keeper/msg_server_update_rollapp_test.go | 31 ++++ x/rollapp/keeper/rollapp.go | 30 ++-- x/rollapp/simulation/create_rollapp.go | 2 +- x/rollapp/types/message_create_rollapp.go | 2 +- .../types/message_create_rollapp_test.go | 26 +-- x/rollapp/types/message_update_rollapp.go | 19 ++- .../types/message_update_rollapp_test.go | 18 ++- x/rollapp/types/query.pb.go | 125 +++++++-------- x/rollapp/types/rollapp.go | 2 +- x/rollapp/types/rollapp.pb.go | 108 +++++++------ x/rollapp/types/tx.pb.go | 148 ++++++++++-------- .../msg_server_create_sequencer_test.go | 2 +- x/sequencer/keeper/sequencer_suite_test.go | 2 +- 29 files changed, 330 insertions(+), 245 deletions(-) diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go index 31577885b..6264a7883 100644 --- a/app/apptesting/test_suite.go +++ b/app/apptesting/test_suite.go @@ -56,7 +56,7 @@ func (s *KeeperTestHelper) CreateRollappByName(name string) { InitialSequencer: "*", Alias: strings.ToLower(rand.Str(7)), VmType: rollapptypes.Rollapp_EVM, - GenesisInfo: rollapptypes.GenesisInfo{ + GenesisInfo: &rollapptypes.GenesisInfo{ Bech32Prefix: strings.ToLower(rand.Str(3)), GenesisChecksum: "1234567890abcdefg", InitialSupply: sdk.NewInt(1000), diff --git a/app/upgrades/v4/upgrade.go b/app/upgrades/v4/upgrade.go index 60d3cb64e..d0e24a79e 100644 --- a/app/upgrades/v4/upgrade.go +++ b/app/upgrades/v4/upgrade.go @@ -223,7 +223,7 @@ func ConvertOldRollappToNew(oldRollapp rollapptypes.Rollapp) rollapptypes.Rollap Tagline: "", FeeDenom: nil, }, - GenesisInfo: rollapptypes.GenesisInfo{ + GenesisInfo: &rollapptypes.GenesisInfo{ Bech32Prefix: oldRollapp.RollappId[:5], // placeholder data GenesisChecksum: string(crypto.Sha256([]byte(oldRollapp.RollappId))), // placeholder data NativeDenom: &rollapptypes.DenomMetadata{ diff --git a/ibctesting/utils_test.go b/ibctesting/utils_test.go index ff5545653..49d21d38d 100644 --- a/ibctesting/utils_test.go +++ b/ibctesting/utils_test.go @@ -135,7 +135,7 @@ func (s *utilSuite) createRollapp(transfersEnabled bool, channelID *string) { Telegram: "https://t.me/rolly", X: "https://x.dymension.xyz", }, - rollapptypes.GenesisInfo{ + &rollapptypes.GenesisInfo{ GenesisChecksum: "somechecksum", Bech32Prefix: "eth", NativeDenom: &rollapptypes.DenomMetadata{ diff --git a/proto/dymensionxyz/dymension/rollapp/query.proto b/proto/dymensionxyz/dymension/rollapp/query.proto index 26448d53f..f688ff88f 100644 --- a/proto/dymensionxyz/dymension/rollapp/query.proto +++ b/proto/dymensionxyz/dymension/rollapp/query.proto @@ -109,7 +109,7 @@ message QueryAllRollappRequest { message QueryAllRollappResponse { reserved 1; - repeated QueryGetRollappResponse rollapp = 3 [ (gogoproto.nullable) = false ]; + repeated QueryGetRollappResponse rollapp = 3 [ (gogoproto.nullable) = true ]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/proto/dymensionxyz/dymension/rollapp/rollapp.proto b/proto/dymensionxyz/dymension/rollapp/rollapp.proto index bbf8b61b4..1e3296958 100644 --- a/proto/dymensionxyz/dymension/rollapp/rollapp.proto +++ b/proto/dymensionxyz/dymension/rollapp/rollapp.proto @@ -41,7 +41,7 @@ message Rollapp { // metadata is the rollapp metadata RollappMetadata metadata = 11; // genesis_info keeps immutable rollapp fields - GenesisInfo genesis_info = 12 [(gogoproto.nullable) = false]; + GenesisInfo genesis_info = 12 [(gogoproto.nullable) = true]; // initial_sequencer is an option to preset one or more coma-separated bech32-encoded addresses of the // sequencer(s) that are allowed to initially register and serve for this rollapp. // if left empty, no sequencer is allowed to register. diff --git a/proto/dymensionxyz/dymension/rollapp/tx.proto b/proto/dymensionxyz/dymension/rollapp/tx.proto index 00633ef4b..bf5f4fe17 100644 --- a/proto/dymensionxyz/dymension/rollapp/tx.proto +++ b/proto/dymensionxyz/dymension/rollapp/tx.proto @@ -37,7 +37,7 @@ message MsgCreateRollapp { // metadata is the rollapp metadata RollappMetadata metadata = 13; // genesis_info is the genesis information - GenesisInfo genesis_info = 14 [(gogoproto.nullable) = false ]; + GenesisInfo genesis_info = 14 [(gogoproto.nullable) = true ]; // vm_type is the type of rollapp machine: EVM or WASM Rollapp.VMType vm_type = 15; } @@ -59,7 +59,7 @@ message MsgUpdateRollappInformation { // metadata is the rollapp metadata RollappMetadata metadata = 5 [(gogoproto.nullable) = true ]; // genesis_info is the genesis information - GenesisInfo genesis_info = 6 [(gogoproto.nullable) = false ]; + GenesisInfo genesis_info = 6 [(gogoproto.nullable) = true ]; } message MsgUpdateRollappInformationResponse { diff --git a/x/denommetadata/ibc_middleware.go b/x/denommetadata/ibc_middleware.go index b9276c1dc..dcbd7c4c2 100644 --- a/x/denommetadata/ibc_middleware.go +++ b/x/denommetadata/ibc_middleware.go @@ -90,6 +90,10 @@ func (im IBCModule) OnRecvPacket( return uevent.NewErrorAcknowledgement(ctx, gerrc.ErrNotFound) } + if im.keeper.HasDenomMetadata(ctx, ibcDenom) { + return im.IBCModule.OnRecvPacket(ctx, packet, relayer) + } + dm.Base = ibcDenom dm.DenomUnits[0].Denom = dm.Base diff --git a/x/denommetadata/ibc_middleware_test.go b/x/denommetadata/ibc_middleware_test.go index b9ed3e6ca..60798e5d9 100644 --- a/x/denommetadata/ibc_middleware_test.go +++ b/x/denommetadata/ibc_middleware_test.go @@ -596,7 +596,7 @@ func (m *mockIBCModule) OnRecvPacket(_ sdk.Context, p channeltypes.Packet, _ sdk return emptyResult } -func (m *mockIBCModule) OnAcknowledgementPacket(_ sdk.Context, _ channeltypes.Packet, ack []byte, _ sdk.AccAddress) error { +func (m *mockIBCModule) OnAcknowledgementPacket(sdk.Context, channeltypes.Packet, []byte, sdk.AccAddress) error { return nil } @@ -604,7 +604,11 @@ type mockDenomMetadataKeeper struct { hasDenomMetaData, created bool } -func (m *mockDenomMetadataKeeper) CreateDenomMetadata(ctx sdk.Context, metadata banktypes.Metadata) error { +func (m *mockDenomMetadataKeeper) HasDenomMetadata(sdk.Context, string) bool { + return true +} + +func (m *mockDenomMetadataKeeper) CreateDenomMetadata(sdk.Context, banktypes.Metadata) error { m.created = true return nil } diff --git a/x/denommetadata/types/expected_keepers.go b/x/denommetadata/types/expected_keepers.go index 374281ce1..3fb289268 100644 --- a/x/denommetadata/types/expected_keepers.go +++ b/x/denommetadata/types/expected_keepers.go @@ -3,6 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/bank/types" + rollapptypes "github.com/dymensionxyz/dymension/v3/x/rollapp/types" ) @@ -14,6 +15,7 @@ type BankKeeper interface { type DenomMetadataKeeper interface { CreateDenomMetadata(ctx sdk.Context, metadata types.Metadata) error + HasDenomMetadata(ctx sdk.Context, base string) bool } type RollappKeeper interface { diff --git a/x/dymns/keeper/keeper_suite_test.go b/x/dymns/keeper/keeper_suite_test.go index ef78966f7..8e0b4e6f0 100644 --- a/x/dymns/keeper/keeper_suite_test.go +++ b/x/dymns/keeper/keeper_suite_test.go @@ -278,7 +278,7 @@ func (s *KeeperTestSuite) persistRollApp(ras ...rollapp) { s.rollAppKeeper.SetRollapp(s.ctx, rollapptypes.Rollapp{ RollappId: ra.rollAppId, Owner: ra.owner, - GenesisInfo: rollapptypes.GenesisInfo{ + GenesisInfo: &rollapptypes.GenesisInfo{ Bech32Prefix: ra.bech32, }, }) diff --git a/x/dymns/keeper/rollapp_test.go b/x/dymns/keeper/rollapp_test.go index 1d840c53f..e27e436ed 100644 --- a/x/dymns/keeper/rollapp_test.go +++ b/x/dymns/keeper/rollapp_test.go @@ -166,21 +166,21 @@ func (s *KeeperTestSuite) TestKeeper_GetRollAppBech32Prefix() { rollApp1 := rollapptypes.Rollapp{ RollappId: "rollapp_1-1", Owner: testAddr(0).bech32(), - GenesisInfo: rollapptypes.GenesisInfo{ + GenesisInfo: &rollapptypes.GenesisInfo{ Bech32Prefix: "one", }, } rollApp2 := rollapptypes.Rollapp{ RollappId: "rolling_2-2", Owner: testAddr(0).bech32(), - GenesisInfo: rollapptypes.GenesisInfo{ + GenesisInfo: &rollapptypes.GenesisInfo{ Bech32Prefix: "two", }, } rollApp3NonExists := rollapptypes.Rollapp{ RollappId: "nah_3-3", Owner: testAddr(0).bech32(), - GenesisInfo: rollapptypes.GenesisInfo{ + GenesisInfo: &rollapptypes.GenesisInfo{ Bech32Prefix: "three", }, } diff --git a/x/incentives/client/cli/query_test.go b/x/incentives/client/cli/query_test.go index f61aeb62d..1f6e907ef 100644 --- a/x/incentives/client/cli/query_test.go +++ b/x/incentives/client/cli/query_test.go @@ -34,7 +34,7 @@ func (suite *QueryTestSuite) CreateDefaultRollapp() string { RollappId: urand.RollappID(), Alias: strings.ToLower(tmrand.Str(7)), VmType: rollapptypes.Rollapp_EVM, - GenesisInfo: rollapptypes.GenesisInfo{ + GenesisInfo: &rollapptypes.GenesisInfo{ Bech32Prefix: strings.ToLower(tmrand.Str(3)), }, } diff --git a/x/incentives/keeper/suite_test.go b/x/incentives/keeper/suite_test.go index eccb86390..80990052c 100644 --- a/x/incentives/keeper/suite_test.go +++ b/x/incentives/keeper/suite_test.go @@ -214,7 +214,7 @@ func (suite *KeeperTestSuite) CreateDefaultRollapp(addr sdk.AccAddress) string { InitialSequencer: addr.String(), Alias: strings.ToLower(tmrand.Str(7)), VmType: rollapptypes.Rollapp_EVM, - GenesisInfo: rollapptypes.GenesisInfo{ + GenesisInfo: &rollapptypes.GenesisInfo{ Bech32Prefix: strings.ToLower(tmrand.Str(3)), GenesisChecksum: "checksum", NativeDenom: &rollapptypes.DenomMetadata{ diff --git a/x/rollapp/client/cli/tx_create_rollapp.go b/x/rollapp/client/cli/tx_create_rollapp.go index 0d6ada235..d1da32b33 100644 --- a/x/rollapp/client/cli/tx_create_rollapp.go +++ b/x/rollapp/client/cli/tx_create_rollapp.go @@ -69,44 +69,44 @@ func CmdCreateRollapp() *cobra.Command { return cmd } -func parseGenesisInfo(cmd *cobra.Command) (types.GenesisInfo, error) { +func parseGenesisInfo(cmd *cobra.Command) (*types.GenesisInfo, error) { var ( - genesisInfo types.GenesisInfo + genesisInfo = &types.GenesisInfo{} err error ok bool ) genesisInfo.GenesisChecksum, err = cmd.Flags().GetString(FlagGenesisChecksum) if err != nil { - return types.GenesisInfo{}, err + return nil, err } genesisInfo.Bech32Prefix, err = cmd.Flags().GetString(FlagBech32Prefix) if err != nil { - return types.GenesisInfo{}, err + return nil, err } nativeDenomFlag, err := cmd.Flags().GetString(FlagNativeDenom) if err != nil { - return types.GenesisInfo{}, err + return nil, err } if nativeDenomFlag != "" { genesisInfo.NativeDenom = new(types.DenomMetadata) if err = utils.ParseJsonFromFile(nativeDenomFlag, genesisInfo.NativeDenom); err != nil { - return types.GenesisInfo{}, err + return nil, err } } initialSupplyFlag, err := cmd.Flags().GetString(FlagInitialSupply) if err != nil { - return types.GenesisInfo{}, err + return nil, err } if initialSupplyFlag != "" { genesisInfo.InitialSupply, ok = sdk.NewIntFromString(initialSupplyFlag) if !ok { - return types.GenesisInfo{}, fmt.Errorf("invalid initial supply: %s", initialSupplyFlag) + return nil, fmt.Errorf("invalid initial supply: %s", initialSupplyFlag) } } diff --git a/x/rollapp/keeper/liveness_test.go b/x/rollapp/keeper/liveness_test.go index 9b4887b22..8e0d07c94 100644 --- a/x/rollapp/keeper/liveness_test.go +++ b/x/rollapp/keeper/liveness_test.go @@ -87,7 +87,7 @@ func (suite *RollappTestSuite) TestLivenessFlow() { tracker := newLivenessMockSequencerKeeper() suite.keeper().SetSequencerKeeper(tracker) for _, ra := range rollapps { - suite.keeper().SetRollapp(suite.Ctx, types.NewRollapp("", ra, "", types.Rollapp_Unspecified, nil, types.GenesisInfo{}, false)) + suite.keeper().SetRollapp(suite.Ctx, types.NewRollapp("", ra, "", types.Rollapp_Unspecified, nil, nil, false)) } hLastUpdate := map[string]int64{} diff --git a/x/rollapp/keeper/msg_server_create_rollapp_test.go b/x/rollapp/keeper/msg_server_create_rollapp_test.go index 4ee861a61..99b265b79 100644 --- a/x/rollapp/keeper/msg_server_create_rollapp_test.go +++ b/x/rollapp/keeper/msg_server_create_rollapp_test.go @@ -383,7 +383,7 @@ var mockRollappMetadata = types.RollappMetadata{ X: "https://x.dymension.xyz", } -var mockGenesisInfo = types.GenesisInfo{ +var mockGenesisInfo = &types.GenesisInfo{ Bech32Prefix: "rol", GenesisChecksum: "checksum", NativeDenom: &types.DenomMetadata{ diff --git a/x/rollapp/keeper/msg_server_update_rollapp_test.go b/x/rollapp/keeper/msg_server_update_rollapp_test.go index 1a66b8282..ad09914f4 100644 --- a/x/rollapp/keeper/msg_server_update_rollapp_test.go +++ b/x/rollapp/keeper/msg_server_update_rollapp_test.go @@ -176,6 +176,37 @@ func (suite *RollappTestSuite) TestUpdateRollapp() { }, }, }, + }, { + name: "Update rollapp: success - unsealed, update rollapp without genesis info", + update: &types.MsgUpdateRollappInformation{ + Owner: alice, + RollappId: rollappId, + }, + rollappLaunched: true, + genInfoSealed: false, + expError: nil, + expRollapp: types.Rollapp{ + RollappId: rollappId, + Owner: alice, + InitialSequencer: "", + ChannelId: "", + Frozen: false, + RegisteredDenoms: nil, + Launched: false, + VmType: types.Rollapp_EVM, + Metadata: &mockRollappMetadata, + GenesisInfo: &types.GenesisInfo{ + Bech32Prefix: "old", + GenesisChecksum: "old", + InitialSupply: sdk.NewInt(1000), + NativeDenom: &types.DenomMetadata{ + Display: "OLD", + Base: "aold", + Exponent: 18, + }, + Sealed: false, + }, + }, }, } diff --git a/x/rollapp/keeper/rollapp.go b/x/rollapp/keeper/rollapp.go index 85ff6e8ac..fd9b09f1f 100644 --- a/x/rollapp/keeper/rollapp.go +++ b/x/rollapp/keeper/rollapp.go @@ -31,7 +31,7 @@ func (k Keeper) CheckAndUpdateRollappFields(ctx sdk.Context, update *types.MsgUp return current, types.ErrImmutableFieldUpdateAfterLaunched } - if update.UpdatingGenesisInfo() && current.GenesisInfo.Sealed { + if update.UpdatingGenesisInfo() && current.GenesisInfo != nil && current.GenesisInfo.Sealed { return current, types.ErrGenesisInfoSealed } @@ -39,20 +39,22 @@ func (k Keeper) CheckAndUpdateRollappFields(ctx sdk.Context, update *types.MsgUp current.InitialSequencer = update.InitialSequencer } - if update.GenesisInfo.GenesisChecksum != "" { - current.GenesisInfo.GenesisChecksum = update.GenesisInfo.GenesisChecksum - } + if update.GenesisInfo != nil { + if update.GenesisInfo.GenesisChecksum != "" { + current.GenesisInfo.GenesisChecksum = update.GenesisInfo.GenesisChecksum + } - if update.GenesisInfo.Bech32Prefix != "" { - current.GenesisInfo.Bech32Prefix = update.GenesisInfo.Bech32Prefix - } + if update.GenesisInfo.Bech32Prefix != "" { + current.GenesisInfo.Bech32Prefix = update.GenesisInfo.Bech32Prefix + } - if update.GenesisInfo.NativeDenom != nil { - current.GenesisInfo.NativeDenom = update.GenesisInfo.NativeDenom - } + if update.GenesisInfo.NativeDenom != nil { + current.GenesisInfo.NativeDenom = update.GenesisInfo.NativeDenom + } - if !update.GenesisInfo.InitialSupply.IsNil() { - current.GenesisInfo.InitialSupply = update.GenesisInfo.InitialSupply + if !update.GenesisInfo.InitialSupply.IsNil() { + current.GenesisInfo.InitialSupply = update.GenesisInfo.InitialSupply + } } if update.Metadata != nil && !update.Metadata.IsEmpty() { @@ -142,6 +144,10 @@ func (k Keeper) SealRollappGenesisInfo(ctx sdk.Context, rollappId string) error return gerrc.ErrNotFound } + if rollapp.GenesisInfo == nil { + return errorsmod.Wrap(gerrc.ErrFailedPrecondition, "genesis info not set") + } + if rollapp.GenesisInfo.Sealed { return errorsmod.Wrap(gerrc.ErrFailedPrecondition, "genesis info already sealed") } diff --git a/x/rollapp/simulation/create_rollapp.go b/x/rollapp/simulation/create_rollapp.go index 997559856..0ba44f879 100644 --- a/x/rollapp/simulation/create_rollapp.go +++ b/x/rollapp/simulation/create_rollapp.go @@ -41,7 +41,7 @@ func SimulateMsgCreateRollapp(ak simulationtypes.AccountKeeper, bk simulationtyp Telegram: "https://t.me/rolly", X: "https://x.dymension.xyz", }, - GenesisInfo: types.GenesisInfo{ + GenesisInfo: &types.GenesisInfo{ GenesisChecksum: "checksum", Bech32Prefix: "bech", NativeDenom: &types.DenomMetadata{ diff --git a/x/rollapp/types/message_create_rollapp.go b/x/rollapp/types/message_create_rollapp.go index 109a95058..d12c94add 100644 --- a/x/rollapp/types/message_create_rollapp.go +++ b/x/rollapp/types/message_create_rollapp.go @@ -15,7 +15,7 @@ func NewMsgCreateRollapp( alias string, vmType Rollapp_VMType, metadata *RollappMetadata, - genesisInfo GenesisInfo, + genesisInfo *GenesisInfo, ) *MsgCreateRollapp { return &MsgCreateRollapp{ Creator: creator, diff --git a/x/rollapp/types/message_create_rollapp_test.go b/x/rollapp/types/message_create_rollapp_test.go index 882b47b3a..9b919e1ae 100644 --- a/x/rollapp/types/message_create_rollapp_test.go +++ b/x/rollapp/types/message_create_rollapp_test.go @@ -28,7 +28,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) { InitialSequencer: sample.AccAddress(), Alias: "Rollapp", VmType: Rollapp_EVM, - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -55,7 +55,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) { RollappId: " ", Alias: "Rollapp", VmType: Rollapp_EVM, - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -72,7 +72,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) { RollappId: "dym_100-1", Alias: "Rollapp", VmType: Rollapp_EVM, - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -89,7 +89,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) { RollappId: "dym_100-1", Alias: "Rollapp", VmType: Rollapp_EVM, - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -105,7 +105,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) { RollappId: "dym_100-1", Alias: "Rollapp", VmType: Rollapp_EVM, - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -122,7 +122,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) { RollappId: "dym_100-1", Alias: "Rollapp", VmType: Rollapp_WASM, - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -139,7 +139,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) { RollappId: "dym_100-1", Alias: "Rollapp", VmType: Rollapp_WASM, - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -158,7 +158,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) { RollappId: "dym_100-1", Alias: "Rollapp", VmType: Rollapp_EVM, - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -175,7 +175,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) { RollappId: "dym_100-1", Alias: "Rollapp", VmType: Rollapp_EVM, - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: "DYM", GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -192,7 +192,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) { RollappId: "dym_100-1", Alias: "alias", VmType: Rollapp_EVM, - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -214,7 +214,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) { RollappId: "dym_100-1", Alias: "alias", VmType: Rollapp_EVM, - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: strings.Repeat("a", maxGenesisChecksumLength+1), NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -231,7 +231,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) { RollappId: "dym_100-1", Alias: "alias", VmType: Rollapp_EVM, - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -251,7 +251,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) { RollappId: "dym_100-1", Alias: "alias", VmType: Rollapp_EVM, - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, diff --git a/x/rollapp/types/message_update_rollapp.go b/x/rollapp/types/message_update_rollapp.go index 73e3f47b0..0e277a119 100644 --- a/x/rollapp/types/message_update_rollapp.go +++ b/x/rollapp/types/message_update_rollapp.go @@ -17,7 +17,7 @@ func NewMsgUpdateRollappInformation( rollappId, initSequencer string, metadata *RollappMetadata, - genesisInfo GenesisInfo, + genesisInfo *GenesisInfo, ) *MsgUpdateRollappInformation { return &MsgUpdateRollappInformation{ Owner: creator, @@ -57,13 +57,15 @@ func (msg *MsgUpdateRollappInformation) ValidateBasic() error { } } - if len(msg.GenesisInfo.GenesisChecksum) > maxGenesisChecksumLength { - return ErrInvalidGenesisChecksum - } + if msg.GenesisInfo != nil { + if len(msg.GenesisInfo.GenesisChecksum) > maxGenesisChecksumLength { + return ErrInvalidGenesisChecksum + } - if msg.GenesisInfo.Bech32Prefix != "" { - if err := validateBech32Prefix(msg.GenesisInfo.Bech32Prefix); err != nil { - return errorsmod.Wrap(errors.Join(err, gerrc.ErrInvalidArgument), "bech32 prefix") + if msg.GenesisInfo.Bech32Prefix != "" { + if err := validateBech32Prefix(msg.GenesisInfo.Bech32Prefix); err != nil { + return errorsmod.Wrap(errors.Join(err, gerrc.ErrInvalidArgument), "bech32 prefix") + } } } @@ -81,6 +83,9 @@ func (msg *MsgUpdateRollappInformation) UpdatingImmutableValues() bool { } func (msg *MsgUpdateRollappInformation) UpdatingGenesisInfo() bool { + if msg.GenesisInfo == nil { + return false + } return msg.GenesisInfo.GenesisChecksum != "" || msg.GenesisInfo.Bech32Prefix != "" || msg.GenesisInfo.NativeDenom != nil || diff --git a/x/rollapp/types/message_update_rollapp_test.go b/x/rollapp/types/message_update_rollapp_test.go index 245db358d..ec8490427 100644 --- a/x/rollapp/types/message_update_rollapp_test.go +++ b/x/rollapp/types/message_update_rollapp_test.go @@ -22,7 +22,7 @@ func TestMsgUpdateRollappInformation_ValidateBasic(t *testing.T) { Owner: sample.AccAddress(), RollappId: "dym_100-1", InitialSequencer: sample.AccAddress(), - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -51,7 +51,7 @@ func TestMsgUpdateRollappInformation_ValidateBasic(t *testing.T) { Owner: sample.AccAddress(), InitialSequencer: "invalid_address", RollappId: "dym_100-1", - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -66,7 +66,7 @@ func TestMsgUpdateRollappInformation_ValidateBasic(t *testing.T) { Owner: sample.AccAddress(), InitialSequencer: sample.AccAddress(), RollappId: "dym_100-1", - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "checksum", NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -86,7 +86,7 @@ func TestMsgUpdateRollappInformation_ValidateBasic(t *testing.T) { Owner: sample.AccAddress(), InitialSequencer: sample.AccAddress(), RollappId: "dym_100-1", - GenesisInfo: GenesisInfo{ + GenesisInfo: &GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: strings.Repeat("a", maxGenesisChecksumLength+1), NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, @@ -95,6 +95,16 @@ func TestMsgUpdateRollappInformation_ValidateBasic(t *testing.T) { }, err: ErrInvalidGenesisChecksum, }, + { + name: "valid: updating without genesis info", + msg: MsgUpdateRollappInformation{ + Owner: sample.AccAddress(), + InitialSequencer: sample.AccAddress(), + RollappId: "dym_100-1", + GenesisInfo: nil, + }, + err: nil, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/x/rollapp/types/query.pb.go b/x/rollapp/types/query.pb.go index a6409c7ec..258d8f07e 100644 --- a/x/rollapp/types/query.pb.go +++ b/x/rollapp/types/query.pb.go @@ -526,8 +526,8 @@ func (m *QueryAllRollappRequest) GetOmitApps() bool { } type QueryAllRollappResponse struct { - Rollapp []QueryGetRollappResponse `protobuf:"bytes,3,rep,name=rollapp,proto3" json:"rollapp"` - Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` + Rollapp []*QueryGetRollappResponse `protobuf:"bytes,3,rep,name=rollapp,proto3" json:"rollapp,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryAllRollappResponse) Reset() { *m = QueryAllRollappResponse{} } @@ -563,7 +563,7 @@ func (m *QueryAllRollappResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAllRollappResponse proto.InternalMessageInfo -func (m *QueryAllRollappResponse) GetRollapp() []QueryGetRollappResponse { +func (m *QueryAllRollappResponse) GetRollapp() []*QueryGetRollappResponse { if m != nil { return m.Rollapp } @@ -710,65 +710,66 @@ func init() { } var fileDescriptor_00a0238fb38306fa = []byte{ - // 928 bytes of a gzipped FileDescriptorProto + // 929 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0x38, 0xae, 0x13, 0xbf, 0x22, 0x11, 0x0d, 0x51, 0x08, 0x6e, 0xe4, 0x46, 0x8b, 0xd4, - 0xba, 0x05, 0xed, 0xc8, 0x09, 0x6e, 0xa9, 0x02, 0xa5, 0x8e, 0xa0, 0x21, 0x15, 0x54, 0x61, 0x03, - 0x42, 0x80, 0x50, 0xb4, 0xa9, 0x27, 0x9b, 0x45, 0xeb, 0x9d, 0xad, 0x67, 0x53, 0xd9, 0x8d, 0x72, - 0x41, 0x7c, 0x00, 0x24, 0x3e, 0x01, 0x5f, 0x80, 0x2b, 0x67, 0xc4, 0x25, 0x07, 0x0e, 0x91, 0x90, - 0x10, 0x17, 0x10, 0x4a, 0xf8, 0x0e, 0x5c, 0x91, 0x67, 0xde, 0xae, 0xd7, 0xeb, 0x24, 0xbb, 0xb6, - 0x7a, 0x72, 0x66, 0xf2, 0xde, 0xef, 0xfd, 0x7e, 0xf3, 0xfe, 0x2d, 0xdc, 0x6e, 0xf5, 0xda, 0xdc, - 0x97, 0xae, 0xf0, 0xbb, 0xbd, 0xe7, 0x2c, 0x3e, 0xb0, 0x8e, 0xf0, 0x3c, 0x3b, 0x08, 0xd8, 0xd3, - 0x03, 0xde, 0xe9, 0x99, 0x41, 0x47, 0x84, 0x82, 0x56, 0x93, 0xb6, 0x66, 0x7c, 0x30, 0xd1, 0xb6, - 0x32, 0xef, 0x08, 0x47, 0x28, 0x53, 0xd6, 0xff, 0x4b, 0x7b, 0x55, 0x96, 0x1c, 0x21, 0x1c, 0x8f, - 0x33, 0x3b, 0x70, 0x99, 0xed, 0xfb, 0x22, 0xb4, 0x43, 0x57, 0xf8, 0x12, 0xff, 0x7b, 0xfb, 0x89, - 0x90, 0x6d, 0x21, 0xd9, 0xae, 0x2d, 0xb9, 0x0e, 0xc6, 0x9e, 0xd5, 0x77, 0x79, 0x68, 0xd7, 0x59, - 0x60, 0x3b, 0xae, 0xaf, 0x8c, 0xd1, 0xf6, 0x8d, 0x0c, 0xae, 0x81, 0xdd, 0xb1, 0xdb, 0x11, 0xf0, - 0x9b, 0x19, 0xc6, 0xf8, 0x8b, 0xd6, 0x2c, 0xc3, 0x5a, 0x86, 0x76, 0xc8, 0x77, 0x5c, 0x7f, 0x2f, - 0x52, 0x55, 0xcb, 0x70, 0x88, 0xa1, 0x8d, 0x79, 0xa0, 0x9f, 0xf4, 0x75, 0x6d, 0x29, 0x76, 0x16, - 0x7f, 0x7a, 0xc0, 0x65, 0x68, 0x7c, 0x05, 0xaf, 0x0c, 0xdd, 0xca, 0x40, 0xf8, 0x92, 0xd3, 0xf7, - 0xa1, 0xa4, 0x55, 0x2c, 0x92, 0x65, 0x52, 0xbb, 0xba, 0x72, 0xc3, 0xbc, 0xfc, 0xcd, 0x4d, 0xed, - 0xbf, 0x5e, 0x3c, 0xfe, 0xfb, 0xfa, 0x94, 0x85, 0xbe, 0xc6, 0x36, 0x2c, 0x28, 0xf0, 0x0d, 0x1e, - 0x5a, 0xda, 0x0e, 0xc3, 0xd2, 0x25, 0x28, 0xa3, 0xe7, 0x66, 0x4b, 0x85, 0x28, 0x5b, 0x83, 0x0b, - 0x7a, 0x0d, 0xca, 0xa2, 0xed, 0x86, 0x3b, 0x76, 0x10, 0xc8, 0xc5, 0xc2, 0x32, 0xa9, 0xcd, 0x5a, - 0xb3, 0xfd, 0x8b, 0x66, 0x10, 0x48, 0xe3, 0x33, 0xa8, 0xa6, 0x40, 0xd7, 0x7b, 0x1f, 0x6c, 0x6e, - 0xd5, 0x1b, 0x8d, 0x08, 0x7c, 0x01, 0x4a, 0xdc, 0x0d, 0xea, 0x8d, 0x86, 0x42, 0x2e, 0x5a, 0x78, - 0xba, 0x1c, 0xf6, 0x0b, 0xb8, 0x16, 0xc1, 0x7e, 0x64, 0x87, 0x5c, 0x86, 0x1f, 0x72, 0xd7, 0xd9, - 0x0f, 0xf3, 0x11, 0x5e, 0x82, 0xf2, 0x9e, 0xeb, 0xdb, 0x9e, 0xfb, 0x9c, 0xb7, 0x10, 0x79, 0x70, - 0x61, 0xdc, 0x81, 0xa5, 0xf3, 0xa1, 0xf1, 0xb1, 0x17, 0xa0, 0xb4, 0xaf, 0x6e, 0x22, 0xbe, 0xfa, - 0x64, 0x7c, 0x0d, 0xd7, 0x87, 0xfd, 0xb6, 0xfb, 0xd9, 0xdf, 0xf4, 0x5b, 0xbc, 0xfb, 0x22, 0x68, - 0x75, 0x61, 0xf9, 0x62, 0x78, 0xa4, 0xf6, 0x29, 0x80, 0x8c, 0x6f, 0xb1, 0x16, 0xcc, 0xac, 0x5a, - 0x40, 0x9c, 0x3d, 0xa1, 0xbc, 0xb0, 0x26, 0x12, 0x38, 0xc6, 0x7f, 0x04, 0x5e, 0x1d, 0x29, 0x0c, - 0x8c, 0xb8, 0x01, 0x33, 0x88, 0x83, 0xe1, 0x6e, 0x66, 0x85, 0x8b, 0xaa, 0x40, 0xc7, 0x89, 0xbc, - 0xe9, 0x63, 0x98, 0x91, 0x07, 0xed, 0xb6, 0xdd, 0xe9, 0x2d, 0x96, 0xf2, 0xf1, 0x46, 0xa0, 0x6d, - 0xed, 0x15, 0xe1, 0x21, 0x08, 0x7d, 0x17, 0x8a, 0xaa, 0x70, 0x66, 0x96, 0xa7, 0x6b, 0x57, 0x57, - 0x5e, 0xcf, 0x02, 0x6b, 0x22, 0x23, 0x62, 0x29, 0xb7, 0x47, 0xc5, 0xd9, 0xc2, 0x5c, 0xc9, 0x38, - 0xc2, 0x8e, 0x68, 0x7a, 0x5e, 0xaa, 0x23, 0x1e, 0x02, 0x0c, 0x06, 0x4d, 0xdc, 0x75, 0x7a, 0x2a, - 0x99, 0xfd, 0xa9, 0x64, 0xea, 0x11, 0x88, 0x53, 0xc9, 0xdc, 0xb2, 0x1d, 0x8e, 0xbe, 0x56, 0xc2, - 0xf3, 0xf2, 0x22, 0xff, 0x25, 0x7a, 0xf8, 0x64, 0x7c, 0x7c, 0xf8, 0xcf, 0x07, 0x0f, 0x3f, 0xad, - 0x24, 0xde, 0xcd, 0x92, 0x78, 0x41, 0x0a, 0xd3, 0x89, 0xd8, 0x18, 0x52, 0x56, 0xc0, 0xa4, 0x66, - 0x29, 0xd3, 0x58, 0x49, 0x69, 0x8f, 0x8a, 0xb3, 0x64, 0xae, 0x60, 0x7c, 0x47, 0x60, 0x31, 0x8a, - 0x1c, 0x57, 0x5a, 0xbe, 0x7e, 0x98, 0x87, 0x2b, 0xae, 0x2a, 0xe4, 0x82, 0xea, 0x33, 0x7d, 0x48, - 0xb4, 0xdf, 0x74, 0xb2, 0xfd, 0x86, 0xbb, 0xa7, 0x98, 0xee, 0x9e, 0x6f, 0xe0, 0xb5, 0x73, 0x58, - 0xe0, 0x5b, 0x7e, 0x0c, 0x65, 0x19, 0x5d, 0x62, 0x2e, 0x6f, 0xe5, 0xee, 0x1a, 0x7c, 0xbf, 0x01, - 0xc2, 0xca, 0x1f, 0x00, 0x57, 0x54, 0x30, 0xfa, 0x23, 0x81, 0x92, 0x1e, 0xb5, 0x74, 0x25, 0x57, - 0x7a, 0x86, 0xa6, 0x7d, 0x65, 0x75, 0x2c, 0x1f, 0x2d, 0xc6, 0x30, 0xbf, 0xfd, 0xfd, 0xdf, 0x1f, - 0x0a, 0x35, 0x7a, 0x83, 0xe5, 0xda, 0x7b, 0xf4, 0x67, 0x02, 0x33, 0x58, 0x12, 0xf4, 0xce, 0xd8, - 0x35, 0xa4, 0x89, 0x4e, 0x5a, 0x7b, 0xc6, 0x9a, 0x22, 0xdb, 0xa0, 0xab, 0x2c, 0xdf, 0xde, 0x65, - 0x87, 0x71, 0x79, 0x1c, 0xd1, 0x5f, 0x09, 0xbc, 0x9c, 0xda, 0x29, 0xf4, 0xfe, 0x98, 0x4c, 0x52, - 0xcb, 0x68, 0x72, 0x25, 0x77, 0x95, 0x92, 0x3a, 0x65, 0x59, 0x4a, 0xf4, 0x76, 0x63, 0x87, 0xfa, - 0xf7, 0x88, 0xfe, 0x44, 0x00, 0x10, 0xac, 0xe9, 0x79, 0x39, 0x53, 0x30, 0x32, 0x90, 0x72, 0x12, - 0x1f, 0x1d, 0x24, 0x06, 0x53, 0xc4, 0x6f, 0xd1, 0x9b, 0x39, 0x53, 0x40, 0x7f, 0x23, 0xf0, 0x52, - 0x72, 0x31, 0xd2, 0xb5, 0xbc, 0x6f, 0x76, 0xce, 0xa6, 0xae, 0xbc, 0x33, 0x99, 0x33, 0x92, 0x6f, - 0x2a, 0xf2, 0x6b, 0xf4, 0x5e, 0x16, 0x79, 0x4f, 0x79, 0xef, 0xe8, 0x59, 0x31, 0x54, 0x45, 0x7f, - 0x11, 0x98, 0x4b, 0x2f, 0x54, 0xfa, 0xde, 0x78, 0xac, 0x46, 0x36, 0x7d, 0xe5, 0xc1, 0xe4, 0x00, - 0x28, 0xed, 0xa1, 0x92, 0xf6, 0x80, 0xde, 0xcf, 0x29, 0x2d, 0xfa, 0xd6, 0x6c, 0xf1, 0xee, 0x90, - 0xbe, 0x63, 0x02, 0xe5, 0x78, 0x58, 0xd1, 0xb7, 0xf3, 0xf2, 0x4a, 0xcf, 0xea, 0xca, 0xbd, 0x09, - 0x3c, 0xc7, 0x95, 0x32, 0xf8, 0x5e, 0x4e, 0x4a, 0x60, 0x87, 0x4a, 0xd5, 0xd1, 0xfa, 0xe3, 0xe3, - 0xd3, 0x2a, 0x39, 0x39, 0xad, 0x92, 0x7f, 0x4e, 0xab, 0xe4, 0xfb, 0xb3, 0xea, 0xd4, 0xc9, 0x59, - 0x75, 0xea, 0xcf, 0xb3, 0xea, 0xd4, 0x97, 0x6f, 0x39, 0x6e, 0xb8, 0x7f, 0xb0, 0x6b, 0x3e, 0x11, - 0xed, 0x8b, 0x62, 0x3c, 0x5b, 0x65, 0xdd, 0x38, 0x50, 0xd8, 0x0b, 0xb8, 0xdc, 0x2d, 0xa9, 0x4f, - 0xed, 0xd5, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x27, 0x2c, 0x7d, 0x1f, 0xce, 0x0c, 0x00, 0x00, + 0x14, 0xcf, 0x38, 0xae, 0x13, 0xbf, 0x22, 0x11, 0x0d, 0x51, 0x08, 0x6e, 0xb4, 0x8d, 0x16, 0xa9, + 0x75, 0x0b, 0xda, 0x91, 0x13, 0xdc, 0x52, 0x05, 0x4a, 0x1d, 0x41, 0x43, 0x2a, 0xa8, 0xc2, 0x06, + 0x84, 0x00, 0xa1, 0x68, 0x53, 0x4f, 0x36, 0x8b, 0xd6, 0x3b, 0x5b, 0xcf, 0xa6, 0xb2, 0x1b, 0xe5, + 0x82, 0xf8, 0x00, 0x48, 0x7c, 0x02, 0xbe, 0x00, 0x57, 0xce, 0x88, 0x4b, 0x0e, 0x1c, 0x22, 0x21, + 0x21, 0x2e, 0x20, 0x94, 0xf0, 0x1d, 0xb8, 0x22, 0xcf, 0xbc, 0x5d, 0xaf, 0xed, 0x24, 0xbb, 0xb6, + 0x7a, 0x72, 0x66, 0xf2, 0xde, 0xef, 0xfd, 0x7e, 0xf3, 0xfe, 0x2d, 0xdc, 0x6e, 0x76, 0x5b, 0x3c, + 0x90, 0x9e, 0x08, 0x3a, 0xdd, 0xe7, 0x2c, 0x39, 0xb0, 0xb6, 0xf0, 0x7d, 0x27, 0x0c, 0xd9, 0xd3, + 0x03, 0xde, 0xee, 0x5a, 0x61, 0x5b, 0x44, 0x82, 0x1a, 0x69, 0x5b, 0x2b, 0x39, 0x58, 0x68, 0x5b, + 0x99, 0x77, 0x85, 0x2b, 0x94, 0x29, 0xeb, 0xfd, 0xa5, 0xbd, 0x2a, 0x4b, 0xae, 0x10, 0xae, 0xcf, + 0x99, 0x13, 0x7a, 0xcc, 0x09, 0x02, 0x11, 0x39, 0x91, 0x27, 0x02, 0x89, 0xff, 0xbd, 0xfd, 0x44, + 0xc8, 0x96, 0x90, 0x6c, 0xd7, 0x91, 0x5c, 0x07, 0x63, 0xcf, 0x6a, 0xbb, 0x3c, 0x72, 0x6a, 0x2c, + 0x74, 0x5c, 0x2f, 0x50, 0xc6, 0x68, 0xfb, 0x46, 0x06, 0xd7, 0xd0, 0x69, 0x3b, 0xad, 0x18, 0xf8, + 0xcd, 0x0c, 0x63, 0xfc, 0x45, 0x6b, 0x96, 0x61, 0x2d, 0x23, 0x27, 0xe2, 0x3b, 0x5e, 0xb0, 0x17, + 0xab, 0xaa, 0x66, 0x38, 0x24, 0xd0, 0xe6, 0x3c, 0xd0, 0x4f, 0x7a, 0xba, 0xb6, 0x14, 0x3b, 0x9b, + 0x3f, 0x3d, 0xe0, 0x32, 0x32, 0xbf, 0x82, 0x57, 0x06, 0x6e, 0x65, 0x28, 0x02, 0xc9, 0xe9, 0xfb, + 0x50, 0xd2, 0x2a, 0x16, 0xc9, 0x32, 0xa9, 0x5e, 0x5d, 0xb9, 0x61, 0x5d, 0xfe, 0xe6, 0x96, 0xf6, + 0x5f, 0x2f, 0x1e, 0xff, 0x7d, 0x7d, 0xca, 0x46, 0x5f, 0x73, 0x1b, 0x16, 0x14, 0xf8, 0x06, 0x8f, + 0x6c, 0x6d, 0x87, 0x61, 0xe9, 0x12, 0x94, 0xd1, 0x73, 0xb3, 0xa9, 0x42, 0x94, 0xed, 0xfe, 0x05, + 0xbd, 0x06, 0x65, 0xd1, 0xf2, 0xa2, 0x1d, 0x27, 0x0c, 0xe5, 0x62, 0x61, 0x99, 0x54, 0x67, 0xed, + 0xd9, 0xde, 0x45, 0x23, 0x0c, 0xa5, 0xf9, 0x19, 0x18, 0x43, 0xa0, 0xeb, 0xdd, 0x0f, 0x36, 0xb7, + 0x6a, 0xf5, 0x7a, 0x0c, 0xbe, 0x00, 0x25, 0xee, 0x85, 0xb5, 0x7a, 0x5d, 0x21, 0x17, 0x6d, 0x3c, + 0x5d, 0x0e, 0xfb, 0x05, 0x5c, 0x8b, 0x61, 0x3f, 0x72, 0x22, 0x2e, 0xa3, 0x0f, 0xb9, 0xe7, 0xee, + 0x47, 0xf9, 0x08, 0x2f, 0x41, 0x79, 0xcf, 0x0b, 0x1c, 0xdf, 0x7b, 0xce, 0x9b, 0x88, 0xdc, 0xbf, + 0x30, 0xef, 0xc0, 0xd2, 0xf9, 0xd0, 0xf8, 0xd8, 0x0b, 0x50, 0xda, 0x57, 0x37, 0x31, 0x5f, 0x7d, + 0x32, 0xbf, 0x86, 0xeb, 0x83, 0x7e, 0xdb, 0xbd, 0xec, 0x6f, 0x06, 0x4d, 0xde, 0x79, 0x11, 0xb4, + 0x3a, 0xb0, 0x7c, 0x31, 0x3c, 0x52, 0xfb, 0x14, 0x40, 0x26, 0xb7, 0x58, 0x0b, 0x56, 0x56, 0x2d, + 0x20, 0xce, 0x9e, 0x50, 0x5e, 0x58, 0x13, 0x29, 0x1c, 0xf3, 0x3f, 0x02, 0xaf, 0x8e, 0x14, 0x06, + 0x46, 0xdc, 0x80, 0x19, 0xc4, 0xc1, 0x70, 0x37, 0xb3, 0xc2, 0xc5, 0x55, 0xa0, 0xe3, 0xc4, 0xde, + 0xf4, 0x31, 0xcc, 0xc8, 0x83, 0x56, 0xcb, 0x69, 0x77, 0x17, 0x4b, 0xf9, 0x78, 0x23, 0xd0, 0xb6, + 0xf6, 0x8a, 0xf1, 0x10, 0x84, 0xbe, 0x0b, 0x45, 0x55, 0x38, 0x33, 0xcb, 0xd3, 0xd5, 0xab, 0x2b, + 0xaf, 0x67, 0x81, 0x35, 0x90, 0x11, 0xb1, 0x95, 0xdb, 0xa3, 0xe2, 0x6c, 0x61, 0xae, 0x64, 0x1e, + 0x61, 0x47, 0x34, 0x7c, 0x7f, 0xa8, 0x23, 0x1e, 0x02, 0xf4, 0x07, 0x4d, 0xd2, 0x75, 0x7a, 0x2a, + 0x59, 0xbd, 0xa9, 0x64, 0xe9, 0x11, 0x88, 0x53, 0xc9, 0xda, 0x72, 0x5c, 0x8e, 0xbe, 0x76, 0xca, + 0xf3, 0xf2, 0x22, 0xff, 0x25, 0x7e, 0xf8, 0x74, 0x7c, 0x7c, 0xf8, 0xcf, 0xfb, 0x0f, 0x3f, 0xad, + 0x24, 0xde, 0xcd, 0x92, 0x78, 0x41, 0x0a, 0x51, 0x76, 0x92, 0x88, 0x8d, 0x01, 0x65, 0x05, 0x4c, + 0x6a, 0x96, 0x32, 0x8d, 0x95, 0x96, 0xf6, 0xa8, 0x38, 0x4b, 0xe6, 0x0a, 0xe6, 0x77, 0x04, 0x16, + 0xe3, 0xc8, 0x49, 0xa5, 0xe5, 0xeb, 0x87, 0x79, 0xb8, 0xe2, 0xa9, 0x42, 0x2e, 0xa8, 0x3e, 0xd3, + 0x87, 0x54, 0xfb, 0x4d, 0xa7, 0xdb, 0x6f, 0xb0, 0x7b, 0x8a, 0xc3, 0xdd, 0xf3, 0x0d, 0xbc, 0x76, + 0x0e, 0x0b, 0x7c, 0xcb, 0x8f, 0xa1, 0x2c, 0xe3, 0x4b, 0xcc, 0xe5, 0xad, 0xdc, 0x5d, 0x83, 0x85, + 0xd7, 0x47, 0x58, 0xf9, 0x03, 0xe0, 0x8a, 0x0a, 0x46, 0x7f, 0x24, 0x50, 0xd2, 0xa3, 0x96, 0xae, + 0xe4, 0x4a, 0xcf, 0xc0, 0xb4, 0xaf, 0xac, 0x8e, 0xe5, 0xa3, 0xc5, 0x98, 0xd6, 0xb7, 0xbf, 0xff, + 0xfb, 0x43, 0xa1, 0x4a, 0x6f, 0xb0, 0x5c, 0x7b, 0x8f, 0xfe, 0x4c, 0x60, 0x06, 0x4b, 0x82, 0xde, + 0x19, 0xbb, 0x86, 0x34, 0xd1, 0x49, 0x6b, 0xcf, 0x5c, 0x53, 0x64, 0xeb, 0x74, 0x95, 0xe5, 0xdb, + 0xbb, 0xec, 0x30, 0x29, 0x8f, 0x23, 0xfa, 0x2b, 0x81, 0x97, 0x87, 0x76, 0x0a, 0xbd, 0x3f, 0x26, + 0x93, 0xa1, 0x65, 0x34, 0xb9, 0x92, 0xbb, 0x4a, 0x49, 0x8d, 0xb2, 0x2c, 0x25, 0x7a, 0xbb, 0xb1, + 0x43, 0xfd, 0x7b, 0x44, 0x7f, 0x22, 0x00, 0x08, 0xd6, 0xf0, 0xfd, 0x9c, 0x29, 0x18, 0x19, 0x48, + 0x39, 0x89, 0x8f, 0x0e, 0x12, 0x93, 0x29, 0xe2, 0xb7, 0xe8, 0xcd, 0x9c, 0x29, 0xa0, 0xbf, 0x11, + 0x78, 0x29, 0xbd, 0x18, 0xe9, 0x5a, 0xde, 0x37, 0x3b, 0x67, 0x53, 0x57, 0xde, 0x99, 0xcc, 0x19, + 0xc9, 0x37, 0x14, 0xf9, 0x35, 0x7a, 0x2f, 0x8b, 0xbc, 0xaf, 0xbc, 0x77, 0xf4, 0xac, 0x18, 0xa8, + 0xa2, 0xbf, 0x08, 0xcc, 0x0d, 0x2f, 0x54, 0xfa, 0xde, 0x78, 0xac, 0x46, 0x36, 0x7d, 0xe5, 0xc1, + 0xe4, 0x00, 0x28, 0xed, 0xa1, 0x92, 0xf6, 0x80, 0xde, 0xcf, 0x29, 0x2d, 0xfe, 0xd6, 0x6c, 0xf2, + 0xce, 0x80, 0xbe, 0x63, 0x02, 0xe5, 0x64, 0x58, 0xd1, 0xb7, 0xf3, 0xf2, 0x1a, 0x9e, 0xd5, 0x95, + 0x7b, 0x13, 0x78, 0x8e, 0x2b, 0xa5, 0xff, 0xbd, 0x9c, 0x96, 0xc0, 0x0e, 0x95, 0xaa, 0xa3, 0xf5, + 0xc7, 0xc7, 0xa7, 0x06, 0x39, 0x39, 0x35, 0xc8, 0x3f, 0xa7, 0x06, 0xf9, 0xfe, 0xcc, 0x98, 0x3a, + 0x39, 0x33, 0xa6, 0xfe, 0x3c, 0x33, 0xa6, 0xbe, 0x7c, 0xcb, 0xf5, 0xa2, 0xfd, 0x83, 0x5d, 0xeb, + 0x89, 0x68, 0x5d, 0x14, 0xe3, 0xd9, 0x2a, 0xeb, 0x24, 0x81, 0xa2, 0x6e, 0xc8, 0xe5, 0x6e, 0x49, + 0x7d, 0x6a, 0xaf, 0xfe, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x61, 0x6f, 0x5f, 0x0b, 0xce, 0x0c, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2830,7 +2831,7 @@ func (m *QueryAllRollappResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Rollapp = append(m.Rollapp, QueryGetRollappResponse{}) + m.Rollapp = append(m.Rollapp, &QueryGetRollappResponse{}) if err := m.Rollapp[len(m.Rollapp)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/rollapp/types/rollapp.go b/x/rollapp/types/rollapp.go index bcea125ce..d458546a7 100644 --- a/x/rollapp/types/rollapp.go +++ b/x/rollapp/types/rollapp.go @@ -19,7 +19,7 @@ func NewRollapp( initialSequencer string, vmType Rollapp_VMType, metadata *RollappMetadata, - genInfo GenesisInfo, + genInfo *GenesisInfo, transfersEnabled bool, ) Rollapp { return Rollapp{ diff --git a/x/rollapp/types/rollapp.pb.go b/x/rollapp/types/rollapp.pb.go index 3822ac895..ff7440a69 100644 --- a/x/rollapp/types/rollapp.pb.go +++ b/x/rollapp/types/rollapp.pb.go @@ -122,7 +122,7 @@ type Rollapp struct { // metadata is the rollapp metadata Metadata *RollappMetadata `protobuf:"bytes,11,opt,name=metadata,proto3" json:"metadata,omitempty"` // genesis_info keeps immutable rollapp fields - GenesisInfo GenesisInfo `protobuf:"bytes,12,opt,name=genesis_info,json=genesisInfo,proto3" json:"genesis_info"` + GenesisInfo *GenesisInfo `protobuf:"bytes,12,opt,name=genesis_info,json=genesisInfo,proto3" json:"genesis_info,omitempty"` // initial_sequencer is an option to preset one or more coma-separated bech32-encoded addresses of the // sequencer(s) that are allowed to initially register and serve for this rollapp. // if left empty, no sequencer is allowed to register. @@ -221,11 +221,11 @@ func (m *Rollapp) GetMetadata() *RollappMetadata { return nil } -func (m *Rollapp) GetGenesisInfo() GenesisInfo { +func (m *Rollapp) GetGenesisInfo() *GenesisInfo { if m != nil { return m.GenesisInfo } - return GenesisInfo{} + return nil } func (m *Rollapp) GetInitialSequencer() string { @@ -431,13 +431,13 @@ func init() { } var fileDescriptor_d4ef2bec3aea5528 = []byte{ - // 815 bytes of a gzipped FileDescriptorProto + // 817 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x5f, 0x6f, 0x1b, 0x45, 0x10, 0xf7, 0xd9, 0x4e, 0x6c, 0x8f, 0x9d, 0xe4, 0xba, 0x6d, 0xe0, 0x88, 0xa8, 0x6b, 0x19, 0x09, 0x19, 0xda, 0xdc, 0x89, 0xa4, 0x12, 0xcf, 0x04, 0x42, 0xeb, 0xa2, 0xa0, 0xea, 0xd2, 0x14, 0xa9, 0x0f, 0x9c, 0xce, 0x77, 0xe3, 0xf3, 0xaa, 0x77, 0x7b, 0xc7, 0xed, 0xda, 0xc4, 0xf9, 0x14, 0x7c, 0x02, 0x3e, 0x4f, 0x1f, 0x2b, 0x5e, 0x40, 0x3c, 0x54, 0x28, 0xf9, 0x22, 0x68, 0xff, 0xd8, 0x35, - 0xa4, 0xc5, 0x11, 0x4f, 0x7b, 0xf3, 0x9b, 0x99, 0xdf, 0xce, 0xce, 0x6f, 0x6e, 0xe0, 0x41, 0x3c, + 0xa4, 0xc5, 0x11, 0x4f, 0x7b, 0xf3, 0x9b, 0x99, 0xdf, 0xce, 0xcd, 0x6f, 0x76, 0xe0, 0x41, 0x3c, 0xcf, 0x90, 0x71, 0x9a, 0xb3, 0xf3, 0xf9, 0x85, 0xb7, 0x34, 0xbc, 0x32, 0x4f, 0xd3, 0xb0, 0x28, 0x16, 0xa7, 0x5b, 0x94, 0xb9, 0xc8, 0x49, 0x77, 0x35, 0xda, 0x5d, 0x1a, 0xae, 0x89, 0xda, 0xbb, 0x93, 0xe4, 0x49, 0xae, 0x42, 0x3d, 0xf9, 0xa5, 0xb3, 0xf6, 0x3e, 0x8c, 0x72, 0x9e, 0xe5, 0xdc, @@ -448,41 +448,42 @@ var fileDescriptor_d4ef2bec3aea5528 = []byte{ 0x97, 0x8e, 0x63, 0x8d, 0x3f, 0xa9, 0x37, 0x2d, 0xbb, 0xda, 0xff, 0x7d, 0x03, 0x1a, 0x86, 0x8a, 0xdc, 0x05, 0x30, 0xf7, 0x05, 0x34, 0x76, 0xac, 0x9e, 0x35, 0x68, 0xf9, 0x2d, 0x83, 0x0c, 0x63, 0x72, 0x07, 0x36, 0xf2, 0x9f, 0x19, 0x96, 0x8a, 0xb1, 0xe5, 0x6b, 0x83, 0xfc, 0x08, 0x5b, 0x89, - 0xae, 0x21, 0x50, 0xaf, 0x72, 0x1a, 0x3d, 0x6b, 0xd0, 0x3e, 0x38, 0x74, 0xff, 0xbb, 0xa3, 0xee, - 0x3b, 0xea, 0x3f, 0xaa, 0xbf, 0x7a, 0x73, 0xaf, 0xe2, 0x77, 0x92, 0xd5, 0x37, 0xdd, 0x05, 0x88, - 0x26, 0x21, 0x63, 0x98, 0xca, 0xa2, 0x9a, 0xba, 0x28, 0x83, 0x0c, 0x63, 0xf2, 0x01, 0x6c, 0x8e, - 0xcb, 0xfc, 0x02, 0x99, 0xd3, 0x52, 0xef, 0x34, 0x16, 0xf9, 0x1c, 0xec, 0x12, 0x13, 0xca, 0x05, - 0x96, 0x18, 0x7f, 0x83, 0x2c, 0xcf, 0xb8, 0x03, 0xbd, 0xda, 0xa0, 0xe5, 0x5f, 0xc3, 0xc9, 0x77, - 0xd0, 0x5c, 0xf4, 0xd7, 0x69, 0xab, 0xea, 0xbd, 0x1b, 0x56, 0x7f, 0x62, 0xd2, 0xfc, 0x25, 0x01, - 0x79, 0x06, 0x8b, 0xfa, 0x95, 0xbe, 0x4e, 0x47, 0x11, 0xde, 0x5f, 0x47, 0x68, 0xfa, 0x30, 0x64, - 0xe3, 0xdc, 0xb4, 0xa1, 0x9d, 0xbc, 0x85, 0xa4, 0xb2, 0x94, 0x51, 0x41, 0xc3, 0x34, 0xe0, 0xf8, - 0xd3, 0x14, 0x59, 0x84, 0xa5, 0xb3, 0xa5, 0x9a, 0x61, 0x1b, 0xc7, 0xe9, 0x02, 0x27, 0x8f, 0xa0, - 0x31, 0xcb, 0x02, 0x31, 0x2f, 0xd0, 0xd9, 0xee, 0x59, 0x83, 0xed, 0x03, 0xf7, 0x86, 0xcf, 0x71, - 0x9f, 0x9f, 0x3c, 0x9b, 0x17, 0xe8, 0x6f, 0xce, 0x32, 0x79, 0x92, 0x3d, 0x68, 0xa6, 0xe1, 0x94, - 0x45, 0x13, 0x8c, 0x9d, 0x1d, 0xd5, 0xde, 0xa5, 0x4d, 0x0e, 0x60, 0x37, 0xa5, 0x33, 0x59, 0x22, - 0x0f, 0x70, 0x86, 0x4c, 0x04, 0x13, 0xa4, 0xc9, 0x44, 0x38, 0x76, 0xcf, 0x1a, 0xd4, 0xfc, 0xdb, - 0x0b, 0xe7, 0xb1, 0xf4, 0x3d, 0x56, 0x2e, 0xf2, 0x25, 0x38, 0x69, 0xc8, 0x85, 0x1e, 0x94, 0x60, - 0x5a, 0xc4, 0xf2, 0x30, 0x69, 0xb7, 0x54, 0xda, 0xae, 0xf4, 0x2b, 0xe1, 0xcf, 0x94, 0x57, 0x27, - 0xf6, 0x1f, 0xc0, 0xa6, 0x2e, 0x8d, 0xec, 0x40, 0xfb, 0x8c, 0xf1, 0x02, 0x23, 0x3a, 0xa6, 0x18, - 0xdb, 0x15, 0xd2, 0x80, 0xda, 0xf1, 0xf3, 0x13, 0xdb, 0x22, 0x4d, 0xa8, 0xff, 0xf0, 0xd5, 0xe9, - 0x89, 0x5d, 0x7d, 0x52, 0x6f, 0xd6, 0xec, 0x46, 0xff, 0xd7, 0x2a, 0xb4, 0x57, 0xba, 0x4a, 0x3e, - 0x03, 0x7b, 0x21, 0x4c, 0x34, 0xc1, 0xe8, 0x25, 0x9f, 0x66, 0x66, 0xc6, 0x77, 0x0c, 0xfe, 0xb5, - 0x81, 0xc9, 0x27, 0xb0, 0x35, 0xc2, 0x68, 0x72, 0x78, 0x10, 0x14, 0x25, 0x8e, 0xe9, 0xb9, 0x99, - 0xf8, 0x8e, 0x06, 0x9f, 0x2a, 0x8c, 0x3c, 0x85, 0x0e, 0x0b, 0x05, 0x9d, 0x61, 0x10, 0xcb, 0x31, - 0x72, 0x6a, 0x4a, 0xe8, 0xfd, 0x75, 0xad, 0x56, 0x33, 0xb7, 0x9c, 0x9b, 0xb6, 0xa6, 0x50, 0x20, - 0x39, 0x83, 0xed, 0xa5, 0xc8, 0xd3, 0xa2, 0x48, 0xe7, 0x4e, 0x5d, 0xde, 0x7b, 0xe4, 0xca, 0x79, - 0xf8, 0xf3, 0xcd, 0xbd, 0x4f, 0x13, 0x2a, 0x26, 0xd3, 0x91, 0x1b, 0xe5, 0x99, 0x67, 0x36, 0x8f, - 0x3e, 0xf6, 0x79, 0xfc, 0xd2, 0x93, 0x7a, 0x73, 0x77, 0xc8, 0x84, 0xbf, 0xb5, 0x98, 0x08, 0x45, - 0x22, 0x7f, 0x11, 0x8e, 0xa1, 0x5c, 0x05, 0x1b, 0xfa, 0x17, 0xd1, 0x56, 0xff, 0xb7, 0x2a, 0x6c, - 0x1b, 0xe1, 0x4f, 0xa7, 0x59, 0x16, 0x96, 0x73, 0xf2, 0x31, 0xbc, 0xfd, 0xdf, 0xaf, 0x2f, 0x80, - 0x17, 0x60, 0xa7, 0xa1, 0x40, 0x23, 0xd0, 0x90, 0xc5, 0xa8, 0x3b, 0xd3, 0x5e, 0x3f, 0x60, 0x26, - 0x63, 0x9c, 0xab, 0x2c, 0xff, 0x1a, 0x0f, 0x49, 0xe1, 0x23, 0x8d, 0x7d, 0x4b, 0x59, 0x98, 0xd2, - 0x0b, 0x8c, 0x57, 0x2e, 0xa9, 0xfd, 0xaf, 0x4b, 0xde, 0x4f, 0x48, 0xfa, 0xd0, 0xd1, 0x4e, 0x3d, - 0x5f, 0xaa, 0xcf, 0x75, 0xff, 0x1f, 0x18, 0x79, 0x08, 0xbb, 0xff, 0x22, 0x30, 0xc1, 0x1b, 0x2a, - 0xf8, 0xdd, 0xce, 0xa3, 0xef, 0x5f, 0x5d, 0x76, 0xad, 0xd7, 0x97, 0x5d, 0xeb, 0xaf, 0xcb, 0xae, - 0xf5, 0xcb, 0x55, 0xb7, 0xf2, 0xfa, 0xaa, 0x5b, 0xf9, 0xe3, 0xaa, 0x5b, 0x79, 0xf1, 0x70, 0x45, - 0xbd, 0xf7, 0x6c, 0xfb, 0xd9, 0xa1, 0x77, 0xbe, 0x5c, 0xf9, 0x4a, 0xcf, 0xd1, 0xa6, 0x5a, 0xf8, - 0x87, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xc5, 0xf0, 0x55, 0x26, 0xcf, 0x06, 0x00, 0x00, + 0xae, 0x21, 0x50, 0x7f, 0xe5, 0x34, 0x7a, 0xd6, 0xa0, 0x7d, 0x70, 0xe8, 0xfe, 0x77, 0x47, 0xdd, + 0x77, 0xd4, 0x7f, 0x54, 0x7f, 0xf5, 0xe6, 0x5e, 0xc5, 0xef, 0x24, 0xab, 0xff, 0x74, 0x17, 0x20, + 0x9a, 0x84, 0x8c, 0x61, 0x2a, 0x8b, 0x6a, 0xea, 0xa2, 0x0c, 0x32, 0x8c, 0xc9, 0x07, 0xb0, 0x39, + 0x2e, 0xf3, 0x0b, 0x64, 0x4e, 0x4b, 0xfd, 0xa7, 0xb1, 0xc8, 0xe7, 0x60, 0x97, 0x98, 0x50, 0x2e, + 0xb0, 0xc4, 0xf8, 0x1b, 0x64, 0x79, 0xc6, 0x1d, 0xe8, 0xd5, 0x06, 0x2d, 0xff, 0x1a, 0x4e, 0xbe, + 0x83, 0xe6, 0xa2, 0xbf, 0x4e, 0x5b, 0x55, 0xef, 0xdd, 0xb0, 0xfa, 0x13, 0x93, 0xe6, 0x2f, 0x09, + 0xc8, 0x33, 0x58, 0xd4, 0xaf, 0xf4, 0x75, 0x3a, 0x8a, 0xf0, 0xfe, 0x3a, 0x42, 0xd3, 0x87, 0x21, + 0x1b, 0xe7, 0xaa, 0x0d, 0x96, 0xdf, 0x4e, 0xde, 0x42, 0x52, 0x59, 0xca, 0xa8, 0xa0, 0x61, 0x1a, + 0x70, 0xfc, 0x69, 0x8a, 0x2c, 0xc2, 0xd2, 0xd9, 0x52, 0xcd, 0xb0, 0x8d, 0xe3, 0x74, 0x81, 0x93, + 0x47, 0xd0, 0x98, 0x65, 0x81, 0x98, 0x17, 0xe8, 0x6c, 0xf7, 0xac, 0xc1, 0xf6, 0x81, 0x7b, 0xc3, + 0xdf, 0x71, 0x9f, 0x9f, 0x3c, 0x9b, 0x17, 0xe8, 0x6f, 0xce, 0x32, 0x79, 0x92, 0x3d, 0x68, 0xa6, + 0xe1, 0x94, 0x45, 0x13, 0x8c, 0x9d, 0x1d, 0xd5, 0xde, 0xa5, 0x4d, 0x0e, 0x60, 0x37, 0xa5, 0x33, + 0x59, 0x22, 0x0f, 0x70, 0x86, 0x4c, 0x04, 0x13, 0xa4, 0xc9, 0x44, 0x38, 0x76, 0xcf, 0x1a, 0xd4, + 0xfc, 0xdb, 0x0b, 0xe7, 0xb1, 0xf4, 0x3d, 0x56, 0x2e, 0xf2, 0x25, 0x38, 0x69, 0xc8, 0x85, 0x1e, + 0x94, 0x60, 0x5a, 0xc4, 0xf2, 0x30, 0x69, 0xb7, 0x54, 0xda, 0xae, 0xf4, 0x2b, 0xe1, 0xcf, 0x94, + 0x57, 0x27, 0xf6, 0x1f, 0xc0, 0xa6, 0x2e, 0x8d, 0xec, 0x40, 0xfb, 0x8c, 0xf1, 0x02, 0x23, 0x3a, + 0xa6, 0x18, 0xdb, 0x15, 0xd2, 0x80, 0xda, 0xf1, 0xf3, 0x13, 0xdb, 0x22, 0x4d, 0xa8, 0xff, 0xf0, + 0xd5, 0xe9, 0x89, 0x5d, 0x7d, 0x52, 0x6f, 0xd6, 0xec, 0x46, 0xff, 0xd7, 0x2a, 0xb4, 0x57, 0xba, + 0x4a, 0x3e, 0x03, 0x7b, 0x21, 0x4c, 0x34, 0xc1, 0xe8, 0x25, 0x9f, 0x66, 0x66, 0xc6, 0x77, 0x0c, + 0xfe, 0xb5, 0x81, 0xc9, 0x27, 0xb0, 0x35, 0xc2, 0x68, 0x72, 0x78, 0x10, 0x14, 0x25, 0x8e, 0xe9, + 0xb9, 0x99, 0xf8, 0x8e, 0x06, 0x9f, 0x2a, 0x8c, 0x3c, 0x85, 0x0e, 0x0b, 0x05, 0x9d, 0x61, 0x10, + 0xcb, 0x31, 0x72, 0x6a, 0x4a, 0xe8, 0xfd, 0x75, 0xad, 0x56, 0x33, 0xb7, 0x9c, 0x9b, 0xb6, 0xa6, + 0x50, 0x20, 0x39, 0x83, 0xed, 0xa5, 0xc8, 0xd3, 0xa2, 0x48, 0xe7, 0x4e, 0x5d, 0xde, 0x7b, 0xe4, + 0xca, 0x67, 0xf1, 0xe7, 0x9b, 0x7b, 0x9f, 0x26, 0x54, 0x4c, 0xa6, 0x23, 0x37, 0xca, 0x33, 0xcf, + 0x6c, 0x1e, 0x7d, 0xec, 0xf3, 0xf8, 0xa5, 0x27, 0xf5, 0xe6, 0xee, 0x90, 0x09, 0x7f, 0x6b, 0x31, + 0x11, 0x8a, 0x44, 0x3e, 0x11, 0x8e, 0xa1, 0x5c, 0x05, 0x1b, 0xfa, 0x89, 0x68, 0xab, 0xff, 0x5b, + 0x15, 0xb6, 0x8d, 0xf0, 0xa7, 0xd3, 0x2c, 0x0b, 0xcb, 0x39, 0xf9, 0x18, 0xde, 0xbe, 0xf7, 0xeb, + 0x0b, 0xe0, 0x05, 0xd8, 0x69, 0x28, 0xd0, 0x08, 0x34, 0x64, 0x31, 0xea, 0xce, 0xb4, 0xd7, 0x0f, + 0x98, 0xc9, 0x18, 0xe7, 0x2a, 0xcb, 0xbf, 0xc6, 0x43, 0x52, 0xf8, 0x48, 0x63, 0xdf, 0x52, 0x16, + 0xa6, 0xf4, 0x02, 0xe3, 0x95, 0x4b, 0x6a, 0xff, 0xeb, 0x92, 0xf7, 0x13, 0x92, 0x3e, 0x74, 0xb4, + 0x53, 0xcf, 0x97, 0xea, 0x73, 0xdd, 0xff, 0x07, 0x46, 0x1e, 0xc2, 0xee, 0xbf, 0x08, 0x4c, 0xf0, + 0x86, 0x0a, 0x7e, 0xb7, 0xf3, 0xe8, 0xfb, 0x57, 0x97, 0x5d, 0xeb, 0xf5, 0x65, 0xd7, 0xfa, 0xeb, + 0xb2, 0x6b, 0xfd, 0x72, 0xd5, 0xad, 0xbc, 0xbe, 0xea, 0x56, 0xfe, 0xb8, 0xea, 0x56, 0x5e, 0x3c, + 0x5c, 0x51, 0xef, 0x3d, 0xdb, 0x7e, 0x76, 0xe8, 0x9d, 0x2f, 0x57, 0xbe, 0xd2, 0x73, 0xb4, 0xa9, + 0x16, 0xfe, 0xe1, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc8, 0x09, 0x8a, 0x4f, 0xcf, 0x06, 0x00, + 0x00, } func (m *RollappGenesisState) Marshal() (dAtA []byte, err error) { @@ -574,16 +575,18 @@ func (m *Rollapp) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x6a } - { - size, err := m.GenesisInfo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.GenesisInfo != nil { + { + size, err := m.GenesisInfo.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintRollapp(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintRollapp(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x62 } - i-- - dAtA[i] = 0x62 if m.Metadata != nil { { size, err := m.Metadata.MarshalToSizedBuffer(dAtA[:i]) @@ -838,8 +841,10 @@ func (m *Rollapp) Size() (n int) { l = m.Metadata.Size() n += 1 + l + sovRollapp(uint64(l)) } - l = m.GenesisInfo.Size() - n += 1 + l + sovRollapp(uint64(l)) + if m.GenesisInfo != nil { + l = m.GenesisInfo.Size() + n += 1 + l + sovRollapp(uint64(l)) + } l = len(m.InitialSequencer) if l > 0 { n += 1 + l + sovRollapp(uint64(l)) @@ -1263,6 +1268,9 @@ func (m *Rollapp) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.GenesisInfo == nil { + m.GenesisInfo = &GenesisInfo{} + } if err := m.GenesisInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/rollapp/types/tx.pb.go b/x/rollapp/types/tx.pb.go index f37d5a9aa..8e7d043a2 100644 --- a/x/rollapp/types/tx.pb.go +++ b/x/rollapp/types/tx.pb.go @@ -44,7 +44,7 @@ type MsgCreateRollapp struct { // metadata is the rollapp metadata Metadata *RollappMetadata `protobuf:"bytes,13,opt,name=metadata,proto3" json:"metadata,omitempty"` // genesis_info is the genesis information - GenesisInfo GenesisInfo `protobuf:"bytes,14,opt,name=genesis_info,json=genesisInfo,proto3" json:"genesis_info"` + GenesisInfo *GenesisInfo `protobuf:"bytes,14,opt,name=genesis_info,json=genesisInfo,proto3" json:"genesis_info,omitempty"` // vm_type is the type of rollapp machine: EVM or WASM VmType Rollapp_VMType `protobuf:"varint,15,opt,name=vm_type,json=vmType,proto3,enum=dymensionxyz.dymension.rollapp.Rollapp_VMType" json:"vm_type,omitempty"` } @@ -117,11 +117,11 @@ func (m *MsgCreateRollapp) GetMetadata() *RollappMetadata { return nil } -func (m *MsgCreateRollapp) GetGenesisInfo() GenesisInfo { +func (m *MsgCreateRollapp) GetGenesisInfo() *GenesisInfo { if m != nil { return m.GenesisInfo } - return GenesisInfo{} + return nil } func (m *MsgCreateRollapp) GetVmType() Rollapp_VMType { @@ -180,7 +180,7 @@ type MsgUpdateRollappInformation struct { // metadata is the rollapp metadata Metadata *RollappMetadata `protobuf:"bytes,5,opt,name=metadata,proto3" json:"metadata,omitempty"` // genesis_info is the genesis information - GenesisInfo GenesisInfo `protobuf:"bytes,6,opt,name=genesis_info,json=genesisInfo,proto3" json:"genesis_info"` + GenesisInfo *GenesisInfo `protobuf:"bytes,6,opt,name=genesis_info,json=genesisInfo,proto3" json:"genesis_info,omitempty"` } func (m *MsgUpdateRollappInformation) Reset() { *m = MsgUpdateRollappInformation{} } @@ -244,11 +244,11 @@ func (m *MsgUpdateRollappInformation) GetMetadata() *RollappMetadata { return nil } -func (m *MsgUpdateRollappInformation) GetGenesisInfo() GenesisInfo { +func (m *MsgUpdateRollappInformation) GetGenesisInfo() *GenesisInfo { if m != nil { return m.GenesisInfo } - return GenesisInfo{} + return nil } type MsgUpdateRollappInformationResponse struct { @@ -929,7 +929,7 @@ func init() { } var fileDescriptor_1a86300fb8647ecb = []byte{ - // 947 bytes of a gzipped FileDescriptorProto + // 948 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4d, 0x6f, 0xe3, 0x44, 0x18, 0xae, 0x93, 0x34, 0x1f, 0x6f, 0xd2, 0x92, 0x0e, 0x55, 0xb1, 0xb2, 0x4b, 0x88, 0xb2, 0x42, 0x14, 0x76, 0xb1, 0xd9, 0x6e, 0x41, 0xa8, 0x70, 0x69, 0xb7, 0xd2, 0xee, 0x82, 0xc2, 0x82, 0xb7, @@ -950,46 +950,46 @@ var fileDescriptor_1a86300fb8647ecb = []byte{ 0xbc, 0x41, 0x1f, 0x43, 0x39, 0x29, 0x5c, 0x5f, 0x69, 0x69, 0x9b, 0xd5, 0x2d, 0xd3, 0x58, 0x2c, 0x83, 0x21, 0xcb, 0xee, 0x48, 0x37, 0x4b, 0x05, 0x40, 0x07, 0x50, 0x73, 0x31, 0xc1, 0xcc, 0x63, 0x5d, 0x8f, 0x1c, 0x51, 0x7d, 0x55, 0x04, 0xbc, 0x9b, 0x16, 0xf0, 0x51, 0xec, 0xf3, 0x84, 0x1c, - 0xd1, 0xbd, 0xc2, 0xf3, 0xbf, 0x5e, 0x5b, 0xb2, 0xaa, 0xee, 0xd8, 0x84, 0x1e, 0x41, 0x69, 0xe8, - 0x77, 0xf9, 0x28, 0xc0, 0xfa, 0x4b, 0x2d, 0x6d, 0x73, 0x75, 0xcb, 0xc8, 0x58, 0xa1, 0xf1, 0x45, - 0xe7, 0x60, 0x14, 0x60, 0xab, 0x38, 0xf4, 0xa3, 0xe7, 0x4e, 0xed, 0xbb, 0x7f, 0x7e, 0x7d, 0x2b, - 0xe1, 0xf6, 0xa3, 0x42, 0x39, 0x5f, 0xaf, 0xb6, 0x1b, 0xa0, 0x5f, 0xd5, 0xc3, 0xc2, 0x2c, 0xa0, - 0x84, 0xe1, 0xf6, 0x6f, 0x39, 0xb8, 0xd5, 0x61, 0xee, 0xe7, 0x81, 0x33, 0x7e, 0x19, 0x55, 0x14, - 0xfa, 0x36, 0xf7, 0x28, 0x89, 0x18, 0xa5, 0x27, 0x04, 0x27, 0xaa, 0xc5, 0x9b, 0x1b, 0x69, 0x96, - 0x9f, 0xa3, 0xd9, 0x67, 0x13, 0xea, 0x2c, 0xdf, 0x48, 0x1d, 0x41, 0xa8, 0xb6, 0x40, 0xa3, 0xe2, - 0x8b, 0xd0, 0x68, 0x07, 0x22, 0x6a, 0x63, 0x02, 0xda, 0xaf, 0xc3, 0x9d, 0x05, 0xac, 0x29, 0x76, - 0x7f, 0xce, 0xc1, 0xaa, 0xc2, 0x3d, 0xe3, 0x36, 0xc7, 0x0b, 0x2e, 0xc2, 0x6d, 0x18, 0x53, 0x38, - 0xcd, 0x69, 0x0b, 0xaa, 0x8c, 0xdb, 0x21, 0x7f, 0x8c, 0x3d, 0xf7, 0x98, 0x0b, 0x36, 0x0b, 0xd6, - 0xa4, 0x29, 0xf2, 0x27, 0x03, 0x7f, 0x2f, 0x9a, 0x03, 0x4c, 0x2f, 0x88, 0xf7, 0x63, 0x03, 0xda, - 0x80, 0xe2, 0xfe, 0xee, 0xa7, 0x36, 0x3f, 0x16, 0x24, 0x57, 0x2c, 0xb9, 0x43, 0x8f, 0x21, 0xbf, - 0xb7, 0xcf, 0xf4, 0x92, 0xa0, 0xe8, 0x9d, 0x34, 0x8a, 0x44, 0xb0, 0x7d, 0x35, 0x64, 0x98, 0xe4, - 0x29, 0x0a, 0x81, 0x10, 0x14, 0xfa, 0x36, 0xe3, 0x7a, 0xb9, 0xa5, 0x6d, 0x96, 0x2d, 0xb1, 0x9e, - 0x3a, 0x8e, 0xc5, 0x7a, 0xa9, 0xad, 0xc3, 0xc6, 0x65, 0x4e, 0x14, 0x5d, 0x3f, 0x68, 0xb0, 0xde, - 0x61, 0xee, 0x41, 0x68, 0x13, 0x76, 0x84, 0xc3, 0xa7, 0x11, 0xd5, 0xec, 0xd8, 0x0b, 0xd0, 0x1d, - 0x58, 0xe9, 0x0d, 0xc2, 0x10, 0x13, 0xde, 0x9d, 0x3c, 0x8d, 0x35, 0x69, 0x14, 0x40, 0x74, 0x0b, - 0x2a, 0x04, 0x9f, 0x48, 0x40, 0xcc, 0x5f, 0x99, 0xe0, 0x93, 0xa7, 0x33, 0x4e, 0x6c, 0xfe, 0x0a, - 0xbb, 0x3b, 0x28, 0xaa, 0xf3, 0x72, 0x8e, 0x76, 0x13, 0x6e, 0xcf, 0x2a, 0x46, 0x55, 0xfb, 0xbb, - 0x06, 0x95, 0x0e, 0x73, 0x77, 0x1d, 0x67, 0x77, 0xe1, 0x80, 0x43, 0x50, 0x20, 0xb6, 0x8f, 0x65, - 0x49, 0x62, 0x9d, 0x52, 0x4e, 0x24, 0x76, 0x32, 0xc9, 0x3d, 0x4a, 0x84, 0x98, 0x15, 0x6b, 0xd2, - 0x14, 0xdd, 0x4b, 0xcf, 0xb7, 0x5d, 0x2c, 0xd5, 0x8c, 0x37, 0xa8, 0x0e, 0xf9, 0x41, 0xd8, 0x17, - 0xe7, 0xbd, 0x62, 0x45, 0x4b, 0x71, 0x7f, 0x43, 0x07, 0x87, 0x42, 0xe0, 0x65, 0x2b, 0xde, 0x5c, - 0x96, 0xa5, 0xfd, 0x32, 0xac, 0xa9, 0x3e, 0x54, 0x77, 0x7f, 0x6a, 0x50, 0x53, 0x32, 0x2d, 0x6e, - 0x70, 0x15, 0x72, 0x72, 0x0a, 0x14, 0xac, 0x9c, 0xe7, 0xa8, 0x86, 0xf3, 0x73, 0x1b, 0x2e, 0xa4, - 0x34, 0xbc, 0xbc, 0xa0, 0xe1, 0xe2, 0x8c, 0x86, 0x4b, 0x33, 0x1a, 0x2e, 0xcf, 0x6f, 0x78, 0x43, - 0x1c, 0x33, 0xd5, 0x9a, 0xea, 0x19, 0x8b, 0x96, 0x2d, 0xec, 0xd3, 0xe1, 0x35, 0x5b, 0x4e, 0x39, - 0x5e, 0xb3, 0xd2, 0xab, 0x34, 0x49, 0xfa, 0xad, 0x7f, 0x8b, 0x90, 0xef, 0x30, 0x17, 0x7d, 0x0b, - 0x2b, 0x97, 0x3f, 0x9e, 0xa9, 0xd7, 0xf2, 0xea, 0x78, 0x6f, 0xbc, 0x7f, 0x5d, 0x8f, 0xa4, 0x08, - 0xf4, 0x8b, 0x06, 0xfa, 0xdc, 0xaf, 0xc1, 0x07, 0x19, 0xc2, 0xce, 0x73, 0x6e, 0x3c, 0xfc, 0x1f, - 0xce, 0xaa, 0xbc, 0x01, 0x54, 0x27, 0xa7, 0xa9, 0x91, 0x39, 0xa6, 0xc0, 0x37, 0xde, 0xbb, 0x1e, - 0x5e, 0xa5, 0xfd, 0x5e, 0x83, 0xb5, 0xe9, 0xb1, 0xb4, 0x9d, 0x21, 0xda, 0x94, 0x57, 0xe3, 0xc3, - 0x9b, 0x78, 0xa9, 0x4a, 0x8e, 0xa0, 0x28, 0x27, 0xce, 0x9b, 0x19, 0xe2, 0xc4, 0xd0, 0xc6, 0xfd, - 0xcc, 0x50, 0x95, 0x87, 0x42, 0x65, 0x7c, 0xf7, 0xef, 0x65, 0xa6, 0x2d, 0xca, 0xb6, 0x7d, 0x1d, - 0xf4, 0x64, 0xc2, 0xf1, 0xcd, 0xcb, 0x92, 0x50, 0xa1, 0x33, 0x25, 0x9c, 0xba, 0x6e, 0x7b, 0x9f, - 0x3c, 0x3f, 0x6f, 0x6a, 0x67, 0xe7, 0x4d, 0xed, 0xef, 0xf3, 0xa6, 0xf6, 0xd3, 0x45, 0x73, 0xe9, - 0xec, 0xa2, 0xb9, 0xf4, 0xc7, 0x45, 0x73, 0xe9, 0xcb, 0x6d, 0xd7, 0xe3, 0xc7, 0x83, 0x43, 0xa3, - 0x47, 0x7d, 0x73, 0xce, 0x1f, 0xf1, 0xf0, 0x81, 0x79, 0x3a, 0xfe, 0xbb, 0x1f, 0x05, 0x98, 0x1d, - 0x16, 0xc5, 0xef, 0xef, 0x83, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa0, 0x0c, 0x19, 0x5d, 0x0c, - 0x0c, 0x00, 0x00, + 0xd1, 0xbd, 0xc2, 0xf3, 0xbf, 0x5e, 0xd3, 0xac, 0xaa, 0x3b, 0x36, 0xa1, 0x47, 0x50, 0x1a, 0xfa, + 0x5d, 0x3e, 0x0a, 0xb0, 0xfe, 0x52, 0x4b, 0xdb, 0x5c, 0xdd, 0x32, 0x32, 0x56, 0x68, 0x7c, 0xd1, + 0x39, 0x18, 0x05, 0xd8, 0x2a, 0x0e, 0xfd, 0xe8, 0xb9, 0x53, 0xfb, 0xee, 0x9f, 0x5f, 0xdf, 0x4a, + 0xb8, 0xfd, 0xa8, 0x50, 0xce, 0xd7, 0xab, 0xed, 0x06, 0xe8, 0x57, 0xf5, 0xb0, 0x30, 0x0b, 0x28, + 0x61, 0xb8, 0xfd, 0x5b, 0x0e, 0x6e, 0x75, 0x98, 0xfb, 0x79, 0xe0, 0x8c, 0x5f, 0x46, 0x15, 0x85, + 0xbe, 0xcd, 0x3d, 0x4a, 0x22, 0x46, 0xe9, 0x09, 0xc1, 0x89, 0x6a, 0xf1, 0xe6, 0x46, 0x9a, 0xe5, + 0xe7, 0x68, 0xf6, 0xd9, 0x84, 0x3a, 0xcb, 0x37, 0x52, 0x47, 0x12, 0x3a, 0x5f, 0xa3, 0xe2, 0x8b, + 0xd0, 0x68, 0x07, 0x22, 0x6a, 0x63, 0x02, 0xda, 0xaf, 0xc3, 0x9d, 0x05, 0xac, 0x29, 0x76, 0x7f, + 0xce, 0xc1, 0xaa, 0xc2, 0x3d, 0xe3, 0x36, 0xc7, 0x0b, 0x2e, 0xc2, 0x6d, 0x18, 0x53, 0x38, 0xcd, + 0x69, 0x0b, 0xaa, 0x8c, 0xdb, 0x21, 0x7f, 0x8c, 0x3d, 0xf7, 0x98, 0x0b, 0x36, 0x0b, 0xd6, 0xa4, + 0x29, 0xf2, 0x27, 0x03, 0x7f, 0x2f, 0x9a, 0x03, 0x4c, 0x2f, 0x88, 0xf7, 0x63, 0x03, 0xda, 0x80, + 0xe2, 0xfe, 0xee, 0xa7, 0x36, 0x3f, 0x16, 0x24, 0x57, 0x2c, 0xb9, 0x43, 0x8f, 0x21, 0xbf, 0xb7, + 0xcf, 0xf4, 0x92, 0xa0, 0xe8, 0x9d, 0x34, 0x8a, 0x44, 0xb0, 0x7d, 0x35, 0x64, 0x98, 0xe0, 0x69, + 0xc9, 0x8a, 0x42, 0x20, 0x04, 0x85, 0xbe, 0xcd, 0xb8, 0x5e, 0x6e, 0x69, 0x9b, 0x65, 0x4b, 0xac, + 0xa7, 0x8e, 0x63, 0xb1, 0x5e, 0x6a, 0xeb, 0xb0, 0x71, 0x99, 0x13, 0x45, 0xd7, 0x0f, 0x1a, 0xac, + 0x77, 0x98, 0x7b, 0x10, 0xda, 0x84, 0x1d, 0xe1, 0xf0, 0x69, 0x44, 0x35, 0x3b, 0xf6, 0x02, 0x74, + 0x07, 0x56, 0x7a, 0x83, 0x30, 0xc4, 0x84, 0x77, 0x27, 0x4f, 0x63, 0x4d, 0x1a, 0x05, 0x10, 0xdd, + 0x82, 0x0a, 0xc1, 0x27, 0x12, 0x10, 0xf3, 0x57, 0x26, 0xf8, 0xe4, 0xe9, 0x8c, 0x13, 0x9b, 0xbf, + 0xc2, 0xee, 0x0e, 0x8a, 0xea, 0xbc, 0x9c, 0xa3, 0xdd, 0x84, 0xdb, 0xb3, 0x8a, 0x51, 0xd5, 0xfe, + 0xae, 0x41, 0xa5, 0xc3, 0xdc, 0x5d, 0xc7, 0xd9, 0x5d, 0x38, 0xe0, 0x10, 0x14, 0x88, 0xed, 0x63, + 0x59, 0x92, 0x58, 0xa7, 0x94, 0x13, 0x89, 0x9d, 0x4c, 0x72, 0x8f, 0x12, 0x21, 0x66, 0xc5, 0x9a, + 0x34, 0x45, 0xf7, 0xd2, 0xf3, 0x6d, 0x17, 0x4b, 0x35, 0xe3, 0x0d, 0xaa, 0x43, 0x7e, 0x10, 0xf6, + 0xc5, 0x79, 0xaf, 0x58, 0xd1, 0x52, 0xdc, 0xdf, 0xd0, 0xc1, 0xa1, 0x10, 0x78, 0xd9, 0x8a, 0x37, + 0x97, 0x65, 0x69, 0xbf, 0x0c, 0x6b, 0xaa, 0x0f, 0xd5, 0xdd, 0x9f, 0x1a, 0xd4, 0x94, 0x4c, 0x8b, + 0x1b, 0x5c, 0x85, 0x9c, 0x9c, 0x02, 0x05, 0x2b, 0xe7, 0x39, 0xaa, 0xe1, 0xfc, 0xdc, 0x86, 0x0b, + 0x29, 0x0d, 0x2f, 0x2f, 0x68, 0xb8, 0x38, 0xa3, 0xe1, 0xd2, 0x8c, 0x86, 0xcb, 0xf3, 0x1b, 0xde, + 0x10, 0xc7, 0x4c, 0xb5, 0xa6, 0x7a, 0xc6, 0xa2, 0x65, 0x0b, 0xfb, 0x74, 0x78, 0xcd, 0x96, 0x53, + 0x8e, 0xd7, 0xac, 0xf4, 0x2a, 0x4d, 0x92, 0x7e, 0xeb, 0xdf, 0x22, 0xe4, 0x3b, 0xcc, 0x45, 0xdf, + 0xc2, 0xca, 0xe5, 0x8f, 0x67, 0xea, 0xb5, 0xbc, 0x3a, 0xde, 0x1b, 0xef, 0x5f, 0xd7, 0x23, 0x29, + 0x02, 0xfd, 0xa2, 0x81, 0x3e, 0xf7, 0x6b, 0xf0, 0x41, 0x86, 0xb0, 0xf3, 0x9c, 0x1b, 0x0f, 0xff, + 0x87, 0xb3, 0x2a, 0x6f, 0x00, 0xd5, 0xc9, 0x69, 0x6a, 0x64, 0x8e, 0x29, 0xf0, 0x8d, 0xf7, 0xae, + 0x87, 0x57, 0x69, 0xbf, 0xd7, 0x60, 0x6d, 0x7a, 0x2c, 0x6d, 0x67, 0x88, 0x36, 0xe5, 0xd5, 0xf8, + 0xf0, 0x26, 0x5e, 0xaa, 0x92, 0x23, 0x28, 0xca, 0x89, 0xf3, 0x66, 0x86, 0x38, 0x31, 0xb4, 0x71, + 0x3f, 0x33, 0x54, 0xe5, 0xa1, 0x50, 0x19, 0xdf, 0xfd, 0x7b, 0x99, 0x69, 0x8b, 0xb2, 0x6d, 0x5f, + 0x07, 0x3d, 0x99, 0x70, 0x7c, 0xf3, 0xb2, 0x24, 0x54, 0xe8, 0x4c, 0x09, 0xa7, 0xae, 0xdb, 0xde, + 0x27, 0xcf, 0xcf, 0x9b, 0xda, 0xd9, 0x79, 0x53, 0xfb, 0xfb, 0xbc, 0xa9, 0xfd, 0x74, 0xd1, 0x5c, + 0x3a, 0xbb, 0x68, 0x2e, 0xfd, 0x71, 0xd1, 0x5c, 0xfa, 0x72, 0xdb, 0xf5, 0xf8, 0xf1, 0xe0, 0xd0, + 0xe8, 0x51, 0xdf, 0x9c, 0xf3, 0x47, 0x3c, 0x7c, 0x60, 0x9e, 0x8e, 0xff, 0xee, 0x47, 0x01, 0x66, + 0x87, 0x45, 0xf1, 0xfb, 0xfb, 0xe0, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x98, 0xec, 0x1b, + 0x0c, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1313,16 +1313,18 @@ func (m *MsgCreateRollapp) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x78 } - { - size, err := m.GenesisInfo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.GenesisInfo != nil { + { + size, err := m.GenesisInfo.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x72 } - i-- - dAtA[i] = 0x72 if m.Metadata != nil { { size, err := m.Metadata.MarshalToSizedBuffer(dAtA[:i]) @@ -1409,16 +1411,18 @@ func (m *MsgUpdateRollappInformation) MarshalToSizedBuffer(dAtA []byte) (int, er _ = i var l int _ = l - { - size, err := m.GenesisInfo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.GenesisInfo != nil { + { + size, err := m.GenesisInfo.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x32 } - i-- - dAtA[i] = 0x32 if m.Metadata != nil { { size, err := m.Metadata.MarshalToSizedBuffer(dAtA[:i]) @@ -1935,8 +1939,10 @@ func (m *MsgCreateRollapp) Size() (n int) { l = m.Metadata.Size() n += 1 + l + sovTx(uint64(l)) } - l = m.GenesisInfo.Size() - n += 1 + l + sovTx(uint64(l)) + if m.GenesisInfo != nil { + l = m.GenesisInfo.Size() + n += 1 + l + sovTx(uint64(l)) + } if m.VmType != 0 { n += 1 + sovTx(uint64(m.VmType)) } @@ -1974,8 +1980,10 @@ func (m *MsgUpdateRollappInformation) Size() (n int) { l = m.Metadata.Size() n += 1 + l + sovTx(uint64(l)) } - l = m.GenesisInfo.Size() - n += 1 + l + sovTx(uint64(l)) + if m.GenesisInfo != nil { + l = m.GenesisInfo.Size() + n += 1 + l + sovTx(uint64(l)) + } return n } @@ -2409,6 +2417,9 @@ func (m *MsgCreateRollapp) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.GenesisInfo == nil { + m.GenesisInfo = &GenesisInfo{} + } if err := m.GenesisInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2693,6 +2704,9 @@ func (m *MsgUpdateRollappInformation) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.GenesisInfo == nil { + m.GenesisInfo = &GenesisInfo{} + } if err := m.GenesisInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/sequencer/keeper/msg_server_create_sequencer_test.go b/x/sequencer/keeper/msg_server_create_sequencer_test.go index 27cb8a264..deb8685f0 100644 --- a/x/sequencer/keeper/msg_server_create_sequencer_test.go +++ b/x/sequencer/keeper/msg_server_create_sequencer_test.go @@ -125,7 +125,7 @@ func (suite *SequencerTestSuite) TestCreateSequencer() { Telegram: "https://t.me/rolly", X: "https://x.dymension.xyz", }, - GenesisInfo: rollapptypes.GenesisInfo{ + GenesisInfo: &rollapptypes.GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "1234567890abcdefg", InitialSupply: sdk.NewInt(1000), diff --git a/x/sequencer/keeper/sequencer_suite_test.go b/x/sequencer/keeper/sequencer_suite_test.go index 1ca199d1a..62cba4f42 100644 --- a/x/sequencer/keeper/sequencer_suite_test.go +++ b/x/sequencer/keeper/sequencer_suite_test.go @@ -54,7 +54,7 @@ func (suite *SequencerTestSuite) CreateRollappWithInitialSequencer(initSeq strin rollapp := rollapptypes.Rollapp{ RollappId: urand.RollappID(), Owner: sample.AccAddress(), - GenesisInfo: rollapptypes.GenesisInfo{ + GenesisInfo: &rollapptypes.GenesisInfo{ Bech32Prefix: "rol", GenesisChecksum: "checksum", NativeDenom: &rollapptypes.DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18}, From a32612bde2fe2d39ccbbfb2200ca8b31005e98ca Mon Sep 17 00:00:00 2001 From: zale144 Date: Wed, 25 Sep 2024 17:35:34 +0200 Subject: [PATCH 2/2] Fix tests --- app/upgrades/v4/upgrade.go | 2 +- .../dymension/rollapp/query.proto | 2 +- x/dymns/keeper/keeper_suite_test.go | 2 +- x/dymns/keeper/rollapp_test.go | 6 +- x/rollapp/keeper/liveness_test.go | 2 +- .../keeper/msg_server_create_rollapp_test.go | 2 +- .../msg_server_transfer_ownership_test.go | 4 +- .../keeper/msg_server_update_rollapp_test.go | 21 +-- .../keeper/msg_server_update_state_test.go | 2 +- x/rollapp/keeper/rollapp.go | 2 +- x/rollapp/types/message_create_rollapp.go | 6 +- x/rollapp/types/message_update_rollapp.go | 8 +- x/rollapp/types/query.pb.go | 125 +++++++++--------- x/rollapp/types/rollapp.go | 2 +- .../msg_server_create_sequencer_test.go | 2 +- x/sequencer/keeper/sequencer_suite_test.go | 2 +- 16 files changed, 98 insertions(+), 92 deletions(-) diff --git a/app/upgrades/v4/upgrade.go b/app/upgrades/v4/upgrade.go index 6540418fb..7fc295229 100644 --- a/app/upgrades/v4/upgrade.go +++ b/app/upgrades/v4/upgrade.go @@ -236,7 +236,7 @@ func ConvertOldRollappToNew(oldRollapp rollapptypes.Rollapp) rollapptypes.Rollap Tagline: "", FeeDenom: nil, }, - GenesisInfo: &rollapptypes.GenesisInfo{ + GenesisInfo: rollapptypes.GenesisInfo{ Bech32Prefix: oldRollapp.RollappId[:5], // placeholder data GenesisChecksum: string(crypto.Sha256([]byte(oldRollapp.RollappId))), // placeholder data NativeDenom: rollapptypes.DenomMetadata{ diff --git a/proto/dymensionxyz/dymension/rollapp/query.proto b/proto/dymensionxyz/dymension/rollapp/query.proto index f688ff88f..26448d53f 100644 --- a/proto/dymensionxyz/dymension/rollapp/query.proto +++ b/proto/dymensionxyz/dymension/rollapp/query.proto @@ -109,7 +109,7 @@ message QueryAllRollappRequest { message QueryAllRollappResponse { reserved 1; - repeated QueryGetRollappResponse rollapp = 3 [ (gogoproto.nullable) = true ]; + repeated QueryGetRollappResponse rollapp = 3 [ (gogoproto.nullable) = false ]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/x/dymns/keeper/keeper_suite_test.go b/x/dymns/keeper/keeper_suite_test.go index 3422ff4ff..20552dd80 100644 --- a/x/dymns/keeper/keeper_suite_test.go +++ b/x/dymns/keeper/keeper_suite_test.go @@ -280,7 +280,7 @@ func (s *KeeperTestSuite) persistRollApp(ras ...rollapp) { s.rollAppKeeper.SetRollapp(s.ctx, rollapptypes.Rollapp{ RollappId: ra.rollAppId, Owner: ra.owner, - GenesisInfo: &rollapptypes.GenesisInfo{ + GenesisInfo: rollapptypes.GenesisInfo{ Bech32Prefix: ra.bech32, }, }) diff --git a/x/dymns/keeper/rollapp_test.go b/x/dymns/keeper/rollapp_test.go index e27e436ed..1d840c53f 100644 --- a/x/dymns/keeper/rollapp_test.go +++ b/x/dymns/keeper/rollapp_test.go @@ -166,21 +166,21 @@ func (s *KeeperTestSuite) TestKeeper_GetRollAppBech32Prefix() { rollApp1 := rollapptypes.Rollapp{ RollappId: "rollapp_1-1", Owner: testAddr(0).bech32(), - GenesisInfo: &rollapptypes.GenesisInfo{ + GenesisInfo: rollapptypes.GenesisInfo{ Bech32Prefix: "one", }, } rollApp2 := rollapptypes.Rollapp{ RollappId: "rolling_2-2", Owner: testAddr(0).bech32(), - GenesisInfo: &rollapptypes.GenesisInfo{ + GenesisInfo: rollapptypes.GenesisInfo{ Bech32Prefix: "two", }, } rollApp3NonExists := rollapptypes.Rollapp{ RollappId: "nah_3-3", Owner: testAddr(0).bech32(), - GenesisInfo: &rollapptypes.GenesisInfo{ + GenesisInfo: rollapptypes.GenesisInfo{ Bech32Prefix: "three", }, } diff --git a/x/rollapp/keeper/liveness_test.go b/x/rollapp/keeper/liveness_test.go index 8e0d07c94..9b4887b22 100644 --- a/x/rollapp/keeper/liveness_test.go +++ b/x/rollapp/keeper/liveness_test.go @@ -87,7 +87,7 @@ func (suite *RollappTestSuite) TestLivenessFlow() { tracker := newLivenessMockSequencerKeeper() suite.keeper().SetSequencerKeeper(tracker) for _, ra := range rollapps { - suite.keeper().SetRollapp(suite.Ctx, types.NewRollapp("", ra, "", types.Rollapp_Unspecified, nil, nil, false)) + suite.keeper().SetRollapp(suite.Ctx, types.NewRollapp("", ra, "", types.Rollapp_Unspecified, nil, types.GenesisInfo{}, false)) } hLastUpdate := map[string]int64{} diff --git a/x/rollapp/keeper/msg_server_create_rollapp_test.go b/x/rollapp/keeper/msg_server_create_rollapp_test.go index f610b1b46..2f9fd373c 100644 --- a/x/rollapp/keeper/msg_server_create_rollapp_test.go +++ b/x/rollapp/keeper/msg_server_create_rollapp_test.go @@ -351,7 +351,7 @@ func (suite *RollappTestSuite) createRollappWithCreatorAndVerify( InitialSequencer: rollapp.GetInitialSequencer(), VmType: types.Rollapp_EVM, Metadata: rollapp.GetMetadata(), - GenesisInfo: rollapp.GetGenesisInfo(), + GenesisInfo: *rollapp.GetGenesisInfo(), } rollappExpect.GenesisState.TransfersEnabled = true diff --git a/x/rollapp/keeper/msg_server_transfer_ownership_test.go b/x/rollapp/keeper/msg_server_transfer_ownership_test.go index dce6b28a2..7daa17c46 100644 --- a/x/rollapp/keeper/msg_server_transfer_ownership_test.go +++ b/x/rollapp/keeper/msg_server_transfer_ownership_test.go @@ -25,7 +25,7 @@ func (suite *RollappTestSuite) TestTransferOwnership() { expRollapp: types.Rollapp{ Owner: bob, RollappId: rollappId, - GenesisInfo: mockGenesisInfo, + GenesisInfo: *mockGenesisInfo, }, }, { name: "Transfer rollapp ownership: failed, rollapp not found", @@ -75,7 +75,7 @@ func (suite *RollappTestSuite) TestTransferOwnership() { rollapp := types.Rollapp{ RollappId: rollappId, Owner: alice, - GenesisInfo: mockGenesisInfo, + GenesisInfo: *mockGenesisInfo, } if tc.malleate != nil { diff --git a/x/rollapp/keeper/msg_server_update_rollapp_test.go b/x/rollapp/keeper/msg_server_update_rollapp_test.go index 778a039ac..90ccecbe1 100644 --- a/x/rollapp/keeper/msg_server_update_rollapp_test.go +++ b/x/rollapp/keeper/msg_server_update_rollapp_test.go @@ -33,7 +33,7 @@ func (suite *RollappTestSuite) TestUpdateRollapp() { RollappId: rollappId, InitialSequencer: initialSequencerAddress, Metadata: &mockRollappMetadata, - GenesisInfo: types.GenesisInfo{ + GenesisInfo: &types.GenesisInfo{ Bech32Prefix: "new", GenesisChecksum: "new_checksum", InitialSupply: sdk.NewInt(1000), @@ -103,7 +103,7 @@ func (suite *RollappTestSuite) TestUpdateRollapp() { RollappId: rollappId, InitialSequencer: "", Metadata: nil, - GenesisInfo: types.GenesisInfo{ + GenesisInfo: &types.GenesisInfo{ GenesisChecksum: "new_checksum", }, }, @@ -114,7 +114,7 @@ func (suite *RollappTestSuite) TestUpdateRollapp() { update: &types.MsgUpdateRollappInformation{ Owner: alice, RollappId: rollappId, - GenesisInfo: types.GenesisInfo{ + GenesisInfo: &types.GenesisInfo{ Bech32Prefix: "new", }, }, @@ -125,7 +125,7 @@ func (suite *RollappTestSuite) TestUpdateRollapp() { update: &types.MsgUpdateRollappInformation{ Owner: alice, RollappId: rollappId, - GenesisInfo: types.GenesisInfo{ + GenesisInfo: &types.GenesisInfo{ NativeDenom: types.DenomMetadata{ Display: "DEN", Base: "aden", @@ -140,7 +140,7 @@ func (suite *RollappTestSuite) TestUpdateRollapp() { update: &types.MsgUpdateRollappInformation{ Owner: alice, RollappId: rollappId, - GenesisInfo: types.GenesisInfo{ + GenesisInfo: &types.GenesisInfo{ InitialSupply: sdk.NewInt(1000), }, }, @@ -183,8 +183,9 @@ func (suite *RollappTestSuite) TestUpdateRollapp() { update: &types.MsgUpdateRollappInformation{ Owner: alice, RollappId: rollappId, + Metadata: &mockRollappMetadata, }, - rollappLaunched: true, + rollappLaunched: false, genInfoSealed: false, expError: nil, expRollapp: types.Rollapp{ @@ -197,11 +198,11 @@ func (suite *RollappTestSuite) TestUpdateRollapp() { Launched: false, VmType: types.Rollapp_EVM, Metadata: &mockRollappMetadata, - GenesisInfo: &types.GenesisInfo{ + GenesisInfo: types.GenesisInfo{ Bech32Prefix: "old", GenesisChecksum: "old", InitialSupply: sdk.NewInt(1000), - NativeDenom: &types.DenomMetadata{ + NativeDenom: types.DenomMetadata{ Display: "OLD", Base: "aold", Exponent: 18, @@ -269,7 +270,7 @@ func (suite *RollappTestSuite) TestCreateAndUpdateRollapp() { InitialSequencer: "", Alias: "default", VmType: types.Rollapp_EVM, - GenesisInfo: types.GenesisInfo{ + GenesisInfo: &types.GenesisInfo{ Bech32Prefix: "rol", GenesisChecksum: "checksum", InitialSupply: sdk.NewInt(1000), @@ -296,7 +297,7 @@ func (suite *RollappTestSuite) TestCreateAndUpdateRollapp() { Owner: alice, RollappId: rollappId, InitialSequencer: addrInit, - GenesisInfo: types.GenesisInfo{GenesisChecksum: "checksum1"}, + GenesisInfo: &types.GenesisInfo{GenesisChecksum: "checksum1"}, }) suite.Require().NoError(err) diff --git a/x/rollapp/keeper/msg_server_update_state_test.go b/x/rollapp/keeper/msg_server_update_state_test.go index 08a040acd..d4aacfe0f 100644 --- a/x/rollapp/keeper/msg_server_update_state_test.go +++ b/x/rollapp/keeper/msg_server_update_state_test.go @@ -191,7 +191,7 @@ func (suite *RollappTestSuite) TestUpdateStateErrLogicUnpermissioned() { RollappId: rollappID, Owner: alice, InitialSequencer: sample.AccAddress(), - GenesisInfo: mockGenesisInfo, + GenesisInfo: *mockGenesisInfo, } suite.App.RollappKeeper.SetRollapp(suite.Ctx, rollapp) diff --git a/x/rollapp/keeper/rollapp.go b/x/rollapp/keeper/rollapp.go index de98bc658..9c20bae31 100644 --- a/x/rollapp/keeper/rollapp.go +++ b/x/rollapp/keeper/rollapp.go @@ -32,7 +32,7 @@ func (k Keeper) CheckAndUpdateRollappFields(ctx sdk.Context, update *types.MsgUp return current, types.ErrImmutableFieldUpdateAfterLaunched } - if update.UpdatingGenesisInfo() && current.GenesisInfo != nil && current.GenesisInfo.Sealed { + if update.UpdatingGenesisInfo() && current.GenesisInfo.Sealed { return current, types.ErrGenesisInfoSealed } diff --git a/x/rollapp/types/message_create_rollapp.go b/x/rollapp/types/message_create_rollapp.go index c9a01d517..96a792fbf 100644 --- a/x/rollapp/types/message_create_rollapp.go +++ b/x/rollapp/types/message_create_rollapp.go @@ -50,13 +50,17 @@ func (msg *MsgCreateRollapp) GetSignBytes() []byte { } func (msg *MsgCreateRollapp) GetRollapp() Rollapp { + genInfo := GenesisInfo{} + if msg.GenesisInfo != nil { + genInfo = *msg.GenesisInfo + } return NewRollapp( msg.Creator, msg.RollappId, msg.InitialSequencer, msg.VmType, msg.Metadata, - msg.GenesisInfo, + genInfo, true, ) } diff --git a/x/rollapp/types/message_update_rollapp.go b/x/rollapp/types/message_update_rollapp.go index 391db6471..a571be23f 100644 --- a/x/rollapp/types/message_update_rollapp.go +++ b/x/rollapp/types/message_update_rollapp.go @@ -5,6 +5,7 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/dymensionxyz/gerr-cosmos/gerrc" ) const TypeMsgUpdateRollappInformation = "update_rollapp" @@ -61,9 +62,10 @@ func (msg *MsgUpdateRollappInformation) ValidateBasic() error { return ErrInvalidGenesisChecksum } - if msg.GenesisInfo.Bech32Prefix != "" { - if err := validateBech32Prefix(msg.GenesisInfo.Bech32Prefix); err != nil { - return errorsmod.Wrap(errors.Join(err, gerrc.ErrInvalidArgument), "bech32 prefix") + if msg.GenesisInfo.Bech32Prefix != "" { + if err := validateBech32Prefix(msg.GenesisInfo.Bech32Prefix); err != nil { + return errorsmod.Wrap(errors.Join(err, gerrc.ErrInvalidArgument), "bech32 prefix") + } } } diff --git a/x/rollapp/types/query.pb.go b/x/rollapp/types/query.pb.go index 258d8f07e..a6409c7ec 100644 --- a/x/rollapp/types/query.pb.go +++ b/x/rollapp/types/query.pb.go @@ -526,8 +526,8 @@ func (m *QueryAllRollappRequest) GetOmitApps() bool { } type QueryAllRollappResponse struct { - Rollapp []*QueryGetRollappResponse `protobuf:"bytes,3,rep,name=rollapp,proto3" json:"rollapp,omitempty"` - Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` + Rollapp []QueryGetRollappResponse `protobuf:"bytes,3,rep,name=rollapp,proto3" json:"rollapp"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryAllRollappResponse) Reset() { *m = QueryAllRollappResponse{} } @@ -563,7 +563,7 @@ func (m *QueryAllRollappResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAllRollappResponse proto.InternalMessageInfo -func (m *QueryAllRollappResponse) GetRollapp() []*QueryGetRollappResponse { +func (m *QueryAllRollappResponse) GetRollapp() []QueryGetRollappResponse { if m != nil { return m.Rollapp } @@ -710,66 +710,65 @@ func init() { } var fileDescriptor_00a0238fb38306fa = []byte{ - // 929 bytes of a gzipped FileDescriptorProto + // 928 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0x38, 0xae, 0x13, 0xbf, 0x22, 0x11, 0x0d, 0x51, 0x08, 0x6e, 0xb4, 0x8d, 0x16, 0xa9, - 0x75, 0x0b, 0xda, 0x91, 0x13, 0xdc, 0x52, 0x05, 0x4a, 0x1d, 0x41, 0x43, 0x2a, 0xa8, 0xc2, 0x06, - 0x84, 0x00, 0xa1, 0x68, 0x53, 0x4f, 0x36, 0x8b, 0xd6, 0x3b, 0x5b, 0xcf, 0xa6, 0xb2, 0x1b, 0xe5, - 0x82, 0xf8, 0x00, 0x48, 0x7c, 0x02, 0xbe, 0x00, 0x57, 0xce, 0x88, 0x4b, 0x0e, 0x1c, 0x22, 0x21, - 0x21, 0x2e, 0x20, 0x94, 0xf0, 0x1d, 0xb8, 0x22, 0xcf, 0xbc, 0x5d, 0xaf, 0xed, 0x24, 0xbb, 0xb6, - 0x7a, 0x72, 0x66, 0xf2, 0xde, 0xef, 0xfd, 0x7e, 0xf3, 0xfe, 0x2d, 0xdc, 0x6e, 0x76, 0x5b, 0x3c, - 0x90, 0x9e, 0x08, 0x3a, 0xdd, 0xe7, 0x2c, 0x39, 0xb0, 0xb6, 0xf0, 0x7d, 0x27, 0x0c, 0xd9, 0xd3, - 0x03, 0xde, 0xee, 0x5a, 0x61, 0x5b, 0x44, 0x82, 0x1a, 0x69, 0x5b, 0x2b, 0x39, 0x58, 0x68, 0x5b, - 0x99, 0x77, 0x85, 0x2b, 0x94, 0x29, 0xeb, 0xfd, 0xa5, 0xbd, 0x2a, 0x4b, 0xae, 0x10, 0xae, 0xcf, - 0x99, 0x13, 0x7a, 0xcc, 0x09, 0x02, 0x11, 0x39, 0x91, 0x27, 0x02, 0x89, 0xff, 0xbd, 0xfd, 0x44, - 0xc8, 0x96, 0x90, 0x6c, 0xd7, 0x91, 0x5c, 0x07, 0x63, 0xcf, 0x6a, 0xbb, 0x3c, 0x72, 0x6a, 0x2c, - 0x74, 0x5c, 0x2f, 0x50, 0xc6, 0x68, 0xfb, 0x46, 0x06, 0xd7, 0xd0, 0x69, 0x3b, 0xad, 0x18, 0xf8, - 0xcd, 0x0c, 0x63, 0xfc, 0x45, 0x6b, 0x96, 0x61, 0x2d, 0x23, 0x27, 0xe2, 0x3b, 0x5e, 0xb0, 0x17, - 0xab, 0xaa, 0x66, 0x38, 0x24, 0xd0, 0xe6, 0x3c, 0xd0, 0x4f, 0x7a, 0xba, 0xb6, 0x14, 0x3b, 0x9b, - 0x3f, 0x3d, 0xe0, 0x32, 0x32, 0xbf, 0x82, 0x57, 0x06, 0x6e, 0x65, 0x28, 0x02, 0xc9, 0xe9, 0xfb, - 0x50, 0xd2, 0x2a, 0x16, 0xc9, 0x32, 0xa9, 0x5e, 0x5d, 0xb9, 0x61, 0x5d, 0xfe, 0xe6, 0x96, 0xf6, - 0x5f, 0x2f, 0x1e, 0xff, 0x7d, 0x7d, 0xca, 0x46, 0x5f, 0x73, 0x1b, 0x16, 0x14, 0xf8, 0x06, 0x8f, - 0x6c, 0x6d, 0x87, 0x61, 0xe9, 0x12, 0x94, 0xd1, 0x73, 0xb3, 0xa9, 0x42, 0x94, 0xed, 0xfe, 0x05, - 0xbd, 0x06, 0x65, 0xd1, 0xf2, 0xa2, 0x1d, 0x27, 0x0c, 0xe5, 0x62, 0x61, 0x99, 0x54, 0x67, 0xed, - 0xd9, 0xde, 0x45, 0x23, 0x0c, 0xa5, 0xf9, 0x19, 0x18, 0x43, 0xa0, 0xeb, 0xdd, 0x0f, 0x36, 0xb7, - 0x6a, 0xf5, 0x7a, 0x0c, 0xbe, 0x00, 0x25, 0xee, 0x85, 0xb5, 0x7a, 0x5d, 0x21, 0x17, 0x6d, 0x3c, - 0x5d, 0x0e, 0xfb, 0x05, 0x5c, 0x8b, 0x61, 0x3f, 0x72, 0x22, 0x2e, 0xa3, 0x0f, 0xb9, 0xe7, 0xee, - 0x47, 0xf9, 0x08, 0x2f, 0x41, 0x79, 0xcf, 0x0b, 0x1c, 0xdf, 0x7b, 0xce, 0x9b, 0x88, 0xdc, 0xbf, - 0x30, 0xef, 0xc0, 0xd2, 0xf9, 0xd0, 0xf8, 0xd8, 0x0b, 0x50, 0xda, 0x57, 0x37, 0x31, 0x5f, 0x7d, - 0x32, 0xbf, 0x86, 0xeb, 0x83, 0x7e, 0xdb, 0xbd, 0xec, 0x6f, 0x06, 0x4d, 0xde, 0x79, 0x11, 0xb4, - 0x3a, 0xb0, 0x7c, 0x31, 0x3c, 0x52, 0xfb, 0x14, 0x40, 0x26, 0xb7, 0x58, 0x0b, 0x56, 0x56, 0x2d, - 0x20, 0xce, 0x9e, 0x50, 0x5e, 0x58, 0x13, 0x29, 0x1c, 0xf3, 0x3f, 0x02, 0xaf, 0x8e, 0x14, 0x06, - 0x46, 0xdc, 0x80, 0x19, 0xc4, 0xc1, 0x70, 0x37, 0xb3, 0xc2, 0xc5, 0x55, 0xa0, 0xe3, 0xc4, 0xde, - 0xf4, 0x31, 0xcc, 0xc8, 0x83, 0x56, 0xcb, 0x69, 0x77, 0x17, 0x4b, 0xf9, 0x78, 0x23, 0xd0, 0xb6, - 0xf6, 0x8a, 0xf1, 0x10, 0x84, 0xbe, 0x0b, 0x45, 0x55, 0x38, 0x33, 0xcb, 0xd3, 0xd5, 0xab, 0x2b, - 0xaf, 0x67, 0x81, 0x35, 0x90, 0x11, 0xb1, 0x95, 0xdb, 0xa3, 0xe2, 0x6c, 0x61, 0xae, 0x64, 0x1e, - 0x61, 0x47, 0x34, 0x7c, 0x7f, 0xa8, 0x23, 0x1e, 0x02, 0xf4, 0x07, 0x4d, 0xd2, 0x75, 0x7a, 0x2a, - 0x59, 0xbd, 0xa9, 0x64, 0xe9, 0x11, 0x88, 0x53, 0xc9, 0xda, 0x72, 0x5c, 0x8e, 0xbe, 0x76, 0xca, - 0xf3, 0xf2, 0x22, 0xff, 0x25, 0x7e, 0xf8, 0x74, 0x7c, 0x7c, 0xf8, 0xcf, 0xfb, 0x0f, 0x3f, 0xad, - 0x24, 0xde, 0xcd, 0x92, 0x78, 0x41, 0x0a, 0x51, 0x76, 0x92, 0x88, 0x8d, 0x01, 0x65, 0x05, 0x4c, - 0x6a, 0x96, 0x32, 0x8d, 0x95, 0x96, 0xf6, 0xa8, 0x38, 0x4b, 0xe6, 0x0a, 0xe6, 0x77, 0x04, 0x16, - 0xe3, 0xc8, 0x49, 0xa5, 0xe5, 0xeb, 0x87, 0x79, 0xb8, 0xe2, 0xa9, 0x42, 0x2e, 0xa8, 0x3e, 0xd3, - 0x87, 0x54, 0xfb, 0x4d, 0xa7, 0xdb, 0x6f, 0xb0, 0x7b, 0x8a, 0xc3, 0xdd, 0xf3, 0x0d, 0xbc, 0x76, - 0x0e, 0x0b, 0x7c, 0xcb, 0x8f, 0xa1, 0x2c, 0xe3, 0x4b, 0xcc, 0xe5, 0xad, 0xdc, 0x5d, 0x83, 0x85, - 0xd7, 0x47, 0x58, 0xf9, 0x03, 0xe0, 0x8a, 0x0a, 0x46, 0x7f, 0x24, 0x50, 0xd2, 0xa3, 0x96, 0xae, - 0xe4, 0x4a, 0xcf, 0xc0, 0xb4, 0xaf, 0xac, 0x8e, 0xe5, 0xa3, 0xc5, 0x98, 0xd6, 0xb7, 0xbf, 0xff, - 0xfb, 0x43, 0xa1, 0x4a, 0x6f, 0xb0, 0x5c, 0x7b, 0x8f, 0xfe, 0x4c, 0x60, 0x06, 0x4b, 0x82, 0xde, - 0x19, 0xbb, 0x86, 0x34, 0xd1, 0x49, 0x6b, 0xcf, 0x5c, 0x53, 0x64, 0xeb, 0x74, 0x95, 0xe5, 0xdb, - 0xbb, 0xec, 0x30, 0x29, 0x8f, 0x23, 0xfa, 0x2b, 0x81, 0x97, 0x87, 0x76, 0x0a, 0xbd, 0x3f, 0x26, - 0x93, 0xa1, 0x65, 0x34, 0xb9, 0x92, 0xbb, 0x4a, 0x49, 0x8d, 0xb2, 0x2c, 0x25, 0x7a, 0xbb, 0xb1, - 0x43, 0xfd, 0x7b, 0x44, 0x7f, 0x22, 0x00, 0x08, 0xd6, 0xf0, 0xfd, 0x9c, 0x29, 0x18, 0x19, 0x48, - 0x39, 0x89, 0x8f, 0x0e, 0x12, 0x93, 0x29, 0xe2, 0xb7, 0xe8, 0xcd, 0x9c, 0x29, 0xa0, 0xbf, 0x11, - 0x78, 0x29, 0xbd, 0x18, 0xe9, 0x5a, 0xde, 0x37, 0x3b, 0x67, 0x53, 0x57, 0xde, 0x99, 0xcc, 0x19, - 0xc9, 0x37, 0x14, 0xf9, 0x35, 0x7a, 0x2f, 0x8b, 0xbc, 0xaf, 0xbc, 0x77, 0xf4, 0xac, 0x18, 0xa8, - 0xa2, 0xbf, 0x08, 0xcc, 0x0d, 0x2f, 0x54, 0xfa, 0xde, 0x78, 0xac, 0x46, 0x36, 0x7d, 0xe5, 0xc1, - 0xe4, 0x00, 0x28, 0xed, 0xa1, 0x92, 0xf6, 0x80, 0xde, 0xcf, 0x29, 0x2d, 0xfe, 0xd6, 0x6c, 0xf2, - 0xce, 0x80, 0xbe, 0x63, 0x02, 0xe5, 0x64, 0x58, 0xd1, 0xb7, 0xf3, 0xf2, 0x1a, 0x9e, 0xd5, 0x95, - 0x7b, 0x13, 0x78, 0x8e, 0x2b, 0xa5, 0xff, 0xbd, 0x9c, 0x96, 0xc0, 0x0e, 0x95, 0xaa, 0xa3, 0xf5, - 0xc7, 0xc7, 0xa7, 0x06, 0x39, 0x39, 0x35, 0xc8, 0x3f, 0xa7, 0x06, 0xf9, 0xfe, 0xcc, 0x98, 0x3a, - 0x39, 0x33, 0xa6, 0xfe, 0x3c, 0x33, 0xa6, 0xbe, 0x7c, 0xcb, 0xf5, 0xa2, 0xfd, 0x83, 0x5d, 0xeb, - 0x89, 0x68, 0x5d, 0x14, 0xe3, 0xd9, 0x2a, 0xeb, 0x24, 0x81, 0xa2, 0x6e, 0xc8, 0xe5, 0x6e, 0x49, - 0x7d, 0x6a, 0xaf, 0xfe, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x61, 0x6f, 0x5f, 0x0b, 0xce, 0x0c, 0x00, - 0x00, + 0x14, 0xcf, 0x38, 0xae, 0x13, 0xbf, 0x22, 0x11, 0x0d, 0x51, 0x08, 0x6e, 0xe4, 0x46, 0x8b, 0xd4, + 0xba, 0x05, 0xed, 0xc8, 0x09, 0x6e, 0xa9, 0x02, 0xa5, 0x8e, 0xa0, 0x21, 0x15, 0x54, 0x61, 0x03, + 0x42, 0x80, 0x50, 0xb4, 0xa9, 0x27, 0x9b, 0x45, 0xeb, 0x9d, 0xad, 0x67, 0x53, 0xd9, 0x8d, 0x72, + 0x41, 0x7c, 0x00, 0x24, 0x3e, 0x01, 0x5f, 0x80, 0x2b, 0x67, 0xc4, 0x25, 0x07, 0x0e, 0x91, 0x90, + 0x10, 0x17, 0x10, 0x4a, 0xf8, 0x0e, 0x5c, 0x91, 0x67, 0xde, 0xae, 0xd7, 0xeb, 0x24, 0xbb, 0xb6, + 0x7a, 0x72, 0x66, 0xf2, 0xde, 0xef, 0xfd, 0x7e, 0xf3, 0xfe, 0x2d, 0xdc, 0x6e, 0xf5, 0xda, 0xdc, + 0x97, 0xae, 0xf0, 0xbb, 0xbd, 0xe7, 0x2c, 0x3e, 0xb0, 0x8e, 0xf0, 0x3c, 0x3b, 0x08, 0xd8, 0xd3, + 0x03, 0xde, 0xe9, 0x99, 0x41, 0x47, 0x84, 0x82, 0x56, 0x93, 0xb6, 0x66, 0x7c, 0x30, 0xd1, 0xb6, + 0x32, 0xef, 0x08, 0x47, 0x28, 0x53, 0xd6, 0xff, 0x4b, 0x7b, 0x55, 0x96, 0x1c, 0x21, 0x1c, 0x8f, + 0x33, 0x3b, 0x70, 0x99, 0xed, 0xfb, 0x22, 0xb4, 0x43, 0x57, 0xf8, 0x12, 0xff, 0x7b, 0xfb, 0x89, + 0x90, 0x6d, 0x21, 0xd9, 0xae, 0x2d, 0xb9, 0x0e, 0xc6, 0x9e, 0xd5, 0x77, 0x79, 0x68, 0xd7, 0x59, + 0x60, 0x3b, 0xae, 0xaf, 0x8c, 0xd1, 0xf6, 0x8d, 0x0c, 0xae, 0x81, 0xdd, 0xb1, 0xdb, 0x11, 0xf0, + 0x9b, 0x19, 0xc6, 0xf8, 0x8b, 0xd6, 0x2c, 0xc3, 0x5a, 0x86, 0x76, 0xc8, 0x77, 0x5c, 0x7f, 0x2f, + 0x52, 0x55, 0xcb, 0x70, 0x88, 0xa1, 0x8d, 0x79, 0xa0, 0x9f, 0xf4, 0x75, 0x6d, 0x29, 0x76, 0x16, + 0x7f, 0x7a, 0xc0, 0x65, 0x68, 0x7c, 0x05, 0xaf, 0x0c, 0xdd, 0xca, 0x40, 0xf8, 0x92, 0xd3, 0xf7, + 0xa1, 0xa4, 0x55, 0x2c, 0x92, 0x65, 0x52, 0xbb, 0xba, 0x72, 0xc3, 0xbc, 0xfc, 0xcd, 0x4d, 0xed, + 0xbf, 0x5e, 0x3c, 0xfe, 0xfb, 0xfa, 0x94, 0x85, 0xbe, 0xc6, 0x36, 0x2c, 0x28, 0xf0, 0x0d, 0x1e, + 0x5a, 0xda, 0x0e, 0xc3, 0xd2, 0x25, 0x28, 0xa3, 0xe7, 0x66, 0x4b, 0x85, 0x28, 0x5b, 0x83, 0x0b, + 0x7a, 0x0d, 0xca, 0xa2, 0xed, 0x86, 0x3b, 0x76, 0x10, 0xc8, 0xc5, 0xc2, 0x32, 0xa9, 0xcd, 0x5a, + 0xb3, 0xfd, 0x8b, 0x66, 0x10, 0x48, 0xe3, 0x33, 0xa8, 0xa6, 0x40, 0xd7, 0x7b, 0x1f, 0x6c, 0x6e, + 0xd5, 0x1b, 0x8d, 0x08, 0x7c, 0x01, 0x4a, 0xdc, 0x0d, 0xea, 0x8d, 0x86, 0x42, 0x2e, 0x5a, 0x78, + 0xba, 0x1c, 0xf6, 0x0b, 0xb8, 0x16, 0xc1, 0x7e, 0x64, 0x87, 0x5c, 0x86, 0x1f, 0x72, 0xd7, 0xd9, + 0x0f, 0xf3, 0x11, 0x5e, 0x82, 0xf2, 0x9e, 0xeb, 0xdb, 0x9e, 0xfb, 0x9c, 0xb7, 0x10, 0x79, 0x70, + 0x61, 0xdc, 0x81, 0xa5, 0xf3, 0xa1, 0xf1, 0xb1, 0x17, 0xa0, 0xb4, 0xaf, 0x6e, 0x22, 0xbe, 0xfa, + 0x64, 0x7c, 0x0d, 0xd7, 0x87, 0xfd, 0xb6, 0xfb, 0xd9, 0xdf, 0xf4, 0x5b, 0xbc, 0xfb, 0x22, 0x68, + 0x75, 0x61, 0xf9, 0x62, 0x78, 0xa4, 0xf6, 0x29, 0x80, 0x8c, 0x6f, 0xb1, 0x16, 0xcc, 0xac, 0x5a, + 0x40, 0x9c, 0x3d, 0xa1, 0xbc, 0xb0, 0x26, 0x12, 0x38, 0xc6, 0x7f, 0x04, 0x5e, 0x1d, 0x29, 0x0c, + 0x8c, 0xb8, 0x01, 0x33, 0x88, 0x83, 0xe1, 0x6e, 0x66, 0x85, 0x8b, 0xaa, 0x40, 0xc7, 0x89, 0xbc, + 0xe9, 0x63, 0x98, 0x91, 0x07, 0xed, 0xb6, 0xdd, 0xe9, 0x2d, 0x96, 0xf2, 0xf1, 0x46, 0xa0, 0x6d, + 0xed, 0x15, 0xe1, 0x21, 0x08, 0x7d, 0x17, 0x8a, 0xaa, 0x70, 0x66, 0x96, 0xa7, 0x6b, 0x57, 0x57, + 0x5e, 0xcf, 0x02, 0x6b, 0x22, 0x23, 0x62, 0x29, 0xb7, 0x47, 0xc5, 0xd9, 0xc2, 0x5c, 0xc9, 0x38, + 0xc2, 0x8e, 0x68, 0x7a, 0x5e, 0xaa, 0x23, 0x1e, 0x02, 0x0c, 0x06, 0x4d, 0xdc, 0x75, 0x7a, 0x2a, + 0x99, 0xfd, 0xa9, 0x64, 0xea, 0x11, 0x88, 0x53, 0xc9, 0xdc, 0xb2, 0x1d, 0x8e, 0xbe, 0x56, 0xc2, + 0xf3, 0xf2, 0x22, 0xff, 0x25, 0x7a, 0xf8, 0x64, 0x7c, 0x7c, 0xf8, 0xcf, 0x07, 0x0f, 0x3f, 0xad, + 0x24, 0xde, 0xcd, 0x92, 0x78, 0x41, 0x0a, 0xd3, 0x89, 0xd8, 0x18, 0x52, 0x56, 0xc0, 0xa4, 0x66, + 0x29, 0xd3, 0x58, 0x49, 0x69, 0x8f, 0x8a, 0xb3, 0x64, 0xae, 0x60, 0x7c, 0x47, 0x60, 0x31, 0x8a, + 0x1c, 0x57, 0x5a, 0xbe, 0x7e, 0x98, 0x87, 0x2b, 0xae, 0x2a, 0xe4, 0x82, 0xea, 0x33, 0x7d, 0x48, + 0xb4, 0xdf, 0x74, 0xb2, 0xfd, 0x86, 0xbb, 0xa7, 0x98, 0xee, 0x9e, 0x6f, 0xe0, 0xb5, 0x73, 0x58, + 0xe0, 0x5b, 0x7e, 0x0c, 0x65, 0x19, 0x5d, 0x62, 0x2e, 0x6f, 0xe5, 0xee, 0x1a, 0x7c, 0xbf, 0x01, + 0xc2, 0xca, 0x1f, 0x00, 0x57, 0x54, 0x30, 0xfa, 0x23, 0x81, 0x92, 0x1e, 0xb5, 0x74, 0x25, 0x57, + 0x7a, 0x86, 0xa6, 0x7d, 0x65, 0x75, 0x2c, 0x1f, 0x2d, 0xc6, 0x30, 0xbf, 0xfd, 0xfd, 0xdf, 0x1f, + 0x0a, 0x35, 0x7a, 0x83, 0xe5, 0xda, 0x7b, 0xf4, 0x67, 0x02, 0x33, 0x58, 0x12, 0xf4, 0xce, 0xd8, + 0x35, 0xa4, 0x89, 0x4e, 0x5a, 0x7b, 0xc6, 0x9a, 0x22, 0xdb, 0xa0, 0xab, 0x2c, 0xdf, 0xde, 0x65, + 0x87, 0x71, 0x79, 0x1c, 0xd1, 0x5f, 0x09, 0xbc, 0x9c, 0xda, 0x29, 0xf4, 0xfe, 0x98, 0x4c, 0x52, + 0xcb, 0x68, 0x72, 0x25, 0x77, 0x95, 0x92, 0x3a, 0x65, 0x59, 0x4a, 0xf4, 0x76, 0x63, 0x87, 0xfa, + 0xf7, 0x88, 0xfe, 0x44, 0x00, 0x10, 0xac, 0xe9, 0x79, 0x39, 0x53, 0x30, 0x32, 0x90, 0x72, 0x12, + 0x1f, 0x1d, 0x24, 0x06, 0x53, 0xc4, 0x6f, 0xd1, 0x9b, 0x39, 0x53, 0x40, 0x7f, 0x23, 0xf0, 0x52, + 0x72, 0x31, 0xd2, 0xb5, 0xbc, 0x6f, 0x76, 0xce, 0xa6, 0xae, 0xbc, 0x33, 0x99, 0x33, 0x92, 0x6f, + 0x2a, 0xf2, 0x6b, 0xf4, 0x5e, 0x16, 0x79, 0x4f, 0x79, 0xef, 0xe8, 0x59, 0x31, 0x54, 0x45, 0x7f, + 0x11, 0x98, 0x4b, 0x2f, 0x54, 0xfa, 0xde, 0x78, 0xac, 0x46, 0x36, 0x7d, 0xe5, 0xc1, 0xe4, 0x00, + 0x28, 0xed, 0xa1, 0x92, 0xf6, 0x80, 0xde, 0xcf, 0x29, 0x2d, 0xfa, 0xd6, 0x6c, 0xf1, 0xee, 0x90, + 0xbe, 0x63, 0x02, 0xe5, 0x78, 0x58, 0xd1, 0xb7, 0xf3, 0xf2, 0x4a, 0xcf, 0xea, 0xca, 0xbd, 0x09, + 0x3c, 0xc7, 0x95, 0x32, 0xf8, 0x5e, 0x4e, 0x4a, 0x60, 0x87, 0x4a, 0xd5, 0xd1, 0xfa, 0xe3, 0xe3, + 0xd3, 0x2a, 0x39, 0x39, 0xad, 0x92, 0x7f, 0x4e, 0xab, 0xe4, 0xfb, 0xb3, 0xea, 0xd4, 0xc9, 0x59, + 0x75, 0xea, 0xcf, 0xb3, 0xea, 0xd4, 0x97, 0x6f, 0x39, 0x6e, 0xb8, 0x7f, 0xb0, 0x6b, 0x3e, 0x11, + 0xed, 0x8b, 0x62, 0x3c, 0x5b, 0x65, 0xdd, 0x38, 0x50, 0xd8, 0x0b, 0xb8, 0xdc, 0x2d, 0xa9, 0x4f, + 0xed, 0xd5, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x27, 0x2c, 0x7d, 0x1f, 0xce, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2831,7 +2830,7 @@ func (m *QueryAllRollappResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Rollapp = append(m.Rollapp, &QueryGetRollappResponse{}) + m.Rollapp = append(m.Rollapp, QueryGetRollappResponse{}) if err := m.Rollapp[len(m.Rollapp)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/x/rollapp/types/rollapp.go b/x/rollapp/types/rollapp.go index 3b96b6c9e..e26efb188 100644 --- a/x/rollapp/types/rollapp.go +++ b/x/rollapp/types/rollapp.go @@ -18,7 +18,7 @@ func NewRollapp( initialSequencer string, vmType Rollapp_VMType, metadata *RollappMetadata, - genInfo *GenesisInfo, + genInfo GenesisInfo, transfersEnabled bool, ) Rollapp { return Rollapp{ diff --git a/x/sequencer/keeper/msg_server_create_sequencer_test.go b/x/sequencer/keeper/msg_server_create_sequencer_test.go index 7b328c8da..4c35460bb 100644 --- a/x/sequencer/keeper/msg_server_create_sequencer_test.go +++ b/x/sequencer/keeper/msg_server_create_sequencer_test.go @@ -126,7 +126,7 @@ func (suite *SequencerTestSuite) TestCreateSequencer() { Telegram: "https://t.me/rolly", X: "https://x.dymension.xyz", }, - GenesisInfo: &rollapptypes.GenesisInfo{ + GenesisInfo: rollapptypes.GenesisInfo{ Bech32Prefix: bech32Prefix, GenesisChecksum: "1234567890abcdefg", InitialSupply: sdk.NewInt(1000), diff --git a/x/sequencer/keeper/sequencer_suite_test.go b/x/sequencer/keeper/sequencer_suite_test.go index cc9b60042..5dec46111 100644 --- a/x/sequencer/keeper/sequencer_suite_test.go +++ b/x/sequencer/keeper/sequencer_suite_test.go @@ -54,7 +54,7 @@ func (suite *SequencerTestSuite) CreateRollappWithInitialSequencer(initSeq strin rollapp := rollapptypes.Rollapp{ RollappId: urand.RollappID(), Owner: sample.AccAddress(), - GenesisInfo: &rollapptypes.GenesisInfo{ + GenesisInfo: rollapptypes.GenesisInfo{ Bech32Prefix: "rol", GenesisChecksum: "checksum", NativeDenom: rollapptypes.DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18},