From a0a367fe02dc66046c471d58a495b644d3dd13f8 Mon Sep 17 00:00:00 2001 From: Michael Tsitrin <114929630+mtsitrin@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:53:51 +0300 Subject: [PATCH] refactor(hub-genesis): refactoring `x/hub-genesis` state (#374) --- proto/hub-genesis/genesis.proto | 4 +- proto/hub-genesis/hub.proto | 12 - proto/hub-genesis/params.proto | 6 +- proto/hub-genesis/query.proto | 30 +- proto/hub-genesis/state.proto | 20 ++ proto/hub-genesis/tx.proto | 2 +- x/hub-genesis/client/cli/query.go | 30 ++ x/hub-genesis/genesis.go | 31 -- x/hub-genesis/keeper/genesis.go | 36 ++ x/hub-genesis/{ => keeper}/genesis_test.go | 11 +- x/hub-genesis/keeper/grpc_query.go | 9 +- x/hub-genesis/keeper/hub.go | 34 -- x/hub-genesis/keeper/keeper.go | 18 +- x/hub-genesis/keeper/msg_server.go | 26 +- x/hub-genesis/keeper/msg_server_test.go | 118 ++++--- x/hub-genesis/keeper/params.go | 12 +- x/hub-genesis/keeper/state.go | 24 ++ x/hub-genesis/module.go | 9 +- x/hub-genesis/types/errors.go | 15 +- x/hub-genesis/types/genesis.go | 16 +- x/hub-genesis/types/genesis.pb.go | 40 +-- x/hub-genesis/types/hub.go | 8 - x/hub-genesis/types/hub.pb.go | 369 -------------------- x/hub-genesis/types/keys.go | 18 +- x/hub-genesis/types/params.go | 24 +- x/hub-genesis/types/params.pb.go | 32 +- x/hub-genesis/types/query.pb.go | 370 +++++++++----------- x/hub-genesis/types/query.pb.gw.go | 92 ++--- x/hub-genesis/types/state.go | 9 + x/hub-genesis/types/state.pb.go | 380 +++++++++++++++++++++ x/hub-genesis/types/tx.pb.go | 2 +- x/mint/types/params.pb.go | 5 +- x/mint/types/query.pb.go | 3 +- x/sequencers/types/genesis.pb.go | 3 +- 34 files changed, 872 insertions(+), 946 deletions(-) delete mode 100644 proto/hub-genesis/hub.proto create mode 100644 proto/hub-genesis/state.proto delete mode 100644 x/hub-genesis/genesis.go create mode 100644 x/hub-genesis/keeper/genesis.go rename x/hub-genesis/{ => keeper}/genesis_test.go (69%) delete mode 100644 x/hub-genesis/keeper/hub.go create mode 100644 x/hub-genesis/keeper/state.go delete mode 100644 x/hub-genesis/types/hub.go delete mode 100644 x/hub-genesis/types/hub.pb.go create mode 100644 x/hub-genesis/types/state.go create mode 100644 x/hub-genesis/types/state.pb.go diff --git a/proto/hub-genesis/genesis.proto b/proto/hub-genesis/genesis.proto index bb19877c..3e226f34 100755 --- a/proto/hub-genesis/genesis.proto +++ b/proto/hub-genesis/genesis.proto @@ -3,7 +3,7 @@ package rollapp.hub_genesis; import "gogoproto/gogo.proto"; import "hub-genesis/params.proto"; -import "hub-genesis/hub.proto"; +import "hub-genesis/state.proto"; option go_package = "github.com/dymensionxyz/dymension-rdk/x/hub-genesis/types"; @@ -11,5 +11,5 @@ option go_package = "github.com/dymensionxyz/dymension-rdk/x/hub-genesis/types"; message GenesisState { // params defines all the parameters of the module. Params params = 1 [ (gogoproto.nullable) = false ]; - Hub hub = 2 [ (gogoproto.nullable) = false ]; + State state = 2 [(gogoproto.nullable) = false]; } diff --git a/proto/hub-genesis/hub.proto b/proto/hub-genesis/hub.proto deleted file mode 100644 index 77fca5ef..00000000 --- a/proto/hub-genesis/hub.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto3"; -package rollapp.hub_genesis; - -option go_package = "github.com/dymensionxyz/dymension-rdk/x/hub-genesis/types"; - -// Hub is a protobuf message that contains the genesis state of the rollapp -message Hub { - string hub_id = 1; - - // channel_id will be set to the canonical IBC channel connected to the hub. - string channel_id = 2; -} diff --git a/proto/hub-genesis/params.proto b/proto/hub-genesis/params.proto index 464750b4..6e3aada0 100644 --- a/proto/hub-genesis/params.proto +++ b/proto/hub-genesis/params.proto @@ -9,11 +9,11 @@ import "gogoproto/gogo.proto"; message Params { option (gogoproto.goproto_stringer) = false; - // genesis_triggerer_whitelist is a list of the + // genesis_triggerer_allowlist is a list of the // accounts that are allowed to trigger a genesis event on the rollapp. // In the case of an empty list, there are no restrictions - repeated GenesisTriggererParams genesis_triggerer_whitelist = 1 [ - (gogoproto.moretags) = "yaml:\"genesis_triggerer_whitelist\"", + repeated GenesisTriggererParams genesis_triggerer_allowlist = 1 [ + (gogoproto.moretags) = "yaml:\"genesis_triggerer_allowlist\"", (gogoproto.nullable) = false ]; } diff --git a/proto/hub-genesis/query.proto b/proto/hub-genesis/query.proto index 9cce8665..35b30535 100644 --- a/proto/hub-genesis/query.proto +++ b/proto/hub-genesis/query.proto @@ -4,32 +4,23 @@ package rollapp.hub_genesis; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "hub-genesis/params.proto"; -import "hub-genesis/hub.proto"; +import "hub-genesis/state.proto"; option go_package = "github.com/dymensionxyz/dymension-rdk/x/hub-genesis/types"; // Query provides defines the gRPC querier service. service Query { - // Hub returns the hub information - rpc Hub(QueryGetHubRequest) returns (QueryGetHubResponse) { - option (google.api.http).get = - "/dymensionxyz/dymension-rdk/hub-genesis/hub/{hub_id}"; - } // Params returns the total set of hub-genesis parameters. rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { option (google.api.http).get = "/dymensionxyz/dymension-rdk/hub-genesis/params"; } -} - -message QueryGetHubRequest { - // id is the id of the hub - string hub_id = 1; -} -message QueryGetHubResponse { - // hub is the hub information - Hub hub = 1 [ (gogoproto.nullable) = false ]; + // State returns the state of the genesis event. + rpc State(QueryStateRequest) returns (QueryStateResponse) { + option (google.api.http).get = + "/dymensionxyz/dymension-rdk/hub-genesis/state"; + } } // QueryParamsRequest is the request type for the Query/Params RPC method. @@ -40,3 +31,12 @@ message QueryParamsResponse { // params defines the parameters of the module. Params params = 1 [ (gogoproto.nullable) = false ]; } + +// QueryStateRequest is the request type for the Query/State RPC method. +message QueryStateRequest {} + +// QueryStateResponse is the response type for the Query/State RPC method. +message QueryStateResponse { + // state holds the state of the genesis event + State state = 1 [(gogoproto.nullable) = false]; +} \ No newline at end of file diff --git a/proto/hub-genesis/state.proto b/proto/hub-genesis/state.proto new file mode 100644 index 00000000..5d80f756 --- /dev/null +++ b/proto/hub-genesis/state.proto @@ -0,0 +1,20 @@ +syntax = "proto3"; +package rollapp.hub_genesis; + +import "gogoproto/gogo.proto"; +import "cosmos/base/v1beta1/coin.proto"; + +option go_package = "github.com/dymensionxyz/dymension-rdk/x/hub-genesis/types"; + +// State holds the state of the genesis event +message State { + // is_locked is a boolean that indicates if the genesis event has occured + bool is_locked = 1; + + // genesis_tokens is the list of tokens that are expected to be locked on genesis event + repeated cosmos.base.v1beta1.Coin genesis_tokens = 2 [ + (gogoproto.nullable) = false, + (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" + ]; + +} diff --git a/proto/hub-genesis/tx.proto b/proto/hub-genesis/tx.proto index 9dd4f84f..a6fe4a6f 100644 --- a/proto/hub-genesis/tx.proto +++ b/proto/hub-genesis/tx.proto @@ -15,7 +15,7 @@ message MsgHubGenesisEvent { string address = 1; // channel_id is the hub channel id on the rollapp string channel_id = 2; - // hub_id is the hub id + // hub_id is the hub's chainid string hub_id = 3; } diff --git a/x/hub-genesis/client/cli/query.go b/x/hub-genesis/client/cli/query.go index e3b0d7f9..b33b8d82 100644 --- a/x/hub-genesis/client/cli/query.go +++ b/x/hub-genesis/client/cli/query.go @@ -23,6 +23,7 @@ func GetQueryCmd() *cobra.Command { hubGenQueryCmd.AddCommand( GetCmdQueryParams(), + GetCmdQueryState(), ) return hubGenQueryCmd @@ -56,3 +57,32 @@ func GetCmdQueryParams() *cobra.Command { return cmd } + +// GetCmdQueryState implements a command to return the current hub-genesis +// state. +func GetCmdQueryState() *cobra.Command { + cmd := &cobra.Command{ + Use: "state", + Short: "Query the current hub-genesis state", + Args: cobra.NoArgs, + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + queryClient := types.NewQueryClient(clientCtx) + + state := &types.QueryStateRequest{} + res, err := queryClient.State(context.Background(), state) + if err != nil { + return err + } + + return clientCtx.PrintProto(&res.State) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} diff --git a/x/hub-genesis/genesis.go b/x/hub-genesis/genesis.go deleted file mode 100644 index d3e17631..00000000 --- a/x/hub-genesis/genesis.go +++ /dev/null @@ -1,31 +0,0 @@ -package hub_genesis - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/dymensionxyz/dymension-rdk/x/hub-genesis/keeper" - "github.com/dymensionxyz/dymension-rdk/x/hub-genesis/types" -) - -// InitGenesis new hub-genesis genesis. -func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, ak types.AccountKeeper, genState *types.GenesisState) { - keeper.SetParams(ctx, genState.Params) - - if !ak.HasAccount(ctx, ak.GetModuleAddress(types.ModuleName)) { - ak.GetModuleAccount(ctx, types.ModuleName) - } - - hub := genState.GetHub() - keeper.SetHub(ctx, hub) -} - -// ExportGenesis returns a GenesisState for a given context and keeper. -func ExportGenesis(ctx sdk.Context, keeper keeper.Keeper) *types.GenesisState { - genesis := types.DefaultGenesisState() - genesis.Params = keeper.GetParams(ctx) - - if hub, found := keeper.GetHub(ctx, genesis.Hub.HubId); found { - genesis.Hub = hub - } - - return genesis -} diff --git a/x/hub-genesis/keeper/genesis.go b/x/hub-genesis/keeper/genesis.go new file mode 100644 index 00000000..de560863 --- /dev/null +++ b/x/hub-genesis/keeper/genesis.go @@ -0,0 +1,36 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/dymensionxyz/dymension-rdk/x/hub-genesis/types" +) + +// InitGenesis new hub-genesis genesis. +func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) { + k.SetParams(ctx, genState.Params) + + modAddress := k.accountKeeper.GetModuleAddress(types.ModuleName) + if !k.accountKeeper.HasAccount(ctx, modAddress) { + k.accountKeeper.GetModuleAccount(ctx, types.ModuleName) + } + + // if tokens provided and waiting to be locked, verify the balance + if !genState.State.IsLocked && !genState.State.GenesisTokens.IsZero() { + // get spendable coins in the module account + spendable := k.bankKeeper.SpendableCoins(ctx, modAddress) + // we expect the genesis balance of the module account to be equal to required genesis tokens + if !spendable.IsEqual(genState.State.GenesisTokens) { + panic(types.ErrWrongGenesisBalance) + } + } + k.SetState(ctx, genState.State) +} + +// ExportGenesis returns a GenesisState for a given context and keeper. +func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState { + genesis := types.DefaultGenesisState() + genesis.Params = k.GetParams(ctx) + genesis.State = k.GetState(ctx) + + return genesis +} diff --git a/x/hub-genesis/genesis_test.go b/x/hub-genesis/keeper/genesis_test.go similarity index 69% rename from x/hub-genesis/genesis_test.go rename to x/hub-genesis/keeper/genesis_test.go index 81c73c27..e46a1706 100644 --- a/x/hub-genesis/genesis_test.go +++ b/x/hub-genesis/keeper/genesis_test.go @@ -1,4 +1,4 @@ -package hub_genesis_test +package keeper_test import ( "testing" @@ -6,22 +6,17 @@ import ( testkeepers "github.com/dymensionxyz/dymension-rdk/testutil/keepers" "github.com/dymensionxyz/dymension-rdk/testutil/nullify" "github.com/dymensionxyz/dymension-rdk/testutil/utils" - hub_genesis "github.com/dymensionxyz/dymension-rdk/x/hub-genesis" "github.com/dymensionxyz/dymension-rdk/x/hub-genesis/types" "github.com/stretchr/testify/require" ) func TestGenesis(t *testing.T) { genesisState := &types.GenesisState{} - app := utils.Setup(t, false) - // HubGenesis Keeper k, ctx := testkeepers.NewTestHubGenesisKeeperFromApp(app) - ak := app.AccountKeeper - - hub_genesis.InitGenesis(ctx, *k, ak, genesisState) - got := hub_genesis.ExportGenesis(ctx, *k) + k.InitGenesis(ctx, genesisState) + got := k.ExportGenesis(ctx) require.NotNil(t, got) nullify.Fill(&genesisState) diff --git a/x/hub-genesis/keeper/grpc_query.go b/x/hub-genesis/keeper/grpc_query.go index d4ab202b..0f1e37a4 100644 --- a/x/hub-genesis/keeper/grpc_query.go +++ b/x/hub-genesis/keeper/grpc_query.go @@ -28,12 +28,7 @@ func (q Querier) Params(c context.Context, _ *types.QueryParamsRequest) (*types. return &types.QueryParamsResponse{Params: params}, nil } -func (q Querier) Hub(goCtx context.Context, request *types.QueryGetHubRequest) (*types.QueryGetHubResponse, error) { +func (q Querier) State(goCtx context.Context, request *types.QueryStateRequest) (*types.QueryStateResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - hub, found := q.Keeper.GetHub(ctx, request.HubId) - if !found { - return nil, types.ErrUnknownHubID - } - - return &types.QueryGetHubResponse{Hub: hub}, nil + return &types.QueryStateResponse{State: q.Keeper.GetState(ctx)}, nil } diff --git a/x/hub-genesis/keeper/hub.go b/x/hub-genesis/keeper/hub.go deleted file mode 100644 index ba4bca78..00000000 --- a/x/hub-genesis/keeper/hub.go +++ /dev/null @@ -1,34 +0,0 @@ -package keeper - -import ( - "github.com/cosmos/cosmos-sdk/store/prefix" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/dymensionxyz/dymension-rdk/x/hub-genesis/types" -) - -// SetHub set a specific hub in the store from its index -func (k Keeper) SetHub(ctx sdk.Context, hub types.Hub) { - store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.HubKeyPrefix)) - b := k.cdc.MustMarshal(&hub) - store.Set(types.HubKey( - hub.HubId, - ), b) -} - -// GetHub returns a hub from its index -func (k Keeper) GetHub( - ctx sdk.Context, - hubId string, -) (val types.Hub, found bool) { - store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefix(types.HubKeyPrefix)) - - b := store.Get(types.HubKey( - hubId, - )) - if b == nil { - return val, false - } - - k.cdc.MustUnmarshal(b, &val) - return val, true -} diff --git a/x/hub-genesis/keeper/keeper.go b/x/hub-genesis/keeper/keeper.go index d17d838d..ecdf2946 100644 --- a/x/hub-genesis/keeper/keeper.go +++ b/x/hub-genesis/keeper/keeper.go @@ -55,22 +55,16 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { } // lock coins by sending them to an escrow address -func (k Keeper) lockRollappGenesisTokens(ctx sdk.Context, sourceChannel string) error { - account := k.accountKeeper.GetModuleAccount(ctx, types.ModuleName) - +func (k Keeper) lockRollappGenesisTokens(ctx sdk.Context, sourceChannel string, tokens sdk.Coins) error { // get spendable coins in the module account + account := k.accountKeeper.GetModuleAccount(ctx, types.ModuleName) spendable := k.bankKeeper.SpendableCoins(ctx, account.GetAddress()) - // send coins to the escrow address - if spendable.Empty() { - return types.ErrGenesisNoCoinsOnModuleAcc + // validate it's enough for the required tokens + if !spendable.IsAllGTE(tokens) { + return types.ErrGenesisInsufficientBalance } escrowAddress := ibctypes.GetEscrowAddress("transfer", sourceChannel) - - if err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, escrowAddress, spendable); err != nil { - return fmt.Errorf("failed to lock coins: %w", err) - } - - return nil + return k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, escrowAddress, tokens) } diff --git a/x/hub-genesis/keeper/msg_server.go b/x/hub-genesis/keeper/msg_server.go index 2ab8c3bb..9c54fce4 100644 --- a/x/hub-genesis/keeper/msg_server.go +++ b/x/hub-genesis/keeper/msg_server.go @@ -26,40 +26,38 @@ var _ types.MsgServer = msgServer{} func (m msgServer) TriggerGenesisEvent(goCtx context.Context, msg *types.MsgHubGenesisEvent) (*types.MsgHubGenesisEventResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - // Get the sender and validate they are in the whitelist - if !m.IsAddressInGenesisTriggererWhiteList(ctx, msg.Address) { + // Get the sender and validate they are in the Allowlist + if !m.IsAddressInGenesisTriggererAllowList(ctx, msg.Address) { return nil, sdkerrors.ErrUnauthorized } _, clientState, err := m.channelKeeper.GetChannelClientState(ctx, "transfer", msg.ChannelId) if err != nil { - return nil, errorsmod.Wrapf(types.ErrInvalidGenesisChannelId, "failed to get client state for channel %s", msg.ChannelId) + return nil, errorsmod.Wrapf(types.ErrFailedGetClientState, "failed to get client state for channel %s: %v", msg.ChannelId, err) } tmClientState, ok := clientState.(*tenderminttypes.ClientState) if !ok { - return nil, errorsmod.Wrapf(types.ErrInvalidGenesisChannelId, "expected tendermint client state, got %T", clientState) + return nil, errorsmod.Wrapf(types.ErrFailedGetClientState, "expected tendermint client state, got %T", clientState) } if tmClientState.GetChainID() != msg.HubId { - return nil, errorsmod.Wrapf(types.ErrInvalidGenesisChainId, "channel %s is connected to chain ID %s, expected %s", - msg.ChannelId, tmClientState.GetChainID(), msg.HubId) + return nil, errorsmod.Wrapf(types.ErrChainIDMismatch, "channel %s is connected to chain ID %s", + msg.ChannelId, tmClientState.GetChainID()) } - // if the hub is found, the genesis event was already triggered - _, found := m.GetHub(ctx, msg.HubId) - if found { + // check if genesis event was already triggered + state := m.GetState(ctx) + if state.IsLocked { return nil, types.ErrGenesisEventAlreadyTriggered } - hub := types.NewHub(msg.HubId, msg.ChannelId) - - if err := m.lockRollappGenesisTokens(ctx, hub.ChannelId); err != nil { + if err := m.lockRollappGenesisTokens(ctx, msg.ChannelId, state.GenesisTokens); err != nil { return nil, errorsmod.Wrapf(types.ErrLockingGenesisTokens, "failed to lock tokens: %v", err) } - // we save the hub in order to prevent the genesis event from being triggered again - m.SetHub(ctx, hub) + state.IsLocked = true + m.SetState(ctx, state) return &types.MsgHubGenesisEventResponse{}, nil } diff --git a/x/hub-genesis/keeper/msg_server_test.go b/x/hub-genesis/keeper/msg_server_test.go index eabf50fa..845de0d0 100644 --- a/x/hub-genesis/keeper/msg_server_test.go +++ b/x/hub-genesis/keeper/msg_server_test.go @@ -10,8 +10,6 @@ import ( "github.com/dymensionxyz/dymension-rdk/testutil/utils" "github.com/stretchr/testify/suite" - errorsmod "cosmossdk.io/errors" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/dymensionxyz/dymension-rdk/testutil/app" "github.com/dymensionxyz/dymension-rdk/testutil/ibctest" @@ -57,127 +55,111 @@ func (suite *HubGenesisMsgServerTestSuite) TestTriggerGenesisEvent() { suite.Coordinator.Setup(path) cases := []struct { - name string - genesisState *types.GenesisState - msg *types.MsgHubGenesisEvent - rollappBalanceBefore sdk.Coin - rollappBalanceAfter sdk.Coin - rollappEscrowBalanceAfter sdk.Coin - hubPersisted bool - expErr error - runBefore func() + name string + genesisState *types.GenesisState + msg *types.MsgHubGenesisEvent + rollappBalanceBefore sdk.Coin + expErr error + runBefore func() }{ { name: "successful hub genesis event", genesisState: &types.GenesisState{ Params: types.Params{ - GenesisTriggererWhitelist: []types.GenesisTriggererParams{{Address: authorisedAddress.String()}}, + GenesisTriggererAllowlist: []types.GenesisTriggererParams{{Address: authorisedAddress.String()}}, }, + State: types.State{GenesisTokens: sdk.NewCoins(initialRollappBalance)}, }, msg: &types.MsgHubGenesisEvent{ Address: authorisedAddress.String(), ChannelId: path.EndpointA.ChannelID, HubId: path.EndpointB.Chain.ChainID, }, - rollappBalanceBefore: initialRollappBalance, - rollappBalanceAfter: sdk.NewCoin(rollappDenom, sdk.NewInt(0)), - rollappEscrowBalanceAfter: initialRollappBalance, - hubPersisted: true, - expErr: nil, + rollappBalanceBefore: initialRollappBalance, + expErr: nil, }, { name: "invalid rollapp genesis event - genesis event already triggered", genesisState: &types.GenesisState{ Params: types.Params{ - GenesisTriggererWhitelist: []types.GenesisTriggererParams{{Address: authorisedAddress.String()}}, - }, - Hub: types.Hub{ - HubId: path.EndpointB.Chain.ChainID, + GenesisTriggererAllowlist: []types.GenesisTriggererParams{{Address: authorisedAddress.String()}}, }, + State: types.State{IsLocked: true, GenesisTokens: sdk.NewCoins(initialRollappBalance)}, }, msg: &types.MsgHubGenesisEvent{ Address: authorisedAddress.String(), ChannelId: path.EndpointA.ChannelID, HubId: path.EndpointB.Chain.ChainID, }, - rollappBalanceBefore: initialRollappBalance, - rollappBalanceAfter: initialRollappBalance, - rollappEscrowBalanceAfter: sdk.NewCoin(rollappDenom, sdk.NewInt(0)), - hubPersisted: true, - expErr: types.ErrGenesisEventAlreadyTriggered, + rollappBalanceBefore: initialRollappBalance, + expErr: types.ErrGenesisEventAlreadyTriggered, }, { - name: "invalid rollapp genesis event - address not in whitelist", + name: "invalid rollapp genesis event - address not in Allowlist", genesisState: &types.GenesisState{ Params: types.Params{ - GenesisTriggererWhitelist: []types.GenesisTriggererParams{{Address: utils.AccAddress().String()}}, + GenesisTriggererAllowlist: []types.GenesisTriggererParams{{Address: utils.AccAddress().String()}}, }, + State: types.State{GenesisTokens: sdk.NewCoins(initialRollappBalance)}, }, msg: &types.MsgHubGenesisEvent{ Address: authorisedAddress.String(), ChannelId: path.EndpointA.ChannelID, HubId: path.EndpointB.Chain.ChainID, }, - rollappBalanceBefore: initialRollappBalance, - rollappBalanceAfter: initialRollappBalance, - rollappEscrowBalanceAfter: sdk.NewCoin(rollappDenom, sdk.NewInt(0)), - hubPersisted: false, - expErr: sdkerrors.ErrUnauthorized, + rollappBalanceBefore: initialRollappBalance, + expErr: sdkerrors.ErrUnauthorized, }, { name: "invalid rollapp genesis event - invalid channel id", genesisState: &types.GenesisState{ Params: types.Params{ - GenesisTriggererWhitelist: []types.GenesisTriggererParams{{Address: authorisedAddress.String()}}, + GenesisTriggererAllowlist: []types.GenesisTriggererParams{{Address: authorisedAddress.String()}}, }, + State: types.State{GenesisTokens: sdk.NewCoins(initialRollappBalance)}, }, msg: &types.MsgHubGenesisEvent{ Address: authorisedAddress.String(), ChannelId: "invalid-channel", HubId: path.EndpointB.Chain.ChainID, }, - rollappBalanceBefore: initialRollappBalance, - rollappBalanceAfter: initialRollappBalance, - rollappEscrowBalanceAfter: sdk.NewCoin(rollappDenom, sdk.NewInt(0)), - hubPersisted: false, - expErr: errorsmod.Wrapf(types.ErrInvalidGenesisChannelId, "failed to get client state for channel %s", "invalid-channel"), + rollappBalanceBefore: initialRollappBalance, + expErr: types.ErrFailedGetClientState, }, { name: "invalid rollapp genesis event - invalid chain id", genesisState: &types.GenesisState{ Params: types.Params{ - GenesisTriggererWhitelist: []types.GenesisTriggererParams{{Address: authorisedAddress.String()}}, + GenesisTriggererAllowlist: []types.GenesisTriggererParams{{Address: authorisedAddress.String()}}, }, + State: types.State{GenesisTokens: sdk.NewCoins(initialRollappBalance)}, }, msg: &types.MsgHubGenesisEvent{ Address: authorisedAddress.String(), ChannelId: path.EndpointA.ChannelID, HubId: "invalid-chain-id", }, - rollappBalanceBefore: initialRollappBalance, - rollappBalanceAfter: initialRollappBalance, - rollappEscrowBalanceAfter: sdk.NewCoin(rollappDenom, sdk.NewInt(0)), - hubPersisted: false, - expErr: errorsmod.Wrapf(types.ErrInvalidGenesisChainId, "channel %s is connected to chain ID %s, expected %s", path.EndpointA.ChannelID, "invalid-chain-id", path.EndpointB.Chain.ChainID), + rollappBalanceBefore: initialRollappBalance, + expErr: types.ErrChainIDMismatch, }, { name: "invalid rollapp genesis event - module account has no coins", genesisState: &types.GenesisState{ Params: types.Params{ - GenesisTriggererWhitelist: []types.GenesisTriggererParams{{Address: authorisedAddress.String()}}, + GenesisTriggererAllowlist: []types.GenesisTriggererParams{{Address: authorisedAddress.String()}}, }, + State: types.State{GenesisTokens: sdk.NewCoins(initialRollappBalance)}, }, msg: &types.MsgHubGenesisEvent{ Address: authorisedAddress.String(), ChannelId: path.EndpointA.ChannelID, HubId: path.EndpointB.Chain.ChainID, }, - rollappBalanceBefore: sdk.NewCoin(rollappDenom, sdk.NewInt(0)), - rollappBalanceAfter: sdk.NewCoin(rollappDenom, sdk.NewInt(0)), - rollappEscrowBalanceAfter: sdk.NewCoin(rollappDenom, sdk.NewInt(0)), + rollappBalanceBefore: sdk.NewCoin(rollappDenom, sdk.NewInt(0)), runBefore: func() { // remove all coins from the module account err := suite.app.BankKeeper.BurnCoins(suite.ctx, types.ModuleName, sdk.Coins{initialRollappBalance}) suite.Require().NoError(err) }, - hubPersisted: false, - expErr: errorsmod.Wrapf(types.ErrLockingGenesisTokens, "failed to lock tokens: %v", types.ErrGenesisNoCoinsOnModuleAcc), + expErr: types.ErrLockingGenesisTokens, }, + + //TODO: add test of not enough tokens } for _, tc := range cases { @@ -192,31 +174,47 @@ func (suite *HubGenesisMsgServerTestSuite) TestTriggerGenesisEvent() { tc.runBefore() } - suite.k.SetHub(suite.ctx, tc.genesisState.Hub) + suite.k.SetState(suite.ctx, tc.genesisState.State) suite.k.SetParams(suite.ctx, tc.genesisState.Params) moduleAddr := suite.app.AccountKeeper.GetModuleAddress(types.ModuleName) // check the initial module balance rollappBalanceBefore := suite.app.BankKeeper.GetBalance(suite.ctx, moduleAddr, rollappDenom) - suite.Require().Equal(tc.rollappBalanceBefore, rollappBalanceBefore) + suite.Require().Equal(tc.rollappBalanceBefore, rollappBalanceBefore, tc.name) // trigger the genesis event _, err := suite.msgServer.TriggerGenesisEvent(suite.ctx, tc.msg) - suite.Require().ErrorIs(err, tc.expErr) + suite.Require().ErrorIs(err, tc.expErr, tc.name) + + var ( + expectedBalance sdk.Coin + expectedEscrowBalance sdk.Coin + expectedState bool + ) + + if tc.expErr == nil { + expectedBalance = sdk.NewCoin(rollappDenom, sdk.NewInt(0)) + expectedEscrowBalance = tc.rollappBalanceBefore + expectedState = true + } else { + expectedBalance = tc.rollappBalanceBefore + expectedEscrowBalance = sdk.NewCoin(rollappDenom, sdk.NewInt(0)) + expectedState = false || tc.genesisState.State.IsLocked + } + + // check the hub genesis state + stateState := suite.k.GetState(suite.ctx) + suite.Require().Equal(expectedState, stateState.IsLocked, tc.name) // check the module balance after the genesis event rollappBalanceAfter := suite.app.BankKeeper.GetBalance(suite.ctx, moduleAddr, rollappDenom) - suite.Require().Equal(tc.rollappBalanceAfter, rollappBalanceAfter) + suite.Require().True(expectedBalance.IsEqual(rollappBalanceAfter), tc.name) // check the escrow balance after the genesis event sourceChannel := path.EndpointA.ChannelID escrowAddress := ibctypes.GetEscrowAddress("transfer", sourceChannel) escrowBalance := suite.app.BankKeeper.GetBalance(suite.ctx, escrowAddress, rollappDenom) - suite.Require().Equal(tc.rollappEscrowBalanceAfter, escrowBalance) - - // check the hub genesis state - _, found := suite.k.GetHub(suite.ctx, tc.msg.HubId) - suite.Require().Equal(tc.hubPersisted, found) + suite.Require().True(expectedEscrowBalance.IsEqual(escrowBalance), tc.name) }) } } diff --git a/x/hub-genesis/keeper/params.go b/x/hub-genesis/keeper/params.go index f2c546a9..1e6f8f47 100644 --- a/x/hub-genesis/keeper/params.go +++ b/x/hub-genesis/keeper/params.go @@ -16,15 +16,15 @@ func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { k.paramstore.SetParamSet(ctx, ¶ms) } -// GenesisTriggererWhitelist returns the GenesisTriggererWhitelist param -func (k Keeper) GenesisTriggererWhitelist(ctx sdk.Context) (res []types.GenesisTriggererParams) { - k.paramstore.Get(ctx, types.KeyGenesisTriggererWhitelist, &res) +// GenesisTriggererAllowlist returns the GenesisTriggererAllowlist param +func (k Keeper) GenesisTriggererAllowlist(ctx sdk.Context) (res []types.GenesisTriggererParams) { + k.paramstore.Get(ctx, types.KeyGenesisTriggererAllowlist, &res) return } -func (k Keeper) IsAddressInGenesisTriggererWhiteList(ctx sdk.Context, address string) bool { - whitelist := k.GenesisTriggererWhitelist(ctx) - for _, item := range whitelist { +func (k Keeper) IsAddressInGenesisTriggererAllowList(ctx sdk.Context, address string) bool { + Allowlist := k.GenesisTriggererAllowlist(ctx) + for _, item := range Allowlist { if item.Address == address { return true } diff --git a/x/hub-genesis/keeper/state.go b/x/hub-genesis/keeper/state.go new file mode 100644 index 00000000..25909810 --- /dev/null +++ b/x/hub-genesis/keeper/state.go @@ -0,0 +1,24 @@ +package keeper + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/dymensionxyz/dymension-rdk/x/hub-genesis/types" +) + +// SetState sets the state state. +func (k Keeper) SetState(ctx sdk.Context, state types.State) { + store := ctx.KVStore(k.storeKey) + store.Set(types.StateKey, k.cdc.MustMarshal(&state)) +} + +// GetState returns the state state. +func (k Keeper) GetState(ctx sdk.Context) types.State { + store := ctx.KVStore(k.storeKey) + bz := store.Get(types.StateKey) + if bz == nil { + return types.State{} + } + var state types.State + k.cdc.MustUnmarshal(bz, &state) + return state +} diff --git a/x/hub-genesis/module.go b/x/hub-genesis/module.go index 9ee84e95..f6638ee1 100644 --- a/x/hub-genesis/module.go +++ b/x/hub-genesis/module.go @@ -79,10 +79,7 @@ func (AppModuleBasic) RegisterRESTRoutes(clientCtx client.Context, rtr *mux.Rout // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the hub-genesis module. func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { if err := types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)); err != nil { - return - } - if err := types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)); err != nil { - return + panic(err) } } @@ -151,14 +148,14 @@ func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json. var genesisState types.GenesisState cdc.MustUnmarshalJSON(data, &genesisState) - InitGenesis(ctx, am.keeper, am.authKeeper, &genesisState) + am.keeper.InitGenesis(ctx, &genesisState) return []abci.ValidatorUpdate{} } // ExportGenesis returns the exported genesis state as raw bytes for the hub-genesis // module. func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage { - gs := ExportGenesis(ctx, am.keeper) + gs := am.keeper.ExportGenesis(ctx) return cdc.MustMarshalJSON(gs) } diff --git a/x/hub-genesis/types/errors.go b/x/hub-genesis/types/errors.go index be8d81b1..b92ce224 100644 --- a/x/hub-genesis/types/errors.go +++ b/x/hub-genesis/types/errors.go @@ -1,12 +1,13 @@ package types -import sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +import errorsmod "cosmossdk.io/errors" var ( - ErrUnknownHubID = sdkerrors.Register(ModuleName, 1000, "unknown hub id") - ErrInvalidGenesisChannelId = sdkerrors.Register(ModuleName, 1001, "invalid genesis channel id") - ErrInvalidGenesisChainId = sdkerrors.Register(ModuleName, 1002, "invalid genesis chain id") - ErrGenesisEventAlreadyTriggered = sdkerrors.Register(ModuleName, 1003, "genesis event already triggered") - ErrGenesisNoCoinsOnModuleAcc = sdkerrors.Register(ModuleName, 1004, "no coins on module account") - ErrLockingGenesisTokens = sdkerrors.Register(ModuleName, 1005, "failed to lock genesis tokens") + ErrFailedGetClientState = errorsmod.Register(ModuleName, 1001, "failed to get client state") + ErrChainIDMismatch = errorsmod.Register(ModuleName, 1002, "chain ID not matches with the channel") + ErrInvalidGenesisTokens = errorsmod.Register(ModuleName, 1003, "invalid genesis token") + ErrGenesisEventAlreadyTriggered = errorsmod.Register(ModuleName, 1004, "genesis event already triggered") + ErrGenesisInsufficientBalance = errorsmod.Register(ModuleName, 1005, "insufficient balance in module account to lock genesis tokens") + ErrLockingGenesisTokens = errorsmod.Register(ModuleName, 1006, "failed to lock genesis tokens") + ErrWrongGenesisBalance = errorsmod.Register(ModuleName, 1007, "genesis bank balance different than expected genesis tokens") ) diff --git a/x/hub-genesis/types/genesis.go b/x/hub-genesis/types/genesis.go index c0555bb9..68a905ea 100644 --- a/x/hub-genesis/types/genesis.go +++ b/x/hub-genesis/types/genesis.go @@ -1,20 +1,28 @@ package types // NewGenesisState creates a new GenesisState object. -func NewGenesisState(params Params, hub Hub) *GenesisState { +func NewGenesisState(params Params, state State) *GenesisState { return &GenesisState{ Params: params, - Hub: hub, + State: state, } } // DefaultGenesisState creates a default GenesisState object. func DefaultGenesisState() *GenesisState { - return NewGenesisState(DefaultParams(), Hub{}) + return NewGenesisState(DefaultParams(), State{}) } // ValidateGenesis validates the provided genesis state to ensure the // expected invariants holds. func ValidateGenesis(data GenesisState) error { - return data.Params.Validate() + if err := data.Params.Validate(); err != nil { + return err + } + + if err := data.State.Validate(); err != nil { + return err + } + + return nil } diff --git a/x/hub-genesis/types/genesis.pb.go b/x/hub-genesis/types/genesis.pb.go index a5948e2e..5cb6727f 100644 --- a/x/hub-genesis/types/genesis.pb.go +++ b/x/hub-genesis/types/genesis.pb.go @@ -27,7 +27,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type GenesisState struct { // params defines all the parameters of the module. Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` - Hub Hub `protobuf:"bytes,2,opt,name=hub,proto3" json:"hub"` + State State `protobuf:"bytes,2,opt,name=state,proto3" json:"state"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -70,11 +70,11 @@ func (m *GenesisState) GetParams() Params { return Params{} } -func (m *GenesisState) GetHub() Hub { +func (m *GenesisState) GetState() State { if m != nil { - return m.Hub + return m.State } - return Hub{} + return State{} } func init() { @@ -84,22 +84,22 @@ func init() { func init() { proto.RegisterFile("hub-genesis/genesis.proto", fileDescriptor_6deac3d79fd587fe) } var fileDescriptor_6deac3d79fd587fe = []byte{ - // 230 bytes of a gzipped FileDescriptorProto + // 231 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcc, 0x28, 0x4d, 0xd2, 0x4d, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x87, 0xd2, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xc2, 0x45, 0xf9, 0x39, 0x39, 0x89, 0x05, 0x05, 0x7a, 0x19, 0xa5, 0x49, 0xf1, 0x50, 0x29, 0x29, 0x91, 0xf4, 0xfc, 0xf4, 0x7c, 0xb0, 0xbc, 0x3e, 0x88, 0x05, 0x51, 0x2a, 0x25, 0x81, 0x6c, - 0x4a, 0x41, 0x62, 0x51, 0x62, 0x2e, 0xd4, 0x10, 0x29, 0x51, 0x64, 0x99, 0x8c, 0xd2, 0x24, 0x88, - 0xb0, 0x52, 0x35, 0x17, 0x8f, 0x3b, 0x44, 0x30, 0xb8, 0x24, 0xb1, 0x24, 0x55, 0xc8, 0x92, 0x8b, - 0x0d, 0xa2, 0x4d, 0x82, 0x51, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x5a, 0x0f, 0x8b, 0xe5, 0x7a, 0x01, - 0x60, 0x25, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x41, 0x35, 0x08, 0x19, 0x70, 0x31, 0x67, - 0x94, 0x26, 0x49, 0x30, 0x81, 0xf5, 0x49, 0x60, 0xd5, 0xe7, 0x51, 0x9a, 0x04, 0xd5, 0x04, 0x52, - 0xea, 0x14, 0x7c, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, - 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x96, 0xe9, 0x99, - 0x25, 0x20, 0x47, 0x26, 0xe7, 0xe7, 0xea, 0xa7, 0x54, 0xe6, 0xa6, 0xe6, 0x15, 0x67, 0xe6, 0xe7, - 0x55, 0x54, 0x56, 0x21, 0x38, 0xba, 0x45, 0x29, 0xd9, 0xfa, 0x15, 0xfa, 0xc8, 0xbe, 0x2a, 0xa9, - 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x7b, 0xcc, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x78, 0x26, - 0xb6, 0x94, 0x51, 0x01, 0x00, 0x00, + 0x4a, 0x41, 0x62, 0x51, 0x62, 0x2e, 0xd4, 0x10, 0x29, 0x71, 0x64, 0x99, 0xe2, 0x92, 0xc4, 0x92, + 0x54, 0x88, 0x84, 0x52, 0x23, 0x23, 0x17, 0x8f, 0x3b, 0x44, 0x3c, 0x18, 0x24, 0x2c, 0x64, 0xc9, + 0xc5, 0x06, 0xd1, 0x29, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xad, 0x87, 0xc5, 0x7e, 0xbd, + 0x00, 0xb0, 0x12, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0xa0, 0x1a, 0x84, 0xcc, 0xb8, 0x58, + 0xc1, 0x46, 0x4b, 0x30, 0x81, 0x75, 0x4a, 0x61, 0xd5, 0x09, 0xb6, 0x05, 0xaa, 0x11, 0xa2, 0xdc, + 0x29, 0xf8, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, + 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x2c, 0xd3, 0x33, 0x4b, + 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x53, 0x2a, 0x73, 0x53, 0xf3, 0x8a, 0x33, 0xf3, + 0xf3, 0x2a, 0x2a, 0xab, 0x10, 0x1c, 0xdd, 0xa2, 0x94, 0x6c, 0xfd, 0x0a, 0x7d, 0x64, 0xef, 0x95, + 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0xfd, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xd3, + 0x81, 0x05, 0x3c, 0x5a, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -123,7 +123,7 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { var l int _ = l { - size, err := m.Hub.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.State.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -164,7 +164,7 @@ func (m *GenesisState) Size() (n int) { _ = l l = m.Params.Size() n += 1 + l + sovGenesis(uint64(l)) - l = m.Hub.Size() + l = m.State.Size() n += 1 + l + sovGenesis(uint64(l)) return n } @@ -239,7 +239,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hub", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field State", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -266,7 +266,7 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Hub.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.State.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/hub-genesis/types/hub.go b/x/hub-genesis/types/hub.go deleted file mode 100644 index 9a82849c..00000000 --- a/x/hub-genesis/types/hub.go +++ /dev/null @@ -1,8 +0,0 @@ -package types - -func NewHub(hubId, channelId string) Hub { - return Hub{ - HubId: hubId, - ChannelId: channelId, - } -} diff --git a/x/hub-genesis/types/hub.pb.go b/x/hub-genesis/types/hub.pb.go deleted file mode 100644 index 84b3be5c..00000000 --- a/x/hub-genesis/types/hub.pb.go +++ /dev/null @@ -1,369 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: hub-genesis/hub.proto - -package types - -import ( - fmt "fmt" - proto "github.com/gogo/protobuf/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// Hub is a protobuf message that contains the genesis state of the rollapp -type Hub struct { - HubId string `protobuf:"bytes,1,opt,name=hub_id,json=hubId,proto3" json:"hub_id,omitempty"` - // channel_id will be set to the canonical IBC channel connected to the hub. - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` -} - -func (m *Hub) Reset() { *m = Hub{} } -func (m *Hub) String() string { return proto.CompactTextString(m) } -func (*Hub) ProtoMessage() {} -func (*Hub) Descriptor() ([]byte, []int) { - return fileDescriptor_a2a8c9df65c81ee1, []int{0} -} -func (m *Hub) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Hub) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Hub.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 *Hub) XXX_Merge(src proto.Message) { - xxx_messageInfo_Hub.Merge(m, src) -} -func (m *Hub) XXX_Size() int { - return m.Size() -} -func (m *Hub) XXX_DiscardUnknown() { - xxx_messageInfo_Hub.DiscardUnknown(m) -} - -var xxx_messageInfo_Hub proto.InternalMessageInfo - -func (m *Hub) GetHubId() string { - if m != nil { - return m.HubId - } - return "" -} - -func (m *Hub) GetChannelId() string { - if m != nil { - return m.ChannelId - } - return "" -} - -func init() { - proto.RegisterType((*Hub)(nil), "rollapp.hub_genesis.Hub") -} - -func init() { proto.RegisterFile("hub-genesis/hub.proto", fileDescriptor_a2a8c9df65c81ee1) } - -var fileDescriptor_a2a8c9df65c81ee1 = []byte{ - // 183 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0xcd, 0x28, 0x4d, 0xd2, - 0x4d, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0xcf, 0x28, 0x4d, 0xd2, 0x2b, 0x28, 0xca, 0x2f, - 0xc9, 0x17, 0x12, 0x2e, 0xca, 0xcf, 0xc9, 0x49, 0x2c, 0x28, 0xd0, 0xcb, 0x28, 0x4d, 0x8a, 0x87, - 0x4a, 0x2b, 0x59, 0x73, 0x31, 0x7b, 0x94, 0x26, 0x09, 0x89, 0x72, 0xb1, 0x81, 0x44, 0x33, 0x53, - 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0x58, 0x33, 0x4a, 0x93, 0x3c, 0x53, 0x84, 0x64, 0xb9, - 0xb8, 0x92, 0x33, 0x12, 0xf3, 0xf2, 0x52, 0x73, 0x40, 0x52, 0x4c, 0x60, 0x29, 0x4e, 0xa8, 0x88, - 0x67, 0x8a, 0x53, 0xf0, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, - 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x59, 0xa6, - 0x67, 0x96, 0x80, 0x6c, 0x4e, 0xce, 0xcf, 0xd5, 0x4f, 0xa9, 0xcc, 0x4d, 0xcd, 0x2b, 0xce, 0xcc, - 0xcf, 0xab, 0xa8, 0xac, 0x42, 0x70, 0x74, 0x8b, 0x52, 0xb2, 0xf5, 0x2b, 0xf4, 0x91, 0x9d, 0x5a, - 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x76, 0xad, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xbd, - 0x88, 0xd3, 0x59, 0xc6, 0x00, 0x00, 0x00, -} - -func (m *Hub) 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 *Hub) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Hub) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ChannelId) > 0 { - i -= len(m.ChannelId) - copy(dAtA[i:], m.ChannelId) - i = encodeVarintHub(dAtA, i, uint64(len(m.ChannelId))) - i-- - dAtA[i] = 0x12 - } - if len(m.HubId) > 0 { - i -= len(m.HubId) - copy(dAtA[i:], m.HubId) - i = encodeVarintHub(dAtA, i, uint64(len(m.HubId))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func encodeVarintHub(dAtA []byte, offset int, v uint64) int { - offset -= sovHub(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *Hub) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.HubId) - if l > 0 { - n += 1 + l + sovHub(uint64(l)) - } - l = len(m.ChannelId) - if l > 0 { - n += 1 + l + sovHub(uint64(l)) - } - return n -} - -func sovHub(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozHub(x uint64) (n int) { - return sovHub(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *Hub) 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 ErrIntOverflowHub - } - 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: Hub: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Hub: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field HubId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHub - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthHub - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthHub - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.HubId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChannelId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowHub - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthHub - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthHub - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChannelId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipHub(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthHub - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipHub(dAtA []byte) (n int, err error) { - l := len(dAtA) - iNdEx := 0 - depth := 0 - for iNdEx < l { - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowHub - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - wireType := int(wire & 0x7) - switch wireType { - case 0: - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowHub - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - iNdEx++ - if dAtA[iNdEx-1] < 0x80 { - break - } - } - case 1: - iNdEx += 8 - case 2: - var length int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowHub - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - length |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if length < 0 { - return 0, ErrInvalidLengthHub - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupHub - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthHub - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthHub = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowHub = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupHub = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/hub-genesis/types/keys.go b/x/hub-genesis/types/keys.go index 4cd3e372..70b28537 100644 --- a/x/hub-genesis/types/keys.go +++ b/x/hub-genesis/types/keys.go @@ -15,22 +15,6 @@ const ( // Query endpoints supported by the minting querier. QueryParameters = "parameters" - - HubKeyPrefix = "Hub/value/" ) -func HubKey( - hubId string, -) []byte { - var key []byte - - hubIdBytes := []byte(hubId) - key = append(key, hubIdBytes...) - key = append(key, []byte("/")...) - - return key -} - -func KeyPrefix(p string) []byte { - return []byte(p) -} +var StateKey = []byte{0x01} diff --git a/x/hub-genesis/types/params.go b/x/hub-genesis/types/params.go index 49652ca9..5608be01 100644 --- a/x/hub-genesis/types/params.go +++ b/x/hub-genesis/types/params.go @@ -11,8 +11,8 @@ import ( var _ paramtypes.ParamSet = (*Params)(nil) var ( - // GenesisTriggererWhitelist is store's key for GenesisTriggererWhitelist Params - KeyGenesisTriggererWhitelist = []byte("GenesisTriggererWhitelist") + // GenesisTriggererAllowlist is store's key for GenesisTriggererAllowlist Params + KeyGenesisTriggererAllowlist = []byte("GenesisTriggererAllowlist") ) // ParamTable for hub_genesis module. @@ -20,9 +20,9 @@ func ParamKeyTable() paramtypes.KeyTable { return paramtypes.NewKeyTable().RegisterParamSet(&Params{}) } -func NewParams(genesisTriggererWhitelist []GenesisTriggererParams) Params { +func NewParams(genesisTriggererAllowlist []GenesisTriggererParams) Params { return Params{ - GenesisTriggererWhitelist: genesisTriggererWhitelist, + GenesisTriggererAllowlist: genesisTriggererAllowlist, } } @@ -39,18 +39,18 @@ func (p Params) String() string { // Implements params.ParamSet. func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { return paramtypes.ParamSetPairs{ - paramtypes.NewParamSetPair(KeyGenesisTriggererWhitelist, &p.GenesisTriggererWhitelist, validateGenesisTriggererWhitelist), + paramtypes.NewParamSetPair(KeyGenesisTriggererAllowlist, &p.GenesisTriggererAllowlist, validateGenesisTriggererAllowlist), } } // Validate checks that the parameters have valid values. func (p Params) Validate() error { - return validateGenesisTriggererWhitelist(p.GenesisTriggererWhitelist) + return validateGenesisTriggererAllowlist(p.GenesisTriggererAllowlist) } -// validateGenesisTriggererWhitelist validates the GenesisTriggererWhitelist param -func validateGenesisTriggererWhitelist(v interface{}) error { - genesisTriggererWhitelist, ok := v.([]GenesisTriggererParams) +// validateGenesisTriggererAllowlist validates the GenesisTriggererAllowlist param +func validateGenesisTriggererAllowlist(v interface{}) error { + genesisTriggererAllowlist, ok := v.([]GenesisTriggererParams) if !ok { return fmt.Errorf("invalid parameter type: %T", v) } @@ -58,15 +58,15 @@ func validateGenesisTriggererWhitelist(v interface{}) error { // Check for duplicated index in genesis triggerer address rollappGenesisTriggererIndexMap := make(map[string]struct{}) - for i, item := range genesisTriggererWhitelist { + for i, item := range genesisTriggererAllowlist { // check Bech32 format if _, err := sdk.AccAddressFromBech32(item.Address); err != nil { - return fmt.Errorf("genesisTriggererWhitelist[%d] format error: %s", i, err.Error()) + return fmt.Errorf("genesisTriggererAllowlist[%d] format error: %s", i, err.Error()) } // check duplicate if _, ok := rollappGenesisTriggererIndexMap[item.Address]; ok { - return fmt.Errorf("duplicated genesis trigerrer address in genesisTriggererWhitelist") + return fmt.Errorf("duplicated genesis trigerrer address in genesisTriggererAllowlist") } rollappGenesisTriggererIndexMap[item.Address] = struct{}{} } diff --git a/x/hub-genesis/types/params.pb.go b/x/hub-genesis/types/params.pb.go index 4216e004..ce48175b 100644 --- a/x/hub-genesis/types/params.pb.go +++ b/x/hub-genesis/types/params.pb.go @@ -25,10 +25,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Params holds parameters for the hub-genesis module. type Params struct { - // genesis_triggerer_whitelist is a list of the + // genesis_triggerer_allowlist is a list of the // accounts that are allowed to trigger a genesis event on the rollapp. // In the case of an empty list, there are no restrictions - GenesisTriggererWhitelist []GenesisTriggererParams `protobuf:"bytes,1,rep,name=genesis_triggerer_whitelist,json=genesisTriggererWhitelist,proto3" json:"genesis_triggerer_whitelist" yaml:"genesis_triggerer_whitelist"` + GenesisTriggererAllowlist []GenesisTriggererParams `protobuf:"bytes,1,rep,name=genesis_triggerer_allowlist,json=genesisTriggererAllowlist,proto3" json:"genesis_triggerer_allowlist" yaml:"genesis_triggerer_allowlist"` } func (m *Params) Reset() { *m = Params{} } @@ -63,9 +63,9 @@ func (m *Params) XXX_DiscardUnknown() { var xxx_messageInfo_Params proto.InternalMessageInfo -func (m *Params) GetGenesisTriggererWhitelist() []GenesisTriggererParams { +func (m *Params) GetGenesisTriggererAllowlist() []GenesisTriggererParams { if m != nil { - return m.GenesisTriggererWhitelist + return m.GenesisTriggererAllowlist } return nil } @@ -130,11 +130,11 @@ var fileDescriptor_a8d0b00d1bcc9c95 = []byte{ 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x2e, 0xca, 0xcf, 0xc9, 0x49, 0x2c, 0x28, 0xd0, 0xcb, 0x28, 0x4d, 0x8a, 0x87, 0xaa, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xcb, 0xeb, 0x83, 0x58, 0x10, 0xa5, 0x4a, 0x2b, 0x18, 0xb9, 0xd8, 0x02, 0xc0, 0x7a, 0x85, 0xa6, 0x33, 0x72, 0x49, 0x43, 0x15, - 0xc7, 0x97, 0x14, 0x65, 0xa6, 0xa7, 0xa7, 0x16, 0xa5, 0x16, 0xc5, 0x97, 0x67, 0x64, 0x96, 0xa4, - 0xe6, 0x64, 0x16, 0x97, 0x48, 0x30, 0x2a, 0x30, 0x6b, 0x70, 0x1b, 0x69, 0xeb, 0x61, 0x31, 0x5c, + 0xc7, 0x97, 0x14, 0x65, 0xa6, 0xa7, 0xa7, 0x16, 0xa5, 0x16, 0xc5, 0x27, 0xe6, 0xe4, 0xe4, 0x97, + 0xe7, 0x64, 0x16, 0x97, 0x48, 0x30, 0x2a, 0x30, 0x6b, 0x70, 0x1b, 0x69, 0xeb, 0x61, 0x31, 0x5c, 0xcf, 0x1d, 0x42, 0x87, 0xc0, 0xb4, 0x41, 0x8c, 0x74, 0xd2, 0x3a, 0x71, 0x4f, 0x9e, 0xe1, 0xd3, 0x3d, 0x79, 0xa5, 0xca, 0xc4, 0xdc, 0x1c, 0x2b, 0x25, 0x3c, 0xa6, 0x2b, 0x05, 0x49, 0xa6, 0xa3, - 0x99, 0x11, 0x0e, 0x93, 0xb3, 0x62, 0x99, 0xb1, 0x40, 0x9e, 0x41, 0xc9, 0x8d, 0x4b, 0x0c, 0xbb, + 0x99, 0xe1, 0x08, 0x93, 0xb3, 0x62, 0x99, 0xb1, 0x40, 0x9e, 0x41, 0xc9, 0x8d, 0x4b, 0x0c, 0xbb, 0x35, 0x42, 0x3a, 0x5c, 0xec, 0x89, 0x29, 0x29, 0x45, 0xa9, 0xc5, 0xc5, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x4e, 0x42, 0x9f, 0xee, 0xc9, 0xf3, 0x41, 0xec, 0x84, 0x4a, 0x28, 0x05, 0xc1, 0x94, 0x38, 0x05, 0x9f, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, @@ -142,7 +142,7 @@ var fileDescriptor_a8d0b00d1bcc9c95 = []byte{ 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x4a, 0x65, 0x6e, 0x6a, 0x5e, 0x71, 0x66, 0x7e, 0x5e, 0x45, 0x65, 0x15, 0x82, 0xa3, 0x5b, 0x94, 0x92, 0xad, 0x5f, 0xa1, 0x8f, 0x1c, 0xf2, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0xe0, 0x34, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, - 0x68, 0x89, 0x98, 0x0e, 0x95, 0x01, 0x00, 0x00, + 0xaa, 0x00, 0x8d, 0x77, 0x95, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -165,10 +165,10 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.GenesisTriggererWhitelist) > 0 { - for iNdEx := len(m.GenesisTriggererWhitelist) - 1; iNdEx >= 0; iNdEx-- { + if len(m.GenesisTriggererAllowlist) > 0 { + for iNdEx := len(m.GenesisTriggererAllowlist) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.GenesisTriggererWhitelist[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.GenesisTriggererAllowlist[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -229,8 +229,8 @@ func (m *Params) Size() (n int) { } var l int _ = l - if len(m.GenesisTriggererWhitelist) > 0 { - for _, e := range m.GenesisTriggererWhitelist { + if len(m.GenesisTriggererAllowlist) > 0 { + for _, e := range m.GenesisTriggererAllowlist { l = e.Size() n += 1 + l + sovParams(uint64(l)) } @@ -288,7 +288,7 @@ func (m *Params) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field GenesisTriggererWhitelist", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field GenesisTriggererAllowlist", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -315,8 +315,8 @@ func (m *Params) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.GenesisTriggererWhitelist = append(m.GenesisTriggererWhitelist, GenesisTriggererParams{}) - if err := m.GenesisTriggererWhitelist[len(m.GenesisTriggererWhitelist)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.GenesisTriggererAllowlist = append(m.GenesisTriggererAllowlist, GenesisTriggererParams{}) + if err := m.GenesisTriggererAllowlist[len(m.GenesisTriggererAllowlist)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/hub-genesis/types/query.pb.go b/x/hub-genesis/types/query.pb.go index 8c63c8f7..a1a82d10 100644 --- a/x/hub-genesis/types/query.pb.go +++ b/x/hub-genesis/types/query.pb.go @@ -29,23 +29,22 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -type QueryGetHubRequest struct { - // id is the id of the hub - HubId string `protobuf:"bytes,1,opt,name=hub_id,json=hubId,proto3" json:"hub_id,omitempty"` +// QueryParamsRequest is the request type for the Query/Params RPC method. +type QueryParamsRequest struct { } -func (m *QueryGetHubRequest) Reset() { *m = QueryGetHubRequest{} } -func (m *QueryGetHubRequest) String() string { return proto.CompactTextString(m) } -func (*QueryGetHubRequest) ProtoMessage() {} -func (*QueryGetHubRequest) Descriptor() ([]byte, []int) { +func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } +func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } +func (*QueryParamsRequest) ProtoMessage() {} +func (*QueryParamsRequest) Descriptor() ([]byte, []int) { return fileDescriptor_361b89f8abfb35e2, []int{0} } -func (m *QueryGetHubRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryGetHubRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryGetHubRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -55,42 +54,36 @@ func (m *QueryGetHubRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryGetHubRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryGetHubRequest.Merge(m, src) +func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryParamsRequest.Merge(m, src) } -func (m *QueryGetHubRequest) XXX_Size() int { +func (m *QueryParamsRequest) XXX_Size() int { return m.Size() } -func (m *QueryGetHubRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryGetHubRequest.DiscardUnknown(m) +func (m *QueryParamsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryGetHubRequest proto.InternalMessageInfo - -func (m *QueryGetHubRequest) GetHubId() string { - if m != nil { - return m.HubId - } - return "" -} +var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo -type QueryGetHubResponse struct { - // hub is the hub information - Hub Hub `protobuf:"bytes,1,opt,name=hub,proto3" json:"hub"` +// QueryParamsResponse is the response type for the Query/Params RPC method. +type QueryParamsResponse struct { + // params defines the parameters of the module. + Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` } -func (m *QueryGetHubResponse) Reset() { *m = QueryGetHubResponse{} } -func (m *QueryGetHubResponse) String() string { return proto.CompactTextString(m) } -func (*QueryGetHubResponse) ProtoMessage() {} -func (*QueryGetHubResponse) Descriptor() ([]byte, []int) { +func (m *QueryParamsResponse) Reset() { *m = QueryParamsResponse{} } +func (m *QueryParamsResponse) String() string { return proto.CompactTextString(m) } +func (*QueryParamsResponse) ProtoMessage() {} +func (*QueryParamsResponse) Descriptor() ([]byte, []int) { return fileDescriptor_361b89f8abfb35e2, []int{1} } -func (m *QueryGetHubResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryGetHubResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryGetHubResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryParamsResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -100,41 +93,41 @@ func (m *QueryGetHubResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryGetHubResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryGetHubResponse.Merge(m, src) +func (m *QueryParamsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryParamsResponse.Merge(m, src) } -func (m *QueryGetHubResponse) XXX_Size() int { +func (m *QueryParamsResponse) XXX_Size() int { return m.Size() } -func (m *QueryGetHubResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryGetHubResponse.DiscardUnknown(m) +func (m *QueryParamsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryParamsResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryGetHubResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryParamsResponse proto.InternalMessageInfo -func (m *QueryGetHubResponse) GetHub() Hub { +func (m *QueryParamsResponse) GetParams() Params { if m != nil { - return m.Hub + return m.Params } - return Hub{} + return Params{} } -// QueryParamsRequest is the request type for the Query/Params RPC method. -type QueryParamsRequest struct { +// QueryStateRequest is the request type for the Query/State RPC method. +type QueryStateRequest struct { } -func (m *QueryParamsRequest) Reset() { *m = QueryParamsRequest{} } -func (m *QueryParamsRequest) String() string { return proto.CompactTextString(m) } -func (*QueryParamsRequest) ProtoMessage() {} -func (*QueryParamsRequest) Descriptor() ([]byte, []int) { +func (m *QueryStateRequest) Reset() { *m = QueryStateRequest{} } +func (m *QueryStateRequest) String() string { return proto.CompactTextString(m) } +func (*QueryStateRequest) ProtoMessage() {} +func (*QueryStateRequest) Descriptor() ([]byte, []int) { return fileDescriptor_361b89f8abfb35e2, []int{2} } -func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryStateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryStateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryParamsRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryStateRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -144,36 +137,36 @@ func (m *QueryParamsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryParamsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryParamsRequest.Merge(m, src) +func (m *QueryStateRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryStateRequest.Merge(m, src) } -func (m *QueryParamsRequest) XXX_Size() int { +func (m *QueryStateRequest) XXX_Size() int { return m.Size() } -func (m *QueryParamsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryParamsRequest.DiscardUnknown(m) +func (m *QueryStateRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryStateRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryStateRequest proto.InternalMessageInfo -// QueryParamsResponse is the response type for the Query/Params RPC method. -type QueryParamsResponse struct { - // params defines the parameters of the module. - Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` +// QueryStateResponse is the response type for the Query/State RPC method. +type QueryStateResponse struct { + // state holds the state of the genesis event + State State `protobuf:"bytes,1,opt,name=state,proto3" json:"state"` } -func (m *QueryParamsResponse) Reset() { *m = QueryParamsResponse{} } -func (m *QueryParamsResponse) String() string { return proto.CompactTextString(m) } -func (*QueryParamsResponse) ProtoMessage() {} -func (*QueryParamsResponse) Descriptor() ([]byte, []int) { +func (m *QueryStateResponse) Reset() { *m = QueryStateResponse{} } +func (m *QueryStateResponse) String() string { return proto.CompactTextString(m) } +func (*QueryStateResponse) ProtoMessage() {} +func (*QueryStateResponse) Descriptor() ([]byte, []int) { return fileDescriptor_361b89f8abfb35e2, []int{3} } -func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryStateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryStateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryParamsResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryStateResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -183,61 +176,59 @@ func (m *QueryParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *QueryParamsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryParamsResponse.Merge(m, src) +func (m *QueryStateResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryStateResponse.Merge(m, src) } -func (m *QueryParamsResponse) XXX_Size() int { +func (m *QueryStateResponse) XXX_Size() int { return m.Size() } -func (m *QueryParamsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryParamsResponse.DiscardUnknown(m) +func (m *QueryStateResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryStateResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryParamsResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryStateResponse proto.InternalMessageInfo -func (m *QueryParamsResponse) GetParams() Params { +func (m *QueryStateResponse) GetState() State { if m != nil { - return m.Params + return m.State } - return Params{} + return State{} } func init() { - proto.RegisterType((*QueryGetHubRequest)(nil), "rollapp.hub_genesis.QueryGetHubRequest") - proto.RegisterType((*QueryGetHubResponse)(nil), "rollapp.hub_genesis.QueryGetHubResponse") proto.RegisterType((*QueryParamsRequest)(nil), "rollapp.hub_genesis.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "rollapp.hub_genesis.QueryParamsResponse") + proto.RegisterType((*QueryStateRequest)(nil), "rollapp.hub_genesis.QueryStateRequest") + proto.RegisterType((*QueryStateResponse)(nil), "rollapp.hub_genesis.QueryStateResponse") } func init() { proto.RegisterFile("hub-genesis/query.proto", fileDescriptor_361b89f8abfb35e2) } var fileDescriptor_361b89f8abfb35e2 = []byte{ - // 388 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x4a, 0xeb, 0x40, - 0x18, 0x85, 0x93, 0xf6, 0x36, 0x70, 0xe7, 0xee, 0xa6, 0x2d, 0xb7, 0x54, 0x89, 0x92, 0x8d, 0x05, - 0x69, 0x52, 0xaa, 0x14, 0x0a, 0xae, 0xba, 0x69, 0xdd, 0xd5, 0xba, 0x73, 0x23, 0x19, 0x33, 0x24, - 0xc1, 0x36, 0x93, 0x66, 0x66, 0xa0, 0x51, 0xdc, 0xf8, 0x04, 0x42, 0xc1, 0x47, 0xf1, 0x19, 0xba, - 0x2c, 0xb8, 0x71, 0x25, 0xd2, 0xfa, 0x20, 0x92, 0xcc, 0x14, 0x1b, 0x2d, 0xd5, 0x5d, 0x32, 0xff, - 0xf9, 0xcf, 0xf9, 0xe6, 0x30, 0xe0, 0xbf, 0xc7, 0x51, 0xdd, 0xc5, 0x01, 0xa6, 0x3e, 0xb5, 0xc6, - 0x1c, 0x47, 0xb1, 0x19, 0x46, 0x84, 0x11, 0x58, 0x8c, 0xc8, 0x70, 0x68, 0x87, 0xa1, 0xe9, 0x71, - 0x74, 0x29, 0x05, 0xd5, 0x92, 0x4b, 0x5c, 0x92, 0xce, 0xad, 0xe4, 0x4b, 0x48, 0xab, 0xbb, 0x2e, - 0x21, 0xee, 0x10, 0x5b, 0x76, 0xe8, 0x5b, 0x76, 0x10, 0x10, 0x66, 0x33, 0x9f, 0x04, 0x54, 0x4e, - 0x2b, 0xeb, 0x09, 0xa1, 0x1d, 0xd9, 0xa3, 0xd5, 0xa4, 0xbc, 0x3e, 0xf1, 0x38, 0x12, 0xc7, 0xc6, - 0x21, 0x80, 0x67, 0x09, 0x48, 0x17, 0xb3, 0x1e, 0x47, 0x03, 0x3c, 0xe6, 0x98, 0x32, 0x58, 0x06, - 0x5a, 0x42, 0xe2, 0x3b, 0x15, 0x75, 0x5f, 0xad, 0xfd, 0x1d, 0x14, 0x3c, 0x8e, 0x4e, 0x1d, 0xa3, - 0x0b, 0x8a, 0x19, 0x31, 0x0d, 0x49, 0x40, 0x31, 0x6c, 0x80, 0xbc, 0xc7, 0x51, 0x2a, 0xfd, 0xd7, - 0xac, 0x98, 0x1b, 0xee, 0x62, 0xf6, 0x38, 0xea, 0xfc, 0x99, 0xbd, 0xee, 0x29, 0x83, 0x44, 0x6a, - 0x94, 0x64, 0x6a, 0x3f, 0x25, 0x94, 0xa9, 0x46, 0x5f, 0xda, 0xaf, 0x4e, 0xa5, 0x7d, 0x1b, 0x68, - 0xe2, 0x26, 0x32, 0x61, 0x67, 0x63, 0x82, 0x58, 0x92, 0x21, 0x72, 0xa1, 0xf9, 0x94, 0x03, 0x85, - 0xd4, 0x12, 0x3e, 0xaa, 0x20, 0xdf, 0xe3, 0x08, 0x1e, 0x6c, 0x5c, 0xfe, 0x5e, 0x41, 0xb5, 0xf6, - 0xb3, 0x50, 0xf0, 0x19, 0x27, 0xf7, 0xcf, 0xef, 0xd3, 0x5c, 0x0b, 0x1e, 0x5b, 0x4e, 0x3c, 0xc2, - 0x01, 0xf5, 0x49, 0x30, 0x89, 0x6f, 0x3e, 0x7f, 0xea, 0x91, 0x73, 0x6d, 0x7d, 0x69, 0xdf, 0xba, - 0x15, 0xfd, 0xde, 0xc1, 0xa9, 0x0a, 0x34, 0xc1, 0xbe, 0x8d, 0x2d, 0x53, 0xd4, 0x36, 0xb6, 0x6c, - 0x77, 0x46, 0x2b, 0x65, 0x6b, 0x40, 0xf3, 0xb7, 0x6c, 0xa2, 0xb8, 0xce, 0xf9, 0x6c, 0xa1, 0xab, - 0xf3, 0x85, 0xae, 0xbe, 0x2d, 0x74, 0xf5, 0x61, 0xa9, 0x2b, 0xf3, 0xa5, 0xae, 0xbc, 0x2c, 0x75, - 0xe5, 0xa2, 0xed, 0xfa, 0x2c, 0x79, 0x3e, 0x57, 0x64, 0xb4, 0xcd, 0x73, 0x92, 0x71, 0x65, 0x71, - 0x88, 0x29, 0xd2, 0xd2, 0x27, 0x77, 0xf4, 0x11, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x4a, 0x8a, 0x7e, - 0x07, 0x03, 0x00, 0x00, + // 361 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xb1, 0x4e, 0x3a, 0x31, + 0x1c, 0xc7, 0xaf, 0xe4, 0x0f, 0x43, 0xff, 0x93, 0x85, 0x44, 0x72, 0x9a, 0xd3, 0xdc, 0x20, 0x2c, + 0x5c, 0x0d, 0x46, 0x12, 0x56, 0x66, 0x07, 0x84, 0xcd, 0xc5, 0xf4, 0xa4, 0x39, 0x2e, 0x42, 0x5b, + 0xae, 0xbd, 0x84, 0x73, 0xf4, 0x05, 0x34, 0xe1, 0x41, 0x7c, 0x0d, 0x46, 0x12, 0x17, 0x27, 0x63, + 0xc0, 0x07, 0x31, 0xb4, 0x25, 0x42, 0x40, 0x71, 0x83, 0xfe, 0xbe, 0xbf, 0xef, 0xe7, 0x73, 0xbd, + 0x83, 0x87, 0xfd, 0x34, 0xac, 0x45, 0x94, 0x51, 0x19, 0x4b, 0x3c, 0x4a, 0x69, 0x92, 0x05, 0x22, + 0xe1, 0x8a, 0xa3, 0x62, 0xc2, 0x07, 0x03, 0x22, 0x44, 0xd0, 0x4f, 0xc3, 0x5b, 0x1b, 0x70, 0x4b, + 0x11, 0x8f, 0xb8, 0x9e, 0xe3, 0xe5, 0x2f, 0x13, 0x75, 0x8f, 0x23, 0xce, 0xa3, 0x01, 0xc5, 0x44, + 0xc4, 0x98, 0x30, 0xc6, 0x15, 0x51, 0x31, 0x67, 0xd2, 0x4e, 0xcb, 0xeb, 0x04, 0x41, 0x12, 0x32, + 0x5c, 0x4d, 0x36, 0xd8, 0x52, 0x11, 0x45, 0xcd, 0xc0, 0x2f, 0x41, 0x74, 0xbd, 0x54, 0x69, 0xeb, + 0x74, 0x87, 0x8e, 0x52, 0x2a, 0x95, 0xdf, 0x86, 0xc5, 0x8d, 0x53, 0x29, 0x38, 0x93, 0x14, 0x35, + 0x61, 0xc1, 0xb4, 0x96, 0xc1, 0x29, 0xa8, 0xfe, 0xaf, 0x1f, 0x05, 0x3b, 0xcc, 0x03, 0xb3, 0xd4, + 0xfa, 0x37, 0x7d, 0x3f, 0x71, 0x3a, 0x76, 0xc1, 0x2f, 0xc2, 0x03, 0xdd, 0xd8, 0x5d, 0xb2, 0x57, + 0x98, 0x2b, 0x0b, 0xb7, 0x87, 0x96, 0xd2, 0x80, 0x79, 0x6d, 0x68, 0x21, 0xee, 0x4e, 0x88, 0x5e, + 0xb1, 0x0c, 0x13, 0xaf, 0xbf, 0xe4, 0x60, 0x5e, 0xd7, 0xa1, 0x09, 0x80, 0x05, 0x63, 0x81, 0x2a, + 0x3b, 0xb7, 0xb7, 0x1f, 0xd9, 0xad, 0xee, 0x0f, 0x1a, 0x3f, 0xbf, 0xf1, 0xf8, 0xfa, 0x39, 0xc9, + 0x9d, 0xa3, 0x00, 0xf7, 0xb2, 0x21, 0x65, 0x32, 0xe6, 0x6c, 0x9c, 0x3d, 0x7c, 0xff, 0xa9, 0x25, + 0xbd, 0x7b, 0xbc, 0xfd, 0x26, 0xd0, 0x13, 0x80, 0x79, 0xad, 0x8d, 0xce, 0x7e, 0x66, 0xad, 0xdf, + 0x8f, 0x5b, 0xd9, 0x9b, 0xb3, 0x4a, 0x97, 0x5a, 0x09, 0xa3, 0xda, 0x5f, 0x95, 0xf4, 0x8d, 0xb5, + 0xba, 0xd3, 0xb9, 0x07, 0x66, 0x73, 0x0f, 0x7c, 0xcc, 0x3d, 0xf0, 0xbc, 0xf0, 0x9c, 0xd9, 0xc2, + 0x73, 0xde, 0x16, 0x9e, 0x73, 0xd3, 0x8c, 0x62, 0xd5, 0x4f, 0xc3, 0xe0, 0x8e, 0x0f, 0x7f, 0xab, + 0x1c, 0x6f, 0x94, 0xaa, 0x4c, 0x50, 0x19, 0x16, 0xf4, 0x87, 0x75, 0xf1, 0x15, 0x00, 0x00, 0xff, + 0xff, 0x4a, 0x6a, 0xbc, 0x50, 0xef, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -252,10 +243,10 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type QueryClient interface { - // Hub returns the hub information - Hub(ctx context.Context, in *QueryGetHubRequest, opts ...grpc.CallOption) (*QueryGetHubResponse, error) // Params returns the total set of hub-genesis parameters. Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) + // State returns the state of the genesis event. + State(ctx context.Context, in *QueryStateRequest, opts ...grpc.CallOption) (*QueryStateResponse, error) } type queryClient struct { @@ -266,18 +257,18 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { return &queryClient{cc} } -func (c *queryClient) Hub(ctx context.Context, in *QueryGetHubRequest, opts ...grpc.CallOption) (*QueryGetHubResponse, error) { - out := new(QueryGetHubResponse) - err := c.cc.Invoke(ctx, "/rollapp.hub_genesis.Query/Hub", in, out, opts...) +func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { + out := new(QueryParamsResponse) + err := c.cc.Invoke(ctx, "/rollapp.hub_genesis.Query/Params", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { - out := new(QueryParamsResponse) - err := c.cc.Invoke(ctx, "/rollapp.hub_genesis.Query/Params", in, out, opts...) +func (c *queryClient) State(ctx context.Context, in *QueryStateRequest, opts ...grpc.CallOption) (*QueryStateResponse, error) { + out := new(QueryStateResponse) + err := c.cc.Invoke(ctx, "/rollapp.hub_genesis.Query/State", in, out, opts...) if err != nil { return nil, err } @@ -286,59 +277,59 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . // QueryServer is the server API for Query service. type QueryServer interface { - // Hub returns the hub information - Hub(context.Context, *QueryGetHubRequest) (*QueryGetHubResponse, error) // Params returns the total set of hub-genesis parameters. Params(context.Context, *QueryParamsRequest) (*QueryParamsResponse, error) + // State returns the state of the genesis event. + State(context.Context, *QueryStateRequest) (*QueryStateResponse, error) } // UnimplementedQueryServer can be embedded to have forward compatible implementations. type UnimplementedQueryServer struct { } -func (*UnimplementedQueryServer) Hub(ctx context.Context, req *QueryGetHubRequest) (*QueryGetHubResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Hub not implemented") -} func (*UnimplementedQueryServer) Params(ctx context.Context, req *QueryParamsRequest) (*QueryParamsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Params not implemented") } +func (*UnimplementedQueryServer) State(ctx context.Context, req *QueryStateRequest) (*QueryStateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method State not implemented") +} func RegisterQueryServer(s grpc1.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) } -func _Query_Hub_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryGetHubRequest) +func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryParamsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Hub(ctx, in) + return srv.(QueryServer).Params(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/rollapp.hub_genesis.Query/Hub", + FullMethod: "/rollapp.hub_genesis.Query/Params", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Hub(ctx, req.(*QueryGetHubRequest)) + return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryParamsRequest) +func _Query_State_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryStateRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Params(ctx, in) + return srv.(QueryServer).State(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/rollapp.hub_genesis.Query/Params", + FullMethod: "/rollapp.hub_genesis.Query/State", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) + return srv.(QueryServer).State(ctx, req.(*QueryStateRequest)) } return interceptor(ctx, in, info, handler) } @@ -347,20 +338,20 @@ var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "rollapp.hub_genesis.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ - { - MethodName: "Hub", - Handler: _Query_Hub_Handler, - }, { MethodName: "Params", Handler: _Query_Params_Handler, }, + { + MethodName: "State", + Handler: _Query_State_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "hub-genesis/query.proto", } -func (m *QueryGetHubRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -370,27 +361,20 @@ func (m *QueryGetHubRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetHubRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryParamsRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetHubRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.HubId) > 0 { - i -= len(m.HubId) - copy(dAtA[i:], m.HubId) - i = encodeVarintQuery(dAtA, i, uint64(len(m.HubId))) - i-- - dAtA[i] = 0xa - } return len(dAtA) - i, nil } -func (m *QueryGetHubResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryParamsResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -400,18 +384,18 @@ func (m *QueryGetHubResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryGetHubResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryParamsResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryGetHubResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l { - size, err := m.Hub.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -423,7 +407,7 @@ func (m *QueryGetHubResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryStateRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -433,12 +417,12 @@ func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryParamsRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryStateRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryStateRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -446,7 +430,7 @@ func (m *QueryParamsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *QueryParamsResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryStateResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -456,18 +440,18 @@ func (m *QueryParamsResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryParamsResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryStateResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryStateResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l { - size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.State.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -490,31 +474,27 @@ func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *QueryGetHubRequest) Size() (n int) { +func (m *QueryParamsRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.HubId) - if l > 0 { - n += 1 + l + sovQuery(uint64(l)) - } return n } -func (m *QueryGetHubResponse) Size() (n int) { +func (m *QueryParamsResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = m.Hub.Size() + l = m.Params.Size() n += 1 + l + sovQuery(uint64(l)) return n } -func (m *QueryParamsRequest) Size() (n int) { +func (m *QueryStateRequest) Size() (n int) { if m == nil { return 0 } @@ -523,13 +503,13 @@ func (m *QueryParamsRequest) Size() (n int) { return n } -func (m *QueryParamsResponse) Size() (n int) { +func (m *QueryStateResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = m.Params.Size() + l = m.State.Size() n += 1 + l + sovQuery(uint64(l)) return n } @@ -540,7 +520,7 @@ func sovQuery(x uint64) (n int) { func sozQuery(x uint64) (n int) { return sovQuery(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *QueryGetHubRequest) Unmarshal(dAtA []byte) error { +func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -563,44 +543,12 @@ func (m *QueryGetHubRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetHubRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetHubRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field HubId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowQuery - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthQuery - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthQuery - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.HubId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -622,7 +570,7 @@ func (m *QueryGetHubRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryGetHubResponse) Unmarshal(dAtA []byte) error { +func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -645,15 +593,15 @@ func (m *QueryGetHubResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryGetHubResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryParamsResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryGetHubResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Hub", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -680,7 +628,7 @@ func (m *QueryGetHubResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Hub.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -705,7 +653,7 @@ func (m *QueryGetHubResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { +func (m *QueryStateRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -728,10 +676,10 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryParamsRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryStateRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryParamsRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryStateRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -755,7 +703,7 @@ func (m *QueryParamsRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { +func (m *QueryStateResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -778,15 +726,15 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryParamsResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryStateResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryStateResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field State", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -813,7 +761,7 @@ func (m *QueryParamsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.State.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/hub-genesis/types/query.pb.gw.go b/x/hub-genesis/types/query.pb.gw.go index 5a6f8da9..16c5d1a9 100644 --- a/x/hub-genesis/types/query.pb.gw.go +++ b/x/hub-genesis/types/query.pb.gw.go @@ -33,74 +33,38 @@ var _ = utilities.NewDoubleArray var _ = descriptor.ForMessage var _ = metadata.Join -func request_Query_Hub_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryGetHubRequest +func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryParamsRequest var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["hub_id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "hub_id") - } - - protoReq.HubId, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "hub_id", err) - } - - msg, err := client.Hub(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_Hub_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryGetHubRequest +func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryParamsRequest var metadata runtime.ServerMetadata - var ( - val string - ok bool - err error - _ = err - ) - - val, ok = pathParams["hub_id"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "hub_id") - } - - protoReq.HubId, err = runtime.String(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "hub_id", err) - } - - msg, err := server.Hub(ctx, &protoReq) + msg, err := server.Params(ctx, &protoReq) return msg, metadata, err } -func request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest +func request_Query_State_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryStateRequest var metadata runtime.ServerMetadata - msg, err := client.Params(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.State(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryParamsRequest +func local_request_Query_State_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryStateRequest var metadata runtime.ServerMetadata - msg, err := server.Params(ctx, &protoReq) + msg, err := server.State(ctx, &protoReq) return msg, metadata, err } @@ -111,7 +75,7 @@ func local_request_Query_Params_0(ctx context.Context, marshaler runtime.Marshal // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead. func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error { - mux.Handle("GET", pattern_Query_Hub_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -122,7 +86,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Hub_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_Params_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -130,11 +94,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Hub_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_State_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -145,7 +109,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Params_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_State_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -153,7 +117,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_State_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -198,7 +162,7 @@ func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc // "QueryClient" to call the correct interceptors. func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error { - mux.Handle("GET", pattern_Query_Hub_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -207,18 +171,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Hub_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_Params_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Hub_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_Params_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_State_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -227,14 +191,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Params_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_State_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Params_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_State_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -242,13 +206,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Hub_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"dymensionxyz", "dymension-rdk", "hub-genesis", "hub", "hub_id"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"dymensionxyz", "dymension-rdk", "hub-genesis", "params"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_State_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3}, []string{"dymensionxyz", "dymension-rdk", "hub-genesis", "state"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( - forward_Query_Hub_0 = runtime.ForwardResponseMessage - forward_Query_Params_0 = runtime.ForwardResponseMessage + + forward_Query_State_0 = runtime.ForwardResponseMessage ) diff --git a/x/hub-genesis/types/state.go b/x/hub-genesis/types/state.go new file mode 100644 index 00000000..ba4f6a1a --- /dev/null +++ b/x/hub-genesis/types/state.go @@ -0,0 +1,9 @@ +package types + +// validate state +func (s State) Validate() error { + if !s.GenesisTokens.IsValid() { + return ErrInvalidGenesisTokens + } + return nil +} diff --git a/x/hub-genesis/types/state.pb.go b/x/hub-genesis/types/state.pb.go new file mode 100644 index 00000000..5df134aa --- /dev/null +++ b/x/hub-genesis/types/state.pb.go @@ -0,0 +1,380 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: hub-genesis/state.proto + +package types + +import ( + fmt "fmt" + github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" + types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +// State holds the state of the genesis event +type State struct { + // is_locked is a boolean that indicates if the genesis event has occured + IsLocked bool `protobuf:"varint,1,opt,name=is_locked,json=isLocked,proto3" json:"is_locked,omitempty"` + // genesis_tokens is the list of tokens that are expected to be locked on genesis event + GenesisTokens github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=genesis_tokens,json=genesisTokens,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"genesis_tokens"` +} + +func (m *State) Reset() { *m = State{} } +func (m *State) String() string { return proto.CompactTextString(m) } +func (*State) ProtoMessage() {} +func (*State) Descriptor() ([]byte, []int) { + return fileDescriptor_1ad65c2fe0d953ab, []int{0} +} +func (m *State) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *State) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_State.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 *State) XXX_Merge(src proto.Message) { + xxx_messageInfo_State.Merge(m, src) +} +func (m *State) XXX_Size() int { + return m.Size() +} +func (m *State) XXX_DiscardUnknown() { + xxx_messageInfo_State.DiscardUnknown(m) +} + +var xxx_messageInfo_State proto.InternalMessageInfo + +func (m *State) GetIsLocked() bool { + if m != nil { + return m.IsLocked + } + return false +} + +func (m *State) GetGenesisTokens() github_com_cosmos_cosmos_sdk_types.Coins { + if m != nil { + return m.GenesisTokens + } + return nil +} + +func init() { + proto.RegisterType((*State)(nil), "rollapp.hub_genesis.State") +} + +func init() { proto.RegisterFile("hub-genesis/state.proto", fileDescriptor_1ad65c2fe0d953ab) } + +var fileDescriptor_1ad65c2fe0d953ab = []byte{ + // 282 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0xb1, 0x4e, 0xeb, 0x30, + 0x14, 0x86, 0xe3, 0x7b, 0x05, 0x2a, 0x41, 0x30, 0x14, 0x24, 0x4a, 0x91, 0xdc, 0x8a, 0xa9, 0x4b, + 0x6d, 0x0a, 0x13, 0x6b, 0x59, 0x99, 0x5a, 0x26, 0x96, 0x28, 0x4e, 0xac, 0xc4, 0x4a, 0xe2, 0x13, + 0xe5, 0x38, 0xa8, 0xe1, 0x29, 0x18, 0x79, 0x06, 0x9e, 0xa4, 0x63, 0x47, 0x26, 0x40, 0xc9, 0x8b, + 0xa0, 0x38, 0x91, 0xe8, 0x64, 0x1f, 0xfd, 0xbf, 0xbf, 0xcf, 0xb6, 0x7b, 0x11, 0x97, 0x62, 0x1e, + 0x49, 0x2d, 0x51, 0x21, 0x47, 0xe3, 0x1b, 0xc9, 0xf2, 0x02, 0x0c, 0x0c, 0xcf, 0x0a, 0x48, 0x53, + 0x3f, 0xcf, 0x59, 0x5c, 0x0a, 0xaf, 0x2f, 0x8c, 0xcf, 0x23, 0x88, 0xc0, 0xe6, 0xbc, 0xdd, 0x75, + 0xd5, 0x31, 0x0d, 0x00, 0x33, 0x40, 0x2e, 0x7c, 0x94, 0xfc, 0x65, 0x21, 0xa4, 0xf1, 0x17, 0x3c, + 0x00, 0xa5, 0xbb, 0xfc, 0xfa, 0x9d, 0xb8, 0x07, 0xeb, 0x16, 0x3d, 0xbc, 0x72, 0x8f, 0x14, 0x7a, + 0x29, 0x04, 0x89, 0x0c, 0x47, 0x64, 0x4a, 0x66, 0x83, 0xd5, 0x40, 0xe1, 0xa3, 0x9d, 0x87, 0x85, + 0x7b, 0xda, 0x7b, 0x3c, 0x03, 0x89, 0xd4, 0x38, 0xfa, 0x37, 0xfd, 0x3f, 0x3b, 0xbe, 0xbd, 0x64, + 0x1d, 0x9f, 0xb5, 0x7c, 0xd6, 0xf3, 0xd9, 0x03, 0x28, 0xbd, 0xbc, 0xd9, 0x7e, 0x4d, 0x9c, 0x8f, + 0xef, 0xc9, 0x2c, 0x52, 0x26, 0x2e, 0x05, 0x0b, 0x20, 0xe3, 0xfd, 0x65, 0xba, 0x65, 0x8e, 0x61, + 0xc2, 0x4d, 0x95, 0x4b, 0xb4, 0x07, 0x70, 0x75, 0xd2, 0x2b, 0x9e, 0xac, 0x61, 0xb9, 0xde, 0xd6, + 0x94, 0xec, 0x6a, 0x4a, 0x7e, 0x6a, 0x4a, 0xde, 0x1a, 0xea, 0xec, 0x1a, 0xea, 0x7c, 0x36, 0xd4, + 0x79, 0xbe, 0xdf, 0x43, 0x86, 0x55, 0x26, 0x35, 0x2a, 0xd0, 0x9b, 0xea, 0xf5, 0x6f, 0x98, 0x17, + 0x61, 0xc2, 0x37, 0x7c, 0xff, 0x03, 0xad, 0x49, 0x1c, 0xda, 0x67, 0xdf, 0xfd, 0x06, 0x00, 0x00, + 0xff, 0xff, 0x4b, 0xdf, 0xb4, 0xa1, 0x5c, 0x01, 0x00, 0x00, +} + +func (m *State) 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 *State) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *State) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.GenesisTokens) > 0 { + for iNdEx := len(m.GenesisTokens) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.GenesisTokens[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintState(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + if m.IsLocked { + i-- + if m.IsLocked { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + +func encodeVarintState(dAtA []byte, offset int, v uint64) int { + offset -= sovState(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *State) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.IsLocked { + n += 2 + } + if len(m.GenesisTokens) > 0 { + for _, e := range m.GenesisTokens { + l = e.Size() + n += 1 + l + sovState(uint64(l)) + } + } + return n +} + +func sovState(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozState(x uint64) (n int) { + return sovState(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *State) 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 ErrIntOverflowState + } + 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: State: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: State: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field IsLocked", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowState + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.IsLocked = bool(v != 0) + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field GenesisTokens", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowState + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthState + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthState + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.GenesisTokens = append(m.GenesisTokens, types.Coin{}) + if err := m.GenesisTokens[len(m.GenesisTokens)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipState(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthState + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipState(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + depth := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowState + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowState + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + case 1: + iNdEx += 8 + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowState + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthState + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupState + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthState + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthState = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowState = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupState = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/hub-genesis/types/tx.pb.go b/x/hub-genesis/types/tx.pb.go index f7e16dbc..186e987d 100644 --- a/x/hub-genesis/types/tx.pb.go +++ b/x/hub-genesis/types/tx.pb.go @@ -33,7 +33,7 @@ type MsgHubGenesisEvent struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // channel_id is the hub channel id on the rollapp ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` - // hub_id is the hub id + // hub_id is the hub's chainid HubId string `protobuf:"bytes,3,opt,name=hub_id,json=hubId,proto3" json:"hub_id,omitempty"` } diff --git a/x/mint/types/params.pb.go b/x/mint/types/params.pb.go index 37565ebf..bb7c1c5e 100644 --- a/x/mint/types/params.pb.go +++ b/x/mint/types/params.pb.go @@ -28,15 +28,12 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Params struct { // type of coin to mint MintDenom string `protobuf:"bytes,1,opt,name=mint_denom,json=mintDenom,proto3" json:"mint_denom,omitempty"` - // mint epoch identifier - How often to mint rewards + // mint epoch identifier MintEpochIdentifier string `protobuf:"bytes,2,opt,name=mint_epoch_identifier,json=mintEpochIdentifier,proto3" json:"mint_epoch_identifier,omitempty" yaml:"mint_epoch_identifier"` // start epoch to start minting rewards from MintStartEpoch int64 `protobuf:"varint,3,opt,name=mint_start_epoch,json=mintStartEpoch,proto3" json:"mint_start_epoch,omitempty" yaml:"minting_rewards_distribution_start_epoch"` - // inflation change epoch identifier - How often to change inflation rate InflationChangeEpochIdentifier string `protobuf:"bytes,4,opt,name=inflation_change_epoch_identifier,json=inflationChangeEpochIdentifier,proto3" json:"inflation_change_epoch_identifier,omitempty" yaml:"inflation_change_epoch_identifier"` - // inflation rate change - How much to change inflation rate InflationRateChange github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=inflation_rate_change,json=inflationRateChange,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"inflation_rate_change" yaml:"inflation_rate_change"` - // target inflation rate TargetInflationRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=target_inflation_rate,json=targetInflationRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"target_inflation_rate" yaml:"target_inflation_rate"` } diff --git a/x/mint/types/query.pb.go b/x/mint/types/query.pb.go index c1f65571..f64f618b 100644 --- a/x/mint/types/query.pb.go +++ b/x/mint/types/query.pb.go @@ -150,7 +150,8 @@ func (m *QueryInflationRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryInflationRequest proto.InternalMessageInfo -// QueryInflationResponse is the response type for the Query/Inflation RPC method. +// QueryInflationResponse is the response type for the Query/Inflation RPC +// method. type QueryInflationResponse struct { // inflation defines the current minting inflation value. CurrentInflationRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=current_inflation_rate,json=currentInflationRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"current_inflation_rate" yaml:"current_inflation_rate"` diff --git a/x/sequencers/types/genesis.pb.go b/x/sequencers/types/genesis.pb.go index a24a41c5..61a057cc 100644 --- a/x/sequencers/types/genesis.pb.go +++ b/x/sequencers/types/genesis.pb.go @@ -26,7 +26,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the test module's genesis state. type GenesisState struct { Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` - // genesis_operator_address defines the genesis operator address of the sequencer. + // genesis_operator_address defines the genesis operator address of the + // sequencer. GenesisOperatorAddress string `protobuf:"bytes,2,opt,name=genesis_operator_address,json=genesisOperatorAddress,proto3" json:"genesis_operator_address,omitempty"` }