From bb5f10bb19076018b8372cd3edace670336e9d2d Mon Sep 17 00:00:00 2001 From: Collin Brittain Date: Wed, 9 Oct 2024 09:30:21 -0500 Subject: [PATCH 1/4] 4 to 5 upgrade handler --- module/app/app.go | 9 ++++++++- module/app/upgrades/v5/README.md | 4 ++++ module/app/upgrades/v5/constants.go | 4 ++++ module/app/upgrades/v5/upgrades.go | 18 ++++++++++++++++++ module/x/gravity/module.go | 9 ++++++++- 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 module/app/upgrades/v5/README.md create mode 100644 module/app/upgrades/v5/constants.go create mode 100644 module/app/upgrades/v5/upgrades.go diff --git a/module/app/app.go b/module/app/app.go index 89d4315f1..34085e918 100644 --- a/module/app/app.go +++ b/module/app/app.go @@ -95,6 +95,7 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" "github.com/gorilla/mux" gravityparams "github.com/peggyjv/gravity-bridge/module/v4/app/params" + v5 "github.com/peggyjv/gravity-bridge/module/v4/app/upgrades/v5" "github.com/peggyjv/gravity-bridge/module/v4/x/gravity" gravityclient "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/client" "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper" @@ -922,5 +923,11 @@ func (app *Gravity) setupUpgradeStoreLoaders() { } func (app *Gravity) setupUpgradeHandlers() { - + app.upgradeKeeper.SetUpgradeHandler( + v5.UpgradeName, + v5.CreateUpgradeHandler( + app.mm, + app.configurator, + ), + ) } diff --git a/module/app/upgrades/v5/README.md b/module/app/upgrades/v5/README.md new file mode 100644 index 000000000..da53194f9 --- /dev/null +++ b/module/app/upgrades/v5/README.md @@ -0,0 +1,4 @@ +# v5 upgrade + +This upgrade simply fixes the bug in the `SubmitEthereumTxConfirmation` message handler where `CompletedOutgoingTx`s were not checked and therefore could not be signed by orchestrators that failed to sign before the transaction was completed, resulting in jailing and slashing. Because this is a state breaking change, we bump the consensus version of the module. + diff --git a/module/app/upgrades/v5/constants.go b/module/app/upgrades/v5/constants.go new file mode 100644 index 000000000..0a8b6b77c --- /dev/null +++ b/module/app/upgrades/v5/constants.go @@ -0,0 +1,4 @@ +package v5 + +// UpgradeName defines the on-chain upgrade name for the Gravity v5 upgrade +const UpgradeName = "v5" diff --git a/module/app/upgrades/v5/upgrades.go b/module/app/upgrades/v5/upgrades.go new file mode 100644 index 000000000..7025419eb --- /dev/null +++ b/module/app/upgrades/v5/upgrades.go @@ -0,0 +1,18 @@ +package v5 + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" +) + +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + ctx.Logger().Info("v5 upgrade: entering handler") + + return mm.RunMigrations(ctx, configurator, fromVM) + } +} diff --git a/module/x/gravity/module.go b/module/x/gravity/module.go index e438008d2..25f367deb 100644 --- a/module/x/gravity/module.go +++ b/module/x/gravity/module.go @@ -108,7 +108,7 @@ func (AppModule) Name() string { // ConsensusVersion implements AppModule/ConsensusVersion. func (AppModule) ConsensusVersion() uint64 { - return 4 + return 5 } // RegisterInvariants implements app module @@ -126,6 +126,13 @@ func (am AppModule) QuerierRoute() string { func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) types.RegisterQueryServer(cfg.QueryServer(), am.keeper) + + // The 4 to 5 migration is a no-op, no store migrations are required + if err := cfg.RegisterMigration(types.ModuleName, 4, func(ctx sdk.Context) error { + return nil + }); err != nil { + panic(fmt.Errorf("failed to register migration handler: %w", err)) + } } // InitGenesis initializes the genesis state for this module and implements app module. From a8e697caa51d42e8bd5a3c88264b57f3c60ab6fc Mon Sep 17 00:00:00 2001 From: Collin Brittain Date: Wed, 9 Oct 2024 10:12:49 -0500 Subject: [PATCH 2/4] Bump gravity to v5 --- module/app/app.go | 12 +- module/app/encoding.go | 2 +- module/app/upgrades/v2/upgrades.go | 2 +- module/app/upgrades/v2/upgrades_test.go | 4 +- module/cmd/gravity/cmd/gentx.go | 2 +- module/cmd/gravity/cmd/root.go | 4 +- module/cmd/gravity/cmd/root_test.go | 2 +- module/cmd/gravity/main.go | 2 +- module/go.mod | 2 +- module/proto/buf.lock | 4 +- module/proto/gravity/v1/genesis.proto | 2 +- module/proto/gravity/v1/gravity.proto | 2 +- module/proto/gravity/v1/msgs.proto | 6 +- module/proto/gravity/v1/query.proto | 4 +- module/x/gravity/abci.go | 4 +- module/x/gravity/abci_test.go | 6 +- module/x/gravity/client/cli/query.go | 2 +- module/x/gravity/client/cli/tx.go | 2 +- module/x/gravity/client/cli/utils.go | 2 +- module/x/gravity/client/proposal_handler.go | 2 +- module/x/gravity/cosmos_originated_test.go | 8 +- module/x/gravity/handler.go | 4 +- module/x/gravity/handler_test.go | 8 +- module/x/gravity/keeper/batch.go | 2 +- module/x/gravity/keeper/batch_test.go | 2 +- module/x/gravity/keeper/contract_call.go | 2 +- module/x/gravity/keeper/contract_call_test.go | 2 +- module/x/gravity/keeper/cosmos_originated.go | 2 +- .../gravity/keeper/ethereum_event_handler.go | 2 +- .../x/gravity/keeper/ethereum_event_vote.go | 2 +- module/x/gravity/keeper/genesis.go | 2 +- module/x/gravity/keeper/grpc_query.go | 2 +- module/x/gravity/keeper/grpc_query_test.go | 2 +- module/x/gravity/keeper/hooks.go | 2 +- module/x/gravity/keeper/keeper.go | 2 +- module/x/gravity/keeper/keeper_test.go | 2 +- module/x/gravity/keeper/msg_server.go | 2 +- module/x/gravity/keeper/msg_server_test.go | 2 +- module/x/gravity/keeper/pool.go | 2 +- module/x/gravity/keeper/pool_test.go | 2 +- module/x/gravity/keeper/proposal_handler.go | 2 +- module/x/gravity/keeper/signer_set.go | 2 +- module/x/gravity/keeper/signer_set_test.go | 2 +- module/x/gravity/keeper/test_common.go | 4 +- module/x/gravity/module.go | 6 +- module/x/gravity/types/genesis.pb.go | 6 +- module/x/gravity/types/gravity.pb.go | 134 +++++++------- module/x/gravity/types/msgs.pb.go | 175 +++++++++--------- module/x/gravity/types/msgs_test.go | 4 +- module/x/gravity/types/query.pb.go | 15 +- 50 files changed, 237 insertions(+), 235 deletions(-) diff --git a/module/app/app.go b/module/app/app.go index 34085e918..56b196ba5 100644 --- a/module/app/app.go +++ b/module/app/app.go @@ -94,12 +94,12 @@ import ( icaexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" "github.com/gorilla/mux" - gravityparams "github.com/peggyjv/gravity-bridge/module/v4/app/params" - v5 "github.com/peggyjv/gravity-bridge/module/v4/app/upgrades/v5" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity" - gravityclient "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/client" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + gravityparams "github.com/peggyjv/gravity-bridge/module/v5/app/params" + v5 "github.com/peggyjv/gravity-bridge/module/v5/app/upgrades/v5" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity" + gravityclient "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/client" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" "github.com/rakyll/statik/fs" "github.com/spf13/cast" diff --git a/module/app/encoding.go b/module/app/encoding.go index 2abb4b9eb..9efb8c398 100644 --- a/module/app/encoding.go +++ b/module/app/encoding.go @@ -2,7 +2,7 @@ package app import ( "github.com/cosmos/cosmos-sdk/std" - gravityparams "github.com/peggyjv/gravity-bridge/module/v4/app/params" + gravityparams "github.com/peggyjv/gravity-bridge/module/v5/app/params" ) // MakeEncodingConfig creates an EncodingConfig for gravity. diff --git a/module/app/upgrades/v2/upgrades.go b/module/app/upgrades/v2/upgrades.go index d1f3401d2..a3e0cc098 100644 --- a/module/app/upgrades/v2/upgrades.go +++ b/module/app/upgrades/v2/upgrades.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func CreateUpgradeHandler( diff --git a/module/app/upgrades/v2/upgrades_test.go b/module/app/upgrades/v2/upgrades_test.go index 560ddb09f..1bd9fb06f 100644 --- a/module/app/upgrades/v2/upgrades_test.go +++ b/module/app/upgrades/v2/upgrades_test.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" "github.com/stretchr/testify/require" ) diff --git a/module/cmd/gravity/cmd/gentx.go b/module/cmd/gravity/cmd/gentx.go index 4feb1ef1b..cff216458 100644 --- a/module/cmd/gravity/cmd/gentx.go +++ b/module/cmd/gravity/cmd/gentx.go @@ -37,7 +37,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/genutil/types" "github.com/cosmos/cosmos-sdk/x/staking/client/cli" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // GenTxCmd builds the application's gentx command. diff --git a/module/cmd/gravity/cmd/root.go b/module/cmd/gravity/cmd/root.go index fe3b21642..dd5158837 100644 --- a/module/cmd/gravity/cmd/root.go +++ b/module/cmd/gravity/cmd/root.go @@ -31,8 +31,8 @@ import ( "github.com/spf13/cast" "github.com/spf13/cobra" - "github.com/peggyjv/gravity-bridge/module/v4/app" - "github.com/peggyjv/gravity-bridge/module/v4/app/params" + "github.com/peggyjv/gravity-bridge/module/v5/app" + "github.com/peggyjv/gravity-bridge/module/v5/app/params" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/module/cmd/gravity/cmd/root_test.go b/module/cmd/gravity/cmd/root_test.go index e142a9ad4..8e1d7e4f5 100644 --- a/module/cmd/gravity/cmd/root_test.go +++ b/module/cmd/gravity/cmd/root_test.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/keys" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" - "github.com/peggyjv/gravity-bridge/module/v4/app" + "github.com/peggyjv/gravity-bridge/module/v5/app" "github.com/spf13/cobra" "github.com/stretchr/testify/require" ) diff --git a/module/cmd/gravity/main.go b/module/cmd/gravity/main.go index 87d0b8c03..e421bd07c 100644 --- a/module/cmd/gravity/main.go +++ b/module/cmd/gravity/main.go @@ -4,7 +4,7 @@ import ( "os" "github.com/cosmos/cosmos-sdk/server" - "github.com/peggyjv/gravity-bridge/module/v4/cmd/gravity/cmd" + "github.com/peggyjv/gravity-bridge/module/v5/cmd/gravity/cmd" ) func main() { diff --git a/module/go.mod b/module/go.mod index 86f721931..cafe5539d 100644 --- a/module/go.mod +++ b/module/go.mod @@ -1,4 +1,4 @@ -module github.com/peggyjv/gravity-bridge/module/v4 +module github.com/peggyjv/gravity-bridge/module/v5 go 1.22 diff --git a/module/proto/buf.lock b/module/proto/buf.lock index 9f37b41eb..1c91f9234 100644 --- a/module/proto/buf.lock +++ b/module/proto/buf.lock @@ -19,5 +19,5 @@ deps: - remote: buf.build owner: googleapis repository: googleapis - commit: 4ed3bc159a8b4ac68fe253218760d035 - digest: shake256:7149cf5e9955c692d381e557830555d4e93f205a0f1b8e2dfdae46d029369aa3fc1980e35df0d310f7cc3b622f93e19ad276769a283a967dd3065ddfd3a40e13 + commit: e7f8d366f5264595bcc4cd4139af9973 + digest: shake256:e5e5f1c12f82e028ea696faa43b4f9dc6258a6d1226282962a8c8b282e10946281d815884f574bd279ebd9cd7588629beb3db17b892af6c33b56f92f8f67f509 diff --git a/module/proto/gravity/v1/genesis.proto b/module/proto/gravity/v1/genesis.proto index eca91bb3a..5b263e164 100644 --- a/module/proto/gravity/v1/genesis.proto +++ b/module/proto/gravity/v1/genesis.proto @@ -6,7 +6,7 @@ import "gravity/v1/gravity.proto"; import "gravity/v1/msgs.proto"; import "google/protobuf/any.proto"; -option go_package = "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"; +option go_package = "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"; option (gogoproto.messagename_all) = true; // Params represent the Gravity genesis and store parameters diff --git a/module/proto/gravity/v1/gravity.proto b/module/proto/gravity/v1/gravity.proto index 6272a0e7a..65e8a1a61 100644 --- a/module/proto/gravity/v1/gravity.proto +++ b/module/proto/gravity/v1/gravity.proto @@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; -option go_package = "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"; +option go_package = "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"; option (gogoproto.messagename_all) = true; // EthereumEventVoteRecord is an event that is pending of confirmation by 2/3 of diff --git a/module/proto/gravity/v1/msgs.proto b/module/proto/gravity/v1/msgs.proto index 407234710..0d1354c51 100644 --- a/module/proto/gravity/v1/msgs.proto +++ b/module/proto/gravity/v1/msgs.proto @@ -10,13 +10,13 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "google/protobuf/any.proto"; -option go_package = "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"; +option go_package = "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"; option (gogoproto.messagename_all) = true; // Msg defines the state transitions possible within gravity service Msg { option (cosmos.msg.v1.service) = true; - + rpc SendToEthereum(MsgSendToEthereum) returns (MsgSendToEthereumResponse) { // option (google.api.http).post = "/gravity/v1/send_to_ethereum"; } @@ -129,7 +129,7 @@ message MsgSubmitEthereumEventResponse {} // to a given orchestrator address. This key is then used as an optional // authentication method for attesting events from Ethereum. message MsgDelegateKeys { - option (cosmos.msg.v1.signer) = "validator_address"; + option (cosmos.msg.v1.signer) = "validator_address"; option (amino.name) = "gravity/MsgDelegateKeys"; string validator_address = 1; diff --git a/module/proto/gravity/v1/query.proto b/module/proto/gravity/v1/query.proto index 9b6972ae3..fb2392ae8 100644 --- a/module/proto/gravity/v1/query.proto +++ b/module/proto/gravity/v1/query.proto @@ -11,7 +11,7 @@ import "gravity/v1/genesis.proto"; import "gravity/v1/gravity.proto"; import "gravity/v1/msgs.proto"; -option go_package = "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types"; +option go_package = "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types"; option (gogoproto.messagename_all) = true; // Query defines the gRPC querier service @@ -30,7 +30,7 @@ service Query { option (google.api.http).get = "/gravity/v1/signer_set_txs/latest"; } rpc BatchTx(BatchTxRequest) returns (BatchTxResponse) { - option (google.api.http).get = "/gravity/v1/batch_txs/{token_contract}/{batch_nonce}"; + option (google.api.http).get = "/gravity/v1/batch_txs/{token_contract}/{batch_nonce}"; } rpc ContractCallTx(ContractCallTxRequest) returns (ContractCallTxResponse) { option (google.api.http).get = "/gravity/v1/contract_call_txs/{invalidation_scope}/{invalidation_nonce}"; diff --git a/module/x/gravity/abci.go b/module/x/gravity/abci.go index 9955a13cb..13fc0004f 100644 --- a/module/x/gravity/abci.go +++ b/module/x/gravity/abci.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // BeginBlocker is called at the beginning of every block diff --git a/module/x/gravity/abci_test.go b/module/x/gravity/abci_test.go index 611d42454..d168ae1b8 100644 --- a/module/x/gravity/abci_test.go +++ b/module/x/gravity/abci_test.go @@ -12,9 +12,9 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func TestSignerSetTxCreationIfNotAvailable(t *testing.T) { diff --git a/module/x/gravity/client/cli/query.go b/module/x/gravity/client/cli/query.go index 6e2e88df9..e0f6ebb54 100644 --- a/module/x/gravity/client/cli/query.go +++ b/module/x/gravity/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" "github.com/spf13/cobra" ) diff --git a/module/x/gravity/client/cli/tx.go b/module/x/gravity/client/cli/tx.go index 9eb8f9a4c..31512c152 100644 --- a/module/x/gravity/client/cli/tx.go +++ b/module/x/gravity/client/cli/tx.go @@ -15,7 +15,7 @@ import ( "github.com/ethereum/go-ethereum/common/hexutil" "github.com/spf13/cobra" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func GetTxCmd(storeKey string) *cobra.Command { diff --git a/module/x/gravity/client/cli/utils.go b/module/x/gravity/client/cli/utils.go index c24a1e9e6..5386a3f7d 100644 --- a/module/x/gravity/client/cli/utils.go +++ b/module/x/gravity/client/cli/utils.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "github.com/cosmos/cosmos-sdk/codec" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // ParseCommunityPoolEthereumSpendProposal reads and parses a CommunityPoolEthereumSpendProposalForCLI from a file. diff --git a/module/x/gravity/client/proposal_handler.go b/module/x/gravity/client/proposal_handler.go index 1c12c349e..b6667c8fa 100644 --- a/module/x/gravity/client/proposal_handler.go +++ b/module/x/gravity/client/proposal_handler.go @@ -2,7 +2,7 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/client/cli" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/client/cli" ) // ProposalHandler is the community Ethereum spend proposal handler. diff --git a/module/x/gravity/cosmos_originated_test.go b/module/x/gravity/cosmos_originated_test.go index f619c9730..5bf2df9b2 100644 --- a/module/x/gravity/cosmos_originated_test.go +++ b/module/x/gravity/cosmos_originated_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/peggyjv/gravity-bridge/module/v4/app" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/app" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // Have the validators put in a erc20<>denom relation with ERC20DeployedEvent diff --git a/module/x/gravity/handler.go b/module/x/gravity/handler.go index 8afbcbdfc..a07072adf 100644 --- a/module/x/gravity/handler.go +++ b/module/x/gravity/handler.go @@ -6,8 +6,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // NewHandler returns a handler for "Gravity" type messages. diff --git a/module/x/gravity/handler_test.go b/module/x/gravity/handler_test.go index 5df508ef9..512be4e86 100644 --- a/module/x/gravity/handler_test.go +++ b/module/x/gravity/handler_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/require" ethCrypto "github.com/ethereum/go-ethereum/crypto" - "github.com/peggyjv/gravity-bridge/module/v4/app" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/app" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func TestHandleMsgSendToEthereum(t *testing.T) { diff --git a/module/x/gravity/keeper/batch.go b/module/x/gravity/keeper/batch.go index d726900c1..db9545a0b 100644 --- a/module/x/gravity/keeper/batch.go +++ b/module/x/gravity/keeper/batch.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // TODO: should we make this a parameter or a a call arg? diff --git a/module/x/gravity/keeper/batch_test.go b/module/x/gravity/keeper/batch_test.go index 1214fa043..c09eae088 100644 --- a/module/x/gravity/keeper/batch_test.go +++ b/module/x/gravity/keeper/batch_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func TestBatches(t *testing.T) { diff --git a/module/x/gravity/keeper/contract_call.go b/module/x/gravity/keeper/contract_call.go index f1ba07a91..3a18b3e06 100644 --- a/module/x/gravity/keeper/contract_call.go +++ b/module/x/gravity/keeper/contract_call.go @@ -7,7 +7,7 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func (k Keeper) GetUnsignedContractCallTxs(ctx sdk.Context, val sdk.ValAddress) []*types.ContractCallTx { diff --git a/module/x/gravity/keeper/contract_call_test.go b/module/x/gravity/keeper/contract_call_test.go index cb7650806..01598d53a 100644 --- a/module/x/gravity/keeper/contract_call_test.go +++ b/module/x/gravity/keeper/contract_call_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/module/x/gravity/keeper/cosmos_originated.go b/module/x/gravity/keeper/cosmos_originated.go index c8cad4272..11aa6dc1d 100644 --- a/module/x/gravity/keeper/cosmos_originated.go +++ b/module/x/gravity/keeper/cosmos_originated.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func (k Keeper) getCosmosOriginatedDenom(ctx sdk.Context, tokenContract common.Address) (string, bool) { diff --git a/module/x/gravity/keeper/ethereum_event_handler.go b/module/x/gravity/keeper/ethereum_event_handler.go index 16ff59d04..30e532681 100644 --- a/module/x/gravity/keeper/ethereum_event_handler.go +++ b/module/x/gravity/keeper/ethereum_event_handler.go @@ -8,7 +8,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func (k Keeper) DetectMaliciousSupply(ctx sdk.Context, denom string, amount sdk.Int) (err error) { diff --git a/module/x/gravity/keeper/ethereum_event_vote.go b/module/x/gravity/keeper/ethereum_event_vote.go index 3763f72b8..0c7d7dcd0 100644 --- a/module/x/gravity/keeper/ethereum_event_vote.go +++ b/module/x/gravity/keeper/ethereum_event_vote.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func (k Keeper) recordEventVote( diff --git a/module/x/gravity/keeper/genesis.go b/module/x/gravity/keeper/genesis.go index 15adf3999..65b880b0a 100644 --- a/module/x/gravity/keeper/genesis.go +++ b/module/x/gravity/keeper/genesis.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // InitGenesis starts a chain from a genesis state diff --git a/module/x/gravity/keeper/grpc_query.go b/module/x/gravity/keeper/grpc_query.go index 708d98eca..0c4a12d29 100644 --- a/module/x/gravity/keeper/grpc_query.go +++ b/module/x/gravity/keeper/grpc_query.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) var _ types.QueryServer = Keeper{} diff --git a/module/x/gravity/keeper/grpc_query_test.go b/module/x/gravity/keeper/grpc_query_test.go index a9469f4df..5638ce738 100644 --- a/module/x/gravity/keeper/grpc_query_test.go +++ b/module/x/gravity/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( "github.com/cometbft/cometbft/libs/bytes" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" "github.com/stretchr/testify/require" ) diff --git a/module/x/gravity/keeper/hooks.go b/module/x/gravity/keeper/hooks.go index 72940c28d..04e7818f7 100644 --- a/module/x/gravity/keeper/hooks.go +++ b/module/x/gravity/keeper/hooks.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) type Hooks struct { diff --git a/module/x/gravity/keeper/keeper.go b/module/x/gravity/keeper/keeper.go index c27e156ae..0e0482c99 100644 --- a/module/x/gravity/keeper/keeper.go +++ b/module/x/gravity/keeper/keeper.go @@ -21,7 +21,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // Keeper maintains the link to storage and exposes getter/setter methods for the various parts of the state machine diff --git a/module/x/gravity/keeper/keeper_test.go b/module/x/gravity/keeper/keeper_test.go index 0538bb738..63320c786 100644 --- a/module/x/gravity/keeper/keeper_test.go +++ b/module/x/gravity/keeper/keeper_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func TestCurrentValsetNormalization(t *testing.T) { diff --git a/module/x/gravity/keeper/msg_server.go b/module/x/gravity/keeper/msg_server.go index 2f1c06dcd..9db6fd403 100644 --- a/module/x/gravity/keeper/msg_server.go +++ b/module/x/gravity/keeper/msg_server.go @@ -12,7 +12,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) type msgServer struct { diff --git a/module/x/gravity/keeper/msg_server_test.go b/module/x/gravity/keeper/msg_server_test.go index 170cd9812..5992256d2 100644 --- a/module/x/gravity/keeper/msg_server_test.go +++ b/module/x/gravity/keeper/msg_server_test.go @@ -13,7 +13,7 @@ import ( ethCrypto "github.com/ethereum/go-ethereum/crypto" "github.com/stretchr/testify/require" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) var ( diff --git a/module/x/gravity/keeper/pool.go b/module/x/gravity/keeper/pool.go index 22a90e745..5c730745c 100644 --- a/module/x/gravity/keeper/pool.go +++ b/module/x/gravity/keeper/pool.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // createSendToEthereum diff --git a/module/x/gravity/keeper/pool_test.go b/module/x/gravity/keeper/pool_test.go index 36c459f11..5d6403b6e 100644 --- a/module/x/gravity/keeper/pool_test.go +++ b/module/x/gravity/keeper/pool_test.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/require" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func TestAddToOutgoingPool(t *testing.T) { diff --git a/module/x/gravity/keeper/proposal_handler.go b/module/x/gravity/keeper/proposal_handler.go index 715e48c03..524764d04 100644 --- a/module/x/gravity/keeper/proposal_handler.go +++ b/module/x/gravity/keeper/proposal_handler.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func (k Keeper) HandleCommunityPoolEthereumSpendProposal(ctx sdk.Context, p *types.CommunityPoolEthereumSpendProposal) error { diff --git a/module/x/gravity/keeper/signer_set.go b/module/x/gravity/keeper/signer_set.go index 60aea5776..f5f94d19a 100644 --- a/module/x/gravity/keeper/signer_set.go +++ b/module/x/gravity/keeper/signer_set.go @@ -5,7 +5,7 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // TODO here we should check the contents of the validator set against diff --git a/module/x/gravity/keeper/signer_set_test.go b/module/x/gravity/keeper/signer_set_test.go index 281476778..5602c7d07 100644 --- a/module/x/gravity/keeper/signer_set_test.go +++ b/module/x/gravity/keeper/signer_set_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func TestSignerSetTxExecuted(t *testing.T) { diff --git a/module/x/gravity/keeper/test_common.go b/module/x/gravity/keeper/test_common.go index 1859f1f64..d9be09af7 100644 --- a/module/x/gravity/keeper/test_common.go +++ b/module/x/gravity/keeper/test_common.go @@ -59,10 +59,10 @@ import ( ibctransfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer" ibc "github.com/cosmos/ibc-go/v7/modules/core" gethcommon "github.com/ethereum/go-ethereum/common" - gravityclient "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/client" + gravityclient "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/client" "github.com/stretchr/testify/require" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) var ( diff --git a/module/x/gravity/module.go b/module/x/gravity/module.go index 25f367deb..006ecdfc6 100644 --- a/module/x/gravity/module.go +++ b/module/x/gravity/module.go @@ -18,9 +18,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/client/cli" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/keeper" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/client/cli" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/keeper" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // type check to ensure the interface is properly implemented diff --git a/module/x/gravity/types/genesis.pb.go b/module/x/gravity/types/genesis.pb.go index bd4e70388..a30667728 100644 --- a/module/x/gravity/types/genesis.pb.go +++ b/module/x/gravity/types/genesis.pb.go @@ -411,7 +411,7 @@ var fileDescriptor_387b0aba880adb60 = []byte{ // 950 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xdf, 0x6e, 0x1b, 0xc5, 0x17, 0x8e, 0x7f, 0x4d, 0xf3, 0x23, 0x63, 0x9b, 0x94, 0xa9, 0x43, 0x37, 0x4e, 0x70, 0x4d, 0x10, - 0x55, 0x40, 0x64, 0x37, 0x31, 0x08, 0x44, 0xca, 0x9f, 0x36, 0x89, 0x81, 0x0a, 0x41, 0xd0, 0xda, + 0x55, 0x40, 0x64, 0x37, 0x31, 0x02, 0x44, 0xca, 0x9f, 0x36, 0x89, 0x81, 0x0a, 0x41, 0xd0, 0xda, 0x02, 0xc1, 0x05, 0xc3, 0x78, 0xe7, 0x64, 0xbd, 0xc4, 0x9e, 0x89, 0x76, 0x66, 0x5d, 0xfb, 0x8e, 0x47, 0xe8, 0xb3, 0xf0, 0x04, 0x5c, 0xe6, 0xb2, 0x97, 0x08, 0xa1, 0x0a, 0x25, 0x2f, 0x82, 0xe6, 0xcf, 0xda, 0x6b, 0x37, 0xdc, 0xe4, 0x6a, 0x3d, 0xf3, 0x7d, 0xdf, 0x39, 0xdf, 0x9c, 0xe3, 0x39, @@ -467,8 +467,8 @@ var fileDescriptor_387b0aba880adb60 = []byte{ 0x51, 0xfa, 0xe7, 0xb2, 0x51, 0x7a, 0x76, 0xd5, 0x58, 0xba, 0xb8, 0x6a, 0x94, 0x9e, 0x5f, 0x35, 0x96, 0xfe, 0xbc, 0x6a, 0x2c, 0xfd, 0xf4, 0xb0, 0x70, 0x6d, 0xcf, 0x21, 0x8e, 0x27, 0xbf, 0x8e, 0xf2, 0x57, 0x7a, 0xd7, 0xbe, 0x5f, 0xc1, 0x50, 0xb0, 0x6c, 0x00, 0xc1, 0xe8, 0x83, 0x60, 0x9c, - 0x43, 0xf6, 0x3e, 0xf7, 0x56, 0x4c, 0xef, 0xdf, 0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0xc1, 0xb7, - 0xc2, 0xad, 0x1f, 0x08, 0x00, 0x00, + 0x43, 0xf6, 0x3e, 0xf7, 0x56, 0x4c, 0xef, 0xdf, 0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0xcf, 0x27, + 0x49, 0x08, 0x1f, 0x08, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/module/x/gravity/types/gravity.pb.go b/module/x/gravity/types/gravity.pb.go index dd4dcb157..3b23d8630 100644 --- a/module/x/gravity/types/gravity.pb.go +++ b/module/x/gravity/types/gravity.pb.go @@ -756,73 +756,73 @@ func init() { func init() { proto.RegisterFile("gravity/v1/gravity.proto", fileDescriptor_1715a041eadeb531) } var fileDescriptor_1715a041eadeb531 = []byte{ - // 1053 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcf, 0x6f, 0xe3, 0x44, - 0x14, 0x8e, 0x93, 0x36, 0x6d, 0x26, 0xd9, 0x6c, 0x3b, 0x94, 0xc5, 0xad, 0x56, 0x71, 0x64, 0xc4, - 0x92, 0x95, 0xa8, 0xdd, 0x86, 0x4a, 0x40, 0x11, 0x2b, 0xad, 0xc3, 0x56, 0x5b, 0x69, 0x85, 0x16, - 0xb7, 0x42, 0x82, 0x4b, 0xe5, 0xd8, 0xaf, 0xae, 0xa9, 0xe3, 0xb1, 0xec, 0x49, 0x68, 0x8e, 0x5c, - 0x10, 0x47, 0x2e, 0x48, 0x1c, 0x7b, 0xe6, 0xcc, 0x91, 0x1b, 0x97, 0x8a, 0xd3, 0x1e, 0x81, 0x43, - 0x80, 0xf6, 0xc2, 0x39, 0x7f, 0x01, 0xf2, 0xfc, 0x70, 0xed, 0xdd, 0x8a, 0x72, 0xea, 0xbc, 0xf7, - 0xbe, 0xef, 0xcd, 0x9b, 0x6f, 0xbe, 0x7a, 0x82, 0x54, 0x3f, 0x71, 0x26, 0x01, 0x9d, 0x9a, 0x93, - 0x6d, 0x53, 0x2c, 0x8d, 0x38, 0x21, 0x94, 0x60, 0x24, 0xc3, 0xc9, 0xf6, 0x46, 0xc7, 0x25, 0xe9, - 0x88, 0xa4, 0xe6, 0xd0, 0x49, 0xc1, 0x9c, 0x6c, 0x0f, 0x81, 0x3a, 0xdb, 0xa6, 0x4b, 0x82, 0x88, - 0x63, 0x37, 0xd6, 0x79, 0xfd, 0x88, 0x45, 0x26, 0x0f, 0x44, 0x69, 0xcd, 0x27, 0x3e, 0xe1, 0xf9, - 0x6c, 0x25, 0x09, 0x3e, 0x21, 0x7e, 0x08, 0x26, 0x8b, 0x86, 0xe3, 0x63, 0xd3, 0x89, 0xc4, 0xbe, - 0xfa, 0xf7, 0x0a, 0x7a, 0xe3, 0x09, 0x3d, 0x81, 0x04, 0xc6, 0xa3, 0x27, 0x13, 0x88, 0xe8, 0x67, - 0x84, 0x82, 0x0d, 0x2e, 0x49, 0x3c, 0xfc, 0x14, 0x2d, 0x42, 0x96, 0x52, 0x95, 0xae, 0xd2, 0x6b, - 0xf6, 0xd7, 0x0c, 0xde, 0xc6, 0x90, 0x6d, 0x8c, 0xc7, 0xd1, 0xd4, 0xba, 0xff, 0xeb, 0x4f, 0x9b, - 0xea, 0xf5, 0xf0, 0x46, 0xa9, 0x99, 0xcd, 0x1b, 0xe0, 0x35, 0xb4, 0x38, 0x21, 0x14, 0x52, 0xb5, - 0xda, 0xad, 0xf5, 0x1a, 0x36, 0x0f, 0xf0, 0x06, 0x5a, 0x76, 0x5c, 0x17, 0x62, 0x0a, 0x9e, 0x5a, - 0xeb, 0x2a, 0xbd, 0x65, 0x3b, 0x8f, 0xf5, 0x00, 0xad, 0x3f, 0x73, 0x28, 0xa4, 0x54, 0xf6, 0xb3, - 0x42, 0xe2, 0x9e, 0x3e, 0x85, 0xc0, 0x3f, 0xa1, 0xf8, 0x6d, 0x74, 0x17, 0x44, 0xfa, 0xe8, 0x84, - 0xa5, 0xd8, 0x88, 0x0b, 0x76, 0x5b, 0xa6, 0x05, 0xf0, 0x4d, 0x74, 0x47, 0x68, 0x25, 0x60, 0x55, - 0x06, 0x6b, 0xf1, 0x24, 0x07, 0xe9, 0x9f, 0xa2, 0xb6, 0xdc, 0xe4, 0x20, 0xf0, 0x23, 0x48, 0xb2, - 0x71, 0x63, 0xf2, 0x15, 0x24, 0xa2, 0x2b, 0x0f, 0xf0, 0x43, 0xb4, 0x92, 0xef, 0xea, 0x78, 0x5e, - 0x02, 0x69, 0xca, 0xfa, 0x35, 0xec, 0x7c, 0x9a, 0xc7, 0x3c, 0xad, 0x7f, 0xa3, 0xa0, 0x26, 0xef, - 0x75, 0x00, 0xf4, 0xf0, 0x2c, 0x6b, 0x18, 0x91, 0xc8, 0x05, 0xd9, 0x90, 0x05, 0xf8, 0x1e, 0xaa, - 0x97, 0xc6, 0x12, 0x11, 0xde, 0x47, 0x4b, 0x29, 0x23, 0xa7, 0x6a, 0xad, 0x5b, 0xeb, 0x35, 0xfb, - 0x1b, 0xc6, 0x0d, 0x02, 0xf3, 0xfe, 0xd6, 0x6b, 0x3f, 0xfe, 0xa9, 0xdd, 0x2d, 0xe7, 0x52, 0x5b, - 0xf2, 0xf5, 0x5f, 0x14, 0xb4, 0x64, 0x39, 0xd4, 0x3d, 0x39, 0x3c, 0xc3, 0x1a, 0x6a, 0x0e, 0xb3, - 0xe5, 0x51, 0x71, 0x14, 0xc4, 0x52, 0x9f, 0xb0, 0x79, 0x54, 0xb4, 0x44, 0x83, 0x11, 0x90, 0xb1, - 0x1c, 0x48, 0x86, 0xf8, 0x11, 0x6a, 0xd1, 0xc4, 0x89, 0x52, 0xc7, 0xa5, 0x01, 0x89, 0x6e, 0x1c, - 0xeb, 0x00, 0x22, 0xef, 0x90, 0xc8, 0x41, 0xec, 0x12, 0x1e, 0xbf, 0x85, 0xda, 0x94, 0x9c, 0x42, - 0x74, 0xe4, 0x92, 0x88, 0x26, 0x8e, 0x4b, 0xd5, 0x05, 0x26, 0xdc, 0x1d, 0x96, 0x1d, 0x88, 0x64, - 0x41, 0x90, 0xc5, 0xa2, 0x20, 0xfa, 0xdf, 0x0a, 0x6a, 0x97, 0xfb, 0xe3, 0x36, 0xaa, 0x06, 0x9e, - 0x38, 0x43, 0x35, 0xf0, 0x32, 0x6a, 0x0a, 0x91, 0x07, 0x89, 0xb8, 0x12, 0x11, 0xe1, 0x4d, 0x84, - 0xf3, 0x4b, 0x4b, 0xc0, 0x0d, 0xe2, 0x20, 0x33, 0x74, 0x8d, 0x61, 0x56, 0x65, 0xc5, 0x96, 0x05, - 0xfc, 0x11, 0x6a, 0x42, 0xe2, 0xf6, 0xb7, 0x8e, 0xd8, 0x60, 0x6c, 0xca, 0x66, 0xff, 0x5e, 0x49, - 0x7e, 0x7b, 0xd0, 0xdf, 0x3a, 0xcc, 0xaa, 0xd6, 0xc2, 0xc5, 0x4c, 0xab, 0xd8, 0x88, 0x11, 0x58, - 0x06, 0x7f, 0x80, 0x1a, 0x9c, 0x7e, 0x0c, 0xc0, 0xce, 0x70, 0x1b, 0x79, 0x99, 0xc1, 0xf7, 0x00, - 0xf4, 0x9f, 0xab, 0xa8, 0x2d, 0x85, 0x18, 0x38, 0x61, 0x78, 0x78, 0x96, 0xcd, 0x1e, 0x44, 0x13, - 0x27, 0x0c, 0x3c, 0x27, 0x93, 0xb1, 0x74, 0x6f, 0xab, 0xc5, 0x0a, 0xbf, 0xbe, 0x97, 0xe1, 0xa9, - 0x4b, 0x62, 0x60, 0x72, 0xb4, 0xca, 0xf0, 0x83, 0xac, 0x90, 0xdd, 0xb6, 0x74, 0x31, 0x97, 0x43, - 0x86, 0x59, 0x25, 0x76, 0xa6, 0x21, 0x71, 0x3c, 0x26, 0x40, 0xcb, 0x96, 0x61, 0xd1, 0x21, 0x8b, - 0x65, 0x87, 0xec, 0xa0, 0x3a, 0x93, 0x2c, 0x55, 0xeb, 0xcc, 0x1b, 0xff, 0x7d, 0x6c, 0x81, 0xc5, - 0x5b, 0x68, 0xe1, 0x18, 0x20, 0x55, 0x97, 0xfe, 0x07, 0x87, 0x21, 0x0b, 0x16, 0x59, 0x2e, 0x59, - 0x24, 0x46, 0xe8, 0x9a, 0x91, 0x7d, 0x59, 0x72, 0xa7, 0x29, 0xec, 0x70, 0x79, 0x8c, 0xf7, 0x50, - 0xdd, 0x19, 0x91, 0x71, 0xc4, 0x4d, 0xde, 0xb0, 0x8c, 0xac, 0xfb, 0x1f, 0x33, 0xed, 0x81, 0x1f, - 0xd0, 0x93, 0xf1, 0xd0, 0x70, 0xc9, 0x48, 0x7c, 0x53, 0xc5, 0x9f, 0xcd, 0xd4, 0x3b, 0x35, 0xe9, - 0x34, 0x86, 0xd4, 0xd8, 0x8f, 0xa8, 0x2d, 0xd8, 0xfa, 0x3a, 0x5a, 0xdc, 0xff, 0xf8, 0x00, 0x28, - 0x5e, 0x41, 0xb5, 0xc0, 0x4b, 0x55, 0xa5, 0x5b, 0xeb, 0x2d, 0xd8, 0xd9, 0x52, 0xff, 0xba, 0x8a, - 0xf4, 0x01, 0x19, 0x8d, 0xc6, 0x51, 0x40, 0xa7, 0xcf, 0x09, 0x09, 0xf3, 0xff, 0xcf, 0x18, 0x22, - 0xef, 0x79, 0x42, 0x62, 0x92, 0x3a, 0x61, 0xf6, 0x55, 0xa0, 0x01, 0x0d, 0x41, 0x8c, 0xc8, 0x03, - 0xdc, 0x45, 0x4d, 0x0f, 0x52, 0x37, 0x09, 0xe2, 0xec, 0xae, 0x84, 0x9d, 0x8b, 0x29, 0x7c, 0x1f, - 0x35, 0x5e, 0xb6, 0xf2, 0x75, 0x02, 0xbf, 0x97, 0x9f, 0x8f, 0xbb, 0x77, 0xdd, 0x10, 0x2f, 0x44, - 0xf6, 0x9c, 0x18, 0xe2, 0x39, 0x31, 0x06, 0x24, 0xc8, 0x2f, 0x83, 0xc3, 0xf1, 0x23, 0x84, 0x86, - 0x49, 0xe0, 0xf9, 0x50, 0x70, 0xef, 0xad, 0xe4, 0x06, 0xa7, 0xec, 0x01, 0xec, 0xb6, 0xbe, 0x3d, - 0xd7, 0x2a, 0x3f, 0x9c, 0x6b, 0x95, 0x7f, 0xce, 0xb5, 0x8a, 0xfe, 0x7b, 0x15, 0xf5, 0x6e, 0xd7, - 0x60, 0x8f, 0x24, 0x83, 0x67, 0xfb, 0xf8, 0x41, 0x49, 0x09, 0x6b, 0x65, 0x3e, 0xd3, 0x5a, 0x53, - 0x67, 0x14, 0xee, 0xea, 0x2c, 0xad, 0x4b, 0x6d, 0xde, 0xbf, 0x41, 0x1b, 0xeb, 0xde, 0x7c, 0xa6, - 0x61, 0x8e, 0x2e, 0x14, 0xf5, 0xb2, 0x66, 0xfd, 0x57, 0x34, 0xb3, 0xd6, 0xe6, 0x33, 0x6d, 0x85, - 0xf3, 0xf2, 0x92, 0x5e, 0x54, 0xf2, 0x61, 0x49, 0xc9, 0x86, 0xb5, 0x3a, 0x9f, 0x69, 0x77, 0x38, - 0x41, 0x78, 0x20, 0xd7, 0x6e, 0xe7, 0x15, 0xed, 0x1a, 0xd6, 0xeb, 0xf3, 0x99, 0xb6, 0xca, 0xe1, - 0xd7, 0x35, 0xbd, 0xa0, 0x18, 0x7e, 0x07, 0x2d, 0x79, 0x10, 0x93, 0x34, 0xa0, 0x6a, 0x9d, 0x51, - 0xf0, 0x7c, 0xa6, 0xb5, 0xe5, 0x51, 0x58, 0x41, 0xb7, 0x25, 0x64, 0x77, 0x59, 0xe8, 0xab, 0x58, - 0x9f, 0x5f, 0x5c, 0x76, 0x94, 0x17, 0x97, 0x1d, 0xe5, 0xaf, 0xcb, 0x8e, 0xf2, 0xdd, 0x55, 0xa7, - 0x72, 0x71, 0xd5, 0x51, 0x5e, 0x5c, 0x75, 0x2a, 0xbf, 0x5d, 0x75, 0x2a, 0x5f, 0x7c, 0x58, 0x30, - 0x72, 0x0c, 0xbe, 0x3f, 0xfd, 0x72, 0x22, 0x7f, 0x6c, 0x6c, 0xf2, 0xbd, 0xcd, 0x11, 0xf1, 0xc6, - 0x21, 0x98, 0x93, 0x1d, 0xf3, 0x4c, 0x96, 0xb8, 0xc3, 0x87, 0x75, 0xf6, 0xb8, 0xbf, 0xfb, 0x6f, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x8d, 0xac, 0xc6, 0xaa, 0x08, 0x00, 0x00, + // 1055 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xcf, 0x6f, 0xe3, 0xc4, + 0x17, 0x8f, 0x93, 0x36, 0x6d, 0x26, 0xd9, 0x6c, 0x3b, 0xdf, 0x7e, 0x8b, 0x5b, 0xad, 0xe2, 0xc8, + 0x88, 0x25, 0x2b, 0x51, 0xbb, 0x0d, 0x8b, 0x80, 0x22, 0x56, 0x5a, 0x87, 0xad, 0xb6, 0xd2, 0x0a, + 0x2d, 0x6e, 0x85, 0x04, 0x97, 0xca, 0xb1, 0x5f, 0x5d, 0x53, 0xc7, 0x63, 0xd9, 0x93, 0xd0, 0x1c, + 0xb9, 0x20, 0x8e, 0x5c, 0x90, 0x38, 0xf6, 0xcc, 0x99, 0x23, 0x37, 0x2e, 0x15, 0xa7, 0x3d, 0x02, + 0x87, 0x00, 0xed, 0x85, 0x73, 0xfe, 0x02, 0xe4, 0xf9, 0xe1, 0xda, 0xbb, 0x15, 0xe5, 0xd4, 0x79, + 0xef, 0x7d, 0x3e, 0x6f, 0xde, 0x7c, 0xe6, 0x53, 0x4f, 0x90, 0xea, 0x27, 0xce, 0x24, 0xa0, 0x53, + 0x73, 0xb2, 0x63, 0x8a, 0xa5, 0x11, 0x27, 0x84, 0x12, 0x8c, 0x64, 0x38, 0xd9, 0xd9, 0xec, 0xb8, + 0x24, 0x1d, 0x91, 0xd4, 0x1c, 0x3a, 0x29, 0x98, 0x93, 0x9d, 0x21, 0x50, 0x67, 0xc7, 0x74, 0x49, + 0x10, 0x71, 0xec, 0xe6, 0x06, 0xaf, 0x1f, 0xb1, 0xc8, 0xe4, 0x81, 0x28, 0xad, 0xf9, 0xc4, 0x27, + 0x3c, 0x9f, 0xad, 0x24, 0xc1, 0x27, 0xc4, 0x0f, 0xc1, 0x64, 0xd1, 0x70, 0x7c, 0x6c, 0x3a, 0x91, + 0xd8, 0x57, 0xff, 0x4e, 0x41, 0xaf, 0x3d, 0xa1, 0x27, 0x90, 0xc0, 0x78, 0xf4, 0x64, 0x02, 0x11, + 0xfd, 0x94, 0x50, 0xb0, 0xc1, 0x25, 0x89, 0x87, 0x9f, 0xa2, 0x45, 0xc8, 0x52, 0xaa, 0xd2, 0x55, + 0x7a, 0xcd, 0xfe, 0x9a, 0xc1, 0xdb, 0x18, 0xb2, 0x8d, 0xf1, 0x38, 0x9a, 0x5a, 0xf7, 0x7e, 0xf9, + 0x71, 0x4b, 0xbd, 0x1e, 0xde, 0x28, 0x35, 0xb3, 0x79, 0x03, 0xbc, 0x86, 0x16, 0x27, 0x84, 0x42, + 0xaa, 0x56, 0xbb, 0xb5, 0x5e, 0xc3, 0xe6, 0x01, 0xde, 0x44, 0xcb, 0x8e, 0xeb, 0x42, 0x4c, 0xc1, + 0x53, 0x6b, 0x5d, 0xa5, 0xb7, 0x6c, 0xe7, 0xb1, 0x1e, 0xa0, 0x8d, 0x67, 0x0e, 0x85, 0x94, 0xca, + 0x7e, 0x56, 0x48, 0xdc, 0xd3, 0xa7, 0x10, 0xf8, 0x27, 0x14, 0xbf, 0x89, 0xee, 0x82, 0x48, 0x1f, + 0x9d, 0xb0, 0x14, 0x1b, 0x71, 0xc1, 0x6e, 0xcb, 0xb4, 0x00, 0xbe, 0x8e, 0xee, 0x08, 0xad, 0x04, + 0xac, 0xca, 0x60, 0x2d, 0x9e, 0xe4, 0x20, 0xfd, 0x13, 0xd4, 0x96, 0x9b, 0x1c, 0x04, 0x7e, 0x04, + 0x49, 0x36, 0x6e, 0x4c, 0xbe, 0x84, 0x44, 0x74, 0xe5, 0x01, 0x7e, 0x80, 0x56, 0xf2, 0x5d, 0x1d, + 0xcf, 0x4b, 0x20, 0x4d, 0x59, 0xbf, 0x86, 0x9d, 0x4f, 0xf3, 0x98, 0xa7, 0xf5, 0xaf, 0x15, 0xd4, + 0xe4, 0xbd, 0x0e, 0x80, 0x1e, 0x9e, 0x65, 0x0d, 0x23, 0x12, 0xb9, 0x20, 0x1b, 0xb2, 0x00, 0xaf, + 0xa3, 0x7a, 0x69, 0x2c, 0x11, 0xe1, 0x7d, 0xb4, 0x94, 0x32, 0x72, 0xaa, 0xd6, 0xba, 0xb5, 0x5e, + 0xb3, 0xbf, 0x69, 0xdc, 0x20, 0x30, 0xef, 0x6f, 0xfd, 0xef, 0x87, 0x3f, 0xb4, 0xbb, 0xe5, 0x5c, + 0x6a, 0x4b, 0xbe, 0xfe, 0xb3, 0x82, 0x96, 0x2c, 0x87, 0xba, 0x27, 0x87, 0x67, 0x58, 0x43, 0xcd, + 0x61, 0xb6, 0x3c, 0x2a, 0x8e, 0x82, 0x58, 0xea, 0x63, 0x36, 0x8f, 0x8a, 0x96, 0x68, 0x30, 0x02, + 0x32, 0x96, 0x03, 0xc9, 0x10, 0x3f, 0x42, 0x2d, 0x9a, 0x38, 0x51, 0xea, 0xb8, 0x34, 0x20, 0xd1, + 0x8d, 0x63, 0x1d, 0x40, 0xe4, 0x1d, 0x12, 0x39, 0x88, 0x5d, 0xc2, 0xe3, 0x37, 0x50, 0x9b, 0x92, + 0x53, 0x88, 0x8e, 0x5c, 0x12, 0xd1, 0xc4, 0x71, 0xa9, 0xba, 0xc0, 0x84, 0xbb, 0xc3, 0xb2, 0x03, + 0x91, 0x2c, 0x08, 0xb2, 0x58, 0x14, 0x44, 0xff, 0x4b, 0x41, 0xed, 0x72, 0x7f, 0xdc, 0x46, 0xd5, + 0xc0, 0x13, 0x67, 0xa8, 0x06, 0x5e, 0x46, 0x4d, 0x21, 0xf2, 0x20, 0x11, 0x57, 0x22, 0x22, 0xbc, + 0x85, 0x70, 0x7e, 0x69, 0x09, 0xb8, 0x41, 0x1c, 0x64, 0x86, 0xae, 0x31, 0xcc, 0xaa, 0xac, 0xd8, + 0xb2, 0x80, 0x3f, 0x44, 0x4d, 0x48, 0xdc, 0xfe, 0xf6, 0x11, 0x1b, 0x8c, 0x4d, 0xd9, 0xec, 0xaf, + 0x97, 0xe4, 0xb7, 0x07, 0xfd, 0xed, 0xc3, 0xac, 0x6a, 0x2d, 0x5c, 0xcc, 0xb4, 0x8a, 0x8d, 0x18, + 0x81, 0x65, 0xf0, 0xfb, 0xa8, 0xc1, 0xe9, 0xc7, 0x00, 0xec, 0x0c, 0xb7, 0x91, 0x97, 0x19, 0x7c, + 0x0f, 0x40, 0xff, 0xa9, 0x8a, 0xda, 0x52, 0x88, 0x81, 0x13, 0x86, 0x87, 0x67, 0xd9, 0xec, 0x41, + 0x34, 0x71, 0xc2, 0xc0, 0x73, 0x32, 0x19, 0x4b, 0xf7, 0xb6, 0x5a, 0xac, 0xf0, 0xeb, 0x7b, 0x19, + 0x9e, 0xba, 0x24, 0x06, 0x26, 0x47, 0xab, 0x0c, 0x3f, 0xc8, 0x0a, 0xd9, 0x6d, 0x4b, 0x17, 0x73, + 0x39, 0x64, 0x98, 0x55, 0x62, 0x67, 0x1a, 0x12, 0xc7, 0x63, 0x02, 0xb4, 0x6c, 0x19, 0x16, 0x1d, + 0xb2, 0x58, 0x76, 0xc8, 0x43, 0x54, 0x67, 0x92, 0xa5, 0x6a, 0x9d, 0x79, 0xe3, 0xdf, 0x8f, 0x2d, + 0xb0, 0x78, 0x1b, 0x2d, 0x1c, 0x03, 0xa4, 0xea, 0xd2, 0x7f, 0xe0, 0x30, 0x64, 0xc1, 0x22, 0xcb, + 0x25, 0x8b, 0xc4, 0x08, 0x5d, 0x33, 0xb2, 0x2f, 0x4b, 0xee, 0x34, 0x85, 0x1d, 0x2e, 0x8f, 0xf1, + 0x1e, 0xaa, 0x3b, 0x23, 0x32, 0x8e, 0xb8, 0xc9, 0x1b, 0x96, 0x91, 0x75, 0xff, 0x7d, 0xa6, 0xdd, + 0xf7, 0x03, 0x7a, 0x32, 0x1e, 0x1a, 0x2e, 0x19, 0x89, 0x6f, 0xaa, 0xf8, 0xb3, 0x95, 0x7a, 0xa7, + 0x26, 0x9d, 0xc6, 0x90, 0x1a, 0xfb, 0x11, 0xb5, 0x05, 0x5b, 0xdf, 0x40, 0x8b, 0xfb, 0x1f, 0x1d, + 0x00, 0xc5, 0x2b, 0xa8, 0x16, 0x78, 0xa9, 0xaa, 0x74, 0x6b, 0xbd, 0x05, 0x3b, 0x5b, 0xea, 0x5f, + 0x55, 0x91, 0x3e, 0x20, 0xa3, 0xd1, 0x38, 0x0a, 0xe8, 0xf4, 0x39, 0x21, 0x61, 0xfe, 0xff, 0x19, + 0x43, 0xe4, 0x3d, 0x4f, 0x48, 0x4c, 0x52, 0x27, 0xcc, 0xbe, 0x0a, 0x34, 0xa0, 0x21, 0x88, 0x11, + 0x79, 0x80, 0xbb, 0xa8, 0xe9, 0x41, 0xea, 0x26, 0x41, 0x9c, 0xdd, 0x95, 0xb0, 0x73, 0x31, 0x85, + 0xef, 0xa1, 0xc6, 0xcb, 0x56, 0xbe, 0x4e, 0xe0, 0x77, 0xf3, 0xf3, 0x71, 0xf7, 0x6e, 0x18, 0xe2, + 0x85, 0xc8, 0x9e, 0x13, 0x43, 0x3c, 0x27, 0xc6, 0x80, 0x04, 0xf9, 0x65, 0x70, 0x38, 0x7e, 0x84, + 0xd0, 0x30, 0x09, 0x3c, 0x1f, 0x0a, 0xee, 0xbd, 0x95, 0xdc, 0xe0, 0x94, 0x3d, 0x80, 0xdd, 0xd6, + 0x37, 0xe7, 0x5a, 0xe5, 0xfb, 0x73, 0xad, 0xf2, 0xf7, 0xb9, 0x56, 0xd1, 0x7f, 0xab, 0xa2, 0xde, + 0xed, 0x1a, 0xec, 0x91, 0x64, 0xf0, 0x6c, 0x1f, 0xdf, 0x2f, 0x29, 0x61, 0xad, 0xcc, 0x67, 0x5a, + 0x6b, 0xea, 0x8c, 0xc2, 0x5d, 0x9d, 0xa5, 0x75, 0xa9, 0xcd, 0x7b, 0x37, 0x68, 0x63, 0xad, 0xcf, + 0x67, 0x1a, 0xe6, 0xe8, 0x42, 0x51, 0x2f, 0x6b, 0xd6, 0x7f, 0x45, 0x33, 0x6b, 0x6d, 0x3e, 0xd3, + 0x56, 0x38, 0x2f, 0x2f, 0xe9, 0x45, 0x25, 0x1f, 0x94, 0x94, 0x6c, 0x58, 0xab, 0xf3, 0x99, 0x76, + 0x87, 0x13, 0x84, 0x07, 0x72, 0xed, 0x1e, 0xbe, 0xa2, 0x5d, 0xc3, 0xfa, 0xff, 0x7c, 0xa6, 0xad, + 0x72, 0xf8, 0x75, 0x4d, 0x2f, 0x28, 0x86, 0xdf, 0x42, 0x4b, 0x1e, 0xc4, 0x24, 0x0d, 0xa8, 0x5a, + 0x67, 0x14, 0x3c, 0x9f, 0x69, 0x6d, 0x79, 0x14, 0x56, 0xd0, 0x6d, 0x09, 0xd9, 0x5d, 0x16, 0xfa, + 0x2a, 0xd6, 0x67, 0x17, 0x97, 0x1d, 0xe5, 0xc5, 0x65, 0x47, 0xf9, 0xf3, 0xb2, 0xa3, 0x7c, 0x7b, + 0xd5, 0xa9, 0x5c, 0x5c, 0x75, 0x94, 0x17, 0x57, 0x9d, 0xca, 0xaf, 0x57, 0x9d, 0xca, 0xe7, 0x1f, + 0x14, 0x8c, 0x1c, 0x83, 0xef, 0x4f, 0xbf, 0x98, 0xc8, 0x1f, 0x1b, 0x5b, 0x7c, 0x6f, 0x73, 0x44, + 0xbc, 0x71, 0x08, 0xe6, 0xe4, 0x1d, 0xf3, 0x4c, 0x96, 0xb8, 0xc3, 0x87, 0x75, 0xf6, 0xb8, 0xbf, + 0xfd, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe6, 0x1d, 0x27, 0x63, 0xaa, 0x08, 0x00, 0x00, } func (m *EthereumEventVoteRecord) Marshal() (dAtA []byte, err error) { diff --git a/module/x/gravity/types/msgs.pb.go b/module/x/gravity/types/msgs.pb.go index 2ed2d6851..09fcca32b 100644 --- a/module/x/gravity/types/msgs.pb.go +++ b/module/x/gravity/types/msgs.pb.go @@ -1346,95 +1346,95 @@ func init() { func init() { proto.RegisterFile("gravity/v1/msgs.proto", fileDescriptor_2f8523f2f6feb451) } var fileDescriptor_2f8523f2f6feb451 = []byte{ - // 1395 bytes of a gzipped FileDescriptorProto + // 1396 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4d, 0x6f, 0xdb, 0x46, 0x13, 0x36, 0x25, 0xd9, 0x81, 0x57, 0x8e, 0x3f, 0x68, 0x27, 0x96, 0xf4, 0xda, 0x92, 0xcd, 0x20, - 0xaf, 0x3f, 0x02, 0x91, 0xb1, 0x12, 0xa0, 0x80, 0x03, 0x14, 0x88, 0x64, 0x07, 0x29, 0x0a, 0xe7, - 0x20, 0xa5, 0x45, 0xda, 0x8b, 0x40, 0x91, 0x63, 0x8a, 0x89, 0xc8, 0x15, 0xb8, 0x2b, 0xc1, 0xba, - 0x15, 0xe9, 0xa1, 0x45, 0x4e, 0xed, 0x3f, 0xc8, 0x21, 0xe8, 0xb1, 0xc8, 0x21, 0x7f, 0xa0, 0xb7, - 0x34, 0xa7, 0xdc, 0x5a, 0xf4, 0x10, 0x14, 0xf1, 0x21, 0xfd, 0x03, 0x3d, 0xb4, 0x87, 0xa2, 0xe0, - 0xee, 0x52, 0x26, 0x29, 0x5a, 0xb6, 0x81, 0x5e, 0x6c, 0xee, 0x3c, 0x0f, 0x67, 0x67, 0x66, 0x1f, - 0xce, 0xac, 0xd0, 0x15, 0xcb, 0xd3, 0xfb, 0x36, 0x1d, 0x68, 0xfd, 0x1d, 0xcd, 0x21, 0x16, 0x51, - 0xbb, 0x1e, 0xa6, 0x58, 0x46, 0xc2, 0xac, 0xf6, 0x77, 0x0a, 0x0b, 0xba, 0x63, 0xbb, 0x58, 0x63, - 0x7f, 0x39, 0x5c, 0x28, 0x1a, 0x98, 0x38, 0x98, 0x68, 0x2d, 0x9d, 0x80, 0xd6, 0xdf, 0x69, 0x01, - 0xd5, 0x77, 0x34, 0x03, 0xdb, 0xae, 0xc0, 0xf3, 0x1c, 0x6f, 0xb2, 0x95, 0xc6, 0x17, 0x02, 0x5a, - 0x16, 0xaf, 0x3a, 0xc4, 0x12, 0x7b, 0x0a, 0x20, 0x17, 0x8a, 0x24, 0xd8, 0x9d, 0x23, 0x4b, 0x16, - 0xb6, 0x30, 0x77, 0xe5, 0x3f, 0x09, 0xeb, 0x8a, 0x85, 0xb1, 0xd5, 0x01, 0x4d, 0xef, 0xda, 0x9a, - 0xee, 0xba, 0x98, 0xea, 0xd4, 0xc6, 0x6e, 0xb0, 0x4d, 0x5e, 0xa0, 0x6c, 0xd5, 0xea, 0x1d, 0x6a, - 0xba, 0x2b, 0xdc, 0x29, 0xff, 0x48, 0x68, 0xe1, 0x80, 0x58, 0x0d, 0x70, 0xcd, 0x87, 0x78, 0x9f, - 0xb6, 0xc1, 0x83, 0x9e, 0x23, 0x5f, 0x45, 0x53, 0x04, 0x5c, 0x13, 0xbc, 0x9c, 0xb4, 0x26, 0x6d, - 0x4e, 0xd7, 0xc5, 0x4a, 0x2e, 0x23, 0x19, 0x04, 0xa7, 0xe9, 0x81, 0x61, 0x77, 0x6d, 0x70, 0x69, - 0x2e, 0xc5, 0x38, 0x0b, 0x01, 0x52, 0x0f, 0x00, 0xf9, 0x23, 0x34, 0xa5, 0x3b, 0xb8, 0xe7, 0xd2, - 0x5c, 0x7a, 0x4d, 0xda, 0xcc, 0x56, 0xf2, 0xaa, 0xc8, 0xde, 0x2f, 0x95, 0x2a, 0x4a, 0xa5, 0xd6, - 0xb0, 0xed, 0x56, 0x33, 0xaf, 0xdf, 0x95, 0x26, 0xea, 0x82, 0x2e, 0x7f, 0x8c, 0x50, 0xcb, 0xb3, - 0x4d, 0x0b, 0x9a, 0x87, 0x00, 0xb9, 0xcc, 0xf9, 0x5e, 0x9e, 0xe6, 0xaf, 0xdc, 0x03, 0xd8, 0xdd, - 0x7a, 0xfa, 0xe1, 0xe5, 0xb6, 0x08, 0xfa, 0xd9, 0x87, 0x97, 0xdb, 0xf9, 0xa0, 0x9c, 0x23, 0xa9, - 0x2a, 0x37, 0x50, 0x7e, 0xc4, 0x58, 0x07, 0xd2, 0xc5, 0x2e, 0x01, 0x79, 0x16, 0xa5, 0x6c, 0x93, - 0xd5, 0x20, 0x53, 0x4f, 0xd9, 0xa6, 0xe2, 0xa1, 0xe5, 0x03, 0x62, 0xd5, 0x74, 0xd7, 0x80, 0x4e, - 0xac, 0x64, 0x31, 0x6a, 0xa8, 0x84, 0xa9, 0x70, 0x09, 0x77, 0xb5, 0x58, 0x68, 0xa5, 0x50, 0x68, - 0x49, 0x8e, 0x95, 0x75, 0x54, 0x3a, 0x05, 0x0a, 0xc2, 0x54, 0x7e, 0x91, 0x18, 0xa7, 0xd1, 0x6b, - 0x39, 0x36, 0x0d, 0xd0, 0x87, 0x47, 0x35, 0xec, 0x1e, 0xda, 0x9e, 0xc3, 0xa4, 0x20, 0x37, 0xd1, - 0x8c, 0x11, 0x5a, 0xb3, 0x48, 0xb3, 0x95, 0x25, 0x95, 0x4b, 0x43, 0x0d, 0xa4, 0xa1, 0xde, 0x75, - 0x07, 0xd5, 0xeb, 0x6f, 0x5e, 0x95, 0xd7, 0x4f, 0x44, 0xaf, 0x26, 0xbb, 0xac, 0x47, 0x1c, 0xb2, - 0x84, 0x6d, 0xcb, 0x0d, 0x25, 0xcc, 0x56, 0xbb, 0x77, 0xbe, 0x7d, 0x5e, 0x9a, 0xe0, 0x49, 0x33, - 0x83, 0x9f, 0xf4, 0x46, 0xf8, 0x3c, 0xc6, 0x44, 0xad, 0xfc, 0x24, 0xa1, 0x42, 0x0d, 0xbb, 0xd4, - 0xd3, 0x0d, 0x5a, 0xd3, 0x3b, 0x9d, 0x58, 0x52, 0x65, 0x24, 0xdb, 0x6e, 0x5f, 0xef, 0xd8, 0x26, - 0x5b, 0x37, 0x89, 0x81, 0xbb, 0xc0, 0x52, 0x9b, 0xa9, 0x2f, 0x84, 0x91, 0x86, 0x0f, 0x8c, 0xd0, - 0x5d, 0xec, 0x1a, 0xc0, 0xc2, 0xcd, 0x44, 0xe9, 0x0f, 0x7c, 0x40, 0xde, 0x40, 0x73, 0x43, 0xb5, - 0x8b, 0xd4, 0xd2, 0x2c, 0xb5, 0xd9, 0xc0, 0xdc, 0x60, 0x56, 0x79, 0x05, 0x4d, 0xfb, 0xb8, 0x4e, - 0x7b, 0x1e, 0x57, 0xeb, 0x4c, 0xfd, 0xc4, 0xa0, 0xbc, 0x90, 0xd0, 0x62, 0x55, 0xa7, 0x46, 0x3b, - 0x16, 0xfc, 0x75, 0x34, 0x4b, 0xf1, 0x13, 0x70, 0x9b, 0x86, 0x48, 0x50, 0x7c, 0x6c, 0x97, 0x99, - 0x35, 0xc8, 0x5a, 0x2e, 0xa1, 0x6c, 0xcb, 0x7f, 0x3b, 0x12, 0x2d, 0x62, 0xa6, 0xff, 0x34, 0xcc, - 0x67, 0x12, 0x5a, 0xe6, 0xc4, 0x06, 0xd0, 0x58, 0xa8, 0x9b, 0x68, 0x9e, 0x7b, 0x6e, 0x12, 0xa0, - 0x22, 0x10, 0x2e, 0xf5, 0x59, 0x12, 0xbc, 0x72, 0x6a, 0x30, 0xa9, 0xb3, 0x83, 0x49, 0xc7, 0x83, - 0xd9, 0x42, 0x1b, 0x67, 0x48, 0x63, 0x28, 0xfe, 0x1f, 0x25, 0x74, 0x75, 0x84, 0xbb, 0xdf, 0xf7, - 0xfb, 0xcf, 0x7d, 0x34, 0x09, 0xfe, 0xc3, 0x58, 0xb1, 0xaf, 0xbc, 0x79, 0x55, 0xce, 0x25, 0x88, - 0x9d, 0xb9, 0xa8, 0x73, 0x07, 0xa7, 0x8a, 0xbb, 0x92, 0x20, 0xee, 0xe2, 0xa9, 0xe2, 0x66, 0x2e, - 0x95, 0x35, 0x54, 0x4c, 0x46, 0x86, 0x29, 0xfd, 0x29, 0xa1, 0xb9, 0x03, 0x62, 0xed, 0x41, 0x07, - 0x2c, 0x9d, 0xc2, 0xa7, 0x30, 0x20, 0xf2, 0x0d, 0xb4, 0x20, 0xf4, 0x89, 0xbd, 0xa6, 0x6e, 0x9a, - 0x1e, 0x10, 0x22, 0x04, 0x33, 0x3f, 0x04, 0xee, 0x72, 0xbb, 0xbc, 0x83, 0x96, 0xb0, 0x67, 0xb4, - 0x81, 0x50, 0x2f, 0xc2, 0xe7, 0xc1, 0x2f, 0x86, 0xb1, 0xe0, 0x95, 0x2d, 0x34, 0x3f, 0x3c, 0xb8, - 0x80, 0xce, 0x65, 0x34, 0x3c, 0xd0, 0x80, 0x7a, 0x0d, 0x5d, 0x06, 0xda, 0x6e, 0xc6, 0xb5, 0x34, - 0x03, 0xb4, 0xdd, 0x08, 0x6c, 0xbb, 0x15, 0xbf, 0x2a, 0xa3, 0x21, 0xfb, 0x05, 0x5a, 0x0e, 0x15, - 0x28, 0x9c, 0xa3, 0x92, 0x67, 0xed, 0x35, 0x6c, 0x1a, 0x96, 0xe4, 0x11, 0x5a, 0x0c, 0xdb, 0xfd, - 0x7d, 0x0e, 0x88, 0x75, 0xb1, 0xaa, 0x2c, 0xa1, 0xc9, 0xf0, 0x37, 0xc4, 0x17, 0xca, 0x37, 0x12, - 0xba, 0x72, 0x40, 0xac, 0xe0, 0x24, 0xee, 0x83, 0x6d, 0xb5, 0xe9, 0xe7, 0x98, 0x46, 0xb5, 0xdc, - 0x66, 0xe6, 0x40, 0xf4, 0x10, 0x21, 0x9f, 0xaa, 0x8e, 0x72, 0x4c, 0x19, 0xab, 0xa1, 0xc4, 0x47, - 0xf7, 0x53, 0x4a, 0x68, 0x35, 0x11, 0x18, 0x16, 0xe1, 0x45, 0x0a, 0x2d, 0xf0, 0x11, 0x50, 0x63, - 0xa3, 0x90, 0xab, 0xbc, 0x84, 0xb2, 0x4c, 0xa4, 0x91, 0xef, 0x12, 0x31, 0x13, 0xff, 0x26, 0x47, - 0x1b, 0x4d, 0x2a, 0xa9, 0xd1, 0xdc, 0x8b, 0x4c, 0xeb, 0xe9, 0xaa, 0xea, 0x4f, 0xd5, 0xdf, 0xde, - 0x95, 0xfe, 0x6f, 0xd9, 0xb4, 0xdd, 0x6b, 0xa9, 0x06, 0x76, 0xc4, 0xed, 0x45, 0xfc, 0x2b, 0x13, - 0xf3, 0x89, 0x46, 0x07, 0x5d, 0x20, 0xea, 0x27, 0x2e, 0x1d, 0x0e, 0xef, 0x48, 0x0b, 0xe0, 0x23, - 0x30, 0x13, 0x6b, 0x01, 0xfc, 0x36, 0xb1, 0x81, 0xe6, 0xc4, 0xd5, 0xc8, 0x03, 0x03, 0xec, 0x3e, - 0x78, 0xb9, 0x49, 0x4e, 0xe4, 0xe6, 0xba, 0xb0, 0x26, 0x1d, 0xc4, 0x54, 0xd2, 0x41, 0xec, 0x66, - 0xfe, 0x78, 0x5e, 0x92, 0x94, 0x1f, 0x24, 0x24, 0xb3, 0x86, 0xbb, 0x7f, 0x04, 0x46, 0x8f, 0x82, - 0xc9, 0xeb, 0x74, 0xfe, 0x7e, 0x1b, 0x2e, 0x67, 0x6a, 0xa4, 0x9c, 0x09, 0xd1, 0xa4, 0x13, 0x65, - 0x11, 0xeb, 0xdc, 0x99, 0x78, 0xe7, 0x56, 0xfe, 0x92, 0x50, 0x3e, 0x3c, 0xdd, 0xa2, 0xf1, 0x9e, - 0x79, 0xae, 0x46, 0xe2, 0xf4, 0xf3, 0x03, 0x9e, 0xa9, 0xde, 0xfe, 0xfb, 0x5d, 0xe9, 0x66, 0xe4, - 0xe0, 0x1c, 0xa0, 0xad, 0x43, 0x7a, 0xf2, 0xd0, 0xb1, 0x5b, 0x44, 0x6b, 0x0d, 0x28, 0x10, 0xf5, - 0x3e, 0x1c, 0x55, 0xfd, 0x87, 0xf3, 0xcf, 0xcc, 0xf4, 0x79, 0x66, 0xa6, 0x28, 0x4e, 0x26, 0xa9, - 0x38, 0xca, 0xf7, 0x29, 0x24, 0xef, 0xd7, 0x6b, 0x95, 0x9b, 0x7b, 0xd0, 0xed, 0xe0, 0xc1, 0xb9, - 0x93, 0x5e, 0xf7, 0xef, 0x31, 0x4c, 0x34, 0x26, 0xb8, 0xd8, 0x11, 0x52, 0xce, 0x72, 0xdb, 0x9e, - 0x6f, 0x4a, 0x38, 0xe8, 0x74, 0xd2, 0x41, 0xaf, 0x22, 0x04, 0x9e, 0x51, 0xb9, 0xd9, 0x74, 0x75, - 0x07, 0x84, 0x44, 0xa7, 0x99, 0xe5, 0x81, 0xee, 0xb0, 0x8d, 0x38, 0x4c, 0x06, 0x4e, 0x0b, 0x77, - 0x84, 0x34, 0xb3, 0xcc, 0xd6, 0x60, 0x26, 0x7f, 0x23, 0x4e, 0x31, 0xc1, 0xb0, 0x1d, 0xbd, 0x43, - 0x84, 0x2c, 0x2f, 0x33, 0xeb, 0x9e, 0x30, 0x26, 0xd5, 0xe4, 0x52, 0x62, 0x4d, 0x7e, 0x96, 0x50, - 0x2e, 0x34, 0x82, 0x2f, 0x28, 0x87, 0x32, 0x5a, 0x0c, 0x0d, 0x69, 0x7a, 0x14, 0x11, 0xf0, 0x3c, - 0x39, 0xf1, 0x7b, 0x41, 0x19, 0xdf, 0x46, 0x97, 0x1c, 0x70, 0x5a, 0xe0, 0x91, 0x5c, 0x66, 0x2d, - 0xbd, 0x99, 0xad, 0x14, 0xd4, 0x84, 0x71, 0xc9, 0xe3, 0xae, 0x07, 0xd4, 0xca, 0xd7, 0x93, 0x28, - 0xed, 0x77, 0xe8, 0x47, 0x68, 0x36, 0x76, 0x53, 0x5e, 0x0d, 0xbf, 0x3e, 0x72, 0xf7, 0x2e, 0x5c, - 0x1f, 0x0b, 0x0f, 0x7b, 0xe1, 0x84, 0xfc, 0x18, 0x2d, 0x25, 0xde, 0xc4, 0xaf, 0xc5, 0x1c, 0x24, - 0x91, 0x0a, 0x37, 0xce, 0x41, 0x0a, 0xed, 0xf5, 0x54, 0x42, 0x2b, 0x63, 0xaf, 0xd7, 0x71, 0x7f, - 0xe3, 0xc8, 0x85, 0x5b, 0x17, 0x20, 0x87, 0x82, 0xb0, 0xd0, 0x62, 0xd2, 0x2d, 0x47, 0x19, 0xeb, - 0x8d, 0x71, 0x0a, 0xdb, 0x67, 0x73, 0x42, 0x1b, 0x7d, 0x86, 0xe6, 0x1a, 0x40, 0x23, 0xd7, 0x8f, - 0xff, 0xc5, 0x1c, 0x84, 0xc1, 0xc2, 0xb5, 0x31, 0x60, 0xe4, 0xc0, 0x72, 0xd1, 0x7d, 0x43, 0xb3, - 0x76, 0x3d, 0xe6, 0x62, 0x94, 0x52, 0xd8, 0x3a, 0x93, 0x72, 0xb2, 0x57, 0x61, 0xf2, 0xab, 0x0f, - 0x2f, 0xb7, 0xa5, 0xea, 0x17, 0xaf, 0xdf, 0x17, 0xa5, 0xb7, 0xef, 0x8b, 0xd2, 0xef, 0xef, 0x8b, - 0xd2, 0x77, 0xc7, 0xc5, 0x89, 0xd7, 0xc7, 0x45, 0xe9, 0xed, 0x71, 0x71, 0xe2, 0xd7, 0xe3, 0xe2, - 0xc4, 0x97, 0x77, 0x42, 0x0d, 0xb2, 0x0b, 0x96, 0x35, 0x78, 0xdc, 0x0f, 0x7e, 0x6d, 0x97, 0xf9, - 0x8f, 0x49, 0xcd, 0xc1, 0x66, 0xaf, 0x03, 0x5a, 0xff, 0xb6, 0x76, 0x14, 0x40, 0x7c, 0xe4, 0xb5, - 0xa6, 0xd8, 0x2d, 0xf2, 0xd6, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1f, 0xe6, 0x6b, 0x77, 0x35, - 0x10, 0x00, 0x00, + 0xaf, 0x3f, 0x02, 0x91, 0xb1, 0x92, 0x17, 0x2f, 0xe0, 0x00, 0x05, 0x22, 0xd9, 0x41, 0x8a, 0xc2, + 0x39, 0x48, 0x69, 0x91, 0xf6, 0x22, 0x50, 0xe4, 0x98, 0x62, 0x22, 0x72, 0x05, 0xee, 0x4a, 0xb0, + 0x6e, 0x45, 0x7a, 0x68, 0x91, 0x53, 0xfb, 0x0f, 0x72, 0x08, 0x7a, 0x2c, 0x72, 0xc8, 0x1f, 0xe8, + 0x2d, 0xcd, 0x29, 0xb7, 0x16, 0x3d, 0x04, 0x45, 0x7c, 0x48, 0xff, 0x40, 0x0f, 0xed, 0xa1, 0x28, + 0xb8, 0xbb, 0x94, 0x49, 0x8a, 0x96, 0x6d, 0xa0, 0x17, 0x9b, 0x3b, 0xcf, 0xc3, 0xd9, 0x99, 0xd9, + 0x87, 0x33, 0x2b, 0x74, 0xc5, 0xf2, 0xf4, 0xbe, 0x4d, 0x07, 0x5a, 0x7f, 0x47, 0x73, 0x88, 0x45, + 0xd4, 0xae, 0x87, 0x29, 0x96, 0x91, 0x30, 0xab, 0xfd, 0x9d, 0xc2, 0x82, 0xee, 0xd8, 0x2e, 0xd6, + 0xd8, 0x5f, 0x0e, 0x17, 0x8a, 0x06, 0x26, 0x0e, 0x26, 0x5a, 0x4b, 0x27, 0xa0, 0xf5, 0x77, 0x5a, + 0x40, 0xf5, 0x1d, 0xcd, 0xc0, 0xb6, 0x2b, 0xf0, 0x3c, 0xc7, 0x9b, 0x6c, 0xa5, 0xf1, 0x85, 0x80, + 0x96, 0xc5, 0xab, 0x0e, 0xb1, 0xc4, 0x9e, 0x02, 0xc8, 0x85, 0x22, 0x09, 0x76, 0xe7, 0xc8, 0x92, + 0x85, 0x2d, 0xcc, 0x5d, 0xf9, 0x4f, 0xc2, 0xba, 0x62, 0x61, 0x6c, 0x75, 0x40, 0xd3, 0xbb, 0xb6, + 0xa6, 0xbb, 0x2e, 0xa6, 0x3a, 0xb5, 0xb1, 0x1b, 0x6c, 0x93, 0x17, 0x28, 0x5b, 0xb5, 0x7a, 0x87, + 0x9a, 0xee, 0x0a, 0x77, 0xca, 0xdf, 0x12, 0x5a, 0x38, 0x20, 0x56, 0x03, 0x5c, 0xf3, 0x21, 0xde, + 0xa7, 0x6d, 0xf0, 0xa0, 0xe7, 0xc8, 0x57, 0xd1, 0x14, 0x01, 0xd7, 0x04, 0x2f, 0x27, 0xad, 0x49, + 0x9b, 0xd3, 0x75, 0xb1, 0x92, 0xcb, 0x48, 0x06, 0xc1, 0x69, 0x7a, 0x60, 0xd8, 0x5d, 0x1b, 0x5c, + 0x9a, 0x4b, 0x31, 0xce, 0x42, 0x80, 0xd4, 0x03, 0x40, 0xfe, 0x3f, 0x9a, 0xd2, 0x1d, 0xdc, 0x73, + 0x69, 0x2e, 0xbd, 0x26, 0x6d, 0x66, 0x2b, 0x79, 0x55, 0x64, 0xef, 0x97, 0x4a, 0x15, 0xa5, 0x52, + 0x6b, 0xd8, 0x76, 0xab, 0x99, 0xd7, 0xef, 0x4a, 0x13, 0x75, 0x41, 0x97, 0x3f, 0x42, 0xa8, 0xe5, + 0xd9, 0xa6, 0x05, 0xcd, 0x43, 0x80, 0x5c, 0xe6, 0x7c, 0x2f, 0x4f, 0xf3, 0x57, 0xee, 0x01, 0xec, + 0x6e, 0x3d, 0xfd, 0xf0, 0x72, 0x5b, 0x04, 0xfd, 0xec, 0xc3, 0xcb, 0xed, 0x7c, 0x50, 0xce, 0x91, + 0x54, 0x95, 0x1b, 0x28, 0x3f, 0x62, 0xac, 0x03, 0xe9, 0x62, 0x97, 0x80, 0x3c, 0x8b, 0x52, 0xb6, + 0xc9, 0x6a, 0x90, 0xa9, 0xa7, 0x6c, 0x53, 0xf1, 0xd0, 0xf2, 0x01, 0xb1, 0x6a, 0xba, 0x6b, 0x40, + 0x27, 0x56, 0xb2, 0x18, 0x35, 0x54, 0xc2, 0x54, 0xb8, 0x84, 0xbb, 0x5a, 0x2c, 0xb4, 0x52, 0x28, + 0xb4, 0x24, 0xc7, 0xca, 0x3a, 0x2a, 0x9d, 0x02, 0x05, 0x61, 0x2a, 0x3f, 0x4b, 0x8c, 0xd3, 0xe8, + 0xb5, 0x1c, 0x9b, 0x06, 0xe8, 0xc3, 0xa3, 0x1a, 0x76, 0x0f, 0x6d, 0xcf, 0x61, 0x52, 0x90, 0x9b, + 0x68, 0xc6, 0x08, 0xad, 0x59, 0xa4, 0xd9, 0xca, 0x92, 0xca, 0xa5, 0xa1, 0x06, 0xd2, 0x50, 0xef, + 0xba, 0x83, 0xea, 0xf5, 0x37, 0xaf, 0xca, 0xeb, 0x27, 0xa2, 0x57, 0x93, 0x5d, 0xd6, 0x23, 0x0e, + 0x59, 0xc2, 0xb6, 0xe5, 0x86, 0x12, 0x66, 0xab, 0xdd, 0x3b, 0xdf, 0x3c, 0x2f, 0x4d, 0xf0, 0xa4, + 0x99, 0xc1, 0x4f, 0x7a, 0x23, 0x7c, 0x1e, 0x63, 0xa2, 0x56, 0x7e, 0x94, 0x50, 0xa1, 0x86, 0x5d, + 0xea, 0xe9, 0x06, 0xad, 0xe9, 0x9d, 0x4e, 0x2c, 0xa9, 0x32, 0x92, 0x6d, 0xb7, 0xaf, 0x77, 0x6c, + 0x93, 0xad, 0x9b, 0xc4, 0xc0, 0x5d, 0x60, 0xa9, 0xcd, 0xd4, 0x17, 0xc2, 0x48, 0xc3, 0x07, 0x46, + 0xe8, 0x2e, 0x76, 0x0d, 0x60, 0xe1, 0x66, 0xa2, 0xf4, 0x07, 0x3e, 0x20, 0x6f, 0xa0, 0xb9, 0xa1, + 0xda, 0x45, 0x6a, 0x69, 0x96, 0xda, 0x6c, 0x60, 0x6e, 0x30, 0xab, 0xbc, 0x82, 0xa6, 0x7d, 0x5c, + 0xa7, 0x3d, 0x8f, 0xab, 0x75, 0xa6, 0x7e, 0x62, 0x50, 0x5e, 0x48, 0x68, 0xb1, 0xaa, 0x53, 0xa3, + 0x1d, 0x0b, 0xfe, 0x3a, 0x9a, 0xa5, 0xf8, 0x09, 0xb8, 0x4d, 0x43, 0x24, 0x28, 0x3e, 0xb6, 0xcb, + 0xcc, 0x1a, 0x64, 0x2d, 0x97, 0x50, 0xb6, 0xe5, 0xbf, 0x1d, 0x89, 0x16, 0x31, 0xd3, 0xbf, 0x1a, + 0xe6, 0x33, 0x09, 0x2d, 0x73, 0x62, 0x03, 0x68, 0x2c, 0xd4, 0x4d, 0x34, 0xcf, 0x3d, 0x37, 0x09, + 0x50, 0x11, 0x08, 0x97, 0xfa, 0x2c, 0x09, 0x5e, 0x39, 0x35, 0x98, 0xd4, 0xd9, 0xc1, 0xa4, 0xe3, + 0xc1, 0x6c, 0xa1, 0x8d, 0x33, 0xa4, 0x31, 0x14, 0xff, 0x0f, 0x12, 0xba, 0x3a, 0xc2, 0xdd, 0xef, + 0xfb, 0xfd, 0xe7, 0x3e, 0x9a, 0x04, 0xff, 0x61, 0xac, 0xd8, 0x57, 0xde, 0xbc, 0x2a, 0xe7, 0x12, + 0xc4, 0xce, 0x5c, 0xd4, 0xb9, 0x83, 0x53, 0xc5, 0x5d, 0x49, 0x10, 0x77, 0xf1, 0x54, 0x71, 0x33, + 0x97, 0xca, 0x1a, 0x2a, 0x26, 0x23, 0xc3, 0x94, 0xfe, 0x90, 0xd0, 0xdc, 0x01, 0xb1, 0xf6, 0xa0, + 0x03, 0x96, 0x4e, 0xe1, 0x13, 0x18, 0x10, 0xf9, 0x06, 0x5a, 0x10, 0xfa, 0xc4, 0x5e, 0x53, 0x37, + 0x4d, 0x0f, 0x08, 0x11, 0x82, 0x99, 0x1f, 0x02, 0x77, 0xb9, 0x5d, 0xde, 0x41, 0x4b, 0xd8, 0x33, + 0xda, 0x40, 0xa8, 0x17, 0xe1, 0xf3, 0xe0, 0x17, 0xc3, 0x58, 0xf0, 0xca, 0x16, 0x9a, 0x1f, 0x1e, + 0x5c, 0x40, 0xe7, 0x32, 0x1a, 0x1e, 0x68, 0x40, 0xbd, 0x86, 0x2e, 0x03, 0x6d, 0x37, 0xe3, 0x5a, + 0x9a, 0x01, 0xda, 0x6e, 0x04, 0xb6, 0xdd, 0x8a, 0x5f, 0x95, 0xd1, 0x90, 0xfd, 0x02, 0x2d, 0x87, + 0x0a, 0x14, 0xce, 0x51, 0xc9, 0xb3, 0xf6, 0x1a, 0x36, 0x0d, 0x4b, 0xf2, 0x08, 0x2d, 0x86, 0xed, + 0xfe, 0x3e, 0x07, 0xc4, 0xba, 0x58, 0x55, 0x96, 0xd0, 0x64, 0xf8, 0x1b, 0xe2, 0x0b, 0xe5, 0x6b, + 0x09, 0x5d, 0x39, 0x20, 0x56, 0x70, 0x12, 0xf7, 0xc1, 0xb6, 0xda, 0xf4, 0x33, 0x4c, 0xa3, 0x5a, + 0x6e, 0x33, 0x73, 0x20, 0x7a, 0x88, 0x90, 0x4f, 0x55, 0x47, 0x39, 0xa6, 0x8c, 0xd5, 0x50, 0xe2, + 0xa3, 0xfb, 0x29, 0x25, 0xb4, 0x9a, 0x08, 0x0c, 0x8b, 0xf0, 0x22, 0x85, 0x16, 0xf8, 0x08, 0xa8, + 0xb1, 0x51, 0xc8, 0x55, 0x5e, 0x42, 0x59, 0x26, 0xd2, 0xc8, 0x77, 0x89, 0x98, 0x89, 0x7f, 0x93, + 0xa3, 0x8d, 0x26, 0x95, 0xd4, 0x68, 0xee, 0x45, 0xa6, 0xf5, 0x74, 0x55, 0xf5, 0xa7, 0xea, 0xaf, + 0xef, 0x4a, 0xff, 0xb5, 0x6c, 0xda, 0xee, 0xb5, 0x54, 0x03, 0x3b, 0xe2, 0xf6, 0x22, 0xfe, 0x95, + 0x89, 0xf9, 0x44, 0xa3, 0x83, 0x2e, 0x10, 0xf5, 0x63, 0x97, 0x0e, 0x87, 0x77, 0xa4, 0x05, 0xf0, + 0x11, 0x98, 0x89, 0xb5, 0x00, 0x7e, 0x9b, 0xd8, 0x40, 0x73, 0xe2, 0x6a, 0xe4, 0x81, 0x01, 0x76, + 0x1f, 0xbc, 0xdc, 0x24, 0x27, 0x72, 0x73, 0x5d, 0x58, 0x93, 0x0e, 0x62, 0x2a, 0xe9, 0x20, 0x76, + 0x33, 0xbf, 0x3f, 0x2f, 0x49, 0xca, 0xf7, 0x12, 0x92, 0x59, 0xc3, 0xdd, 0x3f, 0x02, 0xa3, 0x47, + 0xc1, 0xe4, 0x75, 0x3a, 0x7f, 0xbf, 0x0d, 0x97, 0x33, 0x35, 0x52, 0xce, 0x84, 0x68, 0xd2, 0x89, + 0xb2, 0x88, 0x75, 0xee, 0x4c, 0xbc, 0x73, 0x2b, 0x7f, 0x4a, 0x28, 0x1f, 0x9e, 0x6e, 0xd1, 0x78, + 0xcf, 0x3c, 0x57, 0x23, 0x71, 0xfa, 0xf9, 0x01, 0xcf, 0x54, 0x6f, 0xff, 0xf5, 0xae, 0x74, 0x33, + 0x72, 0x70, 0x0e, 0xd0, 0xd6, 0x21, 0x3d, 0x79, 0xe8, 0xd8, 0x2d, 0xa2, 0xb5, 0x06, 0x14, 0x88, + 0x7a, 0x1f, 0x8e, 0xaa, 0xfe, 0xc3, 0xf9, 0x67, 0x66, 0xfa, 0x3c, 0x33, 0x53, 0x14, 0x27, 0x93, + 0x54, 0x1c, 0xe5, 0xbb, 0x14, 0x92, 0xf7, 0xeb, 0xb5, 0xca, 0xcd, 0x3d, 0xe8, 0x76, 0xf0, 0xe0, + 0xdc, 0x49, 0xaf, 0xfb, 0xf7, 0x18, 0x26, 0x1a, 0x13, 0x5c, 0xec, 0x08, 0x29, 0x67, 0xb9, 0x6d, + 0xcf, 0x37, 0x25, 0x1c, 0x74, 0x3a, 0xe9, 0xa0, 0x57, 0x11, 0x02, 0xcf, 0xa8, 0xdc, 0x6c, 0xba, + 0xba, 0x03, 0x42, 0xa2, 0xd3, 0xcc, 0xf2, 0x40, 0x77, 0xd8, 0x46, 0x1c, 0x26, 0x03, 0xa7, 0x85, + 0x3b, 0x42, 0x9a, 0x59, 0x66, 0x6b, 0x30, 0x93, 0xbf, 0x11, 0xa7, 0x98, 0x60, 0xd8, 0x8e, 0xde, + 0x21, 0x42, 0x96, 0x97, 0x99, 0x75, 0x4f, 0x18, 0x93, 0x6a, 0x72, 0x29, 0xb1, 0x26, 0x3f, 0x49, + 0x28, 0x17, 0x1a, 0xc1, 0x17, 0x94, 0x43, 0x19, 0x2d, 0x86, 0x86, 0x34, 0x3d, 0x8a, 0x08, 0x78, + 0x9e, 0x9c, 0xf8, 0xbd, 0xa0, 0x8c, 0x6f, 0xa3, 0x4b, 0x0e, 0x38, 0x2d, 0xf0, 0x48, 0x2e, 0xb3, + 0x96, 0xde, 0xcc, 0x56, 0x0a, 0x6a, 0xc2, 0xb8, 0xe4, 0x71, 0xd7, 0x03, 0x6a, 0xe5, 0xab, 0x49, + 0x94, 0xf6, 0x3b, 0xf4, 0x23, 0x34, 0x1b, 0xbb, 0x29, 0xaf, 0x86, 0x5f, 0x1f, 0xb9, 0x7b, 0x17, + 0xae, 0x8f, 0x85, 0x87, 0xbd, 0x70, 0x42, 0x7e, 0x8c, 0x96, 0x12, 0x6f, 0xe2, 0xd7, 0x62, 0x0e, + 0x92, 0x48, 0x85, 0x1b, 0xe7, 0x20, 0x85, 0xf6, 0x7a, 0x2a, 0xa1, 0x95, 0xb1, 0xd7, 0xeb, 0xb8, + 0xbf, 0x71, 0xe4, 0xc2, 0xad, 0x0b, 0x90, 0x43, 0x41, 0x58, 0x68, 0x31, 0xe9, 0x96, 0xa3, 0x8c, + 0xf5, 0xc6, 0x38, 0x85, 0xed, 0xb3, 0x39, 0xa1, 0x8d, 0x3e, 0x45, 0x73, 0x0d, 0xa0, 0x91, 0xeb, + 0xc7, 0x7f, 0x62, 0x0e, 0xc2, 0x60, 0xe1, 0xda, 0x18, 0x30, 0x72, 0x60, 0xb9, 0xe8, 0xbe, 0xa1, + 0x59, 0xbb, 0x1e, 0x73, 0x31, 0x4a, 0x29, 0x6c, 0x9d, 0x49, 0x39, 0xd9, 0xab, 0x30, 0xf9, 0xe5, + 0x87, 0x97, 0xdb, 0x52, 0xf5, 0xf3, 0xd7, 0xef, 0x8b, 0xd2, 0xdb, 0xf7, 0x45, 0xe9, 0xb7, 0xf7, + 0x45, 0xe9, 0xdb, 0xe3, 0xe2, 0xc4, 0xeb, 0xe3, 0xa2, 0xf4, 0xf6, 0xb8, 0x38, 0xf1, 0xcb, 0x71, + 0x71, 0xe2, 0x8b, 0x3b, 0xa1, 0x06, 0xd9, 0x05, 0xcb, 0x1a, 0x3c, 0xee, 0x07, 0xbf, 0xb6, 0xcb, + 0xfc, 0xc7, 0xa4, 0xe6, 0x60, 0xb3, 0xd7, 0x01, 0xad, 0xff, 0x3f, 0xed, 0x28, 0x80, 0xf8, 0xc8, + 0x6b, 0x4d, 0xb1, 0x5b, 0xe4, 0xad, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x11, 0x76, 0xe0, 0xd2, + 0x35, 0x10, 0x00, 0x00, } func (this *SendToCosmosEvent) Equal(that interface{}) bool { @@ -1704,6 +1704,7 @@ func _Msg_SubmitEthereumHeightVote_Handler(srv interface{}, ctx context.Context, return interceptor(ctx, in, info, handler) } +var Msg_serviceDesc = _Msg_serviceDesc var _Msg_serviceDesc = grpc.ServiceDesc{ ServiceName: "gravity.v1.Msg", HandlerType: (*MsgServer)(nil), diff --git a/module/x/gravity/types/msgs_test.go b/module/x/gravity/types/msgs_test.go index c92f3c4ec..23c01bc5f 100644 --- a/module/x/gravity/types/msgs_test.go +++ b/module/x/gravity/types/msgs_test.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/assert" - "github.com/peggyjv/gravity-bridge/module/v4/app" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/app" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func TestValidateMsgDelegateKeys(t *testing.T) { diff --git a/module/x/gravity/types/query.pb.go b/module/x/gravity/types/query.pb.go index 0ea2fe577..6470b2003 100644 --- a/module/x/gravity/types/query.pb.go +++ b/module/x/gravity/types/query.pb.go @@ -3441,7 +3441,7 @@ var fileDescriptor_29a9d4192703013c = []byte{ // 2400 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xcd, 0x73, 0x1b, 0x49, 0x15, 0xd7, 0x78, 0xf3, 0xb1, 0x79, 0xfe, 0x6e, 0xcb, 0x89, 0x3c, 0x76, 0x24, 0xbb, 0x9d, 0x38, - 0x4e, 0x8c, 0x35, 0xb6, 0xb3, 0x64, 0xd9, 0x65, 0x17, 0x58, 0x3b, 0x1f, 0xbb, 0xec, 0xe6, 0x03, + 0x4e, 0x8c, 0x35, 0xb6, 0xc3, 0x66, 0xd9, 0x65, 0x17, 0x58, 0x3b, 0x1f, 0xbb, 0xec, 0xe6, 0x03, 0x39, 0x49, 0xc5, 0xb0, 0xd4, 0xec, 0x48, 0xea, 0x48, 0xc2, 0xd2, 0x8c, 0xa3, 0x19, 0x89, 0x98, 0x94, 0xab, 0x52, 0x4b, 0x2d, 0x07, 0x8a, 0xa2, 0x96, 0x82, 0x03, 0x1c, 0x38, 0x50, 0xc5, 0x81, 0xda, 0x2b, 0xfc, 0x11, 0x29, 0x4e, 0x5b, 0xc5, 0x85, 0x13, 0x50, 0x09, 0x7f, 0x08, 0x35, 0x3d, @@ -3546,11 +3546,11 @@ var fileDescriptor_29a9d4192703013c = []byte{ 0x1f, 0xf8, 0xe9, 0xa1, 0x1f, 0xc1, 0xa9, 0xe0, 0x35, 0x08, 0xcd, 0x24, 0xbf, 0x07, 0xb0, 0x2c, 0x74, 0x5d, 0xb6, 0x14, 0xc0, 0xc2, 0xfa, 0xe7, 0xff, 0xf8, 0xef, 0x6f, 0x87, 0xb2, 0x08, 0x19, 0xdc, 0x97, 0x89, 0xe0, 0x03, 0x02, 0xfa, 0x42, 0x83, 0x61, 0xae, 0xd0, 0x50, 0x5e, 0x75, 0x73, - 0xb2, 0x38, 0x05, 0xe5, 0x3a, 0x0b, 0xf6, 0x4d, 0x1a, 0xcc, 0x40, 0xab, 0x7c, 0x30, 0xf1, 0x92, - 0x36, 0x9e, 0xc5, 0x19, 0xe8, 0x03, 0x1f, 0xc7, 0x64, 0xe2, 0x4b, 0x04, 0xba, 0x90, 0xec, 0xc6, - 0x47, 0xc1, 0x74, 0x99, 0x62, 0x5a, 0x44, 0x0b, 0x29, 0x98, 0x9a, 0xd4, 0x3b, 0x7a, 0xae, 0xc1, - 0x69, 0x76, 0xbb, 0x22, 0x5d, 0xd6, 0x72, 0x59, 0xcc, 0x59, 0xe9, 0x1a, 0x8b, 0xf7, 0x1e, 0x8d, - 0x77, 0x0d, 0xbd, 0xc5, 0xc7, 0x8b, 0x1a, 0xba, 0xf1, 0x4c, 0xe4, 0x2a, 0x0e, 0x8c, 0x67, 0x1c, + 0xb2, 0x38, 0x05, 0xe5, 0x3a, 0x0b, 0xf6, 0x16, 0x0d, 0x66, 0xa0, 0x55, 0x3e, 0x98, 0x78, 0x49, + 0x1b, 0xcf, 0xe2, 0x0c, 0xf4, 0x81, 0x8f, 0x63, 0x32, 0xf1, 0x25, 0x02, 0x5d, 0x48, 0x76, 0xe3, + 0xa3, 0x60, 0xba, 0x4c, 0x31, 0x2d, 0xa2, 0x85, 0x14, 0x4c, 0x4d, 0xea, 0x1d, 0x3d, 0xd7, 0xe0, + 0x34, 0xbb, 0x5d, 0x91, 0x2e, 0x6b, 0xb9, 0x2c, 0xe6, 0xac, 0x74, 0x8d, 0xc5, 0x7b, 0x8f, 0xc6, + 0xbb, 0x86, 0xbe, 0xc9, 0xc7, 0x8b, 0x1a, 0xba, 0xf1, 0x4c, 0xe4, 0x2a, 0x0e, 0x8c, 0x67, 0x1c, 0xbb, 0x71, 0x80, 0xfe, 0xa2, 0xc1, 0x98, 0x78, 0xe1, 0xa1, 0x85, 0x94, 0x46, 0xcb, 0x00, 0xe1, 0x34, 0x15, 0x86, 0xeb, 0x2e, 0xc5, 0xf5, 0x11, 0xba, 0xc5, 0xe3, 0x4a, 0x34, 0x77, 0xe3, 0x59, 0x92, 0x58, 0x3a, 0x88, 0x09, 0x19, 0xd4, 0x0e, 0x8c, 0xf0, 0x7d, 0x14, 0xa9, 0x9e, 0x44, 0x54, @@ -3588,7 +3588,7 @@ var fileDescriptor_29a9d4192703013c = []byte{ 0xaf, 0xf2, 0x99, 0x7f, 0xbe, 0xca, 0x67, 0x7e, 0xf8, 0x6d, 0xee, 0xe3, 0xfe, 0x1e, 0xa9, 0xd5, 0xf6, 0x7f, 0xd2, 0x0d, 0xdf, 0x5b, 0x56, 0xcb, 0xed, 0x46, 0xb5, 0x46, 0x8c, 0x96, 0x53, 0xed, 0x34, 0x89, 0xd1, 0x7d, 0xcb, 0x78, 0x1a, 0xbd, 0xd2, 0xd0, 0xaf, 0xfe, 0xe5, 0x53, 0x94, 0x16, - 0xb8, 0xfa, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x32, 0x24, 0x8e, 0xcf, 0x3f, 0x29, 0x00, 0x00, + 0xb8, 0xfa, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3c, 0xb4, 0x05, 0x6a, 0x3f, 0x29, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4746,6 +4746,7 @@ func _Query_EthereumEventVotes_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } +var Query_serviceDesc = _Query_serviceDesc var _Query_serviceDesc = grpc.ServiceDesc{ ServiceName: "gravity.v1.Query", HandlerType: (*QueryServer)(nil), From a9837f68895f41976c724aa936bc364e07862d78 Mon Sep 17 00:00:00 2001 From: Collin Brittain Date: Wed, 9 Oct 2024 10:13:05 -0500 Subject: [PATCH 3/4] Bump proto-gen image version to support more recent Go version --- module/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/Makefile b/module/Makefile index ea762bed9..25a0ee440 100644 --- a/module/Makefile +++ b/module/Makefile @@ -80,7 +80,7 @@ lint: ### Protobuf ### ############################################################################### -protoVer=0.13.1 +protoVer=0.15.1 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer) protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) From 01d5b586ba60cd23fcd37a3dd138f1d2010b4963 Mon Sep 17 00:00:00 2001 From: Collin Brittain Date: Wed, 9 Oct 2024 10:14:22 -0500 Subject: [PATCH 4/4] Bump gravity dep version to v5 in integration tests --- integration_tests/chain.go | 8 ++++---- integration_tests/ethereum.go | 2 +- integration_tests/happy_path_test.go | 2 +- integration_tests/setup_test.go | 2 +- integration_tests/transaction_stress_test.go | 2 +- integration_tests/validator.go | 4 ++-- integration_tests/validator_out.go | 2 +- integration_tests/valset_stress_test.go | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/integration_tests/chain.go b/integration_tests/chain.go index 61bdaeaa7..85fcb9125 100644 --- a/integration_tests/chain.go +++ b/integration_tests/chain.go @@ -39,10 +39,10 @@ import ( upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" ibctransfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer" ibc "github.com/cosmos/ibc-go/v7/modules/core" - "github.com/peggyjv/gravity-bridge/module/v4/app" - "github.com/peggyjv/gravity-bridge/module/v4/app/params" - gravityclient "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/client" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/app" + "github.com/peggyjv/gravity-bridge/module/v5/app/params" + gravityclient "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/client" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) const ( diff --git a/integration_tests/ethereum.go b/integration_tests/ethereum.go index ff9841db1..b61235edb 100644 --- a/integration_tests/ethereum.go +++ b/integration_tests/ethereum.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) type EthereumConfig struct { diff --git a/integration_tests/happy_path_test.go b/integration_tests/happy_path_test.go index c2bbde046..46ec43405 100644 --- a/integration_tests/happy_path_test.go +++ b/integration_tests/happy_path_test.go @@ -15,7 +15,7 @@ import ( govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/ethereum/go-ethereum/common" "github.com/ory/dockertest/v3" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) func (s *IntegrationTestSuite) TestHappyPath() { diff --git a/integration_tests/setup_test.go b/integration_tests/setup_test.go index f2f7b5d86..bb4f8e42b 100644 --- a/integration_tests/setup_test.go +++ b/integration_tests/setup_test.go @@ -38,7 +38,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ory/dockertest/v3" "github.com/ory/dockertest/v3/docker" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" "github.com/spf13/viper" "github.com/stretchr/testify/suite" ) diff --git a/integration_tests/transaction_stress_test.go b/integration_tests/transaction_stress_test.go index dab88f0e1..4851345b5 100644 --- a/integration_tests/transaction_stress_test.go +++ b/integration_tests/transaction_stress_test.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // We have 4 validators running so this totals to 100 tx's diff --git a/integration_tests/validator.go b/integration_tests/validator.go index 27bd8d7b0..29b1d0f11 100644 --- a/integration_tests/validator.go +++ b/integration_tests/validator.go @@ -28,8 +28,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" - "github.com/peggyjv/gravity-bridge/module/v4/app" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/app" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) type validator struct { diff --git a/integration_tests/validator_out.go b/integration_tests/validator_out.go index f2a9fe7ab..d901b3344 100644 --- a/integration_tests/validator_out.go +++ b/integration_tests/validator_out.go @@ -8,7 +8,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // Validator out tests a validator that is not running the mandatory Ethereum node. This validator will be slashed and the bridge will remain functioning. diff --git a/integration_tests/valset_stress_test.go b/integration_tests/valset_stress_test.go index b40438325..04fe4dfbf 100644 --- a/integration_tests/valset_stress_test.go +++ b/integration_tests/valset_stress_test.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking/types" - gravity "github.com/peggyjv/gravity-bridge/module/v4/x/gravity/types" + gravity "github.com/peggyjv/gravity-bridge/module/v5/x/gravity/types" ) // call stress_test for a range of nonce values