From 1bdb0e98d58a355a341bfa850ea66d29ca8bc194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=E1=BA=B7c?= <67097720+expertdicer@users.noreply.github.com> Date: Tue, 14 Mar 2023 11:50:33 +0700 Subject: [PATCH 01/23] remove query client (#3227) * remove query client * merge main * go mod tidy --- modules/apps/29-fee/keeper/grpc_query_test.go | 21 ++++++++++--------- modules/apps/29-fee/keeper/keeper_test.go | 7 ------- .../apps/transfer/keeper/grpc_query_test.go | 12 +++++------ modules/apps/transfer/keeper/keeper_test.go | 3 --- .../core/02-client/keeper/grpc_query_test.go | 7 +------ modules/core/02-client/keeper/keeper_test.go | 13 +----------- 6 files changed, 19 insertions(+), 44 deletions(-) diff --git a/modules/apps/29-fee/keeper/grpc_query_test.go b/modules/apps/29-fee/keeper/grpc_query_test.go index fdededc0b37..abec15426d4 100644 --- a/modules/apps/29-fee/keeper/grpc_query_test.go +++ b/modules/apps/29-fee/keeper/grpc_query_test.go @@ -66,7 +66,8 @@ func (suite *KeeperTestSuite) TestQueryIncentivizedPackets() { tc.malleate() // malleate mutates test data ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.IncentivizedPackets(ctx, req) + + res, err := suite.chainA.GetSimApp().IBCFeeKeeper.IncentivizedPackets(ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -125,7 +126,7 @@ func (suite *KeeperTestSuite) TestQueryIncentivizedPacket() { tc.malleate() // malleate mutates test data ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.IncentivizedPacket(ctx, req) + res, err := suite.chainA.GetSimApp().IBCFeeKeeper.IncentivizedPacket(ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -219,7 +220,7 @@ func (suite *KeeperTestSuite) TestQueryIncentivizedPacketsForChannel() { tc.malleate() ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.IncentivizedPacketsForChannel(ctx, req) + res, err := suite.chainA.GetSimApp().IBCFeeKeeper.IncentivizedPacketsForChannel(ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -275,7 +276,7 @@ func (suite *KeeperTestSuite) TestQueryTotalRecvFees() { tc.malleate() ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.TotalRecvFees(ctx, req) + res, err := suite.chainA.GetSimApp().IBCFeeKeeper.TotalRecvFees(ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -334,7 +335,7 @@ func (suite *KeeperTestSuite) TestQueryTotalAckFees() { tc.malleate() ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.TotalAckFees(ctx, req) + res, err := suite.chainA.GetSimApp().IBCFeeKeeper.TotalAckFees(ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -393,7 +394,7 @@ func (suite *KeeperTestSuite) TestQueryTotalTimeoutFees() { tc.malleate() ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.TotalTimeoutFees(ctx, req) + res, err := suite.chainA.GetSimApp().IBCFeeKeeper.TotalTimeoutFees(ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -460,7 +461,7 @@ func (suite *KeeperTestSuite) TestQueryPayee() { tc.malleate() ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.Payee(ctx, req) + res, err := suite.chainA.GetSimApp().IBCFeeKeeper.Payee(ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -523,7 +524,7 @@ func (suite *KeeperTestSuite) TestQueryCounterpartyPayee() { tc.malleate() ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.CounterpartyPayee(ctx, req) + res, err := suite.chainA.GetSimApp().IBCFeeKeeper.CounterpartyPayee(ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -630,7 +631,7 @@ func (suite *KeeperTestSuite) TestQueryFeeEnabledChannels() { tc.malleate() ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.FeeEnabledChannels(ctx, req) + res, err := suite.chainA.GetSimApp().IBCFeeKeeper.FeeEnabledChannels(ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -679,7 +680,7 @@ func (suite *KeeperTestSuite) TestQueryFeeEnabledChannel() { tc.malleate() ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.FeeEnabledChannel(ctx, req) + res, err := suite.chainA.GetSimApp().IBCFeeKeeper.FeeEnabledChannel(ctx, req) if tc.expPass { suite.Require().NoError(err) diff --git a/modules/apps/29-fee/keeper/keeper_test.go b/modules/apps/29-fee/keeper/keeper_test.go index 89dfcd7a30e..26a573042b7 100644 --- a/modules/apps/29-fee/keeper/keeper_test.go +++ b/modules/apps/29-fee/keeper/keeper_test.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" @@ -33,8 +32,6 @@ type KeeperTestSuite struct { path *ibctesting.Path pathAToC *ibctesting.Path - - queryClient types.QueryClient } func (suite *KeeperTestSuite) SetupTest() { @@ -57,10 +54,6 @@ func (suite *KeeperTestSuite) SetupTest() { path.EndpointA.ChannelConfig.PortID = ibctesting.MockFeePort path.EndpointB.ChannelConfig.PortID = ibctesting.MockFeePort suite.pathAToC = path - - queryHelper := baseapp.NewQueryServerTestHelper(suite.chainA.GetContext(), suite.chainA.GetSimApp().InterfaceRegistry()) - types.RegisterQueryServer(queryHelper, suite.chainA.GetSimApp().IBCFeeKeeper) - suite.queryClient = types.NewQueryClient(queryHelper) } func TestKeeperTestSuite(t *testing.T) { diff --git a/modules/apps/transfer/keeper/grpc_query_test.go b/modules/apps/transfer/keeper/grpc_query_test.go index ffb4833d25e..cabea73824e 100644 --- a/modules/apps/transfer/keeper/grpc_query_test.go +++ b/modules/apps/transfer/keeper/grpc_query_test.go @@ -76,7 +76,7 @@ func (suite *KeeperTestSuite) TestQueryDenomTrace() { tc.malleate() ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.DenomTrace(ctx, req) + res, err := suite.chainA.GetSimApp().TransferKeeper.DenomTrace(ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -92,7 +92,7 @@ func (suite *KeeperTestSuite) TestQueryDenomTrace() { func (suite *KeeperTestSuite) TestQueryDenomTraces() { var ( req *types.QueryDenomTracesRequest - expTraces = types.Traces(nil) + expTraces = types.Traces{} ) testCases := []struct { @@ -136,7 +136,7 @@ func (suite *KeeperTestSuite) TestQueryDenomTraces() { tc.malleate() ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.DenomTraces(ctx, req) + res, err := suite.chainA.GetSimApp().TransferKeeper.DenomTraces(ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -152,7 +152,7 @@ func (suite *KeeperTestSuite) TestQueryDenomTraces() { func (suite *KeeperTestSuite) TestQueryParams() { ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) expParams := types.DefaultParams() - res, _ := suite.queryClient.Params(ctx, &types.QueryParamsRequest{}) + res, _ := suite.chainA.GetSimApp().TransferKeeper.Params(ctx, &types.QueryParamsRequest{}) suite.Require().Equal(&expParams, res.Params) } @@ -209,7 +209,7 @@ func (suite *KeeperTestSuite) TestQueryDenomHash() { tc.malleate() ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.DenomHash(ctx, req) + res, err := suite.chainA.GetSimApp().TransferKeeper.DenomHash(ctx, req) if tc.expPass { suite.Require().NoError(err) @@ -249,7 +249,7 @@ func (suite *KeeperTestSuite) TestEscrowAddress() { tc.malleate() ctx := sdk.WrapSDKContext(suite.chainA.GetContext()) - res, err := suite.queryClient.EscrowAddress(ctx, req) + res, err := suite.chainA.GetSimApp().TransferKeeper.EscrowAddress(ctx, req) if tc.expPass { suite.Require().NoError(err) diff --git a/modules/apps/transfer/keeper/keeper_test.go b/modules/apps/transfer/keeper/keeper_test.go index 6e56dbbd4bc..0d2e9cf9a4d 100644 --- a/modules/apps/transfer/keeper/keeper_test.go +++ b/modules/apps/transfer/keeper/keeper_test.go @@ -19,8 +19,6 @@ type KeeperTestSuite struct { chainA *ibctesting.TestChain chainB *ibctesting.TestChain chainC *ibctesting.TestChain - - queryClient types.QueryClient } func (suite *KeeperTestSuite) SetupTest() { @@ -31,7 +29,6 @@ func (suite *KeeperTestSuite) SetupTest() { queryHelper := baseapp.NewQueryServerTestHelper(suite.chainA.GetContext(), suite.chainA.GetSimApp().InterfaceRegistry()) types.RegisterQueryServer(queryHelper, suite.chainA.GetSimApp().TransferKeeper) - suite.queryClient = types.NewQueryClient(queryHelper) } func NewTransferPath(chainA, chainB *ibctesting.TestChain) *ibctesting.Path { diff --git a/modules/core/02-client/keeper/grpc_query_test.go b/modules/core/02-client/keeper/grpc_query_test.go index 6b48f466aba..636a23aaae5 100644 --- a/modules/core/02-client/keeper/grpc_query_test.go +++ b/modules/core/02-client/keeper/grpc_query_test.go @@ -5,9 +5,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - grpctypes "github.com/cosmos/cosmos-sdk/types/grpc" "github.com/cosmos/cosmos-sdk/types/query" - "google.golang.org/grpc/metadata" "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" @@ -631,10 +629,7 @@ func (suite *KeeperTestSuite) TestQueryUpgradedConsensusStates() { tc.malleate() - ctx := sdk.WrapSDKContext(suite.ctx) - ctx = metadata.AppendToOutgoingContext(ctx, grpctypes.GRPCBlockHeightHeader, fmt.Sprintf("%d", height)) - - res, err := suite.queryClient.UpgradedConsensusState(ctx, req) + res, err := suite.keeper.UpgradedConsensusState(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) suite.Require().True(expConsensusState.Equal(res.UpgradedConsensusState)) diff --git a/modules/core/02-client/keeper/keeper_test.go b/modules/core/02-client/keeper/keeper_test.go index 839ee00553d..ac9d9269322 100644 --- a/modules/core/02-client/keeper/keeper_test.go +++ b/modules/core/02-client/keeper/keeper_test.go @@ -8,13 +8,10 @@ import ( tmbytes "github.com/cometbft/cometbft/libs/bytes" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" - "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/stretchr/testify/suite" - "github.com/cosmos/ibc-go/v7/modules/core/02-client/keeper" "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" @@ -25,6 +22,7 @@ import ( ibctesting "github.com/cosmos/ibc-go/v7/testing" ibctestingmock "github.com/cosmos/ibc-go/v7/testing/mock" "github.com/cosmos/ibc-go/v7/testing/simapp" + "github.com/stretchr/testify/suite" ) const ( @@ -68,9 +66,6 @@ type KeeperTestSuite struct { solomachine *ibctesting.Solomachine signers map[string]tmtypes.PrivValidator - - // TODO: deprecate - queryClient types.QueryClient } func (suite *KeeperTestSuite) SetupTest() { @@ -89,7 +84,6 @@ func (suite *KeeperTestSuite) SetupTest() { suite.ctx = app.BaseApp.NewContext(isCheckTx, tmproto.Header{Height: height, ChainID: testClientID, Time: now2}) suite.keeper = &app.IBCKeeper.ClientKeeper suite.privVal = ibctestingmock.NewPV() - pubKey, err := suite.privVal.GetPubKey() suite.Require().NoError(err) @@ -124,11 +118,6 @@ func (suite *KeeperTestSuite) SetupTest() { } suite.solomachine = ibctesting.NewSolomachine(suite.T(), suite.chainA.Codec, "solomachinesingle", "testing", 1) - - // TODO: deprecate - queryHelper := baseapp.NewQueryServerTestHelper(suite.ctx, app.InterfaceRegistry()) - types.RegisterQueryServer(queryHelper, app.IBCKeeper.ClientKeeper) - suite.queryClient = types.NewQueryClient(queryHelper) } func TestKeeperTestSuite(t *testing.T) { From be4c2d0ba9234089e235d937ed894cf20b112ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=E1=BA=B7c?= <67097720+expertdicer@users.noreply.github.com> Date: Tue, 14 Mar 2023 16:59:40 +0700 Subject: [PATCH 02/23] Rename ``IsBound`` to ``HasCapability`` (#3253) ## Description closes: #828 ### Commit Message / Changelog Entry ```bash imp(api!): rename `IsBound` to `HasCapability` for IBC application modules ``` see the [guidelines](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#commit-messages) for commit messages. (view raw markdown for examples) --- Before we can merge this PR, please make sure that all the following items have been checked off. If any of the checklist items are not applicable, please leave them but write a little note why. - [ ] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#pull-request-targeting)). - [x] Linked to Github issue with discussion and accepted design OR link to spec that describes this work. - [x] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/10-structure.md) and [Go style guide](../docs/dev/go-style-guide.md). - [ ] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/main/testing/README.md#ibc-testing-package). - [ ] Updated relevant documentation (`docs/`) or specification (`x//spec/`). - [ ] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code). - [ ] Provide a [commit message](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#commit-messages) to be used for the changelog entry in the PR description for review. - [ ] Re-reviewed `Files changed` in the Github PR explorer. - [ ] Review `Codecov Report` in the comment section below once CI passes. --- docs/ibc/apps.md | 2 +- docs/ibc/apps/bindports.md | 2 +- docs/ibc/apps/keeper.md | 4 ++-- .../27-interchain-accounts/controller/keeper/account.go | 2 +- .../27-interchain-accounts/controller/keeper/genesis.go | 2 +- .../apps/27-interchain-accounts/controller/keeper/keeper.go | 4 ++-- .../27-interchain-accounts/controller/keeper/keeper_test.go | 6 +++--- modules/apps/27-interchain-accounts/host/keeper/genesis.go | 2 +- modules/apps/27-interchain-accounts/host/keeper/keeper.go | 4 ++-- .../apps/27-interchain-accounts/host/keeper/keeper_test.go | 6 +++--- modules/apps/transfer/keeper/genesis.go | 2 +- modules/apps/transfer/keeper/keeper.go | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/ibc/apps.md b/docs/ibc/apps.md index be0457f4fe6..0d80d412337 100644 --- a/docs/ibc/apps.md +++ b/docs/ibc/apps.md @@ -191,7 +191,7 @@ func InitGenesis(ctx sdk.Context, keeper keeper.Keeper, state types.GenesisState // Only try to bind to port if it is not already bound, since we may already own // port capability from capability InitGenesis - if !isBound(ctx, state.PortID) { + if !hasCapability(ctx, state.PortID) { // module binds to desired ports on InitChain // and claims returned capabilities cap1 := keeper.IBCPortKeeper.BindPort(ctx, port1) diff --git a/docs/ibc/apps/bindports.md b/docs/ibc/apps/bindports.md index bf35fc0df0d..07bdff224e1 100644 --- a/docs/ibc/apps/bindports.md +++ b/docs/ibc/apps/bindports.md @@ -79,7 +79,7 @@ Currently, ports must be bound on app initialization. In order to bind modules t // Only try to bind to port if it is not already bound, since we may already own // port capability from capability InitGenesis - if !k.IsBound(ctx, state.PortId) { + if !k.HasCapability(ctx, state.PortId) { // transfer module binds to the transfer port on InitChain // and claims the returned capability err := k.BindPort(ctx, state.PortId) diff --git a/docs/ibc/apps/keeper.md b/docs/ibc/apps/keeper.md index 809ac46d8d7..f108d0b9f32 100644 --- a/docs/ibc/apps/keeper.md +++ b/docs/ibc/apps/keeper.md @@ -48,8 +48,8 @@ func NewKeeper( } } -// IsBound checks if the IBC app module is already bound to the desired port -func (k Keeper) IsBound(ctx sdk.Context, portID string) bool { +// HasCapability checks if the IBC app module owns the port capability for the desired port +func (k Keeper) HasCapability(ctx sdk.Context, portID string) bool { _, ok := k.scopedKeeper.GetCapability(ctx, host.PortPath(portID)) return ok } diff --git a/modules/apps/27-interchain-accounts/controller/keeper/account.go b/modules/apps/27-interchain-accounts/controller/keeper/account.go index 5044e50b962..71c6947158d 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/account.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/account.go @@ -58,7 +58,7 @@ func (k Keeper) registerInterchainAccount(ctx sdk.Context, connectionID, portID, } switch { - case k.portKeeper.IsBound(ctx, portID) && !k.IsBound(ctx, portID): + case k.portKeeper.IsBound(ctx, portID) && !k.HasCapability(ctx, portID): return "", errorsmod.Wrapf(icatypes.ErrPortAlreadyBound, "another module has claimed capability for and bound port with portID: %s", portID) case !k.portKeeper.IsBound(ctx, portID): cap := k.BindPort(ctx, portID) diff --git a/modules/apps/27-interchain-accounts/controller/keeper/genesis.go b/modules/apps/27-interchain-accounts/controller/keeper/genesis.go index ea5cbd822cd..a018d5d8c14 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/genesis.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/genesis.go @@ -12,7 +12,7 @@ import ( // InitGenesis initializes the interchain accounts controller application state from a provided genesis state func InitGenesis(ctx sdk.Context, keeper Keeper, state genesistypes.ControllerGenesisState) { for _, portID := range state.Ports { - if !keeper.IsBound(ctx, portID) { + if !keeper.HasCapability(ctx, portID) { cap := keeper.BindPort(ctx, portID) if err := keeper.ClaimCapability(ctx, cap, host.PortPath(portID)); err != nil { panic(fmt.Sprintf("could not claim port capability: %v", err)) diff --git a/modules/apps/27-interchain-accounts/controller/keeper/keeper.go b/modules/apps/27-interchain-accounts/controller/keeper/keeper.go index 872186ebe7f..edb9a69299e 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/keeper.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/keeper.go @@ -98,8 +98,8 @@ func (k Keeper) BindPort(ctx sdk.Context, portID string) *capabilitytypes.Capabi return k.portKeeper.BindPort(ctx, portID) } -// IsBound checks if the interchain account controller module is already bound to the desired port -func (k Keeper) IsBound(ctx sdk.Context, portID string) bool { +// HasCapability checks if the interchain account controller module owns the port capability for the desired port +func (k Keeper) HasCapability(ctx sdk.Context, portID string) bool { _, ok := k.scopedKeeper.GetCapability(ctx, host.PortPath(portID)) return ok } diff --git a/modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go b/modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go index 0583912165b..9f80aa507e0 100644 --- a/modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go +++ b/modules/apps/27-interchain-accounts/controller/keeper/keeper_test.go @@ -106,7 +106,7 @@ func TestKeeperTestSuite(t *testing.T) { suite.Run(t, new(KeeperTestSuite)) } -func (suite *KeeperTestSuite) TestIsBound() { +func (suite *KeeperTestSuite) TestHasCapability() { suite.SetupTest() path := NewICAPath(suite.chainA, suite.chainB) @@ -115,8 +115,8 @@ func (suite *KeeperTestSuite) TestIsBound() { err := SetupICAPath(path, TestOwnerAddress) suite.Require().NoError(err) - isBound := suite.chainA.GetSimApp().ICAControllerKeeper.IsBound(suite.chainA.GetContext(), path.EndpointA.ChannelConfig.PortID) - suite.Require().True(isBound) + hasCapability := suite.chainA.GetSimApp().ICAControllerKeeper.HasCapability(suite.chainA.GetContext(), path.EndpointA.ChannelConfig.PortID) + suite.Require().True(hasCapability) } func (suite *KeeperTestSuite) TestGetAllPorts() { diff --git a/modules/apps/27-interchain-accounts/host/keeper/genesis.go b/modules/apps/27-interchain-accounts/host/keeper/genesis.go index 6575bac1713..6a31978d589 100644 --- a/modules/apps/27-interchain-accounts/host/keeper/genesis.go +++ b/modules/apps/27-interchain-accounts/host/keeper/genesis.go @@ -12,7 +12,7 @@ import ( // InitGenesis initializes the interchain accounts host application state from a provided genesis state func InitGenesis(ctx sdk.Context, keeper Keeper, state genesistypes.HostGenesisState) { - if !keeper.IsBound(ctx, state.Port) { + if !keeper.HasCapability(ctx, state.Port) { cap := keeper.BindPort(ctx, state.Port) if err := keeper.ClaimCapability(ctx, cap, host.PortPath(state.Port)); err != nil { panic(fmt.Sprintf("could not claim port capability: %v", err)) diff --git a/modules/apps/27-interchain-accounts/host/keeper/keeper.go b/modules/apps/27-interchain-accounts/host/keeper/keeper.go index 506d7be6832..d89a7ecbee5 100644 --- a/modules/apps/27-interchain-accounts/host/keeper/keeper.go +++ b/modules/apps/27-interchain-accounts/host/keeper/keeper.go @@ -78,8 +78,8 @@ func (k Keeper) BindPort(ctx sdk.Context, portID string) *capabilitytypes.Capabi return k.portKeeper.BindPort(ctx, portID) } -// IsBound checks if the interchain account host module is already bound to the desired port -func (k Keeper) IsBound(ctx sdk.Context, portID string) bool { +// HasCapability checks if the interchain account host module owns the port capability for the desired port +func (k Keeper) HasCapability(ctx sdk.Context, portID string) bool { _, ok := k.scopedKeeper.GetCapability(ctx, host.PortPath(portID)) return ok } diff --git a/modules/apps/27-interchain-accounts/host/keeper/keeper_test.go b/modules/apps/27-interchain-accounts/host/keeper/keeper_test.go index c250e046d67..e6dad73e5b2 100644 --- a/modules/apps/27-interchain-accounts/host/keeper/keeper_test.go +++ b/modules/apps/27-interchain-accounts/host/keeper/keeper_test.go @@ -106,7 +106,7 @@ func TestKeeperTestSuite(t *testing.T) { suite.Run(t, new(KeeperTestSuite)) } -func (suite *KeeperTestSuite) TestIsBound() { +func (suite *KeeperTestSuite) TestHasCapability() { suite.SetupTest() path := NewICAPath(suite.chainA, suite.chainB) @@ -115,8 +115,8 @@ func (suite *KeeperTestSuite) TestIsBound() { err := SetupICAPath(path, TestOwnerAddress) suite.Require().NoError(err) - isBound := suite.chainB.GetSimApp().ICAHostKeeper.IsBound(suite.chainB.GetContext(), path.EndpointB.ChannelConfig.PortID) - suite.Require().True(isBound) + hasCapability := suite.chainB.GetSimApp().ICAHostKeeper.HasCapability(suite.chainB.GetContext(), path.EndpointB.ChannelConfig.PortID) + suite.Require().True(hasCapability) } func (suite *KeeperTestSuite) TestGetInterchainAccountAddress() { diff --git a/modules/apps/transfer/keeper/genesis.go b/modules/apps/transfer/keeper/genesis.go index ce0a45155e1..89ce4697624 100644 --- a/modules/apps/transfer/keeper/genesis.go +++ b/modules/apps/transfer/keeper/genesis.go @@ -18,7 +18,7 @@ func (k Keeper) InitGenesis(ctx sdk.Context, state types.GenesisState) { // Only try to bind to port if it is not already bound, since we may already own // port capability from capability InitGenesis - if !k.IsBound(ctx, state.PortId) { + if !k.HasCapability(ctx, state.PortId) { // transfer module binds to the transfer port on InitChain // and claims the returned capability err := k.BindPort(ctx, state.PortId) diff --git a/modules/apps/transfer/keeper/keeper.go b/modules/apps/transfer/keeper/keeper.go index 0c2546c6b3a..49f828f021e 100644 --- a/modules/apps/transfer/keeper/keeper.go +++ b/modules/apps/transfer/keeper/keeper.go @@ -64,8 +64,8 @@ func (k Keeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", "x/"+exported.ModuleName+"-"+types.ModuleName) } -// IsBound checks if the transfer module is already bound to the desired port -func (k Keeper) IsBound(ctx sdk.Context, portID string) bool { +// HasCapability checks if the transfer module owns the port capability for the desired port +func (k Keeper) HasCapability(ctx sdk.Context, portID string) bool { _, ok := k.scopedKeeper.GetCapability(ctx, host.PortPath(portID)) return ok } From 036565ae7891b145f8288ee8ecf02393ccc6f0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?colin=20axn=C3=A9r?= <25233464+colin-axner@users.noreply.github.com> Date: Tue, 14 Mar 2023 12:48:43 +0100 Subject: [PATCH 03/23] chore: add support for tendermint debug log level (#3279) --- e2e/testconfig/testconfig.go | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/e2e/testconfig/testconfig.go b/e2e/testconfig/testconfig.go index 088fbd3b7bf..cacf14dd0d9 100644 --- a/e2e/testconfig/testconfig.go +++ b/e2e/testconfig/testconfig.go @@ -16,6 +16,7 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/strangelove-ventures/interchaintest/v7/ibc" + interchaintestutil "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/cosmos/ibc-go/e2e/relayer" "github.com/cosmos/ibc-go/e2e/semverutil" @@ -197,6 +198,12 @@ func DefaultChainOptions() ChainOptions { // newDefaultSimappConfig creates an ibc configuration for simd. func newDefaultSimappConfig(cc ChainConfig, name, chainID, denom string) ibc.ChainConfig { + configFileOverrides := make(map[string]any) + tmTomlOverrides := make(interchaintestutil.Toml) + + tmTomlOverrides["log_level"] = "info" // change to debug to increase cometbft logging + configFileOverrides["config/config.toml"] = tmTomlOverrides + return ibc.ChainConfig{ Type: "cosmos", Name: name, @@ -207,15 +214,16 @@ func newDefaultSimappConfig(cc ChainConfig, name, chainID, denom string) ibc.Cha Version: cc.Tag, }, }, - Bin: cc.Binary, - Bech32Prefix: "cosmos", - CoinType: fmt.Sprint(sdk.GetConfig().GetCoinType()), - Denom: denom, - GasPrices: fmt.Sprintf("0.00%s", denom), - GasAdjustment: 1.3, - TrustingPeriod: "508h", - NoHostMount: false, - ModifyGenesis: getGenesisModificationFunction(cc), + Bin: cc.Binary, + Bech32Prefix: "cosmos", + CoinType: fmt.Sprint(sdk.GetConfig().GetCoinType()), + Denom: denom, + GasPrices: fmt.Sprintf("0.00%s", denom), + GasAdjustment: 1.3, + TrustingPeriod: "508h", + NoHostMount: false, + ModifyGenesis: getGenesisModificationFunction(cc), + ConfigFileOverrides: configFileOverrides, } } From 80bab81d38e2b3dbcde54c18e556567fa68ccd09 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 12:01:23 +0000 Subject: [PATCH 04/23] build(deps): bump cosmossdk.io/math from 1.0.0-beta.6.0.20230216172121-959ce49135e4 to 1.0.0-rc.0 (#3285) Bumps [cosmossdk.io/math](https://github.com/cosmos/cosmos-sdk) from 1.0.0-beta.6.0.20230216172121-959ce49135e4 to 1.0.0-rc.0.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=cosmossdk.io/math&package-manager=go_modules&previous-version=1.0.0-beta.6.0.20230216172121-959ce49135e4&new-version=1.0.0-rc.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--- e2e/go.mod | 2 +- e2e/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/e2e/go.mod b/e2e/go.mod index 1f360b0fde5..1637d7db995 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -26,7 +26,7 @@ require ( cosmossdk.io/core v0.6.0 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect cosmossdk.io/errors v1.0.0-beta.7 // indirect - cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 // indirect + cosmossdk.io/math v1.0.0-rc.0 // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect diff --git a/e2e/go.sum b/e2e/go.sum index 0975b682017..3cf3ac34d31 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -196,8 +196,8 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= -cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 h1:/jnzJ9zFsL7qkV8LCQ1JH3dYHh2EsKZ3k8Mr6AqqiOA= -cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4/go.mod h1:gUVtWwIzfSXqcOT+lBVz2jyjfua8DoBdzRsIyaUAT/8= +cosmossdk.io/math v1.0.0-rc.0 h1:ml46ukocrAAoBpYKMidF0R2tQJ1Uxfns0yH8wqgMAFc= +cosmossdk.io/math v1.0.0-rc.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= diff --git a/go.mod b/go.mod index 08781fc3ecb..4d506dfefeb 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ module github.com/cosmos/ibc-go/v7 require ( cosmossdk.io/api v0.3.1 cosmossdk.io/errors v1.0.0-beta.7 - cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 + cosmossdk.io/math v1.0.0-rc.0 cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462 cosmossdk.io/tools/rosetta v0.2.1 github.com/armon/go-metrics v0.4.1 diff --git a/go.sum b/go.sum index b1ad28dc4ab..752bcf55985 100644 --- a/go.sum +++ b/go.sum @@ -196,8 +196,8 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= -cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 h1:/jnzJ9zFsL7qkV8LCQ1JH3dYHh2EsKZ3k8Mr6AqqiOA= -cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4/go.mod h1:gUVtWwIzfSXqcOT+lBVz2jyjfua8DoBdzRsIyaUAT/8= +cosmossdk.io/math v1.0.0-rc.0 h1:ml46ukocrAAoBpYKMidF0R2tQJ1Uxfns0yH8wqgMAFc= +cosmossdk.io/math v1.0.0-rc.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462 h1:g8muUHnXL8vhld2Sjilyhb1UQObc+x9GVuDK43TYZns= cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462/go.mod h1:4Dd3NLoLYoN90kZ0uyHoTHzVVk9+J0v4HhZRBNTAq2c= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= From 2cb28d7620f08735f4b78196d78fdca7e6f83d24 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Tue, 14 Mar 2023 14:11:00 +0000 Subject: [PATCH 05/23] Write docker inspect output to diagnostics (#3291) --- e2e/testsuite/diagnostics/diagnostics.go | 31 +++++++++++++++++++----- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/e2e/testsuite/diagnostics/diagnostics.go b/e2e/testsuite/diagnostics/diagnostics.go index 6226dd4a339..896e73e804a 100644 --- a/e2e/testsuite/diagnostics/diagnostics.go +++ b/e2e/testsuite/diagnostics/diagnostics.go @@ -2,6 +2,7 @@ package diagnostics import ( "context" + "encoding/json" "fmt" "os" ospath "path" @@ -17,7 +18,8 @@ import ( ) const ( - e2eDir = "e2e" + e2eDir = "e2e" + defaultFilePerm = 0750 ) // Collect can be used in `t.Cleanup` and will copy all the of the container logs and relevant files @@ -41,7 +43,7 @@ func Collect(t *testing.T, dc *dockerclient.Client, cfg testconfig.ChainOptions) logsDir := fmt.Sprintf("%s/diagnostics", e2eDir) - if err := os.MkdirAll(fmt.Sprintf("%s/%s", logsDir, t.Name()), 0750); err != nil { + if err := os.MkdirAll(fmt.Sprintf("%s/%s", logsDir, t.Name()), defaultFilePerm); err != nil { t.Logf("failed creating logs directory in test cleanup: %s", err) return } @@ -55,7 +57,7 @@ func Collect(t *testing.T, dc *dockerclient.Client, cfg testconfig.ChainOptions) for _, container := range testContainers { containerName := getContainerName(t, container) containerDir := fmt.Sprintf("%s/%s/%s", logsDir, t.Name(), containerName) - if err := os.MkdirAll(containerDir, 0750); err != nil { + if err := os.MkdirAll(containerDir, defaultFilePerm); err != nil { t.Logf("failed creating logs directory for container %s: %s", containerDir, err) continue } @@ -84,6 +86,13 @@ func Collect(t *testing.T, dc *dockerclient.Client, cfg testconfig.ChainOptions) } t.Logf("successfully wrote diagnostics file %s", absoluteFilePathInContainer) } + + localFilePath := ospath.Join(containerDir, "docker-inspect.json") + if err := fetchAndWriteDockerInspectOutput(ctx, dc, container.ID, localFilePath); err != nil { + t.Logf("failed to fetch docker inspect output: %s", err) + continue + } + t.Logf("successfully wrote docker inspect output") } } @@ -113,12 +122,22 @@ func fetchAndWriteDiagnosticsFile(ctx context.Context, dc *dockerclient.Client, return err } - filePath := ospath.Join(localPath) - if err := os.WriteFile(filePath, fileBz, 0750); err != nil { + return os.WriteFile(localPath, fileBz, defaultFilePerm) +} + +// fetchAndWriteDockerInspectOutput writes the contents of docker inspect to the specified file. +func fetchAndWriteDockerInspectOutput(ctx context.Context, dc *dockerclient.Client, containerID, localPath string) error { + containerJSON, err := dc.ContainerInspect(ctx, containerID) + if err != nil { + return err + } + + fileBz, err := json.MarshalIndent(containerJSON, "", "\t") + if err != nil { return err } - return nil + return os.WriteFile(localPath, fileBz, defaultFilePerm) } // chainDiagnosticAbsoluteFilePaths returns a slice of absolute file paths (in the containers) which are the files that should be From 02d8975773583212a0fd4fcae2481ec7caf3b654 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Tue, 14 Mar 2023 17:19:21 +0100 Subject: [PATCH 06/23] chore: fix dead links (#3293) ## Description closes: #XXXX ### Commit Message / Changelog Entry ```bash type: commit message ``` see the [guidelines](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#commit-messages) for commit messages. (view raw markdown for examples) --- Before we can merge this PR, please make sure that all the following items have been checked off. If any of the checklist items are not applicable, please leave them but write a little note why. - [x] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#pull-request-targeting)). - [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work. - [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/10-structure.md) and [Go style guide](../docs/dev/go-style-guide.md). - [ ] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/main/testing/README.md#ibc-testing-package). - [ ] Updated relevant documentation (`docs/`) or specification (`x//spec/`). - [ ] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code). - [ ] Provide a [commit message](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#commit-messages) to be used for the changelog entry in the PR description for review. - [x] Re-reviewed `Files changed` in the Github PR explorer. - [ ] Review `Codecov Report` in the comment section below once CI passes. --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- docs/dev/project-structure.md | 2 +- docs/ibc/integration.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index bfbcfb6335f..18484388b1f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -43,7 +43,7 @@ write a little note why. - [ ] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#pull-request-targeting)). - [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work. -- [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/10-structure.md) and [Go style guide](../docs/dev/go-style-guide.md). +- [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/11-structure.md) and [Go style guide](../docs/dev/go-style-guide.md). - [ ] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/main/testing/README.md#ibc-testing-package). - [ ] Updated relevant documentation (`docs/`) or specification (`x//spec/`). - [ ] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code). diff --git a/docs/dev/project-structure.md b/docs/dev/project-structure.md index 01fcf6b04da..7e5e68d70cd 100644 --- a/docs/dev/project-structure.md +++ b/docs/dev/project-structure.md @@ -1,6 +1,6 @@ # Project structure -If you're not familiar with the overall module structure from the SDK modules, please check this [document](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/10-structure.md) as prerequisite reading. +If you're not familiar with the overall module structure from the SDK modules, please check this [document](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/11-structure.md) as prerequisite reading. Every Interchain Standard (ICS) has been developed in its own package. The development team separated the IBC TAO (Transport, Authentication, Ordering) ICS specifications from the IBC application level specification. The following sections describe the architecture of the most relevant directories that comprise this repository. diff --git a/docs/ibc/integration.md b/docs/ibc/integration.md index 26b55c9f3a9..9c709d96826 100644 --- a/docs/ibc/integration.md +++ b/docs/ibc/integration.md @@ -157,7 +157,7 @@ func NewApp(...args) *App { ### Module Managers -In order to use IBC, we need to add the new modules to the module `Manager` and to the `SimulationManager` in case your application supports [simulations](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/13-simulator.md). +In order to use IBC, we need to add the new modules to the module `Manager` and to the `SimulationManager` in case your application supports [simulations](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/14-simulator.md). ```go // app.go From 796c7bce77c3e2922f467a95cff23175e11f8868 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Mar 2023 13:33:38 +0100 Subject: [PATCH 07/23] build(deps): bump google.golang.org/protobuf from 1.29.0 to 1.29.1 (#3292) --- e2e/go.mod | 2 +- e2e/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/e2e/go.mod b/e2e/go.mod index 1637d7db995..36cbcc4efe3 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -202,7 +202,7 @@ require ( google.golang.org/api v0.111.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230301171018-9ab4bdc49ad5 // indirect - google.golang.org/protobuf v1.29.0 // indirect + google.golang.org/protobuf v1.29.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/e2e/go.sum b/e2e/go.sum index 3cf3ac34d31..6a5e8020e8e 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -1650,8 +1650,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.29.0 h1:44S3JjaKmLEE4YIkjzexaP+NzZsudE3Zin5Njn/pYX0= -google.golang.org/protobuf v1.29.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM= +google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/go.mod b/go.mod index 4d506dfefeb..0e4837f50ca 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/stretchr/testify v1.8.2 google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 google.golang.org/grpc v1.53.0 - google.golang.org/protobuf v1.29.0 + google.golang.org/protobuf v1.29.1 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index 752bcf55985..05a77e8f04a 100644 --- a/go.sum +++ b/go.sum @@ -1558,8 +1558,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.29.0 h1:44S3JjaKmLEE4YIkjzexaP+NzZsudE3Zin5Njn/pYX0= -google.golang.org/protobuf v1.29.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM= +google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 71e8bf46b992181c601e9f74489be4d2abf0e7d9 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Wed, 15 Mar 2023 22:46:49 +0100 Subject: [PATCH 08/23] deps: bump SDK v0.47 (#3295) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Damian Nolan Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com> --- CHANGELOG.md | 1 + e2e/dockerutil/dockerutil.go | 1 - e2e/go.mod | 20 ++++----- e2e/go.sum | 40 ++++++++--------- e2e/testsuite/diagnostics/diagnostics.go | 4 +- e2e/testsuite/events.go | 2 +- e2e/testsuite/grpc_query.go | 2 +- go.mod | 22 ++++----- go.sum | 45 +++++++++---------- .../27-interchain-accounts/module_test.go | 11 +++-- modules/core/02-client/abci_test.go | 1 + testing/README.md | 28 ++++++++++-- testing/app.go | 3 ++ testing/endpoint.go | 2 + testing/simapp/sim_bench_test.go | 5 ++- testing/simapp/sim_test.go | 15 ++++--- testing/simapp/simd/cmd/root.go | 14 ++++++ 17 files changed, 131 insertions(+), 85 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60372e74200..b7e870e2eda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -121,6 +121,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Bug Fixes +* (testing) [\#3295](https://github.com/cosmos/ibc-go/pull/3295) The function `SetupWithGenesisValSet` will set the baseapp chainID before running `InitChain` * (light-clients/solomachine) [#1839](https://github.com/cosmos/ibc-go/pull/1839) Fixed usage of the new diversifier in validation of changing diversifiers for the solo machine. The current diversifier must sign over the new diversifier. * (light-clients/07-tendermint) [\#1674](https://github.com/cosmos/ibc-go/pull/1674) Submitted ClientState is zeroed out before checking the proof in order to prevent the proposal from containing information governance is not actually voting on. * (modules/core/02-client)[\#1676](https://github.com/cosmos/ibc-go/pull/1676) ClientState must be zeroed out for `UpgradeProposals` to pass validation. This prevents a proposal containing information governance is not actually voting on. diff --git a/e2e/dockerutil/dockerutil.go b/e2e/dockerutil/dockerutil.go index aa7497645bf..4d75f685f5e 100644 --- a/e2e/dockerutil/dockerutil.go +++ b/e2e/dockerutil/dockerutil.go @@ -27,7 +27,6 @@ func GetTestContainers(t *testing.T, ctx context.Context, dc *dockerclient.Clien filters.Arg("label", testLabel+"="+t.Name()), ), }) - if err != nil { return nil, fmt.Errorf("failed listing containers: %s", err) } diff --git a/e2e/go.mod b/e2e/go.mod index 36cbcc4efe3..ed02dd7f995 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/cometbft/cometbft v0.37.0 - github.com/cosmos/cosmos-sdk v0.47.0-rc3 + github.com/cosmos/cosmos-sdk v0.47.0 github.com/cosmos/gogoproto v1.4.6 github.com/cosmos/ibc-go/v7 v7.0.0-rc1 github.com/cosmos/interchain-accounts v0.5.0 @@ -57,7 +57,7 @@ require ( github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect - github.com/cosmos/iavl v0.20.0-alpha4 // indirect + github.com/cosmos/iavl v0.20.0 // indirect github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab // indirect github.com/cosmos/ledger-cosmos-go v0.13.0 // indirect github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect @@ -89,7 +89,7 @@ require ( github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.3 // indirect - github.com/golang/glog v1.0.0 // indirect + github.com/golang/glog v1.1.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect @@ -124,7 +124,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect - github.com/klauspost/compress v1.16.0 // indirect + github.com/klauspost/compress v1.16.3 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/lib/pq v1.10.7 // indirect @@ -189,14 +189,14 @@ require ( go.opencensus.io v0.24.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.9.0 // indirect - golang.org/x/crypto v0.6.0 // indirect - golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect - golang.org/x/net v0.7.0 // indirect + golang.org/x/crypto v0.7.0 // indirect + golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 // indirect + golang.org/x/net v0.8.0 // indirect golang.org/x/oauth2 v0.5.0 // indirect golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/term v0.6.0 // indirect + golang.org/x/text v0.8.0 // indirect golang.org/x/tools v0.6.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.111.0 // indirect diff --git a/e2e/go.sum b/e2e/go.sum index 6a5e8020e8e..2307bcd6c42 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -333,8 +333,8 @@ github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/cosmos-sdk v0.47.0-rc3 h1:MMun/+mMpzise9d85csTp+kGkhLCkjJLwLK0urp0Bcs= -github.com/cosmos/cosmos-sdk v0.47.0-rc3/go.mod h1:GlXjIIIsIZAD5CPqm7FHtr3v5/anE9eXWDjSWdNmznw= +github.com/cosmos/cosmos-sdk v0.47.0 h1:GKYtBpvjwuDEVix1vdnQpq7PuEOnItuEK0vdAL2cZ5g= +github.com/cosmos/cosmos-sdk v0.47.0/go.mod h1:FTtZbqiHCZ2vun9WrPq6qLQafNKkAuIhLAxzLjr2TiI= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= @@ -343,8 +343,8 @@ github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= github.com/cosmos/gogoproto v1.4.6 h1:Ee7z15dWJaGlgM2rWrK8N2IX7PQcuccu8oG68jp5RL4= github.com/cosmos/gogoproto v1.4.6/go.mod h1:VS/ASYmPgv6zkPKLjR9EB91lwbLHOzaGCirmKKhncfI= -github.com/cosmos/iavl v0.20.0-alpha4 h1:49SZoxNwah5nqbVE1da8BAhenC7HMSVOTZ0XKVhZpOE= -github.com/cosmos/iavl v0.20.0-alpha4/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= +github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= +github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab h1:I9ialKTQo7248V827Bba4OuKPmk+FPzmTVHsLXaIJWw= github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab/go.mod h1:2CwqasX5dSD7Hbp/9b6lhK6BwoBDCBldx7gPKRukR60= github.com/cosmos/interchain-accounts v0.5.0 h1:bD4U5PzaRbgsGCTwKEShPjKXFxSIp9D+kAqFutYKl1E= @@ -487,8 +487,8 @@ github.com/gogo/googleapis v1.4.1-0.20201022092350-68b0159b7869/go.mod h1:5YRNX2 github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0= github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= +github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -714,8 +714,8 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= -github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= +github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= @@ -1079,8 +1079,8 @@ golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= -golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1092,8 +1092,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI= -golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 h1:LGJsf5LRplCck6jUCH3dBL2dmycNruWNF5xugkSlfXw= +golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1182,8 +1182,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1324,13 +1324,13 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1341,8 +1341,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/e2e/testsuite/diagnostics/diagnostics.go b/e2e/testsuite/diagnostics/diagnostics.go index 896e73e804a..504c3d55fd5 100644 --- a/e2e/testsuite/diagnostics/diagnostics.go +++ b/e2e/testsuite/diagnostics/diagnostics.go @@ -19,7 +19,7 @@ import ( const ( e2eDir = "e2e" - defaultFilePerm = 0750 + defaultFilePerm = 0o750 ) // Collect can be used in `t.Cleanup` and will copy all the of the container logs and relevant files @@ -69,7 +69,7 @@ func Collect(t *testing.T, dc *dockerclient.Client, cfg testconfig.ChainOptions) } logFile := fmt.Sprintf("%s/%s.log", containerDir, containerName) - if err := os.WriteFile(logFile, logsBz, 0750); err != nil { + if err := os.WriteFile(logFile, logsBz, defaultFilePerm); err != nil { t.Logf("failed writing log file for container %s in test cleanup: %s", containerName, err) continue } diff --git a/e2e/testsuite/events.go b/e2e/testsuite/events.go index 49a76aebe26..c02c21c993d 100644 --- a/e2e/testsuite/events.go +++ b/e2e/testsuite/events.go @@ -1,8 +1,8 @@ package testsuite import ( - sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/cometbft/cometbft/abci/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) // ABCIToSDKEvents converts a list of ABCI events to Cosmos SDK events. diff --git a/e2e/testsuite/grpc_query.go b/e2e/testsuite/grpc_query.go index 7c5d7764dd5..d3535e25ba0 100644 --- a/e2e/testsuite/grpc_query.go +++ b/e2e/testsuite/grpc_query.go @@ -4,13 +4,13 @@ import ( "context" "sort" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govtypesbeta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" intertxtypes "github.com/cosmos/interchain-accounts/x/inter-tx/types" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" controllertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" feetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" diff --git a/go.mod b/go.mod index 0e4837f50ca..a770854d0b8 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/cometbft/cometbft v0.37.0 github.com/cometbft/cometbft-db v0.7.0 github.com/cosmos/cosmos-proto v1.0.0-beta.2 - github.com/cosmos/cosmos-sdk v0.47.0-rc3 + github.com/cosmos/cosmos-sdk v0.47.0 github.com/cosmos/gogoproto v1.4.6 github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab github.com/golang/protobuf v1.5.3 @@ -56,7 +56,7 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect - github.com/cosmos/iavl v0.20.0-alpha4 // indirect + github.com/cosmos/iavl v0.20.0 // indirect github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect github.com/creachadair/taskgroup v0.4.2 // indirect @@ -80,7 +80,7 @@ require ( github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/glog v1.0.0 // indirect + github.com/golang/glog v1.1.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/snappy v0.0.4 // indirect @@ -110,7 +110,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.15.15 // indirect + github.com/klauspost/compress v1.16.3 // indirect github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/magiconair/properties v1.8.7 // indirect @@ -147,15 +147,15 @@ require ( github.com/ulikunitz/xz v0.5.11 // indirect github.com/zondax/hid v0.9.1 // indirect github.com/zondax/ledger-go v0.14.1 // indirect - go.etcd.io/bbolt v1.3.6 // indirect + go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/crypto v0.6.0 // indirect - golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect - golang.org/x/net v0.7.0 // indirect + golang.org/x/crypto v0.7.0 // indirect + golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 // indirect + golang.org/x/net v0.8.0 // indirect golang.org/x/oauth2 v0.5.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/term v0.6.0 // indirect + golang.org/x/text v0.8.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.110.0 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index 05a77e8f04a..ae9c5ce4214 100644 --- a/go.sum +++ b/go.sum @@ -319,8 +319,8 @@ github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/cosmos-sdk v0.47.0-rc3 h1:MMun/+mMpzise9d85csTp+kGkhLCkjJLwLK0urp0Bcs= -github.com/cosmos/cosmos-sdk v0.47.0-rc3/go.mod h1:GlXjIIIsIZAD5CPqm7FHtr3v5/anE9eXWDjSWdNmznw= +github.com/cosmos/cosmos-sdk v0.47.0 h1:GKYtBpvjwuDEVix1vdnQpq7PuEOnItuEK0vdAL2cZ5g= +github.com/cosmos/cosmos-sdk v0.47.0/go.mod h1:FTtZbqiHCZ2vun9WrPq6qLQafNKkAuIhLAxzLjr2TiI= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= @@ -329,8 +329,8 @@ github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= github.com/cosmos/gogoproto v1.4.6 h1:Ee7z15dWJaGlgM2rWrK8N2IX7PQcuccu8oG68jp5RL4= github.com/cosmos/gogoproto v1.4.6/go.mod h1:VS/ASYmPgv6zkPKLjR9EB91lwbLHOzaGCirmKKhncfI= -github.com/cosmos/iavl v0.20.0-alpha4 h1:49SZoxNwah5nqbVE1da8BAhenC7HMSVOTZ0XKVhZpOE= -github.com/cosmos/iavl v0.20.0-alpha4/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= +github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= +github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab h1:I9ialKTQo7248V827Bba4OuKPmk+FPzmTVHsLXaIJWw= github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab/go.mod h1:2CwqasX5dSD7Hbp/9b6lhK6BwoBDCBldx7gPKRukR60= github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w= @@ -458,8 +458,8 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= +github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -680,8 +680,8 @@ github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYs github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= -github.com/klauspost/compress v1.15.15 h1:EF27CXIuDsYJ6mmvtBRlEuB2UVOqHG1tAXgZ7yIO+lw= -github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4= +github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= +github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -953,8 +953,8 @@ github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWp github.com/zondax/ledger-go v0.14.1 h1:Pip65OOl4iJ84WTpA4BKChvOufMhhbxED3BaihoZN4c= github.com/zondax/ledger-go v0.14.1/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= +go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= @@ -991,8 +991,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= -golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= +golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1004,8 +1004,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= -golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 h1:LGJsf5LRplCck6jUCH3dBL2dmycNruWNF5xugkSlfXw= +golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1094,8 +1094,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1187,7 +1187,6 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1234,13 +1233,13 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1251,8 +1250,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/modules/apps/27-interchain-accounts/module_test.go b/modules/apps/27-interchain-accounts/module_test.go index 3ad025af857..461091b996d 100644 --- a/modules/apps/27-interchain-accounts/module_test.go +++ b/modules/apps/27-interchain-accounts/module_test.go @@ -6,6 +6,7 @@ import ( dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/baseapp" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" "github.com/stretchr/testify/suite" @@ -33,12 +34,13 @@ func (suite *InterchainAccountsTestSuite) SetupTest() { func (suite *InterchainAccountsTestSuite) TestInitModule() { // setup and basic testing - app := simapp.NewSimApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 5, simapp.MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}) + chainID := "testchain" + app := simapp.NewSimApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 5, simapp.MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, baseapp.SetChainID(chainID)) appModule, ok := app.GetModuleManager().Modules[types.ModuleName].(ica.AppModule) suite.Require().True(ok) header := tmproto.Header{ - ChainID: "testchain", + ChainID: chainID, Height: 1, Time: suite.coordinator.CurrentTime.UTC(), } @@ -99,9 +101,10 @@ func (suite *InterchainAccountsTestSuite) TestInitModule() { suite.SetupTest() // reset // reset app state - app = simapp.NewSimApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 5, simapp.MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}) + chainID := "testchain" + app = simapp.NewSimApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 5, simapp.MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, baseapp.SetChainID(chainID)) header := tmproto.Header{ - ChainID: "testchain", + ChainID: chainID, Height: 1, Time: suite.coordinator.CurrentTime.UTC(), } diff --git a/modules/core/02-client/abci_test.go b/modules/core/02-client/abci_test.go index 80b67056930..170f5a63524 100644 --- a/modules/core/02-client/abci_test.go +++ b/modules/core/02-client/abci_test.go @@ -59,6 +59,7 @@ func (suite *ClientTestSuite) TestBeginBlockerConsensusState() { nextValsHash := []byte("nextValsHash") newCtx := suite.chainA.GetContext().WithBlockHeader(tmproto.Header{ + ChainID: suite.chainA.ChainID, Height: suite.chainA.GetContext().BlockHeight(), NextValidatorsHash: nextValsHash, }) diff --git a/testing/README.md b/testing/README.md index c99dd33f747..c00eb19af4e 100644 --- a/testing/README.md +++ b/testing/README.md @@ -120,7 +120,17 @@ The testing package requires that you provide a function to initialize your Test func SetupTestingApp() (TestingApp, map[string]json.RawMessage) { db := dbm.NewMemDB() encCdc := simapp.MakeTestEncodingConfig() - app := simapp.NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 5, encCdc, simapp.EmptyAppOptions{}) + app := simapp.NewSimApp( + log.NewNopLogger(), + db, + nil, + true, + map[int64]bool{}, + simapp.DefaultNodeHome, + 5, + encCdc, + simapp.EmptyAppOptions{}, + ) return app, simapp.NewDefaultGenesisState(encCdc.Marshaler) } ``` @@ -131,9 +141,8 @@ Change the value of `DefaultTestingAppInit` to use your function: ```go func init() { - ibctesting.DefaultTestingAppInit = MySetupTestingAppFunction + ibctesting.DefaultTestingAppInit = SetupTestingApp } - ``` ## Example @@ -260,6 +269,7 @@ import ( "github.com/cometbft/cometbft/libs/log" dbm "github.com/cometbft/cometbft-db" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/simapp" ibctesting "github.com/cosmos/ibc-go/v7/testing" @@ -268,7 +278,17 @@ import ( func SetupTransferTestingApp() (ibctesting.TestingApp, map[string]json.RawMessage) { db := dbm.NewMemDB() encCdc := simapp.MakeTestEncodingConfig() - app := simapp.NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 5, encCdc, simapp.EmptyAppOptions{}) + app := simapp.NewSimApp( + log.NewNopLogger(), + db, + nil, + true, + map[int64]bool{}, + simapp.DefaultNodeHome, + 5, + encCdc, + simapp.EmptyAppOptions{}, + ) return app, simapp.NewDefaultGenesisState(encCdc.Marshaler) } diff --git a/testing/app.go b/testing/app.go index bed7c753ac1..f277a5cd98a 100644 --- a/testing/app.go +++ b/testing/app.go @@ -64,6 +64,9 @@ func SetupTestingApp() (TestingApp, map[string]json.RawMessage) { func SetupWithGenesisValSet(t testing.TB, valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, chainID string, powerReduction math.Int, balances ...banktypes.Balance) TestingApp { app, genesisState := DefaultTestingAppInit() + // ensure baseapp has a chain-id set before running InitChain + baseapp.SetChainID(chainID)(app.GetBaseApp()) + // set genesis accounts authGenesis := authtypes.NewGenesisState(authtypes.DefaultParams(), genAccs) genesisState[authtypes.ModuleName] = app.AppCodec().MustMarshalJSON(authGenesis) diff --git a/testing/endpoint.go b/testing/endpoint.go index b30c1534fc7..3e0f240c19d 100644 --- a/testing/endpoint.go +++ b/testing/endpoint.go @@ -4,6 +4,7 @@ import ( "fmt" "strings" + "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -180,6 +181,7 @@ func (endpoint *Endpoint) UpgradeChain() error { } // update chain + baseapp.SetChainID(newChainID)(endpoint.Chain.GetSimApp().GetBaseApp()) endpoint.Chain.ChainID = newChainID endpoint.Chain.CurrentHeader.ChainID = newChainID endpoint.Chain.NextBlock() // commit changes diff --git a/testing/simapp/sim_bench_test.go b/testing/simapp/sim_bench_test.go index d3689d35383..3a70bc835e8 100644 --- a/testing/simapp/sim_bench_test.go +++ b/testing/simapp/sim_bench_test.go @@ -6,6 +6,7 @@ import ( "testing" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/baseapp" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" @@ -28,7 +29,7 @@ func BenchmarkFullAppSimulation(b *testing.B) { } }() - app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, interBlockCacheOpt()) + app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, interBlockCacheOpt(), baseapp.SetChainID(SimAppChainID)) // run randomized simulation _, simParams, simErr := simulation.SimulateFromSeed( @@ -74,7 +75,7 @@ func BenchmarkInvariants(b *testing.B) { } }() - app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, interBlockCacheOpt()) + app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, interBlockCacheOpt(), baseapp.SetChainID(SimAppChainID)) // run randomized simulation _, simParams, simErr := simulation.SimulateFromSeed( diff --git a/testing/simapp/sim_test.go b/testing/simapp/sim_test.go index 5da83481f00..f930927d678 100644 --- a/testing/simapp/sim_test.go +++ b/testing/simapp/sim_test.go @@ -35,6 +35,9 @@ import ( ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ) +// SimAppChainID hardcoded chainID for simulation +const SimAppChainID = "simulation-app" + // Get flags every time the simulator is run func init() { GetSimulatorFlags() @@ -70,7 +73,7 @@ func TestFullAppSimulation(t *testing.T) { require.NoError(t, os.RemoveAll(dir)) }() - app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, fauxMerkleModeOpt) + app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID)) require.Equal(t, "SimApp", app.Name()) // run randomized simulation @@ -108,7 +111,7 @@ func TestAppImportExport(t *testing.T) { require.NoError(t, os.RemoveAll(dir)) }() - app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, fauxMerkleModeOpt) + app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID)) require.Equal(t, "SimApp", app.Name()) // Run randomized simulation @@ -148,7 +151,7 @@ func TestAppImportExport(t *testing.T) { require.NoError(t, os.RemoveAll(newDir)) }() - newApp := NewSimApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, fauxMerkleModeOpt) + newApp := NewSimApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID)) require.Equal(t, "SimApp", newApp.Name()) var genesisState GenesisState @@ -208,7 +211,7 @@ func TestAppSimulationAfterImport(t *testing.T) { require.NoError(t, os.RemoveAll(dir)) }() - app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, fauxMerkleModeOpt) + app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID)) require.Equal(t, "SimApp", app.Name()) // Run randomized simulation @@ -253,7 +256,7 @@ func TestAppSimulationAfterImport(t *testing.T) { require.NoError(t, os.RemoveAll(newDir)) }() - newApp := NewSimApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, fauxMerkleModeOpt) + newApp := NewSimApp(log.NewNopLogger(), newDB, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, fauxMerkleModeOpt, baseapp.SetChainID(SimAppChainID)) require.Equal(t, "SimApp", newApp.Name()) newApp.InitChain(abci.RequestInitChain{ @@ -304,7 +307,7 @@ func TestAppStateDeterminism(t *testing.T) { } db := dbm.NewMemDB() - app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, interBlockCacheOpt()) + app := NewSimApp(logger, db, nil, true, map[int64]bool{}, DefaultNodeHome, FlagPeriodValue, MakeTestEncodingConfig(), simtestutil.EmptyAppOptions{}, interBlockCacheOpt(), baseapp.SetChainID(SimAppChainID)) fmt.Printf( "running non-determinism simulation; seed %d: %d/%d, attempt: %d/%d\n", diff --git a/testing/simapp/simd/cmd/root.go b/testing/simapp/simd/cmd/root.go index 09714b43f26..32aafc1809a 100644 --- a/testing/simapp/simd/cmd/root.go +++ b/testing/simapp/simd/cmd/root.go @@ -12,6 +12,7 @@ import ( tmcfg "github.com/cometbft/cometbft/config" tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cometbft/cometbft/libs/log" + tmtypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" @@ -265,6 +266,18 @@ func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, a panic(err) } + homeDir := cast.ToString(appOpts.Get(flags.FlagHome)) + chainID := cast.ToString(appOpts.Get(flags.FlagChainID)) + if chainID == "" { + // fallback to genesis chain-id + appGenesis, err := tmtypes.GenesisDocFromFile(filepath.Join(homeDir, "config", "genesis.json")) + if err != nil { + panic(err) + } + + chainID = appGenesis.ChainID + } + snapshotDir := filepath.Join(cast.ToString(appOpts.Get(flags.FlagHome)), "data", "snapshots") snapshotDB, err := dbm.NewDB("metadata", server.GetAppDBBackend(appOpts), snapshotDir) if err != nil { @@ -295,6 +308,7 @@ func (a appCreator) newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, a baseapp.SetTrace(cast.ToBool(appOpts.Get(server.FlagTrace))), baseapp.SetIndexEvents(cast.ToStringSlice(appOpts.Get(server.FlagIndexEvents))), baseapp.SetSnapshot(snapshotStore, snapshotOptions), + baseapp.SetChainID(chainID), ) } From 94d74f9ff74d0e1974119c410156ccfa490d0d71 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Wed, 15 Mar 2023 22:58:11 +0100 Subject: [PATCH 09/23] remove unnecessary import from doc --- testing/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/testing/README.md b/testing/README.md index c00eb19af4e..26fffa9958f 100644 --- a/testing/README.md +++ b/testing/README.md @@ -269,7 +269,6 @@ import ( "github.com/cometbft/cometbft/libs/log" dbm "github.com/cometbft/cometbft-db" - "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/simapp" ibctesting "github.com/cosmos/ibc-go/v7/testing" From b502f47376ddad43807d230d00a7f565f431637a Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Fri, 17 Mar 2023 09:17:11 +0100 Subject: [PATCH 10/23] chore: remove support for v3 (#3294) --- .../main/client-chain-a.json | 2 +- .../main/client-chain-b.json | 2 +- .../main/connection-chain-a.json | 2 +- .../main/connection-chain-b.json | 2 +- .../main/transfer-chain-a.json | 2 +- .../main/transfer-chain-b.json | 2 +- .../release-v3.4.x/transfer-chain-a.json | 16 ---------------- .../release-v3.4.x/transfer-chain-b.json | 16 ---------------- .../release-v4.2.x/transfer-chain-a.json | 2 +- .../release-v4.2.x/transfer-chain-b.json | 2 +- .../release-v4.3.x/transfer-chain-a.json | 2 +- .../release-v4.3.x/transfer-chain-b.json | 2 +- .../release-v5.2.x/transfer-chain-a.json | 2 +- .../release-v5.2.x/transfer-chain-b.json | 2 +- .../release-v6.1.x/client-chain-a.json | 2 +- .../release-v6.1.x/client-chain-b.json | 2 +- .../release-v6.1.x/connection-chain-a.json | 2 +- .../release-v6.1.x/connection-chain-b.json | 2 +- .../release-v6.1.x/transfer-chain-a.json | 2 +- .../release-v6.1.x/transfer-chain-b.json | 2 +- .../release-v7.0.x/client-chain-a.json | 2 +- .../release-v7.0.x/client-chain-b.json | 2 +- .../release-v7.0.x/connection-chain-a.json | 2 +- .../release-v7.0.x/connection-chain-b.json | 2 +- .../release-v7.0.x/transfer-chain-a.json | 2 +- .../release-v7.0.x/transfer-chain-b.json | 2 +- .../release-v7.1.x/client-chain-a.json | 2 +- .../release-v7.1.x/client-chain-b.json | 2 +- .../release-v7.1.x/connection-chain-a.json | 2 +- .../release-v7.1.x/connection-chain-b.json | 2 +- .../release-v7.1.x/transfer-chain-a.json | 2 +- .../release-v7.1.x/transfer-chain-b.json | 2 +- .../unreleased/client.json | 4 ++-- .../unreleased/connection.json | 4 ++-- .../unreleased/transfer.json | 4 ++-- .github/mergify.yml | 16 ---------------- .github/workflows/e2e-compatibility.yaml | 2 -- .github/workflows/e2e-manual-icad.yaml | 2 -- .github/workflows/e2e-manual-simd.yaml | 4 ---- README.md | 2 +- RELEASES.md | 4 ---- 41 files changed, 37 insertions(+), 97 deletions(-) delete mode 100644 .github/compatibility-test-matrices/release-v3.4.x/transfer-chain-a.json delete mode 100644 .github/compatibility-test-matrices/release-v3.4.x/transfer-chain-b.json diff --git a/.github/compatibility-test-matrices/main/client-chain-a.json b/.github/compatibility-test-matrices/main/client-chain-a.json index 23b1b5325d5..1a446fd2a2d 100644 --- a/.github/compatibility-test-matrices/main/client-chain-a.json +++ b/.github/compatibility-test-matrices/main/client-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["main"], - "chain-b": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1"], "entrypoint": ["TestClientTestSuite"], "test": [ "TestClientUpdateProposal_Succeeds" diff --git a/.github/compatibility-test-matrices/main/client-chain-b.json b/.github/compatibility-test-matrices/main/client-chain-b.json index f97107801af..f7903a19947 100644 --- a/.github/compatibility-test-matrices/main/client-chain-b.json +++ b/.github/compatibility-test-matrices/main/client-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1"], "chain-b": ["main"], "entrypoint": ["TestClientTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/main/connection-chain-a.json b/.github/compatibility-test-matrices/main/connection-chain-a.json index c41bca7f985..b5999f05fc5 100644 --- a/.github/compatibility-test-matrices/main/connection-chain-a.json +++ b/.github/compatibility-test-matrices/main/connection-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["main"], - "chain-b": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1"], "entrypoint": ["TestConnectionTestSuite"], "test": [ "TestMaxExpectedTimePerBlockParam" diff --git a/.github/compatibility-test-matrices/main/connection-chain-b.json b/.github/compatibility-test-matrices/main/connection-chain-b.json index 030e84d84fe..4481da803ae 100644 --- a/.github/compatibility-test-matrices/main/connection-chain-b.json +++ b/.github/compatibility-test-matrices/main/connection-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1"], "chain-b": ["main"], "entrypoint": ["TestConnectionTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/main/transfer-chain-a.json b/.github/compatibility-test-matrices/main/transfer-chain-a.json index 425b14fdfc1..f8fe0ae83a1 100644 --- a/.github/compatibility-test-matrices/main/transfer-chain-a.json +++ b/.github/compatibility-test-matrices/main/transfer-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["main"], - "chain-b": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1"], "entrypoint": ["TestTransferTestSuite"], "test": [ "TestMsgTransfer_Succeeds_Nonincentivized", diff --git a/.github/compatibility-test-matrices/main/transfer-chain-b.json b/.github/compatibility-test-matrices/main/transfer-chain-b.json index 916d1e58744..7d105a140be 100644 --- a/.github/compatibility-test-matrices/main/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/main/transfer-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["main", "v5.1.0", "v5.0.1", "v4.2.0", "v4.1.1"], "chain-b": ["main"], "entrypoint": ["TestTransferTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-a.json deleted file mode 100644 index 407e9ebd616..00000000000 --- a/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-a.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "chain-a": ["release-v3.4.x"], - "chain-b": ["release-v3.4.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], - "entrypoint": ["TestTransferTestSuite"], - "test": [ - "TestMsgTransfer_Succeeds_Nonincentivized", - "TestMsgTransfer_Fails_InvalidAddress", - "TestMsgTransfer_Timeout_Nonincentivized", - "TestMsgTransfer_WithMemo", - "TestSendEnabledParam", - "TestReceiveEnabledParam" - ], - "relayer-type": ["rly"], - "chain-binary": ["simd"], - "chain-image": ["ghcr.io/cosmos/ibc-go-simd"] -} diff --git a/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-b.json deleted file mode 100644 index ae95e67834a..00000000000 --- a/.github/compatibility-test-matrices/release-v3.4.x/transfer-chain-b.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "chain-a": ["release-v3.4.x", "v6.1.0", "v5.2.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], - "chain-b": ["release-v3.4.x"], - "entrypoint": ["TestTransferTestSuite"], - "test": [ - "TestMsgTransfer_Succeeds_Nonincentivized", - "TestMsgTransfer_Fails_InvalidAddress", - "TestMsgTransfer_Timeout_Nonincentivized", - "TestMsgTransfer_WithMemo", - "TestSendEnabledParam", - "TestReceiveEnabledParam" - ], - "relayer-type": ["rly"], - "chain-binary": ["simd"], - "chain-image": ["ghcr.io/cosmos/ibc-go-simd"] -} diff --git a/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-a.json index 191ca1e3d01..a934e02f6fe 100644 --- a/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-a.json +++ b/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v4.2.x"], - "chain-b": ["release-v4.2.x", "v6.1.0", "v5.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["release-v4.2.x", "v6.1.0", "v5.2.0", "v4.1.1"], "entrypoint": ["TestTransferTestSuite"], "test": [ "TestMsgTransfer_Succeeds_Nonincentivized", diff --git a/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-b.json index b7024615f69..e6fae7619b4 100644 --- a/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v4.2.x/transfer-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v4.2.x", "v6.1.0", "v5.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["release-v4.2.x", "v6.1.0", "v5.2.0", "v4.1.1"], "chain-b": ["release-v4.2.x"], "entrypoint": ["TestTransferTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v4.3.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v4.3.x/transfer-chain-a.json index d4711252f4e..1afd7419551 100644 --- a/.github/compatibility-test-matrices/release-v4.3.x/transfer-chain-a.json +++ b/.github/compatibility-test-matrices/release-v4.3.x/transfer-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v4.3.x"], - "chain-b": ["release-v4.3.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["release-v4.3.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestTransferTestSuite"], "test": [ "TestMsgTransfer_Succeeds_Nonincentivized", diff --git a/.github/compatibility-test-matrices/release-v4.3.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v4.3.x/transfer-chain-b.json index ad11eec6e39..35b2ecf9d42 100644 --- a/.github/compatibility-test-matrices/release-v4.3.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v4.3.x/transfer-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v4.3.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["release-v4.3.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v4.3.x"], "entrypoint": ["TestTransferTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-a.json index 7f18e5f202d..1108cf97cbd 100644 --- a/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-a.json +++ b/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v5.2.x"], - "chain-b": ["release-v5.2.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["release-v5.2.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestTransferTestSuite"], "test": [ "TestMsgTransfer_Succeeds_Nonincentivized", diff --git a/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-b.json index b4f20372860..c058ae21948 100644 --- a/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v5.2.x/transfer-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v5.2.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["release-v5.2.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v5.2.x"], "entrypoint": ["TestTransferTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v6.1.x/client-chain-a.json b/.github/compatibility-test-matrices/release-v6.1.x/client-chain-a.json index aa86869814c..0d3148cb223 100644 --- a/.github/compatibility-test-matrices/release-v6.1.x/client-chain-a.json +++ b/.github/compatibility-test-matrices/release-v6.1.x/client-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v6.1.x"], - "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestClientTestSuite"], "test": [ "TestClientUpdateProposal_Succeeds", diff --git a/.github/compatibility-test-matrices/release-v6.1.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/client-chain-b.json index d7dd9c32f0c..f2a5ba229c2 100644 --- a/.github/compatibility-test-matrices/release-v6.1.x/client-chain-b.json +++ b/.github/compatibility-test-matrices/release-v6.1.x/client-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v6.1.x"], "entrypoint": ["TestClientTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v6.1.x/connection-chain-a.json b/.github/compatibility-test-matrices/release-v6.1.x/connection-chain-a.json index a740b2701d0..077238d28a0 100644 --- a/.github/compatibility-test-matrices/release-v6.1.x/connection-chain-a.json +++ b/.github/compatibility-test-matrices/release-v6.1.x/connection-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v6.1.x"], - "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestConnectionTestSuite"], "test": [ "TestMaxExpectedTimePerBlockParam" diff --git a/.github/compatibility-test-matrices/release-v6.1.x/connection-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/connection-chain-b.json index eae5513e627..cbd2aaab6e9 100644 --- a/.github/compatibility-test-matrices/release-v6.1.x/connection-chain-b.json +++ b/.github/compatibility-test-matrices/release-v6.1.x/connection-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v6.1.x"], "entrypoint": ["TestConnectionTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-a.json index 14d9ee98579..dffc3f21cb7 100644 --- a/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-a.json +++ b/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v6.1.x"], - "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestTransferTestSuite"], "test": [ "TestMsgTransfer_Succeeds_Nonincentivized", diff --git a/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-b.json index 468049cc707..85d479e1c35 100644 --- a/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v6.1.x/transfer-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["release-v6.1.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v6.1.x"], "entrypoint": ["TestTransferTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.0.x/client-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/client-chain-a.json index 9cd17bbbf12..afa22155666 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/client-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/client-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.0.x"], - "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestClientTestSuite"], "test": [ "TestClientUpdateProposal_Succeeds", diff --git a/.github/compatibility-test-matrices/release-v7.0.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/client-chain-b.json index 452dca0061c..020c5e44340 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/client-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/client-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.0.x"], "entrypoint": ["TestClientTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-a.json index 0cc16812e03..cb4dd35b6f0 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.0.x"], - "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestConnectionTestSuite"], "test": [ "TestMaxExpectedTimePerBlockParam" diff --git a/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-b.json index c6aa5e28dbb..268fb343c16 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.0.x"], "entrypoint": ["TestConnectionTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-a.json index afc45db5d08..2f2590edb2e 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.0.x"], - "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestTransferTestSuite"], "test": [ "TestMsgTransfer_Succeeds_Nonincentivized", diff --git a/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-b.json index d3cf643c553..fa353c25a76 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.0.x"], "entrypoint": ["TestTransferTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.1.x/client-chain-a.json b/.github/compatibility-test-matrices/release-v7.1.x/client-chain-a.json index d149b4a035a..ee53ac456c6 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/client-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/client-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.1.x"], - "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestClientTestSuite"], "test": [ "TestClientUpdateProposal_Succeeds", diff --git a/.github/compatibility-test-matrices/release-v7.1.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v7.1.x/client-chain-b.json index 9e093343acf..c462fffad31 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/client-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/client-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.1.x"], "entrypoint": ["TestClientTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-a.json b/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-a.json index b37a70bc4bd..fdacc02efcd 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.1.x"], - "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestConnectionTestSuite"], "test": [ "TestMaxExpectedTimePerBlockParam" diff --git a/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-b.json b/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-b.json index a8869f1ed8c..ff25bc9405a 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.1.x"], "entrypoint": ["TestConnectionTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-a.json index 069150e1c8c..857fd19750e 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.1.x"], - "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestTransferTestSuite"], "test": [ "TestMsgTransfer_Succeeds_Nonincentivized", diff --git a/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-b.json index d2c524b69d3..5d54e15de95 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1", "v3.4.0", "v3.3.1"], + "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.1.x"], "entrypoint": ["TestTransferTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/unreleased/client.json b/.github/compatibility-test-matrices/unreleased/client.json index 48d0bab8140..ff6d4cbe334 100644 --- a/.github/compatibility-test-matrices/unreleased/client.json +++ b/.github/compatibility-test-matrices/unreleased/client.json @@ -1,6 +1,6 @@ { - "chain-a": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x", "release-v3.4.x"], - "chain-b": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x", "release-v3.4.x"], + "chain-a": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x"], + "chain-b": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x"], "entrypoint": ["TestClientTestSuite"], "test": [ "TestClientUpdateProposal_Succeeds" diff --git a/.github/compatibility-test-matrices/unreleased/connection.json b/.github/compatibility-test-matrices/unreleased/connection.json index f386a945054..dc3c3d45c63 100644 --- a/.github/compatibility-test-matrices/unreleased/connection.json +++ b/.github/compatibility-test-matrices/unreleased/connection.json @@ -1,6 +1,6 @@ { - "chain-a": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x", "release-v3.4.x"], - "chain-b": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x", "release-v3.4.x"], + "chain-a": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x"], + "chain-b": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.3.x", "release-v4.2.x"], "entrypoint": ["TestConnectionTestSuite"], "test": [ "TestMaxExpectedTimePerBlockParam" diff --git a/.github/compatibility-test-matrices/unreleased/transfer.json b/.github/compatibility-test-matrices/unreleased/transfer.json index dc93ca6f85b..c11a04c0e1e 100644 --- a/.github/compatibility-test-matrices/unreleased/transfer.json +++ b/.github/compatibility-test-matrices/unreleased/transfer.json @@ -1,6 +1,6 @@ { - "chain-a": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.2.x", "release-v3.4.x"], - "chain-b": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.2.x", "release-v3.4.x"], + "chain-a": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.2.x"], + "chain-b": ["release-v7.0.x", "release-v6.1.x", "release-v5.2.x", "release-v4.2.x"], "entrypoint": ["TestTransferTestSuite"], "test": [ "TestMsgTransfer_Succeeds_Nonincentivized", diff --git a/.github/mergify.yml b/.github/mergify.yml index 2c619590029..3e09cad7eaa 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -18,22 +18,6 @@ pull_request_rules: commit_message_template: | {{ title }} (#{{ number }}) {{ body }} - - name: backport patches to v3.3.x branch - conditions: - - base=main - - label=backport-to-v3.3.x - actions: - backport: - branches: - - release/v3.3.x - - name: backport patches to v3.4.x branch - conditions: - - base=main - - label=backport-to-v3.4.x - actions: - backport: - branches: - - release/v3.4.x - name: backport patches to v4.1.x branch conditions: - base=main diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml index 5151bd71a68..ed29b29ea08 100644 --- a/.github/workflows/e2e-compatibility.yaml +++ b/.github/workflows/e2e-compatibility.yaml @@ -7,7 +7,6 @@ on: required: true type: choice options: - - release/v3.4.x - release/v4.2.x - release/v4.3.x - release/v5.2.x @@ -45,7 +44,6 @@ jobs: strategy: matrix: release-branch: - - release/v3.4.x - release/v4.2.x - release/v4.3.x - release/v5.2.x diff --git a/.github/workflows/e2e-manual-icad.yaml b/.github/workflows/e2e-manual-icad.yaml index 4e01772ef75..556278c3786 100644 --- a/.github/workflows/e2e-manual-icad.yaml +++ b/.github/workflows/e2e-manual-icad.yaml @@ -28,7 +28,6 @@ on: - v0.4.3 - v0.3.6 - v0.2.6 - - v0.1.7 chain-b-tag: default: master description: 'The tag to use for chain B' @@ -39,7 +38,6 @@ on: - v0.4.3 - v0.3.6 - v0.2.6 - - v0.1.7 relayer-type: default: rly description: 'The relayer to use' diff --git a/.github/workflows/e2e-manual-simd.yaml b/.github/workflows/e2e-manual-simd.yaml index 3aea4fe4f6f..a047f325413 100644 --- a/.github/workflows/e2e-manual-simd.yaml +++ b/.github/workflows/e2e-manual-simd.yaml @@ -40,8 +40,6 @@ on: - v4.3.0 - v4.2.0 - v4.1.1 - - v3.4.0 - - v3.3.1 chain-a-tag-override: description: 'Specify an arbitrary tag for chain A' required: false @@ -58,8 +56,6 @@ on: - v4.3.0 - v4.2.0 - v4.1.1 - - v3.4.0 - - v3.3.1 chain-b-tag-override: description: 'Specify an arbitrary tag for chain B' required: false diff --git a/README.md b/README.md index 1469fcd021d..174aefc6f9e 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ For the latest information on the progress of the work or the decisions made tha ## Releases -The release lines currently supported are v3, v4, v5 and v6. +The release lines currently supported are v4, v5 and v6. Please refer to the [Stable Release Policy section of RELEASES.md](https://github.com/cosmos/ibc-go/blob/main/RELEASES.md#stable-release-policy) for more details. diff --git a/RELEASES.md b/RELEASES.md index 68c40632c34..ae0d6b1656e 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -67,8 +67,6 @@ Only the following major release series have a stable release status: |Release|End of Life Date| |-------|----------------| -|`v3.3.x`|March 15, 2023| -|`v3.4.x`|March 15, 2023| |`v4.1.x`|August 12, 2023| |`v4.2.x`|August 12, 2023| |`v4.3.x`|August 12, 2023| @@ -104,8 +102,6 @@ Versions of Golang, Cosmos SDK and Tendermint used by ibc-go in the currently ac | Go | ibc-go | Cosmos SDK | Tendermint | |----|--------|------------|------------| -| 1.18 | v3.3.1 | v0.45.10 | v0.34.22 | -| 1.18 | v3.4.0 | v0.45.10 | v0.34.22 | | 1.18 | v4.1.1 | v0.45.10 | v0.34.22 | | 1.18 | v4.2.0 | v0.45.10 | v0.34.22 | | 1.18 | v4.3.0 | v0.45.12 | v0.34.24 | From 6be595a66e891ec10dbc7afcf36dfc509c685da9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Mar 2023 10:14:15 +0100 Subject: [PATCH 11/23] build(deps): bump actions/setup-go from 3 to 4 (#3307) --- .github/workflows/e2e-compatibility-workflow-call.yaml | 2 +- .github/workflows/e2e-fork.yml | 4 ++-- .github/workflows/e2e-test-workflow-call.yml | 4 ++-- .github/workflows/e2e.yaml | 4 ++-- .github/workflows/golangci.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/e2e-compatibility-workflow-call.yaml b/.github/workflows/e2e-compatibility-workflow-call.yaml index e77026d2f33..3204dbb899c 100644 --- a/.github/workflows/e2e-compatibility-workflow-call.yaml +++ b/.github/workflows/e2e-compatibility-workflow-call.yaml @@ -40,7 +40,7 @@ jobs: uses: actions/checkout@v3 with: repository: cosmos/ibc-go - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: 1.19 - name: Run e2e Test diff --git a/.github/workflows/e2e-fork.yml b/.github/workflows/e2e-fork.yml index faa18d3aca5..d035f438d71 100644 --- a/.github/workflows/e2e-fork.yml +++ b/.github/workflows/e2e-fork.yml @@ -18,7 +18,7 @@ jobs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: 1.19 - id: set-matrix @@ -42,7 +42,7 @@ jobs: - name: Docker Build run: docker build . -t "${CHAIN_IMAGE}:${CHAIN_A_TAG}" --build-arg IBC_GO_VERSION=latest - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: go-version: 1.19 - name: Run e2e Test diff --git a/.github/workflows/e2e-test-workflow-call.yml b/.github/workflows/e2e-test-workflow-call.yml index 756a69b0ead..a8eec8b690e 100644 --- a/.github/workflows/e2e-test-workflow-call.yml +++ b/.github/workflows/e2e-test-workflow-call.yml @@ -130,7 +130,7 @@ jobs: - uses: actions/checkout@v3 with: repository: cosmos/ibc-go - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: 1.19 - id: set-matrix @@ -161,7 +161,7 @@ jobs: - uses: actions/checkout@v3 with: repository: cosmos/ibc-go - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: 1.19 - name: Run e2e Test diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 585d4eca11d..75c5a9e697f 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -22,7 +22,7 @@ jobs: simd-tag: ${{ steps.get-tag.outputs.simd-tag }} steps: - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: 1.18 - id: get-tag @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: 1.19 - name: Build e2e diff --git a/.github/workflows/golangci.yml b/.github/workflows/golangci.yml index 30d745b89e5..04483100946 100644 --- a/.github/workflows/golangci.yml +++ b/.github/workflows/golangci.yml @@ -15,7 +15,7 @@ jobs: name: lint runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: 1.19 - uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f775032c128..ccd16658ab2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: '1.19' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 16f7fb5a421..bc0f3e20652 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,7 @@ jobs: install-tparse: runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: 1.19 - name: Display go version @@ -39,7 +39,7 @@ jobs: go-arch: ["amd64", "arm", "arm64"] steps: - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: 1.19 - uses: technote-space/get-diff-action@v6.1.2 @@ -95,7 +95,7 @@ jobs: part: ["00", "01", "02", "03"] steps: - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: 1.19 - uses: technote-space/get-diff-action@v6.1.2 From 85faf5557949ce90fc16effb1c2acb38f68547e0 Mon Sep 17 00:00:00 2001 From: GNaD13 <89174180+GNaD13@users.noreply.github.com> Date: Mon, 20 Mar 2023 15:21:15 +0700 Subject: [PATCH 12/23] imp: remove unnecessary defer func statements (#3304) --- modules/core/02-client/keeper/proposal.go | 20 ++-- .../core/03-connection/keeper/handshake.go | 16 +--- modules/core/04-channel/keeper/handshake.go | 24 ++--- modules/core/keeper/msg_server.go | 92 +++++++++---------- 4 files changed, 61 insertions(+), 91 deletions(-) diff --git a/modules/core/02-client/keeper/proposal.go b/modules/core/02-client/keeper/proposal.go index 1dc7edd33e0..2cb0787be47 100644 --- a/modules/core/02-client/keeper/proposal.go +++ b/modules/core/02-client/keeper/proposal.go @@ -50,17 +50,15 @@ func (k Keeper) ClientUpdateProposal(ctx sdk.Context, p *types.ClientUpdatePropo k.Logger(ctx).Info("client updated after governance proposal passed", "client-id", p.SubjectClientId) - defer func() { - telemetry.IncrCounterWithLabels( - []string{"ibc", "client", "update"}, - 1, - []metrics.Label{ - telemetry.NewLabel(types.LabelClientType, substituteClientState.ClientType()), - telemetry.NewLabel(types.LabelClientID, p.SubjectClientId), - telemetry.NewLabel(types.LabelUpdateType, "proposal"), - }, - ) - }() + defer telemetry.IncrCounterWithLabels( + []string{"ibc", "client", "update"}, + 1, + []metrics.Label{ + telemetry.NewLabel(types.LabelClientType, substituteClientState.ClientType()), + telemetry.NewLabel(types.LabelClientID, p.SubjectClientId), + telemetry.NewLabel(types.LabelUpdateType, "proposal"), + }, + ) // emitting events in the keeper for proposal updates to clients emitUpdateClientProposalEvent(ctx, p.SubjectClientId, substituteClientState.ClientType()) diff --git a/modules/core/03-connection/keeper/handshake.go b/modules/core/03-connection/keeper/handshake.go index 523296194d3..912c38feb4d 100644 --- a/modules/core/03-connection/keeper/handshake.go +++ b/modules/core/03-connection/keeper/handshake.go @@ -53,9 +53,7 @@ func (k Keeper) ConnOpenInit( k.Logger(ctx).Info("connection state updated", "connection-id", connectionID, "previous-state", "NONE", "new-state", "INIT") - defer func() { - telemetry.IncrCounter(1, "ibc", "connection", "open-init") - }() + defer telemetry.IncrCounter(1, "ibc", "connection", "open-init") emitConnectionOpenInitEvent(ctx, connectionID, clientID, counterparty) @@ -150,9 +148,7 @@ func (k Keeper) ConnOpenTry( k.SetConnection(ctx, connectionID, connection) k.Logger(ctx).Info("connection state updated", "connection-id", connectionID, "previous-state", "NONE", "new-state", "TRYOPEN") - defer func() { - telemetry.IncrCounter(1, "ibc", "connection", "open-try") - }() + defer telemetry.IncrCounter(1, "ibc", "connection", "open-try") emitConnectionOpenTryEvent(ctx, connectionID, clientID, counterparty) @@ -244,9 +240,7 @@ func (k Keeper) ConnOpenAck( k.Logger(ctx).Info("connection state updated", "connection-id", connectionID, "previous-state", "INIT", "new-state", "OPEN") - defer func() { - telemetry.IncrCounter(1, "ibc", "connection", "open-ack") - }() + defer telemetry.IncrCounter(1, "ibc", "connection", "open-ack") // Update connection state to Open connection.State = types.OPEN @@ -300,9 +294,7 @@ func (k Keeper) ConnOpenConfirm( k.SetConnection(ctx, connectionID, connection) k.Logger(ctx).Info("connection state updated", "connection-id", connectionID, "previous-state", "TRYOPEN", "new-state", "OPEN") - defer func() { - telemetry.IncrCounter(1, "ibc", "connection", "open-confirm") - }() + defer telemetry.IncrCounter(1, "ibc", "connection", "open-confirm") emitConnectionOpenConfirmEvent(ctx, connectionID, connection) diff --git a/modules/core/04-channel/keeper/handshake.go b/modules/core/04-channel/keeper/handshake.go index cfca1efd00d..fe3fff7b171 100644 --- a/modules/core/04-channel/keeper/handshake.go +++ b/modules/core/04-channel/keeper/handshake.go @@ -95,9 +95,7 @@ func (k Keeper) WriteOpenInitChannel( k.Logger(ctx).Info("channel state updated", "port-id", portID, "channel-id", channelID, "previous-state", "NONE", "new-state", "INIT") - defer func() { - telemetry.IncrCounter(1, "ibc", "channel", "open-init") - }() + defer telemetry.IncrCounter(1, "ibc", "channel", "open-init") emitChannelOpenInitEvent(ctx, portID, channelID, channel) } @@ -208,9 +206,7 @@ func (k Keeper) WriteOpenTryChannel( k.Logger(ctx).Info("channel state updated", "port-id", portID, "channel-id", channelID, "previous-state", "NONE", "new-state", "TRYOPEN") - defer func() { - telemetry.IncrCounter(1, "ibc", "channel", "open-try") - }() + defer telemetry.IncrCounter(1, "ibc", "channel", "open-try") emitChannelOpenTryEvent(ctx, portID, channelID, channel) } @@ -293,9 +289,7 @@ func (k Keeper) WriteOpenAckChannel( k.Logger(ctx).Info("channel state updated", "port-id", portID, "channel-id", channelID, "previous-state", channel.State.String(), "new-state", "OPEN") - defer func() { - telemetry.IncrCounter(1, "ibc", "channel", "open-ack") - }() + defer telemetry.IncrCounter(1, "ibc", "channel", "open-ack") emitChannelOpenAckEvent(ctx, portID, channelID, channel) } @@ -373,9 +367,7 @@ func (k Keeper) WriteOpenConfirmChannel( k.SetChannel(ctx, portID, channelID, channel) k.Logger(ctx).Info("channel state updated", "port-id", portID, "channel-id", channelID, "previous-state", "TRYOPEN", "new-state", "OPEN") - defer func() { - telemetry.IncrCounter(1, "ibc", "channel", "open-confirm") - }() + defer telemetry.IncrCounter(1, "ibc", "channel", "open-confirm") emitChannelOpenConfirmEvent(ctx, portID, channelID, channel) } @@ -429,9 +421,7 @@ func (k Keeper) ChanCloseInit( k.Logger(ctx).Info("channel state updated", "port-id", portID, "channel-id", channelID, "previous-state", channel.State.String(), "new-state", "CLOSED") - defer func() { - telemetry.IncrCounter(1, "ibc", "channel", "close-init") - }() + defer telemetry.IncrCounter(1, "ibc", "channel", "close-init") channel.State = types.CLOSED k.SetChannel(ctx, portID, channelID, channel) @@ -494,9 +484,7 @@ func (k Keeper) ChanCloseConfirm( k.Logger(ctx).Info("channel state updated", "port-id", portID, "channel-id", channelID, "previous-state", channel.State.String(), "new-state", "CLOSED") - defer func() { - telemetry.IncrCounter(1, "ibc", "channel", "close-confirm") - }() + defer telemetry.IncrCounter(1, "ibc", "channel", "close-confirm") channel.State = types.CLOSED k.SetChannel(ctx, portID, channelID, channel) diff --git a/modules/core/keeper/msg_server.go b/modules/core/keeper/msg_server.go index 2bf694e1e2f..15eb5411580 100644 --- a/modules/core/keeper/msg_server.go +++ b/modules/core/keeper/msg_server.go @@ -469,18 +469,16 @@ func (k Keeper) RecvPacket(goCtx context.Context, msg *channeltypes.MsgRecvPacke } } - defer func() { - telemetry.IncrCounterWithLabels( - []string{"tx", "msg", "ibc", channeltypes.EventTypeRecvPacket}, - 1, - []metrics.Label{ - telemetry.NewLabel(coretypes.LabelSourcePort, msg.Packet.SourcePort), - telemetry.NewLabel(coretypes.LabelSourceChannel, msg.Packet.SourceChannel), - telemetry.NewLabel(coretypes.LabelDestinationPort, msg.Packet.DestinationPort), - telemetry.NewLabel(coretypes.LabelDestinationChannel, msg.Packet.DestinationChannel), - }, - ) - }() + defer telemetry.IncrCounterWithLabels( + []string{"tx", "msg", "ibc", channeltypes.EventTypeRecvPacket}, + 1, + []metrics.Label{ + telemetry.NewLabel(coretypes.LabelSourcePort, msg.Packet.SourcePort), + telemetry.NewLabel(coretypes.LabelSourceChannel, msg.Packet.SourceChannel), + telemetry.NewLabel(coretypes.LabelDestinationPort, msg.Packet.DestinationPort), + telemetry.NewLabel(coretypes.LabelDestinationChannel, msg.Packet.DestinationChannel), + }, + ) ctx.Logger().Info("receive packet callback succeeded", "port-id", msg.Packet.SourcePort, "channel-id", msg.Packet.SourceChannel, "result", channeltypes.SUCCESS.String()) @@ -541,19 +539,17 @@ func (k Keeper) Timeout(goCtx context.Context, msg *channeltypes.MsgTimeout) (*c return nil, err } - defer func() { - telemetry.IncrCounterWithLabels( - []string{"ibc", "timeout", "packet"}, - 1, - []metrics.Label{ - telemetry.NewLabel(coretypes.LabelSourcePort, msg.Packet.SourcePort), - telemetry.NewLabel(coretypes.LabelSourceChannel, msg.Packet.SourceChannel), - telemetry.NewLabel(coretypes.LabelDestinationPort, msg.Packet.DestinationPort), - telemetry.NewLabel(coretypes.LabelDestinationChannel, msg.Packet.DestinationChannel), - telemetry.NewLabel(coretypes.LabelTimeoutType, "height"), - }, - ) - }() + defer telemetry.IncrCounterWithLabels( + []string{"ibc", "timeout", "packet"}, + 1, + []metrics.Label{ + telemetry.NewLabel(coretypes.LabelSourcePort, msg.Packet.SourcePort), + telemetry.NewLabel(coretypes.LabelSourceChannel, msg.Packet.SourceChannel), + telemetry.NewLabel(coretypes.LabelDestinationPort, msg.Packet.DestinationPort), + telemetry.NewLabel(coretypes.LabelDestinationChannel, msg.Packet.DestinationChannel), + telemetry.NewLabel(coretypes.LabelTimeoutType, "height"), + }, + ) ctx.Logger().Info("timeout packet callback succeeded", "port-id", msg.Packet.SourcePort, "channel-id", msg.Packet.SourceChannel, "result", channeltypes.SUCCESS.String()) @@ -617,19 +613,17 @@ func (k Keeper) TimeoutOnClose(goCtx context.Context, msg *channeltypes.MsgTimeo return nil, err } - defer func() { - telemetry.IncrCounterWithLabels( - []string{"ibc", "timeout", "packet"}, - 1, - []metrics.Label{ - telemetry.NewLabel(coretypes.LabelSourcePort, msg.Packet.SourcePort), - telemetry.NewLabel(coretypes.LabelSourceChannel, msg.Packet.SourceChannel), - telemetry.NewLabel(coretypes.LabelDestinationPort, msg.Packet.DestinationPort), - telemetry.NewLabel(coretypes.LabelDestinationChannel, msg.Packet.DestinationChannel), - telemetry.NewLabel(coretypes.LabelTimeoutType, "channel-closed"), - }, - ) - }() + defer telemetry.IncrCounterWithLabels( + []string{"ibc", "timeout", "packet"}, + 1, + []metrics.Label{ + telemetry.NewLabel(coretypes.LabelSourcePort, msg.Packet.SourcePort), + telemetry.NewLabel(coretypes.LabelSourceChannel, msg.Packet.SourceChannel), + telemetry.NewLabel(coretypes.LabelDestinationPort, msg.Packet.DestinationPort), + telemetry.NewLabel(coretypes.LabelDestinationChannel, msg.Packet.DestinationChannel), + telemetry.NewLabel(coretypes.LabelTimeoutType, "channel-closed"), + }, + ) ctx.Logger().Info("timeout on close callback succeeded", "port-id", msg.Packet.SourcePort, "channel-id", msg.Packet.SourceChannel, "result", channeltypes.SUCCESS.String()) @@ -685,18 +679,16 @@ func (k Keeper) Acknowledgement(goCtx context.Context, msg *channeltypes.MsgAckn return nil, errorsmod.Wrap(err, "acknowledge packet callback failed") } - defer func() { - telemetry.IncrCounterWithLabels( - []string{"tx", "msg", "ibc", channeltypes.EventTypeAcknowledgePacket}, - 1, - []metrics.Label{ - telemetry.NewLabel(coretypes.LabelSourcePort, msg.Packet.SourcePort), - telemetry.NewLabel(coretypes.LabelSourceChannel, msg.Packet.SourceChannel), - telemetry.NewLabel(coretypes.LabelDestinationPort, msg.Packet.DestinationPort), - telemetry.NewLabel(coretypes.LabelDestinationChannel, msg.Packet.DestinationChannel), - }, - ) - }() + defer telemetry.IncrCounterWithLabels( + []string{"tx", "msg", "ibc", channeltypes.EventTypeAcknowledgePacket}, + 1, + []metrics.Label{ + telemetry.NewLabel(coretypes.LabelSourcePort, msg.Packet.SourcePort), + telemetry.NewLabel(coretypes.LabelSourceChannel, msg.Packet.SourceChannel), + telemetry.NewLabel(coretypes.LabelDestinationPort, msg.Packet.DestinationPort), + telemetry.NewLabel(coretypes.LabelDestinationChannel, msg.Packet.DestinationChannel), + }, + ) ctx.Logger().Info("acknowledgement succeeded", "port-id", msg.Packet.SourcePort, "channel-id", msg.Packet.SourceChannel, "result", channeltypes.SUCCESS.String()) From b4a386ad819862ae132347a072ff1bf43da6ef17 Mon Sep 17 00:00:00 2001 From: Hieu Vu <72878483+hieuvubk@users.noreply.github.com> Date: Mon, 20 Mar 2023 18:40:50 +0700 Subject: [PATCH 13/23] Remove gogoproto yaml tags from proto files (#3290) ## Description Refer from original issue, I removed all `yaml` tags in proto files. closes: #3145 ### Commit Message / Changelog Entry ```bash type: commit message ``` see the [guidelines](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#commit-messages) for commit messages. (view raw markdown for examples) --- Before we can merge this PR, please make sure that all the following items have been checked off. If any of the checklist items are not applicable, please leave them but write a little note why. - [ ] Targeted PR against correct branch (see [CONTRIBUTING.md](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#pull-request-targeting)). - [ ] Linked to Github issue with discussion and accepted design OR link to spec that describes this work. - [ ] Code follows the [module structure standards](https://github.com/cosmos/cosmos-sdk/blob/main/docs/docs/building-modules/10-structure.md) and [Go style guide](../docs/dev/go-style-guide.md). - [ ] Wrote unit and integration [tests](https://github.com/cosmos/ibc-go/blob/main/testing/README.md#ibc-testing-package). - [ ] Updated relevant documentation (`docs/`) or specification (`x//spec/`). - [ ] Added relevant `godoc` [comments](https://blog.golang.org/godoc-documenting-go-code). - [ ] Provide a [commit message](https://github.com/cosmos/ibc-go/blob/main/docs/dev/pull-requests.md#commit-messages) to be used for the changelog entry in the PR description for review. - [ ] Re-reviewed `Files changed` in the Github PR explorer. - [ ] Review `Codecov Report` in the comment section below once CI passes. --- .../controller/types/controller.pb.go | 35 ++- .../controller/types/query.pb.go | 63 +++-- .../controller/types/tx.pb.go | 82 +++---- .../genesis/types/genesis.pb.go | 109 ++++----- .../host/types/host.pb.go | 42 ++-- .../types/account.pb.go | 32 ++- .../types/metadata.pb.go | 48 ++-- modules/apps/29-fee/types/ack.pb.go | 48 ++-- modules/apps/29-fee/types/fee.pb.go | 79 +++--- modules/apps/29-fee/types/genesis.pb.go | 100 ++++---- modules/apps/29-fee/types/metadata.pb.go | 29 +-- modules/apps/29-fee/types/query.pb.go | 188 +++++++-------- modules/apps/29-fee/types/tx.pb.go | 103 ++++---- modules/apps/transfer/types/authz.pb.go | 60 +++-- modules/apps/transfer/types/genesis.pb.go | 46 ++-- modules/apps/transfer/types/transfer.pb.go | 42 ++-- modules/apps/transfer/types/tx.pb.go | 73 +++--- .../02-client/migrations/v7/solomachine.pb.go | 200 ++++++++------- modules/core/02-client/types/client.pb.go | 110 ++++----- modules/core/02-client/types/genesis.pb.go | 78 +++--- modules/core/02-client/types/tx.pb.go | 95 ++++---- .../core/03-connection/types/connection.pb.go | 108 ++++----- .../core/03-connection/types/genesis.pb.go | 50 ++-- modules/core/03-connection/types/query.pb.go | 125 +++++----- modules/core/03-connection/types/tx.pb.go | 162 ++++++------- modules/core/04-channel/types/channel.pb.go | 139 +++++------ modules/core/04-channel/types/genesis.pb.go | 74 +++--- modules/core/04-channel/types/tx.pb.go | 227 +++++++++--------- .../core/23-commitment/types/commitment.pb.go | 48 ++-- modules/core/types/genesis.pb.go | 48 ++-- .../06-solomachine/solomachine.pb.go | 106 ++++---- .../07-tendermint/tendermint.pb.go | 166 ++++++------- proto/ibc/applications/fee/v1/ack.proto | 8 +- proto/ibc/applications/fee/v1/fee.proto | 30 +-- proto/ibc/applications/fee/v1/genesis.proto | 28 +-- proto/ibc/applications/fee/v1/metadata.proto | 6 +- proto/ibc/applications/fee/v1/query.proto | 38 ++- proto/ibc/applications/fee/v1/tx.proto | 19 +- .../controller/v1/controller.proto | 4 +- .../controller/v1/query.proto | 3 +- .../controller/v1/tx.proto | 15 +- .../genesis/v1/genesis.proto | 40 ++- .../interchain_accounts/host/v1/host.proto | 6 +- .../interchain_accounts/v1/account.proto | 5 +- .../interchain_accounts/v1/metadata.proto | 6 +- .../ibc/applications/transfer/v1/authz.proto | 4 +- .../applications/transfer/v1/genesis.proto | 10 +- .../applications/transfer/v1/transfer.proto | 6 +- proto/ibc/applications/transfer/v1/tx.proto | 9 +- proto/ibc/core/channel/v1/channel.proto | 29 ++- proto/ibc/core/channel/v1/genesis.proto | 15 +- proto/ibc/core/channel/v1/tx.proto | 98 ++++---- proto/ibc/core/client/v1/client.proto | 23 +- proto/ibc/core/client/v1/genesis.proto | 21 +- proto/ibc/core/client/v1/tx.proto | 18 +- proto/ibc/core/commitment/v1/commitment.proto | 4 +- proto/ibc/core/connection/v1/connection.proto | 18 +- proto/ibc/core/connection/v1/genesis.proto | 5 +- proto/ibc/core/connection/v1/query.proto | 4 +- proto/ibc/core/connection/v1/tx.proto | 61 +++-- proto/ibc/core/types/v1/genesis.proto | 9 +- .../solomachine/v2/solomachine.proto | 34 +-- .../solomachine/v3/solomachine.proto | 20 +- .../tendermint/v1/tendermint.proto | 52 ++-- 64 files changed, 1664 insertions(+), 1899 deletions(-) diff --git a/modules/apps/27-interchain-accounts/controller/types/controller.pb.go b/modules/apps/27-interchain-accounts/controller/types/controller.pb.go index 7d8badd96e1..addbb2ec125 100644 --- a/modules/apps/27-interchain-accounts/controller/types/controller.pb.go +++ b/modules/apps/27-interchain-accounts/controller/types/controller.pb.go @@ -5,7 +5,6 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" math "math" @@ -27,7 +26,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // The following parameters may be used to disable the controller submodule. type Params struct { // controller_enabled enables or disables the controller submodule. - ControllerEnabled bool `protobuf:"varint,1,opt,name=controller_enabled,json=controllerEnabled,proto3" json:"controller_enabled,omitempty" yaml:"controller_enabled"` + ControllerEnabled bool `protobuf:"varint,1,opt,name=controller_enabled,json=controllerEnabled,proto3" json:"controller_enabled,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -79,23 +78,21 @@ func init() { } var fileDescriptor_177fd0fec5eb3400 = []byte{ - // 254 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0xce, 0x4c, 0x4a, 0xd6, - 0x4f, 0x2c, 0x28, 0xc8, 0xc9, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0xcf, 0xcc, 0x2b, - 0x49, 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x8b, 0x4f, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x29, - 0xd6, 0x4f, 0xce, 0xcf, 0x2b, 0x29, 0xca, 0xcf, 0xc9, 0x49, 0x2d, 0xd2, 0x2f, 0x33, 0x44, 0xe2, - 0xe9, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x19, 0x65, 0x26, 0x25, 0xeb, 0x21, 0x1b, 0xa2, 0x87, - 0xc5, 0x10, 0x3d, 0x24, 0x6d, 0x65, 0x86, 0x52, 0x22, 0xe9, 0xf9, 0xe9, 0xf9, 0x60, 0xed, 0xfa, - 0x20, 0x16, 0xc4, 0x24, 0xa5, 0x30, 0x2e, 0xb6, 0x80, 0xc4, 0xa2, 0xc4, 0xdc, 0x62, 0x21, 0x1f, - 0x2e, 0x21, 0x84, 0x86, 0xf8, 0xd4, 0xbc, 0xc4, 0xa4, 0x9c, 0xd4, 0x14, 0x09, 0x46, 0x05, 0x46, - 0x0d, 0x0e, 0x27, 0xd9, 0x4f, 0xf7, 0xe4, 0x25, 0x2b, 0x13, 0x73, 0x73, 0xac, 0x94, 0x30, 0xd5, - 0x28, 0x05, 0x09, 0x22, 0x04, 0x5d, 0x21, 0x62, 0x4e, 0x59, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, - 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, - 0x78, 0x2c, 0xc7, 0x10, 0x15, 0x90, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, - 0x9f, 0x9c, 0x5f, 0x9c, 0x9b, 0x5f, 0xac, 0x9f, 0x99, 0x94, 0xac, 0x9b, 0x9e, 0xaf, 0x5f, 0x66, - 0xae, 0x9f, 0x9b, 0x9f, 0x52, 0x9a, 0x93, 0x5a, 0x0c, 0x0a, 0xa0, 0x62, 0x7d, 0x23, 0x73, 0x5d, - 0x84, 0xb7, 0x74, 0xb1, 0x85, 0x4d, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x2b, 0xc6, - 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xf2, 0x00, 0xac, 0x5b, 0x01, 0x00, 0x00, + // 220 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x8f, 0xb1, 0x4e, 0xc3, 0x30, + 0x10, 0x86, 0xe3, 0xa5, 0x42, 0xd9, 0xc8, 0xc4, 0x64, 0x21, 0x26, 0x96, 0xf8, 0xd4, 0x32, 0x64, + 0x07, 0xb1, 0x57, 0x8c, 0x2c, 0x95, 0x7d, 0xb5, 0xda, 0x43, 0x8e, 0x2f, 0xf2, 0x39, 0x91, 0x78, + 0x0b, 0x1e, 0x8b, 0xb1, 0x23, 0x23, 0x4a, 0x5e, 0x04, 0x01, 0x43, 0x32, 0x64, 0x3c, 0x7d, 0xba, + 0x4f, 0xff, 0x57, 0x3e, 0x91, 0x43, 0xb0, 0x5d, 0x17, 0x08, 0x6d, 0x26, 0x8e, 0x02, 0x14, 0xb3, + 0x4f, 0x78, 0xb6, 0x14, 0x0f, 0x16, 0x91, 0xfb, 0x98, 0x05, 0x90, 0x63, 0x4e, 0x1c, 0x82, 0x4f, + 0x30, 0x6c, 0x17, 0x97, 0xe9, 0x12, 0x67, 0xae, 0x76, 0xe4, 0xd0, 0x2c, 0x25, 0x66, 0x45, 0x62, + 0x16, 0x6f, 0xc3, 0xf6, 0xae, 0x29, 0x37, 0x7b, 0x9b, 0x6c, 0x2b, 0x55, 0x5d, 0x56, 0x33, 0x3a, + 0xf8, 0x68, 0x5d, 0xf0, 0xc7, 0x1b, 0x75, 0xab, 0xee, 0xaf, 0x5e, 0xae, 0x67, 0xf2, 0xfc, 0x0f, + 0x1e, 0xdf, 0x3e, 0x47, 0xad, 0x2e, 0xa3, 0x56, 0xdf, 0xa3, 0x56, 0x1f, 0x93, 0x2e, 0x2e, 0x93, + 0x2e, 0xbe, 0x26, 0x5d, 0xbc, 0xee, 0x4f, 0x94, 0xcf, 0xbd, 0x33, 0xc8, 0x2d, 0x20, 0x4b, 0xcb, + 0x02, 0xe4, 0xb0, 0x3e, 0x31, 0x0c, 0x0d, 0xb4, 0x7c, 0xec, 0x83, 0x97, 0xdf, 0x56, 0x81, 0x5d, + 0x53, 0xcf, 0x0b, 0xeb, 0xb5, 0xcc, 0xfc, 0xde, 0x79, 0x71, 0x9b, 0xbf, 0xbe, 0x87, 0x9f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xe8, 0xe6, 0x80, 0x41, 0x26, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/modules/apps/27-interchain-accounts/controller/types/query.pb.go b/modules/apps/27-interchain-accounts/controller/types/query.pb.go index c1900bbc179..3b4863f19d5 100644 --- a/modules/apps/27-interchain-accounts/controller/types/query.pb.go +++ b/modules/apps/27-interchain-accounts/controller/types/query.pb.go @@ -6,7 +6,6 @@ package types import ( context "context" fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -32,7 +31,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // QueryInterchainAccountRequest is the request type for the Query/InterchainAccount RPC method. type QueryInterchainAccountRequest struct { Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` - ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` + ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` } func (m *QueryInterchainAccountRequest) Reset() { *m = QueryInterchainAccountRequest{} } @@ -222,37 +221,35 @@ func init() { } var fileDescriptor_df0d8b259d72854e = []byte{ - // 465 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x41, 0x6b, 0x14, 0x31, - 0x14, 0xc7, 0x77, 0x56, 0xba, 0x62, 0xd4, 0x83, 0x71, 0x0f, 0xcb, 0xa2, 0xa3, 0xcc, 0xc9, 0xcb, - 0x26, 0x74, 0x14, 0x0a, 0x0b, 0x0a, 0x56, 0x50, 0x7a, 0x6b, 0xe7, 0x20, 0xe2, 0xc1, 0x92, 0xcd, - 0x84, 0x69, 0x64, 0x26, 0x6f, 0x9a, 0x64, 0x56, 0x96, 0xd2, 0x8b, 0x9f, 0x40, 0xf0, 0xe6, 0x27, - 0xf2, 0x58, 0x10, 0xc1, 0x93, 0xc8, 0xae, 0x9f, 0xc0, 0xb3, 0x07, 0x99, 0x4c, 0x74, 0x3b, 0x58, - 0xc5, 0x5d, 0x7b, 0x9a, 0xbc, 0xf7, 0x78, 0xff, 0xdf, 0x7b, 0xf9, 0x67, 0xd0, 0x03, 0x39, 0xe1, - 0x94, 0x95, 0x65, 0x2e, 0x39, 0xb3, 0x12, 0x94, 0xa1, 0x52, 0x59, 0xa1, 0xf9, 0x01, 0x93, 0x6a, - 0x9f, 0x71, 0x0e, 0x95, 0xb2, 0x86, 0x72, 0x50, 0x56, 0x43, 0x9e, 0x0b, 0x4d, 0xa7, 0x9b, 0xf4, - 0xb0, 0x12, 0x7a, 0x46, 0x4a, 0x0d, 0x16, 0x70, 0x2c, 0x27, 0x9c, 0x9c, 0xee, 0x27, 0x67, 0xf4, - 0x93, 0x65, 0x3f, 0x99, 0x6e, 0x0e, 0x1f, 0xad, 0xc1, 0x3c, 0xa5, 0xe0, 0xc0, 0xc3, 0x7e, 0x06, - 0x19, 0xb8, 0x23, 0xad, 0x4f, 0x3e, 0x7b, 0x23, 0x03, 0xc8, 0x72, 0x41, 0x59, 0x29, 0x29, 0x53, - 0x0a, 0xac, 0x1f, 0xca, 0x55, 0x23, 0x8b, 0x6e, 0xee, 0xd5, 0xb3, 0xef, 0xfc, 0xc2, 0x3d, 0x6c, - 0x68, 0x89, 0x38, 0xac, 0x84, 0xb1, 0xb8, 0x8f, 0x36, 0xe0, 0x95, 0x12, 0x7a, 0x10, 0xdc, 0x0e, - 0xee, 0x5c, 0x4a, 0x9a, 0x00, 0xdf, 0x47, 0x57, 0x39, 0x28, 0x25, 0x78, 0xad, 0xb5, 0x2f, 0xd3, - 0x41, 0xb7, 0xae, 0x6e, 0x0f, 0xbe, 0x7d, 0xbe, 0xd5, 0x9f, 0xb1, 0x22, 0x1f, 0x47, 0xad, 0x72, - 0x94, 0x5c, 0x59, 0xc6, 0x3b, 0x69, 0x34, 0x46, 0xe1, 0x9f, 0xa8, 0xa6, 0x04, 0x65, 0x04, 0x1e, - 0xa0, 0x8b, 0x2c, 0x4d, 0xb5, 0x30, 0xc6, 0x83, 0x7f, 0x86, 0x51, 0x1f, 0x61, 0xd7, 0xbb, 0xcb, - 0x34, 0x2b, 0x8c, 0x1f, 0x33, 0x92, 0xe8, 0x7a, 0x2b, 0xeb, 0x65, 0x12, 0xd4, 0x2b, 0x5d, 0xc6, - 0xa9, 0x5c, 0x8e, 0xc7, 0x64, 0x75, 0x73, 0x88, 0xd7, 0xf4, 0x4a, 0xf1, 0xf7, 0x0b, 0x68, 0xc3, - 0xb1, 0xf0, 0xbb, 0x2e, 0xba, 0xf6, 0xdb, 0x0a, 0x78, 0x6f, 0x1d, 0xc6, 0x5f, 0x4d, 0x18, 0x26, - 0xe7, 0x29, 0xd9, 0x5c, 0x4d, 0xf4, 0xe2, 0xf5, 0x87, 0xaf, 0x6f, 0xbb, 0xcf, 0xf0, 0x53, 0xea, - 0xdf, 0xde, 0xbf, 0xbc, 0x39, 0xe7, 0xbe, 0xa1, 0x47, 0xee, 0x7b, 0x4c, 0x97, 0xa6, 0x1a, 0x7a, - 0xd4, 0x72, 0xfc, 0x18, 0x7f, 0x0c, 0x50, 0xaf, 0xb9, 0x39, 0xfc, 0x78, 0xed, 0xf1, 0x5b, 0x26, - 0x0f, 0x9f, 0xfc, 0xb7, 0x8e, 0xdf, 0x7d, 0xec, 0x76, 0xbf, 0x87, 0xe3, 0x55, 0x76, 0x6f, 0xec, - 0xdf, 0x7e, 0xf9, 0x7e, 0x1e, 0x06, 0x27, 0xf3, 0x30, 0xf8, 0x32, 0x0f, 0x83, 0x37, 0x8b, 0xb0, - 0x73, 0xb2, 0x08, 0x3b, 0x9f, 0x16, 0x61, 0xe7, 0xf9, 0x6e, 0x26, 0xed, 0x41, 0x35, 0x21, 0x1c, - 0x0a, 0xca, 0xc1, 0x14, 0x60, 0x6a, 0xf9, 0x51, 0x06, 0x74, 0xba, 0x45, 0x0b, 0x48, 0xab, 0x5c, - 0x98, 0x06, 0x16, 0x6f, 0x8d, 0x96, 0xbc, 0xd1, 0x59, 0x3c, 0x3b, 0x2b, 0x85, 0x99, 0xf4, 0xdc, - 0x4f, 0x7a, 0xf7, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0e, 0x23, 0x39, 0x1f, 0x93, 0x04, 0x00, - 0x00, + // 439 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x41, 0x8b, 0xd4, 0x30, + 0x14, 0xc7, 0xa7, 0x23, 0x3b, 0x62, 0xd4, 0x83, 0x71, 0x0f, 0x43, 0xd1, 0x22, 0xf5, 0xe2, 0x65, + 0x12, 0xb6, 0x0a, 0x0b, 0x73, 0x10, 0x54, 0x50, 0xf6, 0xb6, 0xdb, 0x83, 0xc8, 0x1e, 0x5c, 0xd2, + 0x34, 0x74, 0x23, 0x6d, 0x5e, 0x37, 0x49, 0x47, 0x96, 0x65, 0x2f, 0x7e, 0x02, 0xc1, 0x9b, 0x9f, + 0xc8, 0xe3, 0x82, 0x08, 0x1e, 0x65, 0xc6, 0x8f, 0xe1, 0x41, 0x26, 0x8d, 0x76, 0x06, 0x47, 0x71, + 0x46, 0x4f, 0x25, 0x2f, 0xbc, 0xdf, 0xff, 0xbd, 0xff, 0x3f, 0x45, 0x0f, 0x65, 0xc6, 0x29, 0xab, + 0xeb, 0x52, 0x72, 0x66, 0x25, 0x28, 0x43, 0xa5, 0xb2, 0x42, 0xf3, 0x63, 0x26, 0xd5, 0x11, 0xe3, + 0x1c, 0x1a, 0x65, 0x0d, 0xe5, 0xa0, 0xac, 0x86, 0xb2, 0x14, 0x9a, 0x4e, 0x76, 0xe8, 0x49, 0x23, + 0xf4, 0x29, 0xa9, 0x35, 0x58, 0xc0, 0x89, 0xcc, 0x38, 0x59, 0xec, 0x27, 0x2b, 0xfa, 0x49, 0xd7, + 0x4f, 0x26, 0x3b, 0xe1, 0x93, 0x0d, 0x34, 0x17, 0x08, 0x4e, 0x38, 0xbc, 0x55, 0x00, 0x14, 0xa5, + 0xa0, 0xac, 0x96, 0x94, 0x29, 0x05, 0xd6, 0xcb, 0xbb, 0xdb, 0xf8, 0x10, 0xdd, 0x3e, 0x98, 0x4f, + 0xb9, 0xf7, 0x13, 0xfc, 0xa8, 0xe5, 0xa6, 0xe2, 0xa4, 0x11, 0xc6, 0xe2, 0x6d, 0xb4, 0x05, 0xaf, + 0x95, 0xd0, 0xc3, 0xe0, 0x4e, 0x70, 0xef, 0x4a, 0xda, 0x1e, 0xf0, 0x5d, 0x74, 0x9d, 0x83, 0x52, + 0x82, 0xcf, 0x59, 0x47, 0x32, 0x1f, 0xf6, 0xdd, 0xed, 0xb5, 0xae, 0xb8, 0x97, 0xc7, 0x63, 0x14, + 0xfd, 0x8e, 0x6d, 0x6a, 0x50, 0x46, 0xe0, 0x21, 0xba, 0xcc, 0xf2, 0x5c, 0x0b, 0x63, 0x3c, 0xfe, + 0xc7, 0x31, 0xde, 0x46, 0xd8, 0xf5, 0xee, 0x33, 0xcd, 0x2a, 0xe3, 0x87, 0x89, 0x25, 0xba, 0xb9, + 0x54, 0xf5, 0x98, 0x14, 0x0d, 0x6a, 0x57, 0x71, 0x94, 0xab, 0xc9, 0x98, 0xac, 0x6f, 0x36, 0xf1, + 0x4c, 0x4f, 0x4a, 0xbe, 0x5d, 0x42, 0x5b, 0x4e, 0x0b, 0xbf, 0xef, 0xa3, 0x1b, 0xbf, 0xac, 0x80, + 0x0f, 0x36, 0xd1, 0xf8, 0xa3, 0xd5, 0x61, 0xfa, 0x3f, 0x91, 0xad, 0x35, 0xf1, 0xcb, 0x37, 0x1f, + 0xbf, 0xbe, 0xeb, 0xbf, 0xc0, 0xcf, 0xa9, 0x7f, 0x4b, 0x7f, 0xf3, 0x86, 0x5c, 0xc6, 0x86, 0x9e, + 0xb9, 0xef, 0x39, 0xed, 0x42, 0x35, 0xf4, 0x6c, 0x29, 0xf6, 0x73, 0xfc, 0x29, 0x40, 0x83, 0xd6, + 0x39, 0xfc, 0x74, 0xe3, 0xf1, 0x97, 0x42, 0x0e, 0x9f, 0xfd, 0x33, 0xc7, 0xef, 0x3e, 0x76, 0xbb, + 0x3f, 0xc0, 0xc9, 0x3a, 0xbb, 0xb7, 0xf1, 0x3f, 0x7e, 0xf5, 0x61, 0x1a, 0x05, 0x17, 0xd3, 0x28, + 0xf8, 0x32, 0x8d, 0x82, 0xb7, 0xb3, 0xa8, 0x77, 0x31, 0x8b, 0x7a, 0x9f, 0x67, 0x51, 0xef, 0x70, + 0xbf, 0x90, 0xf6, 0xb8, 0xc9, 0x08, 0x87, 0x8a, 0x72, 0x30, 0x15, 0x98, 0x39, 0x7e, 0x54, 0x00, + 0x9d, 0xec, 0xd2, 0x0a, 0xf2, 0xa6, 0x14, 0xa6, 0x15, 0x4b, 0x76, 0x47, 0x9d, 0xde, 0x68, 0x95, + 0x9e, 0x3d, 0xad, 0x85, 0xc9, 0x06, 0xee, 0x57, 0xbc, 0xff, 0x3d, 0x00, 0x00, 0xff, 0xff, 0x3b, + 0xeb, 0xe1, 0x31, 0x63, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/apps/27-interchain-accounts/controller/types/tx.pb.go b/modules/apps/27-interchain-accounts/controller/types/tx.pb.go index b15979a713e..b0e26d5da71 100644 --- a/modules/apps/27-interchain-accounts/controller/types/tx.pb.go +++ b/modules/apps/27-interchain-accounts/controller/types/tx.pb.go @@ -32,7 +32,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgRegisterInterchainAccount defines the payload for Msg/RegisterAccount type MsgRegisterInterchainAccount struct { Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` - ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` + ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` Version string `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` } @@ -71,8 +71,8 @@ var xxx_messageInfo_MsgRegisterInterchainAccount proto.InternalMessageInfo // MsgRegisterInterchainAccountResponse defines the response for Msg/RegisterAccount type MsgRegisterInterchainAccountResponse struct { - ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` - PortId string `protobuf:"bytes,2,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` + ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` + PortId string `protobuf:"bytes,2,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` } func (m *MsgRegisterInterchainAccountResponse) Reset() { *m = MsgRegisterInterchainAccountResponse{} } @@ -125,11 +125,11 @@ func (m *MsgRegisterInterchainAccountResponse) GetPortId() string { // MsgSendTx defines the payload for Msg/SendTx type MsgSendTx struct { Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` - ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` - PacketData types.InterchainAccountPacketData `protobuf:"bytes,3,opt,name=packet_data,json=packetData,proto3" json:"packet_data" yaml:"packet_data"` + ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` + PacketData types.InterchainAccountPacketData `protobuf:"bytes,3,opt,name=packet_data,json=packetData,proto3" json:"packet_data"` // Relative timeout timestamp provided will be added to the current block time during transaction execution. // The timeout timestamp must be non-zero. - RelativeTimeout uint64 `protobuf:"varint,4,opt,name=relative_timeout,json=relativeTimeout,proto3" json:"relative_timeout,omitempty" yaml:"relative_timeout"` + RelativeTimeout uint64 `protobuf:"varint,4,opt,name=relative_timeout,json=relativeTimeout,proto3" json:"relative_timeout,omitempty"` } func (m *MsgSendTx) Reset() { *m = MsgSendTx{} } @@ -222,43 +222,39 @@ func init() { } var fileDescriptor_7def041328c84a30 = []byte{ - // 570 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xbf, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0xed, 0x34, 0xa4, 0xcd, 0x95, 0x5f, 0xb5, 0x82, 0x30, 0x06, 0xd9, 0x95, 0xc5, 0x50, - 0x09, 0xc5, 0xa7, 0x84, 0x4a, 0x95, 0x8a, 0x3a, 0x10, 0x15, 0xa4, 0x0c, 0x91, 0x22, 0xd3, 0x01, - 0xb1, 0x44, 0x97, 0xf3, 0xc9, 0x39, 0x70, 0xee, 0x8c, 0xef, 0x62, 0xda, 0x91, 0x0d, 0x16, 0xc4, - 0xc6, 0xda, 0xbf, 0x82, 0x7f, 0x81, 0x8e, 0x1d, 0x99, 0xac, 0x2a, 0x59, 0x98, 0xf3, 0x17, 0x20, - 0xdb, 0x89, 0x53, 0xa0, 0x54, 0xe5, 0x47, 0x37, 0xbf, 0x7b, 0xf7, 0x79, 0xef, 0x7b, 0xef, 0x3d, - 0x3f, 0xf0, 0x88, 0xf6, 0x31, 0x44, 0x61, 0x18, 0x50, 0x8c, 0x24, 0xe5, 0x4c, 0x40, 0xca, 0x24, - 0x89, 0xf0, 0x00, 0x51, 0xd6, 0x43, 0x18, 0xf3, 0x11, 0x93, 0x02, 0x62, 0xce, 0x64, 0xc4, 0x83, - 0x80, 0x44, 0x30, 0x6e, 0x40, 0xb9, 0xef, 0x84, 0x11, 0x97, 0x5c, 0x6b, 0xd2, 0x3e, 0x76, 0x4e, - 0xc3, 0xce, 0x19, 0xb0, 0xb3, 0x80, 0x9d, 0xb8, 0x61, 0xd4, 0x7c, 0xee, 0xf3, 0x0c, 0x87, 0xe9, - 0x57, 0x1e, 0xc9, 0xd8, 0xbc, 0x90, 0x8c, 0xb8, 0x01, 0x43, 0x84, 0x5f, 0x11, 0x99, 0x53, 0xf6, - 0x27, 0x15, 0xdc, 0xeb, 0x08, 0xdf, 0x25, 0x3e, 0x15, 0x92, 0x44, 0xed, 0x02, 0x79, 0x9c, 0x13, - 0x5a, 0x0d, 0x5c, 0xe1, 0x6f, 0x18, 0x89, 0x74, 0x75, 0x5d, 0xdd, 0xa8, 0xba, 0xb9, 0xa1, 0xed, - 0x80, 0x6b, 0x98, 0x33, 0x46, 0x70, 0x9a, 0xa9, 0x47, 0x3d, 0xbd, 0x94, 0x7a, 0x5b, 0xfa, 0x34, - 0xb1, 0x6a, 0x07, 0x68, 0x18, 0x6c, 0xdb, 0x3f, 0xb8, 0x6d, 0xf7, 0xea, 0xc2, 0x6e, 0x7b, 0x9a, - 0x0e, 0x96, 0x63, 0x12, 0x09, 0xca, 0x99, 0xbe, 0x94, 0x85, 0x9d, 0x9b, 0xdb, 0x2b, 0xef, 0x0e, - 0x2d, 0xe5, 0xdb, 0xa1, 0xa5, 0xd8, 0xef, 0x55, 0x70, 0xff, 0x3c, 0x65, 0x2e, 0x11, 0x21, 0x67, - 0x82, 0x68, 0x9b, 0x00, 0xe0, 0x01, 0x62, 0x8c, 0x04, 0xa9, 0x90, 0x4c, 0x66, 0xeb, 0xd6, 0x34, - 0xb1, 0xd6, 0x66, 0x42, 0x0a, 0x9f, 0xed, 0x56, 0x67, 0x46, 0xdb, 0xd3, 0x1e, 0x80, 0xe5, 0x90, - 0x47, 0x72, 0xa1, 0x5d, 0x9b, 0x26, 0xd6, 0xf5, 0x1c, 0x99, 0x39, 0x6c, 0xb7, 0x92, 0x7e, 0xb5, - 0x3d, 0xfb, 0x73, 0x09, 0x54, 0x3b, 0xc2, 0x7f, 0x46, 0x98, 0xb7, 0xb7, 0x7f, 0x39, 0x25, 0x79, - 0xab, 0x82, 0xd5, 0xbc, 0x33, 0x3d, 0x0f, 0x49, 0x94, 0xd5, 0x65, 0xb5, 0xb9, 0xeb, 0x5c, 0x68, - 0x3e, 0xe2, 0x86, 0xf3, 0x4b, 0x7d, 0xba, 0x59, 0xb0, 0x5d, 0x24, 0x51, 0xcb, 0x38, 0x4a, 0x2c, - 0x65, 0x9a, 0x58, 0xda, 0xec, 0x79, 0x8b, 0x34, 0xb6, 0x0b, 0xc2, 0xe2, 0x9e, 0xf6, 0x14, 0xdc, - 0x8c, 0x48, 0x80, 0x24, 0x8d, 0x49, 0x4f, 0xd2, 0x21, 0xe1, 0x23, 0xa9, 0x97, 0xd7, 0xd5, 0x8d, - 0x72, 0xeb, 0xee, 0x34, 0xb1, 0x6e, 0xe7, 0xf4, 0xcf, 0x37, 0x6c, 0xf7, 0xc6, 0xfc, 0x68, 0x2f, - 0x3f, 0x39, 0xd5, 0x44, 0x08, 0xd6, 0x8a, 0xba, 0x15, 0x0d, 0x33, 0xc0, 0x8a, 0x20, 0xaf, 0x47, - 0x84, 0x61, 0x92, 0x95, 0xb0, 0xec, 0x16, 0x76, 0xf3, 0xa4, 0x04, 0x96, 0x3a, 0xc2, 0xd7, 0xbe, - 0xa8, 0xe0, 0xce, 0xef, 0x87, 0xb2, 0xeb, 0xfc, 0xf9, 0x6f, 0xe3, 0x9c, 0x37, 0x4c, 0xc6, 0xf3, - 0xff, 0x1d, 0xb1, 0x78, 0xed, 0x07, 0x15, 0x54, 0x66, 0x83, 0xb3, 0xf3, 0x97, 0x49, 0x72, 0xdc, - 0x78, 0xf2, 0x4f, 0xf8, 0x5c, 0x50, 0xeb, 0xe5, 0xd1, 0xd8, 0x54, 0x8f, 0xc7, 0xa6, 0x7a, 0x32, - 0x36, 0xd5, 0x8f, 0x13, 0x53, 0x39, 0x9e, 0x98, 0xca, 0xd7, 0x89, 0xa9, 0xbc, 0xe8, 0xfa, 0x54, - 0x0e, 0x46, 0x7d, 0x07, 0xf3, 0x21, 0xc4, 0x5c, 0x0c, 0xb9, 0x80, 0xb4, 0x8f, 0xeb, 0x3e, 0x87, - 0xf1, 0x16, 0x1c, 0x72, 0x6f, 0x14, 0x10, 0x91, 0xae, 0x18, 0x01, 0x9b, 0x5b, 0xf5, 0x45, 0xea, - 0xfa, 0x59, 0x4b, 0x4e, 0x1e, 0x84, 0x44, 0xf4, 0x2b, 0xd9, 0x96, 0x79, 0xf8, 0x3d, 0x00, 0x00, - 0xff, 0xff, 0xf0, 0x81, 0x7c, 0xb2, 0x24, 0x05, 0x00, 0x00, + // 507 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x31, 0x6f, 0xd3, 0x40, + 0x14, 0xc7, 0xed, 0x36, 0xa4, 0xcd, 0x15, 0x04, 0x58, 0x95, 0x08, 0x11, 0x38, 0x55, 0x60, 0x28, + 0x43, 0xee, 0x94, 0x80, 0x54, 0x09, 0xc4, 0x40, 0x55, 0x86, 0x0c, 0x91, 0x22, 0xd3, 0x01, 0x31, + 0x10, 0x5d, 0xce, 0x4f, 0xce, 0x51, 0xe7, 0x9e, 0xf1, 0x9d, 0x4d, 0x19, 0xd8, 0x99, 0x10, 0x1f, + 0xa1, 0xdf, 0x86, 0x8e, 0x1d, 0x99, 0x50, 0x95, 0x2c, 0xfd, 0x18, 0xc8, 0x76, 0xe3, 0x54, 0xa2, + 0x54, 0x85, 0x76, 0xf3, 0x7b, 0xa7, 0xdf, 0xfb, 0xbf, 0xff, 0x7b, 0x77, 0x26, 0x2f, 0xe4, 0x48, + 0x30, 0x1e, 0x45, 0xa1, 0x14, 0xdc, 0x48, 0x54, 0x9a, 0x49, 0x65, 0x20, 0x16, 0x63, 0x2e, 0xd5, + 0x90, 0x0b, 0x81, 0x89, 0x32, 0x9a, 0x09, 0x54, 0x26, 0xc6, 0x30, 0x84, 0x98, 0xa5, 0x1d, 0x66, + 0xf6, 0x69, 0x14, 0xa3, 0x41, 0xa7, 0x2b, 0x47, 0x82, 0x9e, 0x85, 0xe9, 0x39, 0x30, 0x5d, 0xc0, + 0x34, 0xed, 0x34, 0xd6, 0x03, 0x0c, 0x30, 0xc7, 0x59, 0xf6, 0x55, 0x54, 0x6a, 0x3c, 0xbb, 0x54, + 0x1b, 0x69, 0x87, 0x45, 0x5c, 0xec, 0x81, 0x29, 0xa8, 0xd6, 0x17, 0xf2, 0xa0, 0xaf, 0x03, 0x0f, + 0x02, 0xa9, 0x0d, 0xc4, 0xbd, 0x92, 0x78, 0x55, 0x00, 0xce, 0x3a, 0xb9, 0x81, 0x9f, 0x14, 0xc4, + 0x75, 0x7b, 0xc3, 0xde, 0xac, 0x79, 0x45, 0xe0, 0x3c, 0x22, 0xb7, 0x04, 0x2a, 0x05, 0x22, 0x13, + 0x1a, 0x4a, 0xbf, 0xbe, 0x94, 0x9f, 0xde, 0x5c, 0x24, 0x7b, 0xbe, 0x53, 0x27, 0x2b, 0x29, 0xc4, + 0x5a, 0xa2, 0xaa, 0x2f, 0xe7, 0xc7, 0xf3, 0xf0, 0xf9, 0xea, 0xd7, 0x83, 0xa6, 0x75, 0x72, 0xd0, + 0xb4, 0x5a, 0xef, 0xc9, 0xe3, 0x8b, 0xe4, 0x3d, 0xd0, 0x11, 0x2a, 0x0d, 0xce, 0x43, 0x42, 0xc4, + 0x98, 0x2b, 0x05, 0x61, 0xa6, 0x56, 0xf4, 0x52, 0x3b, 0xcd, 0xf4, 0x7c, 0xe7, 0x1e, 0x59, 0x89, + 0x30, 0x36, 0x8b, 0x4e, 0xaa, 0x59, 0xd8, 0xf3, 0x5b, 0x27, 0x36, 0xa9, 0xf5, 0x75, 0xf0, 0x06, + 0x94, 0xbf, 0xbb, 0x7f, 0x15, 0x33, 0x7b, 0x64, 0xad, 0x98, 0xdb, 0xd0, 0xe7, 0x86, 0xe7, 0x86, + 0xd6, 0xba, 0x3b, 0xf4, 0x52, 0xdb, 0x4b, 0x3b, 0xf4, 0x0f, 0x67, 0x83, 0xbc, 0xd8, 0x0e, 0x37, + 0x7c, 0xbb, 0x72, 0xf8, 0xab, 0x69, 0x79, 0x24, 0x2a, 0x33, 0xce, 0x13, 0x72, 0x27, 0x86, 0x90, + 0x1b, 0x99, 0xc2, 0xd0, 0xc8, 0x09, 0x60, 0x62, 0xea, 0x95, 0x0d, 0x7b, 0xb3, 0xe2, 0xdd, 0x9e, + 0xe7, 0x77, 0x8b, 0xf4, 0x99, 0x51, 0x32, 0x72, 0xb7, 0x74, 0x5a, 0xce, 0xad, 0x41, 0x56, 0x35, + 0x7c, 0x4c, 0x40, 0x09, 0xc8, 0x4d, 0x57, 0xbc, 0x32, 0xee, 0x1e, 0x2f, 0x91, 0xe5, 0xbe, 0x0e, + 0x9c, 0x1f, 0x36, 0xb9, 0xff, 0xf7, 0x0b, 0x30, 0xa0, 0xff, 0x7e, 0x43, 0xe9, 0x45, 0x3b, 0x6d, + 0xbc, 0xbd, 0xee, 0x8a, 0xa5, 0xdb, 0x6f, 0x36, 0xa9, 0x9e, 0xae, 0xfa, 0xe5, 0x7f, 0x8a, 0x14, + 0x78, 0xe3, 0xf5, 0x95, 0xf0, 0x79, 0x43, 0xdb, 0x1f, 0x0e, 0xa7, 0xae, 0x7d, 0x34, 0x75, 0xed, + 0xe3, 0xa9, 0x6b, 0x7f, 0x9f, 0xb9, 0xd6, 0xd1, 0xcc, 0xb5, 0x7e, 0xce, 0x5c, 0xeb, 0xdd, 0x20, + 0x90, 0x66, 0x9c, 0x8c, 0xa8, 0xc0, 0x09, 0x13, 0xa8, 0x27, 0xa8, 0x99, 0x1c, 0x89, 0x76, 0x80, + 0x2c, 0xdd, 0x62, 0x13, 0xf4, 0x93, 0x10, 0x74, 0xf6, 0x9a, 0x35, 0xeb, 0x6e, 0xb5, 0x17, 0xd2, + 0xed, 0xf3, 0xfe, 0x27, 0xe6, 0x73, 0x04, 0x7a, 0x54, 0xcd, 0x1f, 0xf4, 0xd3, 0xdf, 0x01, 0x00, + 0x00, 0xff, 0xff, 0xce, 0xb7, 0x7e, 0xfb, 0x8f, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go b/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go index 8e551ec1d62..ddfc654e631 100644 --- a/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go +++ b/modules/apps/27-interchain-accounts/genesis/types/genesis.pb.go @@ -27,8 +27,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the interchain accounts genesis state type GenesisState struct { - ControllerGenesisState ControllerGenesisState `protobuf:"bytes,1,opt,name=controller_genesis_state,json=controllerGenesisState,proto3" json:"controller_genesis_state" yaml:"controller_genesis_state"` - HostGenesisState HostGenesisState `protobuf:"bytes,2,opt,name=host_genesis_state,json=hostGenesisState,proto3" json:"host_genesis_state" yaml:"host_genesis_state"` + ControllerGenesisState ControllerGenesisState `protobuf:"bytes,1,opt,name=controller_genesis_state,json=controllerGenesisState,proto3" json:"controller_genesis_state"` + HostGenesisState HostGenesisState `protobuf:"bytes,2,opt,name=host_genesis_state,json=hostGenesisState,proto3" json:"host_genesis_state"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -80,8 +80,8 @@ func (m *GenesisState) GetHostGenesisState() HostGenesisState { // ControllerGenesisState defines the interchain accounts controller genesis state type ControllerGenesisState struct { - ActiveChannels []ActiveChannel `protobuf:"bytes,1,rep,name=active_channels,json=activeChannels,proto3" json:"active_channels" yaml:"active_channels"` - InterchainAccounts []RegisteredInterchainAccount `protobuf:"bytes,2,rep,name=interchain_accounts,json=interchainAccounts,proto3" json:"interchain_accounts" yaml:"interchain_accounts"` + ActiveChannels []ActiveChannel `protobuf:"bytes,1,rep,name=active_channels,json=activeChannels,proto3" json:"active_channels"` + InterchainAccounts []RegisteredInterchainAccount `protobuf:"bytes,2,rep,name=interchain_accounts,json=interchainAccounts,proto3" json:"interchain_accounts"` Ports []string `protobuf:"bytes,3,rep,name=ports,proto3" json:"ports,omitempty"` Params types.Params `protobuf:"bytes,4,opt,name=params,proto3" json:"params"` } @@ -149,8 +149,8 @@ func (m *ControllerGenesisState) GetParams() types.Params { // HostGenesisState defines the interchain accounts host genesis state type HostGenesisState struct { - ActiveChannels []ActiveChannel `protobuf:"bytes,1,rep,name=active_channels,json=activeChannels,proto3" json:"active_channels" yaml:"active_channels"` - InterchainAccounts []RegisteredInterchainAccount `protobuf:"bytes,2,rep,name=interchain_accounts,json=interchainAccounts,proto3" json:"interchain_accounts" yaml:"interchain_accounts"` + ActiveChannels []ActiveChannel `protobuf:"bytes,1,rep,name=active_channels,json=activeChannels,proto3" json:"active_channels"` + InterchainAccounts []RegisteredInterchainAccount `protobuf:"bytes,2,rep,name=interchain_accounts,json=interchainAccounts,proto3" json:"interchain_accounts"` Port string `protobuf:"bytes,3,opt,name=port,proto3" json:"port,omitempty"` Params types1.Params `protobuf:"bytes,4,opt,name=params,proto3" json:"params"` } @@ -219,10 +219,10 @@ func (m *HostGenesisState) GetParams() types1.Params { // ActiveChannel contains a connection ID, port ID and associated active channel ID, as well as a boolean flag to // indicate if the channel is middleware enabled type ActiveChannel struct { - ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` - PortId string `protobuf:"bytes,2,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` - ChannelId string `protobuf:"bytes,3,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` - IsMiddlewareEnabled bool `protobuf:"varint,4,opt,name=is_middleware_enabled,json=isMiddlewareEnabled,proto3" json:"is_middleware_enabled,omitempty" yaml:"is_middleware_enabled"` + ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` + PortId string `protobuf:"bytes,2,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` + ChannelId string `protobuf:"bytes,3,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` + IsMiddlewareEnabled bool `protobuf:"varint,4,opt,name=is_middleware_enabled,json=isMiddlewareEnabled,proto3" json:"is_middleware_enabled,omitempty"` } func (m *ActiveChannel) Reset() { *m = ActiveChannel{} } @@ -288,9 +288,9 @@ func (m *ActiveChannel) GetIsMiddlewareEnabled() bool { // RegisteredInterchainAccount contains a connection ID, port ID and associated interchain account address type RegisteredInterchainAccount struct { - ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` - PortId string `protobuf:"bytes,2,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` - AccountAddress string `protobuf:"bytes,3,opt,name=account_address,json=accountAddress,proto3" json:"account_address,omitempty" yaml:"account_address"` + ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` + PortId string `protobuf:"bytes,2,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` + AccountAddress string `protobuf:"bytes,3,opt,name=account_address,json=accountAddress,proto3" json:"account_address,omitempty"` } func (m *RegisteredInterchainAccount) Reset() { *m = RegisteredInterchainAccount{} } @@ -360,51 +360,44 @@ func init() { } var fileDescriptor_d4aa48c8e29a1947 = []byte{ - // 692 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x95, 0x4d, 0x6b, 0xdb, 0x3e, - 0x1c, 0xc7, 0xe3, 0xa4, 0xff, 0xfe, 0x17, 0xf5, 0x61, 0x9d, 0xfa, 0x80, 0x97, 0x0d, 0x3b, 0xf3, - 0x65, 0x81, 0x51, 0x9b, 0x76, 0x85, 0x42, 0xa1, 0x83, 0x38, 0x8c, 0x2e, 0xb0, 0xc2, 0xf0, 0x76, - 0x18, 0xbb, 0x18, 0x45, 0x16, 0x8e, 0xc0, 0xb1, 0x82, 0xa5, 0x66, 0xf4, 0x15, 0xf4, 0x3a, 0xf6, - 0x0e, 0x76, 0x1b, 0x7b, 0x01, 0x7b, 0x0d, 0x3d, 0x8d, 0x1e, 0x77, 0x0a, 0xa3, 0x7d, 0x07, 0x79, - 0x05, 0x43, 0xb2, 0x9a, 0xa4, 0x69, 0x3a, 0x92, 0xcb, 0x4e, 0x3b, 0x59, 0x0f, 0xbf, 0xef, 0xf7, - 0xf7, 0x91, 0x7e, 0xb2, 0x04, 0x0e, 0x69, 0x0b, 0x7b, 0xa8, 0xdb, 0x4d, 0x28, 0x46, 0x82, 0xb2, - 0x94, 0x7b, 0x34, 0x15, 0x24, 0xc3, 0x6d, 0x44, 0xd3, 0x10, 0x61, 0xcc, 0x4e, 0x52, 0xc1, 0xbd, - 0x98, 0xa4, 0x84, 0x53, 0xee, 0xf5, 0x76, 0xae, 0x9b, 0x6e, 0x37, 0x63, 0x82, 0x41, 0x8f, 0xb6, - 0xb0, 0x3b, 0x2e, 0x77, 0xa7, 0xc8, 0xdd, 0x6b, 0x4d, 0x6f, 0xa7, 0xb2, 0x11, 0xb3, 0x98, 0x29, - 0xad, 0x27, 0x5b, 0xb9, 0x4d, 0xa5, 0x31, 0x13, 0x05, 0x66, 0xa9, 0xc8, 0x58, 0x92, 0x90, 0x4c, - 0x82, 0x8c, 0x7a, 0xda, 0x64, 0x7f, 0x26, 0x93, 0x36, 0xe3, 0x42, 0xca, 0xe5, 0x37, 0x17, 0x3a, - 0x17, 0x45, 0xb0, 0x7c, 0x94, 0x23, 0xbe, 0x15, 0x48, 0x10, 0xf8, 0xcd, 0x00, 0xe6, 0xc8, 0x3e, - 0xd4, 0xf8, 0x21, 0x97, 0x93, 0xa6, 0x51, 0x35, 0x6a, 0x4b, 0xbb, 0x47, 0xee, 0x9c, 0x2b, 0x77, - 0x1b, 0x43, 0xc3, 0xf1, 0x5c, 0xfe, 0xd3, 0xf3, 0xbe, 0x5d, 0x18, 0xf4, 0x6d, 0xfb, 0x14, 0x75, - 0x92, 0x03, 0xe7, 0xae, 0xb4, 0x4e, 0xb0, 0x85, 0xa7, 0x1a, 0xc0, 0xcf, 0x06, 0x80, 0x72, 0x31, - 0x13, 0x98, 0x45, 0x85, 0x59, 0x9f, 0x1b, 0xf3, 0x15, 0xe3, 0xe2, 0x06, 0xe0, 0x13, 0x0d, 0xf8, - 0x30, 0x07, 0xbc, 0x9d, 0xca, 0x09, 0xd6, 0xda, 0x13, 0x22, 0xe7, 0x7b, 0x09, 0x6c, 0x4d, 0x5f, - 0x30, 0x3c, 0x33, 0xc0, 0x7d, 0x84, 0x05, 0xed, 0x91, 0x10, 0xb7, 0x51, 0x9a, 0x92, 0x84, 0x9b, - 0x46, 0xb5, 0x54, 0x5b, 0xda, 0x7d, 0x31, 0x37, 0x6c, 0x5d, 0xf9, 0x34, 0x72, 0x1b, 0xdf, 0xd2, - 0xa4, 0x5b, 0x39, 0xe9, 0x44, 0x12, 0x27, 0x58, 0x45, 0xe3, 0xe1, 0x1c, 0x7e, 0x31, 0xc0, 0xfa, - 0x94, 0x04, 0x66, 0x51, 0xd1, 0xbc, 0x9e, 0x9b, 0x26, 0x20, 0x31, 0xe5, 0x82, 0x64, 0x24, 0x6a, - 0x0e, 0x03, 0xeb, 0x79, 0x9c, 0xef, 0x68, 0xb6, 0x4a, 0xce, 0x36, 0xc5, 0xc9, 0x09, 0x20, 0x9d, - 0x94, 0x71, 0xb8, 0x01, 0xfe, 0xeb, 0xb2, 0x4c, 0x70, 0xb3, 0x54, 0x2d, 0xd5, 0xca, 0x41, 0xde, - 0x81, 0xef, 0xc1, 0x62, 0x17, 0x65, 0xa8, 0xc3, 0xcd, 0x05, 0x55, 0xe6, 0x83, 0xd9, 0x58, 0xc7, - 0x7e, 0x99, 0xde, 0x8e, 0xfb, 0x46, 0x39, 0xf8, 0x0b, 0x92, 0x2c, 0xd0, 0x7e, 0xce, 0xd7, 0x12, - 0x58, 0x9b, 0x3c, 0x02, 0xff, 0x4a, 0x36, 0x57, 0xc9, 0x20, 0x58, 0x90, 0x55, 0x32, 0x4b, 0x55, - 0xa3, 0x56, 0x0e, 0x54, 0x1b, 0x06, 0x13, 0x05, 0xdb, 0x9b, 0x8d, 0x54, 0x5d, 0x52, 0x77, 0x95, - 0xea, 0xac, 0x08, 0x56, 0x6e, 0xec, 0x26, 0x3c, 0x04, 0x2b, 0x98, 0xa5, 0x29, 0xc1, 0xd2, 0x31, - 0xa4, 0x91, 0xba, 0xab, 0xca, 0xbe, 0x39, 0xe8, 0xdb, 0x1b, 0xc3, 0xeb, 0x65, 0x34, 0xed, 0x04, - 0xcb, 0xa3, 0x7e, 0x33, 0x82, 0xcf, 0xc0, 0xff, 0x12, 0x56, 0x0a, 0x8b, 0x4a, 0x08, 0x07, 0x7d, - 0x7b, 0x35, 0x17, 0xea, 0x09, 0x27, 0x58, 0x94, 0xad, 0x66, 0x04, 0xf7, 0x00, 0xd0, 0x65, 0x92, - 0xf1, 0x6a, 0xad, 0xfe, 0xe6, 0xa0, 0x6f, 0x3f, 0xd0, 0x89, 0x86, 0x73, 0x4e, 0x50, 0xd6, 0x9d, - 0x66, 0x04, 0xdf, 0x81, 0x4d, 0xca, 0xc3, 0x0e, 0x8d, 0xa2, 0x84, 0x7c, 0x44, 0x19, 0x09, 0x49, - 0x8a, 0x5a, 0x09, 0x89, 0xd4, 0xb6, 0xdc, 0xf3, 0xab, 0x83, 0xbe, 0xfd, 0x58, 0x6f, 0xf7, 0xb4, - 0x30, 0x27, 0x58, 0xa7, 0xfc, 0x78, 0x38, 0xfc, 0x52, 0x8f, 0xfe, 0x30, 0xc0, 0xa3, 0x3f, 0x54, - 0xf2, 0xaf, 0xee, 0x4b, 0x43, 0xfe, 0x2a, 0x2a, 0x6d, 0x88, 0xa2, 0x28, 0x23, 0x9c, 0xeb, 0xcd, - 0xa9, 0x8c, 0x1f, 0xf3, 0x1b, 0x01, 0xea, 0x98, 0xab, 0x91, 0x7a, 0x3e, 0xe0, 0xc7, 0xe7, 0x97, - 0x96, 0x71, 0x71, 0x69, 0x19, 0xbf, 0x2e, 0x2d, 0xe3, 0xd3, 0x95, 0x55, 0xb8, 0xb8, 0xb2, 0x0a, - 0x3f, 0xaf, 0xac, 0xc2, 0x87, 0xe3, 0x98, 0x8a, 0xf6, 0x49, 0xcb, 0xc5, 0xac, 0xe3, 0x61, 0xc6, - 0x3b, 0x8c, 0xcb, 0x27, 0x78, 0x3b, 0x66, 0x5e, 0x6f, 0xdf, 0xeb, 0xb0, 0xe8, 0x24, 0x21, 0x5c, - 0x3e, 0x82, 0xdc, 0xdb, 0xdd, 0xdf, 0x1e, 0x1d, 0xa9, 0xed, 0x5b, 0x4f, 0xb9, 0x38, 0xed, 0x12, - 0xde, 0x5a, 0x54, 0x2f, 0xe0, 0xf3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x33, 0x7f, 0xe2, 0xc0, - 0x07, 0x08, 0x00, 0x00, + // 591 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x95, 0x4f, 0x8b, 0xd3, 0x4e, + 0x18, 0xc7, 0x9b, 0xb4, 0xbf, 0xfe, 0xec, 0xec, 0x1f, 0x97, 0xd9, 0x75, 0x0d, 0x2b, 0xc6, 0x52, + 0x0f, 0xf6, 0xd2, 0x84, 0x56, 0xa1, 0x20, 0x28, 0x74, 0x8b, 0xac, 0x05, 0x17, 0x24, 0x5e, 0xc4, + 0x4b, 0x98, 0x4e, 0x86, 0x74, 0x20, 0xc9, 0x84, 0x3c, 0xd3, 0x8a, 0x67, 0x05, 0x8f, 0xfa, 0x12, + 0x7c, 0x39, 0x7b, 0xdc, 0xa3, 0x27, 0x91, 0xf6, 0x05, 0xf8, 0x0a, 0x04, 0x99, 0x49, 0xb6, 0xad, + 0xb5, 0x4a, 0x8b, 0x47, 0x4f, 0x99, 0x79, 0xbe, 0x79, 0xbe, 0xcf, 0x27, 0xcf, 0x93, 0x64, 0xd0, + 0x23, 0x3e, 0xa4, 0x2e, 0x49, 0xd3, 0x88, 0x53, 0x22, 0xb9, 0x48, 0xc0, 0xe5, 0x89, 0x64, 0x19, + 0x1d, 0x11, 0x9e, 0xf8, 0x84, 0x52, 0x31, 0x4e, 0x24, 0xb8, 0x21, 0x4b, 0x18, 0x70, 0x70, 0x27, + 0xed, 0xab, 0xa5, 0x93, 0x66, 0x42, 0x0a, 0xec, 0xf2, 0x21, 0x75, 0x96, 0xd3, 0x9d, 0x35, 0xe9, + 0xce, 0x55, 0xce, 0xa4, 0x7d, 0x72, 0x14, 0x8a, 0x50, 0xe8, 0x5c, 0x57, 0xad, 0x72, 0x9b, 0x93, + 0xfe, 0x46, 0x14, 0x54, 0x24, 0x32, 0x13, 0x51, 0xc4, 0x32, 0x05, 0xb2, 0xd8, 0x15, 0x26, 0xdd, + 0x8d, 0x4c, 0x46, 0x02, 0xa4, 0x4a, 0x57, 0xd7, 0x3c, 0xb1, 0xf1, 0xc1, 0x44, 0xbb, 0x67, 0x39, + 0xe2, 0x0b, 0x49, 0x24, 0xc3, 0xef, 0x0d, 0x64, 0x2d, 0xec, 0xfd, 0x02, 0xdf, 0x07, 0x25, 0x5a, + 0x46, 0xdd, 0x68, 0xee, 0x74, 0xce, 0x9c, 0x2d, 0x9f, 0xdc, 0xe9, 0xcf, 0x0d, 0x97, 0x6b, 0x9d, + 0x56, 0x2e, 0xbe, 0xdc, 0x29, 0x79, 0xc7, 0x74, 0xad, 0x8a, 0xc7, 0x08, 0x2b, 0xd0, 0x15, 0x04, + 0x53, 0x23, 0xf4, 0xb6, 0x46, 0x78, 0x2a, 0x40, 0xae, 0x29, 0x7e, 0x30, 0x5a, 0x89, 0x37, 0xbe, + 0x9b, 0xe8, 0x78, 0x3d, 0x2f, 0x8e, 0xd1, 0x75, 0x42, 0x25, 0x9f, 0x30, 0x9f, 0x8e, 0x48, 0x92, + 0xb0, 0x08, 0x2c, 0xa3, 0x5e, 0x6e, 0xee, 0x74, 0x1e, 0x6f, 0x8d, 0xd3, 0xd3, 0x3e, 0xfd, 0xdc, + 0xa6, 0x60, 0xd9, 0x27, 0xcb, 0x41, 0xc0, 0x6f, 0x0d, 0x74, 0xb8, 0xc6, 0xc6, 0x32, 0x75, 0xcd, + 0x67, 0x5b, 0xd7, 0xf4, 0x58, 0xc8, 0x41, 0xb2, 0x8c, 0x05, 0x83, 0xf9, 0x8d, 0xbd, 0xfc, 0xbe, + 0x82, 0x00, 0xf3, 0x55, 0x01, 0xf0, 0x11, 0xfa, 0x2f, 0x15, 0x99, 0x04, 0xab, 0x5c, 0x2f, 0x37, + 0x6b, 0x5e, 0xbe, 0xc1, 0x2f, 0x51, 0x35, 0x25, 0x19, 0x89, 0xc1, 0xaa, 0xe8, 0x81, 0x3c, 0xdc, + 0x8c, 0x66, 0xe9, 0xc5, 0x9d, 0xb4, 0x9d, 0xe7, 0xda, 0xa1, 0xa8, 0x5d, 0xf8, 0x35, 0xbe, 0x99, + 0xe8, 0x60, 0x75, 0x58, 0xff, 0x66, 0xe7, 0x31, 0xaa, 0xa8, 0x66, 0x5b, 0xe5, 0xba, 0xd1, 0xac, + 0x79, 0x7a, 0x8d, 0xbd, 0x95, 0xbe, 0x3f, 0xd8, 0x8c, 0x45, 0x7f, 0xf1, 0xbf, 0xeb, 0xf8, 0x27, + 0x03, 0xed, 0xfd, 0xd4, 0x15, 0x7c, 0x17, 0xed, 0x51, 0x91, 0x24, 0x8c, 0x2a, 0x47, 0x9f, 0x07, + 0xfa, 0xc3, 0xaf, 0x79, 0xbb, 0x8b, 0xe0, 0x20, 0xc0, 0x37, 0xd1, 0xff, 0x0a, 0x49, 0xc9, 0xa6, + 0x96, 0xab, 0x6a, 0x3b, 0x08, 0xf0, 0x6d, 0x84, 0x8a, 0x29, 0x29, 0x2d, 0xa7, 0xaf, 0x15, 0x91, + 0x41, 0x80, 0x3b, 0xe8, 0x06, 0x07, 0x3f, 0xe6, 0x41, 0x10, 0xb1, 0xd7, 0x24, 0x63, 0x3e, 0x4b, + 0xc8, 0x30, 0x62, 0x81, 0x7e, 0xa2, 0x6b, 0xde, 0x21, 0x87, 0xf3, 0xb9, 0xf6, 0x24, 0x97, 0x1a, + 0xef, 0x0c, 0x74, 0xeb, 0x0f, 0x4d, 0xfc, 0x4b, 0xe0, 0x7b, 0xea, 0xed, 0xd2, 0x46, 0x3e, 0x09, + 0x82, 0x8c, 0x01, 0x14, 0xd4, 0xfb, 0x45, 0xb8, 0x97, 0x47, 0x4f, 0xc3, 0x8b, 0xa9, 0x6d, 0x5c, + 0x4e, 0x6d, 0xe3, 0xeb, 0xd4, 0x36, 0x3e, 0xce, 0xec, 0xd2, 0xe5, 0xcc, 0x2e, 0x7d, 0x9e, 0xd9, + 0xa5, 0x57, 0xe7, 0x21, 0x97, 0xa3, 0xf1, 0xd0, 0xa1, 0x22, 0x76, 0xa9, 0x80, 0x58, 0x80, 0x3a, + 0x1e, 0x5a, 0xa1, 0x70, 0x27, 0x5d, 0x37, 0x16, 0xc1, 0x38, 0x62, 0xa0, 0x7e, 0xd0, 0xe0, 0x76, + 0xba, 0xad, 0xc5, 0x84, 0x5a, 0xbf, 0x1c, 0x33, 0xf2, 0x4d, 0xca, 0x60, 0x58, 0xd5, 0x7f, 0xe7, + 0xfb, 0x3f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x56, 0x6b, 0x4d, 0x28, 0xa3, 0x06, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/modules/apps/27-interchain-accounts/host/types/host.pb.go b/modules/apps/27-interchain-accounts/host/types/host.pb.go index 4b2cc0c6218..7d233d3aa4c 100644 --- a/modules/apps/27-interchain-accounts/host/types/host.pb.go +++ b/modules/apps/27-interchain-accounts/host/types/host.pb.go @@ -5,7 +5,6 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" math "math" @@ -27,9 +26,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // The following parameters may be used to disable the host submodule. type Params struct { // host_enabled enables or disables the host submodule. - HostEnabled bool `protobuf:"varint,1,opt,name=host_enabled,json=hostEnabled,proto3" json:"host_enabled,omitempty" yaml:"host_enabled"` + HostEnabled bool `protobuf:"varint,1,opt,name=host_enabled,json=hostEnabled,proto3" json:"host_enabled,omitempty"` // allow_messages defines a list of sdk message typeURLs allowed to be executed on a host chain. - AllowMessages []string `protobuf:"bytes,2,rep,name=allow_messages,json=allowMessages,proto3" json:"allow_messages,omitempty" yaml:"allow_messages"` + AllowMessages []string `protobuf:"bytes,2,rep,name=allow_messages,json=allowMessages,proto3" json:"allow_messages,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -88,26 +87,23 @@ func init() { } var fileDescriptor_48e202774f13d08e = []byte{ - // 290 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xcf, 0x4c, 0x4a, 0xd6, - 0x4f, 0x2c, 0x28, 0xc8, 0xc9, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0xcf, 0xcc, 0x2b, - 0x49, 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x8b, 0x4f, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x29, - 0xd6, 0xcf, 0xc8, 0x2f, 0x2e, 0xd1, 0x2f, 0x33, 0x04, 0xd3, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, - 0x42, 0x3a, 0x99, 0x49, 0xc9, 0x7a, 0xc8, 0x1a, 0xf5, 0xb0, 0x68, 0xd4, 0x03, 0x6b, 0x28, 0x33, - 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x6b, 0xd4, 0x07, 0xb1, 0x20, 0x66, 0x28, 0xb5, 0x31, - 0x72, 0xb1, 0x05, 0x24, 0x16, 0x25, 0xe6, 0x16, 0x0b, 0x59, 0x71, 0xf1, 0x80, 0xd4, 0xc6, 0xa7, - 0xe6, 0x25, 0x26, 0xe5, 0xa4, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x38, 0x89, 0x7f, 0xba, - 0x27, 0x2f, 0x5c, 0x99, 0x98, 0x9b, 0x63, 0xa5, 0x84, 0x2c, 0xab, 0x14, 0xc4, 0x0d, 0xe2, 0xba, - 0x42, 0x78, 0x42, 0x0e, 0x5c, 0x7c, 0x89, 0x39, 0x39, 0xf9, 0xe5, 0xf1, 0xb9, 0xa9, 0xc5, 0xc5, - 0x89, 0xe9, 0xa9, 0xc5, 0x12, 0x4c, 0x0a, 0xcc, 0x1a, 0x9c, 0x4e, 0x92, 0x9f, 0xee, 0xc9, 0x8b, - 0x42, 0x74, 0xa3, 0xca, 0x2b, 0x05, 0xf1, 0x82, 0x05, 0x7c, 0xa1, 0x7c, 0xa7, 0x94, 0x13, 0x8f, - 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, - 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xf2, 0x4a, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, - 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0xcf, 0x4c, 0x4a, 0xd6, 0x4d, - 0xcf, 0xd7, 0x2f, 0x33, 0xd7, 0xcf, 0xcd, 0x4f, 0x29, 0xcd, 0x49, 0x2d, 0x06, 0x85, 0x5f, 0xb1, - 0xbe, 0x91, 0xb9, 0x2e, 0x22, 0x04, 0x74, 0x51, 0x83, 0xae, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, - 0x0d, 0xec, 0x6b, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xac, 0x86, 0x51, 0x17, 0x74, 0x01, - 0x00, 0x00, + // 245 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0xcf, 0xbf, 0x4a, 0xc5, 0x30, + 0x14, 0xc7, 0xf1, 0x46, 0xe1, 0xa2, 0xf5, 0xcf, 0xd0, 0xe9, 0x4e, 0xe1, 0x2a, 0x08, 0x77, 0xb0, + 0x09, 0x57, 0x87, 0xee, 0x82, 0x8b, 0x20, 0x48, 0x47, 0x97, 0x92, 0xa4, 0xa1, 0x0d, 0x24, 0x39, + 0xa5, 0x27, 0xad, 0xf8, 0x16, 0x3e, 0x96, 0x63, 0x47, 0x47, 0x69, 0x5f, 0x44, 0x5a, 0x05, 0x15, + 0xee, 0x74, 0xe0, 0x03, 0x3f, 0x38, 0xdf, 0x38, 0x33, 0x52, 0x71, 0xd1, 0x34, 0xd6, 0x28, 0x11, + 0x0c, 0x78, 0xe4, 0xc6, 0x07, 0xdd, 0xaa, 0x5a, 0x18, 0x5f, 0x08, 0xa5, 0xa0, 0xf3, 0x01, 0x79, + 0x0d, 0x18, 0x78, 0xbf, 0x5b, 0x2e, 0x6b, 0x5a, 0x08, 0x90, 0x5c, 0x1b, 0xa9, 0xd8, 0xdf, 0x21, + 0xdb, 0x33, 0x64, 0xcb, 0xa0, 0xdf, 0x5d, 0xe6, 0xf1, 0xea, 0x49, 0xb4, 0xc2, 0x61, 0x72, 0x11, + 0x9f, 0xce, 0x58, 0x68, 0x2f, 0xa4, 0xd5, 0xe5, 0x9a, 0x6c, 0xc8, 0xf6, 0x28, 0x3f, 0x99, 0xed, + 0xfe, 0x9b, 0x92, 0xab, 0xf8, 0x5c, 0x58, 0x0b, 0x2f, 0x85, 0xd3, 0x88, 0xa2, 0xd2, 0xb8, 0x3e, + 0xd8, 0x1c, 0x6e, 0x8f, 0xf3, 0xb3, 0x45, 0x1f, 0x7f, 0xf0, 0xae, 0x7c, 0x1f, 0x29, 0x19, 0x46, + 0x4a, 0x3e, 0x47, 0x4a, 0xde, 0x26, 0x1a, 0x0d, 0x13, 0x8d, 0x3e, 0x26, 0x1a, 0x3d, 0x3f, 0x54, + 0x26, 0xd4, 0x9d, 0x64, 0x0a, 0x1c, 0x57, 0x80, 0x0e, 0x90, 0x1b, 0xa9, 0xd2, 0x0a, 0x78, 0x9f, + 0x71, 0x07, 0x65, 0x67, 0x35, 0xce, 0xd1, 0xc8, 0x6f, 0xb2, 0xf4, 0xf7, 0xed, 0xf4, 0x7f, 0x6f, + 0x78, 0x6d, 0x34, 0xca, 0xd5, 0x92, 0x7b, 0xfb, 0x15, 0x00, 0x00, 0xff, 0xff, 0xcc, 0xb5, 0x3b, + 0x6b, 0x29, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/modules/apps/27-interchain-accounts/types/account.pb.go b/modules/apps/27-interchain-accounts/types/account.pb.go index 67273dfd591..0e5745799e8 100644 --- a/modules/apps/27-interchain-accounts/types/account.pb.go +++ b/modules/apps/27-interchain-accounts/types/account.pb.go @@ -27,8 +27,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // An InterchainAccount is defined as a BaseAccount & the address of the account owner on the controller chain type InterchainAccount struct { - *types.BaseAccount `protobuf:"bytes,1,opt,name=base_account,json=baseAccount,proto3,embedded=base_account" json:"base_account,omitempty" yaml:"base_account"` - AccountOwner string `protobuf:"bytes,2,opt,name=account_owner,json=accountOwner,proto3" json:"account_owner,omitempty" yaml:"account_owner"` + *types.BaseAccount `protobuf:"bytes,1,opt,name=base_account,json=baseAccount,proto3,embedded=base_account" json:"base_account,omitempty"` + AccountOwner string `protobuf:"bytes,2,opt,name=account_owner,json=accountOwner,proto3" json:"account_owner,omitempty"` } func (m *InterchainAccount) Reset() { *m = InterchainAccount{} } @@ -72,7 +72,7 @@ func init() { } var fileDescriptor_5561bd92625bf7da = []byte{ - // 344 bytes of a gzipped FileDescriptorProto + // 320 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xcd, 0x4c, 0x4a, 0xd6, 0x4f, 0x2c, 0x28, 0xc8, 0xc9, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0xcf, 0xcc, 0x2b, 0x49, 0x2d, 0x4a, 0xce, 0x48, 0xcc, 0xcc, 0x8b, 0x4f, 0x4c, 0x4e, 0xce, 0x2f, 0xcd, 0x2b, 0x29, @@ -80,21 +80,19 @@ var fileDescriptor_5561bd92625bf7da = []byte{ 0x92, 0xf5, 0x90, 0xb5, 0xe9, 0x61, 0xd1, 0xa6, 0x57, 0x66, 0x28, 0x25, 0x99, 0x9c, 0x5f, 0x9c, 0x9b, 0x5f, 0x1c, 0x0f, 0xd6, 0xa6, 0x0f, 0xe1, 0x40, 0xcc, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x87, 0x88, 0x83, 0x58, 0x50, 0x51, 0x39, 0x88, 0x1a, 0xfd, 0xc4, 0xd2, 0x92, 0x0c, 0xfd, 0x32, - 0xc3, 0xa4, 0xd4, 0x92, 0x44, 0x43, 0x30, 0x07, 0x22, 0xaf, 0xf4, 0x87, 0x91, 0x4b, 0xd0, 0x13, - 0x6e, 0x97, 0x23, 0xc4, 0x2a, 0xa1, 0x04, 0x2e, 0x9e, 0xa4, 0xc4, 0xe2, 0x54, 0x98, 0xd5, 0x12, + 0xc3, 0xa4, 0xd4, 0x92, 0x44, 0x43, 0x30, 0x07, 0x22, 0xaf, 0x74, 0x9a, 0x91, 0x4b, 0xd0, 0x13, + 0x6e, 0x97, 0x23, 0xc4, 0x2a, 0x21, 0x4f, 0x2e, 0x9e, 0xa4, 0xc4, 0xe2, 0x54, 0x98, 0xd5, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x0a, 0x7a, 0x50, 0x0b, 0xc1, 0xfa, 0xa1, 0x86, 0xe9, 0x39, - 0x25, 0x16, 0xa7, 0x42, 0xf5, 0x39, 0x49, 0x5f, 0xb8, 0x27, 0xcf, 0xf8, 0xe9, 0x9e, 0xbc, 0x70, - 0x65, 0x62, 0x6e, 0x8e, 0x95, 0x12, 0xb2, 0x19, 0x4a, 0x41, 0xdc, 0x49, 0x08, 0x95, 0x42, 0xb6, - 0x5c, 0xbc, 0x50, 0x89, 0xf8, 0xfc, 0xf2, 0xbc, 0xd4, 0x22, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x4e, - 0x27, 0x89, 0x4f, 0xf7, 0xe4, 0x45, 0x20, 0x9a, 0x51, 0xa4, 0x95, 0x82, 0x78, 0xa0, 0x7c, 0x7f, - 0x10, 0xd7, 0xca, 0xad, 0x63, 0x81, 0x3c, 0xc3, 0x8c, 0x05, 0xf2, 0x0c, 0xa7, 0xb6, 0xe8, 0x5a, - 0x11, 0x19, 0x78, 0x7a, 0x18, 0xfe, 0xf4, 0x74, 0x8a, 0x3f, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, - 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, - 0x63, 0x39, 0x86, 0x28, 0xd7, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x68, - 0x38, 0xeb, 0x67, 0x26, 0x25, 0xeb, 0xa6, 0xe7, 0xeb, 0x97, 0x99, 0xeb, 0xe7, 0xe6, 0xa7, 0x94, - 0xe6, 0xa4, 0x16, 0x83, 0x62, 0xba, 0x58, 0xdf, 0xc8, 0x5c, 0x17, 0x61, 0xa1, 0x2e, 0x3c, 0x92, - 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xc1, 0x6c, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, - 0xae, 0x11, 0x4f, 0x20, 0x19, 0x02, 0x00, 0x00, + 0x25, 0x16, 0xa7, 0x42, 0xf5, 0x39, 0xb1, 0x5c, 0xb8, 0x27, 0xcf, 0x18, 0xc4, 0x9d, 0x84, 0x10, + 0x12, 0x52, 0xe6, 0xe2, 0x85, 0x9a, 0x12, 0x9f, 0x5f, 0x9e, 0x97, 0x5a, 0x24, 0xc1, 0xa4, 0xc0, + 0xa8, 0xc1, 0x19, 0xc4, 0x03, 0x15, 0xf4, 0x07, 0x89, 0x59, 0xb9, 0x75, 0x2c, 0x90, 0x67, 0x98, + 0xb1, 0x40, 0x9e, 0xe1, 0xd4, 0x16, 0x5d, 0x2b, 0x22, 0xc3, 0x42, 0x0f, 0xc3, 0xd9, 0x9e, 0x4e, + 0xf1, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, + 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xe5, 0x9a, 0x9e, 0x59, 0x92, + 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x0b, 0x0d, 0x36, 0xfd, 0xcc, 0xa4, 0x64, 0xdd, 0xf4, 0x7c, + 0xfd, 0x32, 0x73, 0xfd, 0xdc, 0xfc, 0x94, 0xd2, 0x9c, 0xd4, 0x62, 0x50, 0xc4, 0x15, 0xeb, 0x1b, + 0x99, 0xeb, 0x22, 0x2c, 0xd4, 0x85, 0xc7, 0x59, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0x38, + 0xd4, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd5, 0xd6, 0xd0, 0x9d, 0xe8, 0x01, 0x00, 0x00, } func (m *InterchainAccount) Marshal() (dAtA []byte, err error) { diff --git a/modules/apps/27-interchain-accounts/types/metadata.pb.go b/modules/apps/27-interchain-accounts/types/metadata.pb.go index 38294e2732f..6299045a6d0 100644 --- a/modules/apps/27-interchain-accounts/types/metadata.pb.go +++ b/modules/apps/27-interchain-accounts/types/metadata.pb.go @@ -5,7 +5,6 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" math "math" @@ -29,9 +28,9 @@ type Metadata struct { // version defines the ICS27 protocol version Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` // controller_connection_id is the connection identifier associated with the controller chain - ControllerConnectionId string `protobuf:"bytes,2,opt,name=controller_connection_id,json=controllerConnectionId,proto3" json:"controller_connection_id,omitempty" yaml:"controller_connection_id"` + ControllerConnectionId string `protobuf:"bytes,2,opt,name=controller_connection_id,json=controllerConnectionId,proto3" json:"controller_connection_id,omitempty"` // host_connection_id is the connection identifier associated with the host chain - HostConnectionId string `protobuf:"bytes,3,opt,name=host_connection_id,json=hostConnectionId,proto3" json:"host_connection_id,omitempty" yaml:"host_connection_id"` + HostConnectionId string `protobuf:"bytes,3,opt,name=host_connection_id,json=hostConnectionId,proto3" json:"host_connection_id,omitempty"` // address defines the interchain account address to be fulfilled upon the OnChanOpenTry handshake step // NOTE: the address field is empty on the OnChanOpenInit handshake step Address string `protobuf:"bytes,4,opt,name=address,proto3" json:"address,omitempty"` @@ -125,29 +124,26 @@ func init() { } var fileDescriptor_c29c32e397d1f21e = []byte{ - // 349 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xcf, 0x4a, 0xeb, 0x40, - 0x18, 0xc5, 0x9b, 0xde, 0x6b, 0x5b, 0x67, 0x25, 0x83, 0xe8, 0x58, 0x30, 0x95, 0xb8, 0xd0, 0x4d, - 0x33, 0x54, 0xc1, 0x82, 0xcb, 0x8a, 0x0b, 0x11, 0x37, 0xc5, 0x95, 0x20, 0x61, 0x32, 0x33, 0xa4, - 0x03, 0xc9, 0x7c, 0x21, 0x33, 0x0d, 0xed, 0x5b, 0xf8, 0x06, 0xbe, 0x8e, 0xcb, 0x2e, 0x5d, 0x15, - 0x69, 0xdf, 0xa0, 0x4f, 0x20, 0x49, 0x6b, 0xeb, 0xdf, 0x5d, 0x4e, 0xce, 0x39, 0xbf, 0x8f, 0xe1, - 0xa0, 0x0b, 0x15, 0x72, 0xca, 0xd2, 0x34, 0x56, 0x9c, 0x59, 0x05, 0xda, 0x50, 0xa5, 0xad, 0xcc, - 0xf8, 0x80, 0x29, 0x1d, 0x30, 0xce, 0x61, 0xa8, 0xad, 0xa1, 0x79, 0x87, 0x26, 0xd2, 0x32, 0xc1, - 0x2c, 0xf3, 0xd3, 0x0c, 0x2c, 0xe0, 0x13, 0x15, 0x72, 0xff, 0x73, 0xcf, 0xff, 0xa5, 0xe7, 0xe7, - 0x9d, 0xe6, 0x6e, 0x04, 0x11, 0x94, 0x1d, 0x5a, 0x7c, 0x2d, 0xeb, 0xde, 0x73, 0x15, 0x35, 0xee, - 0x56, 0x44, 0x4c, 0x50, 0x3d, 0x97, 0x99, 0x51, 0xa0, 0x89, 0x73, 0xe4, 0x9c, 0x6e, 0xf7, 0x3f, - 0x24, 0x7e, 0x44, 0x84, 0x83, 0xb6, 0x19, 0xc4, 0xb1, 0xcc, 0x02, 0x0e, 0x5a, 0x4b, 0x5e, 0x5c, - 0x0b, 0x94, 0x20, 0xd5, 0x22, 0xda, 0x3b, 0x5e, 0x4c, 0x5b, 0xad, 0x31, 0x4b, 0xe2, 0x4b, 0xef, - 0xaf, 0xa4, 0xd7, 0xdf, 0xdb, 0x58, 0x57, 0x6b, 0xe7, 0x46, 0xe0, 0x5b, 0x84, 0x07, 0x60, 0xec, - 0x37, 0xf0, 0xbf, 0x12, 0x7c, 0xb8, 0x98, 0xb6, 0x0e, 0x96, 0xe0, 0x9f, 0x19, 0xaf, 0xbf, 0x53, - 0xfc, 0xfc, 0x02, 0x23, 0xa8, 0xce, 0x84, 0xc8, 0xa4, 0x31, 0xe4, 0xff, 0xf2, 0x15, 0x2b, 0x89, - 0x9b, 0xa8, 0x21, 0x35, 0x07, 0xa1, 0x74, 0x44, 0xb6, 0x4a, 0x6b, 0xad, 0xf1, 0x3e, 0xaa, 0xdb, - 0x51, 0x60, 0xc7, 0xa9, 0x24, 0xb5, 0xd2, 0xaa, 0xd9, 0xd1, 0xfd, 0x38, 0x95, 0xbd, 0xe0, 0x65, - 0xe6, 0x3a, 0x93, 0x99, 0xeb, 0xbc, 0xcd, 0x5c, 0xe7, 0x69, 0xee, 0x56, 0x26, 0x73, 0xb7, 0xf2, - 0x3a, 0x77, 0x2b, 0x0f, 0xd7, 0x91, 0xb2, 0x83, 0x61, 0xe8, 0x73, 0x48, 0x28, 0x07, 0x93, 0x80, - 0xa1, 0x2a, 0xe4, 0xed, 0x08, 0x68, 0xde, 0xa5, 0x09, 0x88, 0x61, 0x2c, 0x4d, 0x31, 0xa9, 0xa1, - 0x67, 0xdd, 0xf6, 0x66, 0x95, 0xf6, 0x7a, 0xcd, 0xe2, 0x9a, 0x09, 0x6b, 0xe5, 0x12, 0xe7, 0xef, - 0x01, 0x00, 0x00, 0xff, 0xff, 0xa0, 0xb6, 0x31, 0x17, 0x02, 0x02, 0x00, 0x00, + // 303 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xbd, 0x4e, 0xc3, 0x30, + 0x14, 0x85, 0x1b, 0x7e, 0xda, 0xe2, 0x09, 0x79, 0x00, 0x8b, 0x21, 0x42, 0x2c, 0x30, 0xd0, 0x58, + 0x05, 0x89, 0x32, 0x83, 0x18, 0x18, 0x58, 0x10, 0x13, 0x4b, 0xe4, 0x5c, 0x5b, 0xad, 0xa5, 0xc4, + 0x37, 0xb2, 0x6f, 0xa3, 0xf6, 0x2d, 0x78, 0x2c, 0xc6, 0x8e, 0x48, 0x2c, 0xa8, 0x7d, 0x11, 0x94, + 0x50, 0x52, 0x40, 0x8c, 0x47, 0xdf, 0xf9, 0xec, 0xab, 0xc3, 0xae, 0x6c, 0x06, 0x52, 0x95, 0x65, + 0x6e, 0x41, 0x91, 0x45, 0x17, 0xa4, 0x75, 0x64, 0x3c, 0x4c, 0x94, 0x75, 0xa9, 0x02, 0xc0, 0xa9, + 0xa3, 0x20, 0xab, 0xa1, 0x2c, 0x0c, 0x29, 0xad, 0x48, 0x25, 0xa5, 0x47, 0x42, 0x7e, 0x6a, 0x33, + 0x48, 0x7e, 0x7a, 0xc9, 0x3f, 0x5e, 0x52, 0x0d, 0x4f, 0xde, 0x23, 0xd6, 0x7f, 0x58, 0xbb, 0x5c, + 0xb0, 0x5e, 0x65, 0x7c, 0xb0, 0xe8, 0x44, 0x74, 0x1c, 0x9d, 0xed, 0x3d, 0x7e, 0x47, 0x7e, 0xcd, + 0x04, 0xa0, 0x23, 0x8f, 0x79, 0x6e, 0x7c, 0x0a, 0xe8, 0x9c, 0x81, 0xfa, 0xdd, 0xd4, 0x6a, 0xb1, + 0xd5, 0x54, 0x0f, 0x36, 0xfc, 0xb6, 0xc5, 0xf7, 0x9a, 0x9f, 0x33, 0x3e, 0xc1, 0x40, 0x7f, 0x9c, + 0xed, 0xc6, 0xd9, 0xaf, 0xc9, 0xaf, 0xb6, 0x60, 0x3d, 0xa5, 0xb5, 0x37, 0x21, 0x88, 0x9d, 0xaf, + 0x0b, 0xd6, 0x91, 0x1f, 0xb1, 0xbe, 0x71, 0x80, 0xda, 0xba, 0xb1, 0xd8, 0x6d, 0x50, 0x9b, 0xf9, + 0x21, 0xeb, 0xd1, 0x2c, 0xa5, 0x79, 0x69, 0x44, 0xb7, 0x41, 0x5d, 0x9a, 0x3d, 0xcd, 0x4b, 0x73, + 0x93, 0xbe, 0x2e, 0xe3, 0x68, 0xb1, 0x8c, 0xa3, 0x8f, 0x65, 0x1c, 0xbd, 0xac, 0xe2, 0xce, 0x62, + 0x15, 0x77, 0xde, 0x56, 0x71, 0xe7, 0xf9, 0x6e, 0x6c, 0x69, 0x32, 0xcd, 0x12, 0xc0, 0x42, 0x02, + 0x86, 0x02, 0x83, 0xb4, 0x19, 0x0c, 0xc6, 0x28, 0xab, 0x91, 0x2c, 0x50, 0x4f, 0x73, 0x13, 0xea, + 0xe1, 0x83, 0xbc, 0x18, 0x0d, 0x36, 0xdb, 0x0d, 0xda, 0xcd, 0xeb, 0xdf, 0x42, 0xd6, 0x6d, 0xe6, + 0xbe, 0xfc, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x8a, 0xd1, 0xb2, 0xc5, 0xa8, 0x01, 0x00, 0x00, } func (m *Metadata) Marshal() (dAtA []byte, err error) { diff --git a/modules/apps/29-fee/types/ack.pb.go b/modules/apps/29-fee/types/ack.pb.go index eec38c21121..c078e868113 100644 --- a/modules/apps/29-fee/types/ack.pb.go +++ b/modules/apps/29-fee/types/ack.pb.go @@ -5,7 +5,6 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" math "math" @@ -26,11 +25,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // IncentivizedAcknowledgement is the acknowledgement format to be used by applications wrapped in the fee middleware type IncentivizedAcknowledgement struct { // the underlying app acknowledgement bytes - AppAcknowledgement []byte `protobuf:"bytes,1,opt,name=app_acknowledgement,json=appAcknowledgement,proto3" json:"app_acknowledgement,omitempty" yaml:"app_acknowledgement"` + AppAcknowledgement []byte `protobuf:"bytes,1,opt,name=app_acknowledgement,json=appAcknowledgement,proto3" json:"app_acknowledgement,omitempty"` // the relayer address which submits the recv packet message - ForwardRelayerAddress string `protobuf:"bytes,2,opt,name=forward_relayer_address,json=forwardRelayerAddress,proto3" json:"forward_relayer_address,omitempty" yaml:"forward_relayer_address"` + ForwardRelayerAddress string `protobuf:"bytes,2,opt,name=forward_relayer_address,json=forwardRelayerAddress,proto3" json:"forward_relayer_address,omitempty"` // success flag of the base application callback - UnderlyingAppSuccess bool `protobuf:"varint,3,opt,name=underlying_app_success,json=underlyingAppSuccess,proto3" json:"underlying_app_success,omitempty" yaml:"underlying_app_successl"` + UnderlyingAppSuccess bool `protobuf:"varint,3,opt,name=underlying_app_success,json=underlyingAppSuccess,proto3" json:"underlying_app_success,omitempty"` } func (m *IncentivizedAcknowledgement) Reset() { *m = IncentivizedAcknowledgement{} } @@ -94,28 +93,25 @@ func init() { func init() { proto.RegisterFile("ibc/applications/fee/v1/ack.proto", fileDescriptor_ab2834946fb65ea4) } var fileDescriptor_ab2834946fb65ea4 = []byte{ - // 330 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x4a, 0xc3, 0x30, - 0x1c, 0xc6, 0xd7, 0x09, 0xa2, 0xc5, 0x53, 0x9d, 0x6e, 0x4c, 0xc8, 0x66, 0x4f, 0xbb, 0xac, 0x61, - 0x8a, 0x88, 0xde, 0xb6, 0x9b, 0xa7, 0x41, 0xbd, 0xc8, 0x2e, 0x25, 0x4d, 0xff, 0xab, 0x61, 0x69, - 0x12, 0x92, 0xb6, 0xa3, 0x3e, 0x85, 0x0f, 0xe1, 0xc3, 0x78, 0xdc, 0xd1, 0xd3, 0x90, 0xed, 0x0d, - 0xf6, 0x04, 0xd2, 0x55, 0x70, 0xca, 0xbc, 0x85, 0xef, 0xfb, 0xf1, 0x23, 0xfc, 0x3f, 0xfb, 0x92, - 0x85, 0x14, 0x13, 0xa5, 0x38, 0xa3, 0x24, 0x65, 0x52, 0x18, 0x3c, 0x05, 0xc0, 0xf9, 0x00, 0x13, - 0x3a, 0xf3, 0x94, 0x96, 0xa9, 0x74, 0x9a, 0x2c, 0xa4, 0xde, 0x2e, 0xe2, 0x4d, 0x01, 0xbc, 0x7c, - 0xd0, 0x6e, 0xc4, 0x32, 0x96, 0x5b, 0x06, 0x97, 0xaf, 0x0a, 0x77, 0xdf, 0xea, 0xf6, 0xc5, 0x83, - 0xa0, 0x20, 0x52, 0x96, 0xb3, 0x17, 0x88, 0x86, 0x74, 0x26, 0xe4, 0x9c, 0x43, 0x14, 0x43, 0x02, - 0x22, 0x75, 0xc6, 0xf6, 0x29, 0x51, 0x2a, 0x20, 0xbf, 0xe3, 0x96, 0xd5, 0xb5, 0x7a, 0x27, 0x23, - 0xb4, 0x59, 0x76, 0xda, 0x05, 0x49, 0xf8, 0xbd, 0xbb, 0x07, 0x72, 0x7d, 0x87, 0x28, 0xf5, 0x57, - 0x38, 0xb1, 0x9b, 0x53, 0xa9, 0xe7, 0x44, 0x47, 0x81, 0x06, 0x4e, 0x0a, 0xd0, 0x01, 0x89, 0x22, - 0x0d, 0xc6, 0xb4, 0xea, 0x5d, 0xab, 0x77, 0x3c, 0x72, 0x37, 0xcb, 0x0e, 0xaa, 0xa4, 0xff, 0x80, - 0xae, 0x7f, 0xf6, 0xdd, 0xf8, 0x55, 0x31, 0xac, 0x72, 0xe7, 0xc9, 0x3e, 0xcf, 0x44, 0x04, 0x9a, - 0x17, 0x4c, 0xc4, 0x41, 0xf9, 0x25, 0x93, 0x51, 0x5a, 0xaa, 0x0f, 0xba, 0x56, 0xef, 0x68, 0x57, - 0xbd, 0x9f, 0xe3, 0xae, 0xdf, 0xf8, 0x69, 0x86, 0x4a, 0x3d, 0x56, 0xf9, 0x68, 0xfc, 0xbe, 0x42, - 0xd6, 0x62, 0x85, 0xac, 0xcf, 0x15, 0xb2, 0x5e, 0xd7, 0xa8, 0xb6, 0x58, 0xa3, 0xda, 0xc7, 0x1a, - 0xd5, 0x26, 0x37, 0x31, 0x4b, 0x9f, 0xb3, 0xd0, 0xa3, 0x32, 0xc1, 0x54, 0x9a, 0x44, 0x1a, 0xcc, - 0x42, 0xda, 0x8f, 0x25, 0xce, 0x6f, 0x71, 0x22, 0xa3, 0x8c, 0x83, 0x29, 0x27, 0x33, 0xf8, 0xea, - 0xae, 0x5f, 0xae, 0x95, 0x16, 0x0a, 0x4c, 0x78, 0xb8, 0x3d, 0xff, 0xf5, 0x57, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xaa, 0xbb, 0x40, 0x71, 0xd2, 0x01, 0x00, 0x00, + // 283 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0xd0, 0xcb, 0x4a, 0xf4, 0x30, + 0x18, 0xc6, 0xf1, 0xe6, 0xfb, 0x40, 0xb4, 0xb8, 0xaa, 0x87, 0x19, 0x10, 0x42, 0x75, 0xd5, 0xcd, + 0x34, 0x8c, 0x47, 0x5c, 0xd6, 0x9d, 0x2b, 0xa1, 0xee, 0xdc, 0x94, 0x34, 0x79, 0x5b, 0xc3, 0xb4, + 0x49, 0x48, 0xd2, 0x0e, 0xf5, 0x2a, 0xbc, 0x20, 0x2f, 0xc0, 0xe5, 0x2c, 0x5d, 0x4a, 0x7b, 0x23, + 0x52, 0x2b, 0x78, 0xd8, 0xe6, 0x97, 0x87, 0x17, 0xfe, 0xfe, 0xb1, 0xc8, 0x19, 0xa1, 0x5a, 0x57, + 0x82, 0x51, 0x27, 0x94, 0xb4, 0xa4, 0x00, 0x20, 0xed, 0x92, 0x50, 0xb6, 0x8a, 0xb5, 0x51, 0x4e, + 0x05, 0x33, 0x91, 0xb3, 0xf8, 0xe7, 0x97, 0xb8, 0x00, 0x88, 0xdb, 0xe5, 0xc9, 0x0b, 0xf2, 0x8f, + 0x6e, 0x25, 0x03, 0xe9, 0x44, 0x2b, 0x9e, 0x80, 0x27, 0x6c, 0x25, 0xd5, 0xba, 0x02, 0x5e, 0x42, + 0x0d, 0xd2, 0x05, 0xc4, 0xdf, 0xa3, 0x5a, 0x67, 0xf4, 0xf7, 0xf3, 0x1c, 0x85, 0x28, 0xda, 0x4d, + 0x03, 0xaa, 0xf5, 0xdf, 0xc1, 0xa5, 0x3f, 0x2b, 0x94, 0x59, 0x53, 0xc3, 0x33, 0x03, 0x15, 0xed, + 0xc0, 0x64, 0x94, 0x73, 0x03, 0xd6, 0xce, 0xff, 0x85, 0x28, 0xda, 0x49, 0x0f, 0xbe, 0x38, 0x9d, + 0x34, 0x99, 0x30, 0x38, 0xf7, 0x0f, 0x1b, 0xc9, 0xc1, 0x54, 0x9d, 0x90, 0x65, 0x36, 0xde, 0xb4, + 0x0d, 0x63, 0xe3, 0xec, 0x7f, 0x88, 0xa2, 0xed, 0x74, 0xff, 0x5b, 0x13, 0xad, 0xef, 0x27, 0xbb, + 0xb9, 0x7b, 0xed, 0x31, 0xda, 0xf4, 0x18, 0xbd, 0xf7, 0x18, 0x3d, 0x0f, 0xd8, 0xdb, 0x0c, 0xd8, + 0x7b, 0x1b, 0xb0, 0xf7, 0x70, 0x51, 0x0a, 0xf7, 0xd8, 0xe4, 0x31, 0x53, 0x35, 0x61, 0xca, 0xd6, + 0xca, 0x12, 0x91, 0xb3, 0x45, 0xa9, 0x48, 0x7b, 0x45, 0x6a, 0xc5, 0x9b, 0x0a, 0xec, 0x18, 0xcd, + 0x92, 0xd3, 0xeb, 0xc5, 0xd8, 0xcb, 0x75, 0x1a, 0x6c, 0xbe, 0xf5, 0xd9, 0xeb, 0xec, 0x23, 0x00, + 0x00, 0xff, 0xff, 0xfc, 0x47, 0xb1, 0xa5, 0x54, 0x01, 0x00, 0x00, } func (m *IncentivizedAcknowledgement) Marshal() (dAtA []byte, err error) { diff --git a/modules/apps/29-fee/types/fee.pb.go b/modules/apps/29-fee/types/fee.pb.go index 7268ecfb746..6568d3f9310 100644 --- a/modules/apps/29-fee/types/fee.pb.go +++ b/modules/apps/29-fee/types/fee.pb.go @@ -29,11 +29,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Fee defines the ICS29 receive, acknowledgement and timeout fees type Fee struct { // the packet receive fee - RecvFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=recv_fee,json=recvFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"recv_fee" yaml:"recv_fee"` + RecvFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=recv_fee,json=recvFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"recv_fee"` // the packet acknowledgement fee - AckFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=ack_fee,json=ackFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"ack_fee" yaml:"ack_fee"` + AckFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=ack_fee,json=ackFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"ack_fee"` // the packet timeout fee - TimeoutFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=timeout_fee,json=timeoutFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"timeout_fee" yaml:"timeout_fee"` + TimeoutFee github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=timeout_fee,json=timeoutFee,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"timeout_fee"` } func (m *Fee) Reset() { *m = Fee{} } @@ -95,7 +95,7 @@ type PacketFee struct { // fee encapsulates the recv, ack and timeout fees associated with an IBC packet Fee Fee `protobuf:"bytes,1,opt,name=fee,proto3" json:"fee"` // the refund address for unspent fees - RefundAddress string `protobuf:"bytes,2,opt,name=refund_address,json=refundAddress,proto3" json:"refund_address,omitempty" yaml:"refund_address"` + RefundAddress string `protobuf:"bytes,2,opt,name=refund_address,json=refundAddress,proto3" json:"refund_address,omitempty"` // optional list of relayers permitted to receive fees Relayers []string `protobuf:"bytes,3,rep,name=relayers,proto3" json:"relayers,omitempty"` } @@ -157,7 +157,7 @@ func (m *PacketFee) GetRelayers() []string { // PacketFees contains a list of type PacketFee type PacketFees struct { // list of packet fees - PacketFees []PacketFee `protobuf:"bytes,1,rep,name=packet_fees,json=packetFees,proto3" json:"packet_fees" yaml:"packet_fees"` + PacketFees []PacketFee `protobuf:"bytes,1,rep,name=packet_fees,json=packetFees,proto3" json:"packet_fees"` } func (m *PacketFees) Reset() { *m = PacketFees{} } @@ -203,9 +203,9 @@ func (m *PacketFees) GetPacketFees() []PacketFee { // IdentifiedPacketFees contains a list of type PacketFee and associated PacketId type IdentifiedPacketFees struct { // unique packet identifier comprised of the channel ID, port ID and sequence - PacketId types1.PacketId `protobuf:"bytes,1,opt,name=packet_id,json=packetId,proto3" json:"packet_id" yaml:"packet_id"` + PacketId types1.PacketId `protobuf:"bytes,1,opt,name=packet_id,json=packetId,proto3" json:"packet_id"` // list of packet fees - PacketFees []PacketFee `protobuf:"bytes,2,rep,name=packet_fees,json=packetFees,proto3" json:"packet_fees" yaml:"packet_fees"` + PacketFees []PacketFee `protobuf:"bytes,2,rep,name=packet_fees,json=packetFees,proto3" json:"packet_fees"` } func (m *IdentifiedPacketFees) Reset() { *m = IdentifiedPacketFees{} } @@ -265,40 +265,37 @@ func init() { func init() { proto.RegisterFile("ibc/applications/fee/v1/fee.proto", fileDescriptor_cb3319f1af2a53e5) } var fileDescriptor_cb3319f1af2a53e5 = []byte{ - // 525 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0x41, 0x8b, 0x13, 0x31, - 0x14, 0xc7, 0x3b, 0xad, 0xec, 0x6e, 0x53, 0x5c, 0x65, 0x58, 0xb1, 0x5b, 0x74, 0xba, 0xe6, 0xd4, - 0x4b, 0x13, 0x5a, 0x15, 0xd1, 0x93, 0xce, 0x42, 0x61, 0x4f, 0xca, 0xe0, 0xc9, 0x4b, 0xc9, 0x24, - 0xaf, 0xdd, 0xd0, 0xce, 0x64, 0x98, 0x4c, 0x0b, 0xbd, 0xfa, 0x09, 0xfc, 0x06, 0xde, 0xfd, 0x24, - 0x7b, 0x11, 0xf6, 0xe8, 0xa9, 0x4a, 0xfb, 0x0d, 0xf6, 0x2e, 0x48, 0x32, 0x69, 0xe9, 0x2a, 0xcb, - 0xb2, 0xe0, 0x69, 0xf2, 0x92, 0xf7, 0xcf, 0xef, 0x25, 0xef, 0x3f, 0x41, 0xcf, 0x64, 0xcc, 0x29, - 0xcb, 0xb2, 0xa9, 0xe4, 0xac, 0x90, 0x2a, 0xd5, 0x74, 0x04, 0x40, 0xe7, 0x3d, 0xf3, 0x21, 0x59, - 0xae, 0x0a, 0xe5, 0x3f, 0x96, 0x31, 0x27, 0xbb, 0x29, 0xc4, 0xac, 0xcd, 0x7b, 0xad, 0x80, 0x2b, - 0x9d, 0x28, 0x4d, 0x63, 0xa6, 0x8d, 0x24, 0x86, 0x82, 0xf5, 0x28, 0x57, 0x32, 0x2d, 0x85, 0xad, - 0xa3, 0xb1, 0x1a, 0x2b, 0x3b, 0xa4, 0x66, 0xe4, 0x66, 0x2d, 0x91, 0xab, 0x1c, 0x28, 0x3f, 0x67, - 0x69, 0x0a, 0x53, 0x43, 0x73, 0xc3, 0x32, 0x05, 0xff, 0xae, 0xa2, 0xda, 0x00, 0xc0, 0x5f, 0xa0, - 0x83, 0x1c, 0xf8, 0x7c, 0x38, 0x02, 0x68, 0x7a, 0x27, 0xb5, 0x4e, 0xa3, 0x7f, 0x4c, 0x4a, 0x26, - 0x31, 0x4c, 0xe2, 0x98, 0xe4, 0x54, 0xc9, 0x34, 0x3c, 0xbd, 0x58, 0xb6, 0x2b, 0x57, 0xcb, 0xf6, - 0x83, 0x05, 0x4b, 0xa6, 0x6f, 0xf0, 0x46, 0x88, 0xbf, 0xfd, 0x6c, 0x77, 0xc6, 0xb2, 0x38, 0x9f, - 0xc5, 0x84, 0xab, 0x84, 0xba, 0x9a, 0xcb, 0x4f, 0x57, 0x8b, 0x09, 0x2d, 0x16, 0x19, 0x68, 0xbb, - 0x87, 0x8e, 0xf6, 0x8d, 0xcc, 0xa0, 0xe7, 0x68, 0x9f, 0xf1, 0x89, 0x25, 0x57, 0x6f, 0x23, 0x87, - 0x8e, 0x7c, 0x58, 0x92, 0x9d, 0xee, 0x6e, 0xe0, 0x3d, 0xc6, 0x27, 0x86, 0xfb, 0xd9, 0x43, 0x8d, - 0x42, 0x26, 0xa0, 0x66, 0x85, 0x85, 0xd7, 0x6e, 0x83, 0x0f, 0x1c, 0xdc, 0x2f, 0xe1, 0x3b, 0xda, - 0xbb, 0x15, 0x80, 0x9c, 0x72, 0x00, 0x80, 0xbf, 0x7a, 0xa8, 0xfe, 0x81, 0xf1, 0x09, 0x98, 0xc8, - 0x7f, 0x81, 0x6a, 0x65, 0x03, 0xbc, 0x4e, 0xa3, 0xff, 0x84, 0xdc, 0xe0, 0x06, 0x32, 0x00, 0x08, - 0xef, 0x99, 0x62, 0x22, 0x93, 0xee, 0xbf, 0x45, 0x87, 0x39, 0x8c, 0x66, 0xa9, 0x18, 0x32, 0x21, - 0x72, 0xd0, 0xba, 0x59, 0x3d, 0xf1, 0x3a, 0xf5, 0xf0, 0xf8, 0x6a, 0xd9, 0x7e, 0xb4, 0x69, 0xd1, - 0xee, 0x3a, 0x8e, 0xee, 0x97, 0x13, 0xef, 0xca, 0xd8, 0x6f, 0x99, 0xee, 0x4f, 0xd9, 0x02, 0x72, - 0x6d, 0xaf, 0xa1, 0x1e, 0x6d, 0x63, 0x9c, 0x20, 0xb4, 0x2d, 0x50, 0xfb, 0x43, 0xd4, 0xc8, 0x6c, - 0x64, 0x8e, 0xad, 0x9d, 0x55, 0xf0, 0x8d, 0x95, 0x6e, 0x95, 0x61, 0xeb, 0xfa, 0xe5, 0xed, 0x6c, - 0x82, 0x23, 0x94, 0x6d, 0x01, 0xf8, 0xbb, 0x87, 0x8e, 0xce, 0x04, 0xa4, 0x85, 0x1c, 0x49, 0x10, - 0x3b, 0xe4, 0x8f, 0xa8, 0xee, 0x44, 0x52, 0xb8, 0x1b, 0x7a, 0x6a, 0xb9, 0xc6, 0xe0, 0x64, 0xe3, - 0xea, 0x2d, 0xf3, 0x4c, 0x84, 0x4d, 0x87, 0x7c, 0x78, 0x0d, 0x29, 0x05, 0x8e, 0x0e, 0x32, 0x97, - 0xf3, 0xf7, 0x79, 0xaa, 0xff, 0xfb, 0x3c, 0xe1, 0xfb, 0x8b, 0x55, 0xe0, 0x5d, 0xae, 0x02, 0xef, - 0xd7, 0x2a, 0xf0, 0xbe, 0xac, 0x83, 0xca, 0xe5, 0x3a, 0xa8, 0xfc, 0x58, 0x07, 0x95, 0x4f, 0x2f, - 0xff, 0x35, 0x8c, 0x8c, 0x79, 0x77, 0xac, 0xe8, 0xfc, 0x15, 0x4d, 0x94, 0x98, 0x4d, 0x41, 0x9b, - 0xf7, 0x42, 0xd3, 0xfe, 0xeb, 0xae, 0x79, 0x2a, 0xac, 0x87, 0xe2, 0x3d, 0xfb, 0xe3, 0x3e, 0xff, - 0x13, 0x00, 0x00, 0xff, 0xff, 0x63, 0x3f, 0x38, 0xc9, 0x4f, 0x04, 0x00, 0x00, + // 467 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x41, 0x8b, 0x13, 0x31, + 0x14, 0xc7, 0x9b, 0x56, 0x76, 0xb7, 0x29, 0x7a, 0x18, 0x16, 0x5c, 0x8b, 0xce, 0xae, 0x03, 0x42, + 0x2f, 0x4d, 0x6c, 0x55, 0xc4, 0x9b, 0x56, 0x28, 0xf4, 0xa4, 0xf4, 0x22, 0x78, 0x59, 0x32, 0xc9, + 0x9b, 0x6e, 0xe8, 0x74, 0x32, 0x4c, 0xd2, 0xc2, 0xde, 0xfd, 0x00, 0x7e, 0x07, 0x6f, 0x7e, 0x0b, + 0x6f, 0x7b, 0xdc, 0xa3, 0x27, 0x95, 0xf6, 0x8b, 0xc8, 0xcb, 0xc4, 0x61, 0x51, 0xf6, 0x22, 0x3d, + 0xcd, 0x7b, 0x6f, 0xde, 0x7b, 0xbf, 0x7f, 0xf2, 0xf2, 0xe8, 0x63, 0x9d, 0x4a, 0x2e, 0xca, 0x32, + 0xd7, 0x52, 0x38, 0x6d, 0x0a, 0xcb, 0x33, 0x00, 0xbe, 0x19, 0xe1, 0x87, 0x95, 0x95, 0x71, 0x26, + 0xba, 0xaf, 0x53, 0xc9, 0x6e, 0xa6, 0x30, 0xfc, 0xb7, 0x19, 0xf5, 0x63, 0x69, 0xec, 0xca, 0x58, + 0x9e, 0x0a, 0x8b, 0x25, 0x29, 0x38, 0x31, 0xe2, 0xd2, 0xe8, 0xa2, 0x2e, 0xec, 0x1f, 0x2f, 0xcc, + 0xc2, 0x78, 0x93, 0xa3, 0x15, 0xa2, 0x9e, 0x28, 0x4d, 0x05, 0x5c, 0x5e, 0x88, 0xa2, 0x80, 0x1c, + 0x69, 0xc1, 0xac, 0x53, 0x92, 0x6f, 0x6d, 0xda, 0x99, 0x02, 0x44, 0x19, 0x3d, 0xaa, 0x40, 0x6e, + 0xce, 0x33, 0x80, 0x13, 0x72, 0xd6, 0x19, 0xf4, 0xc6, 0x0f, 0x58, 0xcd, 0x64, 0xc8, 0x64, 0x81, + 0xc9, 0xde, 0x1a, 0x5d, 0x4c, 0x9e, 0x5e, 0xfd, 0x38, 0x6d, 0x7d, 0xfd, 0x79, 0x3a, 0x58, 0x68, + 0x77, 0xb1, 0x4e, 0x99, 0x34, 0x2b, 0x1e, 0x04, 0xd6, 0x9f, 0xa1, 0x55, 0x4b, 0xee, 0x2e, 0x4b, + 0xb0, 0xbe, 0xc0, 0xce, 0x0f, 0xb1, 0x39, 0x72, 0x14, 0x3d, 0x14, 0x72, 0xe9, 0x31, 0xed, 0xfd, + 0x63, 0x0e, 0x84, 0x5c, 0x22, 0x25, 0xa7, 0x3d, 0xa7, 0x57, 0x60, 0xd6, 0xce, 0x93, 0x3a, 0xfb, + 0x27, 0xd1, 0xd0, 0x7f, 0x0a, 0x90, 0x7c, 0x22, 0xb4, 0xfb, 0x5e, 0xc8, 0x25, 0xa0, 0x17, 0x3d, + 0xa7, 0x9d, 0xfa, 0x12, 0xc9, 0xa0, 0x37, 0x7e, 0xc8, 0x6e, 0x99, 0x28, 0x9b, 0x02, 0x4c, 0xee, + 0x20, 0x76, 0x8e, 0xe9, 0xd1, 0x13, 0x7a, 0xaf, 0x82, 0x6c, 0x5d, 0xa8, 0x73, 0xa1, 0x54, 0x05, + 0xd6, 0x9e, 0xb4, 0xcf, 0xc8, 0xa0, 0x3b, 0xbf, 0x5b, 0x47, 0xdf, 0xd4, 0xc1, 0xa8, 0x8f, 0x63, + 0xca, 0xc5, 0x25, 0x54, 0xd6, 0x9f, 0xaa, 0x3b, 0x6f, 0xfc, 0xe4, 0x03, 0xa5, 0x8d, 0x0a, 0x1b, + 0xcd, 0x68, 0xaf, 0xf4, 0x1e, 0xde, 0x80, 0x0d, 0x33, 0x4d, 0x6e, 0x95, 0xd3, 0x54, 0x06, 0x51, + 0xb4, 0x6c, 0x5a, 0x25, 0x5f, 0x08, 0x3d, 0x9e, 0x29, 0x28, 0x9c, 0xce, 0x34, 0xa8, 0x1b, 0x8c, + 0xd7, 0xb4, 0x1b, 0x18, 0x5a, 0x85, 0x03, 0x3f, 0xf2, 0x04, 0x7c, 0x73, 0xec, 0xcf, 0x43, 0x6b, + 0xba, 0xcf, 0x54, 0x68, 0x7e, 0x54, 0x06, 0xff, 0x6f, 0x95, 0xed, 0xff, 0x57, 0x39, 0x79, 0x77, + 0xb5, 0x8d, 0xc9, 0xf5, 0x36, 0x26, 0xbf, 0xb6, 0x31, 0xf9, 0xbc, 0x8b, 0x5b, 0xd7, 0xbb, 0xb8, + 0xf5, 0x7d, 0x17, 0xb7, 0x3e, 0xbe, 0xf8, 0x77, 0xaa, 0x3a, 0x95, 0xc3, 0x85, 0xe1, 0x9b, 0x97, + 0x7c, 0x65, 0xd4, 0x3a, 0x07, 0x8b, 0x8b, 0x69, 0xf9, 0xf8, 0xd5, 0x10, 0x77, 0xd2, 0x0f, 0x3a, + 0x3d, 0xf0, 0x1b, 0xf2, 0xec, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x39, 0xec, 0x7b, 0x52, 0xb8, + 0x03, 0x00, 0x00, } func (m *Fee) Marshal() (dAtA []byte, err error) { diff --git a/modules/apps/29-fee/types/genesis.pb.go b/modules/apps/29-fee/types/genesis.pb.go index 8bca28ff748..caca0e2d681 100644 --- a/modules/apps/29-fee/types/genesis.pb.go +++ b/modules/apps/29-fee/types/genesis.pb.go @@ -27,15 +27,15 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the ICS29 fee middleware genesis state type GenesisState struct { // list of identified packet fees - IdentifiedFees []IdentifiedPacketFees `protobuf:"bytes,1,rep,name=identified_fees,json=identifiedFees,proto3" json:"identified_fees" yaml:"identified_fees"` + IdentifiedFees []IdentifiedPacketFees `protobuf:"bytes,1,rep,name=identified_fees,json=identifiedFees,proto3" json:"identified_fees"` // list of fee enabled channels - FeeEnabledChannels []FeeEnabledChannel `protobuf:"bytes,2,rep,name=fee_enabled_channels,json=feeEnabledChannels,proto3" json:"fee_enabled_channels" yaml:"fee_enabled_channels"` + FeeEnabledChannels []FeeEnabledChannel `protobuf:"bytes,2,rep,name=fee_enabled_channels,json=feeEnabledChannels,proto3" json:"fee_enabled_channels"` // list of registered payees - RegisteredPayees []RegisteredPayee `protobuf:"bytes,3,rep,name=registered_payees,json=registeredPayees,proto3" json:"registered_payees" yaml:"registered_payees"` + RegisteredPayees []RegisteredPayee `protobuf:"bytes,3,rep,name=registered_payees,json=registeredPayees,proto3" json:"registered_payees"` // list of registered counterparty payees - RegisteredCounterpartyPayees []RegisteredCounterpartyPayee `protobuf:"bytes,4,rep,name=registered_counterparty_payees,json=registeredCounterpartyPayees,proto3" json:"registered_counterparty_payees" yaml:"registered_counterparty_payees"` + RegisteredCounterpartyPayees []RegisteredCounterpartyPayee `protobuf:"bytes,4,rep,name=registered_counterparty_payees,json=registeredCounterpartyPayees,proto3" json:"registered_counterparty_payees"` // list of forward relayer addresses - ForwardRelayers []ForwardRelayerAddress `protobuf:"bytes,5,rep,name=forward_relayers,json=forwardRelayers,proto3" json:"forward_relayers" yaml:"forward_relayers"` + ForwardRelayers []ForwardRelayerAddress `protobuf:"bytes,5,rep,name=forward_relayers,json=forwardRelayers,proto3" json:"forward_relayers"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -109,9 +109,9 @@ func (m *GenesisState) GetForwardRelayers() []ForwardRelayerAddress { // FeeEnabledChannel contains the PortID & ChannelID for a fee enabled channel type FeeEnabledChannel struct { // unique port identifier - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` // unique channel identifier - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` } func (m *FeeEnabledChannel) Reset() { *m = FeeEnabledChannel{} } @@ -164,7 +164,7 @@ func (m *FeeEnabledChannel) GetChannelId() string { // RegisteredPayee contains the relayer address and payee address for a specific channel type RegisteredPayee struct { // unique channel identifier - ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` // the relayer address Relayer string `protobuf:"bytes,2,opt,name=relayer,proto3" json:"relayer,omitempty"` // the payee address @@ -229,11 +229,11 @@ func (m *RegisteredPayee) GetPayee() string { // for recv fee distribution) type RegisteredCounterpartyPayee struct { // unique channel identifier - ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` // the relayer address Relayer string `protobuf:"bytes,2,opt,name=relayer,proto3" json:"relayer,omitempty"` // the counterparty payee address - CounterpartyPayee string `protobuf:"bytes,3,opt,name=counterparty_payee,json=counterpartyPayee,proto3" json:"counterparty_payee,omitempty" yaml:"counterparty_payee"` + CounterpartyPayee string `protobuf:"bytes,3,opt,name=counterparty_payee,json=counterpartyPayee,proto3" json:"counterparty_payee,omitempty"` } func (m *RegisteredCounterpartyPayee) Reset() { *m = RegisteredCounterpartyPayee{} } @@ -295,7 +295,7 @@ type ForwardRelayerAddress struct { // the forward relayer address Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // unique packet identifer comprised of the channel ID, port ID and sequence - PacketId types.PacketId `protobuf:"bytes,2,opt,name=packet_id,json=packetId,proto3" json:"packet_id" yaml:"packet_id"` + PacketId types.PacketId `protobuf:"bytes,2,opt,name=packet_id,json=packetId,proto3" json:"packet_id"` } func (m *ForwardRelayerAddress) Reset() { *m = ForwardRelayerAddress{} } @@ -358,48 +358,42 @@ func init() { } var fileDescriptor_7191992e856dff95 = []byte{ - // 648 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcd, 0x4e, 0xd4, 0x40, - 0x1c, 0xdf, 0x82, 0x80, 0x0c, 0x06, 0xd8, 0x09, 0x48, 0x05, 0xe9, 0xe2, 0x18, 0x12, 0xa2, 0xd9, - 0x36, 0x20, 0xc6, 0xe8, 0xcd, 0x12, 0x31, 0x9b, 0x98, 0x48, 0x46, 0x4f, 0x5e, 0x36, 0xdd, 0xf6, - 0xdf, 0xa5, 0x71, 0xb7, 0xd3, 0xcc, 0x0c, 0x4b, 0xd6, 0x9b, 0x27, 0xaf, 0xbe, 0x86, 0xf1, 0x11, - 0x7c, 0x01, 0x8e, 0x1c, 0x3d, 0x6d, 0x0c, 0xbc, 0xc1, 0x3e, 0x81, 0x99, 0xce, 0x14, 0x96, 0xfd, - 0x30, 0x1c, 0xbc, 0xcd, 0x74, 0x7e, 0x5f, 0xd3, 0xdf, 0xe4, 0x8f, 0xb6, 0x93, 0x46, 0xe8, 0x05, - 0x59, 0xd6, 0x4a, 0xc2, 0x40, 0x26, 0x2c, 0x15, 0x5e, 0x0c, 0xe0, 0x75, 0x76, 0xbd, 0x26, 0xa4, - 0x20, 0x12, 0xe1, 0x66, 0x9c, 0x49, 0x86, 0xd7, 0x92, 0x46, 0xe8, 0x0e, 0xc2, 0xdc, 0x18, 0xc0, - 0xed, 0xec, 0xae, 0xaf, 0x34, 0x59, 0x93, 0xe5, 0x18, 0x4f, 0xad, 0x34, 0x7c, 0xfd, 0xd1, 0x24, - 0x55, 0xc5, 0x1a, 0x80, 0x84, 0x8c, 0x83, 0x17, 0x1e, 0x07, 0x69, 0x0a, 0x2d, 0x75, 0x6c, 0x96, - 0x1a, 0x42, 0x7e, 0xce, 0xa0, 0x7b, 0x6f, 0x75, 0x8c, 0x0f, 0x32, 0x90, 0x80, 0x3b, 0x68, 0x29, - 0x89, 0x20, 0x95, 0x49, 0x9c, 0x40, 0x54, 0x8f, 0x01, 0x84, 0x6d, 0x6d, 0x4d, 0xef, 0x2c, 0xec, - 0x55, 0xdd, 0x09, 0xf9, 0xdc, 0xda, 0x15, 0xfe, 0x28, 0x08, 0x3f, 0x83, 0x3c, 0x04, 0x10, 0xbe, - 0x73, 0xd6, 0xab, 0x94, 0xfa, 0xbd, 0xca, 0xfd, 0x6e, 0xd0, 0x6e, 0xbd, 0x22, 0x43, 0x9a, 0x84, - 0x2e, 0x5e, 0x7f, 0x51, 0x78, 0xfc, 0xd5, 0x42, 0x2b, 0x31, 0x40, 0x1d, 0xd2, 0xa0, 0xd1, 0x82, - 0xa8, 0x6e, 0x62, 0x0a, 0x7b, 0x2a, 0x77, 0x7f, 0x32, 0xd1, 0xfd, 0x10, 0xe0, 0x8d, 0xe6, 0x1c, - 0x68, 0x8a, 0xff, 0xd8, 0x58, 0x6f, 0x68, 0xeb, 0x71, 0xaa, 0x84, 0xe2, 0x78, 0x98, 0x27, 0xf0, - 0x29, 0x2a, 0x73, 0x68, 0x26, 0x42, 0x02, 0x87, 0xa8, 0x9e, 0x05, 0x5d, 0x75, 0xfb, 0xe9, 0xdc, - 0x7f, 0x67, 0xa2, 0x3f, 0xbd, 0x62, 0x1c, 0x29, 0x82, 0xbf, 0x65, 0xdc, 0x6d, 0xed, 0x3e, 0x22, - 0x48, 0xe8, 0x32, 0xbf, 0x49, 0x11, 0xf8, 0x87, 0x85, 0x9c, 0x01, 0x60, 0xc8, 0x4e, 0x52, 0x09, - 0x3c, 0x0b, 0xb8, 0xec, 0x16, 0x31, 0xee, 0xe4, 0x31, 0xf6, 0x6f, 0x11, 0xe3, 0x60, 0x80, 0xad, - 0x23, 0x55, 0x4d, 0xa4, 0xed, 0x91, 0x48, 0x63, 0x9c, 0x08, 0x7d, 0xc8, 0x27, 0x6b, 0x09, 0xfc, - 0x05, 0x2d, 0xc7, 0x8c, 0x9f, 0x06, 0x3c, 0xaa, 0x73, 0x68, 0x05, 0x5d, 0xe0, 0xc2, 0x9e, 0xc9, - 0xc3, 0xb9, 0x93, 0x3b, 0xd2, 0x04, 0xaa, 0xf1, 0xaf, 0xa3, 0x88, 0x83, 0x10, 0x7e, 0xc5, 0xc4, - 0x5a, 0x33, 0x3d, 0x0d, 0xa9, 0x12, 0xba, 0x14, 0xdf, 0xe0, 0x09, 0xd2, 0x41, 0xe5, 0x91, 0xba, - 0xf1, 0x53, 0x34, 0x97, 0x31, 0x2e, 0xeb, 0x49, 0x64, 0x5b, 0x5b, 0xd6, 0xce, 0xbc, 0x8f, 0xfb, - 0xbd, 0xca, 0xa2, 0xd6, 0x34, 0x07, 0x84, 0xce, 0xaa, 0x55, 0x2d, 0xc2, 0xfb, 0x08, 0x99, 0x37, - 0xa0, 0xf0, 0x53, 0x39, 0x7e, 0xb5, 0xdf, 0xab, 0x94, 0x35, 0xfe, 0xfa, 0x8c, 0xd0, 0x79, 0xb3, - 0xa9, 0x45, 0xe4, 0x14, 0x2d, 0x0d, 0xd5, 0x3c, 0x24, 0x64, 0xdd, 0x4e, 0x08, 0xdb, 0x68, 0xce, - 0x5c, 0x4f, 0x7b, 0xd3, 0x62, 0x8b, 0x57, 0xd0, 0x4c, 0xfe, 0xff, 0xed, 0xe9, 0xfc, 0xbb, 0xde, - 0x90, 0x5f, 0x16, 0xda, 0xf8, 0x47, 0xb3, 0xff, 0x3d, 0xc5, 0x3b, 0x84, 0x47, 0x9f, 0x84, 0x8e, - 0xe4, 0x6f, 0xf6, 0x7b, 0x95, 0x07, 0x46, 0x77, 0x04, 0x43, 0x68, 0x39, 0x1c, 0x4e, 0x47, 0xbe, - 0x59, 0x68, 0x75, 0x6c, 0xf5, 0x2a, 0x41, 0xa0, 0x97, 0x3a, 0x34, 0x2d, 0xb6, 0xf8, 0x23, 0x9a, - 0xcf, 0xf2, 0x29, 0x52, 0xf4, 0xb3, 0xb0, 0xb7, 0x99, 0xbf, 0x2b, 0x35, 0xc7, 0xdc, 0x62, 0x78, - 0x75, 0x76, 0x5d, 0x3d, 0x6b, 0x6a, 0x91, 0x6f, 0x9b, 0x67, 0xb4, 0x6c, 0x2a, 0x2f, 0xd8, 0x84, - 0xde, 0xcd, 0x0a, 0xcc, 0xfb, 0xb3, 0x0b, 0xc7, 0x3a, 0xbf, 0x70, 0xac, 0x3f, 0x17, 0x8e, 0xf5, - 0xfd, 0xd2, 0x29, 0x9d, 0x5f, 0x3a, 0xa5, 0xdf, 0x97, 0x4e, 0xe9, 0xd3, 0xf3, 0x66, 0x22, 0x8f, - 0x4f, 0x1a, 0x6e, 0xc8, 0xda, 0x5e, 0xc8, 0x44, 0x9b, 0x09, 0x2f, 0x69, 0x84, 0xd5, 0x26, 0xf3, - 0x3a, 0x2f, 0xbc, 0x36, 0x8b, 0x4e, 0x5a, 0x20, 0xd4, 0x98, 0x15, 0xde, 0xde, 0xcb, 0xaa, 0x9a, - 0xb0, 0xb2, 0x9b, 0x81, 0x68, 0xcc, 0xe6, 0xe3, 0xf3, 0xd9, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x25, 0x26, 0x40, 0x90, 0xdc, 0x05, 0x00, 0x00, + // 550 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcf, 0x6f, 0xd3, 0x30, + 0x14, 0x6e, 0xf6, 0x93, 0x7a, 0x88, 0xae, 0x56, 0xd1, 0xa2, 0xc1, 0xc2, 0xa8, 0x84, 0x54, 0x21, + 0x35, 0x51, 0x0b, 0x08, 0x71, 0x03, 0x26, 0x86, 0x2a, 0x0e, 0x4c, 0xe5, 0x06, 0x48, 0x21, 0xb1, + 0x5f, 0x32, 0x8b, 0x36, 0x8e, 0x6c, 0xb7, 0xa8, 0x37, 0x2e, 0xdc, 0xe1, 0xbf, 0xda, 0x71, 0x47, + 0x4e, 0x08, 0xb5, 0xff, 0x08, 0xb2, 0xe3, 0x8c, 0xae, 0x23, 0x08, 0x71, 0xf3, 0x7b, 0xef, 0xfb, + 0xde, 0x67, 0x7f, 0x4f, 0xcf, 0xe8, 0x1e, 0x8b, 0x49, 0x10, 0xe5, 0xf9, 0x88, 0x91, 0x48, 0x31, + 0x9e, 0xc9, 0x20, 0x01, 0x08, 0xa6, 0xbd, 0x20, 0x85, 0x0c, 0x24, 0x93, 0x7e, 0x2e, 0xb8, 0xe2, + 0x78, 0x8f, 0xc5, 0xc4, 0x5f, 0x86, 0xf9, 0x09, 0x80, 0x3f, 0xed, 0xed, 0xb7, 0x52, 0x9e, 0x72, + 0x83, 0x09, 0xf4, 0xa9, 0x80, 0xef, 0xdf, 0xad, 0xea, 0xaa, 0x59, 0x4b, 0x10, 0xc2, 0x05, 0x04, + 0xe4, 0x34, 0xca, 0x32, 0x18, 0xe9, 0xb2, 0x3d, 0x16, 0x90, 0xf6, 0xb7, 0x0d, 0x74, 0xfd, 0x65, + 0x71, 0x8d, 0x37, 0x2a, 0x52, 0x80, 0xdf, 0xa3, 0x06, 0xa3, 0x90, 0x29, 0x96, 0x30, 0xa0, 0x61, + 0x02, 0x20, 0x5d, 0xe7, 0x70, 0xbd, 0xb3, 0xd3, 0xef, 0xfa, 0x15, 0xf7, 0xf3, 0x07, 0x17, 0xf8, + 0x93, 0x88, 0x7c, 0x04, 0x75, 0x0c, 0x20, 0x9f, 0x6f, 0x9c, 0xfd, 0xb8, 0x53, 0x1b, 0xde, 0xf8, + 0xdd, 0x4b, 0x67, 0x71, 0x8c, 0x5a, 0x09, 0x40, 0x08, 0x59, 0x14, 0x8f, 0x80, 0x86, 0xf6, 0x2e, + 0xd2, 0x5d, 0x33, 0x12, 0xf7, 0x2b, 0x25, 0x8e, 0x01, 0x5e, 0x14, 0x9c, 0xa3, 0x82, 0x62, 0xfb, + 0xe3, 0x64, 0xb5, 0x20, 0xf1, 0x3b, 0xd4, 0x14, 0x90, 0x32, 0xa9, 0x40, 0x00, 0x0d, 0xf3, 0x68, + 0xa6, 0xdf, 0xb0, 0x6e, 0x04, 0x3a, 0x95, 0x02, 0xc3, 0x0b, 0xc6, 0x89, 0x26, 0xd8, 0xf6, 0xbb, + 0xe2, 0x72, 0x5a, 0xe2, 0xcf, 0x0e, 0xf2, 0x96, 0xba, 0x13, 0x3e, 0xc9, 0x14, 0x88, 0x3c, 0x12, + 0x6a, 0x56, 0x4a, 0x6d, 0x18, 0xa9, 0x87, 0xff, 0x20, 0x75, 0xb4, 0xc4, 0x5e, 0x96, 0xbd, 0x2d, + 0xaa, 0x21, 0x12, 0x87, 0x68, 0x37, 0xe1, 0xe2, 0x53, 0x24, 0x68, 0x28, 0x60, 0x14, 0xcd, 0x40, + 0x48, 0x77, 0xd3, 0x68, 0xfa, 0xd5, 0xfe, 0x15, 0x84, 0x61, 0x81, 0x7f, 0x46, 0xa9, 0x00, 0x59, + 0xce, 0xa8, 0x91, 0x5c, 0x2a, 0xca, 0xf6, 0x2b, 0xd4, 0xbc, 0xe2, 0x37, 0xde, 0x43, 0xdb, 0x39, + 0x17, 0x2a, 0x64, 0xd4, 0x75, 0x0e, 0x9d, 0x4e, 0x7d, 0xb8, 0xa5, 0xc3, 0x01, 0xc5, 0x07, 0x08, + 0xd9, 0x31, 0xea, 0xda, 0x9a, 0xa9, 0xd5, 0x6d, 0x66, 0x40, 0xdb, 0x1f, 0x50, 0x63, 0xc5, 0xdb, + 0x15, 0x86, 0xb3, 0xc2, 0xc0, 0x2e, 0xda, 0xb6, 0xef, 0xb2, 0xdd, 0xca, 0x10, 0xb7, 0xd0, 0xa6, + 0xf1, 0xd8, 0x5d, 0x37, 0xf9, 0x22, 0x68, 0x7f, 0x71, 0xd0, 0xad, 0xbf, 0x78, 0xfa, 0xff, 0x72, + 0x5d, 0x84, 0xaf, 0xce, 0xd7, 0x6a, 0x37, 0xc9, 0xaa, 0x4e, 0x5b, 0xa2, 0x9b, 0x7f, 0xb4, 0x59, + 0x2b, 0x44, 0xc5, 0xd1, 0xaa, 0x97, 0x21, 0x7e, 0x8a, 0xea, 0xb9, 0x59, 0x99, 0xd2, 0xba, 0x9d, + 0xfe, 0x81, 0x99, 0xa1, 0x5e, 0x5a, 0xbf, 0xdc, 0xd4, 0x69, 0xcf, 0x2f, 0x16, 0x6b, 0x40, 0xed, + 0xc8, 0xae, 0xe5, 0x65, 0xfc, 0xfa, 0x6c, 0xee, 0x39, 0xe7, 0x73, 0xcf, 0xf9, 0x39, 0xf7, 0x9c, + 0xaf, 0x0b, 0xaf, 0x76, 0xbe, 0xf0, 0x6a, 0xdf, 0x17, 0x5e, 0xed, 0xed, 0xa3, 0x94, 0xa9, 0xd3, + 0x49, 0xec, 0x13, 0x3e, 0x0e, 0x08, 0x97, 0x63, 0x2e, 0x03, 0x16, 0x93, 0x6e, 0xca, 0x83, 0xe9, + 0xe3, 0x60, 0xcc, 0xe9, 0x64, 0x04, 0x52, 0xff, 0x1f, 0x32, 0xe8, 0x3f, 0xe9, 0xea, 0xaf, 0x43, + 0xcd, 0x72, 0x90, 0xf1, 0x96, 0xf9, 0x17, 0x1e, 0xfc, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x34, 0xa0, + 0xbc, 0xd7, 0xb5, 0x04, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/modules/apps/29-fee/types/metadata.pb.go b/modules/apps/29-fee/types/metadata.pb.go index 5d89eaa8719..8e7e4eda257 100644 --- a/modules/apps/29-fee/types/metadata.pb.go +++ b/modules/apps/29-fee/types/metadata.pb.go @@ -5,7 +5,6 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" math "math" @@ -27,9 +26,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // See ICS004: https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-and-packet-semantics#Versioning type Metadata struct { // fee_version defines the ICS29 fee version - FeeVersion string `protobuf:"bytes,1,opt,name=fee_version,json=feeVersion,proto3" json:"fee_version,omitempty" yaml:"fee_version"` + FeeVersion string `protobuf:"bytes,1,opt,name=fee_version,json=feeVersion,proto3" json:"fee_version,omitempty"` // app_version defines the underlying application version, which may or may not be a JSON encoded bytestring - AppVersion string `protobuf:"bytes,2,opt,name=app_version,json=appVersion,proto3" json:"app_version,omitempty" yaml:"app_version"` + AppVersion string `protobuf:"bytes,2,opt,name=app_version,json=appVersion,proto3" json:"app_version,omitempty"` } func (m *Metadata) Reset() { *m = Metadata{} } @@ -88,23 +87,21 @@ func init() { } var fileDescriptor_03d0f000eda681ce = []byte{ - // 248 bytes of a gzipped FileDescriptorProto + // 214 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcb, 0x4c, 0x4a, 0xd6, 0x4f, 0x2c, 0x28, 0xc8, 0xc9, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0x4f, 0x4b, 0x4d, 0xd5, 0x2f, 0x33, 0xd4, 0xcf, 0x4d, 0x2d, 0x49, 0x4c, 0x49, 0x2c, 0x49, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xcf, 0x4c, 0x4a, 0xd6, 0x43, 0x56, 0xa7, 0x97, 0x96, 0x9a, 0xaa, 0x57, - 0x66, 0x28, 0x25, 0x92, 0x9e, 0x9f, 0x9e, 0x0f, 0x56, 0xa3, 0x0f, 0x62, 0x41, 0x94, 0x2b, 0xd5, - 0x70, 0x71, 0xf8, 0x42, 0x0d, 0x10, 0x32, 0xe7, 0xe2, 0x4e, 0x4b, 0x4d, 0x8d, 0x2f, 0x4b, 0x2d, - 0x2a, 0xce, 0xcc, 0xcf, 0x93, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x74, 0x12, 0xfb, 0x74, 0x4f, 0x5e, - 0xa8, 0x32, 0x31, 0x37, 0xc7, 0x4a, 0x09, 0x49, 0x52, 0x29, 0x88, 0x2b, 0x2d, 0x35, 0x35, 0x0c, - 0xc2, 0x01, 0x69, 0x4c, 0x2c, 0x28, 0x80, 0x6b, 0x64, 0x42, 0xd7, 0x88, 0x24, 0xa9, 0x14, 0xc4, - 0x95, 0x58, 0x50, 0x00, 0xd5, 0xe8, 0xe4, 0x7f, 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, 0xa6, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xc9, 0xf9, - 0xc5, 0xb9, 0xf9, 0xc5, 0xfa, 0x99, 0x49, 0xc9, 0xba, 0xe9, 0xf9, 0xfa, 0x65, 0xe6, 0xfa, 0xb9, - 0xf9, 0x29, 0xa5, 0x39, 0xa9, 0xc5, 0xa0, 0xe0, 0x28, 0xd6, 0x37, 0xb2, 0xd4, 0x05, 0x85, 0x44, - 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x57, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xa6, 0xd7, 0xc2, 0x68, 0x2e, 0x01, 0x00, 0x00, + 0x66, 0xa8, 0xe4, 0xc3, 0xc5, 0xe1, 0x0b, 0x55, 0x2a, 0x24, 0xcf, 0xc5, 0x9d, 0x96, 0x9a, 0x1a, + 0x5f, 0x96, 0x5a, 0x54, 0x9c, 0x99, 0x9f, 0x27, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x19, 0xc4, 0x95, + 0x96, 0x9a, 0x1a, 0x06, 0x11, 0x01, 0x29, 0x48, 0x2c, 0x28, 0x80, 0x2b, 0x60, 0x82, 0x28, 0x48, + 0x2c, 0x28, 0x80, 0x2a, 0x70, 0xf2, 0x3f, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, + 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, + 0x28, 0xd3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xe4, 0xfc, 0xe2, + 0xdc, 0xfc, 0x62, 0xfd, 0xcc, 0xa4, 0x64, 0xdd, 0xf4, 0x7c, 0xfd, 0x32, 0x73, 0xfd, 0xdc, 0xfc, + 0x94, 0xd2, 0x9c, 0xd4, 0x62, 0x90, 0x47, 0x8a, 0xf5, 0x8d, 0x2c, 0x75, 0x41, 0x7e, 0x28, 0xa9, + 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x3b, 0xdf, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x46, 0xa6, + 0x80, 0x8c, 0xe8, 0x00, 0x00, 0x00, } func (m *Metadata) Marshal() (dAtA []byte, err error) { diff --git a/modules/apps/29-fee/types/query.pb.go b/modules/apps/29-fee/types/query.pb.go index 379d32bca12..ee4d344a336 100644 --- a/modules/apps/29-fee/types/query.pb.go +++ b/modules/apps/29-fee/types/query.pb.go @@ -428,7 +428,7 @@ func (m *QueryTotalRecvFeesRequest) GetPacketId() types.PacketId { // QueryTotalRecvFeesResponse defines the response type for the TotalRecvFees rpc type QueryTotalRecvFeesResponse struct { // the total packet receive fees - RecvFees github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=recv_fees,json=recvFees,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"recv_fees" yaml:"recv_fees"` + RecvFees github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=recv_fees,json=recvFees,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"recv_fees"` } func (m *QueryTotalRecvFeesResponse) Reset() { *m = QueryTotalRecvFeesResponse{} } @@ -520,7 +520,7 @@ func (m *QueryTotalAckFeesRequest) GetPacketId() types.PacketId { // QueryTotalAckFeesResponse defines the response type for the TotalAckFees rpc type QueryTotalAckFeesResponse struct { // the total packet acknowledgement fees - AckFees github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=ack_fees,json=ackFees,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"ack_fees" yaml:"ack_fees"` + AckFees github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=ack_fees,json=ackFees,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"ack_fees"` } func (m *QueryTotalAckFeesResponse) Reset() { *m = QueryTotalAckFeesResponse{} } @@ -612,7 +612,7 @@ func (m *QueryTotalTimeoutFeesRequest) GetPacketId() types.PacketId { // QueryTotalTimeoutFeesResponse defines the response type for the TotalTimeoutFees rpc type QueryTotalTimeoutFeesResponse struct { // the total packet timeout fees - TimeoutFees github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=timeout_fees,json=timeoutFees,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"timeout_fees" yaml:"timeout_fees"` + TimeoutFees github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=timeout_fees,json=timeoutFees,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"timeout_fees"` } func (m *QueryTotalTimeoutFeesResponse) Reset() { *m = QueryTotalTimeoutFeesResponse{} } @@ -658,7 +658,7 @@ func (m *QueryTotalTimeoutFeesResponse) GetTimeoutFees() github_com_cosmos_cosmo // QueryPayeeRequest defines the request type for the Payee rpc type QueryPayeeRequest struct { // unique channel identifier - ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` // the relayer address to which the distribution address is registered Relayer string `protobuf:"bytes,2,opt,name=relayer,proto3" json:"relayer,omitempty"` } @@ -713,7 +713,7 @@ func (m *QueryPayeeRequest) GetRelayer() string { // QueryPayeeResponse defines the response type for the Payee rpc type QueryPayeeResponse struct { // the payee address to which packet fees are paid out - PayeeAddress string `protobuf:"bytes,1,opt,name=payee_address,json=payeeAddress,proto3" json:"payee_address,omitempty" yaml:"payee_address"` + PayeeAddress string `protobuf:"bytes,1,opt,name=payee_address,json=payeeAddress,proto3" json:"payee_address,omitempty"` } func (m *QueryPayeeResponse) Reset() { *m = QueryPayeeResponse{} } @@ -759,7 +759,7 @@ func (m *QueryPayeeResponse) GetPayeeAddress() string { // QueryCounterpartyPayeeRequest defines the request type for the CounterpartyPayee rpc type QueryCounterpartyPayeeRequest struct { // unique channel identifier - ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` // the relayer address to which the counterparty is registered Relayer string `protobuf:"bytes,2,opt,name=relayer,proto3" json:"relayer,omitempty"` } @@ -814,7 +814,7 @@ func (m *QueryCounterpartyPayeeRequest) GetRelayer() string { // QueryCounterpartyPayeeResponse defines the response type for the CounterpartyPayee rpc type QueryCounterpartyPayeeResponse struct { // the counterparty payee address used to compensate forward relaying - CounterpartyPayee string `protobuf:"bytes,1,opt,name=counterparty_payee,json=counterpartyPayee,proto3" json:"counterparty_payee,omitempty" yaml:"counterparty_payee"` + CounterpartyPayee string `protobuf:"bytes,1,opt,name=counterparty_payee,json=counterpartyPayee,proto3" json:"counterparty_payee,omitempty"` } func (m *QueryCounterpartyPayeeResponse) Reset() { *m = QueryCounterpartyPayeeResponse{} } @@ -915,7 +915,7 @@ func (m *QueryFeeEnabledChannelsRequest) GetQueryHeight() uint64 { // QueryFeeEnabledChannelsResponse defines the response type for the FeeEnabledChannels rpc type QueryFeeEnabledChannelsResponse struct { // list of fee enabled channels - FeeEnabledChannels []FeeEnabledChannel `protobuf:"bytes,1,rep,name=fee_enabled_channels,json=feeEnabledChannels,proto3" json:"fee_enabled_channels" yaml:"fee_enabled_channels"` + FeeEnabledChannels []FeeEnabledChannel `protobuf:"bytes,1,rep,name=fee_enabled_channels,json=feeEnabledChannels,proto3" json:"fee_enabled_channels"` // pagination defines the pagination in the response. Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -970,9 +970,9 @@ func (m *QueryFeeEnabledChannelsResponse) GetPagination() *query.PageResponse { // QueryFeeEnabledChannelRequest defines the request type for the FeeEnabledChannel rpc type QueryFeeEnabledChannelRequest struct { // unique port identifier - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` // unique channel identifier - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` } func (m *QueryFeeEnabledChannelRequest) Reset() { *m = QueryFeeEnabledChannelRequest{} } @@ -1025,7 +1025,7 @@ func (m *QueryFeeEnabledChannelRequest) GetChannelId() string { // QueryFeeEnabledChannelResponse defines the response type for the FeeEnabledChannel rpc type QueryFeeEnabledChannelResponse struct { // boolean flag representing the fee enabled channel status - FeeEnabled bool `protobuf:"varint,1,opt,name=fee_enabled,json=feeEnabled,proto3" json:"fee_enabled,omitempty" yaml:"fee_enabled"` + FeeEnabled bool `protobuf:"varint,1,opt,name=fee_enabled,json=feeEnabled,proto3" json:"fee_enabled,omitempty"` } func (m *QueryFeeEnabledChannelResponse) Reset() { *m = QueryFeeEnabledChannelResponse{} } @@ -1096,92 +1096,86 @@ func init() { } var fileDescriptor_0638a8a78ca2503c = []byte{ - // 1358 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x51, 0x6f, 0xdb, 0x54, - 0x14, 0xee, 0xcd, 0xba, 0xb5, 0xbd, 0xed, 0x60, 0xb9, 0x2d, 0x2c, 0x0d, 0x6d, 0xd2, 0x79, 0x8c, - 0x95, 0x4e, 0xb5, 0xd5, 0x8c, 0xd1, 0x0d, 0x09, 0x41, 0xd3, 0xd1, 0x52, 0x18, 0x50, 0xb2, 0xbe, - 0x80, 0x40, 0x99, 0xe3, 0xdc, 0xa4, 0x56, 0x53, 0xdb, 0xb3, 0x9d, 0x88, 0xac, 0x2b, 0xb0, 0x89, - 0x0a, 0x24, 0x90, 0x40, 0x42, 0xe2, 0x81, 0x3f, 0x80, 0x40, 0xe2, 0x07, 0xf0, 0x0f, 0xf6, 0x84, - 0x2a, 0xed, 0x01, 0xc4, 0x43, 0x40, 0x2d, 0xe2, 0x91, 0x87, 0x3c, 0xf1, 0x00, 0x12, 0xf2, 0xbd, - 0xc7, 0x89, 0x33, 0xdb, 0x4d, 0x52, 0xb2, 0xf2, 0xd4, 0xd8, 0xe7, 0x9e, 0x73, 0xbe, 0xef, 0xbb, - 0x27, 0xf7, 0x7e, 0x29, 0x3e, 0xab, 0xe6, 0x14, 0x49, 0x36, 0x8c, 0x92, 0xaa, 0xc8, 0xb6, 0xaa, - 0x6b, 0x96, 0x54, 0xa0, 0x54, 0xaa, 0xcc, 0x49, 0x37, 0xcb, 0xd4, 0xac, 0x8a, 0x86, 0xa9, 0xdb, - 0x3a, 0x39, 0xad, 0xe6, 0x14, 0xd1, 0xbb, 0x48, 0x2c, 0x50, 0x2a, 0x56, 0xe6, 0xe2, 0x63, 0x45, - 0xbd, 0xa8, 0xb3, 0x35, 0x92, 0xf3, 0x89, 0x2f, 0x8f, 0x4f, 0x14, 0x75, 0xbd, 0x58, 0xa2, 0x92, - 0x6c, 0xa8, 0x92, 0xac, 0x69, 0xba, 0x0d, 0x49, 0x3c, 0x9a, 0x50, 0x74, 0x6b, 0x53, 0xb7, 0xa4, - 0x9c, 0x6c, 0x39, 0x8d, 0x72, 0xd4, 0x96, 0xe7, 0x24, 0x45, 0x57, 0x35, 0x88, 0xcf, 0x78, 0xe3, - 0x0c, 0x45, 0x63, 0x95, 0x21, 0x17, 0x55, 0x8d, 0x15, 0x83, 0xb5, 0x67, 0xc2, 0xd0, 0x3b, 0xf8, - 0xf8, 0x92, 0x73, 0x61, 0x4b, 0x8a, 0x54, 0xa3, 0x96, 0x6a, 0x79, 0x2b, 0x29, 0xba, 0x49, 0x25, - 0x65, 0x5d, 0xd6, 0x34, 0x5a, 0x72, 0x96, 0xc0, 0x47, 0xbe, 0x44, 0xf8, 0x0c, 0xe1, 0xe4, 0x9b, - 0x0e, 0x9e, 0x15, 0x4d, 0xa1, 0x9a, 0xad, 0x56, 0xd4, 0x5b, 0x34, 0xbf, 0x2a, 0x2b, 0x1b, 0xd4, - 0xb6, 0x32, 0xf4, 0x66, 0x99, 0x5a, 0x36, 0x59, 0xc2, 0xb8, 0x09, 0x32, 0x86, 0xa6, 0xd0, 0xf4, - 0x70, 0xea, 0x29, 0x91, 0x33, 0x12, 0x1d, 0x46, 0x22, 0xd7, 0x15, 0x18, 0x89, 0xab, 0x72, 0x91, - 0x42, 0x6e, 0xc6, 0x93, 0x49, 0xce, 0xe0, 0x11, 0xb6, 0x30, 0xbb, 0x4e, 0xd5, 0xe2, 0xba, 0x1d, - 0x8b, 0x4c, 0xa1, 0xe9, 0xfe, 0xcc, 0x30, 0x7b, 0xf7, 0x32, 0x7b, 0x25, 0xdc, 0x47, 0x78, 0x2a, - 0x1c, 0x8e, 0x65, 0xe8, 0x9a, 0x45, 0x49, 0x01, 0x8f, 0xa9, 0x9e, 0x70, 0xd6, 0xe0, 0xf1, 0x18, - 0x9a, 0x3a, 0x36, 0x3d, 0x9c, 0x9a, 0x15, 0x43, 0x36, 0x56, 0x5c, 0xc9, 0x3b, 0x39, 0x05, 0xd5, - 0xad, 0xb8, 0x44, 0xa9, 0x95, 0xee, 0xbf, 0x57, 0x4b, 0xf6, 0x65, 0x46, 0x55, 0x7f, 0x3f, 0xb2, - 0xdc, 0xc2, 0x3b, 0xc2, 0x78, 0x9f, 0x6f, 0xcb, 0x9b, 0x83, 0xf4, 0x12, 0x17, 0x76, 0x10, 0x4e, - 0x84, 0xb0, 0x72, 0x35, 0x7e, 0x11, 0x0f, 0x71, 0x1a, 0x59, 0x35, 0x0f, 0x12, 0x4f, 0x32, 0x22, - 0xce, 0xf6, 0x89, 0xee, 0x9e, 0x55, 0x9c, 0x26, 0xce, 0xaa, 0x95, 0x3c, 0x00, 0x1f, 0x34, 0xe0, - 0xb9, 0x13, 0x75, 0x3f, 0x0e, 0xdf, 0xec, 0x86, 0xb8, 0x79, 0x3c, 0x1a, 0x20, 0x2e, 0x40, 0x3a, - 0x94, 0xb6, 0xc4, 0xaf, 0xad, 0xf0, 0x23, 0xc2, 0x4f, 0x87, 0xed, 0xf3, 0x92, 0x6e, 0x2e, 0x72, - 0xbe, 0xbd, 0x1e, 0xc0, 0xd3, 0x78, 0xc0, 0xd0, 0x4d, 0x26, 0xb1, 0xa3, 0xce, 0x50, 0xe6, 0x84, - 0xf3, 0xb8, 0x92, 0x27, 0x93, 0x18, 0x83, 0xc4, 0x4e, 0xec, 0x18, 0x8b, 0x0d, 0xc1, 0x9b, 0x00, - 0x69, 0xfb, 0xfd, 0xd2, 0xfe, 0x84, 0xf0, 0x4c, 0x27, 0x84, 0x40, 0xe5, 0x1b, 0x3d, 0x1c, 0xe1, - 0x87, 0x3c, 0xbc, 0xef, 0xe2, 0x71, 0x46, 0x6c, 0x4d, 0xb7, 0xe5, 0x52, 0x86, 0x2a, 0x15, 0xd6, - 0xb3, 0x57, 0x63, 0x2b, 0x7c, 0x8d, 0x70, 0x3c, 0xa8, 0x3e, 0x08, 0x75, 0x1b, 0x0f, 0x99, 0x54, - 0xa9, 0x64, 0x0b, 0x94, 0xba, 0xea, 0x8c, 0xb7, 0xb0, 0x70, 0xf1, 0x2f, 0xea, 0xaa, 0x96, 0xbe, - 0xea, 0x14, 0xaf, 0xd7, 0x92, 0xa7, 0xaa, 0xf2, 0x66, 0xe9, 0x39, 0xa1, 0x91, 0x29, 0x7c, 0xf7, - 0x6b, 0x72, 0xba, 0xa8, 0xda, 0xeb, 0xe5, 0x9c, 0xa8, 0xe8, 0x9b, 0x12, 0x9c, 0xc6, 0xfc, 0xcf, - 0xac, 0x95, 0xdf, 0x90, 0xec, 0xaa, 0x41, 0x2d, 0x56, 0xc4, 0xca, 0x0c, 0x9a, 0x80, 0x42, 0x78, - 0x07, 0xc7, 0x9a, 0xd8, 0x16, 0x94, 0x8d, 0xde, 0x52, 0xff, 0x0a, 0x79, 0xa5, 0x6d, 0x94, 0x07, - 0xe6, 0x55, 0x3c, 0x28, 0x2b, 0x1b, 0x1d, 0x12, 0x5f, 0x04, 0xe2, 0x8f, 0x72, 0xe2, 0x6e, 0x62, - 0x77, 0xbc, 0x07, 0x64, 0x0e, 0x41, 0xb8, 0x81, 0x27, 0x9a, 0xb8, 0xd6, 0xd4, 0x4d, 0xaa, 0x97, - 0xed, 0xde, 0x52, 0xff, 0x06, 0xe1, 0xc9, 0x90, 0x16, 0x40, 0x7f, 0x07, 0xe1, 0x11, 0x9b, 0xbf, - 0xef, 0x50, 0x83, 0x65, 0xd0, 0x60, 0x94, 0x6b, 0xe0, 0x4d, 0xee, 0x4e, 0x87, 0x61, 0xbb, 0x89, - 0x47, 0x50, 0x70, 0x94, 0x01, 0x5d, 0x95, 0xab, 0xd4, 0x3d, 0x54, 0xc8, 0x33, 0x2d, 0xe7, 0x85, - 0xa3, 0xc0, 0x50, 0xfa, 0xb1, 0x7a, 0x2d, 0x19, 0xe5, 0xad, 0x9b, 0x31, 0xc1, 0x7b, 0x8c, 0xc4, - 0xf0, 0x80, 0x49, 0x4b, 0x72, 0x95, 0x9a, 0x70, 0xfc, 0xb8, 0x8f, 0xc2, 0x75, 0x4c, 0xbc, 0x4d, - 0x40, 0x82, 0xe7, 0xf1, 0x49, 0xc3, 0x79, 0x91, 0x95, 0xf3, 0x79, 0x93, 0x5a, 0x16, 0x34, 0x8a, - 0xd5, 0x6b, 0xc9, 0x31, 0xde, 0xa8, 0x25, 0x2c, 0x64, 0x46, 0xd8, 0xf3, 0x02, 0x3c, 0xea, 0x20, - 0xf1, 0xa2, 0x5e, 0xd6, 0x6c, 0x6a, 0x1a, 0xb2, 0x69, 0x3f, 0x5c, 0x16, 0x1a, 0xdc, 0x72, 0x01, - 0x0d, 0x81, 0xd1, 0x35, 0x4c, 0x14, 0x4f, 0x30, 0xcb, 0xf0, 0x42, 0xe7, 0xc9, 0x7a, 0x2d, 0x39, - 0x0e, 0x9d, 0x7d, 0x6b, 0x84, 0x4c, 0x54, 0x79, 0xb0, 0xaa, 0xf0, 0xa9, 0x7b, 0xad, 0x2e, 0x51, - 0xfa, 0x92, 0x26, 0xe7, 0x4a, 0x34, 0x0f, 0xe7, 0xec, 0xff, 0x61, 0x5d, 0xfe, 0x74, 0x2f, 0xd7, - 0x20, 0x34, 0xc0, 0xff, 0x0e, 0xc2, 0x63, 0x05, 0x4a, 0xb3, 0x94, 0xc7, 0xb3, 0xa0, 0xaa, 0x3b, - 0xdc, 0x33, 0xa1, 0xe7, 0xbe, 0xaf, 0x66, 0xfa, 0x2c, 0x4c, 0xfb, 0x13, 0x5c, 0xb2, 0xa0, 0xaa, - 0x42, 0x86, 0x14, 0x7c, 0x58, 0x7a, 0x77, 0x31, 0xdc, 0x75, 0xbf, 0xc3, 0x3e, 0x70, 0xae, 0xfa, - 0x17, 0x9a, 0xf7, 0x2d, 0xdf, 0x63, 0x52, 0xaf, 0x25, 0x1f, 0x81, 0xd1, 0xe5, 0x01, 0xa1, 0x71, - 0x07, 0xb7, 0x4e, 0x63, 0xa4, 0xb3, 0x69, 0x14, 0xde, 0x0a, 0x1b, 0x81, 0x86, 0xe6, 0xf3, 0x78, - 0xd8, 0x23, 0x0e, 0x03, 0x32, 0x98, 0x7e, 0xbc, 0x5e, 0x4b, 0x12, 0x9f, 0x72, 0x42, 0x06, 0x37, - 0x05, 0x4b, 0xfd, 0x11, 0xc5, 0xc7, 0x59, 0x6d, 0xf2, 0x03, 0xc2, 0xa3, 0x01, 0xf7, 0x3a, 0xb9, - 0x1c, 0xba, 0x5f, 0x6d, 0x2c, 0x75, 0xfc, 0xca, 0x21, 0x32, 0x39, 0x1f, 0x61, 0xf6, 0xee, 0xfd, - 0xdf, 0xbf, 0x8c, 0x9c, 0x27, 0xe7, 0x24, 0xf8, 0x11, 0xd0, 0x30, 0xff, 0x41, 0x8e, 0x82, 0x7c, - 0x1e, 0xc1, 0xc4, 0x5f, 0x8e, 0xcc, 0x77, 0x0b, 0xc0, 0x45, 0x7e, 0xb9, 0xfb, 0x44, 0x00, 0xbe, - 0x83, 0x18, 0xf2, 0x0f, 0xc8, 0xb6, 0x0f, 0xb9, 0x3b, 0xb1, 0xd2, 0x56, 0xe3, 0x5e, 0x11, 0x9b, - 0x1b, 0xbe, 0x2d, 0x39, 0x23, 0xd2, 0x12, 0x84, 0xe9, 0xd9, 0x96, 0x2c, 0x07, 0x96, 0xa6, 0xd0, - 0x96, 0xa8, 0xfb, 0x72, 0x3b, 0x48, 0x12, 0xf2, 0x0f, 0xc2, 0x93, 0x07, 0xba, 0x34, 0x92, 0xee, - 0x7a, 0x77, 0x7c, 0x9e, 0x35, 0xbe, 0xf8, 0x9f, 0x6a, 0x80, 0x64, 0xd7, 0x99, 0x62, 0xaf, 0x91, - 0x57, 0x0f, 0x50, 0x2c, 0x48, 0x27, 0x57, 0x9d, 0xc0, 0x89, 0xf8, 0x1b, 0xe1, 0x93, 0x2d, 0x66, - 0x8b, 0xa4, 0x0e, 0xc6, 0x1a, 0xe4, 0xfc, 0xe2, 0x17, 0xbb, 0xca, 0x01, 0x3e, 0x77, 0xf8, 0x08, - 0x6c, 0x91, 0xea, 0xd1, 0x8d, 0x80, 0xed, 0x20, 0xc9, 0x36, 0xac, 0x20, 0xf9, 0x0b, 0xe1, 0x11, - 0xaf, 0xe1, 0x22, 0x73, 0x1d, 0x30, 0x69, 0xf5, 0x7e, 0xf1, 0x54, 0x37, 0x29, 0xc0, 0xfd, 0x43, - 0xce, 0xfd, 0x16, 0x79, 0xef, 0xa8, 0xb9, 0xbb, 0x6e, 0x90, 0x7c, 0x12, 0xc1, 0xa7, 0x1e, 0x34, - 0x5c, 0xe4, 0x52, 0x07, 0x5c, 0xfc, 0x1e, 0x30, 0xfe, 0x6c, 0xb7, 0x69, 0x20, 0xc3, 0x47, 0x5c, - 0x86, 0xf7, 0xc9, 0xed, 0xa3, 0x96, 0xc1, 0x6b, 0x08, 0xc9, 0xb7, 0x08, 0x1f, 0x67, 0x2e, 0x82, - 0xcc, 0x1c, 0x4c, 0xc4, 0xeb, 0x98, 0xe2, 0x17, 0x3a, 0x5a, 0x0b, 0x4c, 0x97, 0x19, 0xd1, 0x05, - 0xf2, 0x42, 0x87, 0x5f, 0x5e, 0xb0, 0x51, 0x96, 0xb4, 0x05, 0x9f, 0xb6, 0x25, 0xe6, 0x7d, 0xc8, - 0x2f, 0x08, 0x47, 0x7d, 0x9e, 0x8a, 0xb4, 0xd9, 0x80, 0x30, 0xd7, 0x17, 0x9f, 0xef, 0x3a, 0x0f, - 0xf8, 0xac, 0x31, 0x3e, 0xaf, 0x93, 0x6b, 0x87, 0xe7, 0xe3, 0x37, 0x76, 0xe4, 0x7b, 0x84, 0x89, - 0xdf, 0x31, 0xb5, 0xbb, 0x9f, 0x42, 0x1d, 0x5f, 0xbb, 0xfb, 0x29, 0xdc, 0x9c, 0x09, 0x4f, 0x32, - 0x7e, 0x09, 0x32, 0xe1, 0xe3, 0xe7, 0xb1, 0x08, 0x64, 0x17, 0xe1, 0xa8, 0xaf, 0x48, 0xbb, 0xcd, - 0x08, 0x73, 0x48, 0xf1, 0xf9, 0xae, 0xf3, 0x00, 0xec, 0x2b, 0x0c, 0xec, 0x55, 0x92, 0x3e, 0xe4, - 0xcd, 0xe0, 0xa1, 0x94, 0x7e, 0xe3, 0xde, 0x5e, 0x02, 0xed, 0xee, 0x25, 0xd0, 0x6f, 0x7b, 0x09, - 0xf4, 0xc5, 0x7e, 0xa2, 0x6f, 0x77, 0x3f, 0xd1, 0xf7, 0xf3, 0x7e, 0xa2, 0xef, 0xed, 0x4b, 0xfe, - 0xdf, 0x4c, 0x6a, 0x4e, 0x99, 0x2d, 0xea, 0x52, 0x65, 0x5e, 0xda, 0xd4, 0xf3, 0xe5, 0x12, 0xb5, - 0x78, 0xf3, 0xd4, 0x95, 0x59, 0xa7, 0x3f, 0xfb, 0x19, 0x95, 0x3b, 0xc1, 0xfe, 0xb7, 0x78, 0xf1, - 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x67, 0x6b, 0x48, 0x88, 0x15, 0x00, 0x00, + // 1251 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xdf, 0x6e, 0xdc, 0xc4, + 0x17, 0xce, 0x6c, 0xd3, 0x26, 0x39, 0x49, 0xa5, 0x5f, 0x26, 0x91, 0x9a, 0x5a, 0xc9, 0x26, 0x75, + 0x7f, 0xa5, 0x21, 0x68, 0x6d, 0xb2, 0x55, 0x49, 0x73, 0x05, 0x49, 0x20, 0x25, 0x50, 0x68, 0x58, + 0x22, 0x81, 0x10, 0x68, 0xeb, 0xb5, 0x67, 0x1d, 0x2b, 0x1b, 0x8f, 0x6b, 0x7b, 0x57, 0xa4, 0x21, + 0xfc, 0x2f, 0x20, 0x81, 0x54, 0x24, 0x9e, 0x02, 0x24, 0x1e, 0x80, 0x37, 0xe8, 0x55, 0x15, 0xa9, + 0x17, 0x20, 0x2e, 0x00, 0x25, 0x88, 0x67, 0xe0, 0x02, 0x24, 0xe4, 0x99, 0xf1, 0xae, 0x37, 0xb6, + 0xf7, 0x4f, 0xd8, 0x84, 0xab, 0xd8, 0x33, 0x73, 0xce, 0xf9, 0xbe, 0x6f, 0xc6, 0x73, 0xbe, 0x0d, + 0x5c, 0xb6, 0x4a, 0xba, 0xaa, 0x39, 0x4e, 0xc5, 0xd2, 0x35, 0xdf, 0xa2, 0xb6, 0xa7, 0x96, 0x09, + 0x51, 0x6b, 0xf3, 0xea, 0xdd, 0x2a, 0x71, 0x77, 0x14, 0xc7, 0xa5, 0x3e, 0xc5, 0x17, 0xac, 0x92, + 0xae, 0x44, 0x17, 0x29, 0x65, 0x42, 0x94, 0xda, 0xbc, 0x34, 0x6e, 0x52, 0x93, 0xb2, 0x35, 0x6a, + 0xf0, 0xc4, 0x97, 0x4b, 0x93, 0x26, 0xa5, 0x66, 0x85, 0xa8, 0x9a, 0x63, 0xa9, 0x9a, 0x6d, 0x53, + 0x5f, 0x04, 0xf1, 0xd9, 0xac, 0x4e, 0xbd, 0x6d, 0xea, 0xa9, 0x25, 0xcd, 0x0b, 0x0a, 0x95, 0x88, + 0xaf, 0xcd, 0xab, 0x3a, 0xb5, 0x6c, 0x31, 0x3f, 0x17, 0x9d, 0x67, 0x28, 0xea, 0xab, 0x1c, 0xcd, + 0xb4, 0x6c, 0x96, 0x4c, 0xac, 0xbd, 0x94, 0x86, 0x3e, 0xc0, 0xc7, 0x97, 0x5c, 0x49, 0x5b, 0x62, + 0x12, 0x9b, 0x78, 0x96, 0x17, 0xcd, 0xa4, 0x53, 0x97, 0xa8, 0xfa, 0xa6, 0x66, 0xdb, 0xa4, 0x12, + 0x2c, 0x11, 0x8f, 0x7c, 0x89, 0xfc, 0x15, 0x82, 0xe9, 0xd7, 0x02, 0x3c, 0x6b, 0xb6, 0x4e, 0x6c, + 0xdf, 0xaa, 0x59, 0xf7, 0x88, 0xb1, 0xae, 0xe9, 0x5b, 0xc4, 0xf7, 0x0a, 0xe4, 0x6e, 0x95, 0x78, + 0x3e, 0x5e, 0x05, 0x68, 0x80, 0x9c, 0x40, 0x33, 0x68, 0x76, 0x38, 0xff, 0x84, 0xc2, 0x19, 0x29, + 0x01, 0x23, 0x85, 0xeb, 0x2a, 0x18, 0x29, 0xeb, 0x9a, 0x49, 0x44, 0x6c, 0x21, 0x12, 0x89, 0x2f, + 0xc1, 0x08, 0x5b, 0x58, 0xdc, 0x24, 0x96, 0xb9, 0xe9, 0x4f, 0x64, 0x66, 0xd0, 0x6c, 0x7f, 0x61, + 0x98, 0x8d, 0xbd, 0xc8, 0x86, 0xe4, 0xc7, 0x08, 0x66, 0xd2, 0xe1, 0x78, 0x0e, 0xb5, 0x3d, 0x82, + 0xcb, 0x30, 0x6e, 0x45, 0xa6, 0x8b, 0x0e, 0x9f, 0x9f, 0x40, 0x33, 0x67, 0x66, 0x87, 0xf3, 0x39, + 0x25, 0x65, 0x63, 0x95, 0x35, 0x23, 0x88, 0x29, 0x5b, 0x61, 0xc6, 0x55, 0x42, 0xbc, 0xe5, 0xfe, + 0x87, 0xbf, 0x4c, 0xf7, 0x15, 0xc6, 0xac, 0x78, 0x3d, 0x7c, 0xb3, 0x89, 0x77, 0x86, 0xf1, 0xbe, + 0xda, 0x96, 0x37, 0x07, 0x19, 0x25, 0x2e, 0xdf, 0x47, 0x90, 0x4d, 0x61, 0x15, 0x6a, 0xfc, 0x1c, + 0x0c, 0x71, 0x1a, 0x45, 0xcb, 0x10, 0x12, 0x4f, 0x31, 0x22, 0xc1, 0xf6, 0x29, 0xe1, 0x9e, 0xd5, + 0x82, 0x22, 0xc1, 0xaa, 0x35, 0x43, 0x00, 0x1f, 0x74, 0xc4, 0x7b, 0x27, 0xea, 0x7e, 0x9e, 0xbe, + 0xd9, 0x75, 0x71, 0x0d, 0x18, 0x4b, 0x10, 0x57, 0x40, 0x3a, 0x96, 0xb6, 0x38, 0xae, 0xad, 0xfc, + 0x08, 0xc1, 0x93, 0x69, 0xfb, 0xbc, 0x4a, 0xdd, 0x15, 0xce, 0xb7, 0xd7, 0x07, 0xf0, 0x02, 0x0c, + 0x38, 0xd4, 0x65, 0x12, 0x07, 0xea, 0x0c, 0x15, 0xce, 0x05, 0xaf, 0x6b, 0x06, 0x9e, 0x02, 0x10, + 0x12, 0x07, 0x73, 0x67, 0xd8, 0xdc, 0x90, 0x18, 0x49, 0x90, 0xb6, 0x3f, 0x2e, 0xed, 0x8f, 0x08, + 0xe6, 0x3a, 0x21, 0x24, 0x54, 0xbe, 0xd3, 0xc3, 0x23, 0x7c, 0xc2, 0x87, 0xf7, 0x1d, 0xb8, 0xc8, + 0x88, 0x6d, 0x50, 0x5f, 0xab, 0x14, 0x88, 0x5e, 0x63, 0x35, 0x7b, 0x75, 0x6c, 0xe5, 0xcf, 0x10, + 0x48, 0x49, 0xf9, 0x85, 0x50, 0x9b, 0x30, 0xe4, 0x12, 0xbd, 0x56, 0x2c, 0x13, 0x12, 0xaa, 0x73, + 0xb1, 0x89, 0x45, 0x88, 0x7f, 0x85, 0x5a, 0xf6, 0xf2, 0xd3, 0x41, 0xf2, 0xef, 0x7e, 0x9d, 0x9e, + 0x35, 0x2d, 0x7f, 0xb3, 0x5a, 0x52, 0x74, 0xba, 0xad, 0x8a, 0x9b, 0x97, 0xff, 0xc9, 0x79, 0xc6, + 0x96, 0xea, 0xef, 0x38, 0xc4, 0x63, 0x01, 0x5e, 0x61, 0xd0, 0x15, 0x15, 0xe5, 0xb7, 0x61, 0xa2, + 0x81, 0x63, 0x49, 0xdf, 0xea, 0x2d, 0xcd, 0x4f, 0x50, 0x54, 0xc6, 0x7a, 0xfa, 0xfa, 0x8d, 0x36, + 0xa8, 0xe9, 0x5b, 0x27, 0x46, 0x72, 0x40, 0xe3, 0xf5, 0xe4, 0x3b, 0x30, 0xd9, 0x00, 0xb1, 0x61, + 0x6d, 0x13, 0x5a, 0xf5, 0x7b, 0xcb, 0xf3, 0x01, 0x82, 0xa9, 0x94, 0x12, 0x82, 0xab, 0x0d, 0x23, + 0x3e, 0x1f, 0x3e, 0x31, 0xbe, 0xc3, 0x7e, 0xa3, 0xae, 0x7c, 0x0b, 0x46, 0x19, 0xa0, 0x75, 0x6d, + 0x87, 0x84, 0xb7, 0xc2, 0x91, 0x0f, 0x1e, 0x1d, 0xfd, 0xe0, 0x27, 0x60, 0xc0, 0x25, 0x15, 0x6d, + 0x87, 0xb8, 0xe2, 0xa2, 0x08, 0x5f, 0xe5, 0x45, 0xc0, 0xd1, 0x6c, 0x82, 0xd3, 0x65, 0x38, 0xef, + 0x04, 0x03, 0x45, 0xcd, 0x30, 0x5c, 0xe2, 0x79, 0x22, 0xe3, 0x08, 0x1b, 0x5c, 0xe2, 0x63, 0xf2, + 0x9b, 0x42, 0x99, 0x15, 0x5a, 0xb5, 0x7d, 0xe2, 0x3a, 0x9a, 0xeb, 0xf7, 0x08, 0xd4, 0x6d, 0xd1, + 0x5e, 0x12, 0x32, 0x0b, 0x80, 0x39, 0xc0, 0x7a, 0x64, 0xb2, 0xc8, 0x80, 0x89, 0x12, 0xa3, 0xfa, + 0xd1, 0x30, 0xf9, 0xcb, 0xb0, 0x61, 0xad, 0x12, 0xf2, 0x82, 0xad, 0x95, 0x2a, 0xc4, 0x10, 0x37, + 0xd8, 0x7f, 0x61, 0x0a, 0x1e, 0x85, 0x6d, 0x2b, 0x09, 0x8d, 0x20, 0x58, 0x82, 0xf1, 0x32, 0x21, + 0x45, 0xc2, 0xa7, 0x8b, 0x42, 0xb5, 0xf0, 0x74, 0xcd, 0xa5, 0x5e, 0xa8, 0xb1, 0x94, 0x61, 0xd3, + 0x2a, 0xc7, 0x6a, 0xf5, 0xee, 0x4a, 0x7d, 0x43, 0x9c, 0x84, 0x58, 0xf1, 0x50, 0xdc, 0x48, 0xa3, + 0x42, 0x2d, 0x1a, 0x55, 0xe6, 0xc8, 0x11, 0x91, 0x97, 0xd2, 0xb6, 0xad, 0xae, 0xd3, 0x34, 0x0c, + 0x47, 0x74, 0x62, 0xd9, 0x07, 0x0b, 0xd0, 0x20, 0x9b, 0xff, 0x63, 0x14, 0xce, 0xb2, 0x1c, 0xf8, + 0x07, 0x04, 0x63, 0x09, 0xdd, 0x0c, 0xdf, 0x48, 0x15, 0xb3, 0x8d, 0x91, 0x94, 0x16, 0x8f, 0x11, + 0xc9, 0x71, 0xcb, 0xb9, 0x8f, 0x1f, 0xff, 0xfe, 0x4d, 0xe6, 0x2a, 0xbe, 0xa2, 0x0a, 0xeb, 0x5b, + 0xb7, 0xbc, 0x49, 0x7d, 0x14, 0x3f, 0xc8, 0x00, 0x8e, 0xa7, 0xc3, 0x0b, 0xdd, 0x02, 0x08, 0x91, + 0xdf, 0xe8, 0x3e, 0x50, 0x00, 0xbf, 0x8f, 0x18, 0xf2, 0x0f, 0xf0, 0x5e, 0x0c, 0x79, 0x78, 0x48, + 0xd5, 0xdd, 0xfa, 0xa5, 0xab, 0x34, 0x76, 0x77, 0x4f, 0x0d, 0xf6, 0xbc, 0x69, 0x52, 0x9c, 0x89, + 0x3d, 0xd5, 0x0b, 0x60, 0xd9, 0x3a, 0x69, 0x9a, 0x0d, 0x07, 0xf7, 0x92, 0x24, 0xc1, 0x7f, 0x23, + 0x98, 0x6a, 0xe9, 0x4d, 0xf0, 0x72, 0xd7, 0xbb, 0x13, 0x73, 0x6a, 0xd2, 0xca, 0xbf, 0xca, 0x21, + 0x24, 0x7b, 0x9d, 0x29, 0xf6, 0x0a, 0x7e, 0xb9, 0x85, 0x62, 0x49, 0x3a, 0x85, 0xea, 0x24, 0x9e, + 0x88, 0xbf, 0x10, 0x9c, 0x6f, 0xb2, 0x18, 0x38, 0xdf, 0x1a, 0x6b, 0x92, 0xdf, 0x91, 0xae, 0x75, + 0x15, 0x23, 0xf8, 0x7c, 0xc4, 0x8f, 0xc0, 0x2e, 0xde, 0x39, 0xbd, 0x23, 0xe0, 0x07, 0x48, 0x8a, + 0x75, 0xeb, 0x84, 0xff, 0x44, 0x30, 0x12, 0xb5, 0x1e, 0x78, 0xbe, 0x03, 0x26, 0xcd, 0x2e, 0x48, + 0xca, 0x77, 0x13, 0x22, 0xb8, 0x7f, 0xc8, 0xb9, 0xdf, 0xc3, 0xef, 0x9e, 0x36, 0xf7, 0xd0, 0x50, + 0xe1, 0x2f, 0x32, 0xf0, 0xbf, 0xa3, 0x6e, 0x04, 0x5f, 0xef, 0x80, 0x4b, 0xdc, 0x20, 0x49, 0xcf, + 0x74, 0x1b, 0x26, 0x64, 0xf8, 0x94, 0xcb, 0xf0, 0x3e, 0x7e, 0xef, 0xb4, 0x65, 0x88, 0x7a, 0x2d, + 0xfc, 0x2d, 0x82, 0xb3, 0xac, 0xc3, 0xe3, 0xb9, 0xd6, 0x44, 0xa2, 0xbe, 0x44, 0x7a, 0xaa, 0xa3, + 0xb5, 0x82, 0xe9, 0x4d, 0x46, 0x74, 0x09, 0x3f, 0xdb, 0xe1, 0xc7, 0x2b, 0x3c, 0x8c, 0xa7, 0xee, + 0x8a, 0xa7, 0x3d, 0x95, 0x99, 0x13, 0xfc, 0x33, 0x82, 0xd1, 0x98, 0xa1, 0xc1, 0x6d, 0x36, 0x20, + 0xcd, 0x5b, 0x49, 0x0b, 0x5d, 0xc7, 0x09, 0x3e, 0x1b, 0x8c, 0xcf, 0xab, 0xf8, 0xd6, 0xf1, 0xf9, + 0xc4, 0x9d, 0x17, 0xfe, 0x1e, 0x01, 0x8e, 0xbb, 0x99, 0x76, 0xfd, 0x29, 0xd5, 0x8d, 0xb5, 0xeb, + 0x4f, 0xe9, 0xc6, 0x49, 0xfe, 0x3f, 0xe3, 0x97, 0xc5, 0x93, 0x31, 0x7e, 0x11, 0x9f, 0x80, 0xf7, + 0x11, 0x8c, 0xc6, 0x92, 0xb4, 0xdb, 0x8c, 0x34, 0x7b, 0x23, 0x2d, 0x74, 0x1d, 0x27, 0xc0, 0xbe, + 0xc4, 0xc0, 0x3e, 0x8f, 0x97, 0x8f, 0xd9, 0x19, 0x22, 0x94, 0x96, 0x6f, 0x3f, 0x3c, 0xc8, 0xa2, + 0xfd, 0x83, 0x2c, 0xfa, 0xed, 0x20, 0x8b, 0xbe, 0x3e, 0xcc, 0xf6, 0xed, 0x1f, 0x66, 0xfb, 0x7e, + 0x3a, 0xcc, 0xf6, 0xbd, 0x75, 0x3d, 0xfe, 0x43, 0xc3, 0x2a, 0xe9, 0x39, 0x93, 0xaa, 0xb5, 0x05, + 0x75, 0x9b, 0x1a, 0xd5, 0x0a, 0xf1, 0x78, 0xf1, 0xfc, 0x62, 0x2e, 0xa8, 0xcf, 0x7e, 0x7b, 0x94, + 0xce, 0xb1, 0xff, 0xa8, 0x5d, 0xfb, 0x27, 0x00, 0x00, 0xff, 0xff, 0x61, 0x2e, 0xac, 0x94, 0x7e, + 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/apps/29-fee/types/tx.pb.go b/modules/apps/29-fee/types/tx.pb.go index 721250beacc..0c88efc0409 100644 --- a/modules/apps/29-fee/types/tx.pb.go +++ b/modules/apps/29-fee/types/tx.pb.go @@ -32,9 +32,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgRegisterPayee defines the request type for the RegisterPayee rpc type MsgRegisterPayee struct { // unique port identifier - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` // unique channel identifier - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` // the relayer address Relayer string `protobuf:"bytes,3,opt,name=relayer,proto3" json:"relayer,omitempty"` // the payee address @@ -114,13 +114,13 @@ var xxx_messageInfo_MsgRegisterPayeeResponse proto.InternalMessageInfo // MsgRegisterCounterpartyPayee defines the request type for the RegisterCounterpartyPayee rpc type MsgRegisterCounterpartyPayee struct { // unique port identifier - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` // unique channel identifier - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` // the relayer address Relayer string `protobuf:"bytes,3,opt,name=relayer,proto3" json:"relayer,omitempty"` // the counterparty payee address - CounterpartyPayee string `protobuf:"bytes,4,opt,name=counterparty_payee,json=counterpartyPayee,proto3" json:"counterparty_payee,omitempty" yaml:"counterparty_payee"` + CounterpartyPayee string `protobuf:"bytes,4,opt,name=counterparty_payee,json=counterpartyPayee,proto3" json:"counterparty_payee,omitempty"` } func (m *MsgRegisterCounterpartyPayee) Reset() { *m = MsgRegisterCounterpartyPayee{} } @@ -200,9 +200,9 @@ type MsgPayPacketFee struct { // fee encapsulates the recv, ack and timeout fees associated with an IBC packet Fee Fee `protobuf:"bytes,1,opt,name=fee,proto3" json:"fee"` // the source port unique identifier - SourcePortId string `protobuf:"bytes,2,opt,name=source_port_id,json=sourcePortId,proto3" json:"source_port_id,omitempty" yaml:"source_port_id"` + SourcePortId string `protobuf:"bytes,2,opt,name=source_port_id,json=sourcePortId,proto3" json:"source_port_id,omitempty"` // the source channel unique identifer - SourceChannelId string `protobuf:"bytes,3,opt,name=source_channel_id,json=sourceChannelId,proto3" json:"source_channel_id,omitempty" yaml:"source_channel_id"` + SourceChannelId string `protobuf:"bytes,3,opt,name=source_channel_id,json=sourceChannelId,proto3" json:"source_channel_id,omitempty"` // account address to refund fee if necessary Signer string `protobuf:"bytes,4,opt,name=signer,proto3" json:"signer,omitempty"` // optional list of relayers permitted to the receive packet fees @@ -283,9 +283,9 @@ var xxx_messageInfo_MsgPayPacketFeeResponse proto.InternalMessageInfo // This Msg can be used to pay for a packet at a specified sequence (instead of the next sequence send) type MsgPayPacketFeeAsync struct { // unique packet identifier comprised of the channel ID, port ID and sequence - PacketId types.PacketId `protobuf:"bytes,1,opt,name=packet_id,json=packetId,proto3" json:"packet_id" yaml:"packet_id"` + PacketId types.PacketId `protobuf:"bytes,1,opt,name=packet_id,json=packetId,proto3" json:"packet_id"` // the packet fee associated with a particular IBC packet - PacketFee PacketFee `protobuf:"bytes,2,opt,name=packet_fee,json=packetFee,proto3" json:"packet_fee" yaml:"packet_fee"` + PacketFee PacketFee `protobuf:"bytes,2,opt,name=packet_fee,json=packetFee,proto3" json:"packet_fee"` } func (m *MsgPayPacketFeeAsync) Reset() { *m = MsgPayPacketFeeAsync{} } @@ -372,51 +372,46 @@ func init() { func init() { proto.RegisterFile("ibc/applications/fee/v1/tx.proto", fileDescriptor_05c93128649f1b96) } var fileDescriptor_05c93128649f1b96 = []byte{ - // 699 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x4f, 0x6b, 0xdb, 0x4a, - 0x10, 0xb7, 0xe2, 0xfc, 0xf3, 0x24, 0x2f, 0x89, 0x97, 0xe4, 0x45, 0x16, 0x89, 0x95, 0x27, 0x1e, - 0x8f, 0x3c, 0x4a, 0xa4, 0xda, 0x4d, 0x28, 0x0d, 0x94, 0x52, 0x05, 0x42, 0x03, 0x0d, 0x35, 0xa2, - 0xa7, 0x52, 0x08, 0xb2, 0xbc, 0x56, 0xd4, 0xda, 0x5a, 0xa1, 0x95, 0x4d, 0xf5, 0x0d, 0x7a, 0x4c, - 0xbf, 0x41, 0xbe, 0x41, 0xbf, 0x46, 0x8e, 0x39, 0xf4, 0xd0, 0x93, 0x28, 0xc9, 0xa5, 0xb7, 0x82, - 0xfb, 0x05, 0xca, 0x4a, 0x2b, 0x55, 0xb6, 0x71, 0x70, 0x7b, 0xea, 0x6d, 0x67, 0xe6, 0x37, 0xbf, - 0x9d, 0xf9, 0x69, 0x46, 0x0b, 0x3b, 0x4e, 0xd3, 0xd2, 0x4c, 0xcf, 0xeb, 0x38, 0x96, 0x19, 0x38, - 0xc4, 0xa5, 0x5a, 0x1b, 0x63, 0xad, 0x5f, 0xd3, 0x82, 0x77, 0xaa, 0xe7, 0x93, 0x80, 0xa0, 0x4d, - 0xa7, 0x69, 0xa9, 0x79, 0x84, 0xda, 0xc6, 0x58, 0xed, 0xd7, 0xa4, 0x75, 0x9b, 0xd8, 0x24, 0xc6, - 0x68, 0xec, 0x94, 0xc0, 0xa5, 0x7f, 0x26, 0x11, 0xb2, 0xac, 0x1c, 0xc4, 0x22, 0x3e, 0xd6, 0xac, - 0x73, 0xd3, 0x75, 0x71, 0x87, 0x85, 0xf9, 0x31, 0x81, 0x28, 0x1f, 0x05, 0x58, 0x3b, 0xa5, 0xb6, - 0x81, 0x6d, 0x87, 0x06, 0xd8, 0x6f, 0x98, 0x21, 0xc6, 0xe8, 0x1e, 0x2c, 0x78, 0xc4, 0x0f, 0xce, - 0x9c, 0x96, 0x28, 0xec, 0x08, 0xbb, 0x25, 0x1d, 0x0d, 0x22, 0x79, 0x25, 0x34, 0xbb, 0x9d, 0x43, - 0x85, 0x07, 0x14, 0x63, 0x9e, 0x9d, 0x4e, 0x5a, 0x68, 0x1f, 0x80, 0x53, 0x32, 0xfc, 0x4c, 0x8c, - 0xdf, 0x18, 0x44, 0x72, 0x39, 0xc1, 0xff, 0x8c, 0x29, 0x46, 0x89, 0x1b, 0x27, 0x2d, 0x24, 0xc2, - 0x82, 0x8f, 0x3b, 0x66, 0x88, 0x7d, 0xb1, 0xc8, 0x52, 0x8c, 0xd4, 0x44, 0xeb, 0x30, 0xe7, 0xb1, - 0x2a, 0xc4, 0xd9, 0xd8, 0x9f, 0x18, 0x87, 0x8b, 0xef, 0x2f, 0xe5, 0xc2, 0xd7, 0x4b, 0xb9, 0xa0, - 0x48, 0x20, 0x8e, 0x16, 0x6c, 0x60, 0xea, 0x11, 0x97, 0x62, 0xe5, 0xbb, 0x00, 0x5b, 0xb9, 0xe0, - 0x11, 0xe9, 0xb9, 0x01, 0xf6, 0x3d, 0xd3, 0x0f, 0xc2, 0x3f, 0xa0, 0xb3, 0xe7, 0x80, 0xac, 0x5c, - 0x45, 0x67, 0xb9, 0x36, 0xf5, 0xed, 0x41, 0x24, 0x57, 0x38, 0xef, 0x18, 0x46, 0x31, 0xca, 0xd6, - 0x68, 0x2b, 0x39, 0x45, 0xfe, 0x83, 0x7f, 0xef, 0x6a, 0x3a, 0x53, 0xe7, 0x62, 0x06, 0x56, 0x4f, - 0xa9, 0xdd, 0x30, 0xc3, 0x86, 0x69, 0xbd, 0xc5, 0xc1, 0x31, 0xc6, 0x68, 0x1f, 0x8a, 0x6d, 0x8c, - 0x63, 0x31, 0x96, 0xea, 0x5b, 0xea, 0x84, 0x11, 0x54, 0x8f, 0x31, 0xd6, 0x67, 0xaf, 0x22, 0xb9, - 0x60, 0x30, 0x38, 0x7a, 0x02, 0x2b, 0x94, 0xf4, 0x7c, 0x0b, 0x9f, 0xa5, 0x6a, 0x26, 0xea, 0x54, - 0x06, 0x91, 0xbc, 0x91, 0x74, 0x31, 0x1c, 0x57, 0x8c, 0xe5, 0xc4, 0xd1, 0x48, 0xa4, 0x7d, 0x06, - 0x65, 0x0e, 0xc8, 0x29, 0x1c, 0xcb, 0xa5, 0x6f, 0x0d, 0x22, 0x59, 0x1c, 0xe2, 0xc8, 0x0b, 0xbd, - 0x9a, 0xf8, 0x8e, 0x32, 0xb9, 0xff, 0x86, 0x79, 0xea, 0xd8, 0x2e, 0xf6, 0xf9, 0xbc, 0x70, 0x0b, - 0x49, 0xb0, 0xc8, 0x75, 0xa7, 0xe2, 0xdc, 0x4e, 0x71, 0xb7, 0x64, 0x64, 0x76, 0x4e, 0xba, 0x0a, - 0x6c, 0x8e, 0x28, 0x92, 0xa9, 0xf5, 0x49, 0x80, 0xf5, 0x91, 0xd8, 0x53, 0x1a, 0xba, 0x16, 0x7a, - 0x09, 0x25, 0x2f, 0xf6, 0xa4, 0x53, 0xb4, 0x54, 0xdf, 0x8e, 0x85, 0x63, 0x9b, 0xa6, 0xa6, 0xeb, - 0xd5, 0xaf, 0xa9, 0x49, 0xde, 0x49, 0x4b, 0x17, 0x99, 0x72, 0x83, 0x48, 0x5e, 0xe3, 0x83, 0x96, - 0x66, 0x2b, 0xc6, 0xa2, 0xc7, 0x31, 0xe8, 0x35, 0x00, 0xf7, 0xb3, 0xef, 0x31, 0x13, 0xd3, 0x2a, - 0x13, 0xbf, 0x47, 0x56, 0x92, 0x5e, 0xe1, 0xdc, 0xe5, 0x21, 0xee, 0x36, 0x1b, 0x1a, 0x5e, 0xe6, - 0xf1, 0xd0, 0xb0, 0x54, 0xe3, 0x0d, 0x19, 0xeb, 0x2a, 0x6d, 0xbb, 0xfe, 0xad, 0x08, 0xc5, 0x53, - 0x6a, 0xa3, 0x2e, 0xfc, 0x35, 0xfc, 0x53, 0xf8, 0x7f, 0x62, 0x31, 0xa3, 0xeb, 0x28, 0xd5, 0xa6, - 0x86, 0xa6, 0xd7, 0xa2, 0x0f, 0x02, 0x54, 0x26, 0xaf, 0xed, 0xc1, 0x34, 0x84, 0x63, 0x69, 0xd2, - 0xe3, 0xdf, 0x4a, 0xcb, 0x6a, 0x7a, 0x03, 0xcb, 0x43, 0xbb, 0xb2, 0x7b, 0x17, 0x5d, 0x1e, 0x29, - 0xdd, 0x9f, 0x16, 0x99, 0xdd, 0x15, 0x42, 0x79, 0x7c, 0xd2, 0xf6, 0xa6, 0xa5, 0x89, 0xe1, 0xd2, - 0xc1, 0x2f, 0xc1, 0xd3, 0xab, 0xf5, 0x17, 0x57, 0x37, 0x55, 0xe1, 0xfa, 0xa6, 0x2a, 0x7c, 0xb9, - 0xa9, 0x0a, 0x17, 0xb7, 0xd5, 0xc2, 0xf5, 0x6d, 0xb5, 0xf0, 0xf9, 0xb6, 0x5a, 0x78, 0x75, 0x60, - 0x3b, 0xc1, 0x79, 0xaf, 0xa9, 0x5a, 0xa4, 0xab, 0x59, 0x84, 0x76, 0x09, 0xd5, 0x9c, 0xa6, 0xb5, - 0x67, 0x13, 0xad, 0xff, 0x50, 0xeb, 0x92, 0x56, 0xaf, 0x83, 0x29, 0x7b, 0x82, 0xa8, 0x56, 0x7f, - 0xb4, 0xc7, 0x5e, 0x9f, 0x20, 0xf4, 0x30, 0x6d, 0xce, 0xc7, 0x4f, 0xcb, 0x83, 0x1f, 0x01, 0x00, - 0x00, 0xff, 0xff, 0xfb, 0xaa, 0xe9, 0x34, 0xf3, 0x06, 0x00, 0x00, + // 616 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x4f, 0x6f, 0xd3, 0x4e, + 0x10, 0xb5, 0x9b, 0xfe, 0xcb, 0xb4, 0xbf, 0x5f, 0xe9, 0xaa, 0xa2, 0xae, 0xd5, 0xba, 0x25, 0xaa, + 0x50, 0x40, 0x8a, 0x4d, 0x02, 0x11, 0x02, 0x09, 0x09, 0x5a, 0x29, 0x28, 0x87, 0x88, 0x28, 0x47, + 0x2e, 0x91, 0xb3, 0x99, 0xb8, 0x86, 0xc4, 0x6b, 0x79, 0x9d, 0x08, 0xdf, 0x39, 0x70, 0x84, 0x6f, + 0xd0, 0x2b, 0xe2, 0x8b, 0xf4, 0xd8, 0x1b, 0x9c, 0x10, 0x4a, 0x2e, 0xdc, 0xf8, 0x0a, 0xc8, 0xf6, + 0xda, 0x72, 0x12, 0xa5, 0x0a, 0x48, 0xdc, 0x3c, 0x3b, 0x6f, 0xde, 0xcc, 0x7b, 0x9e, 0x5d, 0x38, + 0xb1, 0x3b, 0xd4, 0x30, 0x5d, 0xb7, 0x6f, 0x53, 0xd3, 0xb7, 0x99, 0xc3, 0x8d, 0x1e, 0xa2, 0x31, + 0x2a, 0x1b, 0xfe, 0x3b, 0xdd, 0xf5, 0x98, 0xcf, 0xc8, 0xbe, 0xdd, 0xa1, 0x7a, 0x16, 0xa1, 0xf7, + 0x10, 0xf5, 0x51, 0x59, 0xdd, 0xb3, 0x98, 0xc5, 0x22, 0x8c, 0x11, 0x7e, 0xc5, 0x70, 0xf5, 0xce, + 0x22, 0xc2, 0xb0, 0x2a, 0x03, 0xa1, 0xcc, 0x43, 0x83, 0x5e, 0x98, 0x8e, 0x83, 0xfd, 0x30, 0x2d, + 0x3e, 0x63, 0x48, 0xe1, 0xbd, 0x0c, 0xb7, 0x1a, 0xdc, 0x6a, 0xa1, 0x65, 0x73, 0x1f, 0xbd, 0xa6, + 0x19, 0x20, 0x92, 0x7d, 0xd8, 0x70, 0x99, 0xe7, 0xb7, 0xed, 0xae, 0x22, 0x9f, 0xc8, 0xc5, 0x7c, + 0x6b, 0x3d, 0x0c, 0xeb, 0x5d, 0x72, 0x04, 0x20, 0xca, 0xc3, 0xdc, 0x4a, 0x94, 0xcb, 0x8b, 0x93, + 0x7a, 0x97, 0x28, 0xb0, 0xe1, 0x61, 0xdf, 0x0c, 0xd0, 0x53, 0x72, 0x51, 0x2e, 0x09, 0xc9, 0x1e, + 0xac, 0xb9, 0x21, 0xb5, 0xb2, 0x1a, 0x9d, 0xc7, 0xc1, 0xd3, 0xcd, 0x0f, 0x97, 0xc7, 0xd2, 0xcf, + 0xcb, 0x63, 0xa9, 0xa0, 0x82, 0x32, 0x3b, 0x45, 0x0b, 0xb9, 0xcb, 0x1c, 0x8e, 0x85, 0xcf, 0x32, + 0x1c, 0x66, 0x92, 0xe7, 0x6c, 0xe8, 0xf8, 0xe8, 0xb9, 0xa6, 0xe7, 0x07, 0xff, 0x6a, 0xdc, 0x12, + 0x10, 0x9a, 0x69, 0xd3, 0xce, 0xce, 0xbe, 0x4b, 0x67, 0x07, 0xc8, 0xe8, 0xb8, 0x0b, 0xa7, 0x37, + 0x8d, 0x9a, 0x6a, 0xfa, 0x2a, 0xc3, 0x4e, 0x83, 0x5b, 0x4d, 0x33, 0x68, 0x9a, 0xf4, 0x2d, 0xfa, + 0x35, 0x44, 0xf2, 0x08, 0x72, 0x3d, 0xc4, 0x48, 0xc2, 0x56, 0xe5, 0x50, 0x5f, 0xb0, 0x0d, 0x7a, + 0x0d, 0xf1, 0x6c, 0xf5, 0xea, 0xfb, 0xb1, 0xd4, 0x0a, 0xe1, 0xe4, 0x14, 0xfe, 0xe7, 0x6c, 0xe8, + 0x51, 0x6c, 0x27, 0x1e, 0xc4, 0x3a, 0xb7, 0xe3, 0xd3, 0x66, 0xec, 0xc4, 0x7d, 0xd8, 0x15, 0xa8, + 0x8c, 0x21, 0xb1, 0xe8, 0x9d, 0x38, 0x71, 0x9e, 0xda, 0x72, 0x1b, 0xd6, 0xb9, 0x6d, 0x39, 0xe8, + 0x09, 0xc1, 0x22, 0x22, 0x2a, 0x6c, 0x0a, 0x7f, 0xb8, 0xb2, 0x76, 0x92, 0x2b, 0xe6, 0x5b, 0x69, + 0x9c, 0x71, 0xe0, 0x00, 0xf6, 0x67, 0x84, 0xa5, 0xa2, 0xbf, 0xc8, 0xb0, 0x37, 0x93, 0x7b, 0xc1, + 0x03, 0x87, 0x92, 0xe7, 0x90, 0x77, 0xa3, 0x93, 0xe4, 0x17, 0x6e, 0x55, 0x8e, 0x22, 0xfd, 0xe1, + 0xee, 0xea, 0xc9, 0xc2, 0x8e, 0xca, 0x7a, 0x5c, 0x57, 0xef, 0x0a, 0x03, 0x36, 0x5d, 0x11, 0x93, + 0x97, 0x00, 0x82, 0x21, 0xb4, 0x70, 0x25, 0xa2, 0x28, 0x2c, 0xb4, 0x30, 0x6d, 0x2f, 0x78, 0x44, + 0xf7, 0xda, 0xd4, 0xaf, 0xd4, 0xa2, 0xad, 0x9b, 0x1b, 0x36, 0x51, 0x53, 0xf9, 0x95, 0x83, 0x5c, + 0x83, 0x5b, 0x64, 0x00, 0xff, 0x4d, 0xdf, 0x9e, 0x7b, 0x0b, 0xfb, 0xce, 0xae, 0xb8, 0x5a, 0x5e, + 0x1a, 0x9a, 0xb4, 0x25, 0x9f, 0x64, 0x38, 0x58, 0x7c, 0x15, 0xaa, 0xcb, 0x10, 0xce, 0x95, 0xa9, + 0xcf, 0xfe, 0xaa, 0x2c, 0x9d, 0xe9, 0x0d, 0x6c, 0x4f, 0x6d, 0x72, 0xf1, 0x26, 0xba, 0x2c, 0x52, + 0x7d, 0xb0, 0x2c, 0x32, 0xed, 0x15, 0xc0, 0xee, 0xfc, 0x02, 0x95, 0x96, 0xa5, 0x89, 0xe0, 0x6a, + 0xf5, 0x8f, 0xe0, 0x49, 0xeb, 0xb3, 0x57, 0x57, 0x63, 0x4d, 0xbe, 0x1e, 0x6b, 0xf2, 0x8f, 0xb1, + 0x26, 0x7f, 0x9c, 0x68, 0xd2, 0xf5, 0x44, 0x93, 0xbe, 0x4d, 0x34, 0xe9, 0x75, 0xd5, 0xb2, 0xfd, + 0x8b, 0x61, 0x47, 0xa7, 0x6c, 0x60, 0x50, 0xc6, 0x07, 0x8c, 0x1b, 0x76, 0x87, 0x96, 0x2c, 0x66, + 0x8c, 0x1e, 0x1b, 0x03, 0xd6, 0x1d, 0xf6, 0x91, 0x87, 0x6f, 0x35, 0x37, 0x2a, 0x4f, 0x4a, 0xe1, + 0x33, 0xed, 0x07, 0x2e, 0xf2, 0xce, 0x7a, 0xf4, 0x06, 0x3f, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, + 0xaa, 0x24, 0x00, 0xb6, 0x1c, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/apps/transfer/types/authz.pb.go b/modules/apps/transfer/types/authz.pb.go index 95f24eca332..f5bee61bd43 100644 --- a/modules/apps/transfer/types/authz.pb.go +++ b/modules/apps/transfer/types/authz.pb.go @@ -29,9 +29,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Allocation defines the spend limit for a particular port and channel type Allocation struct { // the port on which the packet will be sent - SourcePort string `protobuf:"bytes,1,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty" yaml:"source_port"` + SourcePort string `protobuf:"bytes,1,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty"` // the channel by which the packet will be sent - SourceChannel string `protobuf:"bytes,2,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty" yaml:"source_channel"` + SourceChannel string `protobuf:"bytes,2,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty"` // spend limitation on the channel SpendLimit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=spend_limit,json=spendLimit,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"spend_limit"` // allow list of receivers, an empty allow list permits any receiver address @@ -156,35 +156,33 @@ func init() { } var fileDescriptor_b1a28b55d17325aa = []byte{ - // 435 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0x4d, 0x6e, 0xd3, 0x40, - 0x14, 0x8e, 0x9b, 0x0a, 0x29, 0x13, 0xc1, 0xc2, 0xa2, 0xc8, 0xa9, 0xc0, 0x89, 0xbc, 0x40, 0xde, - 0x64, 0x86, 0xc0, 0x22, 0x52, 0x57, 0x34, 0xdd, 0x76, 0x51, 0x2c, 0x56, 0x6c, 0xa2, 0xf1, 0x64, - 0xb0, 0x47, 0x8c, 0xfd, 0x2c, 0xcf, 0xd8, 0xa8, 0x3d, 0x05, 0x48, 0x9c, 0x82, 0x35, 0x87, 0xa8, - 0x58, 0x75, 0xc9, 0x2a, 0xa0, 0xe4, 0x06, 0x3d, 0x01, 0xf2, 0xcc, 0x14, 0x5c, 0x21, 0xb1, 0xb2, - 0xdf, 0xcf, 0xf7, 0xde, 0xf7, 0xbe, 0xf9, 0x50, 0x2c, 0x52, 0x46, 0x68, 0x55, 0x49, 0xc1, 0xa8, - 0x16, 0x50, 0x2a, 0xa2, 0x6b, 0x5a, 0xaa, 0xf7, 0xbc, 0x26, 0xed, 0x82, 0xd0, 0x46, 0xe7, 0x57, - 0xb8, 0xaa, 0x41, 0x83, 0xff, 0x54, 0xa4, 0x0c, 0xf7, 0x3b, 0xf1, 0x5d, 0x27, 0x6e, 0x17, 0xc7, - 0x13, 0x06, 0xaa, 0x00, 0xb5, 0x36, 0xbd, 0xc4, 0x06, 0x16, 0x78, 0xfc, 0x38, 0x83, 0x0c, 0x6c, - 0xbe, 0xfb, 0x73, 0xd9, 0xd0, 0xf6, 0x90, 0x94, 0x2a, 0x4e, 0xda, 0x45, 0xca, 0x35, 0x5d, 0x10, - 0x06, 0xa2, 0xb4, 0xf5, 0xe8, 0xcb, 0x01, 0x42, 0xa7, 0x52, 0x82, 0x5d, 0xe6, 0x2f, 0xd1, 0x58, - 0x41, 0x53, 0x33, 0xbe, 0xae, 0xa0, 0xd6, 0x81, 0x37, 0xf3, 0xe2, 0xd1, 0xea, 0xc9, 0xed, 0x76, - 0xea, 0x5f, 0xd2, 0x42, 0x9e, 0x44, 0xbd, 0x62, 0x94, 0x20, 0x1b, 0x5d, 0x40, 0xad, 0xfd, 0xd7, - 0xe8, 0x91, 0xab, 0xb1, 0x9c, 0x96, 0x25, 0x97, 0xc1, 0x81, 0xc1, 0x4e, 0x6e, 0xb7, 0xd3, 0xa3, - 0x7b, 0x58, 0x57, 0x8f, 0x92, 0x87, 0x36, 0x71, 0x66, 0x63, 0x5f, 0xa2, 0xb1, 0xaa, 0x78, 0xb9, - 0x59, 0x4b, 0x51, 0x08, 0x1d, 0x0c, 0x67, 0xc3, 0x78, 0xfc, 0x72, 0x82, 0xdd, 0x8d, 0x1d, 0x7f, - 0xec, 0xf8, 0xe3, 0x33, 0x10, 0xe5, 0xea, 0xc5, 0xf5, 0x76, 0x3a, 0xf8, 0xfa, 0x73, 0x1a, 0x67, - 0x42, 0xe7, 0x4d, 0x8a, 0x19, 0x14, 0x4e, 0x10, 0xf7, 0x99, 0xab, 0xcd, 0x07, 0xa2, 0x2f, 0x2b, - 0xae, 0x0c, 0x40, 0x25, 0xc8, 0xcc, 0x3f, 0xef, 0xc6, 0xfb, 0xcf, 0x10, 0xa2, 0x52, 0xc2, 0xc7, - 0xb5, 0x14, 0x4a, 0x07, 0x87, 0xb3, 0x61, 0x3c, 0x4a, 0x46, 0x26, 0x73, 0x2e, 0x94, 0x8e, 0x3e, - 0x7b, 0xe8, 0xe8, 0xad, 0xd3, 0xfd, 0xb4, 0xd1, 0x39, 0xd4, 0xe2, 0xca, 0x2a, 0x74, 0x81, 0xc6, - 0xf4, 0x8f, 0x5e, 0x2a, 0xf0, 0x0c, 0xcd, 0x18, 0xff, 0xef, 0xd5, 0xf0, 0x5f, 0x81, 0x57, 0x87, - 0x1d, 0xeb, 0xa4, 0x3f, 0xe2, 0xe4, 0xf9, 0xf7, 0x6f, 0xf3, 0xc8, 0x9d, 0x69, 0x9d, 0x70, 0x77, - 0xe7, 0xbd, 0xcd, 0xab, 0x37, 0xd7, 0xbb, 0xd0, 0xbb, 0xd9, 0x85, 0xde, 0xaf, 0x5d, 0xe8, 0x7d, - 0xda, 0x87, 0x83, 0x9b, 0x7d, 0x38, 0xf8, 0xb1, 0x0f, 0x07, 0xef, 0x96, 0xff, 0x4a, 0x20, 0x52, - 0x36, 0xcf, 0x80, 0xb4, 0x4b, 0x52, 0xc0, 0xa6, 0x91, 0x5c, 0x75, 0xee, 0xeb, 0xb9, 0xce, 0xe8, - 0x92, 0x3e, 0x30, 0x26, 0x78, 0xf5, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x61, 0xe8, 0x65, 0x9c, 0x9f, - 0x02, 0x00, 0x00, + // 408 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0x3d, 0x8f, 0xd4, 0x30, + 0x10, 0x5d, 0xb3, 0x27, 0xa4, 0x75, 0x04, 0x45, 0x04, 0x52, 0xee, 0x04, 0xd9, 0xd5, 0x4a, 0xa0, + 0x34, 0x6b, 0x13, 0x28, 0x4e, 0xa2, 0xbb, 0xbd, 0xf6, 0x8a, 0x23, 0xa2, 0xa2, 0x89, 0x1c, 0xaf, + 0x49, 0x2c, 0x9c, 0x4c, 0x14, 0x3b, 0x41, 0xdc, 0xaf, 0x80, 0xbf, 0x41, 0xcd, 0x8f, 0x38, 0x51, + 0x5d, 0x49, 0xc5, 0xc7, 0xee, 0x1f, 0x41, 0xb1, 0xbd, 0xb0, 0x08, 0xe9, 0xaa, 0x24, 0x2f, 0x6f, + 0x66, 0xde, 0x7b, 0x33, 0x38, 0x91, 0x05, 0xa7, 0xac, 0x6d, 0x95, 0xe4, 0xcc, 0x48, 0x68, 0x34, + 0x35, 0x1d, 0x6b, 0xf4, 0x5b, 0xd1, 0xd1, 0x21, 0xa5, 0xac, 0x37, 0xd5, 0x15, 0x69, 0x3b, 0x30, + 0x10, 0x3e, 0x92, 0x05, 0x27, 0x87, 0x4c, 0xb2, 0x67, 0x92, 0x21, 0x3d, 0x39, 0xe6, 0xa0, 0x6b, + 0xd0, 0xb9, 0xe5, 0x52, 0xf7, 0xe1, 0x0a, 0x4f, 0x1e, 0x94, 0x50, 0x82, 0xc3, 0xc7, 0x37, 0x8f, + 0xc6, 0x8e, 0x43, 0x0b, 0xa6, 0x05, 0x1d, 0xd2, 0x42, 0x18, 0x96, 0x52, 0x0e, 0xb2, 0x71, 0xff, + 0x97, 0xbf, 0x10, 0xc6, 0x67, 0x4a, 0x81, 0x1b, 0x16, 0xce, 0x71, 0xa0, 0xa1, 0xef, 0xb8, 0xc8, + 0x5b, 0xe8, 0x4c, 0x84, 0x16, 0x28, 0x99, 0x65, 0xd8, 0x41, 0x97, 0xd0, 0x99, 0xf0, 0x09, 0xbe, + 0xef, 0x09, 0xbc, 0x62, 0x4d, 0x23, 0x54, 0x74, 0xc7, 0x72, 0xee, 0x39, 0xf4, 0xdc, 0x81, 0xa1, + 0xc2, 0x81, 0x6e, 0x45, 0xb3, 0xc9, 0x95, 0xac, 0xa5, 0x89, 0xa6, 0x8b, 0x69, 0x12, 0x3c, 0x3f, + 0x26, 0x5e, 0xf0, 0x28, 0x86, 0x78, 0x31, 0xe4, 0x1c, 0x64, 0xb3, 0x7e, 0x76, 0xfd, 0x7d, 0x3e, + 0xf9, 0xfc, 0x63, 0x9e, 0x94, 0xd2, 0x54, 0x7d, 0x41, 0x38, 0xd4, 0xde, 0x9d, 0x7f, 0xac, 0xf4, + 0xe6, 0x1d, 0x35, 0x1f, 0x5a, 0xa1, 0x6d, 0x81, 0xce, 0xb0, 0xed, 0x7f, 0x31, 0xb6, 0x0f, 0x1f, + 0x63, 0xcc, 0x94, 0x82, 0xf7, 0xb9, 0x92, 0xda, 0x44, 0x47, 0x8b, 0x69, 0x32, 0xcb, 0x66, 0x16, + 0xb9, 0x90, 0xda, 0x2c, 0x3f, 0x21, 0xfc, 0xf0, 0xb5, 0x0f, 0xf1, 0xac, 0x37, 0x15, 0x74, 0xf2, + 0xca, 0xd9, 0xbd, 0xc4, 0x01, 0xfb, 0x63, 0x5e, 0x47, 0xc8, 0xca, 0x4c, 0xc8, 0x6d, 0x2b, 0x20, + 0x7f, 0xd3, 0x5a, 0x1f, 0x8d, 0xaa, 0xb3, 0xc3, 0x16, 0x2f, 0x9f, 0x7e, 0xfd, 0xb2, 0x5a, 0x7a, + 0x9b, 0x6e, 0xad, 0x7b, 0x9f, 0xff, 0x4c, 0x5e, 0xbf, 0xba, 0xde, 0xc6, 0xe8, 0x66, 0x1b, 0xa3, + 0x9f, 0xdb, 0x18, 0x7d, 0xdc, 0xc5, 0x93, 0x9b, 0x5d, 0x3c, 0xf9, 0xb6, 0x8b, 0x27, 0x6f, 0x4e, + 0xff, 0x8f, 0x40, 0x16, 0x7c, 0x55, 0x02, 0x1d, 0x4e, 0x69, 0x0d, 0x9b, 0x5e, 0x09, 0x3d, 0x9e, + 0xd2, 0xc1, 0x09, 0xd9, 0x5c, 0x8a, 0xbb, 0x76, 0xa3, 0x2f, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, + 0x1b, 0xbb, 0x65, 0x15, 0x6c, 0x02, 0x00, 0x00, } func (m *Allocation) Marshal() (dAtA []byte, err error) { diff --git a/modules/apps/transfer/types/genesis.pb.go b/modules/apps/transfer/types/genesis.pb.go index d7cd38dd7a9..f1b7fe6555b 100644 --- a/modules/apps/transfer/types/genesis.pb.go +++ b/modules/apps/transfer/types/genesis.pb.go @@ -25,8 +25,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the ibc-transfer genesis state type GenesisState struct { - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` - DenomTraces Traces `protobuf:"bytes,2,rep,name=denom_traces,json=denomTraces,proto3,castrepeated=Traces" json:"denom_traces" yaml:"denom_traces"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` + DenomTraces Traces `protobuf:"bytes,2,rep,name=denom_traces,json=denomTraces,proto3,castrepeated=Traces" json:"denom_traces"` Params Params `protobuf:"bytes,3,opt,name=params,proto3" json:"params"` } @@ -93,28 +93,26 @@ func init() { } var fileDescriptor_a4f788affd5bea89 = []byte{ - // 324 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0xc3, 0x30, - 0x1c, 0xc6, 0x1b, 0x27, 0x15, 0xbb, 0xe1, 0xa1, 0x7a, 0x18, 0x43, 0xda, 0x51, 0x14, 0x8a, 0xc3, - 0x84, 0xcd, 0xc3, 0xc0, 0x63, 0x11, 0xc4, 0x9b, 0x4e, 0x4f, 0x5e, 0x46, 0x9a, 0xc6, 0x1a, 0x58, - 0x9b, 0x92, 0x7f, 0x36, 0xd8, 0x5b, 0xf8, 0x1c, 0x3e, 0xc9, 0x8e, 0x3b, 0x7a, 0x9a, 0xb2, 0xbd, - 0xc1, 0x7c, 0x01, 0x49, 0x37, 0xc7, 0x4e, 0xbd, 0x7d, 0x24, 0xbf, 0xef, 0xfb, 0xfe, 0x7c, 0xce, - 0x95, 0x88, 0x19, 0xa1, 0x45, 0x31, 0x12, 0x8c, 0x6a, 0x21, 0x73, 0x20, 0x5a, 0xd1, 0x1c, 0xde, - 0xb8, 0x22, 0x93, 0x2e, 0x49, 0x79, 0xce, 0x41, 0x00, 0x2e, 0x94, 0xd4, 0xd2, 0x3d, 0x17, 0x31, - 0xc3, 0xfb, 0x2c, 0xfe, 0x67, 0xf1, 0xa4, 0xdb, 0xea, 0x54, 0x26, 0xed, 0xc8, 0x32, 0xaa, 0x75, - 0x96, 0xca, 0x54, 0x96, 0x92, 0x18, 0xb5, 0x79, 0x0d, 0x7e, 0x91, 0xd3, 0xb8, 0xdf, 0x54, 0x3e, - 0x6b, 0xaa, 0xb9, 0xdb, 0x71, 0x8e, 0x0a, 0xa9, 0xf4, 0x50, 0x24, 0x4d, 0xd4, 0x46, 0xe1, 0x71, - 0xe4, 0xae, 0x17, 0xfe, 0xc9, 0x94, 0x66, 0xa3, 0xdb, 0x60, 0xfb, 0x11, 0x0c, 0x6c, 0xa3, 0x1e, - 0x12, 0x57, 0x39, 0x8d, 0x84, 0xe7, 0x32, 0x1b, 0x6a, 0x45, 0x19, 0x87, 0xe6, 0x41, 0xbb, 0x16, - 0xd6, 0x7b, 0x21, 0xae, 0xba, 0x1a, 0xdf, 0x19, 0xc7, 0x8b, 0x31, 0x44, 0x97, 0xb3, 0x85, 0x6f, - 0xad, 0x17, 0xfe, 0xe9, 0x26, 0x7f, 0x3f, 0x2b, 0xf8, 0xfc, 0xf6, 0xed, 0x92, 0x82, 0x41, 0x3d, - 0xd9, 0x59, 0xc0, 0x8d, 0x1c, 0xbb, 0xa0, 0x8a, 0x66, 0xd0, 0xac, 0xb5, 0x51, 0x58, 0xef, 0x5d, - 0x54, 0xb7, 0x3d, 0x96, 0x6c, 0x74, 0x68, 0x9a, 0x06, 0x5b, 0x67, 0xf4, 0x34, 0x5b, 0x7a, 0x68, - 0xbe, 0xf4, 0xd0, 0xcf, 0xd2, 0x43, 0x1f, 0x2b, 0xcf, 0x9a, 0xaf, 0x3c, 0xeb, 0x6b, 0xe5, 0x59, - 0xaf, 0xfd, 0x54, 0xe8, 0xf7, 0x71, 0x8c, 0x99, 0xcc, 0x08, 0x93, 0x90, 0x49, 0x20, 0x22, 0x66, - 0xd7, 0xa9, 0x24, 0x93, 0x3e, 0xc9, 0x64, 0x32, 0x1e, 0x71, 0x30, 0x93, 0xef, 0x4d, 0xad, 0xa7, - 0x05, 0x87, 0xd8, 0x2e, 0xf7, 0xbc, 0xf9, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x4d, 0x22, 0xc9, - 0xde, 0x01, 0x00, 0x00, + // 301 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0x2b, 0x31, + 0x14, 0x86, 0x27, 0xb7, 0x97, 0x11, 0xa7, 0xc5, 0xc5, 0x20, 0x58, 0x8a, 0xa4, 0x45, 0x5c, 0x0c, + 0x8a, 0x09, 0xad, 0x8b, 0xee, 0x07, 0x41, 0xdc, 0x69, 0x75, 0xa5, 0x8b, 0x92, 0xc9, 0xc4, 0x31, + 0xd0, 0x99, 0x13, 0x72, 0xd2, 0x82, 0x6f, 0xe1, 0x73, 0xf8, 0x24, 0x5d, 0x76, 0xe9, 0x4a, 0xa5, + 0x7d, 0x11, 0xc9, 0x54, 0x4b, 0x57, 0xdd, 0x9d, 0x93, 0x7c, 0xff, 0x97, 0xf0, 0x47, 0x67, 0x3a, + 0x93, 0x5c, 0x18, 0x33, 0xd1, 0x52, 0x38, 0x0d, 0x15, 0x72, 0x67, 0x45, 0x85, 0xcf, 0xca, 0xf2, + 0x59, 0x9f, 0x17, 0xaa, 0x52, 0xa8, 0x91, 0x19, 0x0b, 0x0e, 0xe2, 0x63, 0x9d, 0x49, 0xb6, 0xcd, + 0xb2, 0x3f, 0x96, 0xcd, 0xfa, 0x9d, 0xf3, 0x9d, 0xa6, 0x0d, 0x59, 0xab, 0x3a, 0x87, 0x05, 0x14, + 0x50, 0x8f, 0xdc, 0x4f, 0xeb, 0xd3, 0x93, 0x39, 0x89, 0x5a, 0xd7, 0xeb, 0x27, 0xef, 0x9d, 0x70, + 0x2a, 0x3e, 0x8a, 0xf6, 0x0c, 0x58, 0x37, 0xd6, 0x79, 0x9b, 0xf4, 0x48, 0xb2, 0x3f, 0x0a, 0xfd, + 0x7a, 0x93, 0xc7, 0x4f, 0x51, 0x2b, 0x57, 0x15, 0x94, 0x63, 0x67, 0x85, 0x54, 0xd8, 0xfe, 0xd7, + 0x6b, 0x24, 0xcd, 0x41, 0xc2, 0x76, 0xfd, 0x90, 0x5d, 0xf9, 0xc4, 0x83, 0x0f, 0xa4, 0x07, 0xf3, + 0xcf, 0x6e, 0xf0, 0xfe, 0xd5, 0x0d, 0xeb, 0x15, 0x47, 0xcd, 0x7c, 0x73, 0x87, 0x71, 0x1a, 0x85, + 0x46, 0x58, 0x51, 0x62, 0xbb, 0xd1, 0x23, 0x49, 0x73, 0x70, 0xba, 0x5b, 0x7b, 0x5b, 0xb3, 0xe9, + 0x7f, 0xaf, 0x1c, 0xfd, 0x26, 0xd3, 0xbb, 0xf9, 0x92, 0x92, 0xc5, 0x92, 0x92, 0xef, 0x25, 0x25, + 0x6f, 0x2b, 0x1a, 0x2c, 0x56, 0x34, 0xf8, 0x58, 0xd1, 0xe0, 0x71, 0x58, 0x68, 0xf7, 0x32, 0xcd, + 0x98, 0x84, 0x92, 0x4b, 0xc0, 0x12, 0x90, 0xeb, 0x4c, 0x5e, 0x14, 0xc0, 0x67, 0x43, 0x5e, 0x42, + 0x3e, 0x9d, 0x28, 0xf4, 0x3d, 0x6e, 0xf5, 0xe7, 0x5e, 0x8d, 0xc2, 0x2c, 0xac, 0x4b, 0xba, 0xfc, + 0x09, 0x00, 0x00, 0xff, 0xff, 0x16, 0x48, 0xb9, 0x00, 0xb3, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/modules/apps/transfer/types/transfer.pb.go b/modules/apps/transfer/types/transfer.pb.go index 6669bda8872..56811dbc867 100644 --- a/modules/apps/transfer/types/transfer.pb.go +++ b/modules/apps/transfer/types/transfer.pb.go @@ -5,7 +5,6 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" math "math" @@ -87,10 +86,10 @@ func (m *DenomTrace) GetBaseDenom() string { type Params struct { // send_enabled enables or disables all cross-chain token transfers from this // chain. - SendEnabled bool `protobuf:"varint,1,opt,name=send_enabled,json=sendEnabled,proto3" json:"send_enabled,omitempty" yaml:"send_enabled"` + SendEnabled bool `protobuf:"varint,1,opt,name=send_enabled,json=sendEnabled,proto3" json:"send_enabled,omitempty"` // receive_enabled enables or disables all cross-chain token transfers to this // chain. - ReceiveEnabled bool `protobuf:"varint,2,opt,name=receive_enabled,json=receiveEnabled,proto3" json:"receive_enabled,omitempty" yaml:"receive_enabled"` + ReceiveEnabled bool `protobuf:"varint,2,opt,name=receive_enabled,json=receiveEnabled,proto3" json:"receive_enabled,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -150,26 +149,23 @@ func init() { } var fileDescriptor_5041673e96e97901 = []byte{ - // 300 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xc1, 0x4a, 0x2b, 0x31, - 0x14, 0x86, 0x9b, 0x72, 0x29, 0xb7, 0x51, 0x14, 0xa2, 0x68, 0x29, 0x9a, 0xca, 0xac, 0x04, 0x71, - 0x42, 0x71, 0x51, 0xe8, 0x46, 0xa8, 0xba, 0xd7, 0xe2, 0xca, 0x4d, 0x49, 0x32, 0xc7, 0x69, 0x60, - 0x32, 0x19, 0x92, 0x74, 0xa0, 0x8f, 0xe0, 0xce, 0xc7, 0x72, 0xd9, 0xa5, 0xab, 0x22, 0xed, 0x1b, - 0xf4, 0x09, 0x64, 0xd2, 0x52, 0x06, 0x77, 0xff, 0x39, 0xe7, 0xfb, 0xce, 0xe2, 0xc7, 0x37, 0x4a, - 0x48, 0xc6, 0x8b, 0x22, 0x53, 0x92, 0x7b, 0x65, 0x72, 0xc7, 0xbc, 0xe5, 0xb9, 0x7b, 0x07, 0xcb, - 0xca, 0xfe, 0x3e, 0xc7, 0x85, 0x35, 0xde, 0x90, 0x0b, 0x25, 0x64, 0x5c, 0x87, 0xe3, 0x3d, 0x50, - 0xf6, 0xbb, 0xa7, 0xa9, 0x49, 0x4d, 0x00, 0x59, 0x95, 0xb6, 0x4e, 0x74, 0x8f, 0xf1, 0x23, 0xe4, - 0x46, 0xbf, 0x5a, 0x2e, 0x81, 0x10, 0xfc, 0xaf, 0xe0, 0x7e, 0xda, 0x41, 0x57, 0xe8, 0xba, 0x3d, - 0x0e, 0x99, 0x5c, 0x62, 0x2c, 0xb8, 0x83, 0x49, 0x52, 0x61, 0x9d, 0x66, 0xb8, 0xb4, 0xab, 0x4d, - 0xf0, 0xa2, 0x0f, 0x84, 0x5b, 0xcf, 0xdc, 0x72, 0xed, 0xc8, 0x10, 0x1f, 0x3a, 0xc8, 0x93, 0x09, - 0xe4, 0x5c, 0x64, 0x90, 0x84, 0x2f, 0xff, 0x47, 0xe7, 0x9b, 0x65, 0xef, 0x64, 0xce, 0x75, 0x36, - 0x8c, 0xea, 0xd7, 0x68, 0x7c, 0x50, 0x8d, 0x4f, 0xdb, 0x89, 0x3c, 0xe0, 0x63, 0x0b, 0x12, 0x54, - 0x09, 0x7b, 0xbd, 0x19, 0xf4, 0xee, 0x66, 0xd9, 0x3b, 0xdb, 0xea, 0x7f, 0x80, 0x68, 0x7c, 0xb4, - 0xdb, 0xec, 0x9e, 0x8c, 0x5e, 0xbe, 0x56, 0x14, 0x2d, 0x56, 0x14, 0xfd, 0xac, 0x28, 0xfa, 0x5c, - 0xd3, 0xc6, 0x62, 0x4d, 0x1b, 0xdf, 0x6b, 0xda, 0x78, 0x1b, 0xa4, 0xca, 0x4f, 0x67, 0x22, 0x96, - 0x46, 0x33, 0x69, 0x9c, 0x36, 0x8e, 0x29, 0x21, 0x6f, 0x53, 0xc3, 0xca, 0x01, 0xd3, 0x26, 0x99, - 0x65, 0xe0, 0xaa, 0x9e, 0x6b, 0xfd, 0xfa, 0x79, 0x01, 0x4e, 0xb4, 0x42, 0x4d, 0x77, 0xbf, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x11, 0x89, 0xc0, 0xe0, 0x89, 0x01, 0x00, 0x00, + // 256 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0x3f, 0x4b, 0x03, 0x31, + 0x18, 0x87, 0x9b, 0x22, 0xc5, 0x46, 0x51, 0xc8, 0xd4, 0x41, 0x83, 0x76, 0x51, 0x10, 0x2f, 0x14, + 0x87, 0x8e, 0x82, 0xe8, 0xae, 0xa5, 0x93, 0x4b, 0x49, 0x72, 0xaf, 0x6d, 0xe0, 0xf2, 0x87, 0xbc, + 0xe9, 0x81, 0xdf, 0xc2, 0x8f, 0xe5, 0xd8, 0xd1, 0x51, 0xee, 0xbe, 0x88, 0x5c, 0x2c, 0x47, 0xb7, + 0x1f, 0x4f, 0x9e, 0xbc, 0xc3, 0x43, 0xef, 0x8c, 0xd2, 0x42, 0x86, 0x50, 0x19, 0x2d, 0x93, 0xf1, + 0x0e, 0x45, 0x8a, 0xd2, 0xe1, 0x07, 0x44, 0x51, 0xcf, 0xfa, 0x5d, 0x84, 0xe8, 0x93, 0x67, 0x17, + 0x46, 0xe9, 0xe2, 0x50, 0x2e, 0x7a, 0xa1, 0x9e, 0x4d, 0x1f, 0x29, 0x7d, 0x06, 0xe7, 0xed, 0x32, + 0x4a, 0x0d, 0x8c, 0xd1, 0xa3, 0x20, 0xd3, 0x66, 0x42, 0xae, 0xc8, 0xed, 0x78, 0x91, 0x37, 0xbb, + 0xa4, 0x54, 0x49, 0x84, 0x55, 0xd9, 0x69, 0x93, 0x61, 0x7e, 0x19, 0x77, 0x24, 0xff, 0x9b, 0x2e, + 0xe9, 0xe8, 0x55, 0x46, 0x69, 0x91, 0x5d, 0xd3, 0x53, 0x04, 0x57, 0xae, 0xc0, 0x49, 0x55, 0x41, + 0x99, 0x8f, 0x1c, 0x2f, 0x4e, 0x3a, 0xf6, 0xf2, 0x8f, 0xd8, 0x0d, 0x3d, 0x8f, 0xa0, 0xc1, 0xd4, + 0xd0, 0x5b, 0xc3, 0x6c, 0x9d, 0xed, 0xf1, 0x5e, 0x7c, 0x7a, 0xfb, 0x6e, 0x38, 0xd9, 0x35, 0x9c, + 0xfc, 0x36, 0x9c, 0x7c, 0xb5, 0x7c, 0xb0, 0x6b, 0xf9, 0xe0, 0xa7, 0xe5, 0x83, 0xf7, 0xf9, 0xda, + 0xa4, 0xcd, 0x56, 0x15, 0xda, 0x5b, 0xa1, 0x3d, 0x5a, 0x8f, 0xc2, 0x28, 0x7d, 0xbf, 0xf6, 0xa2, + 0x9e, 0x0b, 0xeb, 0xcb, 0x6d, 0x05, 0xd8, 0xb5, 0x39, 0x68, 0x92, 0x3e, 0x03, 0xa0, 0x1a, 0xe5, + 0x1c, 0x0f, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x85, 0xfd, 0x75, 0xb7, 0x3d, 0x01, 0x00, 0x00, } func (m *DenomTrace) Marshal() (dAtA []byte, err error) { diff --git a/modules/apps/transfer/types/tx.pb.go b/modules/apps/transfer/types/tx.pb.go index 077de524251..73a6a19e1e5 100644 --- a/modules/apps/transfer/types/tx.pb.go +++ b/modules/apps/transfer/types/tx.pb.go @@ -35,9 +35,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // https://github.com/cosmos/ibc/tree/master/spec/app/ics-020-fungible-token-transfer#data-structures type MsgTransfer struct { // the port on which the packet will be sent - SourcePort string `protobuf:"bytes,1,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty" yaml:"source_port"` + SourcePort string `protobuf:"bytes,1,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty"` // the channel by which the packet will be sent - SourceChannel string `protobuf:"bytes,2,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty" yaml:"source_channel"` + SourceChannel string `protobuf:"bytes,2,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty"` // the tokens to be transferred Token types.Coin `protobuf:"bytes,3,opt,name=token,proto3" json:"token"` // the sender address @@ -46,10 +46,10 @@ type MsgTransfer struct { Receiver string `protobuf:"bytes,5,opt,name=receiver,proto3" json:"receiver,omitempty"` // Timeout height relative to the current block height. // The timeout is disabled when set to 0. - TimeoutHeight types1.Height `protobuf:"bytes,6,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height" yaml:"timeout_height"` + TimeoutHeight types1.Height `protobuf:"bytes,6,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height"` // Timeout timestamp in absolute nanoseconds since unix epoch. // The timeout is disabled when set to 0. - TimeoutTimestamp uint64 `protobuf:"varint,7,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty" yaml:"timeout_timestamp"` + TimeoutTimestamp uint64 `protobuf:"varint,7,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty"` // optional memo Memo string `protobuf:"bytes,8,opt,name=memo,proto3" json:"memo,omitempty"` } @@ -143,40 +143,37 @@ func init() { } var fileDescriptor_7401ed9bed2f8e09 = []byte{ - // 517 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xc1, 0x6e, 0xd3, 0x4c, - 0x10, 0xb6, 0xff, 0xa4, 0xf9, 0xc3, 0x46, 0xad, 0x60, 0x81, 0xca, 0x8d, 0x8a, 0x1d, 0x59, 0x42, - 0x0a, 0x07, 0x76, 0xe5, 0x22, 0x14, 0xa9, 0x27, 0x94, 0x5e, 0xe0, 0x50, 0x09, 0xac, 0x9e, 0xb8, - 0x14, 0x7b, 0x3b, 0x38, 0x2b, 0x62, 0x8f, 0xf1, 0x6e, 0x2c, 0xfa, 0x06, 0x1c, 0x79, 0x84, 0x3e, - 0x09, 0xe7, 0x1e, 0x7b, 0xe4, 0x14, 0xa1, 0xe4, 0xc2, 0x39, 0x4f, 0x80, 0xd6, 0x76, 0x42, 0x72, - 0x41, 0x9c, 0x3c, 0x33, 0xdf, 0x37, 0xfe, 0xf6, 0xdb, 0x99, 0x25, 0x4f, 0x65, 0x2c, 0x78, 0x94, - 0xe7, 0x53, 0x29, 0x22, 0x2d, 0x31, 0x53, 0x5c, 0x17, 0x51, 0xa6, 0x3e, 0x42, 0xc1, 0xcb, 0x80, - 0xeb, 0x2f, 0x2c, 0x2f, 0x50, 0x23, 0x3d, 0x96, 0xb1, 0x60, 0xdb, 0x34, 0xb6, 0xa6, 0xb1, 0x32, - 0xe8, 0x3f, 0x4a, 0x30, 0xc1, 0x8a, 0xc8, 0x4d, 0x54, 0xf7, 0xf4, 0x5d, 0x81, 0x2a, 0x45, 0xc5, - 0xe3, 0x48, 0x01, 0x2f, 0x83, 0x18, 0x74, 0x14, 0x70, 0x81, 0x32, 0x6b, 0x70, 0xcf, 0x48, 0x0b, - 0x2c, 0x80, 0x8b, 0xa9, 0x84, 0x4c, 0x1b, 0xc1, 0x3a, 0xaa, 0x09, 0xfe, 0xf7, 0x16, 0xe9, 0x9d, - 0xab, 0xe4, 0xa2, 0x51, 0xa2, 0x23, 0xd2, 0x53, 0x38, 0x2b, 0x04, 0x5c, 0xe6, 0x58, 0x68, 0xc7, - 0x1e, 0xd8, 0xc3, 0x7b, 0xe3, 0xc3, 0xd5, 0xdc, 0xa3, 0xd7, 0x51, 0x3a, 0x3d, 0xf5, 0xb7, 0x40, - 0x3f, 0x24, 0x75, 0xf6, 0x16, 0x0b, 0x4d, 0x5f, 0x91, 0x83, 0x06, 0x13, 0x93, 0x28, 0xcb, 0x60, - 0xea, 0xfc, 0x57, 0xf5, 0x1e, 0xad, 0xe6, 0xde, 0xe3, 0x9d, 0xde, 0x06, 0xf7, 0xc3, 0xfd, 0xba, - 0x70, 0x56, 0xe7, 0xf4, 0x25, 0xd9, 0xd3, 0xf8, 0x09, 0x32, 0xa7, 0x35, 0xb0, 0x87, 0xbd, 0x93, - 0x23, 0x56, 0x7b, 0x63, 0xc6, 0x1b, 0x6b, 0xbc, 0xb1, 0x33, 0x94, 0xd9, 0xb8, 0x7d, 0x3b, 0xf7, - 0xac, 0xb0, 0x66, 0xd3, 0x43, 0xd2, 0x51, 0x90, 0x5d, 0x41, 0xe1, 0xb4, 0x8d, 0x60, 0xd8, 0x64, - 0xb4, 0x4f, 0xba, 0x05, 0x08, 0x90, 0x25, 0x14, 0xce, 0x5e, 0x85, 0x6c, 0x72, 0xfa, 0x81, 0x1c, - 0x68, 0x99, 0x02, 0xce, 0xf4, 0xe5, 0x04, 0x64, 0x32, 0xd1, 0x4e, 0xa7, 0xd2, 0xec, 0x33, 0x33, - 0x03, 0x73, 0x5f, 0xac, 0xb9, 0xa5, 0x32, 0x60, 0xaf, 0x2b, 0xc6, 0xf8, 0x89, 0x11, 0xfd, 0x63, - 0x66, 0xb7, 0xdf, 0x0f, 0xf7, 0x9b, 0x42, 0xcd, 0xa6, 0x6f, 0xc8, 0x83, 0x35, 0xc3, 0x7c, 0x95, - 0x8e, 0xd2, 0xdc, 0xf9, 0x7f, 0x60, 0x0f, 0xdb, 0xe3, 0xe3, 0xd5, 0xdc, 0x73, 0x76, 0x7f, 0xb2, - 0xa1, 0xf8, 0xe1, 0xfd, 0xa6, 0x76, 0xb1, 0x2e, 0x51, 0x4a, 0xda, 0x29, 0xa4, 0xe8, 0x74, 0x2b, - 0x13, 0x55, 0x7c, 0xda, 0xfd, 0x7a, 0xe3, 0x59, 0xbf, 0x6e, 0x3c, 0xcb, 0x0f, 0xc8, 0xc3, 0xad, - 0xf9, 0x85, 0xa0, 0x72, 0xcc, 0x14, 0x18, 0xf7, 0x0a, 0x3e, 0xcf, 0x20, 0x13, 0x50, 0x0d, 0xb1, - 0x1d, 0x6e, 0xf2, 0x13, 0x24, 0xad, 0x73, 0x95, 0xd0, 0x09, 0xe9, 0x6e, 0xc6, 0xfe, 0x8c, 0xfd, - 0x6d, 0xf9, 0xd8, 0x96, 0x42, 0x3f, 0xf8, 0x67, 0xea, 0xfa, 0x30, 0xe3, 0x77, 0xb7, 0x0b, 0xd7, - 0xbe, 0x5b, 0xb8, 0xf6, 0xcf, 0x85, 0x6b, 0x7f, 0x5b, 0xba, 0xd6, 0xdd, 0xd2, 0xb5, 0x7e, 0x2c, - 0x5d, 0xeb, 0xfd, 0x28, 0x91, 0x7a, 0x32, 0x8b, 0x99, 0xc0, 0x94, 0x37, 0xab, 0x2c, 0x63, 0xf1, - 0x3c, 0x41, 0x5e, 0x8e, 0x78, 0x8a, 0x57, 0xb3, 0x29, 0x28, 0xf3, 0x74, 0xb6, 0x9e, 0x8c, 0xbe, - 0xce, 0x41, 0xc5, 0x9d, 0x6a, 0x7d, 0x5f, 0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xde, 0x3d, 0xc2, - 0x16, 0x5c, 0x03, 0x00, 0x00, + // 470 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xc1, 0x6e, 0xd4, 0x30, + 0x10, 0x4d, 0xda, 0xed, 0xb2, 0x78, 0xd5, 0x0a, 0x0c, 0x42, 0x61, 0x85, 0xb2, 0xab, 0x4a, 0x95, + 0x16, 0x21, 0x6c, 0xa5, 0x08, 0x55, 0xe2, 0xd8, 0x1e, 0xe0, 0x52, 0x09, 0xa2, 0x9e, 0xb8, 0x54, + 0x89, 0x3b, 0x24, 0x16, 0x1b, 0x4f, 0xb0, 0x9d, 0x08, 0xfe, 0x80, 0x23, 0x9f, 0xd0, 0xcf, 0xe9, + 0xb1, 0x07, 0x0e, 0x9c, 0x10, 0xda, 0xbd, 0xf0, 0x19, 0x28, 0x8e, 0x77, 0xb5, 0x27, 0xd4, 0x53, + 0x3c, 0x6f, 0x9e, 0xfd, 0xde, 0x4c, 0x1e, 0x39, 0x92, 0xb9, 0xe0, 0x59, 0x5d, 0x2f, 0xa4, 0xc8, + 0xac, 0x44, 0x65, 0xb8, 0xd5, 0x99, 0x32, 0x9f, 0x40, 0xf3, 0x36, 0xe1, 0xf6, 0x2b, 0xab, 0x35, + 0x5a, 0xa4, 0xcf, 0x64, 0x2e, 0xd8, 0x36, 0x8d, 0xad, 0x69, 0xac, 0x4d, 0x26, 0x8f, 0x0b, 0x2c, + 0xd0, 0x11, 0x79, 0x77, 0xea, 0xef, 0x4c, 0x62, 0x81, 0xa6, 0x42, 0xc3, 0xf3, 0xcc, 0x00, 0x6f, + 0x93, 0x1c, 0x6c, 0x96, 0x70, 0x81, 0x52, 0xf9, 0xfe, 0xb4, 0x93, 0x16, 0xa8, 0x81, 0x8b, 0x85, + 0x04, 0x65, 0x3b, 0xc1, 0xfe, 0xd4, 0x13, 0x0e, 0x7f, 0xee, 0x90, 0xf1, 0xb9, 0x29, 0x2e, 0xbc, + 0x12, 0x9d, 0x92, 0xb1, 0xc1, 0x46, 0x0b, 0xb8, 0xac, 0x51, 0xdb, 0x28, 0x9c, 0x85, 0xf3, 0xfb, + 0x29, 0xe9, 0xa1, 0xf7, 0xa8, 0x2d, 0x3d, 0x22, 0x07, 0x9e, 0x20, 0xca, 0x4c, 0x29, 0x58, 0x44, + 0x3b, 0x8e, 0xb3, 0xdf, 0xa3, 0x67, 0x3d, 0x48, 0x5f, 0x93, 0x3d, 0x8b, 0x9f, 0x41, 0x45, 0xbb, + 0xb3, 0x70, 0x3e, 0x3e, 0x7e, 0xca, 0x7a, 0xa3, 0xac, 0x33, 0xca, 0xbc, 0x51, 0x76, 0x86, 0x52, + 0x9d, 0x0e, 0x6e, 0x7e, 0x4f, 0x83, 0xb4, 0x67, 0xd3, 0x27, 0x64, 0x68, 0x40, 0x5d, 0x81, 0x8e, + 0x06, 0xee, 0x55, 0x5f, 0xd1, 0x09, 0x19, 0x69, 0x10, 0x20, 0x5b, 0xd0, 0xd1, 0x9e, 0xeb, 0x6c, + 0x6a, 0xfa, 0x96, 0x1c, 0x58, 0x59, 0x01, 0x36, 0xf6, 0xb2, 0x04, 0x59, 0x94, 0x36, 0x1a, 0x3a, + 0xcd, 0x09, 0xeb, 0x16, 0xda, 0x0d, 0xcf, 0xfc, 0xc8, 0x6d, 0xc2, 0xde, 0x39, 0x86, 0x17, 0xdd, + 0xf7, 0xf7, 0x7a, 0x90, 0xbe, 0x20, 0x0f, 0xd7, 0x0f, 0x75, 0x5f, 0x63, 0xb3, 0xaa, 0x8e, 0xee, + 0xcd, 0xc2, 0xf9, 0x20, 0x7d, 0xe0, 0x1b, 0x17, 0x6b, 0x9c, 0x52, 0x32, 0xa8, 0xa0, 0xc2, 0x68, + 0xe4, 0xdc, 0xb8, 0xf3, 0x9b, 0xd1, 0xf7, 0xeb, 0x69, 0xf0, 0xf7, 0x7a, 0x1a, 0x1c, 0x26, 0xe4, + 0xd1, 0xd6, 0x56, 0x53, 0x30, 0x35, 0x2a, 0x03, 0xdd, 0x18, 0x06, 0xbe, 0x34, 0xa0, 0x04, 0xb8, + 0xd5, 0x0e, 0xd2, 0x4d, 0x7d, 0x8c, 0x64, 0xf7, 0xdc, 0x14, 0xb4, 0x24, 0xa3, 0xcd, 0xcf, 0x78, + 0xce, 0xfe, 0x17, 0x09, 0xb6, 0xa5, 0x30, 0x49, 0xee, 0x4c, 0x5d, 0x9b, 0x39, 0xfd, 0x70, 0xb3, + 0x8c, 0xc3, 0xdb, 0x65, 0x1c, 0xfe, 0x59, 0xc6, 0xe1, 0x8f, 0x55, 0x1c, 0xdc, 0xae, 0xe2, 0xe0, + 0xd7, 0x2a, 0x0e, 0x3e, 0x9e, 0x14, 0xd2, 0x96, 0x4d, 0xce, 0x04, 0x56, 0xdc, 0x07, 0x4c, 0xe6, + 0xe2, 0x65, 0x81, 0xbc, 0x3d, 0xe1, 0x15, 0x5e, 0x35, 0x0b, 0x30, 0x5d, 0xa0, 0xb7, 0x82, 0x6c, + 0xbf, 0xd5, 0x60, 0xf2, 0xa1, 0x0b, 0xd5, 0xab, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x30, + 0xb8, 0x6b, 0xf2, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/core/02-client/migrations/v7/solomachine.pb.go b/modules/core/02-client/migrations/v7/solomachine.pb.go index c51210cf69d..e579505f3e6 100644 --- a/modules/core/02-client/migrations/v7/solomachine.pb.go +++ b/modules/core/02-client/migrations/v7/solomachine.pb.go @@ -93,11 +93,11 @@ type ClientState struct { // latest sequence of the client state Sequence uint64 `protobuf:"varint,1,opt,name=sequence,proto3" json:"sequence,omitempty"` // frozen sequence of the solo machine - IsFrozen bool `protobuf:"varint,2,opt,name=is_frozen,json=isFrozen,proto3" json:"is_frozen,omitempty" yaml:"is_frozen"` - ConsensusState *ConsensusState `protobuf:"bytes,3,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty" yaml:"consensus_state"` + IsFrozen bool `protobuf:"varint,2,opt,name=is_frozen,json=isFrozen,proto3" json:"is_frozen,omitempty"` + ConsensusState *ConsensusState `protobuf:"bytes,3,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"` // when set to true, will allow governance to update a solo machine client. // The client will be unfrozen if it is frozen. - AllowUpdateAfterProposal bool `protobuf:"varint,4,opt,name=allow_update_after_proposal,json=allowUpdateAfterProposal,proto3" json:"allow_update_after_proposal,omitempty" yaml:"allow_update_after_proposal"` + AllowUpdateAfterProposal bool `protobuf:"varint,4,opt,name=allow_update_after_proposal,json=allowUpdateAfterProposal,proto3" json:"allow_update_after_proposal,omitempty"` } func (m *ClientState) Reset() { *m = ClientState{} } @@ -138,7 +138,7 @@ var xxx_messageInfo_ClientState proto.InternalMessageInfo // consensus state. type ConsensusState struct { // public key of the solo machine - PublicKey *types.Any `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty" yaml:"public_key"` + PublicKey *types.Any `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` // diversifier allows the same public key to be re-used across different solo // machine clients (potentially on different chains) without being considered // misbehaviour. @@ -185,8 +185,8 @@ type Header struct { Sequence uint64 `protobuf:"varint,1,opt,name=sequence,proto3" json:"sequence,omitempty"` Timestamp uint64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` Signature []byte `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty"` - NewPublicKey *types.Any `protobuf:"bytes,4,opt,name=new_public_key,json=newPublicKey,proto3" json:"new_public_key,omitempty" yaml:"new_public_key"` - NewDiversifier string `protobuf:"bytes,5,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty" yaml:"new_diversifier"` + NewPublicKey *types.Any `protobuf:"bytes,4,opt,name=new_public_key,json=newPublicKey,proto3" json:"new_public_key,omitempty"` + NewDiversifier string `protobuf:"bytes,5,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty"` } func (m *Header) Reset() { *m = Header{} } @@ -225,10 +225,10 @@ var xxx_messageInfo_Header proto.InternalMessageInfo // Misbehaviour defines misbehaviour for a solo machine which consists // of a sequence and two signatures over different messages at that sequence. type Misbehaviour struct { - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` Sequence uint64 `protobuf:"varint,2,opt,name=sequence,proto3" json:"sequence,omitempty"` - SignatureOne *SignatureAndData `protobuf:"bytes,3,opt,name=signature_one,json=signatureOne,proto3" json:"signature_one,omitempty" yaml:"signature_one"` - SignatureTwo *SignatureAndData `protobuf:"bytes,4,opt,name=signature_two,json=signatureTwo,proto3" json:"signature_two,omitempty" yaml:"signature_two"` + SignatureOne *SignatureAndData `protobuf:"bytes,3,opt,name=signature_one,json=signatureOne,proto3" json:"signature_one,omitempty"` + SignatureTwo *SignatureAndData `protobuf:"bytes,4,opt,name=signature_two,json=signatureTwo,proto3" json:"signature_two,omitempty"` } func (m *Misbehaviour) Reset() { *m = Misbehaviour{} } @@ -268,7 +268,7 @@ var xxx_messageInfo_Misbehaviour proto.InternalMessageInfo // signature. type SignatureAndData struct { Signature []byte `protobuf:"bytes,1,opt,name=signature,proto3" json:"signature,omitempty"` - DataType DataType `protobuf:"varint,2,opt,name=data_type,json=dataType,proto3,enum=ibc.lightclients.solomachine.v2.DataType" json:"data_type,omitempty" yaml:"data_type"` + DataType DataType `protobuf:"varint,2,opt,name=data_type,json=dataType,proto3,enum=ibc.lightclients.solomachine.v2.DataType" json:"data_type,omitempty"` Data []byte `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` Timestamp uint64 `protobuf:"varint,4,opt,name=timestamp,proto3" json:"timestamp,omitempty"` } @@ -309,7 +309,7 @@ var xxx_messageInfo_SignatureAndData proto.InternalMessageInfo // TimestampedSignatureData contains the signature data and the timestamp of the // signature. type TimestampedSignatureData struct { - SignatureData []byte `protobuf:"bytes,1,opt,name=signature_data,json=signatureData,proto3" json:"signature_data,omitempty" yaml:"signature_data"` + SignatureData []byte `protobuf:"bytes,1,opt,name=signature_data,json=signatureData,proto3" json:"signature_data,omitempty"` Timestamp uint64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` } @@ -352,7 +352,7 @@ type SignBytes struct { Timestamp uint64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` Diversifier string `protobuf:"bytes,3,opt,name=diversifier,proto3" json:"diversifier,omitempty"` // type of the data used - DataType DataType `protobuf:"varint,4,opt,name=data_type,json=dataType,proto3,enum=ibc.lightclients.solomachine.v2.DataType" json:"data_type,omitempty" yaml:"data_type"` + DataType DataType `protobuf:"varint,4,opt,name=data_type,json=dataType,proto3,enum=ibc.lightclients.solomachine.v2.DataType" json:"data_type,omitempty"` // marshaled data Data []byte `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"` } @@ -393,9 +393,9 @@ var xxx_messageInfo_SignBytes proto.InternalMessageInfo // HeaderData returns the SignBytes data for update verification. type HeaderData struct { // header public key - NewPubKey *types.Any `protobuf:"bytes,1,opt,name=new_pub_key,json=newPubKey,proto3" json:"new_pub_key,omitempty" yaml:"new_pub_key"` + NewPubKey *types.Any `protobuf:"bytes,1,opt,name=new_pub_key,json=newPubKey,proto3" json:"new_pub_key,omitempty"` // header diversifier - NewDiversifier string `protobuf:"bytes,2,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty" yaml:"new_diversifier"` + NewDiversifier string `protobuf:"bytes,2,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty"` } func (m *HeaderData) Reset() { *m = HeaderData{} } @@ -434,7 +434,7 @@ var xxx_messageInfo_HeaderData proto.InternalMessageInfo // ClientStateData returns the SignBytes data for client state verification. type ClientStateData struct { Path []byte `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"` + ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"` } func (m *ClientStateData) Reset() { *m = ClientStateData{} } @@ -474,7 +474,7 @@ var xxx_messageInfo_ClientStateData proto.InternalMessageInfo // verification. type ConsensusStateData struct { Path []byte `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - ConsensusState *types.Any `protobuf:"bytes,2,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty" yaml:"consensus_state"` + ConsensusState *types.Any `protobuf:"bytes,2,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"` } func (m *ConsensusStateData) Reset() { *m = ConsensusStateData{} } @@ -748,7 +748,7 @@ func (m *PacketReceiptAbsenceData) GetPath() []byte { // sequence to be received. type NextSequenceRecvData struct { Path []byte `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - NextSeqRecv uint64 `protobuf:"varint,2,opt,name=next_seq_recv,json=nextSeqRecv,proto3" json:"next_seq_recv,omitempty" yaml:"next_seq_recv"` + NextSeqRecv uint64 `protobuf:"varint,2,opt,name=next_seq_recv,json=nextSeqRecv,proto3" json:"next_seq_recv,omitempty"` } func (m *NextSequenceRecvData) Reset() { *m = NextSequenceRecvData{} } @@ -823,93 +823,85 @@ func init() { } var fileDescriptor_141333b361aae010 = []byte{ - // 1374 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdf, 0x8e, 0xdb, 0x44, - 0x17, 0x5f, 0xa7, 0xe9, 0x76, 0x33, 0xd9, 0xee, 0xe6, 0x73, 0xd3, 0x36, 0xeb, 0x56, 0x89, 0x3f, - 0x23, 0xca, 0x82, 0x68, 0xcc, 0x2e, 0xa2, 0x45, 0x15, 0x82, 0x3a, 0x8e, 0x4b, 0xd3, 0xee, 0x7a, - 0x83, 0xe3, 0x05, 0x5a, 0x21, 0x59, 0x8e, 0x3d, 0x9b, 0x58, 0x4d, 0x3c, 0x69, 0x3c, 0x49, 0x1a, - 0x24, 0x24, 0xc4, 0x55, 0x89, 0xb8, 0xe0, 0x05, 0x22, 0x21, 0x10, 0xcf, 0xc1, 0x1d, 0x70, 0xd9, - 0x4b, 0xae, 0x02, 0x6a, 0xdf, 0x20, 0x4f, 0x80, 0xec, 0x99, 0xc4, 0x76, 0xb6, 0x9b, 0x15, 0xff, - 0xee, 0x66, 0xce, 0xef, 0x9c, 0xdf, 0x39, 0x73, 0xce, 0xf1, 0x99, 0x31, 0xd8, 0x71, 0xea, 0x96, - 0xd8, 0x72, 0x1a, 0x4d, 0x6c, 0xb5, 0x1c, 0xe8, 0x62, 0x4f, 0xf4, 0x50, 0x0b, 0xb5, 0x4d, 0xab, - 0xe9, 0xb8, 0x50, 0xec, 0xef, 0x46, 0xb7, 0xc5, 0x4e, 0x17, 0x61, 0xc4, 0x16, 0x9c, 0xba, 0x55, - 0x8c, 0x9a, 0x14, 0xa3, 0x3a, 0xfd, 0x5d, 0xee, 0x35, 0x9f, 0xd3, 0x42, 0x5d, 0x28, 0x5a, 0xc8, - 0x75, 0xa1, 0x85, 0x1d, 0xe4, 0x8a, 0xfd, 0x9d, 0xc8, 0x8e, 0x30, 0x71, 0xff, 0x0f, 0x15, 0x9b, - 0xa6, 0xeb, 0xc2, 0x56, 0xa0, 0x45, 0x96, 0x54, 0x25, 0xdb, 0x40, 0x0d, 0x14, 0x2c, 0x45, 0x7f, - 0x45, 0xa5, 0x5b, 0x0d, 0x84, 0x1a, 0x2d, 0x28, 0x06, 0xbb, 0x7a, 0xef, 0x48, 0x34, 0xdd, 0x21, - 0x81, 0x84, 0x9f, 0x12, 0x20, 0x2d, 0x07, 0x71, 0xd5, 0xb0, 0x89, 0x21, 0xcb, 0x81, 0x35, 0x0f, - 0x3e, 0xee, 0x41, 0xd7, 0x82, 0x39, 0x86, 0x67, 0xb6, 0x93, 0xda, 0x7c, 0xcf, 0xee, 0x80, 0x94, - 0xe3, 0x19, 0x47, 0x5d, 0xf4, 0x39, 0x74, 0x73, 0x09, 0x9e, 0xd9, 0x5e, 0x2b, 0x65, 0xa7, 0x93, - 0x42, 0x66, 0x68, 0xb6, 0x5b, 0xb7, 0x84, 0x39, 0x24, 0x68, 0x6b, 0x8e, 0x77, 0x27, 0x58, 0xb2, - 0x18, 0x6c, 0x5a, 0xc8, 0xf5, 0xa0, 0xeb, 0xf5, 0x3c, 0xc3, 0xf3, 0x3d, 0xe4, 0xce, 0xf0, 0xcc, - 0x76, 0x7a, 0x57, 0x2c, 0x9e, 0x92, 0x96, 0xa2, 0x3c, 0xb3, 0x0b, 0x02, 0x2b, 0x71, 0xd3, 0x49, - 0xe1, 0x12, 0xf1, 0xb4, 0xc0, 0x28, 0x68, 0x1b, 0x56, 0x4c, 0x97, 0x85, 0xe0, 0x8a, 0xd9, 0x6a, - 0xa1, 0x81, 0xd1, 0xeb, 0xd8, 0x26, 0x86, 0x86, 0x79, 0x84, 0x61, 0xd7, 0xe8, 0x74, 0x51, 0x07, - 0x79, 0x66, 0x2b, 0x97, 0x0c, 0x42, 0xbf, 0x36, 0x9d, 0x14, 0x04, 0x42, 0xb8, 0x44, 0x59, 0xd0, - 0x72, 0x01, 0x7a, 0x18, 0x80, 0x92, 0x8f, 0x55, 0x29, 0x74, 0x2b, 0xf9, 0xf4, 0xbb, 0xc2, 0x8a, - 0xf0, 0x3d, 0x03, 0x36, 0xe2, 0xb1, 0xb2, 0xf7, 0x00, 0xe8, 0xf4, 0xea, 0x2d, 0xc7, 0x32, 0x1e, - 0xc1, 0x61, 0x90, 0xc6, 0xf4, 0x6e, 0xb6, 0x48, 0x8a, 0x50, 0x9c, 0x15, 0xa1, 0x28, 0xb9, 0xc3, - 0xd2, 0xc5, 0xe9, 0xa4, 0xf0, 0x3f, 0x12, 0x44, 0x68, 0x21, 0x68, 0x29, 0xb2, 0xb9, 0x0f, 0x87, - 0x2c, 0x0f, 0xd2, 0xb6, 0xd3, 0x87, 0x5d, 0xcf, 0x39, 0x72, 0x60, 0x37, 0x48, 0x7b, 0x4a, 0x8b, - 0x8a, 0xd8, 0xab, 0x20, 0x85, 0x9d, 0x36, 0xf4, 0xb0, 0xd9, 0xee, 0x04, 0xd9, 0x4d, 0x6a, 0xa1, - 0x80, 0x06, 0xf9, 0x55, 0x02, 0xac, 0xde, 0x85, 0xa6, 0x0d, 0xbb, 0x4b, 0x2b, 0x1c, 0xa3, 0x4a, - 0x2c, 0x50, 0xf9, 0xa8, 0xe7, 0x34, 0x5c, 0x13, 0xf7, 0xba, 0xa4, 0x8c, 0xeb, 0x5a, 0x28, 0x60, - 0x0f, 0xc1, 0x86, 0x0b, 0x07, 0x46, 0xe4, 0xe0, 0xc9, 0x25, 0x07, 0xdf, 0x9a, 0x4e, 0x0a, 0x17, - 0xc9, 0xc1, 0xe3, 0x56, 0x82, 0xb6, 0xee, 0xc2, 0x41, 0x75, 0x7e, 0x7e, 0x19, 0x6c, 0xfa, 0x0a, - 0xd1, 0x1c, 0x9c, 0xf5, 0x73, 0x10, 0x6d, 0x88, 0x05, 0x05, 0x41, 0xf3, 0x23, 0x29, 0x87, 0x02, - 0x9a, 0x84, 0x5f, 0x12, 0x60, 0x7d, 0xdf, 0xf1, 0xea, 0xb0, 0x69, 0xf6, 0x1d, 0xd4, 0xeb, 0xfa, - 0x0d, 0x4d, 0x9a, 0xcf, 0x70, 0xec, 0x20, 0x17, 0xa9, 0x68, 0x43, 0xcf, 0x21, 0x41, 0x5b, 0x23, - 0xeb, 0x8a, 0x1d, 0xcb, 0x5e, 0x62, 0x21, 0x7b, 0x1d, 0x70, 0x7e, 0x9e, 0x0e, 0x03, 0xb9, 0xb3, - 0x56, 0xdf, 0x39, 0xb5, 0xd5, 0x6b, 0x33, 0x2b, 0xc9, 0xb5, 0xcb, 0x26, 0x36, 0x4b, 0xb9, 0xe9, - 0xa4, 0x90, 0x25, 0x51, 0xc4, 0x18, 0x05, 0x6d, 0x7d, 0xbe, 0x3f, 0x70, 0x17, 0x3c, 0xe2, 0x01, - 0xa2, 0x29, 0xff, 0xb7, 0x3c, 0xe2, 0x01, 0x8a, 0x7a, 0xd4, 0x07, 0x88, 0x66, 0xf2, 0x67, 0x06, - 0x64, 0x16, 0x29, 0xe2, 0xed, 0xc1, 0x2c, 0xb6, 0xc7, 0x67, 0x20, 0x65, 0x9b, 0xd8, 0x34, 0xf0, - 0xb0, 0x43, 0x32, 0xb7, 0xb1, 0xfb, 0xfa, 0xa9, 0x61, 0xfa, 0xbc, 0xfa, 0xb0, 0x03, 0xa3, 0x65, - 0x99, 0xb3, 0x08, 0xda, 0x9a, 0x4d, 0x71, 0x96, 0x05, 0x49, 0x7f, 0x4d, 0xbb, 0x32, 0x58, 0xc7, - 0x9b, 0x39, 0xf9, 0xf2, 0xef, 0xe2, 0x4b, 0x06, 0xe4, 0xf4, 0x99, 0x0c, 0xda, 0xf3, 0x33, 0x05, - 0x07, 0xba, 0x0d, 0x36, 0xc2, 0x5c, 0x04, 0xf4, 0xc1, 0xa9, 0xa2, 0xbd, 0x1b, 0xc7, 0x05, 0x2d, - 0x2c, 0x47, 0xf9, 0x58, 0x08, 0x89, 0x97, 0x87, 0xf0, 0x3b, 0x03, 0x52, 0xbe, 0xdf, 0xd2, 0x10, - 0x43, 0xef, 0x1f, 0x7c, 0x9d, 0x0b, 0x83, 0xe2, 0xcc, 0xf1, 0x41, 0x11, 0x2b, 0x41, 0xf2, 0xbf, - 0x2a, 0xc1, 0xd9, 0xb0, 0x04, 0xf4, 0x84, 0x3f, 0x32, 0x00, 0x90, 0xe1, 0x13, 0x24, 0x65, 0x0f, - 0xa4, 0xe9, 0x27, 0x7f, 0xea, 0x78, 0xbc, 0x34, 0x9d, 0x14, 0xd8, 0xd8, 0x94, 0xa0, 0xf3, 0x91, - 0x8c, 0x88, 0x13, 0xe6, 0x43, 0xe2, 0x6f, 0xce, 0x87, 0x2f, 0xc0, 0x66, 0xe4, 0x2a, 0x0c, 0x62, - 0x65, 0x41, 0xb2, 0x63, 0xe2, 0x26, 0x6d, 0xe7, 0x60, 0xcd, 0x56, 0xc1, 0x3a, 0x1d, 0x0d, 0xe4, - 0x42, 0x4b, 0x2c, 0x39, 0xc0, 0xe5, 0xe9, 0xa4, 0x70, 0x21, 0x36, 0x4e, 0xe8, 0x95, 0x95, 0xb6, - 0x42, 0x4f, 0xd4, 0xfd, 0xd7, 0x0c, 0x60, 0xe3, 0x17, 0xc9, 0x89, 0x21, 0x3c, 0x38, 0x7e, 0xad, - 0x2e, 0x8b, 0xe2, 0x2f, 0xdc, 0x9d, 0x34, 0x96, 0x3e, 0xb8, 0x20, 0xcf, 0x9f, 0x1f, 0xcb, 0x63, - 0x51, 0x00, 0x08, 0x5f, 0x2a, 0x34, 0x8c, 0x57, 0x83, 0xb6, 0xf2, 0x9f, 0x2a, 0xc5, 0xc8, 0x2b, - 0xa6, 0xbf, 0x53, 0x0c, 0x49, 0x15, 0xd7, 0xd6, 0x22, 0x86, 0xd4, 0xaf, 0x0d, 0x32, 0x32, 0x79, - 0xd0, 0x2c, 0x77, 0x7a, 0x03, 0x9c, 0xa3, 0x0f, 0x1f, 0xea, 0xf1, 0x6a, 0xc4, 0x23, 0x7d, 0x11, - 0xf9, 0xee, 0xc8, 0x52, 0x9b, 0x29, 0x53, 0x2f, 0xf7, 0x40, 0xb6, 0x6a, 0x5a, 0x8f, 0x20, 0x96, - 0x51, 0xbb, 0xed, 0xe0, 0x36, 0x74, 0xf1, 0x89, 0x9e, 0xf2, 0xfe, 0xf1, 0x66, 0x5a, 0x81, 0xb3, - 0x75, 0x2d, 0x22, 0x11, 0x1e, 0x80, 0x2d, 0xc2, 0x25, 0x59, 0x8f, 0x5c, 0x34, 0x68, 0x41, 0xbb, - 0x01, 0x97, 0x12, 0x6e, 0x83, 0x4d, 0x33, 0xae, 0x4a, 0x59, 0x17, 0xc5, 0x42, 0x11, 0xe4, 0x08, - 0xb5, 0x06, 0x2d, 0xe8, 0x74, 0xb0, 0x54, 0xf7, 0xfc, 0x39, 0x70, 0x12, 0xb3, 0xd0, 0x04, 0x59, - 0x15, 0x3e, 0xc1, 0x35, 0x3a, 0x2f, 0x34, 0x68, 0xf5, 0x4f, 0x8c, 0xe2, 0x3d, 0x70, 0xde, 0x85, - 0x4f, 0xb0, 0xe1, 0xc1, 0xc7, 0x46, 0x17, 0x5a, 0x7d, 0x32, 0x4f, 0xa2, 0xd7, 0x40, 0x0c, 0x16, - 0xb4, 0xb4, 0x4b, 0xa8, 0x7d, 0xd6, 0x37, 0xbe, 0x49, 0x82, 0xb5, 0xd9, 0x60, 0x60, 0xdf, 0x05, - 0xaf, 0x94, 0x25, 0x5d, 0x32, 0xf4, 0x07, 0x55, 0xc5, 0x38, 0x54, 0x2b, 0x6a, 0x45, 0xaf, 0x48, - 0x7b, 0x95, 0x87, 0x4a, 0xd9, 0x38, 0x54, 0x6b, 0x55, 0x45, 0xae, 0xdc, 0xa9, 0x28, 0xe5, 0xcc, - 0x0a, 0xb7, 0x39, 0x1a, 0xf3, 0xe9, 0x88, 0x88, 0xbd, 0x06, 0x2e, 0x85, 0x96, 0xf2, 0x5e, 0x45, - 0x51, 0x75, 0xa3, 0xa6, 0x4b, 0xba, 0x92, 0x61, 0x38, 0x30, 0x1a, 0xf3, 0xab, 0x44, 0xc6, 0xbe, - 0x09, 0xb6, 0x22, 0x7a, 0x07, 0x6a, 0x4d, 0x51, 0x6b, 0x87, 0x35, 0xaa, 0x9a, 0xe0, 0xce, 0x8f, - 0xc6, 0x7c, 0x6a, 0x2e, 0x66, 0x8b, 0x80, 0x8b, 0x69, 0xab, 0x8a, 0xac, 0x57, 0x0e, 0x54, 0xaa, - 0x7e, 0x86, 0xdb, 0x18, 0x8d, 0x79, 0x10, 0xca, 0xd9, 0x6d, 0x70, 0x39, 0xa2, 0x7f, 0x57, 0x52, - 0x55, 0x65, 0x8f, 0x2a, 0x27, 0xb9, 0xf4, 0x68, 0xcc, 0x9f, 0xa3, 0x42, 0xf6, 0x1d, 0x70, 0x25, - 0xd4, 0xac, 0x4a, 0xf2, 0x7d, 0x45, 0x37, 0xe4, 0x83, 0xfd, 0xfd, 0x8a, 0xbe, 0xaf, 0xa8, 0x7a, - 0xe6, 0x2c, 0x97, 0x1d, 0x8d, 0xf9, 0x0c, 0x01, 0x42, 0x39, 0xfb, 0x01, 0xe0, 0x8f, 0x99, 0x49, - 0xf2, 0x7d, 0xf5, 0xe0, 0x93, 0x3d, 0xa5, 0xfc, 0xa1, 0x12, 0xd8, 0xae, 0x72, 0x5b, 0xa3, 0x31, - 0x7f, 0x91, 0xa0, 0x0b, 0x20, 0xfb, 0xfe, 0x4b, 0x08, 0x34, 0x45, 0x56, 0x2a, 0x55, 0xdd, 0x90, - 0x4a, 0x35, 0x45, 0x95, 0x95, 0xcc, 0x39, 0x2e, 0x37, 0x1a, 0xf3, 0x59, 0x82, 0x52, 0x90, 0x62, - 0xec, 0x0d, 0x70, 0x35, 0xb4, 0x57, 0x95, 0x4f, 0x75, 0xa3, 0xa6, 0x7c, 0x74, 0xe8, 0x43, 0x3e, - 0xcd, 0xc7, 0x99, 0x35, 0x12, 0xb8, 0x8f, 0xcc, 0x00, 0x5f, 0xce, 0xf2, 0x20, 0x13, 0xda, 0xdd, - 0x55, 0xa4, 0xb2, 0xa2, 0x65, 0x52, 0xa4, 0x32, 0x64, 0xc7, 0x25, 0x9f, 0xfe, 0x90, 0x5f, 0x29, - 0x3d, 0xfc, 0xf5, 0x79, 0x9e, 0x79, 0xf6, 0x3c, 0xcf, 0xfc, 0xf1, 0x3c, 0xcf, 0x7c, 0xfb, 0x22, - 0xbf, 0xf2, 0xec, 0x45, 0x7e, 0xe5, 0xb7, 0x17, 0xf9, 0x95, 0x87, 0xb7, 0x1b, 0x0e, 0x6e, 0xf6, - 0xea, 0x45, 0x0b, 0xb5, 0x45, 0x0b, 0x79, 0x6d, 0xe4, 0x89, 0x4e, 0xdd, 0xba, 0xde, 0x40, 0x62, - 0xff, 0xa6, 0xd8, 0x46, 0x76, 0xaf, 0x05, 0x3d, 0xf2, 0x4b, 0xf3, 0xd6, 0xee, 0x75, 0x32, 0x12, - 0xc5, 0xb6, 0xd3, 0xe8, 0x9a, 0xfe, 0x4c, 0xf0, 0xc4, 0xfe, 0xcd, 0xfa, 0x6a, 0x30, 0xc9, 0xde, - 0xfe, 0x33, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x8d, 0x81, 0x56, 0x7a, 0x0d, 0x00, 0x00, + // 1237 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x51, 0x6f, 0xdb, 0x54, + 0x14, 0xae, 0xb3, 0xac, 0x4b, 0x4e, 0xba, 0x36, 0x32, 0x05, 0x52, 0x6f, 0xca, 0x4c, 0xd1, 0x58, + 0x41, 0xcc, 0xa6, 0x1d, 0x6c, 0x68, 0xd2, 0x00, 0xcf, 0xf1, 0x58, 0x58, 0xeb, 0x06, 0xc7, 0x1d, + 0xdb, 0x5e, 0x2c, 0xc7, 0xbe, 0x4d, 0xad, 0x25, 0xbe, 0x99, 0x7d, 0x93, 0x2e, 0xfc, 0x82, 0x29, + 0xf0, 0xc0, 0x1f, 0x88, 0x84, 0xc4, 0x1f, 0xe0, 0x67, 0x80, 0x78, 0xd9, 0x23, 0x8f, 0x68, 0x13, + 0x3f, 0x03, 0x09, 0xf9, 0xde, 0x9b, 0xd8, 0x49, 0xd7, 0xf4, 0x61, 0x6f, 0xf7, 0x9e, 0xf3, 0x9d, + 0xef, 0x3b, 0xe7, 0x5c, 0x9f, 0x7b, 0x0d, 0xdb, 0x41, 0xcb, 0x53, 0x3b, 0x41, 0xfb, 0x88, 0x78, + 0x9d, 0x00, 0x85, 0x24, 0x56, 0x63, 0xdc, 0xc1, 0x5d, 0xd7, 0x3b, 0x0a, 0x42, 0xa4, 0x0e, 0x76, + 0xb2, 0x5b, 0xa5, 0x17, 0x61, 0x82, 0xc5, 0x2b, 0x41, 0xcb, 0x53, 0xb2, 0x21, 0x4a, 0x16, 0x33, + 0xd8, 0x91, 0xae, 0x25, 0x9c, 0x1e, 0x8e, 0x90, 0xea, 0xe1, 0x30, 0x44, 0x1e, 0x09, 0x70, 0xa8, + 0x0e, 0xb6, 0x33, 0x3b, 0xc6, 0x24, 0x7d, 0x90, 0x02, 0x8f, 0xdc, 0x30, 0x44, 0x1d, 0x8a, 0x62, + 0x4b, 0x0e, 0x59, 0x6f, 0xe3, 0x36, 0xa6, 0x4b, 0x35, 0x59, 0x71, 0xeb, 0x46, 0x1b, 0xe3, 0x76, + 0x07, 0xa9, 0x74, 0xd7, 0xea, 0x1f, 0xaa, 0x6e, 0x38, 0x64, 0xae, 0xcd, 0x7f, 0x05, 0x28, 0xe9, + 0x34, 0xaf, 0x26, 0x71, 0x09, 0x12, 0x25, 0x28, 0xc4, 0xe8, 0x59, 0x1f, 0x85, 0x1e, 0xaa, 0x08, + 0xb2, 0xb0, 0x95, 0xb7, 0xa6, 0x7b, 0xf1, 0x12, 0x14, 0x83, 0xd8, 0x39, 0x8c, 0xf0, 0x8f, 0x28, + 0xac, 0xe4, 0x64, 0x61, 0xab, 0x60, 0x15, 0x82, 0xf8, 0x1e, 0xdd, 0x8b, 0x8f, 0x60, 0xcd, 0xc3, + 0x61, 0x8c, 0xc2, 0xb8, 0x1f, 0x3b, 0x71, 0xc2, 0x55, 0x39, 0x27, 0x0b, 0x5b, 0xa5, 0x1d, 0x55, + 0x39, 0xa3, 0x01, 0x8a, 0x3e, 0x89, 0xa3, 0x29, 0x58, 0xab, 0xde, 0xcc, 0x5e, 0xbc, 0x03, 0x97, + 0xdc, 0x4e, 0x07, 0x1f, 0x3b, 0xfd, 0x9e, 0xef, 0x12, 0xe4, 0xb8, 0x87, 0x04, 0x45, 0x4e, 0x2f, + 0xc2, 0x3d, 0x1c, 0xbb, 0x9d, 0x4a, 0x9e, 0x26, 0x52, 0xa1, 0x90, 0x03, 0x8a, 0xd0, 0x12, 0x40, + 0x83, 0xfb, 0x6f, 0xe7, 0x5f, 0xfc, 0x7a, 0x65, 0x69, 0xf3, 0x27, 0x01, 0x56, 0x67, 0x75, 0xc4, + 0x1b, 0x00, 0xbd, 0x7e, 0xab, 0x13, 0x78, 0xce, 0x53, 0x34, 0xa4, 0xc5, 0x96, 0x76, 0xd6, 0x15, + 0xd6, 0x2a, 0x65, 0xd2, 0x2a, 0x45, 0x0b, 0x87, 0x56, 0x91, 0xe1, 0x1e, 0xa0, 0xa1, 0x28, 0x43, + 0xc9, 0x0f, 0x06, 0x28, 0x8a, 0x83, 0xc3, 0x00, 0x45, 0xb4, 0x0b, 0x45, 0x2b, 0x6b, 0x12, 0x2f, + 0x43, 0x91, 0x04, 0x5d, 0x14, 0x13, 0xb7, 0xdb, 0xa3, 0x2d, 0xc8, 0x5b, 0xa9, 0x81, 0x67, 0xf3, + 0x97, 0x00, 0xcb, 0xf7, 0x91, 0xeb, 0xa3, 0x68, 0x61, 0xc3, 0x67, 0xa8, 0x72, 0x73, 0x54, 0x89, + 0x37, 0x0e, 0xda, 0xa1, 0x4b, 0xfa, 0x11, 0xeb, 0xf5, 0x8a, 0x95, 0x1a, 0xc4, 0xdb, 0xb0, 0x1a, + 0xa2, 0x63, 0x27, 0x53, 0x61, 0x7e, 0x41, 0x85, 0x2b, 0x21, 0x3a, 0x6e, 0x4c, 0x8b, 0xbc, 0x06, + 0x6b, 0x49, 0x6c, 0xb6, 0xd0, 0xf3, 0xb4, 0xd0, 0x84, 0xb2, 0x96, 0x5a, 0x79, 0x35, 0xff, 0x09, + 0xb0, 0xb2, 0x17, 0xc4, 0x2d, 0x74, 0xe4, 0x0e, 0x02, 0xdc, 0x8f, 0x92, 0x0f, 0x85, 0x1d, 0xb5, + 0x13, 0xf8, 0xb4, 0xa8, 0xa2, 0x55, 0x60, 0x86, 0xba, 0x3f, 0x53, 0x70, 0x6e, 0xae, 0xe0, 0x87, + 0x70, 0x71, 0x5a, 0x81, 0x83, 0xc3, 0xc9, 0x27, 0xb4, 0x7d, 0xe6, 0x27, 0xd4, 0x9c, 0x44, 0x69, + 0xa1, 0x5f, 0x73, 0x89, 0x6b, 0xad, 0x4c, 0x79, 0xf6, 0xc3, 0x39, 0x5e, 0x72, 0x8c, 0x79, 0x2f, + 0xde, 0x8a, 0xd7, 0x3e, 0xc6, 0xbc, 0xfe, 0xdf, 0x05, 0x28, 0xcf, 0x03, 0x67, 0x4f, 0x47, 0x98, + 0x3f, 0x9d, 0x7b, 0x50, 0xf4, 0x5d, 0xe2, 0x3a, 0x64, 0xd8, 0x63, 0x5d, 0x58, 0xdd, 0xf9, 0xf8, + 0xcc, 0x64, 0x12, 0x5e, 0x7b, 0xd8, 0x43, 0x56, 0xc1, 0xe7, 0x2b, 0x51, 0x84, 0x7c, 0xb2, 0xe6, + 0xc7, 0x4f, 0xd7, 0xb3, 0x5f, 0x4d, 0xfe, 0xcd, 0x1f, 0x20, 0x82, 0x8a, 0x3d, 0x31, 0x21, 0x7f, + 0x9a, 0x3c, 0xcd, 0xfc, 0x2a, 0xac, 0xa6, 0xcd, 0xa2, 0xec, 0x2c, 0xfd, 0xb4, 0x85, 0xb5, 0x13, + 0x32, 0xb9, 0x37, 0xcb, 0xfc, 0x29, 0x40, 0x31, 0x21, 0xbf, 0x3b, 0x24, 0x28, 0x7e, 0x8b, 0x4f, + 0x7d, 0x6e, 0xea, 0xce, 0x9d, 0x9c, 0xba, 0x99, 0x86, 0xe6, 0xdf, 0xbe, 0xa1, 0xe7, 0xd3, 0x86, + 0xf2, 0x5a, 0x9e, 0x01, 0xb0, 0x91, 0xa5, 0xd5, 0x7f, 0x0e, 0x25, 0x3e, 0x5e, 0x67, 0xdf, 0x1e, + 0x6c, 0xb6, 0x4e, 0x19, 0xac, 0xdc, 0x82, 0xc1, 0xf2, 0x61, 0x2d, 0x73, 0x37, 0x53, 0x5d, 0x11, + 0xf2, 0x3d, 0x97, 0x1c, 0xf1, 0x23, 0xa1, 0x6b, 0xf1, 0x16, 0xac, 0xf0, 0x71, 0x63, 0xf7, 0x6e, + 0x6e, 0x41, 0x32, 0x25, 0x2f, 0x25, 0xe4, 0x2a, 0x5d, 0x10, 0x67, 0x6f, 0xc6, 0x53, 0x85, 0xee, + 0x9c, 0xbc, 0xe3, 0x17, 0x69, 0xcd, 0x5d, 0xe4, 0x5c, 0x6e, 0x00, 0xef, 0xe8, 0xd3, 0x97, 0x6d, + 0xb1, 0x9e, 0x01, 0x90, 0x3e, 0x82, 0x5c, 0xea, 0x2a, 0x3d, 0xd5, 0xe4, 0x15, 0x54, 0x32, 0x0f, + 0xe4, 0x60, 0x5b, 0x49, 0x49, 0x8d, 0xd0, 0xb7, 0x32, 0x81, 0xd3, 0x66, 0x96, 0x75, 0xf6, 0x56, + 0x2e, 0x16, 0xbd, 0x09, 0x17, 0xf8, 0x9b, 0xca, 0x15, 0x2f, 0x67, 0x14, 0xf9, 0x63, 0x9b, 0xc8, + 0xb1, 0xa5, 0x35, 0x01, 0x73, 0x95, 0xef, 0x60, 0xbd, 0xe1, 0x7a, 0x4f, 0x11, 0xd1, 0x71, 0xb7, + 0x1b, 0x90, 0x2e, 0x0a, 0xc9, 0xa9, 0x4a, 0xd5, 0xa4, 0xbc, 0x09, 0x8a, 0x8a, 0xad, 0x58, 0x19, + 0xcb, 0xe6, 0x63, 0xd8, 0x60, 0x5c, 0x9a, 0xf7, 0x34, 0xc4, 0xc7, 0x1d, 0xe4, 0xb7, 0xd1, 0x42, + 0xc2, 0x2d, 0x58, 0x73, 0x67, 0xa1, 0x9c, 0x75, 0xde, 0xbc, 0xa9, 0x40, 0x85, 0x51, 0x5b, 0xc8, + 0x43, 0x41, 0x8f, 0x68, 0xad, 0x38, 0x19, 0xc3, 0xd3, 0x98, 0x37, 0x4d, 0x58, 0x37, 0xd1, 0x73, + 0xd2, 0xe4, 0xe3, 0x6a, 0x21, 0x6f, 0x70, 0x6a, 0x16, 0x9b, 0x70, 0x31, 0x44, 0xcf, 0x89, 0x13, + 0xa3, 0x67, 0x4e, 0x84, 0xbc, 0x01, 0x1f, 0xe7, 0x52, 0xc8, 0x08, 0x92, 0xd8, 0x4f, 0x7e, 0xce, + 0x43, 0x61, 0x32, 0x7d, 0xe2, 0x97, 0xf0, 0x61, 0x4d, 0xb3, 0x35, 0xc7, 0x7e, 0xdc, 0x30, 0x9c, + 0x03, 0xb3, 0x6e, 0xd6, 0xed, 0xba, 0xb6, 0x5b, 0x7f, 0x62, 0xd4, 0x9c, 0x03, 0xb3, 0xd9, 0x30, + 0xf4, 0xfa, 0xbd, 0xba, 0x51, 0x2b, 0x2f, 0x49, 0x6b, 0xa3, 0xb1, 0x5c, 0xca, 0x98, 0xc4, 0x8f, + 0xe0, 0xbd, 0x34, 0x52, 0xdf, 0xad, 0x1b, 0xa6, 0xed, 0x34, 0x6d, 0xcd, 0x36, 0xca, 0x82, 0x04, + 0xa3, 0xb1, 0xbc, 0xcc, 0x6c, 0xe2, 0xa7, 0xb0, 0x91, 0xc1, 0xed, 0x9b, 0x4d, 0xc3, 0x6c, 0x1e, + 0x34, 0x39, 0x34, 0x27, 0x5d, 0x1c, 0x8d, 0xe5, 0xe2, 0xd4, 0x2c, 0x2a, 0x20, 0xcd, 0xa0, 0x4d, + 0x43, 0xb7, 0xeb, 0xfb, 0x26, 0x87, 0x9f, 0x93, 0x56, 0x47, 0x63, 0x19, 0x52, 0xbb, 0xb8, 0x05, + 0xef, 0x67, 0xf0, 0xf7, 0x35, 0xd3, 0x34, 0x76, 0x39, 0x38, 0x2f, 0x95, 0x46, 0x63, 0xf9, 0x02, + 0x37, 0x8a, 0x5f, 0xc0, 0xa5, 0x14, 0xd9, 0xd0, 0xf4, 0x07, 0x86, 0xed, 0xe8, 0xfb, 0x7b, 0x7b, + 0x75, 0x7b, 0xcf, 0x30, 0xed, 0xf2, 0x79, 0x69, 0x7d, 0x34, 0x96, 0xcb, 0xcc, 0x91, 0xda, 0xc5, + 0xaf, 0x41, 0x3e, 0x11, 0xa6, 0xe9, 0x0f, 0xcc, 0xfd, 0x1f, 0x76, 0x8d, 0xda, 0xb7, 0x06, 0x8d, + 0x5d, 0x96, 0x36, 0x46, 0x63, 0xf9, 0x5d, 0xe6, 0x9d, 0x73, 0x8a, 0x5f, 0xbd, 0x81, 0xc0, 0x32, + 0x74, 0xa3, 0xde, 0xb0, 0x1d, 0xed, 0x6e, 0xd3, 0x30, 0x75, 0xa3, 0x7c, 0x41, 0xaa, 0x8c, 0xc6, + 0xf2, 0x3a, 0xf3, 0x72, 0x27, 0xf7, 0x89, 0x37, 0xe1, 0x72, 0x1a, 0x6f, 0x1a, 0x8f, 0x6c, 0xa7, + 0x69, 0x7c, 0x7f, 0x90, 0xb8, 0x12, 0x9a, 0x87, 0xe5, 0x02, 0x4b, 0x3c, 0xf1, 0x4c, 0x1c, 0x89, + 0x5d, 0x94, 0xa1, 0x9c, 0xc6, 0xdd, 0x37, 0xb4, 0x9a, 0x61, 0x95, 0x8b, 0xec, 0x64, 0xd8, 0x4e, + 0xca, 0xbf, 0xf8, 0xad, 0xba, 0x74, 0xf7, 0xc9, 0x1f, 0xaf, 0xaa, 0xc2, 0xcb, 0x57, 0x55, 0xe1, + 0x9f, 0x57, 0x55, 0xe1, 0x97, 0xd7, 0xd5, 0xa5, 0x97, 0xaf, 0xab, 0x4b, 0x7f, 0xbf, 0xae, 0x2e, + 0x3d, 0xf9, 0xa6, 0x1d, 0x90, 0xa3, 0x7e, 0x4b, 0xf1, 0x70, 0x57, 0xf5, 0x70, 0xdc, 0xc5, 0xb1, + 0x1a, 0xb4, 0xbc, 0xeb, 0x6d, 0xac, 0x0e, 0x6e, 0xa9, 0x5d, 0xec, 0xf7, 0x3b, 0x28, 0x66, 0xff, + 0xc4, 0x9f, 0xed, 0x5c, 0x67, 0x77, 0x9b, 0xda, 0x0d, 0xda, 0x91, 0x9b, 0x4c, 0x7e, 0xac, 0x0e, + 0x6e, 0xb5, 0x96, 0xe9, 0x9d, 0x74, 0xe3, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5f, 0x4f, 0xdc, + 0xef, 0xbb, 0x0b, 0x00, 0x00, } func (m *ClientState) Marshal() (dAtA []byte, err error) { diff --git a/modules/core/02-client/types/client.pb.go b/modules/core/02-client/types/client.pb.go index badaa482f47..d65d15ccb43 100644 --- a/modules/core/02-client/types/client.pb.go +++ b/modules/core/02-client/types/client.pb.go @@ -30,9 +30,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // identifier field. type IdentifiedClientState struct { // client identifier - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // client state - ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"` + ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"` } func (m *IdentifiedClientState) Reset() { *m = IdentifiedClientState{} } @@ -88,7 +88,7 @@ type ConsensusStateWithHeight struct { // consensus state height Height Height `protobuf:"bytes,1,opt,name=height,proto3" json:"height"` // consensus state - ConsensusState *types.Any `protobuf:"bytes,2,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty" yaml:"consensus_state"` + ConsensusState *types.Any `protobuf:"bytes,2,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"` } func (m *ConsensusStateWithHeight) Reset() { *m = ConsensusStateWithHeight{} } @@ -142,9 +142,9 @@ func (m *ConsensusStateWithHeight) GetConsensusState() *types.Any { // client. type ClientConsensusStates struct { // client identifier - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // consensus states and their heights associated with the client - ConsensusStates []ConsensusStateWithHeight `protobuf:"bytes,2,rep,name=consensus_states,json=consensusStates,proto3" json:"consensus_states" yaml:"consensus_states"` + ConsensusStates []ConsensusStateWithHeight `protobuf:"bytes,2,rep,name=consensus_states,json=consensusStates,proto3" json:"consensus_states"` } func (m *ClientConsensusStates) Reset() { *m = ClientConsensusStates{} } @@ -204,10 +204,10 @@ type ClientUpdateProposal struct { // the description of the proposal Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` // the client identifier for the client to be updated if the proposal passes - SubjectClientId string `protobuf:"bytes,3,opt,name=subject_client_id,json=subjectClientId,proto3" json:"subject_client_id,omitempty" yaml:"subject_client_id"` + SubjectClientId string `protobuf:"bytes,3,opt,name=subject_client_id,json=subjectClientId,proto3" json:"subject_client_id,omitempty"` // the substitute client identifier for the client standing in for the subject // client - SubstituteClientId string `protobuf:"bytes,4,opt,name=substitute_client_id,json=substituteClientId,proto3" json:"substitute_client_id,omitempty" yaml:"substitute_client_id"` + SubstituteClientId string `protobuf:"bytes,4,opt,name=substitute_client_id,json=substituteClientId,proto3" json:"substitute_client_id,omitempty"` } func (m *ClientUpdateProposal) Reset() { *m = ClientUpdateProposal{} } @@ -255,7 +255,7 @@ type UpgradeProposal struct { // new upgraded client is valid by verifying a proof on the previous version // of the chain. This will allow IBC connections to persist smoothly across // planned chain upgrades - UpgradedClientState *types.Any `protobuf:"bytes,4,opt,name=upgraded_client_state,json=upgradedClientState,proto3" json:"upgraded_client_state,omitempty" yaml:"upgraded_client_state"` + UpgradedClientState *types.Any `protobuf:"bytes,4,opt,name=upgraded_client_state,json=upgradedClientState,proto3" json:"upgraded_client_state,omitempty"` } func (m *UpgradeProposal) Reset() { *m = UpgradeProposal{} } @@ -302,9 +302,9 @@ var xxx_messageInfo_UpgradeProposal proto.InternalMessageInfo // gets reset type Height struct { // the revision that the client is currently on - RevisionNumber uint64 `protobuf:"varint,1,opt,name=revision_number,json=revisionNumber,proto3" json:"revision_number,omitempty" yaml:"revision_number"` + RevisionNumber uint64 `protobuf:"varint,1,opt,name=revision_number,json=revisionNumber,proto3" json:"revision_number,omitempty"` // the height within the given revision - RevisionHeight uint64 `protobuf:"varint,2,opt,name=revision_height,json=revisionHeight,proto3" json:"revision_height,omitempty" yaml:"revision_height"` + RevisionHeight uint64 `protobuf:"varint,2,opt,name=revision_height,json=revisionHeight,proto3" json:"revision_height,omitempty"` } func (m *Height) Reset() { *m = Height{} } @@ -344,7 +344,7 @@ type Params struct { // allowed_clients defines the list of allowed client state types which can be created // and interacted with. If a client type is removed from the allowed clients list, usage // of this client will be disabled until it is added again to the list. - AllowedClients []string `protobuf:"bytes,1,rep,name=allowed_clients,json=allowedClients,proto3" json:"allowed_clients,omitempty" yaml:"allowed_clients"` + AllowedClients []string `protobuf:"bytes,1,rep,name=allowed_clients,json=allowedClients,proto3" json:"allowed_clients,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -400,53 +400,47 @@ func init() { func init() { proto.RegisterFile("ibc/core/client/v1/client.proto", fileDescriptor_b6bc4c8185546947) } var fileDescriptor_b6bc4c8185546947 = []byte{ - // 734 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xbd, 0x6e, 0x13, 0x4b, - 0x18, 0xf5, 0x3a, 0xbe, 0x56, 0x3c, 0xbe, 0x8a, 0x73, 0x37, 0xce, 0x8d, 0xaf, 0x6f, 0xe4, 0xb1, - 0x46, 0x14, 0x16, 0x22, 0xbb, 0xd8, 0x48, 0x10, 0xb9, 0xc3, 0x6e, 0x92, 0x02, 0x64, 0x16, 0x45, - 0x08, 0x1a, 0x6b, 0x7f, 0x26, 0xeb, 0x89, 0xd6, 0x3b, 0xd6, 0xce, 0xac, 0xc1, 0x6f, 0x40, 0x07, - 0x25, 0x48, 0x29, 0xf2, 0x06, 0x34, 0x3c, 0x02, 0x45, 0x44, 0x95, 0x92, 0x6a, 0x85, 0x92, 0x86, - 0xda, 0x4f, 0x80, 0x3c, 0x33, 0x9b, 0xd8, 0xf9, 0x01, 0x04, 0xdd, 0xcc, 0x99, 0xb3, 0x67, 0xce, - 0x77, 0xbc, 0xc7, 0x0b, 0x20, 0x71, 0x5c, 0xd3, 0xa5, 0x11, 0x36, 0xdd, 0x80, 0xe0, 0x90, 0x9b, - 0xe3, 0xa6, 0x5a, 0x19, 0xa3, 0x88, 0x72, 0xaa, 0xeb, 0xc4, 0x71, 0x8d, 0x19, 0xc1, 0x50, 0xf0, - 0xb8, 0x59, 0x2d, 0xfb, 0xd4, 0xa7, 0xe2, 0xd8, 0x9c, 0xad, 0x24, 0xb3, 0xfa, 0x9f, 0x4f, 0xa9, - 0x1f, 0x60, 0x53, 0xec, 0x9c, 0x78, 0xdf, 0xb4, 0xc3, 0x89, 0x3a, 0xba, 0xe5, 0x52, 0x36, 0xa4, - 0xcc, 0x8c, 0x47, 0x7e, 0x64, 0x7b, 0xd8, 0x1c, 0x37, 0x1d, 0xcc, 0xed, 0x66, 0xba, 0x4f, 0x05, - 0x24, 0xab, 0x2f, 0x95, 0xe5, 0x46, 0x1e, 0xa1, 0x43, 0x0d, 0xac, 0xef, 0x7a, 0x38, 0xe4, 0x64, - 0x9f, 0x60, 0xaf, 0x2b, 0x9c, 0x3c, 0xe5, 0x36, 0xc7, 0x7a, 0x13, 0x14, 0xa4, 0xb1, 0x3e, 0xf1, - 0x2a, 0x5a, 0x5d, 0x6b, 0x14, 0x3a, 0xe5, 0x69, 0x02, 0x57, 0x27, 0xf6, 0x30, 0x68, 0xa3, 0xf3, - 0x23, 0x64, 0x2d, 0xcb, 0xf5, 0xae, 0xa7, 0xf7, 0xc0, 0xdf, 0x0a, 0x67, 0x33, 0x89, 0x4a, 0xb6, - 0xae, 0x35, 0x8a, 0xad, 0xb2, 0x21, 0xfd, 0x1b, 0xa9, 0x7f, 0xe3, 0x61, 0x38, 0xe9, 0x6c, 0x4c, - 0x13, 0xb8, 0xb6, 0xa0, 0x25, 0x9e, 0x41, 0x56, 0xd1, 0xbd, 0x30, 0x81, 0x3e, 0x68, 0xa0, 0xd2, - 0xa5, 0x21, 0xc3, 0x21, 0x8b, 0x99, 0x80, 0x9e, 0x11, 0x3e, 0xd8, 0xc1, 0xc4, 0x1f, 0x70, 0x7d, - 0x1b, 0xe4, 0x07, 0x62, 0x25, 0xec, 0x15, 0x5b, 0x55, 0xe3, 0x6a, 0xa4, 0x86, 0xe4, 0x76, 0x72, - 0xc7, 0x09, 0xcc, 0x58, 0x8a, 0xaf, 0x3f, 0x07, 0x25, 0x37, 0x55, 0xfd, 0x05, 0xaf, 0xd5, 0x69, - 0x02, 0xff, 0x55, 0x5e, 0x17, 0x1f, 0x43, 0xd6, 0x8a, 0xbb, 0x60, 0x0f, 0x7d, 0xd2, 0xc0, 0xba, - 0x8c, 0x71, 0xd1, 0x37, 0xfb, 0x9d, 0x40, 0x5f, 0x81, 0xd5, 0x4b, 0x17, 0xb2, 0x4a, 0xb6, 0xbe, - 0xd4, 0x28, 0xb6, 0xee, 0x5c, 0x37, 0xeb, 0x4d, 0x49, 0x75, 0xe0, 0x6c, 0xfa, 0x69, 0x02, 0x37, - 0xae, 0x1d, 0x82, 0x21, 0xab, 0xb4, 0x38, 0x05, 0x43, 0x6f, 0xb2, 0xa0, 0x2c, 0xc7, 0xd8, 0x1b, - 0x79, 0x36, 0xc7, 0xbd, 0x88, 0x8e, 0x28, 0xb3, 0x03, 0xbd, 0x0c, 0xfe, 0xe2, 0x84, 0x07, 0x58, - 0x4e, 0x60, 0xc9, 0x8d, 0x5e, 0x07, 0x45, 0x0f, 0x33, 0x37, 0x22, 0x23, 0x4e, 0x68, 0x28, 0xc2, - 0x2c, 0x58, 0xf3, 0x90, 0xbe, 0x03, 0xfe, 0x61, 0xb1, 0x73, 0x80, 0x5d, 0xde, 0xbf, 0x48, 0x61, - 0x49, 0xa4, 0xb0, 0x39, 0x4d, 0x60, 0x45, 0x3a, 0xbb, 0x42, 0x41, 0x56, 0x49, 0x61, 0xdd, 0x34, - 0x94, 0x27, 0xa0, 0xcc, 0x62, 0x87, 0x71, 0xc2, 0x63, 0x8e, 0xe7, 0xc4, 0x72, 0x42, 0x0c, 0x4e, - 0x13, 0xf8, 0xff, 0xb9, 0xd8, 0x15, 0x16, 0xb2, 0xf4, 0x0b, 0x38, 0x95, 0x6c, 0xa3, 0xd7, 0x47, - 0x30, 0xf3, 0xf9, 0xe3, 0x56, 0x55, 0x75, 0xc3, 0xa7, 0x63, 0x43, 0x55, 0x69, 0x16, 0x2a, 0xc7, - 0x21, 0x47, 0xef, 0xb3, 0xa0, 0xb4, 0x27, 0x6b, 0xf5, 0xc7, 0x61, 0xdc, 0x07, 0xb9, 0x51, 0x60, - 0x87, 0x62, 0xfe, 0x62, 0x6b, 0xd3, 0x50, 0xd7, 0xa6, 0xad, 0x4d, 0xaf, 0xee, 0x05, 0x76, 0xa8, - 0xde, 0x5c, 0xc1, 0xd7, 0x0f, 0xc0, 0xba, 0xe2, 0x78, 0xfd, 0x85, 0xa6, 0xe5, 0x7e, 0xf0, 0xf6, - 0xd6, 0xa7, 0x09, 0xdc, 0x94, 0x89, 0x5c, 0xfb, 0x30, 0xb2, 0xd6, 0x52, 0x7c, 0xae, 0xff, 0xed, - 0xdb, 0xb3, 0x4c, 0xde, 0x1d, 0xc1, 0xcc, 0xb7, 0x23, 0xa8, 0xfd, 0x24, 0x9b, 0x43, 0x0d, 0xe4, - 0x55, 0x29, 0xbb, 0xa0, 0x14, 0xe1, 0x31, 0x61, 0x84, 0x86, 0xfd, 0x30, 0x1e, 0x3a, 0x38, 0x12, - 0xe1, 0xe4, 0xe6, 0x4b, 0x74, 0x89, 0x80, 0xac, 0x95, 0x14, 0x79, 0x2c, 0x80, 0x05, 0x11, 0x55, - 0xf1, 0xec, 0x8d, 0x22, 0x92, 0x30, 0x27, 0x22, 0x9d, 0xb4, 0x97, 0xd3, 0x01, 0xd0, 0x23, 0x90, - 0xef, 0xd9, 0x91, 0x3d, 0x64, 0x33, 0x61, 0x3b, 0x08, 0xe8, 0xcb, 0xf3, 0x08, 0x58, 0x45, 0xab, - 0x2f, 0x35, 0x0a, 0xf3, 0xc2, 0x97, 0x08, 0xc8, 0x5a, 0x51, 0x88, 0x4c, 0x87, 0x75, 0xac, 0xe3, - 0xd3, 0x9a, 0x76, 0x72, 0x5a, 0xd3, 0xbe, 0x9e, 0xd6, 0xb4, 0xb7, 0x67, 0xb5, 0xcc, 0xc9, 0x59, - 0x2d, 0xf3, 0xe5, 0xac, 0x96, 0x79, 0xb1, 0xed, 0x13, 0x3e, 0x88, 0x1d, 0xc3, 0xa5, 0x43, 0xf5, - 0x37, 0x6b, 0x12, 0xc7, 0xdd, 0xf2, 0xa9, 0x39, 0x7e, 0x60, 0x0e, 0xa9, 0x17, 0x07, 0x98, 0xc9, - 0x8f, 0xc2, 0xdd, 0xd6, 0x96, 0xfa, 0x2e, 0xf0, 0xc9, 0x08, 0x33, 0x27, 0x2f, 0x7e, 0xb2, 0x7b, - 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x69, 0x32, 0x4f, 0x37, 0x06, 0x00, 0x00, + // 633 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4f, 0x6b, 0xd4, 0x40, + 0x14, 0x4f, 0xda, 0x75, 0xe9, 0x4e, 0xa4, 0xab, 0x71, 0x0b, 0xeb, 0x2a, 0xd9, 0x25, 0x08, 0x2e, + 0xc5, 0x26, 0xdd, 0x15, 0x6c, 0x29, 0x78, 0xb0, 0xbd, 0xb4, 0x17, 0x29, 0x91, 0x22, 0x08, 0xb2, + 0x24, 0x93, 0x69, 0x76, 0x24, 0x99, 0x09, 0x99, 0x49, 0xa4, 0xdf, 0xc0, 0xa3, 0xe0, 0xc5, 0x63, + 0x3f, 0x84, 0x1f, 0xa2, 0x78, 0xea, 0xd1, 0x93, 0xc8, 0xee, 0xc5, 0x6f, 0xe0, 0x55, 0x32, 0x33, + 0x71, 0x37, 0xfe, 0xa9, 0x82, 0xb7, 0x79, 0xef, 0xfd, 0xe6, 0xbd, 0xdf, 0xef, 0xf1, 0x9b, 0x01, + 0x7d, 0x1c, 0x40, 0x17, 0xd2, 0x0c, 0xb9, 0x30, 0xc6, 0x88, 0x70, 0xb7, 0x18, 0xa9, 0x93, 0x93, + 0x66, 0x94, 0x53, 0xd3, 0xc4, 0x01, 0x74, 0x4a, 0x80, 0xa3, 0xd2, 0xc5, 0xa8, 0xd7, 0x89, 0x68, + 0x44, 0x45, 0xd9, 0x2d, 0x4f, 0x12, 0xd9, 0xbb, 0x1d, 0x51, 0x1a, 0xc5, 0xc8, 0x15, 0x51, 0x90, + 0x9f, 0xba, 0x3e, 0x39, 0x53, 0xa5, 0x7b, 0x90, 0xb2, 0x84, 0x32, 0x37, 0x4f, 0xa3, 0xcc, 0x0f, + 0x91, 0x5b, 0x8c, 0x02, 0xc4, 0xfd, 0x51, 0x15, 0x57, 0x0d, 0x24, 0x6a, 0x22, 0x3b, 0xcb, 0x40, + 0x96, 0xec, 0x04, 0x6c, 0x1c, 0x85, 0x88, 0x70, 0x7c, 0x8a, 0x51, 0x78, 0x20, 0x88, 0x3c, 0xe3, + 0x3e, 0x47, 0xe6, 0x1d, 0xd0, 0x92, 0xbc, 0x26, 0x38, 0xec, 0xea, 0x03, 0x7d, 0xd8, 0xf2, 0xd6, + 0x64, 0xe2, 0x28, 0x34, 0x77, 0xc0, 0x75, 0x55, 0x64, 0x25, 0xb8, 0xbb, 0x32, 0xd0, 0x87, 0xc6, + 0xb8, 0xe3, 0x48, 0xa2, 0x4e, 0x45, 0xd4, 0x79, 0x42, 0xce, 0x3c, 0x03, 0x2e, 0xba, 0xda, 0xef, + 0x74, 0xd0, 0x3d, 0xa0, 0x84, 0x21, 0xc2, 0x72, 0x26, 0x52, 0xcf, 0x31, 0x9f, 0x1e, 0x22, 0x1c, + 0x4d, 0xb9, 0xb9, 0x0b, 0x9a, 0x53, 0x71, 0x12, 0xf3, 0x8c, 0x71, 0xcf, 0xf9, 0x75, 0x45, 0x8e, + 0xc4, 0xee, 0x37, 0x2e, 0x3e, 0xf7, 0x35, 0x4f, 0xe1, 0xcd, 0xc7, 0xa0, 0x0d, 0xab, 0xae, 0xff, + 0x40, 0x69, 0x1d, 0xd6, 0x28, 0x94, 0xac, 0x36, 0xa4, 0xf6, 0x3a, 0x37, 0x76, 0xf5, 0x16, 0x5e, + 0x82, 0x1b, 0x3f, 0x4d, 0x65, 0xdd, 0x95, 0xc1, 0xea, 0xd0, 0x18, 0x3f, 0xf8, 0x1d, 0xf3, 0x3f, + 0xe9, 0x56, 0x5a, 0xda, 0x75, 0x52, 0xcc, 0xbe, 0xd4, 0x41, 0x47, 0xb2, 0x3a, 0x49, 0x43, 0x9f, + 0xa3, 0xe3, 0x8c, 0xa6, 0x94, 0xf9, 0xb1, 0xd9, 0x01, 0xd7, 0x38, 0xe6, 0x31, 0x52, 0x84, 0x64, + 0x60, 0x0e, 0x80, 0x11, 0x22, 0x06, 0x33, 0x9c, 0x72, 0x4c, 0x89, 0xd0, 0xdf, 0xf2, 0x96, 0x53, + 0xe6, 0x26, 0xb8, 0xc9, 0xf2, 0xe0, 0x15, 0x82, 0x7c, 0xb2, 0x10, 0xb5, 0x2a, 0x70, 0x6d, 0x55, + 0x38, 0xa8, 0xb4, 0x6d, 0x83, 0x0e, 0xcb, 0x03, 0xc6, 0x31, 0xcf, 0x39, 0x5a, 0x82, 0x37, 0x04, + 0xdc, 0x5c, 0xd4, 0xaa, 0x1b, 0x7b, 0xf6, 0x9b, 0xf3, 0xbe, 0xf6, 0xf1, 0xc3, 0x56, 0x4f, 0xf9, + 0x2b, 0xa2, 0x85, 0xa3, 0xec, 0x58, 0x4a, 0xe7, 0x88, 0x70, 0xfb, 0x9b, 0x0e, 0xda, 0x27, 0xd2, + 0x9a, 0xff, 0xad, 0xe6, 0x11, 0x68, 0xa4, 0xb1, 0x4f, 0x84, 0x00, 0x63, 0x7c, 0xd7, 0x51, 0x63, + 0x2b, 0xe7, 0x57, 0xa3, 0x8f, 0x63, 0x9f, 0xa8, 0x0d, 0x0b, 0xbc, 0x79, 0x08, 0x36, 0x14, 0x26, + 0x9c, 0xd4, 0x4c, 0xdc, 0xb8, 0xc2, 0x31, 0xb7, 0xaa, 0x2b, 0x4b, 0x4f, 0x64, 0x6f, 0xb3, 0x54, + 0xfc, 0xfe, 0xbc, 0xaf, 0x7d, 0x3d, 0xef, 0xeb, 0x7f, 0x51, 0x1e, 0x82, 0xa6, 0x72, 0xf9, 0x7d, + 0xd0, 0xce, 0x50, 0x81, 0x19, 0xa6, 0x64, 0x42, 0xf2, 0x24, 0x40, 0x99, 0x50, 0xde, 0xf0, 0xd6, + 0xab, 0xf4, 0x53, 0x91, 0xad, 0x01, 0xd5, 0xbb, 0x58, 0xa9, 0x03, 0x65, 0xc7, 0xbd, 0xb5, 0x8a, + 0x87, 0x3d, 0x02, 0xcd, 0x63, 0x3f, 0xf3, 0x13, 0x56, 0x5e, 0xf6, 0xe3, 0x98, 0xbe, 0xfe, 0x21, + 0x92, 0x75, 0xf5, 0xc1, 0xea, 0xb0, 0xe5, 0xad, 0xab, 0xb4, 0x14, 0xc2, 0xf6, 0xbd, 0x8b, 0x99, + 0xa5, 0x5f, 0xce, 0x2c, 0xfd, 0xcb, 0xcc, 0xd2, 0xdf, 0xce, 0x2d, 0xed, 0x72, 0x6e, 0x69, 0x9f, + 0xe6, 0x96, 0xf6, 0x62, 0x37, 0xc2, 0x7c, 0x9a, 0x07, 0x0e, 0xa4, 0x89, 0xfa, 0x33, 0x5c, 0x1c, + 0xc0, 0xad, 0x88, 0xba, 0xc5, 0x8e, 0x9b, 0xd0, 0x30, 0x8f, 0x11, 0x93, 0x3f, 0xdc, 0xf6, 0x78, + 0x4b, 0x7d, 0x72, 0xfc, 0x2c, 0x45, 0x2c, 0x68, 0x8a, 0xdd, 0x3d, 0xfc, 0x1e, 0x00, 0x00, 0xff, + 0xff, 0x80, 0xfe, 0x7c, 0xd0, 0x04, 0x05, 0x00, 0x00, } func (this *UpgradeProposal) Equal(that interface{}) bool { diff --git a/modules/core/02-client/types/genesis.pb.go b/modules/core/02-client/types/genesis.pb.go index d6d4fad8cd5..3f2fc730a98 100644 --- a/modules/core/02-client/types/genesis.pb.go +++ b/modules/core/02-client/types/genesis.pb.go @@ -28,14 +28,14 @@ type GenesisState struct { // client states with their corresponding identifiers Clients IdentifiedClientStates `protobuf:"bytes,1,rep,name=clients,proto3,castrepeated=IdentifiedClientStates" json:"clients"` // consensus states from each client - ClientsConsensus ClientsConsensusStates `protobuf:"bytes,2,rep,name=clients_consensus,json=clientsConsensus,proto3,castrepeated=ClientsConsensusStates" json:"clients_consensus" yaml:"clients_consensus"` + ClientsConsensus ClientsConsensusStates `protobuf:"bytes,2,rep,name=clients_consensus,json=clientsConsensus,proto3,castrepeated=ClientsConsensusStates" json:"clients_consensus"` // metadata from each client - ClientsMetadata []IdentifiedGenesisMetadata `protobuf:"bytes,3,rep,name=clients_metadata,json=clientsMetadata,proto3" json:"clients_metadata" yaml:"clients_metadata"` + ClientsMetadata []IdentifiedGenesisMetadata `protobuf:"bytes,3,rep,name=clients_metadata,json=clientsMetadata,proto3" json:"clients_metadata"` Params Params `protobuf:"bytes,4,opt,name=params,proto3" json:"params"` // create localhost on initialization - CreateLocalhost bool `protobuf:"varint,5,opt,name=create_localhost,json=createLocalhost,proto3" json:"create_localhost,omitempty" yaml:"create_localhost"` + CreateLocalhost bool `protobuf:"varint,5,opt,name=create_localhost,json=createLocalhost,proto3" json:"create_localhost,omitempty"` // the sequence for the next generated client identifier - NextClientSequence uint64 `protobuf:"varint,6,opt,name=next_client_sequence,json=nextClientSequence,proto3" json:"next_client_sequence,omitempty" yaml:"next_client_sequence"` + NextClientSequence uint64 `protobuf:"varint,6,opt,name=next_client_sequence,json=nextClientSequence,proto3" json:"next_client_sequence,omitempty"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -158,8 +158,8 @@ var xxx_messageInfo_GenesisMetadata proto.InternalMessageInfo // IdentifiedGenesisMetadata has the client metadata with the corresponding // client id. type IdentifiedGenesisMetadata struct { - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` - ClientMetadata []GenesisMetadata `protobuf:"bytes,2,rep,name=client_metadata,json=clientMetadata,proto3" json:"client_metadata" yaml:"client_metadata"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + ClientMetadata []GenesisMetadata `protobuf:"bytes,2,rep,name=client_metadata,json=clientMetadata,proto3" json:"client_metadata"` } func (m *IdentifiedGenesisMetadata) Reset() { *m = IdentifiedGenesisMetadata{} } @@ -218,41 +218,37 @@ func init() { func init() { proto.RegisterFile("ibc/core/client/v1/genesis.proto", fileDescriptor_bcd0c0f1f2e6a91a) } var fileDescriptor_bcd0c0f1f2e6a91a = []byte{ - // 539 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0x41, 0x6e, 0xd3, 0x40, - 0x14, 0xcd, 0x34, 0x69, 0x68, 0xa7, 0x15, 0x0d, 0xa3, 0xa8, 0x98, 0x54, 0xb2, 0x2d, 0xb3, 0x09, - 0x8b, 0xd8, 0x24, 0x2c, 0xa8, 0xb2, 0x41, 0x72, 0x25, 0x50, 0x25, 0x90, 0xc0, 0xec, 0xd8, 0x58, - 0x93, 0xf1, 0x90, 0x8e, 0xb0, 0x3d, 0x21, 0x33, 0x89, 0xc8, 0x0d, 0x58, 0x22, 0x4e, 0xc0, 0x9a, - 0x33, 0x70, 0x80, 0x2e, 0xbb, 0xec, 0x2a, 0xa0, 0xe4, 0x06, 0x39, 0x01, 0xf2, 0xcc, 0x98, 0xb6, - 0x69, 0xca, 0xee, 0xe7, 0xf9, 0xbd, 0xf7, 0x9f, 0xde, 0xcf, 0x40, 0x97, 0x0d, 0x48, 0x40, 0xf8, - 0x98, 0x06, 0x24, 0x65, 0x34, 0x97, 0xc1, 0xb4, 0x1b, 0x0c, 0x69, 0x4e, 0x05, 0x13, 0xfe, 0x68, - 0xcc, 0x25, 0x47, 0x88, 0x0d, 0x88, 0x5f, 0x30, 0x7c, 0xcd, 0xf0, 0xa7, 0xdd, 0x96, 0xb3, 0x41, - 0x65, 0xbe, 0x2a, 0x51, 0xab, 0x39, 0xe4, 0x43, 0xae, 0xc6, 0xa0, 0x98, 0x34, 0xea, 0x5d, 0xd6, - 0xe0, 0xfe, 0x2b, 0x6d, 0xfe, 0x5e, 0x62, 0x49, 0x11, 0x81, 0xf7, 0xb4, 0x4c, 0x58, 0xc0, 0xad, - 0xb6, 0xf7, 0x7a, 0x4f, 0xfc, 0xdb, 0xdb, 0xfc, 0xd3, 0x84, 0xe6, 0x92, 0x7d, 0x64, 0x34, 0x39, - 0x51, 0x98, 0xd2, 0x86, 0xf6, 0xf9, 0xdc, 0xa9, 0xfc, 0xfc, 0xed, 0x1c, 0x6e, 0xfc, 0x2c, 0xa2, - 0xd2, 0x19, 0x7d, 0x07, 0xf0, 0x81, 0x99, 0x63, 0xc2, 0x73, 0x41, 0x73, 0x31, 0x11, 0xd6, 0xd6, - 0xdd, 0xfb, 0xb4, 0xcd, 0x49, 0x49, 0xd5, 0x7e, 0x61, 0xbf, 0xd8, 0xb7, 0x9a, 0x3b, 0xd6, 0x0c, - 0x67, 0x69, 0xdf, 0xbb, 0xe5, 0xe8, 0x15, 0x59, 0xb4, 0x54, 0xac, 0x69, 0xa3, 0x06, 0x59, 0xc3, - 0xd1, 0x0c, 0x96, 0x58, 0x9c, 0x51, 0x89, 0x13, 0x2c, 0xb1, 0x55, 0x55, 0x91, 0x3a, 0xff, 0xaf, - 0xc0, 0xf4, 0xf7, 0xc6, 0x88, 0x42, 0xc7, 0xc4, 0x7a, 0x78, 0x33, 0x56, 0x69, 0xea, 0x45, 0x07, - 0x06, 0x2a, 0x15, 0xe8, 0x18, 0xd6, 0x47, 0x78, 0x8c, 0x33, 0x61, 0xd5, 0x5c, 0xd0, 0xde, 0xeb, - 0xb5, 0x36, 0x2d, 0x7c, 0xab, 0x18, 0x61, 0xad, 0x70, 0x8f, 0x0c, 0x1f, 0xbd, 0x84, 0x0d, 0x32, - 0xa6, 0x58, 0xd2, 0x38, 0xe5, 0x04, 0xa7, 0x67, 0x5c, 0x48, 0x6b, 0xdb, 0x05, 0xed, 0x9d, 0xf0, - 0xe8, 0x5a, 0x82, 0x35, 0x46, 0x91, 0x40, 0x41, 0xaf, 0x4b, 0x04, 0xbd, 0x83, 0xcd, 0x9c, 0x7e, - 0x91, 0xb1, 0x5e, 0x17, 0x0b, 0xfa, 0x79, 0x42, 0x73, 0x42, 0xad, 0xba, 0x0b, 0xda, 0xb5, 0xd0, - 0x59, 0xcd, 0x9d, 0x23, 0xed, 0xb5, 0x89, 0xe5, 0x45, 0xa8, 0x80, 0xcd, 0xad, 0x4b, 0xf0, 0x05, - 0x3c, 0x58, 0x6b, 0x06, 0x35, 0x60, 0xf5, 0x13, 0x9d, 0x59, 0xc0, 0x05, 0xed, 0xfd, 0xa8, 0x18, - 0x51, 0x13, 0x6e, 0x4f, 0x71, 0x3a, 0xa1, 0xd6, 0x96, 0xc2, 0xf4, 0x8f, 0x7e, 0xed, 0xeb, 0x0f, - 0xa7, 0xe2, 0xfd, 0x02, 0xf0, 0xd1, 0x9d, 0x2d, 0xa3, 0x2e, 0xdc, 0x35, 0x31, 0x58, 0xa2, 0x1c, - 0x77, 0xc3, 0xe6, 0x6a, 0xee, 0x34, 0xae, 0x97, 0x1e, 0xb3, 0xc4, 0x8b, 0x76, 0xf4, 0x7c, 0x9a, - 0xa0, 0x14, 0x9a, 0xe6, 0xaf, 0x0e, 0xac, 0xff, 0x73, 0x8f, 0x37, 0xf5, 0xbd, 0x7e, 0x56, 0xdb, - 0x9c, 0xf5, 0xf0, 0xc6, 0x86, 0xab, 0xab, 0xde, 0xd7, 0xc8, 0x3f, 0x7e, 0x74, 0xbe, 0xb0, 0xc1, - 0xc5, 0xc2, 0x06, 0x7f, 0x16, 0x36, 0xf8, 0xb6, 0xb4, 0x2b, 0x17, 0x4b, 0xbb, 0x72, 0xb9, 0xb4, - 0x2b, 0x1f, 0x8e, 0x87, 0x4c, 0x9e, 0x4d, 0x06, 0x3e, 0xe1, 0x59, 0x40, 0xb8, 0xc8, 0xb8, 0x08, - 0xd8, 0x80, 0x74, 0x86, 0x3c, 0x98, 0x3e, 0x0f, 0x32, 0x9e, 0x4c, 0x52, 0x2a, 0xf4, 0x5b, 0x7e, - 0xda, 0xeb, 0x98, 0xe7, 0x2c, 0x67, 0x23, 0x2a, 0x06, 0x75, 0xf5, 0x6a, 0x9f, 0xfd, 0x0d, 0x00, - 0x00, 0xff, 0xff, 0x62, 0xb6, 0x99, 0xab, 0x24, 0x04, 0x00, 0x00, + // 477 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0xc1, 0x6e, 0xd3, 0x4c, + 0x18, 0xf4, 0x36, 0x69, 0xfe, 0x76, 0x5b, 0xfd, 0x09, 0xab, 0x08, 0x99, 0x20, 0x39, 0x56, 0xb8, + 0xb8, 0x87, 0xd8, 0x6d, 0x38, 0x50, 0x71, 0x41, 0x6a, 0x0f, 0xa8, 0x12, 0x48, 0xc8, 0xdc, 0x38, + 0x60, 0xd9, 0xeb, 0x0f, 0x77, 0x85, 0xed, 0x0d, 0xd9, 0xb5, 0x45, 0xdf, 0x80, 0x03, 0x07, 0x1e, + 0x81, 0x33, 0x4f, 0xd2, 0x63, 0x8f, 0x9c, 0x00, 0x25, 0x2f, 0x82, 0xbc, 0xbb, 0xa6, 0x52, 0x70, + 0xb9, 0x7d, 0x99, 0x99, 0x6f, 0x26, 0x3b, 0xd6, 0x87, 0x5d, 0x96, 0xd0, 0x80, 0xf2, 0x15, 0x04, + 0x34, 0x67, 0x50, 0xca, 0xa0, 0x3e, 0x09, 0x32, 0x28, 0x41, 0x30, 0xe1, 0x2f, 0x57, 0x5c, 0x72, + 0x42, 0x58, 0x42, 0xfd, 0x46, 0xe1, 0x6b, 0x85, 0x5f, 0x9f, 0x4c, 0xa6, 0x1d, 0x5b, 0x86, 0x55, + 0x4b, 0x93, 0x71, 0xc6, 0x33, 0xae, 0xc6, 0xa0, 0x99, 0x34, 0x3a, 0x5b, 0xf7, 0xf0, 0xe1, 0x73, + 0x6d, 0xfe, 0x5a, 0xc6, 0x12, 0x08, 0xc5, 0xff, 0xe9, 0x35, 0x61, 0x23, 0xb7, 0xe7, 0x1d, 0x2c, + 0x8e, 0xfc, 0xbf, 0xd3, 0xfc, 0x8b, 0x14, 0x4a, 0xc9, 0xde, 0x31, 0x48, 0xcf, 0x15, 0xa6, 0x76, + 0xcf, 0x9c, 0xeb, 0x1f, 0x53, 0xeb, 0xdb, 0xcf, 0xe9, 0xfd, 0x4e, 0x5a, 0x84, 0xad, 0x33, 0xa9, + 0xf1, 0x3d, 0x33, 0x46, 0x94, 0x97, 0x02, 0x4a, 0x51, 0x09, 0x7b, 0xe7, 0xee, 0x38, 0xed, 0x72, + 0xde, 0x4a, 0xb5, 0xdd, 0x6d, 0x9c, 0xa6, 0xc5, 0x16, 0x1f, 0x8e, 0xe8, 0x16, 0x4e, 0xde, 0xe2, + 0x16, 0x8b, 0x0a, 0x90, 0x71, 0x1a, 0xcb, 0xd8, 0xee, 0xa9, 0xd8, 0xf9, 0xbf, 0x5f, 0x69, 0x2a, + 0x7a, 0x69, 0x96, 0xce, 0xfa, 0x4d, 0x74, 0x38, 0x34, 0x66, 0x2d, 0x4c, 0x4e, 0xf1, 0x60, 0x19, + 0xaf, 0xe2, 0x42, 0xd8, 0x7d, 0x17, 0x79, 0x07, 0x8b, 0x49, 0x97, 0xeb, 0x2b, 0xa5, 0x30, 0x16, + 0x46, 0x4f, 0x8e, 0xf0, 0x88, 0xae, 0x20, 0x96, 0x10, 0xe5, 0x9c, 0xc6, 0xf9, 0x25, 0x17, 0xd2, + 0xde, 0x75, 0x91, 0xb7, 0x17, 0x0e, 0x35, 0xfe, 0xa2, 0x85, 0xc9, 0x31, 0x1e, 0x97, 0xf0, 0x51, + 0x46, 0xda, 0x31, 0x12, 0xf0, 0xa1, 0x82, 0x92, 0x82, 0x3d, 0x70, 0x91, 0xd7, 0x0f, 0x49, 0xc3, + 0x99, 0xd6, 0x0d, 0x33, 0x7b, 0x86, 0x87, 0x5b, 0x0f, 0x20, 0x23, 0xdc, 0x7b, 0x0f, 0x57, 0x36, + 0x72, 0x91, 0x77, 0x18, 0x36, 0x23, 0x19, 0xe3, 0xdd, 0x3a, 0xce, 0x2b, 0xb0, 0x77, 0x14, 0xa6, + 0x7f, 0x3c, 0xed, 0x7f, 0xfa, 0x3a, 0xb5, 0x66, 0x9f, 0x11, 0x7e, 0x70, 0x67, 0x19, 0xe4, 0x21, + 0xde, 0x37, 0xff, 0x85, 0xa5, 0xca, 0x71, 0x3f, 0xdc, 0xd3, 0xc0, 0x45, 0x4a, 0x42, 0x6c, 0x5a, + 0xba, 0x6d, 0x5c, 0x7f, 0xe8, 0x47, 0x5d, 0xdd, 0x74, 0xf7, 0xfc, 0xbf, 0x16, 0xfc, 0x41, 0xc3, + 0xeb, 0xb5, 0x83, 0x6e, 0xd6, 0x0e, 0xfa, 0xb5, 0x76, 0xd0, 0x97, 0x8d, 0x63, 0xdd, 0x6c, 0x1c, + 0xeb, 0xfb, 0xc6, 0xb1, 0xde, 0x9c, 0x66, 0x4c, 0x5e, 0x56, 0x89, 0x4f, 0x79, 0x11, 0x50, 0x2e, + 0x0a, 0x2e, 0x02, 0x96, 0xd0, 0x79, 0xc6, 0x83, 0xfa, 0x49, 0x50, 0xf0, 0xb4, 0xca, 0x41, 0xe8, + 0x2b, 0x39, 0x5e, 0xcc, 0xcd, 0xa1, 0xc8, 0xab, 0x25, 0x88, 0x64, 0xa0, 0xee, 0xe1, 0xf1, 0xef, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xc3, 0x3c, 0x2d, 0x37, 0x7e, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/modules/core/02-client/types/tx.pb.go b/modules/core/02-client/types/tx.pb.go index ce17ca96ad7..8ac4ff760c0 100644 --- a/modules/core/02-client/types/tx.pb.go +++ b/modules/core/02-client/types/tx.pb.go @@ -32,10 +32,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgCreateClient defines a message to create an IBC client type MsgCreateClient struct { // light client state - ClientState *types.Any `protobuf:"bytes,1,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"` + ClientState *types.Any `protobuf:"bytes,1,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"` // consensus state associated with the client that corresponds to a given // height. - ConsensusState *types.Any `protobuf:"bytes,2,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty" yaml:"consensus_state"` + ConsensusState *types.Any `protobuf:"bytes,2,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"` // signer address Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -114,7 +114,7 @@ var xxx_messageInfo_MsgCreateClientResponse proto.InternalMessageInfo // the given client message. type MsgUpdateClient struct { // client unique identifier - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // client message to update the light client ClientMessage *types.Any `protobuf:"bytes,2,opt,name=client_message,json=clientMessage,proto3" json:"client_message,omitempty"` // signer address @@ -195,16 +195,16 @@ var xxx_messageInfo_MsgUpdateClientResponse proto.InternalMessageInfo // state type MsgUpgradeClient struct { // client unique identifier - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // upgraded client state - ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"` + ClientState *types.Any `protobuf:"bytes,2,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"` // upgraded consensus state, only contains enough information to serve as a // basis of trust in update logic - ConsensusState *types.Any `protobuf:"bytes,3,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty" yaml:"consensus_state"` + ConsensusState *types.Any `protobuf:"bytes,3,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"` // proof that old chain committed to new client - ProofUpgradeClient []byte `protobuf:"bytes,4,opt,name=proof_upgrade_client,json=proofUpgradeClient,proto3" json:"proof_upgrade_client,omitempty" yaml:"proof_upgrade_client"` + ProofUpgradeClient []byte `protobuf:"bytes,4,opt,name=proof_upgrade_client,json=proofUpgradeClient,proto3" json:"proof_upgrade_client,omitempty"` // proof that old chain committed to new consensus state - ProofUpgradeConsensusState []byte `protobuf:"bytes,5,opt,name=proof_upgrade_consensus_state,json=proofUpgradeConsensusState,proto3" json:"proof_upgrade_consensus_state,omitempty" yaml:"proof_upgrade_consensus_state"` + ProofUpgradeConsensusState []byte `protobuf:"bytes,5,opt,name=proof_upgrade_consensus_state,json=proofUpgradeConsensusState,proto3" json:"proof_upgrade_consensus_state,omitempty"` // signer address Signer string `protobuf:"bytes,6,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -284,7 +284,7 @@ var xxx_messageInfo_MsgUpgradeClientResponse proto.InternalMessageInfo // Warning: DEPRECATED type MsgSubmitMisbehaviour struct { // client unique identifier - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` // Deprecated: Do not use. + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // Deprecated: Do not use. // misbehaviour used for freezing the light client Misbehaviour *types.Any `protobuf:"bytes,2,opt,name=misbehaviour,proto3" json:"misbehaviour,omitempty"` // Deprecated: Do not use. // signer address @@ -376,46 +376,43 @@ func init() { func init() { proto.RegisterFile("ibc/core/client/v1/tx.proto", fileDescriptor_cb5dc4651eb49a04) } var fileDescriptor_cb5dc4651eb49a04 = []byte{ - // 623 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0x8d, 0x9b, 0xef, 0x8b, 0x9a, 0x69, 0xfa, 0x23, 0x13, 0x52, 0xd7, 0x55, 0xed, 0xc8, 0x74, - 0x11, 0x04, 0xb5, 0x49, 0xba, 0x00, 0x15, 0x36, 0xa4, 0x2b, 0x16, 0x91, 0xc0, 0x15, 0x0b, 0xd8, - 0x04, 0xff, 0x4c, 0xa7, 0x23, 0x62, 0x4f, 0xe4, 0xb1, 0x23, 0xf2, 0x06, 0x2c, 0x79, 0x84, 0x0a, - 0x5e, 0x80, 0xc7, 0x60, 0xd9, 0x05, 0x0b, 0x56, 0x51, 0x95, 0x6c, 0x58, 0xe7, 0x09, 0x50, 0x3c, - 0x4e, 0xb0, 0x1d, 0x3b, 0x8a, 0x04, 0xec, 0x3c, 0x73, 0xcf, 0x9c, 0x73, 0x8f, 0xcf, 0x1d, 0x1b, - 0x1c, 0x62, 0xd3, 0xd2, 0x2c, 0xe2, 0x41, 0xcd, 0xea, 0x61, 0xe8, 0xfa, 0xda, 0xa0, 0xa9, 0xf9, - 0x1f, 0xd4, 0xbe, 0x47, 0x7c, 0xc2, 0xf3, 0xd8, 0xb4, 0xd4, 0x59, 0x51, 0x65, 0x45, 0x75, 0xd0, - 0x14, 0xab, 0x88, 0x20, 0x12, 0x96, 0xb5, 0xd9, 0x13, 0x43, 0x8a, 0x07, 0x88, 0x10, 0xd4, 0x83, - 0x5a, 0xb8, 0x32, 0x83, 0x4b, 0xcd, 0x70, 0x87, 0xac, 0xa4, 0xdc, 0x72, 0x60, 0xb7, 0x43, 0xd1, - 0xb9, 0x07, 0x0d, 0x1f, 0x9e, 0x87, 0x3c, 0xfc, 0x4b, 0x50, 0x61, 0x8c, 0x5d, 0xea, 0x1b, 0x3e, - 0x14, 0xb8, 0x3a, 0xd7, 0xd8, 0x6a, 0x55, 0x55, 0xc6, 0xa2, 0xce, 0x59, 0xd4, 0xe7, 0xee, 0xb0, - 0xbd, 0x3f, 0x1d, 0xc9, 0x77, 0x86, 0x86, 0xd3, 0x3b, 0x53, 0xe2, 0x67, 0x14, 0x7d, 0x8b, 0x2d, - 0x2f, 0x66, 0x2b, 0xfe, 0x0d, 0xd8, 0xb5, 0x88, 0x4b, 0xa1, 0x4b, 0x03, 0x1a, 0x91, 0x6e, 0xac, - 0x20, 0x15, 0xa7, 0x23, 0xb9, 0x16, 0x91, 0x26, 0x8f, 0x29, 0xfa, 0xce, 0x62, 0x87, 0x51, 0xd7, - 0x40, 0x89, 0x62, 0xe4, 0x42, 0x4f, 0x28, 0xd6, 0xb9, 0x46, 0x59, 0x8f, 0x56, 0x67, 0x9b, 0x1f, - 0xaf, 0xe5, 0xc2, 0xcf, 0x6b, 0xb9, 0xa0, 0x1c, 0x80, 0xfd, 0x94, 0x43, 0x1d, 0xd2, 0xfe, 0x8c, - 0x45, 0xf9, 0xc2, 0xdc, 0xbf, 0xee, 0xdb, 0xbf, 0xdd, 0x37, 0x41, 0x39, 0x72, 0x82, 0xed, 0xd0, - 0x7a, 0xb9, 0x5d, 0x9d, 0x8e, 0xe4, 0xbd, 0x84, 0x49, 0x6c, 0x2b, 0xfa, 0x26, 0x7b, 0x7e, 0x61, - 0xf3, 0x4f, 0xc1, 0x4e, 0xb4, 0xef, 0x40, 0x4a, 0x0d, 0xb4, 0xd2, 0x9d, 0xbe, 0xcd, 0xb0, 0x1d, - 0x06, 0x5d, 0xdb, 0x40, 0xbc, 0xc9, 0x85, 0x81, 0xef, 0x45, 0xb0, 0x17, 0xd6, 0x90, 0x67, 0xd8, - 0x7f, 0xe0, 0x20, 0x1d, 0xf9, 0xc6, 0xbf, 0x88, 0xbc, 0xf8, 0x97, 0x22, 0x7f, 0x05, 0xaa, 0x7d, - 0x8f, 0x90, 0xcb, 0x6e, 0xc0, 0x6c, 0x77, 0x99, 0xae, 0xf0, 0x5f, 0x9d, 0x6b, 0x54, 0xda, 0xf2, - 0x74, 0x24, 0x1f, 0x32, 0xa6, 0x2c, 0x94, 0xa2, 0xf3, 0xe1, 0x76, 0xf2, 0x95, 0xbd, 0x07, 0x47, - 0x29, 0x70, 0xaa, 0xf7, 0xff, 0x43, 0xee, 0xc6, 0x74, 0x24, 0x1f, 0x67, 0x72, 0xa7, 0x7b, 0x16, - 0x13, 0x22, 0x79, 0x23, 0x5b, 0xca, 0x49, 0x5c, 0x04, 0x42, 0x3a, 0xd5, 0x45, 0xe4, 0x5f, 0x39, - 0x70, 0xb7, 0x43, 0xd1, 0x45, 0x60, 0x3a, 0xd8, 0xef, 0x60, 0x6a, 0xc2, 0x2b, 0x63, 0x80, 0x49, - 0xe0, 0xf1, 0xa7, 0xcb, 0xb9, 0xd7, 0xb2, 0x72, 0x17, 0xb8, 0x58, 0xf2, 0xcf, 0x40, 0xc5, 0x89, - 0x91, 0xac, 0x4c, 0x7e, 0x43, 0xe0, 0xf4, 0x04, 0x9a, 0x17, 0x93, 0xc3, 0x1b, 0x22, 0x96, 0xed, - 0xc8, 0xe0, 0x28, 0xb3, 0xe3, 0xb9, 0xa7, 0xd6, 0xe7, 0x22, 0x28, 0x76, 0x28, 0xe2, 0xdf, 0x81, - 0x4a, 0xe2, 0x4b, 0x74, 0x4f, 0x5d, 0xfe, 0xc6, 0xa9, 0xa9, 0xcb, 0x2c, 0x3e, 0x58, 0x03, 0x34, - 0x57, 0x9a, 0x29, 0x24, 0x6e, 0x7b, 0x9e, 0x42, 0x1c, 0x94, 0xab, 0x90, 0x75, 0x25, 0x79, 0x0b, - 0x6c, 0x27, 0x67, 0xeb, 0x38, 0xf7, 0x74, 0x0c, 0x25, 0x3e, 0x5c, 0x07, 0xb5, 0x10, 0xf1, 0x00, - 0x9f, 0x31, 0x00, 0xf7, 0x73, 0x38, 0x96, 0xa1, 0x62, 0x73, 0x6d, 0xe8, 0x5c, 0xb3, 0xad, 0x7f, - 0x1b, 0x4b, 0xdc, 0xcd, 0x58, 0xe2, 0x6e, 0xc7, 0x12, 0xf7, 0x69, 0x22, 0x15, 0x6e, 0x26, 0x52, - 0xe1, 0xc7, 0x44, 0x2a, 0xbc, 0x7d, 0x82, 0xb0, 0x7f, 0x15, 0x98, 0xaa, 0x45, 0x1c, 0xcd, 0x22, - 0xd4, 0x21, 0x54, 0xc3, 0xa6, 0x75, 0x82, 0x88, 0x36, 0x78, 0xac, 0x39, 0xc4, 0x0e, 0x7a, 0x90, - 0xb2, 0xdf, 0xd8, 0xa3, 0xd6, 0x49, 0xf4, 0x27, 0xf3, 0x87, 0x7d, 0x48, 0xcd, 0x52, 0x38, 0x5f, - 0xa7, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x8f, 0x23, 0x99, 0xe9, 0x06, 0x00, 0x00, + // 561 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6f, 0x12, 0x41, + 0x18, 0x66, 0x40, 0x49, 0x99, 0xd2, 0xd6, 0x4c, 0x50, 0xe9, 0x36, 0x5d, 0x08, 0x7a, 0xc0, 0x68, + 0x67, 0x0a, 0x1e, 0x6a, 0xfc, 0x38, 0xb4, 0x3d, 0x79, 0xe0, 0xb2, 0x8d, 0x17, 0x2f, 0xb8, 0xbb, + 0x4c, 0xa7, 0x93, 0xb0, 0x3b, 0x64, 0x67, 0x97, 0xc8, 0x3f, 0xf0, 0x62, 0xe2, 0x0f, 0xf0, 0xd0, + 0x78, 0xf5, 0x3f, 0x78, 0xf6, 0xd8, 0xa3, 0x47, 0x03, 0x17, 0x7f, 0x86, 0x61, 0x06, 0x90, 0x5d, + 0x58, 0xb2, 0xa6, 0x37, 0x96, 0xf7, 0x79, 0xde, 0xe7, 0x79, 0xbf, 0x06, 0x1e, 0x70, 0xc7, 0x25, + 0xae, 0x08, 0x28, 0x71, 0xfb, 0x9c, 0xfa, 0x21, 0x19, 0xb6, 0x48, 0xf8, 0x11, 0x0f, 0x02, 0x11, + 0x0a, 0x84, 0xb8, 0xe3, 0xe2, 0x69, 0x10, 0xeb, 0x20, 0x1e, 0xb6, 0x8c, 0x0a, 0x13, 0x4c, 0xa8, + 0x30, 0x99, 0xfe, 0xd2, 0x48, 0x63, 0x9f, 0x09, 0xc1, 0xfa, 0x94, 0xa8, 0x2f, 0x27, 0xba, 0x24, + 0xb6, 0x3f, 0xd2, 0xa1, 0xc6, 0x77, 0x00, 0xf7, 0x3a, 0x92, 0x9d, 0x07, 0xd4, 0x0e, 0xe9, 0xb9, + 0xca, 0x83, 0x4e, 0x60, 0x59, 0x67, 0xec, 0xca, 0xd0, 0x0e, 0x69, 0x15, 0xd4, 0x41, 0x73, 0xbb, + 0x5d, 0xc1, 0x3a, 0x0b, 0x9e, 0x67, 0xc1, 0xa7, 0xfe, 0xc8, 0xda, 0xd6, 0xc8, 0x8b, 0x29, 0x10, + 0xbd, 0x81, 0x7b, 0xae, 0xf0, 0x25, 0xf5, 0x65, 0x24, 0x67, 0xdc, 0xfc, 0x06, 0xee, 0xee, 0x02, + 0xac, 0xe9, 0x0f, 0x60, 0x51, 0x72, 0xe6, 0xd3, 0xa0, 0x5a, 0xa8, 0x83, 0x66, 0xc9, 0x9a, 0x7d, + 0xbd, 0xdc, 0xfa, 0x74, 0x5d, 0xcb, 0xfd, 0xb9, 0xae, 0xe5, 0x1a, 0xfb, 0xf0, 0x61, 0xc2, 0xac, + 0x45, 0xe5, 0x60, 0x9a, 0xa5, 0xf1, 0x59, 0x17, 0xf2, 0x6e, 0xd0, 0xfb, 0x57, 0xc8, 0x01, 0x2c, + 0xcd, 0x0a, 0xe1, 0x3d, 0x55, 0x45, 0xc9, 0xda, 0xd2, 0x7f, 0xbc, 0xed, 0xa1, 0x57, 0x70, 0x77, + 0x16, 0xf4, 0xa8, 0x94, 0x36, 0xdb, 0xec, 0x75, 0x47, 0x63, 0x3b, 0x1a, 0x9a, 0xd9, 0xea, 0xb2, + 0x9d, 0x85, 0xd5, 0x1f, 0x79, 0x78, 0x4f, 0xc5, 0x58, 0x60, 0xf7, 0x32, 0x79, 0x4d, 0x4e, 0x24, + 0x7f, 0x8b, 0x89, 0x14, 0xfe, 0x63, 0x22, 0xc7, 0xb0, 0x32, 0x08, 0x84, 0xb8, 0xec, 0x46, 0xda, + 0x6b, 0x57, 0xe7, 0xae, 0xde, 0xa9, 0x83, 0x66, 0xd9, 0x42, 0x2a, 0x16, 0x2f, 0xe3, 0x14, 0x1e, + 0x26, 0x18, 0x09, 0xf9, 0xbb, 0x8a, 0x6a, 0xc4, 0xa8, 0x69, 0x6b, 0x50, 0x4c, 0xe9, 0xad, 0x01, + 0xab, 0xc9, 0xfe, 0x2d, 0x9a, 0xfb, 0x15, 0xc0, 0xfb, 0x1d, 0xc9, 0x2e, 0x22, 0xc7, 0xe3, 0x61, + 0x87, 0x4b, 0x87, 0x5e, 0xd9, 0x43, 0x2e, 0xa2, 0x00, 0xd5, 0x56, 0x3a, 0x7c, 0x96, 0xaf, 0x82, + 0xa5, 0x2e, 0xbf, 0x86, 0x65, 0x6f, 0x89, 0xb0, 0xa9, 0xcb, 0x8a, 0x19, 0x43, 0x23, 0x23, 0xbe, + 0x12, 0x0a, 0xb1, 0x6a, 0xbd, 0x06, 0x0f, 0xd7, 0xba, 0x9b, 0xfb, 0x6f, 0x7f, 0x2b, 0xc0, 0x42, + 0x47, 0x32, 0xf4, 0x01, 0x96, 0x63, 0x47, 0xf9, 0x08, 0xaf, 0x9e, 0x3b, 0x4e, 0x1c, 0x83, 0xf1, + 0x34, 0x03, 0x68, 0xae, 0x34, 0x55, 0x88, 0x5d, 0x4b, 0x9a, 0xc2, 0x32, 0x28, 0x55, 0x61, 0xdd, + 0xa2, 0x23, 0x17, 0xee, 0xc4, 0xb7, 0xe3, 0x71, 0x2a, 0x7b, 0x09, 0x65, 0x3c, 0xcb, 0x82, 0x5a, + 0x88, 0x04, 0x10, 0xad, 0x19, 0xf6, 0x93, 0x94, 0x1c, 0xab, 0x50, 0xa3, 0x95, 0x19, 0x3a, 0xd7, + 0x3c, 0xb3, 0x7e, 0x8e, 0x4d, 0x70, 0x33, 0x36, 0xc1, 0xef, 0xb1, 0x09, 0xbe, 0x4c, 0xcc, 0xdc, + 0xcd, 0xc4, 0xcc, 0xfd, 0x9a, 0x98, 0xb9, 0xf7, 0x2f, 0x18, 0x0f, 0xaf, 0x22, 0x07, 0xbb, 0xc2, + 0x23, 0xae, 0x90, 0x9e, 0x90, 0x84, 0x3b, 0xee, 0x11, 0x13, 0x64, 0x78, 0x42, 0x3c, 0xd1, 0x8b, + 0xfa, 0x54, 0xea, 0x17, 0xfd, 0xb8, 0x7d, 0x34, 0x7b, 0xd4, 0xc3, 0xd1, 0x80, 0x4a, 0xa7, 0xa8, + 0xf6, 0xeb, 0xf9, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x54, 0x95, 0x90, 0xf4, 0x05, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/core/03-connection/types/connection.pb.go b/modules/core/03-connection/types/connection.pb.go index 86d1741edaf..2d557b9389d 100644 --- a/modules/core/03-connection/types/connection.pb.go +++ b/modules/core/03-connection/types/connection.pb.go @@ -68,7 +68,7 @@ func (State) EnumDescriptor() ([]byte, []int) { // a connection between two chains. type ConnectionEnd struct { // client associated with this connection. - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // IBC version which can be utilised to determine encodings or protocols for // channels or packets utilising this connection. Versions []*Version `protobuf:"bytes,2,rep,name=versions,proto3" json:"versions,omitempty"` @@ -79,7 +79,7 @@ type ConnectionEnd struct { // delay period that must pass before a consensus state can be used for // packet-verification NOTE: delay period logic is only implemented by some // clients. - DelayPeriod uint64 `protobuf:"varint,5,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty" yaml:"delay_period"` + DelayPeriod uint64 `protobuf:"varint,5,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty"` } func (m *ConnectionEnd) Reset() { *m = ConnectionEnd{} } @@ -119,9 +119,9 @@ var xxx_messageInfo_ConnectionEnd proto.InternalMessageInfo // identifier field. type IdentifiedConnection struct { // connection identifier. - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" yaml:"id"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // client associated with this connection. - ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` + ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // IBC version which can be utilised to determine encodings or protocols for // channels or packets utilising this connection Versions []*Version `protobuf:"bytes,3,rep,name=versions,proto3" json:"versions,omitempty"` @@ -130,7 +130,7 @@ type IdentifiedConnection struct { // counterparty chain associated with this connection. Counterparty Counterparty `protobuf:"bytes,5,opt,name=counterparty,proto3" json:"counterparty"` // delay period associated with this connection. - DelayPeriod uint64 `protobuf:"varint,6,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty" yaml:"delay_period"` + DelayPeriod uint64 `protobuf:"varint,6,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty"` } func (m *IdentifiedConnection) Reset() { *m = IdentifiedConnection{} } @@ -170,10 +170,10 @@ var xxx_messageInfo_IdentifiedConnection proto.InternalMessageInfo type Counterparty struct { // identifies the client on the counterparty chain associated with a given // connection. - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // identifies the connection end on the counterparty chain associated with a // given connection. - ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` + ConnectionId string `protobuf:"bytes,2,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` // commitment merkle prefix of the counterparty chain. Prefix types.MerklePrefix `protobuf:"bytes,3,opt,name=prefix,proto3" json:"prefix"` } @@ -260,7 +260,7 @@ func (m *ClientPaths) GetPaths() []string { // ConnectionPaths define all the connection paths for a given client state. type ConnectionPaths struct { // client state unique identifier - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // list of connection paths Paths []string `protobuf:"bytes,2,rep,name=paths,proto3" json:"paths,omitempty"` } @@ -359,7 +359,7 @@ type Params struct { // maximum expected time per block (in nanoseconds), used to enforce block delay. This parameter should reflect the // largest amount of time that the chain might reasonably take to produce the next block under normal operating // conditions. A safe choice is 3-5x the expected time per block. - MaxExpectedTimePerBlock uint64 `protobuf:"varint,1,opt,name=max_expected_time_per_block,json=maxExpectedTimePerBlock,proto3" json:"max_expected_time_per_block,omitempty" yaml:"max_expected_time_per_block"` + MaxExpectedTimePerBlock uint64 `protobuf:"varint,1,opt,name=max_expected_time_per_block,json=maxExpectedTimePerBlock,proto3" json:"max_expected_time_per_block,omitempty"` } func (m *Params) Reset() { *m = Params{} } @@ -418,53 +418,49 @@ func init() { } var fileDescriptor_90572467c054e43a = []byte{ - // 721 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4f, 0x6f, 0xda, 0x48, - 0x14, 0xc7, 0xc6, 0x10, 0x18, 0xc2, 0x2e, 0x3b, 0x8b, 0x36, 0x16, 0xab, 0xd8, 0x96, 0x77, 0xb5, - 0x8b, 0x56, 0x0a, 0x5e, 0x12, 0x69, 0x57, 0x4a, 0xdb, 0x43, 0x20, 0x54, 0xb2, 0xda, 0x52, 0xe4, - 0x90, 0x48, 0xcd, 0x05, 0x19, 0x7b, 0x42, 0x46, 0xc1, 0x1e, 0x64, 0x0f, 0x08, 0xbe, 0x41, 0x94, - 0x53, 0xaf, 0x3d, 0x44, 0xaa, 0xd4, 0xef, 0x52, 0x45, 0x3d, 0xe5, 0xd8, 0x13, 0xaa, 0x92, 0x6b, - 0x4f, 0x7c, 0x82, 0xca, 0x1e, 0x03, 0x4e, 0xd4, 0x54, 0x4a, 0xda, 0xdb, 0x7b, 0xfe, 0xfd, 0xe1, - 0xbd, 0x1f, 0x0f, 0x03, 0xfe, 0xc6, 0x5d, 0x4b, 0xb3, 0x88, 0x87, 0x34, 0x8b, 0xb8, 0x2e, 0xb2, - 0x28, 0x26, 0xae, 0x36, 0xaa, 0xc6, 0xba, 0xca, 0xc0, 0x23, 0x94, 0xc0, 0xdf, 0x70, 0xd7, 0xaa, - 0x04, 0xc4, 0x4a, 0x0c, 0x1a, 0x55, 0x4b, 0xc5, 0x1e, 0xe9, 0x91, 0x90, 0xa2, 0x05, 0x15, 0x63, - 0x97, 0xe2, 0xb6, 0x8e, 0x83, 0xa9, 0x83, 0x5c, 0xca, 0x6c, 0xe7, 0x1d, 0x23, 0xaa, 0xef, 0x79, - 0x90, 0xaf, 0x2f, 0x0c, 0x1b, 0xae, 0x0d, 0xab, 0x20, 0x6b, 0xf5, 0x31, 0x72, 0x69, 0x07, 0xdb, - 0x22, 0xa7, 0x70, 0xe5, 0x6c, 0xad, 0x38, 0x9b, 0xca, 0x85, 0x89, 0xe9, 0xf4, 0xb7, 0xd5, 0x05, - 0xa4, 0x1a, 0x19, 0x56, 0xeb, 0x36, 0x7c, 0x04, 0x32, 0x23, 0xe4, 0xf9, 0x98, 0xb8, 0xbe, 0xc8, - 0x2b, 0xc9, 0x72, 0x6e, 0x53, 0xae, 0x7c, 0x7d, 0xdc, 0xca, 0x01, 0xe3, 0x19, 0x0b, 0x01, 0xdc, - 0x02, 0x29, 0x9f, 0x9a, 0x14, 0x89, 0x49, 0x85, 0x2b, 0xff, 0xb4, 0xb9, 0x7e, 0x97, 0x72, 0x2f, - 0x20, 0x19, 0x8c, 0x0b, 0x9b, 0x60, 0xd5, 0x22, 0x43, 0x97, 0x22, 0x6f, 0x60, 0x7a, 0x74, 0x22, - 0x0a, 0x0a, 0x57, 0xce, 0x6d, 0xfe, 0x79, 0x97, 0xb6, 0x1e, 0xe3, 0xd6, 0x84, 0x8b, 0xa9, 0x9c, - 0x30, 0x6e, 0xe8, 0xe1, 0x36, 0x58, 0xb5, 0x51, 0xdf, 0x9c, 0x74, 0x06, 0xc8, 0xc3, 0xc4, 0x16, - 0x53, 0x0a, 0x57, 0x16, 0x6a, 0x6b, 0xb3, 0xa9, 0xfc, 0x2b, 0xdb, 0x3b, 0x8e, 0xaa, 0x46, 0x2e, - 0x6c, 0x5b, 0x61, 0xb7, 0x2d, 0x9c, 0xbe, 0x95, 0x13, 0xea, 0x67, 0x1e, 0x14, 0x75, 0x1b, 0xb9, - 0x14, 0x1f, 0x61, 0x64, 0x2f, 0x23, 0x85, 0xeb, 0x80, 0x5f, 0x04, 0x99, 0x9f, 0x4d, 0xe5, 0x2c, - 0x33, 0x0c, 0x12, 0xe4, 0xf1, 0xad, 0xb8, 0xf9, 0x7b, 0xc7, 0x9d, 0x7c, 0x70, 0xdc, 0xc2, 0x77, - 0xc4, 0x9d, 0xfa, 0xc1, 0x71, 0xa7, 0xef, 0x1d, 0xf7, 0x07, 0x0e, 0xac, 0xc6, 0x3f, 0xe6, 0x21, - 0x67, 0xfb, 0x04, 0xe4, 0x97, 0x73, 0x2f, 0xe3, 0x17, 0x67, 0x53, 0xb9, 0x18, 0xc9, 0xe2, 0xb0, - 0x1a, 0x2c, 0x31, 0xef, 0x75, 0x1b, 0xd6, 0x40, 0x7a, 0xe0, 0xa1, 0x23, 0x3c, 0x0e, 0x2f, 0xf7, - 0x56, 0x1c, 0x8b, 0x9f, 0xd9, 0xa8, 0x5a, 0x79, 0x81, 0xbc, 0x93, 0x3e, 0x6a, 0x85, 0xdc, 0x28, - 0x8e, 0x48, 0x19, 0x2d, 0xf3, 0x07, 0xc8, 0xd5, 0xc3, 0xa1, 0x5a, 0x26, 0x3d, 0xf6, 0x61, 0x11, - 0xa4, 0x06, 0x41, 0x21, 0x72, 0x4a, 0xb2, 0x9c, 0x35, 0x58, 0xa3, 0x1e, 0x82, 0x9f, 0x97, 0x57, - 0xc5, 0x88, 0x0f, 0xd8, 0x79, 0xe1, 0xcd, 0xc7, 0xbd, 0x9f, 0x81, 0x95, 0xe8, 0x52, 0xa0, 0x04, - 0x00, 0x9e, 0x9f, 0xb1, 0xc7, 0x4c, 0x8d, 0xd8, 0x13, 0x58, 0x02, 0x99, 0x23, 0x64, 0xd2, 0xa1, - 0x87, 0xe6, 0x1e, 0x8b, 0x3e, 0xda, 0xc6, 0x05, 0xe9, 0x96, 0xe9, 0x99, 0x8e, 0x0f, 0x6d, 0xf0, - 0xbb, 0x63, 0x8e, 0x3b, 0x68, 0x3c, 0x40, 0x16, 0x45, 0x76, 0x87, 0x62, 0x07, 0x05, 0x5f, 0x6a, - 0xa7, 0xdb, 0x27, 0xd6, 0x49, 0x68, 0x2e, 0xd4, 0xfe, 0x9a, 0x4d, 0x65, 0x95, 0x4d, 0xfc, 0x0d, - 0xb2, 0x6a, 0xac, 0x39, 0xe6, 0xb8, 0x11, 0x81, 0x6d, 0xec, 0xa0, 0x16, 0xf2, 0x6a, 0x01, 0xf2, - 0xcf, 0x1b, 0x0e, 0xa4, 0xc2, 0x6b, 0x85, 0xff, 0x01, 0x79, 0xaf, 0xbd, 0xd3, 0x6e, 0x74, 0xf6, - 0x9b, 0x7a, 0x53, 0x6f, 0xeb, 0x3b, 0xcf, 0xf5, 0xc3, 0xc6, 0x6e, 0x67, 0xbf, 0xb9, 0xd7, 0x6a, - 0xd4, 0xf5, 0xa7, 0x7a, 0x63, 0xb7, 0x90, 0x28, 0xfd, 0x72, 0x76, 0xae, 0xe4, 0x6f, 0x10, 0xa0, - 0x08, 0x00, 0xd3, 0x05, 0x0f, 0x0b, 0x5c, 0x29, 0x73, 0x76, 0xae, 0x08, 0x41, 0x0d, 0x25, 0x90, - 0x67, 0x48, 0xdb, 0x78, 0xf5, 0xb2, 0xd5, 0x68, 0x16, 0xf8, 0x52, 0xee, 0xec, 0x5c, 0x59, 0x89, - 0xda, 0xa5, 0x32, 0x04, 0x93, 0x4c, 0x19, 0xd4, 0x25, 0xe1, 0xf4, 0x9d, 0x94, 0xa8, 0x1d, 0x5c, - 0x5c, 0x49, 0xdc, 0xe5, 0x95, 0xc4, 0x7d, 0xba, 0x92, 0xb8, 0xd7, 0xd7, 0x52, 0xe2, 0xf2, 0x5a, - 0x4a, 0x7c, 0xbc, 0x96, 0x12, 0x87, 0x8f, 0x7b, 0x98, 0x1e, 0x0f, 0xbb, 0xc1, 0xa9, 0x68, 0x16, - 0xf1, 0x1d, 0xe2, 0x6b, 0xb8, 0x6b, 0x6d, 0xf4, 0x88, 0x36, 0xfa, 0x5f, 0x73, 0x88, 0x3d, 0xec, - 0x23, 0x9f, 0xbd, 0xc1, 0xff, 0xdd, 0xda, 0x88, 0xfd, 0x37, 0xd0, 0xc9, 0x00, 0xf9, 0xdd, 0x74, - 0xf8, 0xf6, 0xde, 0xfa, 0x12, 0x00, 0x00, 0xff, 0xff, 0x8f, 0xa7, 0x84, 0x5c, 0x3f, 0x06, 0x00, - 0x00, + // 661 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x5d, 0x4b, 0xdb, 0x50, + 0x18, 0x4e, 0xd2, 0xb4, 0xd6, 0xd3, 0xd6, 0xb9, 0x83, 0x6c, 0x21, 0xb2, 0x34, 0xd3, 0xc1, 0xca, + 0xc0, 0x66, 0x2a, 0x6c, 0xb0, 0x79, 0x63, 0x6b, 0x84, 0xb0, 0xad, 0x0b, 0xb1, 0x0a, 0xf3, 0x26, + 0xa4, 0xc9, 0xb1, 0x1e, 0x6c, 0x72, 0x42, 0x72, 0x5a, 0xea, 0x3f, 0x10, 0xaf, 0x76, 0x37, 0x36, + 0x10, 0x06, 0xbb, 0xdf, 0xef, 0xf0, 0xd2, 0xcb, 0x5d, 0x8d, 0xa1, 0x7f, 0x64, 0xe4, 0xc3, 0x26, + 0xca, 0xec, 0xc5, 0xb6, 0xbb, 0xf7, 0xe3, 0x79, 0x9e, 0xbc, 0x79, 0xde, 0x97, 0x03, 0x9e, 0xe2, + 0x9e, 0xad, 0xd8, 0x24, 0x40, 0x8a, 0x4d, 0x3c, 0x0f, 0xd9, 0x14, 0x13, 0x4f, 0x19, 0xad, 0xe6, + 0xb2, 0xa6, 0x1f, 0x10, 0x4a, 0xe0, 0x03, 0xdc, 0xb3, 0x9b, 0x11, 0xb0, 0x99, 0x6b, 0x8d, 0x56, + 0xc5, 0x85, 0x3e, 0xe9, 0x93, 0x18, 0xa2, 0x44, 0x51, 0x82, 0x16, 0xf3, 0xb2, 0xae, 0x8b, 0xa9, + 0x8b, 0x3c, 0x9a, 0xc8, 0x5e, 0x67, 0x09, 0x70, 0xe9, 0x13, 0x07, 0x6a, 0xed, 0x89, 0xa0, 0xea, + 0x39, 0x70, 0x11, 0xcc, 0xda, 0x03, 0x8c, 0x3c, 0x6a, 0x62, 0x47, 0x60, 0x65, 0xb6, 0x31, 0x6b, + 0x94, 0x93, 0x82, 0xe6, 0xc0, 0xd7, 0xa0, 0x3c, 0x42, 0x41, 0x88, 0x89, 0x17, 0x0a, 0x9c, 0x5c, + 0x68, 0x54, 0xd6, 0xea, 0xcd, 0x3f, 0x0f, 0xd6, 0xdc, 0x4b, 0x70, 0xc6, 0x84, 0x00, 0xd7, 0x41, + 0x31, 0xa4, 0x16, 0x45, 0x42, 0x41, 0x66, 0x1b, 0x73, 0x6b, 0x8f, 0xee, 0x62, 0xee, 0x44, 0x20, + 0x23, 0xc1, 0xc2, 0x0e, 0xa8, 0xda, 0x64, 0xe8, 0x51, 0x14, 0xf8, 0x56, 0x40, 0x8f, 0x05, 0x5e, + 0x66, 0x1b, 0x95, 0xb5, 0x27, 0x77, 0x71, 0xdb, 0x39, 0x6c, 0x8b, 0x3f, 0xff, 0x59, 0x67, 0x8c, + 0x1b, 0x7c, 0xf8, 0x18, 0x54, 0x1d, 0x34, 0xb0, 0x8e, 0x4d, 0x1f, 0x05, 0x98, 0x38, 0x42, 0x51, + 0x66, 0x1b, 0xbc, 0x51, 0x89, 0x6b, 0x7a, 0x5c, 0x7a, 0xc5, 0x9f, 0x7c, 0xad, 0x33, 0x4b, 0xdf, + 0x39, 0xb0, 0xa0, 0x39, 0xc8, 0xa3, 0xf8, 0x00, 0x23, 0x27, 0xf3, 0x08, 0xce, 0x01, 0x6e, 0xe2, + 0x0c, 0x87, 0x6f, 0x19, 0xc6, 0x4d, 0x31, 0xac, 0xf0, 0xd7, 0x86, 0xf1, 0xff, 0x60, 0x58, 0xf1, + 0x3f, 0x1b, 0x56, 0xba, 0xcb, 0xb0, 0x2f, 0x2c, 0xa8, 0xe6, 0xd5, 0xa6, 0x5f, 0xd2, 0x32, 0xa8, + 0x65, 0x83, 0x64, 0xce, 0x55, 0xb3, 0xa2, 0xe6, 0xc0, 0x16, 0x28, 0xf9, 0x01, 0x3a, 0xc0, 0xe3, + 0xf8, 0x64, 0x6e, 0xfd, 0xc5, 0xe4, 0x92, 0x47, 0xab, 0xcd, 0x77, 0x28, 0x38, 0x1a, 0x20, 0x3d, + 0xc6, 0xa6, 0x7f, 0x91, 0x32, 0xd3, 0xe1, 0x96, 0x41, 0xa5, 0x1d, 0x7f, 0x5a, 0xb7, 0xe8, 0x61, + 0x08, 0x17, 0x40, 0xd1, 0x8f, 0x02, 0x81, 0x95, 0x0b, 0x8d, 0x59, 0x23, 0x49, 0x96, 0xb6, 0xc0, + 0xbd, 0x6c, 0xcf, 0x09, 0x70, 0xea, 0x3f, 0x4c, 0x54, 0xb8, 0xbc, 0xca, 0x1b, 0x30, 0x93, 0xae, + 0x12, 0x4a, 0x00, 0xe0, 0xeb, 0x13, 0x0a, 0x52, 0x7a, 0xae, 0x02, 0x45, 0x50, 0x3e, 0x40, 0x16, + 0x1d, 0x06, 0xe8, 0x5a, 0x63, 0x92, 0xa7, 0x73, 0x6f, 0x83, 0x92, 0x6e, 0x05, 0x96, 0x1b, 0xc2, + 0x0d, 0xb0, 0xe8, 0x5a, 0x63, 0x13, 0x8d, 0x7d, 0x64, 0x53, 0xe4, 0x98, 0x14, 0xbb, 0x28, 0xda, + 0x89, 0xd9, 0x1b, 0x10, 0xfb, 0x28, 0x16, 0xe7, 0x8d, 0x87, 0xae, 0x35, 0x56, 0x53, 0x44, 0x17, + 0xbb, 0x48, 0x47, 0x41, 0x2b, 0x6a, 0x3f, 0xfb, 0xcc, 0x82, 0x62, 0x7c, 0x26, 0xf0, 0x05, 0xa8, + 0xef, 0x74, 0x37, 0xbb, 0xaa, 0xb9, 0xdb, 0xd1, 0x3a, 0x5a, 0x57, 0xdb, 0x7c, 0xab, 0xed, 0xab, + 0x5b, 0xe6, 0x6e, 0x67, 0x47, 0x57, 0xdb, 0xda, 0xb6, 0xa6, 0x6e, 0xcd, 0x33, 0xe2, 0xfd, 0xd3, + 0x33, 0xb9, 0x76, 0x03, 0x00, 0x05, 0x00, 0x12, 0x5e, 0x54, 0x9c, 0x67, 0xc5, 0xf2, 0xe9, 0x99, + 0xcc, 0x47, 0x31, 0x94, 0x40, 0x2d, 0xe9, 0x74, 0x8d, 0x0f, 0xef, 0x75, 0xb5, 0x33, 0xcf, 0x89, + 0x95, 0xd3, 0x33, 0x79, 0x26, 0x4d, 0x33, 0x66, 0xdc, 0x2c, 0x24, 0xcc, 0x28, 0x16, 0xf9, 0x93, + 0x6f, 0x12, 0xd3, 0xda, 0x3b, 0xbf, 0x94, 0xd8, 0x8b, 0x4b, 0x89, 0xfd, 0x75, 0x29, 0xb1, 0x1f, + 0xaf, 0x24, 0xe6, 0xe2, 0x4a, 0x62, 0x7e, 0x5c, 0x49, 0xcc, 0xfe, 0x46, 0x1f, 0xd3, 0xc3, 0x61, + 0x2f, 0x5a, 0xb6, 0x62, 0x93, 0xd0, 0x25, 0xa1, 0x82, 0x7b, 0xf6, 0x4a, 0x9f, 0x28, 0xa3, 0x97, + 0x8a, 0x4b, 0x9c, 0xe1, 0x00, 0x85, 0xc9, 0x33, 0xf7, 0x7c, 0x7d, 0x25, 0xf7, 0x80, 0xd2, 0x63, + 0x1f, 0x85, 0xbd, 0x52, 0xfc, 0xc4, 0xad, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x16, 0x1e, 0x46, + 0x70, 0x64, 0x05, 0x00, 0x00, } func (m *ConnectionEnd) Marshal() (dAtA []byte, err error) { diff --git a/modules/core/03-connection/types/genesis.pb.go b/modules/core/03-connection/types/genesis.pb.go index 126cc211457..a3514c7c0cc 100644 --- a/modules/core/03-connection/types/genesis.pb.go +++ b/modules/core/03-connection/types/genesis.pb.go @@ -26,9 +26,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the ibc connection submodule's genesis state. type GenesisState struct { Connections []IdentifiedConnection `protobuf:"bytes,1,rep,name=connections,proto3" json:"connections"` - ClientConnectionPaths []ConnectionPaths `protobuf:"bytes,2,rep,name=client_connection_paths,json=clientConnectionPaths,proto3" json:"client_connection_paths" yaml:"client_connection_paths"` + ClientConnectionPaths []ConnectionPaths `protobuf:"bytes,2,rep,name=client_connection_paths,json=clientConnectionPaths,proto3" json:"client_connection_paths"` // the sequence for the next generated connection identifier - NextConnectionSequence uint64 `protobuf:"varint,3,opt,name=next_connection_sequence,json=nextConnectionSequence,proto3" json:"next_connection_sequence,omitempty" yaml:"next_connection_sequence"` + NextConnectionSequence uint64 `protobuf:"varint,3,opt,name=next_connection_sequence,json=nextConnectionSequence,proto3" json:"next_connection_sequence,omitempty"` Params Params `protobuf:"bytes,4,opt,name=params,proto3" json:"params"` } @@ -102,30 +102,28 @@ func init() { } var fileDescriptor_1879d34bc6ac3cd7 = []byte{ - // 359 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x4e, 0xea, 0x40, - 0x14, 0x86, 0xdb, 0x0b, 0x61, 0x51, 0xee, 0xaa, 0xb9, 0x17, 0x1b, 0x16, 0x53, 0x52, 0x8d, 0xb0, - 0x90, 0x19, 0x81, 0x85, 0x89, 0x61, 0x55, 0x17, 0xc6, 0x1d, 0x01, 0xe3, 0xc2, 0xc4, 0x90, 0x76, - 0x38, 0x96, 0x49, 0xe8, 0x4c, 0x65, 0x06, 0x22, 0x4f, 0xe0, 0xc2, 0x8d, 0x8f, 0xc5, 0x92, 0xa5, - 0x2b, 0x62, 0xe0, 0x0d, 0x78, 0x02, 0xd3, 0x96, 0x58, 0x34, 0x76, 0xd7, 0x9c, 0xf3, 0xfd, 0xdf, - 0x9f, 0xce, 0x31, 0x4e, 0x98, 0x4f, 0x09, 0x15, 0x53, 0x20, 0x54, 0x70, 0x0e, 0x54, 0x31, 0xc1, - 0xc9, 0xbc, 0x45, 0x02, 0xe0, 0x20, 0x99, 0xc4, 0xd1, 0x54, 0x28, 0x61, 0x56, 0x98, 0x4f, 0x71, - 0x4c, 0xe1, 0x8c, 0xc2, 0xf3, 0x56, 0xf5, 0x5f, 0x20, 0x02, 0x91, 0x20, 0x24, 0xfe, 0x4a, 0xe9, - 0x6a, 0x3d, 0xc7, 0x79, 0x90, 0x4d, 0x40, 0xe7, 0xb5, 0x60, 0xfc, 0xbd, 0x4e, 0x8b, 0x06, 0xca, - 0x53, 0x60, 0xde, 0x1a, 0xe5, 0x0c, 0x92, 0x96, 0x5e, 0x2b, 0x34, 0xca, 0xed, 0x33, 0xfc, 0x7b, - 0x3b, 0xbe, 0x19, 0x01, 0x57, 0xec, 0x91, 0xc1, 0xe8, 0xea, 0x6b, 0xee, 0x16, 0x97, 0x6b, 0x5b, - 0xeb, 0x1f, 0x6a, 0xcc, 0x17, 0xdd, 0x38, 0xa2, 0x13, 0x06, 0x5c, 0x0d, 0xb3, 0xf1, 0x30, 0xf2, - 0xd4, 0x58, 0x5a, 0x7f, 0x92, 0x8a, 0x7a, 0x5e, 0x45, 0x26, 0xee, 0xc5, 0xb8, 0x7b, 0x1a, 0xdb, - 0x77, 0x6b, 0x1b, 0x2d, 0xbc, 0x70, 0x72, 0xe9, 0xe4, 0x58, 0x9d, 0xfe, 0xff, 0x74, 0xf3, 0x23, - 0x6e, 0x3e, 0x18, 0x16, 0x87, 0xe7, 0x6f, 0x01, 0x09, 0x4f, 0x33, 0xe0, 0x14, 0xac, 0x42, 0x4d, - 0x6f, 0x14, 0xdd, 0xe3, 0xdd, 0xda, 0xb6, 0x53, 0x79, 0x1e, 0xe9, 0xf4, 0x2b, 0xf1, 0x2a, 0x73, - 0x0f, 0xf6, 0x0b, 0xb3, 0x6b, 0x94, 0x22, 0x6f, 0xea, 0x85, 0xd2, 0x2a, 0xd6, 0xf4, 0x46, 0xb9, - 0x8d, 0xf2, 0x7e, 0xab, 0x97, 0x50, 0xfb, 0xb7, 0xda, 0x67, 0xdc, 0xbb, 0xe5, 0x06, 0xe9, 0xab, - 0x0d, 0xd2, 0x3f, 0x36, 0x48, 0x7f, 0xdb, 0x22, 0x6d, 0xb5, 0x45, 0xda, 0xfb, 0x16, 0x69, 0xf7, - 0xdd, 0x80, 0xa9, 0xf1, 0xcc, 0xc7, 0x54, 0x84, 0x84, 0x0a, 0x19, 0x0a, 0x49, 0x98, 0x4f, 0x9b, - 0x81, 0x20, 0xf3, 0x0b, 0x12, 0x8a, 0xd1, 0x6c, 0x02, 0x32, 0x3d, 0xf8, 0x79, 0xa7, 0x79, 0x70, - 0x73, 0xb5, 0x88, 0x40, 0xfa, 0xa5, 0xe4, 0xd8, 0x9d, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x56, - 0x1d, 0xd8, 0x5e, 0x6b, 0x02, 0x00, 0x00, + // 328 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xbf, 0x4e, 0x32, 0x41, + 0x14, 0xc5, 0x77, 0x81, 0x50, 0x0c, 0x5f, 0xb5, 0xf9, 0xc4, 0x0d, 0xc5, 0x48, 0x8c, 0x09, 0x14, + 0x32, 0x23, 0x50, 0x68, 0x41, 0x85, 0x85, 0xb1, 0x23, 0x60, 0x2c, 0x6c, 0xc8, 0xee, 0x70, 0x5d, + 0x26, 0x61, 0xe7, 0xae, 0xcc, 0x40, 0xf4, 0x2d, 0x7c, 0x27, 0x1b, 0x4a, 0x4a, 0x2b, 0x63, 0xe0, + 0x45, 0xcc, 0xfe, 0x89, 0x8b, 0xc6, 0xed, 0x26, 0x73, 0x7e, 0xe7, 0x9c, 0x9b, 0x1c, 0x72, 0x26, + 0x7d, 0xc1, 0x05, 0x2e, 0x81, 0x0b, 0x54, 0x0a, 0x84, 0x91, 0xa8, 0xf8, 0xba, 0xcb, 0x03, 0x50, + 0xa0, 0xa5, 0x66, 0xd1, 0x12, 0x0d, 0x3a, 0x75, 0xe9, 0x0b, 0x16, 0x53, 0x2c, 0xa7, 0xd8, 0xba, + 0xdb, 0xf8, 0x1f, 0x60, 0x80, 0x09, 0xc2, 0xe3, 0x57, 0x4a, 0x37, 0x5a, 0x05, 0x99, 0x07, 0xde, + 0x04, 0x3c, 0x7d, 0x2b, 0x91, 0x7f, 0x37, 0x69, 0xd1, 0xc4, 0x78, 0x06, 0x9c, 0x3b, 0x52, 0xcb, + 0x21, 0xed, 0xda, 0xcd, 0x72, 0xbb, 0xd6, 0x3b, 0x67, 0x7f, 0xb7, 0xb3, 0xdb, 0x19, 0x28, 0x23, + 0x1f, 0x25, 0xcc, 0xae, 0xbf, 0xff, 0x87, 0x95, 0xcd, 0xc7, 0x89, 0x35, 0x3e, 0x8c, 0x71, 0x80, + 0x1c, 0x8b, 0x85, 0x04, 0x65, 0xa6, 0xf9, 0xef, 0x34, 0xf2, 0xcc, 0x5c, 0xbb, 0xa5, 0xa4, 0xa1, + 0x55, 0xd4, 0x90, 0xe7, 0x8e, 0x62, 0x3c, 0x0b, 0x3f, 0x4a, 0xd3, 0x7e, 0x89, 0xce, 0x15, 0x71, + 0x15, 0x3c, 0xff, 0x28, 0xd1, 0xf0, 0xb4, 0x02, 0x25, 0xc0, 0x2d, 0x37, 0xed, 0x76, 0x65, 0x5c, + 0x8f, 0xf5, 0xdc, 0x36, 0xc9, 0x54, 0x67, 0x40, 0xaa, 0x91, 0xb7, 0xf4, 0x42, 0xed, 0x56, 0x9a, + 0x76, 0xbb, 0xd6, 0xa3, 0x45, 0xf7, 0x8c, 0x12, 0x2a, 0x3b, 0x23, 0xf3, 0x0c, 0xef, 0x37, 0x3b, + 0x6a, 0x6f, 0x77, 0xd4, 0xfe, 0xdc, 0x51, 0xfb, 0x75, 0x4f, 0xad, 0xed, 0x9e, 0x5a, 0xef, 0x7b, + 0x6a, 0x3d, 0x0c, 0x02, 0x69, 0xe6, 0x2b, 0x9f, 0x09, 0x0c, 0xb9, 0x40, 0x1d, 0xa2, 0xe6, 0xd2, + 0x17, 0x9d, 0x00, 0xf9, 0xfa, 0x92, 0x87, 0x38, 0x5b, 0x2d, 0x40, 0xa7, 0x43, 0x5d, 0xf4, 0x3b, + 0x07, 0x5b, 0x99, 0x97, 0x08, 0xb4, 0x5f, 0x4d, 0x46, 0xea, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, + 0x2e, 0xe5, 0xed, 0xd8, 0x23, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/modules/core/03-connection/types/query.pb.go b/modules/core/03-connection/types/query.pb.go index 2d87fa0c3ff..ca9d60fad74 100644 --- a/modules/core/03-connection/types/query.pb.go +++ b/modules/core/03-connection/types/query.pb.go @@ -372,7 +372,7 @@ func (m *QueryClientConnectionsResponse) GetProofHeight() types.Height { // Query/ConnectionClientState RPC method type QueryConnectionClientStateRequest struct { // connection identifier - ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` + ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` } func (m *QueryConnectionClientStateRequest) Reset() { *m = QueryConnectionClientStateRequest{} } @@ -484,7 +484,7 @@ func (m *QueryConnectionClientStateResponse) GetProofHeight() types.Height { // Query/ConnectionConsensusState RPC method type QueryConnectionConsensusStateRequest struct { // connection identifier - ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` + ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` RevisionNumber uint64 `protobuf:"varint,2,opt,name=revision_number,json=revisionNumber,proto3" json:"revision_number,omitempty"` RevisionHeight uint64 `protobuf:"varint,3,opt,name=revision_height,json=revisionHeight,proto3" json:"revision_height,omitempty"` } @@ -720,67 +720,66 @@ func init() { } var fileDescriptor_cd8d529f8c7cd06b = []byte{ - // 958 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x41, 0x6f, 0xdc, 0x44, - 0x14, 0xce, 0x6c, 0xd2, 0x88, 0xbc, 0x0d, 0x6d, 0x19, 0xa5, 0xed, 0x62, 0x8a, 0x13, 0x5c, 0xd2, - 0xa4, 0x40, 0x3d, 0xdd, 0x84, 0x84, 0x52, 0x12, 0x04, 0xa9, 0x0a, 0xcd, 0xa5, 0x0a, 0x46, 0x02, - 0x89, 0x4b, 0x64, 0x7b, 0x27, 0x8e, 0xa5, 0xac, 0x67, 0xbb, 0xe3, 0x5d, 0xb4, 0xaa, 0x22, 0x24, - 0x7e, 0x01, 0x12, 0x17, 0x2e, 0x5c, 0x41, 0xe2, 0x0f, 0x20, 0xc4, 0x8d, 0x53, 0x8f, 0x95, 0xb8, - 0xf4, 0x14, 0xa1, 0x0d, 0x57, 0x2e, 0xfc, 0x02, 0xe4, 0x99, 0x71, 0x3d, 0xde, 0xb5, 0x93, 0xcd, - 0x8a, 0xdc, 0x36, 0x6f, 0xde, 0x7b, 0xf3, 0x7d, 0xdf, 0x7b, 0xf3, 0x59, 0x01, 0x2b, 0xf4, 0x7c, - 0xe2, 0xb3, 0x36, 0x25, 0x3e, 0x8b, 0x22, 0xea, 0xc7, 0x21, 0x8b, 0x48, 0xb7, 0x4e, 0x1e, 0x77, - 0x68, 0xbb, 0x67, 0xb7, 0xda, 0x2c, 0x66, 0xf8, 0x6a, 0xe8, 0xf9, 0x76, 0x92, 0x63, 0x67, 0x39, - 0x76, 0xb7, 0x6e, 0xcc, 0x05, 0x2c, 0x60, 0x22, 0x85, 0x24, 0xbf, 0x64, 0xb6, 0xf1, 0x96, 0xcf, - 0x78, 0x93, 0x71, 0xe2, 0xb9, 0x9c, 0xca, 0x36, 0xa4, 0x5b, 0xf7, 0x68, 0xec, 0xd6, 0x49, 0xcb, - 0x0d, 0xc2, 0xc8, 0x15, 0xe5, 0x32, 0x77, 0x3e, 0xbb, 0xfd, 0x20, 0xa4, 0x51, 0x9c, 0xdc, 0x2c, - 0x7f, 0xa9, 0x84, 0xa5, 0x12, 0x78, 0x1a, 0x10, 0x99, 0x78, 0x3d, 0x60, 0x2c, 0x38, 0xa0, 0xc4, - 0x6d, 0x85, 0xc4, 0x8d, 0x22, 0x16, 0x8b, 0x6b, 0xb8, 0x3a, 0x7d, 0x55, 0x9d, 0x8a, 0xbf, 0xbc, - 0xce, 0x1e, 0x71, 0x23, 0x45, 0xce, 0xda, 0x84, 0xab, 0x9f, 0x25, 0x20, 0xef, 0xbf, 0xe8, 0xe8, - 0xd0, 0xc7, 0x1d, 0xca, 0x63, 0x7c, 0x03, 0x5e, 0xce, 0xae, 0xd9, 0x0d, 0x1b, 0x35, 0xb4, 0x80, - 0x96, 0x67, 0x9c, 0xd9, 0x2c, 0xb8, 0xdd, 0xb0, 0x7e, 0x47, 0x70, 0x6d, 0xa8, 0x9e, 0xb7, 0x58, - 0xc4, 0x29, 0x7e, 0x00, 0x90, 0xe5, 0x8a, 0xea, 0xea, 0xca, 0xa2, 0x5d, 0x2c, 0xa6, 0x9d, 0xd5, - 0x3f, 0x88, 0x1a, 0x8e, 0x56, 0x88, 0xe7, 0xe0, 0x42, 0xab, 0xcd, 0xd8, 0x5e, 0xad, 0xb2, 0x80, - 0x96, 0x67, 0x1d, 0xf9, 0x07, 0xbe, 0x0f, 0xb3, 0xe2, 0xc7, 0xee, 0x3e, 0x0d, 0x83, 0xfd, 0xb8, - 0x36, 0x29, 0xda, 0x1b, 0x5a, 0x7b, 0xa9, 0x63, 0xb7, 0x6e, 0x3f, 0x14, 0x19, 0x5b, 0x53, 0x4f, - 0x8f, 0xe6, 0x27, 0x9c, 0xaa, 0xa8, 0x92, 0x21, 0xcb, 0x1d, 0x02, 0xcf, 0x53, 0xf6, 0x9f, 0x00, - 0x64, 0xe3, 0x52, 0xe0, 0x6f, 0xda, 0x72, 0xb6, 0x76, 0x32, 0x5b, 0x5b, 0xae, 0x88, 0x9a, 0xad, - 0xbd, 0xe3, 0x06, 0x54, 0xd5, 0x3a, 0x5a, 0xa5, 0xf5, 0x0f, 0x82, 0xda, 0xf0, 0x1d, 0x4a, 0xa1, - 0x47, 0x50, 0xcd, 0x88, 0xf2, 0x1a, 0x5a, 0x98, 0x5c, 0xae, 0xae, 0xbc, 0x53, 0x26, 0xd1, 0x76, - 0x83, 0x46, 0x71, 0xb8, 0x17, 0xd2, 0x86, 0x26, 0xb6, 0xde, 0x00, 0x7f, 0x9a, 0x03, 0x5d, 0x11, - 0xa0, 0x97, 0x4e, 0x05, 0x2d, 0xc1, 0xe8, 0xa8, 0xf1, 0x5d, 0x98, 0x3e, 0xa3, 0xae, 0x2a, 0xdf, - 0xda, 0x80, 0xd7, 0x25, 0x5d, 0x91, 0x56, 0x20, 0xec, 0x6b, 0x30, 0x23, 0x5b, 0x64, 0x2b, 0xf5, - 0x92, 0x0c, 0x6c, 0x37, 0xac, 0x9f, 0x10, 0x98, 0x65, 0xe5, 0x4a, 0xb3, 0x5b, 0x70, 0x59, 0x5b, - 0xcb, 0x96, 0x1b, 0xef, 0x4b, 0xe1, 0x66, 0x9c, 0x4b, 0x59, 0x7c, 0x27, 0x09, 0x9f, 0xe7, 0xe6, - 0x78, 0xf0, 0xc6, 0xc0, 0x54, 0x25, 0xe2, 0xcf, 0x63, 0x37, 0x4e, 0xf7, 0x00, 0x6f, 0x16, 0xbe, - 0xa0, 0xad, 0xda, 0xbf, 0x47, 0xf3, 0x73, 0x3d, 0xb7, 0x79, 0x70, 0xcf, 0xca, 0x1d, 0x5b, 0x03, - 0x6f, 0xab, 0x8f, 0xc0, 0x3a, 0xe9, 0x12, 0x25, 0x88, 0x0b, 0xd7, 0xc2, 0x17, 0x9b, 0xb1, 0xab, - 0xb4, 0xe5, 0x49, 0x8a, 0x5a, 0xdb, 0x5b, 0x45, 0xd4, 0xb4, 0x65, 0xd2, 0x7a, 0x5e, 0x09, 0x8b, - 0xc2, 0xe7, 0x29, 0xe4, 0xaf, 0x08, 0xde, 0x1c, 0x24, 0x99, 0xd0, 0x8a, 0x78, 0x87, 0xff, 0x8f, - 0x62, 0xe2, 0x25, 0xb8, 0xd4, 0xa6, 0xdd, 0x90, 0x27, 0xa7, 0x51, 0xa7, 0xe9, 0xd1, 0xb6, 0x20, - 0x33, 0xe5, 0x5c, 0x4c, 0xc3, 0x8f, 0x44, 0x34, 0x97, 0xa8, 0x11, 0xd3, 0x12, 0x15, 0xf2, 0x23, - 0x04, 0x8b, 0xa7, 0x20, 0x57, 0x13, 0xda, 0x84, 0x64, 0x35, 0xe5, 0x49, 0x6e, 0x32, 0x73, 0xb6, - 0x34, 0x66, 0x3b, 0x35, 0x66, 0xfb, 0xe3, 0xa8, 0xe7, 0x5c, 0xf4, 0x73, 0x6d, 0xf2, 0x2f, 0xa6, - 0x92, 0x7f, 0x31, 0xd9, 0x68, 0x26, 0x4f, 0x1a, 0xcd, 0xd4, 0x38, 0xa3, 0x31, 0xe1, 0xfa, 0x00, - 0xbf, 0x1d, 0xb7, 0xed, 0x36, 0xd3, 0x97, 0x6c, 0x7d, 0x99, 0x3e, 0xf5, 0xa1, 0x73, 0xc5, 0x7b, - 0x1d, 0xa6, 0x5b, 0x22, 0xa2, 0xe8, 0x9a, 0x65, 0xce, 0xa6, 0xea, 0x54, 0xf6, 0xca, 0x6f, 0x33, - 0x70, 0x41, 0x74, 0xc6, 0xbf, 0x20, 0x80, 0xac, 0x3d, 0xb6, 0xcb, 0x1a, 0x14, 0x7f, 0xc2, 0x0c, - 0x32, 0x72, 0xbe, 0x44, 0x6c, 0x7d, 0xf0, 0xed, 0x9f, 0x7f, 0x7f, 0x5f, 0x59, 0xc3, 0xab, 0xe4, - 0xd4, 0x0f, 0x2f, 0x27, 0x4f, 0x72, 0x0b, 0x77, 0x88, 0x7f, 0x44, 0x50, 0xd5, 0x1c, 0x0b, 0x8f, - 0x7a, 0x7b, 0x2a, 0xa8, 0x71, 0x67, 0xf4, 0x02, 0x85, 0xf7, 0x6d, 0x81, 0x77, 0x11, 0xdf, 0x18, - 0x01, 0x2f, 0xfe, 0x03, 0xc1, 0x2b, 0x43, 0xbe, 0x8a, 0xd7, 0x4e, 0xbe, 0xb4, 0xc4, 0xc6, 0x8d, - 0xf5, 0xb3, 0x96, 0x29, 0xc4, 0x1f, 0x0a, 0xc4, 0x77, 0xf1, 0x7a, 0x29, 0x62, 0xb9, 0xea, 0x79, - 0xa1, 0xd3, 0xf5, 0x3f, 0xc4, 0xcf, 0x11, 0x5c, 0x29, 0xf4, 0x43, 0xfc, 0xfe, 0x88, 0xea, 0x0d, - 0x1b, 0xb5, 0x71, 0x6f, 0x9c, 0x52, 0x45, 0xe8, 0xa1, 0x20, 0xb4, 0x85, 0x3f, 0x1a, 0x63, 0x65, - 0x88, 0xee, 0xd6, 0xf8, 0x87, 0x0a, 0xd4, 0xca, 0xbc, 0x04, 0x6f, 0x8c, 0x0a, 0xb1, 0xc8, 0x3c, - 0x8d, 0xcd, 0x31, 0xab, 0x15, 0xc7, 0x6f, 0x04, 0xc7, 0x1e, 0xfe, 0x7a, 0x2c, 0x8e, 0x79, 0xeb, - 0x23, 0xa9, 0x8d, 0x92, 0x27, 0x03, 0x86, 0x7c, 0x48, 0xa4, 0x5b, 0x69, 0x07, 0x32, 0x70, 0x88, - 0x7f, 0x46, 0x70, 0x79, 0xd0, 0x66, 0xf0, 0xbb, 0x23, 0x92, 0xca, 0xb9, 0x96, 0xb1, 0x76, 0xc6, - 0x2a, 0x25, 0xc1, 0x4d, 0x21, 0xc1, 0x02, 0x36, 0xcb, 0x24, 0x90, 0xde, 0xb5, 0xf5, 0xc5, 0xd3, - 0xbe, 0x89, 0x9e, 0xf5, 0x4d, 0xf4, 0x57, 0xdf, 0x44, 0xdf, 0x1d, 0x9b, 0x13, 0xcf, 0x8e, 0xcd, - 0x89, 0xe7, 0xc7, 0xe6, 0xc4, 0x57, 0x1b, 0x41, 0x18, 0xef, 0x77, 0x3c, 0xdb, 0x67, 0x4d, 0xa2, - 0xfe, 0x47, 0x08, 0x3d, 0xff, 0x76, 0xc0, 0x48, 0xf7, 0x3d, 0xd2, 0x64, 0x8d, 0xce, 0x01, 0xe5, - 0xb2, 0xf1, 0x9d, 0xd5, 0xdb, 0x5a, 0xef, 0xb8, 0xd7, 0xa2, 0xdc, 0x9b, 0x16, 0x9f, 0x88, 0xd5, - 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x8e, 0x40, 0x19, 0x02, 0xb1, 0x0c, 0x00, 0x00, + // 935 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x41, 0x6f, 0xdc, 0x44, + 0x14, 0xce, 0x6c, 0xd2, 0x88, 0xbc, 0x0d, 0x6d, 0x19, 0xa5, 0xed, 0x62, 0x8a, 0x1b, 0x5c, 0xd2, + 0xa4, 0x40, 0x67, 0xba, 0x09, 0x09, 0x05, 0x12, 0x04, 0xa9, 0x0a, 0xc9, 0xa5, 0x0a, 0x46, 0x02, + 0x89, 0x4b, 0x64, 0x7b, 0x27, 0x8e, 0xa5, 0xac, 0x67, 0xbb, 0xe3, 0x5d, 0x14, 0x55, 0x11, 0x12, + 0xbf, 0x00, 0x89, 0x0b, 0x97, 0x5e, 0x41, 0xe2, 0x1f, 0x20, 0x6e, 0x9c, 0x7a, 0xac, 0xc4, 0xa5, + 0xa7, 0x0a, 0x25, 0x5c, 0xf9, 0x0f, 0x95, 0x67, 0xc6, 0xf5, 0x78, 0x77, 0x9d, 0xec, 0xae, 0x94, + 0x9b, 0xf7, 0xcd, 0x7b, 0x6f, 0xbe, 0xef, 0x7b, 0xcf, 0x9f, 0x17, 0x9c, 0xc8, 0x0f, 0x68, 0xc0, + 0xdb, 0x8c, 0x06, 0x3c, 0x8e, 0x59, 0x90, 0x44, 0x3c, 0xa6, 0xdd, 0x3a, 0x7d, 0xd4, 0x61, 0xed, + 0x43, 0xd2, 0x6a, 0xf3, 0x84, 0xe3, 0xab, 0x91, 0x1f, 0x90, 0x34, 0x87, 0xe4, 0x39, 0xa4, 0x5b, + 0xb7, 0xe6, 0x42, 0x1e, 0x72, 0x99, 0x42, 0xd3, 0x27, 0x95, 0x6d, 0xbd, 0x17, 0x70, 0xd1, 0xe4, + 0x82, 0xfa, 0x9e, 0x60, 0xaa, 0x0d, 0xed, 0xd6, 0x7d, 0x96, 0x78, 0x75, 0xda, 0xf2, 0xc2, 0x28, + 0xf6, 0x64, 0xb9, 0xca, 0xbd, 0x91, 0xdf, 0x7e, 0x10, 0xb1, 0x38, 0x49, 0x6f, 0x56, 0x4f, 0x3a, + 0x61, 0xb1, 0x04, 0x9e, 0x01, 0x44, 0x25, 0x5e, 0x0f, 0x39, 0x0f, 0x0f, 0x18, 0xf5, 0x5a, 0x11, + 0xf5, 0xe2, 0x98, 0x27, 0xf2, 0x1a, 0xa1, 0x4f, 0xdf, 0xd4, 0xa7, 0xf2, 0x97, 0xdf, 0xd9, 0xa3, + 0x5e, 0xac, 0xc9, 0x39, 0x1b, 0x70, 0xf5, 0xeb, 0x14, 0xe4, 0xfd, 0x57, 0x1d, 0x5d, 0xf6, 0xa8, + 0xc3, 0x44, 0x82, 0x6f, 0xc2, 0xeb, 0xf9, 0x35, 0xbb, 0x51, 0xa3, 0x86, 0xe6, 0xd1, 0xd2, 0x8c, + 0x3b, 0x9b, 0x07, 0xb7, 0x1b, 0xce, 0x5f, 0x08, 0xae, 0xf5, 0xd5, 0x8b, 0x16, 0x8f, 0x05, 0xc3, + 0x0f, 0x00, 0xf2, 0x5c, 0x59, 0x5d, 0x5d, 0x5e, 0x20, 0x83, 0xc5, 0x24, 0x79, 0xfd, 0x83, 0xb8, + 0xe1, 0x1a, 0x85, 0x78, 0x0e, 0x2e, 0xb4, 0xda, 0x9c, 0xef, 0xd5, 0x2a, 0xf3, 0x68, 0x69, 0xd6, + 0x55, 0x3f, 0xf0, 0x7d, 0x98, 0x95, 0x0f, 0xbb, 0xfb, 0x2c, 0x0a, 0xf7, 0x93, 0xda, 0xa4, 0x6c, + 0x6f, 0x19, 0xed, 0x95, 0x8e, 0xdd, 0x3a, 0xd9, 0x92, 0x19, 0x9b, 0x53, 0x4f, 0x5f, 0xdc, 0x98, + 0x70, 0xab, 0xb2, 0x4a, 0x85, 0x1c, 0xaf, 0x0f, 0xbc, 0xc8, 0xd8, 0x7f, 0x09, 0x90, 0x8f, 0x4b, + 0x83, 0xbf, 0x45, 0xd4, 0x6c, 0x49, 0x3a, 0x5b, 0xa2, 0x56, 0x44, 0xcf, 0x96, 0xec, 0x78, 0x21, + 0xd3, 0xb5, 0xae, 0x51, 0xe9, 0xfc, 0x8f, 0xa0, 0xd6, 0x7f, 0x87, 0x56, 0xe8, 0x21, 0x54, 0x73, + 0xa2, 0xa2, 0x86, 0xe6, 0x27, 0x97, 0xaa, 0xcb, 0x1f, 0x94, 0x49, 0xb4, 0xdd, 0x60, 0x71, 0x12, + 0xed, 0x45, 0xac, 0x61, 0x88, 0x6d, 0x36, 0xc0, 0x5f, 0x15, 0x40, 0x57, 0x24, 0xe8, 0xc5, 0x33, + 0x41, 0x2b, 0x30, 0x26, 0x6a, 0x7c, 0x0f, 0xa6, 0x47, 0xd4, 0x55, 0xe7, 0x3b, 0xeb, 0xf0, 0xb6, + 0xa2, 0x2b, 0xd3, 0x06, 0x08, 0xfb, 0x16, 0xcc, 0xa8, 0x16, 0xf9, 0x4a, 0xbd, 0xa6, 0x02, 0xdb, + 0x0d, 0xe7, 0x37, 0x04, 0x76, 0x59, 0xb9, 0xd6, 0xec, 0x36, 0x5c, 0x36, 0xd6, 0xb2, 0xe5, 0x25, + 0xfb, 0x4a, 0xb8, 0x19, 0xf7, 0x52, 0x1e, 0xdf, 0x49, 0xc3, 0xe7, 0xb9, 0x39, 0x5b, 0xf0, 0x4e, + 0xcf, 0x54, 0x15, 0xe2, 0x6f, 0x12, 0x2f, 0x61, 0x23, 0xbd, 0x41, 0xc7, 0x08, 0x9c, 0xd3, 0x5a, + 0x69, 0xda, 0x1e, 0x5c, 0x8b, 0x5e, 0xcd, 0x7f, 0x57, 0x2b, 0x28, 0xd2, 0x14, 0xbd, 0x9c, 0xb7, + 0x07, 0x11, 0x30, 0x56, 0xc6, 0xe8, 0x79, 0x25, 0x1a, 0x14, 0x3e, 0x4f, 0xb9, 0x9e, 0x20, 0x78, + 0xb7, 0x97, 0x64, 0x4a, 0x2b, 0x16, 0x1d, 0x31, 0xb2, 0x64, 0x78, 0x11, 0x2e, 0xb5, 0x59, 0x37, + 0x12, 0x69, 0x4a, 0xdc, 0x69, 0xfa, 0xac, 0x2d, 0x21, 0x4f, 0xb9, 0x17, 0xb3, 0xf0, 0x43, 0x19, + 0x2d, 0x24, 0x1a, 0xf0, 0x8d, 0x44, 0x8d, 0xef, 0x05, 0x82, 0x85, 0x33, 0xf0, 0xe9, 0x39, 0x6c, + 0x40, 0xba, 0x66, 0xea, 0xa4, 0xa0, 0xff, 0x1c, 0x51, 0x26, 0x4b, 0x32, 0x93, 0x25, 0x5f, 0xc4, + 0x87, 0xee, 0xc5, 0xa0, 0xd0, 0xa6, 0xb8, 0xfd, 0x95, 0xe2, 0xf6, 0xe7, 0x03, 0x98, 0x3c, 0x6d, + 0x00, 0x53, 0xe3, 0x0c, 0xc0, 0x86, 0xeb, 0x3d, 0xfc, 0x76, 0xbc, 0xb6, 0xd7, 0xcc, 0xde, 0x4a, + 0xe7, 0xbb, 0xec, 0xb5, 0xed, 0x3b, 0xd7, 0xbc, 0xd7, 0x60, 0xba, 0x25, 0x23, 0x9a, 0xae, 0x5d, + 0xe6, 0x52, 0xba, 0x4e, 0x67, 0x2f, 0xff, 0x39, 0x03, 0x17, 0x64, 0x67, 0xfc, 0x07, 0x02, 0xc8, + 0xdb, 0x63, 0x52, 0xd6, 0x60, 0xf0, 0xe7, 0xc8, 0xa2, 0x43, 0xe7, 0x2b, 0xc4, 0xce, 0xa7, 0x3f, + 0xfd, 0xf3, 0xdf, 0x2f, 0x95, 0x55, 0xbc, 0x42, 0xcf, 0xfc, 0x88, 0x0a, 0xfa, 0xb8, 0xb0, 0x75, + 0x47, 0xf8, 0x09, 0x82, 0xaa, 0xe1, 0x3e, 0x78, 0xd8, 0xdb, 0x33, 0x41, 0xad, 0xbb, 0xc3, 0x17, + 0x68, 0xbc, 0xef, 0x4b, 0xbc, 0x0b, 0xf8, 0xe6, 0x10, 0x78, 0xf1, 0xdf, 0x08, 0xde, 0xe8, 0xf3, + 0x48, 0xbc, 0x7a, 0xfa, 0xa5, 0x25, 0x96, 0x6c, 0xad, 0x8d, 0x5a, 0xa6, 0x11, 0x7f, 0x26, 0x11, + 0xdf, 0xc3, 0x6b, 0xa5, 0x88, 0xd5, 0xaa, 0x17, 0x85, 0xce, 0xd6, 0xff, 0x08, 0x3f, 0x47, 0x70, + 0x65, 0xa0, 0xeb, 0xe1, 0x8f, 0x87, 0x54, 0xaf, 0xdf, 0x74, 0xad, 0x4f, 0xc6, 0x29, 0xd5, 0x84, + 0xb6, 0x24, 0xa1, 0x4d, 0xfc, 0xf9, 0x18, 0x2b, 0x43, 0x4d, 0x4f, 0xc6, 0xbf, 0x56, 0xa0, 0x56, + 0xe6, 0x25, 0x78, 0x7d, 0x58, 0x88, 0x83, 0x2c, 0xd2, 0xda, 0x18, 0xb3, 0x5a, 0x73, 0xfc, 0x51, + 0x72, 0x3c, 0xc4, 0x3f, 0x8c, 0xc5, 0xb1, 0x68, 0x7d, 0x34, 0xb3, 0x51, 0xfa, 0xb8, 0xc7, 0x90, + 0x8f, 0xa8, 0x72, 0x2b, 0xe3, 0x40, 0x05, 0x8e, 0xf0, 0xef, 0x08, 0x2e, 0xf7, 0xda, 0x0c, 0xfe, + 0x70, 0x48, 0x52, 0x05, 0xd7, 0xb2, 0x56, 0x47, 0xac, 0xd2, 0x12, 0xdc, 0x92, 0x12, 0xcc, 0x63, + 0xbb, 0x4c, 0x02, 0xe5, 0x5d, 0x9b, 0xdf, 0x3e, 0x3d, 0xb6, 0xd1, 0xb3, 0x63, 0x1b, 0xfd, 0x7b, + 0x6c, 0xa3, 0x9f, 0x4f, 0xec, 0x89, 0x67, 0x27, 0xf6, 0xc4, 0xf3, 0x13, 0x7b, 0xe2, 0xfb, 0xf5, + 0x30, 0x4a, 0xf6, 0x3b, 0x3e, 0x09, 0x78, 0x93, 0xea, 0xff, 0xfb, 0x91, 0x1f, 0xdc, 0x09, 0x39, + 0xed, 0x7e, 0x44, 0x9b, 0xbc, 0xd1, 0x39, 0x60, 0x42, 0x35, 0xbe, 0xbb, 0x72, 0xc7, 0xe8, 0x9d, + 0x1c, 0xb6, 0x98, 0xf0, 0xa7, 0xe5, 0x27, 0x62, 0xe5, 0x65, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf9, + 0x35, 0x5d, 0x16, 0x7d, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/core/03-connection/types/tx.pb.go b/modules/core/03-connection/types/tx.pb.go index acfeff2341d..6d3d80ca3b6 100644 --- a/modules/core/03-connection/types/tx.pb.go +++ b/modules/core/03-connection/types/tx.pb.go @@ -33,10 +33,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgConnectionOpenInit defines the msg sent by an account on Chain A to // initialize a connection with Chain B. type MsgConnectionOpenInit struct { - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` Counterparty Counterparty `protobuf:"bytes,2,opt,name=counterparty,proto3" json:"counterparty"` Version *Version `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` - DelayPeriod uint64 `protobuf:"varint,4,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty" yaml:"delay_period"` + DelayPeriod uint64 `protobuf:"varint,4,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty"` Signer string `protobuf:"bytes,5,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -114,22 +114,22 @@ var xxx_messageInfo_MsgConnectionOpenInitResponse proto.InternalMessageInfo // MsgConnectionOpenTry defines a msg sent by a Relayer to try to open a // connection on Chain B. type MsgConnectionOpenTry struct { - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // Deprecated: this field is unused. Crossing hellos are no longer supported in core IBC. - PreviousConnectionId string `protobuf:"bytes,2,opt,name=previous_connection_id,json=previousConnectionId,proto3" json:"previous_connection_id,omitempty" yaml:"previous_connection_id"` // Deprecated: Do not use. - ClientState *types.Any `protobuf:"bytes,3,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"` + PreviousConnectionId string `protobuf:"bytes,2,opt,name=previous_connection_id,json=previousConnectionId,proto3" json:"previous_connection_id,omitempty"` // Deprecated: Do not use. + ClientState *types.Any `protobuf:"bytes,3,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"` Counterparty Counterparty `protobuf:"bytes,4,opt,name=counterparty,proto3" json:"counterparty"` - DelayPeriod uint64 `protobuf:"varint,5,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty" yaml:"delay_period"` - CounterpartyVersions []*Version `protobuf:"bytes,6,rep,name=counterparty_versions,json=counterpartyVersions,proto3" json:"counterparty_versions,omitempty" yaml:"counterparty_versions"` - ProofHeight types1.Height `protobuf:"bytes,7,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"` + DelayPeriod uint64 `protobuf:"varint,5,opt,name=delay_period,json=delayPeriod,proto3" json:"delay_period,omitempty"` + CounterpartyVersions []*Version `protobuf:"bytes,6,rep,name=counterparty_versions,json=counterpartyVersions,proto3" json:"counterparty_versions,omitempty"` + ProofHeight types1.Height `protobuf:"bytes,7,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` // proof of the initialization the connection on Chain A: `UNITIALIZED -> // INIT` - ProofInit []byte `protobuf:"bytes,8,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty" yaml:"proof_init"` + ProofInit []byte `protobuf:"bytes,8,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty"` // proof of client state included in message - ProofClient []byte `protobuf:"bytes,9,opt,name=proof_client,json=proofClient,proto3" json:"proof_client,omitempty" yaml:"proof_client"` + ProofClient []byte `protobuf:"bytes,9,opt,name=proof_client,json=proofClient,proto3" json:"proof_client,omitempty"` // proof of client consensus state - ProofConsensus []byte `protobuf:"bytes,10,opt,name=proof_consensus,json=proofConsensus,proto3" json:"proof_consensus,omitempty" yaml:"proof_consensus"` - ConsensusHeight types1.Height `protobuf:"bytes,11,opt,name=consensus_height,json=consensusHeight,proto3" json:"consensus_height" yaml:"consensus_height"` + ProofConsensus []byte `protobuf:"bytes,10,opt,name=proof_consensus,json=proofConsensus,proto3" json:"proof_consensus,omitempty"` + ConsensusHeight types1.Height `protobuf:"bytes,11,opt,name=consensus_height,json=consensusHeight,proto3" json:"consensus_height"` Signer string `protobuf:"bytes,12,opt,name=signer,proto3" json:"signer,omitempty"` // optional proof data for host state machines that are unable to introspect their own consensus state HostConsensusStateProof []byte `protobuf:"bytes,13,opt,name=host_consensus_state_proof,json=hostConsensusStateProof,proto3" json:"host_consensus_state_proof,omitempty"` @@ -208,19 +208,19 @@ var xxx_messageInfo_MsgConnectionOpenTryResponse proto.InternalMessageInfo // MsgConnectionOpenAck defines a msg sent by a Relayer to Chain A to // acknowledge the change of connection state to TRYOPEN on Chain B. type MsgConnectionOpenAck struct { - ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` - CounterpartyConnectionId string `protobuf:"bytes,2,opt,name=counterparty_connection_id,json=counterpartyConnectionId,proto3" json:"counterparty_connection_id,omitempty" yaml:"counterparty_connection_id"` + ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` + CounterpartyConnectionId string `protobuf:"bytes,2,opt,name=counterparty_connection_id,json=counterpartyConnectionId,proto3" json:"counterparty_connection_id,omitempty"` Version *Version `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"` - ClientState *types.Any `protobuf:"bytes,4,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty" yaml:"client_state"` - ProofHeight types1.Height `protobuf:"bytes,5,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"` + ClientState *types.Any `protobuf:"bytes,4,opt,name=client_state,json=clientState,proto3" json:"client_state,omitempty"` + ProofHeight types1.Height `protobuf:"bytes,5,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` // proof of the initialization the connection on Chain B: `UNITIALIZED -> // TRYOPEN` - ProofTry []byte `protobuf:"bytes,6,opt,name=proof_try,json=proofTry,proto3" json:"proof_try,omitempty" yaml:"proof_try"` + ProofTry []byte `protobuf:"bytes,6,opt,name=proof_try,json=proofTry,proto3" json:"proof_try,omitempty"` // proof of client state included in message - ProofClient []byte `protobuf:"bytes,7,opt,name=proof_client,json=proofClient,proto3" json:"proof_client,omitempty" yaml:"proof_client"` + ProofClient []byte `protobuf:"bytes,7,opt,name=proof_client,json=proofClient,proto3" json:"proof_client,omitempty"` // proof of client consensus state - ProofConsensus []byte `protobuf:"bytes,8,opt,name=proof_consensus,json=proofConsensus,proto3" json:"proof_consensus,omitempty" yaml:"proof_consensus"` - ConsensusHeight types1.Height `protobuf:"bytes,9,opt,name=consensus_height,json=consensusHeight,proto3" json:"consensus_height" yaml:"consensus_height"` + ProofConsensus []byte `protobuf:"bytes,8,opt,name=proof_consensus,json=proofConsensus,proto3" json:"proof_consensus,omitempty"` + ConsensusHeight types1.Height `protobuf:"bytes,9,opt,name=consensus_height,json=consensusHeight,proto3" json:"consensus_height"` Signer string `protobuf:"bytes,10,opt,name=signer,proto3" json:"signer,omitempty"` // optional proof data for host state machines that are unable to introspect their own consensus state HostConsensusStateProof []byte `protobuf:"bytes,11,opt,name=host_consensus_state_proof,json=hostConsensusStateProof,proto3" json:"host_consensus_state_proof,omitempty"` @@ -299,10 +299,10 @@ var xxx_messageInfo_MsgConnectionOpenAckResponse proto.InternalMessageInfo // MsgConnectionOpenConfirm defines a msg sent by a Relayer to Chain B to // acknowledge the change of connection state to OPEN on Chain A. type MsgConnectionOpenConfirm struct { - ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty" yaml:"connection_id"` + ConnectionId string `protobuf:"bytes,1,opt,name=connection_id,json=connectionId,proto3" json:"connection_id,omitempty"` // proof for the change of the connection state on Chain A: `INIT -> OPEN` - ProofAck []byte `protobuf:"bytes,2,opt,name=proof_ack,json=proofAck,proto3" json:"proof_ack,omitempty" yaml:"proof_ack"` - ProofHeight types1.Height `protobuf:"bytes,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"` + ProofAck []byte `protobuf:"bytes,2,opt,name=proof_ack,json=proofAck,proto3" json:"proof_ack,omitempty"` + ProofHeight types1.Height `protobuf:"bytes,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` Signer string `protobuf:"bytes,4,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -391,68 +391,60 @@ func init() { func init() { proto.RegisterFile("ibc/core/connection/v1/tx.proto", fileDescriptor_5d00fde5fc97399e) } var fileDescriptor_5d00fde5fc97399e = []byte{ - // 965 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x31, 0x73, 0xe3, 0x44, - 0x14, 0xb6, 0x62, 0xc7, 0xb1, 0xd7, 0x3e, 0xee, 0x6e, 0x71, 0x12, 0x21, 0xee, 0x2c, 0x23, 0x60, - 0x48, 0x41, 0xa4, 0xf3, 0xdd, 0x31, 0x40, 0x80, 0x22, 0x76, 0x43, 0x8a, 0x83, 0x8c, 0xb8, 0xb9, - 0x19, 0xae, 0xf1, 0xd8, 0xf2, 0x46, 0xd9, 0xb1, 0xad, 0xf5, 0x68, 0x65, 0x83, 0x68, 0x69, 0x18, - 0x2a, 0x7e, 0x01, 0x73, 0xff, 0x81, 0x3f, 0x71, 0x65, 0x0a, 0x0a, 0x2a, 0x0d, 0x93, 0x34, 0xd4, - 0xee, 0xe8, 0x98, 0xdd, 0x95, 0xe4, 0xb5, 0x23, 0x0f, 0x31, 0x0e, 0x9d, 0x9e, 0xde, 0xf7, 0xde, - 0xdb, 0xf7, 0xf6, 0xfb, 0xde, 0x48, 0x40, 0xc7, 0x3d, 0xc7, 0x72, 0x88, 0x8f, 0x2c, 0x87, 0x78, - 0x1e, 0x72, 0x02, 0x4c, 0x3c, 0x6b, 0xda, 0xb4, 0x82, 0xef, 0xcd, 0xb1, 0x4f, 0x02, 0x02, 0xf7, - 0x70, 0xcf, 0x31, 0x19, 0xc0, 0x9c, 0x03, 0xcc, 0x69, 0x53, 0xab, 0xb9, 0xc4, 0x25, 0x1c, 0x62, - 0xb1, 0x27, 0x81, 0xd6, 0xde, 0x72, 0x09, 0x71, 0x87, 0xc8, 0xe2, 0x56, 0x6f, 0x72, 0x66, 0x75, - 0xbd, 0x30, 0x76, 0x49, 0x95, 0x86, 0x18, 0x79, 0x01, 0xab, 0x22, 0x9e, 0x62, 0xc0, 0x07, 0x2b, - 0x8e, 0x22, 0xd5, 0xe5, 0x40, 0xe3, 0xb7, 0x2d, 0xb0, 0xfb, 0x8c, 0xba, 0xed, 0xf4, 0xfd, 0xd7, - 0x63, 0xe4, 0x9d, 0x78, 0x38, 0x80, 0x4d, 0x50, 0x16, 0x29, 0x3b, 0xb8, 0xaf, 0x2a, 0x0d, 0xe5, - 0xa0, 0xdc, 0xaa, 0xcd, 0x22, 0xfd, 0x5e, 0xd8, 0x1d, 0x0d, 0x8f, 0x8c, 0xd4, 0x65, 0xd8, 0x25, - 0xf1, 0x7c, 0xd2, 0x87, 0x5f, 0x81, 0xaa, 0x43, 0x26, 0x5e, 0x80, 0xfc, 0x71, 0xd7, 0x0f, 0x42, - 0x75, 0xab, 0xa1, 0x1c, 0x54, 0x1e, 0xbf, 0x67, 0x66, 0xb7, 0x6d, 0xb6, 0x25, 0x6c, 0xab, 0xf0, - 0x3a, 0xd2, 0x73, 0xf6, 0x42, 0x3c, 0xfc, 0x14, 0xec, 0x4c, 0x91, 0x4f, 0x31, 0xf1, 0xd4, 0x3c, - 0x4f, 0xa5, 0xaf, 0x4a, 0xf5, 0x42, 0xc0, 0xec, 0x04, 0x0f, 0x8f, 0x40, 0xb5, 0x8f, 0x86, 0xdd, - 0xb0, 0x33, 0x46, 0x3e, 0x26, 0x7d, 0xb5, 0xd0, 0x50, 0x0e, 0x0a, 0xad, 0xfd, 0x59, 0xa4, 0xbf, - 0x29, 0x1a, 0x90, 0xbd, 0x86, 0x5d, 0xe1, 0xe6, 0x29, 0xb7, 0xe0, 0x1e, 0x28, 0x52, 0xec, 0x7a, - 0xc8, 0x57, 0xb7, 0x59, 0xdb, 0x76, 0x6c, 0x1d, 0x95, 0x7e, 0x7a, 0xa5, 0xe7, 0xfe, 0x7a, 0xa5, - 0xe7, 0x0c, 0x1d, 0x3c, 0xcc, 0x1c, 0x9a, 0x8d, 0xe8, 0x98, 0x78, 0x14, 0x19, 0xbf, 0xef, 0x80, - 0xda, 0x35, 0xc4, 0x73, 0x3f, 0xfc, 0x2f, 0x53, 0xfd, 0x16, 0xec, 0x8d, 0x7d, 0x34, 0xc5, 0x64, - 0x42, 0x3b, 0xf3, 0xae, 0x59, 0xfc, 0x16, 0x8f, 0x7f, 0x77, 0x16, 0xe9, 0x0f, 0x45, 0x7c, 0x36, - 0xce, 0x50, 0x15, 0xbb, 0x96, 0xb8, 0xe6, 0x47, 0x3a, 0xe9, 0xc3, 0x53, 0x50, 0x8d, 0x4b, 0xd2, - 0xa0, 0x1b, 0xa0, 0x78, 0xca, 0x35, 0x53, 0x30, 0xcf, 0x4c, 0x98, 0x67, 0x1e, 0x7b, 0xa1, 0x3c, - 0x3b, 0x39, 0xc6, 0xb0, 0x2b, 0xc2, 0xfc, 0x86, 0x59, 0xd7, 0x28, 0x50, 0xd8, 0x90, 0x02, 0xcb, - 0xf7, 0xb8, 0xbd, 0xc6, 0x3d, 0x4e, 0xc1, 0xae, 0x9c, 0xab, 0x13, 0x73, 0x83, 0xaa, 0xc5, 0x46, - 0xfe, 0x06, 0x64, 0x6a, 0x35, 0x66, 0x91, 0xfe, 0x20, 0xee, 0x38, 0x2b, 0x8f, 0x61, 0xd7, 0xe4, - 0xf7, 0x71, 0x18, 0x85, 0x2f, 0x41, 0x75, 0xec, 0x13, 0x72, 0xd6, 0x39, 0x47, 0xd8, 0x3d, 0x0f, - 0xd4, 0x1d, 0x3e, 0x03, 0x4d, 0x2a, 0x27, 0xa4, 0x3a, 0x6d, 0x9a, 0x5f, 0x72, 0x44, 0xeb, 0x6d, - 0xd6, 0xf9, 0xbc, 0x27, 0x39, 0xda, 0xb0, 0x2b, 0xdc, 0x14, 0x48, 0xf8, 0x14, 0x00, 0xe1, 0xc5, - 0x1e, 0x0e, 0xd4, 0x52, 0x43, 0x39, 0xa8, 0xb6, 0x76, 0x67, 0x91, 0x7e, 0x5f, 0x8e, 0x64, 0x3e, - 0xc3, 0x2e, 0x73, 0x83, 0x6b, 0xf9, 0x28, 0x39, 0x91, 0xa8, 0xac, 0x96, 0x79, 0xdc, 0xfe, 0x72, - 0x45, 0xe1, 0x4d, 0x2a, 0xb6, 0xb9, 0x05, 0xdb, 0xe0, 0x6e, 0xec, 0x65, 0xcc, 0xf6, 0xe8, 0x84, - 0xaa, 0x80, 0x87, 0x6b, 0xb3, 0x48, 0xdf, 0x5b, 0x08, 0x4f, 0x00, 0x86, 0xfd, 0x86, 0xc8, 0x90, - 0xbc, 0x80, 0x67, 0xe0, 0x5e, 0xea, 0x4d, 0xc6, 0x52, 0xf9, 0xd7, 0xb1, 0xe8, 0xf1, 0x58, 0xf6, - 0x93, 0x4b, 0x58, 0xcc, 0x60, 0xd8, 0x77, 0xd3, 0x57, 0xf1, 0x78, 0xe6, 0xd2, 0xad, 0xca, 0xd2, - 0x85, 0x9f, 0x01, 0xed, 0x9c, 0xd0, 0x60, 0x7e, 0x44, 0x41, 0xde, 0x0e, 0x3f, 0xa6, 0x7a, 0x87, - 0xf5, 0x63, 0xef, 0x33, 0x44, 0x7a, 0x64, 0x4e, 0xe7, 0x53, 0xe6, 0x96, 0x74, 0x5f, 0x07, 0x0f, - 0xb2, 0x54, 0x9d, 0xca, 0xfe, 0xd7, 0x62, 0x86, 0xec, 0x8f, 0x9d, 0x01, 0xfc, 0x02, 0xdc, 0x59, - 0x94, 0xae, 0x90, 0xbe, 0x3a, 0x8b, 0xf4, 0x5a, 0xda, 0x9c, 0xa4, 0x58, 0xa6, 0x02, 0x49, 0xa7, - 0x0e, 0xd0, 0x16, 0x18, 0x98, 0xb5, 0x06, 0xde, 0x9f, 0x45, 0xfa, 0x3b, 0x19, 0x6c, 0x5d, 0x4a, - 0xac, 0xca, 0xce, 0x85, 0x65, 0xb0, 0xc1, 0xb6, 0x5d, 0xde, 0x23, 0x85, 0x8d, 0xf7, 0xc8, 0xb2, - 0x86, 0xb6, 0x6f, 0x51, 0x43, 0x4d, 0x20, 0xa4, 0xd1, 0x09, 0xfc, 0x50, 0x2d, 0x72, 0x2e, 0x4b, - 0x3b, 0x38, 0x75, 0x19, 0x76, 0x89, 0x3f, 0xb3, 0xb5, 0xbd, 0x2c, 0xa0, 0x9d, 0xcd, 0x04, 0x54, - 0xba, 0x15, 0x01, 0x95, 0xff, 0x57, 0x01, 0x81, 0x35, 0x04, 0x54, 0xd9, 0x44, 0x40, 0xc7, 0xce, - 0x20, 0x15, 0xd0, 0xcf, 0x5b, 0x40, 0xbd, 0x06, 0x68, 0x13, 0xef, 0x0c, 0xfb, 0xa3, 0x4d, 0x45, - 0x94, 0x5e, 0x7b, 0xd7, 0x19, 0x70, 0xcd, 0x64, 0x5c, 0x7b, 0xd7, 0x19, 0x24, 0xd7, 0xce, 0x64, - 0xbb, 0xcc, 0xc2, 0xfc, 0x2d, 0xb2, 0x70, 0x3e, 0xe9, 0xc2, 0x8a, 0xaf, 0x0c, 0x03, 0x34, 0x56, - 0xcd, 0x22, 0x19, 0xd8, 0xe3, 0xbf, 0xf3, 0x20, 0xff, 0x8c, 0xba, 0xf0, 0x07, 0x00, 0x33, 0xbe, - 0xe1, 0x0e, 0x57, 0x29, 0x38, 0xf3, 0xeb, 0x45, 0xfb, 0x68, 0x2d, 0x78, 0x72, 0x06, 0xf8, 0x1d, - 0xb8, 0x7f, 0xfd, 0x43, 0xe7, 0xc3, 0x1b, 0xe7, 0x7a, 0xee, 0x87, 0xda, 0xd3, 0x75, 0xd0, 0xab, - 0x0b, 0xb3, 0x3b, 0xbb, 0x79, 0xe1, 0x63, 0x67, 0xb0, 0x46, 0x61, 0x89, 0xa6, 0xf0, 0x47, 0x05, - 0xec, 0x66, 0x73, 0xf4, 0xd1, 0x8d, 0xf3, 0xc5, 0x11, 0xda, 0x27, 0xeb, 0x46, 0x24, 0xa7, 0x68, - 0xbd, 0x78, 0x7d, 0x59, 0x57, 0x2e, 0x2e, 0xeb, 0xca, 0x9f, 0x97, 0x75, 0xe5, 0x97, 0xab, 0x7a, - 0xee, 0xe2, 0xaa, 0x9e, 0xfb, 0xe3, 0xaa, 0x9e, 0x7b, 0xf9, 0xb9, 0x8b, 0x83, 0xf3, 0x49, 0xcf, - 0x74, 0xc8, 0xc8, 0x72, 0x08, 0x1d, 0x11, 0x6a, 0xe1, 0x9e, 0x73, 0xe8, 0x12, 0x6b, 0xfa, 0xb1, - 0x35, 0x22, 0xfd, 0xc9, 0x10, 0x51, 0xf1, 0x7b, 0xf0, 0xe8, 0xc9, 0xa1, 0xf4, 0x87, 0x10, 0x84, - 0x63, 0x44, 0x7b, 0x45, 0xbe, 0xaf, 0x9f, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0x40, 0xa4, 0x36, - 0x0d, 0xd0, 0x0c, 0x00, 0x00, + // 833 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0x4d, 0x6f, 0xda, 0x48, + 0x18, 0xc7, 0x71, 0x78, 0x09, 0x0c, 0x64, 0xb3, 0x3b, 0x22, 0x59, 0xaf, 0xb3, 0x01, 0xc2, 0xae, + 0x14, 0x0e, 0x1b, 0x3b, 0x2f, 0xbb, 0x4a, 0x76, 0x37, 0x17, 0xc2, 0xa5, 0x51, 0x95, 0x36, 0x72, + 0xa3, 0x1c, 0x7a, 0x41, 0x60, 0x26, 0x66, 0x04, 0x78, 0x2c, 0x8f, 0xa1, 0x75, 0xaf, 0xed, 0xa1, + 0xc7, 0x7e, 0x84, 0x7c, 0x97, 0x1e, 0x1a, 0xa9, 0x97, 0x1c, 0x7b, 0xaa, 0xaa, 0xe4, 0xd2, 0xaf, + 0xd0, 0x5b, 0xe5, 0x19, 0x1b, 0x0c, 0x98, 0xca, 0x84, 0x9b, 0xfd, 0xf8, 0xff, 0xbc, 0xff, 0xec, + 0x31, 0x28, 0xe2, 0xa6, 0xa6, 0x68, 0xc4, 0x42, 0x8a, 0x46, 0x0c, 0x03, 0x69, 0x36, 0x26, 0x86, + 0x32, 0xd8, 0x53, 0xec, 0x97, 0xb2, 0x69, 0x11, 0x9b, 0xc0, 0x75, 0xdc, 0xd4, 0x64, 0x57, 0x20, + 0x8f, 0x04, 0xf2, 0x60, 0x4f, 0xca, 0xeb, 0x44, 0x27, 0x4c, 0xa2, 0xb8, 0x57, 0x5c, 0x2d, 0xfd, + 0xa6, 0x13, 0xa2, 0x77, 0x91, 0xc2, 0xee, 0x9a, 0xfd, 0x2b, 0xa5, 0x61, 0x38, 0xde, 0xa3, 0x40, + 0xa6, 0x2e, 0x46, 0x86, 0xed, 0x66, 0xe1, 0x57, 0x9e, 0x60, 0x7b, 0x46, 0x29, 0x81, 0xbc, 0x4c, + 0x58, 0x7e, 0xb3, 0x04, 0xd6, 0xce, 0xa8, 0x5e, 0x1b, 0xda, 0x9f, 0x9a, 0xc8, 0x38, 0x35, 0xb0, + 0x0d, 0x37, 0x40, 0x86, 0x87, 0xac, 0xe3, 0x96, 0x28, 0x94, 0x84, 0x4a, 0x46, 0x4d, 0x73, 0xc3, + 0x69, 0x0b, 0x3e, 0x01, 0x39, 0x8d, 0xf4, 0x0d, 0x1b, 0x59, 0x66, 0xc3, 0xb2, 0x1d, 0x71, 0xa9, + 0x24, 0x54, 0xb2, 0xfb, 0x7f, 0xca, 0xe1, 0x0d, 0xca, 0xb5, 0x80, 0xf6, 0x24, 0x71, 0xf3, 0xb9, + 0x18, 0x53, 0xc7, 0xfc, 0xe1, 0xbf, 0x60, 0x79, 0x80, 0x2c, 0x8a, 0x89, 0x21, 0xc6, 0x59, 0xa8, + 0xe2, 0xac, 0x50, 0x97, 0x5c, 0xa6, 0xfa, 0x7a, 0xb8, 0x05, 0x72, 0x2d, 0xd4, 0x6d, 0x38, 0x75, + 0x13, 0x59, 0x98, 0xb4, 0xc4, 0x44, 0x49, 0xa8, 0x24, 0xd4, 0x2c, 0xb3, 0x9d, 0x33, 0x13, 0x5c, + 0x07, 0x29, 0x8a, 0x75, 0x03, 0x59, 0x62, 0x92, 0xf5, 0xe1, 0xdd, 0xfd, 0x97, 0x7e, 0x7b, 0x5d, + 0x8c, 0x7d, 0xbd, 0x2e, 0xc6, 0xca, 0x45, 0xb0, 0x19, 0x3a, 0x05, 0x15, 0x51, 0x93, 0x18, 0x14, + 0x95, 0x3f, 0x26, 0x41, 0x7e, 0x4a, 0x71, 0x61, 0x39, 0x3f, 0x1e, 0xd3, 0x11, 0x58, 0x37, 0x2d, + 0x34, 0xc0, 0xa4, 0x4f, 0xeb, 0xa3, 0x36, 0x5c, 0xa5, 0x3b, 0xb0, 0xcc, 0xc9, 0x92, 0x28, 0xa8, + 0x79, 0x5f, 0x31, 0x8a, 0x7d, 0xda, 0x82, 0x87, 0x20, 0xe7, 0x85, 0xa5, 0x76, 0xc3, 0x46, 0xde, + 0x54, 0xf2, 0x32, 0x67, 0x42, 0xf6, 0x99, 0x90, 0xab, 0x86, 0xa3, 0x66, 0xb9, 0xf2, 0x99, 0x2b, + 0x9c, 0xda, 0x4c, 0x62, 0xc1, 0xcd, 0x4c, 0x8e, 0x37, 0x39, 0x3d, 0xde, 0x0b, 0xb0, 0x16, 0x74, + 0xa9, 0x7b, 0x9b, 0xa1, 0x62, 0xaa, 0x14, 0x8f, 0xb2, 0xca, 0x7c, 0xd0, 0xdb, 0x33, 0x52, 0x58, + 0x03, 0x39, 0xd3, 0x22, 0xe4, 0xaa, 0xde, 0x46, 0x58, 0x6f, 0xdb, 0xe2, 0x32, 0x6b, 0x44, 0x0a, + 0x04, 0xe3, 0xc0, 0x0f, 0xf6, 0xe4, 0x47, 0x4c, 0xe1, 0x95, 0x9f, 0x65, 0x5e, 0xdc, 0x04, 0x37, + 0x01, 0xe0, 0x41, 0xb0, 0x81, 0x6d, 0x31, 0x5d, 0x12, 0x2a, 0x39, 0x35, 0xc3, 0x2c, 0x8c, 0xf1, + 0x2d, 0x3f, 0x07, 0x8f, 0x25, 0x66, 0x98, 0x80, 0x47, 0xa8, 0x31, 0x13, 0xdc, 0x06, 0xab, 0x9e, + 0xc4, 0xe5, 0xc0, 0xa0, 0x7d, 0x2a, 0x02, 0xa6, 0xfa, 0x89, 0xab, 0x7c, 0x2b, 0x7c, 0x0c, 0x7e, + 0x1e, 0x4a, 0xfc, 0x9a, 0xb3, 0x11, 0x6b, 0x5e, 0x1d, 0x7a, 0x7a, 0x75, 0x8f, 0x88, 0xcd, 0x05, + 0x89, 0x85, 0xff, 0x03, 0xa9, 0x4d, 0xa8, 0x3d, 0x2a, 0x86, 0xe3, 0x51, 0x67, 0xb5, 0x88, 0x2b, + 0xac, 0xb0, 0x5f, 0x5d, 0xc5, 0xb0, 0x2e, 0x46, 0xc5, 0xb9, 0xfb, 0x38, 0x80, 0x7b, 0x01, 0xfc, + 0x1e, 0x06, 0xf3, 0x90, 0xf6, 0x0f, 0x89, 0x10, 0xda, 0xab, 0x5a, 0x07, 0xfe, 0x01, 0x56, 0xc6, + 0x39, 0xe6, 0xc4, 0xe7, 0xb4, 0x20, 0xbb, 0xc7, 0x40, 0x1a, 0xe3, 0x21, 0x84, 0x7c, 0x55, 0x0c, + 0x2a, 0xc6, 0xc8, 0x5f, 0xe0, 0x53, 0x30, 0xf9, 0xd2, 0x24, 0xa2, 0xbe, 0x34, 0x93, 0xac, 0x25, + 0x1f, 0xc2, 0xda, 0x06, 0xe0, 0x64, 0xd5, 0x6d, 0xcb, 0x11, 0x53, 0x6c, 0x15, 0x69, 0x66, 0x70, + 0x3f, 0x13, 0x93, 0xa4, 0x2d, 0x47, 0x22, 0x2d, 0x1d, 0x99, 0xb4, 0xcc, 0xe2, 0xa4, 0x81, 0x39, + 0x48, 0xcb, 0x2e, 0x42, 0x5a, 0x55, 0xeb, 0x0c, 0x49, 0x7b, 0x2f, 0x00, 0x71, 0x4a, 0x50, 0x23, + 0xc6, 0x15, 0xb6, 0x7a, 0xd1, 0x68, 0x1b, 0x8e, 0xbd, 0xa1, 0x75, 0x18, 0x5c, 0xfe, 0xd8, 0x5d, + 0x5e, 0x27, 0x17, 0x1b, 0x7f, 0xc8, 0x62, 0x47, 0x23, 0x4a, 0xcc, 0x38, 0x3e, 0xca, 0xa0, 0x34, + 0xab, 0x09, 0xbf, 0xd3, 0xfd, 0x6f, 0x71, 0x10, 0x3f, 0xa3, 0x3a, 0x7c, 0x05, 0x60, 0xc8, 0x69, + 0xbb, 0x33, 0x0b, 0xf2, 0xd0, 0x63, 0x49, 0xfa, 0x67, 0x2e, 0xb9, 0x5f, 0x03, 0x7c, 0x01, 0x7e, + 0x99, 0x3e, 0xc1, 0xfe, 0x8a, 0x1c, 0xeb, 0xc2, 0x72, 0xa4, 0xbf, 0xe7, 0x51, 0xcf, 0x4e, 0xec, + 0x2e, 0x27, 0x7a, 0xe2, 0xaa, 0xd6, 0x99, 0x23, 0x71, 0x80, 0x2f, 0xf8, 0x5a, 0x00, 0x6b, 0xe1, + 0x70, 0xed, 0x46, 0x8e, 0xe7, 0x79, 0x48, 0x47, 0xf3, 0x7a, 0xf8, 0x55, 0x9c, 0x5c, 0xde, 0xdc, + 0x15, 0x84, 0xdb, 0xbb, 0x82, 0xf0, 0xe5, 0xae, 0x20, 0xbc, 0xbb, 0x2f, 0xc4, 0x6e, 0xef, 0x0b, + 0xb1, 0x4f, 0xf7, 0x85, 0xd8, 0xf3, 0x63, 0x1d, 0xdb, 0xed, 0x7e, 0x53, 0xd6, 0x48, 0x4f, 0xd1, + 0x08, 0xed, 0x11, 0xaa, 0xe0, 0xa6, 0xb6, 0xa3, 0x13, 0x65, 0x70, 0xa8, 0xf4, 0x48, 0xab, 0xdf, + 0x45, 0x94, 0xff, 0xc8, 0xed, 0x1e, 0xec, 0x04, 0xfe, 0xe5, 0x6c, 0xc7, 0x44, 0xb4, 0x99, 0x62, + 0x9f, 0xb4, 0x83, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb0, 0xc7, 0x72, 0x20, 0x7a, 0x0a, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/core/04-channel/types/channel.pb.go b/modules/core/04-channel/types/channel.pb.go index ef0929bbac3..594a4e93470 100644 --- a/modules/core/04-channel/types/channel.pb.go +++ b/modules/core/04-channel/types/channel.pb.go @@ -112,7 +112,7 @@ type Channel struct { Counterparty Counterparty `protobuf:"bytes,3,opt,name=counterparty,proto3" json:"counterparty"` // list of connection identifiers, in order, along which packets sent on // this channel will travel - ConnectionHops []string `protobuf:"bytes,4,rep,name=connection_hops,json=connectionHops,proto3" json:"connection_hops,omitempty" yaml:"connection_hops"` + ConnectionHops []string `protobuf:"bytes,4,rep,name=connection_hops,json=connectionHops,proto3" json:"connection_hops,omitempty"` // opaque channel version, which is agreed upon during the handshake Version string `protobuf:"bytes,5,opt,name=version,proto3" json:"version,omitempty"` } @@ -161,7 +161,7 @@ type IdentifiedChannel struct { Counterparty Counterparty `protobuf:"bytes,3,opt,name=counterparty,proto3" json:"counterparty"` // list of connection identifiers, in order, along which packets sent on // this channel will travel - ConnectionHops []string `protobuf:"bytes,4,rep,name=connection_hops,json=connectionHops,proto3" json:"connection_hops,omitempty" yaml:"connection_hops"` + ConnectionHops []string `protobuf:"bytes,4,rep,name=connection_hops,json=connectionHops,proto3" json:"connection_hops,omitempty"` // opaque channel version, which is agreed upon during the handshake Version string `protobuf:"bytes,5,opt,name=version,proto3" json:"version,omitempty"` // port identifier @@ -206,9 +206,9 @@ var xxx_messageInfo_IdentifiedChannel proto.InternalMessageInfo // Counterparty defines a channel end counterparty type Counterparty struct { // port on the counterparty chain which owns the other end of the channel. - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` // channel end on the counterparty chain - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` } func (m *Counterparty) Reset() { *m = Counterparty{} } @@ -251,19 +251,19 @@ type Packet struct { // with a later sequence number. Sequence uint64 `protobuf:"varint,1,opt,name=sequence,proto3" json:"sequence,omitempty"` // identifies the port on the sending chain. - SourcePort string `protobuf:"bytes,2,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty" yaml:"source_port"` + SourcePort string `protobuf:"bytes,2,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty"` // identifies the channel end on the sending chain. - SourceChannel string `protobuf:"bytes,3,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty" yaml:"source_channel"` + SourceChannel string `protobuf:"bytes,3,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty"` // identifies the port on the receiving chain. - DestinationPort string `protobuf:"bytes,4,opt,name=destination_port,json=destinationPort,proto3" json:"destination_port,omitempty" yaml:"destination_port"` + DestinationPort string `protobuf:"bytes,4,opt,name=destination_port,json=destinationPort,proto3" json:"destination_port,omitempty"` // identifies the channel end on the receiving chain. - DestinationChannel string `protobuf:"bytes,5,opt,name=destination_channel,json=destinationChannel,proto3" json:"destination_channel,omitempty" yaml:"destination_channel"` + DestinationChannel string `protobuf:"bytes,5,opt,name=destination_channel,json=destinationChannel,proto3" json:"destination_channel,omitempty"` // actual opaque bytes transferred directly to the application module Data []byte `protobuf:"bytes,6,opt,name=data,proto3" json:"data,omitempty"` // block height after which the packet times out - TimeoutHeight types.Height `protobuf:"bytes,7,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height" yaml:"timeout_height"` + TimeoutHeight types.Height `protobuf:"bytes,7,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height"` // block timestamp (in nanoseconds) after which the packet times out - TimeoutTimestamp uint64 `protobuf:"varint,8,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty" yaml:"timeout_timestamp"` + TimeoutTimestamp uint64 `protobuf:"varint,8,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty"` } func (m *Packet) Reset() { *m = Packet{} } @@ -305,9 +305,9 @@ var xxx_messageInfo_Packet proto.InternalMessageInfo // state as a commitment, acknowledgement, or a receipt. type PacketState struct { // channel port identifier. - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` // channel unique identifier. - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` // packet sequence. Sequence uint64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"` // embedded data that represents packet state. @@ -352,9 +352,9 @@ var xxx_messageInfo_PacketState proto.InternalMessageInfo // Destination chains refer to packets by destination port/channel type PacketId struct { // channel port identifier - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` // channel unique identifier - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` // packet sequence Sequence uint64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"` } @@ -501,65 +501,58 @@ func init() { func init() { proto.RegisterFile("ibc/core/channel/v1/channel.proto", fileDescriptor_c3a07336710636a0) } var fileDescriptor_c3a07336710636a0 = []byte{ - // 925 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x56, 0xcd, 0x8e, 0x1a, 0x47, - 0x10, 0x66, 0x60, 0xf8, 0x2b, 0x16, 0x96, 0x6d, 0x67, 0xf1, 0x64, 0x62, 0x33, 0x78, 0x94, 0xc3, - 0xca, 0x91, 0xc1, 0xeb, 0x58, 0xb1, 0xe2, 0x53, 0x96, 0x1f, 0x6b, 0x47, 0xb1, 0x60, 0x35, 0xb0, - 0x87, 0xf8, 0x42, 0x60, 0xa6, 0x03, 0x23, 0xc3, 0x34, 0x99, 0x69, 0x58, 0xed, 0x1b, 0x58, 0x5c, - 0x92, 0x17, 0x40, 0x8a, 0x14, 0x25, 0xaf, 0x90, 0x57, 0xf0, 0xd1, 0xc7, 0x9c, 0x50, 0xb4, 0x7b, - 0xc8, 0x9d, 0x17, 0x48, 0x34, 0xdd, 0x3d, 0xfc, 0xac, 0xad, 0x3d, 0x26, 0x17, 0x9f, 0xe8, 0xaa, - 0xef, 0xab, 0xaa, 0x6f, 0xaa, 0x8a, 0x56, 0xc3, 0x03, 0xa7, 0x6f, 0x55, 0x2c, 0xe2, 0xe1, 0x8a, - 0x35, 0xec, 0xb9, 0x2e, 0x1e, 0x55, 0x66, 0xc7, 0xe1, 0xb1, 0x3c, 0xf1, 0x08, 0x25, 0xe8, 0x8e, - 0xd3, 0xb7, 0xca, 0x01, 0xa5, 0x1c, 0xfa, 0x67, 0xc7, 0xea, 0x27, 0x03, 0x32, 0x20, 0x0c, 0xaf, - 0x04, 0x27, 0x4e, 0x55, 0xb5, 0x4d, 0xb6, 0x91, 0x83, 0x5d, 0xca, 0x92, 0xb1, 0x13, 0x27, 0xe8, - 0xbf, 0x45, 0x21, 0x59, 0xe3, 0x59, 0xd0, 0x63, 0x88, 0xfb, 0xb4, 0x47, 0xb1, 0x22, 0x95, 0xa4, - 0xa3, 0xdc, 0x13, 0xb5, 0xfc, 0x81, 0x3a, 0xe5, 0x76, 0xc0, 0x30, 0x39, 0x11, 0x7d, 0x05, 0x29, - 0xe2, 0xd9, 0xd8, 0x73, 0xdc, 0x81, 0x12, 0xbd, 0x25, 0xa8, 0x15, 0x90, 0xcc, 0x35, 0x17, 0x7d, - 0x0b, 0x7b, 0x16, 0x99, 0xba, 0x14, 0x7b, 0x93, 0x9e, 0x47, 0x2f, 0x95, 0x58, 0x49, 0x3a, 0xca, - 0x3c, 0x79, 0xf0, 0xc1, 0xd8, 0xda, 0x16, 0xb1, 0x2a, 0xbf, 0x5d, 0x6a, 0x11, 0x73, 0x27, 0x18, - 0xd5, 0x60, 0xdf, 0x22, 0xae, 0x8b, 0x2d, 0xea, 0x10, 0xb7, 0x3b, 0x24, 0x13, 0x5f, 0x91, 0x4b, - 0xb1, 0xa3, 0x74, 0x55, 0x5d, 0x2d, 0xb5, 0xc2, 0x65, 0x6f, 0x3c, 0x7a, 0xae, 0xdf, 0x20, 0xe8, - 0x66, 0x6e, 0xe3, 0x39, 0x25, 0x13, 0x1f, 0x29, 0x90, 0x9c, 0x61, 0xcf, 0x77, 0x88, 0xab, 0xc4, - 0x4b, 0xd2, 0x51, 0xda, 0x0c, 0xcd, 0xe7, 0xf2, 0x9b, 0x5f, 0xb4, 0x88, 0xfe, 0x77, 0x14, 0x0e, - 0x0c, 0x1b, 0xbb, 0xd4, 0xf9, 0xc1, 0xc1, 0xf6, 0xc7, 0x8e, 0xdd, 0xd2, 0x31, 0x74, 0x17, 0x92, - 0x13, 0xe2, 0xd1, 0xae, 0x63, 0x2b, 0x09, 0x86, 0x24, 0x02, 0xd3, 0xb0, 0xd1, 0x7d, 0x00, 0x21, - 0x33, 0xc0, 0x92, 0x0c, 0x4b, 0x0b, 0x8f, 0x61, 0x8b, 0x4e, 0x5f, 0xc0, 0xde, 0xf6, 0x07, 0xa0, - 0x2f, 0x36, 0xd9, 0x82, 0x2e, 0xa7, 0xab, 0x68, 0xb5, 0xd4, 0x72, 0x5c, 0xa4, 0x00, 0xf4, 0x75, - 0x85, 0xa7, 0x3b, 0x15, 0xa2, 0x8c, 0x7f, 0xb8, 0x5a, 0x6a, 0x07, 0xe2, 0xa3, 0xd6, 0x98, 0xfe, - 0x7e, 0xe1, 0x7f, 0x62, 0x90, 0x38, 0xeb, 0x59, 0xaf, 0x31, 0x45, 0x2a, 0xa4, 0x7c, 0xfc, 0xe3, - 0x14, 0xbb, 0x16, 0x1f, 0xad, 0x6c, 0xae, 0x6d, 0xf4, 0x0c, 0x32, 0x3e, 0x99, 0x7a, 0x16, 0xee, - 0x06, 0x35, 0x45, 0x8d, 0xc2, 0x6a, 0xa9, 0x21, 0x5e, 0x63, 0x0b, 0xd4, 0x4d, 0xe0, 0xd6, 0x19, - 0xf1, 0x28, 0xfa, 0x06, 0x72, 0x02, 0x13, 0x95, 0xd9, 0x10, 0xd3, 0xd5, 0x4f, 0x57, 0x4b, 0xed, - 0x70, 0x27, 0x56, 0xe0, 0xba, 0x99, 0xe5, 0x8e, 0x70, 0xdd, 0x5e, 0x40, 0xde, 0xc6, 0x3e, 0x75, - 0xdc, 0x1e, 0x9b, 0x0b, 0xab, 0x2f, 0xb3, 0x1c, 0x9f, 0xad, 0x96, 0xda, 0x5d, 0x9e, 0xe3, 0x26, - 0x43, 0x37, 0xf7, 0xb7, 0x5c, 0x4c, 0x49, 0x0b, 0xee, 0x6c, 0xb3, 0x42, 0x39, 0x6c, 0x8c, 0xd5, - 0xe2, 0x6a, 0xa9, 0xa9, 0xef, 0xa7, 0x5a, 0x6b, 0x42, 0x5b, 0xde, 0x50, 0x18, 0x02, 0xd9, 0xee, - 0xd1, 0x1e, 0x1b, 0xf7, 0x9e, 0xc9, 0xce, 0xe8, 0x7b, 0xc8, 0x51, 0x67, 0x8c, 0xc9, 0x94, 0x76, - 0x87, 0xd8, 0x19, 0x0c, 0x29, 0x1b, 0x78, 0x66, 0x67, 0xdf, 0xf9, 0x4d, 0x34, 0x3b, 0x2e, 0x9f, - 0x32, 0x46, 0xf5, 0x7e, 0xb0, 0xac, 0x9b, 0x76, 0xec, 0xc6, 0xeb, 0x66, 0x56, 0x38, 0x38, 0x1b, - 0x19, 0x70, 0x10, 0x32, 0x82, 0x5f, 0x9f, 0xf6, 0xc6, 0x13, 0x25, 0x15, 0x8c, 0xab, 0x7a, 0x6f, - 0xb5, 0xd4, 0x94, 0xdd, 0x24, 0x6b, 0x8a, 0x6e, 0xe6, 0x85, 0xaf, 0x13, 0xba, 0xc4, 0x06, 0xfc, - 0x2e, 0x41, 0x86, 0x6f, 0x00, 0xfb, 0xcf, 0xfe, 0x07, 0xab, 0xb7, 0xb3, 0x69, 0xb1, 0x1b, 0x9b, - 0x16, 0x76, 0x55, 0xde, 0x74, 0x55, 0x08, 0xfd, 0x49, 0x82, 0x14, 0x17, 0x6a, 0xd8, 0xff, 0xb3, - 0x4a, 0xa1, 0xa8, 0x05, 0xfb, 0x27, 0xd6, 0x6b, 0x97, 0x5c, 0x8c, 0xb0, 0x3d, 0xc0, 0x63, 0xec, - 0x52, 0xa4, 0x40, 0xc2, 0xc3, 0xfe, 0x74, 0x44, 0x95, 0xc3, 0xe0, 0x03, 0x4e, 0x23, 0xa6, 0xb0, - 0x51, 0x01, 0xe2, 0xd8, 0xf3, 0x88, 0xa7, 0x14, 0x82, 0xfa, 0xa7, 0x11, 0x93, 0x9b, 0x55, 0x80, - 0x94, 0x87, 0xfd, 0x09, 0x71, 0x7d, 0xfc, 0xf0, 0x0f, 0x09, 0xe2, 0x6d, 0x71, 0x65, 0x6a, 0xed, - 0xce, 0x49, 0xa7, 0xd1, 0x3d, 0x6f, 0x1a, 0x4d, 0xa3, 0x63, 0x9c, 0xbc, 0x34, 0x5e, 0x35, 0xea, - 0xdd, 0xf3, 0x66, 0xfb, 0xac, 0x51, 0x33, 0x5e, 0x18, 0x8d, 0x7a, 0x3e, 0xa2, 0x1e, 0xcc, 0x17, - 0xa5, 0xec, 0x0e, 0x01, 0x29, 0x00, 0x3c, 0x2e, 0x70, 0xe6, 0x25, 0x35, 0x35, 0x5f, 0x94, 0xe4, - 0xe0, 0x8c, 0x8a, 0x90, 0xe5, 0x48, 0xc7, 0xfc, 0xae, 0x75, 0xd6, 0x68, 0xe6, 0xa3, 0x6a, 0x66, - 0xbe, 0x28, 0x25, 0x85, 0xb9, 0x89, 0x64, 0x60, 0x8c, 0x47, 0x32, 0xe4, 0x1e, 0xec, 0x71, 0xa4, - 0xf6, 0xb2, 0xd5, 0x6e, 0xd4, 0xf3, 0xb2, 0x0a, 0xf3, 0x45, 0x29, 0xc1, 0x2d, 0x55, 0x7e, 0xf3, - 0x6b, 0x31, 0xf2, 0xf0, 0x02, 0xe2, 0xec, 0xf6, 0x46, 0x9f, 0x43, 0xa1, 0x65, 0xd6, 0x1b, 0x66, - 0xb7, 0xd9, 0x6a, 0x36, 0x6e, 0xe8, 0x65, 0x29, 0x03, 0x3f, 0xd2, 0x61, 0x9f, 0xb3, 0xce, 0x9b, - 0xec, 0xb7, 0x51, 0xcf, 0x4b, 0x6a, 0x76, 0xbe, 0x28, 0xa5, 0xd7, 0x8e, 0x40, 0x30, 0xe7, 0x84, - 0x0c, 0x21, 0x58, 0x98, 0xbc, 0x70, 0xb5, 0xfd, 0xf6, 0xaa, 0x28, 0xbd, 0xbb, 0x2a, 0x4a, 0x7f, - 0x5d, 0x15, 0xa5, 0x9f, 0xaf, 0x8b, 0x91, 0x77, 0xd7, 0xc5, 0xc8, 0x9f, 0xd7, 0xc5, 0xc8, 0xab, - 0xaf, 0x07, 0x0e, 0x1d, 0x4e, 0xfb, 0x65, 0x8b, 0x8c, 0x2b, 0x16, 0xf1, 0xc7, 0xc4, 0xaf, 0x38, - 0x7d, 0xeb, 0xd1, 0x80, 0x54, 0x66, 0xcf, 0x2a, 0x63, 0x62, 0x4f, 0x47, 0xd8, 0xe7, 0xcf, 0x84, - 0xc7, 0x4f, 0x1f, 0x85, 0xef, 0x0e, 0x7a, 0x39, 0xc1, 0x7e, 0x3f, 0xc1, 0xde, 0x09, 0x5f, 0xfe, - 0x1b, 0x00, 0x00, 0xff, 0xff, 0xa2, 0xdd, 0xd7, 0x47, 0x98, 0x08, 0x00, 0x00, + // 816 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x55, 0xcd, 0x8e, 0xdb, 0x54, + 0x14, 0xb6, 0x33, 0xce, 0xdf, 0xc9, 0x64, 0x92, 0xb9, 0x85, 0xc1, 0xb2, 0xc0, 0x71, 0x47, 0x20, + 0x42, 0x51, 0xe3, 0x4e, 0x41, 0x20, 0xd8, 0xcd, 0x24, 0x86, 0x58, 0x8c, 0x92, 0xc8, 0xc9, 0x2c, + 0xe8, 0x26, 0x72, 0xec, 0x4b, 0x62, 0x35, 0xf1, 0x35, 0xf6, 0x4d, 0xaa, 0x8a, 0x17, 0x28, 0x59, + 0xf1, 0x02, 0x91, 0x90, 0x78, 0x08, 0x5e, 0xa1, 0x12, 0x9b, 0x2e, 0xbb, 0x42, 0x68, 0xe6, 0x45, + 0x90, 0xef, 0xbd, 0x9e, 0x24, 0xd5, 0xa8, 0x0b, 0x24, 0x56, 0x5d, 0xe5, 0x9e, 0xef, 0x7c, 0xe7, + 0x3b, 0xc7, 0xdf, 0xb1, 0x73, 0xe1, 0x7e, 0x30, 0xf1, 0x4c, 0x8f, 0xc4, 0xd8, 0xf4, 0x66, 0x6e, + 0x18, 0xe2, 0xb9, 0xb9, 0x3a, 0xcb, 0x8e, 0xad, 0x28, 0x26, 0x94, 0xa0, 0x7b, 0xc1, 0xc4, 0x6b, + 0xa5, 0x94, 0x56, 0x86, 0xaf, 0xce, 0xb4, 0xf7, 0xa6, 0x64, 0x4a, 0x58, 0xde, 0x4c, 0x4f, 0x9c, + 0xaa, 0x35, 0xb6, 0x6a, 0xf3, 0x00, 0x87, 0x94, 0x89, 0xb1, 0x13, 0x27, 0x9c, 0xfe, 0x9a, 0x83, + 0x62, 0x9b, 0xab, 0xa0, 0x47, 0x90, 0x4f, 0xa8, 0x4b, 0xb1, 0x2a, 0x1b, 0x72, 0xf3, 0xe8, 0xb1, + 0xd6, 0xba, 0xa3, 0x4f, 0x6b, 0x98, 0x32, 0x1c, 0x4e, 0x44, 0x5f, 0x41, 0x89, 0xc4, 0x3e, 0x8e, + 0x83, 0x70, 0xaa, 0xe6, 0xde, 0x52, 0xd4, 0x4f, 0x49, 0xce, 0x2d, 0x17, 0xfd, 0x00, 0x87, 0x1e, + 0x59, 0x86, 0x14, 0xc7, 0x91, 0x1b, 0xd3, 0xe7, 0xea, 0x81, 0x21, 0x37, 0x2b, 0x8f, 0xef, 0xdf, + 0x59, 0xdb, 0xde, 0x21, 0x5e, 0x28, 0x2f, 0xff, 0x6e, 0x48, 0xce, 0x5e, 0x31, 0xfa, 0x14, 0x6a, + 0x1e, 0x09, 0x43, 0xec, 0xd1, 0x80, 0x84, 0xe3, 0x19, 0x89, 0x12, 0x55, 0x31, 0x0e, 0x9a, 0x65, + 0xe7, 0x68, 0x0b, 0x77, 0x49, 0x94, 0x20, 0x15, 0x8a, 0x2b, 0x1c, 0x27, 0x01, 0x09, 0xd5, 0xbc, + 0x21, 0x37, 0xcb, 0x4e, 0x16, 0x7e, 0xab, 0xbc, 0xf8, 0xbd, 0x21, 0x9d, 0xfe, 0x95, 0x83, 0x63, + 0xdb, 0xc7, 0x21, 0x0d, 0x7e, 0x0a, 0xb0, 0xff, 0xce, 0xbb, 0x82, 0x3e, 0x80, 0x62, 0x44, 0x62, + 0x3a, 0x0e, 0x7c, 0xb5, 0xc0, 0x32, 0x85, 0x34, 0xb4, 0x7d, 0xf4, 0x11, 0x80, 0x18, 0x25, 0xcd, + 0x15, 0x59, 0xae, 0x2c, 0x10, 0xdb, 0x17, 0x6e, 0x5e, 0xc2, 0xe1, 0xee, 0x90, 0xbb, 0x6a, 0xf2, + 0x5b, 0xd4, 0x72, 0x77, 0xab, 0xbd, 0xce, 0x41, 0x61, 0xe0, 0x7a, 0x4f, 0x31, 0x45, 0x1a, 0x94, + 0x12, 0xfc, 0xf3, 0x12, 0x87, 0x1e, 0xdf, 0x89, 0xe2, 0xdc, 0xc6, 0xa8, 0x01, 0x95, 0x84, 0x2c, + 0x63, 0x0f, 0x8f, 0x53, 0x71, 0x21, 0x06, 0x1c, 0x1a, 0x90, 0x98, 0xa2, 0x4f, 0xe0, 0x48, 0x10, + 0x44, 0x07, 0xe6, 0x72, 0xd9, 0xa9, 0x72, 0x34, 0x5b, 0xfa, 0x67, 0x50, 0xf7, 0x71, 0x42, 0x83, + 0xd0, 0x65, 0xf6, 0x31, 0x31, 0x85, 0x11, 0x6b, 0x3b, 0x38, 0x53, 0x34, 0xe1, 0xde, 0x2e, 0x35, + 0x93, 0xe5, 0x5e, 0xa2, 0x9d, 0x54, 0xa6, 0x8d, 0x40, 0xf1, 0x5d, 0xea, 0x32, 0x4f, 0x0f, 0x1d, + 0x76, 0x46, 0xdf, 0xc3, 0x11, 0x0d, 0x16, 0x98, 0x2c, 0xe9, 0x78, 0x86, 0x83, 0xe9, 0x8c, 0x32, + 0x57, 0x2b, 0x7b, 0x2f, 0x0e, 0xff, 0x6c, 0x57, 0x67, 0xad, 0x2e, 0x63, 0x88, 0xad, 0x57, 0x45, + 0x1d, 0x07, 0xd1, 0xe7, 0x70, 0x9c, 0x09, 0xa5, 0xbf, 0x09, 0x75, 0x17, 0x91, 0x5a, 0x62, 0x2e, + 0xd5, 0x45, 0x62, 0x94, 0xe1, 0xc2, 0xda, 0x5f, 0xa0, 0xc2, 0x9d, 0x65, 0x2f, 0xf1, 0x7f, 0xdd, + 0xd3, 0xde, 0x5a, 0x0e, 0xde, 0x58, 0x4b, 0xf6, 0xc8, 0xca, 0xf6, 0x91, 0x45, 0x73, 0x1f, 0x4a, + 0xbc, 0xb9, 0xed, 0xff, 0x1f, 0x9d, 0x45, 0x97, 0x3e, 0xd4, 0xce, 0xbd, 0xa7, 0x21, 0x79, 0x36, + 0xc7, 0xfe, 0x14, 0x2f, 0x70, 0x48, 0x91, 0x0a, 0x85, 0x18, 0x27, 0xcb, 0x39, 0x55, 0xdf, 0x4f, + 0x87, 0xea, 0x4a, 0x8e, 0x88, 0xd1, 0x09, 0xe4, 0x71, 0x1c, 0x93, 0x58, 0x3d, 0x49, 0x1b, 0x75, + 0x25, 0x87, 0x87, 0x17, 0x00, 0xa5, 0x18, 0x27, 0x11, 0x09, 0x13, 0xfc, 0xe0, 0x4f, 0x19, 0xf2, + 0x43, 0xf1, 0xb1, 0x37, 0x86, 0xa3, 0xf3, 0x91, 0x35, 0xbe, 0xea, 0xd9, 0x3d, 0x7b, 0x64, 0x9f, + 0x5f, 0xda, 0x4f, 0xac, 0xce, 0xf8, 0xaa, 0x37, 0x1c, 0x58, 0x6d, 0xfb, 0x3b, 0xdb, 0xea, 0xd4, + 0x25, 0xed, 0x78, 0xbd, 0x31, 0xaa, 0x7b, 0x04, 0xa4, 0x02, 0xf0, 0xba, 0x14, 0xac, 0xcb, 0x5a, + 0x69, 0xbd, 0x31, 0x94, 0xf4, 0x8c, 0x74, 0xa8, 0xf2, 0xcc, 0xc8, 0xf9, 0xb1, 0x3f, 0xb0, 0x7a, + 0xf5, 0x9c, 0x56, 0x59, 0x6f, 0x8c, 0xa2, 0x08, 0xb7, 0x95, 0x2c, 0x79, 0xc0, 0x2b, 0x59, 0xe6, + 0x43, 0x38, 0xe4, 0x99, 0xf6, 0x65, 0x7f, 0x68, 0x75, 0xea, 0x8a, 0x06, 0xeb, 0x8d, 0x51, 0xe0, + 0x91, 0xa6, 0xbc, 0xf8, 0x43, 0x97, 0x1e, 0x3c, 0x83, 0x3c, 0xfb, 0xdf, 0x41, 0x1f, 0xc3, 0x49, + 0xdf, 0xe9, 0x58, 0xce, 0xb8, 0xd7, 0xef, 0x59, 0x6f, 0xcc, 0xcb, 0x24, 0x53, 0x1c, 0x9d, 0x42, + 0x8d, 0xb3, 0xae, 0x7a, 0xec, 0xd7, 0xea, 0xd4, 0x65, 0xad, 0xba, 0xde, 0x18, 0xe5, 0x5b, 0x20, + 0x1d, 0x98, 0x73, 0x32, 0x86, 0x18, 0x58, 0x84, 0xbc, 0xf1, 0xc5, 0xf0, 0xe5, 0xb5, 0x2e, 0xbf, + 0xba, 0xd6, 0xe5, 0x7f, 0xae, 0x75, 0xf9, 0xb7, 0x1b, 0x5d, 0x7a, 0x75, 0xa3, 0x4b, 0xaf, 0x6f, + 0x74, 0xe9, 0xc9, 0x37, 0xd3, 0x80, 0xce, 0x96, 0x93, 0x96, 0x47, 0x16, 0xa6, 0x47, 0x92, 0x05, + 0x49, 0xcc, 0x60, 0xe2, 0x3d, 0x9c, 0x12, 0x73, 0xf5, 0xb5, 0xb9, 0x20, 0xfe, 0x72, 0x8e, 0x13, + 0x7e, 0x89, 0x3d, 0xfa, 0xf2, 0x61, 0x76, 0x2b, 0xd2, 0xe7, 0x11, 0x4e, 0x26, 0x05, 0x76, 0x8b, + 0x7d, 0xf1, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa2, 0x87, 0x4b, 0xef, 0x36, 0x07, 0x00, 0x00, } func (m *Channel) Marshal() (dAtA []byte, err error) { diff --git a/modules/core/04-channel/types/genesis.pb.go b/modules/core/04-channel/types/genesis.pb.go index 4c6b61988f0..00ea52c8a9b 100644 --- a/modules/core/04-channel/types/genesis.pb.go +++ b/modules/core/04-channel/types/genesis.pb.go @@ -29,11 +29,11 @@ type GenesisState struct { Acknowledgements []PacketState `protobuf:"bytes,2,rep,name=acknowledgements,proto3" json:"acknowledgements"` Commitments []PacketState `protobuf:"bytes,3,rep,name=commitments,proto3" json:"commitments"` Receipts []PacketState `protobuf:"bytes,4,rep,name=receipts,proto3" json:"receipts"` - SendSequences []PacketSequence `protobuf:"bytes,5,rep,name=send_sequences,json=sendSequences,proto3" json:"send_sequences" yaml:"send_sequences"` - RecvSequences []PacketSequence `protobuf:"bytes,6,rep,name=recv_sequences,json=recvSequences,proto3" json:"recv_sequences" yaml:"recv_sequences"` - AckSequences []PacketSequence `protobuf:"bytes,7,rep,name=ack_sequences,json=ackSequences,proto3" json:"ack_sequences" yaml:"ack_sequences"` + SendSequences []PacketSequence `protobuf:"bytes,5,rep,name=send_sequences,json=sendSequences,proto3" json:"send_sequences"` + RecvSequences []PacketSequence `protobuf:"bytes,6,rep,name=recv_sequences,json=recvSequences,proto3" json:"recv_sequences"` + AckSequences []PacketSequence `protobuf:"bytes,7,rep,name=ack_sequences,json=ackSequences,proto3" json:"ack_sequences"` // the sequence for the next generated channel identifier - NextChannelSequence uint64 `protobuf:"varint,8,opt,name=next_channel_sequence,json=nextChannelSequence,proto3" json:"next_channel_sequence,omitempty" yaml:"next_channel_sequence"` + NextChannelSequence uint64 `protobuf:"varint,8,opt,name=next_channel_sequence,json=nextChannelSequence,proto3" json:"next_channel_sequence,omitempty"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -128,8 +128,8 @@ func (m *GenesisState) GetNextChannelSequence() uint64 { // PacketSequence defines the genesis type necessary to retrieve and store // next send and receive sequences. type PacketSequence struct { - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` Sequence uint64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"` } @@ -195,39 +195,35 @@ func init() { func init() { proto.RegisterFile("ibc/core/channel/v1/genesis.proto", fileDescriptor_cb06ec201f452595) } var fileDescriptor_cb06ec201f452595 = []byte{ - // 507 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xcf, 0x6e, 0xd3, 0x40, - 0x10, 0x87, 0xe3, 0x36, 0x4d, 0xd3, 0x6d, 0x13, 0xd1, 0x6d, 0x23, 0x99, 0xa8, 0xd8, 0xc6, 0x48, - 0x28, 0x12, 0xaa, 0x4d, 0xa1, 0x12, 0x82, 0xa3, 0x39, 0x40, 0x6e, 0x68, 0xcb, 0x09, 0x09, 0x45, - 0xf6, 0x7a, 0xea, 0xae, 0x12, 0x7b, 0x83, 0x77, 0x13, 0xe8, 0x53, 0xc0, 0x63, 0xf5, 0xd8, 0x23, - 0x27, 0x0b, 0x25, 0x6f, 0x90, 0x23, 0x27, 0xe4, 0xbf, 0x49, 0xd4, 0x08, 0x51, 0x6e, 0xde, 0x99, - 0xdf, 0x7c, 0xdf, 0x1c, 0x3c, 0xe8, 0x31, 0xf3, 0xa8, 0x4d, 0x79, 0x0c, 0x36, 0xbd, 0x72, 0xa3, - 0x08, 0x46, 0xf6, 0xf4, 0xcc, 0x0e, 0x20, 0x02, 0xc1, 0x84, 0x35, 0x8e, 0xb9, 0xe4, 0xf8, 0x88, - 0x79, 0xd4, 0x4a, 0x23, 0x56, 0x11, 0xb1, 0xa6, 0x67, 0xdd, 0xe3, 0x80, 0x07, 0x3c, 0xeb, 0xdb, - 0xe9, 0x57, 0x1e, 0xed, 0x6e, 0xa4, 0x95, 0x53, 0x59, 0xc4, 0x9c, 0xef, 0xa0, 0x83, 0x77, 0x39, - 0xff, 0x42, 0xba, 0x12, 0xf0, 0x67, 0xd4, 0x2c, 0x12, 0x42, 0x55, 0x8c, 0xed, 0xde, 0xfe, 0x8b, - 0xa7, 0xd6, 0x06, 0xa3, 0xd5, 0xf7, 0x21, 0x92, 0xec, 0x92, 0x81, 0xff, 0x36, 0x2f, 0x3a, 0x0f, - 0x6f, 0x12, 0xbd, 0xf6, 0x3b, 0xd1, 0x0f, 0xef, 0xb4, 0x48, 0x85, 0xc4, 0x04, 0x3d, 0x70, 0xe9, - 0x30, 0xe2, 0x5f, 0x47, 0xe0, 0x07, 0x10, 0x42, 0x24, 0x85, 0xba, 0x95, 0x69, 0x8c, 0x8d, 0x9a, - 0x0f, 0x2e, 0x1d, 0x82, 0xcc, 0x56, 0x73, 0xea, 0xa9, 0x80, 0xdc, 0x99, 0xc7, 0xef, 0xd1, 0x3e, - 0xe5, 0x61, 0xc8, 0x64, 0x8e, 0xdb, 0xbe, 0x17, 0x6e, 0x75, 0x14, 0x3b, 0xa8, 0x19, 0x03, 0x05, - 0x36, 0x96, 0x42, 0xad, 0xdf, 0x0b, 0x53, 0xcd, 0x61, 0x86, 0xda, 0x02, 0x22, 0x7f, 0x20, 0xe0, - 0xcb, 0x04, 0x22, 0x0a, 0x42, 0xdd, 0xc9, 0x48, 0x4f, 0xfe, 0x46, 0x2a, 0xb2, 0xce, 0xa3, 0x14, - 0xb6, 0x48, 0xf4, 0xce, 0xb5, 0x1b, 0x8e, 0xde, 0x98, 0xeb, 0x20, 0x93, 0xb4, 0xd2, 0x42, 0x19, - 0xce, 0x54, 0x31, 0xd0, 0xe9, 0x8a, 0xaa, 0xf1, 0xdf, 0xaa, 0x75, 0x90, 0x49, 0x5a, 0x69, 0x61, - 0xa9, 0xba, 0x44, 0x2d, 0x97, 0x0e, 0x57, 0x4c, 0xbb, 0xff, 0x6e, 0x3a, 0x29, 0x4c, 0xc7, 0xb9, - 0x69, 0x8d, 0x63, 0x92, 0x03, 0x97, 0x0e, 0x97, 0x9e, 0x8f, 0xa8, 0x13, 0xc1, 0x37, 0x39, 0x28, - 0x68, 0x55, 0x50, 0x6d, 0x1a, 0x4a, 0xaf, 0xee, 0x18, 0x8b, 0x44, 0x3f, 0xc9, 0x31, 0x1b, 0x63, - 0x26, 0x39, 0x4a, 0xeb, 0xc5, 0x7f, 0x57, 0x62, 0xcd, 0xef, 0x0a, 0x6a, 0xaf, 0x2f, 0x85, 0x9f, - 0xa1, 0xdd, 0x31, 0x8f, 0xe5, 0x80, 0xf9, 0xaa, 0x62, 0x28, 0xbd, 0x3d, 0x07, 0x2f, 0x12, 0xbd, - 0x9d, 0xa3, 0x8b, 0x86, 0x49, 0x1a, 0xe9, 0x57, 0xdf, 0xc7, 0xe7, 0x08, 0x95, 0x26, 0xe6, 0xab, - 0x5b, 0x59, 0xbe, 0xb3, 0x48, 0xf4, 0xc3, 0x3c, 0xbf, 0xec, 0x99, 0x64, 0xaf, 0x78, 0xf4, 0x7d, - 0xdc, 0x45, 0xcd, 0x6a, 0xfd, 0xed, 0x74, 0x7d, 0x52, 0xbd, 0x9d, 0x8b, 0x9b, 0x99, 0xa6, 0xdc, - 0xce, 0x34, 0xe5, 0xd7, 0x4c, 0x53, 0x7e, 0xcc, 0xb5, 0xda, 0xed, 0x5c, 0xab, 0xfd, 0x9c, 0x6b, - 0xb5, 0x4f, 0xaf, 0x03, 0x26, 0xaf, 0x26, 0x9e, 0x45, 0x79, 0x68, 0x53, 0x2e, 0x42, 0x2e, 0x6c, - 0xe6, 0xd1, 0xd3, 0x80, 0xdb, 0xd3, 0x57, 0x76, 0xc8, 0xfd, 0xc9, 0x08, 0x44, 0x7e, 0xd4, 0xcf, - 0xcf, 0x4f, 0xcb, 0xbb, 0x96, 0xd7, 0x63, 0x10, 0x5e, 0x23, 0xbb, 0xe9, 0x97, 0x7f, 0x02, 0x00, - 0x00, 0xff, 0xff, 0xcc, 0x89, 0x91, 0x33, 0x46, 0x04, 0x00, 0x00, + // 447 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0xd3, 0x4d, 0x6f, 0xd3, 0x30, + 0x18, 0x07, 0xf0, 0x66, 0x2d, 0x5d, 0xe7, 0xbd, 0x08, 0x3c, 0x10, 0xa1, 0x12, 0x59, 0x19, 0x12, + 0xea, 0x65, 0x31, 0x1b, 0x48, 0x88, 0x6b, 0x38, 0x40, 0x2f, 0x68, 0xca, 0x6e, 0x48, 0xa8, 0x4a, + 0xec, 0x87, 0xcc, 0x4a, 0x63, 0x87, 0xd8, 0x0d, 0xf0, 0x2d, 0xf8, 0x58, 0x3b, 0xee, 0xc8, 0x69, + 0x42, 0xed, 0x87, 0x40, 0xe2, 0x84, 0xe2, 0xbc, 0xac, 0xa8, 0xd5, 0xa4, 0xdc, 0x6a, 0x3f, 0xcf, + 0xff, 0xf7, 0xef, 0x21, 0x46, 0xcf, 0x78, 0x48, 0x09, 0x95, 0x19, 0x10, 0x7a, 0x19, 0x08, 0x01, + 0x33, 0x92, 0x9f, 0x92, 0x08, 0x04, 0x28, 0xae, 0xdc, 0x34, 0x93, 0x5a, 0xe2, 0x43, 0x1e, 0x52, + 0xb7, 0x58, 0x71, 0xab, 0x15, 0x37, 0x3f, 0x1d, 0x3e, 0x8c, 0x64, 0x24, 0xcd, 0x9c, 0x14, 0xbf, + 0xca, 0xd5, 0xe1, 0x46, 0xad, 0x4e, 0x99, 0x95, 0xe3, 0x3f, 0x3d, 0xb4, 0xf7, 0xbe, 0xf4, 0x2f, + 0x74, 0xa0, 0x01, 0x7f, 0x46, 0x83, 0x6a, 0x43, 0xd9, 0xd6, 0xa8, 0x3b, 0xde, 0x3d, 0x7b, 0xe1, + 0x6e, 0x68, 0x74, 0x27, 0x0c, 0x84, 0xe6, 0x5f, 0x38, 0xb0, 0x77, 0xe5, 0xa5, 0xf7, 0xe4, 0xea, + 0xe6, 0xa8, 0xf3, 0xf7, 0xe6, 0xe8, 0xc1, 0xda, 0xc8, 0x6f, 0x48, 0xec, 0xa3, 0xfb, 0x01, 0x8d, + 0x85, 0xfc, 0x36, 0x03, 0x16, 0x41, 0x02, 0x42, 0x2b, 0x7b, 0xcb, 0xd4, 0x8c, 0x36, 0xd6, 0x9c, + 0x07, 0x34, 0x06, 0x6d, 0xfe, 0x9a, 0xd7, 0x2b, 0x0a, 0xfc, 0xb5, 0x3c, 0xfe, 0x80, 0x76, 0xa9, + 0x4c, 0x12, 0xae, 0x4b, 0xae, 0xdb, 0x8a, 0x5b, 0x8d, 0x62, 0x0f, 0x0d, 0x32, 0xa0, 0xc0, 0x53, + 0xad, 0xec, 0x5e, 0x2b, 0xa6, 0xc9, 0xe1, 0x73, 0x74, 0xa0, 0x40, 0xb0, 0xa9, 0x82, 0xaf, 0x73, + 0x10, 0x14, 0x94, 0x7d, 0xcf, 0x48, 0xcf, 0xef, 0x92, 0xaa, 0xdd, 0x0a, 0xdb, 0x2f, 0x80, 0xfa, + 0xce, 0x88, 0x19, 0xd0, 0x7c, 0x45, 0xec, 0xb7, 0x16, 0x0b, 0xe0, 0x56, 0xfc, 0x88, 0xf6, 0x03, + 0x1a, 0xaf, 0x80, 0xdb, 0x6d, 0xc1, 0xbd, 0x80, 0xc6, 0xb7, 0xde, 0x19, 0x7a, 0x24, 0xe0, 0xbb, + 0x9e, 0x56, 0xa9, 0x06, 0xb6, 0x07, 0x23, 0x6b, 0xdc, 0xf3, 0x0f, 0x8b, 0x61, 0xf5, 0x2d, 0xd4, + 0xa1, 0x63, 0x86, 0x0e, 0xfe, 0x97, 0xf1, 0x63, 0xb4, 0x9d, 0xca, 0x4c, 0x4f, 0x39, 0xb3, 0xad, + 0x91, 0x35, 0xde, 0xf1, 0xfb, 0xc5, 0x71, 0xc2, 0xf0, 0x53, 0x84, 0x6a, 0x99, 0x33, 0x7b, 0xcb, + 0xcc, 0x76, 0xaa, 0x9b, 0x09, 0xc3, 0x43, 0x34, 0x68, 0x0a, 0xbb, 0xa6, 0xb0, 0x39, 0x7b, 0x17, + 0x57, 0x0b, 0xc7, 0xba, 0x5e, 0x38, 0xd6, 0xef, 0x85, 0x63, 0xfd, 0x5c, 0x3a, 0x9d, 0xeb, 0xa5, + 0xd3, 0xf9, 0xb5, 0x74, 0x3a, 0x9f, 0xde, 0x46, 0x5c, 0x5f, 0xce, 0x43, 0x97, 0xca, 0x84, 0x50, + 0xa9, 0x12, 0xa9, 0x08, 0x0f, 0xe9, 0x49, 0x24, 0x49, 0xfe, 0x86, 0x24, 0x92, 0xcd, 0x67, 0xa0, + 0xca, 0xc7, 0xf3, 0xf2, 0xf5, 0x49, 0xfd, 0x7e, 0xf4, 0x8f, 0x14, 0x54, 0xd8, 0x37, 0x6f, 0xe7, + 0xd5, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x3b, 0xcc, 0xcc, 0xae, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/modules/core/04-channel/types/tx.pb.go b/modules/core/04-channel/types/tx.pb.go index cd1d8fdb256..c285e22fee0 100644 --- a/modules/core/04-channel/types/tx.pb.go +++ b/modules/core/04-channel/types/tx.pb.go @@ -64,7 +64,7 @@ func (ResponseResultType) EnumDescriptor() ([]byte, []int) { // MsgChannelOpenInit defines an sdk.Msg to initialize a channel handshake. It // is called by a relayer on Chain A. type MsgChannelOpenInit struct { - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` Channel Channel `protobuf:"bytes,2,opt,name=channel,proto3" json:"channel"` Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -104,7 +104,7 @@ var xxx_messageInfo_MsgChannelOpenInit proto.InternalMessageInfo // MsgChannelOpenInitResponse defines the Msg/ChannelOpenInit response type. type MsgChannelOpenInitResponse struct { - ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + ChannelId string `protobuf:"bytes,1,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` Version string `protobuf:"bytes,2,opt,name=version,proto3" json:"version,omitempty"` } @@ -159,14 +159,14 @@ func (m *MsgChannelOpenInitResponse) GetVersion() string { // on Chain B. The version field within the Channel field has been deprecated. Its // value will be ignored by core IBC. type MsgChannelOpenTry struct { - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` // Deprecated: this field is unused. Crossing hello's are no longer supported in core IBC. - PreviousChannelId string `protobuf:"bytes,2,opt,name=previous_channel_id,json=previousChannelId,proto3" json:"previous_channel_id,omitempty" yaml:"previous_channel_id"` // Deprecated: Do not use. + PreviousChannelId string `protobuf:"bytes,2,opt,name=previous_channel_id,json=previousChannelId,proto3" json:"previous_channel_id,omitempty"` // Deprecated: Do not use. // NOTE: the version field within the channel has been deprecated. Its value will be ignored by core IBC. Channel Channel `protobuf:"bytes,3,opt,name=channel,proto3" json:"channel"` - CounterpartyVersion string `protobuf:"bytes,4,opt,name=counterparty_version,json=counterpartyVersion,proto3" json:"counterparty_version,omitempty" yaml:"counterparty_version"` - ProofInit []byte `protobuf:"bytes,5,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty" yaml:"proof_init"` - ProofHeight types.Height `protobuf:"bytes,6,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"` + CounterpartyVersion string `protobuf:"bytes,4,opt,name=counterparty_version,json=counterpartyVersion,proto3" json:"counterparty_version,omitempty"` + ProofInit []byte `protobuf:"bytes,5,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty"` + ProofHeight types.Height `protobuf:"bytes,6,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` Signer string `protobuf:"bytes,7,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -206,7 +206,7 @@ var xxx_messageInfo_MsgChannelOpenTry proto.InternalMessageInfo // MsgChannelOpenTryResponse defines the Msg/ChannelOpenTry response type. type MsgChannelOpenTryResponse struct { Version string `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` } func (m *MsgChannelOpenTryResponse) Reset() { *m = MsgChannelOpenTryResponse{} } @@ -259,12 +259,12 @@ func (m *MsgChannelOpenTryResponse) GetChannelId() string { // MsgChannelOpenAck defines a msg sent by a Relayer to Chain A to acknowledge // the change of channel state to TRYOPEN on Chain B. type MsgChannelOpenAck struct { - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` - CounterpartyChannelId string `protobuf:"bytes,3,opt,name=counterparty_channel_id,json=counterpartyChannelId,proto3" json:"counterparty_channel_id,omitempty" yaml:"counterparty_channel_id"` - CounterpartyVersion string `protobuf:"bytes,4,opt,name=counterparty_version,json=counterpartyVersion,proto3" json:"counterparty_version,omitempty" yaml:"counterparty_version"` - ProofTry []byte `protobuf:"bytes,5,opt,name=proof_try,json=proofTry,proto3" json:"proof_try,omitempty" yaml:"proof_try"` - ProofHeight types.Height `protobuf:"bytes,6,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` + CounterpartyChannelId string `protobuf:"bytes,3,opt,name=counterparty_channel_id,json=counterpartyChannelId,proto3" json:"counterparty_channel_id,omitempty"` + CounterpartyVersion string `protobuf:"bytes,4,opt,name=counterparty_version,json=counterpartyVersion,proto3" json:"counterparty_version,omitempty"` + ProofTry []byte `protobuf:"bytes,5,opt,name=proof_try,json=proofTry,proto3" json:"proof_try,omitempty"` + ProofHeight types.Height `protobuf:"bytes,6,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` Signer string `protobuf:"bytes,7,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -341,10 +341,10 @@ var xxx_messageInfo_MsgChannelOpenAckResponse proto.InternalMessageInfo // MsgChannelOpenConfirm defines a msg sent by a Relayer to Chain B to // acknowledge the change of channel state to OPEN on Chain A. type MsgChannelOpenConfirm struct { - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` - ProofAck []byte `protobuf:"bytes,3,opt,name=proof_ack,json=proofAck,proto3" json:"proof_ack,omitempty" yaml:"proof_ack"` - ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` + ProofAck []byte `protobuf:"bytes,3,opt,name=proof_ack,json=proofAck,proto3" json:"proof_ack,omitempty"` + ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` Signer string `protobuf:"bytes,5,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -422,8 +422,8 @@ var xxx_messageInfo_MsgChannelOpenConfirmResponse proto.InternalMessageInfo // MsgChannelCloseInit defines a msg sent by a Relayer to Chain A // to close a channel with Chain B. type MsgChannelCloseInit struct { - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -500,10 +500,10 @@ var xxx_messageInfo_MsgChannelCloseInitResponse proto.InternalMessageInfo // MsgChannelCloseConfirm defines a msg sent by a Relayer to Chain B // to acknowledge the change of channel state to CLOSED on Chain A. type MsgChannelCloseConfirm struct { - PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty" yaml:"port_id"` - ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty" yaml:"channel_id"` - ProofInit []byte `protobuf:"bytes,3,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty" yaml:"proof_init"` - ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"` + PortId string `protobuf:"bytes,1,opt,name=port_id,json=portId,proto3" json:"port_id,omitempty"` + ChannelId string `protobuf:"bytes,2,opt,name=channel_id,json=channelId,proto3" json:"channel_id,omitempty"` + ProofInit []byte `protobuf:"bytes,3,opt,name=proof_init,json=proofInit,proto3" json:"proof_init,omitempty"` + ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` Signer string `protobuf:"bytes,5,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -581,8 +581,8 @@ var xxx_messageInfo_MsgChannelCloseConfirmResponse proto.InternalMessageInfo // MsgRecvPacket receives incoming IBC packet type MsgRecvPacket struct { Packet Packet `protobuf:"bytes,1,opt,name=packet,proto3" json:"packet"` - ProofCommitment []byte `protobuf:"bytes,2,opt,name=proof_commitment,json=proofCommitment,proto3" json:"proof_commitment,omitempty" yaml:"proof_commitment"` - ProofHeight types.Height `protobuf:"bytes,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"` + ProofCommitment []byte `protobuf:"bytes,2,opt,name=proof_commitment,json=proofCommitment,proto3" json:"proof_commitment,omitempty"` + ProofHeight types.Height `protobuf:"bytes,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` Signer string `protobuf:"bytes,4,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -660,9 +660,9 @@ var xxx_messageInfo_MsgRecvPacketResponse proto.InternalMessageInfo // MsgTimeout receives timed-out packet type MsgTimeout struct { Packet Packet `protobuf:"bytes,1,opt,name=packet,proto3" json:"packet"` - ProofUnreceived []byte `protobuf:"bytes,2,opt,name=proof_unreceived,json=proofUnreceived,proto3" json:"proof_unreceived,omitempty" yaml:"proof_unreceived"` - ProofHeight types.Height `protobuf:"bytes,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"` - NextSequenceRecv uint64 `protobuf:"varint,4,opt,name=next_sequence_recv,json=nextSequenceRecv,proto3" json:"next_sequence_recv,omitempty" yaml:"next_sequence_recv"` + ProofUnreceived []byte `protobuf:"bytes,2,opt,name=proof_unreceived,json=proofUnreceived,proto3" json:"proof_unreceived,omitempty"` + ProofHeight types.Height `protobuf:"bytes,3,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` + NextSequenceRecv uint64 `protobuf:"varint,4,opt,name=next_sequence_recv,json=nextSequenceRecv,proto3" json:"next_sequence_recv,omitempty"` Signer string `protobuf:"bytes,5,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -740,10 +740,10 @@ var xxx_messageInfo_MsgTimeoutResponse proto.InternalMessageInfo // MsgTimeoutOnClose timed-out packet upon counterparty channel closure. type MsgTimeoutOnClose struct { Packet Packet `protobuf:"bytes,1,opt,name=packet,proto3" json:"packet"` - ProofUnreceived []byte `protobuf:"bytes,2,opt,name=proof_unreceived,json=proofUnreceived,proto3" json:"proof_unreceived,omitempty" yaml:"proof_unreceived"` - ProofClose []byte `protobuf:"bytes,3,opt,name=proof_close,json=proofClose,proto3" json:"proof_close,omitempty" yaml:"proof_close"` - ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"` - NextSequenceRecv uint64 `protobuf:"varint,5,opt,name=next_sequence_recv,json=nextSequenceRecv,proto3" json:"next_sequence_recv,omitempty" yaml:"next_sequence_recv"` + ProofUnreceived []byte `protobuf:"bytes,2,opt,name=proof_unreceived,json=proofUnreceived,proto3" json:"proof_unreceived,omitempty"` + ProofClose []byte `protobuf:"bytes,3,opt,name=proof_close,json=proofClose,proto3" json:"proof_close,omitempty"` + ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` + NextSequenceRecv uint64 `protobuf:"varint,5,opt,name=next_sequence_recv,json=nextSequenceRecv,proto3" json:"next_sequence_recv,omitempty"` Signer string `protobuf:"bytes,6,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -822,8 +822,8 @@ var xxx_messageInfo_MsgTimeoutOnCloseResponse proto.InternalMessageInfo type MsgAcknowledgement struct { Packet Packet `protobuf:"bytes,1,opt,name=packet,proto3" json:"packet"` Acknowledgement []byte `protobuf:"bytes,2,opt,name=acknowledgement,proto3" json:"acknowledgement,omitempty"` - ProofAcked []byte `protobuf:"bytes,3,opt,name=proof_acked,json=proofAcked,proto3" json:"proof_acked,omitempty" yaml:"proof_acked"` - ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height" yaml:"proof_height"` + ProofAcked []byte `protobuf:"bytes,3,opt,name=proof_acked,json=proofAcked,proto3" json:"proof_acked,omitempty"` + ProofHeight types.Height `protobuf:"bytes,4,opt,name=proof_height,json=proofHeight,proto3" json:"proof_height"` Signer string `protobuf:"bytes,5,opt,name=signer,proto3" json:"signer,omitempty"` } @@ -925,89 +925,80 @@ func init() { func init() { proto.RegisterFile("ibc/core/channel/v1/tx.proto", fileDescriptor_bc4637e0ac3fc7b7) } var fileDescriptor_bc4637e0ac3fc7b7 = []byte{ - // 1300 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xdf, 0x6f, 0xda, 0xd6, - 0x17, 0xc7, 0x40, 0x21, 0x39, 0xf4, 0x9b, 0x10, 0x93, 0xa4, 0xc4, 0x24, 0x98, 0xaf, 0x1f, 0x9a, - 0x28, 0x53, 0xa0, 0x49, 0x3b, 0x55, 0x8d, 0x26, 0x4d, 0x81, 0x51, 0x2d, 0xda, 0x92, 0x20, 0x43, - 0x26, 0x2d, 0x9b, 0x86, 0xc0, 0xdc, 0x12, 0x0b, 0xb0, 0x99, 0x6d, 0x68, 0xf9, 0x0f, 0xaa, 0x3c, - 0xf5, 0xb9, 0x52, 0xa4, 0x4e, 0x7b, 0x9a, 0xf6, 0xd0, 0xfd, 0x19, 0x7d, 0xec, 0xdb, 0xaa, 0x3d, - 0xa0, 0x29, 0x79, 0xd9, 0x33, 0x7f, 0xc1, 0xe4, 0xeb, 0x6b, 0x63, 0xc0, 0x56, 0x9c, 0x34, 0x49, - 0xf7, 0x76, 0xef, 0x3d, 0x9f, 0x7b, 0xce, 0xb9, 0x9f, 0xf3, 0xb9, 0x3f, 0x6c, 0x58, 0x16, 0xab, - 0x42, 0x46, 0x90, 0x15, 0x94, 0x11, 0x8e, 0x2b, 0x92, 0x84, 0x9a, 0x99, 0xee, 0x66, 0x46, 0x7b, - 0x91, 0x6e, 0x2b, 0xb2, 0x26, 0xd3, 0x31, 0xb1, 0x2a, 0xa4, 0x75, 0x6b, 0x9a, 0x58, 0xd3, 0xdd, - 0x4d, 0x66, 0xbe, 0x2e, 0xd7, 0x65, 0x6c, 0xcf, 0xe8, 0x2d, 0x03, 0xca, 0xb0, 0x43, 0x47, 0x4d, - 0x11, 0x49, 0x9a, 0xee, 0xc7, 0x68, 0x11, 0xc0, 0xff, 0x9d, 0x22, 0x99, 0x6e, 0x31, 0x84, 0xfb, - 0x85, 0x02, 0x7a, 0x4f, 0xad, 0xe7, 0x8c, 0xc1, 0x83, 0x36, 0x92, 0x76, 0x25, 0x51, 0xa3, 0x3f, - 0x83, 0x70, 0x5b, 0x56, 0xb4, 0xb2, 0x58, 0x8b, 0x53, 0x29, 0x6a, 0x6d, 0x3a, 0x4b, 0x0f, 0xfa, - 0xec, 0x4c, 0xaf, 0xd2, 0x6a, 0x6e, 0x73, 0xc4, 0xc0, 0xf1, 0x21, 0xbd, 0xb5, 0x5b, 0xa3, 0xbf, - 0x80, 0x30, 0x71, 0x1a, 0xf7, 0xa7, 0xa8, 0xb5, 0xc8, 0xd6, 0x72, 0xda, 0x61, 0x11, 0x69, 0x12, - 0x23, 0x1b, 0x7c, 0xd7, 0x67, 0x7d, 0xbc, 0x39, 0x85, 0x5e, 0x84, 0x90, 0x2a, 0xd6, 0x25, 0xa4, - 0xc4, 0x03, 0x7a, 0x24, 0x9e, 0xf4, 0xb6, 0xa7, 0x5e, 0xbe, 0x61, 0x7d, 0xff, 0xbc, 0x61, 0x7d, - 0x5c, 0x13, 0x98, 0xc9, 0x14, 0x79, 0xa4, 0xb6, 0x65, 0x49, 0x45, 0xf4, 0x23, 0x00, 0xe2, 0x6a, - 0x98, 0xed, 0xc2, 0xa0, 0xcf, 0xce, 0x19, 0xd9, 0x0e, 0x6d, 0x1c, 0x3f, 0x4d, 0x3a, 0xbb, 0x35, - 0x3a, 0x0e, 0xe1, 0x2e, 0x52, 0x54, 0x51, 0x96, 0x70, 0xce, 0xd3, 0xbc, 0xd9, 0xe5, 0x3e, 0x04, - 0x60, 0x6e, 0x34, 0x5c, 0x49, 0xe9, 0x5d, 0x8e, 0x90, 0x02, 0xc4, 0xda, 0x0a, 0xea, 0x8a, 0x72, - 0x47, 0x2d, 0xdb, 0x72, 0xc3, 0x81, 0xb2, 0xa9, 0x41, 0x9f, 0x65, 0xc8, 0xc4, 0x49, 0x10, 0x17, - 0xa7, 0xf8, 0x39, 0x73, 0x3c, 0x67, 0xa5, 0x6b, 0xa3, 0x38, 0x70, 0x79, 0x8a, 0x79, 0x98, 0x17, - 0xe4, 0x8e, 0xa4, 0x21, 0xa5, 0x5d, 0x51, 0xb4, 0x5e, 0xd9, 0x5c, 0x79, 0x10, 0x27, 0xc4, 0x0e, - 0xfa, 0x6c, 0x82, 0x90, 0xe5, 0x80, 0xe2, 0xf8, 0x98, 0x7d, 0xf8, 0x3b, 0x63, 0x54, 0xa7, 0xbd, - 0xad, 0xc8, 0xf2, 0xb3, 0xb2, 0x28, 0x89, 0x5a, 0xfc, 0x4e, 0x8a, 0x5a, 0xbb, 0x6b, 0xa7, 0x7d, - 0x68, 0xe3, 0xf8, 0x69, 0xdc, 0xc1, 0xba, 0x3a, 0x82, 0xbb, 0x86, 0xe5, 0x18, 0x89, 0xf5, 0x63, - 0x2d, 0x1e, 0xc2, 0x8b, 0x61, 0x6c, 0x8b, 0x31, 0xf4, 0xdb, 0xdd, 0x4c, 0x7f, 0x8d, 0x11, 0xd9, - 0x84, 0xbe, 0x94, 0x41, 0x9f, 0x8d, 0xd9, 0xfd, 0x1a, 0xb3, 0x39, 0x3e, 0x82, 0xbb, 0x06, 0xd2, - 0x26, 0xa4, 0xb0, 0x8b, 0x90, 0x1a, 0xb0, 0x34, 0x51, 0x59, 0x4b, 0x47, 0x36, 0x45, 0x50, 0x23, - 0x8a, 0x18, 0x53, 0x98, 0xdf, 0x9b, 0xc2, 0xb8, 0x3f, 0x27, 0x74, 0xb4, 0x23, 0x34, 0x2e, 0xa7, - 0xa3, 0x2b, 0x05, 0xa6, 0x8f, 0xe0, 0xde, 0x48, 0x1d, 0x6d, 0x2e, 0xf0, 0x0e, 0xcb, 0x72, 0x83, - 0x3e, 0x9b, 0x74, 0x28, 0xb8, 0xdd, 0xdf, 0x82, 0xdd, 0x32, 0xd4, 0xe1, 0x4d, 0x28, 0x69, 0x13, - 0x0c, 0x81, 0x94, 0x35, 0xa5, 0x47, 0x84, 0x34, 0x3f, 0xe8, 0xb3, 0x51, 0x7b, 0xc1, 0x35, 0xa5, - 0xc7, 0xf1, 0x53, 0xb8, 0xad, 0xef, 0xc6, 0x4f, 0x2b, 0xa3, 0xc4, 0xb8, 0x8c, 0x76, 0x84, 0x86, - 0x29, 0x23, 0xee, 0x77, 0x3f, 0x2c, 0x8c, 0x5a, 0x73, 0xb2, 0xf4, 0x4c, 0x54, 0x5a, 0xb7, 0x51, - 0x7a, 0x8b, 0xca, 0x8a, 0xd0, 0xc0, 0xc5, 0x76, 0xa0, 0xb2, 0x22, 0x34, 0x4c, 0x2a, 0x75, 0x41, - 0x8e, 0x53, 0x19, 0xbc, 0x11, 0x2a, 0xef, 0xb8, 0x50, 0xc9, 0xc2, 0x8a, 0x23, 0x59, 0x16, 0x9d, - 0xaf, 0x29, 0x88, 0x0d, 0x11, 0xb9, 0xa6, 0xac, 0xa2, 0xcb, 0x5f, 0x50, 0x57, 0x23, 0xf3, 0xe2, - 0x8b, 0x69, 0x05, 0x12, 0x0e, 0xb9, 0x59, 0xb9, 0xbf, 0xf5, 0xc3, 0xe2, 0x98, 0xfd, 0x16, 0xb5, - 0x30, 0x7a, 0x40, 0x07, 0xae, 0x78, 0x40, 0xdf, 0xae, 0x1c, 0x52, 0x90, 0x74, 0x26, 0xcc, 0xe2, - 0xf4, 0x95, 0x1f, 0xfe, 0xb7, 0xa7, 0xd6, 0x79, 0x24, 0x74, 0x0b, 0x15, 0xa1, 0x81, 0x34, 0xfa, - 0x09, 0x84, 0xda, 0xb8, 0x85, 0x99, 0x8c, 0x6c, 0x25, 0x1c, 0x6f, 0x46, 0x03, 0x4c, 0x2e, 0x46, - 0x32, 0x81, 0x7e, 0x0a, 0x51, 0x23, 0x5d, 0x41, 0x6e, 0xb5, 0x44, 0xad, 0x85, 0x24, 0x0d, 0xd3, - 0x7b, 0x37, 0x9b, 0x18, 0xf4, 0xd9, 0x7b, 0xf6, 0x05, 0x0d, 0x11, 0x1c, 0x3f, 0x8b, 0x87, 0x72, - 0xd6, 0xc8, 0x04, 0x69, 0x81, 0x1b, 0x21, 0x2d, 0xe8, 0x42, 0xda, 0x4f, 0xf8, 0xc0, 0x19, 0x32, - 0x62, 0xdd, 0x68, 0x5f, 0x42, 0x48, 0x41, 0x6a, 0xa7, 0x69, 0x30, 0x33, 0xb3, 0xb5, 0xea, 0xc8, - 0x8c, 0x09, 0xe7, 0x31, 0xb4, 0xd4, 0x6b, 0x23, 0x9e, 0x4c, 0xdb, 0x0e, 0xea, 0x31, 0xb8, 0xbf, - 0xfc, 0x00, 0x7b, 0x6a, 0xbd, 0x24, 0xb6, 0x90, 0xdc, 0xb9, 0x1e, 0xbe, 0x3b, 0x92, 0x82, 0x04, - 0x24, 0x76, 0x51, 0xcd, 0x8d, 0xef, 0x21, 0xc2, 0xe4, 0xfb, 0xd0, 0x1a, 0xb9, 0x51, 0xbe, 0xbf, - 0x01, 0x5a, 0x42, 0x2f, 0xb4, 0xb2, 0x8a, 0x7e, 0xee, 0x20, 0x49, 0x40, 0x65, 0x05, 0x09, 0x5d, - 0xcc, 0x7d, 0x30, 0xbb, 0x32, 0xe8, 0xb3, 0x4b, 0x86, 0x87, 0x49, 0x0c, 0xc7, 0x47, 0xf5, 0xc1, - 0x22, 0x19, 0xd3, 0xeb, 0xe1, 0x41, 0xf1, 0x3f, 0xe0, 0xe7, 0x37, 0xe1, 0xf6, 0xba, 0x2b, 0xf7, - 0xda, 0x78, 0x82, 0x10, 0xef, 0x07, 0x12, 0xde, 0x51, 0xff, 0x85, 0x02, 0x3e, 0x86, 0x08, 0xd9, - 0x56, 0x7a, 0x46, 0xe4, 0x70, 0x5a, 0x1c, 0xf4, 0x59, 0x7a, 0x64, 0xcf, 0xe9, 0x46, 0x8e, 0x37, - 0x8e, 0x31, 0x23, 0xf7, 0x9b, 0x3c, 0x9e, 0x9c, 0x2b, 0x7f, 0xe7, 0x63, 0x2b, 0x1f, 0x72, 0xa9, - 0x7c, 0x15, 0xbf, 0x22, 0x46, 0x6b, 0x73, 0xdd, 0x02, 0xf8, 0xc3, 0x8f, 0xe5, 0xb5, 0x23, 0x34, - 0x24, 0xf9, 0x79, 0x13, 0xd5, 0xea, 0x08, 0x9f, 0x57, 0x1f, 0xa1, 0x80, 0x35, 0x98, 0xad, 0x8c, - 0x7a, 0x33, 0x04, 0xc0, 0x8f, 0x0f, 0x0f, 0x6b, 0xac, 0x4f, 0xac, 0xb9, 0xd5, 0x18, 0x1b, 0xcd, - 0x1a, 0xef, 0xe8, 0x9d, 0x4f, 0x7c, 0x05, 0x09, 0xf8, 0x63, 0x73, 0x8c, 0xb1, 0x6b, 0xae, 0xcb, - 0xfa, 0x6f, 0x14, 0xd0, 0x93, 0x20, 0xfa, 0x73, 0x48, 0xf1, 0xf9, 0x62, 0xe1, 0x60, 0xbf, 0x98, - 0x2f, 0xf3, 0xf9, 0xe2, 0xe1, 0xb7, 0xa5, 0x72, 0xe9, 0xfb, 0x42, 0xbe, 0x7c, 0xb8, 0x5f, 0x2c, - 0xe4, 0x73, 0xbb, 0x4f, 0x77, 0xf3, 0x5f, 0x45, 0x7d, 0xcc, 0xec, 0xc9, 0x69, 0x2a, 0x62, 0x1b, - 0xa2, 0x57, 0x61, 0xc9, 0x71, 0xda, 0xfe, 0xc1, 0x41, 0x21, 0x4a, 0x31, 0x53, 0x27, 0xa7, 0xa9, - 0xa0, 0xde, 0xa6, 0x37, 0x60, 0xd9, 0x11, 0x58, 0x3c, 0xcc, 0xe5, 0xf2, 0xc5, 0x62, 0xd4, 0xcf, - 0x44, 0x4e, 0x4e, 0x53, 0x61, 0xd2, 0x65, 0x82, 0x2f, 0x7f, 0x4d, 0xfa, 0xb6, 0xde, 0x4e, 0x41, - 0x60, 0x4f, 0xad, 0xd3, 0x0d, 0x98, 0x1d, 0xff, 0x4b, 0xe0, 0xbc, 0xfa, 0xc9, 0x6f, 0x75, 0x26, - 0xe3, 0x11, 0x68, 0xf1, 0x7c, 0x0c, 0x33, 0x63, 0x1f, 0xe0, 0xf7, 0x3d, 0xb8, 0x28, 0x29, 0x3d, - 0x26, 0xed, 0x0d, 0xe7, 0x12, 0x49, 0x7f, 0x11, 0x7b, 0x89, 0xb4, 0x23, 0x34, 0x3c, 0x45, 0xb2, - 0x7d, 0x19, 0xd0, 0x1a, 0xd0, 0x0e, 0x5f, 0x05, 0xeb, 0x1e, 0xbc, 0x10, 0x2c, 0xb3, 0xe5, 0x1d, - 0x6b, 0x45, 0x95, 0x20, 0x3a, 0xf1, 0x78, 0x5e, 0xbb, 0xc0, 0x8f, 0x85, 0x64, 0x1e, 0x78, 0x45, - 0x5a, 0xf1, 0x9e, 0x43, 0xcc, 0xf1, 0xc1, 0xeb, 0xc5, 0x91, 0xb9, 0xce, 0x87, 0x97, 0x00, 0x5b, - 0x81, 0x7f, 0x04, 0xb0, 0xbd, 0x0a, 0x39, 0x37, 0x17, 0x43, 0x0c, 0xb3, 0x7e, 0x31, 0xc6, 0xf2, - 0x5e, 0x84, 0xb0, 0xf9, 0x00, 0x62, 0xdd, 0xa6, 0x11, 0x00, 0xb3, 0x7a, 0x01, 0xc0, 0xae, 0xbd, - 0xb1, 0xbb, 0xf9, 0xfe, 0x05, 0x53, 0x09, 0xce, 0x5d, 0x7b, 0x2e, 0xf7, 0x49, 0x03, 0x66, 0xc7, - 0x2f, 0x01, 0xd7, 0x2c, 0xc7, 0x80, 0xee, 0x9b, 0xd7, 0xe5, 0x90, 0xcc, 0x16, 0xdf, 0x9d, 0x25, - 0xa9, 0xf7, 0x67, 0x49, 0xea, 0xef, 0xb3, 0x24, 0xf5, 0xea, 0x3c, 0xe9, 0x7b, 0x7f, 0x9e, 0xf4, - 0x7d, 0x38, 0x4f, 0xfa, 0x8e, 0x9e, 0xd4, 0x45, 0xed, 0xb8, 0x53, 0x4d, 0x0b, 0x72, 0x2b, 0x23, - 0xc8, 0x6a, 0x4b, 0x56, 0x33, 0x62, 0x55, 0xd8, 0xa8, 0xcb, 0x99, 0xee, 0xe3, 0x4c, 0x4b, 0xae, - 0x75, 0x9a, 0x48, 0x35, 0x7e, 0x58, 0x3e, 0x78, 0xb4, 0x61, 0xfe, 0xb3, 0xd4, 0x7a, 0x6d, 0xa4, - 0x56, 0x43, 0xf8, 0x7f, 0xe5, 0xc3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x02, 0xf0, 0xc5, 0x4c, - 0x3e, 0x15, 0x00, 0x00, + // 1166 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcb, 0x6e, 0xdb, 0x46, + 0x17, 0x16, 0x65, 0x59, 0xb2, 0x8f, 0xfc, 0xc7, 0x0a, 0x9d, 0x8b, 0x42, 0xdb, 0x92, 0x7e, 0x2d, + 0x62, 0xd7, 0xad, 0xa5, 0x58, 0xe9, 0x05, 0x09, 0x0a, 0x14, 0xb6, 0xaa, 0xa2, 0x06, 0xea, 0x0b, + 0x28, 0xb9, 0x40, 0x2f, 0x28, 0x61, 0x8d, 0x26, 0x34, 0x21, 0x89, 0xc3, 0x92, 0x94, 0x12, 0x2d, + 0xbb, 0x6a, 0x60, 0xa0, 0x40, 0x5f, 0xc0, 0x40, 0x80, 0xae, 0xba, 0xca, 0xbe, 0x4f, 0x90, 0x65, + 0x80, 0x02, 0x6d, 0x17, 0x45, 0x51, 0xd8, 0x9b, 0x3e, 0x46, 0xc1, 0xe1, 0x90, 0xa2, 0x28, 0x32, + 0x62, 0x62, 0xd5, 0x3b, 0xf2, 0x9c, 0x6f, 0xce, 0xe5, 0xfb, 0xe6, 0x46, 0xc2, 0x8a, 0xd2, 0x44, + 0x65, 0x44, 0x74, 0x5c, 0x46, 0x27, 0xc7, 0xaa, 0x8a, 0x3b, 0xe5, 0xfe, 0x56, 0xd9, 0x7c, 0x52, + 0xd2, 0x74, 0x62, 0x12, 0x7e, 0x49, 0x69, 0xa2, 0x92, 0xe5, 0x2d, 0x31, 0x6f, 0xa9, 0xbf, 0x25, + 0xdc, 0x90, 0x89, 0x4c, 0xa8, 0xbf, 0x6c, 0x3d, 0xd9, 0x50, 0x21, 0x3f, 0x0c, 0xd4, 0x51, 0xb0, + 0x6a, 0x5a, 0x71, 0xec, 0x27, 0x06, 0xf8, 0x7f, 0x50, 0x26, 0x27, 0x2c, 0x85, 0x14, 0x7f, 0xe0, + 0x80, 0xdf, 0x33, 0xe4, 0xaa, 0x6d, 0x3c, 0xd0, 0xb0, 0xba, 0xab, 0x2a, 0x26, 0x7f, 0x1b, 0x52, + 0x1a, 0xd1, 0x4d, 0x49, 0x69, 0x65, 0xb9, 0x02, 0xb7, 0x3e, 0x2f, 0x26, 0xad, 0xd7, 0xdd, 0x16, + 0xff, 0x21, 0xa4, 0x58, 0x80, 0x6c, 0xbc, 0xc0, 0xad, 0xa7, 0x2b, 0x2b, 0xa5, 0x80, 0x82, 0x4b, + 0x2c, 0xde, 0x4e, 0xe2, 0xc5, 0x5f, 0xf9, 0x98, 0xe8, 0x0c, 0xe1, 0x6f, 0x41, 0xd2, 0x50, 0x64, + 0x15, 0xeb, 0xd9, 0x19, 0x3b, 0xaa, 0xfd, 0xf6, 0x70, 0xee, 0xe9, 0xb3, 0x7c, 0xec, 0x9f, 0x67, + 0xf9, 0x58, 0xf1, 0x08, 0x84, 0xf1, 0x72, 0x44, 0x6c, 0x68, 0x44, 0x35, 0x30, 0xbf, 0x0a, 0xc0, + 0x42, 0x0d, 0x2b, 0x9b, 0x67, 0x96, 0xdd, 0x16, 0x9f, 0x85, 0x54, 0x1f, 0xeb, 0x86, 0x42, 0x54, + 0x5a, 0xdc, 0xbc, 0xe8, 0xbc, 0x16, 0x7f, 0x8f, 0xc3, 0xf5, 0xd1, 0xb8, 0x0d, 0x7d, 0x10, 0xde, + 0x65, 0x05, 0x96, 0x34, 0x1d, 0xf7, 0x15, 0xd2, 0x33, 0x24, 0x4f, 0x42, 0x1a, 0x74, 0x27, 0x9e, + 0xe5, 0xc4, 0xeb, 0x8e, 0xbb, 0xea, 0x26, 0xf7, 0x30, 0x33, 0xf3, 0xfa, 0xcc, 0x6c, 0xc1, 0x0d, + 0x44, 0x7a, 0xaa, 0x89, 0x75, 0xed, 0x58, 0x37, 0x07, 0x92, 0xd3, 0x47, 0x82, 0xd6, 0xb5, 0xe4, + 0xf5, 0x7d, 0x6e, 0xbb, 0x2c, 0x32, 0x34, 0x9d, 0x90, 0x47, 0x92, 0xa2, 0x2a, 0x66, 0x76, 0xb6, + 0xc0, 0xad, 0x2f, 0x88, 0xf3, 0xd4, 0x42, 0x25, 0xac, 0xc2, 0x82, 0xed, 0x3e, 0xc1, 0x8a, 0x7c, + 0x62, 0x66, 0x93, 0xb4, 0x28, 0xc1, 0x53, 0x94, 0x3d, 0x55, 0xfa, 0x5b, 0xa5, 0x4f, 0x29, 0x82, + 0x95, 0x94, 0xa6, 0xa3, 0x6c, 0x93, 0x47, 0xb0, 0x54, 0x88, 0x60, 0x0d, 0xb8, 0x33, 0x46, 0xac, + 0xab, 0x97, 0x47, 0x10, 0x6e, 0x44, 0x10, 0x9f, 0x92, 0x71, 0x9f, 0x92, 0xc5, 0x5f, 0xc6, 0xf4, + 0xda, 0x46, 0xed, 0x70, 0xbd, 0x5e, 0x1d, 0x8d, 0x7f, 0x1f, 0x6e, 0x8f, 0x90, 0xeb, 0xc1, 0xda, + 0xf3, 0xf0, 0xa6, 0xd7, 0x3d, 0x94, 0xf4, 0x0d, 0x44, 0x59, 0x06, 0x5b, 0x02, 0xc9, 0xd4, 0x07, + 0x4c, 0x93, 0x39, 0x6a, 0xb0, 0xe6, 0xdb, 0x15, 0x49, 0xb2, 0xec, 0x97, 0x64, 0x1b, 0xb5, 0x1d, + 0x49, 0x8a, 0xbf, 0x72, 0x70, 0x73, 0xd4, 0x5b, 0x25, 0xea, 0x23, 0x45, 0xef, 0xbe, 0x31, 0xbb, + 0x6e, 0xcb, 0xc7, 0xa8, 0x4d, 0xf9, 0x74, 0x5a, 0xb6, 0x24, 0xf3, 0xb7, 0x9c, 0xb8, 0x5c, 0xcb, + 0xb3, 0x21, 0x2d, 0xe7, 0x61, 0x35, 0xb0, 0x29, 0xb7, 0x6d, 0x02, 0x4b, 0x43, 0x40, 0xb5, 0x43, + 0x0c, 0xfc, 0xea, 0x7d, 0x6e, 0x42, 0xcf, 0x93, 0x37, 0xb2, 0x55, 0x58, 0x0e, 0x48, 0xe8, 0xd6, + 0xf3, 0x1b, 0x07, 0xb7, 0x7c, 0xfe, 0xcb, 0xea, 0x30, 0xba, 0x1f, 0xcc, 0x4c, 0xda, 0x0f, 0xfe, + 0x23, 0x25, 0x0a, 0x90, 0x0b, 0xee, 0xcb, 0x6d, 0xfd, 0x4f, 0x0e, 0xfe, 0xb7, 0x67, 0xc8, 0x22, + 0x46, 0xfd, 0xc3, 0x63, 0xd4, 0xc6, 0x26, 0xff, 0x00, 0x92, 0x1a, 0x7d, 0xa2, 0x0d, 0xa7, 0x2b, + 0xcb, 0x81, 0x3b, 0xa7, 0x0d, 0x66, 0x55, 0xb1, 0x01, 0xfc, 0x5b, 0x90, 0xb1, 0xbb, 0x42, 0xa4, + 0xdb, 0x55, 0xcc, 0x2e, 0x56, 0x4d, 0xca, 0xcc, 0x82, 0xb8, 0x48, 0xed, 0x55, 0xd7, 0x3c, 0x46, + 0xc0, 0xcc, 0xe5, 0x08, 0x48, 0x84, 0x10, 0xf0, 0x0d, 0x5d, 0x5f, 0xc3, 0xee, 0xdc, 0xcd, 0xf0, + 0x23, 0x48, 0xea, 0xd8, 0xe8, 0x75, 0xec, 0x2e, 0xaf, 0x55, 0xd6, 0x02, 0xbb, 0x74, 0xe0, 0x22, + 0x85, 0x36, 0x06, 0x1a, 0x16, 0xd9, 0xb0, 0x87, 0x09, 0x2b, 0x47, 0xf1, 0xfb, 0x38, 0xc0, 0x9e, + 0x21, 0x37, 0x94, 0x2e, 0x26, 0xbd, 0xe9, 0x70, 0xd7, 0x53, 0x75, 0x8c, 0xb0, 0xd2, 0xc7, 0xad, + 0x11, 0xee, 0x8e, 0x5c, 0xf3, 0x74, 0xb8, 0x7b, 0x07, 0x78, 0x15, 0x3f, 0x31, 0x25, 0x03, 0x7f, + 0xdb, 0xc3, 0x2a, 0xc2, 0x92, 0x8e, 0x51, 0x9f, 0xf2, 0x98, 0x10, 0x33, 0x96, 0xa7, 0xce, 0x1c, + 0x16, 0x79, 0x11, 0xa6, 0xda, 0x57, 0xf4, 0xea, 0xc2, 0x88, 0x98, 0x36, 0xcd, 0xcf, 0xed, 0x13, + 0x88, 0x45, 0x3f, 0x50, 0xe9, 0x54, 0xbe, 0x22, 0xb6, 0xf3, 0x90, 0x66, 0x93, 0xda, 0x4a, 0xca, + 0x96, 0xb2, 0xbd, 0xb8, 0xed, 0x32, 0xa6, 0xb2, 0x96, 0x83, 0xe5, 0x98, 0x9d, 0x28, 0x47, 0x32, + 0x44, 0x8e, 0x26, 0x3d, 0x76, 0x46, 0x09, 0x9b, 0xb6, 0x2a, 0xdf, 0xc5, 0xa9, 0xe6, 0xdb, 0xa8, + 0xad, 0x92, 0xc7, 0x1d, 0xdc, 0x92, 0x31, 0x5d, 0xda, 0x97, 0x90, 0x65, 0x1d, 0x16, 0x8f, 0x47, + 0xa3, 0x39, 0xaa, 0xf8, 0xcc, 0x43, 0x55, 0xac, 0x81, 0xad, 0x11, 0x55, 0xb6, 0x2d, 0xcb, 0x55, + 0xed, 0xb0, 0x88, 0x5e, 0x91, 0x7d, 0x14, 0x4c, 0x99, 0xe8, 0x8d, 0x9f, 0x39, 0xe0, 0xc7, 0x41, + 0xfc, 0x7b, 0x50, 0x10, 0x6b, 0xf5, 0xc3, 0x83, 0xfd, 0x7a, 0x4d, 0x12, 0x6b, 0xf5, 0xa3, 0xcf, + 0x1a, 0x52, 0xe3, 0x8b, 0xc3, 0x9a, 0x74, 0xb4, 0x5f, 0x3f, 0xac, 0x55, 0x77, 0x3f, 0xd9, 0xad, + 0x7d, 0x9c, 0x89, 0x09, 0x8b, 0xa7, 0x67, 0x85, 0xb4, 0xc7, 0xc4, 0xaf, 0xc1, 0x9d, 0xc0, 0x61, + 0xfb, 0x07, 0x07, 0x87, 0x19, 0x4e, 0x98, 0x3b, 0x3d, 0x2b, 0x24, 0xac, 0x67, 0x7e, 0x13, 0x56, + 0x02, 0x81, 0xf5, 0xa3, 0x6a, 0xb5, 0x56, 0xaf, 0x67, 0xe2, 0x42, 0xfa, 0xf4, 0xac, 0x90, 0x62, + 0xaf, 0x42, 0xe2, 0xe9, 0x4f, 0xb9, 0x58, 0xe5, 0xf9, 0x1c, 0xcc, 0xec, 0x19, 0x32, 0xdf, 0x86, + 0x45, 0xff, 0x77, 0x4c, 0x70, 0xf7, 0xe3, 0x5f, 0x18, 0x42, 0x39, 0x22, 0xd0, 0xe5, 0xf9, 0x04, + 0xae, 0xf9, 0xbe, 0x26, 0xee, 0x46, 0x08, 0xd1, 0xd0, 0x07, 0x42, 0x29, 0x1a, 0x2e, 0x24, 0x93, + 0x75, 0xa9, 0x8a, 0x92, 0x69, 0x1b, 0xb5, 0x23, 0x65, 0xf2, 0xdc, 0x0d, 0x79, 0x13, 0xf8, 0x80, + 0x7b, 0xe1, 0x46, 0x84, 0x28, 0x0c, 0x2b, 0x54, 0xa2, 0x63, 0xdd, 0xac, 0x2a, 0x64, 0xc6, 0xee, + 0x65, 0xeb, 0x13, 0xe2, 0xb8, 0x48, 0xe1, 0x5e, 0x54, 0xa4, 0x9b, 0xef, 0x31, 0x2c, 0x05, 0x5d, + 0xbb, 0xde, 0x8e, 0x12, 0xc8, 0xe9, 0xf3, 0xfe, 0x6b, 0x80, 0xdd, 0xc4, 0x5f, 0x03, 0x78, 0x2e, + 0x3d, 0xc5, 0xb0, 0x10, 0x43, 0x8c, 0xb0, 0x31, 0x19, 0xe3, 0x46, 0xaf, 0x43, 0xca, 0xb9, 0x13, + 0xe4, 0xc3, 0x86, 0x31, 0x80, 0xb0, 0x36, 0x01, 0xe0, 0x9d, 0x7b, 0xbe, 0x13, 0xf0, 0xee, 0x84, + 0xa1, 0x0c, 0x17, 0x3e, 0xf7, 0x42, 0x0e, 0x88, 0x36, 0x2c, 0xfa, 0x77, 0xf5, 0xd0, 0x2a, 0x7d, + 0xc0, 0xf0, 0xc5, 0x1b, 0xb2, 0x49, 0xee, 0xd4, 0x5f, 0x9c, 0xe7, 0xb8, 0x97, 0xe7, 0x39, 0xee, + 0xef, 0xf3, 0x1c, 0xf7, 0xe3, 0x45, 0x2e, 0xf6, 0xf2, 0x22, 0x17, 0xfb, 0xe3, 0x22, 0x17, 0xfb, + 0xf2, 0x81, 0xac, 0x98, 0x27, 0xbd, 0x66, 0x09, 0x91, 0x6e, 0x19, 0x11, 0xa3, 0x4b, 0x8c, 0xb2, + 0xd2, 0x44, 0x9b, 0x32, 0x29, 0xf7, 0x3f, 0x28, 0x77, 0x49, 0xab, 0xd7, 0xc1, 0x86, 0xfd, 0x4b, + 0xe5, 0xde, 0xbb, 0x9b, 0xce, 0x5f, 0x15, 0x73, 0xa0, 0x61, 0xa3, 0x99, 0xa4, 0x7f, 0x54, 0xee, + 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x55, 0x0e, 0xc5, 0x69, 0xe0, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/core/23-commitment/types/commitment.pb.go b/modules/core/23-commitment/types/commitment.pb.go index 190710ffbe1..06bb149a828 100644 --- a/modules/core/23-commitment/types/commitment.pb.go +++ b/modules/core/23-commitment/types/commitment.pb.go @@ -67,7 +67,7 @@ var xxx_messageInfo_MerkleRoot proto.InternalMessageInfo // The constructed key from the Path and the key will be append(Path.KeyPath, // append(Path.KeyPrefix, key...)) type MerklePrefix struct { - KeyPrefix []byte `protobuf:"bytes,1,opt,name=key_prefix,json=keyPrefix,proto3" json:"key_prefix,omitempty" yaml:"key_prefix"` + KeyPrefix []byte `protobuf:"bytes,1,opt,name=key_prefix,json=keyPrefix,proto3" json:"key_prefix,omitempty"` } func (m *MerklePrefix) Reset() { *m = MerklePrefix{} } @@ -114,7 +114,7 @@ func (m *MerklePrefix) GetKeyPrefix() []byte { // arbitrary structured object (defined by a commitment type). // MerklePath is represented from root-to-leaf type MerklePath struct { - KeyPath []string `protobuf:"bytes,1,rep,name=key_path,json=keyPath,proto3" json:"key_path,omitempty" yaml:"key_path"` + KeyPath []string `protobuf:"bytes,1,rep,name=key_path,json=keyPath,proto3" json:"key_path,omitempty"` } func (m *MerklePath) Reset() { *m = MerklePath{} } @@ -217,29 +217,27 @@ func init() { } var fileDescriptor_7921d88972a41469 = []byte{ - // 346 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0xcd, 0x4a, 0xc3, 0x40, - 0x10, 0xc7, 0x13, 0x2c, 0xd5, 0x6e, 0x0b, 0x62, 0xfc, 0x40, 0x8a, 0xa4, 0x25, 0x07, 0xed, 0xa5, - 0xbb, 0xb4, 0x15, 0x94, 0xe2, 0x29, 0x0a, 0x9e, 0x84, 0x92, 0x83, 0x07, 0x2f, 0x92, 0xac, 0xdb, - 0x24, 0xb4, 0x71, 0x42, 0x76, 0x1b, 0xcc, 0x1b, 0x78, 0xf4, 0xe8, 0xd1, 0xc7, 0xf1, 0xd8, 0xa3, - 0xa7, 0x22, 0xed, 0x1b, 0xf4, 0x09, 0x64, 0x77, 0xad, 0xe6, 0x36, 0xc3, 0xfc, 0xe6, 0xe3, 0xff, - 0x1f, 0x74, 0x16, 0x07, 0x94, 0x50, 0xc8, 0x18, 0xa1, 0x90, 0x24, 0xb1, 0x48, 0xd8, 0xb3, 0x20, - 0x79, 0xaf, 0x94, 0xe1, 0x34, 0x03, 0x01, 0xd6, 0x51, 0x1c, 0x50, 0x2c, 0x41, 0x5c, 0x2a, 0xe5, - 0xbd, 0xe6, 0x41, 0x08, 0x21, 0x28, 0x84, 0xc8, 0x48, 0xd3, 0xcd, 0x13, 0x0a, 0x3c, 0x01, 0x4e, - 0x62, 0xca, 0xfb, 0x03, 0x39, 0x2f, 0xcd, 0x00, 0xc6, 0x5c, 0x57, 0x9d, 0x53, 0x84, 0xee, 0x58, - 0x36, 0x99, 0x32, 0x0f, 0x40, 0x58, 0x16, 0xaa, 0x44, 0x3e, 0x8f, 0x8e, 0xcd, 0xb6, 0xd9, 0x69, - 0x78, 0x2a, 0x1e, 0x56, 0x5e, 0x3f, 0x5a, 0x86, 0x73, 0x83, 0x1a, 0x9a, 0x1b, 0x65, 0x6c, 0x1c, - 0xbf, 0x58, 0xe7, 0x08, 0x4d, 0x58, 0xf1, 0x98, 0xaa, 0x4c, 0xf3, 0xee, 0xe1, 0x7a, 0xd1, 0xda, - 0x2b, 0xfc, 0x64, 0x3a, 0x74, 0xfe, 0x6b, 0x8e, 0x57, 0x9b, 0xb0, 0x42, 0x77, 0x39, 0xee, 0x66, - 0xdb, 0xc8, 0x17, 0x91, 0x85, 0xd1, 0x8e, 0xe2, 0x7c, 0x21, 0x37, 0x6e, 0x75, 0x6a, 0xee, 0xfe, - 0x7a, 0xd1, 0xda, 0x2d, 0x4d, 0xf0, 0x45, 0xe4, 0x78, 0xdb, 0xb2, 0xdf, 0x17, 0xd1, 0xb0, 0xf2, - 0x2e, 0x2f, 0xb9, 0x45, 0xf5, 0xcd, 0x25, 0x00, 0x63, 0xeb, 0x12, 0x55, 0xb5, 0x20, 0x35, 0xa2, - 0xde, 0x6f, 0x63, 0xad, 0x17, 0x2b, 0xbd, 0x38, 0xef, 0xe1, 0xeb, 0x3f, 0x93, 0x54, 0x87, 0xf7, - 0xcb, 0xbb, 0xf7, 0x9f, 0x4b, 0xdb, 0x9c, 0x2f, 0x6d, 0xf3, 0x7b, 0x69, 0x9b, 0x6f, 0x2b, 0xdb, - 0x98, 0xaf, 0x6c, 0xe3, 0x6b, 0x65, 0x1b, 0x0f, 0x57, 0x61, 0x2c, 0xa2, 0x59, 0x20, 0xed, 0x25, - 0x1b, 0xf7, 0x02, 0xda, 0x0d, 0x81, 0xe4, 0x17, 0x24, 0x81, 0xa7, 0xd9, 0x94, 0x71, 0xfd, 0xa9, - 0xfe, 0xa0, 0x5b, 0x7a, 0x96, 0x28, 0x52, 0xc6, 0x83, 0xaa, 0x72, 0x76, 0xf0, 0x13, 0x00, 0x00, - 0xff, 0xff, 0x90, 0xe5, 0x86, 0x50, 0xd0, 0x01, 0x00, 0x00, + // 316 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0x31, 0x4f, 0xc3, 0x30, + 0x10, 0x85, 0x13, 0x51, 0x15, 0xea, 0x76, 0xb2, 0x10, 0x82, 0x0a, 0x4c, 0xd5, 0x01, 0xba, 0xc4, + 0x56, 0xdb, 0x01, 0x54, 0x31, 0xc1, 0xc0, 0x84, 0x54, 0x65, 0x60, 0x60, 0x41, 0x89, 0x71, 0x13, + 0xab, 0x0d, 0x17, 0xc5, 0x6e, 0x44, 0xff, 0x01, 0x23, 0x23, 0x23, 0x3f, 0x87, 0xb1, 0x23, 0x23, + 0x6a, 0xff, 0x08, 0xb2, 0xdd, 0xa0, 0x6c, 0x77, 0x7a, 0x9f, 0x9f, 0xfc, 0xde, 0xa1, 0x4b, 0x19, + 0x73, 0xc6, 0xa1, 0x10, 0x8c, 0x43, 0x96, 0x49, 0x9d, 0x89, 0x57, 0xcd, 0xca, 0x61, 0x6d, 0xa3, + 0x79, 0x01, 0x1a, 0xf0, 0x91, 0x8c, 0x39, 0x35, 0x20, 0xad, 0x49, 0xe5, 0xb0, 0x7b, 0x98, 0x40, + 0x02, 0x16, 0x61, 0x66, 0x72, 0x74, 0xf7, 0x94, 0x83, 0xca, 0x40, 0x31, 0xc9, 0xd5, 0x68, 0x6c, + 0xfc, 0xf2, 0x02, 0x60, 0xa6, 0x9c, 0xda, 0xbf, 0x40, 0xe8, 0x41, 0x14, 0xf3, 0x85, 0x08, 0x01, + 0x34, 0xc6, 0xa8, 0x91, 0x46, 0x2a, 0x3d, 0xf6, 0x7b, 0xfe, 0xa0, 0x13, 0xda, 0x79, 0xd2, 0x78, + 0xff, 0x3a, 0xf7, 0xfa, 0x01, 0xea, 0x38, 0x6e, 0x5a, 0x88, 0x99, 0x7c, 0xc3, 0x67, 0x08, 0xcd, + 0xc5, 0xea, 0x39, 0xb7, 0xdb, 0x8e, 0x6f, 0xcd, 0xc5, 0xca, 0xc9, 0xfd, 0xa0, 0xb2, 0x9d, 0x46, + 0x3a, 0xc5, 0x27, 0xe8, 0xc0, 0xc2, 0x91, 0x36, 0xd6, 0x7b, 0x83, 0x56, 0xb8, 0x6f, 0xd0, 0x48, + 0xa7, 0x93, 0xc6, 0xa7, 0x71, 0xbf, 0x47, 0xed, 0xca, 0x1d, 0x60, 0x86, 0xaf, 0x51, 0xd3, 0x7d, + 0xd2, 0xd2, 0xed, 0x51, 0x8f, 0xba, 0x0c, 0xd4, 0x66, 0xa0, 0xe5, 0x90, 0xde, 0xfd, 0x07, 0xb7, + 0x2f, 0xc2, 0x1d, 0x7f, 0xfb, 0xf8, 0xbd, 0x21, 0xfe, 0x7a, 0x43, 0xfc, 0xdf, 0x0d, 0xf1, 0x3f, + 0xb6, 0xc4, 0x5b, 0x6f, 0x89, 0xf7, 0xb3, 0x25, 0xde, 0xd3, 0x4d, 0x22, 0x75, 0xba, 0x8c, 0x4d, + 0x65, 0xac, 0x6a, 0x24, 0xe6, 0x41, 0x02, 0xac, 0xbc, 0x62, 0x19, 0xbc, 0x2c, 0x17, 0x42, 0xb9, + 0xf6, 0x47, 0xe3, 0xa0, 0x76, 0x00, 0xbd, 0xca, 0x85, 0x8a, 0x9b, 0xb6, 0xad, 0xf1, 0x5f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x74, 0x07, 0xaf, 0xf3, 0xa4, 0x01, 0x00, 0x00, } func (m *MerkleRoot) Marshal() (dAtA []byte, err error) { diff --git a/modules/core/types/genesis.pb.go b/modules/core/types/genesis.pb.go index 05dea516395..6e7ea86d410 100644 --- a/modules/core/types/genesis.pb.go +++ b/modules/core/types/genesis.pb.go @@ -29,11 +29,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the ibc module's genesis state. type GenesisState struct { // ICS002 - Clients genesis state - ClientGenesis types.GenesisState `protobuf:"bytes,1,opt,name=client_genesis,json=clientGenesis,proto3" json:"client_genesis" yaml:"client_genesis"` + ClientGenesis types.GenesisState `protobuf:"bytes,1,opt,name=client_genesis,json=clientGenesis,proto3" json:"client_genesis"` // ICS003 - Connections genesis state - ConnectionGenesis types1.GenesisState `protobuf:"bytes,2,opt,name=connection_genesis,json=connectionGenesis,proto3" json:"connection_genesis" yaml:"connection_genesis"` + ConnectionGenesis types1.GenesisState `protobuf:"bytes,2,opt,name=connection_genesis,json=connectionGenesis,proto3" json:"connection_genesis"` // ICS004 - Channel genesis state - ChannelGenesis types2.GenesisState `protobuf:"bytes,3,opt,name=channel_genesis,json=channelGenesis,proto3" json:"channel_genesis" yaml:"channel_genesis"` + ChannelGenesis types2.GenesisState `protobuf:"bytes,3,opt,name=channel_genesis,json=channelGenesis,proto3" json:"channel_genesis"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -97,28 +97,26 @@ func init() { func init() { proto.RegisterFile("ibc/core/types/v1/genesis.proto", fileDescriptor_b9a49c5663e6fc59) } var fileDescriptor_b9a49c5663e6fc59 = []byte{ - // 324 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0xb1, 0x4e, 0xeb, 0x30, - 0x14, 0x86, 0x93, 0x5e, 0xe9, 0x0e, 0x01, 0x8a, 0x1a, 0x01, 0x82, 0x4a, 0xb8, 0x6d, 0xd4, 0x81, - 0x05, 0x5b, 0x85, 0x01, 0x89, 0xb1, 0x0b, 0xcc, 0x61, 0x63, 0x41, 0x89, 0x31, 0xa9, 0x51, 0xe2, - 0x53, 0xd5, 0x6e, 0xa4, 0xbe, 0x05, 0x8f, 0xd5, 0xb1, 0x23, 0x62, 0xa8, 0x50, 0xf2, 0x06, 0x3c, - 0x01, 0x6a, 0x6c, 0x92, 0x54, 0xde, 0xa2, 0xff, 0x7c, 0xe7, 0xff, 0x8e, 0x92, 0x78, 0x03, 0x1e, - 0x53, 0x42, 0x61, 0xc1, 0x88, 0x5a, 0xcd, 0x99, 0x24, 0xf9, 0x84, 0x24, 0x4c, 0x30, 0xc9, 0x25, - 0x9e, 0x2f, 0x40, 0x81, 0xdf, 0xe3, 0x31, 0xc5, 0x3b, 0x00, 0x57, 0x00, 0xce, 0x27, 0xfd, 0x93, - 0x04, 0x12, 0xa8, 0xa6, 0x64, 0xf7, 0xa4, 0xc1, 0xfe, 0xb0, 0x6e, 0xa2, 0x29, 0x67, 0x42, 0x59, - 0x55, 0xfd, 0x71, 0x43, 0x80, 0x10, 0x8c, 0x2a, 0x0e, 0xc2, 0xa6, 0x46, 0x0d, 0x35, 0x8b, 0x84, - 0x60, 0xa9, 0x85, 0x04, 0x5f, 0x1d, 0xef, 0xf0, 0x41, 0x27, 0x4f, 0x2a, 0x52, 0xcc, 0x7f, 0xf3, - 0xba, 0x5a, 0xfa, 0x62, 0xc0, 0x73, 0x77, 0xe8, 0x5e, 0x1d, 0xdc, 0x0c, 0x71, 0x7d, 0xbd, 0x9e, - 0xe3, 0x7c, 0x82, 0xdb, 0x9b, 0xd3, 0xcb, 0xf5, 0x76, 0xe0, 0xfc, 0x6c, 0x07, 0xa7, 0xab, 0x28, - 0x4b, 0xef, 0x83, 0xfd, 0x96, 0x20, 0x3c, 0xd2, 0x81, 0x59, 0xf1, 0x73, 0xcf, 0x6f, 0x4e, 0xaf, - 0x5d, 0x9d, 0xca, 0x35, 0x6e, 0xb9, 0x6a, 0xc6, 0xf2, 0x8d, 0x8c, 0xef, 0xc2, 0xf8, 0xac, 0xb6, - 0x20, 0xec, 0x35, 0xe1, 0x9f, 0xf7, 0xdd, 0x3b, 0x36, 0x2f, 0xa3, 0x96, 0xfe, 0xab, 0xa4, 0xa3, - 0x96, 0x54, 0x03, 0x96, 0x11, 0x19, 0xe3, 0x99, 0x31, 0xee, 0xf7, 0x04, 0x61, 0xd7, 0x24, 0x66, - 0x69, 0xfa, 0xb8, 0x2e, 0x90, 0xbb, 0x29, 0x90, 0xfb, 0x5d, 0x20, 0xf7, 0xa3, 0x44, 0xce, 0xa6, - 0x44, 0xce, 0x67, 0x89, 0x9c, 0x67, 0x9c, 0x70, 0x35, 0x5b, 0xc6, 0x98, 0x42, 0x46, 0x28, 0xc8, - 0x0c, 0x24, 0xe1, 0x31, 0xbd, 0x4e, 0x80, 0xe4, 0x77, 0x24, 0x83, 0xd7, 0x65, 0xca, 0x64, 0xeb, - 0x5f, 0x8a, 0xff, 0x57, 0x5f, 0xeb, 0xf6, 0x37, 0x00, 0x00, 0xff, 0xff, 0xf5, 0xb9, 0x8a, 0x1b, - 0x64, 0x02, 0x00, 0x00, + // 293 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xb1, 0x4e, 0xeb, 0x30, + 0x14, 0x40, 0x93, 0xbe, 0x27, 0x86, 0x00, 0x45, 0x8d, 0x18, 0x50, 0x06, 0x37, 0x45, 0x1d, 0x58, + 0xb0, 0x15, 0x18, 0xd8, 0xbb, 0xc0, 0x82, 0x84, 0x60, 0x82, 0x05, 0x35, 0xc6, 0x72, 0x2d, 0x25, + 0xbe, 0x55, 0xed, 0x46, 0xe2, 0x17, 0x98, 0xf8, 0xac, 0x8e, 0x1d, 0x99, 0x10, 0x4a, 0x7e, 0x04, + 0xd5, 0x36, 0x4e, 0xa4, 0xa8, 0x5b, 0x94, 0x73, 0x7c, 0x7c, 0x6d, 0x47, 0x63, 0x91, 0x53, 0x42, + 0x61, 0xc5, 0x88, 0x7e, 0x5f, 0x32, 0x45, 0xaa, 0x8c, 0x70, 0x26, 0x99, 0x12, 0x0a, 0x2f, 0x57, + 0xa0, 0x21, 0x1e, 0x89, 0x9c, 0xe2, 0x9d, 0x80, 0x8d, 0x80, 0xab, 0x2c, 0x39, 0xe5, 0xc0, 0xc1, + 0x50, 0xb2, 0xfb, 0xb2, 0x62, 0x92, 0xfa, 0x12, 0x2d, 0x04, 0x93, 0xba, 0x97, 0x4a, 0xa6, 0xad, + 0x01, 0x52, 0x32, 0xaa, 0x05, 0xc8, 0xbe, 0x35, 0x69, 0xad, 0xc5, 0x5c, 0x4a, 0x56, 0xf4, 0x94, + 0xf3, 0x8f, 0x41, 0x74, 0x74, 0x6b, 0xff, 0x3c, 0xe9, 0xb9, 0x66, 0xf1, 0x7d, 0x34, 0xb4, 0x9b, + 0xbe, 0x3a, 0xf1, 0x2c, 0x4c, 0xc3, 0x8b, 0xc3, 0xab, 0x14, 0xfb, 0xe9, 0x2d, 0xc7, 0x55, 0x86, + 0xbb, 0x2b, 0x67, 0xff, 0x37, 0xdf, 0xe3, 0xe0, 0xf1, 0xd8, 0x52, 0x47, 0xe2, 0xe7, 0x28, 0x6e, + 0x27, 0xf4, 0xc9, 0x81, 0x49, 0x4e, 0x3b, 0x49, 0xef, 0xec, 0xc9, 0x8e, 0x5a, 0xe3, 0x2f, 0xfd, + 0x10, 0x9d, 0xb8, 0x63, 0xf9, 0xee, 0x3f, 0xd3, 0x9d, 0x74, 0xba, 0x56, 0xd8, 0x13, 0x1d, 0x3a, + 0xec, 0xd0, 0xec, 0x6e, 0x53, 0xa3, 0x70, 0x5b, 0xa3, 0xf0, 0xa7, 0x46, 0xe1, 0x67, 0x83, 0x82, + 0x6d, 0x83, 0x82, 0xaf, 0x06, 0x05, 0x2f, 0x98, 0x0b, 0xbd, 0x58, 0xe7, 0x98, 0x42, 0x49, 0x28, + 0xa8, 0x12, 0x14, 0x11, 0x39, 0xbd, 0xe4, 0x40, 0xaa, 0x1b, 0x52, 0xc2, 0xdb, 0xba, 0x60, 0xaa, + 0xf3, 0xf6, 0xf9, 0x81, 0xb9, 0xdd, 0xeb, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xc7, 0x25, + 0x5b, 0x14, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/modules/light-clients/06-solomachine/solomachine.pb.go b/modules/light-clients/06-solomachine/solomachine.pb.go index f2152041bdf..91b84289abe 100644 --- a/modules/light-clients/06-solomachine/solomachine.pb.go +++ b/modules/light-clients/06-solomachine/solomachine.pb.go @@ -30,8 +30,8 @@ type ClientState struct { // latest sequence of the client state Sequence uint64 `protobuf:"varint,1,opt,name=sequence,proto3" json:"sequence,omitempty"` // frozen sequence of the solo machine - IsFrozen bool `protobuf:"varint,2,opt,name=is_frozen,json=isFrozen,proto3" json:"is_frozen,omitempty" yaml:"is_frozen"` - ConsensusState *ConsensusState `protobuf:"bytes,3,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty" yaml:"consensus_state"` + IsFrozen bool `protobuf:"varint,2,opt,name=is_frozen,json=isFrozen,proto3" json:"is_frozen,omitempty"` + ConsensusState *ConsensusState `protobuf:"bytes,3,opt,name=consensus_state,json=consensusState,proto3" json:"consensus_state,omitempty"` } func (m *ClientState) Reset() { *m = ClientState{} } @@ -72,7 +72,7 @@ var xxx_messageInfo_ClientState proto.InternalMessageInfo // consensus state. type ConsensusState struct { // public key of the solo machine - PublicKey *types.Any `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty" yaml:"public_key"` + PublicKey *types.Any `protobuf:"bytes,1,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` // diversifier allows the same public key to be re-used across different solo // machine clients (potentially on different chains) without being considered // misbehaviour. @@ -117,8 +117,8 @@ var xxx_messageInfo_ConsensusState proto.InternalMessageInfo type Header struct { Timestamp uint64 `protobuf:"varint,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` - NewPublicKey *types.Any `protobuf:"bytes,3,opt,name=new_public_key,json=newPublicKey,proto3" json:"new_public_key,omitempty" yaml:"new_public_key"` - NewDiversifier string `protobuf:"bytes,4,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty" yaml:"new_diversifier"` + NewPublicKey *types.Any `protobuf:"bytes,3,opt,name=new_public_key,json=newPublicKey,proto3" json:"new_public_key,omitempty"` + NewDiversifier string `protobuf:"bytes,4,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty"` } func (m *Header) Reset() { *m = Header{} } @@ -158,8 +158,8 @@ var xxx_messageInfo_Header proto.InternalMessageInfo // of a sequence and two signatures over different messages at that sequence. type Misbehaviour struct { Sequence uint64 `protobuf:"varint,1,opt,name=sequence,proto3" json:"sequence,omitempty"` - SignatureOne *SignatureAndData `protobuf:"bytes,2,opt,name=signature_one,json=signatureOne,proto3" json:"signature_one,omitempty" yaml:"signature_one"` - SignatureTwo *SignatureAndData `protobuf:"bytes,3,opt,name=signature_two,json=signatureTwo,proto3" json:"signature_two,omitempty" yaml:"signature_two"` + SignatureOne *SignatureAndData `protobuf:"bytes,2,opt,name=signature_one,json=signatureOne,proto3" json:"signature_one,omitempty"` + SignatureTwo *SignatureAndData `protobuf:"bytes,3,opt,name=signature_two,json=signatureTwo,proto3" json:"signature_two,omitempty"` } func (m *Misbehaviour) Reset() { *m = Misbehaviour{} } @@ -240,7 +240,7 @@ var xxx_messageInfo_SignatureAndData proto.InternalMessageInfo // TimestampedSignatureData contains the signature data and the timestamp of the // signature. type TimestampedSignatureData struct { - SignatureData []byte `protobuf:"bytes,1,opt,name=signature_data,json=signatureData,proto3" json:"signature_data,omitempty" yaml:"signature_data"` + SignatureData []byte `protobuf:"bytes,1,opt,name=signature_data,json=signatureData,proto3" json:"signature_data,omitempty"` Timestamp uint64 `protobuf:"varint,2,opt,name=timestamp,proto3" json:"timestamp,omitempty"` } @@ -327,9 +327,9 @@ var xxx_messageInfo_SignBytes proto.InternalMessageInfo // HeaderData returns the SignBytes data for update verification. type HeaderData struct { // header public key - NewPubKey *types.Any `protobuf:"bytes,1,opt,name=new_pub_key,json=newPubKey,proto3" json:"new_pub_key,omitempty" yaml:"new_pub_key"` + NewPubKey *types.Any `protobuf:"bytes,1,opt,name=new_pub_key,json=newPubKey,proto3" json:"new_pub_key,omitempty"` // header diversifier - NewDiversifier string `protobuf:"bytes,2,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty" yaml:"new_diversifier"` + NewDiversifier string `protobuf:"bytes,2,opt,name=new_diversifier,json=newDiversifier,proto3" json:"new_diversifier,omitempty"` } func (m *HeaderData) Reset() { *m = HeaderData{} } @@ -381,52 +381,46 @@ func init() { } var fileDescriptor_264187157b9220a4 = []byte{ - // 709 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcd, 0x6e, 0xd3, 0x4a, - 0x14, 0xce, 0xa4, 0xbe, 0x55, 0x33, 0xc9, 0x4d, 0x7b, 0xad, 0xb4, 0x4a, 0xa3, 0xab, 0x38, 0xf2, - 0xaa, 0x9b, 0xda, 0xb7, 0xad, 0x74, 0x91, 0xca, 0x86, 0xa6, 0x15, 0x42, 0x50, 0x04, 0x72, 0xcb, - 0x86, 0x4d, 0x34, 0x76, 0x26, 0xce, 0x08, 0x7b, 0x26, 0x64, 0xc6, 0x89, 0x82, 0x58, 0xb0, 0x64, - 0xc9, 0x02, 0xf6, 0x08, 0x89, 0x77, 0x61, 0xd9, 0x65, 0x57, 0x11, 0x6a, 0x25, 0x1e, 0x20, 0x4f, - 0x80, 0x3c, 0x76, 0xe2, 0x9f, 0x96, 0x54, 0x42, 0xec, 0xe6, 0x9c, 0x39, 0x3f, 0xdf, 0xf7, 0xcd, - 0x39, 0x36, 0xdc, 0x23, 0xb6, 0x63, 0x7a, 0xc4, 0xed, 0x0b, 0xc7, 0x23, 0x98, 0x0a, 0x6e, 0x72, - 0xe6, 0x31, 0x1f, 0x39, 0x7d, 0x42, 0xb1, 0x39, 0x3a, 0x48, 0x9b, 0xc6, 0x60, 0xc8, 0x04, 0x53, - 0x35, 0x62, 0x3b, 0x46, 0x3a, 0xc5, 0x48, 0xc7, 0x8c, 0x0e, 0x1a, 0x35, 0x97, 0xb9, 0x4c, 0xc6, - 0x9a, 0xe1, 0x29, 0x4a, 0x6b, 0x6c, 0xbb, 0x8c, 0xb9, 0x1e, 0x36, 0xa5, 0x65, 0x07, 0x3d, 0x13, - 0xd1, 0x49, 0x74, 0xa5, 0x5f, 0x02, 0x58, 0x3e, 0x96, 0xb5, 0xce, 0x04, 0x12, 0x58, 0x6d, 0xc0, - 0x35, 0x8e, 0x5f, 0x07, 0x98, 0x3a, 0xb8, 0x0e, 0x5a, 0x60, 0x47, 0xb1, 0x16, 0xb6, 0xba, 0x07, - 0x4b, 0x84, 0x77, 0x7a, 0x43, 0xf6, 0x06, 0xd3, 0x7a, 0xb1, 0x05, 0x76, 0xd6, 0xda, 0xb5, 0xd9, - 0x54, 0xdb, 0x98, 0x20, 0xdf, 0x3b, 0xd4, 0x17, 0x57, 0xba, 0xb5, 0x46, 0xf8, 0x43, 0x79, 0x54, - 0x05, 0x5c, 0x77, 0x18, 0xe5, 0x98, 0xf2, 0x80, 0x77, 0x78, 0xd8, 0xa1, 0xbe, 0xd2, 0x02, 0x3b, - 0xe5, 0x7d, 0xd3, 0xb8, 0x83, 0x8a, 0x71, 0x3c, 0xcf, 0x93, 0xc0, 0xda, 0x8d, 0xd9, 0x54, 0xdb, - 0x8a, 0x3a, 0xe5, 0x2a, 0xea, 0x56, 0xd5, 0xc9, 0xc4, 0x1e, 0x2a, 0xef, 0x3f, 0x6b, 0x05, 0xfd, - 0x0b, 0x80, 0xd5, 0x6c, 0x11, 0xf5, 0x31, 0x84, 0x83, 0xc0, 0xf6, 0x88, 0xd3, 0x79, 0x85, 0x27, - 0x92, 0x5f, 0x79, 0xbf, 0x66, 0x44, 0xea, 0x18, 0x73, 0x75, 0x8c, 0x23, 0x3a, 0x69, 0x6f, 0xce, - 0xa6, 0xda, 0x3f, 0x51, 0xbb, 0x24, 0x43, 0xb7, 0x4a, 0x91, 0xf1, 0x04, 0x4f, 0xd4, 0x16, 0x2c, - 0x77, 0xc9, 0x08, 0x0f, 0x39, 0xe9, 0x11, 0x3c, 0x94, 0x7a, 0x94, 0xac, 0xb4, 0x4b, 0xfd, 0x17, - 0x96, 0x04, 0xf1, 0x31, 0x17, 0xc8, 0x1f, 0x48, 0xda, 0x8a, 0x95, 0x38, 0x62, 0x90, 0x3f, 0x00, - 0x5c, 0x7d, 0x84, 0x51, 0x37, 0x1f, 0x0e, 0x72, 0xe1, 0xe1, 0x2d, 0x27, 0x2e, 0x45, 0x22, 0x18, - 0x62, 0xd9, 0xac, 0x62, 0x25, 0x0e, 0xf5, 0x05, 0xac, 0x52, 0x3c, 0xee, 0xa4, 0xc8, 0xad, 0x2c, - 0x21, 0xb7, 0x3d, 0x9b, 0x6a, 0x9b, 0x11, 0xb9, 0x6c, 0x96, 0x6e, 0x55, 0x28, 0x1e, 0x3f, 0x5f, - 0x70, 0x3c, 0x86, 0xeb, 0x61, 0x40, 0x9a, 0xa7, 0x12, 0xf2, 0x4c, 0xbf, 0x46, 0x2e, 0x40, 0xb7, - 0x42, 0x24, 0x27, 0x89, 0x23, 0x26, 0xfa, 0xb1, 0x08, 0x2b, 0x4f, 0x09, 0xb7, 0x71, 0x1f, 0x8d, - 0x08, 0x0b, 0x86, 0x4b, 0x27, 0x6d, 0x00, 0xff, 0x5e, 0x70, 0xeb, 0x30, 0x1a, 0x11, 0x2e, 0xef, - 0xef, 0xdd, 0x39, 0x34, 0x67, 0xf3, 0xac, 0x23, 0xda, 0x3d, 0x41, 0x02, 0xb5, 0xeb, 0xb3, 0xa9, - 0x56, 0x8b, 0x80, 0x66, 0x2a, 0xea, 0x56, 0x65, 0x61, 0x3f, 0xa3, 0xb9, 0x8e, 0x62, 0xcc, 0x62, - 0xfd, 0xfe, 0x54, 0x47, 0x31, 0x66, 0xe9, 0x8e, 0xe7, 0x63, 0x16, 0xcb, 0xf2, 0x16, 0x6e, 0xe4, - 0x2b, 0x64, 0x9f, 0x1a, 0xe4, 0x9f, 0x5a, 0x85, 0xca, 0x00, 0x89, 0x7e, 0x3c, 0x03, 0xf2, 0x1c, - 0xfa, 0xba, 0x48, 0x20, 0x09, 0xba, 0x62, 0xc9, 0x73, 0x76, 0x9c, 0x94, 0xdb, 0xa7, 0xef, 0x1d, - 0x80, 0xf5, 0xf3, 0xb9, 0x0f, 0x77, 0x17, 0x48, 0x24, 0x8c, 0x07, 0xb0, 0x9a, 0x10, 0x90, 0xe5, - 0x25, 0x96, 0xf4, 0xf4, 0x64, 0xef, 0x75, 0x2b, 0xd1, 0xf0, 0xe4, 0x06, 0x84, 0xe2, 0xed, 0x10, - 0x3e, 0x01, 0x58, 0x0a, 0xfb, 0xb6, 0x27, 0x02, 0xf3, 0xa5, 0x43, 0xb1, 0xb4, 0x5a, 0x7e, 0x1d, - 0x57, 0x6e, 0xae, 0xe3, 0x5c, 0x38, 0xe5, 0x16, 0xe1, 0xfe, 0x4a, 0x84, 0x8b, 0x71, 0x7d, 0x05, - 0x10, 0x46, 0x8b, 0x29, 0xa9, 0x9c, 0xc2, 0x72, 0xbc, 0x2a, 0x77, 0x7e, 0x3a, 0xb6, 0x66, 0x53, - 0x4d, 0xcd, 0x6c, 0x57, 0xfc, 0xed, 0x88, 0x56, 0xeb, 0x17, 0x7b, 0x55, 0xfc, 0xbd, 0xbd, 0x6a, - 0xf7, 0xbe, 0x5d, 0x35, 0xc1, 0xc5, 0x55, 0x13, 0x7c, 0xbf, 0x6a, 0x82, 0x0f, 0xd7, 0xcd, 0xc2, - 0xc5, 0x75, 0xb3, 0x70, 0x79, 0xdd, 0x2c, 0xbc, 0x3c, 0x75, 0x89, 0xe8, 0x07, 0xb6, 0xe1, 0x30, - 0xdf, 0x74, 0x18, 0xf7, 0x19, 0x37, 0x89, 0xed, 0xec, 0xba, 0xcc, 0x1c, 0xdd, 0x33, 0x7d, 0xd6, - 0x0d, 0x3c, 0xcc, 0xa3, 0xff, 0xcf, 0xee, 0xfc, 0x07, 0xf4, 0xdf, 0xff, 0xbb, 0xa9, 0xf1, 0xbe, - 0x9f, 0x3a, 0xdb, 0xab, 0x92, 0xe3, 0xc1, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x92, 0xe1, 0xf5, - 0xc9, 0xb6, 0x06, 0x00, 0x00, + // 619 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcf, 0x6e, 0xd3, 0x4e, + 0x10, 0xce, 0xb6, 0xfe, 0x55, 0xcd, 0x3a, 0xbf, 0x14, 0x59, 0x3d, 0x84, 0x82, 0xdc, 0xa8, 0x12, + 0xa2, 0x97, 0xd8, 0x34, 0x41, 0x20, 0x95, 0x53, 0xdb, 0x08, 0x21, 0x01, 0x02, 0xb9, 0x15, 0x42, + 0x5c, 0xa2, 0xb5, 0xbd, 0x71, 0x56, 0xd8, 0xbb, 0xa9, 0x77, 0x9d, 0x28, 0x88, 0x07, 0x40, 0xe2, + 0xc2, 0x85, 0x3b, 0x27, 0xae, 0xbc, 0x06, 0xc7, 0x1e, 0x39, 0x56, 0xc9, 0x8b, 0x20, 0xaf, 0xed, + 0xd8, 0x71, 0xd3, 0xe4, 0xc0, 0x6d, 0x66, 0x3c, 0xf3, 0xed, 0xf7, 0xcd, 0x1f, 0xc3, 0x23, 0x62, + 0x3b, 0xa6, 0x4f, 0xbc, 0x81, 0x70, 0x7c, 0x82, 0xa9, 0xe0, 0x26, 0x67, 0x3e, 0x0b, 0x90, 0x33, + 0x20, 0x14, 0x9b, 0xa3, 0x4e, 0xd1, 0x35, 0x86, 0x21, 0x13, 0x4c, 0xdb, 0x27, 0xb6, 0x63, 0x14, + 0x4b, 0x8c, 0x62, 0xce, 0xa8, 0xb3, 0xb7, 0xeb, 0x31, 0x8f, 0xc9, 0x5c, 0x33, 0xb6, 0x92, 0xb2, + 0xbd, 0xbb, 0x1e, 0x63, 0x9e, 0x8f, 0x4d, 0xe9, 0xd9, 0x51, 0xdf, 0x44, 0x74, 0x92, 0x7c, 0x3a, + 0xf8, 0x09, 0xa0, 0x7a, 0x26, 0xb1, 0xce, 0x05, 0x12, 0x58, 0xdb, 0x83, 0xdb, 0x1c, 0x5f, 0x46, + 0x98, 0x3a, 0xb8, 0x01, 0x9a, 0xe0, 0x50, 0xb1, 0xe6, 0xbe, 0x76, 0x0f, 0x56, 0x09, 0xef, 0xf5, + 0x43, 0xf6, 0x09, 0xd3, 0xc6, 0x46, 0x13, 0x1c, 0x6e, 0x5b, 0xdb, 0x84, 0x3f, 0x97, 0xbe, 0xf6, + 0x1e, 0xee, 0x38, 0x8c, 0x72, 0x4c, 0x79, 0xc4, 0x7b, 0x3c, 0xc6, 0x6a, 0x6c, 0x36, 0xc1, 0xa1, + 0xda, 0x36, 0x8d, 0x35, 0xa4, 0x8d, 0xb3, 0xac, 0x4e, 0x52, 0xb0, 0xea, 0xce, 0x82, 0x7f, 0xac, + 0x7c, 0xf9, 0xb1, 0x5f, 0x39, 0xf8, 0x0a, 0x60, 0x7d, 0x31, 0x51, 0xeb, 0x40, 0x38, 0x8c, 0x6c, + 0x9f, 0x38, 0xbd, 0x8f, 0x78, 0x22, 0xd9, 0xaa, 0xed, 0x5d, 0x23, 0xd1, 0x6a, 0x64, 0x5a, 0x8d, + 0x13, 0x3a, 0xb1, 0xaa, 0x49, 0xde, 0x4b, 0x3c, 0xd1, 0x9a, 0x50, 0x75, 0xc9, 0x08, 0x87, 0x9c, + 0xf4, 0x09, 0x0e, 0xa5, 0x8c, 0xaa, 0x55, 0x0c, 0x69, 0xf7, 0x61, 0x55, 0x90, 0x00, 0x73, 0x81, + 0x82, 0xa1, 0xd4, 0xa0, 0x58, 0x79, 0x20, 0x65, 0xf3, 0x0b, 0xc0, 0xad, 0x17, 0x18, 0xb9, 0xe5, + 0x74, 0x50, 0x4a, 0x8f, 0xbf, 0x72, 0xe2, 0x51, 0x24, 0xa2, 0x10, 0xcb, 0xc7, 0x6a, 0x56, 0x1e, + 0xd0, 0x8e, 0x61, 0x9d, 0xe2, 0x71, 0xaf, 0xa0, 0x62, 0x73, 0x85, 0x8a, 0x1a, 0xc5, 0xe3, 0xb7, + 0x73, 0x21, 0x0f, 0xe1, 0x4e, 0x5c, 0x5b, 0x14, 0xa3, 0x48, 0x31, 0x31, 0x64, 0x37, 0x8f, 0xa6, + 0x8c, 0xaf, 0x01, 0xac, 0xbd, 0x26, 0xdc, 0xc6, 0x03, 0x34, 0x22, 0x2c, 0x0a, 0x57, 0x4e, 0xfa, + 0x1d, 0xfc, 0x7f, 0x4e, 0xb2, 0xc7, 0x68, 0xc2, 0x5c, 0x6d, 0x1f, 0xad, 0x1d, 0xe5, 0x79, 0x56, + 0x75, 0x42, 0xdd, 0x2e, 0x12, 0xc8, 0xaa, 0xcd, 0x71, 0xde, 0xd0, 0x12, 0xae, 0x18, 0xb3, 0x54, + 0xee, 0x3f, 0xe1, 0x5e, 0x8c, 0x59, 0x2a, 0xf1, 0x33, 0xbc, 0x53, 0xce, 0x5b, 0xec, 0x3f, 0x28, + 0xf7, 0x5f, 0x83, 0xca, 0x10, 0x89, 0x41, 0x3a, 0x18, 0x69, 0xc7, 0x31, 0x17, 0x09, 0x24, 0xa9, + 0xd5, 0x2c, 0x69, 0x2f, 0xce, 0x58, 0x59, 0xbe, 0x12, 0x18, 0x36, 0x2e, 0xb2, 0x10, 0x76, 0xe7, + 0x44, 0x24, 0x8b, 0x07, 0xb0, 0x9e, 0xeb, 0x96, 0xe8, 0x09, 0x95, 0xbc, 0x1b, 0xdd, 0x1b, 0xcf, + 0x6c, 0x2c, 0x7f, 0xe6, 0x3b, 0x80, 0xd5, 0x18, 0xfc, 0x74, 0x22, 0x30, 0x5f, 0x39, 0xc4, 0x95, + 0x68, 0xe5, 0x3b, 0xd8, 0xbc, 0x79, 0x07, 0x59, 0x73, 0x94, 0x25, 0xcd, 0xf9, 0x2f, 0x6f, 0x4e, + 0xca, 0xeb, 0x12, 0xc2, 0xe4, 0x20, 0xa4, 0x92, 0xc7, 0x50, 0x4d, 0x17, 0x7b, 0xfd, 0x6d, 0x26, + 0x5b, 0x7d, 0xcb, 0x4a, 0x6f, 0xdc, 0xbe, 0xd2, 0xa7, 0xfd, 0xdf, 0x53, 0x1d, 0x5c, 0x4d, 0x75, + 0x70, 0x3d, 0xd5, 0xc1, 0xb7, 0x99, 0x5e, 0xb9, 0x9a, 0xe9, 0x95, 0x3f, 0x33, 0xbd, 0xf2, 0xe1, + 0x95, 0x47, 0xc4, 0x20, 0xb2, 0x0d, 0x87, 0x05, 0xa6, 0xc3, 0x78, 0xc0, 0xb8, 0x49, 0x6c, 0xa7, + 0xe5, 0x31, 0x73, 0xf4, 0xd4, 0x0c, 0x98, 0x1b, 0xf9, 0x98, 0x27, 0xbf, 0xde, 0x56, 0xf6, 0xef, + 0x7d, 0xf4, 0xa4, 0x55, 0xd8, 0xb9, 0x67, 0x05, 0xdb, 0xde, 0x92, 0x7c, 0x3b, 0x7f, 0x03, 0x00, + 0x00, 0xff, 0xff, 0x7a, 0x66, 0xd4, 0xda, 0xb1, 0x05, 0x00, 0x00, } func (m *ClientState) Marshal() (dAtA []byte, err error) { diff --git a/modules/light-clients/07-tendermint/tendermint.pb.go b/modules/light-clients/07-tendermint/tendermint.pb.go index 169630c8cf9..e88522af74f 100644 --- a/modules/light-clients/07-tendermint/tendermint.pb.go +++ b/modules/light-clients/07-tendermint/tendermint.pb.go @@ -37,20 +37,20 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // and a possible frozen height. type ClientState struct { ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - TrustLevel Fraction `protobuf:"bytes,2,opt,name=trust_level,json=trustLevel,proto3" json:"trust_level" yaml:"trust_level"` + TrustLevel Fraction `protobuf:"bytes,2,opt,name=trust_level,json=trustLevel,proto3" json:"trust_level"` // duration of the period since the LastestTimestamp during which the // submitted headers are valid for upgrade - TrustingPeriod time.Duration `protobuf:"bytes,3,opt,name=trusting_period,json=trustingPeriod,proto3,stdduration" json:"trusting_period" yaml:"trusting_period"` + TrustingPeriod time.Duration `protobuf:"bytes,3,opt,name=trusting_period,json=trustingPeriod,proto3,stdduration" json:"trusting_period"` // duration of the staking unbonding period - UnbondingPeriod time.Duration `protobuf:"bytes,4,opt,name=unbonding_period,json=unbondingPeriod,proto3,stdduration" json:"unbonding_period" yaml:"unbonding_period"` + UnbondingPeriod time.Duration `protobuf:"bytes,4,opt,name=unbonding_period,json=unbondingPeriod,proto3,stdduration" json:"unbonding_period"` // defines how much new (untrusted) header's Time can drift into the future. - MaxClockDrift time.Duration `protobuf:"bytes,5,opt,name=max_clock_drift,json=maxClockDrift,proto3,stdduration" json:"max_clock_drift" yaml:"max_clock_drift"` + MaxClockDrift time.Duration `protobuf:"bytes,5,opt,name=max_clock_drift,json=maxClockDrift,proto3,stdduration" json:"max_clock_drift"` // Block height when the client was frozen due to a misbehaviour - FrozenHeight types.Height `protobuf:"bytes,6,opt,name=frozen_height,json=frozenHeight,proto3" json:"frozen_height" yaml:"frozen_height"` + FrozenHeight types.Height `protobuf:"bytes,6,opt,name=frozen_height,json=frozenHeight,proto3" json:"frozen_height"` // Latest height the client was updated to - LatestHeight types.Height `protobuf:"bytes,7,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height" yaml:"latest_height"` + LatestHeight types.Height `protobuf:"bytes,7,opt,name=latest_height,json=latestHeight,proto3" json:"latest_height"` // Proof specifications used in verifying counterparty state - ProofSpecs []*_go.ProofSpec `protobuf:"bytes,8,rep,name=proof_specs,json=proofSpecs,proto3" json:"proof_specs,omitempty" yaml:"proof_specs"` + ProofSpecs []*_go.ProofSpec `protobuf:"bytes,8,rep,name=proof_specs,json=proofSpecs,proto3" json:"proof_specs,omitempty"` // Path at which next upgraded client will be committed. // Each element corresponds to the key for a single CommitmentProof in the // chained proof. NOTE: ClientState must stored under @@ -58,11 +58,11 @@ type ClientState struct { // under `{upgradepath}/{upgradeHeight}/consensusState` For SDK chains using // the default upgrade module, upgrade_path should be []string{"upgrade", // "upgradedIBCState"}` - UpgradePath []string `protobuf:"bytes,9,rep,name=upgrade_path,json=upgradePath,proto3" json:"upgrade_path,omitempty" yaml:"upgrade_path"` + UpgradePath []string `protobuf:"bytes,9,rep,name=upgrade_path,json=upgradePath,proto3" json:"upgrade_path,omitempty"` // allow_update_after_expiry is deprecated - AllowUpdateAfterExpiry bool `protobuf:"varint,10,opt,name=allow_update_after_expiry,json=allowUpdateAfterExpiry,proto3" json:"allow_update_after_expiry,omitempty" yaml:"allow_update_after_expiry"` // Deprecated: Do not use. + AllowUpdateAfterExpiry bool `protobuf:"varint,10,opt,name=allow_update_after_expiry,json=allowUpdateAfterExpiry,proto3" json:"allow_update_after_expiry,omitempty"` // Deprecated: Do not use. // allow_update_after_misbehaviour is deprecated - AllowUpdateAfterMisbehaviour bool `protobuf:"varint,11,opt,name=allow_update_after_misbehaviour,json=allowUpdateAfterMisbehaviour,proto3" json:"allow_update_after_misbehaviour,omitempty" yaml:"allow_update_after_misbehaviour"` // Deprecated: Do not use. + AllowUpdateAfterMisbehaviour bool `protobuf:"varint,11,opt,name=allow_update_after_misbehaviour,json=allowUpdateAfterMisbehaviour,proto3" json:"allow_update_after_misbehaviour,omitempty"` // Deprecated: Do not use. } func (m *ClientState) Reset() { *m = ClientState{} } @@ -105,7 +105,7 @@ type ConsensusState struct { Timestamp time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,stdtime" json:"timestamp"` // commitment root (i.e app hash) Root types1.MerkleRoot `protobuf:"bytes,2,opt,name=root,proto3" json:"root"` - NextValidatorsHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,3,opt,name=next_validators_hash,json=nextValidatorsHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"next_validators_hash,omitempty" yaml:"next_validators_hash"` + NextValidatorsHash github_com_cometbft_cometbft_libs_bytes.HexBytes `protobuf:"bytes,3,opt,name=next_validators_hash,json=nextValidatorsHash,proto3,casttype=github.com/cometbft/cometbft/libs/bytes.HexBytes" json:"next_validators_hash,omitempty"` } func (m *ConsensusState) Reset() { *m = ConsensusState{} } @@ -145,9 +145,9 @@ var xxx_messageInfo_ConsensusState proto.InternalMessageInfo // that implements Misbehaviour interface expected by ICS-02 type Misbehaviour struct { // ClientID is deprecated - ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"client_id"` // Deprecated: Do not use. - Header1 *Header `protobuf:"bytes,2,opt,name=header_1,json=header1,proto3" json:"header_1,omitempty" yaml:"header_1"` - Header2 *Header `protobuf:"bytes,3,opt,name=header_2,json=header2,proto3" json:"header_2,omitempty" yaml:"header_2"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` // Deprecated: Do not use. + Header1 *Header `protobuf:"bytes,2,opt,name=header_1,json=header1,proto3" json:"header_1,omitempty"` + Header2 *Header `protobuf:"bytes,3,opt,name=header_2,json=header2,proto3" json:"header_2,omitempty"` } func (m *Misbehaviour) Reset() { *m = Misbehaviour{} } @@ -196,10 +196,10 @@ var xxx_messageInfo_Misbehaviour proto.InternalMessageInfo // hash to TrustedConsensusState.NextValidatorsHash since that is the last // trusted validator set at the TrustedHeight. type Header struct { - *types2.SignedHeader `protobuf:"bytes,1,opt,name=signed_header,json=signedHeader,proto3,embedded=signed_header" json:"signed_header,omitempty" yaml:"signed_header"` - ValidatorSet *types2.ValidatorSet `protobuf:"bytes,2,opt,name=validator_set,json=validatorSet,proto3" json:"validator_set,omitempty" yaml:"validator_set"` - TrustedHeight types.Height `protobuf:"bytes,3,opt,name=trusted_height,json=trustedHeight,proto3" json:"trusted_height" yaml:"trusted_height"` - TrustedValidators *types2.ValidatorSet `protobuf:"bytes,4,opt,name=trusted_validators,json=trustedValidators,proto3" json:"trusted_validators,omitempty" yaml:"trusted_validators"` + *types2.SignedHeader `protobuf:"bytes,1,opt,name=signed_header,json=signedHeader,proto3,embedded=signed_header" json:"signed_header,omitempty"` + ValidatorSet *types2.ValidatorSet `protobuf:"bytes,2,opt,name=validator_set,json=validatorSet,proto3" json:"validator_set,omitempty"` + TrustedHeight types.Height `protobuf:"bytes,3,opt,name=trusted_height,json=trustedHeight,proto3" json:"trusted_height"` + TrustedValidators *types2.ValidatorSet `protobuf:"bytes,4,opt,name=trusted_validators,json=trustedValidators,proto3" json:"trusted_validators,omitempty"` } func (m *Header) Reset() { *m = Header{} } @@ -323,76 +323,66 @@ func init() { } var fileDescriptor_c6d6cf2b288949be = []byte{ - // 1091 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x6f, 0xe3, 0xc4, - 0x17, 0x6f, 0xda, 0x7e, 0xdb, 0x64, 0x92, 0x6e, 0xf7, 0x6b, 0x4a, 0x37, 0x2d, 0xdd, 0x38, 0x32, - 0x52, 0xe9, 0x81, 0xda, 0x9b, 0xf4, 0xb0, 0x52, 0xe1, 0x82, 0xbb, 0xa0, 0xee, 0x8a, 0x95, 0x2a, - 0x07, 0x38, 0x20, 0x21, 0x33, 0xb1, 0x27, 0xf1, 0x68, 0x6d, 0x8f, 0xe5, 0x19, 0x87, 0x96, 0x3b, - 0x12, 0x37, 0xf6, 0x88, 0x38, 0xed, 0x9f, 0xb3, 0xc7, 0x1e, 0x39, 0x19, 0xd4, 0xfe, 0x07, 0x39, - 0x70, 0xe0, 0x84, 0xe6, 0x87, 0x7f, 0xa4, 0xdb, 0xa5, 0x5a, 0x2e, 0xd1, 0xbc, 0xf7, 0x3e, 0xef, - 0xf3, 0xc9, 0xbc, 0x79, 0xf3, 0xc6, 0xc0, 0xc2, 0x63, 0xcf, 0x0a, 0xf1, 0x34, 0x60, 0x5e, 0x88, - 0x51, 0xcc, 0xa8, 0xc5, 0x50, 0xec, 0xa3, 0x34, 0xc2, 0x31, 0xb3, 0x66, 0x83, 0x9a, 0x65, 0x26, - 0x29, 0x61, 0x44, 0xeb, 0xe1, 0xb1, 0x67, 0xd6, 0x13, 0xcc, 0x1a, 0x64, 0x36, 0xd8, 0xed, 0xd7, - 0xf2, 0xd9, 0x45, 0x82, 0xa8, 0x35, 0x83, 0x21, 0xf6, 0x21, 0x23, 0xa9, 0x64, 0xd8, 0xdd, 0x7b, - 0x03, 0x21, 0x7e, 0x8b, 0xa8, 0x47, 0x68, 0x44, 0xa8, 0x85, 0x3d, 0x3a, 0x3c, 0xe2, 0xff, 0x20, - 0x49, 0x09, 0x99, 0x14, 0xd1, 0xde, 0x94, 0x90, 0x69, 0x88, 0x2c, 0x61, 0x8d, 0xb3, 0x89, 0xe5, - 0x67, 0x29, 0x64, 0x98, 0xc4, 0x2a, 0xae, 0xdf, 0x8c, 0x33, 0x1c, 0x21, 0xca, 0x60, 0x94, 0x14, - 0x00, 0xbe, 0x5f, 0x8f, 0xa4, 0xc8, 0x92, 0x7f, 0x9f, 0x2b, 0xc8, 0x95, 0x02, 0x7c, 0x54, 0x01, - 0x48, 0x14, 0x61, 0x16, 0x15, 0xa0, 0xd2, 0x52, 0xc0, 0xad, 0x29, 0x99, 0x12, 0xb1, 0xb4, 0xf8, - 0x4a, 0x7a, 0x8d, 0xbf, 0xd6, 0x41, 0xfb, 0x44, 0xf0, 0x8d, 0x18, 0x64, 0x48, 0xdb, 0x01, 0x4d, - 0x2f, 0x80, 0x38, 0x76, 0xb1, 0xdf, 0x6d, 0xf4, 0x1b, 0x07, 0x2d, 0x67, 0x5d, 0xd8, 0x4f, 0x7d, - 0x0d, 0x81, 0x36, 0x4b, 0x33, 0xca, 0xdc, 0x10, 0xcd, 0x50, 0xd8, 0x5d, 0xee, 0x37, 0x0e, 0xda, - 0xc3, 0x03, 0xf3, 0xdf, 0xeb, 0x6b, 0x7e, 0x91, 0x42, 0x8f, 0x6f, 0xd8, 0xde, 0x7d, 0x9d, 0xeb, - 0x4b, 0xf3, 0x5c, 0xd7, 0x2e, 0x60, 0x14, 0x1e, 0x1b, 0x35, 0x2a, 0xc3, 0x01, 0xc2, 0xfa, 0x92, - 0x1b, 0xda, 0x04, 0x6c, 0x0a, 0x0b, 0xc7, 0x53, 0x37, 0x41, 0x29, 0x26, 0x7e, 0x77, 0x45, 0x48, - 0xed, 0x98, 0xb2, 0x58, 0x66, 0x51, 0x2c, 0xf3, 0x89, 0x2a, 0xa6, 0x6d, 0x28, 0xee, 0xed, 0x1a, - 0x77, 0x95, 0x6f, 0xfc, 0xfa, 0x87, 0xde, 0x70, 0xee, 0x15, 0xde, 0x33, 0xe1, 0xd4, 0x30, 0xb8, - 0x9f, 0xc5, 0x63, 0x12, 0xfb, 0x35, 0xa1, 0xd5, 0xbb, 0x84, 0x3e, 0x54, 0x42, 0x0f, 0xa4, 0xd0, - 0x4d, 0x02, 0xa9, 0xb4, 0x59, 0xba, 0x95, 0x14, 0x02, 0x9b, 0x11, 0x3c, 0x77, 0xbd, 0x90, 0x78, - 0x2f, 0x5c, 0x3f, 0xc5, 0x13, 0xd6, 0xfd, 0xdf, 0x3b, 0x6e, 0xe9, 0x46, 0xbe, 0x14, 0xda, 0x88, - 0xe0, 0xf9, 0x09, 0x77, 0x3e, 0xe1, 0x3e, 0xed, 0x3b, 0xb0, 0x31, 0x49, 0xc9, 0x8f, 0x28, 0x76, - 0x03, 0xc4, 0x0f, 0xa4, 0xbb, 0x26, 0x44, 0x76, 0xc5, 0x11, 0xf1, 0x16, 0x31, 0x55, 0xe7, 0xcc, - 0x06, 0xe6, 0xa9, 0x40, 0xd8, 0x7b, 0x4a, 0x65, 0x4b, 0xaa, 0x2c, 0xa4, 0x1b, 0x4e, 0x47, 0xda, - 0x12, 0xcb, 0xe9, 0x43, 0xc8, 0x10, 0x65, 0x05, 0xfd, 0xfa, 0xbb, 0xd2, 0x2f, 0xa4, 0x1b, 0x4e, - 0x47, 0xda, 0x8a, 0x7e, 0x04, 0xda, 0xe2, 0xea, 0xb8, 0x34, 0x41, 0x1e, 0xed, 0x36, 0xfb, 0x2b, - 0x82, 0x5c, 0x5e, 0x2f, 0x53, 0x5c, 0x2f, 0xce, 0x7c, 0xc6, 0x31, 0xa3, 0x04, 0x79, 0xf6, 0x76, - 0xd5, 0x4c, 0xb5, 0x44, 0xc3, 0x01, 0x49, 0x01, 0xa1, 0xda, 0x31, 0xe8, 0x64, 0xc9, 0x34, 0x85, - 0x3e, 0x72, 0x13, 0xc8, 0x82, 0x6e, 0xab, 0xbf, 0x72, 0xd0, 0xb2, 0x1f, 0xcc, 0x73, 0xfd, 0x3d, - 0x75, 0x82, 0xb5, 0xa8, 0xe1, 0xb4, 0x95, 0x79, 0x06, 0x59, 0xa0, 0x41, 0xb0, 0x03, 0xc3, 0x90, - 0xfc, 0xe0, 0x66, 0x89, 0x0f, 0x19, 0x72, 0xe1, 0x84, 0xa1, 0xd4, 0x45, 0xe7, 0x09, 0x4e, 0x2f, - 0xba, 0xa0, 0xdf, 0x38, 0x68, 0xda, 0xfb, 0xf3, 0x5c, 0xef, 0x4b, 0xa2, 0xb7, 0x42, 0x8d, 0x6e, - 0xc3, 0xd9, 0x16, 0xd1, 0xaf, 0x45, 0xf0, 0x33, 0x1e, 0xfb, 0x5c, 0x84, 0x34, 0x0a, 0xf4, 0x5b, - 0xf2, 0x22, 0x4c, 0xc7, 0x28, 0x80, 0x33, 0x4c, 0xb2, 0xb4, 0xdb, 0x16, 0x42, 0x1f, 0xcf, 0x73, - 0x7d, 0xff, 0xad, 0x42, 0xf5, 0x04, 0x2e, 0xb7, 0x77, 0x53, 0xee, 0x79, 0x0d, 0x70, 0xbc, 0xfa, - 0xf3, 0x2b, 0x7d, 0xc9, 0x78, 0xb5, 0x0c, 0xee, 0x9d, 0x90, 0x98, 0xa2, 0x98, 0x66, 0x54, 0xde, - 0x7d, 0x1b, 0xb4, 0xca, 0xf1, 0x23, 0x2e, 0x3f, 0xaf, 0xff, 0xcd, 0x06, 0xfd, 0xaa, 0x40, 0xd8, - 0x4d, 0x7e, 0xb8, 0x2f, 0x79, 0x1f, 0x56, 0x69, 0xda, 0xa7, 0x60, 0x35, 0x25, 0x84, 0xa9, 0xe9, - 0x60, 0xd4, 0x7a, 0xa3, 0x9a, 0x47, 0xb3, 0x81, 0xf9, 0x1c, 0xa5, 0x2f, 0x42, 0xe4, 0x10, 0xc2, - 0xec, 0x55, 0x4e, 0xe3, 0x88, 0x2c, 0xed, 0xa7, 0x06, 0xd8, 0x8a, 0xd1, 0x39, 0x73, 0xcb, 0x19, - 0x4c, 0xdd, 0x00, 0xd2, 0x40, 0x4c, 0x80, 0x8e, 0x3d, 0x9a, 0xe7, 0xfa, 0x07, 0xb2, 0x0a, 0xb7, - 0xa1, 0x8c, 0xbf, 0x73, 0xfd, 0xd1, 0x14, 0xb3, 0x20, 0x1b, 0x73, 0x39, 0x3e, 0x02, 0x11, 0x1b, - 0x4f, 0x58, 0xb5, 0x08, 0xf1, 0x98, 0x5a, 0xe3, 0x0b, 0x86, 0xa8, 0x79, 0x8a, 0xce, 0x6d, 0xbe, - 0x70, 0x34, 0x4e, 0xf5, 0x4d, 0xc9, 0x74, 0x0a, 0x69, 0xa0, 0x4a, 0xf4, 0xcb, 0x32, 0xe8, 0xd4, - 0x2b, 0xa7, 0x1d, 0x81, 0x96, 0x6c, 0xf1, 0x72, 0x3a, 0x8a, 0x26, 0xbc, 0x2f, 0xff, 0x52, 0x19, - 0xe2, 0x47, 0xd0, 0x94, 0xd6, 0x53, 0x5f, 0x83, 0xa0, 0x19, 0x20, 0xe8, 0xa3, 0xd4, 0x1d, 0xa8, - 0xaa, 0xec, 0xdf, 0x35, 0x33, 0x4f, 0x05, 0xde, 0xee, 0x5d, 0xe5, 0xfa, 0xba, 0x5c, 0x0f, 0xe6, - 0xb9, 0xbe, 0x29, 0x65, 0x0a, 0x32, 0xc3, 0x59, 0x97, 0xcb, 0x41, 0x4d, 0x62, 0xa8, 0x66, 0xe5, - 0x7f, 0x90, 0x18, 0xbe, 0x21, 0x31, 0x2c, 0x25, 0x86, 0xaa, 0x22, 0xbf, 0xad, 0x80, 0x35, 0x89, - 0xd6, 0x20, 0xd8, 0xa0, 0x78, 0x1a, 0x23, 0xdf, 0x95, 0x10, 0xd5, 0x30, 0xbd, 0xba, 0x8e, 0x7c, - 0x27, 0x47, 0x02, 0xa6, 0x04, 0xf7, 0x2e, 0x73, 0xbd, 0x51, 0x4d, 0x84, 0x05, 0x0a, 0xc3, 0xe9, - 0xd0, 0x1a, 0x96, 0x0f, 0x9c, 0xf2, 0x84, 0x5d, 0x8a, 0x8a, 0xa6, 0xba, 0x45, 0xa2, 0x3c, 0xbe, - 0x11, 0x62, 0x76, 0xb7, 0xa2, 0x5f, 0x48, 0x37, 0x9c, 0xce, 0xac, 0x86, 0xd3, 0xbe, 0x07, 0xf2, - 0x49, 0x10, 0xfa, 0x62, 0xa0, 0xad, 0xdc, 0x39, 0xd0, 0x1e, 0xaa, 0x81, 0xf6, 0x7e, 0xed, 0xa1, - 0x29, 0xf3, 0x0d, 0x67, 0x43, 0x39, 0xd4, 0x48, 0x0b, 0x81, 0x56, 0x20, 0xaa, 0x56, 0x55, 0x8f, - 0xcc, 0x5d, 0xbb, 0x78, 0x38, 0xcf, 0xf5, 0x9d, 0x45, 0x95, 0x8a, 0xc3, 0x70, 0xfe, 0xaf, 0x9c, - 0x55, 0xe3, 0x1a, 0xcf, 0x40, 0xb3, 0x78, 0x6c, 0xb5, 0x3d, 0xd0, 0x8a, 0xb3, 0x08, 0xa5, 0x3c, - 0x22, 0x4e, 0x66, 0xd5, 0xa9, 0x1c, 0x5a, 0x1f, 0xb4, 0x7d, 0x14, 0x93, 0x08, 0xc7, 0x22, 0xbe, - 0x2c, 0xe2, 0x75, 0x97, 0xed, 0xbf, 0xbe, 0xea, 0x35, 0x2e, 0xaf, 0x7a, 0x8d, 0x3f, 0xaf, 0x7a, - 0x8d, 0x97, 0xd7, 0xbd, 0xa5, 0xcb, 0xeb, 0xde, 0xd2, 0xef, 0xd7, 0xbd, 0xa5, 0x6f, 0x9f, 0x2d, - 0x5c, 0x30, 0xf9, 0xe9, 0x33, 0xf6, 0x0e, 0xa7, 0xc4, 0x9a, 0x3d, 0xb6, 0x22, 0xe2, 0x67, 0x21, - 0xa2, 0xf2, 0x03, 0xed, 0xb0, 0xf8, 0x42, 0x7b, 0xf4, 0xf8, 0xb0, 0xda, 0xeb, 0x27, 0xd5, 0x72, - 0xbc, 0x26, 0xa6, 0xca, 0xd1, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x98, 0x66, 0xe1, 0xee, 0xd5, - 0x09, 0x00, 0x00, + // 943 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0x4f, 0x6f, 0xe3, 0xc4, + 0x1b, 0xc7, 0xe3, 0x34, 0xdb, 0x26, 0x93, 0x64, 0xfb, 0xfb, 0x8d, 0x56, 0xc8, 0xad, 0xaa, 0x24, + 0xf4, 0x00, 0xb9, 0xd4, 0xde, 0x64, 0x91, 0x56, 0x62, 0xe1, 0x40, 0xba, 0x0b, 0xed, 0xb2, 0x85, + 0xca, 0x05, 0x0e, 0x5c, 0xac, 0xb1, 0x3d, 0xb1, 0x47, 0x6b, 0x7b, 0xac, 0x99, 0x71, 0x48, 0x39, + 0x71, 0xe4, 0xb8, 0x47, 0x8e, 0xbc, 0x04, 0x5e, 0xc6, 0x1e, 0x7b, 0x41, 0xe2, 0x54, 0x50, 0xfa, + 0x2e, 0x38, 0xa1, 0xf9, 0xe3, 0xc4, 0x94, 0x15, 0x5b, 0x71, 0x89, 0x9e, 0x99, 0xe7, 0xfb, 0x7c, + 0x32, 0xf3, 0xfc, 0x19, 0x03, 0x97, 0x04, 0xa1, 0x9b, 0x92, 0x38, 0x11, 0x61, 0x4a, 0x70, 0x2e, + 0xb8, 0x2b, 0x70, 0x1e, 0x61, 0x96, 0x91, 0x5c, 0xb8, 0x8b, 0x49, 0x6d, 0xe5, 0x14, 0x8c, 0x0a, + 0x0a, 0x07, 0x24, 0x08, 0x9d, 0x7a, 0x80, 0x53, 0x93, 0x2c, 0x26, 0xfb, 0xa3, 0x5a, 0xbc, 0xb8, + 0x2c, 0x30, 0x77, 0x17, 0x28, 0x25, 0x11, 0x12, 0x94, 0x69, 0xc2, 0xfe, 0xc1, 0x3f, 0x14, 0xea, + 0xb7, 0xf2, 0x86, 0x94, 0x67, 0x94, 0xbb, 0x24, 0xe4, 0xd3, 0x47, 0xf2, 0x04, 0x05, 0xa3, 0x74, + 0x5e, 0x79, 0x07, 0x31, 0xa5, 0x71, 0x8a, 0x5d, 0xb5, 0x0a, 0xca, 0xb9, 0x1b, 0x95, 0x0c, 0x09, + 0x42, 0x73, 0xe3, 0x1f, 0xde, 0xf6, 0x0b, 0x92, 0x61, 0x2e, 0x50, 0x56, 0x54, 0x02, 0x79, 0xdf, + 0x90, 0x32, 0xec, 0xea, 0xe3, 0xcb, 0x7f, 0xd0, 0x96, 0x11, 0xbc, 0xbf, 0x11, 0xd0, 0x2c, 0x23, + 0x22, 0xab, 0x44, 0xeb, 0x95, 0x11, 0x3e, 0x88, 0x69, 0x4c, 0x95, 0xe9, 0x4a, 0x4b, 0xef, 0x1e, + 0xae, 0xee, 0x81, 0xee, 0xb1, 0xe2, 0x5d, 0x08, 0x24, 0x30, 0xdc, 0x03, 0xed, 0x30, 0x41, 0x24, + 0xf7, 0x49, 0x64, 0x5b, 0x23, 0x6b, 0xdc, 0xf1, 0x76, 0xd4, 0xfa, 0x34, 0x82, 0x5f, 0x82, 0xae, + 0x60, 0x25, 0x17, 0x7e, 0x8a, 0x17, 0x38, 0xb5, 0x9b, 0x23, 0x6b, 0xdc, 0x9d, 0x8e, 0x9d, 0x7f, + 0xcf, 0xaf, 0xf3, 0x29, 0x43, 0xa1, 0xbc, 0xf0, 0xac, 0xf5, 0xfa, 0x7a, 0xd8, 0xf0, 0x80, 0x42, + 0xbc, 0x90, 0x04, 0xf8, 0x02, 0xec, 0xaa, 0x15, 0xc9, 0x63, 0xbf, 0xc0, 0x8c, 0xd0, 0xc8, 0xde, + 0x52, 0xd0, 0x3d, 0x47, 0xa7, 0xc5, 0xa9, 0xd2, 0xe2, 0x3c, 0x35, 0x69, 0x9b, 0xb5, 0x25, 0xe5, + 0xa7, 0xdf, 0x87, 0x96, 0x77, 0xbf, 0x8a, 0x3d, 0x57, 0xa1, 0xf0, 0x0b, 0xf0, 0xbf, 0x32, 0x0f, + 0x68, 0x1e, 0xd5, 0x70, 0xad, 0xbb, 0xe3, 0x76, 0xd7, 0xc1, 0x86, 0xf7, 0x39, 0xd8, 0xcd, 0xd0, + 0xd2, 0x0f, 0x53, 0x1a, 0xbe, 0xf4, 0x23, 0x46, 0xe6, 0xc2, 0xbe, 0x77, 0x77, 0x5c, 0x3f, 0x43, + 0xcb, 0x63, 0x19, 0xfa, 0x54, 0x46, 0xc2, 0x67, 0xa0, 0x3f, 0x67, 0xf4, 0x7b, 0x9c, 0xfb, 0x09, + 0x96, 0xb9, 0xb2, 0xb7, 0x15, 0x6a, 0x5f, 0x65, 0x4f, 0x56, 0xcf, 0x31, 0x45, 0x5d, 0x4c, 0x9c, + 0x13, 0xa5, 0x30, 0xf9, 0xea, 0xe9, 0x30, 0xbd, 0x27, 0x31, 0x29, 0x12, 0x98, 0x8b, 0x0a, 0xb3, + 0x73, 0x57, 0x8c, 0x0e, 0x33, 0x98, 0x27, 0xa0, 0xab, 0xba, 0xd4, 0xe7, 0x05, 0x0e, 0xb9, 0xdd, + 0x1e, 0x6d, 0x29, 0x88, 0xee, 0x64, 0x47, 0x75, 0xb2, 0x24, 0x9c, 0x4b, 0xcd, 0x45, 0x81, 0x43, + 0x0f, 0x14, 0x95, 0xc9, 0xe1, 0xbb, 0xa0, 0x57, 0x16, 0x31, 0x43, 0x11, 0xf6, 0x0b, 0x24, 0x12, + 0xbb, 0x33, 0xda, 0x1a, 0x77, 0xbc, 0xae, 0xd9, 0x3b, 0x47, 0x22, 0x81, 0x1f, 0x83, 0x3d, 0x94, + 0xa6, 0xf4, 0x3b, 0xbf, 0x2c, 0x22, 0x24, 0xb0, 0x8f, 0xe6, 0x02, 0x33, 0x1f, 0x2f, 0x0b, 0xc2, + 0x2e, 0x6d, 0x30, 0xb2, 0xc6, 0xed, 0x59, 0xd3, 0xb6, 0xbc, 0x77, 0x94, 0xe8, 0x6b, 0xa5, 0xf9, + 0x44, 0x4a, 0x9e, 0x29, 0x05, 0x3c, 0x05, 0xc3, 0x37, 0x84, 0x67, 0x84, 0x07, 0x38, 0x41, 0x0b, + 0x42, 0x4b, 0x66, 0x77, 0xd7, 0x90, 0x83, 0xdb, 0x90, 0xb3, 0x9a, 0xee, 0xc3, 0xd6, 0x8f, 0x3f, + 0x0f, 0x1b, 0x87, 0x3f, 0x34, 0xc1, 0xfd, 0x63, 0x9a, 0x73, 0x9c, 0xf3, 0x92, 0xeb, 0x3e, 0x9f, + 0x81, 0xce, 0x7a, 0xd4, 0x54, 0xa3, 0xcb, 0x04, 0xdc, 0xae, 0xeb, 0x57, 0x95, 0x42, 0x17, 0xf6, + 0x95, 0x2c, 0xec, 0x26, 0x0c, 0x7e, 0x04, 0x5a, 0x8c, 0x52, 0x61, 0x26, 0xe1, 0xb0, 0x56, 0x84, + 0xcd, 0xec, 0x2d, 0x26, 0xce, 0x19, 0x66, 0x2f, 0x53, 0xec, 0x51, 0x5a, 0x15, 0x43, 0x45, 0xc1, + 0x39, 0x78, 0x90, 0xe3, 0xa5, 0xf0, 0xd7, 0xcf, 0x0d, 0xf7, 0x13, 0xc4, 0x13, 0x35, 0x02, 0xbd, + 0xd9, 0x07, 0x7f, 0x5e, 0x0f, 0x1f, 0xc6, 0x44, 0x24, 0x65, 0x20, 0x71, 0x72, 0x9c, 0xb1, 0x08, + 0xe6, 0x62, 0x63, 0xa4, 0x24, 0xe0, 0x6e, 0x70, 0x29, 0x30, 0x77, 0x4e, 0xf0, 0x72, 0x26, 0x0d, + 0x0f, 0x4a, 0xe2, 0x37, 0x6b, 0xe0, 0x09, 0xe2, 0x89, 0x49, 0xc1, 0xaf, 0x16, 0xe8, 0xd5, 0x33, + 0x03, 0x87, 0xa0, 0xa3, 0x7b, 0x65, 0x3d, 0xe9, 0x2a, 0x9d, 0x6d, 0xbd, 0x79, 0x2a, 0xe7, 0xa9, + 0x9d, 0x60, 0x14, 0x61, 0xe6, 0x4f, 0xcc, 0x0d, 0xdf, 0x7b, 0xdb, 0xac, 0x9f, 0x28, 0xfd, 0xac, + 0xbb, 0xba, 0x1e, 0xee, 0x68, 0x7b, 0xe2, 0xed, 0x68, 0xc8, 0xa4, 0xc6, 0x9b, 0x9a, 0x31, 0xff, + 0x0f, 0xbc, 0x69, 0xc5, 0x9b, 0x9a, 0x7b, 0xfd, 0xd2, 0x04, 0xdb, 0xda, 0x05, 0x4f, 0x41, 0x9f, + 0x93, 0x38, 0xc7, 0x91, 0xaf, 0x25, 0xa6, 0xac, 0x83, 0x3a, 0x54, 0xbf, 0xdc, 0x17, 0x4a, 0x66, + 0xe8, 0xad, 0xab, 0xeb, 0xa1, 0xe5, 0xf5, 0x78, 0x6d, 0x0f, 0x1e, 0x83, 0xfe, 0xba, 0x2c, 0x3e, + 0xc7, 0x55, 0x89, 0xdf, 0x80, 0x5a, 0x27, 0xfb, 0x02, 0x0b, 0xaf, 0xb7, 0xa8, 0xad, 0xe0, 0x67, + 0x40, 0x3f, 0x51, 0xea, 0x40, 0x6a, 0x5a, 0xb7, 0xee, 0x38, 0xad, 0x7d, 0x13, 0x67, 0xc6, 0xf5, + 0x0c, 0xc0, 0x0a, 0xb4, 0x69, 0x16, 0xf3, 0xb6, 0xbd, 0xed, 0x48, 0xff, 0x37, 0x91, 0x9b, 0xa6, + 0x38, 0x7c, 0x0e, 0xda, 0xd5, 0xa3, 0x0c, 0x0f, 0x40, 0x27, 0x2f, 0x33, 0xcc, 0xa4, 0x47, 0xe5, + 0xab, 0xe5, 0x6d, 0x36, 0xe0, 0x08, 0x74, 0x23, 0x9c, 0xd3, 0x8c, 0xe4, 0xca, 0xdf, 0x54, 0xfe, + 0xfa, 0xd6, 0x2c, 0x7a, 0xbd, 0x1a, 0x58, 0x57, 0xab, 0x81, 0xf5, 0xc7, 0x6a, 0x60, 0xbd, 0xba, + 0x19, 0x34, 0xae, 0x6e, 0x06, 0x8d, 0xdf, 0x6e, 0x06, 0x8d, 0x6f, 0x9f, 0xff, 0xad, 0x79, 0xf5, + 0x27, 0x32, 0x08, 0x8f, 0x62, 0xea, 0x2e, 0x1e, 0xbb, 0x19, 0x8d, 0xca, 0x14, 0x73, 0xfd, 0x21, + 0x3f, 0xaa, 0xbe, 0xe4, 0x0f, 0x1f, 0x1f, 0x6d, 0x2e, 0xf3, 0x64, 0x63, 0x06, 0xdb, 0x6a, 0x22, + 0x1f, 0xfd, 0x15, 0x00, 0x00, 0xff, 0xff, 0x87, 0x33, 0x96, 0x16, 0xfd, 0x07, 0x00, 0x00, } func (m *ClientState) Marshal() (dAtA []byte, err error) { diff --git a/proto/ibc/applications/fee/v1/ack.proto b/proto/ibc/applications/fee/v1/ack.proto index ec1342bbf23..53519a2bb82 100644 --- a/proto/ibc/applications/fee/v1/ack.proto +++ b/proto/ibc/applications/fee/v1/ack.proto @@ -4,14 +4,12 @@ package ibc.applications.fee.v1; option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types"; -import "gogoproto/gogo.proto"; - // IncentivizedAcknowledgement is the acknowledgement format to be used by applications wrapped in the fee middleware message IncentivizedAcknowledgement { // the underlying app acknowledgement bytes - bytes app_acknowledgement = 1 [(gogoproto.moretags) = "yaml:\"app_acknowledgement\""]; + bytes app_acknowledgement = 1; // the relayer address which submits the recv packet message - string forward_relayer_address = 2 [(gogoproto.moretags) = "yaml:\"forward_relayer_address\""]; + string forward_relayer_address = 2; // success flag of the base application callback - bool underlying_app_success = 3 [(gogoproto.moretags) = "yaml:\"underlying_app_successl\""]; + bool underlying_app_success = 3; } diff --git a/proto/ibc/applications/fee/v1/fee.proto b/proto/ibc/applications/fee/v1/fee.proto index 1a025ddca1c..6cdfdd39082 100644 --- a/proto/ibc/applications/fee/v1/fee.proto +++ b/proto/ibc/applications/fee/v1/fee.proto @@ -11,23 +11,14 @@ import "ibc/core/channel/v1/channel.proto"; // Fee defines the ICS29 receive, acknowledgement and timeout fees message Fee { // the packet receive fee - repeated cosmos.base.v1beta1.Coin recv_fee = 1 [ - (gogoproto.moretags) = "yaml:\"recv_fee\"", - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; + repeated cosmos.base.v1beta1.Coin recv_fee = 1 + [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; // the packet acknowledgement fee - repeated cosmos.base.v1beta1.Coin ack_fee = 2 [ - (gogoproto.moretags) = "yaml:\"ack_fee\"", - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; + repeated cosmos.base.v1beta1.Coin ack_fee = 2 + [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; // the packet timeout fee - repeated cosmos.base.v1beta1.Coin timeout_fee = 3 [ - (gogoproto.moretags) = "yaml:\"timeout_fee\"", - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; + repeated cosmos.base.v1beta1.Coin timeout_fee = 3 + [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; } // PacketFee contains ICS29 relayer fees, refund address and optional list of permitted relayers @@ -35,7 +26,7 @@ message PacketFee { // fee encapsulates the recv, ack and timeout fees associated with an IBC packet Fee fee = 1 [(gogoproto.nullable) = false]; // the refund address for unspent fees - string refund_address = 2 [(gogoproto.moretags) = "yaml:\"refund_address\""]; + string refund_address = 2; // optional list of relayers permitted to receive fees repeated string relayers = 3; } @@ -43,14 +34,13 @@ message PacketFee { // PacketFees contains a list of type PacketFee message PacketFees { // list of packet fees - repeated PacketFee packet_fees = 1 [(gogoproto.moretags) = "yaml:\"packet_fees\"", (gogoproto.nullable) = false]; + repeated PacketFee packet_fees = 1 [(gogoproto.nullable) = false]; } // IdentifiedPacketFees contains a list of type PacketFee and associated PacketId message IdentifiedPacketFees { // unique packet identifier comprised of the channel ID, port ID and sequence - ibc.core.channel.v1.PacketId packet_id = 1 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"packet_id\""]; + ibc.core.channel.v1.PacketId packet_id = 1 [(gogoproto.nullable) = false]; // list of packet fees - repeated PacketFee packet_fees = 2 [(gogoproto.moretags) = "yaml:\"packet_fees\"", (gogoproto.nullable) = false]; + repeated PacketFee packet_fees = 2 [(gogoproto.nullable) = false]; } diff --git a/proto/ibc/applications/fee/v1/genesis.proto b/proto/ibc/applications/fee/v1/genesis.proto index 6bba6cff632..59e3c5d6e12 100644 --- a/proto/ibc/applications/fee/v1/genesis.proto +++ b/proto/ibc/applications/fee/v1/genesis.proto @@ -11,34 +11,29 @@ import "ibc/core/channel/v1/channel.proto"; // GenesisState defines the ICS29 fee middleware genesis state message GenesisState { // list of identified packet fees - repeated IdentifiedPacketFees identified_fees = 1 - [(gogoproto.moretags) = "yaml:\"identified_fees\"", (gogoproto.nullable) = false]; + repeated IdentifiedPacketFees identified_fees = 1 [(gogoproto.nullable) = false]; // list of fee enabled channels - repeated FeeEnabledChannel fee_enabled_channels = 2 - [(gogoproto.moretags) = "yaml:\"fee_enabled_channels\"", (gogoproto.nullable) = false]; + repeated FeeEnabledChannel fee_enabled_channels = 2 [(gogoproto.nullable) = false]; // list of registered payees - repeated RegisteredPayee registered_payees = 3 - [(gogoproto.moretags) = "yaml:\"registered_payees\"", (gogoproto.nullable) = false]; + repeated RegisteredPayee registered_payees = 3 [(gogoproto.nullable) = false]; // list of registered counterparty payees - repeated RegisteredCounterpartyPayee registered_counterparty_payees = 4 - [(gogoproto.moretags) = "yaml:\"registered_counterparty_payees\"", (gogoproto.nullable) = false]; + repeated RegisteredCounterpartyPayee registered_counterparty_payees = 4 [(gogoproto.nullable) = false]; // list of forward relayer addresses - repeated ForwardRelayerAddress forward_relayers = 5 - [(gogoproto.moretags) = "yaml:\"forward_relayers\"", (gogoproto.nullable) = false]; + repeated ForwardRelayerAddress forward_relayers = 5 [(gogoproto.nullable) = false]; } // FeeEnabledChannel contains the PortID & ChannelID for a fee enabled channel message FeeEnabledChannel { // unique port identifier - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string port_id = 1; // unique channel identifier - string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string channel_id = 2; } // RegisteredPayee contains the relayer address and payee address for a specific channel message RegisteredPayee { // unique channel identifier - string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string channel_id = 1; // the relayer address string relayer = 2; // the payee address @@ -49,11 +44,11 @@ message RegisteredPayee { // for recv fee distribution) message RegisteredCounterpartyPayee { // unique channel identifier - string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string channel_id = 1; // the relayer address string relayer = 2; // the counterparty payee address - string counterparty_payee = 3 [(gogoproto.moretags) = "yaml:\"counterparty_payee\""]; + string counterparty_payee = 3; } // ForwardRelayerAddress contains the forward relayer address and PacketId used for async acknowledgements @@ -61,6 +56,5 @@ message ForwardRelayerAddress { // the forward relayer address string address = 1; // unique packet identifer comprised of the channel ID, port ID and sequence - ibc.core.channel.v1.PacketId packet_id = 2 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"packet_id\""]; + ibc.core.channel.v1.PacketId packet_id = 2 [(gogoproto.nullable) = false]; } diff --git a/proto/ibc/applications/fee/v1/metadata.proto b/proto/ibc/applications/fee/v1/metadata.proto index 0c0a72c9ca5..f505034c879 100644 --- a/proto/ibc/applications/fee/v1/metadata.proto +++ b/proto/ibc/applications/fee/v1/metadata.proto @@ -4,13 +4,11 @@ package ibc.applications.fee.v1; option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types"; -import "gogoproto/gogo.proto"; - // Metadata defines the ICS29 channel specific metadata encoded into the channel version bytestring // See ICS004: https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-and-packet-semantics#Versioning message Metadata { // fee_version defines the ICS29 fee version - string fee_version = 1 [(gogoproto.moretags) = "yaml:\"fee_version\""]; + string fee_version = 1; // app_version defines the underlying application version, which may or may not be a JSON encoded bytestring - string app_version = 2 [(gogoproto.moretags) = "yaml:\"app_version\""]; + string app_version = 2; } diff --git a/proto/ibc/applications/fee/v1/query.proto b/proto/ibc/applications/fee/v1/query.proto index bcf6622b34b..faa40f9230e 100644 --- a/proto/ibc/applications/fee/v1/query.proto +++ b/proto/ibc/applications/fee/v1/query.proto @@ -129,11 +129,8 @@ message QueryTotalRecvFeesRequest { // QueryTotalRecvFeesResponse defines the response type for the TotalRecvFees rpc message QueryTotalRecvFeesResponse { // the total packet receive fees - repeated cosmos.base.v1beta1.Coin recv_fees = 1 [ - (gogoproto.moretags) = "yaml:\"recv_fees\"", - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; + repeated cosmos.base.v1beta1.Coin recv_fees = 1 + [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; } // QueryTotalAckFeesRequest defines the request type for the TotalAckFees rpc @@ -145,11 +142,8 @@ message QueryTotalAckFeesRequest { // QueryTotalAckFeesResponse defines the response type for the TotalAckFees rpc message QueryTotalAckFeesResponse { // the total packet acknowledgement fees - repeated cosmos.base.v1beta1.Coin ack_fees = 1 [ - (gogoproto.moretags) = "yaml:\"ack_fees\"", - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; + repeated cosmos.base.v1beta1.Coin ack_fees = 1 + [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; } // QueryTotalTimeoutFeesRequest defines the request type for the TotalTimeoutFees rpc @@ -161,17 +155,14 @@ message QueryTotalTimeoutFeesRequest { // QueryTotalTimeoutFeesResponse defines the response type for the TotalTimeoutFees rpc message QueryTotalTimeoutFeesResponse { // the total packet timeout fees - repeated cosmos.base.v1beta1.Coin timeout_fees = 1 [ - (gogoproto.moretags) = "yaml:\"timeout_fees\"", - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins" - ]; + repeated cosmos.base.v1beta1.Coin timeout_fees = 1 + [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; } // QueryPayeeRequest defines the request type for the Payee rpc message QueryPayeeRequest { // unique channel identifier - string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string channel_id = 1; // the relayer address to which the distribution address is registered string relayer = 2; } @@ -179,13 +170,13 @@ message QueryPayeeRequest { // QueryPayeeResponse defines the response type for the Payee rpc message QueryPayeeResponse { // the payee address to which packet fees are paid out - string payee_address = 1 [(gogoproto.moretags) = "yaml:\"payee_address\""]; + string payee_address = 1; } // QueryCounterpartyPayeeRequest defines the request type for the CounterpartyPayee rpc message QueryCounterpartyPayeeRequest { // unique channel identifier - string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string channel_id = 1; // the relayer address to which the counterparty is registered string relayer = 2; } @@ -193,7 +184,7 @@ message QueryCounterpartyPayeeRequest { // QueryCounterpartyPayeeResponse defines the response type for the CounterpartyPayee rpc message QueryCounterpartyPayeeResponse { // the counterparty payee address used to compensate forward relaying - string counterparty_payee = 1 [(gogoproto.moretags) = "yaml:\"counterparty_payee\""]; + string counterparty_payee = 1; } // QueryFeeEnabledChannelsRequest defines the request type for the FeeEnabledChannels rpc @@ -207,8 +198,7 @@ message QueryFeeEnabledChannelsRequest { // QueryFeeEnabledChannelsResponse defines the response type for the FeeEnabledChannels rpc message QueryFeeEnabledChannelsResponse { // list of fee enabled channels - repeated ibc.applications.fee.v1.FeeEnabledChannel fee_enabled_channels = 1 - [(gogoproto.moretags) = "yaml:\"fee_enabled_channels\"", (gogoproto.nullable) = false]; + repeated ibc.applications.fee.v1.FeeEnabledChannel fee_enabled_channels = 1 [(gogoproto.nullable) = false]; // pagination defines the pagination in the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; } @@ -216,13 +206,13 @@ message QueryFeeEnabledChannelsResponse { // QueryFeeEnabledChannelRequest defines the request type for the FeeEnabledChannel rpc message QueryFeeEnabledChannelRequest { // unique port identifier - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string port_id = 1; // unique channel identifier - string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string channel_id = 2; } // QueryFeeEnabledChannelResponse defines the response type for the FeeEnabledChannel rpc message QueryFeeEnabledChannelResponse { // boolean flag representing the fee enabled channel status - bool fee_enabled = 1 [(gogoproto.moretags) = "yaml:\"fee_enabled\""]; + bool fee_enabled = 1; } diff --git a/proto/ibc/applications/fee/v1/tx.proto b/proto/ibc/applications/fee/v1/tx.proto index 3a46de74ebe..e1c4751325b 100644 --- a/proto/ibc/applications/fee/v1/tx.proto +++ b/proto/ibc/applications/fee/v1/tx.proto @@ -43,9 +43,9 @@ message MsgRegisterPayee { option (gogoproto.goproto_getters) = false; // unique port identifier - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string port_id = 1; // unique channel identifier - string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string channel_id = 2; // the relayer address string relayer = 3; // the payee address @@ -61,13 +61,13 @@ message MsgRegisterCounterpartyPayee { option (gogoproto.goproto_getters) = false; // unique port identifier - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string port_id = 1; // unique channel identifier - string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string channel_id = 2; // the relayer address string relayer = 3; // the counterparty payee address - string counterparty_payee = 4 [(gogoproto.moretags) = "yaml:\"counterparty_payee\""]; + string counterparty_payee = 4; } // MsgRegisterCounterpartyPayeeResponse defines the response type for the RegisterCounterpartyPayee rpc @@ -83,9 +83,9 @@ message MsgPayPacketFee { // fee encapsulates the recv, ack and timeout fees associated with an IBC packet ibc.applications.fee.v1.Fee fee = 1 [(gogoproto.nullable) = false]; // the source port unique identifier - string source_port_id = 2 [(gogoproto.moretags) = "yaml:\"source_port_id\""]; + string source_port_id = 2; // the source channel unique identifer - string source_channel_id = 3 [(gogoproto.moretags) = "yaml:\"source_channel_id\""]; + string source_channel_id = 3; // account address to refund fee if necessary string signer = 4; // optional list of relayers permitted to the receive packet fees @@ -102,10 +102,9 @@ message MsgPayPacketFeeAsync { option (gogoproto.goproto_getters) = false; // unique packet identifier comprised of the channel ID, port ID and sequence - ibc.core.channel.v1.PacketId packet_id = 1 - [(gogoproto.moretags) = "yaml:\"packet_id\"", (gogoproto.nullable) = false]; + ibc.core.channel.v1.PacketId packet_id = 1 [(gogoproto.nullable) = false]; // the packet fee associated with a particular IBC packet - PacketFee packet_fee = 2 [(gogoproto.moretags) = "yaml:\"packet_fee\"", (gogoproto.nullable) = false]; + PacketFee packet_fee = 2 [(gogoproto.nullable) = false]; } // MsgPayPacketFeeAsyncResponse defines the response type for the PayPacketFeeAsync rpc diff --git a/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto b/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto index a505b4637ef..d32d69fe2b4 100644 --- a/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto +++ b/proto/ibc/applications/interchain_accounts/controller/v1/controller.proto @@ -4,11 +4,9 @@ package ibc.applications.interchain_accounts.controller.v1; option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"; -import "gogoproto/gogo.proto"; - // Params defines the set of on-chain interchain accounts parameters. // The following parameters may be used to disable the controller submodule. message Params { // controller_enabled enables or disables the controller submodule. - bool controller_enabled = 1 [(gogoproto.moretags) = "yaml:\"controller_enabled\""]; + bool controller_enabled = 1; } diff --git a/proto/ibc/applications/interchain_accounts/controller/v1/query.proto b/proto/ibc/applications/interchain_accounts/controller/v1/query.proto index 8c237a1525f..0fb70d82479 100644 --- a/proto/ibc/applications/interchain_accounts/controller/v1/query.proto +++ b/proto/ibc/applications/interchain_accounts/controller/v1/query.proto @@ -5,7 +5,6 @@ package ibc.applications.interchain_accounts.controller.v1; option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"; import "ibc/applications/interchain_accounts/controller/v1/controller.proto"; -import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; // Query provides defines the gRPC querier service. @@ -25,7 +24,7 @@ service Query { // QueryInterchainAccountRequest is the request type for the Query/InterchainAccount RPC method. message QueryInterchainAccountRequest { string owner = 1; - string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""]; + string connection_id = 2; } // QueryInterchainAccountResponse the response type for the Query/InterchainAccount RPC method. diff --git a/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto b/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto index 284ffe70576..c0585eee806 100644 --- a/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto +++ b/proto/ibc/applications/interchain_accounts/controller/v1/tx.proto @@ -21,14 +21,14 @@ message MsgRegisterInterchainAccount { option (gogoproto.goproto_getters) = false; string owner = 1; - string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""]; + string connection_id = 2; string version = 3; } // MsgRegisterInterchainAccountResponse defines the response for Msg/RegisterAccount message MsgRegisterInterchainAccountResponse { - string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""]; - string port_id = 2 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string channel_id = 1; + string port_id = 2; } // MsgSendTx defines the payload for Msg/SendTx @@ -36,13 +36,12 @@ message MsgSendTx { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string owner = 1; - string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""]; - ibc.applications.interchain_accounts.v1.InterchainAccountPacketData packet_data = 3 - [(gogoproto.moretags) = "yaml:\"packet_data\"", (gogoproto.nullable) = false]; + string owner = 1; + string connection_id = 2; + ibc.applications.interchain_accounts.v1.InterchainAccountPacketData packet_data = 3 [(gogoproto.nullable) = false]; // Relative timeout timestamp provided will be added to the current block time during transaction execution. // The timeout timestamp must be non-zero. - uint64 relative_timeout = 4 [(gogoproto.moretags) = "yaml:\"relative_timeout\""]; + uint64 relative_timeout = 4; } // MsgSendTxResponse defines the response for MsgSendTx diff --git a/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto b/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto index 2fed3763ff3..63da034544f 100644 --- a/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto +++ b/proto/ibc/applications/interchain_accounts/genesis/v1/genesis.proto @@ -10,44 +10,38 @@ import "ibc/applications/interchain_accounts/host/v1/host.proto"; // GenesisState defines the interchain accounts genesis state message GenesisState { - ControllerGenesisState controller_genesis_state = 1 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"controller_genesis_state\""]; - HostGenesisState host_genesis_state = 2 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"host_genesis_state\""]; + ControllerGenesisState controller_genesis_state = 1 [(gogoproto.nullable) = false]; + HostGenesisState host_genesis_state = 2 [(gogoproto.nullable) = false]; } // ControllerGenesisState defines the interchain accounts controller genesis state message ControllerGenesisState { - repeated ActiveChannel active_channels = 1 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"active_channels\""]; - repeated RegisteredInterchainAccount interchain_accounts = 2 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"interchain_accounts\""]; - repeated string ports = 3; - ibc.applications.interchain_accounts.controller.v1.Params params = 4 [(gogoproto.nullable) = false]; + repeated ActiveChannel active_channels = 1 [(gogoproto.nullable) = false]; + repeated RegisteredInterchainAccount interchain_accounts = 2 [(gogoproto.nullable) = false]; + repeated string ports = 3; + ibc.applications.interchain_accounts.controller.v1.Params params = 4 [(gogoproto.nullable) = false]; } // HostGenesisState defines the interchain accounts host genesis state message HostGenesisState { - repeated ActiveChannel active_channels = 1 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"active_channels\""]; - repeated RegisteredInterchainAccount interchain_accounts = 2 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"interchain_accounts\""]; - string port = 3; - ibc.applications.interchain_accounts.host.v1.Params params = 4 [(gogoproto.nullable) = false]; + repeated ActiveChannel active_channels = 1 [(gogoproto.nullable) = false]; + repeated RegisteredInterchainAccount interchain_accounts = 2 [(gogoproto.nullable) = false]; + string port = 3; + ibc.applications.interchain_accounts.host.v1.Params params = 4 [(gogoproto.nullable) = false]; } // ActiveChannel contains a connection ID, port ID and associated active channel ID, as well as a boolean flag to // indicate if the channel is middleware enabled message ActiveChannel { - string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""]; - string port_id = 2 [(gogoproto.moretags) = "yaml:\"port_id\""]; - string channel_id = 3 [(gogoproto.moretags) = "yaml:\"channel_id\""]; - bool is_middleware_enabled = 4 [(gogoproto.moretags) = "yaml:\"is_middleware_enabled\""]; + string connection_id = 1; + string port_id = 2; + string channel_id = 3; + bool is_middleware_enabled = 4; } // RegisteredInterchainAccount contains a connection ID, port ID and associated interchain account address message RegisteredInterchainAccount { - string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""]; - string port_id = 2 [(gogoproto.moretags) = "yaml:\"port_id\""]; - string account_address = 3 [(gogoproto.moretags) = "yaml:\"account_address\""]; + string connection_id = 1; + string port_id = 2; + string account_address = 3; } \ No newline at end of file diff --git a/proto/ibc/applications/interchain_accounts/host/v1/host.proto b/proto/ibc/applications/interchain_accounts/host/v1/host.proto index 18cc1d13da3..51e557113a5 100644 --- a/proto/ibc/applications/interchain_accounts/host/v1/host.proto +++ b/proto/ibc/applications/interchain_accounts/host/v1/host.proto @@ -4,13 +4,11 @@ package ibc.applications.interchain_accounts.host.v1; option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"; -import "gogoproto/gogo.proto"; - // Params defines the set of on-chain interchain accounts parameters. // The following parameters may be used to disable the host submodule. message Params { // host_enabled enables or disables the host submodule. - bool host_enabled = 1 [(gogoproto.moretags) = "yaml:\"host_enabled\""]; + bool host_enabled = 1; // allow_messages defines a list of sdk message typeURLs allowed to be executed on a host chain. - repeated string allow_messages = 2 [(gogoproto.moretags) = "yaml:\"allow_messages\""]; + repeated string allow_messages = 2; } diff --git a/proto/ibc/applications/interchain_accounts/v1/account.proto b/proto/ibc/applications/interchain_accounts/v1/account.proto index d60c27a9c29..9db1022dde4 100644 --- a/proto/ibc/applications/interchain_accounts/v1/account.proto +++ b/proto/ibc/applications/interchain_accounts/v1/account.proto @@ -14,7 +14,6 @@ message InterchainAccount { option (gogoproto.goproto_stringer) = false; option (cosmos_proto.implements_interface) = "ibc.applications.interchain_accounts.v1.InterchainAccountI"; - cosmos.auth.v1beta1.BaseAccount base_account = 1 - [(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"base_account\""]; - string account_owner = 2 [(gogoproto.moretags) = "yaml:\"account_owner\""]; + cosmos.auth.v1beta1.BaseAccount base_account = 1 [(gogoproto.embed) = true]; + string account_owner = 2; } diff --git a/proto/ibc/applications/interchain_accounts/v1/metadata.proto b/proto/ibc/applications/interchain_accounts/v1/metadata.proto index 9ea7eeca337..78964dbadd0 100644 --- a/proto/ibc/applications/interchain_accounts/v1/metadata.proto +++ b/proto/ibc/applications/interchain_accounts/v1/metadata.proto @@ -4,17 +4,15 @@ package ibc.applications.interchain_accounts.v1; option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"; -import "gogoproto/gogo.proto"; - // Metadata defines a set of protocol specific data encoded into the ICS27 channel version bytestring // See ICS004: https://github.com/cosmos/ibc/tree/master/spec/core/ics-004-channel-and-packet-semantics#Versioning message Metadata { // version defines the ICS27 protocol version string version = 1; // controller_connection_id is the connection identifier associated with the controller chain - string controller_connection_id = 2 [(gogoproto.moretags) = "yaml:\"controller_connection_id\""]; + string controller_connection_id = 2; // host_connection_id is the connection identifier associated with the host chain - string host_connection_id = 3 [(gogoproto.moretags) = "yaml:\"host_connection_id\""]; + string host_connection_id = 3; // address defines the interchain account address to be fulfilled upon the OnChanOpenTry handshake step // NOTE: the address field is empty on the OnChanOpenInit handshake step string address = 4; diff --git a/proto/ibc/applications/transfer/v1/authz.proto b/proto/ibc/applications/transfer/v1/authz.proto index 8b27ac9cf7d..b0ee1d9cd55 100644 --- a/proto/ibc/applications/transfer/v1/authz.proto +++ b/proto/ibc/applications/transfer/v1/authz.proto @@ -11,9 +11,9 @@ import "cosmos/base/v1beta1/coin.proto"; // Allocation defines the spend limit for a particular port and channel message Allocation { // the port on which the packet will be sent - string source_port = 1 [(gogoproto.moretags) = "yaml:\"source_port\""]; + string source_port = 1; // the channel by which the packet will be sent - string source_channel = 2 [(gogoproto.moretags) = "yaml:\"source_channel\""]; + string source_channel = 2; // spend limitation on the channel repeated cosmos.base.v1beta1.Coin spend_limit = 3 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"]; diff --git a/proto/ibc/applications/transfer/v1/genesis.proto b/proto/ibc/applications/transfer/v1/genesis.proto index 5e09a34ab07..3e24d1e8236 100644 --- a/proto/ibc/applications/transfer/v1/genesis.proto +++ b/proto/ibc/applications/transfer/v1/genesis.proto @@ -9,11 +9,7 @@ import "gogoproto/gogo.proto"; // GenesisState defines the ibc-transfer genesis state message GenesisState { - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; - repeated DenomTrace denom_traces = 2 [ - (gogoproto.castrepeated) = "Traces", - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"denom_traces\"" - ]; - Params params = 3 [(gogoproto.nullable) = false]; + string port_id = 1; + repeated DenomTrace denom_traces = 2 [(gogoproto.castrepeated) = "Traces", (gogoproto.nullable) = false]; + Params params = 3 [(gogoproto.nullable) = false]; } diff --git a/proto/ibc/applications/transfer/v1/transfer.proto b/proto/ibc/applications/transfer/v1/transfer.proto index 2171074799a..d64b4a446a4 100644 --- a/proto/ibc/applications/transfer/v1/transfer.proto +++ b/proto/ibc/applications/transfer/v1/transfer.proto @@ -4,8 +4,6 @@ package ibc.applications.transfer.v1; option go_package = "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"; -import "gogoproto/gogo.proto"; - // DenomTrace contains the base denomination for ICS20 fungible tokens and the // source tracing information path. message DenomTrace { @@ -23,8 +21,8 @@ message DenomTrace { message Params { // send_enabled enables or disables all cross-chain token transfers from this // chain. - bool send_enabled = 1 [(gogoproto.moretags) = "yaml:\"send_enabled\""]; + bool send_enabled = 1; // receive_enabled enables or disables all cross-chain token transfers to this // chain. - bool receive_enabled = 2 [(gogoproto.moretags) = "yaml:\"receive_enabled\""]; + bool receive_enabled = 2; } diff --git a/proto/ibc/applications/transfer/v1/tx.proto b/proto/ibc/applications/transfer/v1/tx.proto index 1c67aafb937..65f1c8c8e74 100644 --- a/proto/ibc/applications/transfer/v1/tx.proto +++ b/proto/ibc/applications/transfer/v1/tx.proto @@ -22,9 +22,9 @@ message MsgTransfer { option (gogoproto.goproto_getters) = false; // the port on which the packet will be sent - string source_port = 1 [(gogoproto.moretags) = "yaml:\"source_port\""]; + string source_port = 1; // the channel by which the packet will be sent - string source_channel = 2 [(gogoproto.moretags) = "yaml:\"source_channel\""]; + string source_channel = 2; // the tokens to be transferred cosmos.base.v1beta1.Coin token = 3 [(gogoproto.nullable) = false]; // the sender address @@ -33,11 +33,10 @@ message MsgTransfer { string receiver = 5; // Timeout height relative to the current block height. // The timeout is disabled when set to 0. - ibc.core.client.v1.Height timeout_height = 6 - [(gogoproto.moretags) = "yaml:\"timeout_height\"", (gogoproto.nullable) = false]; + ibc.core.client.v1.Height timeout_height = 6 [(gogoproto.nullable) = false]; // Timeout timestamp in absolute nanoseconds since unix epoch. // The timeout is disabled when set to 0. - uint64 timeout_timestamp = 7 [(gogoproto.moretags) = "yaml:\"timeout_timestamp\""]; + uint64 timeout_timestamp = 7; // optional memo string memo = 8; } diff --git a/proto/ibc/core/channel/v1/channel.proto b/proto/ibc/core/channel/v1/channel.proto index 5fbb0d423f7..05c7dbac33b 100644 --- a/proto/ibc/core/channel/v1/channel.proto +++ b/proto/ibc/core/channel/v1/channel.proto @@ -21,7 +21,7 @@ message Channel { Counterparty counterparty = 3 [(gogoproto.nullable) = false]; // list of connection identifiers, in order, along which packets sent on // this channel will travel - repeated string connection_hops = 4 [(gogoproto.moretags) = "yaml:\"connection_hops\""]; + repeated string connection_hops = 4; // opaque channel version, which is agreed upon during the handshake string version = 5; } @@ -39,7 +39,7 @@ message IdentifiedChannel { Counterparty counterparty = 3 [(gogoproto.nullable) = false]; // list of connection identifiers, in order, along which packets sent on // this channel will travel - repeated string connection_hops = 4 [(gogoproto.moretags) = "yaml:\"connection_hops\""]; + repeated string connection_hops = 4; // opaque channel version, which is agreed upon during the handshake string version = 5; // port identifier @@ -85,9 +85,9 @@ message Counterparty { option (gogoproto.goproto_getters) = false; // port on the counterparty chain which owns the other end of the channel. - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string port_id = 1; // channel end on the counterparty chain - string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string channel_id = 2; } // Packet defines a type that carries data across different chains through IBC @@ -99,20 +99,19 @@ message Packet { // with a later sequence number. uint64 sequence = 1; // identifies the port on the sending chain. - string source_port = 2 [(gogoproto.moretags) = "yaml:\"source_port\""]; + string source_port = 2; // identifies the channel end on the sending chain. - string source_channel = 3 [(gogoproto.moretags) = "yaml:\"source_channel\""]; + string source_channel = 3; // identifies the port on the receiving chain. - string destination_port = 4 [(gogoproto.moretags) = "yaml:\"destination_port\""]; + string destination_port = 4; // identifies the channel end on the receiving chain. - string destination_channel = 5 [(gogoproto.moretags) = "yaml:\"destination_channel\""]; + string destination_channel = 5; // actual opaque bytes transferred directly to the application module bytes data = 6; // block height after which the packet times out - ibc.core.client.v1.Height timeout_height = 7 - [(gogoproto.moretags) = "yaml:\"timeout_height\"", (gogoproto.nullable) = false]; + ibc.core.client.v1.Height timeout_height = 7 [(gogoproto.nullable) = false]; // block timestamp (in nanoseconds) after which the packet times out - uint64 timeout_timestamp = 8 [(gogoproto.moretags) = "yaml:\"timeout_timestamp\""]; + uint64 timeout_timestamp = 8; } // PacketState defines the generic type necessary to retrieve and store @@ -123,9 +122,9 @@ message PacketState { option (gogoproto.goproto_getters) = false; // channel port identifier. - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string port_id = 1; // channel unique identifier. - string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string channel_id = 2; // packet sequence. uint64 sequence = 3; // embedded data that represents packet state. @@ -139,9 +138,9 @@ message PacketId { option (gogoproto.goproto_getters) = false; // channel port identifier - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string port_id = 1; // channel unique identifier - string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string channel_id = 2; // packet sequence uint64 sequence = 3; } diff --git a/proto/ibc/core/channel/v1/genesis.proto b/proto/ibc/core/channel/v1/genesis.proto index 65cc928aa2a..092466186da 100644 --- a/proto/ibc/core/channel/v1/genesis.proto +++ b/proto/ibc/core/channel/v1/genesis.proto @@ -13,20 +13,17 @@ message GenesisState { repeated PacketState acknowledgements = 2 [(gogoproto.nullable) = false]; repeated PacketState commitments = 3 [(gogoproto.nullable) = false]; repeated PacketState receipts = 4 [(gogoproto.nullable) = false]; - repeated PacketSequence send_sequences = 5 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"send_sequences\""]; - repeated PacketSequence recv_sequences = 6 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"recv_sequences\""]; - repeated PacketSequence ack_sequences = 7 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"ack_sequences\""]; + repeated PacketSequence send_sequences = 5 [(gogoproto.nullable) = false]; + repeated PacketSequence recv_sequences = 6 [(gogoproto.nullable) = false]; + repeated PacketSequence ack_sequences = 7 [(gogoproto.nullable) = false]; // the sequence for the next generated channel identifier - uint64 next_channel_sequence = 8 [(gogoproto.moretags) = "yaml:\"next_channel_sequence\""]; + uint64 next_channel_sequence = 8; } // PacketSequence defines the genesis type necessary to retrieve and store // next send and receive sequences. message PacketSequence { - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; - string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string port_id = 1; + string channel_id = 2; uint64 sequence = 3; } diff --git a/proto/ibc/core/channel/v1/tx.proto b/proto/ibc/core/channel/v1/tx.proto index a67a375559b..c16e48dc264 100644 --- a/proto/ibc/core/channel/v1/tx.proto +++ b/proto/ibc/core/channel/v1/tx.proto @@ -60,14 +60,14 @@ message MsgChannelOpenInit { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string port_id = 1; Channel channel = 2 [(gogoproto.nullable) = false]; string signer = 3; } // MsgChannelOpenInitResponse defines the Msg/ChannelOpenInit response type. message MsgChannelOpenInitResponse { - string channel_id = 1 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string channel_id = 1; string version = 2; } @@ -78,22 +78,21 @@ message MsgChannelOpenTry { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; + string port_id = 1; // Deprecated: this field is unused. Crossing hello's are no longer supported in core IBC. - string previous_channel_id = 2 [deprecated = true, (gogoproto.moretags) = "yaml:\"previous_channel_id\""]; + string previous_channel_id = 2 [deprecated = true]; // NOTE: the version field within the channel has been deprecated. Its value will be ignored by core IBC. Channel channel = 3 [(gogoproto.nullable) = false]; - string counterparty_version = 4 [(gogoproto.moretags) = "yaml:\"counterparty_version\""]; - bytes proof_init = 5 [(gogoproto.moretags) = "yaml:\"proof_init\""]; - ibc.core.client.v1.Height proof_height = 6 - [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false]; - string signer = 7; + string counterparty_version = 4; + bytes proof_init = 5; + ibc.core.client.v1.Height proof_height = 6 [(gogoproto.nullable) = false]; + string signer = 7; } // MsgChannelOpenTryResponse defines the Msg/ChannelOpenTry response type. message MsgChannelOpenTryResponse { string version = 1; - string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string channel_id = 2; } // MsgChannelOpenAck defines a msg sent by a Relayer to Chain A to acknowledge @@ -102,14 +101,13 @@ message MsgChannelOpenAck { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; - string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; - string counterparty_channel_id = 3 [(gogoproto.moretags) = "yaml:\"counterparty_channel_id\""]; - string counterparty_version = 4 [(gogoproto.moretags) = "yaml:\"counterparty_version\""]; - bytes proof_try = 5 [(gogoproto.moretags) = "yaml:\"proof_try\""]; - ibc.core.client.v1.Height proof_height = 6 - [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false]; - string signer = 7; + string port_id = 1; + string channel_id = 2; + string counterparty_channel_id = 3; + string counterparty_version = 4; + bytes proof_try = 5; + ibc.core.client.v1.Height proof_height = 6 [(gogoproto.nullable) = false]; + string signer = 7; } // MsgChannelOpenAckResponse defines the Msg/ChannelOpenAck response type. @@ -121,12 +119,11 @@ message MsgChannelOpenConfirm { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; - string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; - bytes proof_ack = 3 [(gogoproto.moretags) = "yaml:\"proof_ack\""]; - ibc.core.client.v1.Height proof_height = 4 - [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false]; - string signer = 5; + string port_id = 1; + string channel_id = 2; + bytes proof_ack = 3; + ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false]; + string signer = 5; } // MsgChannelOpenConfirmResponse defines the Msg/ChannelOpenConfirm response @@ -139,8 +136,8 @@ message MsgChannelCloseInit { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; - string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; + string port_id = 1; + string channel_id = 2; string signer = 3; } @@ -153,12 +150,11 @@ message MsgChannelCloseConfirm { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string port_id = 1 [(gogoproto.moretags) = "yaml:\"port_id\""]; - string channel_id = 2 [(gogoproto.moretags) = "yaml:\"channel_id\""]; - bytes proof_init = 3 [(gogoproto.moretags) = "yaml:\"proof_init\""]; - ibc.core.client.v1.Height proof_height = 4 - [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false]; - string signer = 5; + string port_id = 1; + string channel_id = 2; + bytes proof_init = 3; + ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false]; + string signer = 5; } // MsgChannelCloseConfirmResponse defines the Msg/ChannelCloseConfirm response @@ -171,10 +167,9 @@ message MsgRecvPacket { option (gogoproto.goproto_getters) = false; Packet packet = 1 [(gogoproto.nullable) = false]; - bytes proof_commitment = 2 [(gogoproto.moretags) = "yaml:\"proof_commitment\""]; - ibc.core.client.v1.Height proof_height = 3 - [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false]; - string signer = 4; + bytes proof_commitment = 2; + ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false]; + string signer = 4; } // MsgRecvPacketResponse defines the Msg/RecvPacket response type. @@ -189,12 +184,11 @@ message MsgTimeout { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - Packet packet = 1 [(gogoproto.nullable) = false]; - bytes proof_unreceived = 2 [(gogoproto.moretags) = "yaml:\"proof_unreceived\""]; - ibc.core.client.v1.Height proof_height = 3 - [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false]; - uint64 next_sequence_recv = 4 [(gogoproto.moretags) = "yaml:\"next_sequence_recv\""]; - string signer = 5; + Packet packet = 1 [(gogoproto.nullable) = false]; + bytes proof_unreceived = 2; + ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false]; + uint64 next_sequence_recv = 4; + string signer = 5; } // MsgTimeoutResponse defines the Msg/Timeout response type. @@ -209,13 +203,12 @@ message MsgTimeoutOnClose { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - Packet packet = 1 [(gogoproto.nullable) = false]; - bytes proof_unreceived = 2 [(gogoproto.moretags) = "yaml:\"proof_unreceived\""]; - bytes proof_close = 3 [(gogoproto.moretags) = "yaml:\"proof_close\""]; - ibc.core.client.v1.Height proof_height = 4 - [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false]; - uint64 next_sequence_recv = 5 [(gogoproto.moretags) = "yaml:\"next_sequence_recv\""]; - string signer = 6; + Packet packet = 1 [(gogoproto.nullable) = false]; + bytes proof_unreceived = 2; + bytes proof_close = 3; + ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false]; + uint64 next_sequence_recv = 5; + string signer = 6; } // MsgTimeoutOnCloseResponse defines the Msg/TimeoutOnClose response type. @@ -232,10 +225,9 @@ message MsgAcknowledgement { Packet packet = 1 [(gogoproto.nullable) = false]; bytes acknowledgement = 2; - bytes proof_acked = 3 [(gogoproto.moretags) = "yaml:\"proof_acked\""]; - ibc.core.client.v1.Height proof_height = 4 - [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false]; - string signer = 5; + bytes proof_acked = 3; + ibc.core.client.v1.Height proof_height = 4 [(gogoproto.nullable) = false]; + string signer = 5; } // MsgAcknowledgementResponse defines the Msg/Acknowledgement response type. diff --git a/proto/ibc/core/client/v1/client.proto b/proto/ibc/core/client/v1/client.proto index 15b47e55548..9c9178d5f0e 100644 --- a/proto/ibc/core/client/v1/client.proto +++ b/proto/ibc/core/client/v1/client.proto @@ -13,9 +13,9 @@ import "cosmos_proto/cosmos.proto"; // identifier field. message IdentifiedClientState { // client identifier - string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; + string client_id = 1; // client state - google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""]; + google.protobuf.Any client_state = 2; } // ConsensusStateWithHeight defines a consensus state with an additional height @@ -24,17 +24,16 @@ message ConsensusStateWithHeight { // consensus state height Height height = 1 [(gogoproto.nullable) = false]; // consensus state - google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; + google.protobuf.Any consensus_state = 2; } // ClientConsensusStates defines all the stored consensus states for a given // client. message ClientConsensusStates { // client identifier - string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; + string client_id = 1; // consensus states and their heights associated with the client - repeated ConsensusStateWithHeight consensus_states = 2 - [(gogoproto.moretags) = "yaml:\"consensus_states\"", (gogoproto.nullable) = false]; + repeated ConsensusStateWithHeight consensus_states = 2 [(gogoproto.nullable) = false]; } // ClientUpdateProposal is a governance proposal. If it passes, the substitute @@ -49,10 +48,10 @@ message ClientUpdateProposal { // the description of the proposal string description = 2; // the client identifier for the client to be updated if the proposal passes - string subject_client_id = 3 [(gogoproto.moretags) = "yaml:\"subject_client_id\""]; + string subject_client_id = 3; // the substitute client identifier for the client standing in for the subject // client - string substitute_client_id = 4 [(gogoproto.moretags) = "yaml:\"substitute_client_id\""]; + string substitute_client_id = 4; } // UpgradeProposal is a gov Content type for initiating an IBC breaking @@ -73,7 +72,7 @@ message UpgradeProposal { // new upgraded client is valid by verifying a proof on the previous version // of the chain. This will allow IBC connections to persist smoothly across // planned chain upgrades - google.protobuf.Any upgraded_client_state = 4 [(gogoproto.moretags) = "yaml:\"upgraded_client_state\""]; + google.protobuf.Any upgraded_client_state = 4; } // Height is a monotonically increasing data type @@ -91,9 +90,9 @@ message Height { option (gogoproto.goproto_stringer) = false; // the revision that the client is currently on - uint64 revision_number = 1 [(gogoproto.moretags) = "yaml:\"revision_number\""]; + uint64 revision_number = 1; // the height within the given revision - uint64 revision_height = 2 [(gogoproto.moretags) = "yaml:\"revision_height\""]; + uint64 revision_height = 2; } // Params defines the set of IBC light client parameters. @@ -101,5 +100,5 @@ message Params { // allowed_clients defines the list of allowed client state types which can be created // and interacted with. If a client type is removed from the allowed clients list, usage // of this client will be disabled until it is added again to the list. - repeated string allowed_clients = 1 [(gogoproto.moretags) = "yaml:\"allowed_clients\""]; + repeated string allowed_clients = 1; } diff --git a/proto/ibc/core/client/v1/genesis.proto b/proto/ibc/core/client/v1/genesis.proto index 78821244169..d23585dcbab 100644 --- a/proto/ibc/core/client/v1/genesis.proto +++ b/proto/ibc/core/client/v1/genesis.proto @@ -13,19 +13,15 @@ message GenesisState { repeated IdentifiedClientState clients = 1 [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "IdentifiedClientStates"]; // consensus states from each client - repeated ClientConsensusStates clients_consensus = 2 [ - (gogoproto.nullable) = false, - (gogoproto.castrepeated) = "ClientsConsensusStates", - (gogoproto.moretags) = "yaml:\"clients_consensus\"" - ]; + repeated ClientConsensusStates clients_consensus = 2 + [(gogoproto.nullable) = false, (gogoproto.castrepeated) = "ClientsConsensusStates"]; // metadata from each client - repeated IdentifiedGenesisMetadata clients_metadata = 3 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"clients_metadata\""]; - Params params = 4 [(gogoproto.nullable) = false]; + repeated IdentifiedGenesisMetadata clients_metadata = 3 [(gogoproto.nullable) = false]; + Params params = 4 [(gogoproto.nullable) = false]; // create localhost on initialization - bool create_localhost = 5 [(gogoproto.moretags) = "yaml:\"create_localhost\""]; + bool create_localhost = 5; // the sequence for the next generated client identifier - uint64 next_client_sequence = 6 [(gogoproto.moretags) = "yaml:\"next_client_sequence\""]; + uint64 next_client_sequence = 6; } // GenesisMetadata defines the genesis type for metadata that clients may return @@ -42,7 +38,6 @@ message GenesisMetadata { // IdentifiedGenesisMetadata has the client metadata with the corresponding // client id. message IdentifiedGenesisMetadata { - string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; - repeated GenesisMetadata client_metadata = 2 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"client_metadata\""]; + string client_id = 1; + repeated GenesisMetadata client_metadata = 2 [(gogoproto.nullable) = false]; } diff --git a/proto/ibc/core/client/v1/tx.proto b/proto/ibc/core/client/v1/tx.proto index 23302d5e3aa..9388dbc9dd5 100644 --- a/proto/ibc/core/client/v1/tx.proto +++ b/proto/ibc/core/client/v1/tx.proto @@ -28,10 +28,10 @@ message MsgCreateClient { option (gogoproto.goproto_getters) = false; // light client state - google.protobuf.Any client_state = 1 [(gogoproto.moretags) = "yaml:\"client_state\""]; + google.protobuf.Any client_state = 1; // consensus state associated with the client that corresponds to a given // height. - google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; + google.protobuf.Any consensus_state = 2; // signer address string signer = 3; } @@ -46,7 +46,7 @@ message MsgUpdateClient { option (gogoproto.goproto_getters) = false; // client unique identifier - string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; + string client_id = 1; // client message to update the light client google.protobuf.Any client_message = 2; // signer address @@ -63,16 +63,16 @@ message MsgUpgradeClient { option (gogoproto.goproto_getters) = false; // client unique identifier - string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; + string client_id = 1; // upgraded client state - google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""]; + google.protobuf.Any client_state = 2; // upgraded consensus state, only contains enough information to serve as a // basis of trust in update logic - google.protobuf.Any consensus_state = 3 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; + google.protobuf.Any consensus_state = 3; // proof that old chain committed to new client - bytes proof_upgrade_client = 4 [(gogoproto.moretags) = "yaml:\"proof_upgrade_client\""]; + bytes proof_upgrade_client = 4; // proof that old chain committed to new consensus state - bytes proof_upgrade_consensus_state = 5 [(gogoproto.moretags) = "yaml:\"proof_upgrade_consensus_state\""]; + bytes proof_upgrade_consensus_state = 5; // signer address string signer = 6; } @@ -88,7 +88,7 @@ message MsgSubmitMisbehaviour { option (gogoproto.goproto_getters) = false; // client unique identifier - string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\"", deprecated = true]; + string client_id = 1 [deprecated = true]; // misbehaviour used for freezing the light client google.protobuf.Any misbehaviour = 2 [deprecated = true]; // signer address diff --git a/proto/ibc/core/commitment/v1/commitment.proto b/proto/ibc/core/commitment/v1/commitment.proto index 4840ff3e067..f44fb75379a 100644 --- a/proto/ibc/core/commitment/v1/commitment.proto +++ b/proto/ibc/core/commitment/v1/commitment.proto @@ -19,7 +19,7 @@ message MerkleRoot { // The constructed key from the Path and the key will be append(Path.KeyPath, // append(Path.KeyPrefix, key...)) message MerklePrefix { - bytes key_prefix = 1 [(gogoproto.moretags) = "yaml:\"key_prefix\""]; + bytes key_prefix = 1; } // MerklePath is the path used to verify commitment proofs, which can be an @@ -28,7 +28,7 @@ message MerklePrefix { message MerklePath { option (gogoproto.goproto_stringer) = false; - repeated string key_path = 1 [(gogoproto.moretags) = "yaml:\"key_path\""]; + repeated string key_path = 1; } // MerkleProof is a wrapper type over a chain of CommitmentProofs. diff --git a/proto/ibc/core/connection/v1/connection.proto b/proto/ibc/core/connection/v1/connection.proto index ba367c14d20..952a831aef3 100644 --- a/proto/ibc/core/connection/v1/connection.proto +++ b/proto/ibc/core/connection/v1/connection.proto @@ -17,7 +17,7 @@ import "ibc/core/commitment/v1/commitment.proto"; message ConnectionEnd { option (gogoproto.goproto_getters) = false; // client associated with this connection. - string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; + string client_id = 1; // IBC version which can be utilised to determine encodings or protocols for // channels or packets utilising this connection. repeated Version versions = 2; @@ -28,7 +28,7 @@ message ConnectionEnd { // delay period that must pass before a consensus state can be used for // packet-verification NOTE: delay period logic is only implemented by some // clients. - uint64 delay_period = 5 [(gogoproto.moretags) = "yaml:\"delay_period\""]; + uint64 delay_period = 5; } // IdentifiedConnection defines a connection with additional connection @@ -36,9 +36,9 @@ message ConnectionEnd { message IdentifiedConnection { option (gogoproto.goproto_getters) = false; // connection identifier. - string id = 1 [(gogoproto.moretags) = "yaml:\"id\""]; + string id = 1; // client associated with this connection. - string client_id = 2 [(gogoproto.moretags) = "yaml:\"client_id\""]; + string client_id = 2; // IBC version which can be utilised to determine encodings or protocols for // channels or packets utilising this connection repeated Version versions = 3; @@ -47,7 +47,7 @@ message IdentifiedConnection { // counterparty chain associated with this connection. Counterparty counterparty = 5 [(gogoproto.nullable) = false]; // delay period associated with this connection. - uint64 delay_period = 6 [(gogoproto.moretags) = "yaml:\"delay_period\""]; + uint64 delay_period = 6; } // State defines if a connection is in one of the following states: @@ -72,10 +72,10 @@ message Counterparty { // identifies the client on the counterparty chain associated with a given // connection. - string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; + string client_id = 1; // identifies the connection end on the counterparty chain associated with a // given connection. - string connection_id = 2 [(gogoproto.moretags) = "yaml:\"connection_id\""]; + string connection_id = 2; // commitment merkle prefix of the counterparty chain. ibc.core.commitment.v1.MerklePrefix prefix = 3 [(gogoproto.nullable) = false]; } @@ -89,7 +89,7 @@ message ClientPaths { // ConnectionPaths define all the connection paths for a given client state. message ConnectionPaths { // client state unique identifier - string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; + string client_id = 1; // list of connection paths repeated string paths = 2; } @@ -110,5 +110,5 @@ message Params { // maximum expected time per block (in nanoseconds), used to enforce block delay. This parameter should reflect the // largest amount of time that the chain might reasonably take to produce the next block under normal operating // conditions. A safe choice is 3-5x the expected time per block. - uint64 max_expected_time_per_block = 1 [(gogoproto.moretags) = "yaml:\"max_expected_time_per_block\""]; + uint64 max_expected_time_per_block = 1; } diff --git a/proto/ibc/core/connection/v1/genesis.proto b/proto/ibc/core/connection/v1/genesis.proto index 122c5a4652d..43b4e45955e 100644 --- a/proto/ibc/core/connection/v1/genesis.proto +++ b/proto/ibc/core/connection/v1/genesis.proto @@ -10,9 +10,8 @@ import "ibc/core/connection/v1/connection.proto"; // GenesisState defines the ibc connection submodule's genesis state. message GenesisState { repeated IdentifiedConnection connections = 1 [(gogoproto.nullable) = false]; - repeated ConnectionPaths client_connection_paths = 2 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"client_connection_paths\""]; + repeated ConnectionPaths client_connection_paths = 2 [(gogoproto.nullable) = false]; // the sequence for the next generated connection identifier - uint64 next_connection_sequence = 3 [(gogoproto.moretags) = "yaml:\"next_connection_sequence\""]; + uint64 next_connection_sequence = 3; Params params = 4 [(gogoproto.nullable) = false]; } diff --git a/proto/ibc/core/connection/v1/query.proto b/proto/ibc/core/connection/v1/query.proto index 3c76b238910..99f6f92ab6e 100644 --- a/proto/ibc/core/connection/v1/query.proto +++ b/proto/ibc/core/connection/v1/query.proto @@ -106,7 +106,7 @@ message QueryClientConnectionsResponse { // Query/ConnectionClientState RPC method message QueryConnectionClientStateRequest { // connection identifier - string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""]; + string connection_id = 1; } // QueryConnectionClientStateResponse is the response type for the @@ -124,7 +124,7 @@ message QueryConnectionClientStateResponse { // Query/ConnectionConsensusState RPC method message QueryConnectionConsensusStateRequest { // connection identifier - string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""]; + string connection_id = 1; uint64 revision_number = 2; uint64 revision_height = 3; } diff --git a/proto/ibc/core/connection/v1/tx.proto b/proto/ibc/core/connection/v1/tx.proto index af8f505c461..28ab6264a6c 100644 --- a/proto/ibc/core/connection/v1/tx.proto +++ b/proto/ibc/core/connection/v1/tx.proto @@ -31,10 +31,10 @@ message MsgConnectionOpenInit { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; + string client_id = 1; Counterparty counterparty = 2 [(gogoproto.nullable) = false]; Version version = 3; - uint64 delay_period = 4 [(gogoproto.moretags) = "yaml:\"delay_period\""]; + uint64 delay_period = 4; string signer = 5; } @@ -48,25 +48,23 @@ message MsgConnectionOpenTry { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; + string client_id = 1; // Deprecated: this field is unused. Crossing hellos are no longer supported in core IBC. - string previous_connection_id = 2 [deprecated = true, (gogoproto.moretags) = "yaml:\"previous_connection_id\""]; - google.protobuf.Any client_state = 3 [(gogoproto.moretags) = "yaml:\"client_state\""]; - Counterparty counterparty = 4 [(gogoproto.nullable) = false]; - uint64 delay_period = 5 [(gogoproto.moretags) = "yaml:\"delay_period\""]; - repeated Version counterparty_versions = 6 [(gogoproto.moretags) = "yaml:\"counterparty_versions\""]; - ibc.core.client.v1.Height proof_height = 7 - [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false]; + string previous_connection_id = 2 [deprecated = true]; + google.protobuf.Any client_state = 3; + Counterparty counterparty = 4 [(gogoproto.nullable) = false]; + uint64 delay_period = 5; + repeated Version counterparty_versions = 6; + ibc.core.client.v1.Height proof_height = 7 [(gogoproto.nullable) = false]; // proof of the initialization the connection on Chain A: `UNITIALIZED -> // INIT` - bytes proof_init = 8 [(gogoproto.moretags) = "yaml:\"proof_init\""]; + bytes proof_init = 8; // proof of client state included in message - bytes proof_client = 9 [(gogoproto.moretags) = "yaml:\"proof_client\""]; + bytes proof_client = 9; // proof of client consensus state - bytes proof_consensus = 10 [(gogoproto.moretags) = "yaml:\"proof_consensus\""]; - ibc.core.client.v1.Height consensus_height = 11 - [(gogoproto.moretags) = "yaml:\"consensus_height\"", (gogoproto.nullable) = false]; - string signer = 12; + bytes proof_consensus = 10; + ibc.core.client.v1.Height consensus_height = 11 [(gogoproto.nullable) = false]; + string signer = 12; // optional proof data for host state machines that are unable to introspect their own consensus state bytes host_consensus_state_proof = 13; } @@ -80,22 +78,20 @@ message MsgConnectionOpenAck { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""]; - string counterparty_connection_id = 2 [(gogoproto.moretags) = "yaml:\"counterparty_connection_id\""]; - Version version = 3; - google.protobuf.Any client_state = 4 [(gogoproto.moretags) = "yaml:\"client_state\""]; - ibc.core.client.v1.Height proof_height = 5 - [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false]; + string connection_id = 1; + string counterparty_connection_id = 2; + Version version = 3; + google.protobuf.Any client_state = 4; + ibc.core.client.v1.Height proof_height = 5 [(gogoproto.nullable) = false]; // proof of the initialization the connection on Chain B: `UNITIALIZED -> // TRYOPEN` - bytes proof_try = 6 [(gogoproto.moretags) = "yaml:\"proof_try\""]; + bytes proof_try = 6; // proof of client state included in message - bytes proof_client = 7 [(gogoproto.moretags) = "yaml:\"proof_client\""]; + bytes proof_client = 7; // proof of client consensus state - bytes proof_consensus = 8 [(gogoproto.moretags) = "yaml:\"proof_consensus\""]; - ibc.core.client.v1.Height consensus_height = 9 - [(gogoproto.moretags) = "yaml:\"consensus_height\"", (gogoproto.nullable) = false]; - string signer = 10; + bytes proof_consensus = 8; + ibc.core.client.v1.Height consensus_height = 9 [(gogoproto.nullable) = false]; + string signer = 10; // optional proof data for host state machines that are unable to introspect their own consensus state bytes host_consensus_state_proof = 11; } @@ -109,12 +105,11 @@ message MsgConnectionOpenConfirm { option (gogoproto.equal) = false; option (gogoproto.goproto_getters) = false; - string connection_id = 1 [(gogoproto.moretags) = "yaml:\"connection_id\""]; + string connection_id = 1; // proof for the change of the connection state on Chain A: `INIT -> OPEN` - bytes proof_ack = 2 [(gogoproto.moretags) = "yaml:\"proof_ack\""]; - ibc.core.client.v1.Height proof_height = 3 - [(gogoproto.moretags) = "yaml:\"proof_height\"", (gogoproto.nullable) = false]; - string signer = 4; + bytes proof_ack = 2; + ibc.core.client.v1.Height proof_height = 3 [(gogoproto.nullable) = false]; + string signer = 4; } // MsgConnectionOpenConfirmResponse defines the Msg/ConnectionOpenConfirm diff --git a/proto/ibc/core/types/v1/genesis.proto b/proto/ibc/core/types/v1/genesis.proto index 4e07551f823..9ab7fd3f741 100644 --- a/proto/ibc/core/types/v1/genesis.proto +++ b/proto/ibc/core/types/v1/genesis.proto @@ -12,12 +12,9 @@ import "ibc/core/channel/v1/genesis.proto"; // GenesisState defines the ibc module's genesis state. message GenesisState { // ICS002 - Clients genesis state - ibc.core.client.v1.GenesisState client_genesis = 1 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"client_genesis\""]; + ibc.core.client.v1.GenesisState client_genesis = 1 [(gogoproto.nullable) = false]; // ICS003 - Connections genesis state - ibc.core.connection.v1.GenesisState connection_genesis = 2 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"connection_genesis\""]; + ibc.core.connection.v1.GenesisState connection_genesis = 2 [(gogoproto.nullable) = false]; // ICS004 - Channel genesis state - ibc.core.channel.v1.GenesisState channel_genesis = 3 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"channel_genesis\""]; + ibc.core.channel.v1.GenesisState channel_genesis = 3 [(gogoproto.nullable) = false]; } diff --git a/proto/ibc/lightclients/solomachine/v2/solomachine.proto b/proto/ibc/lightclients/solomachine/v2/solomachine.proto index 250313319b4..b18ba9bc92f 100644 --- a/proto/ibc/lightclients/solomachine/v2/solomachine.proto +++ b/proto/ibc/lightclients/solomachine/v2/solomachine.proto @@ -16,11 +16,11 @@ message ClientState { // latest sequence of the client state uint64 sequence = 1; // frozen sequence of the solo machine - bool is_frozen = 2 [(gogoproto.moretags) = "yaml:\"is_frozen\""]; - ConsensusState consensus_state = 3 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; + bool is_frozen = 2; + ConsensusState consensus_state = 3; // when set to true, will allow governance to update a solo machine client. // The client will be unfrozen if it is frozen. - bool allow_update_after_proposal = 4 [(gogoproto.moretags) = "yaml:\"allow_update_after_proposal\""]; + bool allow_update_after_proposal = 4; } // ConsensusState defines a solo machine consensus state. The sequence of a @@ -29,7 +29,7 @@ message ClientState { message ConsensusState { option (gogoproto.goproto_getters) = false; // public key of the solo machine - google.protobuf.Any public_key = 1 [(gogoproto.moretags) = "yaml:\"public_key\""]; + google.protobuf.Any public_key = 1; // diversifier allows the same public key to be re-used across different solo // machine clients (potentially on different chains) without being considered // misbehaviour. @@ -44,18 +44,18 @@ message Header { uint64 sequence = 1; uint64 timestamp = 2; bytes signature = 3; - google.protobuf.Any new_public_key = 4 [(gogoproto.moretags) = "yaml:\"new_public_key\""]; - string new_diversifier = 5 [(gogoproto.moretags) = "yaml:\"new_diversifier\""]; + google.protobuf.Any new_public_key = 4; + string new_diversifier = 5; } // Misbehaviour defines misbehaviour for a solo machine which consists // of a sequence and two signatures over different messages at that sequence. message Misbehaviour { option (gogoproto.goproto_getters) = false; - string client_id = 1 [(gogoproto.moretags) = "yaml:\"client_id\""]; + string client_id = 1; uint64 sequence = 2; - SignatureAndData signature_one = 3 [(gogoproto.moretags) = "yaml:\"signature_one\""]; - SignatureAndData signature_two = 4 [(gogoproto.moretags) = "yaml:\"signature_two\""]; + SignatureAndData signature_one = 3; + SignatureAndData signature_two = 4; } // SignatureAndData contains a signature and the data signed over to create that @@ -63,7 +63,7 @@ message Misbehaviour { message SignatureAndData { option (gogoproto.goproto_getters) = false; bytes signature = 1; - DataType data_type = 2 [(gogoproto.moretags) = "yaml:\"data_type\""]; + DataType data_type = 2; bytes data = 3; uint64 timestamp = 4; } @@ -72,7 +72,7 @@ message SignatureAndData { // signature. message TimestampedSignatureData { option (gogoproto.goproto_getters) = false; - bytes signature_data = 1 [(gogoproto.moretags) = "yaml:\"signature_data\""]; + bytes signature_data = 1; uint64 timestamp = 2; } @@ -84,7 +84,7 @@ message SignBytes { uint64 timestamp = 2; string diversifier = 3; // type of the data used - DataType data_type = 4 [(gogoproto.moretags) = "yaml:\"data_type\""]; + DataType data_type = 4; // marshaled data bytes data = 5; } @@ -121,9 +121,9 @@ message HeaderData { option (gogoproto.goproto_getters) = false; // header public key - google.protobuf.Any new_pub_key = 1 [(gogoproto.moretags) = "yaml:\"new_pub_key\""]; + google.protobuf.Any new_pub_key = 1; // header diversifier - string new_diversifier = 2 [(gogoproto.moretags) = "yaml:\"new_diversifier\""]; + string new_diversifier = 2; } // ClientStateData returns the SignBytes data for client state verification. @@ -131,7 +131,7 @@ message ClientStateData { option (gogoproto.goproto_getters) = false; bytes path = 1; - google.protobuf.Any client_state = 2 [(gogoproto.moretags) = "yaml:\"client_state\""]; + google.protobuf.Any client_state = 2; } // ConsensusStateData returns the SignBytes data for consensus state @@ -140,7 +140,7 @@ message ConsensusStateData { option (gogoproto.goproto_getters) = false; bytes path = 1; - google.protobuf.Any consensus_state = 2 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; + google.protobuf.Any consensus_state = 2; } // ConnectionStateData returns the SignBytes data for connection state @@ -185,5 +185,5 @@ message PacketReceiptAbsenceData { // sequence to be received. message NextSequenceRecvData { bytes path = 1; - uint64 next_seq_recv = 2 [(gogoproto.moretags) = "yaml:\"next_seq_recv\""]; + uint64 next_seq_recv = 2; } diff --git a/proto/ibc/lightclients/solomachine/v3/solomachine.proto b/proto/ibc/lightclients/solomachine/v3/solomachine.proto index 40e76b722e7..7bc800e93a7 100644 --- a/proto/ibc/lightclients/solomachine/v3/solomachine.proto +++ b/proto/ibc/lightclients/solomachine/v3/solomachine.proto @@ -14,8 +14,8 @@ message ClientState { // latest sequence of the client state uint64 sequence = 1; // frozen sequence of the solo machine - bool is_frozen = 2 [(gogoproto.moretags) = "yaml:\"is_frozen\""]; - ConsensusState consensus_state = 3 [(gogoproto.moretags) = "yaml:\"consensus_state\""]; + bool is_frozen = 2; + ConsensusState consensus_state = 3; } // ConsensusState defines a solo machine consensus state. The sequence of a @@ -24,7 +24,7 @@ message ClientState { message ConsensusState { option (gogoproto.goproto_getters) = false; // public key of the solo machine - google.protobuf.Any public_key = 1 [(gogoproto.moretags) = "yaml:\"public_key\""]; + google.protobuf.Any public_key = 1; // diversifier allows the same public key to be re-used across different solo // machine clients (potentially on different chains) without being considered // misbehaviour. @@ -38,8 +38,8 @@ message Header { uint64 timestamp = 1; bytes signature = 2; - google.protobuf.Any new_public_key = 3 [(gogoproto.moretags) = "yaml:\"new_public_key\""]; - string new_diversifier = 4 [(gogoproto.moretags) = "yaml:\"new_diversifier\""]; + google.protobuf.Any new_public_key = 3; + string new_diversifier = 4; } // Misbehaviour defines misbehaviour for a solo machine which consists @@ -48,8 +48,8 @@ message Misbehaviour { option (gogoproto.goproto_getters) = false; uint64 sequence = 1; - SignatureAndData signature_one = 2 [(gogoproto.moretags) = "yaml:\"signature_one\""]; - SignatureAndData signature_two = 3 [(gogoproto.moretags) = "yaml:\"signature_two\""]; + SignatureAndData signature_one = 2; + SignatureAndData signature_two = 3; } // SignatureAndData contains a signature and the data signed over to create that @@ -68,7 +68,7 @@ message SignatureAndData { message TimestampedSignatureData { option (gogoproto.goproto_getters) = false; - bytes signature_data = 1 [(gogoproto.moretags) = "yaml:\"signature_data\""]; + bytes signature_data = 1; uint64 timestamp = 2; } @@ -93,7 +93,7 @@ message HeaderData { option (gogoproto.goproto_getters) = false; // header public key - google.protobuf.Any new_pub_key = 1 [(gogoproto.moretags) = "yaml:\"new_pub_key\""]; + google.protobuf.Any new_pub_key = 1; // header diversifier - string new_diversifier = 2 [(gogoproto.moretags) = "yaml:\"new_diversifier\""]; + string new_diversifier = 2; } diff --git a/proto/ibc/lightclients/tendermint/v1/tendermint.proto b/proto/ibc/lightclients/tendermint/v1/tendermint.proto index 83fa59c9fa4..7926828b519 100644 --- a/proto/ibc/lightclients/tendermint/v1/tendermint.proto +++ b/proto/ibc/lightclients/tendermint/v1/tendermint.proto @@ -19,29 +19,21 @@ message ClientState { option (gogoproto.goproto_getters) = false; string chain_id = 1; - Fraction trust_level = 2 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"trust_level\""]; + Fraction trust_level = 2 [(gogoproto.nullable) = false]; // duration of the period since the LastestTimestamp during which the // submitted headers are valid for upgrade - google.protobuf.Duration trusting_period = 3 - [(gogoproto.nullable) = false, (gogoproto.stdduration) = true, (gogoproto.moretags) = "yaml:\"trusting_period\""]; + google.protobuf.Duration trusting_period = 3 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true]; // duration of the staking unbonding period - google.protobuf.Duration unbonding_period = 4 [ - (gogoproto.nullable) = false, - (gogoproto.stdduration) = true, - (gogoproto.moretags) = "yaml:\"unbonding_period\"" - ]; + google.protobuf.Duration unbonding_period = 4 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true]; // defines how much new (untrusted) header's Time can drift into the future. - google.protobuf.Duration max_clock_drift = 5 - [(gogoproto.nullable) = false, (gogoproto.stdduration) = true, (gogoproto.moretags) = "yaml:\"max_clock_drift\""]; + google.protobuf.Duration max_clock_drift = 5 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true]; // Block height when the client was frozen due to a misbehaviour - ibc.core.client.v1.Height frozen_height = 6 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"frozen_height\""]; + ibc.core.client.v1.Height frozen_height = 6 [(gogoproto.nullable) = false]; // Latest height the client was updated to - ibc.core.client.v1.Height latest_height = 7 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"latest_height\""]; + ibc.core.client.v1.Height latest_height = 7 [(gogoproto.nullable) = false]; // Proof specifications used in verifying counterparty state - repeated cosmos.ics23.v1.ProofSpec proof_specs = 8 [(gogoproto.moretags) = "yaml:\"proof_specs\""]; + repeated cosmos.ics23.v1.ProofSpec proof_specs = 8; // Path at which next upgraded client will be committed. // Each element corresponds to the key for a single CommitmentProof in the @@ -50,13 +42,12 @@ message ClientState { // under `{upgradepath}/{upgradeHeight}/consensusState` For SDK chains using // the default upgrade module, upgrade_path should be []string{"upgrade", // "upgradedIBCState"}` - repeated string upgrade_path = 9 [(gogoproto.moretags) = "yaml:\"upgrade_path\""]; + repeated string upgrade_path = 9; // allow_update_after_expiry is deprecated - bool allow_update_after_expiry = 10 [deprecated = true, (gogoproto.moretags) = "yaml:\"allow_update_after_expiry\""]; + bool allow_update_after_expiry = 10 [deprecated = true]; // allow_update_after_misbehaviour is deprecated - bool allow_update_after_misbehaviour = 11 - [deprecated = true, (gogoproto.moretags) = "yaml:\"allow_update_after_misbehaviour\""]; + bool allow_update_after_misbehaviour = 11 [deprecated = true]; } // ConsensusState defines the consensus state from Tendermint. @@ -67,11 +58,8 @@ message ConsensusState { // was stored. google.protobuf.Timestamp timestamp = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; // commitment root (i.e app hash) - ibc.core.commitment.v1.MerkleRoot root = 2 [(gogoproto.nullable) = false]; - bytes next_validators_hash = 3 [ - (gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes", - (gogoproto.moretags) = "yaml:\"next_validators_hash\"" - ]; + ibc.core.commitment.v1.MerkleRoot root = 2 [(gogoproto.nullable) = false]; + bytes next_validators_hash = 3 [(gogoproto.casttype) = "github.com/cometbft/cometbft/libs/bytes.HexBytes"]; } // Misbehaviour is a wrapper over two conflicting Headers @@ -80,9 +68,9 @@ message Misbehaviour { option (gogoproto.goproto_getters) = false; // ClientID is deprecated - string client_id = 1 [deprecated = true, (gogoproto.moretags) = "yaml:\"client_id\""]; - Header header_1 = 2 [(gogoproto.customname) = "Header1", (gogoproto.moretags) = "yaml:\"header_1\""]; - Header header_2 = 3 [(gogoproto.customname) = "Header2", (gogoproto.moretags) = "yaml:\"header_2\""]; + string client_id = 1 [deprecated = true]; + Header header_1 = 2 [(gogoproto.customname) = "Header1"]; + Header header_2 = 3 [(gogoproto.customname) = "Header2"]; } // Header defines the Tendermint client consensus Header. @@ -98,13 +86,11 @@ message Misbehaviour { // hash to TrustedConsensusState.NextValidatorsHash since that is the last // trusted validator set at the TrustedHeight. message Header { - .tendermint.types.SignedHeader signed_header = 1 - [(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"signed_header\""]; + .tendermint.types.SignedHeader signed_header = 1 [(gogoproto.embed) = true]; - .tendermint.types.ValidatorSet validator_set = 2 [(gogoproto.moretags) = "yaml:\"validator_set\""]; - ibc.core.client.v1.Height trusted_height = 3 - [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"trusted_height\""]; - .tendermint.types.ValidatorSet trusted_validators = 4 [(gogoproto.moretags) = "yaml:\"trusted_validators\""]; + .tendermint.types.ValidatorSet validator_set = 2; + ibc.core.client.v1.Height trusted_height = 3 [(gogoproto.nullable) = false]; + .tendermint.types.ValidatorSet trusted_validators = 4; } // Fraction defines the protobuf message type for tmmath.Fraction that only From b3f1b4d89168924e6c7a6206b32306c6038c5e90 Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Mon, 20 Mar 2023 13:14:51 +0100 Subject: [PATCH 14/23] add reasoning for migration to enable localhost --- docs/migrations/v7-to-v7_1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/migrations/v7-to-v7_1.md b/docs/migrations/v7-to-v7_1.md index 15042455930..d024c2cb999 100644 --- a/docs/migrations/v7-to-v7_1.md +++ b/docs/migrations/v7-to-v7_1.md @@ -20,7 +20,7 @@ In the previous release of ibc-go, the localhost `v1` light client module was de An [automatic migration handler](https://github.com/cosmos/ibc-go/blob/09-localhost/modules/core/module.go#L133-L145) is configured in the core IBC module to set the localhost `ClientState` and sentinel `ConnectionEnd` in state. In order to use the 09-localhost client chains must update the `AllowedClients` parameter in the 02-client submodule of core IBC. This can be configured directly in the application upgrade handler or alternatively updated via the legacy governance parameter change proposal. -We __strongly__ recommend chains to perform this action. +We __strongly__ recommend chains to perform this action so that intra-ledger communication can be carried out using the familiar IBC interfaces. See the upgrade handler code sample provided below or [follow this link](https://github.com/cosmos/ibc-go/blob/09-localhost/testing/simapp/upgrades/upgrades.go#L85) for the upgrade handler used by the ibc-go simapp. From cbb6859f47f69d7f8ca49778033a9dfe8433c932 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Tue, 21 Mar 2023 09:03:30 +0000 Subject: [PATCH 15/23] Support configuration file for e2e tests (#3260) --- e2e/Makefile | 7 +- e2e/README.md | 8 +- e2e/relayer/relayer.go | 6 +- e2e/sample.config.yaml | 40 ++++ e2e/scripts/init.sh | 20 ++ e2e/scripts/run-e2e.sh | 4 - e2e/testconfig/testconfig.go | 242 +++++++++++++++++++---- e2e/tests/upgrades/upgrade_test.go | 26 +-- e2e/testsuite/diagnostics/diagnostics.go | 17 +- e2e/testsuite/testsuite.go | 14 +- 10 files changed, 307 insertions(+), 77 deletions(-) create mode 100644 e2e/sample.config.yaml create mode 100755 e2e/scripts/init.sh diff --git a/e2e/Makefile b/e2e/Makefile index 0be3866abb8..e05b3173db7 100644 --- a/e2e/Makefile +++ b/e2e/Makefile @@ -7,10 +7,13 @@ cleanup-ibc-test-containers: $(DOCKER) rm $$id ; \ done -e2e-test: cleanup-ibc-test-containers +init: + ./scripts/init.sh + +e2e-test: init cleanup-ibc-test-containers ./scripts/run-e2e.sh $(test) $(entrypoint) compatibility-tests: ./scripts/run-compatibility-tests.sh $(release_branch) -.PHONY: cleanup-ibc-test-containers e2e-test compatibility-tests +.PHONY: cleanup-ibc-test-containers e2e-test compatibility-tests init diff --git a/e2e/README.md b/e2e/README.md index b683baf8cb4..32d576cd6af 100644 --- a/e2e/README.md +++ b/e2e/README.md @@ -37,7 +37,13 @@ be quite common in most tests. Tests can be run using a Makefile target under the e2e directory. `e2e/Makefile` -There are several envinronment variables that alter the behaviour of the make target. +The tests can be configured using a configuration file or environment variables. + +See [the example](./sample.config.yaml) to get started. The default location the tests look is `~/.ibc-go-e2e-config.yaml` +But this can be specified directly using the `E2E_CONFIG_PATH` environment variable. + +There are several environment variables that alter the behaviour of the make target which will override any +options specified in your config file. | Environment Variable | Description | Default Value | |----------------------|-------------------------------------------|---------------| diff --git a/e2e/relayer/relayer.go b/e2e/relayer/relayer.go index f96af34a7c9..befcd6d127a 100644 --- a/e2e/relayer/relayer.go +++ b/e2e/relayer/relayer.go @@ -22,9 +22,11 @@ const ( // Config holds configuration values for the relayer used in the tests. type Config struct { // Tag is the tag used for the relayer image. - Tag string + Tag string `yaml:"tag"` // Type specifies the type of relayer that this is. - Type string + Type string `yaml:"type"` + // Image is the image that should be used for the relayer. + Image string `yaml:"image"` } // New returns an implementation of ibc.Relayer depending on the provided RelayerType. diff --git a/e2e/sample.config.yaml b/e2e/sample.config.yaml new file mode 100644 index 00000000000..30da46744a0 --- /dev/null +++ b/e2e/sample.config.yaml @@ -0,0 +1,40 @@ +# This file contains configuration for running e2e tests. +# Many of these fields can be overridden with environment variables. +# All fields that support this have the corresponding environment variable name in a comment beside the field. + +--- +chains: + # the entry at index 0 corresponds to CHAIN_A +- chainId: chain-a + numValidators: 1 + numFullNodes: 0 + image: ghcr.io/cosmos/ibc-go-simd # override with CHAIN_IMAGE + tag: main # override with CHAIN_A_TAG + binary: simd # override with CHAIN_BINARY + + # the entry at index 1 corresponds to CHAIN_B +- chainId: chain-b + numValidators: 1 + numFullNodes: 0 + image: ghcr.io/cosmos/ibc-go-simd # override with CHAIN_IMAGE + tag: main # override with CHAIN_B_TAG + binary: simd # override with CHAIN_BINARY + +relayer: + type: rly # override with RELAYER_TYPE + image: damiannolan/rly + tag: latest # override with RELAYER_TAG + +cometbft: + logLevel: info + +debug: + # setting this value to true will force log collection even if the test passes. + dumpLogs: false + +# Required only for upgrade tests. +# Chain A will be upgraded the specified tag. +# The plan name must be registered as an upgrade handler in the given tag. +upgrade: + planName: "" + tag: "" diff --git a/e2e/scripts/init.sh b/e2e/scripts/init.sh new file mode 100755 index 00000000000..9ff395aed2a --- /dev/null +++ b/e2e/scripts/init.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +set -euo pipefail + +# ensure_config_file makes sure there is a config file for the e2e tests either by creating a new one using the sample, +# it is copied to either the default location or the specified env location. +function ensure_config_file(){ + local config_file_path="${HOME}/.ibc-go-e2e-config.yaml" + if [[ ! -z "${E2E_CONFIG_PATH:-}" ]]; then + config_file_path="${E2E_CONFIG_PATH}" + fi + if [[ ! -f "${config_file_path}" ]]; then + echo "creating e2e config file from sample." + echo "copying sample.config.yaml to ${config_file_path}" + cp sample.config.yaml "${config_file_path}" + fi + echo "using config file at ${config_file_path} for e2e test" +} + +ensure_config_file diff --git a/e2e/scripts/run-e2e.sh b/e2e/scripts/run-e2e.sh index 122b22794c1..1d3f51c74ef 100755 --- a/e2e/scripts/run-e2e.sh +++ b/e2e/scripts/run-e2e.sh @@ -5,10 +5,6 @@ set -eo pipefail TEST="${1}" ENTRY_POINT="${2:-}" -export CHAIN_A_TAG="${CHAIN_A_TAG:-main}" -export CHAIN_IMAGE="${CHAIN_IMAGE:-ghcr.io/cosmos/ibc-go-simd}" -export CHAIN_BINARY="${CHAIN_BINARY:-simd}" - # if jq is installed, we can automatically determine the test entrypoint. if command -v jq > /dev/null; then cd .. diff --git a/e2e/testconfig/testconfig.go b/e2e/testconfig/testconfig.go index cacf14dd0d9..88b1541b751 100644 --- a/e2e/testconfig/testconfig.go +++ b/e2e/testconfig/testconfig.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" "os" + "path" "strings" tmjson "github.com/cometbft/cometbft/libs/json" @@ -17,6 +18,7 @@ import ( govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/strangelove-ventures/interchaintest/v7/ibc" interchaintestutil "github.com/strangelove-ventures/interchaintest/v7/testutil" + "gopkg.in/yaml.v2" "github.com/cosmos/ibc-go/e2e/relayer" "github.com/cosmos/ibc-go/e2e/semverutil" @@ -42,6 +44,8 @@ const ( ChainUpgradeTagEnv = "CHAIN_UPGRADE_TAG" // ChainUpgradePlanEnv specifies the upgrade plan name ChainUpgradePlanEnv = "CHAIN_UPGRADE_PLAN" + // E2EConfigFilePathEnv allows you to specify a custom path for the config file to be used. + E2EConfigFilePathEnv = "E2E_CONFIG_PATH" // defaultBinary is the default binary that will be used by the chains. defaultBinary = "simd" @@ -52,6 +56,9 @@ const ( defaultChainTag = "main" // defaultRelayerType is the default relayer that will be used if none is specified. defaultRelayerType = relayer.Rly + // defaultConfigFileName is the default filename for the config file that can be used to configure + // e2e tests. See sample.config.yaml as an example for what this should look like. + defaultConfigFileName = ".ibc-go-e2e-config.yaml" ) func getChainImage(binary string) string { @@ -61,24 +68,160 @@ func getChainImage(binary string) string { return fmt.Sprintf("ghcr.io/cosmos/ibc-go-%s", binary) } -// TestConfig holds various fields used in the E2E tests. +// TestConfig holds configuration used throughout the different e2e tests. type TestConfig struct { - ChainAConfig ChainConfig - ChainBConfig ChainConfig - RelayerConfig relayer.Config - UpgradeTag string - UpgradePlanName string + // ChainConfigs holds configuration values related to the chains used in the tests. + ChainConfigs []ChainConfig `yaml:"chains"` + // RelayerConfig holds configuration for the relayer to be used. + RelayerConfig relayer.Config `yaml:"relayer"` + // UpgradeConfig holds values used only for the upgrade tests. + UpgradeConfig UpgradeConfig `yaml:"upgrade"` + // CometBFTConfig holds values for configuring CometBFT. + CometBFTConfig CometBFTConfig `yaml:"cometbft"` + // DebugConfig holds configuration for miscellaneous options. + DebugConfig DebugConfig `yaml:"debug"` +} + +// GetChainNumValidators returns the number of validators for the specific chain index. +// default 1 +func (tc TestConfig) GetChainNumValidators(idx int) int { + if tc.ChainConfigs[idx].NumValidators > 0 { + return tc.ChainConfigs[idx].NumValidators + } + return 1 +} + +// GetChainNumFullNodes returns the number of full nodes for the specific chain index. +// default 0 +func (tc TestConfig) GetChainNumFullNodes(idx int) int { + if tc.ChainConfigs[idx].NumFullNodes > 0 { + return tc.ChainConfigs[idx].NumFullNodes + } + return 0 +} + +// GetChainAID returns the chain-id for chain A. +func (tc TestConfig) GetChainAID() string { + if tc.ChainConfigs[0].ChainID != "" { + return tc.ChainConfigs[0].ChainID + } + return "chain-a" +} + +// GetChainBID returns the chain-id for chain B. +func (tc TestConfig) GetChainBID() string { + if tc.ChainConfigs[1].ChainID != "" { + return tc.ChainConfigs[1].ChainID + } + return "chain-b" +} + +// UpgradeConfig holds values relevant to upgrade tests. +type UpgradeConfig struct { + PlanName string `yaml:"planName"` + Tag string `yaml:"tag"` } // ChainConfig holds information about an individual chain used in the tests. type ChainConfig struct { - Image string - Tag string - Binary string + ChainID string `yaml:"chainId"` + Image string `yaml:"image"` + Tag string `yaml:"tag"` + Binary string `yaml:"binary"` + NumValidators int `yaml:"numValidators"` + NumFullNodes int `yaml:"numFullNodes"` +} + +type CometBFTConfig struct { + LogLevel string `yaml:"logLevel"` +} + +type DebugConfig struct { + // DumpLogs forces the logs to be collected before removing test containers. + DumpLogs bool `yaml:"dumpLogs"` +} + +// LoadConfig attempts to load a atest configuration from the default file path. +// if any environment variables are specified, they will take precedence over the individual configuration +// options. +func LoadConfig() TestConfig { + fileTc, foundFile := fromFile() + if !foundFile { + return fromEnv() + } + return applyEnvironmentVariableOverrides(fileTc) +} + +// fromFile returns a TestConfig from a json file and a boolean indicating if the file was found. +func fromFile() (TestConfig, bool) { + var tc TestConfig + bz, err := os.ReadFile(getConfigFilePath()) + if err != nil { + return TestConfig{}, false + } + + if err := yaml.Unmarshal(bz, &tc); err != nil { + panic(err) + } + + return tc, true +} + +// applyEnvironmentVariableOverrides applies all environment variable changes to the config +// loaded from a file. +func applyEnvironmentVariableOverrides(fromFile TestConfig) TestConfig { + envTc := fromEnv() + + if os.Getenv(ChainATagEnv) != "" { + fromFile.ChainConfigs[0].Tag = envTc.ChainConfigs[0].Tag + } + + if os.Getenv(ChainBTagEnv) != "" { + fromFile.ChainConfigs[1].Tag = envTc.ChainConfigs[1].Tag + } + + if os.Getenv(ChainBinaryEnv) != "" { + for i := range fromFile.ChainConfigs { + fromFile.ChainConfigs[i].Binary = envTc.ChainConfigs[i].Binary + } + } + + if os.Getenv(ChainImageEnv) != "" { + for i := range fromFile.ChainConfigs { + fromFile.ChainConfigs[i].Image = envTc.ChainConfigs[i].Image + } + } + + if os.Getenv(RelayerTagEnv) != "" { + fromFile.RelayerConfig.Tag = envTc.RelayerConfig.Tag + } + + if os.Getenv(RelayerTypeEnv) != "" { + fromFile.RelayerConfig.Type = envTc.RelayerConfig.Type + } + + if os.Getenv(ChainUpgradePlanEnv) != "" { + fromFile.UpgradeConfig.PlanName = envTc.UpgradeConfig.PlanName + } + + if os.Getenv(ChainUpgradeTagEnv) != "" { + fromFile.UpgradeConfig.Tag = envTc.UpgradeConfig.Tag + } + + return fromFile } -// FromEnv returns a TestConfig constructed from environment variables. -func FromEnv() TestConfig { +// fromEnv returns a TestConfig constructed from environment variables. +func fromEnv() TestConfig { + return TestConfig{ + ChainConfigs: getChainConfigsFromEnv(), + UpgradeConfig: getUpgradePlanConfigFromEnv(), + RelayerConfig: getRelayerConfigFromEnv(), + } +} + +// getChainConfigsFromEnv returns the chain configs from environment variables. +func getChainConfigsFromEnv() []ChainConfig { chainBinary, ok := os.LookupEnv(ChainBinaryEnv) if !ok { chainBinary = defaultBinary @@ -99,37 +242,37 @@ func FromEnv() TestConfig { if ok { chainAImage = specifiedChainImage } - chainBImage := chainAImage - - upgradeTag, ok := os.LookupEnv(ChainUpgradeTagEnv) - if !ok { - upgradeTag = "" - } - upgradePlan, ok := os.LookupEnv(ChainUpgradePlanEnv) - if !ok { - upgradePlan = "" - } - - return TestConfig{ - ChainAConfig: ChainConfig{ + chainBImage := chainAImage + return []ChainConfig{ + { Image: chainAImage, Tag: chainATag, Binary: chainBinary, }, - ChainBConfig: ChainConfig{ + { Image: chainBImage, Tag: chainBTag, Binary: chainBinary, }, - UpgradeTag: upgradeTag, - UpgradePlanName: upgradePlan, - RelayerConfig: GetRelayerConfigFromEnv(), } } -// GetRelayerConfigFromEnv returns the RelayerConfig from present environment variables. -func GetRelayerConfigFromEnv() relayer.Config { +// getConfigFilePath returns the absolute path where the e2e config file should be. +func getConfigFilePath() string { + if absoluteConfigPath := os.Getenv(E2EConfigFilePathEnv); absoluteConfigPath != "" { + return absoluteConfigPath + } + + homeDir, err := os.UserHomeDir() + if err != nil { + panic(err) + } + return path.Join(homeDir, defaultConfigFileName) +} + +// getRelayerConfigFromEnv returns the RelayerConfig from present environment variables. +func getRelayerConfigFromEnv() relayer.Config { relayerType := strings.TrimSpace(os.Getenv(RelayerTypeEnv)) if relayerType == "" { relayerType = defaultRelayerType @@ -150,20 +293,32 @@ func GetRelayerConfigFromEnv() relayer.Config { } } -func GetChainATag() string { - chainATag, ok := os.LookupEnv(ChainATagEnv) +// getUpgradePlanConfigFromEnv returns the upgrade config from environment variables. +func getUpgradePlanConfigFromEnv() UpgradeConfig { + upgradeTag, ok := os.LookupEnv(ChainUpgradeTagEnv) + if !ok { + upgradeTag = "" + } + + upgradePlan, ok := os.LookupEnv(ChainUpgradePlanEnv) if !ok { - panic(fmt.Sprintf("no environment variable specified for %s", ChainATagEnv)) + upgradePlan = "" + } + return UpgradeConfig{ + PlanName: upgradePlan, + Tag: upgradeTag, } - return chainATag +} + +func GetChainATag() string { + return LoadConfig().ChainConfigs[0].Tag } func GetChainBTag() string { - chainBTag, ok := os.LookupEnv(ChainBTagEnv) - if !ok { - return GetChainATag() + if chainBTag := LoadConfig().ChainConfigs[1].Tag; chainBTag != "" { + return chainBTag } - return chainBTag + return GetChainATag() } // IsCI returns true if the tests are running in CI, false is returned @@ -187,9 +342,10 @@ type ChainOptionConfiguration func(options *ChainOptions) // DefaultChainOptions returns the default configuration for the chains. // These options can be configured by passing configuration functions to E2ETestSuite.GetChains. func DefaultChainOptions() ChainOptions { - tc := FromEnv() - chainACfg := newDefaultSimappConfig(tc.ChainAConfig, "simapp-a", "chain-a", "atoma") - chainBCfg := newDefaultSimappConfig(tc.ChainBConfig, "simapp-b", "chain-b", "atomb") + tc := LoadConfig() + + chainACfg := newDefaultSimappConfig(tc.ChainConfigs[0], "simapp-a", tc.GetChainAID(), "atoma", tc.CometBFTConfig) + chainBCfg := newDefaultSimappConfig(tc.ChainConfigs[1], "simapp-b", tc.GetChainBID(), "atomb", tc.CometBFTConfig) return ChainOptions{ ChainAConfig: &chainACfg, ChainBConfig: &chainBCfg, @@ -197,11 +353,11 @@ func DefaultChainOptions() ChainOptions { } // newDefaultSimappConfig creates an ibc configuration for simd. -func newDefaultSimappConfig(cc ChainConfig, name, chainID, denom string) ibc.ChainConfig { +func newDefaultSimappConfig(cc ChainConfig, name, chainID, denom string, cometCfg CometBFTConfig) ibc.ChainConfig { configFileOverrides := make(map[string]any) tmTomlOverrides := make(interchaintestutil.Toml) - tmTomlOverrides["log_level"] = "info" // change to debug to increase cometbft logging + tmTomlOverrides["log_level"] = cometCfg.LogLevel // change to debug in ~/.ibc-go-e2e-config.json to increase cometbft logging. configFileOverrides["config/config.toml"] = tmTomlOverrides return ibc.ChainConfig{ diff --git a/e2e/tests/upgrades/upgrade_test.go b/e2e/tests/upgrades/upgrade_test.go index b4b46d8cb4c..8cac637882c 100644 --- a/e2e/tests/upgrades/upgrade_test.go +++ b/e2e/tests/upgrades/upgrade_test.go @@ -37,9 +37,9 @@ const ( ) func TestUpgradeTestSuite(t *testing.T) { - testCfg := testconfig.FromEnv() - if testCfg.UpgradeTag == "" || testCfg.UpgradePlanName == "" { - t.Fatal("upgrade tag and upgrade plan name must be provided in test configuration") + testCfg := testconfig.LoadConfig() + if testCfg.UpgradeConfig.Tag == "" || testCfg.UpgradeConfig.PlanName == "" { + t.Fatalf("%s and %s must be set when running an upgrade test", testconfig.ChainUpgradeTagEnv, testconfig.ChainUpgradePlanEnv) } suite.Run(t, new(UpgradeTestSuite)) @@ -96,7 +96,7 @@ func (s *UpgradeTestSuite) UpgradeChain(ctx context.Context, chain *cosmos.Cosmo func (s *UpgradeTestSuite) TestIBCChainUpgrade() { t := s.T() - testCfg := testconfig.FromEnv() + testCfg := testconfig.LoadConfig() ctx := context.Background() relayer, channelA := s.SetupChainsRelayerAndChannel(ctx) @@ -153,7 +153,7 @@ func (s *UpgradeTestSuite) TestIBCChainUpgrade() { s.Require().NoError(test.WaitForBlocks(ctx, 5, chainA, chainB), "failed to wait for blocks") t.Run("upgrade chainA", func(t *testing.T) { - s.UpgradeChain(ctx, chainA, chainAUpgradeProposalWallet, testCfg.UpgradePlanName, testCfg.ChainAConfig.Tag, testCfg.UpgradeTag) + s.UpgradeChain(ctx, chainA, chainAUpgradeProposalWallet, testCfg.UpgradeConfig.PlanName, testCfg.ChainConfigs[0].Tag, testCfg.UpgradeConfig.Tag) }) t.Run("restart relayer", func(t *testing.T) { @@ -229,10 +229,10 @@ func (s *UpgradeTestSuite) TestChainUpgrade() { }) t.Run("upgrade chain", func(t *testing.T) { - testCfg := testconfig.FromEnv() + testCfg := testconfig.LoadConfig() proposerWallet := s.CreateUserOnChainA(ctx, testvalues.StartingTokenAmount) - s.UpgradeChain(ctx, chain, proposerWallet, testCfg.UpgradePlanName, testCfg.ChainAConfig.Tag, testCfg.UpgradeTag) + s.UpgradeChain(ctx, chain, proposerWallet, testCfg.UpgradeConfig.PlanName, testCfg.ChainConfigs[0].Tag, testCfg.UpgradeConfig.Tag) }) t.Run("send funds to test wallet", func(t *testing.T) { @@ -255,7 +255,7 @@ func (s *UpgradeTestSuite) TestChainUpgrade() { func (s *UpgradeTestSuite) TestV5ToV6ChainUpgrade() { t := s.T() - testCfg := testconfig.FromEnv() + testCfg := testconfig.LoadConfig() ctx := context.Background() relayer, _ := s.SetupChainsRelayerAndChannel(ctx) @@ -353,7 +353,7 @@ func (s *UpgradeTestSuite) TestV5ToV6ChainUpgrade() { s.Require().NoError(test.WaitForBlocks(ctx, 5, chainA, chainB), "failed to wait for blocks") t.Run("upgrade chainA", func(t *testing.T) { - s.UpgradeChain(ctx, chainA, chainAUpgradeProposalWallet, testCfg.UpgradePlanName, testCfg.ChainAConfig.Tag, testCfg.UpgradeTag) + s.UpgradeChain(ctx, chainA, chainAUpgradeProposalWallet, testCfg.UpgradeConfig.PlanName, testCfg.ChainConfigs[0].Tag, testCfg.UpgradeConfig.Tag) }) t.Run("restart relayer", func(t *testing.T) { @@ -458,7 +458,7 @@ func (s *UpgradeTestSuite) TestV5ToV6ChainUpgrade() { // can be sent before and after the upgrade without issue func (s *UpgradeTestSuite) TestV6ToV7ChainUpgrade() { t := s.T() - testCfg := testconfig.FromEnv() + testCfg := testconfig.LoadConfig() ctx := context.Background() relayer, channelA := s.SetupChainsRelayerAndChannel(ctx) @@ -569,7 +569,7 @@ func (s *UpgradeTestSuite) TestV6ToV7ChainUpgrade() { chainAUpgradeProposalWallet := s.CreateUserOnChainA(ctx, testvalues.StartingTokenAmount) t.Run("upgrade chainA", func(t *testing.T) { - s.UpgradeChain(ctx, chainA, chainAUpgradeProposalWallet, testCfg.UpgradePlanName, testCfg.ChainAConfig.Tag, testCfg.UpgradeTag) + s.UpgradeChain(ctx, chainA, chainAUpgradeProposalWallet, testCfg.UpgradeConfig.PlanName, testCfg.ChainConfigs[0].Tag, testCfg.UpgradeConfig.Tag) }) t.Run("check that the tendermint clients are active again after upgrade", func(t *testing.T) { @@ -607,7 +607,7 @@ func (s *UpgradeTestSuite) TestV6ToV7ChainUpgrade() { func (s *UpgradeTestSuite) TestV7ChainUpgradeAddLocalhost() { t := s.T() - testCfg := testconfig.FromEnv() + testCfg := testconfig.LoadConfig() ctx := context.Background() _, _ = s.SetupChainsRelayerAndChannel(ctx) @@ -617,7 +617,7 @@ func (s *UpgradeTestSuite) TestV7ChainUpgradeAddLocalhost() { t.Run("upgrade chain", func(t *testing.T) { govProposalWallet := s.CreateUserOnChainA(ctx, testvalues.StartingTokenAmount) - s.UpgradeChain(ctx, chain, govProposalWallet, testCfg.UpgradePlanName, testCfg.ChainAConfig.Tag, testCfg.UpgradeTag) + s.UpgradeChain(ctx, chain, govProposalWallet, testCfg.UpgradeConfig.PlanName, testCfg.ChainConfigs[0].Tag, testCfg.UpgradeConfig.Tag) }) t.Run("ensure the localhost client is active and sentinel connection is stored in state", func(t *testing.T) { diff --git a/e2e/testsuite/diagnostics/diagnostics.go b/e2e/testsuite/diagnostics/diagnostics.go index 504c3d55fd5..72ae0960250 100644 --- a/e2e/testsuite/diagnostics/diagnostics.go +++ b/e2e/testsuite/diagnostics/diagnostics.go @@ -18,8 +18,9 @@ import ( ) const ( - e2eDir = "e2e" - defaultFilePerm = 0o750 + dockerInspectFileName = "docker-inspect.json" + e2eDir = "e2e" + defaultFilePerm = 0o750 ) // Collect can be used in `t.Cleanup` and will copy all the of the container logs and relevant files @@ -27,9 +28,13 @@ const ( func Collect(t *testing.T, dc *dockerclient.Client, cfg testconfig.ChainOptions) { t.Helper() - if !t.Failed() { - t.Logf("test passed, not uploading logs") - return + debugCfg := testconfig.LoadConfig().DebugConfig + if !debugCfg.DumpLogs { + // when we are not forcing log collection, we only upload upon test failing. + if !t.Failed() { + t.Logf("test passed, not uploading logs") + return + } } t.Logf("writing logs for test: %s", t.Name()) @@ -87,7 +92,7 @@ func Collect(t *testing.T, dc *dockerclient.Client, cfg testconfig.ChainOptions) t.Logf("successfully wrote diagnostics file %s", absoluteFilePathInContainer) } - localFilePath := ospath.Join(containerDir, "docker-inspect.json") + localFilePath := ospath.Join(containerDir, dockerInspectFileName) if err := fetchAndWriteDockerInspectOutput(ctx, dc, container.ID, localFilePath); err != nil { t.Logf("failed to fetch docker inspect output: %s", err) continue diff --git a/e2e/testsuite/testsuite.go b/e2e/testsuite/testsuite.go index 4ed48f30b50..7fe7acf1322 100644 --- a/e2e/testsuite/testsuite.go +++ b/e2e/testsuite/testsuite.go @@ -127,7 +127,7 @@ func (s *E2ETestSuite) GetRelayerUsers(ctx context.Context, chainOpts ...testcon func (s *E2ETestSuite) SetupChainsRelayerAndChannel(ctx context.Context, channelOpts ...func(*ibc.CreateChannelOptions)) (ibc.Relayer, ibc.ChannelOutput) { chainA, chainB := s.GetChains() - r := relayer.New(s.T(), testconfig.FromEnv().RelayerConfig, s.logger, s.DockerClient, s.network) + r := relayer.New(s.T(), testconfig.LoadConfig().RelayerConfig, s.logger, s.DockerClient, s.network) pathName := s.generatePathName() @@ -464,9 +464,9 @@ func (s *E2ETestSuite) createCosmosChains(chainOptions testconfig.ChainOptions) logger := zaptest.NewLogger(t) - numValidators, numFullNodes := getValidatorsAndFullNodes() - + numValidators, numFullNodes := getValidatorsAndFullNodes(0) chainA := cosmos.NewCosmosChain(t.Name(), *chainOptions.ChainAConfig, numValidators, numFullNodes, logger) + numValidators, numFullNodes = getValidatorsAndFullNodes(1) chainB := cosmos.NewCosmosChain(t.Name(), *chainOptions.ChainBConfig, numValidators, numFullNodes, logger) // this is intentionally called after the interchaintest.DockerSetup function. The above function registers a @@ -617,11 +617,13 @@ func GetIBCToken(fullTokenDenom string, portID, channelID string) transfertypes. } // getValidatorsAndFullNodes returns the number of validators and full nodes respectively that should be used for -// the test. If the test is running in CI, more nodes are used, when running locally a single node is used to +// the test. If the test is running in CI, more nodes are used, when running locally a single node is used by default to // use less resources and allow the tests to run faster. -func getValidatorsAndFullNodes() (int, int) { +// both the number of validators and full nodes can be overwritten in a config file. +func getValidatorsAndFullNodes(chainIdx int) (int, int) { if testconfig.IsCI() { return 4, 1 } - return 1, 0 + tc := testconfig.LoadConfig() + return tc.GetChainNumValidators(chainIdx), tc.GetChainNumFullNodes(chainIdx) } From 89ecf25f3619c01607bf1d4bbe9137e8f8eab188 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Tue, 21 Mar 2023 12:02:16 +0000 Subject: [PATCH 16/23] E2E fzf Test Selection Autocompletion (#3313) --- e2e/README.md | 2 ++ e2e/scripts/run-e2e.sh | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/e2e/README.md b/e2e/README.md index 32d576cd6af..1c016a24402 100644 --- a/e2e/README.md +++ b/e2e/README.md @@ -80,6 +80,8 @@ make e2e-test entrypoint=TestInterchainAccountsTestSuite test=TestMsgSubmitTx_Su If `jq` is installed, you only need to specify the `test`. +If `fzf` is also installed, you only need to run `make e2e-test` and you will be prompted with interactive test selection. + ```sh make e2e-test test=TestMsgSubmitTx_SuccessfulTransfer ``` diff --git a/e2e/scripts/run-e2e.sh b/e2e/scripts/run-e2e.sh index 1d3f51c74ef..1328b1d8f88 100755 --- a/e2e/scripts/run-e2e.sh +++ b/e2e/scripts/run-e2e.sh @@ -5,6 +5,26 @@ set -eo pipefail TEST="${1}" ENTRY_POINT="${2:-}" +# _get_test returns the test that should be used in the e2e test. If an argument is provided, that argument +# is returned. Otherwise, fzf is used to interactively choose from all available tests. +function _get_test(){ + if [ -n "$1" ]; then + echo "$1" + return + # if fzf and jq are installed, we can use them to provide an interactive mechanism to select from all available tests. + elif command -v fzf > /dev/null && command -v jq > /dev/null; then + cd .. + go run -mod=readonly cmd/build_test_matrix/main.go | jq -r '.include[] | .test' | fzf + cd - > /dev/null + else + echo "TEST was not provided and both fzf and jq are not present. Unable to determine which test should be used." + exit 1 + fi +} + +# if test is set, that is used directly, otherwise the test can be interactively provided if fzf is installed. +TEST="$(_get_test ${TEST})" + # if jq is installed, we can automatically determine the test entrypoint. if command -v jq > /dev/null; then cd .. From 88f3c3cd06c66df9f021e3db436249bd6cd519ce Mon Sep 17 00:00:00 2001 From: Carlos Rodriguez Date: Tue, 21 Mar 2023 21:16:01 +0100 Subject: [PATCH 17/23] post v7 release chores (#3310) --- .../release-v7.0.x/client-chain-a.json | 2 +- .../release-v7.0.x/client-chain-b.json | 2 +- .../release-v7.0.x/connection-chain-a.json | 2 +- .../release-v7.0.x/connection-chain-b.json | 2 +- .../release-v7.0.x/ica-chain-a.json | 2 +- .../release-v7.0.x/ica-chain-b.json | 2 +- .../release-v7.0.x/ica-gov-chain-a.json | 2 +- .../release-v7.0.x/ica-gov-chain-b.json | 2 +- .../release-v7.0.x/ica-groups-chain-a.json | 2 +- .../release-v7.0.x/ica-groups-chain-b.json | 2 +- .../incentivized-ica-chain-a.json | 2 +- .../incentivized-ica-chain-b.json | 2 +- .../incentivized-transfer-chain-a.json | 2 +- .../incentivized-transfer-chain-b.json | 2 +- .../transfer-authz-chain-a.json | 3 +- .../transfer-authz-chain-b.json | 12 +++ .../release-v7.0.x/transfer-chain-a.json | 2 +- .../release-v7.0.x/transfer-chain-b.json | 2 +- .../release-v7.1.x/client-chain-a.json | 2 +- .../release-v7.1.x/client-chain-b.json | 2 +- .../release-v7.1.x/connection-chain-a.json | 2 +- .../release-v7.1.x/connection-chain-b.json | 2 +- .../release-v7.1.x/ica-chain-a.json | 2 +- .../release-v7.1.x/ica-chain-b.json | 2 +- .../release-v7.1.x/ica-gov-chain-a.json | 2 +- .../release-v7.1.x/ica-gov-chain-b.json | 2 +- .../release-v7.1.x/ica-groups-chain-a.json | 2 +- .../release-v7.1.x/ica-groups-chain-b.json | 2 +- .../incentivized-ica-chain-a.json | 2 +- .../incentivized-ica-chain-b.json | 2 +- .../incentivized-transfer-chain-a.json | 2 +- .../incentivized-transfer-chain-b.json | 2 +- ...hain-1.json => localhost-ica-chain-a.json} | 0 .../transfer-authz-chain-a.json | 3 +- .../transfer-authz-chain-b.json | 12 +++ .../release-v7.1.x/transfer-chain-a.json | 2 +- .../release-v7.1.x/transfer-chain-b.json | 2 +- .github/workflows/e2e-compatibility.yaml | 9 ++ .github/workflows/e2e-manual-icad.yaml | 2 + .github/workflows/e2e-manual-simd.yaml | 4 +- .github/workflows/e2e-upgrade.yaml | 2 +- CHANGELOG.md | 93 +++++++++++-------- README.md | 2 +- RELEASES.md | 10 +- docs/.vuepress/config.js | 4 + .../adr-003-ics27-acknowledgement.md | 4 +- .../adr-010-light-clients-as-sdk-modules.md | 2 +- docs/dev/go-style-guide.md | 2 +- docs/ibc/light-clients/client-state.md | 12 +-- docs/ibc/light-clients/consensus-state.md | 2 +- docs/ibc/light-clients/genesis.md | 6 +- .../light-clients/localhost/integration.md | 2 +- docs/ibc/light-clients/overview.md | 4 +- docs/ibc/light-clients/proofs.md | 4 +- docs/ibc/light-clients/proposals.md | 10 +- docs/ibc/light-clients/setup.md | 10 +- .../light-clients/updates-and-misbehaviour.md | 23 +++-- docs/ibc/light-clients/upgrades.md | 2 +- docs/ibc/middleware/develop.md | 30 +++--- docs/middleware/ics29-fee/fee-distribution.md | 2 +- docs/roadmap/roadmap.md | 22 +---- docs/versions | 1 + e2e/go.mod | 2 +- 63 files changed, 202 insertions(+), 158 deletions(-) create mode 100644 .github/compatibility-test-matrices/release-v7.0.x/transfer-authz-chain-b.json rename .github/compatibility-test-matrices/release-v7.1.x/{localhost-ica-chain-1.json => localhost-ica-chain-a.json} (100%) create mode 100644 .github/compatibility-test-matrices/release-v7.1.x/transfer-authz-chain-b.json diff --git a/.github/compatibility-test-matrices/release-v7.0.x/client-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/client-chain-a.json index afa22155666..187f3c58c80 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/client-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/client-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.0.x"], - "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-b": ["release-v7.0.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestClientTestSuite"], "test": [ "TestClientUpdateProposal_Succeeds", diff --git a/.github/compatibility-test-matrices/release-v7.0.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/client-chain-b.json index 020c5e44340..7b1c6b855db 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/client-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/client-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-a": ["release-v7.0.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.0.x"], "entrypoint": ["TestClientTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-a.json index cb4dd35b6f0..627ddf6fe1b 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.0.x"], - "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-b": ["release-v7.0.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestConnectionTestSuite"], "test": [ "TestMaxExpectedTimePerBlockParam" diff --git a/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-b.json index 268fb343c16..4b4642311e1 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/connection-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-a": ["release-v7.0.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.0.x"], "entrypoint": ["TestConnectionTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.0.x/ica-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/ica-chain-a.json index f6a63997f3d..6eb0f0467be 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/ica-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/ica-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.0.x"], - "chain-b": ["release-v7.0.x", "v6.1.0"], + "chain-b": ["release-v7.0.x", "v7.0.0", "v6.1.0"], "entrypoint": ["TestInterchainAccountsTestSuite"], "test": [ "TestMsgSendTx_SuccessfulTransfer", diff --git a/.github/compatibility-test-matrices/release-v7.0.x/ica-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/ica-chain-b.json index 452fbebe98b..b8a26f53fed 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/ica-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/ica-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.0.x", "v6.1.0"], + "chain-a": ["release-v7.0.x", "v7.0.0", "v6.1.0"], "chain-b": ["release-v7.0.x"], "entrypoint": ["TestInterchainAccountsTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.0.x/ica-gov-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/ica-gov-chain-a.json index c339471ea3d..5962864aa18 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/ica-gov-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/ica-gov-chain-a.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.0.x", "v6.1.0"], + "chain-a": ["release-v7.0.x", "v7.0.0", "v6.1.0"], "chain-b": ["release-v7.0.x"], "entrypoint": ["TestInterchainAccountsGovTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.0.x/ica-gov-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/ica-gov-chain-b.json index c8489613a48..ae25f8f7eba 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/ica-gov-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/ica-gov-chain-b.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.0.x"], - "chain-b": ["release-v7.0.x", "v6.1.0"], + "chain-b": ["release-v7.0.x", "v7.0.0", "v6.1.0"], "entrypoint": ["TestInterchainAccountsGovTestSuite"], "test": [ "TestInterchainAccountsGovIntegration" diff --git a/.github/compatibility-test-matrices/release-v7.0.x/ica-groups-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/ica-groups-chain-a.json index 888f7e22e07..bd209c5fe15 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/ica-groups-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/ica-groups-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.0.x"], - "chain-b": ["release-v7.0.x", "v6.1.0"], + "chain-b": ["release-v7.0.x", "v7.0.0", "v6.1.0"], "entrypoint": ["TestInterchainAccountsGroupsTestSuite"], "test": [ "TestInterchainAccountsGroupsIntegration" diff --git a/.github/compatibility-test-matrices/release-v7.0.x/ica-groups-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/ica-groups-chain-b.json index ff75181eb46..2012cacc120 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/ica-groups-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/ica-groups-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.0.x", "v6.1.0"], + "chain-a": ["release-v7.0.x", "v7.0.0", "v6.1.0"], "chain-b": ["release-v7.0.x"], "entrypoint": ["TestInterchainAccountsGroupsTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.0.x/incentivized-ica-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/incentivized-ica-chain-a.json index bc937f1d6a5..767f8af98cc 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/incentivized-ica-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/incentivized-ica-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.0.x"], - "chain-b": ["release-v7.0.x", "v6.1.0"], + "chain-b": ["release-v7.0.x", "v7.0.0", "v6.1.0"], "entrypoint": ["TestIncentivizedInterchainAccountsTestSuite"], "test": [ "TestMsgSendTx_SuccessfulBankSend_Incentivized", diff --git a/.github/compatibility-test-matrices/release-v7.0.x/incentivized-ica-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/incentivized-ica-chain-b.json index 000e6fcf2be..43b5c25a9f3 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/incentivized-ica-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/incentivized-ica-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.0.x", "v6.1.0"], + "chain-a": ["release-v7.0.x", "v7.0.0", "v6.1.0"], "chain-b": ["release-v7.0.x"], "entrypoint": ["TestIncentivizedInterchainAccountsTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.0.x/incentivized-transfer-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/incentivized-transfer-chain-a.json index 54841e7e08c..964241f7c78 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/incentivized-transfer-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/incentivized-transfer-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.0.x"], - "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-b": ["release-v7.0.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestIncentivizedTransferTestSuite"], "test": [ "TestMsgPayPacketFee_AsyncSingleSender_Succeeds", diff --git a/.github/compatibility-test-matrices/release-v7.0.x/incentivized-transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/incentivized-transfer-chain-b.json index f62e5040c05..8ca0ebf533f 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/incentivized-transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/incentivized-transfer-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-a": ["release-v7.0.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.0.x"], "entrypoint": ["TestIncentivizedTransferTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.0.x/transfer-authz-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/transfer-authz-chain-a.json index 23ac0a9ed1b..a689e709292 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/transfer-authz-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/transfer-authz-chain-a.json @@ -1,11 +1,12 @@ { "chain-a": ["release-v7.0.x"], - "chain-b": ["release-v7.0.x"], + "chain-b": ["release-v7.0.x", "v7.0.0"], "entrypoint": ["TestAuthzTransferTestSuite"], "test": [ "TestAuthz_MsgTransfer_Succeeds", "TestAuthz_InvalidTransferAuthorizations" ], + "relayer-type": ["rly"], "chain-binary": ["simd"], "chain-image": ["ghcr.io/cosmos/ibc-go-simd"] } diff --git a/.github/compatibility-test-matrices/release-v7.0.x/transfer-authz-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/transfer-authz-chain-b.json new file mode 100644 index 00000000000..13c9f1c9a64 --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.0.x/transfer-authz-chain-b.json @@ -0,0 +1,12 @@ +{ + "chain-a": ["release-v7.0.x", "v7.0.0"], + "chain-b": ["release-v7.0.x"], + "entrypoint": ["TestAuthzTransferTestSuite"], + "test": [ + "TestAuthz_MsgTransfer_Succeeds", + "TestAuthz_InvalidTransferAuthorizations" + ], + "relayer-type": ["rly"], + "chain-binary": ["simd"], + "chain-image": ["ghcr.io/cosmos/ibc-go-simd"] +} diff --git a/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-a.json index 2f2590edb2e..9900028af83 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.0.x"], - "chain-b": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-b": ["release-v7.0.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestTransferTestSuite"], "test": [ "TestMsgTransfer_Succeeds_Nonincentivized", diff --git a/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-b.json index fa353c25a76..95168b8db3c 100644 --- a/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.0.x/transfer-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.0.x", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-a": ["release-v7.0.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.0.x"], "entrypoint": ["TestTransferTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.1.x/client-chain-a.json b/.github/compatibility-test-matrices/release-v7.1.x/client-chain-a.json index ee53ac456c6..ab830bd3076 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/client-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/client-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.1.x"], - "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-b": ["release-v7.1.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestClientTestSuite"], "test": [ "TestClientUpdateProposal_Succeeds", diff --git a/.github/compatibility-test-matrices/release-v7.1.x/client-chain-b.json b/.github/compatibility-test-matrices/release-v7.1.x/client-chain-b.json index c462fffad31..a161eb48df0 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/client-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/client-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-a": ["release-v7.1.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.1.x"], "entrypoint": ["TestClientTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-a.json b/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-a.json index fdacc02efcd..3e101bf4979 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.1.x"], - "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-b": ["release-v7.1.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestConnectionTestSuite"], "test": [ "TestMaxExpectedTimePerBlockParam" diff --git a/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-b.json b/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-b.json index ff25bc9405a..8da137bde10 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/connection-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-a": ["release-v7.1.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.1.x"], "entrypoint": ["TestConnectionTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.1.x/ica-chain-a.json b/.github/compatibility-test-matrices/release-v7.1.x/ica-chain-a.json index 36379c9d38d..a3d30079a9e 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/ica-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/ica-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.1.x"], - "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0"], + "chain-b": ["release-v7.1.x", "v7.0.0", "v6.1.0"], "entrypoint": ["TestInterchainAccountsTestSuite"], "test": [ "TestMsgSendTx_SuccessfulTransfer", diff --git a/.github/compatibility-test-matrices/release-v7.1.x/ica-chain-b.json b/.github/compatibility-test-matrices/release-v7.1.x/ica-chain-b.json index 0dc7aed2695..944952d3140 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/ica-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/ica-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0"], + "chain-a": ["release-v7.1.x", "v7.0.0", "v6.1.0"], "chain-b": ["release-v7.1.x"], "entrypoint": ["TestInterchainAccountsTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.1.x/ica-gov-chain-a.json b/.github/compatibility-test-matrices/release-v7.1.x/ica-gov-chain-a.json index 77a29a799d4..be313dcb0e4 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/ica-gov-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/ica-gov-chain-a.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0"], + "chain-a": ["release-v7.1.x", "v7.0.0", "v6.1.0"], "chain-b": ["release-v7.1.x"], "entrypoint": ["TestInterchainAccountsGovTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.1.x/ica-gov-chain-b.json b/.github/compatibility-test-matrices/release-v7.1.x/ica-gov-chain-b.json index 00d59180c4d..5926babf87e 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/ica-gov-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/ica-gov-chain-b.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.1.x"], - "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0"], + "chain-b": ["release-v7.1.x", "v7.0.0", "v6.1.0"], "entrypoint": ["TestInterchainAccountsGovTestSuite"], "test": [ "TestInterchainAccountsGovIntegration" diff --git a/.github/compatibility-test-matrices/release-v7.1.x/ica-groups-chain-a.json b/.github/compatibility-test-matrices/release-v7.1.x/ica-groups-chain-a.json index 35012389202..ca93ca756dd 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/ica-groups-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/ica-groups-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.1.x"], - "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0"], + "chain-b": ["release-v7.1.x", "v7.0.0", "v6.1.0"], "entrypoint": ["TestInterchainAccountsGroupsTestSuite"], "test": [ "TestInterchainAccountsGroupsIntegration" diff --git a/.github/compatibility-test-matrices/release-v7.1.x/ica-groups-chain-b.json b/.github/compatibility-test-matrices/release-v7.1.x/ica-groups-chain-b.json index 412f0e21d1c..71a6dc8168a 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/ica-groups-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/ica-groups-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0"], + "chain-a": ["release-v7.1.x", "v7.0.0", "v6.1.0"], "chain-b": ["release-v7.1.x"], "entrypoint": ["TestInterchainAccountsGroupsTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.1.x/incentivized-ica-chain-a.json b/.github/compatibility-test-matrices/release-v7.1.x/incentivized-ica-chain-a.json index b84d56409e5..861939f800b 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/incentivized-ica-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/incentivized-ica-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.1.x"], - "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0"], + "chain-b": ["release-v7.1.x", "v7.0.0", "v6.1.0"], "entrypoint": ["TestIncentivizedInterchainAccountsTestSuite"], "test": [ "TestMsgSendTx_SuccessfulBankSend_Incentivized", diff --git a/.github/compatibility-test-matrices/release-v7.1.x/incentivized-ica-chain-b.json b/.github/compatibility-test-matrices/release-v7.1.x/incentivized-ica-chain-b.json index b5074245c8b..f6f7149ce4e 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/incentivized-ica-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/incentivized-ica-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0"], + "chain-a": ["release-v7.1.x", "v7.0.0", "v6.1.0"], "chain-b": ["release-v7.1.x"], "entrypoint": ["TestIncentivizedInterchainAccountsTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.1.x/incentivized-transfer-chain-a.json b/.github/compatibility-test-matrices/release-v7.1.x/incentivized-transfer-chain-a.json index d8f9a15f240..02ae0d96087 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/incentivized-transfer-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/incentivized-transfer-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.1.x"], - "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-b": ["release-v7.1.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestIncentivizedTransferTestSuite"], "test": [ "TestMsgPayPacketFee_AsyncSingleSender_Succeeds", diff --git a/.github/compatibility-test-matrices/release-v7.1.x/incentivized-transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.1.x/incentivized-transfer-chain-b.json index 3c303671554..3aacc37432a 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/incentivized-transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/incentivized-transfer-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-a": ["release-v7.1.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.1.x"], "entrypoint": ["TestIncentivizedTransferTestSuite"], "test": [ diff --git a/.github/compatibility-test-matrices/release-v7.1.x/localhost-ica-chain-1.json b/.github/compatibility-test-matrices/release-v7.1.x/localhost-ica-chain-a.json similarity index 100% rename from .github/compatibility-test-matrices/release-v7.1.x/localhost-ica-chain-1.json rename to .github/compatibility-test-matrices/release-v7.1.x/localhost-ica-chain-a.json diff --git a/.github/compatibility-test-matrices/release-v7.1.x/transfer-authz-chain-a.json b/.github/compatibility-test-matrices/release-v7.1.x/transfer-authz-chain-a.json index f4a08d01392..e986f41f14c 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/transfer-authz-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/transfer-authz-chain-a.json @@ -1,11 +1,12 @@ { "chain-a": ["release-v7.1.x"], - "chain-b": ["release-v7.1.x", "v7.0.0-rc1"], + "chain-b": ["release-v7.1.x", "v7.0.0"], "entrypoint": ["TestAuthzTransferTestSuite"], "test": [ "TestAuthz_MsgTransfer_Succeeds", "TestAuthz_InvalidTransferAuthorizations" ], + "relayer-type": ["rly"], "chain-binary": ["simd"], "chain-image": ["ghcr.io/cosmos/ibc-go-simd"] } diff --git a/.github/compatibility-test-matrices/release-v7.1.x/transfer-authz-chain-b.json b/.github/compatibility-test-matrices/release-v7.1.x/transfer-authz-chain-b.json new file mode 100644 index 00000000000..5add6e403ac --- /dev/null +++ b/.github/compatibility-test-matrices/release-v7.1.x/transfer-authz-chain-b.json @@ -0,0 +1,12 @@ +{ + "chain-a": ["release-v7.1.x", "v7.0.0"], + "chain-b": ["release-v7.1.x"], + "entrypoint": ["TestAuthzTransferTestSuite"], + "test": [ + "TestAuthz_MsgTransfer_Succeeds", + "TestAuthz_InvalidTransferAuthorizations" + ], + "relayer-type": ["rly"], + "chain-binary": ["simd"], + "chain-image": ["ghcr.io/cosmos/ibc-go-simd"] +} diff --git a/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-a.json b/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-a.json index 857fd19750e..87469c1c25b 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-a.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-a.json @@ -1,6 +1,6 @@ { "chain-a": ["release-v7.1.x"], - "chain-b": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-b": ["release-v7.1.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "entrypoint": ["TestTransferTestSuite"], "test": [ "TestMsgTransfer_Succeeds_Nonincentivized", diff --git a/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-b.json b/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-b.json index 5d54e15de95..7406f39d1f0 100644 --- a/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-b.json +++ b/.github/compatibility-test-matrices/release-v7.1.x/transfer-chain-b.json @@ -1,5 +1,5 @@ { - "chain-a": ["release-v7.1.x", "v7.0.0-rc1", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], + "chain-a": ["release-v7.1.x", "v7.0.0", "v6.1.0", "v5.2.0", "v4.3.0", "v4.2.0", "v4.1.1"], "chain-b": ["release-v7.1.x"], "entrypoint": ["TestTransferTestSuite"], "test": [ diff --git a/.github/workflows/e2e-compatibility.yaml b/.github/workflows/e2e-compatibility.yaml index ed29b29ea08..bdffa51b671 100644 --- a/.github/workflows/e2e-compatibility.yaml +++ b/.github/workflows/e2e-compatibility.yaml @@ -103,6 +103,15 @@ jobs: test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}" test-suite: "transfer-authz-chain-a" + transfer-authz-chain-b: + needs: + - build-release-images + - determine-test-directory + uses: ./.github/workflows/e2e-compatibility-workflow-call.yaml + with: + test-file-directory: "${{ needs.determine-test-directory.outputs.test-directory }}" + test-suite: "transfer-authz-chain-b" + connection-chain-a: needs: - build-release-images diff --git a/.github/workflows/e2e-manual-icad.yaml b/.github/workflows/e2e-manual-icad.yaml index 556278c3786..1e48f8d384f 100644 --- a/.github/workflows/e2e-manual-icad.yaml +++ b/.github/workflows/e2e-manual-icad.yaml @@ -25,6 +25,7 @@ on: default: master options: - master + - v0.5.1 - v0.4.3 - v0.3.6 - v0.2.6 @@ -35,6 +36,7 @@ on: type: choice options: - master + - v0.5.1 - v0.4.3 - v0.3.6 - v0.2.6 diff --git a/.github/workflows/e2e-manual-simd.yaml b/.github/workflows/e2e-manual-simd.yaml index a047f325413..109e61247ff 100644 --- a/.github/workflows/e2e-manual-simd.yaml +++ b/.github/workflows/e2e-manual-simd.yaml @@ -35,6 +35,7 @@ on: default: main options: - main + - v7.0.0 - v6.1.0 - v5.2.0 - v4.3.0 @@ -45,12 +46,13 @@ on: required: false type: string chain-b-tag: - default: v6.0.0 + default: v7.0.0 description: 'The tag to use for chain B' required: true type: choice options: - main + - v7.0.0 - v6.1.0 - v5.2.0 - v4.3.0 diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml index 644d70d04e1..3bf5444c490 100644 --- a/.github/workflows/e2e-upgrade.yaml +++ b/.github/workflows/e2e-upgrade.yaml @@ -39,7 +39,7 @@ jobs: chain-binary: simd chain-a-tag: v6.1.0 chain-b-tag: v6.1.0 - chain-upgrade-tag: v7.0.0-rc1 + chain-upgrade-tag: v7.0.0 upgrade-plan-name: "v7" test-entry-point: "TestUpgradeTestSuite" test: "TestV6ToV7ChainUpgrade" diff --git a/CHANGELOG.md b/CHANGELOG.md index b7e870e2eda..28354f0c7c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,8 +38,24 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Dependencies -* [#2672](https://github.com/cosmos/ibc-go/issues/2672) Update to cosmos-sdk v0.47. -* [#3175](https://github.com/cosmos/ibc-go/issues/3175) Migrate to cometbft v0.37. +### API Breaking + +### State Machine Breaking + +### Improvements + +* (tests) [\#3138](https://github.com/cosmos/ibc-go/pull/3138) Support benchmarks and fuzz tests through `testing.TB`. + +### Features + +### Bug Fixes + +## [v7.0.0](https://github.com/cosmos/ibc-go/releases/tag/v6.1.0) - 2023-03-17 + +### Dependencies + +* [\#2672](https://github.com/cosmos/ibc-go/issues/2672) Update to cosmos-sdk v0.47. +* [\#3175](https://github.com/cosmos/ibc-go/issues/3175) Migrate to cometbft v0.37. ### API Breaking @@ -61,20 +77,19 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (apps/27-interchain-accounts) [\#2638](https://github.com/cosmos/ibc-go/pull/2638) Interchain accounts host and controller Keepers now expects a keeper which fulfills the expected `exported.ScopedKeeper` interface for the capability keeper. * (06-solomachine) [\#2761](https://github.com/cosmos/ibc-go/pull/2761) Removed deprecated `ClientId` field from `Misbehaviour` and `allow_update_after_proposal` field from `ClientState`. * (apps) [\#3154](https://github.com/cosmos/ibc-go/pull/3154) Remove unused `ProposalContents` function. -* (apps) [#3149](https://github.com/cosmos/ibc-go/pull/3149) Remove legacy interface function `RandomizedParams`, which is no longer used. -* (light-clients/06-solomachine) [#2941](https://github.com/cosmos/ibc-go/pull/2941) Remove solomachine header sequence. -* (core) [#2982](https://github.com/cosmos/ibc-go/pull/2982) Moved the ibc module name into the exported package. +* (apps) [\#3149](https://github.com/cosmos/ibc-go/pull/3149) Remove legacy interface function `RandomizedParams`, which is no longer used. +* (light-clients/06-solomachine) [\#2941](https://github.com/cosmos/ibc-go/pull/2941) Remove solomachine header sequence. +* (core) [\#2982](https://github.com/cosmos/ibc-go/pull/2982) Moved the ibc module name into the exported package. ### State Machine Breaking * (06-solomachine) [\#2744](https://github.com/cosmos/ibc-go/pull/2744) `Misbehaviour.ValidateBasic()` now only enforces that signature data does not match when the signature paths are different. * (06-solomachine) [\#2748](https://github.com/cosmos/ibc-go/pull/2748) Adding sentinel value for header path in 06-solomachine. * (apps/29-fee) [\#2942](https://github.com/cosmos/ibc-go/pull/2942) Check `x/bank` send enabled before escrowing fees. -* (core/04-channel) [#3009](https://github.com/cosmos/ibc-go/pull/3009) Change check to disallow optimistic sends. +* (core/04-channel) [\#3009](https://github.com/cosmos/ibc-go/pull/3009) Change check to disallow optimistic sends. ### Improvements -* (tests) [\#3138](https://github.com/cosmos/ibc-go/pull/3138) Support benchmarks and fuzz tests through `testing.TB`. * (core) [\#3082](https://github.com/cosmos/ibc-go/pull/3082) Add `HasConnection` and `HasChannel` methods. * (tests) [\#2926](https://github.com/cosmos/ibc-go/pull/2926) Lint tests * (apps/transfer) [\#2643](https://github.com/cosmos/ibc-go/pull/2643) Add amount, denom, and memo to transfer event emission. @@ -84,56 +99,56 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (modules/core/02-client) [\#1188](https://github.com/cosmos/ibc-go/pull/1188/files) Routing `MsgSubmitMisbehaviour` to `UpdateClient` keeper function. Deprecating `SubmitMisbehaviour` endpoint. * (modules/core/02-client) [\#1208](https://github.com/cosmos/ibc-go/pull/1208) Replace `CheckHeaderAndUpdateState` usage in 02-client with calls to `VerifyClientMessage`, `CheckForMisbehaviour`, `UpdateStateOnMisbehaviour` and `UpdateState`. * (modules/light-clients/09-localhost) [\#1187](https://github.com/cosmos/ibc-go/pull/1187/) Removing localhost light client implementation as it is not functional. An upgrade handler is provided in `modules/migrations/v5` to prune `09-localhost` clients and consensus states from the store. -* [\#1186](https://github.com/cosmos/ibc-go/pull/1186/files) Removing `GetRoot` function from ConsensusState interface in `02-client`. `GetRoot` is unused by core IBC. +* (modules/core/02-client) [\#1186](https://github.com/cosmos/ibc-go/pull/1186) Removing `GetRoot` function from ConsensusState interface in `02-client`. `GetRoot` is unused by core IBC. * (modules/core/02-client) [\#1196](https://github.com/cosmos/ibc-go/pull/1196) Adding VerifyClientMessage to ClientState interface. * (modules/core/02-client) [\#1198](https://github.com/cosmos/ibc-go/pull/1198) Adding UpdateStateOnMisbehaviour to ClientState interface. * (modules/core/02-client) [\#1170](https://github.com/cosmos/ibc-go/pull/1170) Updating `ClientUpdateProposal` to set client state in lightclient implementations `CheckSubstituteAndUpdateState` methods. * (modules/core/02-client) [\#1197](https://github.com/cosmos/ibc-go/pull/1197) Adding `CheckForMisbehaviour` to `ClientState` interface. -* (modules/core/02-client) [\#1195](https://github.com/cosmos/ibc-go/pull/1210) Removing `CheckHeaderAndUpdateState` from `ClientState` interface & associated light client implementations. -* (modules/core/02-client) [\#1189](https://github.com/cosmos/ibc-go/pull/1212) Removing `CheckMisbehaviourAndUpdateState` from `ClientState` interface & associated light client implementations. +* (modules/core/02-client) [\#1210](https://github.com/cosmos/ibc-go/pull/1210) Removing `CheckHeaderAndUpdateState` from `ClientState` interface & associated light client implementations. +* (modules/core/02-client) [\#1212](https://github.com/cosmos/ibc-go/pull/1212) Removing `CheckMisbehaviourAndUpdateState` from `ClientState` interface & associated light client implementations. * (modules/core/exported) [\#1206](https://github.com/cosmos/ibc-go/pull/1206) Adding new method `UpdateState` to `ClientState` interface. * (modules/core/02-client) [\#1741](https://github.com/cosmos/ibc-go/pull/1741) Emitting a new `upgrade_chain` event upon setting upgrade consensus state. * (client) [\#724](https://github.com/cosmos/ibc-go/pull/724) `IsRevisionFormat` and `IsClientIDFormat` have been updated to disallow newlines before the dash used to separate the chainID and revision number, and the client type and client sequence. * (02-client/cli) [\#897](https://github.com/cosmos/ibc-go/pull/897) Remove `GetClientID()` from `Misbehaviour` interface. Submit client misbehaviour cli command requires an explicit client id now. -* (06-solomachine) [\#1972](https://github.com/cosmos/ibc-go/pull/1972) Solo machine implementation of `ZeroCustomFields` fn now panics as the fn is only used for upgrades which solo machine does not support. +* (06-solomachine) [\#1972](https://github.com/cosmos/ibc-go/pull/1972) Solo machine implementation of `ZeroCustomFields` fn now panics as the fn is only used for upgrades which solo machine does not support. * (light-clients/06-solomachine) Moving `verifyMisbehaviour` function from update.go to misbehaviour_handle.go. * [\#2434](https://github.com/cosmos/ibc-go/pull/2478) Removed all `TypeMsg` constants -* (modules/core/exported) [#1689](https://github.com/cosmos/ibc-go/pull/2539) Removing `GetVersions` from `ConnectionI` interface. -* (core/02-connection) [#2419](https://github.com/cosmos/ibc-go/pull/2419) Add optional proof data to proto definitions of `MsgConnectionOpenTry` and `MsgConnectionOpenAck` for host state machines that are unable to introspect their own consensus state. -* (light-clients/07-tendermint) [#3046](https://github.com/cosmos/ibc-go/pull/3046) Moved non-verification misbehaviour checks to `CheckForMisbehaviour`. -* (apps/29-fee) [#2975](https://github.com/cosmos/ibc-go/pull/2975) Adding distribute fee events to ics29. -* (light-clients/07-tendermint) [#2965](https://github.com/cosmos/ibc-go/pull/2965) Prune expired `07-tendermint` consensus states on duplicate header updates. -* (light-clients) [#2736](https://github.com/cosmos/ibc-go/pull/2736) Updating `VerifyMembership` and `VerifyNonMembership` methods to use `Path` interface. -* (light-clients) [#3113](https://github.com/cosmos/ibc-go/pull/3113) Align light client module names. +* (modules/core/exported) [\#2539] (https://github.com/cosmos/ibc-go/pull/2539) Removing `GetVersions` from `ConnectionI` interface. +* (core/02-connection) [\#2419](https://github.com/cosmos/ibc-go/pull/2419) Add optional proof data to proto definitions of `MsgConnectionOpenTry` and `MsgConnectionOpenAck` for host state machines that are unable to introspect their own consensus state. +* (light-clients/07-tendermint) [\#3046](https://github.com/cosmos/ibc-go/pull/3046) Moved non-verification misbehaviour checks to `CheckForMisbehaviour`. +* (apps/29-fee) [\#2975](https://github.com/cosmos/ibc-go/pull/2975) Adding distribute fee events to ics29. +* (light-clients/07-tendermint) [\#2965](https://github.com/cosmos/ibc-go/pull/2965) Prune expired `07-tendermint` consensus states on duplicate header updates. +* (light-clients) [\#2736](https://github.com/cosmos/ibc-go/pull/2736) Updating `VerifyMembership` and `VerifyNonMembership` methods to use `Path` interface. +* (light-clients) [\#3113](https://github.com/cosmos/ibc-go/pull/3113) Align light client module names. ### Features -* (apps/transfer) [#3079](https://github.com/cosmos/ibc-go/pull/3079) Added authz support for ics20. +* (apps/transfer) [\#3079](https://github.com/cosmos/ibc-go/pull/3079) Added authz support for ics20. * (core/02-client) [\#2824](https://github.com/cosmos/ibc-go/pull/2824) Add genesis migrations for v6 to v7. The migration migrates the solo machine client state definition, removes all solo machine consensus states and removes the localhost client. * (core/24-host) [\#2856](https://github.com/cosmos/ibc-go/pull/2856) Add `PrefixedClientStorePath` and `PrefixedClientStoreKey` functions to 24-host * (core/02-client) [\#2819](https://github.com/cosmos/ibc-go/pull/2819) Add automatic in-place store migrations to remove the localhost client and migrate existing solo machine definitions. -* (light-clients/06-solomachine) [\#2826](https://github.com/cosmos/ibc-go/pull/2826) Add `AppModuleBasic` for the 06-solomachine client and remove solo machine type registration from core IBC. Chains must register the `AppModuleBasic` of light clients. -* (light-clients/07-tendermint) [\#2825](https://github.com/cosmos/ibc-go/pull/2825) Add `AppModuleBasic` for the 07-tendermint client and remove tendermint type registration from core IBC. Chains must register the `AppModuleBasic` of light clients. +* (light-clients/06-solomachine) [\#2826](https://github.com/cosmos/ibc-go/pull/2826) Add `AppModuleBasic` for the 06-solomachine client and remove solo machine type registration from core IBC. Chains must register the `AppModuleBasic` of light clients. +* (light-clients/07-tendermint) [\#2825](https://github.com/cosmos/ibc-go/pull/2825) Add `AppModuleBasic` for the 07-tendermint client and remove tendermint type registration from core IBC. Chains must register the `AppModuleBasic` of light clients. * (light-clients/07-tendermint) [\#2800](https://github.com/cosmos/ibc-go/pull/2800) Add optional in-place store migration function to prune all expired tendermint consensus states. -* (core/24-host) [\#2820](https://github.com/cosmos/ibc-go/pull/2820) Add `MustParseClientStatePath` which parses the clientID from a client state key path. +* (core/24-host) [\#2820](https://github.com/cosmos/ibc-go/pull/2820) Add `MustParseClientStatePath` which parses the clientID from a client state key path. * (testing/simapp) [\#2842](https://github.com/cosmos/ibc-go/pull/2842) Adding the new upgrade handler for v6 -> v7 to simapp which prunes expired Tendermint consensus states. * (testing) [\#2829](https://github.com/cosmos/ibc-go/pull/2829) Add `AssertEvents` which asserts events against expected event map. ### Bug Fixes * (testing) [\#3295](https://github.com/cosmos/ibc-go/pull/3295) The function `SetupWithGenesisValSet` will set the baseapp chainID before running `InitChain` -* (light-clients/solomachine) [#1839](https://github.com/cosmos/ibc-go/pull/1839) Fixed usage of the new diversifier in validation of changing diversifiers for the solo machine. The current diversifier must sign over the new diversifier. +* (light-clients/solomachine) [\#1839](https://github.com/cosmos/ibc-go/pull/1839) Fixed usage of the new diversifier in validation of changing diversifiers for the solo machine. The current diversifier must sign over the new diversifier. * (light-clients/07-tendermint) [\#1674](https://github.com/cosmos/ibc-go/pull/1674) Submitted ClientState is zeroed out before checking the proof in order to prevent the proposal from containing information governance is not actually voting on. * (modules/core/02-client)[\#1676](https://github.com/cosmos/ibc-go/pull/1676) ClientState must be zeroed out for `UpgradeProposals` to pass validation. This prevents a proposal containing information governance is not actually voting on. * (core/02-client) [\#2510](https://github.com/cosmos/ibc-go/pull/2510) Fix client ID validation regex to conform closer to spec. -* (apps/transfer) [#3045](https://github.com/cosmos/ibc-go/pull/3045) Allow value with slashes in URL template. -* (apps/27-interchain-accounts) [#2601](https://github.com/cosmos/ibc-go/pull/2601) Remove bech32 check from owner address on ICA controller msgs RegisterInterchainAccount and SendTx. -* (apps/transfer) [#2651](https://github.com/cosmos/ibc-go/pull/2651) Skip emission of unpopulated memo field in ics20. -* (apps/27-interchain-accounts) [#2682](https://github.com/cosmos/ibc-go/pull/2682) Avoid race conditions in ics27 handshakes. -* (light-clients/06-solomachine) [#2741](https://github.com/cosmos/ibc-go/pull/2741) Added check for empty path in 06-solomachine. -* (light-clients/07-tendermint) [#3022](https://github.com/cosmos/ibc-go/pull/3022) Correctly close iterator in `07-tendermint` store. -* (core/02-client) [#3010](https://github.com/cosmos/ibc-go/pull/3010) Update `Paginate` to use `FilterPaginate` in `ClientStates` and `ConnectionChannels` grpc queries. - +* (apps/transfer) [\#3045](https://github.com/cosmos/ibc-go/pull/3045) Allow value with slashes in URL template. +* (apps/27-interchain-accounts) [\#2601](https://github.com/cosmos/ibc-go/pull/2601) Remove bech32 check from owner address on ICA controller msgs RegisterInterchainAccount and SendTx. +* (apps/transfer) [\#2651](https://github.com/cosmos/ibc-go/pull/2651) Skip emission of unpopulated memo field in ics20. +* (apps/27-interchain-accounts) [\#2682](https://github.com/cosmos/ibc-go/pull/2682) Avoid race conditions in ics27 handshakes. +* (light-clients/06-solomachine) [\#2741](https://github.com/cosmos/ibc-go/pull/2741) Added check for empty path in 06-solomachine. +* (light-clients/07-tendermint) [\#3022](https://github.com/cosmos/ibc-go/pull/3022) Correctly close iterator in `07-tendermint` store. +* (core/02-client) [\#3010](https://github.com/cosmos/ibc-go/pull/3010) Update `Paginate` to use `FilterPaginate` in `ClientStates` and `ConnectionChannels` grpc queries. + ## [v6.1.0](https://github.com/cosmos/ibc-go/releases/tag/v6.1.0) - 2022-12-20 ### Dependencies @@ -172,7 +187,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (27-interchain-accounts) [\#2590](https://github.com/cosmos/ibc-go/pull/2590) Removing port prefix requirement from the ICA host channel handshake * (transfer) [\#2377](https://github.com/cosmos/ibc-go/pull/2377) Adding `sequence` to `MsgTransferResponse`. * (light-clients/07-tendermint) [\#2555](https://github.com/cosmos/ibc-go/pull/2555) Forbid negative values for `TrustingPeriod`, `UnbondingPeriod` and `MaxClockDrift` (as specified in ICS-07). -* (core/04-channel) [#2973](https://github.com/cosmos/ibc-go/pull/2973) Write channel state before invoking app callbacks in ack and confirm channel handshake steps. +* (core/04-channel) [\#2973](https://github.com/cosmos/ibc-go/pull/2973) Write channel state before invoking app callbacks in ack and confirm channel handshake steps. ### Improvements @@ -285,28 +300,28 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Dependencies -* [#3049](https://github.com/cosmos/ibc-go/pull/3049) Bump Cosmos SDK to v0.45.12. -* [#2868](https://github.com/cosmos/ibc-go/pull/2868) Bump ics23 to v0.9.0. +* [\#3049](https://github.com/cosmos/ibc-go/pull/3049) Bump Cosmos SDK to v0.45.12. +* [\#2868](https://github.com/cosmos/ibc-go/pull/2868) Bump ics23 to v0.9.0. ### State Machine Breaking -* (core/04-channel) [#2973](https://github.com/cosmos/ibc-go/pull/2973) Write channel state before invoking app callbacks in ack and confirm channel handshake steps. +* (core/04-channel) [\#2973](https://github.com/cosmos/ibc-go/pull/2973) Write channel state before invoking app callbacks in ack and confirm channel handshake steps. ### Improvements -* (apps/29-fee) [#2786](https://github.com/cosmos/ibc-go/pull/2786) Save gas on `IsFeeEnabled`. +* (apps/29-fee) [\#2786](https://github.com/cosmos/ibc-go/pull/2786) Save gas on `IsFeeEnabled`. ### Bug Fixes -* (apps/29-fee) [#2942](https://github.com/cosmos/ibc-go/pull/2942) Check `x/bank` send enabled before escrowing fees. +* (apps/29-fee) [\#2942](https://github.com/cosmos/ibc-go/pull/2942) Check `x/bank` send enabled before escrowing fees. ### Documentation -* [#2737](https://github.com/cosmos/ibc-go/pull/2737) Fix migration/docs for ICA controller middleware. +* [\#2737](https://github.com/cosmos/ibc-go/pull/2737) Fix migration/docs for ICA controller middleware. ### Miscellaneous Tasks -* [#2772](https://github.com/cosmos/ibc-go/pull/2772) Integrated git cliff into the code base to automate generation of changelogs. +* [\#2772](https://github.com/cosmos/ibc-go/pull/2772) Integrated git cliff into the code base to automate generation of changelogs. ## [v4.2.0](https://github.com/cosmos/ibc-go/releases/tag/v4.2.0) - 2022-11-07 diff --git a/README.md b/README.md index 174aefc6f9e..d3f65b8d58f 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ For the latest information on the progress of the work or the decisions made tha ## Releases -The release lines currently supported are v4, v5 and v6. +The release lines currently supported are v4, v5, v6 and v7. Please refer to the [Stable Release Policy section of RELEASES.md](https://github.com/cosmos/ibc-go/blob/main/RELEASES.md#stable-release-policy) for more details. diff --git a/RELEASES.md b/RELEASES.md index ae0d6b1656e..6be4caef671 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -72,6 +72,7 @@ Only the following major release series have a stable release status: |`v4.3.x`|August 12, 2023| |`v5.2.x`|September 28, 2023| |`v6.1.x`|December 09, 2023| +|`v7.0.x`|March 17, 2024| All missing minor release versions have been discontinued. @@ -100,13 +101,14 @@ As rule of thumb, the following changes will **NOT** be automatically accepted i Versions of Golang, Cosmos SDK and Tendermint used by ibc-go in the currently active releases: -| Go | ibc-go | Cosmos SDK | Tendermint | -|----|--------|------------|------------| +| Go | ibc-go | Cosmos SDK | Tendermint/CometBFT | +|----|--------|------------|---------------------| | 1.18 | v4.1.1 | v0.45.10 | v0.34.22 | | 1.18 | v4.2.0 | v0.45.10 | v0.34.22 | | 1.18 | v4.3.0 | v0.45.12 | v0.34.24 | -| 1.18 | v5.2.0 | v0.46.7 | v0.34.24 | -| 1.18 | v6.1.0 | v0.46.7 | v0.34.24 | +| 1.18 | v5.2.0 | v0.46.7 | v0.34.24 | +| 1.18 | v6.1.0 | v0.46.7 | v0.34.24 | +| 1.19 | v7.0.0 | v0.47.0 | v0.37.0 | ## Graphics diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js index 90e172b6cf4..5dd9f2c1577 100644 --- a/docs/.vuepress/config.js +++ b/docs/.vuepress/config.js @@ -160,6 +160,10 @@ module.exports = { label: "v6.1.0", key: "v6.1.0", }, + { + label: "v7.0.0", + key: "v7.0.0", + }, ], topbar: { banner: true, diff --git a/docs/architecture/adr-003-ics27-acknowledgement.md b/docs/architecture/adr-003-ics27-acknowledgement.md index 5704af0d98c..4a192795ca5 100644 --- a/docs/architecture/adr-003-ics27-acknowledgement.md +++ b/docs/architecture/adr-003-ics27-acknowledgement.md @@ -92,14 +92,14 @@ Replicate the transaction response format as provided by the current SDK verison When the SDK version changes, adjust the transaction response format to use the updated transaction response format. Include the transaction response bytes in the result channel acknowledgement. -A test has been [written](https://github.com/cosmos/ibc-go/blob/v3.0.0-beta1/modules/apps/27-interchain-accounts/host/ibc_module_test.go#L716-#L774) to fail if the `MsgResponse` is no longer included in consensus. +A test has been [written](https://github.com/cosmos/ibc-go/blob/v3.0.0/modules/apps/27-interchain-accounts/host/ibc_module_test.go#L716-#L774) to fail if the `MsgResponse` is no longer included in consensus. ### Error acknowledgements As indicated above, the `abci.ResponseDeliverTx.Code` is determinstic. Upon transaction execution errors, an error acknowledgement should be returned including the abci code. -A test has been [written](https://github.com/cosmos/ibc-go/blob/v3.0.0-beta1/modules/apps/27-interchain-accounts/host/types/ack_test.go#L41-#L82) to fail if the ABCI code is no longer determinstic. +A test has been [written](https://github.com/cosmos/ibc-go/blob/v3.0.0/modules/apps/27-interchain-accounts/host/types/ack_test.go#L41-#L82) to fail if the ABCI code is no longer determinstic. ## Consequences diff --git a/docs/architecture/adr-010-light-clients-as-sdk-modules.md b/docs/architecture/adr-010-light-clients-as-sdk-modules.md index 62186debaf3..0c8f2bb8e6e 100644 --- a/docs/architecture/adr-010-light-clients-as-sdk-modules.md +++ b/docs/architecture/adr-010-light-clients-as-sdk-modules.md @@ -17,7 +17,7 @@ ibc-go has 3 main consumers: Relayers listen and respond to events emitted by ibc-go while IBC light clients and applications are invoked by core IBC. Currently there exists two different approaches to callbacks being invoked by core IBC. -IBC light clients currently are invoked by a `ClientState` and `ConsensusState` interface as defined by [core IBC](https://github.com/cosmos/ibc-go/blob/fb9dedd706e5835cdd607392320df79fcea7ca7f/modules/core/exported/client.go#L36). +IBC light clients currently are invoked by a `ClientState` and `ConsensusState` interface as defined by [core IBC](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/exported/client.go#L36). The 02-client submodule will retrieve the `ClientState` or `ConsensusState` from the IBC store in order to perform callbacks to the light client. This design requires all required information for the light client to function to be stored in the `ClientState` or `ConsensusState` or potentially under metadata keys for a specific client instance. Additional information may be provided by core IBC via the defined interface arguments if that information is generic enough to be useful to all IBC light clients. diff --git a/docs/dev/go-style-guide.md b/docs/dev/go-style-guide.md index 8e50b592030..7cf50598000 100644 --- a/docs/dev/go-style-guide.md +++ b/docs/dev/go-style-guide.md @@ -93,7 +93,7 @@ import ( ## Testing -- Make use of table driven testing where possible and not-cumbersome. Read [this blog post](https://dave.cheney.net/2013/06/09/writing-table-driven-tests-in-go) for more information. See the [tests](https://github.com/cosmos/ibc-go/blob/f24f41ea8a61fe87f6becab94e84de08c8aa9381/modules/apps/transfer/keeper/msg_server_test.go#L11) for [`Transfer`](https://github.com/cosmos/ibc-go/blob/f24f41ea8a61fe87f6becab94e84de08c8aa9381/modules/apps/transfer/keeper/msg_server.go#L15) for an example. +- Make use of table driven testing where possible and not-cumbersome. Read [this blog post](https://dave.cheney.net/2013/06/09/writing-table-driven-tests-in-go) for more information. See the [tests](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/apps/transfer/keeper/msg_server_test.go#L11) for [`Transfer`](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/apps/transfer/keeper/msg_server.go#L15) for an example. - Make use of Testify [assert](https://godoc.org/github.com/stretchr/testify/assert) and [require](https://godoc.org/github.com/stretchr/testify/require). - When using mocks, it is recommended to use Testify [mock](https://pkg.go.dev/github.com/stretchr/testify/mock) along with [Mockery](https://github.com/vektra/mockery) for autogeneration. diff --git a/docs/ibc/light-clients/client-state.md b/docs/ibc/light-clients/client-state.md index b72b73ad217..b9290fbbb03 100644 --- a/docs/ibc/light-clients/client-state.md +++ b/docs/ibc/light-clients/client-state.md @@ -4,7 +4,7 @@ order: 2 # Implementing the `ClientState` interface -Learn how to implement the [`ClientState`](https://github.com/cosmos/ibc-go/blob/v6.0.0/modules/core/exported/client.go#L40) interface. This list of methods described here does not include all methods of the interface. Some methods are explained in detail in the relevant sections of the guide. +Learn how to implement the [`ClientState`](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/exported/client.go#L36) interface. This list of methods described here does not include all methods of the interface. Some methods are explained in detail in the relevant sections of the guide. ## `ClientType` method @@ -18,7 +18,7 @@ The format is created as follows: `ClientType-{N}` where `{N}` is the unique glo ## `Validate` method `Validate` should validate every client state field and should return an error if any value is invalid. The light client -implementer is in charge of determining which checks are required. See the [Tendermint light client implementation](https://github.com/cosmos/ibc-go/blob/v6.0.0/modules/light-clients/07-tendermint/types/client_state.go#L101) as a reference. +implementer is in charge of determining which checks are required. See the [Tendermint light client implementation](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/light-clients/07-tendermint/client_state.go#L111) as a reference. ## `Status` method @@ -29,14 +29,14 @@ implementer is in charge of determining which checks are required. See the [Tend - An `Expired` status indicates that a client is not allowed to be used because it was not updated for longer than the trusting period. - An `Unknown` status indicates that there was an error in determining the status of a client. -All possible `Status` types can be found [here](https://github.com/cosmos/ibc-go/blob/v6.0.0/modules/core/exported/client.go#L26-L36). +All possible `Status` types can be found [here](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/exported/client.go#L22-L32). -This field is returned in the response of the gRPC [`ibc.core.client.v1.Query/ClientStatus`](https://github.com/cosmos/ibc-go/blob/v6.0.0/modules/core/02-client/types/query.pb.go#L665) endpoint. +This field is returned in the response of the gRPC [`ibc.core.client.v1.Query/ClientStatus`](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/02-client/types/query.pb.go#L665) endpoint. ## `ZeroCustomFields` method `ZeroCustomFields` should return a copy of the light client with all client customizable fields with their zero value. It should not mutate the fields of the light client. -This method is used when [scheduling upgrades](https://github.com/cosmos/ibc-go/blob/v6.0.0/modules/core/02-client/keeper/proposal.go#L89). Upgrades are used to upgrade chain specific fields. +This method is used when [scheduling upgrades](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/02-client/keeper/proposal.go#L82). Upgrades are used to upgrade chain specific fields. In the tendermint case, this may be the chain ID or the unbonding period. For more information about client upgrades see the [Handling upgrades](./upgrades.md) section. @@ -50,7 +50,7 @@ This value is used to facilitate timeouts by checking the packet timeout timesta Clients must validate the initial consensus state, and set the initial client state and consensus state in the provided client store. Clients may also store any necessary client-specific metadata. -`Initialize` is called when a [client is created](https://github.com/cosmos/ibc-go/blob/main/modules/core/02-client/keeper/client.go#L32). +`Initialize` is called when a [client is created](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/02-client/keeper/client.go#L30). ## `VerifyMembership` method diff --git a/docs/ibc/light-clients/consensus-state.md b/docs/ibc/light-clients/consensus-state.md index 26166bc41a7..6e33785a7cf 100644 --- a/docs/ibc/light-clients/consensus-state.md +++ b/docs/ibc/light-clients/consensus-state.md @@ -8,7 +8,7 @@ A `ConsensusState` is the snapshot of the counterparty chain, that an IBC client The further development of multiple types of IBC light clients and the difficulties presented by this generalization problem (see [ADR-006](https://github.com/cosmos/ibc-go/blob/main/docs/architecture/adr-006-02-client-refactor.md) for more information about this historical context) led to the design decision of each client keeping track of and set its own `ClientState` and `ConsensusState`, as well as the simplification of client `ConsensusState` updates through the generalized `ClientMessage` interface. -The below [`ConsensusState`](https://github.com/cosmos/ibc-go/blob/main/modules/core/exported/client.go#L134) interface is a generalized interface for the types of information a `ConsensusState` could contain. For a reference `ConsensusState` implementation, please see the [Tendermint light client `ConsensusState`](https://github.com/cosmos/ibc-go/blob/main/modules/light-clients/07-tendermint/consensus_state.go). +The below [`ConsensusState`](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/exported/client.go#L133) interface is a generalized interface for the types of information a `ConsensusState` could contain. For a reference `ConsensusState` implementation, please see the [Tendermint light client `ConsensusState`](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/light-clients/07-tendermint/consensus_state.go). ## `ClientType` method diff --git a/docs/ibc/light-clients/genesis.md b/docs/ibc/light-clients/genesis.md index 234cfa4002e..9a0eb6249b6 100644 --- a/docs/ibc/light-clients/genesis.md +++ b/docs/ibc/light-clients/genesis.md @@ -12,7 +12,7 @@ Learn how to implement the `ExportMetadata` interface {synopsis} `ClientState` instances are provided their own isolated and namespaced client store upon initialisation. `ClientState` implementations may choose to store any amount of arbitrary metadata in order to verify counterparty consensus state and perform light client updates correctly. -The `ExportMetadata` method of the [`ClientState` interface](https://github.com/cosmos/ibc-go/blob/e650be91614ced7be687c30eb42714787a3bbc59/modules/core/exported/client.go) provides light client modules with the ability to persist metadata in genesis exports. +The `ExportMetadata` method of the [`ClientState` interface](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/exported/client.go#L47) provides light client modules with the ability to persist metadata in genesis exports. ```go ExportMetadata(clientStore sdk.KVStore) []GenesisMetadata @@ -31,6 +31,6 @@ type GenesisMetadata interface { This allows `ClientState` instances to retrieve and export any number of key-value pairs which are maintained within the store in their raw `[]byte` form. -When a chain is started with a `genesis.json` file which contains `ClientState` metadata (for example, when performing manual upgrades using an exported `genesis.json`) the `02-client` submodule of core IBC will handle setting the key-value pairs within their respective client stores. [See `02-client` `InitGenesis`](https://github.com/cosmos/ibc-go/blob/02-client-refactor-beta1/modules/core/02-client/genesis.go#L18-L22). +When a chain is started with a `genesis.json` file which contains `ClientState` metadata (for example, when performing manual upgrades using an exported `genesis.json`) the `02-client` submodule of core IBC will handle setting the key-value pairs within their respective client stores. [See `02-client` `InitGenesis`](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/02-client/genesis.go#L18-L22). -Please refer to the [Tendermint light client implementation](https://github.com/cosmos/ibc-go/blob/02-client-refactor-beta1/modules/light-clients/07-tendermint/genesis.go#L12) for an example. +Please refer to the [Tendermint light client implementation](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/light-clients/07-tendermint/genesis.go#L12) for an example. diff --git a/docs/ibc/light-clients/localhost/integration.md b/docs/ibc/light-clients/localhost/integration.md index a818507f1fd..15a236e2efe 100644 --- a/docs/ibc/light-clients/localhost/integration.md +++ b/docs/ibc/light-clients/localhost/integration.md @@ -6,7 +6,7 @@ order: 2 The 09-localhost light client module registers codec types within the core IBC module. This differs from other light client module implementations which are expected to register codec types using the `AppModuleBasic` interface. -The localhost client is added to the 02-client submodule param [`allowed_clients`](https://github.com/cosmos/ibc-go/blob/v7.0.0-rc0/proto/ibc/core/client/v1/client.proto#L102) by default in ibc-go. +The localhost client is added to the 02-client submodule param [`allowed_clients`](https://github.com/cosmos/ibc-go/blob/v7.0.0/proto/ibc/core/client/v1/client.proto#L102) by default in ibc-go. ```go var ( diff --git a/docs/ibc/light-clients/overview.md b/docs/ibc/light-clients/overview.md index a06ae4afa31..b5d973f79a2 100644 --- a/docs/ibc/light-clients/overview.md +++ b/docs/ibc/light-clients/overview.md @@ -54,11 +54,11 @@ The methods which make up this interface are detailed at a more granular level i ### `Height` `Height` defines a monotonically increasing sequence number which provides ordering of consensus state data persisted through client updates. -IBC light client module developers are expected to use the [concrete type](https://github.com/cosmos/ibc-go/tree/02-client-refactor-beta1/proto/ibc/core/client/v1/client.proto#L89) provided by the `02-client` submodule. This implements the expectations required by the [`Height`](https://github.com/cosmos/ibc-go/blob/02-client-refactor-beta1/modules/core/exported/client.go#L157) interface defined in `modules/core/exported/client.go`. +IBC light client module developers are expected to use the [concrete type](https://github.com/cosmos/ibc-go/tree/02-client-refactor-beta1/proto/ibc/core/client/v1/client.proto#L89) provided by the `02-client` submodule. This implements the expectations required by the [`Height`](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/exported/client.go#L156) interface defined in `modules/core/exported/client.go`. ### `ClientMessage` -`ClientMessage` refers to the interface type [`ClientMessage`](https://github.com/cosmos/ibc-go/tree/02-client-refactor-beta1/modules/core/exported/client.go#L148) used for performing updates to a `ClientState` stored on chain. +`ClientMessage` refers to the interface type [`ClientMessage`](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/exported/client.go#L147) used for performing updates to a `ClientState` stored on chain. This may be any concrete type which produces a change in state to the IBC client when verified. The following are considered as valid update scenarios: diff --git a/docs/ibc/light-clients/proofs.md b/docs/ibc/light-clients/proofs.md index fa4e5a84126..acb7f82ed1e 100644 --- a/docs/ibc/light-clients/proofs.md +++ b/docs/ibc/light-clients/proofs.md @@ -28,7 +28,7 @@ In some cases, there is a necessity to "mock" non-existence proofs if the counte The state verification functions for all IBC data types have been consolidated into two generic methods, `VerifyMembership` and `VerifyNonMembership`. -From the [`ClientState` interface definition](https://github.com/cosmos/ibc-go/blob/e650be91614ced7be687c30eb42714787a3bbc59/modules/core/exported/client.go#L68-L91), we find: +From the [`ClientState` interface definition](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/exported/client.go#L68-L91), we find: ```go VerifyMembership( @@ -59,4 +59,4 @@ VerifyNonMembership( Both are expected to be provided with a standardised key path, `exported.Path`, as defined in [ICS-24 host requirements](https://github.com/cosmos/ibc/tree/main/spec/core/ics-024-host-requirements). Membership verification requires callers to provide the value marshalled as `[]byte`. Delay period values should be zero for non-packet processing verification. A zero proof height is now allowed by core IBC and may be passed into `VerifyMembership` and `VerifyNonMembership`. Light clients are responsible for returning an error if a zero proof height is invalid behaviour. -Please refer to the [ICS-23 implementation](https://github.com/cosmos/ibc-go/blob/e093d85b533ab3572b32a7de60b88a0816bed4af/modules/core/23-commitment/types/merkle.go#L131-L205) for a concrete example. +Please refer to the [ICS-23 implementation](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/23-commitment/types/merkle.go#L131-L205) for a concrete example. diff --git a/docs/ibc/light-clients/proposals.md b/docs/ibc/light-clients/proposals.md index c2a0a57adef..8247cc8fe38 100644 --- a/docs/ibc/light-clients/proposals.md +++ b/docs/ibc/light-clients/proposals.md @@ -8,7 +8,7 @@ It is possible to update the client with the state of the substitute client thro ## Implementing `CheckSubstituteAndUpdateState` -In the [`ClientState`interface](https://github.com/cosmos/ibc-go/blob/e650be91614ced7be687c30eb42714787a3bbc59/modules/core/exported/client.go), we find: +In the [`ClientState`interface](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/exported/client.go), we find: ```go // CheckSubstituteAndUpdateState must verify that the provided substitute may be used to update the subject client. @@ -24,9 +24,9 @@ CheckSubstituteAndUpdateState( Prior to updating, this function must verify that: -- the substitute client is the same type as the subject client. For a reference implementation, please see the [Tendermint light client](https://github.com/cosmos/ibc-go/blob/02-client-refactor-beta1/modules/light-clients/07-tendermint/proposal_handle.go#L32). -- the provided substitute may be used to update the subject client. This may mean that certain parameters must remain unaltered. For example, a [valid substitute Tendermint light client](https://github.com/cosmos/ibc-go/blob/02-client-refactor-beta1/modules/light-clients/07-tendermint/proposal_handle.go#L84) must NOT change the chain ID, trust level, max clock drift, unbonding period, proof specs or upgrade path. Please note that `AllowUpdateAfterMisbehaviour` and `AllowUpdateAfterExpiry` have been deprecated (see ADR 026 for more information). +- the substitute client is the same type as the subject client. For a reference implementation, please see the [Tendermint light client](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/light-clients/07-tendermint/proposal_handle.go#L32). +- the provided substitute may be used to update the subject client. This may mean that certain parameters must remain unaltered. For example, a [valid substitute Tendermint light client](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/light-clients/07-tendermint/proposal_handle.go#L84) must NOT change the chain ID, trust level, max clock drift, unbonding period, proof specs or upgrade path. Please note that `AllowUpdateAfterMisbehaviour` and `AllowUpdateAfterExpiry` have been deprecated (see ADR 026 for more information). -After these checks are performed, the function must [set the updated client and consensus states](https://github.com/cosmos/ibc-go/blob/02-client-refactor-beta1/modules/light-clients/07-tendermint/proposal_handle.go#L77) within the client store for the subject client. +After these checks are performed, the function must [set the updated client and consensus states](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/light-clients/07-tendermint/proposal_handle.go#L77) within the client store for the subject client. -Please refer to the [Tendermint light client implementation](https://github.com/cosmos/ibc-go/blob/02-client-refactor-beta1/modules/light-clients/07-tendermint/proposal_handle.go#L27) for reference. +Please refer to the [Tendermint light client implementation](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/light-clients/07-tendermint/proposal_handle.go#L27) for reference. diff --git a/docs/ibc/light-clients/setup.md b/docs/ibc/light-clients/setup.md index 84d5a924fff..9e97ab22de5 100644 --- a/docs/ibc/light-clients/setup.md +++ b/docs/ibc/light-clients/setup.md @@ -12,7 +12,7 @@ Finally, a succinct rundown is given of the remaining steps to make the light cl ## Configuring a light client module -An IBC light client module must implement the [`AppModuleBasic`](https://github.com/cosmos/cosmos-sdk/blob/main/types/module/module.go#L50) interface in order to register its concrete types against the core IBC interfaces defined in `modules/core/exported`. This is accomplished via the `RegisterInterfaces` method which provides the light client module with the opportunity to register codec types using the chain's `InterfaceRegistry`. Please refer to the [`07-tendermint` codec registration](https://github.com/cosmos/ibc-go/blob/02-client-refactor-beta1/modules/light-clients/07-tendermint/codec.go#L11). +An IBC light client module must implement the [`AppModuleBasic`](https://github.com/cosmos/cosmos-sdk/blob/main/types/module/module.go#L50) interface in order to register its concrete types against the core IBC interfaces defined in `modules/core/exported`. This is accomplished via the `RegisterInterfaces` method which provides the light client module with the opportunity to register codec types using the chain's `InterfaceRegistry`. Please refer to the [`07-tendermint` codec registration](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/light-clients/07-tendermint/codec.go#L11). The `AppModuleBasic` interface may also be leveraged to install custom CLI handlers for light client module users. Light client modules can safely no-op for interface methods which it does not wish to implement. @@ -77,7 +77,7 @@ See below for a list of IBC relayer implementations: - [informalsystems/hermes](https://github.com/informalsystems/hermes) - [confio/ts-relayer](https://github.com/confio/ts-relayer) -Stateless checks are performed within the [`ValidateBasic`](https://github.com/cosmos/ibc-go/blob/02-client-refactor-beta1/modules/core/02-client/types/msgs.go#L48) method of `MsgCreateClient`. +Stateless checks are performed within the [`ValidateBasic`](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/02-client/types/msgs.go#L48) method of `MsgCreateClient`. ```protobuf // MsgCreateClient defines a message to create an IBC client @@ -95,11 +95,11 @@ message MsgCreateClient { } ``` -Leveraging protobuf `Any` encoding allows core IBC to [unpack](https://github.com/cosmos/ibc-go/blob/02-client-refactor-beta1/modules/core/keeper/msg_server.go#L28-L36) both the `ClientState` and `ConsensusState` into their respective interface types registered previously using the light client module's `RegisterInterfaces` method. +Leveraging protobuf `Any` encoding allows core IBC to [unpack](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/keeper/msg_server.go#L28-L36) both the `ClientState` and `ConsensusState` into their respective interface types registered previously using the light client module's `RegisterInterfaces` method. -Within the `02-client` submodule, the [`ClientState` is then initialized](https://github.com/cosmos/ibc-go/blob/02-client-refactor-beta1/modules/core/02-client/keeper/client.go#L30-L34) with its own isolated key-value store, namespaced using a unique client identifier. +Within the `02-client` submodule, the [`ClientState` is then initialized](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/02-client/keeper/client.go#L30-L32) with its own isolated key-value store, namespaced using a unique client identifier. -In order to successfully create an IBC client using a new client type, it [must be supported](https://github.com/cosmos/ibc-go/blob/02-client-refactor-beta1/modules/core/02-client/keeper/client.go#L18-L24). Light client support in IBC is gated by on-chain governance. The allow list may be updated by submitting a new governance proposal to update the `02-client` parameter `AllowedClients`. +In order to successfully create an IBC client using a new client type, it [must be supported](https://github.com/cosmos/ibc-go/blob/v7.0.0/modules/core/02-client/keeper/client.go#L19-L25). Light client support in IBC is gated by on-chain governance. The allow list may be updated by submitting a new governance proposal to update the `02-client` parameter `AllowedClients`.