diff --git a/app/params/params.go b/app/params/params.go deleted file mode 100644 index b6aa5fb5..00000000 --- a/app/params/params.go +++ /dev/null @@ -1,7 +0,0 @@ -package params - -// Simulation parameter constants -const ( - StakePerAccount = "stake_per_account" - InitiallyBondedValidators = "initially_bonded_validators" -) diff --git a/app/params/weights.go b/app/params/weights.go deleted file mode 100644 index 0ba377b0..00000000 --- a/app/params/weights.go +++ /dev/null @@ -1,23 +0,0 @@ -package params - -// Default simulation operation weights for messages and gov proposals -const ( - DefaultWeightMsgSend int = 100 - DefaultWeightMsgMultiSend int = 10 - DefaultWeightMsgSetWithdrawAddress int = 50 - DefaultWeightMsgWithdrawDelegationReward int = 50 - DefaultWeightMsgWithdrawValidatorCommission int = 50 - DefaultWeightMsgFundCommunityPool int = 50 - DefaultWeightMsgDeposit int = 100 - DefaultWeightMsgVote int = 67 - DefaultWeightMsgUnjail int = 100 - DefaultWeightMsgCreateValidator int = 100 - DefaultWeightMsgEditValidator int = 5 - DefaultWeightMsgDelegate int = 100 - DefaultWeightMsgUndelegate int = 100 - DefaultWeightMsgBeginRedelegate int = 100 - - DefaultWeightCommunitySpendProposal int = 5 - DefaultWeightTextProposal int = 5 - DefaultWeightParamChangeProposal int = 5 -) diff --git a/app/sim_test.go b/app/sim_test.go index 44f6524b..d15c98d3 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -27,8 +27,6 @@ func init() { simcli.GetSimulatorFlags() } -// Profile with: -// /usr/local/go/bin/go test -benchmem -run=^$ github.com/cosmos/cosmos-sdk/feeappApp -bench ^BenchmarkFullAppSimulation$ -Commit=true -cpuprofile cpu.out func BenchmarkFullAppSimulation(b *testing.B) { config := simcli.NewConfigFromFlags() diff --git a/cmd/feeappd/cmd/root.go b/cmd/feeappd/cmd/root.go index 16e1909b..423ace58 100644 --- a/cmd/feeappd/cmd/root.go +++ b/cmd/feeappd/cmd/root.go @@ -60,7 +60,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { rootCmd := &cobra.Command{ Use: "feeappd", - Short: "Stargate Cosmos Hub App", + Short: "Fee Abstraction App", PersistentPreRunE: func(cmd *cobra.Command, _ []string) error { initClientCtx, err := client.ReadPersistentCommandFlags(initClientCtx, cmd.Flags()) if err != nil { diff --git a/cmd/feeappd/cmd/testnet.go b/cmd/feeappd/cmd/testnet.go index c13dfe9f..95b65af5 100644 --- a/cmd/feeappd/cmd/testnet.go +++ b/cmd/feeappd/cmd/testnet.go @@ -46,6 +46,7 @@ var ( flagOutputDir = "output-dir" flagNodeDaemonHome = "node-daemon-home" flagStartingIPAddress = "starting-ip-address" + flagKeyAlgorithm = "key-algorithm" ) // get cmd to initialize all files for tendermint testnet and application @@ -77,7 +78,7 @@ Example: nodeDaemonHome, _ := cmd.Flags().GetString(flagNodeDaemonHome) startingIPAddress, _ := cmd.Flags().GetString(flagStartingIPAddress) numValidators, _ := cmd.Flags().GetInt(flagNumValidators) - algo, _ := cmd.Flags().GetString(flags.FlagKeyAlgorithm) + algo, _ := cmd.Flags().GetString(flagKeyAlgorithm) return InitTestnet( clientCtx, cmd, config, mbm, genBalIterator, outputDir, chainID, minGasPrices, @@ -94,7 +95,7 @@ Example: cmd.Flags().String(flags.FlagChainID, "", "genesis file chain-id, if left blank will be randomly created") cmd.Flags().String(server.FlagMinGasPrices, fmt.Sprintf("0.000006%s", sdk.DefaultBondDenom), "Minimum gas prices to accept for transactions; All fees in a tx must meet this minimum (e.g. 0.01photino,0.001stake)") cmd.Flags().String(flags.FlagKeyringBackend, flags.DefaultKeyringBackend, "Select keyring's backend (os|file|test)") - cmd.Flags().String(flags.FlagKeyAlgorithm, string(hd.Secp256k1Type), "Key signing algorithm to generate keys for") + cmd.Flags().String(flagKeyAlgorithm, string(hd.Secp256k1Type), "Key signing algorithm to generate keys for") return cmd } diff --git a/proto/feeabstraction/absfee/v1beta1/feepool.proto b/proto/feeabstraction/absfee/v1beta1/feepool.proto deleted file mode 100644 index 6bd3a634..00000000 --- a/proto/feeabstraction/absfee/v1beta1/feepool.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; -package feeabstraction.absfee.v1beta1; - -import "gogoproto/gogo.proto"; -import "google/api/annotations.proto"; -import "cosmos/base/query/v1beta1/pagination.proto"; -import "feeabstraction/absfee/v1beta1/params.proto"; - -option go_package = "github.com/osmosis-labs/fee-abstraction/v7/x/feeabs/types"; diff --git a/proto/feeabstraction/absfee/v1beta1/epoch.proto b/proto/feeabstraction/feeabs/v1beta1/epoch.proto similarity index 98% rename from proto/feeabstraction/absfee/v1beta1/epoch.proto rename to proto/feeabstraction/feeabs/v1beta1/epoch.proto index 42d78682..e3aea896 100644 --- a/proto/feeabstraction/absfee/v1beta1/epoch.proto +++ b/proto/feeabstraction/feeabs/v1beta1/epoch.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package feeabstraction.absfee.v1beta1; +package feeabstraction.feeabs.v1beta1; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; diff --git a/proto/feeabstraction/absfee/v1beta1/genesis.proto b/proto/feeabstraction/feeabs/v1beta1/genesis.proto similarity index 68% rename from proto/feeabstraction/absfee/v1beta1/genesis.proto rename to proto/feeabstraction/feeabs/v1beta1/genesis.proto index 252b220c..a31e4a00 100644 --- a/proto/feeabstraction/absfee/v1beta1/genesis.proto +++ b/proto/feeabstraction/feeabs/v1beta1/genesis.proto @@ -1,15 +1,15 @@ syntax = "proto3"; -package feeabstraction.absfee.v1beta1; +package feeabstraction.feeabs.v1beta1; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "feeabstraction/absfee/v1beta1/params.proto"; -import "feeabstraction/absfee/v1beta1/epoch.proto"; +import "feeabstraction/feeabs/v1beta1/params.proto"; +import "feeabstraction/feeabs/v1beta1/epoch.proto"; option go_package = "github.com/osmosis-labs/fee-abstraction/v7/x/feeabs/types"; -// Params defines the parameters for the feeabs module. +// GenesisState defines the feeabs module's genesis state. message GenesisState { Params params = 1 [ (gogoproto.moretags) = "yaml:\"params\"", diff --git a/proto/feeabstraction/absfee/v1beta1/osmosisibc.proto b/proto/feeabstraction/feeabs/v1beta1/osmosisibc.proto similarity index 97% rename from proto/feeabstraction/absfee/v1beta1/osmosisibc.proto rename to proto/feeabstraction/feeabs/v1beta1/osmosisibc.proto index d119bb5c..5b86eeec 100644 --- a/proto/feeabstraction/absfee/v1beta1/osmosisibc.proto +++ b/proto/feeabstraction/feeabs/v1beta1/osmosisibc.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package feeabstraction.absfee.v1beta1; +package feeabstraction.feeabs.v1beta1; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; diff --git a/proto/feeabstraction/absfee/v1beta1/params.proto b/proto/feeabstraction/feeabs/v1beta1/params.proto similarity index 95% rename from proto/feeabstraction/absfee/v1beta1/params.proto rename to proto/feeabstraction/feeabs/v1beta1/params.proto index 88b4b7f0..b6f03305 100644 --- a/proto/feeabstraction/absfee/v1beta1/params.proto +++ b/proto/feeabstraction/feeabs/v1beta1/params.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package feeabstraction.absfee.v1beta1; +package feeabstraction.feeabs.v1beta1; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; diff --git a/proto/feeabstraction/absfee/v1beta1/proposal.proto b/proto/feeabstraction/feeabs/v1beta1/proposal.proto similarity index 97% rename from proto/feeabstraction/absfee/v1beta1/proposal.proto rename to proto/feeabstraction/feeabs/v1beta1/proposal.proto index b4226c57..390f3b42 100644 --- a/proto/feeabstraction/absfee/v1beta1/proposal.proto +++ b/proto/feeabstraction/feeabs/v1beta1/proposal.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package feeabstraction.absfee.v1beta1; +package feeabstraction.feeabs.v1beta1; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; diff --git a/proto/feeabstraction/absfee/v1beta1/query.proto b/proto/feeabstraction/feeabs/v1beta1/query.proto similarity index 86% rename from proto/feeabstraction/absfee/v1beta1/query.proto rename to proto/feeabstraction/feeabs/v1beta1/query.proto index 93bb68f4..b51fe011 100644 --- a/proto/feeabstraction/absfee/v1beta1/query.proto +++ b/proto/feeabstraction/feeabs/v1beta1/query.proto @@ -1,18 +1,18 @@ syntax = "proto3"; -package feeabstraction.absfee.v1beta1; +package feeabstraction.feeabs.v1beta1; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "feeabstraction/absfee/v1beta1/params.proto"; -import "feeabstraction/absfee/v1beta1/osmosisibc.proto"; -import "feeabstraction/absfee/v1beta1/proposal.proto"; +import "feeabstraction/feeabs/v1beta1/params.proto"; +import "feeabstraction/feeabs/v1beta1/osmosisibc.proto"; +import "feeabstraction/feeabs/v1beta1/proposal.proto"; import "cosmos/base/v1beta1/coin.proto"; option go_package = "github.com/osmosis-labs/fee-abstraction/v7/x/feeabs/types"; // Query defines the gRPC querier service. service Query { - // OsmosisSpotPrice return spot price of pair Osmo/nativeToken + // OsmosisArithmeticTwap return spot price of pair Osmo/nativeToken rpc OsmosisArithmeticTwap(QueryOsmosisArithmeticTwapRequest) returns (QueryOsmosisArithmeticTwapResponse) { option (google.api.http).get = @@ -46,8 +46,8 @@ message QueryHostChainConfigResponse { ]; } -// QueryOsmosisSpotPriceRequest is the request type for the Query/Feeabs RPC -// method. +// QueryOsmosisArithmeticTwapRequest is the request type for the Query/Feeabs +// RPC method. message QueryOsmosisArithmeticTwapRequest { string ibc_denom = 1; } message QueryOsmosisArithmeticTwapResponse { diff --git a/proto/feeabstraction/absfee/v1beta1/tx.proto b/proto/feeabstraction/feeabs/v1beta1/tx.proto similarity index 76% rename from proto/feeabstraction/absfee/v1beta1/tx.proto rename to proto/feeabstraction/feeabs/v1beta1/tx.proto index bf415cc6..62795e61 100644 --- a/proto/feeabstraction/absfee/v1beta1/tx.proto +++ b/proto/feeabstraction/feeabs/v1beta1/tx.proto @@ -1,15 +1,14 @@ syntax = "proto3"; -package feeabstraction.absfee.v1beta1; +package feeabstraction.feeabs.v1beta1; import "gogoproto/gogo.proto"; -import "feeabstraction/absfee/v1beta1/params.proto"; -import "feeabstraction/absfee/v1beta1/epoch.proto"; +import "feeabstraction/feeabs/v1beta1/params.proto"; +import "feeabstraction/feeabs/v1beta1/epoch.proto"; import "cosmos/base/v1beta1/coin.proto"; import "google/protobuf/timestamp.proto"; option go_package = "github.com/osmosis-labs/fee-abstraction/v7/x/feeabs/types"; -// Msg is the cosmos.group.v1 Msg service. service Msg { rpc SendQueryIbcDenomTWAP(MsgSendQueryIbcDenomTWAP) returns (MsgSendQueryIbcDenomTWAPResponse); @@ -18,7 +17,6 @@ service Msg { returns (MsgFundFeeAbsModuleAccountResponse); } -// Msg fund module account message MsgFundFeeAbsModuleAccount { string from_address = 1; repeated cosmos.base.v1beta1.Coin amount = 2 [ @@ -30,12 +28,10 @@ message MsgFundFeeAbsModuleAccount { message MsgFundFeeAbsModuleAccountResponse {} -// Params defines the parameters for the feeabs module. message MsgSendQueryIbcDenomTWAP { string from_address = 1; } message MsgSendQueryIbcDenomTWAPResponse {} -// Params defines the parameters for the feeabs module. message MsgSwapCrossChain { string from_address = 1; string ibc_denom = 2; diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index b744b289..1953f9f5 100644 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -5,7 +5,7 @@ set -eo pipefail # get protoc executions echo "Generating gogo proto code" cd proto -proto_dirs=$(find ./feeabstraction/absfee/v1beta1/ -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq) +proto_dirs=$(find ./feeabstraction/feeabs/v1beta1/ -path -prune -o -name '*.proto' -print0 | xargs -0 -n1 dirname | sort | uniq) for dir in $proto_dirs; do for file in $(find "${dir}" -maxdepth 1 -name '*.proto'); do if grep go_package $file &>/dev/null; then diff --git a/x/feeabs/ibctesting/README.md b/x/feeabs/ibctesting/README.md deleted file mode 100644 index 5d966d7c..00000000 --- a/x/feeabs/ibctesting/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# testing package for ibc - -Customized version of cosmos-sdk x/ibc/testing and CosmWasm wasmd x/wasm/ibctesting diff --git a/x/feeabs/ibctesting/chain.go b/x/feeabs/ibctesting/chain.go deleted file mode 100644 index a243ede0..00000000 --- a/x/feeabs/ibctesting/chain.go +++ /dev/null @@ -1,595 +0,0 @@ -package ibctesting - -import ( - "bytes" - "fmt" - "testing" - "time" - - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" - host "github.com/cosmos/ibc-go/v7/modules/core/24-host" - ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" - "github.com/cosmos/ibc-go/v7/modules/core/types" - ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - ibctesting "github.com/cosmos/ibc-go/v7/testing" - "github.com/cosmos/ibc-go/v7/testing/mock" - ibctestingtypes "github.com/cosmos/ibc-go/v7/testing/types" - "github.com/stretchr/testify/require" - - sdkerrors "cosmossdk.io/errors" - - "github.com/cosmos/cosmos-sdk/baseapp" - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" - cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - teststaking "github.com/cosmos/cosmos-sdk/x/staking/testutil" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/tmhash" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - tmprotoversion "github.com/cometbft/cometbft/proto/tendermint/version" - tmtypes "github.com/cometbft/cometbft/types" - tmversion "github.com/cometbft/cometbft/version" - - feeabs "github.com/osmosis-labs/fee-abstraction/v7/app" -) - -// TestChain is a testing struct that wraps a simapp with the last TM Header, the current ABCI -// header and the validators of the TestChain. It also contains a field called ChainID. This -// is the clientID that *other* chains use to refer to this TestChain. The SenderAccount -// is used for delivering transactions through the application state. -// NOTE: the actual application uses an empty chain-id for ease of testing. -type TestChain struct { - t *testing.T - - Coordinator *Coordinator - App ibctesting.TestingApp - ChainID string - LastHeader *ibctm.Header // header for last block height committed - CurrentHeader tmproto.Header // header for current block height - QueryServer types.QueryServer - TxConfig client.TxConfig - Codec codec.BinaryCodec - - Vals *tmtypes.ValidatorSet - Signers []tmtypes.PrivValidator - - senderPrivKey cryptotypes.PrivKey - SenderAccount authtypes.AccountI - - PendingSendPackets []channeltypes.Packet - PendingAckPackets []PacketAck -} - -type PacketAck struct { - Packet channeltypes.Packet - Ack []byte -} - -// NewTestChain initializes a new TestChain instance with a single validator set using a -// generated private key. It also creates a sender account to be used for delivering transactions. -// -// The first block height is committed to state in order to allow for client creations on -// counterparty chains. The TestChain will return with a block height starting at 2. -// -// Time management is handled by the Coordinator in order to ensure synchrony between chains. -// Each update of any chain increments the block header time for all chains by 5 seconds. -func NewTestChain(t *testing.T, coord *Coordinator, chainID string) *TestChain { - t.Helper() - // generate validator private/public key - privVal := mock.NewPV() - pubKey, err := privVal.GetPubKey() - require.NoError(t, err) - - // create validator set with single validator - validator := tmtypes.NewValidator(pubKey, 1) - valSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{validator}) - signers := []tmtypes.PrivValidator{privVal} - - // generate genesis account - senderPrivKey := secp256k1.GenPrivKey() - acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), 0, 0) - amount, ok := sdk.NewIntFromString("10000000000000000000") - require.True(t, ok) - - balance := banktypes.Balance{ - Address: acc.GetAddress().String(), - Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, amount)), - } - - app := NewTestingAppDecorator(t, feeabs.SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{acc}, chainID, balance)) - - // create current header and call begin block - header := tmproto.Header{ - ChainID: chainID, - Height: 1, - Time: coord.CurrentTime.UTC(), - } - - txConfig := app.GetTxConfig() - - // create an account to send transactions from - chain := &TestChain{ - t: t, - Coordinator: coord, - ChainID: chainID, - App: app, - CurrentHeader: header, - QueryServer: app.GetIBCKeeper(), - TxConfig: txConfig, - Codec: app.AppCodec(), - Vals: valSet, - Signers: signers, - senderPrivKey: senderPrivKey, - SenderAccount: acc, - } - - coord.CommitBlock(chain) - - return chain -} - -// GetContext returns the current context for the application. -func (chain *TestChain) GetContext() sdk.Context { - return chain.App.GetBaseApp().NewContext(false, chain.CurrentHeader) -} - -// QueryProof performs an abci query with the given key and returns the proto encoded merkle proof -// for the query and the height at which the proof will succeed on a tendermint verifier. -func (chain *TestChain) QueryProof(key []byte) ([]byte, clienttypes.Height) { - return chain.QueryProofAtHeight(key, chain.App.LastBlockHeight()) -} - -// QueryProof performs an abci query with the given key and returns the proto encoded merkle proof -// for the query and the height at which the proof will succeed on a tendermint verifier. -func (chain *TestChain) QueryProofAtHeight(key []byte, height int64) ([]byte, clienttypes.Height) { - res := chain.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", ibcexported.StoreKey), - Height: height - 1, - Data: key, - Prove: true, - }) - - merkleProof, err := commitmenttypes.ConvertProofs(res.ProofOps) - require.NoError(chain.t, err) - - proof, err := chain.App.AppCodec().Marshal(&merkleProof) - require.NoError(chain.t, err) - - revision := clienttypes.ParseChainID(chain.ChainID) - - // proof height + 1 is returned as the proof created corresponds to the height the proof - // was created in the IAVL tree. Tendermint and subsequently the clients that rely on it - // have heights 1 above the IAVL tree. Thus we return proof height + 1 - return proof, clienttypes.NewHeight(revision, uint64(res.Height)+1) -} - -// QueryUpgradeProof performs an abci query with the given key and returns the proto encoded merkle proof -// for the query and the height at which the proof will succeed on a tendermint verifier. -func (chain *TestChain) QueryUpgradeProof(key []byte, height uint64) ([]byte, clienttypes.Height) { - res := chain.App.Query(abci.RequestQuery{ - Path: "store/upgrade/key", - Height: int64(height - 1), - Data: key, - Prove: true, - }) - - merkleProof, err := commitmenttypes.ConvertProofs(res.ProofOps) - require.NoError(chain.t, err) - - proof, err := chain.App.AppCodec().Marshal(&merkleProof) - require.NoError(chain.t, err) - - revision := clienttypes.ParseChainID(chain.ChainID) - - // proof height + 1 is returned as the proof created corresponds to the height the proof - // was created in the IAVL tree. Tendermint and subsequently the clients that rely on it - // have heights 1 above the IAVL tree. Thus we return proof height + 1 - return proof, clienttypes.NewHeight(revision, uint64(res.Height+1)) -} - -// QueryConsensusStateProof performs an abci query for a consensus state -// stored on the given clientID. The proof and consensusHeight are returned. -func (chain *TestChain) QueryConsensusStateProof(clientID string) ([]byte, clienttypes.Height) { - clientState := chain.GetClientState(clientID) - - consensusHeight := clientState.GetLatestHeight().(clienttypes.Height) - consensusKey := host.FullConsensusStateKey(clientID, consensusHeight) - proofConsensus, _ := chain.QueryProof(consensusKey) - - return proofConsensus, consensusHeight -} - -// NextBlock sets the last header to the current header and increments the current header to be -// at the next block height. It does not update the time as that is handled by the Coordinator. -// -// CONTRACT: this function must only be called after app.Commit() occurs -func (chain *TestChain) NextBlock() { - // set the last header to the current header - // use nil trusted fields - chain.LastHeader = chain.CurrentTMClientHeader() - - // increment the current header - chain.CurrentHeader = tmproto.Header{ - ChainID: chain.ChainID, - Height: chain.App.LastBlockHeight() + 1, - AppHash: chain.App.LastCommitID().Hash, - // NOTE: the time is increased by the coordinator to maintain time synchrony amongst - // chains. - Time: chain.CurrentHeader.Time, - ValidatorsHash: chain.Vals.Hash(), - NextValidatorsHash: chain.Vals.Hash(), - } - - chain.App.BeginBlock(abci.RequestBeginBlock{Header: chain.CurrentHeader}) -} - -// sendMsgs delivers a transaction through the application without returning the result. -func (chain *TestChain) sendMsgs(msgs ...sdk.Msg) error { - _, err := chain.SendMsgs(msgs...) - return err -} - -// SendMsgs delivers a transaction through the application. It updates the senders sequence -// number and updates the TestChain's headers. It returns the result and error if one -// occurred. -func (chain *TestChain) SendMsgs(msgs ...sdk.Msg) (*sdk.Result, error) { - // ensure the chain has the latest time - chain.Coordinator.UpdateTimeForChain(chain) - - _, r, err := feeabs.SignAndDeliver( - chain.t, - chain.TxConfig, - chain.App.GetBaseApp(), - chain.GetContext().BlockHeader(), - msgs, - chain.ChainID, - []uint64{chain.SenderAccount.GetAccountNumber()}, - []uint64{chain.SenderAccount.GetSequence()}, - true, true, chain.senderPrivKey, - ) - if err != nil { - return nil, err - } - - // SignAndDeliver calls app.Commit() - chain.NextBlock() - - // increment sequence for successful transaction execution - err = chain.SenderAccount.SetSequence(chain.SenderAccount.GetSequence() + 1) - if err != nil { - return nil, err - } - - chain.Coordinator.IncrementTime() - - chain.captureIBCEvents(r) - - return r, nil -} - -func (chain *TestChain) captureIBCEvents(r *sdk.Result) { - toSend := getSendPackets(r.Events) - if len(toSend) > 0 { - // Keep a queue on the chain that we can relay in tests - chain.PendingSendPackets = append(chain.PendingSendPackets, toSend...) - } - toAck := getAckPackets(r.Events) - if len(toAck) > 0 { - // Keep a queue on the chain that we can relay in tests - chain.PendingAckPackets = append(chain.PendingAckPackets, toAck...) - } -} - -// GetClientState retrieves the client state for the provided clientID. The client is -// expected to exist otherwise testing will fail. -func (chain *TestChain) GetClientState(clientID string) ibcexported.ClientState { - clientState, found := chain.App.GetIBCKeeper().ClientKeeper.GetClientState(chain.GetContext(), clientID) - require.True(chain.t, found) - - return clientState -} - -// GetConsensusState retrieves the consensus state for the provided clientID and height. -// It will return a success boolean depending on if consensus state exists or not. -func (chain *TestChain) GetConsensusState(clientID string, height ibcexported.Height) (ibcexported.ConsensusState, bool) { - return chain.App.GetIBCKeeper().ClientKeeper.GetClientConsensusState(chain.GetContext(), clientID, height) -} - -// GetValsAtHeight will return the validator set of the chain at a given height. It will return -// a success boolean depending on if the validator set exists or not at that height. -func (chain *TestChain) GetValsAtHeight(height int64) (*tmtypes.ValidatorSet, bool) { - histInfo, ok := chain.App.GetStakingKeeper().GetHistoricalInfo(chain.GetContext(), height) - if !ok { - return nil, false - } - - valSet := stakingtypes.Validators(histInfo.Valset) - - tmValidators, err := teststaking.ToTmValidators(valSet, sdk.DefaultPowerReduction) - if err != nil { - panic(err) - } - return tmtypes.NewValidatorSet(tmValidators), true -} - -// GetAcknowledgement retrieves an acknowledgement for the provided packet. If the -// acknowledgement does not exist then testing will fail. -func (chain *TestChain) GetAcknowledgement(packet ibcexported.PacketI) []byte { - ack, found := chain.App.GetIBCKeeper().ChannelKeeper.GetPacketAcknowledgement(chain.GetContext(), packet.GetDestPort(), packet.GetDestChannel(), packet.GetSequence()) - require.True(chain.t, found) - - return ack -} - -// GetPrefix returns the prefix for used by a chain in connection creation -func (chain *TestChain) GetPrefix() commitmenttypes.MerklePrefix { - return commitmenttypes.NewMerklePrefix(chain.App.GetIBCKeeper().ConnectionKeeper.GetCommitmentPrefix().Bytes()) -} - -// ConstructUpdateTMClientHeader will construct a valid 07-tendermint Header to update the -// light client on the source chain. -func (chain *TestChain) ConstructUpdateTMClientHeader(counterparty *TestChain, clientID string) (*ibctm.Header, error) { - return chain.ConstructUpdateTMClientHeaderWithTrustedHeight(counterparty, clientID, clienttypes.ZeroHeight()) -} - -// ConstructUpdateTMClientHeader will construct a valid 07-tendermint Header to update the -// light client on the source chain. -func (chain *TestChain) ConstructUpdateTMClientHeaderWithTrustedHeight(counterparty *TestChain, clientID string, trustedHeight clienttypes.Height) (*ibctm.Header, error) { - header := counterparty.LastHeader - // Relayer must query for LatestHeight on client to get TrustedHeight if the trusted height is not set - if trustedHeight.IsZero() { - trustedHeight = chain.GetClientState(clientID).GetLatestHeight().(clienttypes.Height) - } - var ( - tmTrustedVals *tmtypes.ValidatorSet - ok bool - ) - // Once we get TrustedHeight from client, we must query the validators from the counterparty chain - // If the LatestHeight == LastHeader.Height, then TrustedValidators are current validators - // If LatestHeight < LastHeader.Height, we can query the historical validator set from HistoricalInfo - if trustedHeight == counterparty.LastHeader.GetHeight() { - tmTrustedVals = counterparty.Vals - } else { - // NOTE: We need to get validators from counterparty at height: trustedHeight+1 - // since the last trusted validators for a header at height h - // is the NextValidators at h+1 committed to in header h by - // NextValidatorsHash - tmTrustedVals, ok = counterparty.GetValsAtHeight(int64(trustedHeight.RevisionHeight + 1)) - if !ok { - return nil, sdkerrors.Wrapf(ibctm.ErrInvalidHeaderHeight, "could not retrieve trusted validators at trustedHeight: %d", trustedHeight) - } - } - // inject trusted fields into last header - // for now assume revision number is 0 - header.TrustedHeight = trustedHeight - - trustedVals, err := tmTrustedVals.ToProto() - if err != nil { - return nil, err - } - header.TrustedValidators = trustedVals - - return header, nil -} - -// ExpireClient fast forwards the chain's block time by the provided amount of time which will -// expire any clients with a trusting period less than or equal to this amount of time. -func (chain *TestChain) ExpireClient(amount time.Duration) { - chain.Coordinator.IncrementTimeBy(amount) -} - -// CurrentTMClientHeader creates a TM header using the current header parameters -// on the chain. The trusted fields in the header are set to nil. -func (chain *TestChain) CurrentTMClientHeader() *ibctm.Header { - return chain.CreateTMClientHeader(chain.ChainID, chain.CurrentHeader.Height, clienttypes.Height{}, chain.CurrentHeader.Time, chain.Vals, nil, chain.Signers) -} - -// CreateTMClientHeader creates a TM header to update the TM client. Args are passed in to allow -// caller flexibility to use params that differ from the chain. -func (chain *TestChain) CreateTMClientHeader(chainID string, blockHeight int64, trustedHeight clienttypes.Height, timestamp time.Time, tmValSet, tmTrustedVals *tmtypes.ValidatorSet, signers []tmtypes.PrivValidator) *ibctm.Header { - var ( - valSet *tmproto.ValidatorSet - trustedVals *tmproto.ValidatorSet - ) - require.NotNil(chain.t, tmValSet) - - vsetHash := tmValSet.Hash() - - tmHeader := tmtypes.Header{ - Version: tmprotoversion.Consensus{Block: tmversion.BlockProtocol, App: 2}, - ChainID: chainID, - Height: blockHeight, - Time: timestamp, - LastBlockID: MakeBlockID(make([]byte, tmhash.Size), 10_000, make([]byte, tmhash.Size)), - LastCommitHash: chain.App.LastCommitID().Hash, - DataHash: tmhash.Sum([]byte("data_hash")), - ValidatorsHash: vsetHash, - NextValidatorsHash: vsetHash, - ConsensusHash: tmhash.Sum([]byte("consensus_hash")), - AppHash: chain.CurrentHeader.AppHash, - LastResultsHash: tmhash.Sum([]byte("last_results_hash")), - EvidenceHash: tmhash.Sum([]byte("evidence_hash")), - ProposerAddress: tmValSet.Proposer.Address, - } - hhash := tmHeader.Hash() - blockID := MakeBlockID(hhash, 3, tmhash.Sum([]byte("part_set"))) - voteSet := tmtypes.NewVoteSet(chainID, blockHeight, 1, tmproto.PrecommitType, tmValSet) - - commit, err := tmtypes.MakeCommit(blockID, blockHeight, 1, voteSet, signers, timestamp) - require.NoError(chain.t, err) - - signedHeader := &tmproto.SignedHeader{ - Header: tmHeader.ToProto(), - Commit: commit.ToProto(), - } - - valSet, err = tmValSet.ToProto() - if err != nil { - panic(err) - } - - if tmTrustedVals != nil { - trustedVals, err = tmTrustedVals.ToProto() - if err != nil { - panic(err) - } - } - - // The trusted fields may be nil. They may be filled before relaying messages to a client. - // The relayer is responsible for querying client and injecting appropriate trusted fields. - return &ibctm.Header{ - SignedHeader: signedHeader, - ValidatorSet: valSet, - TrustedHeight: trustedHeight, - TrustedValidators: trustedVals, - } -} - -// MakeBlockID copied unimported test functions from tmtypes to use them here -func MakeBlockID(hash []byte, partSetSize uint32, partSetHash []byte) tmtypes.BlockID { - return tmtypes.BlockID{ - Hash: hash, - PartSetHeader: tmtypes.PartSetHeader{ - Total: partSetSize, - Hash: partSetHash, - }, - } -} - -// CreateSortedSignerArray takes two PrivValidators, and the corresponding Validator structs -// (including voting power). It returns a signer array of PrivValidators that matches the -// sorting of ValidatorSet. -// The sorting is first by .VotingPower (descending), with secondary index of .Address (ascending). -func CreateSortedSignerArray(altPrivVal, suitePrivVal tmtypes.PrivValidator, - altVal, suiteVal *tmtypes.Validator, -) []tmtypes.PrivValidator { - switch { - case altVal.VotingPower > suiteVal.VotingPower: - return []tmtypes.PrivValidator{altPrivVal, suitePrivVal} - case altVal.VotingPower < suiteVal.VotingPower: - return []tmtypes.PrivValidator{suitePrivVal, altPrivVal} - default: - if bytes.Compare(altVal.Address, suiteVal.Address) == -1 { - return []tmtypes.PrivValidator{altPrivVal, suitePrivVal} - } - return []tmtypes.PrivValidator{suitePrivVal, altPrivVal} - } -} - -// CreatePortCapability binds and claims a capability for the given portID if it does not -// already exist. This function will fail testing on any resulting error. -// NOTE: only creation of a capbility for a transfer or mock port is supported -// Other applications must bind to the port in InitGenesis or modify this code. -func (chain *TestChain) CreatePortCapability(scopedKeeper capabilitykeeper.ScopedKeeper, portID string) { - // check if the portId is already binded, if not bind it - _, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), host.PortPath(portID)) - if !ok { - // create capability using the IBC capability keeper - capability, err := chain.App.GetScopedIBCKeeper().NewCapability(chain.GetContext(), host.PortPath(portID)) - require.NoError(chain.t, err) - - // claim capability using the scopedKeeper - err = scopedKeeper.ClaimCapability(chain.GetContext(), capability, host.PortPath(portID)) - require.NoError(chain.t, err) - } - - chain.App.Commit() - - chain.NextBlock() -} - -// GetPortCapability returns the port capability for the given portID. The capability must -// exist, otherwise testing will fail. -func (chain *TestChain) GetPortCapability(portID string) *capabilitytypes.Capability { - capability, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), host.PortPath(portID)) - require.True(chain.t, ok) - - return capability -} - -// CreateChannelCapability binds and claims a capability for the given portID and channelID -// if it does not already exist. This function will fail testing on any resulting error. The -// scoped keeper passed in will claim the new capability. -func (chain *TestChain) CreateChannelCapability(scopedKeeper capabilitykeeper.ScopedKeeper, portID, channelID string) { - capName := host.ChannelCapabilityPath(portID, channelID) - // check if the portId is already binded, if not bind it - _, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), capName) - if !ok { - capability, err := chain.App.GetScopedIBCKeeper().NewCapability(chain.GetContext(), capName) - require.NoError(chain.t, err) - err = scopedKeeper.ClaimCapability(chain.GetContext(), capability, capName) - require.NoError(chain.t, err) - } - - chain.App.Commit() - - chain.NextBlock() -} - -// GetChannelCapability returns the channel capability for the given portID and channelID. -// The capability must exist, otherwise testing will fail. -func (chain *TestChain) GetChannelCapability(portID, channelID string) *capabilitytypes.Capability { - capability, ok := chain.App.GetScopedIBCKeeper().GetCapability(chain.GetContext(), host.ChannelCapabilityPath(portID, channelID)) - require.True(chain.t, ok) - - return capability -} - -func (chain *TestChain) Balance(acc sdk.AccAddress, denom string) sdk.Coin { - return chain.GetTestSupport().BankKeeper().GetBalance(chain.GetContext(), acc, denom) -} - -func (chain *TestChain) AllBalances(acc sdk.AccAddress) sdk.Coins { - return chain.GetTestSupport().BankKeeper().GetAllBalances(chain.GetContext(), acc) -} - -func (chain TestChain) GetTestSupport() *feeabs.TestSupport { - return chain.App.(*TestingAppDecorator).TestSupport() -} - -var _ ibctesting.TestingApp = TestingAppDecorator{} - -type TestingAppDecorator struct { - *feeabs.FeeAbs - t *testing.T -} - -func NewTestingAppDecorator(t *testing.T, feeabstraction *feeabs.FeeAbs) *TestingAppDecorator { - t.Helper() - return &TestingAppDecorator{FeeAbs: feeabstraction, t: t} -} - -func (a TestingAppDecorator) GetBaseApp() *baseapp.BaseApp { - return a.TestSupport().GetBaseApp() -} - -func (a TestingAppDecorator) GetStakingKeeper() ibctestingtypes.StakingKeeper { - return a.TestSupport().StakingKeeper() -} - -func (a TestingAppDecorator) GetIBCKeeper() *ibckeeper.Keeper { - return a.TestSupport().IBCKeeper() -} - -func (a TestingAppDecorator) GetScopedIBCKeeper() capabilitykeeper.ScopedKeeper { - return a.TestSupport().ScopeIBCKeeper() -} - -func (a TestingAppDecorator) GetTxConfig() client.TxConfig { - return a.TestSupport().GetTxConfig() -} - -func (a TestingAppDecorator) TestSupport() *feeabs.TestSupport { - return feeabs.NewTestSupport(a.t, a.FeeAbs) -} diff --git a/x/feeabs/ibctesting/coordinator.go b/x/feeabs/ibctesting/coordinator.go deleted file mode 100644 index c98aa6e6..00000000 --- a/x/feeabs/ibctesting/coordinator.go +++ /dev/null @@ -1,337 +0,0 @@ -package ibctesting - -import ( - "fmt" - "strconv" - "testing" - "time" - - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - host "github.com/cosmos/ibc-go/v7/modules/core/24-host" - ibctesting "github.com/cosmos/ibc-go/v7/testing" - "github.com/stretchr/testify/require" - - abci "github.com/cometbft/cometbft/abci/types" -) - -const ChainIDPrefix = "testchain" - -var ( - globalStartTime = time.Date(2020, 12, 4, 10, 30, 0, 0, time.UTC) - TimeIncrement = time.Second * 5 -) - -// Coordinator is a testing struct which contains N TestChain's. It handles keeping all chains -// in sync with regards to time. -type Coordinator struct { - t *testing.T - - CurrentTime time.Time - Chains map[string]*TestChain -} - -// NewCoordinator initializes Coordinator with N TestChain's -func NewCoordinator(t *testing.T, n int) *Coordinator { - t.Helper() - chains := make(map[string]*TestChain) - coord := &Coordinator{ - t: t, - CurrentTime: globalStartTime, - } - - for i := 0; i < n; i++ { - chainID := GetChainID(i) - chains[chainID] = NewTestChain(t, coord, chainID) - } - coord.Chains = chains - - return coord -} - -// IncrementTime iterates through all the TestChain's and increments their current header time -// by 5 seconds. -// -// CONTRACT: this function must be called after every Commit on any TestChain. -func (coord *Coordinator) IncrementTime() { - coord.IncrementTimeBy(TimeIncrement) -} - -// IncrementTimeBy iterates through all the TestChain's and increments their current header time -// by specified time. -func (coord *Coordinator) IncrementTimeBy(increment time.Duration) { - coord.CurrentTime = coord.CurrentTime.Add(increment).UTC() - coord.UpdateTime() -} - -// UpdateTime updates all clocks for the TestChains to the current global time. -func (coord *Coordinator) UpdateTime() { - for _, chain := range coord.Chains { - coord.UpdateTimeForChain(chain) - } -} - -// UpdateTimeForChain updates the clock for a specific chain. -func (coord *Coordinator) UpdateTimeForChain(chain *TestChain) { - chain.CurrentHeader.Time = coord.CurrentTime.UTC() - chain.App.BeginBlock(abci.RequestBeginBlock{Header: chain.CurrentHeader}) -} - -// Setup constructs a TM client, connection, and channel on both chains provided. It will -// fail if any error occurs. The clientID's, TestConnections, and TestChannels are returned -// for both chains. The channels created are connected to the ibc-transfer application. -func (coord *Coordinator) Setup(path *Path) { - coord.SetupConnections(path) - - // channels can also be referenced through the returned connections - coord.CreateChannels(path) -} - -// SetupClients is a helper function to create clients on both chains. It assumes the -// caller does not anticipate any errors. -func (coord *Coordinator) SetupClients(path *Path) { - err := path.EndpointA.CreateClient() - require.NoError(coord.t, err) - - err = path.EndpointB.CreateClient() - require.NoError(coord.t, err) -} - -// SetupClientConnections is a helper function to create clients and the appropriate -// connections on both the source and counterparty chain. It assumes the caller does not -// anticipate any errors. -func (coord *Coordinator) SetupConnections(path *Path) { - coord.SetupClients(path) - - coord.CreateConnections(path) -} - -// CreateConnection constructs and executes connection handshake messages in order to create -// OPEN channels on chainA and chainB. The connection information of for chainA and chainB -// are returned within a TestConnection struct. The function expects the connections to be -// successfully opened otherwise testing will fail. -func (coord *Coordinator) CreateConnections(path *Path) { - err := path.EndpointA.ConnOpenInit() - require.NoError(coord.t, err) - - err = path.EndpointB.ConnOpenTry() - require.NoError(coord.t, err) - - err = path.EndpointA.ConnOpenAck() - require.NoError(coord.t, err) - - err = path.EndpointB.ConnOpenConfirm() - require.NoError(coord.t, err) - - // ensure counterparty is up to date - err = path.EndpointA.UpdateClient() - require.NoError(coord.t, err) -} - -// CreateMockChannels constructs and executes channel handshake messages to create OPEN -// channels that use a mock application module that returns nil on all callbacks. This -// function is expects the channels to be successfully opened otherwise testing will -// fail. -func (coord *Coordinator) CreateMockChannels(path *Path) { - path.EndpointA.ChannelConfig.PortID = ibctesting.MockPort - path.EndpointB.ChannelConfig.PortID = ibctesting.MockPort - - coord.CreateChannels(path) -} - -// CreateTransferChannels constructs and executes channel handshake messages to create OPEN -// ibc-transfer channels on chainA and chainB. The function expects the channels to be -// successfully opened otherwise testing will fail. -func (coord *Coordinator) CreateTransferChannels(path *Path) { - path.EndpointA.ChannelConfig.PortID = ibctesting.TransferPort - path.EndpointB.ChannelConfig.PortID = ibctesting.TransferPort - - coord.CreateChannels(path) -} - -// CreateChannel constructs and executes channel handshake messages in order to create -// OPEN channels on chainA and chainB. The function expects the channels to be successfully -// opened otherwise testing will fail. -func (coord *Coordinator) CreateChannels(path *Path) { - err := path.EndpointA.ChanOpenInit() - require.NoError(coord.t, err) - - err = path.EndpointB.ChanOpenTry() - require.NoError(coord.t, err) - - err = path.EndpointA.ChanOpenAck() - require.NoError(coord.t, err) - - err = path.EndpointB.ChanOpenConfirm() - require.NoError(coord.t, err) - - // ensure counterparty is up to date - err = path.EndpointA.UpdateClient() - require.NoError(coord.t, err) -} - -// GetChain returns the TestChain using the given chainID and returns an error if it does -// not exist. -func (coord *Coordinator) GetChain(chainID string) *TestChain { - chain, found := coord.Chains[chainID] - require.True(coord.t, found, fmt.Sprintf("%s chain does not exist", chainID)) - return chain -} - -// GetChainID returns the chainID used for the provided index. -func GetChainID(index int) string { - return ChainIDPrefix + strconv.Itoa(index) -} - -// CommitBlock commits a block on the provided indexes and then increments the global time. -// -// CONTRACT: the passed in list of indexes must not contain duplicates -func (coord *Coordinator) CommitBlock(chains ...*TestChain) { - for _, chain := range chains { - chain.App.Commit() - chain.NextBlock() - } - coord.IncrementTime() -} - -// CommitNBlocks commits n blocks to state and updates the block height by 1 for each commit. -func (coord *Coordinator) CommitNBlocks(chain *TestChain, n uint64) { - for i := uint64(0); i < n; i++ { - chain.App.BeginBlock(abci.RequestBeginBlock{Header: chain.CurrentHeader}) - chain.App.Commit() - chain.NextBlock() - coord.IncrementTime() - } -} - -// ConnOpenInitOnBothChains initializes a connection on both endpoints with the state INIT -// using the OpenInit handshake call. -func (*Coordinator) ConnOpenInitOnBothChains(path *Path) error { - if err := path.EndpointA.ConnOpenInit(); err != nil { - return err - } - - if err := path.EndpointB.ConnOpenInit(); err != nil { - return err - } - - if err := path.EndpointA.UpdateClient(); err != nil { - return err - } - - if err := path.EndpointB.UpdateClient(); err != nil { - return err - } - - return nil -} - -// ChanOpenInitOnBothChains initializes a channel on the source chain and counterparty chain -// with the state INIT using the OpenInit handshake call. -func (*Coordinator) ChanOpenInitOnBothChains(path *Path) error { - // NOTE: only creation of a capability for a transfer or mock port is supported - // Other applications must bind to the port in InitGenesis or modify this code. - - if err := path.EndpointA.ChanOpenInit(); err != nil { - return err - } - - if err := path.EndpointB.ChanOpenInit(); err != nil { - return err - } - - if err := path.EndpointA.UpdateClient(); err != nil { - return err - } - - if err := path.EndpointB.UpdateClient(); err != nil { - return err - } - - return nil -} - -// from A to B -func (coord *Coordinator) RelayAndAckPendingPackets(path *Path) error { - // get all the packet to relay src->dest - src := path.EndpointA - dest := path.EndpointB - toSend := src.Chain.PendingSendPackets - coord.t.Logf("Relay %d Packets A->B\n", len(toSend)) - - // send this to the other side - coord.IncrementTime() - coord.CommitBlock(src.Chain) - err := dest.UpdateClient() - if err != nil { - return err - } - for _, packet := range toSend { - err = dest.RecvPacket(packet) - if err != nil { - return err - } - } - src.Chain.PendingSendPackets = nil - - // get all the acks to relay dest->src - toAck := dest.Chain.PendingAckPackets - // TODO: assert >= len(toSend)? - coord.t.Logf("Ack %d Packets B->A\n", len(toAck)) - - // send the ack back from dest -> src - coord.IncrementTime() - coord.CommitBlock(dest.Chain) - err = src.UpdateClient() - if err != nil { - return err - } - for _, ack := range toAck { - err = src.AcknowledgePacket(ack.Packet, ack.Ack) - if err != nil { - return err - } - } - dest.Chain.PendingAckPackets = nil - return nil -} - -// TimeoutPendingPackets returns the package to source chain to let the IBC app revert any operation. -// from A to A -func (coord *Coordinator) TimeoutPendingPackets(path *Path) error { - src := path.EndpointA - dest := path.EndpointB - - toSend := src.Chain.PendingSendPackets - coord.t.Logf("Timeout %d Packets A->A\n", len(toSend)) - - if err := src.UpdateClient(); err != nil { - return err - } - // Increment time and commit block so that 5 second delay period passes between send and receive - coord.IncrementTime() - coord.CommitBlock(src.Chain, dest.Chain) - for _, packet := range toSend { - // get proof of packet unreceived on dest - packetKey := host.PacketReceiptKey(packet.GetDestPort(), packet.GetDestChannel(), packet.GetSequence()) - proofUnreceived, proofHeight := dest.QueryProof(packetKey) - timeoutMsg := channeltypes.NewMsgTimeout(packet, packet.Sequence, proofUnreceived, proofHeight, src.Chain.SenderAccount.GetAddress().String()) - err := src.Chain.sendMsgs(timeoutMsg) - if err != nil { - return err - } - } - src.Chain.PendingSendPackets = nil - dest.Chain.PendingAckPackets = nil - return nil -} - -// CloseChannel close channel on both sides -func (coord *Coordinator) CloseChannel(path *Path) { - err := path.EndpointA.ChanCloseInit() - require.NoError(coord.t, err) - coord.IncrementTime() - err = path.EndpointB.UpdateClient() - require.NoError(coord.t, err) - err = path.EndpointB.ChanCloseConfirm() - require.NoError(coord.t, err) -} diff --git a/x/feeabs/ibctesting/endpoint.go b/x/feeabs/ibctesting/endpoint.go deleted file mode 100644 index 9b47e815..00000000 --- a/x/feeabs/ibctesting/endpoint.go +++ /dev/null @@ -1,375 +0,0 @@ -package ibctesting - -import ( - "fmt" - - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" - host "github.com/cosmos/ibc-go/v7/modules/core/24-host" - "github.com/cosmos/ibc-go/v7/modules/core/exported" - ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - ibctesting "github.com/cosmos/ibc-go/v7/testing" - "github.com/stretchr/testify/require" -) - -// Endpoint is a which represents a channel endpoint and its associated -// client and connections. It contains client, connection, and channel -// configuration parameters. Endpoint functions will utilize the parameters -// set in the configuration structs when executing IBC messages. -type Endpoint struct { - Chain *TestChain - Counterparty *Endpoint - ClientID string - ConnectionID string - ChannelID string - - ClientConfig ibctesting.ClientConfig - ConnectionConfig *ibctesting.ConnectionConfig - ChannelConfig *ibctesting.ChannelConfig -} - -// QueryProof queries proof associated with this endpoint using the lastest client state -// height on the counterparty chain. -func (endpoint *Endpoint) QueryProof(key []byte) ([]byte, clienttypes.Height) { - // obtain the counterparty client representing the chain associated with the endpoint - clientState := endpoint.Counterparty.Chain.GetClientState(endpoint.Counterparty.ClientID) - - // query proof on the counterparty using the latest height of the IBC client - return endpoint.QueryProofAtHeight(key, clientState.GetLatestHeight().GetRevisionHeight()) -} - -// QueryProofAtHeight queries proof associated with this endpoint using the proof height -// providied -func (endpoint *Endpoint) QueryProofAtHeight(key []byte, height uint64) ([]byte, clienttypes.Height) { - // query proof on the counterparty using the latest height of the IBC client - return endpoint.Chain.QueryProofAtHeight(key, int64(height)) -} - -// CreateClient creates an IBC client on the endpoint. It will update the -// clientID for the endpoint if the message is successfully executed. -// NOTE: a solo machine client will be created with an empty diversifier. -func (endpoint *Endpoint) CreateClient() (err error) { - // ensure counterparty has committed state - endpoint.Chain.Coordinator.CommitBlock(endpoint.Counterparty.Chain) - - var ( - clientState exported.ClientState - consensusState exported.ConsensusState - ) - - switch endpoint.ClientConfig.GetClientType() { - case exported.Tendermint: - tmConfig, ok := endpoint.ClientConfig.(*ibctesting.TendermintConfig) - require.True(endpoint.Chain.t, ok) - - height := endpoint.Counterparty.Chain.LastHeader.GetHeight().(clienttypes.Height) - clientState = ibctm.NewClientState( - endpoint.Counterparty.Chain.ChainID, tmConfig.TrustLevel, tmConfig.TrustingPeriod, tmConfig.UnbondingPeriod, tmConfig.MaxClockDrift, - height, commitmenttypes.GetSDKSpecs(), ibctesting.UpgradePath, - ) - consensusState = endpoint.Counterparty.Chain.LastHeader.ConsensusState() - case exported.Solomachine: - // TODO - // solo := NewSolomachine(chain.t, endpoint.Chain.Codec, clientID, "", 1) - // clientState = solo.ClientState() - // consensusState = solo.ConsensusState() - - default: - err = fmt.Errorf("client type %s is not supported", endpoint.ClientConfig.GetClientType()) - } - - if err != nil { - return err - } - - msg, err := clienttypes.NewMsgCreateClient( - clientState, consensusState, endpoint.Chain.SenderAccount.GetAddress().String(), - ) - require.NoError(endpoint.Chain.t, err) - - res, err := endpoint.Chain.SendMsgs(msg) - if err != nil { - return err - } - - endpoint.ClientID, err = ibctesting.ParseClientIDFromEvents(res.GetEvents()) - require.NoError(endpoint.Chain.t, err) - - return nil -} - -// UpdateClient updates the IBC client associated with the endpoint. -func (endpoint *Endpoint) UpdateClient() (err error) { - // ensure counterparty has committed state - endpoint.Chain.Coordinator.CommitBlock(endpoint.Counterparty.Chain) - - var header *ibctm.Header - - switch endpoint.ClientConfig.GetClientType() { - case exported.Tendermint: - header, err = endpoint.Chain.ConstructUpdateTMClientHeader(endpoint.Counterparty.Chain, endpoint.ClientID) - - default: - err = fmt.Errorf("client type %s is not supported", endpoint.ClientConfig.GetClientType()) - } - - if err != nil { - return err - } - - msg, err := clienttypes.NewMsgUpdateClient( - endpoint.ClientID, header, - endpoint.Chain.SenderAccount.GetAddress().String(), - ) - require.NoError(endpoint.Chain.t, err) - - return endpoint.Chain.sendMsgs(msg) -} - -// ConnOpenInit will construct and execute a MsgConnectionOpenInit on the associated endpoint. -func (endpoint *Endpoint) ConnOpenInit() error { - msg := connectiontypes.NewMsgConnectionOpenInit( - endpoint.ClientID, - endpoint.Counterparty.ClientID, - endpoint.Counterparty.Chain.GetPrefix(), ibctesting.DefaultOpenInitVersion, endpoint.ConnectionConfig.DelayPeriod, - endpoint.Chain.SenderAccount.GetAddress().String(), - ) - res, err := endpoint.Chain.SendMsgs(msg) - if err != nil { - return err - } - - endpoint.ConnectionID, err = ibctesting.ParseConnectionIDFromEvents(res.GetEvents()) - require.NoError(endpoint.Chain.t, err) - - return nil -} - -// ConnOpenTry will construct and execute a MsgConnectionOpenTry on the associated endpoint. -func (endpoint *Endpoint) ConnOpenTry() error { - if err := endpoint.UpdateClient(); err != nil { - return err - } - - counterpartyClient, proofClient, proofConsensus, consensusHeight, proofInit, proofHeight := endpoint.QueryConnectionHandshakeProof() - - msg := connectiontypes.NewMsgConnectionOpenTry( - endpoint.ClientID, endpoint.Counterparty.ConnectionID, endpoint.Counterparty.ClientID, - counterpartyClient, endpoint.Counterparty.Chain.GetPrefix(), []*connectiontypes.Version{ibctesting.ConnectionVersion}, endpoint.ConnectionConfig.DelayPeriod, - proofInit, proofClient, proofConsensus, - proofHeight, consensusHeight, - endpoint.Chain.SenderAccount.GetAddress().String(), - ) - res, err := endpoint.Chain.SendMsgs(msg) - if err != nil { - return err - } - - if endpoint.ConnectionID == "" { - endpoint.ConnectionID, err = ibctesting.ParseConnectionIDFromEvents(res.GetEvents()) - require.NoError(endpoint.Chain.t, err) - } - - return nil -} - -// ConnOpenAck will construct and execute a MsgConnectionOpenAck on the associated endpoint. -func (endpoint *Endpoint) ConnOpenAck() error { - if err := endpoint.UpdateClient(); err != nil { - return err - } - - counterpartyClient, proofClient, proofConsensus, consensusHeight, proofTry, proofHeight := endpoint.QueryConnectionHandshakeProof() - - msg := connectiontypes.NewMsgConnectionOpenAck( - endpoint.ConnectionID, endpoint.Counterparty.ConnectionID, counterpartyClient, // testing doesn't use flexible selection - proofTry, proofClient, proofConsensus, - proofHeight, consensusHeight, - ibctesting.ConnectionVersion, - endpoint.Chain.SenderAccount.GetAddress().String(), - ) - return endpoint.Chain.sendMsgs(msg) -} - -// ConnOpenConfirm will construct and execute a MsgConnectionOpenConfirm on the associated endpoint. -func (endpoint *Endpoint) ConnOpenConfirm() error { - if err := endpoint.UpdateClient(); err != nil { - return err - } - - connectionKey := host.ConnectionKey(endpoint.Counterparty.ConnectionID) - proof, height := endpoint.Counterparty.Chain.QueryProof(connectionKey) - - msg := connectiontypes.NewMsgConnectionOpenConfirm( - endpoint.ConnectionID, - proof, height, - endpoint.Chain.SenderAccount.GetAddress().String(), - ) - return endpoint.Chain.sendMsgs(msg) -} - -// QueryConnectionHandshakeProof returns all the proofs necessary to execute OpenTry or Open Ack of -// the connection handshakes. It returns the counterparty client state, proof of the counterparty -// client state, proof of the counterparty consensus state, the consensus state height, proof of -// the counterparty connection, and the proof height for all the proofs returned. -func (endpoint *Endpoint) QueryConnectionHandshakeProof() ( - clientState exported.ClientState, proofClient, - proofConsensus []byte, consensusHeight clienttypes.Height, - proofConnection []byte, proofHeight clienttypes.Height, -) { - // obtain the client state on the counterparty chain - clientState = endpoint.Counterparty.Chain.GetClientState(endpoint.Counterparty.ClientID) - - // query proof for the client state on the counterparty - clientKey := host.FullClientStateKey(endpoint.Counterparty.ClientID) - proofClient, proofHeight = endpoint.Counterparty.QueryProof(clientKey) - - consensusHeight = clientState.GetLatestHeight().(clienttypes.Height) - - // query proof for the consensus state on the counterparty - consensusKey := host.FullConsensusStateKey(endpoint.Counterparty.ClientID, consensusHeight) - proofConsensus, _ = endpoint.Counterparty.QueryProofAtHeight(consensusKey, proofHeight.GetRevisionHeight()) - - // query proof for the connection on the counterparty - connectionKey := host.ConnectionKey(endpoint.Counterparty.ConnectionID) - proofConnection, _ = endpoint.Counterparty.QueryProofAtHeight(connectionKey, proofHeight.GetRevisionHeight()) - - return clientState, proofClient, proofConsensus, consensusHeight, proofConnection, proofHeight -} - -// ChanOpenInit will construct and execute a MsgChannelOpenInit on the associated endpoint. -func (endpoint *Endpoint) ChanOpenInit() error { - msg := channeltypes.NewMsgChannelOpenInit( - endpoint.ChannelConfig.PortID, - endpoint.ChannelConfig.Version, endpoint.ChannelConfig.Order, []string{endpoint.ConnectionID}, - endpoint.Counterparty.ChannelConfig.PortID, - endpoint.Chain.SenderAccount.GetAddress().String(), - ) - res, err := endpoint.Chain.SendMsgs(msg) - if err != nil { - return err - } - - endpoint.ChannelID, err = ibctesting.ParseChannelIDFromEvents(res.GetEvents()) - require.NoError(endpoint.Chain.t, err) - - return nil -} - -// ChanOpenTry will construct and execute a MsgChannelOpenTry on the associated endpoint. -func (endpoint *Endpoint) ChanOpenTry() error { - if err := endpoint.UpdateClient(); err != nil { - return err - } - - channelKey := host.ChannelKey(endpoint.Counterparty.ChannelConfig.PortID, endpoint.Counterparty.ChannelID) - proof, height := endpoint.Counterparty.Chain.QueryProof(channelKey) - - msg := channeltypes.NewMsgChannelOpenTry( - endpoint.ChannelConfig.PortID, - endpoint.ChannelConfig.Version, endpoint.ChannelConfig.Order, []string{endpoint.ConnectionID}, - endpoint.Counterparty.ChannelConfig.PortID, endpoint.Counterparty.ChannelID, endpoint.Counterparty.ChannelConfig.Version, - proof, height, - endpoint.Chain.SenderAccount.GetAddress().String(), - ) - res, err := endpoint.Chain.SendMsgs(msg) - if err != nil { - return err - } - - if endpoint.ChannelID == "" { - endpoint.ChannelID, err = ibctesting.ParseChannelIDFromEvents(res.GetEvents()) - require.NoError(endpoint.Chain.t, err) - } - - return nil -} - -// ChanOpenAck will construct and execute a MsgChannelOpenAck on the associated endpoint. -func (endpoint *Endpoint) ChanOpenAck() error { - if err := endpoint.UpdateClient(); err != nil { - return err - } - - channelKey := host.ChannelKey(endpoint.Counterparty.ChannelConfig.PortID, endpoint.Counterparty.ChannelID) - proof, height := endpoint.Counterparty.Chain.QueryProof(channelKey) - - msg := channeltypes.NewMsgChannelOpenAck( - endpoint.ChannelConfig.PortID, endpoint.ChannelID, - endpoint.Counterparty.ChannelID, endpoint.Counterparty.ChannelConfig.Version, // testing doesn't use flexible selection - proof, height, - endpoint.Chain.SenderAccount.GetAddress().String(), - ) - return endpoint.Chain.sendMsgs(msg) -} - -// ChanOpenConfirm will construct and execute a MsgChannelOpenConfirm on the associated endpoint. -func (endpoint *Endpoint) ChanOpenConfirm() error { - if err := endpoint.UpdateClient(); err != nil { - return err - } - - channelKey := host.ChannelKey(endpoint.Counterparty.ChannelConfig.PortID, endpoint.Counterparty.ChannelID) - proof, height := endpoint.Counterparty.Chain.QueryProof(channelKey) - - msg := channeltypes.NewMsgChannelOpenConfirm( - endpoint.ChannelConfig.PortID, endpoint.ChannelID, - proof, height, - endpoint.Chain.SenderAccount.GetAddress().String(), - ) - return endpoint.Chain.sendMsgs(msg) -} - -// ChanCloseInit will construct and execute a MsgChannelCloseInit on the associated endpoint. -// -// NOTE: does not work with ibc-transfer module -func (endpoint *Endpoint) ChanCloseInit() error { - msg := channeltypes.NewMsgChannelCloseInit( - endpoint.ChannelConfig.PortID, endpoint.ChannelID, - endpoint.Chain.SenderAccount.GetAddress().String(), - ) - return endpoint.Chain.sendMsgs(msg) -} - -// ChanCloseConfirm will construct and execute a NewMsgChannelCloseConfirm on the associated endpoint. -func (endpoint *Endpoint) ChanCloseConfirm() error { - channelKey := host.ChannelKey(endpoint.Counterparty.ChannelConfig.PortID, endpoint.Counterparty.ChannelID) - proof, proofHeight := endpoint.Counterparty.QueryProof(channelKey) - - msg := channeltypes.NewMsgChannelCloseConfirm( - endpoint.ChannelConfig.PortID, endpoint.ChannelID, - proof, proofHeight, - endpoint.Chain.SenderAccount.GetAddress().String(), - ) - return endpoint.Chain.sendMsgs(msg) -} - -// RecvPacket receives a packet on the associated endpoint. -// The counterparty client is updated. -func (endpoint *Endpoint) RecvPacket(packet channeltypes.Packet) error { - // get proof of packet commitment on source - packetKey := host.PacketCommitmentKey(packet.GetSourcePort(), packet.GetSourceChannel(), packet.GetSequence()) - proof, proofHeight := endpoint.Counterparty.Chain.QueryProof(packetKey) - - recvMsg := channeltypes.NewMsgRecvPacket(packet, proof, proofHeight, endpoint.Chain.SenderAccount.GetAddress().String()) - - // receive on counterparty and update source client - if err := endpoint.Chain.sendMsgs(recvMsg); err != nil { - return err - } - - return endpoint.Counterparty.UpdateClient() -} - -// AcknowledgePacket sends a MsgAcknowledgement to the channel associated with the endpoint. -func (endpoint *Endpoint) AcknowledgePacket(packet channeltypes.Packet, ack []byte) error { - // get proof of acknowledgement on counterparty - packetKey := host.PacketAcknowledgementKey(packet.GetDestPort(), packet.GetDestChannel(), packet.GetSequence()) - proof, proofHeight := endpoint.Counterparty.QueryProof(packetKey) - - ackMsg := channeltypes.NewMsgAcknowledgement(packet, ack, proof, proofHeight, endpoint.Chain.SenderAccount.GetAddress().String()) - - return endpoint.Chain.sendMsgs(ackMsg) -} diff --git a/x/feeabs/ibctesting/event_utils.go b/x/feeabs/ibctesting/event_utils.go deleted file mode 100644 index 6aa79bb4..00000000 --- a/x/feeabs/ibctesting/event_utils.go +++ /dev/null @@ -1,92 +0,0 @@ -package ibctesting - -import ( - "strconv" - "strings" - - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - - abci "github.com/cometbft/cometbft/abci/types" -) - -func getSendPackets(evts []abci.Event) []channeltypes.Packet { - var res []channeltypes.Packet - for _, evt := range evts { - if evt.Type == "send_packet" { - packet := parsePacketFromEvent(evt) - res = append(res, packet) - } - } - return res -} - -func getAckPackets(evts []abci.Event) []PacketAck { - var res []PacketAck - for _, evt := range evts { - if evt.Type == "write_acknowledgement" { - packet := parsePacketFromEvent(evt) - ack := PacketAck{ - Packet: packet, - Ack: []byte(getField(evt, "packet_ack")), - } - res = append(res, ack) - } - } - return res -} - -// Used for various debug statements above when needed... do not remove -// func showEvent(evt abci.Event) { -// fmt.Printf("evt.Type: %s\n", evt.Type) -// for _, attr := range evt.Attributes { -// fmt.Printf(" %s = %s\n", string(attr.Key), string(attr.Value)) -// } -// } - -func parsePacketFromEvent(evt abci.Event) channeltypes.Packet { - return channeltypes.Packet{ - Sequence: getUintField(evt, "packet_sequence"), - SourcePort: getField(evt, "packet_src_port"), - SourceChannel: getField(evt, "packet_src_channel"), - DestinationPort: getField(evt, "packet_dst_port"), - DestinationChannel: getField(evt, "packet_dst_channel"), - Data: []byte(getField(evt, "packet_data")), - TimeoutHeight: parseTimeoutHeight(getField(evt, "packet_timeout_height")), - TimeoutTimestamp: getUintField(evt, "packet_timeout_timestamp"), - } -} - -// return the value for the attribute with the given name -func getField(evt abci.Event, key string) string { - for _, attr := range evt.Attributes { - if attr.Key == key { - return attr.Value - } - } - return "" -} - -func getUintField(evt abci.Event, key string) uint64 { - raw := getField(evt, key) - return toUint64(raw) -} - -func toUint64(raw string) uint64 { - if raw == "" { - return 0 - } - i, err := strconv.ParseUint(raw, 10, 64) - if err != nil { - panic(err) - } - return i -} - -func parseTimeoutHeight(raw string) clienttypes.Height { - chunks := strings.Split(raw, "-") - return clienttypes.Height{ - RevisionNumber: toUint64(chunks[0]), - RevisionHeight: toUint64(chunks[1]), - } -} diff --git a/x/feeabs/ibctesting/path.go b/x/feeabs/ibctesting/path.go deleted file mode 100644 index 4a505b63..00000000 --- a/x/feeabs/ibctesting/path.go +++ /dev/null @@ -1,38 +0,0 @@ -package ibctesting - -import ( - ibctesting "github.com/cosmos/ibc-go/v7/testing" -) - -// Path contains two endpoints representing two chains connected over IBC -type Path struct { - EndpointA *Endpoint - EndpointB *Endpoint -} - -// NewPath constructs an endpoint for each chain using the default values -// for the endpoints. Each endpoint is updated to have a pointer to the -// counterparty endpoint. -func NewPath(chainA, chainB *TestChain) *Path { - endpointA := NewDefaultEndpoint(chainA) - endpointB := NewDefaultEndpoint(chainB) - - endpointA.Counterparty = endpointB - endpointB.Counterparty = endpointA - - return &Path{ - EndpointA: endpointA, - EndpointB: endpointB, - } -} - -// NewDefaultEndpoint constructs a new endpoint using default values. -// CONTRACT: the counterparty endpoitn must be set by the caller. -func NewDefaultEndpoint(chain *TestChain) *Endpoint { - return &Endpoint{ - Chain: chain, - ClientConfig: ibctesting.NewTendermintConfig(), - ConnectionConfig: ibctesting.NewConnectionConfig(), - ChannelConfig: ibctesting.NewChannelConfig(), - } -} diff --git a/x/feeabs/types/epoch.pb.go b/x/feeabs/types/epoch.pb.go index a9b380b8..57e479a0 100644 --- a/x/feeabs/types/epoch.pb.go +++ b/x/feeabs/types/epoch.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feeabstraction/absfee/v1beta1/epoch.proto +// source: feeabstraction/feeabs/v1beta1/epoch.proto package types @@ -75,7 +75,7 @@ func (m *EpochInfo) Reset() { *m = EpochInfo{} } func (m *EpochInfo) String() string { return proto.CompactTextString(m) } func (*EpochInfo) ProtoMessage() {} func (*EpochInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_4a30326e6468dfa9, []int{0} + return fileDescriptor_95c6723303c4bcf6, []int{0} } func (m *EpochInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -154,44 +154,44 @@ func (m *EpochInfo) GetCurrentEpochStartHeight() int64 { } func init() { - proto.RegisterType((*EpochInfo)(nil), "feeabstraction.absfee.v1beta1.EpochInfo") + proto.RegisterType((*EpochInfo)(nil), "feeabstraction.feeabs.v1beta1.EpochInfo") } func init() { - proto.RegisterFile("feeabstraction/absfee/v1beta1/epoch.proto", fileDescriptor_4a30326e6468dfa9) + proto.RegisterFile("feeabstraction/feeabs/v1beta1/epoch.proto", fileDescriptor_95c6723303c4bcf6) } -var fileDescriptor_4a30326e6468dfa9 = []byte{ - // 452 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x3f, 0x6f, 0xd3, 0x40, - 0x14, 0xcf, 0xd1, 0x50, 0x9c, 0x03, 0x04, 0x58, 0x05, 0x4c, 0xa4, 0xda, 0x51, 0x58, 0x82, 0xa0, - 0x3e, 0x05, 0x90, 0x10, 0xb0, 0x05, 0x90, 0x80, 0x31, 0x61, 0x40, 0x2c, 0xd1, 0xd9, 0x79, 0xb6, - 0x4f, 0x8a, 0x7d, 0x96, 0xef, 0xb9, 0x22, 0x1b, 0x1f, 0x21, 0x23, 0x1f, 0xa9, 0x63, 0x47, 0xa6, - 0x80, 0x92, 0x8d, 0xb1, 0x9f, 0x00, 0xf9, 0xce, 0x2e, 0x29, 0x01, 0xb1, 0xd9, 0xef, 0xf7, 0xef, - 0xbd, 0x9f, 0x8e, 0x3e, 0x88, 0x00, 0x78, 0xa0, 0xb0, 0xe0, 0x21, 0x0a, 0x99, 0x31, 0x1e, 0xa8, - 0x08, 0x80, 0x1d, 0x0f, 0x03, 0x40, 0x3e, 0x64, 0x90, 0xcb, 0x30, 0xf1, 0xf3, 0x42, 0xa2, 0xb4, - 0x0f, 0x2f, 0x52, 0x7d, 0x43, 0xf5, 0x6b, 0x6a, 0xf7, 0x20, 0x96, 0xb1, 0xd4, 0x4c, 0x56, 0x7d, - 0x19, 0x51, 0xd7, 0x8d, 0xa5, 0x8c, 0xe7, 0xc0, 0xf4, 0x5f, 0x50, 0x46, 0x6c, 0x56, 0x16, 0x5c, - 0xcb, 0x0d, 0xee, 0xfd, 0x89, 0xa3, 0x48, 0x41, 0x21, 0x4f, 0x73, 0x43, 0xe8, 0x2f, 0xdb, 0xb4, - 0xf3, 0xa6, 0xda, 0xe2, 0x5d, 0x16, 0x49, 0xdb, 0xa5, 0x54, 0xcc, 0x20, 0x43, 0x11, 0x09, 0x28, - 0x1c, 0xd2, 0x23, 0x83, 0xce, 0x78, 0x6b, 0x62, 0x7f, 0xa4, 0x54, 0x21, 0x2f, 0x70, 0x5a, 0xd9, - 0x38, 0x97, 0x7a, 0x64, 0x70, 0xf5, 0x71, 0xd7, 0x37, 0x19, 0x7e, 0x93, 0xe1, 0x7f, 0x68, 0x32, - 0x46, 0x87, 0x27, 0x2b, 0xaf, 0x75, 0xb6, 0xf2, 0x6e, 0x2d, 0x78, 0x3a, 0x7f, 0xd1, 0xff, 0xad, - 0xed, 0x2f, 0xbf, 0x7b, 0x64, 0xdc, 0xd1, 0x83, 0x8a, 0x6e, 0x27, 0xd4, 0x6a, 0x56, 0x77, 0xf6, - 0xb4, 0xef, 0xbd, 0x1d, 0xdf, 0xd7, 0x35, 0x61, 0x34, 0xac, 0x6c, 0x7f, 0xae, 0x3c, 0xbb, 0x91, - 0x3c, 0x92, 0xa9, 0x40, 0x48, 0x73, 0x5c, 0x9c, 0xad, 0xbc, 0x1b, 0x26, 0xac, 0xc1, 0xfa, 0x5f, - 0xab, 0xa8, 0x73, 0x77, 0xfb, 0x3e, 0xbd, 0x1e, 0x96, 0x45, 0x01, 0x19, 0x4e, 0x75, 0xfd, 0x4e, - 0xbb, 0x47, 0x06, 0x7b, 0xe3, 0x6b, 0xf5, 0x50, 0x97, 0x61, 0x7f, 0x21, 0xd4, 0xb9, 0xc0, 0x9a, - 0x6e, 0xdd, 0x7d, 0xf9, 0xbf, 0x77, 0x3f, 0xac, 0xef, 0xf6, 0xcc, 0x2a, 0xff, 0x72, 0x32, 0x2d, - 0xdc, 0xde, 0x4e, 0x9e, 0x9c, 0x37, 0xf2, 0x94, 0xde, 0x31, 0xfc, 0x50, 0x96, 0x19, 0x8a, 0x2c, - 0x36, 0x42, 0x98, 0x39, 0xfb, 0x3d, 0x32, 0xb0, 0xc6, 0x07, 0x1a, 0x7d, 0x55, 0x83, 0x13, 0x83, - 0xd9, 0x2f, 0x69, 0xf7, 0x6f, 0x69, 0x09, 0x88, 0x38, 0x41, 0xc7, 0xd2, 0xa7, 0xde, 0xdd, 0x09, - 0x7c, 0xab, 0xe1, 0xf7, 0x6d, 0xeb, 0xca, 0x4d, 0x6b, 0x34, 0x39, 0x59, 0xbb, 0xe4, 0x74, 0xed, - 0x92, 0x1f, 0x6b, 0x97, 0x2c, 0x37, 0x6e, 0xeb, 0x74, 0xe3, 0xb6, 0xbe, 0x6d, 0xdc, 0xd6, 0xa7, - 0xe7, 0xb1, 0xc0, 0xa4, 0x0c, 0xfc, 0x50, 0xa6, 0x4c, 0xaa, 0x54, 0x2a, 0xa1, 0x8e, 0xe6, 0x3c, - 0x50, 0x2c, 0x02, 0x38, 0xda, 0x7e, 0xe6, 0xc7, 0xcf, 0xd8, 0x67, 0x66, 0xde, 0x33, 0xc3, 0x45, - 0x0e, 0x2a, 0xd8, 0xd7, 0x2d, 0x3d, 0xf9, 0x15, 0x00, 0x00, 0xff, 0xff, 0xf9, 0xde, 0x16, 0x6a, - 0x11, 0x03, 0x00, 0x00, +var fileDescriptor_95c6723303c4bcf6 = []byte{ + // 450 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0xb1, 0x8e, 0xd3, 0x40, + 0x10, 0xcd, 0x72, 0xe1, 0x70, 0x16, 0x10, 0xb0, 0x3a, 0xc0, 0x44, 0xba, 0x75, 0x14, 0x1a, 0x23, + 0x38, 0xaf, 0x02, 0x48, 0x08, 0xe8, 0x02, 0x48, 0x40, 0xe9, 0x50, 0x20, 0x9a, 0xc8, 0x76, 0xd6, + 0xf6, 0x4a, 0xb1, 0xd7, 0xb2, 0xc7, 0x27, 0xd2, 0xf1, 0x09, 0x29, 0xf9, 0xa4, 0x2b, 0xaf, 0xa4, + 0x32, 0x28, 0xe9, 0x28, 0xef, 0x0b, 0x90, 0x77, 0xed, 0xc3, 0x47, 0x40, 0x74, 0xbb, 0xf3, 0xde, + 0xbc, 0x37, 0xf3, 0x34, 0xf8, 0x41, 0xc8, 0xb9, 0xe7, 0x17, 0x90, 0x7b, 0x01, 0x08, 0x99, 0x32, + 0xfd, 0x65, 0xc7, 0x13, 0x9f, 0x83, 0x37, 0x61, 0x3c, 0x93, 0x41, 0xec, 0x64, 0xb9, 0x04, 0x49, + 0x0e, 0x2f, 0x52, 0x1d, 0xfd, 0x75, 0x1a, 0xea, 0xf0, 0x20, 0x92, 0x91, 0x54, 0x4c, 0x56, 0xbf, + 0x74, 0xd3, 0x90, 0x46, 0x52, 0x46, 0x4b, 0xce, 0xd4, 0xcf, 0x2f, 0x43, 0xb6, 0x28, 0x73, 0x4f, + 0xb5, 0x6b, 0xdc, 0xfa, 0x13, 0x07, 0x91, 0xf0, 0x02, 0xbc, 0x24, 0xd3, 0x84, 0xf1, 0xba, 0x8f, + 0x07, 0x6f, 0xea, 0x29, 0xde, 0xa5, 0xa1, 0x24, 0x14, 0x63, 0xb1, 0xe0, 0x29, 0x88, 0x50, 0xf0, + 0xdc, 0x44, 0x23, 0x64, 0x0f, 0xdc, 0x4e, 0x85, 0x7c, 0xc4, 0xb8, 0x00, 0x2f, 0x87, 0x79, 0x2d, + 0x63, 0x5e, 0x1a, 0x21, 0xfb, 0xea, 0xe3, 0xa1, 0xa3, 0x3d, 0x9c, 0xd6, 0xc3, 0xf9, 0xd0, 0x7a, + 0x4c, 0x0f, 0x4f, 0x2a, 0xab, 0x77, 0x56, 0x59, 0xb7, 0x56, 0x5e, 0xb2, 0x7c, 0x31, 0xfe, 0xdd, + 0x3b, 0x5e, 0x7f, 0xb7, 0x90, 0x3b, 0x50, 0x85, 0x9a, 0x4e, 0x62, 0x6c, 0xb4, 0xa3, 0x9b, 0x7b, + 0x4a, 0xf7, 0xde, 0x8e, 0xee, 0xeb, 0x86, 0x30, 0x9d, 0xd4, 0xb2, 0x3f, 0x2b, 0x8b, 0xb4, 0x2d, + 0x8f, 0x64, 0x22, 0x80, 0x27, 0x19, 0xac, 0xce, 0x2a, 0xeb, 0x86, 0x36, 0x6b, 0xb1, 0xf1, 0xd7, + 0xda, 0xea, 0x5c, 0x9d, 0xdc, 0xc7, 0xd7, 0x83, 0x32, 0xcf, 0x79, 0x0a, 0x73, 0x15, 0xbf, 0xd9, + 0x1f, 0x21, 0x7b, 0xcf, 0xbd, 0xd6, 0x14, 0x55, 0x18, 0xe4, 0x0b, 0xc2, 0xe6, 0x05, 0xd6, 0xbc, + 0xb3, 0xf7, 0xe5, 0xff, 0xee, 0xfd, 0xb0, 0xd9, 0xdb, 0xd2, 0xa3, 0xfc, 0x4b, 0x49, 0xa7, 0x70, + 0xbb, 0xeb, 0x3c, 0x3b, 0x4f, 0xe4, 0x29, 0xbe, 0xa3, 0xf9, 0x81, 0x2c, 0x53, 0x10, 0x69, 0xa4, + 0x1b, 0xf9, 0xc2, 0xdc, 0x1f, 0x21, 0xdb, 0x70, 0x0f, 0x14, 0xfa, 0xaa, 0x01, 0x67, 0x1a, 0x23, + 0x2f, 0xf1, 0xf0, 0x6f, 0x6e, 0x31, 0x17, 0x51, 0x0c, 0xa6, 0xa1, 0x56, 0xbd, 0xbb, 0x63, 0xf8, + 0x56, 0xc1, 0xef, 0xfb, 0xc6, 0x95, 0x9b, 0xc6, 0x74, 0x76, 0xb2, 0xa1, 0xe8, 0x74, 0x43, 0xd1, + 0x8f, 0x0d, 0x45, 0xeb, 0x2d, 0xed, 0x9d, 0x6e, 0x69, 0xef, 0xdb, 0x96, 0xf6, 0x3e, 0x3d, 0x8f, + 0x04, 0xc4, 0xa5, 0xef, 0x04, 0x32, 0x61, 0xb2, 0x48, 0x64, 0x21, 0x8a, 0xa3, 0x65, 0x7d, 0xcf, + 0x21, 0xe7, 0x47, 0xdd, 0x33, 0x3f, 0x7e, 0xc6, 0x3e, 0xb7, 0xb7, 0x0e, 0xab, 0x8c, 0x17, 0xfe, + 0xbe, 0x4a, 0xe9, 0xc9, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x5c, 0x01, 0x9b, 0x11, 0x03, + 0x00, 0x00, } func (m *EpochInfo) Marshal() (dAtA []byte, err error) { diff --git a/x/feeabs/types/feepool.pb.go b/x/feeabs/types/feepool.pb.go deleted file mode 100644 index 0f33e7ae..00000000 --- a/x/feeabs/types/feepool.pb.go +++ /dev/null @@ -1,46 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feeabstraction/absfee/v1beta1/feepool.proto - -package types - -import ( - fmt "fmt" - _ "github.com/cosmos/cosmos-sdk/types/query" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - _ "google.golang.org/genproto/googleapis/api/annotations" - math "math" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -func init() { - proto.RegisterFile("feeabstraction/absfee/v1beta1/feepool.proto", fileDescriptor_aeac12e01fe4cbff) -} - -var fileDescriptor_aeac12e01fe4cbff = []byte{ - // 218 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x8f, 0x31, 0x4e, 0xc5, 0x30, - 0x0c, 0x86, 0xdb, 0x85, 0x81, 0x11, 0x31, 0x3d, 0x41, 0x0e, 0x00, 0x7a, 0xb1, 0x2a, 0x06, 0xc4, - 0xca, 0x15, 0xd8, 0xd8, 0x9c, 0xca, 0x0d, 0x91, 0xda, 0x38, 0xc4, 0x69, 0x45, 0x6f, 0xc1, 0xb1, - 0x18, 0x3b, 0x32, 0xa2, 0xf6, 0x22, 0xa8, 0x69, 0x41, 0xb0, 0xbc, 0xcd, 0x92, 0xbf, 0xff, 0xff, - 0xec, 0xf3, 0xdb, 0x86, 0x08, 0x8d, 0xa4, 0x88, 0x75, 0x72, 0xec, 0x01, 0x8d, 0x34, 0x44, 0x30, - 0x54, 0x86, 0x12, 0x56, 0xd0, 0x10, 0x05, 0xe6, 0x56, 0x87, 0xc8, 0x89, 0x2f, 0xae, 0xff, 0xc3, - 0x7a, 0x83, 0xf5, 0x0e, 0x1f, 0x2e, 0x2d, 0x5b, 0xce, 0x24, 0xac, 0xd3, 0x16, 0x3a, 0x5c, 0x59, - 0x66, 0xdb, 0x12, 0x60, 0x70, 0x80, 0xde, 0x73, 0xc2, 0x35, 0x2b, 0xfb, 0xf6, 0xa6, 0x66, 0xe9, - 0x58, 0xc0, 0xa0, 0x10, 0xbc, 0xf6, 0x14, 0xc7, 0x5f, 0x77, 0x40, 0xeb, 0x7c, 0x86, 0x7f, 0xd8, - 0xd3, 0xb7, 0x06, 0x8c, 0xd8, 0xed, 0xbd, 0x8f, 0x4f, 0x1f, 0xb3, 0x2a, 0xa7, 0x59, 0x95, 0x5f, - 0xb3, 0x2a, 0xdf, 0x17, 0x55, 0x4c, 0x8b, 0x2a, 0x3e, 0x17, 0x55, 0x3c, 0x3f, 0x58, 0x97, 0x5e, - 0x7a, 0xa3, 0x6b, 0xee, 0x20, 0xbb, 0x9d, 0x1c, 0x5b, 0x34, 0xb2, 0xfe, 0x7a, 0xfc, 0x5b, 0x3f, - 0xdc, 0xc3, 0x1b, 0x6c, 0x4a, 0x48, 0x63, 0x20, 0x31, 0x67, 0xb9, 0xfb, 0xee, 0x3b, 0x00, 0x00, - 0xff, 0xff, 0xf7, 0xef, 0x9f, 0x4f, 0x35, 0x01, 0x00, 0x00, -} diff --git a/x/feeabs/types/genesis.pb.go b/x/feeabs/types/genesis.pb.go index 979d05eb..c8e72f50 100644 --- a/x/feeabs/types/genesis.pb.go +++ b/x/feeabs/types/genesis.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feeabstraction/absfee/v1beta1/genesis.proto +// source: feeabstraction/feeabs/v1beta1/genesis.proto package types @@ -25,7 +25,7 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// Params defines the parameters for the feeabs module. +// GenesisState defines the feeabs module's genesis state. type GenesisState struct { Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params" yaml:"params"` Epochs []EpochInfo `protobuf:"bytes,2,rep,name=epochs,proto3" json:"epochs"` @@ -36,7 +36,7 @@ func (m *GenesisState) Reset() { *m = GenesisState{} } func (m *GenesisState) String() string { return proto.CompactTextString(m) } func (*GenesisState) ProtoMessage() {} func (*GenesisState) Descriptor() ([]byte, []int) { - return fileDescriptor_c85d049bd82004cc, []int{0} + return fileDescriptor_a6133d256fb92bdc, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -87,37 +87,37 @@ func (m *GenesisState) GetPortId() string { } func init() { - proto.RegisterType((*GenesisState)(nil), "feeabstraction.absfee.v1beta1.GenesisState") + proto.RegisterType((*GenesisState)(nil), "feeabstraction.feeabs.v1beta1.GenesisState") } func init() { - proto.RegisterFile("feeabstraction/absfee/v1beta1/genesis.proto", fileDescriptor_c85d049bd82004cc) + proto.RegisterFile("feeabstraction/feeabs/v1beta1/genesis.proto", fileDescriptor_a6133d256fb92bdc) } -var fileDescriptor_c85d049bd82004cc = []byte{ - // 341 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xc1, 0x4a, 0xc3, 0x40, - 0x10, 0x86, 0x13, 0x2b, 0x11, 0x53, 0xbd, 0x04, 0xc5, 0x52, 0x34, 0x2d, 0x05, 0x21, 0x2a, 0xcd, - 0xd2, 0x7a, 0x10, 0x3d, 0x16, 0x54, 0x7a, 0x93, 0xd6, 0x93, 0x17, 0x99, 0xa4, 0x93, 0x34, 0xd0, - 0x64, 0xd6, 0xec, 0xb6, 0xd8, 0xb7, 0xf0, 0xa5, 0x84, 0x1e, 0x7b, 0xf4, 0x54, 0xa4, 0x7d, 0x03, - 0x9f, 0x40, 0x92, 0x4d, 0x45, 0x2f, 0xf5, 0xb6, 0x0b, 0xdf, 0xff, 0xcd, 0xcc, 0x6f, 0x5e, 0x04, - 0x88, 0xe0, 0x09, 0x99, 0x82, 0x2f, 0x23, 0x4a, 0x18, 0x78, 0x22, 0x40, 0x64, 0x93, 0x96, 0x87, - 0x12, 0x5a, 0x2c, 0xc4, 0x04, 0x45, 0x24, 0x5c, 0x9e, 0x92, 0x24, 0xeb, 0xe4, 0x2f, 0xec, 0x2a, - 0xd8, 0x2d, 0xe0, 0xea, 0x41, 0x48, 0x21, 0xe5, 0x24, 0xcb, 0x5e, 0x2a, 0x54, 0x3d, 0x0e, 0x89, - 0xc2, 0x11, 0x32, 0xe0, 0x11, 0x83, 0x24, 0x21, 0x09, 0x59, 0xb6, 0x50, 0x56, 0xcf, 0x7d, 0x12, - 0x31, 0x09, 0xe6, 0x81, 0x40, 0xf6, 0x32, 0xc6, 0x74, 0xfa, 0x33, 0x9b, 0x43, 0x18, 0x25, 0x39, - 0xbc, 0x66, 0x37, 0xef, 0xca, 0x21, 0x85, 0x78, 0xed, 0x3d, 0xdb, 0xcc, 0x22, 0x27, 0x7f, 0xa8, - 0xd0, 0xc6, 0xbb, 0x6e, 0xee, 0xdd, 0xab, 0x3b, 0xfb, 0x12, 0x24, 0x5a, 0x8f, 0xa6, 0xa1, 0x5c, - 0x15, 0xbd, 0xae, 0x3b, 0xe5, 0xf6, 0xa9, 0xbb, 0xf1, 0x6e, 0xf7, 0x21, 0x87, 0x3b, 0x87, 0xb3, - 0x45, 0x4d, 0xfb, 0x5a, 0xd4, 0xf6, 0xa7, 0x10, 0x8f, 0x6e, 0x1a, 0x4a, 0xd1, 0xe8, 0x15, 0x2e, - 0xeb, 0xce, 0x34, 0xf2, 0xa9, 0xa2, 0xb2, 0x55, 0x2f, 0x39, 0xe5, 0xb6, 0xf3, 0x8f, 0xf5, 0x36, - 0x83, 0xbb, 0x49, 0x40, 0x9d, 0xed, 0x4c, 0xdc, 0x2b, 0xd2, 0xd6, 0x91, 0xb9, 0xc3, 0x29, 0x95, - 0xcf, 0xd1, 0xa0, 0x52, 0xaa, 0xeb, 0xce, 0x6e, 0xcf, 0xc8, 0xbe, 0xdd, 0x41, 0xa7, 0x3f, 0x5b, - 0xda, 0xfa, 0x7c, 0x69, 0xeb, 0x9f, 0x4b, 0x5b, 0x7f, 0x5b, 0xd9, 0xda, 0x7c, 0x65, 0x6b, 0x1f, - 0x2b, 0x5b, 0x7b, 0xba, 0x0e, 0x23, 0x39, 0x1c, 0x7b, 0xae, 0x4f, 0x31, 0xcb, 0xeb, 0x8e, 0x44, - 0x73, 0x04, 0x9e, 0x60, 0x01, 0x62, 0xf3, 0x77, 0x4b, 0x93, 0x2b, 0xf6, 0xca, 0xd4, 0x5a, 0x4c, - 0x4e, 0x39, 0x0a, 0xcf, 0xc8, 0x3b, 0xba, 0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x28, 0x8c, 0x15, - 0xc6, 0x28, 0x02, 0x00, 0x00, +var fileDescriptor_a6133d256fb92bdc = []byte{ + // 340 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x90, 0xc1, 0x4a, 0xeb, 0x40, + 0x14, 0x86, 0x33, 0xb7, 0x97, 0x5c, 0x6e, 0xaa, 0x9b, 0xa0, 0x58, 0x8a, 0xa6, 0xa5, 0x20, 0x44, + 0xa5, 0x19, 0x5a, 0x17, 0xa2, 0xcb, 0x82, 0x4a, 0x77, 0xd2, 0xba, 0x72, 0x23, 0x93, 0xf4, 0x74, + 0x3a, 0xd0, 0xe4, 0x8c, 0x99, 0x69, 0xb1, 0x6f, 0xe1, 0x4b, 0x09, 0x5d, 0x76, 0xe9, 0xaa, 0x48, + 0xfb, 0x06, 0x3e, 0x81, 0x24, 0x93, 0x8a, 0x6e, 0xea, 0x6e, 0x0e, 0x7c, 0xff, 0x77, 0xe6, 0xfc, + 0xce, 0xd9, 0x10, 0x80, 0x85, 0x4a, 0xa7, 0x2c, 0xd2, 0x02, 0x13, 0x6a, 0x46, 0x3a, 0x6d, 0x85, + 0xa0, 0x59, 0x8b, 0x72, 0x48, 0x40, 0x09, 0x15, 0xc8, 0x14, 0x35, 0xba, 0x47, 0x3f, 0xe1, 0xc0, + 0x8c, 0x41, 0x01, 0x57, 0xf7, 0x38, 0x72, 0xcc, 0x49, 0x9a, 0xbd, 0x4c, 0xa8, 0x7a, 0xc8, 0x11, + 0xf9, 0x18, 0x28, 0x93, 0x82, 0xb2, 0x24, 0x41, 0xcd, 0xb2, 0x6c, 0xa1, 0xac, 0x9e, 0x46, 0xa8, + 0x62, 0x54, 0x34, 0x64, 0x0a, 0xe8, 0xd3, 0x04, 0xd2, 0xd9, 0xd7, 0x6e, 0xc9, 0xb8, 0x48, 0x72, + 0x78, 0xc3, 0x6e, 0xff, 0xab, 0x64, 0x29, 0x8b, 0x37, 0xde, 0x93, 0xed, 0x2c, 0x48, 0x8c, 0x46, + 0x06, 0x6d, 0xbc, 0x12, 0x67, 0xe7, 0xd6, 0xdc, 0xd9, 0xd7, 0x4c, 0x83, 0x7b, 0xef, 0xd8, 0xc6, + 0x55, 0x21, 0x75, 0xe2, 0x97, 0xdb, 0xc7, 0xc1, 0xd6, 0xbb, 0x83, 0xbb, 0x1c, 0xee, 0xec, 0xcf, + 0x97, 0x35, 0xeb, 0x63, 0x59, 0xdb, 0x9d, 0xb1, 0x78, 0x7c, 0xd5, 0x30, 0x8a, 0x46, 0xaf, 0x70, + 0xb9, 0x37, 0x8e, 0x9d, 0x6f, 0x55, 0x95, 0x3f, 0xf5, 0x92, 0x5f, 0x6e, 0xfb, 0xbf, 0x58, 0xaf, + 0x33, 0xb8, 0x9b, 0x0c, 0xb1, 0xf3, 0x37, 0x13, 0xf7, 0x8a, 0xb4, 0x7b, 0xe0, 0xfc, 0x93, 0x98, + 0xea, 0x47, 0x31, 0xa8, 0x94, 0xea, 0xc4, 0xff, 0xdf, 0xb3, 0xb3, 0xb1, 0x3b, 0xe8, 0xf4, 0xe7, + 0x2b, 0x8f, 0x2c, 0x56, 0x1e, 0x79, 0x5f, 0x79, 0xe4, 0x65, 0xed, 0x59, 0x8b, 0xb5, 0x67, 0xbd, + 0xad, 0x3d, 0xeb, 0xe1, 0x92, 0x0b, 0x3d, 0x9a, 0x84, 0x41, 0x84, 0x31, 0xcd, 0xeb, 0x16, 0xaa, + 0x39, 0xce, 0xea, 0x18, 0x02, 0x34, 0xbf, 0xb7, 0x34, 0xbd, 0xa0, 0xcf, 0x9b, 0xaa, 0xf4, 0x4c, + 0x82, 0x0a, 0xed, 0xbc, 0xa3, 0xf3, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x26, 0x61, 0xae, 0xd2, + 0x28, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/feeabs/types/osmosisibc.pb.go b/x/feeabs/types/osmosisibc.pb.go index 23c870d1..9dca16c0 100644 --- a/x/feeabs/types/osmosisibc.pb.go +++ b/x/feeabs/types/osmosisibc.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feeabstraction/absfee/v1beta1/osmosisibc.proto +// source: feeabstraction/feeabs/v1beta1/osmosisibc.proto package types @@ -41,7 +41,7 @@ func (m *QueryArithmeticTwapToNowRequest) Reset() { *m = QueryArithmetic func (m *QueryArithmeticTwapToNowRequest) String() string { return proto.CompactTextString(m) } func (*QueryArithmeticTwapToNowRequest) ProtoMessage() {} func (*QueryArithmeticTwapToNowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d7e956854d14a746, []int{0} + return fileDescriptor_29d8511a7187d317, []int{0} } func (m *QueryArithmeticTwapToNowRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -106,7 +106,7 @@ func (m *QueryArithmeticTwapToNowResponse) Reset() { *m = QueryArithmeti func (m *QueryArithmeticTwapToNowResponse) String() string { return proto.CompactTextString(m) } func (*QueryArithmeticTwapToNowResponse) ProtoMessage() {} func (*QueryArithmeticTwapToNowResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d7e956854d14a746, []int{1} + return fileDescriptor_29d8511a7187d317, []int{1} } func (m *QueryArithmeticTwapToNowResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -144,7 +144,7 @@ func (m *InterchainQueryRequest) Reset() { *m = InterchainQueryRequest{} func (m *InterchainQueryRequest) String() string { return proto.CompactTextString(m) } func (*InterchainQueryRequest) ProtoMessage() {} func (*InterchainQueryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d7e956854d14a746, []int{2} + return fileDescriptor_29d8511a7187d317, []int{2} } func (m *InterchainQueryRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -198,7 +198,7 @@ func (m *InterchainQueryPacketData) Reset() { *m = InterchainQueryPacket func (m *InterchainQueryPacketData) String() string { return proto.CompactTextString(m) } func (*InterchainQueryPacketData) ProtoMessage() {} func (*InterchainQueryPacketData) Descriptor() ([]byte, []int) { - return fileDescriptor_d7e956854d14a746, []int{3} + return fileDescriptor_29d8511a7187d317, []int{3} } func (m *InterchainQueryPacketData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -251,7 +251,7 @@ func (m *InterchainQueryPacketAck) Reset() { *m = InterchainQueryPacketA func (m *InterchainQueryPacketAck) String() string { return proto.CompactTextString(m) } func (*InterchainQueryPacketAck) ProtoMessage() {} func (*InterchainQueryPacketAck) Descriptor() ([]byte, []int) { - return fileDescriptor_d7e956854d14a746, []int{4} + return fileDescriptor_29d8511a7187d317, []int{4} } func (m *InterchainQueryPacketAck) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -295,7 +295,7 @@ func (m *InterchainQueryRequestPacket) Reset() { *m = InterchainQueryReq func (m *InterchainQueryRequestPacket) String() string { return proto.CompactTextString(m) } func (*InterchainQueryRequestPacket) ProtoMessage() {} func (*InterchainQueryRequestPacket) Descriptor() ([]byte, []int) { - return fileDescriptor_d7e956854d14a746, []int{5} + return fileDescriptor_29d8511a7187d317, []int{5} } func (m *InterchainQueryRequestPacket) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -341,7 +341,7 @@ func (m *CosmosQuery) Reset() { *m = CosmosQuery{} } func (m *CosmosQuery) String() string { return proto.CompactTextString(m) } func (*CosmosQuery) ProtoMessage() {} func (*CosmosQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_d7e956854d14a746, []int{6} + return fileDescriptor_29d8511a7187d317, []int{6} } func (m *CosmosQuery) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -387,7 +387,7 @@ func (m *CosmosResponse) Reset() { *m = CosmosResponse{} } func (m *CosmosResponse) String() string { return proto.CompactTextString(m) } func (*CosmosResponse) ProtoMessage() {} func (*CosmosResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d7e956854d14a746, []int{7} + return fileDescriptor_29d8511a7187d317, []int{7} } func (m *CosmosResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -424,59 +424,59 @@ func (m *CosmosResponse) GetResponses() []types.ResponseQuery { } func init() { - proto.RegisterType((*QueryArithmeticTwapToNowRequest)(nil), "feeabstraction.absfee.v1beta1.QueryArithmeticTwapToNowRequest") - proto.RegisterType((*QueryArithmeticTwapToNowResponse)(nil), "feeabstraction.absfee.v1beta1.QueryArithmeticTwapToNowResponse") - proto.RegisterType((*InterchainQueryRequest)(nil), "feeabstraction.absfee.v1beta1.InterchainQueryRequest") - proto.RegisterType((*InterchainQueryPacketData)(nil), "feeabstraction.absfee.v1beta1.InterchainQueryPacketData") - proto.RegisterType((*InterchainQueryPacketAck)(nil), "feeabstraction.absfee.v1beta1.InterchainQueryPacketAck") - proto.RegisterType((*InterchainQueryRequestPacket)(nil), "feeabstraction.absfee.v1beta1.InterchainQueryRequestPacket") - proto.RegisterType((*CosmosQuery)(nil), "feeabstraction.absfee.v1beta1.CosmosQuery") - proto.RegisterType((*CosmosResponse)(nil), "feeabstraction.absfee.v1beta1.CosmosResponse") + proto.RegisterType((*QueryArithmeticTwapToNowRequest)(nil), "feeabstraction.feeabs.v1beta1.QueryArithmeticTwapToNowRequest") + proto.RegisterType((*QueryArithmeticTwapToNowResponse)(nil), "feeabstraction.feeabs.v1beta1.QueryArithmeticTwapToNowResponse") + proto.RegisterType((*InterchainQueryRequest)(nil), "feeabstraction.feeabs.v1beta1.InterchainQueryRequest") + proto.RegisterType((*InterchainQueryPacketData)(nil), "feeabstraction.feeabs.v1beta1.InterchainQueryPacketData") + proto.RegisterType((*InterchainQueryPacketAck)(nil), "feeabstraction.feeabs.v1beta1.InterchainQueryPacketAck") + proto.RegisterType((*InterchainQueryRequestPacket)(nil), "feeabstraction.feeabs.v1beta1.InterchainQueryRequestPacket") + proto.RegisterType((*CosmosQuery)(nil), "feeabstraction.feeabs.v1beta1.CosmosQuery") + proto.RegisterType((*CosmosResponse)(nil), "feeabstraction.feeabs.v1beta1.CosmosResponse") } func init() { - proto.RegisterFile("feeabstraction/absfee/v1beta1/osmosisibc.proto", fileDescriptor_d7e956854d14a746) + proto.RegisterFile("feeabstraction/feeabs/v1beta1/osmosisibc.proto", fileDescriptor_29d8511a7187d317) } -var fileDescriptor_d7e956854d14a746 = []byte{ - // 591 bytes of a gzipped FileDescriptorProto +var fileDescriptor_29d8511a7187d317 = []byte{ + // 587 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0xc1, 0x6e, 0xd3, 0x4c, - 0x10, 0xc7, 0xe3, 0xaf, 0x51, 0x3f, 0xb2, 0x41, 0x45, 0x58, 0xa8, 0x84, 0xd2, 0xd8, 0x91, 0x0f, - 0x28, 0x97, 0xee, 0xaa, 0x45, 0x08, 0xc1, 0x05, 0x9a, 0xf6, 0x40, 0x2f, 0x15, 0x98, 0x48, 0x20, - 0x2e, 0xd1, 0xda, 0xd9, 0x24, 0xab, 0xc6, 0x5e, 0xc7, 0x3b, 0x69, 0xc8, 0x5b, 0xf4, 0xc2, 0x3b, - 0xf5, 0xd8, 0x03, 0x07, 0xc4, 0x21, 0xa0, 0xe4, 0x0d, 0xfa, 0x04, 0x68, 0xd7, 0xeb, 0x24, 0x6d, - 0x0d, 0xa7, 0xcc, 0xce, 0xfc, 0xe7, 0xb7, 0x33, 0x93, 0xf1, 0x22, 0xdc, 0x63, 0x8c, 0x06, 0x12, - 0x52, 0x1a, 0x02, 0x17, 0x31, 0xa1, 0x81, 0xec, 0x31, 0x46, 0xce, 0xf7, 0x03, 0x06, 0x74, 0x9f, - 0x08, 0x19, 0x09, 0xc9, 0x25, 0x0f, 0x42, 0x9c, 0xa4, 0x02, 0x84, 0x5d, 0xbf, 0xa9, 0xc7, 0x99, - 0x1e, 0x1b, 0xfd, 0xce, 0xa3, 0xbe, 0xe8, 0x0b, 0xad, 0x24, 0xca, 0xca, 0x92, 0x76, 0xdc, 0xbe, - 0x10, 0xfd, 0x21, 0x23, 0xfa, 0x14, 0x8c, 0x7b, 0x04, 0x78, 0xc4, 0x24, 0xd0, 0x28, 0x31, 0x82, - 0x5d, 0x23, 0xa0, 0x09, 0x27, 0x34, 0x8e, 0x05, 0x50, 0x05, 0x97, 0x26, 0xfa, 0x14, 0x58, 0xdc, - 0x65, 0x69, 0xc4, 0x63, 0x20, 0x34, 0x08, 0x39, 0x81, 0x69, 0xc2, 0x4c, 0xd0, 0xfb, 0x6e, 0x21, - 0xf7, 0xc3, 0x98, 0xa5, 0xd3, 0xc3, 0x94, 0xc3, 0x20, 0x62, 0xc0, 0xc3, 0xf6, 0x84, 0x26, 0x6d, - 0x71, 0x2a, 0x26, 0x3e, 0x1b, 0x8d, 0x99, 0x04, 0xfb, 0x31, 0xfa, 0x3f, 0x11, 0x62, 0xd8, 0xe1, - 0xdd, 0x9a, 0xd5, 0xb0, 0x9a, 0x65, 0x7f, 0x53, 0x1d, 0x4f, 0xba, 0x76, 0x1d, 0xa1, 0x80, 0x4a, - 0xd6, 0xa1, 0x52, 0x32, 0xa8, 0xfd, 0xd7, 0xb0, 0x9a, 0x15, 0xbf, 0xa2, 0x3c, 0x87, 0xca, 0x61, - 0xbb, 0xa8, 0x3a, 0x1a, 0x0b, 0xc8, 0xe3, 0x1b, 0x3a, 0x8e, 0xb4, 0x2b, 0x13, 0x7c, 0x46, 0x48, - 0x02, 0x4d, 0xa1, 0xa3, 0x1a, 0xaa, 0x95, 0x1b, 0x56, 0xb3, 0x7a, 0xb0, 0x83, 0xb3, 0x66, 0x70, - 0xde, 0x2d, 0x6e, 0xe7, 0xdd, 0xb6, 0xea, 0x97, 0x33, 0xb7, 0x74, 0x3d, 0x73, 0x1f, 0x4e, 0x69, - 0x34, 0x7c, 0xed, 0xad, 0x72, 0xbd, 0x8b, 0x5f, 0xae, 0xe5, 0x57, 0xb4, 0x43, 0xc9, 0xbd, 0x6f, - 0x16, 0x6a, 0xfc, 0xbd, 0x2d, 0x99, 0x88, 0x58, 0x32, 0x7b, 0x84, 0x1e, 0xd0, 0x65, 0xb8, 0x03, - 0x13, 0x9a, 0xe8, 0xfe, 0x2a, 0xad, 0x77, 0xea, 0x9e, 0x9f, 0x33, 0xf7, 0x59, 0x9f, 0xc3, 0x60, - 0x1c, 0xe0, 0x50, 0x44, 0x24, 0xd4, 0xff, 0xa5, 0xf9, 0xd9, 0x93, 0xdd, 0x33, 0x33, 0xc6, 0x63, - 0x16, 0x5e, 0xcf, 0xdc, 0xed, 0xac, 0xa2, 0x5b, 0x38, 0xcf, 0xdf, 0xa2, 0x37, 0xee, 0xf7, 0xde, - 0xa2, 0xed, 0x93, 0x18, 0x58, 0x1a, 0x0e, 0x28, 0x8f, 0x75, 0x81, 0xf9, 0x90, 0x6d, 0x54, 0xee, - 0x52, 0xa0, 0xba, 0x82, 0xfb, 0xbe, 0xb6, 0x95, 0x2f, 0xa1, 0x30, 0x30, 0x93, 0xd5, 0xb6, 0x77, - 0x84, 0x9e, 0xdc, 0x22, 0xbc, 0xa7, 0xe1, 0x19, 0x83, 0x63, 0x93, 0x50, 0x04, 0x89, 0x58, 0x24, - 0x72, 0x88, 0xb2, 0x3d, 0x8c, 0x6a, 0x85, 0x90, 0xc3, 0xf0, 0xac, 0x88, 0xe1, 0x4d, 0xd0, 0x6e, - 0x71, 0xd9, 0x59, 0x9a, 0xfd, 0x09, 0xdd, 0x4b, 0x33, 0x87, 0xac, 0x59, 0x8d, 0x8d, 0x66, 0xf5, - 0xe0, 0x05, 0xfe, 0xe7, 0xa6, 0xe3, 0x62, 0x5c, 0xab, 0xac, 0x26, 0xef, 0x2f, 0x61, 0xde, 0x29, - 0xaa, 0x1e, 0xe9, 0x89, 0x6b, 0x95, 0xfd, 0xe6, 0xce, 0x3d, 0x75, 0xbc, 0xda, 0x6e, 0xac, 0xb6, - 0x1b, 0x1b, 0x94, 0x4e, 0xb8, 0xc3, 0x6b, 0xa3, 0xad, 0x8c, 0xb7, 0x5c, 0x82, 0x16, 0xaa, 0xa4, - 0xc6, 0xce, 0x99, 0x4e, 0x01, 0x33, 0x53, 0xac, 0x43, 0x57, 0x69, 0xad, 0x8f, 0x97, 0x73, 0xc7, - 0xba, 0x9a, 0x3b, 0xd6, 0xef, 0xb9, 0x63, 0x5d, 0x2c, 0x9c, 0xd2, 0xd5, 0xc2, 0x29, 0xfd, 0x58, - 0x38, 0xa5, 0x2f, 0xaf, 0xd6, 0x36, 0xc8, 0x3c, 0x06, 0x7b, 0x43, 0x1a, 0x48, 0xd2, 0x63, 0x6c, - 0x6f, 0xfd, 0xe1, 0x38, 0x7f, 0x49, 0xbe, 0x92, 0x6c, 0x64, 0xd9, 0x62, 0x05, 0x9b, 0xfa, 0x03, - 0x78, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x1d, 0x13, 0x0a, 0x63, 0x04, 0x00, 0x00, + 0x10, 0xc7, 0xe3, 0xaf, 0x51, 0x3f, 0xb2, 0x41, 0x45, 0x58, 0xa8, 0x84, 0xd0, 0xd8, 0x91, 0x0f, + 0x28, 0x97, 0xac, 0xd5, 0x22, 0x84, 0xe0, 0x02, 0x49, 0x7b, 0xa0, 0x97, 0x0a, 0x4c, 0x24, 0x10, + 0x97, 0x68, 0xed, 0x6c, 0x92, 0x55, 0x62, 0xaf, 0xe3, 0x9d, 0x34, 0xe4, 0x2d, 0x7a, 0xe1, 0x9d, + 0x7a, 0xec, 0x81, 0x03, 0xe2, 0x10, 0x50, 0xf2, 0x06, 0x7d, 0x02, 0xb4, 0xeb, 0x75, 0x92, 0xb6, + 0x86, 0x53, 0x66, 0x67, 0xfe, 0xf3, 0xdb, 0x9d, 0xc9, 0x78, 0x10, 0xee, 0x53, 0x4a, 0x7c, 0x01, + 0x09, 0x09, 0x80, 0xf1, 0xc8, 0x4d, 0x8f, 0xee, 0xf9, 0xa1, 0x4f, 0x81, 0x1c, 0xba, 0x5c, 0x84, + 0x5c, 0x30, 0xc1, 0xfc, 0x00, 0xc7, 0x09, 0x07, 0x6e, 0xd6, 0x6e, 0xea, 0x75, 0x3a, 0xd6, 0xfa, + 0xea, 0xa3, 0x01, 0x1f, 0x70, 0xa5, 0x74, 0xa5, 0x95, 0x26, 0x55, 0xed, 0x01, 0xe7, 0x83, 0x31, + 0x75, 0xd5, 0xc9, 0x9f, 0xf6, 0x5d, 0x60, 0x21, 0x15, 0x40, 0xc2, 0x58, 0x0b, 0x0e, 0xb4, 0x80, + 0xc4, 0xcc, 0x25, 0x51, 0xc4, 0x81, 0x48, 0xb8, 0xd0, 0xd1, 0xa7, 0x40, 0xa3, 0x1e, 0x4d, 0x42, + 0x16, 0x81, 0x4b, 0xfc, 0x80, 0xb9, 0x30, 0x8f, 0xa9, 0x0e, 0x3a, 0xdf, 0x0d, 0x64, 0x7f, 0x98, + 0xd2, 0x64, 0xde, 0x4a, 0x18, 0x0c, 0x43, 0x0a, 0x2c, 0xe8, 0xcc, 0x48, 0xdc, 0xe1, 0x67, 0x7c, + 0xe6, 0xd1, 0xc9, 0x94, 0x0a, 0x30, 0x1f, 0xa3, 0xff, 0x63, 0xce, 0xc7, 0x5d, 0xd6, 0xab, 0x18, + 0x75, 0xa3, 0x51, 0xf4, 0x76, 0xe5, 0xf1, 0xb4, 0x67, 0xd6, 0x10, 0xf2, 0x89, 0xa0, 0x5d, 0x22, + 0x04, 0x85, 0xca, 0x7f, 0x75, 0xa3, 0x51, 0xf2, 0x4a, 0xd2, 0xd3, 0x92, 0x0e, 0xd3, 0x46, 0xe5, + 0xc9, 0x94, 0x43, 0x16, 0xdf, 0x51, 0x71, 0xa4, 0x5c, 0xa9, 0xe0, 0x33, 0x42, 0x02, 0x48, 0x02, + 0x5d, 0x59, 0x50, 0xa5, 0x58, 0x37, 0x1a, 0xe5, 0xa3, 0x2a, 0x4e, 0x8b, 0xc1, 0x59, 0xb5, 0xb8, + 0x93, 0x55, 0xdb, 0xae, 0x5d, 0x2e, 0xec, 0xc2, 0xf5, 0xc2, 0x7e, 0x38, 0x27, 0xe1, 0xf8, 0xb5, + 0xb3, 0xc9, 0x75, 0x2e, 0x7e, 0xd9, 0x86, 0x57, 0x52, 0x0e, 0x29, 0x77, 0xbe, 0x19, 0xa8, 0xfe, + 0xf7, 0xb2, 0x44, 0xcc, 0x23, 0x41, 0xcd, 0x09, 0x7a, 0x40, 0xd6, 0xe1, 0x2e, 0xcc, 0x48, 0xac, + 0xea, 0x2b, 0xb5, 0xdf, 0xc9, 0x7b, 0x7e, 0x2e, 0xec, 0x67, 0x03, 0x06, 0xc3, 0xa9, 0x8f, 0x03, + 0x1e, 0xba, 0x81, 0xfa, 0x2f, 0xf5, 0x4f, 0x53, 0xf4, 0x46, 0xba, 0x8d, 0x27, 0x34, 0xb8, 0x5e, + 0xd8, 0xfb, 0xe9, 0x8b, 0x6e, 0xe1, 0x1c, 0x6f, 0x8f, 0xdc, 0xb8, 0xdf, 0x79, 0x8b, 0xf6, 0x4f, + 0x23, 0xa0, 0x49, 0x30, 0x24, 0x2c, 0x52, 0x0f, 0xcc, 0x9a, 0x6c, 0xa2, 0x62, 0x8f, 0x00, 0x51, + 0x2f, 0xb8, 0xef, 0x29, 0x5b, 0xfa, 0x62, 0x02, 0x43, 0xdd, 0x59, 0x65, 0x3b, 0xc7, 0xe8, 0xc9, + 0x2d, 0xc2, 0x7b, 0x12, 0x8c, 0x28, 0x9c, 0xe8, 0x84, 0x3c, 0x48, 0x48, 0x43, 0x9e, 0x41, 0xa4, + 0xed, 0x60, 0x54, 0xc9, 0x85, 0xb4, 0x82, 0x51, 0x1e, 0xc3, 0x99, 0xa1, 0x83, 0xfc, 0x67, 0xa7, + 0x69, 0xe6, 0x27, 0x74, 0x2f, 0x49, 0x1d, 0xa2, 0x62, 0xd4, 0x77, 0x1a, 0xe5, 0xa3, 0x17, 0xf8, + 0x9f, 0x93, 0x8e, 0xf3, 0x71, 0xed, 0xa2, 0xec, 0xbc, 0xb7, 0x86, 0x39, 0x67, 0xa8, 0x7c, 0xac, + 0x3a, 0xae, 0x54, 0xe6, 0x9b, 0x3b, 0xf7, 0xd4, 0xf0, 0x66, 0xba, 0xb1, 0x9c, 0x6e, 0xac, 0x51, + 0x2a, 0xe1, 0x0e, 0xaf, 0x83, 0xf6, 0x52, 0xde, 0x7a, 0x08, 0xda, 0xa8, 0x94, 0x68, 0x3b, 0x63, + 0x5a, 0x39, 0xcc, 0x54, 0xb1, 0x0d, 0xdd, 0xa4, 0xb5, 0x3f, 0x5e, 0x2e, 0x2d, 0xe3, 0x6a, 0x69, + 0x19, 0xbf, 0x97, 0x96, 0x71, 0xb1, 0xb2, 0x0a, 0x57, 0x2b, 0xab, 0xf0, 0x63, 0x65, 0x15, 0xbe, + 0xbc, 0xda, 0x9a, 0x20, 0xbd, 0x0c, 0x9a, 0x63, 0xb9, 0x21, 0xfa, 0x94, 0x36, 0xb7, 0x17, 0xc7, + 0xf9, 0x4b, 0xf7, 0x6b, 0xb6, 0x3d, 0xd4, 0x60, 0xf9, 0xbb, 0xea, 0x03, 0x78, 0xfe, 0x27, 0x00, + 0x00, 0xff, 0xff, 0xb6, 0x1f, 0x20, 0x17, 0x63, 0x04, 0x00, 0x00, } func (m *QueryArithmeticTwapToNowRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/feeabs/types/params.pb.go b/x/feeabs/types/params.pb.go index 4c548340..75374b55 100644 --- a/x/feeabs/types/params.pb.go +++ b/x/feeabs/types/params.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feeabstraction/absfee/v1beta1/params.proto +// source: feeabstraction/feeabs/v1beta1/params.proto package types @@ -46,7 +46,7 @@ func (m *Params) Reset() { *m = Params{} } func (m *Params) String() string { return proto.CompactTextString(m) } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_64e66a0978c84086, []int{0} + return fileDescriptor_e9fa451f85bd9084, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -118,41 +118,40 @@ func (m *Params) GetOsmosisCrosschainSwapAddress() string { } func init() { - proto.RegisterType((*Params)(nil), "feeabstraction.absfee.v1beta1.Params") + proto.RegisterType((*Params)(nil), "feeabstraction.feeabs.v1beta1.Params") } func init() { - proto.RegisterFile("feeabstraction/absfee/v1beta1/params.proto", fileDescriptor_64e66a0978c84086) + proto.RegisterFile("feeabstraction/feeabs/v1beta1/params.proto", fileDescriptor_e9fa451f85bd9084) } -var fileDescriptor_64e66a0978c84086 = []byte{ - // 401 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0xcf, 0x6f, 0xd3, 0x30, - 0x14, 0xc7, 0x9b, 0x01, 0x95, 0xe6, 0x63, 0x54, 0x44, 0x54, 0x6d, 0x01, 0x71, 0x42, 0x93, 0x56, - 0x53, 0x21, 0x84, 0x38, 0xc2, 0xc4, 0xa1, 0x17, 0x18, 0x6c, 0x27, 0x2e, 0xd6, 0xb3, 0xfb, 0x92, - 0x58, 0x6a, 0x6c, 0xd7, 0x76, 0x5a, 0xf6, 0x5f, 0xf0, 0x2f, 0x71, 0xe3, 0xb8, 0x23, 0x47, 0xd4, - 0xfe, 0x23, 0xc8, 0x3f, 0x56, 0x95, 0x5b, 0x92, 0xef, 0xe7, 0xf3, 0xde, 0x57, 0xca, 0x23, 0x17, - 0x0d, 0x22, 0x70, 0xe7, 0x2d, 0x08, 0x2f, 0xb5, 0xa2, 0xc0, 0x5d, 0x83, 0x48, 0x37, 0x73, 0x8e, - 0x1e, 0xe6, 0xd4, 0x80, 0x85, 0xde, 0xcd, 0x8c, 0xd5, 0x5e, 0x97, 0xe7, 0xff, 0xb3, 0xb3, 0xc4, - 0xce, 0x32, 0x3b, 0x9d, 0xb4, 0xba, 0xd5, 0x91, 0xa4, 0xe1, 0x29, 0x49, 0xd3, 0xb3, 0x56, 0xeb, - 0x76, 0x85, 0x14, 0x8c, 0xa4, 0xa0, 0x94, 0xf6, 0x10, 0xdc, 0x3c, 0x72, 0x7a, 0x21, 0xb4, 0xeb, - 0xb5, 0xa3, 0x1c, 0x1c, 0xd2, 0xf5, 0x80, 0xf6, 0xee, 0x68, 0x75, 0x2b, 0x55, 0x84, 0x33, 0x5b, - 0xe7, 0x49, 0xf1, 0x8d, 0x0f, 0x0d, 0x5d, 0x0e, 0xf6, 0x28, 0x7f, 0xf9, 0xeb, 0x84, 0x8c, 0xaf, - 0x63, 0xdf, 0xf2, 0x2d, 0x79, 0x16, 0xd4, 0x0d, 0x32, 0xc9, 0x05, 0x2e, 0x99, 0x54, 0x2c, 0xee, - 0x91, 0xae, 0x2a, 0x5e, 0x14, 0xaf, 0x4e, 0xbf, 0x4d, 0x52, 0xbc, 0x08, 0xe9, 0x42, 0x7d, 0x49, - 0x59, 0xd0, 0x32, 0xc6, 0x62, 0x17, 0xe6, 0xb7, 0x60, 0x98, 0x01, 0xdf, 0x55, 0x27, 0x49, 0xcb, - 0xf1, 0xd7, 0x90, 0xde, 0x6e, 0xc1, 0x5c, 0x83, 0xef, 0xca, 0x73, 0x42, 0x44, 0x07, 0x52, 0x31, - 0x05, 0x3d, 0x56, 0x8f, 0x22, 0x79, 0x1a, 0xbf, 0x7c, 0x86, 0x1e, 0xcb, 0xd7, 0x64, 0x22, 0xb9, - 0x60, 0xde, 0x82, 0x72, 0x0d, 0x5a, 0x26, 0x3a, 0x50, 0x0a, 0x57, 0xd5, 0xe3, 0x08, 0x96, 0x92, - 0x8b, 0xdb, 0x1c, 0x5d, 0xa5, 0xa4, 0x9c, 0x93, 0xa7, 0xc1, 0x48, 0x1d, 0xa4, 0x58, 0x1f, 0x94, - 0x27, 0x07, 0x25, 0x36, 0x58, 0x88, 0xf5, 0x83, 0xf2, 0x89, 0x3c, 0x7f, 0xa8, 0x2e, 0xac, 0x76, - 0x2e, 0x15, 0x72, 0xa1, 0x3f, 0x2c, 0x97, 0x16, 0x9d, 0xab, 0xc6, 0x51, 0x3e, 0xcb, 0xd8, 0xd5, - 0x81, 0xba, 0xd9, 0x82, 0xf9, 0x90, 0x98, 0x8f, 0x37, 0xbf, 0x77, 0x75, 0x71, 0xbf, 0xab, 0x8b, - 0xbf, 0xbb, 0xba, 0xf8, 0xb9, 0xaf, 0x47, 0xf7, 0xfb, 0x7a, 0xf4, 0x67, 0x5f, 0x8f, 0xbe, 0xbf, - 0x6f, 0xa5, 0xef, 0x06, 0x3e, 0x13, 0xba, 0xa7, 0x79, 0xc4, 0xe5, 0x0a, 0xb8, 0xa3, 0x0d, 0xe2, - 0xe5, 0xf1, 0x05, 0x6d, 0xde, 0xd1, 0x1f, 0x34, 0x5d, 0x0a, 0xf5, 0x77, 0x06, 0x1d, 0x1f, 0xc7, - 0xff, 0xf3, 0xe6, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x76, 0x05, 0x27, 0xd0, 0x6c, 0x02, 0x00, - 0x00, +var fileDescriptor_e9fa451f85bd9084 = []byte{ + // 397 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0xbf, 0x8e, 0x13, 0x31, + 0x10, 0xc6, 0xb3, 0x07, 0x44, 0x3a, 0x97, 0xab, 0x20, 0x56, 0xd1, 0xdd, 0x82, 0xa8, 0xd0, 0x49, + 0x17, 0x13, 0x21, 0x84, 0x28, 0xe1, 0x44, 0x91, 0x06, 0x0e, 0xee, 0x2a, 0x1a, 0x6b, 0xec, 0x4c, + 0x76, 0x2d, 0x65, 0x6d, 0xc7, 0xf6, 0x26, 0xdc, 0x5b, 0xf0, 0x4a, 0x74, 0x94, 0x29, 0x29, 0x51, + 0xf2, 0x22, 0xc8, 0x7f, 0x12, 0x85, 0x2e, 0x93, 0xef, 0xf7, 0x1b, 0x7f, 0xd2, 0x0e, 0xb9, 0x5a, + 0x20, 0x02, 0x77, 0xde, 0x82, 0xf0, 0x52, 0x2b, 0x9a, 0x46, 0xba, 0x9e, 0x72, 0xf4, 0x30, 0xa5, + 0x06, 0x2c, 0x74, 0x6e, 0x62, 0xac, 0xf6, 0xba, 0xbc, 0xfc, 0x9f, 0x9d, 0xa4, 0x71, 0x92, 0xd9, + 0xf1, 0xa8, 0xd1, 0x8d, 0x8e, 0x24, 0x0d, 0xbf, 0x92, 0x34, 0xbe, 0x68, 0xb4, 0x6e, 0x96, 0x48, + 0xc1, 0x48, 0x0a, 0x4a, 0x69, 0x0f, 0xc1, 0xcd, 0x2b, 0xc7, 0x57, 0x42, 0xbb, 0x4e, 0x3b, 0xca, + 0xc1, 0x21, 0x5d, 0xf5, 0x68, 0x1f, 0x4e, 0x9e, 0x6e, 0xa4, 0x8a, 0x70, 0x66, 0xeb, 0xbc, 0x29, + 0x4e, 0xbc, 0x5f, 0xd0, 0x79, 0x6f, 0x4f, 0xf2, 0x97, 0xbf, 0xce, 0xc8, 0xf0, 0x36, 0xf6, 0x2d, + 0xdf, 0x92, 0x67, 0x41, 0x5d, 0x23, 0x93, 0x5c, 0xe0, 0x9c, 0x49, 0xc5, 0xe2, 0x3b, 0xd2, 0x55, + 0xc5, 0x8b, 0xe2, 0xd5, 0xf9, 0xb7, 0x51, 0x8a, 0x67, 0x21, 0x9d, 0xa9, 0x2f, 0x29, 0x0b, 0x5a, + 0xc6, 0x58, 0xec, 0xc2, 0xfc, 0x06, 0x0c, 0x33, 0xe0, 0xdb, 0xea, 0x2c, 0x69, 0x39, 0xfe, 0x1a, + 0xd2, 0xfb, 0x0d, 0x98, 0x5b, 0xf0, 0x6d, 0x79, 0x49, 0x88, 0x68, 0x41, 0x2a, 0xa6, 0xa0, 0xc3, + 0xea, 0x51, 0x24, 0xcf, 0xe3, 0x3f, 0x9f, 0xa1, 0xc3, 0xf2, 0x35, 0x19, 0x49, 0x2e, 0x98, 0xb7, + 0xa0, 0xdc, 0x02, 0x2d, 0x13, 0x2d, 0x28, 0x85, 0xcb, 0xea, 0x71, 0x04, 0x4b, 0xc9, 0xc5, 0x7d, + 0x8e, 0x6e, 0x52, 0x52, 0x4e, 0xc9, 0xd3, 0x60, 0xa4, 0x0e, 0x52, 0xac, 0x8e, 0xca, 0x93, 0xa3, + 0x12, 0x1b, 0xcc, 0xc4, 0xea, 0xa0, 0x7c, 0x22, 0xcf, 0x0f, 0xd5, 0x85, 0xd5, 0xce, 0xa5, 0x42, + 0x2e, 0xf4, 0x87, 0xf9, 0xdc, 0xa2, 0x73, 0xd5, 0x30, 0xca, 0x17, 0x19, 0xbb, 0x39, 0x52, 0x77, + 0x1b, 0x30, 0x1f, 0x12, 0xf3, 0xf1, 0xee, 0xf7, 0xae, 0x2e, 0xb6, 0xbb, 0xba, 0xf8, 0xbb, 0xab, + 0x8b, 0x9f, 0xfb, 0x7a, 0xb0, 0xdd, 0xd7, 0x83, 0x3f, 0xfb, 0x7a, 0xf0, 0xfd, 0x7d, 0x23, 0x7d, + 0xdb, 0xf3, 0x89, 0xd0, 0x1d, 0xcd, 0x2b, 0xae, 0x97, 0xe1, 0x54, 0x16, 0x88, 0xd7, 0xa7, 0x17, + 0xb4, 0x7e, 0x47, 0x7f, 0x1c, 0xce, 0xc8, 0x3f, 0x18, 0x74, 0x7c, 0x18, 0xbf, 0xcf, 0x9b, 0x7f, + 0x01, 0x00, 0x00, 0xff, 0xff, 0x41, 0x72, 0xdb, 0x7b, 0x6c, 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/feeabs/types/proposal.pb.go b/x/feeabs/types/proposal.pb.go index 076b4482..edaab0ef 100644 --- a/x/feeabs/types/proposal.pb.go +++ b/x/feeabs/types/proposal.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feeabstraction/absfee/v1beta1/proposal.proto +// source: feeabstraction/feeabs/v1beta1/proposal.proto package types @@ -40,7 +40,7 @@ func (m *HostChainFeeAbsConfig) Reset() { *m = HostChainFeeAbsConfig{} } func (m *HostChainFeeAbsConfig) String() string { return proto.CompactTextString(m) } func (*HostChainFeeAbsConfig) ProtoMessage() {} func (*HostChainFeeAbsConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_b23c77c2b5aa1f89, []int{0} + return fileDescriptor_c397b73ee3101036, []int{0} } func (m *HostChainFeeAbsConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -110,7 +110,7 @@ func (m *AddHostZoneProposal) Reset() { *m = AddHostZoneProposal{} } func (m *AddHostZoneProposal) String() string { return proto.CompactTextString(m) } func (*AddHostZoneProposal) ProtoMessage() {} func (*AddHostZoneProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_b23c77c2b5aa1f89, []int{1} + return fileDescriptor_c397b73ee3101036, []int{1} } func (m *AddHostZoneProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -152,7 +152,7 @@ func (m *DeleteHostZoneProposal) Reset() { *m = DeleteHostZoneProposal{} func (m *DeleteHostZoneProposal) String() string { return proto.CompactTextString(m) } func (*DeleteHostZoneProposal) ProtoMessage() {} func (*DeleteHostZoneProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_b23c77c2b5aa1f89, []int{2} + return fileDescriptor_c397b73ee3101036, []int{2} } func (m *DeleteHostZoneProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -194,7 +194,7 @@ func (m *SetHostZoneProposal) Reset() { *m = SetHostZoneProposal{} } func (m *SetHostZoneProposal) String() string { return proto.CompactTextString(m) } func (*SetHostZoneProposal) ProtoMessage() {} func (*SetHostZoneProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_b23c77c2b5aa1f89, []int{3} + return fileDescriptor_c397b73ee3101036, []int{3} } func (m *SetHostZoneProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -224,48 +224,48 @@ func (m *SetHostZoneProposal) XXX_DiscardUnknown() { var xxx_messageInfo_SetHostZoneProposal proto.InternalMessageInfo func init() { - proto.RegisterType((*HostChainFeeAbsConfig)(nil), "feeabstraction.absfee.v1beta1.HostChainFeeAbsConfig") - proto.RegisterType((*AddHostZoneProposal)(nil), "feeabstraction.absfee.v1beta1.AddHostZoneProposal") - proto.RegisterType((*DeleteHostZoneProposal)(nil), "feeabstraction.absfee.v1beta1.DeleteHostZoneProposal") - proto.RegisterType((*SetHostZoneProposal)(nil), "feeabstraction.absfee.v1beta1.SetHostZoneProposal") + proto.RegisterType((*HostChainFeeAbsConfig)(nil), "feeabstraction.feeabs.v1beta1.HostChainFeeAbsConfig") + proto.RegisterType((*AddHostZoneProposal)(nil), "feeabstraction.feeabs.v1beta1.AddHostZoneProposal") + proto.RegisterType((*DeleteHostZoneProposal)(nil), "feeabstraction.feeabs.v1beta1.DeleteHostZoneProposal") + proto.RegisterType((*SetHostZoneProposal)(nil), "feeabstraction.feeabs.v1beta1.SetHostZoneProposal") } func init() { - proto.RegisterFile("feeabstraction/absfee/v1beta1/proposal.proto", fileDescriptor_b23c77c2b5aa1f89) + proto.RegisterFile("feeabstraction/feeabs/v1beta1/proposal.proto", fileDescriptor_c397b73ee3101036) } -var fileDescriptor_b23c77c2b5aa1f89 = []byte{ - // 470 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x93, 0xbf, 0x6e, 0xd4, 0x40, - 0x10, 0xc6, 0xcf, 0xe4, 0x38, 0x92, 0x4d, 0x81, 0x30, 0x47, 0x62, 0x25, 0xe0, 0x3b, 0xb9, 0xba, - 0x82, 0x78, 0x15, 0xfe, 0x08, 0x11, 0xd1, 0xe4, 0x8f, 0x10, 0xe9, 0x22, 0x87, 0x2a, 0x8d, 0xd9, - 0xb5, 0xc7, 0xbe, 0x15, 0xeb, 0x1d, 0xcb, 0xbb, 0x09, 0x84, 0x27, 0xa0, 0xe4, 0x11, 0x78, 0x09, - 0x4a, 0x7a, 0xca, 0x2b, 0xa9, 0x10, 0xba, 0x7b, 0x03, 0x9e, 0x00, 0xad, 0xbd, 0xa0, 0x43, 0x42, - 0x54, 0x34, 0xe9, 0xfc, 0xcd, 0xfe, 0x66, 0xfc, 0xf9, 0x1b, 0x2f, 0xb9, 0x5f, 0x00, 0x30, 0xae, - 0x4d, 0xc3, 0x32, 0x23, 0x50, 0x51, 0xc6, 0x75, 0x01, 0x40, 0x2f, 0x76, 0x39, 0x18, 0xb6, 0x4b, - 0xeb, 0x06, 0x6b, 0xd4, 0x4c, 0xc6, 0x75, 0x83, 0x06, 0xfd, 0x7b, 0x7f, 0xd2, 0x71, 0x47, 0xc7, - 0x8e, 0xde, 0x1a, 0x96, 0x58, 0x62, 0x4b, 0x52, 0xfb, 0xd4, 0x35, 0x6d, 0x8d, 0x4a, 0xc4, 0x52, - 0x02, 0x6d, 0x15, 0x3f, 0x2f, 0xa8, 0x11, 0x15, 0x68, 0xc3, 0xaa, 0xda, 0x01, 0x77, 0x1d, 0xc0, - 0x6a, 0x41, 0x99, 0x52, 0x68, 0x98, 0x1d, 0xae, 0xbb, 0xd3, 0xe8, 0xb3, 0x47, 0xee, 0xbc, 0x40, - 0x6d, 0x0e, 0xa7, 0x4c, 0xa8, 0xe7, 0x00, 0xfb, 0x5c, 0x1f, 0xa2, 0x2a, 0x44, 0xe9, 0x3f, 0x26, - 0x6b, 0x82, 0x67, 0x69, 0x0e, 0x0a, 0xab, 0xc0, 0x1b, 0x7b, 0x93, 0xb5, 0x83, 0xe0, 0xc7, 0xb7, - 0xd1, 0xf0, 0x92, 0x55, 0x72, 0x2f, 0x62, 0x52, 0xe2, 0x1b, 0xc8, 0x53, 0x83, 0xaf, 0x41, 0x45, - 0xc9, 0xaa, 0xe0, 0xd9, 0x91, 0x25, 0xfd, 0x67, 0x64, 0x1b, 0x75, 0x85, 0x5a, 0xe8, 0xb4, 0x46, - 0x94, 0x1d, 0xd0, 0x4d, 0x49, 0x85, 0x0a, 0xae, 0xd9, 0x41, 0xc9, 0xa6, 0x43, 0x4e, 0x10, 0xe5, - 0x4b, 0x0b, 0xb4, 0xbd, 0xc7, 0xca, 0xdf, 0x24, 0x37, 0xda, 0x2e, 0x91, 0x07, 0x2b, 0x63, 0x6f, - 0xd2, 0x4f, 0x06, 0x56, 0x1e, 0xe7, 0xfe, 0x06, 0x19, 0x14, 0x0d, 0xbe, 0x03, 0x15, 0xf4, 0xc7, - 0xde, 0x64, 0x35, 0x71, 0x2a, 0xfa, 0xe4, 0x91, 0xdb, 0xfb, 0x79, 0x6e, 0x3f, 0xe1, 0x0c, 0x15, - 0x9c, 0xb8, 0x44, 0xfd, 0x21, 0xb9, 0x6e, 0x84, 0x91, 0xd0, 0x39, 0x4f, 0x3a, 0xe1, 0x8f, 0xc9, - 0x7a, 0x0e, 0x3a, 0x6b, 0x44, 0x6d, 0x33, 0x70, 0x66, 0x96, 0x4b, 0xfe, 0x2b, 0x72, 0x6b, 0x8a, - 0xda, 0xa4, 0x99, 0xcd, 0x23, 0xcd, 0xda, 0x28, 0x5a, 0x2b, 0xeb, 0x0f, 0x1e, 0xc5, 0xff, 0xdc, - 0x4f, 0xfc, 0xd7, 0x18, 0x93, 0x9b, 0xd3, 0x5f, 0xe5, 0xae, 0xb0, 0xd7, 0x7f, 0xff, 0x71, 0xd4, - 0x8b, 0x34, 0xd9, 0x38, 0x02, 0x09, 0x06, 0xfe, 0x9b, 0xf3, 0xed, 0xe5, 0x7d, 0xad, 0xb4, 0xe7, - 0xbf, 0xb7, 0xe2, 0x5e, 0x6a, 0xc3, 0x3a, 0x05, 0x73, 0xd5, 0xc2, 0x3a, 0x38, 0xfd, 0x32, 0x0f, - 0xbd, 0xd9, 0x3c, 0xf4, 0xbe, 0xcf, 0x43, 0xef, 0xc3, 0x22, 0xec, 0xcd, 0x16, 0x61, 0xef, 0xeb, - 0x22, 0xec, 0x9d, 0x3d, 0x2d, 0x85, 0x99, 0x9e, 0xf3, 0x38, 0xc3, 0x8a, 0xba, 0x7f, 0x6a, 0x47, - 0x32, 0xae, 0x69, 0x01, 0xb0, 0xb3, 0x7c, 0xf3, 0x2e, 0x9e, 0xd0, 0xb7, 0xb4, 0xb3, 0x44, 0xcd, - 0x65, 0x0d, 0x9a, 0x0f, 0xda, 0x0b, 0xf0, 0xf0, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x48, - 0xe3, 0x9f, 0xa4, 0x03, 0x00, 0x00, +var fileDescriptor_c397b73ee3101036 = []byte{ + // 466 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x93, 0xbd, 0x6e, 0xd4, 0x40, + 0x10, 0xc7, 0xcf, 0xe4, 0x38, 0x92, 0x4d, 0x81, 0x30, 0x47, 0x62, 0x25, 0xe0, 0x3b, 0xb9, 0xba, + 0x82, 0x78, 0x15, 0x3e, 0x84, 0x88, 0x68, 0xf2, 0x21, 0x44, 0xba, 0xc8, 0xa1, 0x4a, 0x63, 0xd6, + 0xf6, 0xd8, 0xb7, 0x62, 0xbd, 0x63, 0x79, 0x37, 0x81, 0xf0, 0x04, 0x94, 0x3c, 0x02, 0x2f, 0x41, + 0x49, 0x4f, 0x99, 0x92, 0x0a, 0xa1, 0xbb, 0x37, 0xe0, 0x09, 0xd0, 0x7a, 0xf7, 0xd0, 0x21, 0x21, + 0x2a, 0x1a, 0x3a, 0xff, 0x67, 0x7e, 0x33, 0x1e, 0xff, 0xc7, 0x43, 0xee, 0x97, 0x00, 0x2c, 0x53, + 0xba, 0x65, 0xb9, 0xe6, 0x28, 0xa9, 0x95, 0xf4, 0x62, 0x37, 0x03, 0xcd, 0x76, 0x69, 0xd3, 0x62, + 0x83, 0x8a, 0x89, 0xb8, 0x69, 0x51, 0xa3, 0x7f, 0xef, 0x77, 0x3a, 0xb6, 0x32, 0x76, 0xf4, 0xd6, + 0xb0, 0xc2, 0x0a, 0x3b, 0x92, 0x9a, 0x27, 0x5b, 0xb4, 0x35, 0xaa, 0x10, 0x2b, 0x01, 0xb4, 0x53, + 0xd9, 0x79, 0x49, 0x35, 0xaf, 0x41, 0x69, 0x56, 0x37, 0x0e, 0xb8, 0xeb, 0x00, 0xd6, 0x70, 0xca, + 0xa4, 0x44, 0xcd, 0x4c, 0x73, 0x65, 0xb3, 0xd1, 0x67, 0x8f, 0xdc, 0x79, 0x81, 0x4a, 0x1f, 0x4e, + 0x19, 0x97, 0xcf, 0x01, 0xf6, 0x33, 0x75, 0x88, 0xb2, 0xe4, 0x95, 0xff, 0x98, 0xac, 0xf1, 0x2c, + 0x4f, 0x0b, 0x90, 0x58, 0x07, 0xde, 0xd8, 0x9b, 0xac, 0x1d, 0x04, 0x3f, 0xbe, 0x8d, 0x86, 0x97, + 0xac, 0x16, 0x7b, 0x11, 0x13, 0x02, 0xdf, 0x40, 0x91, 0x6a, 0x7c, 0x0d, 0x32, 0x4a, 0x56, 0x79, + 0x96, 0x1f, 0x19, 0xd2, 0x7f, 0x46, 0xb6, 0x51, 0xd5, 0xa8, 0xb8, 0x4a, 0x1b, 0x44, 0x61, 0x01, + 0xdb, 0x25, 0xe5, 0x32, 0xb8, 0x66, 0x1a, 0x25, 0x9b, 0x0e, 0x39, 0x41, 0x14, 0x2f, 0x0d, 0xd0, + 0xd5, 0x1e, 0x4b, 0x7f, 0x93, 0xdc, 0xe8, 0xaa, 0x78, 0x11, 0xac, 0x8c, 0xbd, 0x49, 0x3f, 0x19, + 0x18, 0x79, 0x5c, 0xf8, 0x1b, 0x64, 0x50, 0xb6, 0xf8, 0x0e, 0x64, 0xd0, 0x1f, 0x7b, 0x93, 0xd5, + 0xc4, 0xa9, 0xe8, 0x93, 0x47, 0x6e, 0xef, 0x17, 0x85, 0xf9, 0x84, 0x33, 0x94, 0x70, 0xe2, 0x1c, + 0xf5, 0x87, 0xe4, 0xba, 0xe6, 0x5a, 0x80, 0x9d, 0x3c, 0xb1, 0xc2, 0x1f, 0x93, 0xf5, 0x02, 0x54, + 0xde, 0xf2, 0xc6, 0x78, 0xe0, 0x86, 0x59, 0x0e, 0xf9, 0xaf, 0xc8, 0xad, 0x29, 0x2a, 0x9d, 0xe6, + 0xc6, 0x8f, 0x34, 0xef, 0xac, 0xe8, 0x46, 0x59, 0x7f, 0xf0, 0x28, 0xfe, 0xeb, 0x7e, 0xe2, 0x3f, + 0xda, 0x98, 0xdc, 0x9c, 0x2e, 0xc2, 0x36, 0xb0, 0xd7, 0x7f, 0xff, 0x71, 0xd4, 0x8b, 0x14, 0xd9, + 0x38, 0x02, 0x01, 0x1a, 0xfe, 0xd9, 0xe4, 0xdb, 0xcb, 0xfb, 0x5a, 0xe9, 0xf2, 0xbf, 0xb6, 0xe2, + 0x5e, 0x6a, 0xcc, 0x3a, 0x05, 0xfd, 0xbf, 0x99, 0x75, 0x70, 0xfa, 0x65, 0x16, 0x7a, 0x57, 0xb3, + 0xd0, 0xfb, 0x3e, 0x0b, 0xbd, 0x0f, 0xf3, 0xb0, 0x77, 0x35, 0x0f, 0x7b, 0x5f, 0xe7, 0x61, 0xef, + 0xec, 0x69, 0xc5, 0xf5, 0xf4, 0x3c, 0x8b, 0x73, 0xac, 0xa9, 0xfb, 0xa7, 0x76, 0x84, 0x39, 0xb1, + 0x12, 0x60, 0x67, 0xf9, 0xf2, 0x2e, 0x9e, 0xd0, 0xb7, 0x8b, 0xf3, 0xd3, 0x97, 0x0d, 0xa8, 0x6c, + 0xd0, 0x1d, 0xc0, 0xc3, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x57, 0x2f, 0xac, 0x41, 0xa4, 0x03, + 0x00, 0x00, } func (m *HostChainFeeAbsConfig) Marshal() (dAtA []byte, err error) { diff --git a/x/feeabs/types/query.pb.go b/x/feeabs/types/query.pb.go index 7b213661..28c63d41 100644 --- a/x/feeabs/types/query.pb.go +++ b/x/feeabs/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feeabstraction/absfee/v1beta1/query.proto +// source: feeabstraction/feeabs/v1beta1/query.proto package types @@ -39,7 +39,7 @@ func (m *QueryHostChainConfigRequest) Reset() { *m = QueryHostChainConfi func (m *QueryHostChainConfigRequest) String() string { return proto.CompactTextString(m) } func (*QueryHostChainConfigRequest) ProtoMessage() {} func (*QueryHostChainConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0a3dde61db3cbb0e, []int{0} + return fileDescriptor_7cd2729237176027, []int{0} } func (m *QueryHostChainConfigRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -83,7 +83,7 @@ func (m *QueryHostChainConfigResponse) Reset() { *m = QueryHostChainConf func (m *QueryHostChainConfigResponse) String() string { return proto.CompactTextString(m) } func (*QueryHostChainConfigResponse) ProtoMessage() {} func (*QueryHostChainConfigResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0a3dde61db3cbb0e, []int{1} + return fileDescriptor_7cd2729237176027, []int{1} } func (m *QueryHostChainConfigResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -119,8 +119,8 @@ func (m *QueryHostChainConfigResponse) GetHostChainConfig() HostChainFeeAbsConfi return HostChainFeeAbsConfig{} } -// QueryOsmosisSpotPriceRequest is the request type for the Query/Feeabs RPC -// method. +// QueryOsmosisArithmeticTwapRequest is the request type for the Query/Feeabs +// RPC method. type QueryOsmosisArithmeticTwapRequest struct { IbcDenom string `protobuf:"bytes,1,opt,name=ibc_denom,json=ibcDenom,proto3" json:"ibc_denom,omitempty"` } @@ -129,7 +129,7 @@ func (m *QueryOsmosisArithmeticTwapRequest) Reset() { *m = QueryOsmosisA func (m *QueryOsmosisArithmeticTwapRequest) String() string { return proto.CompactTextString(m) } func (*QueryOsmosisArithmeticTwapRequest) ProtoMessage() {} func (*QueryOsmosisArithmeticTwapRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0a3dde61db3cbb0e, []int{2} + return fileDescriptor_7cd2729237176027, []int{2} } func (m *QueryOsmosisArithmeticTwapRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -173,7 +173,7 @@ func (m *QueryOsmosisArithmeticTwapResponse) Reset() { *m = QueryOsmosis func (m *QueryOsmosisArithmeticTwapResponse) String() string { return proto.CompactTextString(m) } func (*QueryOsmosisArithmeticTwapResponse) ProtoMessage() {} func (*QueryOsmosisArithmeticTwapResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0a3dde61db3cbb0e, []int{3} + return fileDescriptor_7cd2729237176027, []int{3} } func (m *QueryOsmosisArithmeticTwapResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -211,7 +211,7 @@ func (m *QueryFeeabsModuleBalacesRequest) Reset() { *m = QueryFeeabsModu func (m *QueryFeeabsModuleBalacesRequest) String() string { return proto.CompactTextString(m) } func (*QueryFeeabsModuleBalacesRequest) ProtoMessage() {} func (*QueryFeeabsModuleBalacesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0a3dde61db3cbb0e, []int{4} + return fileDescriptor_7cd2729237176027, []int{4} } func (m *QueryFeeabsModuleBalacesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -249,7 +249,7 @@ func (m *QueryFeeabsModuleBalacesResponse) Reset() { *m = QueryFeeabsMod func (m *QueryFeeabsModuleBalacesResponse) String() string { return proto.CompactTextString(m) } func (*QueryFeeabsModuleBalacesResponse) ProtoMessage() {} func (*QueryFeeabsModuleBalacesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0a3dde61db3cbb0e, []int{5} + return fileDescriptor_7cd2729237176027, []int{5} } func (m *QueryFeeabsModuleBalacesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -299,7 +299,7 @@ func (m *AllQueryHostChainConfigRequest) Reset() { *m = AllQueryHostChai func (m *AllQueryHostChainConfigRequest) String() string { return proto.CompactTextString(m) } func (*AllQueryHostChainConfigRequest) ProtoMessage() {} func (*AllQueryHostChainConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0a3dde61db3cbb0e, []int{6} + return fileDescriptor_7cd2729237176027, []int{6} } func (m *AllQueryHostChainConfigRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -336,7 +336,7 @@ func (m *AllQueryHostChainConfigResponse) Reset() { *m = AllQueryHostCha func (m *AllQueryHostChainConfigResponse) String() string { return proto.CompactTextString(m) } func (*AllQueryHostChainConfigResponse) ProtoMessage() {} func (*AllQueryHostChainConfigResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0a3dde61db3cbb0e, []int{7} + return fileDescriptor_7cd2729237176027, []int{7} } func (m *AllQueryHostChainConfigResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -373,70 +373,69 @@ func (m *AllQueryHostChainConfigResponse) GetAllHostChainConfig() []HostChainFee } func init() { - proto.RegisterType((*QueryHostChainConfigRequest)(nil), "feeabstraction.absfee.v1beta1.QueryHostChainConfigRequest") - proto.RegisterType((*QueryHostChainConfigResponse)(nil), "feeabstraction.absfee.v1beta1.QueryHostChainConfigResponse") - proto.RegisterType((*QueryOsmosisArithmeticTwapRequest)(nil), "feeabstraction.absfee.v1beta1.QueryOsmosisArithmeticTwapRequest") - proto.RegisterType((*QueryOsmosisArithmeticTwapResponse)(nil), "feeabstraction.absfee.v1beta1.QueryOsmosisArithmeticTwapResponse") - proto.RegisterType((*QueryFeeabsModuleBalacesRequest)(nil), "feeabstraction.absfee.v1beta1.QueryFeeabsModuleBalacesRequest") - proto.RegisterType((*QueryFeeabsModuleBalacesResponse)(nil), "feeabstraction.absfee.v1beta1.QueryFeeabsModuleBalacesResponse") - proto.RegisterType((*AllQueryHostChainConfigRequest)(nil), "feeabstraction.absfee.v1beta1.AllQueryHostChainConfigRequest") - proto.RegisterType((*AllQueryHostChainConfigResponse)(nil), "feeabstraction.absfee.v1beta1.AllQueryHostChainConfigResponse") + proto.RegisterType((*QueryHostChainConfigRequest)(nil), "feeabstraction.feeabs.v1beta1.QueryHostChainConfigRequest") + proto.RegisterType((*QueryHostChainConfigResponse)(nil), "feeabstraction.feeabs.v1beta1.QueryHostChainConfigResponse") + proto.RegisterType((*QueryOsmosisArithmeticTwapRequest)(nil), "feeabstraction.feeabs.v1beta1.QueryOsmosisArithmeticTwapRequest") + proto.RegisterType((*QueryOsmosisArithmeticTwapResponse)(nil), "feeabstraction.feeabs.v1beta1.QueryOsmosisArithmeticTwapResponse") + proto.RegisterType((*QueryFeeabsModuleBalacesRequest)(nil), "feeabstraction.feeabs.v1beta1.QueryFeeabsModuleBalacesRequest") + proto.RegisterType((*QueryFeeabsModuleBalacesResponse)(nil), "feeabstraction.feeabs.v1beta1.QueryFeeabsModuleBalacesResponse") + proto.RegisterType((*AllQueryHostChainConfigRequest)(nil), "feeabstraction.feeabs.v1beta1.AllQueryHostChainConfigRequest") + proto.RegisterType((*AllQueryHostChainConfigResponse)(nil), "feeabstraction.feeabs.v1beta1.AllQueryHostChainConfigResponse") } func init() { - proto.RegisterFile("feeabstraction/absfee/v1beta1/query.proto", fileDescriptor_0a3dde61db3cbb0e) + proto.RegisterFile("feeabstraction/feeabs/v1beta1/query.proto", fileDescriptor_7cd2729237176027) } -var fileDescriptor_0a3dde61db3cbb0e = []byte{ - // 758 bytes of a gzipped FileDescriptorProto +var fileDescriptor_7cd2729237176027 = []byte{ + // 752 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4f, 0x6b, 0x13, 0x4d, - 0x1c, 0xce, 0xb4, 0xbc, 0x7d, 0xdb, 0x29, 0xbc, 0xe1, 0x1d, 0x5a, 0x89, 0x69, 0xdd, 0xa4, 0x8b, + 0x1c, 0xce, 0xb4, 0xbc, 0x7d, 0xdb, 0x29, 0xbc, 0xe1, 0x1d, 0x5a, 0x89, 0x69, 0xdd, 0xa4, 0x83, 0x48, 0x2d, 0xdd, 0x5d, 0x1b, 0x05, 0x6b, 0xc4, 0x9a, 0x3f, 0xa5, 0xf4, 0x22, 0x62, 0xf4, 0xe4, - 0x25, 0xcc, 0x6e, 0x26, 0xc9, 0xe2, 0x64, 0x67, 0x9b, 0xd9, 0xb4, 0x56, 0xf1, 0xd2, 0xbb, 0x20, + 0x25, 0xcc, 0x6e, 0xa6, 0xc9, 0xe2, 0x64, 0x67, 0x9b, 0xd9, 0xb4, 0x56, 0xf1, 0xd2, 0xbb, 0x20, 0x78, 0xf0, 0x03, 0x78, 0xf3, 0xe6, 0xcd, 0x8f, 0x50, 0x50, 0xa1, 0xe0, 0x45, 0x14, 0xa2, 0xb4, - 0xfd, 0x04, 0xfd, 0x04, 0xb2, 0xb3, 0x93, 0x6d, 0x93, 0xa6, 0x9b, 0x10, 0x4f, 0xc9, 0x32, 0xcf, - 0xef, 0xf9, 0x3d, 0xcf, 0xef, 0xf7, 0xec, 0x2c, 0xbc, 0x5e, 0x25, 0x04, 0x9b, 0xdc, 0x6b, 0x62, - 0xcb, 0xb3, 0x99, 0x63, 0x60, 0x93, 0x57, 0x09, 0x31, 0xb6, 0x57, 0x4c, 0xe2, 0xe1, 0x15, 0x63, - 0xab, 0x45, 0x9a, 0xbb, 0xba, 0xdb, 0x64, 0x1e, 0x43, 0x57, 0xba, 0xa1, 0x7a, 0x00, 0xd5, 0x25, - 0x34, 0x39, 0x53, 0x63, 0x35, 0x26, 0x90, 0x86, 0xff, 0x2f, 0x28, 0x4a, 0xce, 0xd7, 0x18, 0xab, - 0x51, 0x62, 0x60, 0xd7, 0x36, 0xb0, 0xe3, 0x30, 0x0f, 0xfb, 0xb5, 0x5c, 0x9e, 0x2e, 0x45, 0x77, - 0x77, 0x71, 0x13, 0x37, 0x3a, 0x58, 0x3d, 0x1a, 0xcb, 0x78, 0x83, 0x71, 0x9b, 0xdb, 0xa6, 0x25, - 0xf1, 0xcb, 0x03, 0xb8, 0x9b, 0xcc, 0x65, 0x1c, 0x53, 0x89, 0x56, 0x2c, 0x41, 0x60, 0x98, 0x98, - 0x9f, 0x62, 0x2c, 0x66, 0x3b, 0xc1, 0xb9, 0x9a, 0x85, 0x73, 0x8f, 0xfc, 0x59, 0x6c, 0x32, 0xee, - 0x15, 0xeb, 0xd8, 0x76, 0x8a, 0xcc, 0xa9, 0xda, 0xb5, 0x12, 0xd9, 0x6a, 0x11, 0xee, 0xa1, 0x39, - 0x38, 0x65, 0x9b, 0x56, 0xb9, 0x42, 0x1c, 0xd6, 0x48, 0x80, 0x34, 0x58, 0x9c, 0x2a, 0x4d, 0xda, - 0xa6, 0xb5, 0xee, 0x3f, 0xab, 0xef, 0x01, 0x9c, 0xef, 0x5f, 0xcc, 0x5d, 0xe6, 0x70, 0x82, 0xf6, - 0x00, 0xfc, 0xbf, 0xce, 0xb8, 0x57, 0xb6, 0xfc, 0xc3, 0xb2, 0x25, 0x4e, 0x05, 0xcd, 0x74, 0xe6, - 0x96, 0x1e, 0x39, 0x76, 0x3d, 0xe4, 0xdc, 0x20, 0x24, 0x6f, 0xf2, 0x80, 0xb9, 0x90, 0xde, 0x6f, - 0xa7, 0x62, 0x27, 0xed, 0x54, 0x62, 0x17, 0x37, 0x68, 0x56, 0x3d, 0x47, 0xae, 0x96, 0xe2, 0xf5, - 0x6e, 0x31, 0x6a, 0x0e, 0x2e, 0x08, 0x91, 0x0f, 0x83, 0x41, 0xe6, 0x9b, 0xb6, 0x57, 0x6f, 0x10, - 0xcf, 0xb6, 0x9e, 0xec, 0x60, 0x77, 0x28, 0x9f, 0xef, 0x00, 0x54, 0xa3, 0x28, 0xa4, 0xdb, 0x2d, - 0x18, 0xc7, 0xe1, 0x49, 0xd9, 0xdb, 0xc1, 0x6e, 0xc0, 0x54, 0xd8, 0xf4, 0x45, 0xff, 0x68, 0xa7, - 0xae, 0xd5, 0x6c, 0xaf, 0xde, 0x32, 0x75, 0x8b, 0x35, 0x0c, 0xb9, 0x96, 0xe0, 0x47, 0xe3, 0x95, - 0x67, 0x86, 0xb7, 0xeb, 0x12, 0xae, 0xaf, 0x13, 0xeb, 0xa4, 0x9d, 0xba, 0x14, 0xd8, 0xeb, 0xa1, - 0x53, 0x4b, 0xff, 0xe1, 0xae, 0xd6, 0xea, 0x02, 0x4c, 0x09, 0x61, 0x1b, 0x62, 0x94, 0x0f, 0x58, - 0xa5, 0x45, 0x49, 0x01, 0x53, 0x6c, 0x11, 0x2e, 0x9d, 0xa9, 0x9f, 0x00, 0x4c, 0x5f, 0x8c, 0x91, - 0xd2, 0x5f, 0xc0, 0x49, 0x13, 0x53, 0xec, 0x58, 0x84, 0x27, 0x40, 0x7a, 0x7c, 0x71, 0x3a, 0x73, - 0x59, 0x0f, 0xa4, 0xe9, 0x7e, 0x70, 0xc2, 0xa5, 0x14, 0x99, 0xed, 0x14, 0x8a, 0x72, 0x07, 0xf1, - 0x40, 0x64, 0xa7, 0x50, 0xfd, 0xf0, 0x2b, 0xb5, 0x38, 0x84, 0x43, 0x9f, 0x83, 0x97, 0xc2, 0x7e, - 0x28, 0x01, 0xff, 0xc5, 0x95, 0x4a, 0x93, 0x70, 0x9e, 0x18, 0x13, 0x83, 0xef, 0x3c, 0xaa, 0x69, - 0xa8, 0xe4, 0x29, 0x8d, 0x88, 0xa7, 0xfa, 0x11, 0xc0, 0xd4, 0x85, 0x10, 0xe9, 0xed, 0x35, 0x80, - 0xb3, 0x98, 0xd2, 0x72, 0xbf, 0x20, 0x8e, 0x8f, 0x1c, 0xc4, 0xab, 0x72, 0x08, 0xf3, 0x72, 0x53, - 0xfd, 0x1a, 0xa8, 0x25, 0x84, 0x29, 0xed, 0xd1, 0x95, 0xf9, 0x39, 0x01, 0xff, 0x11, 0x82, 0xd1, - 0x31, 0x80, 0xb3, 0x7d, 0x23, 0x85, 0x72, 0x03, 0x34, 0x0d, 0x0c, 0x74, 0x32, 0xff, 0x17, 0x0c, - 0xc1, 0xe0, 0xd4, 0x8d, 0xbd, 0x6f, 0xc7, 0x6f, 0xc7, 0x72, 0x68, 0xcd, 0xa8, 0x12, 0xa2, 0x9d, - 0xbd, 0x72, 0x02, 0x6a, 0x63, 0x3b, 0xbc, 0x9d, 0xb4, 0xd3, 0x5c, 0x6a, 0x7e, 0x52, 0x8d, 0x97, - 0xe1, 0xdb, 0xf4, 0x0a, 0x7d, 0x06, 0x70, 0xa6, 0x37, 0x7c, 0x62, 0xf3, 0x6b, 0xc3, 0x68, 0xbc, - 0x38, 0xda, 0xc9, 0xfb, 0x23, 0xd7, 0x4b, 0x87, 0x19, 0xe1, 0x70, 0x19, 0x2d, 0x45, 0x38, 0x6c, - 0x88, 0x4a, 0x2d, 0x8c, 0xeb, 0x17, 0x00, 0xe3, 0x3d, 0x2b, 0x45, 0xd9, 0x61, 0x84, 0xf4, 0x8f, - 0x70, 0xf2, 0xee, 0x48, 0xb5, 0xd2, 0x40, 0x4e, 0x18, 0xc8, 0xa2, 0xd5, 0x08, 0x03, 0x7e, 0x2c, - 0x35, 0x11, 0x4b, 0x2d, 0x88, 0x65, 0xd7, 0x72, 0xbe, 0x02, 0x88, 0xf2, 0xe7, 0x42, 0x8a, 0xee, - 0x0d, 0x50, 0x15, 0xfd, 0x5e, 0x26, 0xd7, 0x46, 0x2d, 0x97, 0xbe, 0x56, 0x85, 0xaf, 0x0c, 0xba, - 0x11, 0xe1, 0x0b, 0x53, 0xaa, 0x9d, 0xf3, 0x56, 0x78, 0xbc, 0x7f, 0xa8, 0x80, 0x83, 0x43, 0x05, - 0xfc, 0x3e, 0x54, 0xc0, 0x9b, 0x23, 0x25, 0x76, 0x70, 0xa4, 0xc4, 0xbe, 0x1f, 0x29, 0xb1, 0xa7, - 0x77, 0xce, 0xdc, 0x4d, 0x9d, 0xd8, 0x52, 0x9f, 0xab, 0xb7, 0xc5, 0xf6, 0x6d, 0xe3, 0x79, 0xa7, - 0x8f, 0xb8, 0xb2, 0xcc, 0x09, 0xf1, 0xad, 0xbc, 0xf9, 0x27, 0x00, 0x00, 0xff, 0xff, 0x61, 0xcb, - 0xd5, 0x08, 0x55, 0x08, 0x00, 0x00, + 0xfd, 0x04, 0xfd, 0x04, 0xb2, 0xb3, 0x93, 0x68, 0xd2, 0x74, 0x13, 0xe2, 0xa9, 0x1d, 0xe6, 0xf9, + 0x3d, 0xbf, 0xe7, 0xf9, 0xfd, 0x9e, 0x9d, 0xc0, 0xab, 0x5b, 0x94, 0x12, 0x4b, 0xf8, 0x0d, 0x62, + 0xfb, 0x0e, 0x77, 0xcd, 0xf0, 0x68, 0xee, 0xac, 0x58, 0xd4, 0x27, 0x2b, 0xe6, 0x76, 0x93, 0x36, + 0xf6, 0x0c, 0xaf, 0xc1, 0x7d, 0x8e, 0x2e, 0x75, 0x43, 0x8d, 0xf0, 0x68, 0x28, 0x68, 0x72, 0xa6, + 0xca, 0xab, 0x5c, 0x22, 0xcd, 0xe0, 0xbf, 0xb0, 0x28, 0x39, 0x5f, 0xe5, 0xbc, 0xca, 0xa8, 0x49, + 0x3c, 0xc7, 0x24, 0xae, 0xcb, 0x7d, 0x12, 0xd4, 0x0a, 0x75, 0xbb, 0x14, 0xdd, 0xdd, 0x23, 0x0d, + 0x52, 0x6f, 0x63, 0x8d, 0x68, 0x2c, 0x17, 0x75, 0x2e, 0x1c, 0xe1, 0x58, 0xb6, 0xc2, 0x2f, 0x0f, + 0xe0, 0x6e, 0x70, 0x8f, 0x0b, 0xc2, 0x14, 0x5a, 0xb3, 0x25, 0x81, 0x69, 0x11, 0x41, 0x3b, 0x18, + 0x9b, 0x3b, 0x6e, 0x78, 0x8f, 0xb3, 0x70, 0xee, 0x41, 0x30, 0x8b, 0x4d, 0x2e, 0xfc, 0x62, 0x8d, + 0x38, 0x6e, 0x91, 0xbb, 0x5b, 0x4e, 0xb5, 0x44, 0xb7, 0x9b, 0x54, 0xf8, 0x68, 0x0e, 0x4e, 0x39, + 0x96, 0x5d, 0xae, 0x50, 0x97, 0xd7, 0x13, 0x20, 0x0d, 0x16, 0xa7, 0x4a, 0x93, 0x8e, 0x65, 0xaf, + 0x07, 0x67, 0xfc, 0x16, 0xc0, 0xf9, 0xfe, 0xc5, 0xc2, 0xe3, 0xae, 0xa0, 0x68, 0x1f, 0xc0, 0xff, + 0x6b, 0x5c, 0xf8, 0x65, 0x3b, 0xb8, 0x2c, 0xdb, 0xf2, 0x56, 0xd2, 0x4c, 0x67, 0x6e, 0x18, 0x91, + 0x63, 0x37, 0x3a, 0x9c, 0x1b, 0x94, 0xe6, 0x2d, 0x11, 0x32, 0x17, 0xd2, 0x07, 0xad, 0x54, 0xec, + 0xb4, 0x95, 0x4a, 0xec, 0x91, 0x3a, 0xcb, 0xe2, 0x33, 0xe4, 0xb8, 0x14, 0xaf, 0x75, 0x8b, 0xc1, + 0x39, 0xb8, 0x20, 0x45, 0xde, 0x0f, 0x07, 0x99, 0x6f, 0x38, 0x7e, 0xad, 0x4e, 0x7d, 0xc7, 0x7e, + 0xb4, 0x4b, 0xbc, 0xa1, 0x7c, 0xbe, 0x01, 0x10, 0x47, 0x51, 0x28, 0xb7, 0xdb, 0x30, 0x4e, 0x3a, + 0x37, 0x65, 0x7f, 0x97, 0x78, 0x21, 0x53, 0x61, 0x33, 0x10, 0xfd, 0xad, 0x95, 0xba, 0x52, 0x75, + 0xfc, 0x5a, 0xd3, 0x32, 0x6c, 0x5e, 0x37, 0xd5, 0x5a, 0xc2, 0x3f, 0xba, 0xa8, 0x3c, 0x31, 0xfd, + 0x3d, 0x8f, 0x0a, 0x63, 0x9d, 0xda, 0xa7, 0xad, 0xd4, 0x85, 0xd0, 0x5e, 0x0f, 0x1d, 0x2e, 0xfd, + 0x47, 0xba, 0x5a, 0xe3, 0x05, 0x98, 0x92, 0xc2, 0x36, 0xe4, 0xec, 0xee, 0xf1, 0x4a, 0x93, 0xd1, + 0x02, 0x61, 0xc4, 0xa6, 0x42, 0x39, 0xc3, 0x1f, 0x00, 0x4c, 0x9f, 0x8f, 0x51, 0xd2, 0x9f, 0xc1, + 0x49, 0x8b, 0x30, 0xe2, 0xda, 0x54, 0x24, 0x40, 0x7a, 0x7c, 0x71, 0x3a, 0x73, 0xd1, 0x08, 0xa5, + 0x19, 0x41, 0x70, 0x3a, 0x4b, 0x29, 0x72, 0xc7, 0x2d, 0x14, 0xd5, 0x0e, 0xe2, 0xa1, 0xc8, 0x76, + 0x21, 0x7e, 0xf7, 0x23, 0xb5, 0x38, 0x84, 0xc3, 0x80, 0x43, 0x94, 0x3a, 0xfd, 0x50, 0x02, 0xfe, + 0x4b, 0x2a, 0x95, 0x06, 0x15, 0x22, 0x31, 0x26, 0x07, 0xdf, 0x3e, 0xe2, 0x34, 0xd4, 0xf2, 0x8c, + 0x45, 0xc4, 0x13, 0xbf, 0x07, 0x30, 0x75, 0x2e, 0x44, 0x79, 0x7b, 0x09, 0xe0, 0x2c, 0x61, 0xac, + 0xdc, 0x2f, 0x88, 0xe3, 0x23, 0x07, 0xf1, 0xb2, 0x1a, 0xc2, 0xbc, 0xda, 0x54, 0xbf, 0x06, 0xb8, + 0x84, 0x08, 0x63, 0x3d, 0xba, 0x32, 0xdf, 0x27, 0xe0, 0x3f, 0x52, 0x30, 0x3a, 0x01, 0x70, 0xb6, + 0x6f, 0xa4, 0x50, 0x6e, 0x80, 0xa6, 0x81, 0x81, 0x4e, 0xe6, 0xff, 0x82, 0x21, 0x1c, 0x1c, 0xde, + 0xd8, 0xff, 0x72, 0xf2, 0x7a, 0x2c, 0x87, 0xd6, 0x82, 0x27, 0x46, 0xef, 0xfb, 0xe4, 0xb4, 0x5f, + 0x27, 0xfd, 0x77, 0x2e, 0xf5, 0x20, 0xa9, 0xe6, 0xf3, 0xce, 0xd7, 0xf4, 0x02, 0x7d, 0x04, 0x70, + 0xa6, 0x37, 0x7c, 0x72, 0xf3, 0x6b, 0xc3, 0x68, 0x3c, 0x3f, 0xda, 0xc9, 0xbb, 0x23, 0xd7, 0x2b, + 0x87, 0x19, 0xe9, 0x70, 0x19, 0x2d, 0x45, 0x38, 0xac, 0xcb, 0x4a, 0xbd, 0x13, 0xd7, 0x4f, 0x00, + 0xc6, 0x7b, 0x56, 0x8a, 0xb2, 0xc3, 0x08, 0xe9, 0x1f, 0xe1, 0xe4, 0xed, 0x91, 0x6a, 0x95, 0x81, + 0x9c, 0x34, 0x90, 0x45, 0xab, 0x11, 0x06, 0x82, 0x58, 0xea, 0x32, 0x96, 0x7a, 0x18, 0xcb, 0xae, + 0xe5, 0x7c, 0x06, 0x10, 0xe5, 0xcf, 0x84, 0x14, 0xdd, 0x19, 0xa0, 0x2a, 0xfa, 0xbb, 0x4c, 0xae, + 0x8d, 0x5a, 0xae, 0x7c, 0xad, 0x4a, 0x5f, 0x19, 0x74, 0x2d, 0xc2, 0x17, 0x61, 0x4c, 0x3f, 0xe3, + 0xad, 0xf0, 0xf0, 0xe0, 0x48, 0x03, 0x87, 0x47, 0x1a, 0xf8, 0x79, 0xa4, 0x81, 0x57, 0xc7, 0x5a, + 0xec, 0xf0, 0x58, 0x8b, 0x7d, 0x3d, 0xd6, 0x62, 0x8f, 0x6f, 0xfd, 0xf1, 0x36, 0xb5, 0x63, 0xcb, + 0x02, 0xae, 0xde, 0x16, 0x3b, 0x37, 0xcd, 0xa7, 0xed, 0x3e, 0xf2, 0xc9, 0xb2, 0x26, 0xe4, 0x6f, + 0xe5, 0xf5, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xe1, 0xa5, 0x0f, 0x5e, 0x55, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -451,7 +450,7 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type QueryClient interface { - // OsmosisSpotPrice return spot price of pair Osmo/nativeToken + // OsmosisArithmeticTwap return spot price of pair Osmo/nativeToken OsmosisArithmeticTwap(ctx context.Context, in *QueryOsmosisArithmeticTwapRequest, opts ...grpc.CallOption) (*QueryOsmosisArithmeticTwapResponse, error) // FeeabsModuleBalances return total balances of feeabs module FeeabsModuleBalances(ctx context.Context, in *QueryFeeabsModuleBalacesRequest, opts ...grpc.CallOption) (*QueryFeeabsModuleBalacesResponse, error) @@ -469,7 +468,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) OsmosisArithmeticTwap(ctx context.Context, in *QueryOsmosisArithmeticTwapRequest, opts ...grpc.CallOption) (*QueryOsmosisArithmeticTwapResponse, error) { out := new(QueryOsmosisArithmeticTwapResponse) - err := c.cc.Invoke(ctx, "/feeabstraction.absfee.v1beta1.Query/OsmosisArithmeticTwap", in, out, opts...) + err := c.cc.Invoke(ctx, "/feeabstraction.feeabs.v1beta1.Query/OsmosisArithmeticTwap", in, out, opts...) if err != nil { return nil, err } @@ -478,7 +477,7 @@ func (c *queryClient) OsmosisArithmeticTwap(ctx context.Context, in *QueryOsmosi func (c *queryClient) FeeabsModuleBalances(ctx context.Context, in *QueryFeeabsModuleBalacesRequest, opts ...grpc.CallOption) (*QueryFeeabsModuleBalacesResponse, error) { out := new(QueryFeeabsModuleBalacesResponse) - err := c.cc.Invoke(ctx, "/feeabstraction.absfee.v1beta1.Query/FeeabsModuleBalances", in, out, opts...) + err := c.cc.Invoke(ctx, "/feeabstraction.feeabs.v1beta1.Query/FeeabsModuleBalances", in, out, opts...) if err != nil { return nil, err } @@ -487,7 +486,7 @@ func (c *queryClient) FeeabsModuleBalances(ctx context.Context, in *QueryFeeabsM func (c *queryClient) HostChainConfig(ctx context.Context, in *QueryHostChainConfigRequest, opts ...grpc.CallOption) (*QueryHostChainConfigResponse, error) { out := new(QueryHostChainConfigResponse) - err := c.cc.Invoke(ctx, "/feeabstraction.absfee.v1beta1.Query/HostChainConfig", in, out, opts...) + err := c.cc.Invoke(ctx, "/feeabstraction.feeabs.v1beta1.Query/HostChainConfig", in, out, opts...) if err != nil { return nil, err } @@ -496,7 +495,7 @@ func (c *queryClient) HostChainConfig(ctx context.Context, in *QueryHostChainCon func (c *queryClient) AllHostChainConfig(ctx context.Context, in *AllQueryHostChainConfigRequest, opts ...grpc.CallOption) (*AllQueryHostChainConfigResponse, error) { out := new(AllQueryHostChainConfigResponse) - err := c.cc.Invoke(ctx, "/feeabstraction.absfee.v1beta1.Query/AllHostChainConfig", in, out, opts...) + err := c.cc.Invoke(ctx, "/feeabstraction.feeabs.v1beta1.Query/AllHostChainConfig", in, out, opts...) if err != nil { return nil, err } @@ -505,7 +504,7 @@ func (c *queryClient) AllHostChainConfig(ctx context.Context, in *AllQueryHostCh // QueryServer is the server API for Query service. type QueryServer interface { - // OsmosisSpotPrice return spot price of pair Osmo/nativeToken + // OsmosisArithmeticTwap return spot price of pair Osmo/nativeToken OsmosisArithmeticTwap(context.Context, *QueryOsmosisArithmeticTwapRequest) (*QueryOsmosisArithmeticTwapResponse, error) // FeeabsModuleBalances return total balances of feeabs module FeeabsModuleBalances(context.Context, *QueryFeeabsModuleBalacesRequest) (*QueryFeeabsModuleBalacesResponse, error) @@ -544,7 +543,7 @@ func _Query_OsmosisArithmeticTwap_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/feeabstraction.absfee.v1beta1.Query/OsmosisArithmeticTwap", + FullMethod: "/feeabstraction.feeabs.v1beta1.Query/OsmosisArithmeticTwap", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).OsmosisArithmeticTwap(ctx, req.(*QueryOsmosisArithmeticTwapRequest)) @@ -562,7 +561,7 @@ func _Query_FeeabsModuleBalances_Handler(srv interface{}, ctx context.Context, d } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/feeabstraction.absfee.v1beta1.Query/FeeabsModuleBalances", + FullMethod: "/feeabstraction.feeabs.v1beta1.Query/FeeabsModuleBalances", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).FeeabsModuleBalances(ctx, req.(*QueryFeeabsModuleBalacesRequest)) @@ -580,7 +579,7 @@ func _Query_HostChainConfig_Handler(srv interface{}, ctx context.Context, dec fu } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/feeabstraction.absfee.v1beta1.Query/HostChainConfig", + FullMethod: "/feeabstraction.feeabs.v1beta1.Query/HostChainConfig", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).HostChainConfig(ctx, req.(*QueryHostChainConfigRequest)) @@ -598,7 +597,7 @@ func _Query_AllHostChainConfig_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/feeabstraction.absfee.v1beta1.Query/AllHostChainConfig", + FullMethod: "/feeabstraction.feeabs.v1beta1.Query/AllHostChainConfig", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).AllHostChainConfig(ctx, req.(*AllQueryHostChainConfigRequest)) @@ -607,7 +606,7 @@ func _Query_AllHostChainConfig_Handler(srv interface{}, ctx context.Context, dec } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "feeabstraction.absfee.v1beta1.Query", + ServiceName: "feeabstraction.feeabs.v1beta1.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { @@ -628,7 +627,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "feeabstraction/absfee/v1beta1/query.proto", + Metadata: "feeabstraction/feeabs/v1beta1/query.proto", } func (m *QueryHostChainConfigRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/feeabs/types/query.pb.gw.go b/x/feeabs/types/query.pb.gw.go index c02e4df1..38c371e6 100644 --- a/x/feeabs/types/query.pb.gw.go +++ b/x/feeabs/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: feeabstraction/absfee/v1beta1/query.proto +// source: feeabstraction/feeabs/v1beta1/query.proto /* Package types is a reverse proxy. diff --git a/x/feeabs/types/tx.pb.go b/x/feeabs/types/tx.pb.go index bac87cfa..5c00c379 100644 --- a/x/feeabs/types/tx.pb.go +++ b/x/feeabs/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: feeabstraction/absfee/v1beta1/tx.proto +// source: feeabstraction/feeabs/v1beta1/tx.proto package types @@ -31,7 +31,6 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// Msg fund module account type MsgFundFeeAbsModuleAccount struct { FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=amount,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"amount" yaml:"amount"` @@ -41,7 +40,7 @@ func (m *MsgFundFeeAbsModuleAccount) Reset() { *m = MsgFundFeeAbsModuleA func (m *MsgFundFeeAbsModuleAccount) String() string { return proto.CompactTextString(m) } func (*MsgFundFeeAbsModuleAccount) ProtoMessage() {} func (*MsgFundFeeAbsModuleAccount) Descriptor() ([]byte, []int) { - return fileDescriptor_84c172c34645b936, []int{0} + return fileDescriptor_bc180c3e894b3e83, []int{0} } func (m *MsgFundFeeAbsModuleAccount) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -91,7 +90,7 @@ func (m *MsgFundFeeAbsModuleAccountResponse) Reset() { *m = MsgFundFeeAb func (m *MsgFundFeeAbsModuleAccountResponse) String() string { return proto.CompactTextString(m) } func (*MsgFundFeeAbsModuleAccountResponse) ProtoMessage() {} func (*MsgFundFeeAbsModuleAccountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_84c172c34645b936, []int{1} + return fileDescriptor_bc180c3e894b3e83, []int{1} } func (m *MsgFundFeeAbsModuleAccountResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -120,7 +119,6 @@ func (m *MsgFundFeeAbsModuleAccountResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgFundFeeAbsModuleAccountResponse proto.InternalMessageInfo -// Params defines the parameters for the feeabs module. type MsgSendQueryIbcDenomTWAP struct { FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` } @@ -129,7 +127,7 @@ func (m *MsgSendQueryIbcDenomTWAP) Reset() { *m = MsgSendQueryIbcDenomTW func (m *MsgSendQueryIbcDenomTWAP) String() string { return proto.CompactTextString(m) } func (*MsgSendQueryIbcDenomTWAP) ProtoMessage() {} func (*MsgSendQueryIbcDenomTWAP) Descriptor() ([]byte, []int) { - return fileDescriptor_84c172c34645b936, []int{2} + return fileDescriptor_bc180c3e894b3e83, []int{2} } func (m *MsgSendQueryIbcDenomTWAP) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -172,7 +170,7 @@ func (m *MsgSendQueryIbcDenomTWAPResponse) Reset() { *m = MsgSendQueryIb func (m *MsgSendQueryIbcDenomTWAPResponse) String() string { return proto.CompactTextString(m) } func (*MsgSendQueryIbcDenomTWAPResponse) ProtoMessage() {} func (*MsgSendQueryIbcDenomTWAPResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_84c172c34645b936, []int{3} + return fileDescriptor_bc180c3e894b3e83, []int{3} } func (m *MsgSendQueryIbcDenomTWAPResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -201,7 +199,6 @@ func (m *MsgSendQueryIbcDenomTWAPResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgSendQueryIbcDenomTWAPResponse proto.InternalMessageInfo -// Params defines the parameters for the feeabs module. type MsgSwapCrossChain struct { FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` IbcDenom string `protobuf:"bytes,2,opt,name=ibc_denom,json=ibcDenom,proto3" json:"ibc_denom,omitempty"` @@ -211,7 +208,7 @@ func (m *MsgSwapCrossChain) Reset() { *m = MsgSwapCrossChain{} } func (m *MsgSwapCrossChain) String() string { return proto.CompactTextString(m) } func (*MsgSwapCrossChain) ProtoMessage() {} func (*MsgSwapCrossChain) Descriptor() ([]byte, []int) { - return fileDescriptor_84c172c34645b936, []int{4} + return fileDescriptor_bc180c3e894b3e83, []int{4} } func (m *MsgSwapCrossChain) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -261,7 +258,7 @@ func (m *MsgSwapCrossChainResponse) Reset() { *m = MsgSwapCrossChainResp func (m *MsgSwapCrossChainResponse) String() string { return proto.CompactTextString(m) } func (*MsgSwapCrossChainResponse) ProtoMessage() {} func (*MsgSwapCrossChainResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_84c172c34645b936, []int{5} + return fileDescriptor_bc180c3e894b3e83, []int{5} } func (m *MsgSwapCrossChainResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -291,53 +288,53 @@ func (m *MsgSwapCrossChainResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgSwapCrossChainResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgFundFeeAbsModuleAccount)(nil), "feeabstraction.absfee.v1beta1.MsgFundFeeAbsModuleAccount") - proto.RegisterType((*MsgFundFeeAbsModuleAccountResponse)(nil), "feeabstraction.absfee.v1beta1.MsgFundFeeAbsModuleAccountResponse") - proto.RegisterType((*MsgSendQueryIbcDenomTWAP)(nil), "feeabstraction.absfee.v1beta1.MsgSendQueryIbcDenomTWAP") - proto.RegisterType((*MsgSendQueryIbcDenomTWAPResponse)(nil), "feeabstraction.absfee.v1beta1.MsgSendQueryIbcDenomTWAPResponse") - proto.RegisterType((*MsgSwapCrossChain)(nil), "feeabstraction.absfee.v1beta1.MsgSwapCrossChain") - proto.RegisterType((*MsgSwapCrossChainResponse)(nil), "feeabstraction.absfee.v1beta1.MsgSwapCrossChainResponse") + proto.RegisterType((*MsgFundFeeAbsModuleAccount)(nil), "feeabstraction.feeabs.v1beta1.MsgFundFeeAbsModuleAccount") + proto.RegisterType((*MsgFundFeeAbsModuleAccountResponse)(nil), "feeabstraction.feeabs.v1beta1.MsgFundFeeAbsModuleAccountResponse") + proto.RegisterType((*MsgSendQueryIbcDenomTWAP)(nil), "feeabstraction.feeabs.v1beta1.MsgSendQueryIbcDenomTWAP") + proto.RegisterType((*MsgSendQueryIbcDenomTWAPResponse)(nil), "feeabstraction.feeabs.v1beta1.MsgSendQueryIbcDenomTWAPResponse") + proto.RegisterType((*MsgSwapCrossChain)(nil), "feeabstraction.feeabs.v1beta1.MsgSwapCrossChain") + proto.RegisterType((*MsgSwapCrossChainResponse)(nil), "feeabstraction.feeabs.v1beta1.MsgSwapCrossChainResponse") } func init() { - proto.RegisterFile("feeabstraction/absfee/v1beta1/tx.proto", fileDescriptor_84c172c34645b936) -} - -var fileDescriptor_84c172c34645b936 = []byte{ - // 516 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xcf, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0xe3, 0x46, 0xaa, 0xe8, 0x16, 0x90, 0x88, 0x40, 0xa4, 0xae, 0x70, 0x82, 0x85, 0x50, - 0x40, 0x8a, 0x97, 0x96, 0x43, 0x29, 0x12, 0x42, 0x6e, 0x50, 0x25, 0x0e, 0x91, 0x20, 0x41, 0x42, - 0xe2, 0x52, 0xed, 0xda, 0x13, 0xc7, 0x22, 0xf6, 0x58, 0x9e, 0x75, 0x69, 0x24, 0x1e, 0x02, 0x4e, - 0xbc, 0x03, 0x37, 0x0e, 0xbc, 0x43, 0x8f, 0x3d, 0x72, 0x2a, 0x28, 0x79, 0x03, 0x9e, 0x00, 0xf9, - 0x4f, 0x4a, 0x0b, 0x38, 0xa4, 0x3d, 0xd9, 0xde, 0xfd, 0x7d, 0xdf, 0x7c, 0xb3, 0x9a, 0x35, 0xbb, - 0x3b, 0x00, 0x10, 0x92, 0x54, 0x2c, 0x1c, 0xe5, 0x63, 0xc8, 0x85, 0xa4, 0x01, 0x00, 0xdf, 0xdf, - 0x90, 0xa0, 0xc4, 0x06, 0x57, 0x07, 0x56, 0x14, 0xa3, 0xc2, 0xda, 0xad, 0xb3, 0x9c, 0x95, 0x73, - 0x56, 0xc1, 0xe9, 0xd7, 0x3d, 0xf4, 0x30, 0x23, 0x79, 0xfa, 0x96, 0x8b, 0xf4, 0xfb, 0xf3, 0xcd, - 0x23, 0x11, 0x8b, 0x80, 0x0a, 0xf6, 0xde, 0x7c, 0x16, 0x22, 0x74, 0x86, 0x05, 0x6a, 0x38, 0x48, - 0x01, 0x12, 0x97, 0x82, 0x7e, 0x03, 0x0e, 0xfa, 0x61, 0xb1, 0xdf, 0xf0, 0x10, 0xbd, 0x11, 0xf0, - 0xec, 0x4b, 0x26, 0x03, 0xae, 0xfc, 0x00, 0x48, 0x89, 0x20, 0xca, 0x01, 0xf3, 0xab, 0xc6, 0xf4, - 0x2e, 0x79, 0xbb, 0x49, 0xe8, 0xee, 0x02, 0xd8, 0x92, 0xba, 0xe8, 0x26, 0x23, 0xb0, 0x1d, 0x07, - 0x93, 0x50, 0xd5, 0x6e, 0xb3, 0xcb, 0x83, 0x18, 0x83, 0x3d, 0xe1, 0xba, 0x31, 0x10, 0xd5, 0xb5, - 0xa6, 0xd6, 0x5a, 0xe9, 0xad, 0xa6, 0x6b, 0x76, 0xbe, 0x54, 0x53, 0x6c, 0x59, 0x04, 0x29, 0x5c, - 0x5f, 0x6a, 0x56, 0x5b, 0xab, 0x9b, 0x6b, 0x56, 0x9e, 0xc9, 0x4a, 0x33, 0xcd, 0x4e, 0xc5, 0xea, - 0xa0, 0x1f, 0xee, 0xd8, 0x87, 0xc7, 0x8d, 0xca, 0xcf, 0xe3, 0xc6, 0x95, 0xb1, 0x08, 0x46, 0x8f, - 0xcd, 0x5c, 0x66, 0x7e, 0xfe, 0xde, 0x68, 0x79, 0xbe, 0x1a, 0x26, 0xd2, 0x72, 0x30, 0xe0, 0x45, - 0x47, 0xf9, 0xa3, 0x4d, 0xee, 0x5b, 0xae, 0xc6, 0x11, 0x50, 0xe6, 0x40, 0xbd, 0xa2, 0x96, 0x79, - 0x87, 0x99, 0xe5, 0xb1, 0x7b, 0x40, 0x11, 0x86, 0x04, 0xe6, 0x13, 0x56, 0xef, 0x92, 0xd7, 0x87, - 0xd0, 0x7d, 0x99, 0x40, 0x3c, 0x7e, 0x2e, 0x9d, 0x67, 0x10, 0x62, 0xf0, 0xea, 0xb5, 0xfd, 0x62, - 0x81, 0xd6, 0x4c, 0x93, 0x35, 0xcb, 0xe4, 0x27, 0x25, 0xfa, 0xec, 0x5a, 0xca, 0xbc, 0x13, 0x51, - 0x27, 0x46, 0xa2, 0xce, 0x50, 0xf8, 0xe1, 0x22, 0xc7, 0xb6, 0xce, 0x56, 0x7c, 0xe9, 0xec, 0xb9, - 0xa9, 0x61, 0x7d, 0x29, 0xdb, 0xbf, 0xe4, 0x17, 0x05, 0xcc, 0x75, 0xb6, 0xf6, 0x97, 0xe9, 0xac, - 0xe2, 0xe6, 0x97, 0x2a, 0xab, 0x76, 0xc9, 0xab, 0x7d, 0xd4, 0xd8, 0x8d, 0x7f, 0xb7, 0xb6, 0x65, - 0xcd, 0x1d, 0x51, 0xab, 0xac, 0x29, 0xfd, 0xe9, 0x05, 0x85, 0xb3, 0x6c, 0xb5, 0xf7, 0xec, 0xea, - 0x1f, 0x47, 0xf1, 0x60, 0x01, 0xcb, 0x33, 0x0a, 0xfd, 0xd1, 0x79, 0x15, 0x27, 0xd5, 0x3f, 0x69, - 0xec, 0x66, 0xd9, 0x24, 0x6f, 0xff, 0xdf, 0xb5, 0x44, 0xaa, 0xdb, 0x17, 0x96, 0xce, 0x92, 0xed, - 0xf4, 0x0f, 0x27, 0x86, 0x76, 0x34, 0x31, 0xb4, 0x1f, 0x13, 0x43, 0xfb, 0x30, 0x35, 0x2a, 0x47, - 0x53, 0xa3, 0xf2, 0x6d, 0x6a, 0x54, 0xde, 0x6c, 0x9f, 0x1a, 0xfd, 0x6c, 0xe4, 0x7d, 0x6a, 0x8f, - 0x84, 0x24, 0x3e, 0x00, 0x68, 0x9f, 0xfe, 0x0b, 0xec, 0x6f, 0xf1, 0x03, 0x9e, 0x07, 0xc9, 0x6f, - 0x84, 0x5c, 0xce, 0xae, 0xf0, 0xc3, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x0c, 0x77, 0x4e, 0x61, - 0xb9, 0x04, 0x00, 0x00, + proto.RegisterFile("feeabstraction/feeabs/v1beta1/tx.proto", fileDescriptor_bc180c3e894b3e83) +} + +var fileDescriptor_bc180c3e894b3e83 = []byte{ + // 513 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0x8e, 0x1b, 0xa9, 0xa2, 0x5b, 0x40, 0xc2, 0x02, 0x91, 0xba, 0xc2, 0x09, 0x16, 0x42, 0x01, + 0x29, 0x5e, 0x5a, 0x0e, 0xa5, 0x48, 0x08, 0xb9, 0x41, 0x95, 0x38, 0x44, 0x82, 0x04, 0x09, 0x89, + 0x4b, 0xb5, 0xb6, 0x27, 0x8e, 0x45, 0xec, 0xb1, 0x3c, 0xeb, 0xd2, 0x48, 0x3c, 0x04, 0x9c, 0x78, + 0x07, 0x6e, 0x1c, 0x78, 0x87, 0x1e, 0x7b, 0xe4, 0x54, 0x50, 0xf2, 0x06, 0x3c, 0x01, 0xf2, 0x5f, + 0xd4, 0x02, 0x0e, 0xa1, 0x27, 0x7b, 0x76, 0xbf, 0xef, 0x9b, 0x6f, 0x46, 0x33, 0xcb, 0xee, 0x0e, + 0x01, 0x84, 0x4d, 0x32, 0x16, 0x8e, 0xf4, 0x31, 0xe4, 0x79, 0xc8, 0x0f, 0xb7, 0x6c, 0x90, 0x62, + 0x8b, 0xcb, 0x23, 0x33, 0x8a, 0x51, 0xa2, 0x7a, 0xeb, 0x3c, 0xce, 0xcc, 0x43, 0xb3, 0xc0, 0x69, + 0xd7, 0x3d, 0xf4, 0x30, 0x43, 0xf2, 0xf4, 0x2f, 0x27, 0x69, 0xf7, 0x17, 0x8b, 0x47, 0x22, 0x16, + 0x01, 0x15, 0xd8, 0x7b, 0x8b, 0xb1, 0x10, 0xa1, 0x33, 0x2a, 0xa0, 0xba, 0x83, 0x14, 0x20, 0x71, + 0x5b, 0x10, 0xcc, 0x01, 0x0e, 0xfa, 0x61, 0x71, 0xdf, 0xf4, 0x10, 0xbd, 0x31, 0xf0, 0x2c, 0xb2, + 0x93, 0x21, 0x97, 0x7e, 0x00, 0x24, 0x45, 0x10, 0xe5, 0x00, 0xe3, 0xab, 0xc2, 0xb4, 0x1e, 0x79, + 0xfb, 0x49, 0xe8, 0xee, 0x03, 0x58, 0x36, 0xf5, 0xd0, 0x4d, 0xc6, 0x60, 0x39, 0x0e, 0x26, 0xa1, + 0x54, 0x6f, 0xb3, 0xcb, 0xc3, 0x18, 0x83, 0x03, 0xe1, 0xba, 0x31, 0x10, 0x35, 0x94, 0x96, 0xd2, + 0x5e, 0xeb, 0xaf, 0xa7, 0x67, 0x56, 0x7e, 0xa4, 0x4a, 0xb6, 0x2a, 0x82, 0x14, 0xdc, 0x58, 0x69, + 0xd5, 0xdb, 0xeb, 0xdb, 0x1b, 0x66, 0xee, 0xc9, 0x4c, 0x3d, 0x95, 0x5d, 0x31, 0xbb, 0xe8, 0x87, + 0x7b, 0xd6, 0xf1, 0x69, 0xb3, 0xf6, 0xf3, 0xb4, 0x79, 0x65, 0x22, 0x82, 0xf1, 0x63, 0x23, 0xa7, + 0x19, 0x9f, 0xbf, 0x37, 0xdb, 0x9e, 0x2f, 0x47, 0x89, 0x6d, 0x3a, 0x18, 0xf0, 0xa2, 0xa2, 0xfc, + 0xd3, 0x21, 0xf7, 0x2d, 0x97, 0x93, 0x08, 0x28, 0x53, 0xa0, 0x7e, 0x91, 0xcb, 0xb8, 0xc3, 0x8c, + 0x6a, 0xdb, 0x7d, 0xa0, 0x08, 0x43, 0x02, 0xe3, 0x09, 0x6b, 0xf4, 0xc8, 0x1b, 0x40, 0xe8, 0xbe, + 0x4c, 0x20, 0x9e, 0x3c, 0xb7, 0x9d, 0x67, 0x10, 0x62, 0xf0, 0xea, 0xb5, 0xf5, 0x62, 0x89, 0xd2, + 0x0c, 0x83, 0xb5, 0xaa, 0xe8, 0xf3, 0x14, 0x03, 0x76, 0x2d, 0xc5, 0xbc, 0x13, 0x51, 0x37, 0x46, + 0xa2, 0xee, 0x48, 0xf8, 0xe1, 0x32, 0x6d, 0xdb, 0x64, 0x6b, 0xbe, 0xed, 0x1c, 0xb8, 0xa9, 0x60, + 0x63, 0x25, 0xbb, 0xbf, 0xe4, 0x17, 0x09, 0x8c, 0x4d, 0xb6, 0xf1, 0x87, 0x68, 0x99, 0x71, 0xfb, + 0x4b, 0x9d, 0xd5, 0x7b, 0xe4, 0xa9, 0x1f, 0x15, 0x76, 0xe3, 0xef, 0xa5, 0xed, 0x98, 0x0b, 0x47, + 0xd4, 0xac, 0x2a, 0x4a, 0x7b, 0x7a, 0x41, 0x62, 0xe9, 0x4d, 0x7d, 0xcf, 0xae, 0xfe, 0xd6, 0x8a, + 0x07, 0x4b, 0x48, 0x9e, 0x63, 0x68, 0x8f, 0xfe, 0x97, 0x31, 0xcf, 0xfe, 0x49, 0x61, 0x37, 0xab, + 0x26, 0x79, 0xf7, 0xdf, 0xaa, 0x15, 0x54, 0xcd, 0xba, 0x30, 0xb5, 0x74, 0xb6, 0x37, 0x38, 0x9e, + 0xea, 0xca, 0xc9, 0x54, 0x57, 0x7e, 0x4c, 0x75, 0xe5, 0xc3, 0x4c, 0xaf, 0x9d, 0xcc, 0xf4, 0xda, + 0xb7, 0x99, 0x5e, 0x7b, 0xb3, 0x7b, 0x66, 0xf4, 0xb3, 0x91, 0xf7, 0xa9, 0x33, 0x4e, 0xd7, 0x7d, + 0x08, 0xd0, 0x39, 0xfb, 0x0a, 0x1c, 0xee, 0xf0, 0xa3, 0xf2, 0x29, 0xc8, 0x36, 0xc2, 0x5e, 0xcd, + 0x56, 0xf8, 0xe1, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x4a, 0x38, 0xfa, 0xb9, 0x04, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -367,7 +364,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { func (c *msgClient) SendQueryIbcDenomTWAP(ctx context.Context, in *MsgSendQueryIbcDenomTWAP, opts ...grpc.CallOption) (*MsgSendQueryIbcDenomTWAPResponse, error) { out := new(MsgSendQueryIbcDenomTWAPResponse) - err := c.cc.Invoke(ctx, "/feeabstraction.absfee.v1beta1.Msg/SendQueryIbcDenomTWAP", in, out, opts...) + err := c.cc.Invoke(ctx, "/feeabstraction.feeabs.v1beta1.Msg/SendQueryIbcDenomTWAP", in, out, opts...) if err != nil { return nil, err } @@ -376,7 +373,7 @@ func (c *msgClient) SendQueryIbcDenomTWAP(ctx context.Context, in *MsgSendQueryI func (c *msgClient) SwapCrossChain(ctx context.Context, in *MsgSwapCrossChain, opts ...grpc.CallOption) (*MsgSwapCrossChainResponse, error) { out := new(MsgSwapCrossChainResponse) - err := c.cc.Invoke(ctx, "/feeabstraction.absfee.v1beta1.Msg/SwapCrossChain", in, out, opts...) + err := c.cc.Invoke(ctx, "/feeabstraction.feeabs.v1beta1.Msg/SwapCrossChain", in, out, opts...) if err != nil { return nil, err } @@ -385,7 +382,7 @@ func (c *msgClient) SwapCrossChain(ctx context.Context, in *MsgSwapCrossChain, o func (c *msgClient) FundFeeAbsModuleAccount(ctx context.Context, in *MsgFundFeeAbsModuleAccount, opts ...grpc.CallOption) (*MsgFundFeeAbsModuleAccountResponse, error) { out := new(MsgFundFeeAbsModuleAccountResponse) - err := c.cc.Invoke(ctx, "/feeabstraction.absfee.v1beta1.Msg/FundFeeAbsModuleAccount", in, out, opts...) + err := c.cc.Invoke(ctx, "/feeabstraction.feeabs.v1beta1.Msg/FundFeeAbsModuleAccount", in, out, opts...) if err != nil { return nil, err } @@ -427,7 +424,7 @@ func _Msg_SendQueryIbcDenomTWAP_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/feeabstraction.absfee.v1beta1.Msg/SendQueryIbcDenomTWAP", + FullMethod: "/feeabstraction.feeabs.v1beta1.Msg/SendQueryIbcDenomTWAP", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).SendQueryIbcDenomTWAP(ctx, req.(*MsgSendQueryIbcDenomTWAP)) @@ -445,7 +442,7 @@ func _Msg_SwapCrossChain_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/feeabstraction.absfee.v1beta1.Msg/SwapCrossChain", + FullMethod: "/feeabstraction.feeabs.v1beta1.Msg/SwapCrossChain", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).SwapCrossChain(ctx, req.(*MsgSwapCrossChain)) @@ -463,7 +460,7 @@ func _Msg_FundFeeAbsModuleAccount_Handler(srv interface{}, ctx context.Context, } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/feeabstraction.absfee.v1beta1.Msg/FundFeeAbsModuleAccount", + FullMethod: "/feeabstraction.feeabs.v1beta1.Msg/FundFeeAbsModuleAccount", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).FundFeeAbsModuleAccount(ctx, req.(*MsgFundFeeAbsModuleAccount)) @@ -472,7 +469,7 @@ func _Msg_FundFeeAbsModuleAccount_Handler(srv interface{}, ctx context.Context, } var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "feeabstraction.absfee.v1beta1.Msg", + ServiceName: "feeabstraction.feeabs.v1beta1.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { @@ -489,7 +486,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "feeabstraction/absfee/v1beta1/tx.proto", + Metadata: "feeabstraction/feeabs/v1beta1/tx.proto", } func (m *MsgFundFeeAbsModuleAccount) Marshal() (dAtA []byte, err error) {