From bdff1dacaabe8055f52fc40a812c92df5a6c9547 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Wed, 16 Feb 2022 13:22:15 +0700 Subject: [PATCH] Semantic versioning for v7 (#804) * update go.mod * fix order adding in app.go * update hardcoded gas amounts * Annotate app.go * Delete .gitpod.yml * go fmt * finish annotation * Update CHANGELOG.md * Update app/app.go Co-authored-by: Dev Ojha * v7 * Semantic versioning * remove artifact that make-proto didn't catch * clean * go mod tidy * ensure all imports refer to v7 * fmt Co-authored-by: Sunny Aggarwal Co-authored-by: Dev Ojha --- app/ante.go | 4 +- app/app.go | 68 +++--- app/config.go | 2 +- app/encoding.go | 2 +- app/forks.go | 4 +- app/keepers.go | 42 ++-- app/params/config.go | 2 +- app/upgrades/v4/upgrade_test.go | 4 +- app/upgrades/v4/upgrades.go | 4 +- app/upgrades/v5/upgrades.go | 8 +- app/upgrades/v5/whitelist_feetokens.go | 4 +- app/wasmtest/helpers_test.go | 5 +- app/wasmtest/store_run_test.go | 2 +- .../cmd/balances_from_state_export.go | 10 +- cmd/osmosisd/cmd/genesis.go | 12 +- cmd/osmosisd/cmd/root.go | 5 +- cmd/osmosisd/cmd/testnetify/cmd.go | 2 +- cmd/osmosisd/cmd/testnetify/find_replace.go | 2 +- .../cmd/testnetify/state_export_to_testnet.go | 2 +- cmd/osmosisd/main.go | 6 +- go.mod | 2 +- proto/osmosis/claim/v1beta1/claim.proto | 2 +- proto/osmosis/claim/v1beta1/genesis.proto | 2 +- proto/osmosis/claim/v1beta1/params.proto | 2 +- proto/osmosis/claim/v1beta1/query.proto | 2 +- proto/osmosis/epochs/genesis.proto | 2 +- proto/osmosis/epochs/query.proto | 2 +- .../pool-models/balancer/balancerPool.proto | 2 +- .../gamm/pool-models/balancer/tx.proto | 2 +- proto/osmosis/gamm/v1beta1/genesis.proto | 2 +- proto/osmosis/gamm/v1beta1/pool.proto | 2 +- proto/osmosis/gamm/v1beta1/query.proto | 2 +- proto/osmosis/gamm/v1beta1/tx.proto | 2 +- proto/osmosis/incentives/gauge.proto | 2 +- proto/osmosis/incentives/genesis.proto | 2 +- proto/osmosis/incentives/params.proto | 2 +- proto/osmosis/incentives/query.proto | 2 +- proto/osmosis/incentives/tx.proto | 2 +- proto/osmosis/lockup/genesis.proto | 2 +- proto/osmosis/lockup/lock.proto | 2 +- proto/osmosis/lockup/query.proto | 2 +- proto/osmosis/lockup/tx.proto | 2 +- proto/osmosis/mint/v1beta1/genesis.proto | 2 +- proto/osmosis/mint/v1beta1/mint.proto | 2 +- proto/osmosis/mint/v1beta1/query.proto | 2 +- .../pool-incentives/v1beta1/genesis.proto | 2 +- .../osmosis/pool-incentives/v1beta1/gov.proto | 2 +- .../pool-incentives/v1beta1/incentives.proto | 2 +- .../pool-incentives/v1beta1/query.proto | 2 +- proto/osmosis/store/v1beta1/tree.proto | 2 +- proto/osmosis/superfluid/genesis.proto | 2 +- proto/osmosis/superfluid/gov.proto | 2 +- proto/osmosis/superfluid/params.proto | 2 +- proto/osmosis/superfluid/query.proto | 2 +- proto/osmosis/superfluid/superfluid.proto | 2 +- proto/osmosis/superfluid/tx.proto | 2 +- proto/osmosis/txfees/v1beta1/feetoken.proto | 2 +- proto/osmosis/txfees/v1beta1/genesis.proto | 2 +- proto/osmosis/txfees/v1beta1/gov.proto | 2 +- proto/osmosis/txfees/v1beta1/query.proto | 2 +- scripts/protocgen.sh | 2 +- simapp/genesis.go | 2 +- simapp/sim_test.go | 2 +- simapp/state.go | 2 +- store/legacy/v101/tree.go | 2 +- store/legacy/v101/tree_test.go | 4 +- store/tree.pb.go | 40 ++-- store/tree_test.go | 2 +- v043_temp/address/hash.go | 2 +- v043_temp/address/store_key_test.go | 2 +- x/claim/abci.go | 2 +- x/claim/client/cli/cli_test.go | 10 +- x/claim/client/cli/query.go | 2 +- x/claim/client/cli/tx.go | 2 +- x/claim/genesis.go | 4 +- x/claim/genesis_test.go | 6 +- x/claim/handler.go | 4 +- x/claim/keeper/claim.go | 2 +- x/claim/keeper/claim_test.go | 2 +- x/claim/keeper/grpc_query.go | 2 +- x/claim/keeper/hooks.go | 4 +- x/claim/keeper/keeper.go | 2 +- x/claim/keeper/keeper_test.go | 4 +- x/claim/keeper/params.go | 2 +- x/claim/keeper/query.go | 2 +- x/claim/module.go | 8 +- x/claim/types/claim.pb.go | 54 ++--- x/claim/types/genesis.pb.go | 51 ++-- x/claim/types/params.pb.go | 48 ++-- x/claim/types/query.pb.go | 94 ++++---- x/epochs/abci.go | 4 +- x/epochs/abci_test.go | 6 +- x/epochs/client/cli/cli_test.go | 6 +- x/epochs/client/cli/query.go | 2 +- x/epochs/client/cli/tx.go | 2 +- x/epochs/genesis.go | 4 +- x/epochs/genesis_test.go | 6 +- x/epochs/handler.go | 4 +- x/epochs/keeper/epoch.go | 2 +- x/epochs/keeper/epoch_test.go | 2 +- x/epochs/keeper/grpc_query.go | 2 +- x/epochs/keeper/grpc_query_test.go | 2 +- x/epochs/keeper/keeper.go | 2 +- x/epochs/keeper/keeper_test.go | 4 +- x/epochs/keeper/query.go | 2 +- x/epochs/module.go | 10 +- x/epochs/simulation/genesis.go | 2 +- x/epochs/types/genesis.pb.go | 62 ++--- x/epochs/types/query.pb.go | 50 ++-- x/gamm/client/cli/cli_test.go | 12 +- x/gamm/client/cli/query.go | 2 +- x/gamm/client/cli/tx.go | 4 +- x/gamm/client/testutil/test_helpers.go | 2 +- x/gamm/genesis.go | 4 +- x/gamm/genesis_test.go | 10 +- x/gamm/handler.go | 6 +- x/gamm/keeper/gas_test.go | 4 +- x/gamm/keeper/grpc_query.go | 4 +- x/gamm/keeper/grpc_query_test.go | 2 +- x/gamm/keeper/invariants.go | 4 +- x/gamm/keeper/keeper.go | 2 +- x/gamm/keeper/keeper_test.go | 6 +- x/gamm/keeper/legacy.go | 2 +- x/gamm/keeper/marshal_bench_test.go | 6 +- x/gamm/keeper/math.go | 2 +- x/gamm/keeper/msg_server.go | 4 +- x/gamm/keeper/multihop.go | 2 +- x/gamm/keeper/multihop_test.go | 2 +- x/gamm/keeper/params.go | 2 +- x/gamm/keeper/pool.go | 4 +- x/gamm/keeper/pool_service.go | 4 +- x/gamm/keeper/pool_service_test.go | 4 +- x/gamm/keeper/pool_test.go | 2 +- x/gamm/keeper/share.go | 2 +- x/gamm/keeper/swap.go | 2 +- x/gamm/keeper/swap_test.go | 2 +- x/gamm/module.go | 12 +- .../pool-models/balancer/balancerPool.pb.go | 98 ++++---- x/gamm/pool-models/balancer/balancer_pool.go | 2 +- .../balancer/balancer_pool_test.go | 2 +- x/gamm/pool-models/balancer/codec.go | 2 +- x/gamm/pool-models/balancer/marshal.go | 2 +- x/gamm/pool-models/balancer/marshal_test.go | 2 +- x/gamm/pool-models/balancer/msgs.go | 2 +- x/gamm/pool-models/balancer/msgs_test.go | 4 +- x/gamm/pool-models/balancer/tx.pb.go | 54 ++--- x/gamm/simulation/operations.go | 8 +- x/gamm/types/genesis.pb.go | 52 ++--- x/gamm/types/msgs_test.go | 2 +- x/gamm/types/params.go | 2 +- x/gamm/types/pool.go | 2 +- x/gamm/types/pool.pb.go | 10 +- x/gamm/types/query.pb.go | 164 ++++++------- x/gamm/types/tx.pb.go | 128 +++++----- x/incentives/abci_test.go | 4 +- x/incentives/client/cli/cli_test.go | 6 +- x/incentives/client/cli/query.go | 2 +- x/incentives/client/cli/tx.go | 4 +- x/incentives/genesis.go | 4 +- x/incentives/genesis_test.go | 8 +- x/incentives/handler.go | 4 +- x/incentives/keeper/bench_test.go | 6 +- x/incentives/keeper/distribute.go | 4 +- x/incentives/keeper/distribute_test.go | 4 +- x/incentives/keeper/gauge.go | 6 +- x/incentives/keeper/gauge_test.go | 4 +- x/incentives/keeper/grpc_query.go | 4 +- x/incentives/keeper/grpc_query_test.go | 6 +- x/incentives/keeper/hooks.go | 2 +- x/incentives/keeper/iterator.go | 4 +- x/incentives/keeper/keeper.go | 2 +- x/incentives/keeper/keeper_test.go | 2 +- x/incentives/keeper/msg_server.go | 4 +- x/incentives/keeper/params.go | 2 +- x/incentives/keeper/query.go | 2 +- x/incentives/keeper/store.go | 2 +- x/incentives/keeper/suite_test.go | 4 +- x/incentives/keeper/utils.go | 2 +- x/incentives/keeper/utils_test.go | 2 +- x/incentives/module.go | 10 +- x/incentives/simulation/genesis.go | 2 +- x/incentives/simulation/operations.go | 8 +- x/incentives/types/expected_keepers.go | 4 +- x/incentives/types/gauge.go | 2 +- x/incentives/types/gauge.pb.go | 73 +++--- x/incentives/types/genesis.pb.go | 46 ++-- x/incentives/types/msgs.go | 2 +- x/incentives/types/msgs_test.go | 2 +- x/incentives/types/params.go | 2 +- x/incentives/types/params.pb.go | 10 +- x/incentives/types/query.pb.go | 135 +++++------ x/incentives/types/tx.pb.go | 75 +++--- x/lockup/abci.go | 2 +- x/lockup/client/cli/cli_test.go | 10 +- x/lockup/client/cli/query.go | 2 +- x/lockup/client/cli/tx.go | 2 +- x/lockup/client/rest/query.go | 2 +- x/lockup/client/rest/tx.go | 2 +- x/lockup/client/testutil/test_helpers.go | 2 +- x/lockup/genesis.go | 4 +- x/lockup/genesis_test.go | 6 +- x/lockup/handler.go | 4 +- x/lockup/keeper/admin_keeper.go | 2 +- x/lockup/keeper/admin_keeper_test.go | 4 +- x/lockup/keeper/bench_test.go | 4 +- x/lockup/keeper/export_test.go | 2 +- x/lockup/keeper/grpc_query.go | 2 +- x/lockup/keeper/grpc_query_test.go | 2 +- x/lockup/keeper/invariants.go | 2 +- x/lockup/keeper/iterator.go | 2 +- x/lockup/keeper/keeper.go | 2 +- x/lockup/keeper/keeper_test.go | 2 +- x/lockup/keeper/legacy.go | 220 ++++++++++++++++++ x/lockup/keeper/lock.go | 4 +- x/lockup/keeper/lock_refs.go | 2 +- x/lockup/keeper/lock_test.go | 2 +- x/lockup/keeper/msg_server.go | 4 +- x/lockup/keeper/msg_server_test.go | 4 +- x/lockup/keeper/query.go | 2 +- x/lockup/keeper/store.go | 2 +- x/lockup/keeper/synthetic_lock.go | 2 +- x/lockup/keeper/synthetic_lock_test.go | 2 +- x/lockup/keeper/utils.go | 2 +- x/lockup/keeper/utils_test.go | 2 +- x/lockup/module.go | 10 +- x/lockup/simulation/operations.go | 6 +- x/lockup/types/genesis.pb.go | 12 +- x/lockup/types/lock.pb.go | 74 +++--- x/lockup/types/query.pb.go | 168 ++++++------- x/lockup/types/tx.pb.go | 67 +++--- x/mint/client/cli/cli_test.go | 4 +- x/mint/client/cli/query.go | 2 +- x/mint/client/rest/grpc_query_test.go | 4 +- x/mint/client/rest/query.go | 2 +- x/mint/genesis.go | 4 +- x/mint/genesis_test.go | 4 +- x/mint/keeper/grpc_query.go | 2 +- x/mint/keeper/grpc_query_test.go | 4 +- x/mint/keeper/hooks.go | 4 +- x/mint/keeper/hooks_test.go | 6 +- x/mint/keeper/integration_test.go | 4 +- x/mint/keeper/keeper.go | 4 +- x/mint/keeper/keeper_test.go | 8 +- x/mint/keeper/querier.go | 2 +- x/mint/keeper/querier_test.go | 4 +- x/mint/module.go | 10 +- x/mint/module_test.go | 4 +- x/mint/simulation/decoder.go | 2 +- x/mint/simulation/decoder_test.go | 6 +- x/mint/simulation/genesis.go | 2 +- x/mint/simulation/genesis_test.go | 4 +- x/mint/simulation/params_test.go | 2 +- x/mint/types/expected_keepers.go | 2 +- x/mint/types/genesis.pb.go | 12 +- x/mint/types/mint.pb.go | 98 ++++---- x/mint/types/params.go | 2 +- x/mint/types/query.pb.go | 52 ++--- x/pool-incentives/abci.go | 2 +- x/pool-incentives/client/cli/cli_test.go | 6 +- x/pool-incentives/client/cli/query.go | 2 +- x/pool-incentives/client/cli/tx.go | 4 +- x/pool-incentives/client/proposal_handler.go | 4 +- x/pool-incentives/client/rest/tx.go | 2 +- x/pool-incentives/genesis.go | 4 +- x/pool-incentives/genesis_test.go | 6 +- x/pool-incentives/handler.go | 4 +- x/pool-incentives/keeper/distr.go | 2 +- x/pool-incentives/keeper/distr_test.go | 4 +- x/pool-incentives/keeper/gov.go | 2 +- x/pool-incentives/keeper/grpc_query.go | 4 +- x/pool-incentives/keeper/grpc_query_test.go | 4 +- x/pool-incentives/keeper/hooks.go | 2 +- x/pool-incentives/keeper/keeper.go | 8 +- x/pool-incentives/keeper/keeper_test.go | 8 +- x/pool-incentives/keeper/params.go | 2 +- x/pool-incentives/module.go | 6 +- x/pool-incentives/types/expected_keepers.go | 8 +- x/pool-incentives/types/genesis.pb.go | 46 ++-- x/pool-incentives/types/genesis_test.go | 2 +- x/pool-incentives/types/gov.pb.go | 12 +- x/pool-incentives/types/gov_test.go | 2 +- x/pool-incentives/types/incentives.pb.go | 59 ++--- x/pool-incentives/types/incentives_test.go | 2 +- x/pool-incentives/types/query.pb.go | 104 ++++----- x/pool-incentives/types/query_test.go | 2 +- x/pool-incentives/types/record_test.go | 2 +- x/superfluid/abci.go | 2 +- x/superfluid/client/cli/query.go | 2 +- x/superfluid/client/cli/tx.go | 2 +- x/superfluid/client/proposal_handler.go | 4 +- x/superfluid/genesis.go | 4 +- x/superfluid/handler.go | 4 +- x/superfluid/keeper/distribution.go | 2 +- x/superfluid/keeper/distribution_test.go | 6 +- x/superfluid/keeper/gov.go | 2 +- x/superfluid/keeper/gov_test.go | 2 +- x/superfluid/keeper/grpc_query.go | 2 +- x/superfluid/keeper/grpc_query_test.go | 2 +- x/superfluid/keeper/hooks.go | 6 +- x/superfluid/keeper/hooks_test.go | 10 +- x/superfluid/keeper/intermediary_account.go | 2 +- .../keeper/intermediary_account_test.go | 2 +- x/superfluid/keeper/keeper.go | 2 +- x/superfluid/keeper/keeper_test.go | 2 +- x/superfluid/keeper/msg_server.go | 2 +- x/superfluid/keeper/params.go | 2 +- x/superfluid/keeper/slash.go | 2 +- x/superfluid/keeper/slash_test.go | 6 +- x/superfluid/keeper/stake.go | 6 +- x/superfluid/keeper/stake_test.go | 12 +- x/superfluid/keeper/superfluid_asset.go | 2 +- x/superfluid/keeper/superfluid_asset_store.go | 2 +- x/superfluid/keeper/superfluid_asset_test.go | 2 +- x/superfluid/keeper/twap_price.go | 4 +- x/superfluid/keeper/twap_price_test.go | 4 +- x/superfluid/module.go | 10 +- x/superfluid/proposal_handler.go | 4 +- x/superfluid/simulation/genesis.go | 2 +- x/superfluid/simulation/operations.go | 8 +- x/superfluid/simulation/proposals.go | 4 +- x/superfluid/types/expected_keepers.go | 6 +- x/superfluid/types/genesis.pb.go | 46 ++-- x/superfluid/types/gov.go | 2 +- x/superfluid/types/gov.pb.go | 14 +- x/superfluid/types/params.go | 2 +- x/superfluid/types/params.pb.go | 48 ++-- x/superfluid/types/query.pb.go | 98 ++++---- x/superfluid/types/superfluid.pb.go | 65 +++--- x/superfluid/types/tx.pb.go | 47 ++-- x/txfees/client/cli/query.go | 2 +- x/txfees/client/cli/tx.go | 2 +- x/txfees/genesis.go | 4 +- x/txfees/handler.go | 4 +- x/txfees/keeper/feedecorator.go | 4 +- x/txfees/keeper/feedecorator_test.go | 4 +- x/txfees/keeper/feetokens.go | 2 +- x/txfees/keeper/feetokens_test.go | 2 +- x/txfees/keeper/gov.go | 2 +- x/txfees/keeper/grpc_query.go | 2 +- x/txfees/keeper/keeper.go | 2 +- x/txfees/keeper/keeper_test.go | 8 +- x/txfees/keeper/txfee_filters/arb_tx.go | 2 +- x/txfees/module.go | 6 +- x/txfees/module_test.go | 2 +- x/txfees/types/feetoken.pb.go | 12 +- x/txfees/types/genesis.pb.go | 12 +- x/txfees/types/gov.pb.go | 12 +- x/txfees/types/query.pb.go | 65 +++--- 348 files changed, 1988 insertions(+), 1757 deletions(-) create mode 100644 x/lockup/keeper/legacy.go diff --git a/app/ante.go b/app/ante.go index 3e1fdc6f588..90191f3a173 100644 --- a/app/ante.go +++ b/app/ante.go @@ -11,8 +11,8 @@ import ( channelkeeper "github.com/cosmos/ibc-go/v2/modules/core/04-channel/keeper" ibcante "github.com/cosmos/ibc-go/v2/modules/core/ante" - txfeeskeeper "github.com/osmosis-labs/osmosis/x/txfees/keeper" - txfeestypes "github.com/osmosis-labs/osmosis/x/txfees/types" + txfeeskeeper "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper" + txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) // Link to default ante handler used by cosmos sdk: diff --git a/app/app.go b/app/app.go index c810cb77aba..775ae902b7c 100644 --- a/app/app.go +++ b/app/app.go @@ -132,60 +132,60 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v2/modules/core/keeper" // Osmosis application prarmeters - appparams "github.com/osmosis-labs/osmosis/app/params" + appparams "github.com/osmosis-labs/osmosis/v7/app/params" // Upgrades from earlier versions of Osmosis - v4 "github.com/osmosis-labs/osmosis/app/upgrades/v4" - v5 "github.com/osmosis-labs/osmosis/app/upgrades/v5" - v7 "github.com/osmosis-labs/osmosis/app/upgrades/v7" - _ "github.com/osmosis-labs/osmosis/client/docs/statik" + v4 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v4" + v5 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v5" + v7 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v7" + _ "github.com/osmosis-labs/osmosis/v7/client/docs/statik" // Modules that live in the Osmosis repository and are specific to Osmosis - "github.com/osmosis-labs/osmosis/x/claim" - claimkeeper "github.com/osmosis-labs/osmosis/x/claim/keeper" - claimtypes "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/x/claim" + claimkeeper "github.com/osmosis-labs/osmosis/v7/x/claim/keeper" + claimtypes "github.com/osmosis-labs/osmosis/v7/x/claim/types" // Epochs: gives Osmosis a sense of "clock time" so that events can be based on days instead of "number of blocks" - "github.com/osmosis-labs/osmosis/x/epochs" - epochskeeper "github.com/osmosis-labs/osmosis/x/epochs/keeper" - epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs" + epochskeeper "github.com/osmosis-labs/osmosis/v7/x/epochs/keeper" + epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" // Generalized Automated Market Maker - "github.com/osmosis-labs/osmosis/x/gamm" - gammkeeper "github.com/osmosis-labs/osmosis/x/gamm/keeper" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm" + gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" // Incentives: Allows Osmosis and foriegn chain communities to incentivize users to provide liquidity - "github.com/osmosis-labs/osmosis/x/incentives" - incentiveskeeper "github.com/osmosis-labs/osmosis/x/incentives/keeper" - incentivestypes "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives" + incentiveskeeper "github.com/osmosis-labs/osmosis/v7/x/incentives/keeper" + incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" // Lockup: allows tokens to be locked (made non-transferrable) - "github.com/osmosis-labs/osmosis/x/lockup" - lockupkeeper "github.com/osmosis-labs/osmosis/x/lockup/keeper" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup" + lockupkeeper "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" // Mint: Our modified version of github.com/cosmos/cosmos-sdk/x/mint - "github.com/osmosis-labs/osmosis/x/mint" - mintkeeper "github.com/osmosis-labs/osmosis/x/mint/keeper" - minttypes "github.com/osmosis-labs/osmosis/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/mint" + mintkeeper "github.com/osmosis-labs/osmosis/v7/x/mint/keeper" + minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" // Pool incentives: - poolincentives "github.com/osmosis-labs/osmosis/x/pool-incentives" - poolincentivesclient "github.com/osmosis-labs/osmosis/x/pool-incentives/client" - poolincentiveskeeper "github.com/osmosis-labs/osmosis/x/pool-incentives/keeper" - poolincentivestypes "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + poolincentives "github.com/osmosis-labs/osmosis/v7/x/pool-incentives" + poolincentivesclient "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/client" + poolincentiveskeeper "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/keeper" + poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" // Superfluid: Allows users to stake gamm (bonded liquidity) - superfluid "github.com/osmosis-labs/osmosis/x/superfluid" - superfluidclient "github.com/osmosis-labs/osmosis/x/superfluid/client" - superfluidkeeper "github.com/osmosis-labs/osmosis/x/superfluid/keeper" - superfluidtypes "github.com/osmosis-labs/osmosis/x/superfluid/types" + superfluid "github.com/osmosis-labs/osmosis/v7/x/superfluid" + superfluidclient "github.com/osmosis-labs/osmosis/v7/x/superfluid/client" + superfluidkeeper "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" + superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" // txfees: Allows Osmosis to charge transaction fees without harming IBC user experience - "github.com/osmosis-labs/osmosis/x/txfees" - txfeeskeeper "github.com/osmosis-labs/osmosis/x/txfees/keeper" - txfeestypes "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees" + txfeeskeeper "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper" + txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types" "github.com/CosmWasm/wasmd/x/wasm" wasmclient "github.com/CosmWasm/wasmd/x/wasm/client" diff --git a/app/config.go b/app/config.go index b580dbb9194..4e9fa1b551a 100644 --- a/app/config.go +++ b/app/config.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/simapp" "github.com/cosmos/cosmos-sdk/testutil/network" - "github.com/osmosis-labs/osmosis/app/params" + "github.com/osmosis-labs/osmosis/v7/app/params" dbm "github.com/tendermint/tm-db" servertypes "github.com/cosmos/cosmos-sdk/server/types" diff --git a/app/encoding.go b/app/encoding.go index 2741e196311..c106d30a0c7 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -2,7 +2,7 @@ package app import ( "github.com/cosmos/cosmos-sdk/std" - "github.com/osmosis-labs/osmosis/app/params" + "github.com/osmosis-labs/osmosis/v7/app/params" ) // MakeEncodingConfig creates an EncodingConfig for testing diff --git a/app/forks.go b/app/forks.go index 218135bb36f..136afbed8f0 100644 --- a/app/forks.go +++ b/app/forks.go @@ -2,8 +2,8 @@ package app import ( sdk "github.com/cosmos/cosmos-sdk/types" - v3 "github.com/osmosis-labs/osmosis/app/upgrades/v3" - v6 "github.com/osmosis-labs/osmosis/app/upgrades/v6" + v3 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v3" + v6 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v6" ) // BeginBlockForks is intended to be ran in diff --git a/app/keepers.go b/app/keepers.go index b517e27cb2b..46cf87ca24c 100644 --- a/app/keepers.go +++ b/app/keepers.go @@ -46,27 +46,27 @@ import ( bech32ibckeeper "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/keeper" bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types" bech32ics20keeper "github.com/osmosis-labs/bech32-ibc/x/bech32ics20/keeper" - claimkeeper "github.com/osmosis-labs/osmosis/x/claim/keeper" - claimtypes "github.com/osmosis-labs/osmosis/x/claim/types" - epochskeeper "github.com/osmosis-labs/osmosis/x/epochs/keeper" - epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" - gammkeeper "github.com/osmosis-labs/osmosis/x/gamm/keeper" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" - incentiveskeeper "github.com/osmosis-labs/osmosis/x/incentives/keeper" - incentivestypes "github.com/osmosis-labs/osmosis/x/incentives/types" - lockupkeeper "github.com/osmosis-labs/osmosis/x/lockup/keeper" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" - mintkeeper "github.com/osmosis-labs/osmosis/x/mint/keeper" - minttypes "github.com/osmosis-labs/osmosis/x/mint/types" - poolincentives "github.com/osmosis-labs/osmosis/x/pool-incentives" - poolincentiveskeeper "github.com/osmosis-labs/osmosis/x/pool-incentives/keeper" - poolincentivestypes "github.com/osmosis-labs/osmosis/x/pool-incentives/types" - superfluid "github.com/osmosis-labs/osmosis/x/superfluid" - superfluidkeeper "github.com/osmosis-labs/osmosis/x/superfluid/keeper" - superfluidtypes "github.com/osmosis-labs/osmosis/x/superfluid/types" - "github.com/osmosis-labs/osmosis/x/txfees" - txfeeskeeper "github.com/osmosis-labs/osmosis/x/txfees/keeper" - txfeestypes "github.com/osmosis-labs/osmosis/x/txfees/types" + claimkeeper "github.com/osmosis-labs/osmosis/v7/x/claim/keeper" + claimtypes "github.com/osmosis-labs/osmosis/v7/x/claim/types" + epochskeeper "github.com/osmosis-labs/osmosis/v7/x/epochs/keeper" + epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + incentiveskeeper "github.com/osmosis-labs/osmosis/v7/x/incentives/keeper" + incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockupkeeper "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + mintkeeper "github.com/osmosis-labs/osmosis/v7/x/mint/keeper" + minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" + poolincentives "github.com/osmosis-labs/osmosis/v7/x/pool-incentives" + poolincentiveskeeper "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/keeper" + poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid" + superfluidkeeper "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" + superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees" + txfeeskeeper "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper" + txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) func (app *OsmosisApp) InitSpecialKeepers( diff --git a/app/params/config.go b/app/params/config.go index 4da8d9c6d22..4062770bcd6 100644 --- a/app/params/config.go +++ b/app/params/config.go @@ -3,7 +3,7 @@ package params import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v043_temp/address" + "github.com/osmosis-labs/osmosis/v7/v043_temp/address" ) const ( diff --git a/app/upgrades/v4/upgrade_test.go b/app/upgrades/v4/upgrade_test.go index e70bf821014..77a75ece912 100644 --- a/app/upgrades/v4/upgrade_test.go +++ b/app/upgrades/v4/upgrade_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/app" - v4 "github.com/osmosis-labs/osmosis/app/upgrades/v4" + "github.com/osmosis-labs/osmosis/v7/app" + v4 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v4" "github.com/stretchr/testify/suite" abci "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index 05841b7176d..42bd913b96a 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -6,10 +6,10 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" - gammkeeper "github.com/osmosis-labs/osmosis/x/gamm/keeper" + gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func CreateUpgradeHandler(mm *module.Manager, configurator module.Configurator, diff --git a/app/upgrades/v5/upgrades.go b/app/upgrades/v5/upgrades.go index 02c0230d2f6..3d5c7d45fe7 100644 --- a/app/upgrades/v5/upgrades.go +++ b/app/upgrades/v5/upgrades.go @@ -9,15 +9,15 @@ import ( stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" connectionkeeper "github.com/cosmos/ibc-go/v2/modules/core/03-connection/keeper" - gammkeeper "github.com/osmosis-labs/osmosis/x/gamm/keeper" - txfeeskeeper "github.com/osmosis-labs/osmosis/x/txfees/keeper" + gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" + txfeeskeeper "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper" - "github.com/osmosis-labs/osmosis/x/txfees" + "github.com/osmosis-labs/osmosis/v7/x/txfees" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ibcconnectiontypes "github.com/cosmos/ibc-go/v2/modules/core/03-connection/types" bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types" - txfeestypes "github.com/osmosis-labs/osmosis/x/txfees/types" + txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) func CreateUpgradeHandler(mm *module.Manager, configurator module.Configurator, diff --git a/app/upgrades/v5/whitelist_feetokens.go b/app/upgrades/v5/whitelist_feetokens.go index fabeb1e3cc4..d94f0ba5add 100644 --- a/app/upgrades/v5/whitelist_feetokens.go +++ b/app/upgrades/v5/whitelist_feetokens.go @@ -6,8 +6,8 @@ import ( "strings" sdk "github.com/cosmos/cosmos-sdk/types" - gammkeeper "github.com/osmosis-labs/osmosis/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/x/txfees/types" + gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) // Every asset with a liquid osmo pairing pool on Osmosis, as of 12/01/21 diff --git a/app/wasmtest/helpers_test.go b/app/wasmtest/helpers_test.go index 0618507faf4..ee4eb1327b6 100644 --- a/app/wasmtest/helpers_test.go +++ b/app/wasmtest/helpers_test.go @@ -1,17 +1,18 @@ package wasmtest import ( - "github.com/stretchr/testify/require" "testing" "time" + "github.com/stretchr/testify/require" + "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/tendermint/tendermint/crypto" "github.com/tendermint/tendermint/crypto/ed25519" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/app" + "github.com/osmosis-labs/osmosis/v7/app" ) func CreateTestInput() (*app.OsmosisApp, sdk.Context) { diff --git a/app/wasmtest/store_run_test.go b/app/wasmtest/store_run_test.go index 875e32e7dfc..2dec41e456d 100644 --- a/app/wasmtest/store_run_test.go +++ b/app/wasmtest/store_run_test.go @@ -12,7 +12,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/app" + "github.com/osmosis-labs/osmosis/v7/app" ) func TestNoStorageWithoutProposal(t *testing.T) { diff --git a/cmd/osmosisd/cmd/balances_from_state_export.go b/cmd/osmosisd/cmd/balances_from_state_export.go index b9b4e9c4019..13dcd477971 100644 --- a/cmd/osmosisd/cmd/balances_from_state_export.go +++ b/cmd/osmosisd/cmd/balances_from_state_export.go @@ -12,11 +12,11 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - appparams "github.com/osmosis-labs/osmosis/app/params" - "github.com/osmosis-labs/osmosis/osmoutils" - claimtypes "github.com/osmosis-labs/osmosis/x/claim/types" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + appparams "github.com/osmosis-labs/osmosis/v7/app/params" + "github.com/osmosis-labs/osmosis/v7/osmoutils" + claimtypes "github.com/osmosis-labs/osmosis/v7/x/claim/types" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" "github.com/spf13/cobra" tmjson "github.com/tendermint/tendermint/libs/json" tmtypes "github.com/tendermint/tendermint/types" diff --git a/cmd/osmosisd/cmd/genesis.go b/cmd/osmosisd/cmd/genesis.go index 303eae95fd7..fdf409e3a96 100644 --- a/cmd/osmosisd/cmd/genesis.go +++ b/cmd/osmosisd/cmd/genesis.go @@ -26,13 +26,13 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - appParams "github.com/osmosis-labs/osmosis/app/params" + appParams "github.com/osmosis-labs/osmosis/v7/app/params" - claimtypes "github.com/osmosis-labs/osmosis/x/claim/types" - epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" - incentivestypes "github.com/osmosis-labs/osmosis/x/incentives/types" - minttypes "github.com/osmosis-labs/osmosis/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + claimtypes "github.com/osmosis-labs/osmosis/v7/x/claim/types" + epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) func PrepareGenesisCmd(defaultNodeHome string, mbm module.BasicManager) *cobra.Command { diff --git a/cmd/osmosisd/cmd/root.go b/cmd/osmosisd/cmd/root.go index 2a16cc4e7d2..5c8731bfbae 100644 --- a/cmd/osmosisd/cmd/root.go +++ b/cmd/osmosisd/cmd/root.go @@ -7,6 +7,8 @@ import ( "github.com/prometheus/client_golang/prometheus" + "github.com/osmosis-labs/osmosis/v7/app/params" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" @@ -36,8 +38,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - osmosis "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/app/params" + osmosis "github.com/osmosis-labs/osmosis/v7/app" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/cmd/osmosisd/cmd/testnetify/cmd.go b/cmd/osmosisd/cmd/testnetify/cmd.go index d1bec8ee0e2..d158ba4b88c 100644 --- a/cmd/osmosisd/cmd/testnetify/cmd.go +++ b/cmd/osmosisd/cmd/testnetify/cmd.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - "github.com/osmosis-labs/osmosis/app" + "github.com/osmosis-labs/osmosis/v7/app" "github.com/spf13/cobra" ) diff --git a/cmd/osmosisd/cmd/testnetify/find_replace.go b/cmd/osmosisd/cmd/testnetify/find_replace.go index cb6b2ef97b8..fad757bac9a 100644 --- a/cmd/osmosisd/cmd/testnetify/find_replace.go +++ b/cmd/osmosisd/cmd/testnetify/find_replace.go @@ -3,7 +3,7 @@ package testnetify import ( "bytes" - "github.com/osmosis-labs/osmosis/app" + "github.com/osmosis-labs/osmosis/v7/app" ) func replaceConsAddrHex(genesis app.GenesisState, fromAddr string, replaceAddr string) { diff --git a/cmd/osmosisd/cmd/testnetify/state_export_to_testnet.go b/cmd/osmosisd/cmd/testnetify/state_export_to_testnet.go index ece35958978..2f61bfdc1a3 100644 --- a/cmd/osmosisd/cmd/testnetify/state_export_to_testnet.go +++ b/cmd/osmosisd/cmd/testnetify/state_export_to_testnet.go @@ -1,7 +1,7 @@ package testnetify import ( - "github.com/osmosis-labs/osmosis/app" + "github.com/osmosis-labs/osmosis/v7/app" "github.com/spf13/cobra" ) diff --git a/cmd/osmosisd/main.go b/cmd/osmosisd/main.go index 61ab8b19f96..0a8f95b9834 100644 --- a/cmd/osmosisd/main.go +++ b/cmd/osmosisd/main.go @@ -5,9 +5,9 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - osmosis "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/app/params" - "github.com/osmosis-labs/osmosis/cmd/osmosisd/cmd" + osmosis "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/app/params" + "github.com/osmosis-labs/osmosis/v7/cmd/osmosisd/cmd" ) func main() { diff --git a/go.mod b/go.mod index ce196d2ad97..70e612089f8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/osmosis-labs/osmosis +module github.com/osmosis-labs/osmosis/v7 go 1.17 diff --git a/proto/osmosis/claim/v1beta1/claim.proto b/proto/osmosis/claim/v1beta1/claim.proto index 08baaeb9d55..47e824ab7ec 100644 --- a/proto/osmosis/claim/v1beta1/claim.proto +++ b/proto/osmosis/claim/v1beta1/claim.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; import "cosmos/bank/v1beta1/genesis.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/claim/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/claim/types"; enum Action { option (gogoproto.goproto_enum_prefix) = false; diff --git a/proto/osmosis/claim/v1beta1/genesis.proto b/proto/osmosis/claim/v1beta1/genesis.proto index 7af79d0bb30..1166a25c562 100644 --- a/proto/osmosis/claim/v1beta1/genesis.proto +++ b/proto/osmosis/claim/v1beta1/genesis.proto @@ -9,7 +9,7 @@ import "google/protobuf/timestamp.proto"; import "osmosis/claim/v1beta1/claim.proto"; import "osmosis/claim/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/claim/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/claim/types"; // GenesisState defines the claim module's genesis state. message GenesisState { diff --git a/proto/osmosis/claim/v1beta1/params.proto b/proto/osmosis/claim/v1beta1/params.proto index 19cd3ae9d2d..3398b0dad11 100644 --- a/proto/osmosis/claim/v1beta1/params.proto +++ b/proto/osmosis/claim/v1beta1/params.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/claim/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/claim/types"; // Params defines the claim module's parameters. message Params { diff --git a/proto/osmosis/claim/v1beta1/query.proto b/proto/osmosis/claim/v1beta1/query.proto index 5f32c3d3c32..cca557595c6 100644 --- a/proto/osmosis/claim/v1beta1/query.proto +++ b/proto/osmosis/claim/v1beta1/query.proto @@ -7,7 +7,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "osmosis/claim/v1beta1/claim.proto"; import "osmosis/claim/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/claim/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/claim/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/epochs/genesis.proto b/proto/osmosis/epochs/genesis.proto index b444801d35b..cc9d5793946 100644 --- a/proto/osmosis/epochs/genesis.proto +++ b/proto/osmosis/epochs/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/epochs/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/epochs/types"; message EpochInfo { string identifier = 1; diff --git a/proto/osmosis/epochs/query.proto b/proto/osmosis/epochs/query.proto index 5d7a17ef880..0e4776a526f 100644 --- a/proto/osmosis/epochs/query.proto +++ b/proto/osmosis/epochs/query.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "osmosis/epochs/genesis.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/epochs/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/epochs/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto b/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto index 4e66ca334e7..11eb006d734 100644 --- a/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto +++ b/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto @@ -12,7 +12,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "osmosis/gamm/v1beta1/pool.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer"; // Parameters for changing the weights in a balancer pool smoothly from // a start weight and end weight over a period of time. diff --git a/proto/osmosis/gamm/pool-models/balancer/tx.proto b/proto/osmosis/gamm/pool-models/balancer/tx.proto index db985963142..46ac992ae65 100644 --- a/proto/osmosis/gamm/pool-models/balancer/tx.proto +++ b/proto/osmosis/gamm/pool-models/balancer/tx.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "osmosis/gamm/pool-models/balancer/balancerPool.proto"; import "osmosis/gamm/v1beta1/pool.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer"; service Msg { rpc CreateBalancerPool(MsgCreateBalancerPool) diff --git a/proto/osmosis/gamm/v1beta1/genesis.proto b/proto/osmosis/gamm/v1beta1/genesis.proto index 896cf89b1e2..9585dd04752 100644 --- a/proto/osmosis/gamm/v1beta1/genesis.proto +++ b/proto/osmosis/gamm/v1beta1/genesis.proto @@ -15,7 +15,7 @@ message Params { ]; } -option go_package = "github.com/osmosis-labs/osmosis/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/gamm/types"; // GenesisState defines the gamm module's genesis state. message GenesisState { diff --git a/proto/osmosis/gamm/v1beta1/pool.proto b/proto/osmosis/gamm/v1beta1/pool.proto index d12ea698c20..9fa42651ee7 100644 --- a/proto/osmosis/gamm/v1beta1/pool.proto +++ b/proto/osmosis/gamm/v1beta1/pool.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/gamm/types"; message PoolAsset { // Coins we are talking about, diff --git a/proto/osmosis/gamm/v1beta1/query.proto b/proto/osmosis/gamm/v1beta1/query.proto index de49bc59cb3..d2e03c977b2 100644 --- a/proto/osmosis/gamm/v1beta1/query.proto +++ b/proto/osmosis/gamm/v1beta1/query.proto @@ -11,7 +11,7 @@ import "google/api/annotations.proto"; import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/gamm/types"; service Query { rpc Pools(QueryPoolsRequest) returns (QueryPoolsResponse) { diff --git a/proto/osmosis/gamm/v1beta1/tx.proto b/proto/osmosis/gamm/v1beta1/tx.proto index ce122f3e79b..ec154469ad4 100644 --- a/proto/osmosis/gamm/v1beta1/tx.proto +++ b/proto/osmosis/gamm/v1beta1/tx.proto @@ -4,7 +4,7 @@ package osmosis.gamm.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/gamm/types"; service Msg { rpc JoinPool(MsgJoinPool) returns (MsgJoinPoolResponse); diff --git a/proto/osmosis/incentives/gauge.proto b/proto/osmosis/incentives/gauge.proto index 5171e899b28..6a78f6cf9f0 100644 --- a/proto/osmosis/incentives/gauge.proto +++ b/proto/osmosis/incentives/gauge.proto @@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/incentives/types"; message Gauge { uint64 id = 1; // unique ID of a Gauge diff --git a/proto/osmosis/incentives/genesis.proto b/proto/osmosis/incentives/genesis.proto index 22c811688c5..b1abf386a64 100644 --- a/proto/osmosis/incentives/genesis.proto +++ b/proto/osmosis/incentives/genesis.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "osmosis/incentives/params.proto"; import "osmosis/incentives/gauge.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/incentives/types"; // GenesisState defines the incentives module's genesis state. message GenesisState { diff --git a/proto/osmosis/incentives/params.proto b/proto/osmosis/incentives/params.proto index 7f38b7162ce..47709619aab 100644 --- a/proto/osmosis/incentives/params.proto +++ b/proto/osmosis/incentives/params.proto @@ -3,7 +3,7 @@ package osmosis.incentives; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/incentives/types"; // Params holds parameters for the incentives module message Params { diff --git a/proto/osmosis/incentives/query.proto b/proto/osmosis/incentives/query.proto index 5614e9b8cb7..fbad2c8f1c8 100644 --- a/proto/osmosis/incentives/query.proto +++ b/proto/osmosis/incentives/query.proto @@ -9,7 +9,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/incentives/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/incentives/tx.proto b/proto/osmosis/incentives/tx.proto index 1c96f268d74..b02fee19380 100644 --- a/proto/osmosis/incentives/tx.proto +++ b/proto/osmosis/incentives/tx.proto @@ -7,7 +7,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/incentives/types"; service Msg { rpc CreateGauge(MsgCreateGauge) returns (MsgCreateGaugeResponse); diff --git a/proto/osmosis/lockup/genesis.proto b/proto/osmosis/lockup/genesis.proto index 2f9afd36fa6..52f498084b4 100644 --- a/proto/osmosis/lockup/genesis.proto +++ b/proto/osmosis/lockup/genesis.proto @@ -4,7 +4,7 @@ package osmosis.lockup; import "gogoproto/gogo.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/lockup/types"; // GenesisState defines the lockup module's genesis state. message GenesisState { diff --git a/proto/osmosis/lockup/lock.proto b/proto/osmosis/lockup/lock.proto index 7f4b2206613..20764e50295 100644 --- a/proto/osmosis/lockup/lock.proto +++ b/proto/osmosis/lockup/lock.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/lockup/types"; // PeriodLock is a single unit of lock by period. It's a record of locked coin // at a specific time. It stores owner, duration, unlock time and the amount of diff --git a/proto/osmosis/lockup/query.proto b/proto/osmosis/lockup/query.proto index e49d846ed9c..64948d84e8d 100644 --- a/proto/osmosis/lockup/query.proto +++ b/proto/osmosis/lockup/query.proto @@ -8,7 +8,7 @@ import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/lockup/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/lockup/tx.proto b/proto/osmosis/lockup/tx.proto index 64dd3fb975d..a77320e60ce 100644 --- a/proto/osmosis/lockup/tx.proto +++ b/proto/osmosis/lockup/tx.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/lockup/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/osmosis/mint/v1beta1/genesis.proto b/proto/osmosis/mint/v1beta1/genesis.proto index 61a5b6ed495..3a9112b639a 100644 --- a/proto/osmosis/mint/v1beta1/genesis.proto +++ b/proto/osmosis/mint/v1beta1/genesis.proto @@ -4,7 +4,7 @@ package osmosis.mint.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/mint/v1beta1/mint.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/mint/types"; // GenesisState defines the mint module's genesis state. message GenesisState { diff --git a/proto/osmosis/mint/v1beta1/mint.proto b/proto/osmosis/mint/v1beta1/mint.proto index fc9637cefd7..95490b849a5 100644 --- a/proto/osmosis/mint/v1beta1/mint.proto +++ b/proto/osmosis/mint/v1beta1/mint.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package osmosis.mint.v1beta1; -option go_package = "github.com/osmosis-labs/osmosis/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/mint/types"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; diff --git a/proto/osmosis/mint/v1beta1/query.proto b/proto/osmosis/mint/v1beta1/query.proto index 3950b3b67b4..83c55a5e0ad 100644 --- a/proto/osmosis/mint/v1beta1/query.proto +++ b/proto/osmosis/mint/v1beta1/query.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "osmosis/mint/v1beta1/mint.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/mint/types"; // Query provides defines the gRPC querier service. service Query { diff --git a/proto/osmosis/pool-incentives/v1beta1/genesis.proto b/proto/osmosis/pool-incentives/v1beta1/genesis.proto index c4c1f4f4cb7..6b4f4ba24c1 100644 --- a/proto/osmosis/pool-incentives/v1beta1/genesis.proto +++ b/proto/osmosis/pool-incentives/v1beta1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "osmosis/pool-incentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types"; // GenesisState defines the pool incentives module's genesis state. message GenesisState { diff --git a/proto/osmosis/pool-incentives/v1beta1/gov.proto b/proto/osmosis/pool-incentives/v1beta1/gov.proto index b5c16f81b84..d7c9c4c7f7f 100644 --- a/proto/osmosis/pool-incentives/v1beta1/gov.proto +++ b/proto/osmosis/pool-incentives/v1beta1/gov.proto @@ -4,7 +4,7 @@ package osmosis.poolincentives.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/pool-incentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types"; // ReplacePoolIncentivesProposal is a gov Content type for updating the pool // incentives. If a ReplacePoolIncentivesProposal passes, the proposal’s records diff --git a/proto/osmosis/pool-incentives/v1beta1/incentives.proto b/proto/osmosis/pool-incentives/v1beta1/incentives.proto index 96356b2b42e..cb4ab408c2b 100644 --- a/proto/osmosis/pool-incentives/v1beta1/incentives.proto +++ b/proto/osmosis/pool-incentives/v1beta1/incentives.proto @@ -4,7 +4,7 @@ package osmosis.poolincentives.v1beta1; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types"; message Params { option (gogoproto.goproto_stringer) = false; diff --git a/proto/osmosis/pool-incentives/v1beta1/query.proto b/proto/osmosis/pool-incentives/v1beta1/query.proto index 2682d081935..0af0a636e17 100644 --- a/proto/osmosis/pool-incentives/v1beta1/query.proto +++ b/proto/osmosis/pool-incentives/v1beta1/query.proto @@ -7,7 +7,7 @@ import "google/protobuf/duration.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/pool-incentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types"; service Query { // GaugeIds takes the pool id and returns the matching gauge ids and durations diff --git a/proto/osmosis/store/v1beta1/tree.proto b/proto/osmosis/store/v1beta1/tree.proto index 3932079d6aa..85ef7f25064 100644 --- a/proto/osmosis/store/v1beta1/tree.proto +++ b/proto/osmosis/store/v1beta1/tree.proto @@ -4,7 +4,7 @@ package osmosis.store.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/store"; +option go_package = "github.com/osmosis-labs/osmosis/v7/store"; message Node { repeated Child children = 1; } diff --git a/proto/osmosis/superfluid/genesis.proto b/proto/osmosis/superfluid/genesis.proto index e859fbcc4ab..af1ef2dd5fd 100644 --- a/proto/osmosis/superfluid/genesis.proto +++ b/proto/osmosis/superfluid/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "osmosis/superfluid/superfluid.proto"; import "osmosis/superfluid/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"; // GenesisState defines the module's genesis state. message GenesisState { diff --git a/proto/osmosis/superfluid/gov.proto b/proto/osmosis/superfluid/gov.proto index 3af4a7ab0d4..2ad153d144a 100644 --- a/proto/osmosis/superfluid/gov.proto +++ b/proto/osmosis/superfluid/gov.proto @@ -4,7 +4,7 @@ package osmosis.superfluid.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/superfluid/superfluid.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"; // SetSuperfluidAssetsProposal is a gov Content type to update the superfluid // assets diff --git a/proto/osmosis/superfluid/params.proto b/proto/osmosis/superfluid/params.proto index 8db76982d75..ac6ef39749d 100644 --- a/proto/osmosis/superfluid/params.proto +++ b/proto/osmosis/superfluid/params.proto @@ -4,7 +4,7 @@ package osmosis.superfluid; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"; // Params holds parameters for the superfluid module message Params { diff --git a/proto/osmosis/superfluid/query.proto b/proto/osmosis/superfluid/query.proto index 9bdf69e45d8..f25125bcac6 100644 --- a/proto/osmosis/superfluid/query.proto +++ b/proto/osmosis/superfluid/query.proto @@ -9,7 +9,7 @@ import "google/protobuf/duration.proto"; import "osmosis/superfluid/superfluid.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/superfluid/superfluid.proto b/proto/osmosis/superfluid/superfluid.proto index c2f5811191d..4133942bb1b 100644 --- a/proto/osmosis/superfluid/superfluid.proto +++ b/proto/osmosis/superfluid/superfluid.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"; enum SuperfluidAssetType { option (gogoproto.goproto_enum_prefix) = false; diff --git a/proto/osmosis/superfluid/tx.proto b/proto/osmosis/superfluid/tx.proto index 85126a0493e..a3b882aea30 100644 --- a/proto/osmosis/superfluid/tx.proto +++ b/proto/osmosis/superfluid/tx.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/superfluid/superfluid.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/osmosis/txfees/v1beta1/feetoken.proto b/proto/osmosis/txfees/v1beta1/feetoken.proto index e701933344f..c7cd36e34e0 100644 --- a/proto/osmosis/txfees/v1beta1/feetoken.proto +++ b/proto/osmosis/txfees/v1beta1/feetoken.proto @@ -3,7 +3,7 @@ package osmosis.txfees.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/txfees/types"; // FeeToken is a struct that specifies a coin denom, and pool ID pair. // This marks the token as eligible for use as a tx fee asset in Osmosis. diff --git a/proto/osmosis/txfees/v1beta1/genesis.proto b/proto/osmosis/txfees/v1beta1/genesis.proto index 40be01f9f5a..9b6fb48c4e9 100644 --- a/proto/osmosis/txfees/v1beta1/genesis.proto +++ b/proto/osmosis/txfees/v1beta1/genesis.proto @@ -4,7 +4,7 @@ package osmosis.txfees.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/txfees/types"; // GenesisState defines the txfees module's genesis state. message GenesisState { diff --git a/proto/osmosis/txfees/v1beta1/gov.proto b/proto/osmosis/txfees/v1beta1/gov.proto index 06003db8dce..253e822d612 100644 --- a/proto/osmosis/txfees/v1beta1/gov.proto +++ b/proto/osmosis/txfees/v1beta1/gov.proto @@ -4,7 +4,7 @@ package osmosis.txfees.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/txfees/types"; // UpdateFeeTokenProposal is a gov Content type for adding a new whitelisted fee // token. It must specify a denom along with gamm pool ID to use as a spot price diff --git a/proto/osmosis/txfees/v1beta1/query.proto b/proto/osmosis/txfees/v1beta1/query.proto index 042f42be2e1..4bab62c70a8 100644 --- a/proto/osmosis/txfees/v1beta1/query.proto +++ b/proto/osmosis/txfees/v1beta1/query.proto @@ -7,7 +7,7 @@ import "google/protobuf/duration.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; -option go_package = "github.com/osmosis-labs/osmosis/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v7/x/txfees/types"; service Query { // FeeTokens returns a list of all the whitelisted fee tokens and their diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 3ed8142cfdc..fe53060cd26 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -29,5 +29,5 @@ Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \ $(find "${dir}" -maxdepth 1 -name '*.proto') done -cp -r ./github.com/osmosis-labs/osmosis/* ./ +cp -r ./github.com/osmosis-labs/osmosis/v*/x/* x/ rm -rf ./github.com diff --git a/simapp/genesis.go b/simapp/genesis.go index a271e03b1d2..2be960330ba 100644 --- a/simapp/genesis.go +++ b/simapp/genesis.go @@ -5,7 +5,7 @@ import ( "io" "io/ioutil" - "github.com/osmosis-labs/osmosis/app" + "github.com/osmosis-labs/osmosis/v7/app" tmjson "github.com/tendermint/tendermint/libs/json" tmtypes "github.com/tendermint/tendermint/types" diff --git a/simapp/sim_test.go b/simapp/sim_test.go index 02f85eaa4d9..92f5e217d75 100644 --- a/simapp/sim_test.go +++ b/simapp/sim_test.go @@ -13,7 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/store" simulation2 "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/osmosis-labs/osmosis/app" + "github.com/osmosis-labs/osmosis/v7/app" "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/libs/log" dbm "github.com/tendermint/tm-db" diff --git a/simapp/state.go b/simapp/state.go index e9f889e841d..ebcaede2e42 100644 --- a/simapp/state.go +++ b/simapp/state.go @@ -7,7 +7,7 @@ import ( "math/rand" "time" - "github.com/osmosis-labs/osmosis/app" + "github.com/osmosis-labs/osmosis/v7/app" "github.com/cosmos/cosmos-sdk/codec" sdksimapp "github.com/cosmos/cosmos-sdk/simapp" diff --git a/store/legacy/v101/tree.go b/store/legacy/v101/tree.go index 90f6100bfac..d9bdccc6241 100644 --- a/store/legacy/v101/tree.go +++ b/store/legacy/v101/tree.go @@ -10,7 +10,7 @@ import ( stypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/store" + "github.com/osmosis-labs/osmosis/v7/store" ) type Child struct { diff --git a/store/legacy/v101/tree_test.go b/store/legacy/v101/tree_test.go index ac9233eb26b..3287138a9ee 100644 --- a/store/legacy/v101/tree_test.go +++ b/store/legacy/v101/tree_test.go @@ -18,8 +18,8 @@ import ( iavlstore "github.com/cosmos/cosmos-sdk/store/iavl" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/store" - v101 "github.com/osmosis-labs/osmosis/store/legacy/v101" + "github.com/osmosis-labs/osmosis/v7/store" + v101 "github.com/osmosis-labs/osmosis/v7/store/legacy/v101" ) func setupStore() sdk.KVStore { diff --git a/store/tree.pb.go b/store/tree.pb.go index b577a3e34df..895f4a19087 100644 --- a/store/tree.pb.go +++ b/store/tree.pb.go @@ -167,26 +167,26 @@ func init() { func init() { proto.RegisterFile("osmosis/store/v1beta1/tree.proto", fileDescriptor_72b0b7af579d13be) } var fileDescriptor_72b0b7af579d13be = []byte{ - // 295 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0xd1, 0x41, 0x4b, 0xf3, 0x30, - 0x18, 0x07, 0xf0, 0xe6, 0x7d, 0x37, 0xd1, 0xb8, 0x53, 0x99, 0x30, 0x86, 0x64, 0xa5, 0xa0, 0xf4, - 0xb2, 0xc4, 0xe9, 0x65, 0x37, 0x65, 0x9e, 0x04, 0xf1, 0xd0, 0xa3, 0xb7, 0x34, 0xcd, 0xba, 0x60, - 0xdb, 0x67, 0x36, 0xa9, 0xe8, 0xb7, 0xf0, 0x63, 0xed, 0xb8, 0xa3, 0x78, 0x18, 0xd2, 0x7e, 0x11, - 0x59, 0x5a, 0xd4, 0x81, 0xe0, 0xa9, 0x4d, 0xf2, 0xe3, 0xff, 0xfc, 0x49, 0xb0, 0x07, 0x3a, 0x03, - 0xad, 0x34, 0xd3, 0x06, 0x0a, 0xc9, 0x9e, 0x26, 0x91, 0x34, 0x7c, 0xc2, 0x4c, 0x21, 0x25, 0x5d, - 0x16, 0x60, 0xc0, 0x3d, 0x6a, 0x05, 0xb5, 0x82, 0xb6, 0x62, 0xd8, 0x4f, 0x20, 0x01, 0x2b, 0xd8, - 0xf6, 0xaf, 0xc1, 0x43, 0x22, 0xac, 0x66, 0x11, 0xd7, 0xdf, 0x61, 0x02, 0x54, 0xde, 0x9c, 0xfb, - 0x57, 0xb8, 0x73, 0x07, 0xb1, 0x74, 0xa7, 0x78, 0x5f, 0x2c, 0x54, 0x1a, 0x17, 0x32, 0x1f, 0x20, - 0xef, 0x7f, 0x70, 0x78, 0x7e, 0x4c, 0x7f, 0x9d, 0x43, 0xaf, 0xb7, 0x2c, 0xfc, 0xd2, 0xfe, 0x23, - 0xee, 0xda, 0x2d, 0xb7, 0x8f, 0xbb, 0x2a, 0x8f, 0xe5, 0xf3, 0x00, 0x79, 0x28, 0xe8, 0x85, 0xcd, - 0xc2, 0x0d, 0x71, 0x8f, 0x0b, 0x51, 0x66, 0x65, 0xca, 0x8d, 0x82, 0x7c, 0xf0, 0xcf, 0x43, 0xc1, - 0xc1, 0x8c, 0xae, 0x36, 0x23, 0xe7, 0x7d, 0x33, 0x3a, 0x4d, 0x94, 0x59, 0x94, 0x11, 0x15, 0x90, - 0xb1, 0xb6, 0x69, 0xf3, 0x19, 0xeb, 0xf8, 0x81, 0x99, 0x97, 0xa5, 0xd4, 0xf4, 0x26, 0x37, 0xe1, - 0x4e, 0x86, 0x3f, 0xc5, 0x9d, 0x5b, 0xc9, 0xe7, 0xee, 0x19, 0xee, 0xa4, 0x92, 0xcf, 0xed, 0xc0, - 0xbf, 0x0a, 0x5b, 0x39, 0xbb, 0x5c, 0x55, 0x04, 0xad, 0x2b, 0x82, 0x3e, 0x2a, 0x82, 0x5e, 0x6b, - 0xe2, 0xac, 0x6b, 0xe2, 0xbc, 0xd5, 0xc4, 0xb9, 0x3f, 0xf9, 0xd1, 0xa4, 0xcd, 0x19, 0xa7, 0x3c, - 0xd2, 0x6c, 0xe7, 0x3d, 0xa2, 0x3d, 0x7b, 0x6d, 0x17, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd6, - 0x50, 0x3c, 0xd7, 0xa7, 0x01, 0x00, 0x00, + // 297 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0xd1, 0x4d, 0x4b, 0xc3, 0x30, + 0x18, 0x07, 0xf0, 0x46, 0x3b, 0xd1, 0xb8, 0x53, 0x99, 0x50, 0x86, 0x64, 0xa5, 0x07, 0xe9, 0x65, + 0x89, 0xd3, 0x83, 0x3b, 0x4a, 0x3d, 0x09, 0xe2, 0xa1, 0x47, 0x6f, 0x69, 0x9a, 0x75, 0xc1, 0xb6, + 0x99, 0x4d, 0x3a, 0xf4, 0x5b, 0xf8, 0xb1, 0x76, 0xdc, 0x51, 0x3c, 0x0c, 0x69, 0xbf, 0x88, 0x2c, + 0xad, 0x6f, 0x20, 0xec, 0x94, 0x3c, 0xc9, 0x8f, 0xe7, 0xf9, 0x93, 0x40, 0x4f, 0xaa, 0x5c, 0x2a, + 0xa1, 0x88, 0xd2, 0xb2, 0xe4, 0x64, 0x39, 0x89, 0xb9, 0xa6, 0x13, 0xa2, 0x4b, 0xce, 0xf1, 0xa2, + 0x94, 0x5a, 0x3a, 0x27, 0x9d, 0xc0, 0x46, 0xe0, 0x4e, 0x0c, 0x07, 0xa9, 0x4c, 0xa5, 0x11, 0x64, + 0xbb, 0x6b, 0xf1, 0x10, 0x31, 0xa3, 0x49, 0x4c, 0xd5, 0x4f, 0x33, 0x26, 0x45, 0xd1, 0xde, 0xfb, + 0xd7, 0xd0, 0xbe, 0x97, 0x09, 0x77, 0xa6, 0xf0, 0x90, 0xcd, 0x45, 0x96, 0x94, 0xbc, 0x70, 0x81, + 0xb7, 0x1f, 0x1c, 0x5f, 0x9c, 0xe2, 0x7f, 0xe7, 0xe0, 0x9b, 0x2d, 0x8b, 0xbe, 0xb5, 0xff, 0x04, + 0x7b, 0xe6, 0xc8, 0x19, 0xc0, 0x9e, 0x28, 0x12, 0xfe, 0xec, 0x02, 0x0f, 0x04, 0xfd, 0xa8, 0x2d, + 0x9c, 0x08, 0xf6, 0x29, 0x63, 0x55, 0x5e, 0x65, 0x54, 0x0b, 0x59, 0xb8, 0x7b, 0x1e, 0x08, 0x8e, + 0x42, 0xbc, 0xda, 0x8c, 0xac, 0xf7, 0xcd, 0xe8, 0x2c, 0x15, 0x7a, 0x5e, 0xc5, 0x98, 0xc9, 0x9c, + 0x74, 0x49, 0xdb, 0x65, 0xac, 0x92, 0x47, 0xa2, 0x5f, 0x16, 0x5c, 0xe1, 0xdb, 0x42, 0x47, 0x7f, + 0x7a, 0xf8, 0x53, 0x68, 0xdf, 0x71, 0x3a, 0x73, 0xce, 0xa1, 0x9d, 0x71, 0x3a, 0x33, 0x03, 0x77, + 0x05, 0x36, 0x32, 0x0c, 0x57, 0x35, 0x02, 0xeb, 0x1a, 0x81, 0x8f, 0x1a, 0x81, 0xd7, 0x06, 0x59, + 0xeb, 0x06, 0x59, 0x6f, 0x0d, 0xb2, 0x1e, 0x82, 0x5f, 0x49, 0xba, 0x3e, 0xe3, 0x8c, 0xc6, 0xea, + 0xab, 0x20, 0xcb, 0xab, 0xf6, 0x4b, 0xe2, 0x03, 0xf3, 0x72, 0x97, 0x9f, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x63, 0x3c, 0x1f, 0x09, 0xaa, 0x01, 0x00, 0x00, } func (m *Node) Marshal() (dAtA []byte, err error) { diff --git a/store/tree_test.go b/store/tree_test.go index 8a305c5d150..5ced86a0d15 100644 --- a/store/tree_test.go +++ b/store/tree_test.go @@ -15,7 +15,7 @@ import ( iavlstore "github.com/cosmos/cosmos-sdk/store/iavl" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/store" + "github.com/osmosis-labs/osmosis/v7/store" ) type TreeTestSuite struct { diff --git a/v043_temp/address/hash.go b/v043_temp/address/hash.go index 0f38585e55c..2d302e63e6c 100644 --- a/v043_temp/address/hash.go +++ b/v043_temp/address/hash.go @@ -6,7 +6,7 @@ import ( "fmt" "sort" - "github.com/osmosis-labs/osmosis/v043_temp/conv" + "github.com/osmosis-labs/osmosis/v7/v043_temp/conv" ) // Len is the length of base addresses diff --git a/v043_temp/address/store_key_test.go b/v043_temp/address/store_key_test.go index 974d4145b4d..b85ad5bfb95 100644 --- a/v043_temp/address/store_key_test.go +++ b/v043_temp/address/store_key_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v043_temp/address" + "github.com/osmosis-labs/osmosis/v7/v043_temp/address" ) func TestStoreKeySuite(t *testing.T) { diff --git a/x/claim/abci.go b/x/claim/abci.go index edd5ca5fafb..eee7928c577 100644 --- a/x/claim/abci.go +++ b/x/claim/abci.go @@ -2,7 +2,7 @@ package claim import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/claim/keeper" + "github.com/osmosis-labs/osmosis/v7/x/claim/keeper" ) // EndBlocker called every block, process inflation, update validator set. diff --git a/x/claim/client/cli/cli_test.go b/x/claim/client/cli/cli_test.go index a7f52ce69f8..870faf44211 100644 --- a/x/claim/client/cli/cli_test.go +++ b/x/claim/client/cli/cli_test.go @@ -9,11 +9,11 @@ import ( clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/app/params" - "github.com/osmosis-labs/osmosis/x/claim/client/cli" - "github.com/osmosis-labs/osmosis/x/claim/types" - claimtypes "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/app/params" + "github.com/osmosis-labs/osmosis/v7/x/claim/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" + claimtypes "github.com/osmosis-labs/osmosis/v7/x/claim/types" "github.com/stretchr/testify/suite" tmcli "github.com/tendermint/tendermint/libs/cli" ) diff --git a/x/claim/client/cli/query.go b/x/claim/client/cli/query.go index ecc50e982c0..147816616ac 100644 --- a/x/claim/client/cli/query.go +++ b/x/claim/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" "github.com/spf13/cobra" ) diff --git a/x/claim/client/cli/tx.go b/x/claim/client/cli/tx.go index bec564c3012..2810d1414b4 100644 --- a/x/claim/client/cli/tx.go +++ b/x/claim/client/cli/tx.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/cosmos/cosmos-sdk/client" - "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" "github.com/spf13/cobra" ) diff --git a/x/claim/genesis.go b/x/claim/genesis.go index 233e54164a6..a561fb31fc9 100644 --- a/x/claim/genesis.go +++ b/x/claim/genesis.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/claim/keeper" - "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/x/claim/keeper" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/claim/genesis_test.go b/x/claim/genesis_test.go index 84dabfa50a6..f62f0152141 100644 --- a/x/claim/genesis_test.go +++ b/x/claim/genesis_test.go @@ -5,9 +5,9 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - simapp "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/claim" - "github.com/osmosis-labs/osmosis/x/claim/types" + simapp "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/claim" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" diff --git a/x/claim/handler.go b/x/claim/handler.go index 0e685ca997a..d57d32808b9 100644 --- a/x/claim/handler.go +++ b/x/claim/handler.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/claim/keeper" - "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/x/claim/keeper" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" ) // NewHandler returns claim module messages diff --git a/x/claim/keeper/claim.go b/x/claim/keeper/claim.go index 995f8888ee5..bddf03bc9ee 100644 --- a/x/claim/keeper/claim.go +++ b/x/claim/keeper/claim.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" ) // GetModuleAccountBalance gets the airdrop coin balance of module account diff --git a/x/claim/keeper/claim_test.go b/x/claim/keeper/claim_test.go index 2747617a9b7..69c184b9aa6 100644 --- a/x/claim/keeper/claim_test.go +++ b/x/claim/keeper/claim_test.go @@ -9,7 +9,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" ) func (suite *KeeperTestSuite) TestHookOfUnclaimableAccount() { diff --git a/x/claim/keeper/grpc_query.go b/x/claim/keeper/grpc_query.go index 1e69ae332ef..cc6734439da 100644 --- a/x/claim/keeper/grpc_query.go +++ b/x/claim/keeper/grpc_query.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/claim/keeper/hooks.go b/x/claim/keeper/hooks.go index a8bf7d3602d..33570ce6eb5 100644 --- a/x/claim/keeper/hooks.go +++ b/x/claim/keeper/hooks.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/x/claim/types" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func (k Keeper) AfterAddLiquidity(ctx sdk.Context, sender sdk.AccAddress) { diff --git a/x/claim/keeper/keeper.go b/x/claim/keeper/keeper.go index 62f13493a13..566baead3d4 100644 --- a/x/claim/keeper/keeper.go +++ b/x/claim/keeper/keeper.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" ) // Keeper struct diff --git a/x/claim/keeper/keeper_test.go b/x/claim/keeper/keeper_test.go index a2063c619fb..f226fce74d3 100644 --- a/x/claim/keeper/keeper_test.go +++ b/x/claim/keeper/keeper_test.go @@ -5,8 +5,8 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) diff --git a/x/claim/keeper/params.go b/x/claim/keeper/params.go index 1b19207b328..35ac07e7f38 100644 --- a/x/claim/keeper/params.go +++ b/x/claim/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" ) // GetParams get params diff --git a/x/claim/keeper/query.go b/x/claim/keeper/query.go index 06bfd1c7862..68897c37757 100644 --- a/x/claim/keeper/query.go +++ b/x/claim/keeper/query.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/claim/module.go b/x/claim/module.go index 907d1ae52b8..3d07333c988 100644 --- a/x/claim/module.go +++ b/x/claim/module.go @@ -16,10 +16,10 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/x/claim/client/cli" - "github.com/osmosis-labs/osmosis/x/claim/client/rest" - "github.com/osmosis-labs/osmosis/x/claim/keeper" - "github.com/osmosis-labs/osmosis/x/claim/types" + "github.com/osmosis-labs/osmosis/v7/x/claim/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/claim/client/rest" + "github.com/osmosis-labs/osmosis/v7/x/claim/keeper" + "github.com/osmosis-labs/osmosis/v7/x/claim/types" ) var ( diff --git a/x/claim/types/claim.pb.go b/x/claim/types/claim.pb.go index d202494a1d6..37366c1c824 100644 --- a/x/claim/types/claim.pb.go +++ b/x/claim/types/claim.pb.go @@ -130,34 +130,34 @@ func init() { func init() { proto.RegisterFile("osmosis/claim/v1beta1/claim.proto", fileDescriptor_a48687913a68f9e3) } var fileDescriptor_a48687913a68f9e3 = []byte{ - // 423 bytes of a gzipped FileDescriptorProto + // 428 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xb1, 0x8e, 0xd3, 0x30, - 0x18, 0xc7, 0x93, 0x16, 0x1d, 0xe0, 0x93, 0x8e, 0xc8, 0xc0, 0x5d, 0x28, 0x92, 0xd3, 0xcb, 0x14, - 0x21, 0x9a, 0xe8, 0x60, 0x63, 0x6b, 0x82, 0x60, 0x61, 0x4a, 0x25, 0x06, 0x96, 0xc8, 0x89, 0xad, - 0x60, 0x35, 0x89, 0x43, 0xed, 0x02, 0x7d, 0x03, 0x46, 0xde, 0x81, 0x05, 0x31, 0xf0, 0x1c, 0x37, - 0xde, 0xc8, 0x14, 0x50, 0xfb, 0x06, 0x7d, 0x02, 0x14, 0xdb, 0xb9, 0x22, 0xa4, 0x9b, 0xe2, 0xef, - 0xff, 0xff, 0xe9, 0xef, 0xef, 0x73, 0x3e, 0x70, 0xce, 0x45, 0xcd, 0x05, 0x13, 0x51, 0x51, 0x61, - 0x56, 0x47, 0x1f, 0x2f, 0x72, 0x2a, 0xf1, 0x85, 0xae, 0xc2, 0x76, 0xc5, 0x25, 0x87, 0x0f, 0x0d, - 0x12, 0x6a, 0xd1, 0x20, 0x93, 0x07, 0x25, 0x2f, 0xb9, 0x22, 0xa2, 0xfe, 0xa4, 0xe1, 0x09, 0x2a, - 0x14, 0x1d, 0xe5, 0x58, 0xd0, 0x43, 0x1a, 0x67, 0x8d, 0xf1, 0xcf, 0xaf, 0xfd, 0x66, 0x79, 0xed, - 0x97, 0xb4, 0xa1, 0xfd, 0x05, 0x0a, 0xf1, 0x7f, 0x8e, 0xc0, 0x71, 0xd2, 0x5f, 0x95, 0xd2, 0x82, - 0xaf, 0x08, 0x7c, 0x0a, 0x6e, 0x63, 0x42, 0x56, 0x54, 0x08, 0xd7, 0x9e, 0xda, 0xc1, 0xdd, 0x18, - 0xee, 0x3b, 0xef, 0x64, 0x83, 0xeb, 0xea, 0x85, 0x6f, 0x0c, 0x3f, 0x1d, 0x10, 0xf8, 0xdd, 0x06, - 0x2e, 0x6b, 0x98, 0x64, 0xb8, 0xca, 0x54, 0xc3, 0x38, 0xaf, 0x68, 0x86, 0x6b, 0xbe, 0x6e, 0xa4, - 0x3b, 0x9a, 0x8e, 0x83, 0xe3, 0x67, 0x8f, 0x42, 0xdd, 0x44, 0xd8, 0x37, 0x39, 0xcc, 0x13, 0x26, - 0x9c, 0x35, 0xf1, 0xe2, 0xb2, 0xf3, 0xac, 0x7d, 0xe7, 0x79, 0x3a, 0xfe, 0xa6, 0x20, 0xff, 0xc7, - 0x6f, 0x2f, 0x28, 0x99, 0x7c, 0xbf, 0xce, 0xc3, 0x82, 0xd7, 0x91, 0x19, 0x4a, 0x7f, 0x66, 0x82, - 0x2c, 0x23, 0xb9, 0x69, 0xa9, 0x50, 0x99, 0x22, 0x3d, 0x35, 0x31, 0xc9, 0x90, 0x32, 0x57, 0x21, - 0xf0, 0x15, 0x70, 0x70, 0x21, 0x19, 0x6f, 0xb2, 0x82, 0xd7, 0x6d, 0x45, 0x25, 0x25, 0xee, 0x78, - 0x3a, 0x0e, 0xee, 0xc4, 0x8f, 0xf7, 0x9d, 0x77, 0x66, 0x26, 0xfc, 0x8f, 0xf0, 0xd3, 0x7b, 0x5a, - 0x4a, 0x06, 0xe5, 0x49, 0x06, 0x8e, 0xe6, 0x4a, 0x82, 0xa7, 0x00, 0xea, 0xd3, 0x9c, 0x90, 0x37, - 0xec, 0xc3, 0x9a, 0x11, 0x26, 0x37, 0x8e, 0x05, 0x4f, 0x00, 0xd0, 0xfa, 0xe2, 0x13, 0x6e, 0x1d, - 0xfb, 0x50, 0xbf, 0xe5, 0x92, 0x3a, 0x23, 0x78, 0x06, 0xee, 0xeb, 0xfa, 0x25, 0xad, 0x68, 0x89, - 0x25, 0x5d, 0x48, 0xbc, 0xa4, 0xce, 0x78, 0x72, 0xeb, 0xcb, 0x37, 0x64, 0xc5, 0xaf, 0x2f, 0xb7, - 0xc8, 0xbe, 0xda, 0x22, 0xfb, 0xcf, 0x16, 0xd9, 0x5f, 0x77, 0xc8, 0xba, 0xda, 0x21, 0xeb, 0xd7, - 0x0e, 0x59, 0xef, 0x66, 0xff, 0x3c, 0x82, 0x59, 0x93, 0x59, 0x85, 0x73, 0x31, 0x14, 0xd1, 0x67, - 0xb3, 0x58, 0xea, 0x3d, 0xf2, 0x23, 0xf5, 0x87, 0x9f, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xfc, - 0xa6, 0x6d, 0x58, 0x76, 0x02, 0x00, 0x00, + 0x18, 0xc7, 0x93, 0x16, 0x1d, 0xe0, 0x93, 0x8e, 0xc8, 0xc0, 0x5d, 0x29, 0x92, 0xd3, 0xcb, 0x54, + 0x21, 0x2e, 0xe6, 0x60, 0x40, 0x62, 0x6b, 0x82, 0x18, 0x10, 0x53, 0x2a, 0x31, 0xb0, 0x44, 0x4e, + 0x6c, 0x05, 0xab, 0x49, 0x1c, 0x6a, 0xf7, 0xa0, 0x6f, 0xc0, 0xc8, 0x3b, 0xb0, 0x20, 0x06, 0x9e, + 0xe3, 0xc6, 0x1b, 0x99, 0x02, 0x6a, 0xdf, 0xa0, 0x4f, 0x80, 0x62, 0x3b, 0x57, 0x84, 0xc4, 0x14, + 0x7f, 0xff, 0xff, 0x4f, 0x7f, 0x7f, 0x9f, 0xf3, 0x81, 0x53, 0x21, 0x2b, 0x21, 0xb9, 0xc4, 0x79, + 0x49, 0x78, 0x85, 0x2f, 0xce, 0x33, 0xa6, 0xc8, 0xb9, 0xa9, 0xc2, 0x66, 0x29, 0x94, 0x80, 0xf7, + 0x2d, 0x12, 0x1a, 0xd1, 0x22, 0xe3, 0x7b, 0x85, 0x28, 0x84, 0x26, 0x70, 0x77, 0x32, 0xf0, 0x18, + 0xe5, 0x9a, 0xc6, 0x19, 0x91, 0x6c, 0x9f, 0x26, 0x78, 0x6d, 0xfd, 0xd3, 0x6b, 0xbf, 0x5e, 0x5c, + 0xfb, 0x05, 0xab, 0x59, 0x77, 0x81, 0x46, 0x82, 0x1f, 0x03, 0x70, 0x18, 0x77, 0x57, 0x25, 0x2c, + 0x17, 0x4b, 0x0a, 0x1f, 0x83, 0x9b, 0x84, 0xd2, 0x25, 0x93, 0x72, 0xe4, 0x4e, 0xdc, 0xe9, 0xed, + 0x08, 0xee, 0x5a, 0xff, 0x68, 0x4d, 0xaa, 0xf2, 0x45, 0x60, 0x8d, 0x20, 0xe9, 0x11, 0xf8, 0xcd, + 0x05, 0x23, 0x5e, 0x73, 0xc5, 0x49, 0x99, 0xea, 0x86, 0x49, 0x56, 0xb2, 0x94, 0x54, 0x62, 0x55, + 0xab, 0xd1, 0x60, 0x32, 0x9c, 0x1e, 0x3e, 0x7d, 0x10, 0x9a, 0x26, 0xc2, 0xae, 0xc9, 0x7e, 0x9e, + 0x30, 0x16, 0xbc, 0x8e, 0xe6, 0x97, 0xad, 0xef, 0xec, 0x5a, 0xdf, 0x37, 0xf1, 0xff, 0x0b, 0x0a, + 0xbe, 0xff, 0xf2, 0xa7, 0x05, 0x57, 0xef, 0x57, 0x59, 0x98, 0x8b, 0x0a, 0xdb, 0xa1, 0xcc, 0xe7, + 0x4c, 0xd2, 0x05, 0x56, 0xeb, 0x86, 0x49, 0x9d, 0x29, 0x93, 0x63, 0x1b, 0x13, 0xf7, 0x29, 0x33, + 0x1d, 0x02, 0x5f, 0x01, 0x8f, 0xe4, 0x8a, 0x8b, 0x3a, 0xcd, 0x45, 0xd5, 0x94, 0x4c, 0x31, 0x3a, + 0x1a, 0x4e, 0x86, 0xd3, 0x5b, 0xd1, 0xc3, 0x5d, 0xeb, 0x9f, 0xd8, 0x09, 0xff, 0x21, 0x82, 0xe4, + 0x8e, 0x91, 0xe2, 0x5e, 0x79, 0x94, 0x82, 0x83, 0x99, 0x96, 0xe0, 0x31, 0x80, 0xe6, 0x34, 0xa3, + 0xf4, 0x0d, 0xff, 0xb0, 0xe2, 0x94, 0xab, 0xb5, 0xe7, 0xc0, 0x23, 0x00, 0x8c, 0x3e, 0xff, 0x48, + 0x1a, 0xcf, 0xdd, 0xd7, 0x6f, 0x85, 0x62, 0xde, 0x00, 0x9e, 0x80, 0xbb, 0xa6, 0x7e, 0xc9, 0x4a, + 0x56, 0x10, 0xc5, 0xe6, 0x8a, 0x2c, 0x98, 0x37, 0x1c, 0xdf, 0xf8, 0xfc, 0x15, 0x39, 0xd1, 0xeb, + 0xcb, 0x0d, 0x72, 0xaf, 0x36, 0xc8, 0xfd, 0xbd, 0x41, 0xee, 0x97, 0x2d, 0x72, 0xae, 0xb6, 0xc8, + 0xf9, 0xb9, 0x45, 0xce, 0xbb, 0x27, 0x7f, 0x3d, 0x82, 0x5d, 0x93, 0xb3, 0x92, 0x64, 0xb2, 0x2f, + 0xf0, 0xc5, 0x73, 0xfc, 0xc9, 0xee, 0x96, 0x7e, 0x92, 0xec, 0x40, 0xff, 0xe4, 0x67, 0x7f, 0x02, + 0x00, 0x00, 0xff, 0xff, 0x17, 0x72, 0x34, 0x35, 0x79, 0x02, 0x00, 0x00, } func (m *ClaimRecord) Marshal() (dAtA []byte, err error) { diff --git a/x/claim/types/genesis.pb.go b/x/claim/types/genesis.pb.go index aae8e5fee68..8fbcfd0f39d 100644 --- a/x/claim/types/genesis.pb.go +++ b/x/claim/types/genesis.pb.go @@ -100,31 +100,32 @@ func init() { } var fileDescriptor_9236f2c69911ca0c = []byte{ - // 383 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xb1, 0x8e, 0xda, 0x30, - 0x18, 0xc7, 0x13, 0x90, 0x18, 0x02, 0x2c, 0x11, 0x54, 0x14, 0x15, 0x43, 0x53, 0x55, 0x62, 0xc1, - 0x16, 0x74, 0xeb, 0xd6, 0x30, 0xb0, 0x74, 0xa8, 0xd2, 0xad, 0x0b, 0x72, 0x8c, 0x9b, 0xb3, 0x2e, - 0x8e, 0xa3, 0xd8, 0x41, 0xc7, 0x5b, 0xdc, 0xfb, 0xdc, 0x0b, 0x30, 0x32, 0xde, 0x84, 0x4e, 0xf0, - 0x06, 0xf7, 0x04, 0x27, 0x6c, 0x87, 0xd3, 0x9d, 0x72, 0x5b, 0x3e, 0x7f, 0xbf, 0xef, 0xff, 0xff, - 0x7f, 0xf9, 0xbc, 0x6f, 0x42, 0x72, 0x21, 0x99, 0x44, 0x24, 0xc5, 0x8c, 0xa3, 0xed, 0x3c, 0xa6, - 0x0a, 0xcf, 0x51, 0x42, 0x33, 0x2a, 0x99, 0x84, 0x79, 0x21, 0x94, 0xf0, 0xfb, 0x16, 0x82, 0x1a, - 0x82, 0x16, 0x1a, 0xf6, 0x12, 0x91, 0x08, 0x4d, 0xa0, 0xcb, 0x97, 0x81, 0x87, 0x80, 0x68, 0x1a, - 0xc5, 0x58, 0xd2, 0xab, 0x1e, 0x11, 0x2c, 0xb3, 0xfd, 0xaf, 0xd7, 0x7e, 0x76, 0x5b, 0xef, 0x37, - 0x04, 0x89, 0x10, 0x49, 0x4a, 0x91, 0xae, 0xe2, 0xf2, 0x3f, 0xda, 0x94, 0x05, 0x56, 0x4c, 0x54, - 0x12, 0xe3, 0xf7, 0x7d, 0xc5, 0x38, 0x95, 0x0a, 0xf3, 0xbc, 0xf2, 0xa8, 0xdf, 0xca, 0xc4, 0x37, - 0x48, 0x50, 0x8f, 0xe4, 0xb8, 0xc0, 0xdc, 0xe6, 0x08, 0x1e, 0x1a, 0x5e, 0x67, 0x65, 0x92, 0xfd, - 0x55, 0x58, 0x51, 0x7f, 0xeb, 0x7d, 0xe2, 0x62, 0x53, 0xa6, 0x74, 0x8d, 0x09, 0x11, 0x65, 0xa6, - 0xd6, 0x31, 0x4e, 0x71, 0x46, 0xe8, 0xc0, 0x9d, 0xb8, 0xd3, 0xf6, 0xe2, 0x33, 0x34, 0xcb, 0xc1, - 0xcb, 0xf2, 0xd5, 0x7f, 0x82, 0x4b, 0xc1, 0xb2, 0xf0, 0xfb, 0xfe, 0x38, 0x76, 0x9e, 0x8f, 0xe3, - 0xd1, 0x0e, 0xf3, 0xf4, 0x67, 0x50, 0x2f, 0x13, 0x44, 0x3d, 0xd3, 0xf8, 0x65, 0xde, 0x43, 0xf3, - 0xec, 0xff, 0xf6, 0x5a, 0x26, 0xd8, 0xa0, 0xa1, 0x7d, 0x46, 0xb0, 0xf6, 0x22, 0xf0, 0x8f, 0x86, - 0xc2, 0xbe, 0xf5, 0xea, 0x1a, 0x2f, 0x33, 0x1a, 0x44, 0x56, 0xc3, 0xa7, 0x5e, 0x57, 0x8f, 0xad, - 0x0b, 0x4a, 0x44, 0xb1, 0x91, 0x83, 0xe6, 0xa4, 0x39, 0x6d, 0x2f, 0x82, 0x0f, 0x44, 0x97, 0x97, - 0x2a, 0xd2, 0x68, 0xf8, 0xc5, 0x2a, 0xf7, 0x8c, 0xf2, 0x1b, 0x99, 0x20, 0xea, 0x90, 0x57, 0x54, - 0x86, 0xab, 0xfd, 0x09, 0xb8, 0x87, 0x13, 0x70, 0x9f, 0x4e, 0xc0, 0xbd, 0x3f, 0x03, 0xe7, 0x70, - 0x06, 0xce, 0xe3, 0x19, 0x38, 0xff, 0x66, 0x09, 0x53, 0x37, 0x65, 0x0c, 0x89, 0xe0, 0xc8, 0x7a, - 0xce, 0x52, 0x1c, 0xcb, 0xaa, 0x40, 0x77, 0xf6, 0x2a, 0x6a, 0x97, 0x53, 0x19, 0xb7, 0xf4, 0x35, - 0x7e, 0xbc, 0x04, 0x00, 0x00, 0xff, 0xff, 0x36, 0x82, 0x93, 0xdd, 0xac, 0x02, 0x00, 0x00, + // 388 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xc1, 0x6e, 0xda, 0x30, + 0x18, 0xc7, 0x13, 0x90, 0x38, 0x04, 0xb8, 0x44, 0x30, 0x31, 0x34, 0x0c, 0xcb, 0x34, 0x89, 0xcb, + 0xec, 0xc1, 0x0e, 0x93, 0x76, 0x5b, 0x38, 0x4c, 0x9a, 0x76, 0x98, 0xd2, 0x5b, 0x2f, 0xc8, 0x31, + 0x6e, 0x6a, 0x35, 0x8e, 0xa3, 0xd8, 0x41, 0xe5, 0x2d, 0xfa, 0x3e, 0x7d, 0x01, 0x8e, 0x1c, 0x7b, + 0x42, 0x15, 0xbc, 0x41, 0x9f, 0xa0, 0xc2, 0x76, 0xa8, 0x5a, 0xa5, 0xb7, 0x7c, 0xfe, 0x7e, 0xdf, + 0xff, 0xff, 0xff, 0xf2, 0x79, 0x5f, 0x84, 0xe4, 0x42, 0x32, 0x89, 0x48, 0x8a, 0x19, 0x47, 0xeb, + 0x59, 0x4c, 0x15, 0x9e, 0xa1, 0x84, 0x66, 0x54, 0x32, 0x09, 0xf3, 0x42, 0x28, 0xe1, 0xf7, 0x2d, + 0x04, 0x35, 0x04, 0x2d, 0x34, 0xec, 0x25, 0x22, 0x11, 0x9a, 0x40, 0xa7, 0x2f, 0x03, 0x0f, 0x01, + 0xd1, 0x34, 0x8a, 0xb1, 0xa4, 0x67, 0x3d, 0x22, 0x58, 0x66, 0xfb, 0x9f, 0xcf, 0xfd, 0xec, 0xa6, + 0xde, 0x6f, 0x08, 0x12, 0x21, 0x92, 0x94, 0x22, 0x5d, 0xc5, 0xe5, 0x15, 0x5a, 0x95, 0x05, 0x56, + 0x4c, 0x54, 0x12, 0xe3, 0xb7, 0x7d, 0xc5, 0x38, 0x95, 0x0a, 0xf3, 0xbc, 0xf2, 0xa8, 0xdf, 0xca, + 0xc4, 0x37, 0x48, 0x50, 0x8f, 0xe4, 0xb8, 0xc0, 0xdc, 0xe6, 0x08, 0xee, 0x1b, 0x5e, 0xe7, 0x8f, + 0x49, 0x76, 0xa1, 0xb0, 0xa2, 0xfe, 0xda, 0xfb, 0xc0, 0xc5, 0xaa, 0x4c, 0xe9, 0x12, 0x13, 0x22, + 0xca, 0x4c, 0x2d, 0x63, 0x9c, 0xe2, 0x8c, 0xd0, 0x81, 0x3b, 0x71, 0xa7, 0xed, 0xf9, 0x47, 0x68, + 0x96, 0x83, 0xa7, 0xe5, 0xab, 0xff, 0x04, 0x17, 0x82, 0x65, 0xe1, 0xd7, 0xed, 0x7e, 0xec, 0x3c, + 0xed, 0xc7, 0xa3, 0x0d, 0xe6, 0xe9, 0xaf, 0xa0, 0x5e, 0x26, 0x88, 0x7a, 0xa6, 0xf1, 0xdb, 0xbc, + 0x87, 0xe6, 0xd9, 0xff, 0xe7, 0xb5, 0x4c, 0xb0, 0x41, 0x43, 0xfb, 0x8c, 0x60, 0xed, 0x45, 0xe0, + 0x7f, 0x0d, 0x85, 0x7d, 0xeb, 0xd5, 0x35, 0x5e, 0x66, 0x34, 0x88, 0xac, 0x86, 0x4f, 0xbd, 0xae, + 0x1e, 0x5b, 0x16, 0x94, 0x88, 0x62, 0x25, 0x07, 0xcd, 0x49, 0x73, 0xda, 0x9e, 0x07, 0xef, 0x88, + 0x2e, 0x4e, 0x55, 0xa4, 0xd1, 0xf0, 0x93, 0x55, 0xee, 0x19, 0xe5, 0x57, 0x32, 0x41, 0xd4, 0x21, + 0x2f, 0xa8, 0x0c, 0xff, 0x6e, 0x0f, 0xc0, 0xdd, 0x1d, 0x80, 0xfb, 0x78, 0x00, 0xee, 0xdd, 0x11, + 0x38, 0xbb, 0x23, 0x70, 0x1e, 0x8e, 0xc0, 0xb9, 0xfc, 0x9e, 0x30, 0x75, 0x5d, 0xc6, 0x90, 0x08, + 0x8e, 0xac, 0xe7, 0xb7, 0x14, 0xc7, 0xb2, 0x2a, 0xd0, 0xfa, 0x27, 0xba, 0xb5, 0x87, 0x51, 0x9b, + 0x9c, 0xca, 0xb8, 0xa5, 0x0f, 0xf2, 0xe3, 0x39, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x5f, 0xe1, 0x02, + 0xaf, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/claim/types/params.pb.go b/x/claim/types/params.pb.go index d6dcfae05d6..ae7140553d1 100644 --- a/x/claim/types/params.pb.go +++ b/x/claim/types/params.pb.go @@ -107,32 +107,32 @@ func init() { } var fileDescriptor_a1687b9ddfb80c0a = []byte{ - // 393 bytes of a gzipped FileDescriptorProto + // 397 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x31, 0x6b, 0xdb, 0x40, 0x14, 0xc7, 0x75, 0x75, 0x31, 0x54, 0x1e, 0xda, 0x0a, 0x17, 0x64, 0x1b, 0x4e, 0x46, 0x50, 0xf0, - 0x50, 0xeb, 0x70, 0xbb, 0x75, 0x74, 0x0d, 0xa5, 0x53, 0x83, 0x93, 0x2c, 0x59, 0xc4, 0xc9, 0x92, - 0x95, 0x03, 0x9d, 0x4f, 0xe8, 0x4e, 0x21, 0xfa, 0x0a, 0x99, 0x3c, 0x85, 0x7c, 0x9c, 0x8c, 0x1e, - 0x3d, 0x66, 0x52, 0x82, 0xbd, 0x65, 0xf4, 0x27, 0x08, 0x77, 0x3a, 0x05, 0x62, 0x1b, 0xb2, 0xe9, - 0xde, 0xff, 0xf7, 0xde, 0xfb, 0x09, 0x9e, 0xe9, 0x32, 0x4e, 0x19, 0x27, 0x1c, 0xcd, 0x12, 0x4c, - 0x28, 0xba, 0x1a, 0x05, 0x91, 0xc0, 0x23, 0x94, 0xe2, 0x0c, 0x53, 0xee, 0xa5, 0x19, 0x13, 0xcc, - 0xfa, 0xa6, 0x19, 0x4f, 0x31, 0x9e, 0x66, 0xba, 0xed, 0x98, 0xc5, 0x4c, 0x11, 0x48, 0x7e, 0x55, - 0x70, 0x17, 0xc6, 0x8c, 0xc5, 0x49, 0x84, 0xd4, 0x2b, 0xc8, 0xe7, 0x28, 0xcc, 0x33, 0x2c, 0x08, - 0x5b, 0xe8, 0xdc, 0xd9, 0xcf, 0x05, 0xa1, 0x11, 0x17, 0x98, 0xa6, 0x15, 0xe0, 0xde, 0x37, 0xcc, - 0xe6, 0x89, 0x5a, 0x6f, 0x31, 0xd3, 0xc2, 0x24, 0x0b, 0x33, 0x96, 0xfa, 0x5c, 0xe0, 0x4c, 0xf8, - 0x92, 0xb5, 0x41, 0x1f, 0x0c, 0x5a, 0x3f, 0xbb, 0x5e, 0x35, 0xc8, 0xab, 0x07, 0x79, 0x67, 0xf5, - 0xa0, 0xf1, 0xf7, 0x55, 0xe9, 0x18, 0xbb, 0xd2, 0xe9, 0x14, 0x98, 0x26, 0xbf, 0xdd, 0xc3, 0x19, - 0xee, 0xf2, 0xd1, 0x01, 0xd3, 0x2f, 0x3a, 0x38, 0x95, 0x75, 0xd9, 0x6d, 0xdd, 0x02, 0xb3, 0x5d, - 0xfb, 0xfa, 0xf9, 0x42, 0x90, 0xc4, 0x0f, 0xa3, 0x19, 0x2e, 0xec, 0x0f, 0x6a, 0x67, 0xe7, 0x60, - 0xe7, 0x44, 0xc3, 0xe3, 0x7f, 0x72, 0xe5, 0x73, 0xe9, 0xc0, 0x63, 0xed, 0x3f, 0x18, 0x25, 0x22, - 0xa2, 0xa9, 0x28, 0x76, 0xa5, 0xd3, 0xab, 0xa4, 0x8e, 0x71, 0xee, 0x9d, 0xd4, 0xb2, 0xea, 0xe8, - 0x5c, 0x26, 0x13, 0x19, 0x58, 0x37, 0xc0, 0xfc, 0xfa, 0xda, 0xc1, 0xe6, 0xda, 0xaa, 0xf1, 0x9e, - 0xd5, 0x1f, 0x6d, 0xd5, 0x3b, 0xe8, 0x7d, 0xa3, 0x64, 0xef, 0x29, 0xd5, 0x50, 0xe5, 0xf3, 0xb9, - 0xae, 0xff, 0x9f, 0x57, 0x32, 0x8e, 0xd9, 0x52, 0x97, 0xe0, 0x87, 0xd1, 0x82, 0x51, 0xfb, 0x63, - 0x1f, 0x0c, 0x3e, 0x4d, 0x4d, 0x55, 0x9a, 0xc8, 0xca, 0xf8, 0xef, 0x6a, 0x03, 0xc1, 0x7a, 0x03, - 0xc1, 0xd3, 0x06, 0x82, 0xe5, 0x16, 0x1a, 0xeb, 0x2d, 0x34, 0x1e, 0xb6, 0xd0, 0xb8, 0x18, 0xc6, - 0x44, 0x5c, 0xe6, 0x81, 0x37, 0x63, 0x14, 0xe9, 0xab, 0x1a, 0x26, 0x38, 0xe0, 0xf5, 0x03, 0x5d, - 0xeb, 0x43, 0x14, 0x45, 0x1a, 0xf1, 0xa0, 0xa9, 0x7e, 0xe9, 0xd7, 0x4b, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x76, 0x40, 0xc9, 0xa6, 0xa6, 0x02, 0x00, 0x00, + 0xd0, 0xea, 0xea, 0x76, 0x28, 0x74, 0x74, 0xbd, 0xb4, 0x4b, 0x8b, 0x93, 0x2c, 0x59, 0xc4, 0xc9, + 0x92, 0x95, 0x03, 0x9d, 0x4f, 0xe8, 0x4e, 0x26, 0xfa, 0x0a, 0x99, 0x3c, 0x85, 0x7c, 0x9c, 0x8c, + 0x1e, 0x3d, 0x66, 0x52, 0x82, 0xbd, 0x65, 0xf4, 0x27, 0x08, 0x77, 0x3a, 0x05, 0x62, 0x1b, 0xb2, + 0xe9, 0xde, 0xff, 0xf7, 0xde, 0xfb, 0x09, 0x9e, 0xe9, 0x32, 0x4e, 0x19, 0x27, 0x1c, 0x4d, 0x13, + 0x4c, 0x28, 0x5a, 0x0c, 0x83, 0x48, 0xe0, 0x21, 0x4a, 0x71, 0x86, 0x29, 0xf7, 0xd2, 0x8c, 0x09, + 0x66, 0x7d, 0xd2, 0x8c, 0xa7, 0x18, 0x4f, 0x33, 0xdd, 0x76, 0xcc, 0x62, 0xa6, 0x08, 0x24, 0xbf, + 0x2a, 0xb8, 0x0b, 0x63, 0xc6, 0xe2, 0x24, 0x42, 0xea, 0x15, 0xe4, 0x33, 0x14, 0xe6, 0x19, 0x16, + 0x84, 0xcd, 0x75, 0xee, 0xec, 0xe7, 0x82, 0xd0, 0x88, 0x0b, 0x4c, 0xd3, 0x0a, 0x70, 0x6f, 0x1b, + 0x66, 0xf3, 0xbf, 0x5a, 0x6f, 0x31, 0xd3, 0xc2, 0x24, 0x0b, 0x33, 0x96, 0xfa, 0x5c, 0xe0, 0x4c, + 0xf8, 0x92, 0xb5, 0x41, 0x1f, 0x0c, 0x5a, 0xdf, 0xbb, 0x5e, 0x35, 0xc8, 0xab, 0x07, 0x79, 0xa7, + 0xf5, 0xa0, 0xd1, 0xe7, 0x55, 0xe9, 0x18, 0xbb, 0xd2, 0xe9, 0x14, 0x98, 0x26, 0xbf, 0xdc, 0xc3, + 0x19, 0xee, 0xf2, 0xde, 0x01, 0x93, 0x0f, 0x3a, 0x38, 0x91, 0x75, 0xd9, 0x6d, 0x5d, 0x03, 0xb3, + 0x5d, 0xfb, 0xfa, 0xf9, 0x5c, 0x90, 0xc4, 0x0f, 0xa3, 0x29, 0x2e, 0xec, 0x37, 0x6a, 0x67, 0xe7, + 0x60, 0xe7, 0x58, 0xc3, 0xa3, 0x3f, 0x72, 0xe5, 0x63, 0xe9, 0xc0, 0x63, 0xed, 0x5f, 0x18, 0x25, + 0x22, 0xa2, 0xa9, 0x28, 0x76, 0xa5, 0xd3, 0xab, 0xa4, 0x8e, 0x71, 0xee, 0x8d, 0xd4, 0xb2, 0xea, + 0xe8, 0x4c, 0x26, 0x63, 0x19, 0x58, 0x57, 0xc0, 0xfc, 0xf8, 0xdc, 0xc1, 0x66, 0xda, 0xaa, 0xf1, + 0x9a, 0xd5, 0x6f, 0x6d, 0xd5, 0x3b, 0xe8, 0x7d, 0xa1, 0x64, 0xef, 0x29, 0xd5, 0x50, 0xe5, 0xf3, + 0xbe, 0xae, 0xff, 0x9b, 0x55, 0x32, 0x8e, 0xd9, 0x52, 0x97, 0xe0, 0x87, 0xd1, 0x9c, 0x51, 0xfb, + 0x6d, 0x1f, 0x0c, 0xde, 0x4d, 0x4c, 0x55, 0x1a, 0xcb, 0xca, 0xe8, 0xef, 0x6a, 0x03, 0xc1, 0x7a, + 0x03, 0xc1, 0xc3, 0x06, 0x82, 0xe5, 0x16, 0x1a, 0xeb, 0x2d, 0x34, 0xee, 0xb6, 0xd0, 0x38, 0xff, + 0x16, 0x13, 0x71, 0x91, 0x07, 0xde, 0x94, 0x51, 0xa4, 0xaf, 0xea, 0x6b, 0x82, 0x03, 0x5e, 0x3f, + 0xd0, 0xe2, 0x27, 0xba, 0xd4, 0xb7, 0x28, 0x8a, 0x34, 0xe2, 0x41, 0x53, 0xfd, 0xd5, 0x8f, 0xa7, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x24, 0xdf, 0x09, 0x00, 0xa9, 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/claim/types/query.pb.go b/x/claim/types/query.pb.go index d36b65b704e..776710bf940 100644 --- a/x/claim/types/query.pb.go +++ b/x/claim/types/query.pb.go @@ -486,53 +486,53 @@ func init() { proto.RegisterFile("osmosis/claim/v1beta1/query.proto", fileDescri var fileDescriptor_1bba73508cdd8c1d = []byte{ // 742 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0xcd, 0x6b, 0x13, 0x4d, - 0x18, 0xcf, 0xf4, 0x7d, 0x9b, 0x97, 0x77, 0xd2, 0xb7, 0xf0, 0x4e, 0x23, 0xc6, 0xad, 0xdd, 0x4d, - 0x07, 0x84, 0xf8, 0x91, 0x1d, 0x1b, 0xa9, 0x16, 0x05, 0x69, 0x53, 0xa8, 0x22, 0x08, 0xba, 0x78, - 0xf2, 0x12, 0x66, 0x37, 0x63, 0x5c, 0xdc, 0xec, 0xa4, 0x3b, 0x1b, 0xb1, 0x94, 0x7a, 0xf0, 0xe0, - 0xd5, 0x82, 0x1e, 0xfc, 0x07, 0xbc, 0x78, 0xf3, 0xe0, 0xdd, 0x63, 0xc1, 0x4b, 0xc1, 0x8b, 0xa7, - 0x28, 0xad, 0x7f, 0x41, 0xef, 0x82, 0xec, 0xcc, 0xe4, 0xa3, 0x76, 0x93, 0xb6, 0x1e, 0xf4, 0x94, - 0x30, 0xfb, 0x7b, 0x9e, 0xdf, 0xc7, 0xce, 0xf3, 0x2c, 0x9c, 0xe5, 0xa2, 0xc9, 0x85, 0x2f, 0x88, - 0x17, 0x50, 0xbf, 0x49, 0x1e, 0xcf, 0xb9, 0x2c, 0xa6, 0x73, 0x64, 0xb5, 0xcd, 0xa2, 0x35, 0xbb, - 0x15, 0xf1, 0x98, 0xa3, 0x13, 0x1a, 0x62, 0x4b, 0x88, 0xad, 0x21, 0x46, 0xbe, 0xc1, 0x1b, 0x5c, - 0x22, 0x48, 0xf2, 0x4f, 0x81, 0x8d, 0xd3, 0x0d, 0xce, 0x1b, 0x01, 0x23, 0xb4, 0xe5, 0x13, 0x1a, - 0x86, 0x3c, 0xa6, 0xb1, 0xcf, 0x43, 0xa1, 0x9f, 0x9a, 0x9e, 0xec, 0x45, 0x5c, 0x2a, 0x58, 0x8f, - 0xcb, 0xe3, 0x7e, 0xa8, 0x9f, 0x0f, 0x51, 0xa3, 0x88, 0x15, 0x04, 0xa7, 0x43, 0x5a, 0x34, 0xa2, - 0x4d, 0x4d, 0x83, 0x31, 0x2c, 0xde, 0x4d, 0x0c, 0xdc, 0xe6, 0xf5, 0x76, 0xc0, 0x96, 0x3c, 0x8f, - 0xb7, 0xc3, 0xb8, 0x4a, 0x03, 0x1a, 0x7a, 0xcc, 0x61, 0xab, 0x6d, 0x26, 0x62, 0xfc, 0x1e, 0xc0, - 0xd9, 0x11, 0x20, 0xd1, 0xe2, 0xa1, 0x60, 0xe8, 0x05, 0x80, 0xf9, 0x66, 0x0a, 0xa0, 0x00, 0x8a, - 0x7f, 0x95, 0x72, 0x95, 0x53, 0xb6, 0x32, 0x64, 0x27, 0x86, 0xba, 0xc9, 0xd8, 0xcb, 0xdc, 0x0f, - 0xab, 0x8b, 0x5b, 0x1d, 0x2b, 0xb3, 0xd7, 0xb1, 0x26, 0xd6, 0x68, 0x33, 0xb8, 0x8a, 0x13, 0x93, - 0x02, 0xbf, 0xfd, 0x62, 0x95, 0x1a, 0x7e, 0xfc, 0xb0, 0xed, 0xda, 0x1e, 0x6f, 0x12, 0x9d, 0x86, - 0xfa, 0x29, 0x8b, 0xfa, 0x23, 0x12, 0xaf, 0xb5, 0x98, 0x90, 0x0d, 0x84, 0x93, 0x4a, 0x8c, 0xf3, - 0x10, 0x49, 0xd9, 0x77, 0xa4, 0xe1, 0xae, 0x1b, 0x07, 0x4e, 0xed, 0x3b, 0xd5, 0xf2, 0xaf, 0xc1, - 0xac, 0x0a, 0xa6, 0x00, 0x8a, 0xa0, 0x94, 0xab, 0xcc, 0xd8, 0xa9, 0xef, 0xd2, 0x56, 0x65, 0xd5, - 0xbf, 0x13, 0xcd, 0x8e, 0x2e, 0xc1, 0x2b, 0xf0, 0xa4, 0xec, 0xb9, 0x9c, 0x40, 0x1d, 0xe6, 0xf1, - 0xa8, 0xae, 0xe9, 0xd0, 0x79, 0xf8, 0x0f, 0xad, 0xd7, 0x23, 0x26, 0x54, 0xe3, 0x7f, 0xab, 0xff, - 0xef, 0x75, 0xac, 0xff, 0x94, 0x53, 0xc1, 0xc2, 0x3a, 0x8b, 0xb0, 0xd3, 0x45, 0xe0, 0xa7, 0xb0, - 0x70, 0xb0, 0x8f, 0x16, 0xe8, 0xc2, 0x09, 0xa9, 0xa4, 0x16, 0xc9, 0x73, 0x2d, 0x13, 0x0f, 0x91, - 0x39, 0xd0, 0xa1, 0x3a, 0xad, 0xf3, 0x9d, 0xd2, 0xf9, 0x0e, 0x74, 0xc1, 0x4e, 0xce, 0xeb, 0x23, - 0xf1, 0x6b, 0x00, 0xcd, 0xbe, 0x00, 0xea, 0x06, 0x6c, 0x85, 0x47, 0x4b, 0x5e, 0x72, 0x2f, 0xbb, - 0x7e, 0x2e, 0xfc, 0xec, 0x07, 0xed, 0x75, 0xac, 0x49, 0xd5, 0xb9, 0x6b, 0xa3, 0x67, 0x08, 0xdd, - 0x84, 0x59, 0x2a, 0xcb, 0x0b, 0x63, 0x45, 0x50, 0x9a, 0x1c, 0x9a, 0xaa, 0xe2, 0x18, 0xcc, 0x46, - 0x95, 0x61, 0x47, 0xd7, 0xe3, 0x57, 0x00, 0x5a, 0x43, 0xa5, 0xe9, 0x88, 0x56, 0xe1, 0xb8, 0xbc, - 0x3c, 0xbf, 0xe3, 0xca, 0x29, 0x26, 0x7c, 0x0b, 0x1a, 0x52, 0xd5, 0x3d, 0x1e, 0xd3, 0xa0, 0x27, - 0xed, 0x97, 0xc2, 0xc2, 0x9b, 0x00, 0x4e, 0xa7, 0x36, 0xfb, 0x63, 0xf6, 0x2a, 0xdf, 0xb3, 0x70, - 0x5c, 0x4a, 0x42, 0x1f, 0x00, 0xcc, 0xa7, 0xcd, 0x3f, 0xba, 0x32, 0xe4, 0x95, 0x1e, 0xb6, 0x56, - 0x8c, 0x85, 0xe3, 0x17, 0xaa, 0x20, 0xf0, 0xfc, 0xb3, 0x4f, 0xdf, 0x5e, 0x8e, 0x11, 0x54, 0x26, - 0xe9, 0x1b, 0x4e, 0x6d, 0x83, 0x1a, 0x55, 0xd5, 0x35, 0x57, 0x2b, 0x7d, 0x0e, 0x60, 0x56, 0x8d, - 0x2f, 0x3a, 0x3b, 0x8a, 0x7b, 0xdf, 0xbe, 0x30, 0xce, 0x1d, 0x05, 0xaa, 0x85, 0x9d, 0x91, 0xc2, - 0x2c, 0x34, 0x43, 0x46, 0xad, 0x5e, 0xf4, 0x06, 0xc0, 0xdc, 0xc0, 0x80, 0x22, 0x7b, 0x14, 0xc5, - 0xc1, 0x9d, 0x62, 0x90, 0x23, 0xe3, 0x8f, 0x18, 0xd8, 0xe0, 0x4a, 0x20, 0xeb, 0xfa, 0x3e, 0x6e, - 0xa0, 0x8f, 0x00, 0xa2, 0x83, 0xe3, 0x86, 0xe6, 0x0f, 0xa5, 0x4f, 0xdb, 0x1c, 0xc6, 0xe5, 0xe3, - 0x96, 0x69, 0xf1, 0x2b, 0x52, 0xfc, 0x22, 0xba, 0x3e, 0x4a, 0x7c, 0x52, 0x5a, 0x7b, 0xc0, 0xa3, - 0x9a, 0x5a, 0x17, 0x7d, 0x13, 0x64, 0x5d, 0x9d, 0x6c, 0xa0, 0x77, 0x00, 0x4e, 0xee, 0x9f, 0x2c, - 0x34, 0x37, 0x4a, 0x52, 0xea, 0x48, 0x1b, 0x95, 0xe3, 0x94, 0x68, 0x07, 0x0b, 0xd2, 0x41, 0x05, - 0x5d, 0x1c, 0xe2, 0x20, 0x4e, 0xca, 0x6a, 0x3d, 0x1f, 0x7d, 0xf1, 0xd5, 0x1b, 0x5b, 0x3b, 0x26, - 0xd8, 0xde, 0x31, 0xc1, 0xd7, 0x1d, 0x13, 0x6c, 0xee, 0x9a, 0x99, 0xed, 0x5d, 0x33, 0xf3, 0x79, - 0xd7, 0xcc, 0xdc, 0x2f, 0x0f, 0x8c, 0xb2, 0xee, 0x5a, 0x0e, 0xa8, 0x2b, 0x7a, 0x14, 0x4f, 0x34, - 0x89, 0x9c, 0x6a, 0x37, 0x2b, 0x3f, 0xf7, 0x97, 0x7e, 0x04, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x70, - 0x4f, 0xbd, 0xc5, 0x08, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0xcd, 0x6b, 0x13, 0x41, + 0x14, 0xcf, 0x54, 0x1b, 0x71, 0x52, 0x0b, 0x4e, 0x23, 0xc6, 0xad, 0xdd, 0xa4, 0x03, 0x42, 0xfc, + 0xe8, 0x4e, 0x1b, 0xa9, 0x2d, 0x0a, 0xd2, 0xa6, 0x50, 0xa4, 0x20, 0xe8, 0xe2, 0xc9, 0x4b, 0x98, + 0xdd, 0x8c, 0x71, 0x71, 0xb3, 0x93, 0xee, 0x6c, 0x8a, 0xa5, 0xd4, 0x83, 0x07, 0xaf, 0x16, 0xf4, + 0xe0, 0x3f, 0xe0, 0xc5, 0x9b, 0x07, 0xef, 0x1e, 0x0b, 0x5e, 0x0a, 0x5e, 0x3c, 0x45, 0x69, 0xfd, + 0x0b, 0x7a, 0x17, 0x64, 0x67, 0x26, 0x1f, 0xb5, 0x9b, 0xb4, 0xf5, 0xa0, 0xa7, 0x84, 0xd9, 0xdf, + 0x7b, 0xbf, 0x8f, 0x9d, 0xf7, 0x16, 0x4e, 0x72, 0x51, 0xe7, 0xc2, 0x13, 0xc4, 0xf5, 0xa9, 0x57, + 0x27, 0x6b, 0x33, 0x0e, 0x8b, 0xe8, 0x0c, 0x59, 0x6d, 0xb2, 0x70, 0xdd, 0x6a, 0x84, 0x3c, 0xe2, + 0xe8, 0x82, 0x86, 0x58, 0x12, 0x62, 0x69, 0x88, 0x91, 0xad, 0xf1, 0x1a, 0x97, 0x08, 0x12, 0xff, + 0x53, 0x60, 0xe3, 0x72, 0x8d, 0xf3, 0x9a, 0xcf, 0x08, 0x6d, 0x78, 0x84, 0x06, 0x01, 0x8f, 0x68, + 0xe4, 0xf1, 0x40, 0xe8, 0xa7, 0xa6, 0x2b, 0x7b, 0x11, 0x87, 0x0a, 0xd6, 0xe1, 0x72, 0xb9, 0x17, + 0xe8, 0xe7, 0x7d, 0xd4, 0x28, 0x62, 0x05, 0xc1, 0xc9, 0x90, 0x06, 0x0d, 0x69, 0x5d, 0xd3, 0x60, + 0x0c, 0x0b, 0x0f, 0x63, 0x03, 0xf7, 0x79, 0xb5, 0xe9, 0xb3, 0x45, 0xd7, 0xe5, 0xcd, 0x20, 0x2a, + 0x53, 0x9f, 0x06, 0x2e, 0xb3, 0xd9, 0x6a, 0x93, 0x89, 0x08, 0x7f, 0x02, 0x70, 0x72, 0x00, 0x48, + 0x34, 0x78, 0x20, 0x18, 0x7a, 0x0d, 0x60, 0xb6, 0x9e, 0x00, 0xc8, 0x81, 0xc2, 0xa9, 0x62, 0xa6, + 0x74, 0xc9, 0x52, 0x86, 0xac, 0xd8, 0x50, 0x3b, 0x19, 0x6b, 0x89, 0x7b, 0x41, 0x79, 0x61, 0xbb, + 0x95, 0x4f, 0xed, 0xb7, 0xf2, 0x23, 0xeb, 0xb4, 0xee, 0xdf, 0xc6, 0xb1, 0x49, 0x81, 0x3f, 0x7c, + 0xcf, 0x17, 0x6b, 0x5e, 0xf4, 0xb4, 0xe9, 0x58, 0x2e, 0xaf, 0x13, 0x9d, 0x86, 0xfa, 0x99, 0x12, + 0xd5, 0x67, 0x24, 0x5a, 0x6f, 0x30, 0x21, 0x1b, 0x08, 0x3b, 0x91, 0x18, 0x67, 0x21, 0x92, 0xb2, + 0x1f, 0x48, 0xc3, 0x6d, 0x37, 0x36, 0x1c, 0x3b, 0x70, 0xaa, 0xe5, 0xdf, 0x81, 0x69, 0x15, 0x4c, + 0x0e, 0x14, 0x40, 0x31, 0x53, 0x9a, 0xb0, 0x12, 0xdf, 0xa5, 0xa5, 0xca, 0xca, 0xa7, 0x63, 0xcd, + 0xb6, 0x2e, 0xc1, 0xcb, 0xf0, 0xa2, 0xec, 0xb9, 0x14, 0x43, 0x6d, 0xe6, 0xf2, 0xb0, 0xaa, 0xe9, + 0xd0, 0x75, 0x78, 0x86, 0x56, 0xab, 0x21, 0x13, 0xaa, 0xf1, 0xd9, 0xf2, 0xf9, 0xfd, 0x56, 0xfe, + 0x9c, 0x72, 0x2a, 0x58, 0x50, 0x65, 0x21, 0xb6, 0xdb, 0x08, 0xfc, 0x02, 0xe6, 0x0e, 0xf7, 0xd1, + 0x02, 0x1d, 0x38, 0x22, 0x95, 0x54, 0x42, 0x79, 0xae, 0x65, 0xe2, 0x3e, 0x32, 0x7b, 0x3a, 0x94, + 0xc7, 0x75, 0xbe, 0x63, 0x3a, 0xdf, 0x9e, 0x2e, 0xd8, 0xce, 0xb8, 0x5d, 0x24, 0x7e, 0x07, 0xa0, + 0xd9, 0x15, 0x40, 0x1d, 0x9f, 0x2d, 0xf3, 0x70, 0xd1, 0x8d, 0xef, 0x65, 0xdb, 0xcf, 0x8d, 0x3f, + 0xfd, 0xa0, 0xfd, 0x56, 0x7e, 0x54, 0x75, 0x6e, 0xdb, 0xe8, 0x18, 0x42, 0xf7, 0x60, 0x9a, 0xca, + 0xf2, 0xdc, 0x50, 0x01, 0x14, 0x47, 0xfb, 0xa6, 0xaa, 0x38, 0x7a, 0xb3, 0x51, 0x65, 0xd8, 0xd6, + 0xf5, 0xf8, 0x2d, 0x80, 0xf9, 0xbe, 0xd2, 0x74, 0x44, 0xab, 0x70, 0x58, 0x5e, 0x9e, 0x7f, 0x71, + 0xe5, 0x14, 0x13, 0x5e, 0x81, 0x86, 0x54, 0xf5, 0x88, 0x47, 0xd4, 0xef, 0x48, 0xfb, 0xab, 0xb0, + 0xf0, 0x16, 0x80, 0xe3, 0x89, 0xcd, 0xfe, 0x9b, 0xbd, 0xd2, 0xaf, 0x34, 0x1c, 0x96, 0x92, 0xd0, + 0x67, 0x00, 0xb3, 0x49, 0xf3, 0x8f, 0xe6, 0xfa, 0xbc, 0xd2, 0xa3, 0xd6, 0x8a, 0x31, 0x7f, 0xf2, + 0x42, 0x15, 0x04, 0x9e, 0x7d, 0xf9, 0xf5, 0xe7, 0x9b, 0x21, 0x82, 0xa6, 0x48, 0xf2, 0x86, 0x53, + 0xdb, 0xa0, 0x42, 0x55, 0x75, 0xc5, 0xd1, 0x4a, 0x5f, 0x01, 0x98, 0x56, 0xe3, 0x8b, 0xae, 0x0e, + 0xe2, 0x3e, 0xb0, 0x2f, 0x8c, 0x6b, 0xc7, 0x81, 0x6a, 0x61, 0x57, 0xa4, 0xb0, 0x3c, 0x9a, 0x20, + 0x83, 0x56, 0x2f, 0x7a, 0x0f, 0x60, 0xa6, 0x67, 0x40, 0x91, 0x35, 0x88, 0xe2, 0xf0, 0x4e, 0x31, + 0xc8, 0xb1, 0xf1, 0xc7, 0x0c, 0xac, 0x77, 0x25, 0x90, 0x0d, 0x7d, 0x1f, 0x37, 0xd1, 0x17, 0x00, + 0xd1, 0xe1, 0x71, 0x43, 0xb3, 0x47, 0xd2, 0x27, 0x6d, 0x0e, 0xe3, 0xd6, 0x49, 0xcb, 0xb4, 0xf8, + 0x65, 0x29, 0x7e, 0x01, 0xdd, 0x1d, 0x24, 0x3e, 0x2e, 0xad, 0x3c, 0xe1, 0x61, 0x45, 0xad, 0x8b, + 0xae, 0x09, 0xb2, 0xa1, 0x4e, 0x36, 0xd1, 0x47, 0x00, 0x47, 0x0f, 0x4e, 0x16, 0x9a, 0x19, 0x24, + 0x29, 0x71, 0xa4, 0x8d, 0xd2, 0x49, 0x4a, 0xb4, 0x83, 0x79, 0xe9, 0xa0, 0x84, 0xa6, 0xfb, 0x38, + 0x88, 0xe2, 0xb2, 0x4a, 0xc7, 0x47, 0x57, 0x7c, 0x79, 0x65, 0x7b, 0xd7, 0x04, 0x3b, 0xbb, 0x26, + 0xf8, 0xb1, 0x6b, 0x82, 0xad, 0x3d, 0x33, 0xb5, 0xb3, 0x67, 0xa6, 0xbe, 0xed, 0x99, 0xa9, 0xc7, + 0xd3, 0x3d, 0xa3, 0xac, 0xbb, 0x4e, 0xf9, 0xd4, 0x11, 0x1d, 0x8a, 0xb5, 0x39, 0xf2, 0x5c, 0xf3, + 0xc8, 0xc1, 0x76, 0xd2, 0xf2, 0x8b, 0x7f, 0xf3, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x92, + 0xec, 0x02, 0xc8, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/epochs/abci.go b/x/epochs/abci.go index 2b5c7327a14..6a5667ed3fc 100644 --- a/x/epochs/abci.go +++ b/x/epochs/abci.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/epochs/keeper" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs/keeper" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) // BeginBlocker of epochs module diff --git a/x/epochs/abci_test.go b/x/epochs/abci_test.go index 065216d651a..2c0916eceab 100644 --- a/x/epochs/abci_test.go +++ b/x/epochs/abci_test.go @@ -5,9 +5,9 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - simapp "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/epochs" - "github.com/osmosis-labs/osmosis/x/epochs/types" + simapp "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/epochs" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) diff --git a/x/epochs/client/cli/cli_test.go b/x/epochs/client/cli/cli_test.go index bd736cd4c6b..c7cbae8d04e 100644 --- a/x/epochs/client/cli/cli_test.go +++ b/x/epochs/client/cli/cli_test.go @@ -6,9 +6,9 @@ import ( clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" - "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/epochs/client/cli" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/epochs/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) type IntegrationTestSuite struct { diff --git a/x/epochs/client/cli/query.go b/x/epochs/client/cli/query.go index 63e3edd33fc..c3400327998 100644 --- a/x/epochs/client/cli/query.go +++ b/x/epochs/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" "github.com/spf13/cobra" ) diff --git a/x/epochs/client/cli/tx.go b/x/epochs/client/cli/tx.go index 6f1bb04ab12..6f60825089b 100644 --- a/x/epochs/client/cli/tx.go +++ b/x/epochs/client/cli/tx.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" // "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/epochs/genesis.go b/x/epochs/genesis.go index b6cbaed020d..72e7eb4f447 100644 --- a/x/epochs/genesis.go +++ b/x/epochs/genesis.go @@ -4,8 +4,8 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/epochs/keeper" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs/keeper" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/epochs/genesis_test.go b/x/epochs/genesis_test.go index 0811b35e1ae..588e100f8df 100644 --- a/x/epochs/genesis_test.go +++ b/x/epochs/genesis_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - simapp "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/epochs" - "github.com/osmosis-labs/osmosis/x/epochs/types" + simapp "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/epochs" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) diff --git a/x/epochs/handler.go b/x/epochs/handler.go index 580ab685e3a..cd30719707d 100644 --- a/x/epochs/handler.go +++ b/x/epochs/handler.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/epochs/keeper" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs/keeper" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) // NewHandler returns a handler for epochs module messages diff --git a/x/epochs/keeper/epoch.go b/x/epochs/keeper/epoch.go index 71039676b99..c20e290e5e3 100644 --- a/x/epochs/keeper/epoch.go +++ b/x/epochs/keeper/epoch.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) // GetEpochInfo returns epoch info by identifier diff --git a/x/epochs/keeper/epoch_test.go b/x/epochs/keeper/epoch_test.go index 14fe40760fe..584eb2ac4dc 100644 --- a/x/epochs/keeper/epoch_test.go +++ b/x/epochs/keeper/epoch_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "time" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) func (suite *KeeperTestSuite) TestEpochLifeCycle() { diff --git a/x/epochs/keeper/grpc_query.go b/x/epochs/keeper/grpc_query.go index 77caf16d9b0..4a409380df5 100644 --- a/x/epochs/keeper/grpc_query.go +++ b/x/epochs/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( "errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/epochs/keeper/grpc_query_test.go b/x/epochs/keeper/grpc_query_test.go index aa801330af6..ab828f00155 100644 --- a/x/epochs/keeper/grpc_query_test.go +++ b/x/epochs/keeper/grpc_query_test.go @@ -4,7 +4,7 @@ import ( gocontext "context" "time" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) func (suite *KeeperTestSuite) TestQueryEpochInfos() { diff --git a/x/epochs/keeper/keeper.go b/x/epochs/keeper/keeper.go index 4f6176cd314..0e130cd01b3 100644 --- a/x/epochs/keeper/keeper.go +++ b/x/epochs/keeper/keeper.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" "github.com/tendermint/tendermint/libs/log" ) diff --git a/x/epochs/keeper/keeper_test.go b/x/epochs/keeper/keeper_test.go index 8078200a28a..deb318f3707 100644 --- a/x/epochs/keeper/keeper_test.go +++ b/x/epochs/keeper/keeper_test.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) diff --git a/x/epochs/keeper/query.go b/x/epochs/keeper/query.go index 1887ee9f91c..38cba2f84fc 100644 --- a/x/epochs/keeper/query.go +++ b/x/epochs/keeper/query.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/epochs/module.go b/x/epochs/module.go index 65dfdb6b86d..024a91d485b 100644 --- a/x/epochs/module.go +++ b/x/epochs/module.go @@ -19,11 +19,11 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/x/epochs/client/cli" - "github.com/osmosis-labs/osmosis/x/epochs/client/rest" - "github.com/osmosis-labs/osmosis/x/epochs/keeper" - "github.com/osmosis-labs/osmosis/x/epochs/simulation" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/epochs/client/rest" + "github.com/osmosis-labs/osmosis/v7/x/epochs/keeper" + "github.com/osmosis-labs/osmosis/v7/x/epochs/simulation" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) var ( diff --git a/x/epochs/simulation/genesis.go b/x/epochs/simulation/genesis.go index 8df61c850cc..f6a2497260f 100644 --- a/x/epochs/simulation/genesis.go +++ b/x/epochs/simulation/genesis.go @@ -8,7 +8,7 @@ import ( "time" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) // RandomizedGenState generates a random GenesisState for mint diff --git a/x/epochs/types/genesis.pb.go b/x/epochs/types/genesis.pb.go index 5e52251d4cb..eef9222f8a7 100644 --- a/x/epochs/types/genesis.pb.go +++ b/x/epochs/types/genesis.pb.go @@ -173,37 +173,37 @@ func init() { func init() { proto.RegisterFile("osmosis/epochs/genesis.proto", fileDescriptor_7ecf3e4d59074cbd) } var fileDescriptor_7ecf3e4d59074cbd = []byte{ - // 474 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0x31, 0x8f, 0xd3, 0x30, - 0x18, 0xad, 0x69, 0x29, 0xa9, 0xef, 0x10, 0x60, 0x1d, 0x47, 0xa8, 0x20, 0x09, 0x61, 0x89, 0x04, - 0x38, 0xea, 0xc1, 0x04, 0x03, 0x52, 0x01, 0x71, 0xb0, 0x20, 0xa5, 0x0c, 0x88, 0xa5, 0x4a, 0x5a, - 0x37, 0xb1, 0xd4, 0xc4, 0x51, 0xfc, 0x05, 0xd1, 0x8d, 0x9f, 0xd0, 0x91, 0x9f, 0x74, 0xe3, 0x8d, - 0x4c, 0x05, 0xb5, 0x1b, 0xe3, 0xfd, 0x02, 0x14, 0x3b, 0x29, 0x85, 0x3b, 0xc4, 0x16, 0xfb, 0xbd, - 0xef, 0x3d, 0xbf, 0xa7, 0x2f, 0xf8, 0x8e, 0x90, 0xa9, 0x90, 0x5c, 0xfa, 0x2c, 0x17, 0x93, 0x44, - 0xfa, 0x31, 0xcb, 0x98, 0xe4, 0x92, 0xe6, 0x85, 0x00, 0x41, 0x0e, 0x6b, 0x94, 0x6a, 0x94, 0x7e, - 0x1a, 0x44, 0x0c, 0xc2, 0x41, 0xff, 0x20, 0x16, 0xb1, 0x50, 0x14, 0xbf, 0xfa, 0xd2, 0xec, 0xbe, - 0x15, 0x0b, 0x11, 0xcf, 0x99, 0xaf, 0x4e, 0x51, 0x39, 0xf3, 0xa7, 0x65, 0x11, 0x02, 0x17, 0x59, - 0x8d, 0xdb, 0x7f, 0xe3, 0xc0, 0x53, 0x26, 0x21, 0x4c, 0x73, 0x4d, 0x70, 0x97, 0x1d, 0xdc, 0x7b, - 0x55, 0x39, 0xbd, 0xc9, 0x66, 0x82, 0x58, 0x18, 0xf3, 0x29, 0xcb, 0x80, 0xcf, 0x38, 0x2b, 0x4c, - 0xe4, 0x20, 0xaf, 0x17, 0xec, 0xdc, 0x90, 0x0f, 0x18, 0x4b, 0x08, 0x0b, 0x18, 0x57, 0x32, 0xe6, - 0x25, 0x07, 0x79, 0x7b, 0x47, 0x7d, 0xaa, 0x3d, 0x68, 0xe3, 0x41, 0xdf, 0x37, 0x1e, 0xc3, 0xbb, - 0x27, 0x2b, 0xbb, 0x75, 0xb6, 0xb2, 0x6f, 0x2c, 0xc2, 0x74, 0xfe, 0xd4, 0xfd, 0x3d, 0xeb, 0x2e, - 0xbf, 0xdb, 0x28, 0xe8, 0xa9, 0x8b, 0x8a, 0x4e, 0x12, 0x6c, 0x34, 0x4f, 0x37, 0xdb, 0x4a, 0xf7, - 0xf6, 0x39, 0xdd, 0x97, 0x35, 0x61, 0x38, 0xa8, 0x64, 0x7f, 0xae, 0x6c, 0xd2, 0x8c, 0x3c, 0x14, - 0x29, 0x07, 0x96, 0xe6, 0xb0, 0x38, 0x5b, 0xd9, 0xd7, 0xb4, 0x59, 0x83, 0xb9, 0x5f, 0x2b, 0xab, - 0xad, 0x3a, 0xb9, 0x8f, 0xaf, 0x4e, 0xca, 0xa2, 0x60, 0x19, 0x8c, 0x55, 0xc5, 0x66, 0xc7, 0x41, - 0x5e, 0x3b, 0xd8, 0xaf, 0x2f, 0x55, 0x19, 0xe4, 0x0b, 0xc2, 0xe6, 0x1f, 0xac, 0xf1, 0x4e, 0xee, - 0xcb, 0xff, 0xcd, 0xfd, 0xa0, 0xce, 0x6d, 0xeb, 0xa7, 0xfc, 0x4b, 0x49, 0xb7, 0x70, 0x73, 0xd7, - 0x79, 0xb4, 0x6d, 0xe4, 0x09, 0x3e, 0xd4, 0xfc, 0x89, 0x28, 0x33, 0xe0, 0x59, 0xac, 0x07, 0xd9, - 0xd4, 0xec, 0x3a, 0xc8, 0x33, 0x82, 0x03, 0x85, 0xbe, 0xa8, 0xc1, 0x91, 0xc6, 0xc8, 0x33, 0xdc, - 0xbf, 0xc8, 0x2d, 0x61, 0x3c, 0x4e, 0xc0, 0x34, 0x54, 0xd4, 0x5b, 0xe7, 0x0c, 0x8f, 0x15, 0xfc, - 0xb6, 0x63, 0x5c, 0xb9, 0x6e, 0xb8, 0xef, 0xf0, 0xfe, 0x6b, 0xbd, 0x92, 0x23, 0x08, 0x81, 0x91, - 0xe7, 0xb8, 0xab, 0x77, 0xd1, 0x44, 0x4e, 0xdb, 0xdb, 0x3b, 0xba, 0x47, 0x2f, 0x5e, 0x51, 0xba, - 0xdd, 0xa3, 0x61, 0xa7, 0xca, 0x1f, 0xd4, 0x63, 0xc3, 0xe3, 0x93, 0xb5, 0x85, 0x4e, 0xd7, 0x16, - 0xfa, 0xb1, 0xb6, 0xd0, 0x72, 0x63, 0xb5, 0x4e, 0x37, 0x56, 0xeb, 0xdb, 0xc6, 0x6a, 0x7d, 0xa4, - 0x31, 0x87, 0xa4, 0x8c, 0xe8, 0x44, 0xa4, 0x7e, 0x2d, 0xfa, 0x68, 0x1e, 0x46, 0xb2, 0x39, 0xf8, - 0x9f, 0x9b, 0x9f, 0x04, 0x16, 0x39, 0x93, 0x51, 0x57, 0x75, 0xfd, 0xf8, 0x57, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x92, 0x53, 0x58, 0x15, 0x43, 0x03, 0x00, 0x00, + // 479 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0x3f, 0x8f, 0xd3, 0x30, + 0x1c, 0xad, 0xb9, 0x52, 0x52, 0xdf, 0x21, 0xc0, 0x3a, 0x8e, 0x50, 0x41, 0x12, 0xc2, 0x12, 0x09, + 0x70, 0xd4, 0x03, 0x09, 0x09, 0x06, 0xa4, 0x02, 0xe2, 0xdf, 0x80, 0x94, 0x32, 0x20, 0x96, 0x2a, + 0x69, 0xdd, 0xc4, 0x52, 0x13, 0x47, 0xf1, 0x2f, 0x27, 0xba, 0xf1, 0x11, 0x3a, 0xf2, 0x91, 0x6e, + 0xbc, 0x91, 0xa9, 0xa0, 0x76, 0x63, 0xbc, 0x4f, 0x80, 0x62, 0x27, 0xa5, 0x70, 0x87, 0xd8, 0x62, + 0xbf, 0xf7, 0x7b, 0xcf, 0xef, 0xe9, 0x17, 0x7c, 0x4b, 0xc8, 0x54, 0x48, 0x2e, 0x7d, 0x96, 0x8b, + 0x71, 0x22, 0xfd, 0x98, 0x65, 0x4c, 0x72, 0x49, 0xf3, 0x42, 0x80, 0x20, 0x07, 0x35, 0x4a, 0x35, + 0x4a, 0x8f, 0xfa, 0x11, 0x83, 0xb0, 0xdf, 0xdb, 0x8f, 0x45, 0x2c, 0x14, 0xc5, 0xaf, 0xbe, 0x34, + 0xbb, 0x67, 0xc5, 0x42, 0xc4, 0x33, 0xe6, 0xab, 0x53, 0x54, 0x4e, 0xfd, 0x49, 0x59, 0x84, 0xc0, + 0x45, 0x56, 0xe3, 0xf6, 0xdf, 0x38, 0xf0, 0x94, 0x49, 0x08, 0xd3, 0x5c, 0x13, 0xdc, 0x45, 0x1b, + 0x77, 0x5f, 0x56, 0x4e, 0x6f, 0xb2, 0xa9, 0x20, 0x16, 0xc6, 0x7c, 0xc2, 0x32, 0xe0, 0x53, 0xce, + 0x0a, 0x13, 0x39, 0xc8, 0xeb, 0x06, 0x5b, 0x37, 0xe4, 0x23, 0xc6, 0x12, 0xc2, 0x02, 0x46, 0x95, + 0x8c, 0x79, 0xc1, 0x41, 0xde, 0xee, 0x61, 0x8f, 0x6a, 0x0f, 0xda, 0x78, 0xd0, 0x0f, 0x8d, 0xc7, + 0xe0, 0xf6, 0xf1, 0xd2, 0x6e, 0x9d, 0x2e, 0xed, 0x6b, 0xf3, 0x30, 0x9d, 0x3d, 0x71, 0x7f, 0xcf, + 0xba, 0x8b, 0xef, 0x36, 0x0a, 0xba, 0xea, 0xa2, 0xa2, 0x93, 0x04, 0x1b, 0xcd, 0xd3, 0xcd, 0x1d, + 0xa5, 0x7b, 0xf3, 0x8c, 0xee, 0x8b, 0x9a, 0x30, 0xe8, 0x57, 0xb2, 0x3f, 0x97, 0x36, 0x69, 0x46, + 0xee, 0x8b, 0x94, 0x03, 0x4b, 0x73, 0x98, 0x9f, 0x2e, 0xed, 0x2b, 0xda, 0xac, 0xc1, 0xdc, 0xaf, + 0x95, 0xd5, 0x46, 0x9d, 0xdc, 0xc5, 0x97, 0xc7, 0x65, 0x51, 0xb0, 0x0c, 0x46, 0xaa, 0x62, 0xb3, + 0xed, 0x20, 0x6f, 0x27, 0xd8, 0xab, 0x2f, 0x55, 0x19, 0xe4, 0x0b, 0xc2, 0xe6, 0x1f, 0xac, 0xd1, + 0x56, 0xee, 0x8b, 0xff, 0xcd, 0x7d, 0xaf, 0xce, 0x6d, 0xeb, 0xa7, 0xfc, 0x4b, 0x49, 0xb7, 0x70, + 0x7d, 0xdb, 0x79, 0xb8, 0x69, 0xe4, 0x11, 0x3e, 0xd0, 0xfc, 0xb1, 0x28, 0x33, 0xe0, 0x59, 0xac, + 0x07, 0xd9, 0xc4, 0xec, 0x38, 0xc8, 0x33, 0x82, 0x7d, 0x85, 0x3e, 0xaf, 0xc1, 0xa1, 0xc6, 0xc8, + 0x53, 0xdc, 0x3b, 0xcf, 0x2d, 0x61, 0x3c, 0x4e, 0xc0, 0x34, 0x54, 0xd4, 0x1b, 0x67, 0x0c, 0x5f, + 0x2b, 0xf8, 0x6d, 0xdb, 0xb8, 0x74, 0xd5, 0x70, 0xdf, 0xe3, 0xbd, 0x57, 0x7a, 0x25, 0x87, 0x10, + 0x02, 0x23, 0xcf, 0x70, 0x47, 0xef, 0xa2, 0x89, 0x9c, 0x1d, 0x6f, 0xf7, 0xf0, 0x0e, 0x3d, 0x7f, + 0x45, 0xe9, 0x66, 0x8f, 0x06, 0xed, 0x2a, 0x7f, 0x50, 0x8f, 0x0d, 0xde, 0x1d, 0xaf, 0x2c, 0x74, + 0xb2, 0xb2, 0xd0, 0x8f, 0x95, 0x85, 0x16, 0x6b, 0xab, 0x75, 0xb2, 0xb6, 0x5a, 0xdf, 0xd6, 0x56, + 0xeb, 0x53, 0x3f, 0xe6, 0x90, 0x94, 0x11, 0x1d, 0x8b, 0xd4, 0xaf, 0x45, 0x1f, 0xcc, 0xc2, 0x48, + 0x36, 0x07, 0xff, 0xe8, 0xb1, 0xff, 0xb9, 0xf9, 0x4f, 0x60, 0x9e, 0x33, 0x19, 0x75, 0x54, 0xdd, + 0x0f, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x35, 0x0e, 0x9c, 0x46, 0x03, 0x00, 0x00, } func (m *EpochInfo) Marshal() (dAtA []byte, err error) { diff --git a/x/epochs/types/query.pb.go b/x/epochs/types/query.pb.go index 5f281a1a6a8..c02a5e48ff6 100644 --- a/x/epochs/types/query.pb.go +++ b/x/epochs/types/query.pb.go @@ -208,33 +208,33 @@ func init() { func init() { proto.RegisterFile("osmosis/epochs/query.proto", fileDescriptor_574bd176519c765f) } var fileDescriptor_574bd176519c765f = []byte{ - // 405 bytes of a gzipped FileDescriptorProto + // 410 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0xcf, 0x6e, 0xd3, 0x30, 0x18, 0x8f, 0x5b, 0xa8, 0x84, 0x29, 0x17, 0x0b, 0x95, 0x10, 0x21, 0x53, 0x82, 0x80, 0x0a, 0xa9, - 0x36, 0x2d, 0x37, 0x2e, 0xa0, 0x22, 0x24, 0x38, 0x92, 0x63, 0x2f, 0x28, 0x09, 0x6e, 0x6a, 0xa9, - 0xb5, 0xd3, 0xd8, 0x41, 0xf4, 0xba, 0x27, 0x98, 0x34, 0xed, 0x05, 0xf6, 0x2c, 0x3b, 0xf4, 0x58, - 0x69, 0x97, 0x9d, 0xa6, 0xa9, 0xdd, 0x83, 0x4c, 0x71, 0x92, 0xaa, 0xeb, 0xd2, 0x69, 0xbb, 0x25, - 0xfe, 0xfd, 0xfd, 0x3e, 0x1b, 0x3a, 0x52, 0x4d, 0xa5, 0xe2, 0x8a, 0xb2, 0x58, 0x86, 0x63, 0x45, - 0x67, 0x29, 0x4b, 0xe6, 0x24, 0x4e, 0xa4, 0x96, 0xa8, 0x55, 0x60, 0x24, 0xc7, 0xc8, 0xbf, 0x5e, - 0xc0, 0xb4, 0xdf, 0x73, 0x9e, 0x47, 0x32, 0x92, 0x86, 0x42, 0xb3, 0xaf, 0x9c, 0xed, 0xbc, 0x8a, - 0xa4, 0x8c, 0x26, 0x8c, 0xfa, 0x31, 0xa7, 0xbe, 0x10, 0x52, 0xfb, 0x9a, 0x4b, 0xa1, 0x0a, 0xf4, - 0x63, 0x68, 0xcc, 0x68, 0xe0, 0x2b, 0x96, 0x87, 0xd0, 0xc2, 0x8e, 0xc6, 0x7e, 0xc4, 0x85, 0x21, - 0x97, 0x4e, 0x3b, 0x9d, 0x22, 0x26, 0x58, 0x56, 0xc3, 0xa0, 0xae, 0x0d, 0x5b, 0xbf, 0x33, 0xfd, - 0x0f, 0x03, 0xfe, 0x12, 0x23, 0xe9, 0xb1, 0x59, 0xca, 0x94, 0x76, 0x87, 0xf0, 0xc5, 0x2d, 0x44, - 0xc5, 0x52, 0x28, 0x86, 0xbe, 0xc2, 0x46, 0x6e, 0x66, 0x83, 0x76, 0xbd, 0xf3, 0xb4, 0xff, 0x86, - 0x54, 0xcf, 0x46, 0x8c, 0x36, 0x93, 0x0e, 0x1e, 0x2d, 0x2e, 0x5e, 0x5b, 0x5e, 0x21, 0x73, 0xbf, - 0x40, 0xdb, 0x78, 0x7f, 0x4f, 0x93, 0x84, 0x09, 0x6d, 0x68, 0x45, 0x2e, 0xc2, 0x10, 0xf2, 0xbf, - 0x4c, 0x68, 0x3e, 0xe2, 0x2c, 0xb1, 0x41, 0x1b, 0x74, 0x9e, 0x78, 0x5b, 0x27, 0xee, 0x37, 0xf8, - 0xb2, 0x42, 0x5b, 0x34, 0x7b, 0x0b, 0x9f, 0x85, 0xf9, 0xf9, 0x1f, 0x13, 0x65, 0xf4, 0x75, 0xaf, - 0x19, 0x6e, 0x91, 0xfb, 0xa7, 0x35, 0xf8, 0xd8, 0x58, 0xa0, 0x63, 0x00, 0xe1, 0xa6, 0xa3, 0x42, - 0x64, 0xdf, 0x1c, 0xd5, 0x2b, 0x72, 0xe8, 0xbd, 0xf9, 0x79, 0x3d, 0xf7, 0xfd, 0xc1, 0xd9, 0xd5, - 0x51, 0xad, 0x8d, 0x30, 0xdd, 0xb9, 0x94, 0xf2, 0xf6, 0xf2, 0x5f, 0x74, 0x02, 0x60, 0x73, 0x7b, - 0x3e, 0xf4, 0xe9, 0xce, 0xa4, 0x8a, 0x35, 0x3a, 0xbd, 0x07, 0x28, 0x8a, 0x76, 0x5d, 0xd3, 0xee, - 0x03, 0x7a, 0xb7, 0xaf, 0xdd, 0x8d, 0xd5, 0x0e, 0x7e, 0x2e, 0x56, 0x18, 0x2c, 0x57, 0x18, 0x5c, - 0xae, 0x30, 0x38, 0x5c, 0x63, 0x6b, 0xb9, 0xc6, 0xd6, 0xf9, 0x1a, 0x5b, 0x43, 0x12, 0x71, 0x3d, - 0x4e, 0x03, 0x12, 0xca, 0x69, 0x69, 0xd5, 0x9d, 0xf8, 0x81, 0xda, 0xf8, 0xfe, 0x2f, 0x9d, 0xf5, - 0x3c, 0x66, 0x2a, 0x68, 0x98, 0xb7, 0xf8, 0xf9, 0x3a, 0x00, 0x00, 0xff, 0xff, 0xc4, 0x77, 0x87, - 0x07, 0x3f, 0x03, 0x00, 0x00, + 0x31, 0x29, 0x07, 0x24, 0x2e, 0xa0, 0x22, 0x0e, 0x88, 0x13, 0x39, 0xf6, 0x82, 0x92, 0xe0, 0xa6, + 0x96, 0x5a, 0x3b, 0x8d, 0x9d, 0x8a, 0x5e, 0xf7, 0x04, 0x93, 0xa6, 0xbd, 0xc0, 0x9e, 0x65, 0x87, + 0x1e, 0x2b, 0xed, 0xb2, 0xd3, 0x34, 0xb5, 0x7b, 0x90, 0x29, 0x4e, 0x52, 0x75, 0x5d, 0x3a, 0x6d, + 0xb7, 0xc4, 0xbf, 0xbf, 0xdf, 0x67, 0x43, 0x4b, 0xc8, 0x89, 0x90, 0x4c, 0x12, 0x1a, 0x8b, 0x70, + 0x24, 0xc9, 0x34, 0xa5, 0xc9, 0xdc, 0x89, 0x13, 0xa1, 0x04, 0x6a, 0x15, 0x98, 0x93, 0x63, 0xce, + 0xcc, 0x0d, 0xa8, 0xf2, 0x5d, 0xeb, 0x79, 0x24, 0x22, 0xa1, 0x29, 0x24, 0xfb, 0xca, 0xd9, 0xd6, + 0xab, 0x48, 0x88, 0x68, 0x4c, 0x89, 0x1f, 0x33, 0xe2, 0x73, 0x2e, 0x94, 0xaf, 0x98, 0xe0, 0xb2, + 0x40, 0x3f, 0x86, 0xda, 0x8c, 0x04, 0xbe, 0xa4, 0x79, 0x08, 0x29, 0xec, 0x48, 0xec, 0x47, 0x8c, + 0x6b, 0x72, 0xe9, 0xb4, 0xd3, 0x29, 0xa2, 0x9c, 0x66, 0x35, 0x34, 0x6a, 0x9b, 0xb0, 0xf5, 0x27, + 0xd3, 0xff, 0xd4, 0xe0, 0x2f, 0x3e, 0x14, 0x1e, 0x9d, 0xa6, 0x54, 0x2a, 0x7b, 0x00, 0x5f, 0xdc, + 0x42, 0x64, 0x2c, 0xb8, 0xa4, 0xe8, 0x1b, 0x6c, 0xe4, 0x66, 0x26, 0x68, 0xd7, 0x3b, 0x4f, 0x7b, + 0x6f, 0x9c, 0xea, 0xd9, 0x1c, 0xad, 0xcd, 0xa4, 0xfd, 0x47, 0x8b, 0x8b, 0xd7, 0x86, 0x57, 0xc8, + 0xec, 0xaf, 0xd0, 0xd4, 0xde, 0x3f, 0xd2, 0x24, 0xa1, 0x5c, 0x69, 0x5a, 0x91, 0x8b, 0x30, 0x84, + 0xec, 0x1f, 0xe5, 0x8a, 0x0d, 0x19, 0x4d, 0x4c, 0xd0, 0x06, 0x9d, 0x27, 0xde, 0xd6, 0x89, 0xfd, + 0x1d, 0xbe, 0xac, 0xd0, 0x16, 0xcd, 0xde, 0xc2, 0x67, 0x61, 0x7e, 0xfe, 0x57, 0x47, 0x69, 0x7d, + 0xdd, 0x6b, 0x86, 0x5b, 0xe4, 0xde, 0x69, 0x0d, 0x3e, 0xd6, 0x16, 0xe8, 0x18, 0x40, 0xb8, 0xe9, + 0x28, 0x91, 0xb3, 0x6f, 0x8e, 0xea, 0x15, 0x59, 0xe4, 0xde, 0xfc, 0xbc, 0x9e, 0xfd, 0xfe, 0xe0, + 0xec, 0xea, 0xa8, 0xd6, 0x46, 0x98, 0xec, 0x5c, 0x4a, 0x79, 0x7b, 0xf9, 0x2f, 0x3a, 0x01, 0xb0, + 0xb9, 0x3d, 0x1f, 0xfa, 0x74, 0x67, 0x52, 0xc5, 0x1a, 0x2d, 0xf7, 0x01, 0x8a, 0xa2, 0x5d, 0x57, + 0xb7, 0xfb, 0x80, 0xde, 0xed, 0x6b, 0x77, 0x63, 0xb5, 0xfd, 0xdf, 0x8b, 0x15, 0x06, 0xcb, 0x15, + 0x06, 0x97, 0x2b, 0x0c, 0x0e, 0xd7, 0xd8, 0x58, 0xae, 0xb1, 0x71, 0xbe, 0xc6, 0xc6, 0xc0, 0x8d, + 0x98, 0x1a, 0xa5, 0x81, 0x13, 0x8a, 0x49, 0x69, 0xd5, 0x1d, 0xfb, 0x81, 0xdc, 0xf8, 0xce, 0xbe, + 0x90, 0xff, 0xa5, 0xb9, 0x9a, 0xc7, 0x54, 0x06, 0x0d, 0xfd, 0x1c, 0x3f, 0x5f, 0x07, 0x00, 0x00, + 0xff, 0xff, 0x37, 0x49, 0xbb, 0x13, 0x42, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gamm/client/cli/cli_test.go b/x/gamm/client/cli/cli_test.go index 5e62a1cf1b0..6aafa9de45f 100644 --- a/x/gamm/client/cli/cli_test.go +++ b/x/gamm/client/cli/cli_test.go @@ -15,12 +15,12 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" banktestutil "github.com/cosmos/cosmos-sdk/x/bank/client/testutil" - "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/x/gamm/client/cli" - gammtestutil "github.com/osmosis-labs/osmosis/x/gamm/client/testutil" - "github.com/osmosis-labs/osmosis/x/gamm/types" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/osmoutils" + "github.com/osmosis-labs/osmosis/v7/x/gamm/client/cli" + gammtestutil "github.com/osmosis-labs/osmosis/v7/x/gamm/client/testutil" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" tmcli "github.com/tendermint/tendermint/libs/cli" ) diff --git a/x/gamm/client/cli/query.go b/x/gamm/client/cli/query.go index ac9e56b4db5..035e85518d6 100644 --- a/x/gamm/client/cli/query.go +++ b/x/gamm/client/cli/query.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" "github.com/spf13/cobra" "gopkg.in/yaml.v2" ) diff --git a/x/gamm/client/cli/tx.go b/x/gamm/client/cli/tx.go index 997113e9248..e93de638e00 100644 --- a/x/gamm/client/cli/tx.go +++ b/x/gamm/client/cli/tx.go @@ -15,8 +15,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func NewTxCmd() *cobra.Command { diff --git a/x/gamm/client/testutil/test_helpers.go b/x/gamm/client/testutil/test_helpers.go index a11828acca3..4fc6cde9fd7 100644 --- a/x/gamm/client/testutil/test_helpers.go +++ b/x/gamm/client/testutil/test_helpers.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/testutil" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" sdk "github.com/cosmos/cosmos-sdk/types" - gammcli "github.com/osmosis-labs/osmosis/x/gamm/client/cli" + gammcli "github.com/osmosis-labs/osmosis/v7/x/gamm/client/cli" ) // commonArgs is args for CLI test commands diff --git a/x/gamm/genesis.go b/x/gamm/genesis.go index b397741b767..368b5035015 100644 --- a/x/gamm/genesis.go +++ b/x/gamm/genesis.go @@ -3,8 +3,8 @@ package gamm import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/gamm/genesis_test.go b/x/gamm/genesis_test.go index b95040acf1c..fe8c97949ff 100644 --- a/x/gamm/genesis_test.go +++ b/x/gamm/genesis_test.go @@ -6,11 +6,11 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - osmoapp "github.com/osmosis-labs/osmosis/app" - appparams "github.com/osmosis-labs/osmosis/app/params" - "github.com/osmosis-labs/osmosis/x/gamm" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/x/gamm/types" + osmoapp "github.com/osmosis-labs/osmosis/v7/app" + appparams "github.com/osmosis-labs/osmosis/v7/app/params" + "github.com/osmosis-labs/osmosis/v7/x/gamm" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/crypto/ed25519" diff --git a/x/gamm/handler.go b/x/gamm/handler.go index 71de5a07ef8..d21973598dd 100644 --- a/x/gamm/handler.go +++ b/x/gamm/handler.go @@ -3,9 +3,9 @@ package gamm import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) // NewHandler returns a handler for "gamm" type messages. diff --git a/x/gamm/keeper/gas_test.go b/x/gamm/keeper/gas_test.go index 539cc589f46..9031313f3c4 100644 --- a/x/gamm/keeper/gas_test.go +++ b/x/gamm/keeper/gas_test.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - balanacertypes "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/x/gamm/types" + balanacertypes "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) var ( diff --git a/x/gamm/keeper/grpc_query.go b/x/gamm/keeper/grpc_query.go index 7d185212d76..0d75762a9b5 100644 --- a/x/gamm/keeper/grpc_query.go +++ b/x/gamm/keeper/grpc_query.go @@ -16,8 +16,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) var ( diff --git a/x/gamm/keeper/grpc_query_test.go b/x/gamm/keeper/grpc_query_test.go index a84b53fa84a..7cde3fa0741 100644 --- a/x/gamm/keeper/grpc_query_test.go +++ b/x/gamm/keeper/grpc_query_test.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func (suite *KeeperTestSuite) TestQueryPool() { diff --git a/x/gamm/keeper/invariants.go b/x/gamm/keeper/invariants.go index 2d37f5fbfe5..0e8609602b8 100644 --- a/x/gamm/keeper/invariants.go +++ b/x/gamm/keeper/invariants.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/osmomath" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) const poolBalanceInvariantName = "pool-account-balance-equals-expected" diff --git a/x/gamm/keeper/keeper.go b/x/gamm/keeper/keeper.go index 2ac0904fced..e02b39cf5e1 100644 --- a/x/gamm/keeper/keeper.go +++ b/x/gamm/keeper/keeper.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func permContains(perms []string, perm string) bool { diff --git a/x/gamm/keeper/keeper_test.go b/x/gamm/keeper/keeper_test.go index 738c006d53f..22d7a8a93ef 100644 --- a/x/gamm/keeper/keeper_test.go +++ b/x/gamm/keeper/keeper_test.go @@ -12,10 +12,10 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/app" + "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) type KeeperTestSuite struct { diff --git a/x/gamm/keeper/legacy.go b/x/gamm/keeper/legacy.go index b78241ffe67..381aca3904d 100644 --- a/x/gamm/keeper/legacy.go +++ b/x/gamm/keeper/legacy.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func (k Keeper) SetLegacyTotalLiquidity(ctx sdk.Context, coins sdk.Coins) { diff --git a/x/gamm/keeper/marshal_bench_test.go b/x/gamm/keeper/marshal_bench_test.go index 868ff93d9b1..ac7d4dd78ec 100644 --- a/x/gamm/keeper/marshal_bench_test.go +++ b/x/gamm/keeper/marshal_bench_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func genPoolAssets(r *rand.Rand) []gammtypes.PoolAsset { diff --git a/x/gamm/keeper/math.go b/x/gamm/keeper/math.go index 49fc880a16d..7d3bf67d45d 100644 --- a/x/gamm/keeper/math.go +++ b/x/gamm/keeper/math.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/osmomath" + "github.com/osmosis-labs/osmosis/v7/osmomath" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/gamm/keeper/msg_server.go b/x/gamm/keeper/msg_server.go index 73648241ca3..b50b00ab383 100644 --- a/x/gamm/keeper/msg_server.go +++ b/x/gamm/keeper/msg_server.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) type msgServer struct { diff --git a/x/gamm/keeper/multihop.go b/x/gamm/keeper/multihop.go index 8f4bd0c5aee..27a39686ccc 100644 --- a/x/gamm/keeper/multihop.go +++ b/x/gamm/keeper/multihop.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) // MultihopSwapExactAmountIn defines the input denom and input amount for the first pool, diff --git a/x/gamm/keeper/multihop_test.go b/x/gamm/keeper/multihop_test.go index 01ef6564b68..deec2e1bde3 100644 --- a/x/gamm/keeper/multihop_test.go +++ b/x/gamm/keeper/multihop_test.go @@ -3,7 +3,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func (suite *KeeperTestSuite) TestBalancerPoolSimpleMultihopSwapExactAmountIn() { diff --git a/x/gamm/keeper/params.go b/x/gamm/keeper/params.go index 0c633bbc056..f2ff63b3d9c 100644 --- a/x/gamm/keeper/params.go +++ b/x/gamm/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) // GetParams returns the total set params diff --git a/x/gamm/keeper/pool.go b/x/gamm/keeper/pool.go index 11ae0f78d9f..7356e28debe 100644 --- a/x/gamm/keeper/pool.go +++ b/x/gamm/keeper/pool.go @@ -9,8 +9,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func (k Keeper) MarshalPool(pool types.PoolI) ([]byte, error) { diff --git a/x/gamm/keeper/pool_service.go b/x/gamm/keeper/pool_service.go index ea7f787bdf5..4015fca3579 100644 --- a/x/gamm/keeper/pool_service.go +++ b/x/gamm/keeper/pool_service.go @@ -8,8 +8,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func (k Keeper) CreateBalancerPool( diff --git a/x/gamm/keeper/pool_service_test.go b/x/gamm/keeper/pool_service_test.go index 30398963819..b4c4e90a3a1 100644 --- a/x/gamm/keeper/pool_service_test.go +++ b/x/gamm/keeper/pool_service_test.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) var ( diff --git a/x/gamm/keeper/pool_test.go b/x/gamm/keeper/pool_test.go index 28aa04e4737..d4e91f51d91 100644 --- a/x/gamm/keeper/pool_test.go +++ b/x/gamm/keeper/pool_test.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func (suite *KeeperTestSuite) TestCleanupPool() { diff --git a/x/gamm/keeper/share.go b/x/gamm/keeper/share.go index 887ef68248d..1719ea34b39 100644 --- a/x/gamm/keeper/share.go +++ b/x/gamm/keeper/share.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func (k Keeper) MintPoolShareToAccount(ctx sdk.Context, pool types.PoolI, addr sdk.AccAddress, amount sdk.Int) error { diff --git a/x/gamm/keeper/swap.go b/x/gamm/keeper/swap.go index 164a9139e58..98cab827358 100644 --- a/x/gamm/keeper/swap.go +++ b/x/gamm/keeper/swap.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func (k Keeper) SwapExactAmountIn( diff --git a/x/gamm/keeper/swap_test.go b/x/gamm/keeper/swap_test.go index fd984cd7342..d7c14d2cf2e 100644 --- a/x/gamm/keeper/swap_test.go +++ b/x/gamm/keeper/swap_test.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" ) func (suite *KeeperTestSuite) TestBalancerPoolSimpleSwapExactAmountIn() { diff --git a/x/gamm/module.go b/x/gamm/module.go index bbb9d2dc0f3..741c8e70cd5 100644 --- a/x/gamm/module.go +++ b/x/gamm/module.go @@ -18,12 +18,12 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/osmosis-labs/osmosis/x/gamm/client/cli" - "github.com/osmosis-labs/osmosis/x/gamm/client/rest" - "github.com/osmosis-labs/osmosis/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/x/gamm/simulation" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/gamm/client/rest" + "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v7/x/gamm/simulation" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) var ( diff --git a/x/gamm/pool-models/balancer/balancerPool.pb.go b/x/gamm/pool-models/balancer/balancerPool.pb.go index 78053a8bf41..f7c15d5a428 100644 --- a/x/gamm/pool-models/balancer/balancerPool.pb.go +++ b/x/gamm/pool-models/balancer/balancerPool.pb.go @@ -11,7 +11,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - types "github.com/osmosis-labs/osmosis/x/gamm/types" + types "github.com/osmosis-labs/osmosis/v7/x/gamm/types" _ "github.com/regen-network/cosmos-proto" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" @@ -241,56 +241,56 @@ func init() { } var fileDescriptor_7e991f749f68c2a4 = []byte{ - // 779 bytes of a gzipped FileDescriptorProto + // 783 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0xcb, 0x4e, 0xdb, 0x4a, 0x18, 0xc7, 0xe3, 0x24, 0xc0, 0x61, 0x38, 0xe2, 0x88, 0x39, 0x48, 0x35, 0x41, 0x8d, 0x91, 0x2b, - 0x55, 0xa8, 0x25, 0xb6, 0x42, 0xbb, 0xa2, 0x2b, 0x0c, 0x6d, 0xc5, 0x8e, 0x9a, 0x56, 0x45, 0x65, - 0x61, 0x4d, 0x92, 0xc1, 0x19, 0xd5, 0xce, 0xb8, 0x9e, 0x09, 0x97, 0x37, 0xe8, 0x92, 0x25, 0xdd, - 0xf1, 0x10, 0x7d, 0x84, 0x4a, 0x65, 0x89, 0xba, 0xaa, 0xba, 0x70, 0x2b, 0xd8, 0xb1, 0xcc, 0x13, - 0x54, 0x73, 0x71, 0x08, 0x81, 0x48, 0x54, 0x5d, 0xc5, 0x33, 0xf3, 0x7d, 0xbf, 0xff, 0x77, 0x9b, - 0x09, 0x78, 0x4a, 0x59, 0x4c, 0x19, 0x61, 0x6e, 0x88, 0xe2, 0xd8, 0x4d, 0x28, 0x8d, 0x6a, 0x31, - 0x6d, 0xe1, 0x88, 0xb9, 0x0d, 0x14, 0xa1, 0x4e, 0x13, 0xa7, 0xfd, 0x8f, 0x4d, 0x4a, 0x23, 0x27, - 0x49, 0x29, 0xa7, 0xf0, 0x9e, 0xf6, 0x72, 0x84, 0x97, 0x23, 0xbc, 0x94, 0x53, 0x65, 0xae, 0x29, - 0x4f, 0x02, 0x69, 0xe6, 0xaa, 0x85, 0xf2, 0xa9, 0xcc, 0x86, 0x34, 0xa4, 0x6a, 0x5f, 0x7c, 0xe9, - 0xdd, 0x6a, 0x48, 0x69, 0x18, 0x61, 0x57, 0xae, 0x1a, 0xdd, 0x5d, 0xb7, 0xd5, 0x4d, 0x11, 0x27, - 0xb4, 0xa3, 0xcf, 0xad, 0xe1, 0x73, 0x4e, 0x62, 0xcc, 0x38, 0x8a, 0x93, 0x1c, 0xa0, 0x44, 0x5c, - 0xd4, 0xe5, 0x6d, 0x77, 0xaf, 0xde, 0xc0, 0x1c, 0xd5, 0xe5, 0x62, 0xe8, 0xbc, 0x81, 0x18, 0xee, - 0x9f, 0x37, 0x29, 0xe9, 0x0b, 0x5c, 0x2b, 0x40, 0x6e, 0x90, 0xf4, 0x73, 0xb5, 0xbf, 0x96, 0x80, - 0xb9, 0x15, 0x53, 0xca, 0xdb, 0x6f, 0x31, 0x09, 0xdb, 0x7c, 0xad, 0x8d, 0x3a, 0x21, 0xde, 0x44, - 0x29, 0x8a, 0x19, 0xdc, 0x06, 0x80, 0x71, 0x94, 0xf2, 0x40, 0x84, 0x65, 0x1a, 0x0b, 0xc6, 0xe2, - 0xd4, 0x72, 0xc5, 0x51, 0x31, 0x3b, 0x79, 0xcc, 0xce, 0xeb, 0x3c, 0x66, 0xef, 0xfe, 0x69, 0x66, - 0x15, 0x7a, 0x99, 0x35, 0x73, 0x88, 0xe2, 0x68, 0xc5, 0xbe, 0xf2, 0xb5, 0x8f, 0x7e, 0x5a, 0x86, - 0x3f, 0x29, 0x37, 0x84, 0x39, 0x6c, 0x83, 0x7f, 0xf2, 0x52, 0x98, 0x45, 0xc9, 0x9d, 0xbb, 0xc1, - 0x5d, 0xd7, 0x06, 0x5e, 0x5d, 0x60, 0x2f, 0x33, 0x0b, 0xe6, 0x2e, 0x4b, 0x34, 0x26, 0x1c, 0xc7, - 0x09, 0x3f, 0xec, 0x65, 0xd6, 0x7f, 0x4a, 0x2c, 0x3f, 0xb3, 0x8f, 0x85, 0x54, 0x9f, 0x0e, 0x39, - 0x80, 0xa4, 0x43, 0x38, 0x41, 0x91, 0xe8, 0xb0, 0x4a, 0x92, 0x99, 0xa5, 0x85, 0xd2, 0xe2, 0xd4, - 0xb2, 0xe5, 0x5c, 0xeb, 0xb4, 0x2e, 0x8f, 0x23, 0x0c, 0x57, 0x19, 0xc3, 0xdc, 0x7b, 0xa0, 0x13, - 0x9a, 0x57, 0x1a, 0x1a, 0x14, 0x88, 0xfa, 0x05, 0xfb, 0x0a, 0x65, 0xfb, 0xb7, 0xf0, 0xe1, 0x07, - 0x30, 0xc3, 0x51, 0x1a, 0x62, 0x3e, 0x28, 0x5a, 0xbe, 0x9b, 0xa8, 0xad, 0x45, 0x2b, 0x4a, 0x54, - 0x71, 0x86, 0x34, 0x6f, 0xd2, 0xed, 0xcb, 0x22, 0x80, 0xde, 0xc0, 0x30, 0xeb, 0x1e, 0xee, 0x80, - 0x09, 0xb6, 0x8f, 0x92, 0x17, 0x58, 0x35, 0x70, 0xd2, 0x5b, 0x15, 0xf8, 0x1f, 0x99, 0xf5, 0x30, - 0x24, 0xbc, 0xdd, 0x6d, 0x38, 0x4d, 0x1a, 0xeb, 0x51, 0xd6, 0x3f, 0x35, 0xd6, 0x7a, 0xef, 0xf2, - 0xc3, 0x04, 0x33, 0x67, 0x1d, 0x37, 0xaf, 0x2a, 0x2c, 0x30, 0xc1, 0x2e, 0xc6, 0xb6, 0x9f, 0x13, - 0x05, 0x1c, 0x1f, 0x10, 0x2e, 0xe0, 0xc5, 0xbf, 0x83, 0x0b, 0x8c, 0x86, 0x6b, 0x22, 0xfc, 0x64, - 0x00, 0x93, 0x8d, 0x18, 0x4d, 0xb3, 0x24, 0x87, 0xa6, 0xee, 0x8c, 0xb8, 0xaa, 0xce, 0xa8, 0x99, - 0xf6, 0x1e, 0x9d, 0x66, 0x96, 0xd1, 0xcb, 0x2c, 0x5b, 0x27, 0x25, 0xed, 0x74, 0x61, 0x83, 0xa6, - 0xb4, 0x0c, 0x12, 0x69, 0x6a, 0xfb, 0x23, 0xe5, 0xed, 0x2f, 0x65, 0xf0, 0xef, 0x60, 0xb1, 0xe1, - 0x12, 0x98, 0x40, 0xad, 0x56, 0x8a, 0x19, 0xd3, 0x65, 0x86, 0xbd, 0xcc, 0x9a, 0x56, 0x1a, 0xfa, - 0xc0, 0xf6, 0x73, 0x13, 0x38, 0x0d, 0x8a, 0xa4, 0x25, 0x4b, 0x56, 0xf6, 0x8b, 0xa4, 0x05, 0x13, - 0x00, 0x92, 0x7e, 0xcb, 0x74, 0x6e, 0x8f, 0x47, 0xe6, 0x76, 0xb3, 0xcb, 0xc3, 0x83, 0x9a, 0x3f, - 0x6a, 0x6a, 0x6a, 0xf2, 0x74, 0x06, 0x34, 0xe0, 0x2b, 0x30, 0xbb, 0xdb, 0xe5, 0xdd, 0x14, 0x2b, - 0x93, 0x90, 0xee, 0xe1, 0xb4, 0x43, 0x53, 0xb3, 0x2c, 0x83, 0xb7, 0xae, 0x50, 0xb7, 0x59, 0xd9, - 0x3e, 0x54, 0xdb, 0x22, 0x82, 0x97, 0x7a, 0x13, 0x6e, 0x83, 0x29, 0x4e, 0x39, 0x8a, 0xb6, 0xda, - 0x28, 0xc5, 0xcc, 0x1c, 0xd3, 0xd7, 0x5a, 0x3f, 0x93, 0xe2, 0x85, 0xea, 0x0f, 0xfb, 0x1a, 0x25, - 0x1d, 0x6f, 0x5e, 0xc7, 0xfc, 0xbf, 0x9e, 0x73, 0xe1, 0x1b, 0x30, 0xe9, 0x6c, 0xfb, 0x83, 0x28, - 0xb8, 0xa3, 0xca, 0x23, 0xaf, 0x07, 0x33, 0xc7, 0xef, 0x76, 0x8d, 0x2a, 0x1a, 0x0f, 0x15, 0x5e, - 0x26, 0x80, 0x24, 0x41, 0x57, 0x42, 0xe1, 0x60, 0xa8, 0xc3, 0x56, 0x5d, 0x36, 0x27, 0x64, 0x01, - 0x9e, 0xff, 0xc1, 0x1c, 0x6f, 0x74, 0xf8, 0x70, 0x16, 0x6a, 0x9c, 0xf2, 0x2c, 0x14, 0x79, 0x65, - 0xe6, 0xe3, 0x89, 0x55, 0x38, 0x3e, 0xb1, 0x0a, 0xdf, 0x3e, 0xd7, 0xc6, 0x44, 0x9c, 0x1b, 0xde, - 0x9b, 0xd3, 0xf3, 0xaa, 0x71, 0x76, 0x5e, 0x35, 0x7e, 0x9d, 0x57, 0x8d, 0xa3, 0x8b, 0x6a, 0xe1, - 0xec, 0xa2, 0x5a, 0xf8, 0x7e, 0x51, 0x2d, 0xbc, 0x7b, 0x36, 0x20, 0xac, 0x13, 0xad, 0x45, 0xa8, - 0xc1, 0xf2, 0x85, 0x7b, 0x30, 0xfa, 0x3f, 0xad, 0x31, 0x2e, 0xdf, 0xd0, 0x27, 0xbf, 0x03, 0x00, - 0x00, 0xff, 0xff, 0xf1, 0x11, 0x2d, 0xeb, 0xff, 0x06, 0x00, 0x00, + 0x55, 0xa8, 0x25, 0xb6, 0x42, 0x2b, 0x55, 0x62, 0x51, 0x09, 0x43, 0x5b, 0xb1, 0xa3, 0xa6, 0x52, + 0x51, 0x59, 0x58, 0x93, 0x64, 0x70, 0x46, 0xb5, 0x33, 0xae, 0x67, 0xc2, 0xe5, 0x0d, 0xba, 0x64, + 0x49, 0x77, 0x3c, 0x44, 0x1f, 0xa1, 0x52, 0x59, 0xa2, 0xae, 0xaa, 0x2e, 0xdc, 0x0a, 0x76, 0x2c, + 0xf3, 0x04, 0xd5, 0x5c, 0x1c, 0x42, 0x20, 0x12, 0x55, 0x57, 0xf1, 0xcc, 0x7c, 0xdf, 0xef, 0xff, + 0xdd, 0x66, 0x02, 0x9e, 0x52, 0x16, 0x53, 0x46, 0x98, 0x1b, 0xa2, 0x38, 0x76, 0x13, 0x4a, 0xa3, + 0x5a, 0x4c, 0x5b, 0x38, 0x62, 0x6e, 0x03, 0x45, 0xa8, 0xd3, 0xc4, 0x69, 0xff, 0x63, 0x93, 0xd2, + 0xc8, 0x49, 0x52, 0xca, 0x29, 0xbc, 0xa7, 0xbd, 0x1c, 0xe1, 0xe5, 0x08, 0x2f, 0xe5, 0x54, 0x99, + 0x6b, 0xca, 0x93, 0x40, 0x9a, 0xb9, 0x6a, 0xa1, 0x7c, 0x2a, 0xb3, 0x21, 0x0d, 0xa9, 0xda, 0x17, + 0x5f, 0x7a, 0xb7, 0x1a, 0x52, 0x1a, 0x46, 0xd8, 0x95, 0xab, 0x46, 0x77, 0xd7, 0x6d, 0x75, 0x53, + 0xc4, 0x09, 0xed, 0xe8, 0x73, 0x6b, 0xf8, 0x9c, 0x93, 0x18, 0x33, 0x8e, 0xe2, 0x24, 0x07, 0x28, + 0x11, 0x17, 0x75, 0x79, 0xdb, 0xdd, 0xab, 0x37, 0x30, 0x47, 0x75, 0xb9, 0x18, 0x3a, 0x6f, 0x20, + 0x86, 0xfb, 0xe7, 0x4d, 0x4a, 0xfa, 0x02, 0xd7, 0x0a, 0x90, 0x1b, 0x24, 0xfd, 0x5c, 0xed, 0xaf, + 0x25, 0x60, 0x6e, 0xc5, 0x94, 0xf2, 0xf6, 0x5b, 0x4c, 0xc2, 0x36, 0x5f, 0x6b, 0xa3, 0x4e, 0x88, + 0x37, 0x51, 0x8a, 0x62, 0x06, 0xb7, 0x01, 0x60, 0x1c, 0xa5, 0x3c, 0x10, 0x61, 0x99, 0xc6, 0x82, + 0xb1, 0x38, 0xb5, 0x5c, 0x71, 0x54, 0xcc, 0x4e, 0x1e, 0xb3, 0xf3, 0x26, 0x8f, 0xd9, 0xbb, 0x7f, + 0x9a, 0x59, 0x85, 0x5e, 0x66, 0xcd, 0x1c, 0xa2, 0x38, 0x5a, 0xb1, 0xaf, 0x7c, 0xed, 0xa3, 0x9f, + 0x96, 0xe1, 0x4f, 0xca, 0x0d, 0x61, 0x0e, 0xdb, 0xe0, 0x9f, 0xbc, 0x14, 0x66, 0x51, 0x72, 0xe7, + 0x6e, 0x70, 0xd7, 0xb5, 0x81, 0x57, 0x17, 0xd8, 0xcb, 0xcc, 0x82, 0xb9, 0xcb, 0x12, 0x8d, 0x09, + 0xc7, 0x71, 0xc2, 0x0f, 0x7b, 0x99, 0xf5, 0x9f, 0x12, 0xcb, 0xcf, 0xec, 0x63, 0x21, 0xd5, 0xa7, + 0x43, 0x0e, 0x20, 0xe9, 0x10, 0x4e, 0x50, 0x24, 0x3a, 0xac, 0x92, 0x64, 0x66, 0x69, 0xa1, 0xb4, + 0x38, 0xb5, 0x6c, 0x39, 0xd7, 0x3a, 0xad, 0xcb, 0xe3, 0x08, 0xc3, 0x55, 0xc6, 0x30, 0xf7, 0x1e, + 0xe8, 0x84, 0xe6, 0x95, 0x86, 0x06, 0x05, 0xa2, 0x7e, 0xc1, 0xbe, 0x42, 0xd9, 0xfe, 0x2d, 0x7c, + 0xf8, 0x01, 0xcc, 0x70, 0x94, 0x86, 0x98, 0x0f, 0x8a, 0x96, 0xef, 0x26, 0x6a, 0x6b, 0xd1, 0x8a, + 0x12, 0x55, 0x9c, 0x21, 0xcd, 0x9b, 0x74, 0xfb, 0xb2, 0x08, 0xa0, 0x37, 0x30, 0xcc, 0xba, 0x87, + 0x3b, 0x60, 0x82, 0xed, 0xa3, 0xe4, 0x25, 0x56, 0x0d, 0x9c, 0xf4, 0x56, 0x05, 0xfe, 0x47, 0x66, + 0x3d, 0x0c, 0x09, 0x6f, 0x77, 0x1b, 0x4e, 0x93, 0xc6, 0x7a, 0x94, 0xf5, 0x4f, 0x8d, 0xb5, 0xde, + 0xbb, 0xfc, 0x30, 0xc1, 0xcc, 0x59, 0xc7, 0xcd, 0xab, 0x0a, 0x0b, 0x4c, 0xb0, 0x8b, 0xb1, 0xed, + 0xe7, 0x44, 0x01, 0xc7, 0x07, 0x84, 0x0b, 0x78, 0xf1, 0xef, 0xe0, 0x02, 0xa3, 0xe1, 0x9a, 0x08, + 0x3f, 0x19, 0xc0, 0x64, 0x23, 0x46, 0xd3, 0x2c, 0xc9, 0xa1, 0xa9, 0x3b, 0x23, 0xae, 0xaa, 0x33, + 0x6a, 0xa6, 0xbd, 0x47, 0xa7, 0x99, 0x65, 0xf4, 0x32, 0xcb, 0xd6, 0x49, 0x49, 0x3b, 0x5d, 0xd8, + 0xa0, 0x29, 0x2d, 0x83, 0x44, 0x9a, 0xda, 0xfe, 0x48, 0x79, 0xfb, 0x4b, 0x19, 0xfc, 0x3b, 0x58, + 0x6c, 0xb8, 0x04, 0x26, 0x50, 0xab, 0x95, 0x62, 0xc6, 0x74, 0x99, 0x61, 0x2f, 0xb3, 0xa6, 0x95, + 0x86, 0x3e, 0xb0, 0xfd, 0xdc, 0x04, 0x4e, 0x83, 0x22, 0x69, 0xc9, 0x92, 0x95, 0xfd, 0x22, 0x69, + 0xc1, 0x04, 0x80, 0xa4, 0xdf, 0x32, 0x9d, 0xdb, 0xe3, 0x91, 0xb9, 0xdd, 0xec, 0xf2, 0xf0, 0xa0, + 0xe6, 0x8f, 0x9a, 0x9a, 0x9a, 0x3c, 0x9d, 0x01, 0x0d, 0xf8, 0x1a, 0xcc, 0xee, 0x76, 0x79, 0x37, + 0xc5, 0xca, 0x24, 0xa4, 0x7b, 0x38, 0xed, 0xd0, 0xd4, 0x2c, 0xcb, 0xe0, 0xad, 0x2b, 0xd4, 0x6d, + 0x56, 0xb6, 0x0f, 0xd5, 0xb6, 0x88, 0xe0, 0x95, 0xde, 0x84, 0xdb, 0x60, 0x8a, 0x53, 0x8e, 0xa2, + 0xad, 0x36, 0x4a, 0x31, 0x33, 0xc7, 0xf4, 0xb5, 0xd6, 0xcf, 0xa4, 0x78, 0xa1, 0xfa, 0xc3, 0xbe, + 0x46, 0x49, 0xc7, 0x9b, 0xd7, 0x31, 0xff, 0xaf, 0xe7, 0x5c, 0xf8, 0x06, 0x4c, 0x3a, 0xdb, 0xfe, + 0x20, 0x0a, 0xee, 0xa8, 0xf2, 0xc8, 0xeb, 0xc1, 0xcc, 0xf1, 0xbb, 0x5d, 0xa3, 0x8a, 0xc6, 0x43, + 0x85, 0x97, 0x09, 0x20, 0x49, 0xd0, 0x95, 0x50, 0x38, 0x18, 0xea, 0xb0, 0x55, 0x97, 0xcd, 0x09, + 0x59, 0x80, 0x17, 0x7f, 0x30, 0xc7, 0x1b, 0x1d, 0x3e, 0x9c, 0x85, 0x1a, 0xa7, 0x3c, 0x0b, 0x45, + 0x5e, 0x99, 0xf9, 0x78, 0x62, 0x15, 0x8e, 0x4f, 0xac, 0xc2, 0xb7, 0xcf, 0xb5, 0x31, 0x11, 0xe7, + 0x86, 0xb7, 0x7d, 0x7a, 0x5e, 0x35, 0xce, 0xce, 0xab, 0xc6, 0xaf, 0xf3, 0xaa, 0x71, 0x74, 0x51, + 0x2d, 0x9c, 0x5d, 0x54, 0x0b, 0xdf, 0x2f, 0xaa, 0x85, 0x77, 0xcf, 0x07, 0x84, 0x75, 0xa2, 0xb5, + 0x08, 0x35, 0x58, 0xbe, 0x70, 0xf7, 0x9e, 0xb9, 0x07, 0xa3, 0xff, 0xd6, 0x1a, 0xe3, 0xf2, 0x19, + 0x7d, 0xf2, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x29, 0xc5, 0x29, 0x02, 0x07, 0x00, 0x00, } func (m *SmoothWeightChangeParams) Marshal() (dAtA []byte, err error) { diff --git a/x/gamm/pool-models/balancer/balancer_pool.go b/x/gamm/pool-models/balancer/balancer_pool.go index 08fda2d705d..bea39dbd31a 100644 --- a/x/gamm/pool-models/balancer/balancer_pool.go +++ b/x/gamm/pool-models/balancer/balancer_pool.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) // NewPool returns a weighted CPMM pool with the provided parameters, and initial assets. diff --git a/x/gamm/pool-models/balancer/balancer_pool_test.go b/x/gamm/pool-models/balancer/balancer_pool_test.go index f3547b4d5fd..3b4f1455f05 100644 --- a/x/gamm/pool-models/balancer/balancer_pool_test.go +++ b/x/gamm/pool-models/balancer/balancer_pool_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) var ( diff --git a/x/gamm/pool-models/balancer/codec.go b/x/gamm/pool-models/balancer/codec.go index 01370de2cf9..07920b92f61 100644 --- a/x/gamm/pool-models/balancer/codec.go +++ b/x/gamm/pool-models/balancer/codec.go @@ -5,7 +5,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" - types "github.com/osmosis-labs/osmosis/x/gamm/types" + types "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) // RegisterLegacyAminoCodec registers the necessary x/gamm interfaces and concrete types diff --git a/x/gamm/pool-models/balancer/marshal.go b/x/gamm/pool-models/balancer/marshal.go index ac7b06bb897..ef117f5cd78 100644 --- a/x/gamm/pool-models/balancer/marshal.go +++ b/x/gamm/pool-models/balancer/marshal.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) type balancerPoolPretty struct { diff --git a/x/gamm/pool-models/balancer/marshal_test.go b/x/gamm/pool-models/balancer/marshal_test.go index 731bd0c8e72..5cfb80284ee 100644 --- a/x/gamm/pool-models/balancer/marshal_test.go +++ b/x/gamm/pool-models/balancer/marshal_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) var ymlAssetTest = []types.PoolAsset{ diff --git a/x/gamm/pool-models/balancer/msgs.go b/x/gamm/pool-models/balancer/msgs.go index 1ac269dae91..3acd95e4335 100644 --- a/x/gamm/pool-models/balancer/msgs.go +++ b/x/gamm/pool-models/balancer/msgs.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) const ( diff --git a/x/gamm/pool-models/balancer/msgs_test.go b/x/gamm/pool-models/balancer/msgs_test.go index a31f721e5de..347846eb27a 100644 --- a/x/gamm/pool-models/balancer/msgs_test.go +++ b/x/gamm/pool-models/balancer/msgs_test.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" - appParams "github.com/osmosis-labs/osmosis/app/params" - "github.com/osmosis-labs/osmosis/x/gamm/types" + appParams "github.com/osmosis-labs/osmosis/v7/app/params" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) func TestMsgCreateBalancerPool(t *testing.T) { diff --git a/x/gamm/pool-models/balancer/tx.pb.go b/x/gamm/pool-models/balancer/tx.pb.go index 6670cdf03f3..c4922250c46 100644 --- a/x/gamm/pool-models/balancer/tx.pb.go +++ b/x/gamm/pool-models/balancer/tx.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" - types "github.com/osmosis-labs/osmosis/x/gamm/types" + types "github.com/osmosis-labs/osmosis/v7/x/gamm/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -144,32 +144,32 @@ func init() { } var fileDescriptor_26dfff9c7e076bd8 = []byte{ - // 393 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x4a, 0xeb, 0x40, - 0x18, 0x85, 0x93, 0xb6, 0x14, 0xee, 0x94, 0xbb, 0xb8, 0x43, 0xef, 0xbd, 0xa1, 0x62, 0xa6, 0x64, - 0x55, 0x95, 0x4e, 0x68, 0x15, 0x17, 0xba, 0x32, 0x22, 0xae, 0x0a, 0x35, 0xe0, 0xc6, 0x4d, 0x99, - 0xb4, 0x63, 0x2c, 0x24, 0x99, 0x30, 0x93, 0x96, 0x0a, 0xee, 0x7c, 0x01, 0x5f, 0xc9, 0x5d, 0x97, - 0x5d, 0xba, 0x0a, 0xd2, 0xbe, 0x41, 0x9f, 0x40, 0x92, 0x49, 0x20, 0x85, 0x14, 0x71, 0x37, 0x73, - 0xf8, 0xce, 0x39, 0xf3, 0xff, 0x0c, 0x38, 0x66, 0xc2, 0x67, 0x62, 0x2a, 0x4c, 0x97, 0xf8, 0xbe, - 0x19, 0x32, 0xe6, 0x75, 0x7d, 0x36, 0xa1, 0x9e, 0x30, 0x1d, 0xe2, 0x91, 0x60, 0x4c, 0xb9, 0x19, - 0x2d, 0x70, 0xc8, 0x59, 0xc4, 0xe0, 0xff, 0x8c, 0xc5, 0x09, 0x8b, 0x13, 0x56, 0xa2, 0xad, 0xa6, - 0xcb, 0x5c, 0x96, 0x32, 0x66, 0x72, 0x92, 0x78, 0xeb, 0xec, 0xfb, 0xe8, 0xfc, 0x30, 0x64, 0xcc, - 0xcb, 0x5c, 0x68, 0xc7, 0x35, 0xef, 0x39, 0x34, 0x22, 0xbd, 0xd4, 0x2d, 0x01, 0xe3, 0xbd, 0x02, - 0xfe, 0x0e, 0x84, 0x7b, 0xcd, 0x29, 0x89, 0xa8, 0x55, 0x08, 0x80, 0x47, 0xa0, 0x2e, 0x68, 0x30, - 0xa1, 0x5c, 0x53, 0xdb, 0x6a, 0xe7, 0x97, 0xf5, 0x67, 0x1b, 0xa3, 0xdf, 0xcf, 0xc4, 0xf7, 0x2e, - 0x0c, 0xa9, 0x1b, 0x76, 0x06, 0xc0, 0x31, 0x00, 0x49, 0xe4, 0x90, 0x70, 0xe2, 0x0b, 0xad, 0xd2, - 0x56, 0x3b, 0x8d, 0xfe, 0x09, 0xde, 0x33, 0x1f, 0x2e, 0xb6, 0x48, 0x8b, 0xf5, 0x6f, 0x1b, 0x23, - 0x28, 0xb3, 0x13, 0x70, 0x14, 0xa6, 0xb2, 0x61, 0x17, 0x62, 0xe1, 0x8d, 0x2c, 0xb9, 0x12, 0x82, - 0x46, 0x42, 0xab, 0xb6, 0xab, 0x9d, 0x46, 0x1f, 0xed, 0x96, 0x64, 0xf3, 0xe1, 0x61, 0xce, 0x59, - 0xb5, 0x65, 0x8c, 0x14, 0xbb, 0x60, 0x84, 0x77, 0xa0, 0xf9, 0x38, 0x8b, 0x66, 0x9c, 0x8e, 0xd2, - 0x26, 0x97, 0xcd, 0x29, 0x0f, 0x18, 0xd7, 0x6a, 0xe9, 0x90, 0x68, 0x1b, 0xa3, 0x03, 0xf9, 0x90, - 0x32, 0xca, 0xb0, 0xa1, 0x94, 0x93, 0x86, 0xdb, 0x5c, 0x44, 0xe0, 0xb0, 0x74, 0x85, 0x36, 0x15, - 0x21, 0x0b, 0x04, 0xed, 0xbf, 0xaa, 0xa0, 0x3a, 0x10, 0x2e, 0x7c, 0x01, 0xb0, 0x64, 0xd1, 0x78, - 0xef, 0xa6, 0x4a, 0x53, 0x5b, 0xe7, 0x3f, 0xe3, 0xf3, 0x57, 0x58, 0xf7, 0xcb, 0xb5, 0xae, 0xae, - 0xd6, 0xba, 0xfa, 0xb9, 0xd6, 0xd5, 0xb7, 0x8d, 0xae, 0xac, 0x36, 0xba, 0xf2, 0xb1, 0xd1, 0x95, - 0x87, 0x4b, 0x77, 0x1a, 0x3d, 0xcd, 0x1c, 0x3c, 0x66, 0xbe, 0x99, 0x65, 0x77, 0x3d, 0xe2, 0x88, - 0xfc, 0x62, 0x2e, 0xf6, 0xff, 0x3a, 0xa7, 0x9e, 0x7e, 0xa4, 0xd3, 0xaf, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xca, 0xc1, 0x84, 0x33, 0xfc, 0x02, 0x00, 0x00, + // 397 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x6a, 0xdb, 0x30, + 0x1c, 0xc6, 0xed, 0x24, 0x04, 0xa6, 0xb0, 0xc3, 0x44, 0xb6, 0x99, 0x8c, 0x59, 0xc1, 0xa7, 0x6c, + 0x23, 0x12, 0xc9, 0xc6, 0x06, 0x3b, 0x14, 0xea, 0x52, 0x7a, 0x0a, 0xa4, 0x3e, 0x95, 0x5e, 0x82, + 0x9c, 0xa8, 0x6e, 0xc0, 0xb6, 0x8c, 0xe4, 0x84, 0x14, 0x7a, 0xeb, 0x0b, 0xf4, 0x95, 0x7a, 0xcb, + 0x31, 0xc7, 0x9e, 0x4c, 0x49, 0xde, 0x20, 0x4f, 0x50, 0x6c, 0xd9, 0xe0, 0x80, 0x43, 0xe9, 0x4d, + 0xfa, 0xf8, 0x7d, 0xdf, 0xa7, 0xff, 0x1f, 0x81, 0x9f, 0x5c, 0x06, 0x5c, 0xce, 0x25, 0xf1, 0x68, + 0x10, 0x90, 0x88, 0x73, 0xbf, 0x1f, 0xf0, 0x19, 0xf3, 0x25, 0x71, 0xa9, 0x4f, 0xc3, 0x29, 0x13, + 0x24, 0x5e, 0xe1, 0x48, 0xf0, 0x98, 0xc3, 0xaf, 0x39, 0x8b, 0x53, 0x16, 0xa7, 0xac, 0x42, 0x3b, + 0x6d, 0x8f, 0x7b, 0x3c, 0x63, 0x48, 0x7a, 0x52, 0x78, 0xe7, 0xcf, 0xdb, 0xd1, 0xc5, 0x61, 0xcc, + 0xb9, 0x9f, 0xbb, 0xd0, 0x81, 0x6b, 0x39, 0x70, 0x59, 0x4c, 0x07, 0x99, 0x5b, 0x01, 0xd6, 0x53, + 0x0d, 0x7c, 0x1e, 0x49, 0xef, 0x4c, 0x30, 0x1a, 0x33, 0xbb, 0x14, 0x00, 0x7f, 0x80, 0xa6, 0x64, + 0xe1, 0x8c, 0x09, 0x43, 0xef, 0xea, 0xbd, 0x0f, 0xf6, 0xa7, 0x7d, 0x82, 0x3e, 0xde, 0xd1, 0xc0, + 0xff, 0x6f, 0x29, 0xdd, 0x72, 0x72, 0x00, 0x4e, 0x01, 0x48, 0x23, 0xc7, 0x54, 0xd0, 0x40, 0x1a, + 0xb5, 0xae, 0xde, 0x6b, 0x0d, 0x7f, 0xe1, 0x23, 0xf3, 0xe1, 0x72, 0x8b, 0xb2, 0xd8, 0x5f, 0xf6, + 0x09, 0x82, 0x2a, 0x3b, 0x05, 0x27, 0x51, 0x26, 0x5b, 0x4e, 0x29, 0x16, 0x9e, 0xab, 0x92, 0x53, + 0x29, 0x59, 0x2c, 0x8d, 0x7a, 0xb7, 0xde, 0x6b, 0x0d, 0xd1, 0x61, 0x49, 0x3e, 0x1f, 0x1e, 0x17, + 0x9c, 0xdd, 0x58, 0x27, 0x48, 0x73, 0x4a, 0x46, 0x78, 0x09, 0xda, 0x37, 0x8b, 0x78, 0x21, 0xd8, + 0x24, 0x6b, 0xf2, 0xf8, 0x92, 0x89, 0x90, 0x0b, 0xa3, 0x91, 0x0d, 0x89, 0xf6, 0x09, 0xfa, 0xa6, + 0x1e, 0x52, 0x45, 0x59, 0x0e, 0x54, 0x72, 0xda, 0x70, 0x51, 0x88, 0x08, 0x7c, 0xaf, 0x5c, 0xa1, + 0xc3, 0x64, 0xc4, 0x43, 0xc9, 0x86, 0x0f, 0x3a, 0xa8, 0x8f, 0xa4, 0x07, 0xef, 0x01, 0xac, 0x58, + 0x34, 0x3e, 0xba, 0xa9, 0xca, 0xd4, 0xce, 0xdf, 0xf7, 0xf1, 0xc5, 0x2b, 0xec, 0xab, 0xf5, 0xd6, + 0xd4, 0x37, 0x5b, 0x53, 0x7f, 0xd9, 0x9a, 0xfa, 0xe3, 0xce, 0xd4, 0x36, 0x3b, 0x53, 0x7b, 0xde, + 0x99, 0xda, 0xf5, 0x89, 0x37, 0x8f, 0x6f, 0x17, 0x2e, 0x9e, 0xf2, 0x80, 0xe4, 0xd9, 0x7d, 0x9f, + 0xba, 0xb2, 0xb8, 0x90, 0xe5, 0x3f, 0xb2, 0x3a, 0xfe, 0xf1, 0xdc, 0x66, 0xf6, 0x97, 0x7e, 0xbf, + 0x06, 0x00, 0x00, 0xff, 0xff, 0x95, 0xfd, 0xc9, 0x2f, 0xff, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gamm/simulation/operations.go b/x/gamm/simulation/operations.go index 8c56cfeda73..d686b7b2f07 100644 --- a/x/gamm/simulation/operations.go +++ b/x/gamm/simulation/operations.go @@ -5,7 +5,7 @@ import ( "time" "github.com/cosmos/cosmos-sdk/baseapp" - osmo_simulation "github.com/osmosis-labs/osmosis/x/simulation" + osmo_simulation "github.com/osmosis-labs/osmosis/v7/x/simulation" "github.com/cosmos/cosmos-sdk/codec" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" @@ -13,9 +13,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" stakingTypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) // Simulation operation weights constants diff --git a/x/gamm/types/genesis.pb.go b/x/gamm/types/genesis.pb.go index 91a336ae6f5..2ef903b395e 100644 --- a/x/gamm/types/genesis.pb.go +++ b/x/gamm/types/genesis.pb.go @@ -143,32 +143,32 @@ func init() { } var fileDescriptor_5a324eb7f1dd793e = []byte{ - // 390 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x52, 0x3d, 0xeb, 0xd3, 0x40, - 0x18, 0xcf, 0xf9, 0xff, 0xb7, 0x60, 0x2c, 0xbe, 0x84, 0x0e, 0x69, 0x87, 0xb4, 0x64, 0xca, 0x60, - 0xef, 0x68, 0xc5, 0xc5, 0xcd, 0x14, 0x2a, 0x82, 0x48, 0x89, 0x9b, 0x4b, 0xb8, 0xc4, 0x6b, 0x0c, - 0x26, 0xf7, 0x84, 0xdc, 0x55, 0x9a, 0x6f, 0x21, 0xb8, 0xbb, 0xb8, 0x39, 0xfb, 0x21, 0x8a, 0x53, - 0x47, 0xa7, 0x2a, 0xed, 0x37, 0xf0, 0x13, 0xc8, 0xbd, 0x54, 0x0a, 0x4e, 0xc9, 0xef, 0x7e, 0x2f, - 0xf7, 0x3c, 0xbf, 0xc4, 0x0d, 0x41, 0xd4, 0x20, 0x4a, 0x41, 0x0a, 0x5a, 0xd7, 0xe4, 0xe3, 0x3c, - 0x63, 0x92, 0xce, 0x49, 0xc1, 0x38, 0x13, 0xa5, 0xc0, 0x4d, 0x0b, 0x12, 0xbc, 0x81, 0xd5, 0x60, - 0xa5, 0x19, 0x0f, 0x0b, 0x28, 0x40, 0x13, 0x44, 0xbd, 0x19, 0xcd, 0x78, 0x54, 0x00, 0x14, 0x15, - 0x23, 0x1a, 0x65, 0xdb, 0x0d, 0xa1, 0xbc, 0xbb, 0x50, 0xb9, 0xf6, 0xa7, 0xc6, 0x63, 0x80, 0xa5, - 0x02, 0x83, 0x48, 0x46, 0x05, 0xfb, 0x77, 0x79, 0x0e, 0x25, 0x37, 0x7c, 0xf8, 0x05, 0xb9, 0xfd, - 0x35, 0x6d, 0x69, 0x2d, 0xbc, 0xcf, 0xc8, 0x7d, 0xd4, 0x00, 0x54, 0x69, 0xde, 0x32, 0x2a, 0x4b, - 0xe0, 0xe9, 0x86, 0x31, 0x1f, 0x4d, 0x6f, 0xa2, 0x7b, 0x8b, 0x11, 0xb6, 0xa9, 0x2a, 0x07, 0xdb, - 0x1c, 0xbc, 0x84, 0x92, 0xc7, 0xaf, 0xf6, 0xc7, 0x89, 0xf3, 0xe7, 0x38, 0xf1, 0x3b, 0x5a, 0x57, - 0xcf, 0xc2, 0xff, 0x12, 0xc2, 0x6f, 0xbf, 0x26, 0x51, 0x51, 0xca, 0xf7, 0xdb, 0x0c, 0xe7, 0x50, - 0xdb, 0xf1, 0xec, 0x63, 0x26, 0xde, 0x7d, 0x20, 0xb2, 0x6b, 0x98, 0xd0, 0x61, 0x22, 0x79, 0xa0, - 0xfc, 0x4b, 0x6b, 0x5f, 0x31, 0x16, 0x7e, 0x45, 0xee, 0xe0, 0x85, 0x29, 0xeb, 0x8d, 0xa4, 0x92, - 0x79, 0x4f, 0xdd, 0x9e, 0xd2, 0x08, 0x3b, 0xd9, 0x10, 0x9b, 0x5e, 0xf0, 0xa5, 0x17, 0xfc, 0x9c, - 0x77, 0xf1, 0xdd, 0x1f, 0xdf, 0x67, 0xbd, 0x35, 0x40, 0xf5, 0x32, 0x31, 0x6a, 0x2f, 0x72, 0x1f, - 0x72, 0xb6, 0x93, 0xa9, 0x9e, 0x8f, 0x6f, 0xeb, 0x8c, 0xb5, 0xfe, 0x9d, 0x29, 0x8a, 0x6e, 0x93, - 0xfb, 0xea, 0x5c, 0x69, 0x5f, 0xeb, 0x53, 0x6f, 0xe1, 0xf6, 0x1b, 0xdd, 0x88, 0x7f, 0x33, 0x45, - 0xfa, 0x86, 0xeb, 0xaf, 0x83, 0x4d, 0x5b, 0xf1, 0xad, 0x5a, 0x3b, 0xb1, 0xca, 0x78, 0xb5, 0x3f, - 0x05, 0xe8, 0x70, 0x0a, 0xd0, 0xef, 0x53, 0x80, 0x3e, 0x9d, 0x03, 0xe7, 0x70, 0x0e, 0x9c, 0x9f, - 0xe7, 0xc0, 0x79, 0xfb, 0xf8, 0x6a, 0x75, 0x9b, 0x33, 0xab, 0x68, 0x26, 0x2e, 0x80, 0xec, 0xcc, - 0x8f, 0xa1, 0x4b, 0xc8, 0xfa, 0x7a, 0x8b, 0x27, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x6a, - 0x74, 0x74, 0x35, 0x02, 0x00, 0x00, + // 393 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x52, 0xcb, 0xaa, 0xd3, 0x40, + 0x18, 0xce, 0x78, 0xce, 0x29, 0x18, 0x0f, 0x5e, 0x42, 0x17, 0x69, 0x17, 0x69, 0xc9, 0x2a, 0x9b, + 0xce, 0xd0, 0x8a, 0x08, 0xee, 0x4c, 0x41, 0x29, 0x88, 0x94, 0xb8, 0x73, 0x13, 0x26, 0x71, 0x1a, + 0x83, 0xc9, 0xfc, 0x21, 0x33, 0x2d, 0xcd, 0x5b, 0x08, 0xee, 0xdd, 0xb8, 0x73, 0xed, 0x43, 0x14, + 0x57, 0x5d, 0xba, 0xaa, 0xd2, 0xbe, 0x81, 0x4f, 0x20, 0x73, 0xa9, 0x14, 0xce, 0x2a, 0xf9, 0xe6, + 0xbb, 0xcc, 0xff, 0x7f, 0x89, 0x1b, 0x82, 0xa8, 0x41, 0x94, 0x82, 0x14, 0xb4, 0xae, 0xc9, 0x66, + 0x9a, 0x31, 0x49, 0xa7, 0xa4, 0x60, 0x9c, 0x89, 0x52, 0xe0, 0xa6, 0x05, 0x09, 0xde, 0xad, 0xd5, + 0x60, 0xa5, 0x19, 0xf6, 0x0b, 0x28, 0x40, 0x13, 0x44, 0xbd, 0x19, 0xcd, 0x70, 0x50, 0x00, 0x14, + 0x15, 0x23, 0x1a, 0x65, 0xeb, 0x15, 0xa1, 0xbc, 0x3b, 0x53, 0xb9, 0xf6, 0xa7, 0xc6, 0x63, 0x80, + 0xa5, 0x02, 0x83, 0x48, 0x46, 0x05, 0xfb, 0x7f, 0x79, 0x0e, 0x25, 0x37, 0x7c, 0xf8, 0x15, 0xb9, + 0xbd, 0x25, 0x6d, 0x69, 0x2d, 0xbc, 0x2f, 0xc8, 0x7d, 0xd2, 0x00, 0x54, 0x69, 0xde, 0x32, 0x2a, + 0x4b, 0xe0, 0xe9, 0x8a, 0x31, 0x1f, 0x8d, 0xaf, 0xa2, 0x07, 0xb3, 0x01, 0xb6, 0xa9, 0x2a, 0x07, + 0xdb, 0x1c, 0x3c, 0x87, 0x92, 0xc7, 0x6f, 0x76, 0x87, 0x91, 0xf3, 0xf7, 0x30, 0xf2, 0x3b, 0x5a, + 0x57, 0x2f, 0xc2, 0x3b, 0x09, 0xe1, 0xf7, 0xdf, 0xa3, 0xa8, 0x28, 0xe5, 0xc7, 0x75, 0x86, 0x73, + 0xa8, 0xed, 0x78, 0xf6, 0x31, 0x11, 0x1f, 0x3e, 0x11, 0xd9, 0x35, 0x4c, 0xe8, 0x30, 0x91, 0x3c, + 0x52, 0xfe, 0xb9, 0xb5, 0xbf, 0x62, 0x2c, 0xfc, 0x86, 0xdc, 0xdb, 0xd7, 0xa6, 0xac, 0x77, 0x92, + 0x4a, 0xe6, 0x3d, 0x73, 0x6f, 0x94, 0x46, 0xd8, 0xc9, 0xfa, 0xd8, 0xf4, 0x82, 0xcf, 0xbd, 0xe0, + 0x97, 0xbc, 0x8b, 0xef, 0xff, 0xfc, 0x31, 0xb9, 0x59, 0x02, 0x54, 0x8b, 0xc4, 0xa8, 0xbd, 0xc8, + 0x7d, 0xcc, 0xd9, 0x56, 0xa6, 0x7a, 0x3e, 0xbe, 0xae, 0x33, 0xd6, 0xfa, 0xf7, 0xc6, 0x28, 0xba, + 0x4e, 0x1e, 0xaa, 0x73, 0xa5, 0x7d, 0xab, 0x4f, 0xbd, 0x99, 0xdb, 0x6b, 0x74, 0x23, 0xfe, 0xd5, + 0x18, 0xe9, 0x1b, 0x2e, 0xbf, 0x0e, 0x36, 0x6d, 0xc5, 0xd7, 0x6a, 0xed, 0xc4, 0x2a, 0xe3, 0xc5, + 0xee, 0x18, 0xa0, 0xfd, 0x31, 0x40, 0x7f, 0x8e, 0x01, 0xfa, 0x7c, 0x0a, 0x9c, 0xfd, 0x29, 0x70, + 0x7e, 0x9d, 0x02, 0xe7, 0x3d, 0xb9, 0x58, 0xdd, 0xe6, 0x4c, 0x2a, 0x9a, 0x89, 0x33, 0x20, 0x9b, + 0xe7, 0x64, 0x6b, 0xfe, 0x0d, 0xdd, 0x43, 0xd6, 0xd3, 0x8b, 0x3c, 0xfd, 0x17, 0x00, 0x00, 0xff, + 0xff, 0xf6, 0xbb, 0x63, 0x56, 0x38, 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/gamm/types/msgs_test.go b/x/gamm/types/msgs_test.go index 2400640c3d5..9643f354b5e 100644 --- a/x/gamm/types/msgs_test.go +++ b/x/gamm/types/msgs_test.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" - appParams "github.com/osmosis-labs/osmosis/app/params" + appParams "github.com/osmosis-labs/osmosis/v7/app/params" ) func TestMsgSwapExactAmountIn(t *testing.T) { diff --git a/x/gamm/types/params.go b/x/gamm/types/params.go index 59aeef798e3..4780a63f113 100644 --- a/x/gamm/types/params.go +++ b/x/gamm/types/params.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - appparams "github.com/osmosis-labs/osmosis/app/params" + appparams "github.com/osmosis-labs/osmosis/v7/app/params" ) // Parameter store keys diff --git a/x/gamm/types/pool.go b/x/gamm/types/pool.go index d73f227b455..81de780f9bb 100644 --- a/x/gamm/types/pool.go +++ b/x/gamm/types/pool.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" proto "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v043_temp/address" + "github.com/osmosis-labs/osmosis/v7/v043_temp/address" ) // PoolI defines an interface for pools that hold tokens. diff --git a/x/gamm/types/pool.pb.go b/x/gamm/types/pool.pb.go index 68cac5e2ab1..68a46da3696 100644 --- a/x/gamm/types/pool.pb.go +++ b/x/gamm/types/pool.pb.go @@ -80,7 +80,7 @@ func init() { func init() { proto.RegisterFile("osmosis/gamm/v1beta1/pool.proto", fileDescriptor_e5ab9bc6d45f98ce) } var fileDescriptor_e5ab9bc6d45f98ce = []byte{ - // 283 bytes of a gzipped FileDescriptorProto + // 286 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x4f, 0x4f, 0xcc, 0xcd, 0xd5, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0xc8, 0xcf, 0xcf, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x81, 0x2a, 0xd0, @@ -94,11 +94,11 @@ var fileDescriptor_e5ab9bc6d45f98ce = []byte{ 0x12, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x4e, 0x27, 0x7b, 0x90, 0xe2, 0x5b, 0xf7, 0xe4, 0xd5, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0xee, 0x82, 0x50, 0xba, 0xc5, 0x29, 0xd9, 0xfa, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x7a, 0x9e, 0x79, 0x25, 0x9f, 0xee, 0xc9, 0xf3, - 0x42, 0x8c, 0x85, 0x98, 0xa2, 0x14, 0x04, 0x35, 0xce, 0xc9, 0xed, 0xc4, 0x23, 0x39, 0xc6, 0x0b, + 0x42, 0x8c, 0x85, 0x98, 0xa2, 0x14, 0x04, 0x35, 0xce, 0xc9, 0xf3, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, - 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x74, 0x90, 0x8c, 0x86, 0x06, 0x8f, 0x6e, 0x4e, 0x62, 0x52, 0x31, - 0x8c, 0xa3, 0x5f, 0x01, 0x09, 0x4e, 0xb0, 0x25, 0x49, 0x6c, 0x60, 0xcf, 0x1b, 0x03, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x55, 0x32, 0xea, 0x1c, 0x6b, 0x01, 0x00, 0x00, + 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0xf4, 0x91, 0x8c, 0x86, 0x06, 0x8f, 0x6e, 0x4e, 0x62, 0x52, 0x31, + 0x8c, 0xa3, 0x5f, 0x66, 0xae, 0x5f, 0x01, 0x09, 0x51, 0xb0, 0x3d, 0x49, 0x6c, 0x60, 0xff, 0x1b, + 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x64, 0x99, 0x81, 0xef, 0x6e, 0x01, 0x00, 0x00, } func (m *PoolAsset) Marshal() (dAtA []byte, err error) { diff --git a/x/gamm/types/query.pb.go b/x/gamm/types/query.pb.go index 1cc44d9929b..0f15565e7c4 100644 --- a/x/gamm/types/query.pb.go +++ b/x/gamm/types/query.pb.go @@ -1002,90 +1002,90 @@ func init() { func init() { proto.RegisterFile("osmosis/gamm/v1beta1/query.proto", fileDescriptor_d9a717df9ca609ef) } var fileDescriptor_d9a717df9ca609ef = []byte{ - // 1322 bytes of a gzipped FileDescriptorProto + // 1326 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x6f, 0x1b, 0xc5, 0x17, 0xcf, 0xa6, 0x69, 0xbe, 0xf5, 0xa4, 0xed, 0xb7, 0x9d, 0x3a, 0xa9, 0xb3, 0x6d, 0xbd, 0x61, - 0x80, 0x24, 0xb4, 0xf1, 0x6e, 0xd3, 0xd0, 0x03, 0x15, 0x2d, 0xd4, 0x24, 0x6d, 0x2d, 0x01, 0x0d, - 0x5b, 0x04, 0x08, 0x0e, 0x66, 0x1d, 0x4f, 0xdd, 0x55, 0xed, 0x9d, 0x8d, 0x67, 0x96, 0xd4, 0x42, - 0x15, 0xa8, 0x12, 0x37, 0x0e, 0xa0, 0x72, 0x03, 0x71, 0x42, 0x42, 0xe2, 0xcc, 0x1f, 0x51, 0x21, - 0x0e, 0x95, 0xb8, 0x20, 0x0e, 0x0b, 0x6a, 0xf8, 0x0b, 0x7c, 0x47, 0x42, 0x3b, 0xfb, 0x76, 0xbd, - 0xeb, 0xf8, 0xb7, 0xc4, 0xa9, 0xf5, 0xbc, 0xcf, 0x7b, 0xf3, 0x79, 0x9f, 0xcf, 0xec, 0xcc, 0x0b, - 0x5a, 0x62, 0xbc, 0xc1, 0xb8, 0xcd, 0x8d, 0x9a, 0xd5, 0x68, 0x18, 0x9f, 0xac, 0x57, 0xa8, 0xb0, - 0xd6, 0x8d, 0x5d, 0x8f, 0x36, 0x5b, 0xba, 0xdb, 0x64, 0x82, 0xe1, 0x2c, 0x20, 0xf4, 0x00, 0xa1, - 0x03, 0x42, 0xcd, 0xd6, 0x58, 0x8d, 0x49, 0x80, 0x11, 0xfc, 0x2f, 0xc4, 0xaa, 0xe7, 0x7a, 0x56, - 0x13, 0x0f, 0x20, 0xac, 0xf5, 0x0c, 0xbb, 0x8c, 0xd5, 0x01, 0x90, 0xdf, 0x91, 0x08, 0xa3, 0x62, - 0x71, 0x1a, 0xc7, 0x77, 0x98, 0xed, 0x40, 0xfc, 0x7c, 0x32, 0x2e, 0x49, 0x76, 0xaa, 0x58, 0x35, - 0xdb, 0xb1, 0x84, 0xcd, 0x22, 0xec, 0xd9, 0x1a, 0x63, 0xb5, 0x3a, 0x35, 0x2c, 0xd7, 0x36, 0x2c, - 0xc7, 0x61, 0x42, 0x06, 0x39, 0x44, 0x17, 0x21, 0x2a, 0x7f, 0x55, 0xbc, 0xbb, 0x86, 0xe5, 0xb4, - 0xa2, 0x50, 0xb8, 0x49, 0x39, 0xec, 0x2e, 0xfc, 0x11, 0x86, 0xc8, 0x35, 0x74, 0xe2, 0x9d, 0x60, - 0xd7, 0x6d, 0xc6, 0xea, 0x26, 0xdd, 0xf5, 0x28, 0x17, 0xf8, 0x3c, 0x9a, 0x0d, 0x3a, 0x28, 0x55, - 0x73, 0xca, 0x92, 0xb2, 0x3a, 0x53, 0xc4, 0x6d, 0x5f, 0x3b, 0xde, 0xb2, 0x1a, 0xf5, 0x2b, 0x24, - 0x58, 0x2f, 0xdb, 0x55, 0x62, 0x02, 0x82, 0xdc, 0x42, 0x27, 0x13, 0xf9, 0xdc, 0x65, 0x0e, 0xa7, - 0x78, 0x03, 0xcd, 0x04, 0x61, 0x99, 0x3e, 0x77, 0x29, 0xab, 0x87, 0xcc, 0xf4, 0x88, 0x99, 0x7e, - 0xdd, 0x69, 0x15, 0x33, 0xbf, 0xfc, 0x5c, 0x38, 0x1c, 0x64, 0x95, 0x4c, 0x09, 0x26, 0x1f, 0x25, - 0x2a, 0xf1, 0x88, 0xca, 0x0d, 0x84, 0x3a, 0x32, 0xe4, 0xa6, 0x65, 0xbd, 0x65, 0x1d, 0x3a, 0x08, - 0x34, 0xd3, 0x43, 0x63, 0x41, 0x33, 0x7d, 0xdb, 0xaa, 0x51, 0xc8, 0x35, 0x13, 0x99, 0xe4, 0x1b, - 0x05, 0xe1, 0x64, 0x75, 0x20, 0x7a, 0x19, 0x1d, 0x0e, 0xf6, 0xe6, 0x39, 0x65, 0xe9, 0xd0, 0x28, - 0x4c, 0x43, 0x34, 0xbe, 0xd9, 0x83, 0xd5, 0xca, 0x50, 0x56, 0xe1, 0x9e, 0x29, 0x5a, 0x0b, 0x28, - 0x2b, 0x59, 0xbd, 0xed, 0x35, 0x92, 0x6d, 0x93, 0x12, 0x9a, 0xef, 0x5a, 0x07, 0xc2, 0x17, 0xd1, - 0x11, 0x07, 0xd6, 0xc0, 0x9c, 0x6c, 0xdb, 0xd7, 0x4e, 0x84, 0xe6, 0x38, 0x5e, 0xa3, 0x2c, 0x09, - 0x12, 0x33, 0x46, 0x91, 0x4d, 0xb4, 0x10, 0x37, 0xbe, 0x6d, 0x35, 0xad, 0x06, 0x9f, 0xc4, 0xe6, - 0x9b, 0xe8, 0xf4, 0x81, 0x2a, 0x40, 0x69, 0x0d, 0xcd, 0xba, 0x72, 0x65, 0x90, 0xdd, 0x26, 0x60, - 0xc8, 0x16, 0x14, 0x7a, 0x97, 0x09, 0xab, 0x7e, 0xe7, 0x9e, 0xd5, 0xa4, 0x13, 0xf1, 0x11, 0x28, - 0x77, 0xb0, 0x0c, 0x10, 0xfa, 0x00, 0xcd, 0x89, 0xce, 0x32, 0xb0, 0x5a, 0x4c, 0xd9, 0x13, 0x19, - 0xf3, 0x06, 0xb3, 0x9d, 0xe2, 0x99, 0x27, 0xbe, 0x36, 0xd5, 0xf6, 0xb5, 0x53, 0xe1, 0x5e, 0x32, - 0xb7, 0xcc, 0x65, 0x32, 0x31, 0x93, 0xa5, 0x52, 0x5a, 0x5e, 0xe7, 0x9c, 0x8a, 0x89, 0xb8, 0x7f, - 0x9c, 0xd0, 0x32, 0xaa, 0x02, 0xd4, 0xb7, 0x10, 0x72, 0xe3, 0x55, 0x38, 0x94, 0x9a, 0xde, 0xeb, - 0xba, 0xd2, 0xe3, 0xec, 0xe2, 0x4c, 0xc0, 0xdf, 0x4c, 0x24, 0x92, 0xcf, 0xa7, 0xe1, 0xfc, 0xdc, - 0x71, 0x99, 0xd8, 0x6e, 0xda, 0x3b, 0x74, 0x02, 0x9e, 0xf8, 0x2a, 0x3a, 0x2a, 0xd8, 0x7d, 0xea, - 0x94, 0x9c, 0x4d, 0xea, 0xb0, 0x86, 0x3c, 0xe7, 0x99, 0xe2, 0x62, 0xdb, 0xd7, 0xe6, 0x23, 0xa5, - 0xee, 0x53, 0xa7, 0x6c, 0x3b, 0xe5, 0x6a, 0x10, 0x27, 0x66, 0x0a, 0x8e, 0x5f, 0x47, 0xc7, 0xe4, - 0xef, 0xdb, 0x9e, 0x08, 0xf3, 0x0f, 0xc9, 0x7c, 0xb5, 0xed, 0x6b, 0x0b, 0xc9, 0x7c, 0xe6, 0x89, - 0xa8, 0x40, 0x3a, 0x01, 0x5f, 0x41, 0x73, 0x7b, 0xb6, 0xb8, 0x77, 0x67, 0xcf, 0x72, 0x6f, 0x50, - 0x9a, 0x9b, 0x59, 0x52, 0x56, 0x8f, 0x14, 0x73, 0x6d, 0x5f, 0xcb, 0x86, 0xf9, 0x41, 0xb0, 0xcc, - 0xf7, 0x2c, 0xb7, 0x7c, 0x97, 0x52, 0x62, 0x26, 0xc1, 0xe4, 0x2d, 0xb0, 0x2a, 0xa1, 0x40, 0x7c, - 0x39, 0x65, 0x78, 0xb4, 0x28, 0x55, 0xc8, 0x14, 0xe7, 0xdb, 0xbe, 0x76, 0x32, 0xac, 0x19, 0x84, - 0xca, 0x6e, 0x10, 0x23, 0x66, 0x07, 0x47, 0xfe, 0x51, 0xd0, 0xb9, 0xb0, 0xde, 0x9e, 0xe5, 0x6e, - 0x3d, 0xb0, 0x76, 0xc4, 0xf5, 0x06, 0xf3, 0x1c, 0x51, 0x72, 0x22, 0x65, 0x5f, 0x42, 0xb3, 0x9c, - 0x3a, 0x55, 0xda, 0x84, 0x9a, 0x27, 0xdb, 0xbe, 0x76, 0x0c, 0x6a, 0xca, 0x75, 0x62, 0x02, 0x20, - 0x61, 0xc2, 0xf4, 0x50, 0x13, 0x0a, 0xe8, 0x7f, 0xa0, 0x2a, 0xe8, 0x77, 0xaa, 0xed, 0x6b, 0xff, - 0x4f, 0xeb, 0x4f, 0xcc, 0x08, 0x83, 0xdf, 0x43, 0xb3, 0x4d, 0xe6, 0x09, 0xca, 0x73, 0x33, 0xf2, - 0xf0, 0xac, 0xf4, 0x3e, 0x3c, 0x41, 0x17, 0x71, 0x03, 0x01, 0xbe, 0x38, 0x0f, 0x1f, 0x01, 0x50, - 0x0e, 0x8b, 0x10, 0x13, 0xaa, 0x91, 0xc7, 0x0a, 0xca, 0xf7, 0xeb, 0x1f, 0x74, 0xdd, 0x45, 0xc7, - 0x23, 0xfb, 0xc2, 0x18, 0x08, 0x51, 0x0a, 0x2a, 0xff, 0xe1, 0x6b, 0xcb, 0x35, 0x5b, 0xdc, 0xf3, - 0x2a, 0xfa, 0x0e, 0x6b, 0xc0, 0x13, 0x04, 0xff, 0x14, 0x78, 0xf5, 0xbe, 0x21, 0x5a, 0x2e, 0xe5, - 0x7a, 0xc9, 0x11, 0x6d, 0x5f, 0x3b, 0xdd, 0x7d, 0x3c, 0x2c, 0x59, 0x8f, 0x98, 0x5d, 0x1b, 0x90, - 0x47, 0xd3, 0xbd, 0x59, 0xdd, 0xf6, 0xc4, 0x7f, 0x6c, 0xcb, 0xfb, 0xb1, 0xce, 0x87, 0xa4, 0xce, - 0xab, 0xc3, 0x74, 0x0e, 0x28, 0x8d, 0x20, 0x74, 0x70, 0xc1, 0x47, 0x4d, 0xca, 0x03, 0x9f, 0x49, - 0x5e, 0xf0, 0xb1, 0x22, 0xc4, 0x8c, 0x51, 0xe4, 0x6b, 0x05, 0x69, 0x7d, 0x45, 0x00, 0x6f, 0x1c, - 0xf8, 0x16, 0x4b, 0x4e, 0xca, 0x9a, 0x5b, 0x63, 0x5b, 0xb3, 0xd0, 0xf5, 0xe5, 0x47, 0xce, 0xa4, - 0xcb, 0x93, 0xb3, 0x48, 0xed, 0x5c, 0xcf, 0x6f, 0xda, 0xbb, 0x9e, 0x5d, 0xb5, 0x45, 0x2b, 0x7a, - 0xdd, 0xbe, 0x53, 0xd0, 0x99, 0x9e, 0x61, 0x60, 0xfb, 0x10, 0x65, 0xea, 0xd1, 0x22, 0x5c, 0x82, - 0x03, 0xae, 0xef, 0x4d, 0x10, 0x14, 0x34, 0x8a, 0x33, 0xc9, 0x4f, 0x7f, 0x6a, 0xab, 0x23, 0x34, - 0x16, 0x14, 0xe1, 0x66, 0x67, 0xc7, 0x4b, 0xed, 0xa3, 0xe8, 0xb0, 0xa4, 0x87, 0x3f, 0x43, 0xf2, - 0xdd, 0xe7, 0xb8, 0xcf, 0x67, 0x74, 0x60, 0x5e, 0x51, 0x57, 0x87, 0x03, 0xc3, 0x26, 0xc9, 0xf3, - 0x8f, 0x7e, 0xfb, 0xfb, 0xf1, 0xf4, 0x39, 0x7c, 0xc6, 0xe8, 0x3b, 0x42, 0x72, 0xfc, 0xa5, 0x82, - 0x8e, 0x44, 0x33, 0x00, 0x3e, 0x3f, 0xa0, 0x76, 0xd7, 0x00, 0xa1, 0x5e, 0x18, 0x09, 0x0b, 0x54, - 0x56, 0x24, 0x95, 0xe7, 0xb0, 0xd6, 0x9b, 0x4a, 0x3c, 0x56, 0xe0, 0x1f, 0x14, 0x74, 0x3c, 0xed, - 0x19, 0xbe, 0x38, 0x60, 0xa3, 0x9e, 0xee, 0xab, 0xeb, 0x63, 0x64, 0x00, 0xc1, 0x82, 0x24, 0xb8, - 0x82, 0x5f, 0xec, 0x4d, 0x30, 0x7c, 0xb1, 0x63, 0x03, 0xf1, 0x17, 0x0a, 0x9a, 0x09, 0x3a, 0xc4, - 0xcb, 0x43, 0xdc, 0x88, 0x28, 0xad, 0x0c, 0xc5, 0x01, 0x91, 0x35, 0x49, 0x64, 0x19, 0xbf, 0x30, - 0xc0, 0x34, 0xe3, 0xd3, 0xf0, 0x8e, 0x78, 0x88, 0xbf, 0x57, 0x10, 0xea, 0x0c, 0x4c, 0x78, 0x6d, - 0xc8, 0x2e, 0xa9, 0xe9, 0x4c, 0x2d, 0x8c, 0x88, 0x06, 0x66, 0x1b, 0x92, 0x59, 0x01, 0x5f, 0x18, - 0x85, 0x99, 0x11, 0x0e, 0x63, 0xf8, 0x47, 0x05, 0xcd, 0x25, 0x26, 0x28, 0x5c, 0x18, 0x66, 0x4d, - 0x6a, 0x60, 0x53, 0xf5, 0x51, 0xe1, 0xc0, 0xf1, 0x15, 0xc9, 0x71, 0x03, 0xaf, 0x8f, 0xc4, 0x31, - 0x39, 0x87, 0xc5, 0x52, 0x86, 0x03, 0xce, 0x50, 0x29, 0x53, 0xc3, 0xd9, 0x50, 0x29, 0xd3, 0x43, - 0xd8, 0x98, 0x52, 0xca, 0x8b, 0x8f, 0xe3, 0x6f, 0x15, 0x94, 0x89, 0x67, 0x0d, 0x3c, 0xe8, 0xf3, - 0xeb, 0x9e, 0xc9, 0xd4, 0xb5, 0xd1, 0xc0, 0x93, 0x19, 0x1d, 0xe4, 0x72, 0xfc, 0xab, 0x82, 0x16, - 0xb7, 0xb8, 0xb0, 0x1b, 0x96, 0xa0, 0x07, 0x5e, 0x70, 0xbc, 0x31, 0x88, 0x40, 0x9f, 0x79, 0x47, - 0x7d, 0x79, 0xbc, 0x24, 0x60, 0xbf, 0x29, 0xd9, 0x5f, 0xc3, 0xaf, 0xf6, 0x66, 0x1f, 0xf3, 0xa6, - 0x40, 0xd6, 0x90, 0xe3, 0x1d, 0x0d, 0x6a, 0xc1, 0x5b, 0x53, 0xb6, 0x1d, 0xfc, 0x54, 0x41, 0x6a, - 0x9f, 0x76, 0x6e, 0x7b, 0x02, 0x8f, 0x41, 0xad, 0x33, 0x29, 0xa8, 0x97, 0xc7, 0xcc, 0x82, 0x8e, - 0xb6, 0x64, 0x47, 0xaf, 0xe1, 0xab, 0x93, 0x77, 0xc4, 0x3c, 0x51, 0xbc, 0xf1, 0xe4, 0x59, 0x5e, - 0x79, 0xfa, 0x2c, 0xaf, 0xfc, 0xf5, 0x2c, 0xaf, 0x7c, 0xb5, 0x9f, 0x9f, 0x7a, 0xba, 0x9f, 0x9f, - 0xfa, 0x7d, 0x3f, 0x3f, 0xf5, 0xe1, 0x5a, 0xe2, 0x0d, 0x83, 0x2d, 0x0a, 0x75, 0xab, 0xc2, 0xe3, - 0xfd, 0x1e, 0x84, 0x3b, 0xca, 0xd7, 0xac, 0x32, 0x2b, 0xff, 0xea, 0xda, 0xf8, 0x37, 0x00, 0x00, - 0xff, 0xff, 0xec, 0x45, 0x83, 0x84, 0x06, 0x11, 0x00, 0x00, + 0x80, 0x24, 0xb4, 0xf1, 0x6e, 0xd3, 0x50, 0x21, 0x2a, 0x5a, 0xa8, 0x49, 0xda, 0x5a, 0x02, 0x1a, + 0xb6, 0x08, 0x10, 0x1c, 0xcc, 0x3a, 0x9e, 0xba, 0xab, 0xda, 0x3b, 0x1b, 0xcf, 0x6c, 0x53, 0x0b, + 0x55, 0xa0, 0x4a, 0xdc, 0x38, 0x80, 0xca, 0x0d, 0xc4, 0x09, 0x09, 0x89, 0x33, 0x7f, 0x44, 0x85, + 0x38, 0x54, 0xe2, 0x82, 0x38, 0x2c, 0xa8, 0xe5, 0x2f, 0xf0, 0x1d, 0x09, 0xed, 0xec, 0xdb, 0xf5, + 0xae, 0xe3, 0xdf, 0x12, 0xa7, 0xd6, 0xf3, 0x3e, 0xef, 0xcd, 0xe7, 0x7d, 0x3e, 0xb3, 0x33, 0x2f, + 0x68, 0x89, 0xf1, 0x06, 0xe3, 0x36, 0x37, 0x6a, 0x56, 0xa3, 0x61, 0xdc, 0x5b, 0xaf, 0x50, 0x61, + 0xad, 0x1b, 0xbb, 0x1e, 0x6d, 0xb6, 0x74, 0xb7, 0xc9, 0x04, 0xc3, 0x59, 0x40, 0xe8, 0x01, 0x42, + 0x07, 0x84, 0x9a, 0xad, 0xb1, 0x1a, 0x93, 0x00, 0x23, 0xf8, 0x5f, 0x88, 0x55, 0xcf, 0xf4, 0xac, + 0x26, 0xee, 0x43, 0x58, 0xeb, 0x19, 0x76, 0x19, 0xab, 0x03, 0x20, 0xbf, 0x23, 0x11, 0x46, 0xc5, + 0xe2, 0x34, 0x8e, 0xef, 0x30, 0xdb, 0x81, 0xf8, 0xd9, 0x64, 0x5c, 0x92, 0xec, 0x54, 0xb1, 0x6a, + 0xb6, 0x63, 0x09, 0x9b, 0x45, 0xd8, 0xd3, 0x35, 0xc6, 0x6a, 0x75, 0x6a, 0x58, 0xae, 0x6d, 0x58, + 0x8e, 0xc3, 0x84, 0x0c, 0x72, 0x88, 0x2e, 0x42, 0x54, 0xfe, 0xaa, 0x78, 0xb7, 0x0d, 0xcb, 0x69, + 0x45, 0xa1, 0x70, 0x93, 0x72, 0xd8, 0x5d, 0xf8, 0x23, 0x0c, 0x91, 0x2b, 0xe8, 0xd8, 0xbb, 0xc1, + 0xae, 0xdb, 0x8c, 0xd5, 0x4d, 0xba, 0xeb, 0x51, 0x2e, 0xf0, 0x59, 0x34, 0x1b, 0x74, 0x50, 0xaa, + 0xe6, 0x94, 0x25, 0x65, 0x75, 0xa6, 0x88, 0xdb, 0xbe, 0x76, 0xb4, 0x65, 0x35, 0xea, 0x97, 0x48, + 0xb0, 0x5e, 0xb6, 0xab, 0xc4, 0x04, 0x04, 0xb9, 0x81, 0x8e, 0x27, 0xf2, 0xb9, 0xcb, 0x1c, 0x4e, + 0xf1, 0x06, 0x9a, 0x09, 0xc2, 0x32, 0x7d, 0xee, 0x42, 0x56, 0x0f, 0x99, 0xe9, 0x11, 0x33, 0xfd, + 0xaa, 0xd3, 0x2a, 0x66, 0x7e, 0xf9, 0xb9, 0x70, 0x30, 0xc8, 0x2a, 0x99, 0x12, 0x4c, 0x3e, 0x4e, + 0x54, 0xe2, 0x11, 0x95, 0x6b, 0x08, 0x75, 0x64, 0xc8, 0x4d, 0xcb, 0x7a, 0xcb, 0x3a, 0x74, 0x10, + 0x68, 0xa6, 0x87, 0xc6, 0x82, 0x66, 0xfa, 0xb6, 0x55, 0xa3, 0x90, 0x6b, 0x26, 0x32, 0xc9, 0x37, + 0x0a, 0xc2, 0xc9, 0xea, 0x40, 0xf4, 0x22, 0x3a, 0x18, 0xec, 0xcd, 0x73, 0xca, 0xd2, 0x81, 0x51, + 0x98, 0x86, 0x68, 0x7c, 0xbd, 0x07, 0xab, 0x95, 0xa1, 0xac, 0xc2, 0x3d, 0x53, 0xb4, 0x16, 0x50, + 0x56, 0xb2, 0x7a, 0xc7, 0x6b, 0x24, 0xdb, 0x26, 0x25, 0x34, 0xdf, 0xb5, 0x0e, 0x84, 0xcf, 0xa3, + 0x43, 0x0e, 0xac, 0x81, 0x39, 0xd9, 0xb6, 0xaf, 0x1d, 0x0b, 0xcd, 0x71, 0xbc, 0x46, 0x59, 0x12, + 0x24, 0x66, 0x8c, 0x22, 0x9b, 0x68, 0x21, 0x6e, 0x7c, 0xdb, 0x6a, 0x5a, 0x0d, 0x3e, 0x89, 0xcd, + 0xd7, 0xd1, 0xc9, 0x7d, 0x55, 0x80, 0xd2, 0x1a, 0x9a, 0x75, 0xe5, 0xca, 0x20, 0xbb, 0x4d, 0xc0, + 0x90, 0x2d, 0x28, 0xf4, 0x1e, 0x13, 0x56, 0xfd, 0xd6, 0x1d, 0xab, 0x49, 0x27, 0xe2, 0x23, 0x50, + 0x6e, 0x7f, 0x19, 0x20, 0xf4, 0x21, 0x9a, 0x13, 0x9d, 0x65, 0x60, 0xb5, 0x98, 0xb2, 0x27, 0x32, + 0xe6, 0x4d, 0x66, 0x3b, 0xc5, 0x53, 0x8f, 0x7d, 0x6d, 0xaa, 0xed, 0x6b, 0x27, 0xc2, 0xbd, 0x64, + 0x6e, 0x99, 0xcb, 0x64, 0x62, 0x26, 0x4b, 0xa5, 0xb4, 0xbc, 0xca, 0x39, 0x15, 0x13, 0x71, 0xff, + 0x24, 0xa1, 0x65, 0x54, 0x05, 0xa8, 0x6f, 0x21, 0xe4, 0xc6, 0xab, 0x70, 0x28, 0x35, 0xbd, 0xd7, + 0x75, 0xa5, 0xc7, 0xd9, 0xc5, 0x99, 0x80, 0xbf, 0x99, 0x48, 0x24, 0x9f, 0x4f, 0xc3, 0xf9, 0xb9, + 0xe5, 0x32, 0xb1, 0xdd, 0xb4, 0x77, 0xe8, 0x04, 0x3c, 0xf1, 0x65, 0x74, 0x58, 0xb0, 0xbb, 0xd4, + 0x29, 0x39, 0x9b, 0xd4, 0x61, 0x0d, 0x79, 0xce, 0x33, 0xc5, 0xc5, 0xb6, 0xaf, 0xcd, 0x47, 0x4a, + 0xdd, 0xa5, 0x4e, 0xd9, 0x76, 0xca, 0xd5, 0x20, 0x4e, 0xcc, 0x14, 0x1c, 0xbf, 0x81, 0x8e, 0xc8, + 0xdf, 0x37, 0x3d, 0x11, 0xe6, 0x1f, 0x90, 0xf9, 0x6a, 0xdb, 0xd7, 0x16, 0x92, 0xf9, 0xcc, 0x13, + 0x51, 0x81, 0x74, 0x02, 0xbe, 0x84, 0xe6, 0xf6, 0x6c, 0x71, 0xe7, 0xd6, 0x9e, 0xe5, 0x5e, 0xa3, + 0x34, 0x37, 0xb3, 0xa4, 0xac, 0x1e, 0x2a, 0xe6, 0xda, 0xbe, 0x96, 0x0d, 0xf3, 0x83, 0x60, 0x99, + 0xef, 0x59, 0x6e, 0xf9, 0x36, 0xa5, 0xc4, 0x4c, 0x82, 0xc9, 0xdb, 0x60, 0x55, 0x42, 0x81, 0xf8, + 0x72, 0xca, 0xf0, 0x68, 0x51, 0xaa, 0x90, 0x29, 0xce, 0xb7, 0x7d, 0xed, 0x78, 0x58, 0x33, 0x08, + 0x95, 0xdd, 0x20, 0x46, 0xcc, 0x0e, 0x8e, 0xfc, 0xa3, 0xa0, 0x33, 0x61, 0xbd, 0x3d, 0xcb, 0xdd, + 0xba, 0x6f, 0xed, 0x88, 0xab, 0x0d, 0xe6, 0x39, 0xa2, 0xe4, 0x44, 0xca, 0xbe, 0x84, 0x66, 0x39, + 0x75, 0xaa, 0xb4, 0x09, 0x35, 0x8f, 0xb7, 0x7d, 0xed, 0x08, 0xd4, 0x94, 0xeb, 0xc4, 0x04, 0x40, + 0xc2, 0x84, 0xe9, 0xa1, 0x26, 0x14, 0xd0, 0xff, 0x40, 0x55, 0xd0, 0xef, 0x44, 0xdb, 0xd7, 0xfe, + 0x9f, 0xd6, 0x9f, 0x98, 0x11, 0x06, 0xbf, 0x8f, 0x66, 0x9b, 0xcc, 0x13, 0x94, 0xe7, 0x66, 0xe4, + 0xe1, 0x59, 0xe9, 0x7d, 0x78, 0x82, 0x2e, 0xe2, 0x06, 0x02, 0x7c, 0x71, 0x1e, 0x3e, 0x02, 0xa0, + 0x1c, 0x16, 0x21, 0x26, 0x54, 0x23, 0x8f, 0x14, 0x94, 0xef, 0xd7, 0x3f, 0xe8, 0xba, 0x8b, 0x8e, + 0x46, 0xf6, 0x85, 0x31, 0x10, 0xa2, 0x14, 0x54, 0xfe, 0xc3, 0xd7, 0x96, 0x6b, 0xb6, 0xb8, 0xe3, + 0x55, 0xf4, 0x1d, 0xd6, 0x80, 0x27, 0x08, 0xfe, 0x29, 0xf0, 0xea, 0x5d, 0x43, 0xb4, 0x5c, 0xca, + 0xf5, 0x92, 0x23, 0xda, 0xbe, 0x76, 0xb2, 0xfb, 0x78, 0x58, 0xb2, 0x1e, 0x31, 0xbb, 0x36, 0x20, + 0x0f, 0xa7, 0x7b, 0xb3, 0xba, 0xe9, 0x89, 0xff, 0xd8, 0x96, 0x0f, 0x62, 0x9d, 0x0f, 0x48, 0x9d, + 0x57, 0x87, 0xe9, 0x1c, 0x50, 0x1a, 0x41, 0xe8, 0xe0, 0x82, 0x8f, 0x9a, 0x94, 0x07, 0x3e, 0x93, + 0xbc, 0xe0, 0x63, 0x45, 0x88, 0x19, 0xa3, 0xc8, 0xd7, 0x0a, 0xd2, 0xfa, 0x8a, 0x00, 0xde, 0x38, + 0xf0, 0x2d, 0x96, 0x9c, 0x94, 0x35, 0x37, 0xc6, 0xb6, 0x66, 0xa1, 0xeb, 0xcb, 0x8f, 0x9c, 0x49, + 0x97, 0x27, 0xa7, 0x91, 0xda, 0xb9, 0x9e, 0xdf, 0xb2, 0x77, 0x3d, 0xbb, 0x6a, 0x8b, 0x56, 0xf4, + 0xba, 0x7d, 0xa7, 0xa0, 0x53, 0x3d, 0xc3, 0xc0, 0xf6, 0x01, 0xca, 0xd4, 0xa3, 0x45, 0xb8, 0x04, + 0x07, 0x5c, 0xdf, 0x9b, 0x20, 0x28, 0x68, 0x14, 0x67, 0x92, 0x9f, 0xfe, 0xd4, 0x56, 0x47, 0x68, + 0x2c, 0x28, 0xc2, 0xcd, 0xce, 0x8e, 0x17, 0xda, 0x87, 0xd1, 0x41, 0x49, 0x0f, 0x7f, 0x86, 0xe4, + 0xbb, 0xcf, 0x71, 0x9f, 0xcf, 0x68, 0xdf, 0xbc, 0xa2, 0xae, 0x0e, 0x07, 0x86, 0x4d, 0x92, 0xe7, + 0x1f, 0xfe, 0xf6, 0xf7, 0xa3, 0xe9, 0x33, 0xf8, 0x94, 0xd1, 0x77, 0x84, 0xe4, 0xf8, 0x4b, 0x05, + 0x1d, 0x8a, 0x66, 0x00, 0x7c, 0x76, 0x40, 0xed, 0xae, 0x01, 0x42, 0x3d, 0x37, 0x12, 0x16, 0xa8, + 0xac, 0x48, 0x2a, 0xcf, 0x61, 0xad, 0x37, 0x95, 0x78, 0xac, 0xc0, 0x3f, 0x28, 0xe8, 0x68, 0xda, + 0x33, 0x7c, 0x7e, 0xc0, 0x46, 0x3d, 0xdd, 0x57, 0xd7, 0xc7, 0xc8, 0x00, 0x82, 0x05, 0x49, 0x70, + 0x05, 0xbf, 0xd8, 0x9b, 0x60, 0xf8, 0x62, 0xc7, 0x06, 0xe2, 0x2f, 0x14, 0x34, 0x13, 0x74, 0x88, + 0x97, 0x87, 0xb8, 0x11, 0x51, 0x5a, 0x19, 0x8a, 0x03, 0x22, 0x6b, 0x92, 0xc8, 0x32, 0x7e, 0x61, + 0x80, 0x69, 0xc6, 0xa7, 0xe1, 0x1d, 0xf1, 0x00, 0x7f, 0xaf, 0x20, 0xd4, 0x19, 0x98, 0xf0, 0xda, + 0x90, 0x5d, 0x52, 0xd3, 0x99, 0x5a, 0x18, 0x11, 0x0d, 0xcc, 0x36, 0x24, 0xb3, 0x02, 0x3e, 0x37, + 0x0a, 0x33, 0x23, 0x1c, 0xc6, 0xf0, 0x8f, 0x0a, 0x9a, 0x4b, 0x4c, 0x50, 0xb8, 0x30, 0xcc, 0x9a, + 0xd4, 0xc0, 0xa6, 0xea, 0xa3, 0xc2, 0x81, 0xe3, 0xab, 0x92, 0xe3, 0x06, 0x5e, 0x1f, 0x89, 0x63, + 0x72, 0x0e, 0x8b, 0xa5, 0x0c, 0x07, 0x9c, 0xa1, 0x52, 0xa6, 0x86, 0xb3, 0xa1, 0x52, 0xa6, 0x87, + 0xb0, 0x31, 0xa5, 0x94, 0x17, 0x1f, 0xc7, 0xdf, 0x2a, 0x28, 0x13, 0xcf, 0x1a, 0x78, 0xd0, 0xe7, + 0xd7, 0x3d, 0x93, 0xa9, 0x6b, 0xa3, 0x81, 0x27, 0x33, 0x3a, 0xc8, 0xe5, 0xf8, 0x57, 0x05, 0x2d, + 0x6e, 0x71, 0x61, 0x37, 0x2c, 0x41, 0xf7, 0xbd, 0xe0, 0x78, 0x63, 0x10, 0x81, 0x3e, 0xf3, 0x8e, + 0xfa, 0xf2, 0x78, 0x49, 0xc0, 0x7e, 0x53, 0xb2, 0xbf, 0x82, 0x5f, 0xeb, 0xcd, 0x3e, 0xe6, 0x4d, + 0x81, 0xac, 0x21, 0xc7, 0x3b, 0x1a, 0xd4, 0x82, 0xb7, 0xa6, 0x6c, 0x3b, 0xf8, 0x89, 0x82, 0xd4, + 0x3e, 0xed, 0xdc, 0xf4, 0x04, 0x1e, 0x83, 0x5a, 0x67, 0x52, 0x50, 0x2f, 0x8e, 0x99, 0x05, 0x1d, + 0x6d, 0xc9, 0x8e, 0x5e, 0xc7, 0x97, 0x27, 0xef, 0x88, 0x79, 0xa2, 0x58, 0x7a, 0xfc, 0x34, 0xaf, + 0x3c, 0x79, 0x9a, 0x57, 0xfe, 0x7a, 0x9a, 0x57, 0xbe, 0x7a, 0x96, 0x9f, 0x7a, 0xf2, 0x2c, 0x3f, + 0xf5, 0xfb, 0xb3, 0xfc, 0xd4, 0x47, 0x46, 0xe2, 0x0d, 0x83, 0x2d, 0x0a, 0x75, 0xab, 0xc2, 0xe3, + 0xfd, 0xee, 0xbd, 0x62, 0xdc, 0x0f, 0x37, 0x95, 0x0f, 0x5a, 0x65, 0x56, 0xfe, 0xe1, 0xb5, 0xf1, + 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xae, 0x6a, 0x1e, 0x71, 0x09, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gamm/types/tx.pb.go b/x/gamm/types/tx.pb.go index cda7047941a..33eef014c37 100644 --- a/x/gamm/types/tx.pb.go +++ b/x/gamm/types/tx.pb.go @@ -944,71 +944,71 @@ func init() { func init() { proto.RegisterFile("osmosis/gamm/v1beta1/tx.proto", fileDescriptor_cfc8fd3ac7df3247) } var fileDescriptor_cfc8fd3ac7df3247 = []byte{ - // 1018 bytes of a gzipped FileDescriptorProto + // 1020 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x6f, 0x1b, 0x45, - 0x18, 0xce, 0xda, 0x6e, 0xda, 0xbe, 0x21, 0xa5, 0x59, 0x92, 0xc6, 0xd9, 0xb6, 0xde, 0x74, 0x5a, - 0x41, 0x5a, 0xe8, 0x2e, 0x4d, 0x25, 0x40, 0x48, 0x20, 0x30, 0xa4, 0xc2, 0xa8, 0x96, 0xd1, 0xf6, - 0x82, 0xb8, 0x98, 0xb5, 0xbd, 0x72, 0x57, 0xcd, 0xce, 0x18, 0xcf, 0x6c, 0x71, 0xc5, 0x81, 0x0f, - 0x89, 0x3b, 0xbf, 0x00, 0xf1, 0x33, 0xe8, 0x01, 0xce, 0x3d, 0x56, 0x42, 0x48, 0x88, 0x83, 0x85, - 0x92, 0x7f, 0xe0, 0x5f, 0x80, 0x76, 0x67, 0x76, 0xbd, 0x9f, 0xb6, 0xb7, 0x8d, 0x73, 0x4a, 0xe2, - 0x79, 0xe7, 0x79, 0xdf, 0x79, 0x9e, 0xf7, 0x2b, 0x86, 0xab, 0x84, 0x3a, 0x84, 0xda, 0x54, 0xef, - 0x9b, 0x8e, 0xa3, 0x3f, 0xbe, 0xd3, 0xb1, 0x98, 0x79, 0x47, 0x67, 0x23, 0x6d, 0x30, 0x24, 0x8c, - 0xc8, 0x9b, 0xe2, 0x58, 0xf3, 0x8e, 0x35, 0x71, 0xac, 0x6c, 0xf6, 0x49, 0x9f, 0xf8, 0x06, 0xba, - 0xf7, 0x1b, 0xb7, 0x55, 0x6a, 0x5d, 0xdf, 0x58, 0xef, 0x98, 0xd4, 0x0a, 0x91, 0xba, 0xc4, 0xc6, - 0xfc, 0x1c, 0xfd, 0x5e, 0x82, 0xb5, 0x26, 0xed, 0x7f, 0x4e, 0x6c, 0xfc, 0x05, 0x21, 0x87, 0xf2, - 0x4d, 0x58, 0xa5, 0x16, 0xee, 0x59, 0xc3, 0xaa, 0xb4, 0x2b, 0xed, 0x9d, 0xaf, 0x6f, 0x4c, 0xc6, - 0xea, 0xfa, 0x13, 0xd3, 0x39, 0x7c, 0x1f, 0xf1, 0xcf, 0x91, 0x21, 0x0c, 0xe4, 0x5b, 0xb0, 0x3a, - 0x20, 0xe4, 0xb0, 0xd1, 0xab, 0x96, 0x76, 0xa5, 0xbd, 0x4a, 0x5d, 0x9e, 0x8c, 0xd5, 0x0b, 0xdc, - 0xd4, 0xfb, 0xbc, 0x6d, 0xf7, 0x90, 0x21, 0x2c, 0xe4, 0x01, 0x5c, 0xa0, 0x0f, 0xcd, 0xa1, 0xd5, - 0x72, 0xd9, 0xc7, 0x0e, 0x71, 0x31, 0xab, 0x96, 0x7d, 0xf8, 0xcf, 0x9e, 0x8d, 0xd5, 0x95, 0x7f, - 0xc7, 0xea, 0xeb, 0x7d, 0x9b, 0x3d, 0x74, 0x3b, 0x5a, 0x97, 0x38, 0xba, 0x88, 0x98, 0xff, 0xb8, - 0x4d, 0x7b, 0x8f, 0x74, 0xf6, 0x64, 0x60, 0x51, 0xad, 0x81, 0xd9, 0x64, 0xac, 0x5e, 0x8a, 0x78, - 0x30, 0x7d, 0xa8, 0x36, 0x71, 0x19, 0x32, 0x12, 0xf8, 0xf2, 0xd7, 0xb0, 0xc6, 0xc8, 0x23, 0x0b, - 0x37, 0x70, 0xd3, 0x1c, 0xd1, 0x6a, 0x65, 0xb7, 0xbc, 0xb7, 0xb6, 0xbf, 0xa3, 0x71, 0x54, 0xcd, - 0xa3, 0x23, 0x60, 0x4e, 0xfb, 0x84, 0xd8, 0xb8, 0x7e, 0xdd, 0x8b, 0x64, 0x32, 0x56, 0x2f, 0x73, - 0x7c, 0xff, 0x6e, 0xdb, 0xc6, 0x6d, 0xc7, 0x1c, 0x09, 0x3f, 0x14, 0x19, 0x51, 0x48, 0xb4, 0x05, - 0xaf, 0x45, 0x98, 0x33, 0x2c, 0x3a, 0x20, 0x98, 0x5a, 0xe8, 0x29, 0x67, 0xf4, 0x60, 0x64, 0xb3, - 0x65, 0x32, 0x8a, 0x61, 0xdd, 0x7f, 0x71, 0x03, 0x9f, 0x0c, 0xa1, 0x3e, 0x98, 0xf7, 0x60, 0xfe, - 0x58, 0x64, 0xc4, 0xe1, 0xe5, 0x2e, 0xbc, 0xe2, 0x3f, 0xbe, 0xe5, 0xb2, 0xa6, 0x8d, 0x17, 0x20, - 0xf4, 0x86, 0x20, 0xf4, 0x4a, 0x94, 0x50, 0xe2, 0xb2, 0xb6, 0x13, 0x3a, 0xa1, 0xc8, 0x88, 0x81, - 0x0a, 0x4a, 0x03, 0xea, 0x42, 0x4a, 0x7f, 0x94, 0x60, 0xe3, 0xc1, 0xb7, 0xe6, 0x80, 0x87, 0xd2, - 0xc0, 0x06, 0x71, 0x99, 0x15, 0x61, 0x4b, 0x9a, 0xcb, 0xd6, 0x47, 0xb0, 0x1e, 0x38, 0xfa, 0xd4, - 0xc2, 0xc4, 0xf1, 0x09, 0x3e, 0x5f, 0x57, 0xa6, 0xef, 0x9f, 0xc6, 0xd7, 0xf3, 0x0c, 0x90, 0x11, - 0xbf, 0x80, 0xfe, 0x2a, 0xc1, 0x66, 0x93, 0xf6, 0xbd, 0x30, 0x0e, 0x46, 0x66, 0x97, 0x05, 0xb1, - 0x14, 0xd1, 0xf7, 0x00, 0x56, 0x87, 0x5e, 0xe8, 0xb4, 0x5a, 0xf2, 0xd9, 0x7b, 0x43, 0xcb, 0xaa, - 0x64, 0x2d, 0xf5, 0xd4, 0x7a, 0xc5, 0xe3, 0xd2, 0x10, 0x97, 0xe5, 0xfb, 0x70, 0x56, 0xe4, 0xa1, - 0x2f, 0xfa, 0x4c, 0x15, 0xb6, 0x85, 0x0a, 0xaf, 0xc6, 0xd3, 0x1a, 0x19, 0x01, 0x84, 0xfc, 0x1d, - 0x6c, 0x44, 0x34, 0x10, 0xc9, 0x54, 0xf1, 0x9f, 0xd2, 0x2c, 0x9c, 0x4c, 0x97, 0xf3, 0xc5, 0x46, - 0x46, 0xda, 0x0f, 0xaa, 0xc1, 0x95, 0x2c, 0x52, 0x43, 0xe5, 0x7f, 0x90, 0x40, 0x9e, 0xd2, 0xd1, - 0x72, 0x59, 0x71, 0xe9, 0x3f, 0x14, 0x89, 0xdb, 0xc0, 0x8b, 0x2a, 0x1f, 0xb3, 0x47, 0x7f, 0x97, - 0x60, 0x2b, 0x1d, 0x63, 0xcb, 0x65, 0x45, 0x94, 0xbf, 0x97, 0x50, 0x7e, 0x6f, 0x9e, 0xf2, 0xc1, - 0x53, 0x13, 0xd2, 0x8f, 0xe0, 0xe2, 0xb4, 0x05, 0xc5, 0x0a, 0xff, 0x7e, 0x61, 0xad, 0x94, 0xdc, - 0x4e, 0x87, 0x8c, 0x94, 0x17, 0xb9, 0x05, 0xe7, 0x02, 0xf9, 0xfc, 0xec, 0x98, 0x99, 0x75, 0x55, - 0x91, 0x75, 0x17, 0x13, 0x0c, 0x23, 0x23, 0x04, 0x41, 0x2a, 0x5c, 0xcd, 0xa4, 0x35, 0xd4, 0xfe, - 0x8f, 0x12, 0xec, 0x88, 0x06, 0xcb, 0xad, 0x98, 0x35, 0xc4, 0x2f, 0x52, 0x76, 0x45, 0xda, 0xea, - 0x89, 0xd7, 0x56, 0x30, 0x96, 0x4e, 0xac, 0xb6, 0x78, 0xa3, 0x4e, 0xd5, 0x56, 0xca, 0x0f, 0xba, - 0x0e, 0xd7, 0x72, 0xe9, 0x0b, 0x49, 0xfe, 0xb5, 0x1c, 0x23, 0xf9, 0x81, 0x87, 0xf2, 0x42, 0x19, - 0x5e, 0x84, 0xe4, 0x0f, 0x12, 0x25, 0xc9, 0x33, 0x78, 0x67, 0x32, 0x56, 0xb7, 0x12, 0x39, 0x99, - 0x55, 0x91, 0xf2, 0x37, 0xa9, 0x65, 0x82, 0x53, 0xda, 0x28, 0x4c, 0xe9, 0x76, 0x92, 0xd2, 0x80, - 0xce, 0xe4, 0x36, 0x91, 0x55, 0x77, 0x67, 0x4e, 0xa3, 0xee, 0x12, 0x2a, 0xc6, 0xf5, 0x09, 0x55, - 0xfc, 0xad, 0x0c, 0x55, 0x31, 0x38, 0x13, 0x56, 0xcb, 0xab, 0x94, 0xd4, 0x48, 0x2d, 0x17, 0x1c, - 0xa9, 0xe9, 0x15, 0xa6, 0xb2, 0xdc, 0x15, 0x26, 0x73, 0xd2, 0x9d, 0x39, 0xa5, 0x49, 0x87, 0x60, - 0x37, 0x4f, 0xa1, 0x50, 0xc6, 0x3f, 0x4b, 0xa0, 0x44, 0x8c, 0xa2, 0x25, 0xbb, 0xc4, 0x6a, 0x8c, - 0x76, 0xf6, 0xf2, 0x09, 0x74, 0x76, 0xaf, 0x58, 0x04, 0xf1, 0xd3, 0x62, 0xa9, 0xbc, 0x5c, 0xb1, - 0x84, 0xd2, 0xc6, 0x8a, 0x25, 0xe9, 0x05, 0xdd, 0x00, 0x94, 0xcf, 0x5f, 0x40, 0xf3, 0xfe, 0xd3, - 0xb3, 0x50, 0x6e, 0xd2, 0xbe, 0xfc, 0x25, 0x9c, 0x0b, 0xff, 0xef, 0xb9, 0x96, 0x3d, 0x90, 0x23, - 0x0b, 0xbe, 0x72, 0x73, 0xae, 0x49, 0xe0, 0xc1, 0x43, 0x0e, 0xf7, 0xff, 0x7c, 0xe4, 0xc0, 0x64, - 0x06, 0x72, 0x72, 0x15, 0x96, 0x29, 0xdf, 0x84, 0xe3, 0x2b, 0xe8, 0xad, 0xdc, 0xfb, 0x29, 0x5b, - 0x65, 0x7f, 0x71, 0xdb, 0xd0, 0xe9, 0x63, 0xbe, 0x84, 0x25, 0xd6, 0x9f, 0x37, 0x17, 0x45, 0x6a, - 0xb9, 0x4c, 0xb9, 0x5b, 0xc0, 0x38, 0xf4, 0xfb, 0x93, 0x04, 0x97, 0x72, 0xc6, 0xbf, 0x3e, 0x53, - 0x8c, 0xf4, 0x05, 0xe5, 0xdd, 0x82, 0x17, 0x32, 0x83, 0x48, 0x8c, 0xc7, 0xf9, 0x41, 0xc4, 0x2f, - 0x2c, 0x10, 0x44, 0x76, 0x83, 0x97, 0x7f, 0x96, 0x60, 0x3b, 0xaf, 0x2d, 0xbc, 0x3d, 0x33, 0x7b, - 0x32, 0x6e, 0x28, 0xef, 0x15, 0xbd, 0x11, 0xc6, 0xf1, 0x3d, 0x6c, 0x65, 0x0f, 0x19, 0x6d, 0x2e, - 0x64, 0xcc, 0x5e, 0x79, 0xa7, 0x98, 0x7d, 0x10, 0x40, 0xfd, 0xde, 0xb3, 0xa3, 0x9a, 0xf4, 0xfc, - 0xa8, 0x26, 0xfd, 0x77, 0x54, 0x93, 0x7e, 0x39, 0xae, 0xad, 0x3c, 0x3f, 0xae, 0xad, 0xfc, 0x73, - 0x5c, 0x5b, 0xf9, 0xea, 0xad, 0x48, 0x4f, 0x11, 0xd8, 0xb7, 0x0f, 0xcd, 0x0e, 0x0d, 0xfe, 0xd0, - 0x47, 0xfc, 0xeb, 0x14, 0xbf, 0xbb, 0x74, 0x56, 0xfd, 0xaf, 0x3f, 0xee, 0xfe, 0x1f, 0x00, 0x00, - 0xff, 0xff, 0xb8, 0x33, 0x3b, 0x9d, 0x6b, 0x11, 0x00, 0x00, + 0x18, 0xce, 0xda, 0x6e, 0xda, 0xbe, 0x21, 0xa5, 0x59, 0x92, 0xc6, 0xd9, 0xb6, 0x76, 0x3a, 0xad, + 0x20, 0x2d, 0xea, 0x2e, 0x4d, 0x25, 0x8a, 0x90, 0x40, 0x60, 0x08, 0x62, 0x51, 0x2d, 0xa3, 0xed, + 0x05, 0x71, 0x31, 0x6b, 0x7b, 0xe5, 0xae, 0x9a, 0x9d, 0x31, 0x9e, 0xd9, 0xe0, 0x8a, 0x03, 0x1f, + 0x12, 0x77, 0x7e, 0x01, 0xe2, 0x67, 0xd0, 0x03, 0x9c, 0x7b, 0xac, 0x84, 0x90, 0x10, 0x07, 0x0b, + 0x25, 0xff, 0xc0, 0xbf, 0x00, 0xed, 0xce, 0xec, 0x7a, 0x3f, 0x6d, 0x6f, 0x89, 0x73, 0x4a, 0xe2, + 0x79, 0xe7, 0x79, 0xdf, 0x79, 0x9e, 0xf7, 0x2b, 0x86, 0xeb, 0x84, 0x3a, 0x84, 0xda, 0x54, 0xeb, + 0x9b, 0x8e, 0xa3, 0x1d, 0xdd, 0xeb, 0x58, 0xcc, 0xbc, 0xa7, 0xb1, 0x91, 0x3a, 0x18, 0x12, 0x46, + 0xe4, 0x4d, 0x71, 0xac, 0x7a, 0xc7, 0xaa, 0x38, 0x56, 0x36, 0xfb, 0xa4, 0x4f, 0x7c, 0x03, 0xcd, + 0xfb, 0x8d, 0xdb, 0x2a, 0xb5, 0xae, 0x6f, 0xac, 0x75, 0x4c, 0x6a, 0x85, 0x48, 0x5d, 0x62, 0x63, + 0x7e, 0x8e, 0x7e, 0x2b, 0xc1, 0x5a, 0x93, 0xf6, 0x3f, 0x23, 0x36, 0xfe, 0x9c, 0x90, 0x43, 0xf9, + 0x36, 0xac, 0x52, 0x0b, 0xf7, 0xac, 0x61, 0x55, 0xda, 0x95, 0xf6, 0x2e, 0x36, 0x36, 0x26, 0xe3, + 0xfa, 0xfa, 0x53, 0xd3, 0x39, 0x7c, 0x17, 0xf1, 0xcf, 0x91, 0x21, 0x0c, 0xe4, 0x3b, 0xb0, 0x3a, + 0x20, 0xe4, 0x50, 0xef, 0x55, 0x4b, 0xbb, 0xd2, 0x5e, 0xa5, 0x21, 0x4f, 0xc6, 0xf5, 0x4b, 0xdc, + 0xd4, 0xfb, 0xbc, 0x6d, 0xf7, 0x90, 0x21, 0x2c, 0xe4, 0x01, 0x5c, 0xa2, 0x8f, 0xcd, 0xa1, 0xd5, + 0x72, 0xd9, 0x87, 0x0e, 0x71, 0x31, 0xab, 0x96, 0x7d, 0xf8, 0x4f, 0x9f, 0x8f, 0xeb, 0x2b, 0xff, + 0x8c, 0xeb, 0xaf, 0xf7, 0x6d, 0xf6, 0xd8, 0xed, 0xa8, 0x5d, 0xe2, 0x68, 0x22, 0x62, 0xfe, 0xe3, + 0x2e, 0xed, 0x3d, 0xd1, 0xd8, 0xd3, 0x81, 0x45, 0x55, 0x1d, 0xb3, 0xc9, 0xb8, 0x7e, 0x25, 0xe2, + 0xc1, 0xf4, 0xa1, 0xda, 0xc4, 0x65, 0xc8, 0x48, 0xe0, 0xcb, 0x5f, 0xc1, 0x1a, 0x23, 0x4f, 0x2c, + 0xac, 0xe3, 0xa6, 0x39, 0xa2, 0xd5, 0xca, 0x6e, 0x79, 0x6f, 0x6d, 0x7f, 0x47, 0xe5, 0xa8, 0xaa, + 0x47, 0x47, 0xc0, 0x9c, 0xfa, 0x11, 0xb1, 0x71, 0xe3, 0xa6, 0x17, 0xc9, 0x64, 0x5c, 0xbf, 0xca, + 0xf1, 0xfd, 0xbb, 0x6d, 0x1b, 0xb7, 0x1d, 0x73, 0x24, 0xfc, 0x50, 0x64, 0x44, 0x21, 0xd1, 0x16, + 0xbc, 0x16, 0x61, 0xce, 0xb0, 0xe8, 0x80, 0x60, 0x6a, 0xa1, 0x67, 0x9c, 0xd1, 0x83, 0x91, 0xcd, + 0x96, 0xc9, 0x28, 0x86, 0x75, 0xff, 0xc5, 0x3a, 0x3e, 0x1d, 0x42, 0x7d, 0x30, 0xef, 0xc1, 0xfc, + 0xb1, 0xc8, 0x88, 0xc3, 0xcb, 0x5d, 0x78, 0xc5, 0x7f, 0x7c, 0xcb, 0x65, 0x4d, 0x1b, 0x2f, 0x40, + 0xe8, 0x2d, 0x41, 0xe8, 0xb5, 0x28, 0xa1, 0xc4, 0x65, 0x6d, 0x27, 0x74, 0x42, 0x91, 0x11, 0x03, + 0x15, 0x94, 0x06, 0xd4, 0x85, 0x94, 0xfe, 0x20, 0xc1, 0xc6, 0xa3, 0x6f, 0xcc, 0x01, 0x0f, 0x45, + 0xc7, 0x06, 0x71, 0x99, 0x15, 0x61, 0x4b, 0x9a, 0xcb, 0xd6, 0x07, 0xb0, 0x1e, 0x38, 0xfa, 0xd8, + 0xc2, 0xc4, 0xf1, 0x09, 0xbe, 0xd8, 0x50, 0xa6, 0xef, 0x9f, 0xc6, 0xd7, 0xf3, 0x0c, 0x90, 0x11, + 0xbf, 0x80, 0xfe, 0x2c, 0xc1, 0x66, 0x93, 0xf6, 0xbd, 0x30, 0x0e, 0x46, 0x66, 0x97, 0x05, 0xb1, + 0x14, 0xd1, 0xf7, 0x00, 0x56, 0x87, 0x5e, 0xe8, 0xb4, 0x5a, 0xf2, 0xd9, 0x7b, 0x43, 0xcd, 0xaa, + 0x64, 0x35, 0xf5, 0xd4, 0x46, 0xc5, 0xe3, 0xd2, 0x10, 0x97, 0xe5, 0x87, 0x70, 0x5e, 0xe4, 0xa1, + 0x2f, 0xfa, 0x4c, 0x15, 0xb6, 0x85, 0x0a, 0xaf, 0xc6, 0xd3, 0x1a, 0x19, 0x01, 0x84, 0xfc, 0x2d, + 0x6c, 0x44, 0x34, 0x10, 0xc9, 0x54, 0xf1, 0x9f, 0xd2, 0x2c, 0x9c, 0x4c, 0x57, 0xf3, 0xc5, 0x46, + 0x46, 0xda, 0x0f, 0xaa, 0xc1, 0xb5, 0x2c, 0x52, 0x43, 0xe5, 0xbf, 0x97, 0x40, 0x9e, 0xd2, 0xd1, + 0x72, 0x59, 0x71, 0xe9, 0xdf, 0x17, 0x89, 0xab, 0xe3, 0x45, 0x95, 0x8f, 0xd9, 0xa3, 0xbf, 0x4a, + 0xb0, 0x95, 0x8e, 0xb1, 0xe5, 0xb2, 0x22, 0xca, 0x7f, 0x92, 0x50, 0x7e, 0x6f, 0x9e, 0xf2, 0xc1, + 0x53, 0x13, 0xd2, 0x8f, 0xe0, 0xf2, 0xb4, 0x05, 0xc5, 0x0a, 0xff, 0x61, 0x61, 0xad, 0x94, 0xdc, + 0x4e, 0x87, 0x8c, 0x94, 0x17, 0xb9, 0x05, 0x17, 0x02, 0xf9, 0xfc, 0xec, 0x98, 0x99, 0x75, 0x55, + 0x91, 0x75, 0x97, 0x13, 0x0c, 0x23, 0x23, 0x04, 0x41, 0x75, 0xb8, 0x9e, 0x49, 0x6b, 0xa8, 0xfd, + 0xef, 0x25, 0xd8, 0x11, 0x0d, 0x96, 0x5b, 0x31, 0x6b, 0x88, 0x5f, 0xa6, 0xec, 0x8a, 0xb4, 0xd5, + 0x53, 0xaf, 0xad, 0x60, 0x2c, 0x9d, 0x5a, 0x6d, 0xf1, 0x46, 0x9d, 0xaa, 0xad, 0x94, 0x1f, 0x74, + 0x13, 0x6e, 0xe4, 0xd2, 0x17, 0x92, 0xfc, 0x4b, 0x39, 0x46, 0xf2, 0x23, 0x0f, 0xe5, 0xa5, 0x32, + 0xbc, 0x08, 0xc9, 0xef, 0x25, 0x4a, 0x92, 0x67, 0xf0, 0xce, 0x64, 0x5c, 0xdf, 0x4a, 0xe4, 0x64, + 0x56, 0x45, 0xca, 0x5f, 0xa7, 0x96, 0x09, 0x4e, 0xa9, 0x5e, 0x98, 0xd2, 0xed, 0x24, 0xa5, 0x01, + 0x9d, 0xc9, 0x6d, 0x22, 0xab, 0xee, 0xce, 0x9d, 0x45, 0xdd, 0x25, 0x54, 0x8c, 0xeb, 0x13, 0xaa, + 0xf8, 0x6b, 0x19, 0xaa, 0x62, 0x70, 0x26, 0xac, 0x96, 0x57, 0x29, 0xa9, 0x91, 0x5a, 0x2e, 0x38, + 0x52, 0xd3, 0x2b, 0x4c, 0x65, 0xb9, 0x2b, 0x4c, 0xe6, 0xa4, 0x3b, 0x77, 0x46, 0x93, 0x0e, 0xc1, + 0x6e, 0x9e, 0x42, 0xa1, 0x8c, 0x7f, 0x94, 0x40, 0x89, 0x18, 0x45, 0x4b, 0x76, 0x89, 0xd5, 0x18, + 0xed, 0xec, 0xe5, 0x53, 0xe8, 0xec, 0x5e, 0xb1, 0x08, 0xe2, 0xa7, 0xc5, 0x52, 0xf9, 0x7f, 0xc5, + 0x12, 0x4a, 0x1b, 0x2b, 0x96, 0xa4, 0x17, 0x74, 0x0b, 0x50, 0x3e, 0x7f, 0x01, 0xcd, 0xfb, 0xcf, + 0xce, 0x43, 0xb9, 0x49, 0xfb, 0xf2, 0x17, 0x70, 0x21, 0xfc, 0xbf, 0xe7, 0x46, 0xf6, 0x40, 0x8e, + 0x2c, 0xf8, 0xca, 0xed, 0xb9, 0x26, 0x81, 0x07, 0x0f, 0x39, 0xdc, 0xff, 0xf3, 0x91, 0x03, 0x93, + 0x19, 0xc8, 0xc9, 0x55, 0x58, 0xa6, 0x7c, 0x13, 0x8e, 0xaf, 0xa0, 0x77, 0x72, 0xef, 0xa7, 0x6c, + 0x95, 0xfd, 0xc5, 0x6d, 0x43, 0xa7, 0x47, 0x7c, 0x09, 0x4b, 0xac, 0x3f, 0x6f, 0x2e, 0x8a, 0xd4, + 0x72, 0x99, 0x72, 0xbf, 0x80, 0x71, 0xe8, 0xf7, 0x47, 0x09, 0xae, 0xe4, 0x8c, 0x7f, 0x6d, 0xa6, + 0x18, 0xe9, 0x0b, 0xca, 0x83, 0x82, 0x17, 0x32, 0x83, 0x48, 0x8c, 0xc7, 0xf9, 0x41, 0xc4, 0x2f, + 0x2c, 0x10, 0x44, 0x76, 0x83, 0x97, 0x7f, 0x92, 0x60, 0x3b, 0xaf, 0x2d, 0xbc, 0x35, 0x33, 0x7b, + 0x32, 0x6e, 0x28, 0xef, 0x14, 0xbd, 0x11, 0xc6, 0xf1, 0x1d, 0x6c, 0x65, 0x0f, 0x19, 0x75, 0x2e, + 0x64, 0xcc, 0x5e, 0x79, 0xbb, 0x98, 0x7d, 0x10, 0x40, 0x43, 0x7f, 0x7e, 0x5c, 0x93, 0x5e, 0x1c, + 0xd7, 0xa4, 0x7f, 0x8f, 0x6b, 0xd2, 0xcf, 0x27, 0xb5, 0x95, 0x17, 0x27, 0xb5, 0x95, 0xbf, 0x4f, + 0x6a, 0x2b, 0x5f, 0x6a, 0x91, 0x9e, 0x22, 0xb0, 0xef, 0x1e, 0x9a, 0x1d, 0x1a, 0xfc, 0xa1, 0x1d, + 0x3d, 0xd0, 0x46, 0xfc, 0x1b, 0x15, 0xbf, 0xc1, 0x74, 0x56, 0xfd, 0x6f, 0x40, 0xee, 0xff, 0x17, + 0x00, 0x00, 0xff, 0xff, 0x15, 0x09, 0x74, 0xa6, 0x6e, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/incentives/abci_test.go b/x/incentives/abci_test.go index c08dfa45200..445aa39a679 100644 --- a/x/incentives/abci_test.go +++ b/x/incentives/abci_test.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - osmoapp "github.com/osmosis-labs/osmosis/app" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + osmoapp "github.com/osmosis-labs/osmosis/v7/app" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" diff --git a/x/incentives/client/cli/cli_test.go b/x/incentives/client/cli/cli_test.go index e3c47bed8e4..9dd080ca0a8 100644 --- a/x/incentives/client/cli/cli_test.go +++ b/x/incentives/client/cli/cli_test.go @@ -8,9 +8,9 @@ import ( clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" - "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/incentives/client/cli" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/incentives/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" ) type IntegrationTestSuite struct { diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go index 44944fd5753..7571eb835bb 100644 --- a/x/incentives/client/cli/query.go +++ b/x/incentives/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" "github.com/spf13/cobra" ) diff --git a/x/incentives/client/cli/tx.go b/x/incentives/client/cli/tx.go index 90ae8769f8b..da9e0cef238 100644 --- a/x/incentives/client/cli/tx.go +++ b/x/incentives/client/cli/tx.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" "github.com/spf13/cobra" ) diff --git a/x/incentives/genesis.go b/x/incentives/genesis.go index ec37fd01b8d..bc284062257 100644 --- a/x/incentives/genesis.go +++ b/x/incentives/genesis.go @@ -2,8 +2,8 @@ package incentives import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/incentives/genesis_test.go b/x/incentives/genesis_test.go index 368a81cc14e..08a432aa29d 100644 --- a/x/incentives/genesis_test.go +++ b/x/incentives/genesis_test.go @@ -6,10 +6,10 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - osmoapp "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/incentives" - "github.com/osmosis-labs/osmosis/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + osmoapp "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/incentives" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) diff --git a/x/incentives/handler.go b/x/incentives/handler.go index 829cf474c19..3699892cdb1 100644 --- a/x/incentives/handler.go +++ b/x/incentives/handler.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" ) // NewHandler returns msg handler for this module diff --git a/x/incentives/keeper/bench_test.go b/x/incentives/keeper/bench_test.go index 3a7e0193ed4..5806b2138cc 100644 --- a/x/incentives/keeper/bench_test.go +++ b/x/incentives/keeper/bench_test.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" "github.com/tendermint/tendermint/crypto/secp256k1" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) diff --git a/x/incentives/keeper/distribute.go b/x/incentives/keeper/distribute.go index 6e1a535d832..bfe632eaa08 100644 --- a/x/incentives/keeper/distribute.go +++ b/x/incentives/keeper/distribute.go @@ -5,8 +5,8 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" db "github.com/tendermint/tm-db" ) diff --git a/x/incentives/keeper/distribute_test.go b/x/incentives/keeper/distribute_test.go index c55ae3c6625..b12205660a3 100644 --- a/x/incentives/keeper/distribute_test.go +++ b/x/incentives/keeper/distribute_test.go @@ -4,8 +4,8 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // TestDistribute tests that when the distribute command is executed on diff --git a/x/incentives/keeper/gauge.go b/x/incentives/keeper/gauge.go index e30034c3ea5..d487b3dfac3 100644 --- a/x/incentives/keeper/gauge.go +++ b/x/incentives/keeper/gauge.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/proto" - epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" - "github.com/osmosis-labs/osmosis/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + epochtypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" db "github.com/tendermint/tm-db" ) diff --git a/x/incentives/keeper/gauge_test.go b/x/incentives/keeper/gauge_test.go index 96c2a1be24e..c5f7a10b6e6 100644 --- a/x/incentives/keeper/gauge_test.go +++ b/x/incentives/keeper/gauge_test.go @@ -4,8 +4,8 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) func (suite *KeeperTestSuite) TestInvalidDurationGaugeCreationValidation() { diff --git a/x/incentives/keeper/grpc_query.go b/x/incentives/keeper/grpc_query.go index 5bc9eecdfb7..acc66b2258d 100644 --- a/x/incentives/keeper/grpc_query.go +++ b/x/incentives/keeper/grpc_query.go @@ -4,13 +4,13 @@ import ( "context" "encoding/json" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/incentives/keeper/grpc_query_test.go b/x/incentives/keeper/grpc_query_test.go index 3b4dddb856e..fcb703ad295 100644 --- a/x/incentives/keeper/grpc_query_test.go +++ b/x/incentives/keeper/grpc_query_test.go @@ -4,9 +4,9 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" - pooltypes "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + pooltypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) func (suite *KeeperTestSuite) TestGRPCGaugeByID() { diff --git a/x/incentives/keeper/hooks.go b/x/incentives/keeper/hooks.go index 826dabe4b81..a7eb550fbb9 100644 --- a/x/incentives/keeper/hooks.go +++ b/x/incentives/keeper/hooks.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" + epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) func (k Keeper) BeforeEpochStart(ctx sdk.Context, epochIdentifier string, epochNumber int64) { diff --git a/x/incentives/keeper/iterator.go b/x/incentives/keeper/iterator.go index c295063cbde..f96e758db81 100644 --- a/x/incentives/keeper/iterator.go +++ b/x/incentives/keeper/iterator.go @@ -5,8 +5,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // Returns an iterator over all gauges in the {prefix} space of state, that begin distributing rewards after a specific time diff --git a/x/incentives/keeper/keeper.go b/x/incentives/keeper/keeper.go index e39f345f8fd..132c894ebd5 100644 --- a/x/incentives/keeper/keeper.go +++ b/x/incentives/keeper/keeper.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" "github.com/tendermint/tendermint/libs/log" ) diff --git a/x/incentives/keeper/keeper_test.go b/x/incentives/keeper/keeper_test.go index a9926d901ef..3f834d30e21 100644 --- a/x/incentives/keeper/keeper_test.go +++ b/x/incentives/keeper/keeper_test.go @@ -5,7 +5,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/app" + "github.com/osmosis-labs/osmosis/v7/app" "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) diff --git a/x/incentives/keeper/msg_server.go b/x/incentives/keeper/msg_server.go index 0e02ef316b4..d532b0ceec0 100644 --- a/x/incentives/keeper/msg_server.go +++ b/x/incentives/keeper/msg_server.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/gamm/utils" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/utils" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" ) type msgServer struct { diff --git a/x/incentives/keeper/params.go b/x/incentives/keeper/params.go index 5a3cffe561b..b69a95449bb 100644 --- a/x/incentives/keeper/params.go +++ b/x/incentives/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" ) // GetParams returns the total set params diff --git a/x/incentives/keeper/query.go b/x/incentives/keeper/query.go index 0bd48851f8f..aa8b1adab44 100644 --- a/x/incentives/keeper/query.go +++ b/x/incentives/keeper/query.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/incentives/keeper/store.go b/x/incentives/keeper/store.go index a33ebcf7c0a..95707e3d93d 100644 --- a/x/incentives/keeper/store.go +++ b/x/incentives/keeper/store.go @@ -5,7 +5,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" ) // GetLastGaugeID returns ID used last time diff --git a/x/incentives/keeper/suite_test.go b/x/incentives/keeper/suite_test.go index 07c77ac188b..fba65f318b0 100644 --- a/x/incentives/keeper/suite_test.go +++ b/x/incentives/keeper/suite_test.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) var ( diff --git a/x/incentives/keeper/utils.go b/x/incentives/keeper/utils.go index cf42bc5c625..097d589fcaa 100644 --- a/x/incentives/keeper/utils.go +++ b/x/incentives/keeper/utils.go @@ -4,7 +4,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" ) func findIndex(IDs []uint64, ID uint64) int { diff --git a/x/incentives/keeper/utils_test.go b/x/incentives/keeper/utils_test.go index 816bd35d658..deb1741272e 100644 --- a/x/incentives/keeper/utils_test.go +++ b/x/incentives/keeper/utils_test.go @@ -6,7 +6,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" "github.com/stretchr/testify/require" ) diff --git a/x/incentives/module.go b/x/incentives/module.go index 38e3ba62cc1..f993ad7a40e 100644 --- a/x/incentives/module.go +++ b/x/incentives/module.go @@ -19,11 +19,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/x/incentives/client/cli" - "github.com/osmosis-labs/osmosis/x/incentives/client/rest" - "github.com/osmosis-labs/osmosis/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/x/incentives/simulation" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/incentives/client/rest" + "github.com/osmosis-labs/osmosis/v7/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v7/x/incentives/simulation" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" ) var ( diff --git a/x/incentives/simulation/genesis.go b/x/incentives/simulation/genesis.go index a0bf1c4f1e7..1acc0f350f4 100644 --- a/x/incentives/simulation/genesis.go +++ b/x/incentives/simulation/genesis.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" ) // Simulation parameter constants diff --git a/x/incentives/simulation/operations.go b/x/incentives/simulation/operations.go index 8f81055ef47..3c378045c3d 100644 --- a/x/incentives/simulation/operations.go +++ b/x/incentives/simulation/operations.go @@ -5,7 +5,7 @@ import ( "time" "github.com/cosmos/cosmos-sdk/baseapp" - osmo_simulation "github.com/osmosis-labs/osmosis/x/simulation" + osmo_simulation "github.com/osmosis-labs/osmosis/v7/x/simulation" "github.com/cosmos/cosmos-sdk/codec" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" @@ -13,9 +13,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" stakingTypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // Simulation operation weights constants diff --git a/x/incentives/types/expected_keepers.go b/x/incentives/types/expected_keepers.go index 0b74ed748c3..0a4267ddeb8 100644 --- a/x/incentives/types/expected_keepers.go +++ b/x/incentives/types/expected_keepers.go @@ -4,8 +4,8 @@ import ( time "time" sdk "github.com/cosmos/cosmos-sdk/types" - epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // BankKeeper defines the expected interface needed to retrieve account balances. diff --git a/x/incentives/types/gauge.go b/x/incentives/types/gauge.go index 8834f22b40c..f5a16f378eb 100644 --- a/x/incentives/types/gauge.go +++ b/x/incentives/types/gauge.go @@ -4,7 +4,7 @@ import ( time "time" sdk "github.com/cosmos/cosmos-sdk/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) func NewGauge(id uint64, isPerpetual bool, distrTo lockuptypes.QueryCondition, coins sdk.Coins, startTime time.Time, numEpochsPaidOver uint64, filledEpochs uint64, distrCoins sdk.Coins) Gauge { diff --git a/x/incentives/types/gauge.pb.go b/x/incentives/types/gauge.pb.go index bd0c89c53e8..4d22ccfff8d 100644 --- a/x/incentives/types/gauge.pb.go +++ b/x/incentives/types/gauge.pb.go @@ -10,7 +10,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - types "github.com/osmosis-labs/osmosis/x/lockup/types" + types "github.com/osmosis-labs/osmosis/v7/x/lockup/types" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" @@ -187,41 +187,42 @@ func init() { func init() { proto.RegisterFile("osmosis/incentives/gauge.proto", fileDescriptor_c0304e2bb0159901) } var fileDescriptor_c0304e2bb0159901 = []byte{ - // 541 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6e, 0xd3, 0x30, - 0x1c, 0xc7, 0x9b, 0xae, 0x1d, 0xc3, 0xed, 0x10, 0xb5, 0x86, 0x94, 0x56, 0x22, 0x2d, 0x45, 0x48, - 0xbd, 0xcc, 0x66, 0xe5, 0xc6, 0xb1, 0x03, 0xa1, 0x49, 0x93, 0x18, 0xd5, 0x0e, 0x88, 0x4b, 0xe4, - 0x24, 0x6e, 0x66, 0x35, 0xc9, 0x2f, 0x8a, 0x9d, 0x6a, 0x7d, 0x03, 0x8e, 0x13, 0x27, 0x9e, 0x81, - 0x27, 0xd9, 0x71, 0x47, 0x4e, 0x1b, 0x6a, 0xdf, 0x80, 0x27, 0x40, 0xb1, 0x13, 0xb5, 0x2a, 0xd7, - 0x9d, 0x1c, 0xff, 0xbe, 0xbf, 0x7f, 0xdf, 0x8f, 0x1c, 0xe4, 0x80, 0x8c, 0x41, 0x0a, 0x49, 0x45, - 0xe2, 0xf3, 0x44, 0x89, 0x05, 0x97, 0x34, 0x64, 0x79, 0xc8, 0x49, 0x9a, 0x81, 0x02, 0x8c, 0x4b, - 0x9d, 0x6c, 0xf4, 0xde, 0x51, 0x08, 0x21, 0x68, 0x99, 0x16, 0x5f, 0x26, 0xb3, 0xe7, 0x84, 0x00, - 0x61, 0xc4, 0xa9, 0xbe, 0x79, 0xf9, 0x8c, 0x06, 0x79, 0xc6, 0x94, 0x80, 0xa4, 0xd4, 0xfb, 0xbb, - 0xba, 0x12, 0x31, 0x97, 0x8a, 0xc5, 0x69, 0xd5, 0xc0, 0xd7, 0xb3, 0xa8, 0xc7, 0x24, 0xa7, 0x8b, - 0x13, 0x8f, 0x2b, 0x76, 0x42, 0x7d, 0x10, 0x55, 0x83, 0x6e, 0xb5, 0x6a, 0x04, 0xfe, 0x3c, 0x4f, - 0xf5, 0x61, 0xa4, 0xe1, 0x8f, 0x06, 0x6a, 0x7e, 0x2a, 0xb6, 0xc6, 0xcf, 0x50, 0x5d, 0x04, 0xb6, - 0x35, 0xb0, 0x46, 0x8d, 0x69, 0x5d, 0x04, 0xf8, 0x15, 0x6a, 0x0b, 0xe9, 0xa6, 0x3c, 0x4b, 0xb9, - 0xca, 0x59, 0x64, 0xd7, 0x07, 0xd6, 0xe8, 0x60, 0xda, 0x12, 0xf2, 0xa2, 0x0a, 0xe1, 0x33, 0x74, - 0x18, 0x08, 0xa9, 0x32, 0xe1, 0xe5, 0x8a, 0xbb, 0x0a, 0xec, 0xbd, 0x81, 0x35, 0x6a, 0x8d, 0x1d, - 0x52, 0x59, 0x37, 0xf3, 0xc8, 0x97, 0x9c, 0x67, 0xcb, 0x53, 0x48, 0x02, 0x51, 0xb8, 0x9a, 0x34, - 0x6e, 0xef, 0xfb, 0xb5, 0x69, 0x7b, 0x53, 0x7a, 0x09, 0x98, 0xa1, 0x66, 0xb1, 0xb0, 0xb4, 0x1b, - 0x83, 0xbd, 0x51, 0x6b, 0xdc, 0x25, 0xc6, 0x12, 0x29, 0x2c, 0x91, 0xd2, 0x12, 0x39, 0x05, 0x91, - 0x4c, 0xde, 0x16, 0xd5, 0xbf, 0x1e, 0xfa, 0xa3, 0x50, 0xa8, 0xab, 0xdc, 0x23, 0x3e, 0xc4, 0xb4, - 0xf4, 0x6f, 0x8e, 0x63, 0x19, 0xcc, 0xa9, 0x5a, 0xa6, 0x5c, 0xea, 0x02, 0x39, 0x35, 0x9d, 0xf1, - 0x57, 0x84, 0xa4, 0x62, 0x99, 0x72, 0x0b, 0x7c, 0x76, 0x53, 0xaf, 0xda, 0x23, 0x86, 0x2d, 0xa9, - 0xd8, 0x92, 0xcb, 0x8a, 0xed, 0xe4, 0x65, 0x31, 0xe8, 0xef, 0x7d, 0xbf, 0xb3, 0x64, 0x71, 0xf4, - 0x7e, 0xb8, 0xa9, 0x1d, 0xde, 0x3c, 0xf4, 0xad, 0xe9, 0x53, 0x1d, 0x28, 0xd2, 0x31, 0x45, 0x47, - 0x49, 0x1e, 0xbb, 0x3c, 0x05, 0xff, 0x4a, 0xba, 0x29, 0x13, 0x81, 0x0b, 0x0b, 0x9e, 0xd9, 0xfb, - 0x1a, 0x66, 0x27, 0xc9, 0xe3, 0x8f, 0x5a, 0xba, 0x60, 0x22, 0xf8, 0xbc, 0xe0, 0x19, 0x7e, 0x8d, - 0x0e, 0x67, 0x22, 0x8a, 0x78, 0x50, 0xd6, 0xd8, 0x4f, 0x74, 0x66, 0xdb, 0x04, 0x4d, 0x32, 0xbe, - 0x46, 0x9d, 0x0d, 0xa2, 0xc0, 0x35, 0x78, 0x0e, 0x1e, 0x1f, 0xcf, 0xf3, 0xad, 0x29, 0x3a, 0x32, - 0xfc, 0x6e, 0xa1, 0x17, 0xe7, 0xe0, 0xcf, 0x99, 0x17, 0xf1, 0x0f, 0xe5, 0x5b, 0x94, 0x67, 0xc9, - 0x0c, 0x30, 0x20, 0x1c, 0x95, 0x82, 0x5b, 0xbd, 0x52, 0x69, 0x5b, 0xe5, 0x52, 0xbb, 0x2c, 0xab, - 0xda, 0xc9, 0x9b, 0x12, 0x65, 0xd7, 0xa0, 0xfc, 0xbf, 0xc5, 0xf0, 0x67, 0x81, 0xb4, 0x13, 0xed, - 0x0e, 0x9d, 0x9c, 0xdf, 0xae, 0x1c, 0xeb, 0x6e, 0xe5, 0x58, 0x7f, 0x56, 0x8e, 0x75, 0xb3, 0x76, - 0x6a, 0x77, 0x6b, 0xa7, 0xf6, 0x7b, 0xed, 0xd4, 0xbe, 0x8d, 0xb7, 0x0c, 0x96, 0xef, 0xed, 0x38, - 0x62, 0x9e, 0xac, 0x2e, 0xf4, 0x7a, 0xfb, 0xcf, 0xd4, 0x86, 0xbd, 0x7d, 0xbd, 0xda, 0xbb, 0x7f, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x14, 0x4e, 0x84, 0x96, 0xbc, 0x03, 0x00, 0x00, + // 545 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6a, 0xdb, 0x30, + 0x1c, 0xc7, 0xe3, 0x34, 0xe9, 0x3a, 0x25, 0x1d, 0x8b, 0xe8, 0xc0, 0x09, 0xcc, 0xc9, 0x32, 0x06, + 0xb9, 0x54, 0x5a, 0x3b, 0xc6, 0x60, 0xc7, 0x74, 0x63, 0x14, 0x06, 0xed, 0x42, 0x0f, 0x63, 0x17, + 0x23, 0xdb, 0x8a, 0x2b, 0x62, 0xfb, 0x67, 0x2c, 0x39, 0x34, 0x6f, 0xb0, 0x63, 0xd9, 0x69, 0xcf, + 0xb0, 0x27, 0xe9, 0xb1, 0xc7, 0x9d, 0xda, 0x91, 0xbc, 0xc1, 0x9e, 0x60, 0x58, 0xb2, 0x49, 0xc8, + 0xae, 0x3d, 0xc9, 0xfa, 0x7d, 0x7f, 0xff, 0xbe, 0x1f, 0x64, 0xe4, 0x80, 0x8c, 0x41, 0x0a, 0x49, + 0x45, 0xe2, 0xf3, 0x44, 0x89, 0x39, 0x97, 0x34, 0x64, 0x79, 0xc8, 0x49, 0x9a, 0x81, 0x02, 0x8c, + 0x4b, 0x9d, 0xac, 0xf5, 0xde, 0x41, 0x08, 0x21, 0x68, 0x99, 0x16, 0x5f, 0x26, 0xb3, 0xe7, 0x84, + 0x00, 0x61, 0xc4, 0xa9, 0xbe, 0x79, 0xf9, 0x94, 0x06, 0x79, 0xc6, 0x94, 0x80, 0xa4, 0xd4, 0xfb, + 0xdb, 0xba, 0x12, 0x31, 0x97, 0x8a, 0xc5, 0x69, 0xd5, 0xc0, 0xd7, 0xb3, 0xa8, 0xc7, 0x24, 0xa7, + 0xf3, 0x23, 0x8f, 0x2b, 0x76, 0x44, 0x7d, 0x10, 0x55, 0x83, 0x6e, 0xb5, 0x6a, 0x04, 0xfe, 0x2c, + 0x4f, 0xf5, 0x61, 0xa4, 0xe1, 0x8f, 0x06, 0x6a, 0x7e, 0x2a, 0xb6, 0xc6, 0x4f, 0x50, 0x5d, 0x04, + 0xb6, 0x35, 0xb0, 0x46, 0x8d, 0x49, 0x5d, 0x04, 0xf8, 0x05, 0x6a, 0x0b, 0xe9, 0xa6, 0x3c, 0x4b, + 0xb9, 0xca, 0x59, 0x64, 0xd7, 0x07, 0xd6, 0x68, 0x6f, 0xd2, 0x12, 0xf2, 0xbc, 0x0a, 0xe1, 0x53, + 0xb4, 0x1f, 0x08, 0xa9, 0x32, 0xe1, 0xe5, 0x8a, 0xbb, 0x0a, 0xec, 0x9d, 0x81, 0x35, 0x6a, 0x1d, + 0x3b, 0xa4, 0xb2, 0x6e, 0xe6, 0x91, 0x2f, 0x39, 0xcf, 0x16, 0x27, 0x90, 0x04, 0xa2, 0x70, 0x35, + 0x6e, 0xdc, 0xdc, 0xf5, 0x6b, 0x93, 0xf6, 0xba, 0xf4, 0x02, 0x30, 0x43, 0xcd, 0x62, 0x61, 0x69, + 0x37, 0x06, 0x3b, 0xa3, 0xd6, 0x71, 0x97, 0x18, 0x4b, 0xa4, 0xb0, 0x44, 0x4a, 0x4b, 0xe4, 0x04, + 0x44, 0x32, 0x7e, 0x5d, 0x54, 0xff, 0xba, 0xef, 0x8f, 0x42, 0xa1, 0x2e, 0x73, 0x8f, 0xf8, 0x10, + 0xd3, 0xd2, 0xbf, 0x39, 0x0e, 0x65, 0x30, 0xa3, 0x6a, 0x91, 0x72, 0xa9, 0x0b, 0xe4, 0xc4, 0x74, + 0xc6, 0x5f, 0x11, 0x92, 0x8a, 0x65, 0xca, 0x2d, 0xf0, 0xd9, 0x4d, 0xbd, 0x6a, 0x8f, 0x18, 0xb6, + 0xa4, 0x62, 0x4b, 0x2e, 0x2a, 0xb6, 0xe3, 0xe7, 0xc5, 0xa0, 0xbf, 0x77, 0xfd, 0xce, 0x82, 0xc5, + 0xd1, 0xfb, 0xe1, 0xba, 0x76, 0x78, 0x7d, 0xdf, 0xb7, 0x26, 0x8f, 0x75, 0xa0, 0x48, 0xc7, 0x14, + 0x1d, 0x24, 0x79, 0xec, 0xf2, 0x14, 0xfc, 0x4b, 0xe9, 0xa6, 0x4c, 0x04, 0x2e, 0xcc, 0x79, 0x66, + 0xef, 0x6a, 0x98, 0x9d, 0x24, 0x8f, 0x3f, 0x6a, 0xe9, 0x9c, 0x89, 0xe0, 0x6c, 0xce, 0x33, 0xfc, + 0x12, 0xed, 0x4f, 0x45, 0x14, 0xf1, 0xa0, 0xac, 0xb1, 0x1f, 0xe9, 0xcc, 0xb6, 0x09, 0x9a, 0x64, + 0x7c, 0x85, 0x3a, 0x6b, 0x44, 0x81, 0x6b, 0xf0, 0xec, 0x3d, 0x3c, 0x9e, 0xa7, 0x1b, 0x53, 0x74, + 0x64, 0xf8, 0xdd, 0x42, 0xcf, 0x3e, 0x83, 0x3f, 0x63, 0x5e, 0xc4, 0x3f, 0x94, 0x6f, 0x51, 0x9e, + 0x26, 0x53, 0xc0, 0x80, 0x70, 0x54, 0x0a, 0x6e, 0xf5, 0x4a, 0xa5, 0x6d, 0x95, 0x4b, 0x6d, 0xb3, + 0xac, 0x6a, 0xc7, 0xaf, 0x4a, 0x94, 0x5d, 0x83, 0xf2, 0xff, 0x16, 0xc3, 0x9f, 0x05, 0xd2, 0x4e, + 0xb4, 0x3d, 0x74, 0x7c, 0x76, 0xb3, 0x74, 0xac, 0xdb, 0xa5, 0x63, 0xfd, 0x59, 0x3a, 0xd6, 0xf5, + 0xca, 0xa9, 0xdd, 0xae, 0x9c, 0xda, 0xef, 0x95, 0x53, 0xfb, 0xf6, 0x76, 0xc3, 0x60, 0xf9, 0xde, + 0x0e, 0x23, 0xe6, 0xc9, 0xea, 0x42, 0xe7, 0xef, 0xe8, 0xd5, 0xe6, 0xcf, 0xa9, 0x3d, 0x7b, 0xbb, + 0x7a, 0xbb, 0x37, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc5, 0xeb, 0x47, 0xca, 0xbf, 0x03, 0x00, + 0x00, } func (m *Gauge) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/genesis.pb.go b/x/incentives/types/genesis.pb.go index d9165edc15f..5bfa46d50f7 100644 --- a/x/incentives/types/genesis.pb.go +++ b/x/incentives/types/genesis.pb.go @@ -104,29 +104,29 @@ func init() { func init() { proto.RegisterFile("osmosis/incentives/genesis.proto", fileDescriptor_a288ccc95d977d2d) } var fileDescriptor_a288ccc95d977d2d = []byte{ - // 338 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xfb, 0x30, - 0x10, 0xc6, 0xe3, 0xb6, 0xea, 0x90, 0xfe, 0xff, 0x03, 0x16, 0x43, 0xda, 0xc1, 0x89, 0x22, 0x21, - 0x75, 0xc1, 0x96, 0xca, 0x00, 0x62, 0xac, 0x90, 0x2a, 0x24, 0x06, 0x54, 0x36, 0x96, 0xca, 0x69, - 0x8d, 0xb1, 0x48, 0xe2, 0xaa, 0xe7, 0x20, 0xfa, 0x16, 0x4c, 0x88, 0x47, 0xea, 0xd8, 0x91, 0xa9, - 0xa0, 0xf6, 0x0d, 0x78, 0x02, 0x14, 0x27, 0x16, 0x48, 0xed, 0xe6, 0xf3, 0xf7, 0xbb, 0xef, 0xbe, - 0x3b, 0x3f, 0xd2, 0x90, 0x69, 0x50, 0xc0, 0x54, 0x3e, 0x15, 0xb9, 0x51, 0xcf, 0x02, 0x98, 0x14, - 0xb9, 0x00, 0x05, 0x74, 0xbe, 0xd0, 0x46, 0x63, 0x5c, 0x13, 0xf4, 0x97, 0xe8, 0x1d, 0x4b, 0x2d, - 0xb5, 0x95, 0x59, 0xf9, 0xaa, 0xc8, 0x1e, 0x91, 0x5a, 0xcb, 0x54, 0x30, 0x5b, 0x25, 0xc5, 0x03, - 0x9b, 0x15, 0x0b, 0x6e, 0x94, 0xce, 0x6b, 0x3d, 0x3c, 0x30, 0x6b, 0xce, 0x17, 0x3c, 0x03, 0x67, - 0x70, 0x28, 0x0c, 0x2f, 0xa4, 0xa8, 0xf4, 0xf8, 0xad, 0xe1, 0xff, 0x1b, 0x55, 0xe1, 0xee, 0x0c, - 0x37, 0x02, 0x5f, 0xf8, 0xed, 0xca, 0x20, 0x40, 0x11, 0xea, 0x77, 0x06, 0x3d, 0xba, 0x1f, 0x96, - 0xde, 0x5a, 0x62, 0xd8, 0x5a, 0x6d, 0x42, 0x6f, 0x5c, 0xf3, 0xf8, 0xdc, 0x6f, 0x5b, 0x67, 0x08, - 0x1a, 0x51, 0xb3, 0xdf, 0x19, 0x74, 0x0f, 0x75, 0x8e, 0x4a, 0xc2, 0x35, 0x56, 0x38, 0xd6, 0x3e, - 0x4e, 0xf5, 0xf4, 0x89, 0x27, 0xa9, 0x98, 0xb8, 0xfd, 0x20, 0x68, 0xd6, 0x26, 0xd5, 0x05, 0xa8, - 0xbb, 0x00, 0xbd, 0xaa, 0x89, 0xe1, 0x49, 0x69, 0xf2, 0xbd, 0x09, 0xbb, 0x4b, 0x9e, 0xa5, 0x97, - 0xf1, 0xbe, 0x45, 0xfc, 0xfe, 0x19, 0xa2, 0xf1, 0x91, 0x13, 0x5c, 0x23, 0xe0, 0xd8, 0xff, 0x9f, - 0x72, 0x30, 0x13, 0x3b, 0x7f, 0xa2, 0x66, 0x41, 0x2b, 0x42, 0xfd, 0xd6, 0xb8, 0x53, 0x7e, 0xda, - 0x80, 0xd7, 0xb3, 0xe1, 0xcd, 0x6a, 0x4b, 0xd0, 0x7a, 0x4b, 0xd0, 0xd7, 0x96, 0xa0, 0xd7, 0x1d, - 0xf1, 0xd6, 0x3b, 0xe2, 0x7d, 0xec, 0x88, 0x77, 0x3f, 0x90, 0xca, 0x3c, 0x16, 0x09, 0x9d, 0xea, - 0x8c, 0xd5, 0x1b, 0x9e, 0xa6, 0x3c, 0x01, 0x57, 0xb0, 0x97, 0xbf, 0xc7, 0x36, 0xcb, 0xb9, 0x80, - 0xa4, 0x6d, 0xe3, 0x9f, 0xfd, 0x04, 0x00, 0x00, 0xff, 0xff, 0x72, 0xa5, 0x7b, 0x3a, 0x1c, 0x02, - 0x00, 0x00, + // 339 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xc3, 0x30, + 0x10, 0x86, 0x93, 0xb6, 0xea, 0x90, 0xc2, 0x80, 0xc5, 0x90, 0x76, 0x70, 0xa2, 0x48, 0x48, 0x5d, + 0xb0, 0xa5, 0x22, 0x54, 0xc4, 0x58, 0x21, 0x55, 0x4c, 0xa0, 0xb2, 0xb1, 0x54, 0x4e, 0x6b, 0x8c, + 0x45, 0x12, 0x57, 0x3d, 0xa7, 0xa2, 0x6f, 0xc1, 0x84, 0x78, 0xa4, 0x8e, 0x1d, 0x99, 0x0a, 0x6a, + 0xdf, 0x80, 0x27, 0x40, 0x71, 0x62, 0x81, 0xd4, 0x6e, 0x3e, 0xff, 0xdf, 0xfd, 0xf7, 0xdf, 0x79, + 0xa1, 0x82, 0x54, 0x81, 0x04, 0x2a, 0xb3, 0x09, 0xcf, 0xb4, 0x5c, 0x70, 0xa0, 0x82, 0x67, 0x1c, + 0x24, 0x90, 0xd9, 0x5c, 0x69, 0x85, 0x50, 0x45, 0x90, 0x3f, 0xa2, 0x73, 0x2a, 0x94, 0x50, 0x46, + 0xa6, 0xc5, 0xab, 0x24, 0x3b, 0x58, 0x28, 0x25, 0x12, 0x4e, 0x4d, 0x15, 0xe7, 0x4f, 0x74, 0x9a, + 0xcf, 0x99, 0x96, 0x2a, 0xab, 0xf4, 0xe0, 0xc0, 0xac, 0x19, 0x9b, 0xb3, 0x14, 0xac, 0xc1, 0xa1, + 0x30, 0x2c, 0x17, 0xbc, 0xd4, 0xa3, 0xf7, 0x9a, 0x77, 0x34, 0x2c, 0xc3, 0x3d, 0x68, 0xa6, 0x39, + 0xba, 0xf2, 0x9a, 0xa5, 0x81, 0xef, 0x86, 0x6e, 0xb7, 0xd5, 0xeb, 0x90, 0xfd, 0xb0, 0xe4, 0xde, + 0x10, 0x83, 0xc6, 0x6a, 0x13, 0x38, 0xa3, 0x8a, 0x47, 0x7d, 0xaf, 0x69, 0x9c, 0xc1, 0xaf, 0x85, + 0xf5, 0x6e, 0xab, 0xd7, 0x3e, 0xd4, 0x39, 0x2c, 0x08, 0xdb, 0x58, 0xe2, 0x48, 0x79, 0x28, 0x51, + 0x93, 0x17, 0x16, 0x27, 0x7c, 0x6c, 0xf7, 0x03, 0xbf, 0x5e, 0x99, 0x94, 0x17, 0x20, 0xf6, 0x02, + 0xe4, 0xa6, 0x22, 0x06, 0x67, 0x85, 0xc9, 0xcf, 0x26, 0x68, 0x2f, 0x59, 0x9a, 0x5c, 0x47, 0xfb, + 0x16, 0xd1, 0xc7, 0x57, 0xe0, 0x8e, 0x4e, 0xac, 0x60, 0x1b, 0x01, 0x45, 0xde, 0x71, 0xc2, 0x40, + 0x8f, 0xcd, 0xfc, 0xb1, 0x9c, 0xfa, 0x8d, 0xd0, 0xed, 0x36, 0x46, 0xad, 0xe2, 0xd3, 0x04, 0xbc, + 0x9d, 0x0e, 0xee, 0x56, 0x5b, 0xec, 0xae, 0xb7, 0xd8, 0xfd, 0xde, 0x62, 0xf7, 0x6d, 0x87, 0x9d, + 0xf5, 0x0e, 0x3b, 0x9f, 0x3b, 0xec, 0x3c, 0x5e, 0x0a, 0xa9, 0x9f, 0xf3, 0x98, 0x4c, 0x54, 0x4a, + 0xab, 0x0d, 0xcf, 0x13, 0x16, 0x83, 0x2d, 0xe8, 0xa2, 0x4f, 0x5f, 0xff, 0xdf, 0x5b, 0x2f, 0x67, + 0x1c, 0xe2, 0xa6, 0xd9, 0xe0, 0xe2, 0x37, 0x00, 0x00, 0xff, 0xff, 0x51, 0x99, 0x95, 0x16, 0x1f, + 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/msgs.go b/x/incentives/types/msgs.go index 1d41bb69797..020601f2580 100644 --- a/x/incentives/types/msgs.go +++ b/x/incentives/types/msgs.go @@ -5,7 +5,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // constants diff --git a/x/incentives/types/msgs_test.go b/x/incentives/types/msgs_test.go index 6c7d42b68fe..3827172bfa9 100644 --- a/x/incentives/types/msgs_test.go +++ b/x/incentives/types/msgs_test.go @@ -5,7 +5,7 @@ import ( time "time" sdk "github.com/cosmos/cosmos-sdk/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/crypto/ed25519" ) diff --git a/x/incentives/types/params.go b/x/incentives/types/params.go index 353c6b12d03..1064b1a4b3e 100644 --- a/x/incentives/types/params.go +++ b/x/incentives/types/params.go @@ -2,7 +2,7 @@ package types import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" + epochtypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) // Parameter store keys diff --git a/x/incentives/types/params.pb.go b/x/incentives/types/params.pb.go index 555ff601c8f..1883a77f073 100644 --- a/x/incentives/types/params.pb.go +++ b/x/incentives/types/params.pb.go @@ -76,7 +76,7 @@ func init() { func init() { proto.RegisterFile("osmosis/incentives/params.proto", fileDescriptor_1cc8b460d089f845) } var fileDescriptor_1cc8b460d089f845 = []byte{ - // 203 bytes of a gzipped FileDescriptorProto + // 206 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xcf, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0xcf, 0xcc, 0x4b, 0x4e, 0xcd, 0x2b, 0xc9, 0x2c, 0x4b, 0x2d, 0xd6, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x82, 0x2a, 0xd0, @@ -84,12 +84,12 @@ var fileDescriptor_1cc8b460d089f845 = []byte{ 0x89, 0x5c, 0x6c, 0x01, 0x60, 0x9d, 0x42, 0xe1, 0x5c, 0x62, 0x29, 0x99, 0xc5, 0x25, 0x45, 0xf1, 0xa9, 0x05, 0xf9, 0xc9, 0x19, 0xf1, 0x99, 0x29, 0x20, 0x8d, 0x69, 0x99, 0xa9, 0x45, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x4e, 0x8a, 0x9f, 0xee, 0xc9, 0xcb, 0x56, 0x26, 0xe6, 0xe6, 0x58, 0x29, - 0x61, 0x57, 0xa7, 0x14, 0x24, 0x02, 0x96, 0x70, 0x05, 0x89, 0x7b, 0xc2, 0x85, 0x9d, 0x7c, 0x4e, + 0x61, 0x57, 0xa7, 0x14, 0x24, 0x02, 0x96, 0x70, 0x05, 0x89, 0x7b, 0xc2, 0x85, 0x9d, 0xfc, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, - 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x28, 0x3d, 0xb3, 0x24, 0xa3, 0x34, + 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x34, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0xea, 0x62, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, - 0x02, 0xd9, 0x87, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x77, 0x1b, 0x03, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x38, 0xf6, 0x10, 0xd8, 0x04, 0x01, 0x00, 0x00, + 0xcc, 0x5c, 0xbf, 0x02, 0xd9, 0x93, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xa7, 0x1b, + 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x27, 0x6e, 0x20, 0x07, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/query.pb.go b/x/incentives/types/query.pb.go index 85c565485b5..1497f89b5ad 100644 --- a/x/incentives/types/query.pb.go +++ b/x/incentives/types/query.pb.go @@ -13,7 +13,7 @@ import ( grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - _ "github.com/osmosis-labs/osmosis/x/lockup/types" + _ "github.com/osmosis-labs/osmosis/v7/x/lockup/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -893,72 +893,73 @@ func init() { func init() { proto.RegisterFile("osmosis/incentives/query.proto", fileDescriptor_8124258a89427f98) } var fileDescriptor_8124258a89427f98 = []byte{ - // 1038 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x96, 0x4f, 0x6f, 0xdc, 0xc4, - 0x1b, 0xc7, 0x33, 0x9b, 0x6c, 0x7f, 0xcd, 0xd3, 0xfe, 0xa2, 0x66, 0x08, 0x25, 0xd9, 0x16, 0xef, - 0x62, 0xb5, 0xe9, 0x36, 0x25, 0x76, 0x76, 0xb7, 0x04, 0x04, 0x08, 0x89, 0x65, 0x4b, 0x55, 0xa9, - 0x48, 0xc5, 0x02, 0x21, 0x21, 0x21, 0xcb, 0x6b, 0x0f, 0xae, 0x95, 0x5d, 0x8f, 0xeb, 0xb1, 0x1b, - 0x56, 0x51, 0x2f, 0xc0, 0xb9, 0x02, 0x51, 0x21, 0x0e, 0x7d, 0x05, 0x1c, 0x39, 0x70, 0xe3, 0xc2, - 0xa9, 0xc7, 0x4a, 0x08, 0x89, 0x53, 0x8a, 0x12, 0x5e, 0x41, 0x5f, 0x01, 0xf2, 0xcc, 0x78, 0xff, - 0x7a, 0xbd, 0x29, 0x52, 0xab, 0x9c, 0x9c, 0xc9, 0xf3, 0xef, 0xf3, 0x3c, 0x9e, 0x7d, 0xbe, 0x06, - 0x85, 0xb2, 0x2e, 0x65, 0x1e, 0xd3, 0x3d, 0xdf, 0x26, 0x7e, 0xe4, 0xdd, 0x25, 0x4c, 0xbf, 0x13, - 0x93, 0xb0, 0xa7, 0x05, 0x21, 0x8d, 0x28, 0xc6, 0xd2, 0xae, 0x0d, 0xec, 0xa5, 0x15, 0x97, 0xba, - 0x94, 0x9b, 0xf5, 0xe4, 0x2f, 0xe1, 0x59, 0x3a, 0xef, 0x52, 0xea, 0x76, 0x88, 0x6e, 0x05, 0x9e, - 0x6e, 0xf9, 0x3e, 0x8d, 0xac, 0xc8, 0xa3, 0x3e, 0x93, 0x56, 0x45, 0x5a, 0xf9, 0xa9, 0x1d, 0x7f, - 0xa9, 0x3b, 0x71, 0xc8, 0x1d, 0x52, 0xbb, 0xcd, 0x0b, 0xe9, 0x6d, 0x8b, 0x11, 0xfd, 0x6e, 0xad, - 0x4d, 0x22, 0xab, 0xa6, 0xdb, 0xd4, 0x4b, 0xed, 0x1b, 0xc3, 0x76, 0x0e, 0xd8, 0xf7, 0x0a, 0x2c, - 0xd7, 0xf3, 0x47, 0x72, 0x65, 0xf4, 0xe4, 0x5a, 0xb1, 0x4b, 0xa4, 0x7d, 0x2d, 0xb5, 0x77, 0xa8, - 0xbd, 0x13, 0x07, 0xfc, 0x21, 0x4c, 0x6a, 0x05, 0x94, 0x8f, 0xa8, 0x13, 0x77, 0xc8, 0x27, 0xb4, - 0xe5, 0xb1, 0x28, 0xf4, 0xda, 0x71, 0x44, 0x3e, 0xa0, 0x9e, 0xcf, 0x0c, 0x72, 0x27, 0x26, 0x2c, - 0x52, 0xbf, 0x45, 0x50, 0x9e, 0xea, 0xc2, 0x02, 0xea, 0x33, 0x82, 0x2d, 0x28, 0x26, 0xe8, 0x6c, - 0x15, 0x55, 0xe6, 0xab, 0xa7, 0xea, 0x6b, 0x9a, 0x80, 0xd7, 0x12, 0x78, 0x4d, 0x62, 0x6b, 0x49, - 0x48, 0x73, 0xeb, 0xd1, 0x7e, 0x79, 0xee, 0xe7, 0x27, 0xe5, 0xaa, 0xeb, 0x45, 0xb7, 0xe3, 0xb6, - 0x66, 0xd3, 0xae, 0x2e, 0x3b, 0x15, 0x8f, 0x4d, 0xe6, 0xec, 0xe8, 0x51, 0x2f, 0x20, 0x4c, 0x13, - 0x35, 0x44, 0x66, 0xb5, 0x0c, 0xaf, 0x0a, 0x8a, 0x01, 0x83, 0x33, 0xc2, 0xf9, 0x0d, 0x4a, 0x5b, - 0x99, 0xf4, 0x78, 0x71, 0x98, 0x2a, 0x9c, 0xb9, 0x9e, 0x4c, 0xbe, 0xd9, 0xbb, 0xd1, 0x92, 0x64, - 0x78, 0x09, 0x0a, 0x9e, 0xb3, 0x8a, 0x2a, 0xa8, 0xba, 0x60, 0x14, 0x3c, 0x47, 0x6d, 0xc1, 0xf2, - 0x90, 0x8f, 0x64, 0xd3, 0xa1, 0xc8, 0x5f, 0x19, 0xf7, 0x4b, 0xd8, 0x26, 0xef, 0xa1, 0xc6, 0xa3, - 0x0c, 0xe1, 0xa7, 0x7e, 0x06, 0xff, 0xe7, 0xe7, 0x74, 0x00, 0xf8, 0x43, 0x80, 0xc1, 0xcd, 0x90, - 0x69, 0xd6, 0x47, 0x5a, 0x14, 0xf7, 0x3c, 0x6d, 0xf4, 0x96, 0xe5, 0x12, 0x19, 0x6b, 0x0c, 0x45, - 0xaa, 0xf7, 0x11, 0x2c, 0xa5, 0x99, 0x25, 0x5c, 0x03, 0x16, 0x1c, 0x2b, 0xb2, 0xfa, 0x73, 0x9b, - 0xc6, 0xd6, 0x5c, 0x48, 0xe6, 0x66, 0x70, 0x67, 0x7c, 0x7d, 0x84, 0xa7, 0xc0, 0x79, 0x2e, 0xcd, - 0xe4, 0x11, 0x15, 0x47, 0x80, 0xbe, 0x80, 0x97, 0xde, 0xb7, 0x93, 0x2a, 0xcf, 0xa7, 0xdf, 0x07, - 0x08, 0x56, 0x46, 0xf3, 0x1f, 0x8b, 0xae, 0xf7, 0xe0, 0xdc, 0x30, 0xd5, 0x2d, 0x12, 0xb6, 0x88, - 0x4f, 0xbb, 0x69, 0xf7, 0x2b, 0x50, 0x74, 0x92, 0x33, 0x6f, 0x7c, 0xd1, 0x10, 0x87, 0xb1, 0x99, - 0x14, 0xfe, 0xf3, 0x4c, 0x1e, 0x22, 0x38, 0x9f, 0x5d, 0xfd, 0x58, 0xcc, 0xc6, 0x84, 0x97, 0x3f, - 0x0d, 0x6c, 0xda, 0xf5, 0x7c, 0xf7, 0xf9, 0xdc, 0x89, 0x1f, 0x11, 0x9c, 0x1d, 0xaf, 0x70, 0x2c, - 0x3a, 0x67, 0xb0, 0x6c, 0x90, 0x5d, 0x2b, 0x74, 0xd8, 0x35, 0x16, 0xa5, 0x5d, 0xaf, 0x43, 0x91, - 0xee, 0xfa, 0x24, 0x14, 0x77, 0xa1, 0x79, 0xe6, 0xe9, 0x7e, 0xf9, 0x74, 0xcf, 0xea, 0x76, 0xde, - 0x56, 0xf9, 0xbf, 0x55, 0x43, 0x98, 0xf1, 0x1a, 0x9c, 0x4c, 0x56, 0xbf, 0xe9, 0x39, 0x6c, 0xb5, - 0x50, 0x99, 0xaf, 0x2e, 0x18, 0xff, 0x4b, 0xce, 0x37, 0x1c, 0x86, 0xcf, 0xc1, 0x22, 0xf1, 0x1d, - 0x93, 0x04, 0xd4, 0xbe, 0xbd, 0x3a, 0x5f, 0x41, 0xd5, 0x79, 0xe3, 0x24, 0xf1, 0x9d, 0x6b, 0xc9, - 0x59, 0xdd, 0x05, 0x3c, 0x5c, 0xf4, 0x85, 0x2e, 0xfd, 0x8f, 0x93, 0xb9, 0xdc, 0xa4, 0xf6, 0x8e, - 0xd5, 0xee, 0x90, 0x96, 0xd4, 0xd0, 0xfe, 0xd2, 0xff, 0x1e, 0x81, 0x32, 0xcd, 0x43, 0x62, 0x52, - 0xc0, 0x1d, 0x69, 0x34, 0x53, 0x0d, 0x1e, 0x30, 0x0b, 0x95, 0xd6, 0x52, 0x95, 0xd6, 0xd2, 0xf8, - 0xe6, 0xc5, 0x84, 0xf9, 0xe9, 0x7e, 0x79, 0x4d, 0x0c, 0x72, 0x32, 0x85, 0xfa, 0xd3, 0x93, 0x32, - 0x32, 0x96, 0x3b, 0xe3, 0x85, 0xeb, 0x7f, 0x9e, 0x82, 0x22, 0x67, 0xc2, 0xbf, 0x23, 0x78, 0x65, - 0x8a, 0x74, 0xe2, 0x7a, 0xd6, 0xc5, 0xc9, 0x97, 0xe2, 0x52, 0xe3, 0x99, 0x62, 0x44, 0xff, 0xea, - 0x7b, 0x5f, 0xff, 0xf1, 0xcf, 0x0f, 0x85, 0xb7, 0xf0, 0xb6, 0x9e, 0xf1, 0x95, 0x90, 0x7e, 0x52, - 0x74, 0x79, 0x12, 0x33, 0xa2, 0xa6, 0xd3, 0x4f, 0x63, 0xf2, 0x77, 0x80, 0x7f, 0x43, 0x70, 0x36, - 0x5b, 0x57, 0x71, 0x6d, 0x3a, 0xcf, 0x14, 0x95, 0x2e, 0xd5, 0x9f, 0x25, 0x44, 0x76, 0xf0, 0x2e, - 0xef, 0x60, 0x1b, 0x5f, 0x3d, 0x42, 0x07, 0x03, 0x7c, 0x47, 0xf2, 0xdf, 0x47, 0xb0, 0xd8, 0x97, - 0x5b, 0x7c, 0x61, 0xfa, 0xef, 0x75, 0xa0, 0xd8, 0xa5, 0x8b, 0x33, 0xbc, 0x24, 0xd8, 0x55, 0x0e, - 0xa6, 0xe1, 0xd7, 0xf3, 0xc0, 0xb8, 0x5a, 0x9b, 0xed, 0x9e, 0xe9, 0x39, 0xfa, 0x9e, 0xe7, 0xdc, - 0xc3, 0x7b, 0x70, 0x42, 0xac, 0x14, 0xfc, 0xda, 0xd4, 0x32, 0xfd, 0x79, 0xa9, 0x79, 0x2e, 0x12, - 0x63, 0x83, 0x63, 0x5c, 0xc0, 0xea, 0x4c, 0x0c, 0x86, 0x1f, 0x20, 0x38, 0x3d, 0xbc, 0xd8, 0xf1, - 0xa5, 0xac, 0x02, 0x19, 0x72, 0x5b, 0xaa, 0xce, 0x76, 0x94, 0x3c, 0x35, 0xce, 0x73, 0x05, 0x5f, - 0xce, 0xe3, 0xb1, 0x78, 0xa4, 0x29, 0xb1, 0x7e, 0x1d, 0xd3, 0xe0, 0x54, 0x6f, 0xb0, 0x3e, 0xab, - 0xea, 0x98, 0x2e, 0x96, 0xb6, 0x8e, 0x1e, 0x20, 0x71, 0xdf, 0xe1, 0xb8, 0x6f, 0xe0, 0xc6, 0x91, - 0x71, 0xcd, 0x80, 0x84, 0xa6, 0x10, 0xdc, 0x87, 0x08, 0x96, 0x46, 0x85, 0x02, 0x5f, 0xce, 0x22, - 0xc8, 0x94, 0xab, 0xd2, 0xc6, 0x51, 0x5c, 0x25, 0x66, 0x83, 0x63, 0x6e, 0xe2, 0x2b, 0x79, 0x98, - 0xb1, 0x8c, 0x35, 0x07, 0xaf, 0x1b, 0x06, 0xab, 0x1b, 0x67, 0xde, 0xeb, 0x09, 0x3d, 0x29, 0xad, - 0xcf, 0x72, 0x93, 0x48, 0x6f, 0x72, 0xa4, 0x1a, 0xd6, 0xf3, 0x90, 0x42, 0x11, 0x67, 0x12, 0x16, - 0xe9, 0x7b, 0x5c, 0x87, 0xee, 0xe1, 0x5f, 0x10, 0x2c, 0x4f, 0x6c, 0xec, 0xec, 0x75, 0x92, 0xbb, - 0xff, 0xb3, 0xd7, 0x49, 0xbe, 0x20, 0xa8, 0xdb, 0x9c, 0x7a, 0x0b, 0x6b, 0x79, 0xd4, 0x93, 0xfb, - 0xbe, 0x79, 0xf3, 0xd1, 0x81, 0x82, 0x1e, 0x1f, 0x28, 0xe8, 0xef, 0x03, 0x05, 0x7d, 0x77, 0xa8, - 0xcc, 0x3d, 0x3e, 0x54, 0xe6, 0xfe, 0x3a, 0x54, 0xe6, 0x3e, 0xaf, 0x0f, 0xe9, 0x9a, 0xcc, 0xb9, - 0xd9, 0xb1, 0xda, 0xac, 0x5f, 0xe0, 0xab, 0xe1, 0x12, 0x5c, 0xe7, 0xda, 0x27, 0xb8, 0xe4, 0x34, - 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x08, 0x05, 0x70, 0xb5, 0x90, 0x0e, 0x00, 0x00, + // 1042 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x96, 0x4f, 0x6f, 0x1b, 0xc5, + 0x1b, 0xc7, 0x33, 0x4e, 0xdc, 0x5f, 0xf3, 0xb4, 0xbf, 0xa8, 0x19, 0x42, 0x49, 0xdc, 0xb2, 0x36, + 0xab, 0x36, 0x75, 0x53, 0xb2, 0x13, 0xc7, 0x6d, 0x8a, 0x00, 0x21, 0x61, 0x5c, 0xaa, 0x4a, 0x20, + 0xca, 0x0a, 0x84, 0x84, 0x84, 0x56, 0x6b, 0xef, 0xb0, 0x5d, 0xc5, 0xde, 0x71, 0x77, 0x76, 0x13, + 0xac, 0xa8, 0x17, 0xe0, 0x5c, 0x81, 0xa8, 0x10, 0x87, 0xbe, 0x02, 0x8e, 0x1c, 0xb8, 0x71, 0xe1, + 0xd4, 0x63, 0x25, 0x84, 0xc4, 0x29, 0x45, 0x09, 0xaf, 0xa0, 0xaf, 0x00, 0xed, 0xcc, 0xac, 0xff, + 0xae, 0xd7, 0x29, 0x52, 0xab, 0x9c, 0x36, 0x93, 0xe7, 0xdf, 0xe7, 0x79, 0x76, 0xfc, 0x7c, 0x17, + 0x34, 0xc6, 0xdb, 0x8c, 0x7b, 0x9c, 0x78, 0x7e, 0x93, 0xfa, 0xa1, 0xb7, 0x43, 0x39, 0xb9, 0x1b, + 0xd1, 0xa0, 0x6b, 0x74, 0x02, 0x16, 0x32, 0x8c, 0x95, 0xdd, 0xe8, 0xdb, 0x0b, 0x4b, 0x2e, 0x73, + 0x99, 0x30, 0x93, 0xf8, 0x2f, 0xe9, 0x59, 0x38, 0xef, 0x32, 0xe6, 0xb6, 0x28, 0xb1, 0x3b, 0x1e, + 0xb1, 0x7d, 0x9f, 0x85, 0x76, 0xe8, 0x31, 0x9f, 0x2b, 0xab, 0xa6, 0xac, 0xe2, 0xd4, 0x88, 0xbe, + 0x24, 0x4e, 0x14, 0x08, 0x87, 0xc4, 0xde, 0x14, 0x85, 0x48, 0xc3, 0xe6, 0x94, 0xec, 0x54, 0x1a, + 0x34, 0xb4, 0x2b, 0xa4, 0xc9, 0xbc, 0xc4, 0xbe, 0x36, 0x68, 0x17, 0x80, 0x3d, 0xaf, 0x8e, 0xed, + 0x7a, 0xfe, 0x50, 0xae, 0x94, 0x9e, 0x5c, 0x3b, 0x72, 0xa9, 0xb2, 0xaf, 0x24, 0xf6, 0x16, 0x6b, + 0x6e, 0x47, 0x1d, 0xf1, 0x90, 0x26, 0xbd, 0x04, 0xda, 0x87, 0xcc, 0x89, 0x5a, 0xf4, 0x13, 0x56, + 0xf7, 0x78, 0x18, 0x78, 0x8d, 0x28, 0xa4, 0xef, 0x31, 0xcf, 0xe7, 0x26, 0xbd, 0x1b, 0x51, 0x1e, + 0xea, 0xdf, 0x22, 0x28, 0x4e, 0x74, 0xe1, 0x1d, 0xe6, 0x73, 0x8a, 0x6d, 0xc8, 0xc7, 0xe8, 0x7c, + 0x19, 0x95, 0x66, 0xcb, 0xa7, 0x36, 0x57, 0x0c, 0x09, 0x6f, 0xc4, 0xf0, 0x86, 0xc2, 0x36, 0xe2, + 0x90, 0xda, 0xc6, 0xa3, 0xfd, 0xe2, 0xcc, 0xcf, 0x4f, 0x8a, 0x65, 0xd7, 0x0b, 0xef, 0x44, 0x0d, + 0xa3, 0xc9, 0xda, 0x44, 0x75, 0x2a, 0x1f, 0xeb, 0xdc, 0xd9, 0x26, 0x61, 0xb7, 0x43, 0xb9, 0x21, + 0x6b, 0xc8, 0xcc, 0x7a, 0x11, 0x5e, 0x95, 0x14, 0x7d, 0x06, 0x67, 0x88, 0xf3, 0x1b, 0x94, 0xb4, + 0x32, 0xee, 0xf1, 0xe2, 0x30, 0x75, 0x38, 0x73, 0x33, 0x9e, 0x7c, 0xad, 0x7b, 0xab, 0xae, 0xc8, + 0xf0, 0x02, 0xe4, 0x3c, 0x67, 0x19, 0x95, 0x50, 0x79, 0xce, 0xcc, 0x79, 0x8e, 0x5e, 0x87, 0xc5, + 0x01, 0x1f, 0xc5, 0x46, 0x20, 0x2f, 0x5e, 0x99, 0xf0, 0x8b, 0xd9, 0xc6, 0xef, 0xa1, 0x21, 0xa2, + 0x4c, 0xe9, 0xa7, 0x7f, 0x06, 0xff, 0x17, 0xe7, 0x64, 0x00, 0xf8, 0x7d, 0x80, 0xfe, 0xcd, 0x50, + 0x69, 0x56, 0x87, 0x5a, 0x94, 0xf7, 0x3c, 0x69, 0xf4, 0xb6, 0xed, 0x52, 0x15, 0x6b, 0x0e, 0x44, + 0xea, 0xf7, 0x11, 0x2c, 0x24, 0x99, 0x15, 0x5c, 0x15, 0xe6, 0x1c, 0x3b, 0xb4, 0x7b, 0x73, 0x9b, + 0xc4, 0x56, 0x9b, 0x8b, 0xe7, 0x66, 0x0a, 0x67, 0x7c, 0x73, 0x88, 0x27, 0x27, 0x78, 0x2e, 0x4d, + 0xe5, 0x91, 0x15, 0x87, 0x80, 0xbe, 0x80, 0x97, 0xde, 0x6d, 0xc6, 0x55, 0x9e, 0x4f, 0xbf, 0x0f, + 0x10, 0x2c, 0x0d, 0xe7, 0x3f, 0x16, 0x5d, 0xef, 0xc1, 0xb9, 0x41, 0xaa, 0xdb, 0x34, 0xa8, 0x53, + 0x9f, 0xb5, 0x93, 0xee, 0x97, 0x20, 0xef, 0xc4, 0x67, 0xd1, 0xf8, 0xbc, 0x29, 0x0f, 0x23, 0x33, + 0xc9, 0xfd, 0xe7, 0x99, 0x3c, 0x44, 0x70, 0x3e, 0xbd, 0xfa, 0xb1, 0x98, 0x8d, 0x05, 0x2f, 0x7f, + 0xda, 0x69, 0xb2, 0xb6, 0xe7, 0xbb, 0xcf, 0xe7, 0x4e, 0xfc, 0x88, 0xe0, 0xec, 0x68, 0x85, 0x63, + 0xd1, 0x39, 0x87, 0x45, 0x93, 0xee, 0xda, 0x81, 0xc3, 0x6f, 0xf0, 0x30, 0xe9, 0x7a, 0x15, 0xf2, + 0x6c, 0xd7, 0xa7, 0x81, 0xbc, 0x0b, 0xb5, 0x33, 0x4f, 0xf7, 0x8b, 0xa7, 0xbb, 0x76, 0xbb, 0xf5, + 0xa6, 0x2e, 0xfe, 0xad, 0x9b, 0xd2, 0x8c, 0x57, 0xe0, 0x64, 0xbc, 0xfa, 0x2d, 0xcf, 0xe1, 0xcb, + 0xb9, 0xd2, 0x6c, 0x79, 0xce, 0xfc, 0x5f, 0x7c, 0xbe, 0xe5, 0x70, 0x7c, 0x0e, 0xe6, 0xa9, 0xef, + 0x58, 0xb4, 0xc3, 0x9a, 0x77, 0x96, 0x67, 0x4b, 0xa8, 0x3c, 0x6b, 0x9e, 0xa4, 0xbe, 0x73, 0x23, + 0x3e, 0xeb, 0xbb, 0x80, 0x07, 0x8b, 0xbe, 0xd0, 0xa5, 0xff, 0x71, 0x3c, 0x97, 0x0f, 0x58, 0x73, + 0xdb, 0x6e, 0xb4, 0x68, 0x5d, 0x69, 0x68, 0x6f, 0xe9, 0x7f, 0x8f, 0x40, 0x9b, 0xe4, 0xa1, 0x30, + 0x19, 0xe0, 0x96, 0x32, 0x5a, 0x89, 0x06, 0xf7, 0x99, 0xa5, 0x4a, 0x1b, 0x89, 0x4a, 0x1b, 0x49, + 0x7c, 0xed, 0x62, 0xcc, 0xfc, 0x74, 0xbf, 0xb8, 0x22, 0x07, 0x39, 0x9e, 0x42, 0xff, 0xe9, 0x49, + 0x11, 0x99, 0x8b, 0xad, 0xd1, 0xc2, 0x9b, 0x7f, 0x9e, 0x82, 0xbc, 0x60, 0xc2, 0xbf, 0x23, 0x78, + 0x65, 0x82, 0x74, 0xe2, 0xcd, 0xb4, 0x8b, 0x93, 0x2d, 0xc5, 0x85, 0xea, 0x33, 0xc5, 0xc8, 0xfe, + 0xf5, 0x77, 0xbe, 0xfe, 0xe3, 0x9f, 0x1f, 0x72, 0x6f, 0xe0, 0x2d, 0x92, 0xf2, 0x95, 0x90, 0x7c, + 0x52, 0xb4, 0x45, 0x12, 0x2b, 0x64, 0x96, 0xd3, 0x4b, 0x63, 0x89, 0x77, 0x80, 0x7f, 0x43, 0x70, + 0x36, 0x5d, 0x57, 0x71, 0x65, 0x32, 0xcf, 0x04, 0x95, 0x2e, 0x6c, 0x3e, 0x4b, 0x88, 0xea, 0xe0, + 0x6d, 0xd1, 0xc1, 0x16, 0xbe, 0x7a, 0x84, 0x0e, 0xfa, 0xf8, 0x8e, 0xe2, 0xbf, 0x8f, 0x60, 0xbe, + 0x27, 0xb7, 0xf8, 0xc2, 0xe4, 0xdf, 0x6b, 0x5f, 0xb1, 0x0b, 0x17, 0xa7, 0x78, 0x29, 0xb0, 0xab, + 0x02, 0xcc, 0xc0, 0xaf, 0x67, 0x81, 0x09, 0xb5, 0xb6, 0x1a, 0x5d, 0xcb, 0x73, 0xc8, 0x9e, 0xe7, + 0xdc, 0xc3, 0x7b, 0x70, 0x42, 0xae, 0x14, 0xfc, 0xda, 0xc4, 0x32, 0xbd, 0x79, 0xe9, 0x59, 0x2e, + 0x0a, 0x63, 0x4d, 0x60, 0x5c, 0xc0, 0xfa, 0x54, 0x0c, 0x8e, 0x1f, 0x20, 0x38, 0x3d, 0xb8, 0xd8, + 0xf1, 0xa5, 0xb4, 0x02, 0x29, 0x72, 0x5b, 0x28, 0x4f, 0x77, 0x54, 0x3c, 0x15, 0xc1, 0x73, 0x05, + 0x5f, 0xce, 0xe2, 0xb1, 0x45, 0xa4, 0xa5, 0xb0, 0x7e, 0x1d, 0xd1, 0xe0, 0x44, 0x6f, 0x30, 0x99, + 0x56, 0x75, 0x44, 0x17, 0x0b, 0x1b, 0x47, 0x0f, 0x50, 0xb8, 0x6f, 0x09, 0xdc, 0x6b, 0xb8, 0x7a, + 0x64, 0x5c, 0xab, 0x43, 0x03, 0x4b, 0x0a, 0xee, 0x43, 0x04, 0x0b, 0xc3, 0x42, 0x81, 0x2f, 0xa7, + 0x11, 0xa4, 0xca, 0x55, 0x61, 0xed, 0x28, 0xae, 0x0a, 0xb3, 0x2a, 0x30, 0xd7, 0xf1, 0x95, 0x2c, + 0xcc, 0x48, 0xc5, 0x5a, 0xfd, 0xd7, 0x0d, 0xfd, 0xd5, 0x8d, 0x53, 0xef, 0xf5, 0x98, 0x9e, 0x14, + 0x56, 0xa7, 0xb9, 0x29, 0xa4, 0xeb, 0x02, 0xa9, 0x82, 0x49, 0x16, 0x52, 0x20, 0xe3, 0x2c, 0xca, + 0x43, 0xb2, 0x27, 0x74, 0xe8, 0x1e, 0xfe, 0x05, 0xc1, 0xe2, 0xd8, 0xc6, 0x4e, 0x5f, 0x27, 0x99, + 0xfb, 0x3f, 0x7d, 0x9d, 0x64, 0x0b, 0x82, 0xbe, 0x25, 0xa8, 0x37, 0xb0, 0x91, 0x45, 0x3d, 0xbe, + 0xef, 0x6b, 0x1f, 0x3d, 0x3a, 0xd0, 0xd0, 0xe3, 0x03, 0x0d, 0xfd, 0x7d, 0xa0, 0xa1, 0xef, 0x0e, + 0xb5, 0x99, 0xc7, 0x87, 0xda, 0xcc, 0x5f, 0x87, 0xda, 0xcc, 0xe7, 0xd7, 0x06, 0x74, 0x4d, 0xe5, + 0x5c, 0x6f, 0xd9, 0x0d, 0xde, 0x2b, 0xb0, 0x73, 0x9d, 0x7c, 0x35, 0x58, 0x45, 0x48, 0x5d, 0xe3, + 0x84, 0x50, 0x9d, 0xea, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x39, 0x11, 0x26, 0x76, 0x93, 0x0e, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/incentives/types/tx.pb.go b/x/incentives/types/tx.pb.go index 4692361bfe3..5c07884bd96 100644 --- a/x/incentives/types/tx.pb.go +++ b/x/incentives/types/tx.pb.go @@ -12,7 +12,7 @@ import ( grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - types "github.com/osmosis-labs/osmosis/x/lockup/types" + types "github.com/osmosis-labs/osmosis/v7/x/lockup/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -263,44 +263,45 @@ func init() { func init() { proto.RegisterFile("osmosis/incentives/tx.proto", fileDescriptor_8ea120e22291556e) } var fileDescriptor_8ea120e22291556e = []byte{ - // 592 bytes of a gzipped FileDescriptorProto + // 596 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcd, 0x6e, 0xd3, 0x4c, 0x14, 0xcd, 0x7c, 0x49, 0xff, 0x26, 0xed, 0xa7, 0x62, 0x15, 0x70, 0x03, 0xb2, 0x53, 0x2f, 0x90, - 0x41, 0xea, 0x0c, 0x0d, 0x3b, 0x76, 0x24, 0x42, 0xa8, 0x12, 0x11, 0xc5, 0x8a, 0x84, 0x54, 0x09, - 0x59, 0x63, 0x7b, 0x70, 0x47, 0x8d, 0x3d, 0x96, 0x67, 0x9c, 0x36, 0x6f, 0x51, 0x89, 0xb7, 0xe0, - 0x0d, 0xd8, 0xb1, 0xec, 0xb2, 0x4b, 0x56, 0x29, 0x4a, 0xde, 0xa0, 0x4f, 0x80, 0x3c, 0xb6, 0x9b, - 0x44, 0xfc, 0x74, 0xc3, 0x6a, 0x32, 0x73, 0xce, 0x3d, 0x73, 0xe7, 0x9c, 0x1b, 0xc3, 0x47, 0x5c, - 0x44, 0x5c, 0x30, 0x81, 0x59, 0xec, 0xd3, 0x58, 0xb2, 0x11, 0x15, 0x58, 0x9e, 0xa3, 0x24, 0xe5, - 0x92, 0x6b, 0x5a, 0x09, 0xa2, 0x39, 0xd8, 0xda, 0x09, 0x79, 0xc8, 0x15, 0x8c, 0xf3, 0x5f, 0x05, - 0xb3, 0x65, 0x86, 0x9c, 0x87, 0x43, 0x8a, 0xd5, 0xce, 0xcb, 0x3e, 0x61, 0xc9, 0x22, 0x2a, 0x24, - 0x89, 0x92, 0x92, 0x60, 0xf8, 0x4a, 0x0b, 0x7b, 0x44, 0x50, 0x3c, 0x3a, 0xf0, 0xa8, 0x24, 0x07, - 0xd8, 0xe7, 0x2c, 0xae, 0xf0, 0xdf, 0xf4, 0x11, 0x92, 0x2c, 0xa4, 0x25, 0xbe, 0x5b, 0xe1, 0x43, - 0xee, 0x9f, 0x66, 0x89, 0x5a, 0x0a, 0xc8, 0xfa, 0x5c, 0x87, 0xff, 0xf7, 0x45, 0xd8, 0x4b, 0x29, - 0x91, 0xf4, 0x4d, 0x5e, 0xa3, 0xed, 0xc1, 0x4d, 0x26, 0xdc, 0x84, 0xa6, 0x09, 0x95, 0x19, 0x19, - 0xea, 0xa0, 0x0d, 0xec, 0x75, 0xa7, 0xc9, 0xc4, 0x51, 0x75, 0xa4, 0x3d, 0x81, 0x2b, 0xfc, 0x2c, - 0xa6, 0xa9, 0xfe, 0x5f, 0x1b, 0xd8, 0x1b, 0xdd, 0xed, 0x9b, 0x89, 0xb9, 0x39, 0x26, 0xd1, 0xf0, - 0xa5, 0xa5, 0x8e, 0x2d, 0xa7, 0x80, 0xb5, 0x43, 0xb8, 0x15, 0x30, 0x21, 0x53, 0xe6, 0x65, 0x92, - 0xba, 0x92, 0xeb, 0xf5, 0x36, 0xb0, 0x9b, 0x1d, 0x03, 0x55, 0xde, 0x14, 0x0d, 0xa1, 0xf7, 0x19, - 0x4d, 0xc7, 0x3d, 0x1e, 0x07, 0x4c, 0x32, 0x1e, 0x77, 0x1b, 0x97, 0x13, 0xb3, 0xe6, 0x6c, 0xce, - 0x4b, 0x07, 0x5c, 0x23, 0x70, 0x25, 0x7f, 0xb1, 0xd0, 0x1b, 0xed, 0xba, 0xdd, 0xec, 0xec, 0xa2, - 0xc2, 0x13, 0x94, 0x7b, 0x82, 0x4a, 0x4f, 0x50, 0x8f, 0xb3, 0xb8, 0xfb, 0x3c, 0xaf, 0xfe, 0x72, - 0x6d, 0xda, 0x21, 0x93, 0x27, 0x99, 0x87, 0x7c, 0x1e, 0xe1, 0xd2, 0xc0, 0x62, 0xd9, 0x17, 0xc1, - 0x29, 0x96, 0xe3, 0x84, 0x0a, 0x55, 0x20, 0x9c, 0x42, 0x59, 0xfb, 0x00, 0xa1, 0x90, 0x24, 0x95, - 0x6e, 0xee, 0xbf, 0xbe, 0xa2, 0x5a, 0x6d, 0xa1, 0x22, 0x1c, 0x54, 0x85, 0x83, 0x06, 0x55, 0x38, - 0xdd, 0xc7, 0xf9, 0x45, 0x37, 0x13, 0x73, 0xbb, 0x78, 0xfa, 0x6d, 0x6a, 0xd6, 0xc5, 0xb5, 0x09, - 0x9c, 0x0d, 0xa5, 0x95, 0xb3, 0x35, 0x0c, 0x77, 0xe2, 0x2c, 0x72, 0x69, 0xc2, 0xfd, 0x13, 0xe1, - 0x26, 0x84, 0x05, 0x2e, 0x1f, 0xd1, 0x54, 0x5f, 0x6d, 0x03, 0xbb, 0xe1, 0xdc, 0x8b, 0xb3, 0xe8, - 0xb5, 0x82, 0x8e, 0x08, 0x0b, 0xde, 0x8d, 0x68, 0x6a, 0xe9, 0xf0, 0xc1, 0x72, 0x28, 0x0e, 0x15, - 0x09, 0x8f, 0x05, 0xb5, 0xbe, 0x02, 0xb8, 0xd5, 0x17, 0xe1, 0xab, 0x20, 0x18, 0xf0, 0x22, 0xae, - 0xdb, 0x2c, 0xc0, 0xdf, 0xb3, 0xd8, 0x85, 0xeb, 0x6a, 0x26, 0x5c, 0x16, 0xa8, 0xd8, 0x1a, 0xce, - 0x9a, 0xda, 0x1f, 0x06, 0x1a, 0x85, 0x6b, 0x29, 0x3d, 0x23, 0x69, 0x20, 0xf4, 0xfa, 0xbf, 0x77, - 0xb7, 0xd2, 0xb6, 0x1e, 0xc2, 0xfb, 0x4b, 0xad, 0x57, 0x8f, 0xea, 0x7c, 0x03, 0xb0, 0xde, 0x17, - 0xa1, 0xf6, 0x11, 0x36, 0x17, 0x07, 0xd1, 0x42, 0xbf, 0xfe, 0x85, 0xd0, 0xb2, 0x2f, 0xad, 0x67, - 0x77, 0x73, 0xaa, 0x6b, 0xb4, 0x63, 0x08, 0x17, 0x7c, 0xdb, 0xfb, 0x43, 0xe5, 0x9c, 0xd2, 0x7a, - 0x7a, 0x27, 0xa5, 0xd2, 0xee, 0xbe, 0xbd, 0x9c, 0x1a, 0xe0, 0x6a, 0x6a, 0x80, 0x1f, 0x53, 0x03, - 0x5c, 0xcc, 0x8c, 0xda, 0xd5, 0xcc, 0xa8, 0x7d, 0x9f, 0x19, 0xb5, 0xe3, 0xce, 0x82, 0x51, 0xa5, - 0xdc, 0xfe, 0x90, 0x78, 0xa2, 0xda, 0xe0, 0xf3, 0xa5, 0xcf, 0x47, 0x6e, 0x9c, 0xb7, 0xaa, 0xa6, - 0xed, 0xc5, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x52, 0x59, 0xec, 0x61, 0x61, 0x04, 0x00, 0x00, + 0x41, 0xea, 0x0c, 0x2d, 0x42, 0x48, 0xec, 0x48, 0x84, 0x50, 0x17, 0x51, 0x8b, 0x15, 0x09, 0xa9, + 0x12, 0xb2, 0xc6, 0xf6, 0xe0, 0x8e, 0x1a, 0x7b, 0x2c, 0xcf, 0x38, 0x6d, 0xde, 0xa2, 0x12, 0x6f, + 0xc1, 0x1b, 0xb0, 0x63, 0xd9, 0x65, 0x97, 0xac, 0x52, 0x94, 0xbc, 0x41, 0x9f, 0x00, 0x79, 0x6c, + 0x37, 0x89, 0xf8, 0xe9, 0x86, 0xd5, 0x64, 0xe6, 0x9c, 0x7b, 0xe6, 0xce, 0x39, 0x37, 0x86, 0x8f, + 0xb8, 0x88, 0xb8, 0x60, 0x02, 0xb3, 0xd8, 0xa7, 0xb1, 0x64, 0x43, 0x2a, 0xb0, 0x3c, 0x47, 0x49, + 0xca, 0x25, 0xd7, 0xb4, 0x12, 0x44, 0x33, 0xb0, 0xb5, 0x15, 0xf2, 0x90, 0x2b, 0x18, 0xe7, 0xbf, + 0x0a, 0x66, 0xcb, 0x0c, 0x39, 0x0f, 0x07, 0x14, 0xab, 0x9d, 0x97, 0x7d, 0xc2, 0x92, 0x45, 0x54, + 0x48, 0x12, 0x25, 0x25, 0xc1, 0xf0, 0x95, 0x16, 0xf6, 0x88, 0xa0, 0x78, 0xb8, 0xe7, 0x51, 0x49, + 0xf6, 0xb0, 0xcf, 0x59, 0x5c, 0xe1, 0xbf, 0xe9, 0x23, 0x24, 0x59, 0x48, 0x4b, 0x7c, 0xbb, 0xc2, + 0x07, 0xdc, 0x3f, 0xcd, 0x12, 0xb5, 0x14, 0x90, 0xf5, 0xb9, 0x0e, 0xff, 0xef, 0x89, 0xb0, 0x9b, + 0x52, 0x22, 0xe9, 0xbb, 0xbc, 0x46, 0xdb, 0x81, 0xeb, 0x4c, 0xb8, 0x09, 0x4d, 0x13, 0x2a, 0x33, + 0x32, 0xd0, 0x41, 0x1b, 0xd8, 0xab, 0x4e, 0x93, 0x89, 0xa3, 0xea, 0x48, 0x7b, 0x02, 0x97, 0xf8, + 0x59, 0x4c, 0x53, 0xfd, 0xbf, 0x36, 0xb0, 0xd7, 0x3a, 0x9b, 0x37, 0x63, 0x73, 0x7d, 0x44, 0xa2, + 0xc1, 0x6b, 0x4b, 0x1d, 0x5b, 0x4e, 0x01, 0x6b, 0x07, 0x70, 0x23, 0x60, 0x42, 0xa6, 0xcc, 0xcb, + 0x24, 0x75, 0x25, 0xd7, 0xeb, 0x6d, 0x60, 0x37, 0xf7, 0x0d, 0x54, 0x79, 0x53, 0x34, 0x84, 0xde, + 0x67, 0x34, 0x1d, 0x75, 0x79, 0x1c, 0x30, 0xc9, 0x78, 0xdc, 0x69, 0x5c, 0x8e, 0xcd, 0x9a, 0xb3, + 0x3e, 0x2b, 0xed, 0x73, 0x8d, 0xc0, 0xa5, 0xfc, 0xc5, 0x42, 0x6f, 0xb4, 0xeb, 0x76, 0x73, 0x7f, + 0x1b, 0x15, 0x9e, 0xa0, 0xdc, 0x13, 0x54, 0x7a, 0x82, 0xba, 0x9c, 0xc5, 0x9d, 0xe7, 0x79, 0xf5, + 0x97, 0x6b, 0xd3, 0x0e, 0x99, 0x3c, 0xc9, 0x3c, 0xe4, 0xf3, 0x08, 0x97, 0x06, 0x16, 0xcb, 0xae, + 0x08, 0x4e, 0xb1, 0x1c, 0x25, 0x54, 0xa8, 0x02, 0xe1, 0x14, 0xca, 0xda, 0x07, 0x08, 0x85, 0x24, + 0xa9, 0x74, 0x73, 0xff, 0xf5, 0x25, 0xd5, 0x6a, 0x0b, 0x15, 0xe1, 0xa0, 0x2a, 0x1c, 0xd4, 0xaf, + 0xc2, 0xe9, 0x3c, 0xce, 0x2f, 0xba, 0x19, 0x9b, 0x9b, 0xc5, 0xd3, 0x6f, 0x53, 0xb3, 0x2e, 0xae, + 0x4d, 0xe0, 0xac, 0x29, 0xad, 0x9c, 0xad, 0x61, 0xb8, 0x15, 0x67, 0x91, 0x4b, 0x13, 0xee, 0x9f, + 0x08, 0x37, 0x21, 0x2c, 0x70, 0xf9, 0x90, 0xa6, 0xfa, 0x72, 0x1b, 0xd8, 0x0d, 0xe7, 0x5e, 0x9c, + 0x45, 0x6f, 0x15, 0x74, 0x44, 0x58, 0x70, 0x38, 0xa4, 0xa9, 0xa5, 0xc3, 0x07, 0x8b, 0xa1, 0x38, + 0x54, 0x24, 0x3c, 0x16, 0xd4, 0xfa, 0x0a, 0xe0, 0x46, 0x4f, 0x84, 0x6f, 0x82, 0xa0, 0xcf, 0x8b, + 0xb8, 0x6e, 0xb3, 0x00, 0x7f, 0xcf, 0x62, 0x1b, 0xae, 0xaa, 0x99, 0x70, 0x59, 0xa0, 0x62, 0x6b, + 0x38, 0x2b, 0x6a, 0x7f, 0x10, 0x68, 0x14, 0xae, 0xa4, 0xf4, 0x8c, 0xa4, 0x81, 0xd0, 0xeb, 0xff, + 0xde, 0xdd, 0x4a, 0xdb, 0x7a, 0x08, 0xef, 0x2f, 0xb4, 0x5e, 0x3d, 0x6a, 0xff, 0x1b, 0x80, 0xf5, + 0x9e, 0x08, 0xb5, 0x8f, 0xb0, 0x39, 0x3f, 0x88, 0x16, 0xfa, 0xf5, 0x2f, 0x84, 0x16, 0x7d, 0x69, + 0x3d, 0xbb, 0x9b, 0x53, 0x5d, 0xa3, 0x1d, 0x43, 0x38, 0xe7, 0xdb, 0xce, 0x1f, 0x2a, 0x67, 0x94, + 0xd6, 0xd3, 0x3b, 0x29, 0x95, 0x76, 0xe7, 0xf0, 0x72, 0x62, 0x80, 0xab, 0x89, 0x01, 0x7e, 0x4c, + 0x0c, 0x70, 0x31, 0x35, 0x6a, 0x57, 0x53, 0xa3, 0xf6, 0x7d, 0x6a, 0xd4, 0x8e, 0x5f, 0xce, 0x19, + 0x55, 0xca, 0xed, 0x0e, 0x88, 0x27, 0xaa, 0x0d, 0x1e, 0xbe, 0xc2, 0xe7, 0x0b, 0x5f, 0x90, 0xdc, + 0x3b, 0x6f, 0x59, 0x0d, 0xdc, 0x8b, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x77, 0xba, 0xf8, + 0x64, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/lockup/abci.go b/x/lockup/abci.go index d5a28f29024..5125d56353d 100644 --- a/x/lockup/abci.go +++ b/x/lockup/abci.go @@ -4,7 +4,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" ) // BeginBlocker is called on every block diff --git a/x/lockup/client/cli/cli_test.go b/x/lockup/client/cli/cli_test.go index 949f424f30c..be406156770 100644 --- a/x/lockup/client/cli/cli_test.go +++ b/x/lockup/client/cli/cli_test.go @@ -16,11 +16,11 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" banktestutil "github.com/cosmos/cosmos-sdk/x/bank/client/testutil" - "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/x/lockup/client/cli" - lockuptestutil "github.com/osmosis-labs/osmosis/x/lockup/client/testutil" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/osmoutils" + "github.com/osmosis-labs/osmosis/v7/x/lockup/client/cli" + lockuptestutil "github.com/osmosis-labs/osmosis/v7/x/lockup/client/testutil" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) type IntegrationTestSuite struct { diff --git a/x/lockup/client/cli/query.go b/x/lockup/client/cli/query.go index 9f27a9b2f2c..638e48db34b 100644 --- a/x/lockup/client/cli/query.go +++ b/x/lockup/client/cli/query.go @@ -16,7 +16,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/lockup/client/cli/tx.go b/x/lockup/client/cli/tx.go index d9e57e49bee..afb0342fd5d 100644 --- a/x/lockup/client/cli/tx.go +++ b/x/lockup/client/cli/tx.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/lockup/client/rest/query.go b/x/lockup/client/rest/query.go index 9fe6ca5f9ec..a87987efe0d 100644 --- a/x/lockup/client/rest/query.go +++ b/x/lockup/client/rest/query.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/rest" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) func registerQueryRoutes(clientCtx client.Context, r *mux.Router) { diff --git a/x/lockup/client/rest/tx.go b/x/lockup/client/rest/tx.go index 94564a35b32..f7c4d0c7f96 100644 --- a/x/lockup/client/rest/tx.go +++ b/x/lockup/client/rest/tx.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" "github.com/cosmos/cosmos-sdk/types/rest" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) func registerTxHandlers(clientCtx client.Context, r *mux.Router) { diff --git a/x/lockup/client/testutil/test_helpers.go b/x/lockup/client/testutil/test_helpers.go index 07517b6c7bb..7b27ca6b8ff 100644 --- a/x/lockup/client/testutil/test_helpers.go +++ b/x/lockup/client/testutil/test_helpers.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/testutil" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" sdk "github.com/cosmos/cosmos-sdk/types" - lockupcli "github.com/osmosis-labs/osmosis/x/lockup/client/cli" + lockupcli "github.com/osmosis-labs/osmosis/v7/x/lockup/client/cli" ) // commonArgs is args for CLI test commands diff --git a/x/lockup/genesis.go b/x/lockup/genesis.go index 8c105684ec2..187f8fd5f94 100644 --- a/x/lockup/genesis.go +++ b/x/lockup/genesis.go @@ -2,8 +2,8 @@ package lockup import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/lockup/genesis_test.go b/x/lockup/genesis_test.go index 1de2bbb52d5..ccb50f9eb80 100644 --- a/x/lockup/genesis_test.go +++ b/x/lockup/genesis_test.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - osmoapp "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/lockup" - "github.com/osmosis-labs/osmosis/x/lockup/types" + osmoapp "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/lockup" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" diff --git a/x/lockup/handler.go b/x/lockup/handler.go index 2a74ecf7708..8e2996b558f 100644 --- a/x/lockup/handler.go +++ b/x/lockup/handler.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // NewHandler returns a handler for "lockup" type messages. diff --git a/x/lockup/keeper/admin_keeper.go b/x/lockup/keeper/admin_keeper.go index a70e30ee3e8..5162730b417 100644 --- a/x/lockup/keeper/admin_keeper.go +++ b/x/lockup/keeper/admin_keeper.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // Relock unlock previous lockID and create a new lock with newCoins with same duration and endtime diff --git a/x/lockup/keeper/admin_keeper_test.go b/x/lockup/keeper/admin_keeper_test.go index 798cb000b65..6db67389d4f 100644 --- a/x/lockup/keeper/admin_keeper_test.go +++ b/x/lockup/keeper/admin_keeper_test.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) func (suite *KeeperTestSuite) TestRelock() { diff --git a/x/lockup/keeper/bench_test.go b/x/lockup/keeper/bench_test.go index c04f449cabb..bbf28d0e856 100644 --- a/x/lockup/keeper/bench_test.go +++ b/x/lockup/keeper/bench_test.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/osmosis-labs/osmosis/app" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/app" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" "github.com/tendermint/tendermint/crypto/secp256k1" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) diff --git a/x/lockup/keeper/export_test.go b/x/lockup/keeper/export_test.go index 91c62e296ba..ad756191580 100644 --- a/x/lockup/keeper/export_test.go +++ b/x/lockup/keeper/export_test.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) func (k Keeper) AddLockRefByKey(ctx sdk.Context, key []byte, lockID uint64) error { diff --git a/x/lockup/keeper/grpc_query.go b/x/lockup/keeper/grpc_query.go index 376f75a3e56..b1934622851 100644 --- a/x/lockup/keeper/grpc_query.go +++ b/x/lockup/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( "errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/lockup/keeper/grpc_query_test.go b/x/lockup/keeper/grpc_query_test.go index 0f5892016cf..224bc6a1c12 100644 --- a/x/lockup/keeper/grpc_query_test.go +++ b/x/lockup/keeper/grpc_query_test.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) func (suite *KeeperTestSuite) LockTokens(addr sdk.AccAddress, coins sdk.Coins, duration time.Duration) { diff --git a/x/lockup/keeper/invariants.go b/x/lockup/keeper/invariants.go index b7147204a4a..9ac43c6c3a9 100644 --- a/x/lockup/keeper/invariants.go +++ b/x/lockup/keeper/invariants.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) // RegisterInvariants registers all governance invariants diff --git a/x/lockup/keeper/iterator.go b/x/lockup/keeper/iterator.go index 092308ae866..c636cb4ea54 100644 --- a/x/lockup/keeper/iterator.go +++ b/x/lockup/keeper/iterator.go @@ -5,7 +5,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" db "github.com/tendermint/tm-db" ) diff --git a/x/lockup/keeper/keeper.go b/x/lockup/keeper/keeper.go index 9736be505f6..003f37874b9 100644 --- a/x/lockup/keeper/keeper.go +++ b/x/lockup/keeper/keeper.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // Keeper provides a way to manage module storage diff --git a/x/lockup/keeper/keeper_test.go b/x/lockup/keeper/keeper_test.go index dfc51f31c3a..0e4dc85a56e 100644 --- a/x/lockup/keeper/keeper_test.go +++ b/x/lockup/keeper/keeper_test.go @@ -5,7 +5,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/app" + "github.com/osmosis-labs/osmosis/v7/app" "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) diff --git a/x/lockup/keeper/legacy.go b/x/lockup/keeper/legacy.go new file mode 100644 index 00000000000..1bce2526a3a --- /dev/null +++ b/x/lockup/keeper/legacy.go @@ -0,0 +1,220 @@ +package keeper + +import ( + "encoding/binary" + "encoding/json" + "fmt" + "time" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/gogo/protobuf/proto" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + db "github.com/tendermint/tm-db" +) + +func legacyAccumulationKey(duration time.Duration, id uint64) []byte { + res := make([]byte, 16) + binary.BigEndian.PutUint64(res[:8], uint64(duration)) + binary.BigEndian.PutUint64(res[8:], id) + return res +} + +func findIndex(IDs []uint64, ID uint64) int { + for index, id := range IDs { + if id == ID { + return index + } + } + return -1 +} + +func removeValue(IDs []uint64, ID uint64) ([]uint64, int) { + index := findIndex(IDs, ID) + if index < 0 { + return IDs, index + } + IDs[index] = IDs[len(IDs)-1] // set last element to index + return IDs[:len(IDs)-1], index +} + +// getLockRefs get lock IDs specified on the prefix and timestamp key +func (k Keeper) getLegacyLockRefs(ctx sdk.Context, key []byte) []uint64 { + store := ctx.KVStore(k.storeKey) + lockIDs := []uint64{} + if store.Has(key) { + bz := store.Get(key) + err := json.Unmarshal(bz, &lockIDs) + if err != nil { + panic(err) + } + } + return lockIDs +} + +func (k Keeper) getLegacyLocksFromIterator(ctx sdk.Context, iterator db.Iterator) []types.PeriodLock { + locks := []types.PeriodLock{} + defer iterator.Close() + for ; iterator.Valid(); iterator.Next() { + lockIDs := []uint64{} + err := json.Unmarshal(iterator.Value(), &lockIDs) + if err != nil { + panic(err) + } + for _, lockID := range lockIDs { + lock, err := k.GetLockByID(ctx, lockID) + if err != nil { + panic(err) + } + locks = append(locks, *lock) + } + } + return locks +} + +// GetLegacyPeriodLocks Returns the period locks on pool +func (k Keeper) GetLegacyPeriodLocks(ctx sdk.Context) ([]types.PeriodLock, error) { + maxID := int(k.GetLastLockID(ctx) + 1) + + locks := make([]types.PeriodLock, 0, maxID) + store := ctx.KVStore(k.storeKey) + for lockID := 0; lockID < maxID; lockID++ { + if lockID%10000 == 0 { + ctx.Logger().Info(fmt.Sprintf("Fetched %d locks", lockID)) + } + // Copy in GetLockByID logic, with optimizations for hotloop + lockKey := lockStoreKey(uint64(lockID)) + if !store.Has(lockKey) { + continue + } + lock := types.PeriodLock{} + bz := store.Get(lockKey) + err := proto.Unmarshal(bz, &lock) + if err != nil { + return nil, err + } + locks = append(locks, lock) + } + return locks, nil +} + +// addLockRefByKey append lock ID into an array associated to provided key +func (k Keeper) addLegacyLockRefByKey(ctx sdk.Context, key []byte, lockID uint64) error { + store := ctx.KVStore(k.storeKey) + lockIDs := k.getLegacyLockRefs(ctx, key) + if findIndex(lockIDs, lockID) > -1 { + return fmt.Errorf("lock with same ID exist: %d", lockID) + } + lockIDs = append(lockIDs, lockID) + bz, err := json.Marshal(lockIDs) + if err != nil { + return err + } + store.Set(key, bz) + return nil +} + +// deleteLegacyLockRefByKey removes lock ID from an array associated to provided key +func (k Keeper) deleteLegacyLockRefByKey(ctx sdk.Context, key []byte, lockID uint64) error { + var index = -1 + store := ctx.KVStore(k.storeKey) + lockIDs := k.getLegacyLockRefs(ctx, key) + lockIDs, index = removeValue(lockIDs, lockID) + if index < 0 { + return fmt.Errorf("specific lock with ID %d not found", lockID) + } + if len(lockIDs) == 0 { + if store.Has(key) { + store.Delete(key) + } + } else { + bz, err := json.Marshal(lockIDs) + if err != nil { + return err + } + store.Set(key, bz) + } + return nil +} + +// LegacyLockTokens lock tokens from an account for specified duration +func (k Keeper) LegacyLockTokens(ctx sdk.Context, owner sdk.AccAddress, coins sdk.Coins, duration time.Duration) (types.PeriodLock, error) { + ID := k.GetLastLockID(ctx) + 1 + // unlock time is set at the beginning of unlocking time + lock := types.NewPeriodLock(ID, owner, duration, time.Time{}, coins) + return lock, k.LegacyLock(ctx, lock) +} + +// Lock is a utility to lock coins into module account +func (k Keeper) LegacyLock(ctx sdk.Context, lock types.PeriodLock) error { + owner, err := sdk.AccAddressFromBech32(lock.Owner) + if err != nil { + return err + } + if err := k.bk.SendCoinsFromAccountToModule(ctx, owner, types.ModuleName, lock.Coins); err != nil { + return err + } + + lockID := lock.ID + store := ctx.KVStore(k.storeKey) + bz, err := proto.Marshal(&lock) + if err != nil { + return err + } + store.Set(lockStoreKey(lockID), bz) + k.SetLastLockID(ctx, lockID) + + refKeys, err := lockRefKeys(lock) + if err != nil { + return err + } + for _, refKey := range refKeys { + if err := k.addLegacyLockRefByKey(ctx, combineKeys(types.KeyPrefixNotUnlocking, refKey), lockID); err != nil { + return err + } + } + + for _, coin := range lock.Coins { + k.accumulationStore(ctx, coin.Denom).Set(legacyAccumulationKey(lock.Duration, lock.ID), coin.Amount) + } + + k.hooks.OnTokenLocked(ctx, owner, lock.ID, lock.Coins, lock.Duration, lock.EndTime) + return nil +} + +// LegacyBeginUnlock is a utility to start unlocking coins from NotUnlocking queue +func (k Keeper) LegacyBeginUnlock(ctx sdk.Context, lock types.PeriodLock) error { + lockID := lock.ID + refKeys, err := lockRefKeys(lock) + if err != nil { + return err + } + for _, refKey := range refKeys { + err := k.deleteLegacyLockRefByKey(ctx, combineKeys(types.KeyPrefixNotUnlocking, refKey), lockID) + if err != nil { + return err + } + } + lock.EndTime = ctx.BlockTime().Add(lock.Duration) + store := ctx.KVStore(k.storeKey) + bz, err := proto.Marshal(&lock) + if err != nil { + return err + } + store.Set(lockStoreKey(lockID), bz) + + refKeys, err = lockRefKeys(lock) + if err != nil { + return err + } + for _, refKey := range refKeys { + if err := k.addLegacyLockRefByKey(ctx, combineKeys(types.KeyPrefixUnlocking, refKey), lockID); err != nil { + return err + } + } + + for _, coin := range lock.Coins { + k.accumulationStore(ctx, coin.Denom).Remove(legacyAccumulationKey(lock.Duration, lock.ID)) + } + + return nil +} diff --git a/x/lockup/keeper/lock.go b/x/lockup/keeper/lock.go index 472486836c9..8089b980b1a 100644 --- a/x/lockup/keeper/lock.go +++ b/x/lockup/keeper/lock.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/store" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/store" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // TODO: Reorganize functions in this file diff --git a/x/lockup/keeper/lock_refs.go b/x/lockup/keeper/lock_refs.go index 5476701f409..164b0782a86 100644 --- a/x/lockup/keeper/lock_refs.go +++ b/x/lockup/keeper/lock_refs.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) func (k Keeper) addLockRefs(ctx sdk.Context, lockRefPrefix []byte, lock types.PeriodLock) error { diff --git a/x/lockup/keeper/lock_test.go b/x/lockup/keeper/lock_test.go index 2b48cd74126..6c4a32786da 100644 --- a/x/lockup/keeper/lock_test.go +++ b/x/lockup/keeper/lock_test.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) func (suite *KeeperTestSuite) TestBeginUnlocking() { // test for all unlockable coins diff --git a/x/lockup/keeper/msg_server.go b/x/lockup/keeper/msg_server.go index cb59bf7cd3b..2601727ff48 100644 --- a/x/lockup/keeper/msg_server.go +++ b/x/lockup/keeper/msg_server.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/gamm/utils" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/utils" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) type msgServer struct { diff --git a/x/lockup/keeper/msg_server_test.go b/x/lockup/keeper/msg_server_test.go index cb6eec2603a..4ab6c2b0ebf 100644 --- a/x/lockup/keeper/msg_server_test.go +++ b/x/lockup/keeper/msg_server_test.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // TODO: Make table driven diff --git a/x/lockup/keeper/query.go b/x/lockup/keeper/query.go index e574a3b433a..fac3a3c3a77 100644 --- a/x/lockup/keeper/query.go +++ b/x/lockup/keeper/query.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/lockup/keeper/store.go b/x/lockup/keeper/store.go index 4bde0c7fdb4..d0238e3fe88 100644 --- a/x/lockup/keeper/store.go +++ b/x/lockup/keeper/store.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // GetLastLockID returns ID used last time diff --git a/x/lockup/keeper/synthetic_lock.go b/x/lockup/keeper/synthetic_lock.go index 6b5d4cfa32f..0c5a2421818 100644 --- a/x/lockup/keeper/synthetic_lock.go +++ b/x/lockup/keeper/synthetic_lock.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) func (k Keeper) setSyntheticLockupObject(ctx sdk.Context, synthLock *types.SyntheticLock) error { diff --git a/x/lockup/keeper/synthetic_lock_test.go b/x/lockup/keeper/synthetic_lock_test.go index 006e5a529ac..f5df412956c 100644 --- a/x/lockup/keeper/synthetic_lock_test.go +++ b/x/lockup/keeper/synthetic_lock_test.go @@ -4,7 +4,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) func (suite *KeeperTestSuite) TestSyntheticLockupCreation() { diff --git a/x/lockup/keeper/utils.go b/x/lockup/keeper/utils.go index 3b747d0f85c..d8e21156dfe 100644 --- a/x/lockup/keeper/utils.go +++ b/x/lockup/keeper/utils.go @@ -5,7 +5,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // combineKeys combine bytes array into a single bytes diff --git a/x/lockup/keeper/utils_test.go b/x/lockup/keeper/utils_test.go index 8cf9e644ef5..8fd49ee338d 100644 --- a/x/lockup/keeper/utils_test.go +++ b/x/lockup/keeper/utils_test.go @@ -6,7 +6,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" "github.com/stretchr/testify/require" ) diff --git a/x/lockup/module.go b/x/lockup/module.go index 4796dc7f669..11887d5c302 100644 --- a/x/lockup/module.go +++ b/x/lockup/module.go @@ -15,11 +15,11 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/osmosis-labs/osmosis/x/lockup/client/cli" - "github.com/osmosis-labs/osmosis/x/lockup/client/rest" - "github.com/osmosis-labs/osmosis/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/x/lockup/simulation" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/lockup/client/rest" + "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v7/x/lockup/simulation" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/lockup/simulation/operations.go b/x/lockup/simulation/operations.go index a6f20285bef..eefc50921aa 100644 --- a/x/lockup/simulation/operations.go +++ b/x/lockup/simulation/operations.go @@ -5,7 +5,7 @@ import ( "time" "github.com/cosmos/cosmos-sdk/baseapp" - osmo_simulation "github.com/osmosis-labs/osmosis/x/simulation" + osmo_simulation "github.com/osmosis-labs/osmosis/v7/x/simulation" "github.com/cosmos/cosmos-sdk/codec" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" @@ -13,8 +13,8 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" stakingTypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // Simulation operation weights constants diff --git a/x/lockup/types/genesis.pb.go b/x/lockup/types/genesis.pb.go index 7f34a4e43a3..c108a1cdcd0 100644 --- a/x/lockup/types/genesis.pb.go +++ b/x/lockup/types/genesis.pb.go @@ -91,7 +91,7 @@ func init() { func init() { proto.RegisterFile("osmosis/lockup/genesis.proto", fileDescriptor_648db7c6ebb608b0) } var fileDescriptor_648db7c6ebb608b0 = []byte{ - // 258 bytes of a gzipped FileDescriptorProto + // 261 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xc9, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0xcf, 0xc9, 0x4f, 0xce, 0x2e, 0x2d, 0xd0, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x83, 0xca, 0xea, 0x41, 0x64, 0xa5, @@ -103,12 +103,12 @@ var fileDescriptor_648db7c6ebb608b0 = []byte{ 0x06, 0xbd, 0x80, 0xd4, 0xa2, 0xcc, 0xfc, 0x14, 0x90, 0x62, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0x20, 0xca, 0x85, 0x7c, 0xb8, 0xf8, 0x8b, 0x2b, 0xf3, 0x4a, 0x32, 0x52, 0x4b, 0x32, 0x93, 0xe3, 0x21, 0x26, 0x30, 0x83, 0x4d, 0x90, 0x45, 0x37, 0x21, 0x18, 0xa6, 0x0c, 0xc9, 0x10, 0xbe, - 0x62, 0x64, 0xc1, 0x62, 0x27, 0x8f, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, + 0x62, 0x64, 0xc1, 0x62, 0x27, 0xef, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, - 0xd2, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x1a, 0xac, 0x9b, - 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x57, 0xc0, 0xc2, 0xa1, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, - 0x0d, 0x1c, 0x12, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdf, 0xb6, 0x09, 0xb9, 0x6a, 0x01, - 0x00, 0x00, + 0x32, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x1a, 0xac, 0x9b, + 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x99, 0xeb, 0x57, 0xc0, 0x82, 0xa2, 0xa4, 0xb2, 0x20, + 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x18, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x7b, 0x29, + 0xfd, 0x6d, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/lockup/types/lock.pb.go b/x/lockup/types/lock.pb.go index 204b882e76b..3b4c84daeca 100644 --- a/x/lockup/types/lock.pb.go +++ b/x/lockup/types/lock.pb.go @@ -306,45 +306,45 @@ func init() { func init() { proto.RegisterFile("osmosis/lockup/lock.proto", fileDescriptor_7e9d7527a237b489) } var fileDescriptor_7e9d7527a237b489 = []byte{ - // 600 bytes of a gzipped FileDescriptorProto + // 603 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0x3d, 0x6f, 0xd3, 0x40, 0x18, 0xc7, 0xed, 0xbc, 0xd1, 0x1e, 0x34, 0x8d, 0x4e, 0x15, 0x4a, 0x03, 0xd8, 0x91, 0x07, 0x14, - 0xa1, 0xf6, 0x4c, 0xca, 0xc6, 0xe8, 0x16, 0x89, 0x48, 0x0c, 0x60, 0x2a, 0x06, 0x96, 0xc8, 0x2f, - 0x17, 0xe7, 0x14, 0xdb, 0x67, 0xfc, 0x02, 0xf5, 0x37, 0x60, 0xec, 0x08, 0x0b, 0x0b, 0x1b, 0x9f, - 0xa4, 0x63, 0x47, 0xa6, 0x14, 0x25, 0x62, 0x61, 0xec, 0x27, 0x40, 0x77, 0x67, 0xe7, 0xa5, 0x08, - 0xd4, 0x81, 0x4e, 0xce, 0xe3, 0xff, 0x3d, 0xff, 0x7b, 0xee, 0x77, 0x7f, 0x07, 0xec, 0xd2, 0x24, - 0xa0, 0x09, 0x49, 0x74, 0x9f, 0x3a, 0x93, 0x2c, 0xe2, 0x0f, 0x14, 0xc5, 0x34, 0xa5, 0xb0, 0x59, - 0x48, 0x48, 0x48, 0x9d, 0x1d, 0x8f, 0x7a, 0x94, 0x4b, 0x3a, 0xfb, 0x25, 0x56, 0x75, 0x14, 0x8f, - 0x52, 0xcf, 0xc7, 0x3a, 0xaf, 0xec, 0x6c, 0xa4, 0xbb, 0x59, 0x6c, 0xa5, 0x84, 0x86, 0x85, 0xae, - 0x5e, 0xd5, 0x53, 0x12, 0xe0, 0x24, 0xb5, 0x82, 0xa8, 0x34, 0x70, 0xf8, 0x3e, 0xba, 0x6d, 0x25, - 0x58, 0x7f, 0xdf, 0xb7, 0x71, 0x6a, 0xf5, 0x75, 0x87, 0x92, 0xc2, 0x40, 0xfb, 0x59, 0x01, 0xe0, - 0x25, 0x8e, 0x09, 0x75, 0x5f, 0x50, 0x67, 0x02, 0x9b, 0xa0, 0x32, 0x38, 0x6a, 0xcb, 0x5d, 0xb9, - 0x57, 0x33, 0x2b, 0x83, 0x23, 0xf8, 0x10, 0xd4, 0xe9, 0x87, 0x10, 0xc7, 0xed, 0x4a, 0x57, 0xee, - 0x6d, 0x1a, 0xad, 0xcb, 0xa9, 0x7a, 0x27, 0xb7, 0x02, 0xff, 0xa9, 0xc6, 0x5f, 0x6b, 0xa6, 0x90, - 0xe1, 0x18, 0x6c, 0x94, 0x93, 0xb5, 0xab, 0x5d, 0xb9, 0x77, 0xfb, 0x60, 0x17, 0x89, 0xd1, 0x50, - 0x39, 0x1a, 0x3a, 0x2a, 0x16, 0x18, 0xfd, 0xb3, 0xa9, 0x2a, 0xfd, 0x9a, 0xaa, 0xb0, 0x6c, 0xd9, - 0xa3, 0x01, 0x49, 0x71, 0x10, 0xa5, 0xf9, 0xe5, 0x54, 0xdd, 0x16, 0xfe, 0xa5, 0xa6, 0x7d, 0xba, - 0x50, 0x65, 0x73, 0xe1, 0x0e, 0x4d, 0xb0, 0x81, 0x43, 0x77, 0xc8, 0xce, 0xd9, 0xae, 0xf1, 0x9d, - 0x3a, 0x7f, 0xec, 0x74, 0x5c, 0x42, 0x30, 0xee, 0xb1, 0xad, 0x96, 0xa6, 0x65, 0xa7, 0x76, 0xca, - 0x4c, 0x6f, 0xe1, 0xd0, 0x65, 0x4b, 0xa1, 0x05, 0xea, 0x0c, 0x49, 0xd2, 0xae, 0x77, 0xab, 0x7c, - 0x74, 0x01, 0x0d, 0x31, 0x68, 0xa8, 0x80, 0x86, 0x0e, 0x29, 0x09, 0x8d, 0xc7, 0xcc, 0xef, 0xdb, - 0x85, 0xda, 0xf3, 0x48, 0x3a, 0xce, 0x6c, 0xe4, 0xd0, 0x40, 0x2f, 0x08, 0x8b, 0xc7, 0x7e, 0xe2, - 0x4e, 0xf4, 0x34, 0x8f, 0x70, 0xc2, 0x1b, 0x12, 0x53, 0x38, 0x6b, 0x9f, 0x2b, 0xa0, 0xf9, 0x2a, - 0xc3, 0x71, 0x7e, 0x48, 0x43, 0x97, 0xf0, 0x93, 0x3c, 0x03, 0xdb, 0xec, 0xee, 0x87, 0xef, 0xd8, - 0xeb, 0x21, 0xeb, 0xe1, 0xe0, 0x9b, 0x07, 0x0f, 0xd0, 0x7a, 0x36, 0x10, 0xbb, 0x1a, 0xde, 0x7c, - 0x9c, 0x47, 0xd8, 0xdc, 0xf2, 0x57, 0x4b, 0xb8, 0x03, 0xea, 0x2e, 0x0e, 0x69, 0x20, 0xae, 0xc8, - 0x14, 0x05, 0xc3, 0x74, 0xfd, 0x0b, 0xb9, 0x42, 0xe9, 0x6f, 0xe8, 0xdf, 0x80, 0xcd, 0x45, 0xbc, - 0xae, 0xc1, 0xfe, 0x7e, 0xe1, 0xda, 0x12, 0xae, 0x8b, 0x56, 0x01, 0x7f, 0x69, 0xa5, 0x7d, 0xa9, - 0x82, 0xad, 0xd7, 0x79, 0x98, 0x8e, 0x71, 0x4a, 0x1c, 0x1e, 0xc3, 0x3d, 0x00, 0xb3, 0xd0, 0xc5, - 0xb1, 0x9f, 0x93, 0xd0, 0x1b, 0x72, 0x4a, 0xc4, 0x2d, 0x62, 0xd9, 0x5a, 0x2a, 0x6c, 0xed, 0xc0, - 0x85, 0x77, 0x41, 0x23, 0xc9, 0x46, 0x23, 0x72, 0x52, 0x20, 0x28, 0xaa, 0xb5, 0xa8, 0x54, 0xff, - 0x53, 0x54, 0x56, 0x83, 0x5e, 0xbb, 0xd1, 0xa0, 0xdf, 0x7c, 0x28, 0x97, 0x5f, 0x77, 0xe3, 0x9f, - 0x5f, 0xf7, 0xa3, 0x3e, 0xd8, 0x5a, 0x8b, 0x20, 0x6c, 0x02, 0x60, 0xe4, 0xe5, 0x31, 0x5b, 0x12, - 0x04, 0xa0, 0x61, 0xe4, 0x8c, 0x4f, 0x4b, 0xee, 0xd4, 0x3e, 0x7e, 0x55, 0x24, 0xe3, 0xf9, 0xd9, - 0x4c, 0x91, 0xcf, 0x67, 0x8a, 0xfc, 0x63, 0xa6, 0xc8, 0xa7, 0x73, 0x45, 0x3a, 0x9f, 0x2b, 0xd2, - 0xf7, 0xb9, 0x22, 0xbd, 0x45, 0x2b, 0x53, 0x16, 0x39, 0xdf, 0xf7, 0x2d, 0x3b, 0x29, 0x0b, 0xfd, - 0xa4, 0xfc, 0xb7, 0xe4, 0x13, 0xdb, 0x0d, 0xce, 0xf5, 0xc9, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xf4, 0x94, 0xd1, 0x40, 0x4c, 0x05, 0x00, 0x00, + 0xa1, 0xd6, 0x26, 0x65, 0x40, 0x62, 0x74, 0xcb, 0x50, 0xc1, 0x00, 0xa6, 0x62, 0x60, 0x89, 0xfc, + 0x72, 0x71, 0x4e, 0xb1, 0x7d, 0xc6, 0x2f, 0xa5, 0xfe, 0x06, 0x8c, 0x1d, 0x61, 0x61, 0x61, 0xe3, + 0x93, 0x74, 0xec, 0xc8, 0x94, 0xa2, 0x44, 0x2c, 0x8c, 0xfd, 0x04, 0xe8, 0x5e, 0x9c, 0x97, 0x22, + 0x50, 0x07, 0x3a, 0x39, 0x8f, 0xff, 0xf7, 0xfc, 0xef, 0xb9, 0xdf, 0xfd, 0x1d, 0xb0, 0x4d, 0xd2, + 0x90, 0xa4, 0x38, 0x35, 0x02, 0xe2, 0x8e, 0xf3, 0x98, 0x3d, 0xf4, 0x38, 0x21, 0x19, 0x81, 0x4d, + 0x21, 0xe9, 0x5c, 0xea, 0x6c, 0xf9, 0xc4, 0x27, 0x4c, 0x32, 0xe8, 0x2f, 0xbe, 0xaa, 0xa3, 0xf8, + 0x84, 0xf8, 0x01, 0x32, 0x58, 0xe5, 0xe4, 0x43, 0xc3, 0xcb, 0x13, 0x3b, 0xc3, 0x24, 0x12, 0xba, + 0x7a, 0x55, 0xcf, 0x70, 0x88, 0xd2, 0xcc, 0x0e, 0xe3, 0xd2, 0xc0, 0x65, 0xfb, 0x18, 0x8e, 0x9d, + 0x22, 0xe3, 0xb8, 0xef, 0xa0, 0xcc, 0xee, 0x1b, 0x2e, 0xc1, 0xc2, 0x40, 0xfb, 0x59, 0x01, 0xe0, + 0x15, 0x4a, 0x30, 0xf1, 0x5e, 0x12, 0x77, 0x0c, 0x9b, 0xa0, 0x72, 0x78, 0xd0, 0x96, 0xbb, 0x72, + 0xaf, 0x66, 0x55, 0x0e, 0x0f, 0xe0, 0x43, 0x50, 0x27, 0x1f, 0x22, 0x94, 0xb4, 0x2b, 0x5d, 0xb9, + 0xb7, 0x6e, 0xb6, 0x2e, 0x27, 0xea, 0x9d, 0xc2, 0x0e, 0x83, 0x67, 0x1a, 0x7b, 0xad, 0x59, 0x5c, + 0x86, 0x23, 0xb0, 0x56, 0x4e, 0xd6, 0xae, 0x76, 0xe5, 0xde, 0xed, 0xbd, 0x6d, 0x9d, 0x8f, 0xa6, + 0x97, 0xa3, 0xe9, 0x07, 0x62, 0x81, 0xd9, 0x3f, 0x9b, 0xa8, 0xd2, 0xaf, 0x89, 0x0a, 0xcb, 0x96, + 0x1d, 0x12, 0xe2, 0x0c, 0x85, 0x71, 0x56, 0x5c, 0x4e, 0xd4, 0x4d, 0xee, 0x5f, 0x6a, 0xda, 0xa7, + 0x0b, 0x55, 0xb6, 0xe6, 0xee, 0xd0, 0x02, 0x6b, 0x28, 0xf2, 0x06, 0xf4, 0x9c, 0xed, 0x1a, 0xdb, + 0xa9, 0xf3, 0xc7, 0x4e, 0x47, 0x25, 0x04, 0xf3, 0x1e, 0xdd, 0x6a, 0x61, 0x5a, 0x76, 0x6a, 0xa7, + 0xd4, 0xf4, 0x16, 0x8a, 0x3c, 0xba, 0x14, 0xda, 0xa0, 0x4e, 0x91, 0xa4, 0xed, 0x7a, 0xb7, 0xca, + 0x46, 0xe7, 0xd0, 0x74, 0x0a, 0x4d, 0x17, 0xd0, 0xf4, 0x7d, 0x82, 0x23, 0xf3, 0x31, 0xf5, 0xfb, + 0x76, 0xa1, 0xf6, 0x7c, 0x9c, 0x8d, 0x72, 0x47, 0x77, 0x49, 0x68, 0x08, 0xc2, 0xfc, 0xb1, 0x9b, + 0x7a, 0x63, 0x23, 0x2b, 0x62, 0x94, 0xb2, 0x86, 0xd4, 0xe2, 0xce, 0xda, 0xe7, 0x0a, 0x68, 0xbe, + 0xce, 0x51, 0x52, 0xec, 0x93, 0xc8, 0xc3, 0xec, 0x24, 0xcf, 0xc1, 0x26, 0xbd, 0xfb, 0xc1, 0x7b, + 0xfa, 0x7a, 0x40, 0x7b, 0x18, 0xf8, 0xe6, 0xde, 0x03, 0x7d, 0x35, 0x1b, 0x3a, 0xbd, 0x1a, 0xd6, + 0x7c, 0x54, 0xc4, 0xc8, 0xda, 0x08, 0x96, 0x4b, 0xb8, 0x05, 0xea, 0x1e, 0x8a, 0x48, 0xc8, 0xaf, + 0xc8, 0xe2, 0x05, 0xc5, 0x74, 0xfd, 0x0b, 0xb9, 0x42, 0xe9, 0x6f, 0xe8, 0xdf, 0x82, 0xf5, 0x79, + 0xbc, 0xae, 0xc1, 0xfe, 0xbe, 0x70, 0x6d, 0x71, 0xd7, 0x79, 0x2b, 0x87, 0xbf, 0xb0, 0xd2, 0xbe, + 0x54, 0xc1, 0xc6, 0x9b, 0x22, 0xca, 0x46, 0x28, 0xc3, 0x2e, 0x8b, 0xe1, 0x0e, 0x80, 0x79, 0xe4, + 0xa1, 0x24, 0x28, 0x70, 0xe4, 0x0f, 0x18, 0x25, 0xec, 0x89, 0x58, 0xb6, 0x16, 0x0a, 0x5d, 0x7b, + 0xe8, 0xc1, 0xbb, 0xa0, 0x91, 0xe6, 0xc3, 0x21, 0x3e, 0x11, 0x08, 0x44, 0xb5, 0x12, 0x95, 0xea, + 0x7f, 0x8a, 0xca, 0x72, 0xd0, 0x6b, 0x37, 0x1a, 0xf4, 0x9b, 0x0f, 0xe5, 0xe2, 0xeb, 0x6e, 0xfc, + 0xf3, 0xeb, 0x7e, 0xd4, 0x07, 0x1b, 0x2b, 0x11, 0x84, 0x4d, 0x00, 0xcc, 0xa2, 0x3c, 0x66, 0x4b, + 0x82, 0x00, 0x34, 0xcc, 0x82, 0xf2, 0x69, 0xc9, 0x9d, 0xda, 0xc7, 0xaf, 0x8a, 0x64, 0xbe, 0x38, + 0x9b, 0x2a, 0xf2, 0xf9, 0x54, 0x91, 0x7f, 0x4c, 0x15, 0xf9, 0x74, 0xa6, 0x48, 0xe7, 0x33, 0x45, + 0xfa, 0x3e, 0x53, 0xa4, 0x77, 0xfd, 0xa5, 0x29, 0x45, 0xce, 0x77, 0x03, 0xdb, 0x49, 0xcb, 0xc2, + 0x38, 0x7e, 0x6a, 0x9c, 0x94, 0x7f, 0x98, 0x6c, 0x68, 0xa7, 0xc1, 0xd0, 0x3e, 0xf9, 0x1d, 0x00, + 0x00, 0xff, 0xff, 0xcf, 0xce, 0x8b, 0xe6, 0x4f, 0x05, 0x00, 0x00, } func (m *PeriodLock) Marshal() (dAtA []byte, err error) { diff --git a/x/lockup/types/query.pb.go b/x/lockup/types/query.pb.go index c928d0daee1..86368b4a7ef 100644 --- a/x/lockup/types/query.pb.go +++ b/x/lockup/types/query.pb.go @@ -1379,90 +1379,90 @@ func init() { func init() { proto.RegisterFile("osmosis/lockup/query.proto", fileDescriptor_e906fda01cffd91a) } var fileDescriptor_e906fda01cffd91a = []byte{ - // 1314 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6f, 0x1b, 0xc5, - 0x17, 0xcf, 0xb4, 0x4d, 0xbe, 0xdf, 0xbe, 0x90, 0x52, 0x0d, 0x69, 0x49, 0x36, 0xa9, 0x1d, 0xb6, - 0x6d, 0x30, 0x90, 0xec, 0xe6, 0x47, 0x95, 0x96, 0x2a, 0x6d, 0x52, 0x27, 0x04, 0x82, 0x02, 0xb4, - 0xa6, 0x50, 0xf1, 0x4b, 0xd6, 0xda, 0x9e, 0x9a, 0x55, 0xec, 0x1d, 0xd7, 0xbb, 0x06, 0x4c, 0x55, - 0x2a, 0xb5, 0x1c, 0x39, 0x14, 0x71, 0xe1, 0x84, 0x80, 0x1b, 0x1c, 0x10, 0x17, 0x0e, 0x15, 0x77, - 0x54, 0x71, 0x40, 0x95, 0xb8, 0x20, 0x0e, 0x29, 0x4a, 0xf8, 0x0b, 0x72, 0x42, 0xe2, 0x82, 0x76, - 0x66, 0x76, 0x93, 0x5d, 0xef, 0x6e, 0x76, 0x6d, 0x25, 0xca, 0xc9, 0xb1, 0xdf, 0x9b, 0xf7, 0x3e, - 0x9f, 0xcf, 0xbc, 0x7d, 0xfb, 0x5e, 0x40, 0xa2, 0x66, 0x95, 0x9a, 0xba, 0xa9, 0x56, 0x68, 0x71, - 0xb5, 0x51, 0x53, 0x6f, 0x34, 0x48, 0xbd, 0xa9, 0xd4, 0xea, 0xd4, 0xa2, 0xf8, 0x88, 0xb0, 0x29, - 0xdc, 0x26, 0xf5, 0x97, 0x69, 0x99, 0x32, 0x93, 0x6a, 0xff, 0xc5, 0xbd, 0xa4, 0x54, 0x91, 0xb9, - 0xa9, 0x05, 0xcd, 0x24, 0xea, 0x07, 0x93, 0x05, 0x62, 0x69, 0x93, 0x6a, 0x91, 0xea, 0x86, 0xb0, - 0x0f, 0x97, 0x29, 0x2d, 0x57, 0x88, 0xaa, 0xd5, 0x74, 0x55, 0x33, 0x0c, 0x6a, 0x69, 0x96, 0x4e, - 0x0d, 0x53, 0x58, 0xd3, 0xc2, 0xca, 0xbe, 0x15, 0x1a, 0xd7, 0x55, 0x4b, 0xaf, 0x12, 0xd3, 0xd2, - 0xaa, 0x35, 0x27, 0xbc, 0xdf, 0xa1, 0xd4, 0xa8, 0xb3, 0x08, 0xc2, 0x3e, 0xe8, 0x23, 0x60, 0x7f, - 0x70, 0x93, 0x7c, 0x1c, 0xfa, 0x5f, 0xa1, 0xa5, 0x46, 0x85, 0x64, 0xb5, 0x8a, 0x66, 0x14, 0x49, - 0x8e, 0xdc, 0x68, 0x10, 0xd3, 0x92, 0x3f, 0x86, 0x63, 0xbe, 0xdf, 0xcd, 0x1a, 0x35, 0x4c, 0x82, - 0x35, 0xe8, 0xb6, 0x81, 0x9b, 0x03, 0x68, 0xe4, 0x60, 0xa6, 0x77, 0x6a, 0x50, 0xe1, 0xd4, 0x14, - 0x9b, 0x9a, 0x22, 0xa8, 0x29, 0x0b, 0x54, 0x37, 0xb2, 0x13, 0x0f, 0xd6, 0xd2, 0x5d, 0xdf, 0x3f, - 0x4a, 0x67, 0xca, 0xba, 0xf5, 0x7e, 0xa3, 0xa0, 0x14, 0x69, 0x55, 0x15, 0x3a, 0xf0, 0x8f, 0x71, - 0xb3, 0xb4, 0xaa, 0x5a, 0xcd, 0x1a, 0x31, 0xd9, 0x01, 0x33, 0xc7, 0x23, 0xcb, 0x43, 0x30, 0xc8, - 0x73, 0xaf, 0xd0, 0xe2, 0x2a, 0x29, 0x5d, 0xaa, 0xd2, 0x86, 0x61, 0x39, 0xc0, 0x6e, 0x83, 0x14, - 0x64, 0xdc, 0x3b, 0x74, 0x2f, 0xc2, 0x89, 0x4b, 0xc5, 0xa2, 0x9d, 0xf5, 0x0d, 0xc3, 0x16, 0x52, - 0x2b, 0x54, 0x08, 0x77, 0xe0, 0x08, 0xf1, 0x28, 0x74, 0xd3, 0x0f, 0x0d, 0x52, 0x1f, 0x40, 0x23, - 0x28, 0x73, 0x38, 0x7b, 0x74, 0x73, 0x2d, 0xfd, 0x58, 0x53, 0xab, 0x56, 0xce, 0xcb, 0xec, 0x67, - 0x39, 0xc7, 0xcd, 0xf2, 0x5d, 0x04, 0xa9, 0xb0, 0x48, 0x7b, 0x47, 0x67, 0x09, 0x86, 0x3d, 0x20, - 0x74, 0xa3, 0xdc, 0x16, 0x9b, 0x3b, 0xc8, 0xa7, 0xcb, 0x56, 0xa0, 0xbd, 0x23, 0xb3, 0x00, 0x83, - 0x02, 0x03, 0xaf, 0x8e, 0xb6, 0x98, 0xdc, 0x06, 0x29, 0x28, 0xc8, 0xde, 0xb1, 0xf8, 0x0a, 0xb9, - 0x77, 0xc2, 0x11, 0x5c, 0xd6, 0x4c, 0xeb, 0xaa, 0x5e, 0x25, 0x09, 0x99, 0xe0, 0x37, 0xe1, 0xb0, - 0xdb, 0x2a, 0x06, 0x0e, 0x8c, 0xa0, 0x4c, 0xef, 0x94, 0xa4, 0xf0, 0x5e, 0xa1, 0x38, 0xbd, 0x42, - 0xb9, 0xea, 0x78, 0x64, 0x87, 0x6d, 0xc0, 0x9b, 0x6b, 0xe9, 0xa3, 0x3c, 0x96, 0x7b, 0x54, 0xbe, - 0xf7, 0x28, 0x8d, 0x72, 0x5b, 0xa1, 0xe4, 0x6b, 0xee, 0x55, 0xfb, 0xf1, 0x09, 0x91, 0x66, 0xa0, - 0xdb, 0x2e, 0x01, 0x47, 0x24, 0x49, 0xf1, 0x76, 0x49, 0xe5, 0x32, 0xa9, 0xeb, 0xb4, 0x64, 0x1f, - 0xce, 0x1e, 0xb2, 0x93, 0xe6, 0xb8, 0xbb, 0xfc, 0x03, 0x82, 0xb1, 0xc0, 0xc8, 0xaf, 0xd2, 0xad, - 0xaa, 0x7a, 0xcd, 0xa8, 0x34, 0xf7, 0x8b, 0x12, 0x65, 0x18, 0x8f, 0x89, 0xb7, 0x43, 0x65, 0xbe, - 0x45, 0x30, 0xe2, 0x79, 0xbc, 0x48, 0x29, 0x4b, 0xae, 0xd3, 0x3a, 0xd9, 0x4f, 0x75, 0xf1, 0x0e, - 0x3c, 0x15, 0x81, 0xb1, 0x43, 0x05, 0xee, 0x23, 0x37, 0xba, 0x57, 0xeb, 0x45, 0x62, 0xd0, 0xea, - 0x3e, 0x91, 0x00, 0xf7, 0x43, 0x77, 0xc9, 0xc6, 0x33, 0x70, 0xd0, 0xce, 0x9f, 0xe3, 0x5f, 0xe4, - 0x77, 0x41, 0x8e, 0x82, 0xde, 0xa1, 0x32, 0x9f, 0x00, 0xe6, 0x61, 0x3d, 0x4a, 0xb8, 0x48, 0xd0, - 0x36, 0x24, 0x38, 0x07, 0xff, 0x77, 0x86, 0x03, 0x41, 0x7b, 0xb0, 0x85, 0xf6, 0xa2, 0x70, 0xc8, - 0x0e, 0x09, 0xd6, 0x8f, 0x73, 0xd6, 0xce, 0x41, 0xf9, 0x4b, 0x9b, 0xb4, 0x1b, 0x47, 0x36, 0xe0, - 0x09, 0x4f, 0x7e, 0x41, 0xe7, 0x1a, 0xf4, 0x68, 0xec, 0xed, 0x2c, 0xee, 0x62, 0xce, 0x8e, 0xf6, - 0xe7, 0x5a, 0x7a, 0x34, 0x46, 0x3f, 0x5c, 0x36, 0xac, 0xcd, 0xb5, 0x74, 0x1f, 0xcf, 0xcb, 0xa3, - 0xc8, 0x39, 0x11, 0x4e, 0xce, 0x40, 0x1f, 0xcf, 0xe7, 0x50, 0x7d, 0x12, 0xfe, 0x67, 0x2b, 0x91, - 0xd7, 0x4b, 0x2c, 0xd5, 0xa1, 0x5c, 0x8f, 0xfd, 0x75, 0xb9, 0x24, 0xcf, 0xc3, 0x11, 0xc7, 0x53, - 0x80, 0x52, 0xe0, 0x90, 0x6d, 0x63, 0x7e, 0x91, 0x12, 0xe7, 0x98, 0x9f, 0xfc, 0x35, 0xf2, 0x5d, - 0xdd, 0x0a, 0x35, 0xca, 0xa4, 0xee, 0x48, 0x94, 0xb4, 0xec, 0x76, 0x43, 0xfe, 0xf7, 0xe0, 0x64, - 0x24, 0xc2, 0x0e, 0xab, 0xeb, 0x47, 0x04, 0x53, 0x11, 0xf1, 0x3b, 0xed, 0xcc, 0xbb, 0xa1, 0x48, - 0x15, 0xa6, 0x13, 0x21, 0xee, 0x50, 0xa1, 0x9f, 0x11, 0x3c, 0x1d, 0x91, 0xaf, 0xad, 0xfe, 0xb4, - 0x0b, 0xb2, 0x84, 0xf4, 0xa6, 0x02, 0x64, 0x76, 0x06, 0xdf, 0x99, 0x42, 0x53, 0xff, 0xf6, 0x43, - 0xf7, 0x15, 0x7b, 0x6b, 0xc2, 0x9f, 0x21, 0xe8, 0xf3, 0x2c, 0x16, 0xf8, 0x94, 0x3f, 0x48, 0xd0, - 0x3e, 0x22, 0x9d, 0xde, 0xc1, 0x8b, 0x03, 0x94, 0x95, 0x3b, 0xbf, 0xff, 0xfd, 0xc5, 0x81, 0x0c, - 0x1e, 0x55, 0x7d, 0x2b, 0x8f, 0xb3, 0x74, 0x55, 0xd9, 0xb1, 0x7c, 0x41, 0x24, 0xff, 0x06, 0x01, - 0x6e, 0x5d, 0x27, 0xf0, 0x33, 0xc1, 0xd9, 0x02, 0xf6, 0x11, 0xe9, 0xd9, 0x38, 0xae, 0x02, 0xdd, - 0x19, 0x86, 0x4e, 0xc1, 0x63, 0x3b, 0xa0, 0xe3, 0xef, 0xce, 0x3c, 0x6f, 0x77, 0xf8, 0x3e, 0x82, - 0xe3, 0xc1, 0x7b, 0x02, 0x1e, 0xf7, 0x27, 0x8f, 0xdc, 0x4c, 0x24, 0x25, 0xae, 0xbb, 0xc0, 0x3b, - 0xcf, 0xf0, 0x9e, 0xc7, 0xe7, 0xc2, 0xf0, 0x6a, 0xfc, 0x7c, 0xbe, 0xe1, 0x06, 0xc8, 0xb3, 0x11, - 0x56, 0xbd, 0xc9, 0xaa, 0xf8, 0x16, 0xfe, 0x09, 0xc1, 0xb1, 0xc0, 0xad, 0x00, 0x8f, 0x45, 0x62, - 0xf1, 0x6d, 0x21, 0xd2, 0x78, 0x4c, 0x6f, 0x01, 0x7c, 0x8e, 0x01, 0x7f, 0x1e, 0x9f, 0x8d, 0x07, - 0x5c, 0x37, 0xca, 0x3e, 0xdc, 0xdf, 0x21, 0xc0, 0xad, 0x4b, 0x40, 0x6b, 0x5d, 0x84, 0x6e, 0x1b, - 0xad, 0x75, 0x11, 0xbe, 0x53, 0xc8, 0xb3, 0x0c, 0xee, 0x0c, 0x3e, 0xb3, 0x13, 0x5c, 0x51, 0x18, - 0xa1, 0x1a, 0x7b, 0xa7, 0x8b, 0x50, 0x8d, 0x03, 0xb7, 0x8a, 0x50, 0x8d, 0x83, 0x67, 0xfc, 0xf8, - 0x1a, 0x0b, 0xd0, 0x35, 0xcd, 0xb4, 0xec, 0x39, 0xc9, 0xc5, 0xfd, 0x0f, 0x82, 0xd3, 0xb1, 0x86, - 0x67, 0x3c, 0x1b, 0x0b, 0x59, 0xc8, 0x9b, 0x48, 0xba, 0xd0, 0xe6, 0x69, 0xc1, 0x33, 0xc7, 0x78, - 0xae, 0xe0, 0x97, 0x13, 0xf2, 0xcc, 0x1b, 0x74, 0x7b, 0x7d, 0x51, 0xa3, 0xd2, 0x74, 0xa9, 0xff, - 0x82, 0xdc, 0x45, 0xb5, 0x75, 0x52, 0xc6, 0x13, 0x91, 0xc5, 0x1e, 0x30, 0xf8, 0x4b, 0x93, 0x09, - 0x4e, 0x08, 0x5a, 0x8b, 0x8c, 0xd6, 0x45, 0x3c, 0x1b, 0xef, 0x11, 0x21, 0xa5, 0x7c, 0x81, 0x05, - 0xc9, 0x7b, 0xee, 0xf0, 0x57, 0xe4, 0x5b, 0x96, 0x3d, 0x93, 0x2d, 0x9e, 0x8c, 0x25, 0xfd, 0xf6, - 0x17, 0xa4, 0x34, 0x95, 0xe4, 0x88, 0xe0, 0xf2, 0x02, 0xe3, 0x32, 0x87, 0x2f, 0x24, 0xbd, 0x22, - 0xf6, 0x06, 0x74, 0xc9, 0x7c, 0x8a, 0xa0, 0x77, 0xdb, 0x20, 0x8b, 0x65, 0x3f, 0x94, 0xd6, 0x29, - 0x5b, 0x3a, 0x19, 0xe9, 0x23, 0xf0, 0x8d, 0x31, 0x7c, 0xa3, 0xf8, 0x54, 0x18, 0x3e, 0x81, 0x8b, - 0x8f, 0xe8, 0x77, 0x11, 0x00, 0x8f, 0x92, 0x6d, 0x2e, 0x2f, 0xe2, 0x13, 0xc1, 0x19, 0x1c, 0x00, - 0xa9, 0x30, 0xb3, 0xc8, 0x3d, 0xc3, 0x72, 0x4f, 0x60, 0x65, 0x87, 0xdc, 0x85, 0x66, 0x5e, 0x2f, - 0xa9, 0x37, 0xc5, 0x1c, 0x7d, 0x0b, 0xff, 0x86, 0x60, 0x28, 0x62, 0x2e, 0xc0, 0xd1, 0xf7, 0x14, - 0x38, 0x25, 0x4b, 0xd3, 0x89, 0xce, 0x08, 0x02, 0x4b, 0x8c, 0xc0, 0x3c, 0xbe, 0x18, 0xf3, 0x72, - 0x2b, 0x2c, 0x4c, 0xde, 0x99, 0x7a, 0xdc, 0xdb, 0xfd, 0xfc, 0x00, 0x3c, 0x97, 0x60, 0x2a, 0xc4, - 0xd9, 0x04, 0x60, 0xc3, 0x5a, 0xcf, 0x42, 0x47, 0x31, 0x84, 0x00, 0x6f, 0x31, 0x01, 0x5e, 0xc7, - 0x57, 0xda, 0x13, 0x20, 0xaa, 0x0f, 0x6d, 0x6c, 0xfd, 0x57, 0x21, 0x74, 0xf8, 0xc3, 0x67, 0x13, - 0x90, 0xf0, 0x3c, 0x1b, 0xe7, 0x92, 0x1f, 0x14, 0x94, 0x57, 0x18, 0xe5, 0x25, 0xbc, 0xd8, 0x26, - 0x65, 0xcf, 0x73, 0x9d, 0x7d, 0xe9, 0xc1, 0x7a, 0x0a, 0x3d, 0x5c, 0x4f, 0xa1, 0xbf, 0xd6, 0x53, - 0xe8, 0xde, 0x46, 0xaa, 0xeb, 0xe1, 0x46, 0xaa, 0xeb, 0x8f, 0x8d, 0x54, 0xd7, 0xdb, 0xca, 0xb6, - 0x55, 0x54, 0x64, 0x1a, 0xaf, 0x68, 0x05, 0xd3, 0x4d, 0xfb, 0x91, 0x93, 0x98, 0xad, 0xa5, 0x85, - 0x1e, 0x36, 0x7b, 0x4f, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0xf2, 0x91, 0x08, 0x8e, 0x12, 0x18, - 0x00, 0x00, + // 1316 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6f, 0xdc, 0x54, + 0x10, 0xce, 0x4b, 0x93, 0x40, 0x27, 0xa4, 0x54, 0x8f, 0xb4, 0x24, 0x4e, 0xba, 0x1b, 0xdc, 0x36, + 0x2c, 0x90, 0xd8, 0xf9, 0x51, 0x25, 0xa5, 0x4a, 0x9b, 0x74, 0x13, 0x82, 0x02, 0x01, 0xda, 0xa5, + 0x50, 0xf1, 0x4b, 0x2b, 0xef, 0xda, 0x5d, 0xac, 0xec, 0xfa, 0x6d, 0xd7, 0xde, 0xc2, 0x52, 0x95, + 0x4a, 0x2d, 0x47, 0x0e, 0x45, 0x5c, 0x38, 0x21, 0xe0, 0x06, 0x07, 0xc4, 0x85, 0x43, 0xc5, 0x1d, + 0x55, 0x1c, 0x50, 0x25, 0x2e, 0x88, 0x43, 0x8a, 0x12, 0xfe, 0x82, 0x9c, 0x90, 0xb8, 0x20, 0xbf, + 0xf7, 0xec, 0xc4, 0x5e, 0xdb, 0xb1, 0x77, 0x95, 0x28, 0xa7, 0xcd, 0xee, 0xcc, 0x9b, 0xf9, 0xbe, + 0xef, 0x8d, 0xc7, 0x33, 0x01, 0x81, 0x98, 0x15, 0x62, 0xea, 0xa6, 0x5c, 0x26, 0xc5, 0xb5, 0x7a, + 0x55, 0xbe, 0x5e, 0xd7, 0x6a, 0x0d, 0xa9, 0x5a, 0x23, 0x16, 0xc1, 0x47, 0xb8, 0x4d, 0x62, 0x36, + 0xa1, 0xbf, 0x44, 0x4a, 0x84, 0x9a, 0x64, 0xfb, 0x2f, 0xe6, 0x25, 0xa4, 0x8a, 0xd4, 0x4d, 0x2e, + 0x28, 0xa6, 0x26, 0xdf, 0x98, 0x2c, 0x68, 0x96, 0x32, 0x29, 0x17, 0x89, 0x6e, 0x70, 0xfb, 0x70, + 0x89, 0x90, 0x52, 0x59, 0x93, 0x95, 0xaa, 0x2e, 0x2b, 0x86, 0x41, 0x2c, 0xc5, 0xd2, 0x89, 0x61, + 0x72, 0x6b, 0x9a, 0x5b, 0xe9, 0xb7, 0x42, 0xfd, 0x9a, 0x6c, 0xe9, 0x15, 0xcd, 0xb4, 0x94, 0x4a, + 0xd5, 0x09, 0xef, 0x77, 0x50, 0xeb, 0x35, 0x1a, 0x81, 0xdb, 0x07, 0x7d, 0x04, 0xec, 0x0f, 0x66, + 0x12, 0x8f, 0x43, 0xff, 0x6b, 0x44, 0xad, 0x97, 0xb5, 0xac, 0x52, 0x56, 0x8c, 0xa2, 0x96, 0xd3, + 0xae, 0xd7, 0x35, 0xd3, 0x12, 0x3f, 0x81, 0x63, 0xbe, 0xdf, 0xcd, 0x2a, 0x31, 0x4c, 0x0d, 0x2b, + 0xd0, 0x6d, 0x03, 0x37, 0x07, 0xd0, 0xc8, 0xa1, 0x4c, 0xef, 0xd4, 0xa0, 0xc4, 0xa8, 0x49, 0x36, + 0x35, 0x89, 0x53, 0x93, 0x16, 0x89, 0x6e, 0x64, 0x27, 0x1e, 0xac, 0xa7, 0x3b, 0x7e, 0x78, 0x94, + 0xce, 0x94, 0x74, 0xeb, 0xc3, 0x7a, 0x41, 0x2a, 0x92, 0x8a, 0xcc, 0x75, 0x60, 0x1f, 0xe3, 0xa6, + 0xba, 0x26, 0x5b, 0x8d, 0xaa, 0x66, 0xd2, 0x03, 0x66, 0x8e, 0x45, 0x16, 0x87, 0x60, 0x90, 0xe5, + 0x5e, 0x25, 0xc5, 0x35, 0x4d, 0xbd, 0x58, 0x21, 0x75, 0xc3, 0x72, 0x80, 0xdd, 0x06, 0x21, 0xc8, + 0xb8, 0x7f, 0xe8, 0x5e, 0x86, 0x13, 0x17, 0x8b, 0x45, 0x3b, 0xeb, 0x5b, 0x86, 0x2d, 0xa4, 0x52, + 0x28, 0x6b, 0xcc, 0x81, 0x21, 0xc4, 0xa3, 0xd0, 0x4d, 0x3e, 0x32, 0xb4, 0xda, 0x00, 0x1a, 0x41, + 0x99, 0xc3, 0xd9, 0xa3, 0x5b, 0xeb, 0xe9, 0x27, 0x1a, 0x4a, 0xa5, 0x7c, 0x4e, 0xa4, 0x3f, 0x8b, + 0x39, 0x66, 0x16, 0xef, 0x22, 0x48, 0x85, 0x45, 0xda, 0x3f, 0x3a, 0xcb, 0x30, 0xec, 0x01, 0xa1, + 0x1b, 0xa5, 0x96, 0xd8, 0xdc, 0x41, 0x3e, 0x5d, 0xb6, 0x03, 0xed, 0x1f, 0x99, 0x45, 0x18, 0xe4, + 0x18, 0x58, 0x75, 0xb4, 0xc4, 0xe4, 0x36, 0x08, 0x41, 0x41, 0xf6, 0x8f, 0xc5, 0xd7, 0xc8, 0xbd, + 0x13, 0x86, 0xe0, 0x92, 0x62, 0x5a, 0x57, 0xf4, 0x8a, 0x96, 0x90, 0x09, 0x7e, 0x1b, 0x0e, 0xbb, + 0xad, 0x62, 0xa0, 0x73, 0x04, 0x65, 0x7a, 0xa7, 0x04, 0x89, 0xf5, 0x0a, 0xc9, 0xe9, 0x15, 0xd2, + 0x15, 0xc7, 0x23, 0x3b, 0x6c, 0x03, 0xde, 0x5a, 0x4f, 0x1f, 0x65, 0xb1, 0xdc, 0xa3, 0xe2, 0xbd, + 0x47, 0x69, 0x94, 0xdb, 0x0e, 0x25, 0x5e, 0x75, 0xaf, 0xda, 0x8f, 0x8f, 0x8b, 0x34, 0x03, 0xdd, + 0x76, 0x09, 0x38, 0x22, 0x09, 0x92, 0xb7, 0x4b, 0x4a, 0x97, 0xb4, 0x9a, 0x4e, 0x54, 0xfb, 0x70, + 0xb6, 0xcb, 0x4e, 0x9a, 0x63, 0xee, 0xe2, 0x8f, 0x08, 0xc6, 0x02, 0x23, 0xbf, 0x4e, 0xb6, 0xab, + 0xea, 0x0d, 0xa3, 0xdc, 0x38, 0x28, 0x4a, 0x94, 0x60, 0x3c, 0x26, 0xde, 0x36, 0x95, 0xf9, 0x0e, + 0xc1, 0x88, 0xe7, 0xf1, 0xd2, 0xd4, 0xac, 0x76, 0x8d, 0xd4, 0xb4, 0x83, 0x54, 0x17, 0xef, 0xc1, + 0x33, 0x11, 0x18, 0xdb, 0x54, 0xe0, 0x3e, 0x72, 0xa3, 0x7b, 0xb5, 0x5e, 0xd2, 0x0c, 0x52, 0x39, + 0x20, 0x12, 0xe0, 0x7e, 0xe8, 0x56, 0x6d, 0x3c, 0x03, 0x87, 0xec, 0xfc, 0x39, 0xf6, 0x45, 0x7c, + 0x1f, 0xc4, 0x28, 0xe8, 0x6d, 0x2a, 0xf3, 0x29, 0x60, 0x16, 0xd6, 0xa3, 0x84, 0x8b, 0x04, 0xed, + 0x40, 0x82, 0x73, 0xf0, 0xb8, 0x33, 0x1c, 0x70, 0xda, 0x83, 0x4d, 0xb4, 0x97, 0xb8, 0x43, 0x76, + 0x88, 0xb3, 0x7e, 0x92, 0xb1, 0x76, 0x0e, 0x8a, 0x5f, 0xd9, 0xa4, 0xdd, 0x38, 0xa2, 0x01, 0x4f, + 0x79, 0xf2, 0x73, 0x3a, 0x57, 0xa1, 0x47, 0xa1, 0x6f, 0x67, 0x7e, 0x17, 0xf3, 0x76, 0xb4, 0xbf, + 0xd6, 0xd3, 0xa3, 0x31, 0xfa, 0xe1, 0x8a, 0x61, 0x6d, 0xad, 0xa7, 0xfb, 0x58, 0x5e, 0x16, 0x45, + 0xcc, 0xf1, 0x70, 0x62, 0x06, 0xfa, 0x58, 0x3e, 0x87, 0xea, 0xd3, 0xf0, 0x98, 0xad, 0x44, 0x5e, + 0x57, 0x69, 0xaa, 0xae, 0x5c, 0x8f, 0xfd, 0x75, 0x45, 0x15, 0x17, 0xe0, 0x88, 0xe3, 0xc9, 0x41, + 0x49, 0xd0, 0x65, 0xdb, 0xa8, 0x5f, 0xa4, 0xc4, 0x39, 0xea, 0x27, 0x7e, 0x83, 0x7c, 0x57, 0xb7, + 0x4a, 0x8c, 0x92, 0x56, 0x73, 0x24, 0x4a, 0x5a, 0x76, 0x7b, 0x21, 0xff, 0x07, 0x70, 0x32, 0x12, + 0x61, 0x9b, 0xd5, 0xf5, 0x13, 0x82, 0xa9, 0x88, 0xf8, 0xed, 0x76, 0xe6, 0xbd, 0x50, 0xa4, 0x02, + 0xd3, 0x89, 0x10, 0xb7, 0xa9, 0xd0, 0x2f, 0x08, 0x9e, 0x8d, 0xc8, 0xd7, 0x52, 0x7f, 0xda, 0x03, + 0x59, 0x42, 0x7a, 0x53, 0x01, 0x32, 0xbb, 0x83, 0x6f, 0x4f, 0xa1, 0xa9, 0xff, 0xfa, 0xa1, 0xfb, + 0xb2, 0xbd, 0x35, 0xe1, 0xcf, 0x11, 0xf4, 0x79, 0x16, 0x0b, 0x7c, 0xca, 0x1f, 0x24, 0x68, 0x1f, + 0x11, 0x4e, 0xef, 0xe2, 0xc5, 0x00, 0x8a, 0xd2, 0x9d, 0x3f, 0xfe, 0xf9, 0xb2, 0x33, 0x83, 0x47, + 0x65, 0xdf, 0xca, 0xe3, 0x2c, 0x5d, 0x15, 0x7a, 0x2c, 0x5f, 0xe0, 0xc9, 0xbf, 0x45, 0x80, 0x9b, + 0xd7, 0x09, 0xfc, 0x5c, 0x70, 0xb6, 0x80, 0x7d, 0x44, 0x78, 0x3e, 0x8e, 0x2b, 0x47, 0x77, 0x86, + 0xa2, 0x93, 0xf0, 0xd8, 0x2e, 0xe8, 0xd8, 0xbb, 0x33, 0xcf, 0xda, 0x1d, 0xbe, 0x8f, 0xe0, 0x78, + 0xf0, 0x9e, 0x80, 0xc7, 0xfd, 0xc9, 0x23, 0x37, 0x13, 0x41, 0x8a, 0xeb, 0xce, 0xf1, 0x2e, 0x50, + 0xbc, 0xe7, 0xf0, 0xd9, 0x30, 0xbc, 0x0a, 0x3b, 0x9f, 0xaf, 0xbb, 0x01, 0xf2, 0x74, 0x84, 0x95, + 0x6f, 0xd2, 0x2a, 0xbe, 0x85, 0x7f, 0x46, 0x70, 0x2c, 0x70, 0x2b, 0xc0, 0x63, 0x91, 0x58, 0x7c, + 0x5b, 0x88, 0x30, 0x1e, 0xd3, 0x9b, 0x03, 0x9f, 0xa7, 0xc0, 0x5f, 0xc4, 0xb3, 0xf1, 0x80, 0xeb, + 0x46, 0xc9, 0x87, 0xfb, 0x7b, 0x04, 0xb8, 0x79, 0x09, 0x68, 0xae, 0x8b, 0xd0, 0x6d, 0xa3, 0xb9, + 0x2e, 0xc2, 0x77, 0x0a, 0x71, 0x8e, 0xc2, 0x9d, 0xc1, 0x67, 0x76, 0x83, 0xcb, 0x0b, 0x23, 0x54, + 0x63, 0xef, 0x74, 0x11, 0xaa, 0x71, 0xe0, 0x56, 0x11, 0xaa, 0x71, 0xf0, 0x8c, 0x1f, 0x5f, 0x63, + 0x0e, 0xba, 0xaa, 0x98, 0x96, 0x3d, 0x27, 0xb9, 0xb8, 0xff, 0x45, 0x70, 0x3a, 0xd6, 0xf0, 0x8c, + 0xe7, 0x62, 0x21, 0x0b, 0x79, 0x13, 0x09, 0xe7, 0x5b, 0x3c, 0xcd, 0x79, 0xe6, 0x28, 0xcf, 0x55, + 0xfc, 0x4a, 0x42, 0x9e, 0x79, 0x83, 0xec, 0xac, 0x2f, 0x62, 0x94, 0x1b, 0x2e, 0xf5, 0x5f, 0x91, + 0xbb, 0xa8, 0x36, 0x4f, 0xca, 0x78, 0x22, 0xb2, 0xd8, 0x03, 0x06, 0x7f, 0x61, 0x32, 0xc1, 0x09, + 0x4e, 0x6b, 0x89, 0xd2, 0xba, 0x80, 0xe7, 0xe2, 0x3d, 0x22, 0x9a, 0x9a, 0x2f, 0xd0, 0x20, 0x79, + 0xcf, 0x1d, 0xfe, 0x86, 0x7c, 0xcb, 0xb2, 0x67, 0xb2, 0xc5, 0x93, 0xb1, 0xa4, 0xdf, 0xf9, 0x82, + 0x14, 0xa6, 0x92, 0x1c, 0xe1, 0x5c, 0x5e, 0xa2, 0x5c, 0xe6, 0xf1, 0xf9, 0xa4, 0x57, 0x44, 0xdf, + 0x80, 0x2e, 0x99, 0xcf, 0x10, 0xf4, 0xee, 0x18, 0x64, 0xb1, 0xe8, 0x87, 0xd2, 0x3c, 0x65, 0x0b, + 0x27, 0x23, 0x7d, 0x38, 0xbe, 0x31, 0x8a, 0x6f, 0x14, 0x9f, 0x0a, 0xc3, 0xc7, 0x71, 0xb1, 0x11, + 0xfd, 0x2e, 0x02, 0x60, 0x51, 0xb2, 0x8d, 0x95, 0x25, 0x7c, 0x22, 0x38, 0x83, 0x03, 0x20, 0x15, + 0x66, 0xe6, 0xb9, 0x67, 0x68, 0xee, 0x09, 0x2c, 0xed, 0x92, 0xbb, 0xd0, 0xc8, 0xeb, 0xaa, 0x7c, + 0x93, 0xcf, 0xd1, 0xb7, 0xf0, 0xef, 0x08, 0x86, 0x22, 0xe6, 0x02, 0x1c, 0x7d, 0x4f, 0x81, 0x53, + 0xb2, 0x30, 0x9d, 0xe8, 0x0c, 0x27, 0xb0, 0x4c, 0x09, 0x2c, 0xe0, 0x0b, 0x31, 0x2f, 0xb7, 0x4c, + 0xc3, 0xe4, 0x9d, 0xa9, 0xc7, 0xbd, 0xdd, 0x2f, 0x3a, 0xe1, 0x85, 0x04, 0x53, 0x21, 0xce, 0x26, + 0x00, 0x1b, 0xd6, 0x7a, 0x16, 0xdb, 0x8a, 0xc1, 0x05, 0x78, 0x87, 0x0a, 0xf0, 0x26, 0xbe, 0xdc, + 0x9a, 0x00, 0x51, 0x7d, 0x68, 0x73, 0xfb, 0xbf, 0x0a, 0xa1, 0xc3, 0x1f, 0x9e, 0x4d, 0x40, 0xc2, + 0xf3, 0x6c, 0x9c, 0x4d, 0x7e, 0x90, 0x53, 0x5e, 0xa5, 0x94, 0x97, 0xf1, 0x52, 0x8b, 0x94, 0x3d, + 0xcf, 0x75, 0xf6, 0xd5, 0x07, 0x1b, 0x29, 0xf4, 0x70, 0x23, 0x85, 0xfe, 0xde, 0x48, 0xa1, 0x7b, + 0x9b, 0xa9, 0x8e, 0x87, 0x9b, 0xa9, 0x8e, 0x3f, 0x37, 0x53, 0x1d, 0xef, 0x4e, 0xee, 0x58, 0x45, + 0x79, 0xa6, 0xf1, 0xb2, 0x52, 0x30, 0xdd, 0xb4, 0x37, 0x66, 0xe5, 0x8f, 0x9d, 0xdc, 0x74, 0x33, + 0x2d, 0xf4, 0xd0, 0xf1, 0x7b, 0xfa, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x86, 0x2c, 0x7e, 0x60, + 0x15, 0x18, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/lockup/types/tx.pb.go b/x/lockup/types/tx.pb.go index 4ec81792415..8be4152ee3b 100644 --- a/x/lockup/types/tx.pb.go +++ b/x/lockup/types/tx.pb.go @@ -334,40 +334,41 @@ func init() { func init() { proto.RegisterFile("osmosis/lockup/tx.proto", fileDescriptor_bcdad5af0d24735f) } var fileDescriptor_bcdad5af0d24735f = []byte{ - // 528 bytes of a gzipped FileDescriptorProto + // 531 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xbf, 0x6f, 0xd3, 0x40, - 0x14, 0x8e, 0x1d, 0x4a, 0xcb, 0x01, 0x81, 0x5a, 0x45, 0x24, 0x16, 0xd8, 0xc1, 0xe2, 0x47, 0x90, - 0xda, 0x3b, 0x52, 0x60, 0x61, 0x40, 0x22, 0x64, 0xa0, 0x82, 0x48, 0xc8, 0x2a, 0x0b, 0x03, 0x92, - 0xed, 0x1c, 0x57, 0x2b, 0x8e, 0xcf, 0xca, 0xb3, 0xa1, 0xd9, 0xf9, 0x03, 0x18, 0x99, 0x19, 0xf9, - 0x4b, 0x3a, 0x76, 0x64, 0x4a, 0x51, 0xb2, 0x31, 0xf6, 0x2f, 0x40, 0xbe, 0xf3, 0x59, 0x4d, 0x52, - 0xd1, 0x4c, 0xe7, 0x77, 0xdf, 0x7b, 0xdf, 0x7b, 0xdf, 0xe7, 0x67, 0xa3, 0xdb, 0x1c, 0x86, 0x1c, - 0x42, 0x20, 0x11, 0x0f, 0x06, 0x59, 0x42, 0xd2, 0x43, 0x9c, 0x8c, 0x78, 0xca, 0x8d, 0x5a, 0x01, - 0x60, 0x09, 0x98, 0x5b, 0x8c, 0x33, 0x2e, 0x20, 0x92, 0x3f, 0xc9, 0x2c, 0xd3, 0x62, 0x9c, 0xb3, - 0x88, 0x12, 0x11, 0xf9, 0xd9, 0x67, 0xd2, 0xcf, 0x46, 0x5e, 0x1a, 0xf2, 0x58, 0xe1, 0x81, 0xa0, - 0x21, 0xbe, 0x07, 0x94, 0x7c, 0x69, 0xfb, 0x34, 0xf5, 0xda, 0x24, 0xe0, 0xa1, 0xc2, 0x1b, 0x0b, - 0xed, 0xf3, 0x43, 0x42, 0xce, 0x37, 0x1d, 0x5d, 0xef, 0x01, 0x7b, 0xc7, 0x83, 0xc1, 0x3e, 0x1f, - 0xd0, 0x18, 0x8c, 0x87, 0x68, 0x8d, 0x7f, 0x8d, 0xe9, 0xa8, 0xae, 0x35, 0xb5, 0xd6, 0x95, 0xce, - 0xcd, 0xd3, 0x89, 0x7d, 0x6d, 0xec, 0x0d, 0xa3, 0x17, 0x8e, 0xb8, 0x76, 0x5c, 0x09, 0x1b, 0x07, - 0x68, 0x43, 0x8d, 0x51, 0xd7, 0x9b, 0x5a, 0xeb, 0xea, 0x6e, 0x03, 0xcb, 0x39, 0xb1, 0x9a, 0x13, - 0x77, 0x8b, 0x84, 0x4e, 0xfb, 0x68, 0x62, 0x57, 0xfe, 0x4e, 0x6c, 0x43, 0x95, 0x6c, 0xf3, 0x61, - 0x98, 0xd2, 0x61, 0x92, 0x8e, 0x4f, 0x27, 0xf6, 0x0d, 0xc9, 0xaf, 0x30, 0xe7, 0xc7, 0x89, 0xad, - 0xb9, 0x25, 0xbb, 0xe1, 0xa1, 0xb5, 0x5c, 0x0c, 0xd4, 0xab, 0xcd, 0xaa, 0x68, 0x23, 0xe5, 0xe2, - 0x5c, 0x2e, 0x2e, 0xe4, 0xe2, 0xd7, 0x3c, 0x8c, 0x3b, 0x4f, 0xf2, 0x36, 0xbf, 0x4e, 0xec, 0x16, - 0x0b, 0xd3, 0x83, 0xcc, 0xc7, 0x01, 0x1f, 0x92, 0xc2, 0x1b, 0x79, 0xec, 0x40, 0x7f, 0x40, 0xd2, - 0x71, 0x42, 0x41, 0x14, 0x80, 0x2b, 0x99, 0x9d, 0x47, 0xe8, 0xd6, 0x9c, 0x0b, 0x2e, 0x85, 0x84, - 0xc7, 0x40, 0x8d, 0x1a, 0xd2, 0xf7, 0xba, 0xc2, 0x8a, 0x4b, 0xae, 0xbe, 0xd7, 0x75, 0x5e, 0xa2, - 0xad, 0x1e, 0xb0, 0x0e, 0x65, 0x61, 0xfc, 0x21, 0xce, 0x7d, 0x0c, 0x63, 0xf6, 0x2a, 0x8a, 0x56, - 0x75, 0xcd, 0xd9, 0x47, 0x77, 0xce, 0xab, 0x2f, 0xfb, 0x3d, 0x43, 0xeb, 0x99, 0xb8, 0x87, 0xba, - 0x26, 0xd4, 0x9a, 0x78, 0x7e, 0x45, 0xf0, 0x7b, 0x3a, 0x0a, 0x79, 0x3f, 0x1f, 0xd5, 0x55, 0xa9, - 0xce, 0x5b, 0xb4, 0xb9, 0xc4, 0xba, 0xf2, 0x8b, 0x94, 0x12, 0xf5, 0x52, 0xe2, 0x73, 0xd4, 0x58, - 0x22, 0x2b, 0xe7, 0xab, 0xa3, 0x75, 0xc8, 0x82, 0x80, 0x02, 0x08, 0xda, 0x0d, 0x57, 0x85, 0xbb, - 0x3f, 0x75, 0x54, 0xed, 0x01, 0x33, 0x5c, 0x84, 0xce, 0x6c, 0xd3, 0xdd, 0xc5, 0xf1, 0xe7, 0x6c, - 0x36, 0x1f, 0xfc, 0x17, 0x2e, 0xbb, 0x32, 0xb4, 0xb9, 0x6c, 0xf9, 0xfd, 0x73, 0x6a, 0x97, 0xb2, - 0xcc, 0xed, 0x55, 0xb2, 0xca, 0x46, 0x9f, 0x50, 0x6d, 0xc1, 0xc5, 0x7b, 0x17, 0xd6, 0x9b, 0x8f, - 0x2f, 0x4c, 0x51, 0xfc, 0x9d, 0x37, 0x47, 0x53, 0x4b, 0x3b, 0x9e, 0x5a, 0xda, 0x9f, 0xa9, 0xa5, - 0x7d, 0x9f, 0x59, 0x95, 0xe3, 0x99, 0x55, 0xf9, 0x3d, 0xb3, 0x2a, 0x1f, 0xf1, 0x99, 0x95, 0x2d, - 0xe8, 0x76, 0x22, 0xcf, 0x07, 0x15, 0x90, 0xc3, 0xf2, 0xe7, 0x91, 0xaf, 0xaf, 0x7f, 0x59, 0x7c, - 0x64, 0x4f, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x38, 0xe4, 0xad, 0x5b, 0x04, 0x00, 0x00, + 0x14, 0x8e, 0x1d, 0x4a, 0xcb, 0x01, 0x81, 0x5a, 0x45, 0x38, 0x16, 0xd8, 0xc1, 0xe2, 0x47, 0x90, + 0xda, 0x3b, 0x52, 0x40, 0x48, 0x0c, 0x48, 0x98, 0x2c, 0x55, 0x89, 0x84, 0xac, 0xb2, 0x30, 0x20, + 0xd9, 0xce, 0x71, 0xb5, 0x62, 0xfb, 0xac, 0x9c, 0x5d, 0x9a, 0x9d, 0x3f, 0x80, 0x91, 0x99, 0x91, + 0xbf, 0xa4, 0x63, 0x47, 0xa6, 0x14, 0x25, 0x1b, 0x63, 0xff, 0x02, 0xe4, 0x3b, 0x9f, 0xd5, 0x24, + 0x15, 0xc9, 0x74, 0x7e, 0xf7, 0xbd, 0xf7, 0xbd, 0xf7, 0x7d, 0x7e, 0x36, 0xb8, 0x4b, 0x59, 0x4c, + 0x59, 0xc8, 0x50, 0x44, 0x83, 0x41, 0x9e, 0xa2, 0xec, 0x18, 0xa6, 0x43, 0x9a, 0x51, 0xad, 0x51, + 0x02, 0x50, 0x00, 0xc6, 0x16, 0xa1, 0x84, 0x72, 0x08, 0x15, 0x4f, 0x22, 0xcb, 0x30, 0x09, 0xa5, + 0x24, 0xc2, 0x88, 0x47, 0x7e, 0xfe, 0x05, 0xf5, 0xf3, 0xa1, 0x97, 0x85, 0x34, 0x91, 0x78, 0xc0, + 0x69, 0x90, 0xef, 0x31, 0x8c, 0x8e, 0x3a, 0x3e, 0xce, 0xbc, 0x0e, 0x0a, 0x68, 0x28, 0xf1, 0xe6, + 0x5c, 0xfb, 0xe2, 0x10, 0x90, 0xfd, 0x4d, 0x05, 0x37, 0x7b, 0x8c, 0xbc, 0xa7, 0xc1, 0xe0, 0x80, + 0x0e, 0x70, 0xc2, 0xb4, 0xc7, 0x60, 0x8d, 0x7e, 0x4d, 0xf0, 0x50, 0x57, 0x5a, 0x4a, 0xfb, 0x9a, + 0x73, 0xfb, 0x7c, 0x6c, 0xdd, 0x18, 0x79, 0x71, 0xf4, 0xda, 0xe6, 0xd7, 0xb6, 0x2b, 0x60, 0xed, + 0x10, 0x6c, 0xc8, 0x31, 0x74, 0xb5, 0xa5, 0xb4, 0xaf, 0xef, 0x36, 0xa1, 0x98, 0x13, 0xca, 0x39, + 0x61, 0xb7, 0x4c, 0x70, 0x3a, 0x27, 0x63, 0xab, 0xf6, 0x77, 0x6c, 0x69, 0xb2, 0x64, 0x9b, 0xc6, + 0x61, 0x86, 0xe3, 0x34, 0x1b, 0x9d, 0x8f, 0xad, 0x5b, 0x82, 0x5f, 0x62, 0xf6, 0x8f, 0x33, 0x4b, + 0x71, 0x2b, 0x76, 0xcd, 0x03, 0x6b, 0x85, 0x18, 0xa6, 0xd7, 0x5b, 0x75, 0xde, 0x46, 0xc8, 0x85, + 0x85, 0x5c, 0x58, 0xca, 0x85, 0xef, 0x68, 0x98, 0x38, 0xcf, 0x8a, 0x36, 0xbf, 0xce, 0xac, 0x36, + 0x09, 0xb3, 0xc3, 0xdc, 0x87, 0x01, 0x8d, 0x51, 0xe9, 0x8d, 0x38, 0x76, 0x58, 0x7f, 0x80, 0xb2, + 0x51, 0x8a, 0x19, 0x2f, 0x60, 0xae, 0x60, 0xb6, 0x9f, 0x80, 0x3b, 0x33, 0x2e, 0xb8, 0x98, 0xa5, + 0x34, 0x61, 0x58, 0x6b, 0x00, 0x75, 0xaf, 0xcb, 0xad, 0xb8, 0xe2, 0xaa, 0x7b, 0x5d, 0xfb, 0x0d, + 0xd8, 0xea, 0x31, 0xe2, 0x60, 0x12, 0x26, 0x1f, 0x93, 0xc2, 0xc7, 0x30, 0x21, 0x6f, 0xa3, 0x68, + 0x55, 0xd7, 0xec, 0x03, 0x70, 0xef, 0xb2, 0xfa, 0xaa, 0xdf, 0x0b, 0xb0, 0x9e, 0xf3, 0x7b, 0xa6, + 0x2b, 0x5c, 0xad, 0x01, 0x67, 0x57, 0x04, 0x7e, 0xc0, 0xc3, 0x90, 0xf6, 0x8b, 0x51, 0x5d, 0x99, + 0x6a, 0xef, 0x83, 0xcd, 0x05, 0xd6, 0x95, 0x5f, 0xa4, 0x90, 0xa8, 0x56, 0x12, 0x5f, 0x82, 0xe6, + 0x02, 0x59, 0x35, 0x9f, 0x0e, 0xd6, 0x59, 0x1e, 0x04, 0x98, 0x31, 0x4e, 0xbb, 0xe1, 0xca, 0x70, + 0xf7, 0xa7, 0x0a, 0xea, 0x3d, 0x46, 0x34, 0x17, 0x80, 0x0b, 0xdb, 0x74, 0x7f, 0x7e, 0xfc, 0x19, + 0x9b, 0x8d, 0x47, 0xff, 0x85, 0xab, 0xae, 0x04, 0x6c, 0x2e, 0x5a, 0xfe, 0xf0, 0x92, 0xda, 0x85, + 0x2c, 0x63, 0x7b, 0x95, 0xac, 0xaa, 0xd1, 0x67, 0xd0, 0x98, 0x73, 0xf1, 0xc1, 0xd2, 0x7a, 0xe3, + 0xe9, 0xd2, 0x14, 0xc9, 0xef, 0xec, 0x9f, 0x4c, 0x4c, 0xe5, 0x74, 0x62, 0x2a, 0x7f, 0x26, 0xa6, + 0xf2, 0x7d, 0x6a, 0xd6, 0x4e, 0xa7, 0x66, 0xed, 0xf7, 0xd4, 0xac, 0x7d, 0xea, 0x5c, 0x58, 0xd9, + 0x92, 0x6e, 0x27, 0xf2, 0x7c, 0x26, 0x03, 0x74, 0xf4, 0x0a, 0x1d, 0x57, 0xff, 0x8f, 0x62, 0x83, + 0xfd, 0xab, 0xfc, 0x3b, 0x7b, 0xfe, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x6b, 0x43, 0x89, 0x5e, + 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/mint/client/cli/cli_test.go b/x/mint/client/cli/cli_test.go index c4958781396..9be44dc2b81 100644 --- a/x/mint/client/cli/cli_test.go +++ b/x/mint/client/cli/cli_test.go @@ -14,8 +14,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" - "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/mint/client/cli" + "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/mint/client/cli" ) type IntegrationTestSuite struct { diff --git a/x/mint/client/cli/query.go b/x/mint/client/cli/query.go index 2cce90aee7f..d370a970d9b 100644 --- a/x/mint/client/cli/query.go +++ b/x/mint/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/osmosis-labs/osmosis/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) // GetQueryCmd returns the cli query commands for the minting module. diff --git a/x/mint/client/rest/grpc_query_test.go b/x/mint/client/rest/grpc_query_test.go index 1c1a55022bd..ec137b32c48 100644 --- a/x/mint/client/rest/grpc_query_test.go +++ b/x/mint/client/rest/grpc_query_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/suite" "github.com/cosmos/cosmos-sdk/testutil/network" - "github.com/osmosis-labs/osmosis/app" - minttypes "github.com/osmosis-labs/osmosis/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/app" + minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) type IntegrationTestSuite struct { diff --git a/x/mint/client/rest/query.go b/x/mint/client/rest/query.go index 062f2c91a9a..1b4fb74369f 100644 --- a/x/mint/client/rest/query.go +++ b/x/mint/client/rest/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/types/rest" - "github.com/osmosis-labs/osmosis/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) func registerQueryRoutes(clientCtx client.Context, r *mux.Router) { diff --git a/x/mint/genesis.go b/x/mint/genesis.go index 87c6af1f77e..30032090382 100644 --- a/x/mint/genesis.go +++ b/x/mint/genesis.go @@ -2,8 +2,8 @@ package mint import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/mint/keeper" - "github.com/osmosis-labs/osmosis/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/keeper" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) // InitGenesis new mint genesis diff --git a/x/mint/genesis_test.go b/x/mint/genesis_test.go index 2b4bafe61f8..dcdc91bcb98 100644 --- a/x/mint/genesis_test.go +++ b/x/mint/genesis_test.go @@ -4,8 +4,8 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - simapp "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/mint/types" + simapp "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) diff --git a/x/mint/keeper/grpc_query.go b/x/mint/keeper/grpc_query.go index 1407d9d117c..ff54dc1db1d 100644 --- a/x/mint/keeper/grpc_query.go +++ b/x/mint/keeper/grpc_query.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/mint/keeper/grpc_query_test.go b/x/mint/keeper/grpc_query_test.go index e8a84b0b0bd..d0292a50bc9 100644 --- a/x/mint/keeper/grpc_query_test.go +++ b/x/mint/keeper/grpc_query_test.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" - simapp "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/mint/types" + simapp "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) type MintTestSuite struct { diff --git a/x/mint/keeper/hooks.go b/x/mint/keeper/hooks.go index d7ae28fdcaf..4a53caea20e 100644 --- a/x/mint/keeper/hooks.go +++ b/x/mint/keeper/hooks.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" - "github.com/osmosis-labs/osmosis/x/mint/types" + epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) func (k Keeper) BeforeEpochStart(ctx sdk.Context, epochIdentifier string, epochNumber int64) { diff --git a/x/mint/keeper/hooks_test.go b/x/mint/keeper/hooks_test.go index a24b515b245..1f029ef0d5c 100644 --- a/x/mint/keeper/hooks_test.go +++ b/x/mint/keeper/hooks_test.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - osmoapp "github.com/osmosis-labs/osmosis/app" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" - "github.com/osmosis-labs/osmosis/x/mint/types" + osmoapp "github.com/osmosis-labs/osmosis/v7/app" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" diff --git a/x/mint/keeper/integration_test.go b/x/mint/keeper/integration_test.go index 6858d1e1a88..e78f380bde9 100644 --- a/x/mint/keeper/integration_test.go +++ b/x/mint/keeper/integration_test.go @@ -4,8 +4,8 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" - simapp "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/mint/types" + simapp "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) // returns context and an app with updated mint keeper diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index 0eb13fc89c5..f9d3c809d60 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/osmosis-labs/osmosis/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" "github.com/tendermint/tendermint/libs/log" ) diff --git a/x/mint/keeper/keeper_test.go b/x/mint/keeper/keeper_test.go index a3013f030d3..f7b4dc6285c 100644 --- a/x/mint/keeper/keeper_test.go +++ b/x/mint/keeper/keeper_test.go @@ -9,10 +9,10 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/distribution" - "github.com/osmosis-labs/osmosis/app" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" - "github.com/osmosis-labs/osmosis/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/app" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" "github.com/stretchr/testify/suite" abci "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" diff --git a/x/mint/keeper/querier.go b/x/mint/keeper/querier.go index ddc6396dcc2..741da7f238a 100644 --- a/x/mint/keeper/querier.go +++ b/x/mint/keeper/querier.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) // NewQuerier returns a minting Querier handler. diff --git a/x/mint/keeper/querier_test.go b/x/mint/keeper/querier_test.go index d7dd7499c7b..88fca711a23 100644 --- a/x/mint/keeper/querier_test.go +++ b/x/mint/keeper/querier_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" - keep "github.com/osmosis-labs/osmosis/x/mint/keeper" - "github.com/osmosis-labs/osmosis/x/mint/types" + keep "github.com/osmosis-labs/osmosis/v7/x/mint/keeper" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/mint/module.go b/x/mint/module.go index 1ee96900fe2..c69828ee0a4 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -17,11 +17,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/x/mint/client/cli" - "github.com/osmosis-labs/osmosis/x/mint/client/rest" - "github.com/osmosis-labs/osmosis/x/mint/keeper" - "github.com/osmosis-labs/osmosis/x/mint/simulation" - "github.com/osmosis-labs/osmosis/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/mint/client/rest" + "github.com/osmosis-labs/osmosis/v7/x/mint/keeper" + "github.com/osmosis-labs/osmosis/v7/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) var ( diff --git a/x/mint/module_test.go b/x/mint/module_test.go index c4396bd79fc..c029a0d4ac5 100644 --- a/x/mint/module_test.go +++ b/x/mint/module_test.go @@ -8,8 +8,8 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - simapp "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/mint/types" + simapp "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) func TestItCreatesModuleAccountOnInitBlock(t *testing.T) { diff --git a/x/mint/simulation/decoder.go b/x/mint/simulation/decoder.go index 46bf6b5f148..654ea412bb5 100644 --- a/x/mint/simulation/decoder.go +++ b/x/mint/simulation/decoder.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/osmosis-labs/osmosis/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) // NewDecodeStore returns a decoder function closure that umarshals the KVPair's diff --git a/x/mint/simulation/decoder_test.go b/x/mint/simulation/decoder_test.go index ac600c36f5b..91b1a74965e 100644 --- a/x/mint/simulation/decoder_test.go +++ b/x/mint/simulation/decoder_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - simapp "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/mint/simulation" - "github.com/osmosis-labs/osmosis/x/mint/types" + simapp "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) func TestDecodeStore(t *testing.T) { diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go index b2e8937c14b..dcd61815ab7 100644 --- a/x/mint/simulation/genesis.go +++ b/x/mint/simulation/genesis.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) // RandomizedGenState generates a random GenesisState for mint diff --git a/x/mint/simulation/genesis_test.go b/x/mint/simulation/genesis_test.go index 582f84f8504..d4f402e7fcd 100644 --- a/x/mint/simulation/genesis_test.go +++ b/x/mint/simulation/genesis_test.go @@ -11,8 +11,8 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/x/mint/simulation" - "github.com/osmosis-labs/osmosis/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v7/x/mint/types" ) // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState. diff --git a/x/mint/simulation/params_test.go b/x/mint/simulation/params_test.go index a1f81d4ed7a..29519aa6b83 100644 --- a/x/mint/simulation/params_test.go +++ b/x/mint/simulation/params_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v7/x/mint/simulation" ) func TestParamChanges(t *testing.T) { diff --git a/x/mint/types/expected_keepers.go b/x/mint/types/expected_keepers.go index cad2cdfe65d..3d818b6efb1 100644 --- a/x/mint/types/expected_keepers.go +++ b/x/mint/types/expected_keepers.go @@ -3,7 +3,7 @@ package types // noalias import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" - epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" + epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) // AccountKeeper defines the contract required for account APIs. diff --git a/x/mint/types/genesis.pb.go b/x/mint/types/genesis.pb.go index bd78ac26497..7aca546b4bc 100644 --- a/x/mint/types/genesis.pb.go +++ b/x/mint/types/genesis.pb.go @@ -96,7 +96,7 @@ func init() { } var fileDescriptor_12e6a5511ad3feeb = []byte{ - // 276 bytes of a gzipped FileDescriptorProto + // 279 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xca, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, @@ -109,12 +109,12 @@ var fileDescriptor_12e6a5511ad3feeb = []byte{ 0xc8, 0x25, 0x92, 0x91, 0x98, 0x53, 0x96, 0x9a, 0x17, 0x5f, 0x5c, 0x92, 0x58, 0x54, 0x92, 0x9a, 0x12, 0x9f, 0x5a, 0x90, 0x9f, 0x9c, 0x21, 0xc1, 0xac, 0xc0, 0xa8, 0xc1, 0xec, 0x24, 0xff, 0xe9, 0x9e, 0xbc, 0x74, 0x65, 0x62, 0x6e, 0x8e, 0x95, 0x12, 0x36, 0x55, 0x4a, 0x41, 0x42, 0x10, 0xe1, - 0x60, 0x88, 0xa8, 0x2b, 0x48, 0xd0, 0xc9, 0xed, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, + 0x60, 0x88, 0xa8, 0x2b, 0x48, 0xd0, 0xc9, 0xf3, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, - 0x18, 0xa2, 0x74, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0x4e, - 0xd4, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0x2b, 0x20, 0x01, 0x56, 0x52, 0x59, 0x90, 0x5a, - 0x9c, 0xc4, 0x06, 0x0e, 0x2a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x85, 0x2a, 0x41, - 0x9d, 0x01, 0x00, 0x00, + 0x18, 0xa2, 0xf4, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0x4e, + 0xd4, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0xcc, 0xf5, 0x2b, 0x20, 0x61, 0x56, 0x52, + 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x0e, 0x2d, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf7, + 0x5d, 0xab, 0xdd, 0xa0, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/mint.pb.go b/x/mint/types/mint.pb.go index 0a6f8533dfa..41184a522d5 100644 --- a/x/mint/types/mint.pb.go +++ b/x/mint/types/mint.pb.go @@ -263,55 +263,55 @@ func init() { func init() { proto.RegisterFile("osmosis/mint/v1beta1/mint.proto", fileDescriptor_ccb38f8335e0f45b) } var fileDescriptor_ccb38f8335e0f45b = []byte{ - // 763 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4f, 0x4f, 0x3b, 0x45, - 0x18, 0xee, 0x5a, 0x2c, 0x32, 0x04, 0x8a, 0x1b, 0xa4, 0x2b, 0xc6, 0x2e, 0x6c, 0xc0, 0xd4, 0x04, - 0xba, 0x01, 0x6e, 0x5c, 0xd4, 0xa6, 0xa2, 0x35, 0x31, 0xa9, 0xe3, 0x81, 0x84, 0xcb, 0x66, 0xbb, - 0x3b, 0x2c, 0x13, 0xba, 0x33, 0xeb, 0xcc, 0xb4, 0xb5, 0x17, 0xbf, 0x80, 0x17, 0x8f, 0x1c, 0xf5, - 0xdb, 0x70, 0xc4, 0x9b, 0xf1, 0xd0, 0x18, 0xf8, 0x06, 0xfd, 0x02, 0x9a, 0xf9, 0xb3, 0x2d, 0x2c, - 0x34, 0xb1, 0xf9, 0x9d, 0xba, 0xf3, 0xbc, 0x4f, 0x9f, 0xe7, 0xdd, 0x77, 0xde, 0xf7, 0x5d, 0xe0, - 0x52, 0x9e, 0x52, 0x8e, 0xb9, 0x9f, 0x62, 0x22, 0xfc, 0xe1, 0x49, 0x0f, 0x89, 0xf0, 0x44, 0x1d, - 0x9a, 0x19, 0xa3, 0x82, 0xda, 0xdb, 0x86, 0xd0, 0x54, 0x98, 0x21, 0xec, 0x6e, 0x27, 0x34, 0xa1, - 0x8a, 0xe0, 0xcb, 0x27, 0xcd, 0xdd, 0x75, 0x13, 0x4a, 0x93, 0x3e, 0xf2, 0xd5, 0xa9, 0x37, 0xb8, - 0xf6, 0x05, 0x4e, 0x11, 0x17, 0x61, 0x9a, 0x19, 0xc2, 0xc7, 0x45, 0x42, 0x48, 0xc6, 0x26, 0x54, - 0x2f, 0x86, 0xe2, 0x01, 0x0b, 0x05, 0xa6, 0x44, 0xc7, 0xbd, 0x5f, 0x40, 0xe5, 0x7b, 0x4c, 0x04, - 0x62, 0xb6, 0x00, 0x5b, 0x28, 0xa3, 0xd1, 0x4d, 0x90, 0x31, 0x3a, 0xc4, 0x1c, 0x53, 0xc2, 0x1d, - 0x6b, 0xcf, 0x6a, 0xac, 0xb5, 0x3a, 0xf7, 0x13, 0xb7, 0xf4, 0xf7, 0xc4, 0xfd, 0x2c, 0xc1, 0xe2, - 0x66, 0xd0, 0x6b, 0x46, 0x34, 0xf5, 0x23, 0x95, 0xbf, 0xf9, 0x39, 0xe6, 0xf1, 0xad, 0x2f, 0xc6, - 0x19, 0xe2, 0xcd, 0x36, 0x8a, 0xa6, 0x13, 0xb7, 0x36, 0x0e, 0xd3, 0xfe, 0xb9, 0x57, 0xd4, 0xf3, - 0x60, 0x55, 0x41, 0xdd, 0x39, 0x72, 0x67, 0x81, 0xea, 0x25, 0xc2, 0xc9, 0x8d, 0x40, 0xf1, 0x57, - 0x71, 0xcc, 0x10, 0xe7, 0xf6, 0x11, 0x58, 0x0d, 0xf5, 0xa3, 0x49, 0xc0, 0x9e, 0x4e, 0xdc, 0x4d, - 0x2d, 0x69, 0x02, 0x1e, 0xcc, 0x29, 0xf6, 0x25, 0xa8, 0x8c, 0x94, 0x80, 0xf3, 0x9e, 0x22, 0x7f, - 0xb1, 0x74, 0xb6, 0x1b, 0x5a, 0x5a, 0xab, 0x78, 0xd0, 0xc8, 0x79, 0x7f, 0x96, 0x41, 0xad, 0x8d, - 0xb9, 0x60, 0xb8, 0x37, 0x90, 0x15, 0xeb, 0x32, 0x9a, 0x51, 0x26, 0x9f, 0xb8, 0x7d, 0x05, 0x56, - 0xb9, 0x08, 0x6f, 0x31, 0x49, 0x4c, 0x8a, 0x5f, 0x2e, 0xed, 0x6a, 0x5e, 0xc8, 0xc8, 0x78, 0x30, - 0x17, 0xb4, 0x7f, 0x02, 0xd5, 0x8c, 0xd2, 0x7e, 0x80, 0x49, 0x84, 0x88, 0xc0, 0x43, 0xc4, 0xcd, - 0x9b, 0x7d, 0xbb, 0xb4, 0xc7, 0x8e, 0xf6, 0x28, 0xc8, 0x79, 0x70, 0x53, 0x22, 0x9d, 0x19, 0x60, - 0x8f, 0xc0, 0x87, 0x31, 0x1a, 0xa2, 0x3e, 0xcd, 0x10, 0x0b, 0x18, 0x1a, 0x85, 0x2c, 0xe6, 0x4e, - 0x59, 0x99, 0x7e, 0xb7, 0xb4, 0xa9, 0xa3, 0x4d, 0x5f, 0x09, 0x7a, 0x70, 0x6b, 0x86, 0x41, 0x0d, - 0xd9, 0x04, 0x6c, 0x46, 0x34, 0x4d, 0x07, 0x04, 0x8b, 0x71, 0x20, 0x93, 0x72, 0x56, 0x94, 0xeb, - 0x37, 0x4b, 0xbb, 0x7e, 0xa4, 0x5d, 0x5f, 0xaa, 0x79, 0x70, 0x63, 0x06, 0x74, 0xe5, 0xf9, 0xdf, - 0x0a, 0xa8, 0x74, 0x43, 0x16, 0xa6, 0xdc, 0xfe, 0x14, 0x00, 0x39, 0x7b, 0x41, 0x8c, 0x08, 0x4d, - 0xf5, 0x2d, 0xc2, 0x35, 0x89, 0xb4, 0x25, 0x60, 0xff, 0x6a, 0x01, 0x27, 0x41, 0x04, 0x71, 0xcc, - 0x83, 0x57, 0x73, 0xa1, 0xef, 0xe3, 0x87, 0xa5, 0x93, 0x74, 0x75, 0x92, 0x8b, 0x74, 0x3d, 0xb8, - 0x63, 0x42, 0x5f, 0xbf, 0x1c, 0x13, 0xfb, 0x22, 0x1f, 0x4e, 0x1c, 0xcb, 0x3b, 0xbb, 0xc6, 0x88, - 0x99, 0xfb, 0xf9, 0xa4, 0x38, 0x6e, 0x73, 0x46, 0x3e, 0x6e, 0x9d, 0x19, 0x62, 0xf7, 0xc0, 0x2e, - 0x43, 0xf1, 0x20, 0x92, 0x5d, 0x1c, 0x64, 0x88, 0x61, 0x1a, 0x07, 0x98, 0xe8, 0x44, 0xb8, 0xaa, - 0x7d, 0xb9, 0x75, 0x38, 0x9d, 0xb8, 0xfb, 0x5a, 0x71, 0x31, 0xd7, 0x83, 0xb5, 0x59, 0xb0, 0xab, - 0x62, 0x1d, 0xa2, 0x92, 0xe6, 0x72, 0x91, 0xcc, 0xff, 0x77, 0x1d, 0x46, 0x82, 0x32, 0xe7, 0xfd, - 0x77, 0x5b, 0x24, 0x45, 0x3d, 0x0f, 0x56, 0x67, 0xd0, 0x85, 0x42, 0x6c, 0x02, 0x9c, 0xf8, 0xd9, - 0xb0, 0xca, 0xaa, 0xe6, 0xd3, 0xea, 0x54, 0xf6, 0xac, 0xc6, 0xfa, 0xe9, 0x71, 0xf3, 0xad, 0x9d, - 0xdb, 0x5c, 0x30, 0xe2, 0xad, 0x15, 0x99, 0x2c, 0xac, 0xc5, 0x0b, 0x36, 0xc0, 0x1f, 0x16, 0x38, - 0x18, 0x99, 0xc5, 0x15, 0xbc, 0xea, 0xf5, 0x80, 0xa1, 0x08, 0xe1, 0x21, 0x62, 0xdc, 0x59, 0xdd, - 0x2b, 0x37, 0xd6, 0x4f, 0x0f, 0xdf, 0x36, 0x2f, 0xac, 0xbe, 0xd6, 0xe7, 0xd2, 0x74, 0x5e, 0xff, - 0xc5, 0xba, 0x1e, 0xdc, 0xcf, 0xdd, 0xdb, 0x85, 0xa1, 0x82, 0xb9, 0xb5, 0xec, 0xe1, 0x86, 0xb4, - 0xc3, 0x24, 0x99, 0x09, 0xbc, 0x28, 0x12, 0x17, 0x21, 0x13, 0xfa, 0x46, 0x9d, 0x0f, 0xd4, 0xe5, - 0x9f, 0x4d, 0x27, 0xae, 0xaf, 0xcd, 0xff, 0xef, 0x3f, 0x3d, 0x78, 0x60, 0xa8, 0x26, 0x81, 0xe7, - 0x15, 0xfd, 0x51, 0xf2, 0x54, 0x63, 0x9c, 0xaf, 0xdc, 0xfd, 0xee, 0x96, 0x5a, 0x17, 0xf7, 0x8f, - 0x75, 0xeb, 0xe1, 0xb1, 0x6e, 0xfd, 0xf3, 0x58, 0xb7, 0x7e, 0x7b, 0xaa, 0x97, 0x1e, 0x9e, 0xea, - 0xa5, 0xbf, 0x9e, 0xea, 0xa5, 0xab, 0xa3, 0x67, 0x5d, 0x61, 0x8a, 0x75, 0xdc, 0x0f, 0x7b, 0x3c, - 0x3f, 0xf8, 0x3f, 0xeb, 0xaf, 0xa9, 0xea, 0x8f, 0x5e, 0x45, 0x7d, 0xbf, 0xce, 0xfe, 0x0b, 0x00, - 0x00, 0xff, 0xff, 0x87, 0xa3, 0xd1, 0x17, 0x6a, 0x07, 0x00, 0x00, + // 768 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0xf3, 0x44, + 0x14, 0x8d, 0x49, 0x49, 0xe9, 0x54, 0x6d, 0x8a, 0x55, 0x1a, 0x53, 0x44, 0xdc, 0x5a, 0x2d, 0x0a, + 0x12, 0x8d, 0xd5, 0x76, 0x81, 0xd4, 0x0d, 0x10, 0x85, 0x42, 0x90, 0x90, 0xc2, 0xb0, 0xa8, 0xd4, + 0x8d, 0xe5, 0xd8, 0x53, 0x77, 0xd4, 0x78, 0xc6, 0xcc, 0x4c, 0x12, 0xb2, 0xe1, 0x05, 0xd8, 0xb0, + 0xec, 0x12, 0xde, 0xa6, 0xcb, 0xb2, 0x43, 0x2c, 0x22, 0xd4, 0xbe, 0x41, 0x5e, 0x80, 0x4f, 0xf3, + 0xe3, 0xa4, 0x75, 0x1b, 0xe9, 0x8b, 0xbe, 0x55, 0x3c, 0xe7, 0x9e, 0x9c, 0x73, 0x7d, 0xe7, 0xde, + 0x6b, 0xe0, 0x52, 0x9e, 0x52, 0x8e, 0xb9, 0x9f, 0x62, 0x22, 0xfc, 0xe1, 0x71, 0x0f, 0x89, 0xf0, + 0x58, 0x1d, 0x9a, 0x19, 0xa3, 0x82, 0xda, 0xdb, 0x86, 0xd0, 0x54, 0x98, 0x21, 0xec, 0x6e, 0x27, + 0x34, 0xa1, 0x8a, 0xe0, 0xcb, 0x27, 0xcd, 0xdd, 0x75, 0x13, 0x4a, 0x93, 0x3e, 0xf2, 0xd5, 0xa9, + 0x37, 0xb8, 0xf2, 0x05, 0x4e, 0x11, 0x17, 0x61, 0x9a, 0x19, 0xc2, 0xc7, 0x45, 0x42, 0x48, 0xc6, + 0x26, 0x54, 0x2f, 0x86, 0xe2, 0x01, 0x0b, 0x05, 0xa6, 0x44, 0xc7, 0xbd, 0xdf, 0x40, 0xe5, 0x47, + 0x4c, 0x04, 0x62, 0xb6, 0x00, 0x5b, 0x28, 0xa3, 0xd1, 0x75, 0x90, 0x31, 0x3a, 0xc4, 0x1c, 0x53, + 0xc2, 0x1d, 0x6b, 0xcf, 0x6a, 0xac, 0xb5, 0x3a, 0x77, 0x13, 0xb7, 0xf4, 0xef, 0xc4, 0xfd, 0x2c, + 0xc1, 0xe2, 0x7a, 0xd0, 0x6b, 0x46, 0x34, 0xf5, 0x23, 0x95, 0xbf, 0xf9, 0x39, 0xe2, 0xf1, 0x8d, + 0x2f, 0xc6, 0x19, 0xe2, 0xcd, 0x36, 0x8a, 0xa6, 0x13, 0xb7, 0x36, 0x0e, 0xd3, 0xfe, 0x99, 0x57, + 0xd4, 0xf3, 0x60, 0x55, 0x41, 0xdd, 0x39, 0x72, 0x6b, 0x81, 0xea, 0x05, 0xc2, 0xc9, 0xb5, 0x40, + 0xf1, 0x37, 0x71, 0xcc, 0x10, 0xe7, 0xf6, 0x17, 0x60, 0x35, 0xd4, 0x8f, 0x26, 0x01, 0x7b, 0x3a, + 0x71, 0x37, 0xb5, 0xa4, 0x09, 0x78, 0x30, 0xa7, 0xd8, 0x17, 0xa0, 0x32, 0x52, 0x02, 0xce, 0x7b, + 0x8a, 0xfc, 0xd5, 0xd2, 0xd9, 0x6e, 0x68, 0x69, 0xad, 0xe2, 0x41, 0x23, 0xe7, 0xfd, 0x5d, 0x06, + 0xb5, 0x36, 0xe6, 0x82, 0xe1, 0xde, 0x40, 0x56, 0xac, 0xcb, 0x68, 0x46, 0x99, 0x7c, 0xe2, 0xf6, + 0x25, 0x58, 0xe5, 0x22, 0xbc, 0xc1, 0x24, 0x31, 0x29, 0x7e, 0xbd, 0xb4, 0xab, 0x79, 0x21, 0x23, + 0xe3, 0xc1, 0x5c, 0xd0, 0xfe, 0x05, 0x54, 0x33, 0x4a, 0xfb, 0x01, 0x26, 0x11, 0x22, 0x02, 0x0f, + 0x11, 0x37, 0x6f, 0xf6, 0xfd, 0xd2, 0x1e, 0x3b, 0xda, 0xa3, 0x20, 0xe7, 0xc1, 0x4d, 0x89, 0x74, + 0x66, 0x80, 0x3d, 0x02, 0x1f, 0xc6, 0x68, 0x88, 0xfa, 0x34, 0x43, 0x2c, 0x60, 0x68, 0x14, 0xb2, + 0x98, 0x3b, 0x65, 0x65, 0xfa, 0xc3, 0xd2, 0xa6, 0x8e, 0x36, 0x7d, 0x21, 0xe8, 0xc1, 0xad, 0x19, + 0x06, 0x35, 0x64, 0x13, 0xb0, 0x19, 0xd1, 0x34, 0x1d, 0x10, 0x2c, 0xc6, 0x81, 0x4c, 0xca, 0x59, + 0x51, 0xae, 0xdf, 0x2d, 0xed, 0xfa, 0x91, 0x76, 0x7d, 0xae, 0xe6, 0xc1, 0x8d, 0x19, 0xd0, 0x95, + 0xe7, 0xff, 0x2b, 0xa0, 0xd2, 0x0d, 0x59, 0x98, 0x72, 0xfb, 0x53, 0x00, 0xe4, 0xec, 0x05, 0x31, + 0x22, 0x34, 0xd5, 0xb7, 0x08, 0xd7, 0x24, 0xd2, 0x96, 0x80, 0xfd, 0xbb, 0x05, 0x9c, 0x04, 0x11, + 0xc4, 0x31, 0x0f, 0x5e, 0xcc, 0x85, 0xbe, 0x8f, 0x9f, 0x96, 0x4e, 0xd2, 0xd5, 0x49, 0x2e, 0xd2, + 0xf5, 0xe0, 0x8e, 0x09, 0x7d, 0xfb, 0x7c, 0x4c, 0xec, 0xf3, 0x7c, 0x38, 0x71, 0x2c, 0xef, 0xec, + 0x0a, 0x23, 0x66, 0xee, 0xe7, 0x93, 0xe2, 0xb8, 0xcd, 0x19, 0xf9, 0xb8, 0x75, 0x66, 0x88, 0xdd, + 0x03, 0xbb, 0x0c, 0xc5, 0x83, 0x48, 0x76, 0x71, 0x90, 0x21, 0x86, 0x69, 0x1c, 0x60, 0xa2, 0x13, + 0xe1, 0xaa, 0xf6, 0xe5, 0xd6, 0xe1, 0x74, 0xe2, 0xee, 0x6b, 0xc5, 0xc5, 0x5c, 0x0f, 0xd6, 0x66, + 0xc1, 0xae, 0x8a, 0x75, 0x88, 0x4a, 0x9a, 0xcb, 0x45, 0x32, 0xff, 0xdf, 0x55, 0x18, 0x09, 0xca, + 0x9c, 0xf7, 0xdf, 0x6d, 0x91, 0x14, 0xf5, 0x3c, 0x58, 0x9d, 0x41, 0xe7, 0x0a, 0xb1, 0x09, 0x70, + 0xe2, 0x27, 0xc3, 0x2a, 0xab, 0x9a, 0x4f, 0xab, 0x53, 0xd9, 0xb3, 0x1a, 0xeb, 0x27, 0x47, 0xcd, + 0xd7, 0x76, 0x6e, 0x73, 0xc1, 0x88, 0xb7, 0x56, 0x64, 0xb2, 0xb0, 0x16, 0x2f, 0xd8, 0x00, 0x7f, + 0x59, 0xe0, 0x60, 0x64, 0x16, 0x57, 0xf0, 0xa2, 0xd7, 0x03, 0x86, 0x22, 0x84, 0x87, 0x88, 0x71, + 0x67, 0x75, 0xaf, 0xdc, 0x58, 0x3f, 0x39, 0x7c, 0xdd, 0xbc, 0xb0, 0xfa, 0x5a, 0x9f, 0x4b, 0xd3, + 0x79, 0xfd, 0x17, 0xeb, 0x7a, 0x70, 0x3f, 0x77, 0x6f, 0x17, 0x86, 0x0a, 0xe6, 0xd6, 0xb2, 0x87, + 0x1b, 0xd2, 0x0e, 0x93, 0x64, 0x26, 0xf0, 0xac, 0x48, 0x5c, 0x84, 0x4c, 0xe8, 0x1b, 0x75, 0x3e, + 0x50, 0x97, 0x7f, 0x3a, 0x9d, 0xb8, 0xbe, 0x36, 0x7f, 0xdb, 0x7f, 0x7a, 0xf0, 0xc0, 0x50, 0x4d, + 0x02, 0x4f, 0x2b, 0xfa, 0xb3, 0xe4, 0xa9, 0xc6, 0x38, 0x5b, 0xb9, 0xfd, 0xd3, 0x2d, 0xb5, 0x3a, + 0x77, 0x0f, 0x75, 0xeb, 0xfe, 0xa1, 0x6e, 0xfd, 0xf7, 0x50, 0xb7, 0xfe, 0x78, 0xac, 0x97, 0xee, + 0x1f, 0xeb, 0xa5, 0x7f, 0x1e, 0xeb, 0xa5, 0x4b, 0xff, 0x49, 0x57, 0x98, 0x62, 0x1d, 0xf5, 0xc3, + 0x1e, 0xcf, 0x0f, 0xfe, 0xf0, 0x4b, 0xff, 0x57, 0xfd, 0x41, 0x55, 0x2d, 0xd2, 0xab, 0xa8, 0x4f, + 0xd8, 0xe9, 0x9b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x68, 0x80, 0x8b, 0x7e, 0x6d, 0x07, 0x00, 0x00, } func (m *Minter) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/params.go b/x/mint/types/params.go index 9abec74b042..44094ec181e 100644 --- a/x/mint/types/params.go +++ b/x/mint/types/params.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" + epochtypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" yaml "gopkg.in/yaml.v2" ) diff --git a/x/mint/types/query.pb.go b/x/mint/types/query.pb.go index 18f7c1e4345..a7c1a564082 100644 --- a/x/mint/types/query.pb.go +++ b/x/mint/types/query.pb.go @@ -201,32 +201,32 @@ func init() { func init() { proto.RegisterFile("osmosis/mint/v1beta1/query.proto", fileDescriptor_cd2f42111e753fbb) } var fileDescriptor_cd2f42111e753fbb = []byte{ - // 391 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x4e, 0xea, 0x40, - 0x14, 0x86, 0x5b, 0x72, 0x2f, 0x8b, 0xb9, 0x37, 0xe1, 0x66, 0x2e, 0x0b, 0x53, 0x6b, 0x21, 0x8d, - 0x21, 0x98, 0xc8, 0x4c, 0xc0, 0x9d, 0x4b, 0xa2, 0xae, 0x81, 0x9d, 0x6e, 0x4c, 0x5b, 0x27, 0xa5, - 0x91, 0xf6, 0x94, 0xce, 0x40, 0x64, 0xab, 0x2f, 0x60, 0xe2, 0x4b, 0xf8, 0x08, 0x3e, 0x02, 0x4b, - 0x12, 0x37, 0xc6, 0x05, 0x31, 0xe0, 0x83, 0x98, 0x4e, 0x47, 0x22, 0xd8, 0x18, 0x5d, 0xb5, 0x99, - 0xf3, 0x9f, 0xff, 0xff, 0xe6, 0x9c, 0x41, 0x55, 0xe0, 0x21, 0xf0, 0x80, 0xd3, 0x30, 0x88, 0x04, - 0x1d, 0x37, 0x5d, 0x26, 0x9c, 0x26, 0x1d, 0x8e, 0x58, 0x32, 0x21, 0x71, 0x02, 0x02, 0x70, 0x59, - 0x29, 0x48, 0xaa, 0x20, 0x4a, 0x61, 0x94, 0x7d, 0xf0, 0x41, 0x0a, 0x68, 0xfa, 0x97, 0x69, 0x0d, - 0xd3, 0x07, 0xf0, 0x07, 0x8c, 0x3a, 0x71, 0x40, 0x9d, 0x28, 0x02, 0xe1, 0x88, 0x00, 0x22, 0xae, - 0xaa, 0x95, 0xdc, 0x2c, 0x69, 0x2b, 0x05, 0x76, 0x19, 0xe1, 0x6e, 0x9a, 0xdc, 0x71, 0x12, 0x27, - 0xe4, 0x3d, 0x36, 0x1c, 0x31, 0x2e, 0xec, 0x2e, 0xfa, 0xbf, 0x76, 0xca, 0x63, 0x88, 0x38, 0xc3, - 0x87, 0xa8, 0x18, 0xcb, 0x93, 0x2d, 0xbd, 0xaa, 0xd7, 0xff, 0xb4, 0x4c, 0x92, 0x07, 0x4a, 0xb2, - 0xae, 0xf6, 0xaf, 0xe9, 0xbc, 0xa2, 0xf5, 0x54, 0x87, 0xbd, 0x83, 0xb6, 0xa5, 0xe5, 0x71, 0x0c, - 0x5e, 0xbf, 0x93, 0xc0, 0x38, 0xe0, 0x29, 0xe7, 0x7b, 0xe2, 0x04, 0x99, 0xf9, 0x65, 0x15, 0x7d, - 0x8a, 0xfe, 0xb1, 0xb4, 0x74, 0x1e, 0xaf, 0x6a, 0x12, 0xe2, 0x6f, 0x9b, 0xa4, 0x31, 0xcf, 0xf3, - 0x4a, 0xcd, 0x0f, 0x44, 0x7f, 0xe4, 0x12, 0x0f, 0x42, 0xea, 0x49, 0x2e, 0xf5, 0x69, 0xf0, 0x8b, - 0x4b, 0x2a, 0x26, 0x31, 0xe3, 0xe4, 0x88, 0x79, 0xbd, 0x12, 0x5b, 0x8f, 0x68, 0x3d, 0x14, 0xd0, - 0x6f, 0x99, 0x8d, 0x6f, 0x74, 0x54, 0xcc, 0xe0, 0x71, 0x3d, 0xff, 0x6a, 0x9f, 0x67, 0x65, 0xec, - 0x7d, 0x43, 0x99, 0x5d, 0xc2, 0xde, 0xbd, 0x7e, 0x7c, 0xbd, 0x2b, 0x58, 0xd8, 0xa4, 0xb9, 0x6b, - 0xc9, 0x26, 0x85, 0xef, 0x75, 0x54, 0xda, 0x18, 0x03, 0x6e, 0x7e, 0x11, 0x92, 0x3f, 0x51, 0xa3, - 0xf5, 0x93, 0x16, 0x05, 0x48, 0x24, 0x60, 0x1d, 0xd7, 0xf2, 0x01, 0x37, 0x37, 0xd0, 0x3e, 0x99, - 0x2e, 0x2c, 0x7d, 0xb6, 0xb0, 0xf4, 0x97, 0x85, 0xa5, 0xdf, 0x2e, 0x2d, 0x6d, 0xb6, 0xb4, 0xb4, - 0xa7, 0xa5, 0xa5, 0x9d, 0xed, 0x7f, 0xd8, 0x86, 0xf2, 0x6a, 0x0c, 0x1c, 0x97, 0xaf, 0x8c, 0xaf, - 0x32, 0x6b, 0xb9, 0x17, 0xb7, 0x28, 0x1f, 0xe3, 0xc1, 0x5b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x59, - 0xe0, 0xb5, 0xaf, 0x1b, 0x03, 0x00, 0x00, + // 394 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc8, 0x2f, 0xce, 0xcd, + 0x2f, 0xce, 0x2c, 0xd6, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, + 0xd4, 0x2f, 0x2c, 0x4d, 0x2d, 0xaa, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x81, 0xaa, + 0xd0, 0x03, 0xa9, 0xd0, 0x83, 0xaa, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd0, 0x07, + 0xb1, 0x20, 0x6a, 0xa5, 0x64, 0xd2, 0xf3, 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0x13, 0x0b, 0x32, 0xf5, + 0x13, 0xf3, 0xf2, 0xf2, 0x4b, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x8a, 0xa1, 0xb2, 0xf2, 0x58, 0xed, + 0x02, 0x1b, 0x0b, 0x56, 0xa0, 0x24, 0xc2, 0x25, 0x14, 0x08, 0xb2, 0x39, 0x20, 0xb1, 0x28, 0x31, + 0xb7, 0x38, 0x28, 0xb5, 0xb0, 0x34, 0xb5, 0xb8, 0x44, 0x29, 0x90, 0x4b, 0x18, 0x45, 0xb4, 0xb8, + 0x20, 0x3f, 0xaf, 0x38, 0x55, 0xc8, 0x8a, 0x8b, 0xad, 0x00, 0x2c, 0x22, 0xc1, 0xa8, 0xc0, 0xa8, + 0xc1, 0x6d, 0x24, 0xa3, 0x87, 0xcd, 0xa1, 0x7a, 0x10, 0x5d, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, + 0x04, 0x41, 0x75, 0x28, 0xc9, 0x72, 0x49, 0x83, 0x8d, 0x74, 0x2d, 0xc8, 0x4f, 0xce, 0x08, 0x28, + 0xca, 0x2f, 0xcb, 0x2c, 0x06, 0xb9, 0x13, 0x66, 0x63, 0x25, 0x97, 0x0c, 0x76, 0x69, 0xa8, 0xd5, + 0x91, 0x5c, 0x02, 0xa9, 0x20, 0xa9, 0xf8, 0x02, 0xb8, 0x1c, 0xd8, 0x11, 0x3c, 0x4e, 0x7a, 0x20, + 0x6b, 0x6e, 0xdd, 0x93, 0x57, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, + 0x4f, 0x06, 0xbb, 0x0b, 0x4a, 0xe9, 0x16, 0xa7, 0x64, 0xeb, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, + 0xb9, 0xa4, 0x26, 0x07, 0xf1, 0xa7, 0xa2, 0x5a, 0x61, 0xb4, 0x83, 0x89, 0x8b, 0x15, 0x6c, 0xb7, + 0x50, 0x33, 0x23, 0x17, 0x1b, 0xc4, 0xf1, 0x42, 0x1a, 0xd8, 0xbd, 0x86, 0x19, 0x56, 0x52, 0x9a, + 0x44, 0xa8, 0x84, 0x78, 0x42, 0x49, 0xa5, 0xe9, 0xf2, 0x93, 0xc9, 0x4c, 0x72, 0x42, 0x32, 0xfa, + 0x58, 0xa3, 0x05, 0x12, 0x52, 0x42, 0x2b, 0x18, 0xb9, 0xf8, 0xd1, 0x82, 0x41, 0xc8, 0x10, 0x8f, + 0x25, 0xd8, 0x43, 0x54, 0xca, 0x88, 0x14, 0x2d, 0x50, 0x07, 0xea, 0x81, 0x1d, 0xa8, 0x21, 0xa4, + 0x86, 0xdd, 0x81, 0xe8, 0x31, 0xe0, 0xe4, 0x79, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, + 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, + 0x0c, 0x51, 0xfa, 0x48, 0xb1, 0x01, 0x35, 0x4b, 0x37, 0x27, 0x31, 0xa9, 0x18, 0x6e, 0x70, 0x99, + 0xb9, 0x7e, 0x05, 0xc4, 0x74, 0x70, 0xd4, 0x24, 0xb1, 0x81, 0xd3, 0xa3, 0x31, 0x20, 0x00, 0x00, + 0xff, 0xff, 0x6d, 0x21, 0x17, 0x68, 0x1e, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/pool-incentives/abci.go b/x/pool-incentives/abci.go index 54ed86e1559..c89e7e9f8b2 100644 --- a/x/pool-incentives/abci.go +++ b/x/pool-incentives/abci.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" - "github.com/osmosis-labs/osmosis/x/pool-incentives/keeper" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/keeper" ) func BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock, k keeper.Keeper) { diff --git a/x/pool-incentives/client/cli/cli_test.go b/x/pool-incentives/client/cli/cli_test.go index ba586a8e367..69abbc47578 100644 --- a/x/pool-incentives/client/cli/cli_test.go +++ b/x/pool-incentives/client/cli/cli_test.go @@ -6,9 +6,9 @@ import ( clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" - "github.com/osmosis-labs/osmosis/app" - "github.com/osmosis-labs/osmosis/x/pool-incentives/client/cli" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/app" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) type IntegrationTestSuite struct { diff --git a/x/pool-incentives/client/cli/query.go b/x/pool-incentives/client/cli/query.go index 8661ac19ffb..20237f41e5b 100644 --- a/x/pool-incentives/client/cli/query.go +++ b/x/pool-incentives/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" "github.com/spf13/cobra" ) diff --git a/x/pool-incentives/client/cli/tx.go b/x/pool-incentives/client/cli/tx.go index 4631e7b79f3..a71b8607180 100644 --- a/x/pool-incentives/client/cli/tx.go +++ b/x/pool-incentives/client/cli/tx.go @@ -12,8 +12,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/client/cli" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/osmoutils" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) func NewTxCmd() *cobra.Command { diff --git a/x/pool-incentives/client/proposal_handler.go b/x/pool-incentives/client/proposal_handler.go index a445792054f..f7484b00c29 100644 --- a/x/pool-incentives/client/proposal_handler.go +++ b/x/pool-incentives/client/proposal_handler.go @@ -2,8 +2,8 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/osmosis-labs/osmosis/x/pool-incentives/client/cli" - "github.com/osmosis-labs/osmosis/x/pool-incentives/client/rest" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/client/rest" ) var UpdatePoolIncentivesHandler = govclient.NewProposalHandler(cli.NewCmdSubmitUpdatePoolIncentivesProposal, rest.ProposalUpdatePoolIncentivesRESTHandler) diff --git a/x/pool-incentives/client/rest/tx.go b/x/pool-incentives/client/rest/tx.go index beb44710873..2b12eebdc23 100644 --- a/x/pool-incentives/client/rest/tx.go +++ b/x/pool-incentives/client/rest/tx.go @@ -10,7 +10,7 @@ import ( govrest "github.com/cosmos/cosmos-sdk/x/gov/client/rest" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) type UpdatePoolIncentivesRequest struct { diff --git a/x/pool-incentives/genesis.go b/x/pool-incentives/genesis.go index 9fd3fa8378e..843c0a356be 100644 --- a/x/pool-incentives/genesis.go +++ b/x/pool-incentives/genesis.go @@ -3,8 +3,8 @@ package pool_incentives import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/pool-incentives/keeper" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/keeper" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState *types.GenesisState) { diff --git a/x/pool-incentives/genesis_test.go b/x/pool-incentives/genesis_test.go index 8c277802f24..15d0aa7b19d 100644 --- a/x/pool-incentives/genesis_test.go +++ b/x/pool-incentives/genesis_test.go @@ -5,9 +5,9 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - simapp "github.com/osmosis-labs/osmosis/app" - pool_incentives "github.com/osmosis-labs/osmosis/x/pool-incentives" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + simapp "github.com/osmosis-labs/osmosis/v7/app" + pool_incentives "github.com/osmosis-labs/osmosis/v7/x/pool-incentives" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" diff --git a/x/pool-incentives/handler.go b/x/pool-incentives/handler.go index d5c50fd3907..3177660db70 100644 --- a/x/pool-incentives/handler.go +++ b/x/pool-incentives/handler.go @@ -5,8 +5,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/x/pool-incentives/keeper" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/keeper" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) func NewPoolIncentivesProposalHandler(k keeper.Keeper) govtypes.Handler { diff --git a/x/pool-incentives/keeper/distr.go b/x/pool-incentives/keeper/distr.go index b56971f8531..973e7997595 100644 --- a/x/pool-incentives/keeper/distr.go +++ b/x/pool-incentives/keeper/distr.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) func (k Keeper) FundCommunityPoolFromModule(ctx sdk.Context, asset sdk.Coin) error { diff --git a/x/pool-incentives/keeper/distr_test.go b/x/pool-incentives/keeper/distr_test.go index 8bcb822a3e2..e61b2c56fe6 100644 --- a/x/pool-incentives/keeper/distr_test.go +++ b/x/pool-incentives/keeper/distr_test.go @@ -5,8 +5,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/distribution" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - minttypes "github.com/osmosis-labs/osmosis/x/mint/types" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/pool-incentives/keeper/gov.go b/x/pool-incentives/keeper/gov.go index a596b87f8b1..8d3aa985c7b 100644 --- a/x/pool-incentives/keeper/gov.go +++ b/x/pool-incentives/keeper/gov.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) func (k Keeper) HandleReplacePoolIncentivesProposal(ctx sdk.Context, p *types.ReplacePoolIncentivesProposal) error { diff --git a/x/pool-incentives/keeper/grpc_query.go b/x/pool-incentives/keeper/grpc_query.go index cc5e8cf5284..02e46cf89f2 100644 --- a/x/pool-incentives/keeper/grpc_query.go +++ b/x/pool-incentives/keeper/grpc_query.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - incentivetypes "github.com/osmosis-labs/osmosis/x/incentives/types" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + incentivetypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/pool-incentives/keeper/grpc_query_test.go b/x/pool-incentives/keeper/grpc_query_test.go index 96fa36aab9c..e50234d7405 100644 --- a/x/pool-incentives/keeper/grpc_query_test.go +++ b/x/pool-incentives/keeper/grpc_query_test.go @@ -4,10 +4,10 @@ import ( "context" "time" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) var isPerpetual = true diff --git a/x/pool-incentives/keeper/hooks.go b/x/pool-incentives/keeper/hooks.go index 4bb4c43e9e4..5135c5fedb5 100644 --- a/x/pool-incentives/keeper/hooks.go +++ b/x/pool-incentives/keeper/hooks.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) type Hooks struct { diff --git a/x/pool-incentives/keeper/keeper.go b/x/pool-incentives/keeper/keeper.go index 25384c8f7bb..1d9f090863f 100644 --- a/x/pool-incentives/keeper/keeper.go +++ b/x/pool-incentives/keeper/keeper.go @@ -8,10 +8,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" "github.com/tendermint/tendermint/libs/log" ) diff --git a/x/pool-incentives/keeper/keeper_test.go b/x/pool-incentives/keeper/keeper_test.go index ba6066e82b8..5246053ac3e 100644 --- a/x/pool-incentives/keeper/keeper_test.go +++ b/x/pool-incentives/keeper/keeper_test.go @@ -13,12 +13,12 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/app" + "github.com/osmosis-labs/osmosis/v7/app" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) type KeeperTestSuite struct { diff --git a/x/pool-incentives/keeper/params.go b/x/pool-incentives/keeper/params.go index 5cdb1077738..1ff9ef0bf2c 100644 --- a/x/pool-incentives/keeper/params.go +++ b/x/pool-incentives/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { diff --git a/x/pool-incentives/module.go b/x/pool-incentives/module.go index f17103c88a8..4ffc667e528 100644 --- a/x/pool-incentives/module.go +++ b/x/pool-incentives/module.go @@ -18,9 +18,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/osmosis-labs/osmosis/x/pool-incentives/client/cli" - "github.com/osmosis-labs/osmosis/x/pool-incentives/keeper" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/keeper" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) var ( diff --git a/x/pool-incentives/types/expected_keepers.go b/x/pool-incentives/types/expected_keepers.go index f1e65a4bddd..051bbf906fd 100644 --- a/x/pool-incentives/types/expected_keepers.go +++ b/x/pool-incentives/types/expected_keepers.go @@ -7,10 +7,10 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/x/incentives/types" - types "github.com/osmosis-labs/osmosis/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + types "github.com/osmosis-labs/osmosis/v7/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) type AccountKeeper interface { diff --git a/x/pool-incentives/types/genesis.pb.go b/x/pool-incentives/types/genesis.pb.go index 565509dfec8..5ffe92a0a62 100644 --- a/x/pool-incentives/types/genesis.pb.go +++ b/x/pool-incentives/types/genesis.pb.go @@ -98,29 +98,29 @@ func init() { } var fileDescriptor_cc1f078212600632 = []byte{ - // 346 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xcf, 0x4e, 0xc2, 0x40, - 0x10, 0x87, 0xbb, 0x60, 0x48, 0x2c, 0x5e, 0x68, 0x3c, 0x00, 0x87, 0x2d, 0x69, 0xa2, 0xc1, 0x03, - 0xbb, 0x82, 0x07, 0x13, 0x8f, 0x84, 0xc4, 0x78, 0x53, 0xbc, 0x79, 0x21, 0xdb, 0xb2, 0xd4, 0x8d, - 0x6d, 0xa7, 0xe9, 0x2e, 0x44, 0xde, 0xc2, 0xa3, 0xcf, 0xe0, 0x93, 0x70, 0xe4, 0xe8, 0xa9, 0x1a, - 0xfa, 0x06, 0x3c, 0x81, 0xe9, 0x3f, 0x31, 0x21, 0x91, 0x5b, 0x27, 0xf3, 0xfd, 0x66, 0xbe, 0xe9, - 0xea, 0x3d, 0x90, 0x3e, 0x48, 0x21, 0x69, 0x08, 0xe0, 0xf5, 0x44, 0xe0, 0xf0, 0x40, 0x89, 0x05, - 0x97, 0x74, 0xd1, 0xb7, 0xb9, 0x62, 0x7d, 0xea, 0xf2, 0x80, 0x4b, 0x21, 0x49, 0x18, 0x81, 0x02, - 0x03, 0x17, 0x38, 0x49, 0xf1, 0x1d, 0x4d, 0x0a, 0xba, 0x7d, 0xea, 0x82, 0x0b, 0x19, 0x4a, 0xd3, - 0xaf, 0x3c, 0xd5, 0xc6, 0x2e, 0x80, 0xeb, 0x71, 0x9a, 0x55, 0xf6, 0x7c, 0x46, 0xa7, 0xf3, 0x88, - 0x29, 0x01, 0x41, 0xd1, 0xbf, 0x3c, 0x24, 0xf1, 0x67, 0x53, 0x96, 0xb0, 0x3e, 0x2a, 0xfa, 0xc9, - 0x6d, 0x6e, 0xf6, 0xa8, 0x98, 0xe2, 0xc6, 0x48, 0xaf, 0x85, 0x2c, 0x62, 0xbe, 0x6c, 0xa2, 0x0e, - 0xea, 0xd6, 0x07, 0xe7, 0xe4, 0x7f, 0x53, 0x72, 0x9f, 0xd1, 0xc3, 0xa3, 0x55, 0x6c, 0x6a, 0xe3, - 0x22, 0x6b, 0x80, 0x6e, 0x78, 0xe0, 0xbc, 0x30, 0xdb, 0xe3, 0x93, 0xd2, 0x51, 0x36, 0x2b, 0x9d, - 0x6a, 0xb7, 0x3e, 0x68, 0x91, 0xfc, 0x0a, 0x52, 0x5e, 0x41, 0x46, 0x05, 0x31, 0x3c, 0x4b, 0x87, - 0x6c, 0x63, 0xb3, 0xb5, 0x64, 0xbe, 0x77, 0x63, 0xed, 0x8f, 0xb0, 0xde, 0xbf, 0x4c, 0x34, 0x6e, - 0x94, 0x8d, 0x32, 0x28, 0x0d, 0x47, 0xd7, 0xa7, 0x42, 0xaa, 0x68, 0x22, 0x82, 0x19, 0x34, 0xab, - 0x99, 0xfa, 0xc5, 0x21, 0xf5, 0x51, 0x9a, 0xb8, 0x0b, 0x66, 0x30, 0x6c, 0xad, 0x62, 0x13, 0x6d, - 0x63, 0xb3, 0x91, 0x2f, 0xde, 0x8d, 0xb2, 0xc6, 0xc7, 0xd3, 0x5f, 0xea, 0x61, 0xb5, 0xc1, 0x68, - 0xbd, 0xc1, 0xe8, 0x7b, 0x83, 0xd1, 0x5b, 0x82, 0xb5, 0x75, 0x82, 0xb5, 0xcf, 0x04, 0x6b, 0x4f, - 0xd7, 0xae, 0x50, 0xcf, 0x73, 0x9b, 0x38, 0xe0, 0xd3, 0x62, 0x69, 0xcf, 0x63, 0xb6, 0x2c, 0x0b, - 0xfa, 0xba, 0xf7, 0x24, 0x6a, 0x19, 0x72, 0x69, 0xd7, 0xb2, 0x9f, 0x70, 0xf5, 0x13, 0x00, 0x00, - 0xff, 0xff, 0x1b, 0x33, 0x07, 0xe3, 0x3f, 0x02, 0x00, 0x00, + // 351 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0xcf, 0x4e, 0xfa, 0x40, + 0x10, 0xc7, 0xbb, 0xf0, 0x0b, 0xc9, 0xaf, 0x78, 0xa1, 0xf1, 0x00, 0x1c, 0xb6, 0xa4, 0x89, 0x06, + 0x0f, 0xec, 0x0a, 0x1e, 0x4c, 0x38, 0x12, 0x12, 0xe3, 0xcd, 0xa0, 0x27, 0x2f, 0x64, 0x5b, 0x96, + 0xba, 0xb1, 0xed, 0x34, 0xdd, 0x85, 0xc8, 0x5b, 0x78, 0xf4, 0x19, 0x7c, 0x12, 0x8e, 0x1c, 0x3d, + 0x55, 0x43, 0xdf, 0x80, 0x27, 0x30, 0xfd, 0x27, 0x26, 0x24, 0x72, 0xeb, 0x64, 0x3e, 0xdf, 0x99, + 0xcf, 0x74, 0xf5, 0x1e, 0x48, 0x1f, 0xa4, 0x90, 0x34, 0x04, 0xf0, 0x7a, 0x22, 0x70, 0x78, 0xa0, + 0xc4, 0x92, 0x4b, 0xba, 0xec, 0xdb, 0x5c, 0xb1, 0x3e, 0x75, 0x79, 0xc0, 0xa5, 0x90, 0x24, 0x8c, + 0x40, 0x81, 0x81, 0x0b, 0x9c, 0xa4, 0xf8, 0x9e, 0x26, 0x05, 0xdd, 0x3e, 0x75, 0xc1, 0x85, 0x0c, + 0xa5, 0xe9, 0x57, 0x9e, 0x6a, 0x63, 0x17, 0xc0, 0xf5, 0x38, 0xcd, 0x2a, 0x7b, 0x31, 0xa7, 0xb3, + 0x45, 0xc4, 0x94, 0x80, 0xa0, 0xe8, 0x5f, 0x1e, 0x93, 0xf8, 0xb5, 0x29, 0x4b, 0x58, 0xef, 0x15, + 0xfd, 0xe4, 0x26, 0x37, 0xbb, 0x57, 0x4c, 0x71, 0x63, 0xac, 0xd7, 0x42, 0x16, 0x31, 0x5f, 0x36, + 0x51, 0x07, 0x75, 0xeb, 0x83, 0x73, 0xf2, 0xb7, 0x29, 0xb9, 0xcb, 0xe8, 0xd1, 0xbf, 0x75, 0x6c, + 0x6a, 0x93, 0x22, 0x6b, 0x80, 0x6e, 0x78, 0xe0, 0x3c, 0x33, 0xdb, 0xe3, 0xd3, 0xd2, 0x51, 0x36, + 0x2b, 0x9d, 0x6a, 0xb7, 0x3e, 0x68, 0x91, 0xfc, 0x0a, 0x52, 0x5e, 0x41, 0xc6, 0x05, 0x31, 0x3a, + 0x4b, 0x87, 0xec, 0x62, 0xb3, 0xb5, 0x62, 0xbe, 0x37, 0xb4, 0x0e, 0x47, 0x58, 0x6f, 0x9f, 0x26, + 0x9a, 0x34, 0xca, 0x46, 0x19, 0x94, 0x86, 0xa3, 0xeb, 0x33, 0x21, 0x55, 0x34, 0x15, 0xc1, 0x1c, + 0x9a, 0xd5, 0x4c, 0xfd, 0xe2, 0x98, 0xfa, 0x38, 0x4d, 0xdc, 0x06, 0x73, 0x18, 0xb5, 0xd6, 0xb1, + 0x89, 0x76, 0xb1, 0xd9, 0xc8, 0x17, 0xef, 0x47, 0x59, 0x93, 0xff, 0xb3, 0x1f, 0xea, 0x61, 0xbd, + 0xc5, 0x68, 0xb3, 0xc5, 0xe8, 0x6b, 0x8b, 0xd1, 0x6b, 0x82, 0xb5, 0x4d, 0x82, 0xb5, 0x8f, 0x04, + 0x6b, 0x8f, 0x43, 0x57, 0xa8, 0xa7, 0x85, 0x4d, 0x1c, 0xf0, 0x69, 0xb1, 0xb4, 0xe7, 0x31, 0x5b, + 0x96, 0x05, 0x5d, 0x5e, 0xd3, 0x97, 0x83, 0x57, 0x51, 0xab, 0x90, 0x4b, 0xbb, 0x96, 0xfd, 0x87, + 0xab, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x32, 0x7b, 0x3c, 0x42, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/pool-incentives/types/genesis_test.go b/x/pool-incentives/types/genesis_test.go index 25c84ba8468..75280ad1a85 100644 --- a/x/pool-incentives/types/genesis_test.go +++ b/x/pool-incentives/types/genesis_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" proto "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" "github.com/stretchr/testify/require" ) diff --git a/x/pool-incentives/types/gov.pb.go b/x/pool-incentives/types/gov.pb.go index 7bbfcec39f3..9674aeeee1e 100644 --- a/x/pool-incentives/types/gov.pb.go +++ b/x/pool-incentives/types/gov.pb.go @@ -123,7 +123,7 @@ func init() { } var fileDescriptor_96caede426ba9516 = []byte{ - // 299 bytes of a gzipped FileDescriptorProto + // 302 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xcc, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0xc8, 0xcf, 0xcf, 0xd1, 0xcd, 0xcc, 0x4b, 0x4e, 0xcd, 0x2b, 0xc9, 0x2c, 0x4b, 0x2d, 0xd6, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0xcf, 0x2f, 0xd3, @@ -137,12 +137,12 @@ var fileDescriptor_96caede426ba9516 = []byte{ 0x2f, 0x4a, 0x29, 0x96, 0x60, 0x56, 0x60, 0xd6, 0xe0, 0x36, 0xd2, 0xd6, 0xc3, 0xef, 0x27, 0x3d, 0x97, 0xcc, 0xe2, 0x92, 0xa2, 0x20, 0xb0, 0x1e, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0x60, 0x26, 0x58, 0xf1, 0x74, 0x2c, 0x90, 0x67, 0x98, 0xb1, 0x40, 0x9e, 0xe1, 0xc5, 0x02, 0x79, 0x46, - 0xa5, 0x8d, 0x8c, 0x5c, 0x32, 0xa1, 0x05, 0x29, 0x89, 0x25, 0x43, 0xc7, 0xcd, 0x4e, 0x81, 0x27, + 0xa5, 0x8d, 0x8c, 0x5c, 0x32, 0xa1, 0x05, 0x29, 0x89, 0x25, 0x43, 0xc7, 0xcd, 0x4e, 0x21, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, - 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x65, 0x9e, 0x9e, 0x59, 0x92, 0x51, 0x9a, - 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0xb5, 0x4d, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0xaf, - 0xc0, 0x88, 0xce, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x14, 0x1a, 0x03, 0x02, 0x00, - 0x00, 0xff, 0xff, 0xfe, 0x3f, 0x2e, 0x60, 0x57, 0x02, 0x00, 0x00, + 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x65, 0x95, 0x9e, 0x59, 0x92, 0x51, 0x9a, + 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0xb5, 0x4d, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, + 0x33, 0xd7, 0xaf, 0xc0, 0x88, 0xd1, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x2c, 0x1a, + 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x51, 0xf7, 0x55, 0x7d, 0x5a, 0x02, 0x00, 0x00, } func (this *ReplacePoolIncentivesProposal) Equal(that interface{}) bool { diff --git a/x/pool-incentives/types/gov_test.go b/x/pool-incentives/types/gov_test.go index 98c27703a64..5b59f87119c 100644 --- a/x/pool-incentives/types/gov_test.go +++ b/x/pool-incentives/types/gov_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" proto "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" "github.com/stretchr/testify/require" ) diff --git a/x/pool-incentives/types/incentives.pb.go b/x/pool-incentives/types/incentives.pb.go index 8b6086e0ad0..c7debf384d9 100644 --- a/x/pool-incentives/types/incentives.pb.go +++ b/x/pool-incentives/types/incentives.pb.go @@ -221,36 +221,37 @@ func init() { } var fileDescriptor_a8153bad03e553d1 = []byte{ - // 462 bytes of a gzipped FileDescriptorProto + // 465 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0x41, 0x6b, 0xd4, 0x40, - 0x18, 0xcd, 0xd4, 0xa5, 0xb5, 0xb3, 0x05, 0x31, 0x55, 0xdc, 0xf6, 0x90, 0x94, 0x01, 0xa5, 0x20, - 0x3b, 0x63, 0xf5, 0x20, 0xec, 0x31, 0xac, 0xc2, 0xaa, 0x07, 0xcd, 0x45, 0xf0, 0xb2, 0x4c, 0x92, - 0x69, 0x76, 0x68, 0x92, 0x6f, 0xc9, 0xcc, 0x56, 0xfb, 0x0f, 0x04, 0x2f, 0x1e, 0x7b, 0xec, 0x6f, - 0xf1, 0xd4, 0x63, 0x8f, 0xe2, 0x21, 0xca, 0xee, 0xc5, 0xf3, 0xfe, 0x02, 0xc9, 0x64, 0x42, 0x83, - 0x05, 0xc1, 0x53, 0xe6, 0xe5, 0xe5, 0xbd, 0xef, 0xbd, 0xf9, 0x82, 0x9f, 0x80, 0xca, 0x41, 0x49, - 0xc5, 0xe6, 0x00, 0xd9, 0x50, 0x16, 0xb1, 0x28, 0xb4, 0x3c, 0x15, 0x8a, 0x9d, 0x1e, 0x45, 0x42, - 0xf3, 0x23, 0x76, 0xfd, 0x8a, 0xce, 0x4b, 0xd0, 0xe0, 0x7a, 0x56, 0x41, 0x6b, 0x45, 0x87, 0xb5, - 0x82, 0xfd, 0x7b, 0x29, 0xa4, 0x60, 0x3e, 0x65, 0xf5, 0xa9, 0x51, 0xed, 0x7b, 0x29, 0x40, 0x9a, - 0x09, 0x66, 0x50, 0xb4, 0x38, 0x66, 0xc9, 0xa2, 0xe4, 0x5a, 0x42, 0xd1, 0xf0, 0xe4, 0x15, 0xde, - 0x7c, 0xcb, 0x4b, 0x9e, 0x2b, 0x77, 0x84, 0x77, 0x72, 0x59, 0x68, 0x91, 0x4c, 0x13, 0x51, 0x40, - 0x3e, 0x40, 0x07, 0xe8, 0x70, 0x3b, 0x78, 0xb0, 0xae, 0xfc, 0xdd, 0x33, 0x9e, 0x67, 0x23, 0xd2, - 0x65, 0x49, 0xd8, 0x6f, 0xe0, 0xb8, 0x46, 0xa3, 0xde, 0xf9, 0x85, 0xef, 0x90, 0xcf, 0x08, 0xdf, - 0x7f, 0x03, 0xf1, 0x09, 0x8f, 0x32, 0x31, 0xb6, 0x63, 0xd4, 0xa4, 0x38, 0x06, 0x17, 0xb0, 0x9b, - 0x59, 0x62, 0xda, 0x06, 0x50, 0x03, 0x74, 0x70, 0xeb, 0xb0, 0xff, 0x74, 0x8f, 0x36, 0x11, 0x69, - 0x1b, 0x91, 0xb6, 0xda, 0xe0, 0xe1, 0x65, 0xe5, 0x3b, 0xeb, 0xca, 0xdf, 0x6b, 0x02, 0xdc, 0xb4, - 0x20, 0xe7, 0x3f, 0x7d, 0x14, 0xde, 0xcd, 0xfe, 0x1e, 0x4a, 0xbe, 0x21, 0xbc, 0x3d, 0x96, 0x4a, - 0x97, 0x66, 0xfc, 0x0c, 0xef, 0x68, 0xd0, 0x3c, 0x9b, 0x7e, 0x14, 0x32, 0x9d, 0x69, 0x5b, 0xed, - 0x45, 0xed, 0xfe, 0xa3, 0xf2, 0x1f, 0xa5, 0x52, 0xcf, 0x16, 0x11, 0x8d, 0x21, 0x67, 0xb1, 0xb9, - 0x64, 0xfb, 0x18, 0xaa, 0xe4, 0x84, 0xe9, 0xb3, 0xb9, 0x50, 0x74, 0x52, 0xe8, 0xeb, 0x8b, 0xe8, - 0x7a, 0x91, 0xb0, 0x6f, 0xe0, 0x7b, 0x83, 0xdc, 0xd7, 0x78, 0xab, 0x14, 0x31, 0x94, 0x89, 0x1a, - 0x6c, 0x98, 0x76, 0x8f, 0xe9, 0xbf, 0xd7, 0x46, 0x4d, 0xca, 0xd0, 0x68, 0x82, 0x5e, 0x9d, 0x28, - 0x6c, 0x1d, 0xc8, 0x17, 0x84, 0xfb, 0x1d, 0xda, 0xa5, 0xf8, 0x76, 0xca, 0x17, 0xa9, 0x98, 0xca, - 0xc4, 0x54, 0xe8, 0x05, 0xbb, 0xeb, 0xca, 0xbf, 0xd3, 0x84, 0x6a, 0x19, 0x12, 0x6e, 0x99, 0xe3, - 0x24, 0x71, 0x5f, 0xe2, 0x4d, 0x5b, 0x78, 0xc3, 0x14, 0xa6, 0xff, 0x57, 0x38, 0xb4, 0xea, 0x51, - 0xef, 0xf7, 0x85, 0x8f, 0x82, 0x77, 0x97, 0x4b, 0x0f, 0x5d, 0x2d, 0x3d, 0xf4, 0x6b, 0xe9, 0xa1, - 0xaf, 0x2b, 0xcf, 0xb9, 0x5a, 0x79, 0xce, 0xf7, 0x95, 0xe7, 0x7c, 0x78, 0xde, 0xf1, 0xb3, 0x6d, - 0x87, 0x19, 0x8f, 0x54, 0x0b, 0xd8, 0xa7, 0x1b, 0x7f, 0xb9, 0x19, 0x12, 0x6d, 0x9a, 0x95, 0x3f, - 0xfb, 0x13, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x49, 0xa0, 0x8d, 0x0d, 0x03, 0x00, 0x00, + 0x18, 0xcd, 0xd4, 0x65, 0x6b, 0x67, 0x0b, 0x62, 0xaa, 0xb8, 0xed, 0x21, 0x29, 0x01, 0xa5, 0x20, + 0x3b, 0x63, 0xf5, 0x20, 0xe4, 0x18, 0x56, 0x61, 0xd5, 0x83, 0x04, 0x41, 0xf0, 0xb2, 0x4c, 0x92, + 0x69, 0x76, 0x68, 0x92, 0x6f, 0xc9, 0xcc, 0xae, 0xf6, 0x1f, 0x08, 0x5e, 0x3c, 0xf6, 0xd8, 0xdf, + 0xe2, 0xa9, 0xc7, 0x1e, 0xc5, 0x43, 0x94, 0xdd, 0x8b, 0xe7, 0xfd, 0x05, 0x92, 0xc9, 0x84, 0x06, + 0x0b, 0x82, 0xa7, 0xcc, 0xcb, 0xcb, 0x7b, 0xdf, 0x7b, 0xf3, 0x05, 0x3f, 0x01, 0x99, 0x83, 0x14, + 0x92, 0xce, 0x01, 0xb2, 0x91, 0x28, 0x62, 0x5e, 0x28, 0xb1, 0xe4, 0x92, 0x2e, 0x8f, 0x23, 0xae, + 0xd8, 0x31, 0xbd, 0x7e, 0x45, 0xe6, 0x25, 0x28, 0xb0, 0x1d, 0xa3, 0x20, 0xb5, 0xa2, 0xc3, 0x1a, + 0xc1, 0xc1, 0xbd, 0x14, 0x52, 0xd0, 0x9f, 0xd2, 0xfa, 0xd4, 0xa8, 0x0e, 0x9c, 0x14, 0x20, 0xcd, + 0x38, 0xd5, 0x28, 0x5a, 0x9c, 0xd0, 0x64, 0x51, 0x32, 0x25, 0xa0, 0x68, 0x78, 0xef, 0x15, 0xee, + 0xbf, 0x65, 0x25, 0xcb, 0xa5, 0xed, 0xe3, 0xdd, 0x5c, 0x14, 0x8a, 0x27, 0xd3, 0x84, 0x17, 0x90, + 0x0f, 0xd1, 0x21, 0x3a, 0xda, 0x09, 0x1e, 0x6c, 0x2a, 0x77, 0xef, 0x8c, 0xe5, 0x99, 0xef, 0x75, + 0x59, 0x2f, 0x1c, 0x34, 0x70, 0x5c, 0x23, 0xbf, 0x77, 0x7e, 0xe1, 0x5a, 0xde, 0x67, 0x84, 0xef, + 0xbf, 0x81, 0xf8, 0x94, 0x45, 0x19, 0x1f, 0x9b, 0x31, 0x72, 0x52, 0x9c, 0x80, 0x0d, 0xd8, 0xce, + 0x0c, 0x31, 0x6d, 0x03, 0xc8, 0x21, 0x3a, 0xbc, 0x75, 0x34, 0x78, 0xba, 0x4f, 0x9a, 0x88, 0xa4, + 0x8d, 0x48, 0x5a, 0x6d, 0xf0, 0xf0, 0xb2, 0x72, 0xad, 0x4d, 0xe5, 0xee, 0x37, 0x01, 0x6e, 0x5a, + 0x78, 0xe7, 0x3f, 0x5d, 0x14, 0xde, 0xcd, 0xfe, 0x1e, 0xea, 0x7d, 0x43, 0x78, 0x67, 0x2c, 0xa4, + 0x2a, 0xf5, 0xf8, 0x19, 0xde, 0x55, 0xa0, 0x58, 0x36, 0xfd, 0xc8, 0x45, 0x3a, 0x53, 0xa6, 0xda, + 0x8b, 0xda, 0xfd, 0x47, 0xe5, 0x3e, 0x4a, 0x85, 0x9a, 0x2d, 0x22, 0x12, 0x43, 0x4e, 0x63, 0x7d, + 0xc9, 0xe6, 0x31, 0x92, 0xc9, 0x29, 0x55, 0x67, 0x73, 0x2e, 0xc9, 0xa4, 0x50, 0xd7, 0x17, 0xd1, + 0xf5, 0xf2, 0xc2, 0x81, 0x86, 0xef, 0x35, 0xb2, 0x5f, 0xe3, 0xed, 0x92, 0xc7, 0x50, 0x26, 0x72, + 0xb8, 0xa5, 0xdb, 0x3d, 0x26, 0xff, 0x5e, 0x1b, 0xd1, 0x29, 0x43, 0xad, 0x09, 0x7a, 0x75, 0xa2, + 0xb0, 0x75, 0xf0, 0xbe, 0x20, 0x3c, 0xe8, 0xd0, 0x36, 0xc1, 0xb7, 0x53, 0xb6, 0x48, 0xf9, 0x54, + 0x24, 0xba, 0x42, 0x2f, 0xd8, 0xdb, 0x54, 0xee, 0x9d, 0x26, 0x54, 0xcb, 0x78, 0xe1, 0xb6, 0x3e, + 0x4e, 0x12, 0xfb, 0x25, 0xee, 0x9b, 0xc2, 0x5b, 0xba, 0x30, 0xf9, 0xbf, 0xc2, 0xa1, 0x51, 0xfb, + 0xbd, 0xdf, 0x17, 0x2e, 0x0a, 0xde, 0x5d, 0xae, 0x1c, 0x74, 0xb5, 0x72, 0xd0, 0xaf, 0x95, 0x83, + 0xbe, 0xae, 0x1d, 0xeb, 0x6a, 0xed, 0x58, 0xdf, 0xd7, 0x8e, 0xf5, 0xc1, 0xef, 0xf8, 0x99, 0xb6, + 0xa3, 0x8c, 0x45, 0xb2, 0x05, 0x74, 0xf9, 0x9c, 0x7e, 0xba, 0xf1, 0xa3, 0xeb, 0x39, 0x51, 0x5f, + 0x6f, 0xfd, 0xd9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x92, 0x5d, 0x6d, 0x10, 0x03, 0x00, + 0x00, } func (this *DistrRecord) Equal(that interface{}) bool { diff --git a/x/pool-incentives/types/incentives_test.go b/x/pool-incentives/types/incentives_test.go index 7577bba2737..83e786f5691 100644 --- a/x/pool-incentives/types/incentives_test.go +++ b/x/pool-incentives/types/incentives_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" proto "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" "github.com/stretchr/testify/require" ) diff --git a/x/pool-incentives/types/query.pb.go b/x/pool-incentives/types/query.pb.go index 922955d6bfb..8be7a38b40a 100644 --- a/x/pool-incentives/types/query.pb.go +++ b/x/pool-incentives/types/query.pb.go @@ -10,7 +10,7 @@ import ( grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - types "github.com/osmosis-labs/osmosis/x/incentives/types" + types "github.com/osmosis-labs/osmosis/v7/x/incentives/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -660,63 +660,63 @@ func init() { } var fileDescriptor_302873ecccbc7636 = []byte{ - // 891 bytes of a gzipped FileDescriptorProto + // 894 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x41, 0x6f, 0xe3, 0x44, 0x14, 0xce, 0x74, 0x4b, 0x36, 0x9d, 0x4a, 0xb0, 0x99, 0x06, 0xda, 0x5a, 0xe0, 0x94, 0x61, 0x17, - 0xba, 0xaa, 0x62, 0xef, 0x26, 0xbb, 0x8b, 0xb4, 0x2c, 0x20, 0x65, 0x83, 0x50, 0x24, 0x0e, 0xbb, - 0xbe, 0x20, 0xc1, 0xc1, 0x72, 0x62, 0xd7, 0x1d, 0xe1, 0x78, 0xb2, 0x19, 0x67, 0xd9, 0x82, 0xf6, - 0xb2, 0x07, 0xce, 0x20, 0x2e, 0x9c, 0x11, 0x3d, 0x73, 0xe2, 0x37, 0xd0, 0x1b, 0x95, 0xb8, 0x70, - 0x21, 0xa0, 0x96, 0x03, 0xe7, 0xfc, 0x02, 0xe4, 0xf1, 0xb3, 0x9b, 0xd8, 0x4d, 0x9c, 0x94, 0x5b, - 0xe2, 0xf7, 0xde, 0xf7, 0xbe, 0xef, 0xbd, 0xe7, 0xcf, 0x78, 0x8f, 0x8b, 0x1e, 0x17, 0x4c, 0xe8, - 0x7d, 0xce, 0xbd, 0x1a, 0xf3, 0xbb, 0x8e, 0x1f, 0xb0, 0xa7, 0x8e, 0xd0, 0x9f, 0xde, 0xee, 0x38, - 0x81, 0x75, 0x5b, 0x7f, 0x32, 0x74, 0x06, 0x87, 0x5a, 0x7f, 0xc0, 0x03, 0x4e, 0x54, 0x48, 0xd6, + 0xba, 0xaa, 0x62, 0xef, 0x26, 0xbb, 0x8b, 0x54, 0x16, 0x90, 0xb2, 0x41, 0x28, 0x12, 0x87, 0xc5, + 0x42, 0x42, 0x82, 0x83, 0xe5, 0xc4, 0xae, 0x3b, 0xc2, 0xf1, 0x64, 0x33, 0x4e, 0xd9, 0x82, 0xf6, + 0xb2, 0x07, 0xce, 0x20, 0x2e, 0x9c, 0x11, 0x7b, 0xe6, 0xc4, 0x6f, 0x60, 0x6f, 0x54, 0xe2, 0xc2, + 0x85, 0x80, 0x5a, 0x0e, 0x9c, 0xf3, 0x0b, 0x90, 0xc7, 0xcf, 0x6e, 0x62, 0x37, 0x71, 0x52, 0x6e, + 0x89, 0xdf, 0x7b, 0xdf, 0xfb, 0xbe, 0xf7, 0x9e, 0x3f, 0xe3, 0x3d, 0x2e, 0x7a, 0x5c, 0x30, 0xa1, + 0xf7, 0x39, 0xf7, 0x6a, 0xcc, 0xef, 0x3a, 0x7e, 0xc0, 0x8e, 0x1c, 0xa1, 0x1f, 0xdd, 0xee, 0x38, + 0x81, 0x75, 0x5b, 0x7f, 0x34, 0x74, 0x06, 0xc7, 0x5a, 0x7f, 0xc0, 0x03, 0x4e, 0x54, 0x48, 0xd6, 0xc2, 0xe4, 0xf3, 0x5c, 0x0d, 0x72, 0x95, 0x8a, 0xcb, 0x5d, 0x2e, 0x53, 0xf5, 0xf0, 0x57, 0x54, - 0xa5, 0xbc, 0xee, 0x72, 0xee, 0x7a, 0x8e, 0x6e, 0xf5, 0x99, 0x6e, 0xf9, 0x3e, 0x0f, 0xac, 0x80, - 0x71, 0x5f, 0x40, 0x54, 0x85, 0xa8, 0xfc, 0xd7, 0x19, 0xee, 0xeb, 0xf6, 0x70, 0x20, 0x13, 0xe2, + 0xa5, 0xbc, 0xea, 0x72, 0xee, 0x7a, 0x8e, 0x6e, 0xf5, 0x99, 0x6e, 0xf9, 0x3e, 0x0f, 0xac, 0x80, + 0x71, 0x5f, 0x40, 0x54, 0x85, 0xa8, 0xfc, 0xd7, 0x19, 0x1e, 0xe8, 0xf6, 0x70, 0x20, 0x13, 0xe2, 0x78, 0x4c, 0x70, 0x82, 0x9b, 0x6b, 0x0d, 0x5d, 0x07, 0xe2, 0xb7, 0xf2, 0x04, 0x4c, 0xf0, 0x94, - 0x15, 0xf4, 0x21, 0xae, 0x3c, 0x0e, 0x45, 0x7d, 0x1c, 0xa2, 0xb4, 0x6d, 0x61, 0x38, 0x4f, 0x86, - 0x8e, 0x08, 0xc8, 0x1e, 0xbe, 0x1a, 0x62, 0x98, 0xcc, 0xde, 0x42, 0x3b, 0x68, 0x77, 0xb5, 0x49, - 0xc6, 0xa3, 0xea, 0xcb, 0x87, 0x56, 0xcf, 0xbb, 0x4f, 0x21, 0x40, 0x8d, 0x62, 0xf8, 0xab, 0x6d, - 0xd3, 0x5f, 0x57, 0xf0, 0xab, 0x29, 0x14, 0xd1, 0xe7, 0xbe, 0x70, 0xc8, 0x4f, 0x08, 0x6f, 0x4a, - 0x82, 0x26, 0xb3, 0x85, 0xf9, 0x25, 0x0b, 0x0e, 0xcc, 0x58, 0xd2, 0x16, 0xda, 0xb9, 0xb2, 0xbb, - 0x5e, 0x6f, 0x6b, 0xf3, 0xe7, 0xa8, 0x5d, 0x08, 0xac, 0xc1, 0x83, 0x4f, 0x59, 0x70, 0xd0, 0x02, + 0x15, 0xf4, 0x01, 0xae, 0x7c, 0x1c, 0x8a, 0xfa, 0x30, 0x44, 0x69, 0xdb, 0xc2, 0x70, 0x1e, 0x0d, + 0x1d, 0x11, 0x90, 0x3d, 0x7c, 0x35, 0xc4, 0x30, 0x99, 0xbd, 0x85, 0x76, 0xd0, 0xee, 0x6a, 0x93, + 0x8c, 0x47, 0xd5, 0x17, 0x8f, 0xad, 0x9e, 0xb7, 0x4f, 0x21, 0x40, 0x8d, 0x62, 0xf8, 0xab, 0x6d, + 0xd3, 0x5f, 0x57, 0xf0, 0xcb, 0x29, 0x14, 0xd1, 0xe7, 0xbe, 0x70, 0xc8, 0x4f, 0x08, 0x6f, 0x4a, + 0x82, 0x26, 0xb3, 0x85, 0xf9, 0x25, 0x0b, 0x0e, 0xcd, 0x58, 0xd2, 0x16, 0xda, 0xb9, 0xb2, 0xbb, + 0x5e, 0x6f, 0x6b, 0xf3, 0xe7, 0xa8, 0x5d, 0x08, 0xac, 0xc1, 0x83, 0x4f, 0x59, 0x70, 0xd8, 0x02, 0xc0, 0x26, 0x1d, 0x8f, 0xaa, 0x6a, 0x44, 0x71, 0x46, 0x4f, 0x6a, 0x54, 0x5c, 0x40, 0x9a, 0xac, 0x54, 0xbe, 0x41, 0x78, 0xe3, 0x02, 0x44, 0xa2, 0xe1, 0x52, 0x8c, 0x04, 0x63, 0xd8, 0x18, 0x8f, - 0xaa, 0xaf, 0x4c, 0xf7, 0xa0, 0xc6, 0x55, 0x00, 0x25, 0x1f, 0xe2, 0x52, 0x22, 0x6f, 0x65, 0x07, - 0xed, 0xae, 0xd7, 0xb7, 0xb5, 0x68, 0xa5, 0x5a, 0xbc, 0x52, 0x2d, 0xa1, 0x5b, 0x3a, 0x1e, 0x55, - 0x0b, 0x3f, 0xfc, 0x55, 0x45, 0x46, 0x52, 0x44, 0x37, 0x61, 0x90, 0x2d, 0x26, 0x82, 0x41, 0xdb, - 0xdf, 0xe7, 0xb0, 0x0f, 0xfa, 0x1c, 0xbf, 0x96, 0x0e, 0xc0, 0x88, 0xbb, 0x18, 0xdb, 0xe1, 0x43, - 0x93, 0xf9, 0xfb, 0x5c, 0xb2, 0x5c, 0xaf, 0xdf, 0xcc, 0x1b, 0x6a, 0x02, 0xd3, 0xdc, 0x0e, 0x59, - 0x8c, 0x47, 0xd5, 0x72, 0x24, 0xea, 0x1c, 0x8a, 0x1a, 0x6b, 0x76, 0x9c, 0x45, 0x2b, 0x98, 0xc8, - 0xf6, 0x8f, 0xac, 0x81, 0xd5, 0x8b, 0x8f, 0x84, 0x7e, 0x8e, 0x37, 0xa6, 0x9e, 0x02, 0xa3, 0x16, - 0x2e, 0xf6, 0xe5, 0x13, 0x60, 0xf3, 0x76, 0x1e, 0x9b, 0xa8, 0xbe, 0xb9, 0x1a, 0x52, 0x31, 0xa0, - 0x96, 0x56, 0xf1, 0x1b, 0x12, 0xfc, 0x13, 0xde, 0xfd, 0xc2, 0xea, 0x78, 0x4e, 0x3c, 0xb7, 0xa4, - 0xfb, 0x77, 0x08, 0xab, 0xb3, 0x32, 0x80, 0x09, 0xc7, 0xc4, 0x83, 0x60, 0x72, 0x03, 0x02, 0x0e, - 0x6f, 0xce, 0x66, 0x6e, 0xc0, 0x4c, 0xb6, 0xa3, 0x99, 0x64, 0x21, 0xa8, 0x5c, 0x5b, 0xd9, 0x4b, - 0x37, 0x4e, 0x48, 0xb7, 0x41, 0x24, 0xfb, 0xca, 0xb1, 0x1f, 0x71, 0xee, 0x25, 0xa4, 0xff, 0x44, - 0xf8, 0x5a, 0x3a, 0xb8, 0xd4, 0xcb, 0x46, 0x3c, 0x5c, 0xce, 0x10, 0xca, 0x3f, 0xb6, 0xeb, 0x20, - 0x69, 0x6b, 0x86, 0xa4, 0x48, 0xd1, 0xb5, 0xb4, 0xa2, 0xa9, 0x37, 0xe0, 0x4a, 0xfe, 0x1b, 0x40, - 0x8f, 0xe2, 0xa5, 0x5c, 0x30, 0x01, 0x58, 0xca, 0x0b, 0x84, 0x09, 0x9b, 0x88, 0x9a, 0xa1, 0xb0, - 0x78, 0x2b, 0xb7, 0xf2, 0x6e, 0x25, 0x8d, 0xdb, 0x7c, 0x73, 0x7a, 0x59, 0x59, 0x64, 0x6a, 0x94, - 0x59, 0x9a, 0x0c, 0xbd, 0x81, 0xdf, 0x92, 0x34, 0x3f, 0x7a, 0x16, 0x38, 0x03, 0xdf, 0xf2, 0x62, - 0x58, 0x47, 0xda, 0xc0, 0xc4, 0x85, 0x5f, 0x9f, 0x9f, 0x06, 0x9a, 0x1a, 0x78, 0xd5, 0xb6, 0x02, - 0x2b, 0x39, 0xad, 0x58, 0xc4, 0x84, 0x00, 0x59, 0x01, 0x37, 0x2e, 0x93, 0xeb, 0x47, 0x6b, 0xf8, - 0x25, 0x89, 0x4e, 0x7e, 0x41, 0xb8, 0x14, 0x5b, 0x1c, 0xb9, 0xb3, 0xa4, 0x23, 0x4a, 0xa6, 0xca, - 0xdd, 0x4b, 0xf9, 0x28, 0x7d, 0xf0, 0xe2, 0xf7, 0x7f, 0xbe, 0x5f, 0xb9, 0x47, 0xee, 0xe8, 0x79, - 0x9f, 0x0e, 0xb9, 0xe1, 0x1a, 0xb3, 0x85, 0xfe, 0x35, 0xdc, 0xe4, 0x73, 0xf2, 0x33, 0xc2, 0x6b, - 0x89, 0x95, 0x90, 0xc5, 0x28, 0xa4, 0xad, 0x4d, 0xb9, 0xb7, 0x6c, 0x19, 0x50, 0x6f, 0x48, 0xea, - 0x35, 0xb2, 0x97, 0x4b, 0xfd, 0xdc, 0xd4, 0xc8, 0x8f, 0x08, 0x17, 0x23, 0xbb, 0x21, 0xf5, 0x85, - 0xfa, 0x4e, 0x39, 0x9e, 0xd2, 0x58, 0xaa, 0x06, 0x88, 0xea, 0x92, 0xe8, 0x4d, 0xf2, 0x4e, 0x2e, - 0xd1, 0xc8, 0xfa, 0xc8, 0x6f, 0x08, 0x97, 0x33, 0xa6, 0x46, 0xde, 0x5f, 0xa8, 0xf7, 0x2c, 0xbb, - 0x54, 0x3e, 0xb8, 0x6c, 0x39, 0xa8, 0x78, 0x4f, 0xaa, 0xb8, 0x4b, 0x1a, 0xb9, 0x2a, 0xb2, 0x7e, - 0x29, 0x15, 0x65, 0x1c, 0x61, 0x41, 0x45, 0xb3, 0xbc, 0x74, 0x41, 0x45, 0x33, 0x8d, 0x68, 0x09, - 0x45, 0x59, 0x53, 0x21, 0xff, 0x22, 0xbc, 0x39, 0xc3, 0x15, 0xc8, 0xc3, 0x85, 0x88, 0xcd, 0xb7, - 0x1e, 0xa5, 0xf5, 0xff, 0x40, 0x40, 0x63, 0x53, 0x6a, 0x7c, 0x40, 0xee, 0xe7, 0x6a, 0x74, 0x00, - 0xc9, 0x4c, 0x62, 0xa6, 0x7c, 0xe5, 0x45, 0xf3, 0xf1, 0xf1, 0xa9, 0x8a, 0x4e, 0x4e, 0x55, 0xf4, - 0xf7, 0xa9, 0x8a, 0xbe, 0x3d, 0x53, 0x0b, 0x27, 0x67, 0x6a, 0xe1, 0x8f, 0x33, 0xb5, 0xf0, 0xd9, - 0xbb, 0x2e, 0x0b, 0x0e, 0x86, 0x1d, 0xad, 0xcb, 0x7b, 0x31, 0x7e, 0xcd, 0xb3, 0x3a, 0x22, 0x69, - 0xf6, 0x2c, 0xd3, 0x2e, 0x38, 0xec, 0x3b, 0xa2, 0x53, 0x94, 0x5f, 0xa8, 0xc6, 0x7f, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x94, 0x9d, 0x60, 0x6b, 0x72, 0x0b, 0x00, 0x00, + 0xaa, 0x2f, 0x4d, 0xf7, 0xa0, 0xc6, 0x55, 0x00, 0x25, 0xef, 0xe3, 0x52, 0x22, 0x6f, 0x65, 0x07, + 0xed, 0xae, 0xd7, 0xb7, 0xb5, 0x68, 0xa5, 0x5a, 0xbc, 0x52, 0x2d, 0xa1, 0x5b, 0x7a, 0x3e, 0xaa, + 0x16, 0x7e, 0xf8, 0xab, 0x8a, 0x8c, 0xa4, 0x88, 0x6e, 0xc2, 0x20, 0x5b, 0x4c, 0x04, 0x83, 0xb6, + 0x7f, 0xc0, 0x61, 0x1f, 0xf4, 0x09, 0x7e, 0x25, 0x1d, 0x80, 0x11, 0x77, 0x31, 0xb6, 0xc3, 0x87, + 0x26, 0xf3, 0x0f, 0xb8, 0x64, 0xb9, 0x5e, 0xbf, 0x99, 0x37, 0xd4, 0x04, 0xa6, 0xb9, 0x1d, 0xb2, + 0x18, 0x8f, 0xaa, 0xe5, 0x48, 0xd4, 0x39, 0x14, 0x35, 0xd6, 0xec, 0x38, 0x8b, 0x56, 0x30, 0x91, + 0xed, 0x1f, 0x5a, 0x03, 0xab, 0x17, 0x1f, 0x09, 0xfd, 0x1c, 0x6f, 0x4c, 0x3d, 0x05, 0x46, 0x2d, + 0x5c, 0xec, 0xcb, 0x27, 0xc0, 0xe6, 0xcd, 0x3c, 0x36, 0x51, 0x7d, 0x73, 0x35, 0xa4, 0x62, 0x40, + 0x2d, 0xad, 0xe2, 0xd7, 0x24, 0xf8, 0x47, 0xbc, 0xfb, 0x85, 0xd5, 0xf1, 0x9c, 0x78, 0x6e, 0x49, + 0xf7, 0xef, 0x10, 0x56, 0x67, 0x65, 0x00, 0x13, 0x8e, 0x89, 0x07, 0xc1, 0xe4, 0x06, 0x04, 0x1c, + 0xde, 0x9c, 0xcd, 0xdc, 0x80, 0x99, 0x6c, 0x47, 0x33, 0xc9, 0x42, 0x50, 0xb9, 0xb6, 0xb2, 0x97, + 0x6e, 0x9c, 0x90, 0x6e, 0x83, 0x48, 0xf6, 0x95, 0x63, 0x3f, 0xe4, 0xdc, 0x4b, 0x48, 0xff, 0x89, + 0xf0, 0xb5, 0x74, 0x70, 0xa9, 0x97, 0x8d, 0x78, 0xb8, 0x9c, 0x21, 0x94, 0x7f, 0x6c, 0xd7, 0x41, + 0xd2, 0xd6, 0x0c, 0x49, 0x91, 0xa2, 0x6b, 0x69, 0x45, 0x53, 0x6f, 0xc0, 0x95, 0xfc, 0x37, 0x80, + 0x3e, 0x8b, 0x97, 0x72, 0xc1, 0x04, 0x60, 0x29, 0x4f, 0x11, 0x26, 0x6c, 0x22, 0x6a, 0x86, 0xc2, + 0xe2, 0xad, 0xdc, 0xca, 0xbb, 0x95, 0x34, 0x6e, 0xf3, 0xf5, 0xe9, 0x65, 0x65, 0x91, 0xa9, 0x51, + 0x66, 0x69, 0x32, 0xf4, 0x06, 0x7e, 0x43, 0xd2, 0xfc, 0xe0, 0x71, 0xe0, 0x0c, 0x7c, 0xcb, 0x8b, + 0x61, 0x1d, 0x69, 0x03, 0x13, 0x17, 0x7e, 0x7d, 0x7e, 0x1a, 0x68, 0x6a, 0xe0, 0x55, 0xdb, 0x0a, + 0xac, 0xe4, 0xb4, 0x62, 0x11, 0x13, 0x02, 0x64, 0x05, 0xdc, 0xb8, 0x4c, 0xae, 0x3f, 0x5b, 0xc3, + 0x2f, 0x48, 0x74, 0xf2, 0x0b, 0xc2, 0xa5, 0xd8, 0xe2, 0xc8, 0x9d, 0x25, 0x1d, 0x51, 0x32, 0x55, + 0xee, 0x5e, 0xca, 0x47, 0xe9, 0xfd, 0xa7, 0xbf, 0xff, 0xf3, 0xfd, 0xca, 0x3d, 0x72, 0x47, 0xcf, + 0xfb, 0x74, 0xc8, 0x0d, 0xd7, 0x98, 0x2d, 0xf4, 0xaf, 0xe1, 0x26, 0x9f, 0x90, 0x9f, 0x11, 0x5e, + 0x4b, 0xac, 0x84, 0x2c, 0x46, 0x21, 0x6d, 0x6d, 0xca, 0xbd, 0x65, 0xcb, 0x80, 0x7a, 0x43, 0x52, + 0xaf, 0x91, 0xbd, 0x5c, 0xea, 0xe7, 0xa6, 0x46, 0x7e, 0x44, 0xb8, 0x18, 0xd9, 0x0d, 0xa9, 0x2f, + 0xd4, 0x77, 0xca, 0xf1, 0x94, 0xc6, 0x52, 0x35, 0x40, 0x54, 0x97, 0x44, 0x6f, 0x92, 0xb7, 0x72, + 0x89, 0x46, 0xd6, 0x47, 0x7e, 0x43, 0xb8, 0x9c, 0x31, 0x35, 0xf2, 0xee, 0x42, 0xbd, 0x67, 0xd9, + 0xa5, 0xf2, 0xde, 0x65, 0xcb, 0x41, 0xc5, 0x3b, 0x52, 0xc5, 0x5d, 0xd2, 0xc8, 0x55, 0x91, 0xf5, + 0x4b, 0xa9, 0x28, 0xe3, 0x08, 0x0b, 0x2a, 0x9a, 0xe5, 0xa5, 0x0b, 0x2a, 0x9a, 0x69, 0x44, 0x4b, + 0x28, 0xca, 0x9a, 0x0a, 0xf9, 0x17, 0xe1, 0xcd, 0x19, 0xae, 0x40, 0x1e, 0x2c, 0x44, 0x6c, 0xbe, + 0xf5, 0x28, 0xad, 0xff, 0x07, 0x02, 0x1a, 0x9b, 0x52, 0xe3, 0x7d, 0xb2, 0x9f, 0xab, 0xd1, 0x01, + 0x24, 0x33, 0x89, 0x99, 0xf2, 0x95, 0x17, 0xcd, 0x4f, 0x9e, 0x9f, 0xaa, 0xe8, 0xe4, 0x54, 0x45, + 0x7f, 0x9f, 0xaa, 0xe8, 0xdb, 0x33, 0xb5, 0x70, 0x72, 0xa6, 0x16, 0xfe, 0x38, 0x53, 0x0b, 0x9f, + 0xed, 0xbb, 0x2c, 0x38, 0x1c, 0x76, 0xb4, 0x2e, 0xef, 0xc5, 0xf8, 0x35, 0xcf, 0xea, 0x88, 0xa4, + 0xd9, 0xd1, 0xdb, 0xfa, 0xe3, 0x4c, 0xc7, 0xe0, 0xb8, 0xef, 0x88, 0x4e, 0x51, 0x7e, 0xa4, 0x1a, + 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x50, 0x0b, 0x40, 0x35, 0x75, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/pool-incentives/types/query_test.go b/x/pool-incentives/types/query_test.go index 09546a03f1b..a7038d2fbb8 100644 --- a/x/pool-incentives/types/query_test.go +++ b/x/pool-incentives/types/query_test.go @@ -5,7 +5,7 @@ import ( "time" proto "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" "github.com/stretchr/testify/require" ) diff --git a/x/pool-incentives/types/record_test.go b/x/pool-incentives/types/record_test.go index ee58a427d8a..a49cb927e1c 100644 --- a/x/pool-incentives/types/record_test.go +++ b/x/pool-incentives/types/record_test.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types" ) func TestDistrRecord(t *testing.T) { diff --git a/x/superfluid/abci.go b/x/superfluid/abci.go index acdc56d3b03..094cbae7de5 100644 --- a/x/superfluid/abci.go +++ b/x/superfluid/abci.go @@ -4,7 +4,7 @@ import ( abci "github.com/tendermint/tendermint/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" ) // BeginBlocker is called on every block diff --git a/x/superfluid/client/cli/query.go b/x/superfluid/client/cli/query.go index 19dcd83ddbc..ad57e282e39 100644 --- a/x/superfluid/client/cli/query.go +++ b/x/superfluid/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" "github.com/spf13/cobra" ) diff --git a/x/superfluid/client/cli/tx.go b/x/superfluid/client/cli/tx.go index 75d8d6af9be..6dd3ef03ab7 100644 --- a/x/superfluid/client/cli/tx.go +++ b/x/superfluid/client/cli/tx.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govcli "github.com/cosmos/cosmos-sdk/x/gov/client/cli" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" "github.com/spf13/cobra" ) diff --git a/x/superfluid/client/proposal_handler.go b/x/superfluid/client/proposal_handler.go index 1239e192880..5a2132b1bde 100644 --- a/x/superfluid/client/proposal_handler.go +++ b/x/superfluid/client/proposal_handler.go @@ -2,8 +2,8 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/osmosis-labs/osmosis/x/superfluid/client/cli" - "github.com/osmosis-labs/osmosis/x/superfluid/client/rest" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/client/rest" ) var SetSuperfluidAssetsProposalHandler = govclient.NewProposalHandler(cli.NewCmdSubmitSetSuperfluidAssetsProposal, rest.ProposalSetSuperfluidAssetsRESTHandler) diff --git a/x/superfluid/genesis.go b/x/superfluid/genesis.go index 76c5dd273ce..cb9b30926c2 100644 --- a/x/superfluid/genesis.go +++ b/x/superfluid/genesis.go @@ -2,8 +2,8 @@ package superfluid import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/superfluid/handler.go b/x/superfluid/handler.go index 6f9d3f9cb9d..85f0ea1b20b 100644 --- a/x/superfluid/handler.go +++ b/x/superfluid/handler.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) // NewHandler returns a handler for "superfluid" type messages. diff --git a/x/superfluid/keeper/distribution.go b/x/superfluid/keeper/distribution.go index af5c5dbbda1..24d022e2ca3 100644 --- a/x/superfluid/keeper/distribution.go +++ b/x/superfluid/keeper/distribution.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/osmoutils" + "github.com/osmosis-labs/osmosis/v7/osmoutils" ) func (k Keeper) MoveSuperfluidDelegationRewardToGauges(ctx sdk.Context) { diff --git a/x/superfluid/keeper/distribution_test.go b/x/superfluid/keeper/distribution_test.go index 5a657c97433..9d3b1fb83c8 100644 --- a/x/superfluid/keeper/distribution_test.go +++ b/x/superfluid/keeper/distribution_test.go @@ -4,9 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" - minttypes "github.com/osmosis-labs/osmosis/x/mint/types" - "github.com/osmosis-labs/osmosis/x/superfluid/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" ) func (suite *KeeperTestSuite) allocateRewardsToValidator(valAddr sdk.ValAddress) { diff --git a/x/superfluid/keeper/gov.go b/x/superfluid/keeper/gov.go index 195acf1c13d..2a4ce1b0b96 100644 --- a/x/superfluid/keeper/gov.go +++ b/x/superfluid/keeper/gov.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) func (k Keeper) HandleSetSuperfluidAssetsProposal(ctx sdk.Context, p *types.SetSuperfluidAssetsProposal) error { diff --git a/x/superfluid/keeper/gov_test.go b/x/superfluid/keeper/gov_test.go index e9fe1338733..a294faf85db 100644 --- a/x/superfluid/keeper/gov_test.go +++ b/x/superfluid/keeper/gov_test.go @@ -2,7 +2,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) func (suite *KeeperTestSuite) TestHandleSetSuperfluidAssetsProposal() { diff --git a/x/superfluid/keeper/grpc_query.go b/x/superfluid/keeper/grpc_query.go index b7e13a218cb..b3471794f5c 100644 --- a/x/superfluid/keeper/grpc_query.go +++ b/x/superfluid/keeper/grpc_query.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/superfluid/keeper/grpc_query_test.go b/x/superfluid/keeper/grpc_query_test.go index 28af4c48619..e8ded6f052f 100644 --- a/x/superfluid/keeper/grpc_query_test.go +++ b/x/superfluid/keeper/grpc_query_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/hooks.go b/x/superfluid/keeper/hooks.go index 47f2865371b..9e62b58b385 100644 --- a/x/superfluid/keeper/hooks.go +++ b/x/superfluid/keeper/hooks.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) func (k Keeper) BeforeEpochStart(ctx sdk.Context, epochIdentifier string, _ int64) { diff --git a/x/superfluid/keeper/hooks_test.go b/x/superfluid/keeper/hooks_test.go index f8fe34f435c..72688347d6b 100644 --- a/x/superfluid/keeper/hooks_test.go +++ b/x/superfluid/keeper/hooks_test.go @@ -3,11 +3,11 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - appparams "github.com/osmosis-labs/osmosis/app/params" - "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" - minttypes "github.com/osmosis-labs/osmosis/x/mint/types" - "github.com/osmosis-labs/osmosis/x/superfluid/keeper" + appparams "github.com/osmosis-labs/osmosis/v7/app/params" + "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" "github.com/tendermint/tendermint/crypto/ed25519" ) diff --git a/x/superfluid/keeper/intermediary_account.go b/x/superfluid/keeper/intermediary_account.go index 74873774e9a..0a0aa05ac23 100644 --- a/x/superfluid/keeper/intermediary_account.go +++ b/x/superfluid/keeper/intermediary_account.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) func (k Keeper) GetAllIntermediaryAccounts(ctx sdk.Context) []types.SuperfluidIntermediaryAccount { diff --git a/x/superfluid/keeper/intermediary_account_test.go b/x/superfluid/keeper/intermediary_account_test.go index ab3b1a4e616..6f17500953c 100644 --- a/x/superfluid/keeper/intermediary_account_test.go +++ b/x/superfluid/keeper/intermediary_account_test.go @@ -2,7 +2,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) func (suite *KeeperTestSuite) TestIntermediaryAccountsSetGetDeleteFlow() { diff --git a/x/superfluid/keeper/keeper.go b/x/superfluid/keeper/keeper.go index 51813b27330..78e31f9031c 100644 --- a/x/superfluid/keeper/keeper.go +++ b/x/superfluid/keeper/keeper.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" "github.com/tendermint/tendermint/libs/log" ) diff --git a/x/superfluid/keeper/keeper_test.go b/x/superfluid/keeper/keeper_test.go index f56e2d2e275..470f5311553 100644 --- a/x/superfluid/keeper/keeper_test.go +++ b/x/superfluid/keeper/keeper_test.go @@ -5,7 +5,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/app" + "github.com/osmosis-labs/osmosis/v7/app" "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) diff --git a/x/superfluid/keeper/msg_server.go b/x/superfluid/keeper/msg_server.go index d95d3df29b1..792e30c4c7b 100644 --- a/x/superfluid/keeper/msg_server.go +++ b/x/superfluid/keeper/msg_server.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) type msgServer struct { diff --git a/x/superfluid/keeper/params.go b/x/superfluid/keeper/params.go index 950cc7c4104..2d85ebdc008 100644 --- a/x/superfluid/keeper/params.go +++ b/x/superfluid/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) // GetParams returns the total set params diff --git a/x/superfluid/keeper/slash.go b/x/superfluid/keeper/slash.go index 610591e50ac..034503f1eb9 100644 --- a/x/superfluid/keeper/slash.go +++ b/x/superfluid/keeper/slash.go @@ -4,7 +4,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) func (k Keeper) SlashLockupsForUnbondingDelegationSlash(ctx sdk.Context, delAddrStr string, valAddrStr string, slashFactor sdk.Dec) { diff --git a/x/superfluid/keeper/slash_test.go b/x/superfluid/keeper/slash_test.go index 23362df3dcf..f34233b9b16 100644 --- a/x/superfluid/keeper/slash_test.go +++ b/x/superfluid/keeper/slash_test.go @@ -3,9 +3,9 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - appparams "github.com/osmosis-labs/osmosis/app/params" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + appparams "github.com/osmosis-labs/osmosis/v7/app/params" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) func (suite *KeeperTestSuite) TestBeforeValidatorSlashed() { diff --git a/x/superfluid/keeper/stake.go b/x/superfluid/keeper/stake.go index ad996b3a303..ca625bf28b1 100644 --- a/x/superfluid/keeper/stake.go +++ b/x/superfluid/keeper/stake.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" - minttypes "github.com/osmosis-labs/osmosis/x/mint/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) func stakingSuffix(valAddr string) string { diff --git a/x/superfluid/keeper/stake_test.go b/x/superfluid/keeper/stake_test.go index 99c2db97ba3..e50d88e4447 100644 --- a/x/superfluid/keeper/stake_test.go +++ b/x/superfluid/keeper/stake_test.go @@ -6,12 +6,12 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - appparams "github.com/osmosis-labs/osmosis/app/params" - epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" - minttypes "github.com/osmosis-labs/osmosis/x/mint/types" - "github.com/osmosis-labs/osmosis/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + appparams "github.com/osmosis-labs/osmosis/v7/app/params" + epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/superfluid/keeper/superfluid_asset.go b/x/superfluid/keeper/superfluid_asset.go index 9aa488d93fa..916ff63bfad 100644 --- a/x/superfluid/keeper/superfluid_asset.go +++ b/x/superfluid/keeper/superfluid_asset.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) // BeginUnwindSuperfluidAsset starts the deletion process for a superfluid asset. diff --git a/x/superfluid/keeper/superfluid_asset_store.go b/x/superfluid/keeper/superfluid_asset_store.go index 524fcd41bb5..ffed8b898a5 100644 --- a/x/superfluid/keeper/superfluid_asset_store.go +++ b/x/superfluid/keeper/superfluid_asset_store.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) func (k Keeper) SetSuperfluidAsset(ctx sdk.Context, asset types.SuperfluidAsset) { diff --git a/x/superfluid/keeper/superfluid_asset_test.go b/x/superfluid/keeper/superfluid_asset_test.go index 06f23dc450d..3b7999f713f 100644 --- a/x/superfluid/keeper/superfluid_asset_test.go +++ b/x/superfluid/keeper/superfluid_asset_test.go @@ -2,7 +2,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) func (suite *KeeperTestSuite) TestSuperfluidAssetSetGetDeleteFlow() { diff --git a/x/superfluid/keeper/twap_price.go b/x/superfluid/keeper/twap_price.go index 86d875bbfaa..c15b2e0a440 100644 --- a/x/superfluid/keeper/twap_price.go +++ b/x/superfluid/keeper/twap_price.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/proto" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) // This function calculates the osmo equivalent worth of an LP share. diff --git a/x/superfluid/keeper/twap_price_test.go b/x/superfluid/keeper/twap_price_test.go index e52e2842375..5306701973d 100644 --- a/x/superfluid/keeper/twap_price_test.go +++ b/x/superfluid/keeper/twap_price_test.go @@ -2,8 +2,8 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) func (suite *KeeperTestSuite) TestEpochOsmoEquivalentTWAPSetGetDeleteFlow() { diff --git a/x/superfluid/module.go b/x/superfluid/module.go index 54458b39aff..cd76528f7c5 100644 --- a/x/superfluid/module.go +++ b/x/superfluid/module.go @@ -15,11 +15,11 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/osmosis-labs/osmosis/x/mint/client/rest" - "github.com/osmosis-labs/osmosis/x/superfluid/client/cli" - "github.com/osmosis-labs/osmosis/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/x/superfluid/simulation" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/mint/client/rest" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/simulation" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/superfluid/proposal_handler.go b/x/superfluid/proposal_handler.go index b44afaf0635..f9ee5c593aa 100644 --- a/x/superfluid/proposal_handler.go +++ b/x/superfluid/proposal_handler.go @@ -5,8 +5,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) func NewSuperfluidProposalHandler(k keeper.Keeper) govtypes.Handler { diff --git a/x/superfluid/simulation/genesis.go b/x/superfluid/simulation/genesis.go index 4d1fda60545..41645d53836 100644 --- a/x/superfluid/simulation/genesis.go +++ b/x/superfluid/simulation/genesis.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) // RandomizedGenState generates a random GenesisState for staking diff --git a/x/superfluid/simulation/operations.go b/x/superfluid/simulation/operations.go index 84611d9f5e4..f74a44e9512 100644 --- a/x/superfluid/simulation/operations.go +++ b/x/superfluid/simulation/operations.go @@ -4,7 +4,7 @@ import ( "math/rand" "github.com/cosmos/cosmos-sdk/baseapp" - osmo_simulation "github.com/osmosis-labs/osmosis/x/simulation" + osmo_simulation "github.com/osmosis-labs/osmosis/v7/x/simulation" "github.com/cosmos/cosmos-sdk/codec" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" @@ -12,9 +12,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" - "github.com/osmosis-labs/osmosis/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) // Simulation operation weights constants diff --git a/x/superfluid/simulation/proposals.go b/x/superfluid/simulation/proposals.go index 19c1de46697..72d0acc3db4 100644 --- a/x/superfluid/simulation/proposals.go +++ b/x/superfluid/simulation/proposals.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/osmosis-labs/osmosis/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v7/x/superfluid/types" ) const ( diff --git a/x/superfluid/types/expected_keepers.go b/x/superfluid/types/expected_keepers.go index 8db012d5761..77bf369ac99 100644 --- a/x/superfluid/types/expected_keepers.go +++ b/x/superfluid/types/expected_keepers.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types" + epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types" ) // LockupKeeper defines the expected interface needed to retrieve locks diff --git a/x/superfluid/types/genesis.pb.go b/x/superfluid/types/genesis.pb.go index 063df4fa111..765c5a39e96 100644 --- a/x/superfluid/types/genesis.pb.go +++ b/x/superfluid/types/genesis.pb.go @@ -99,29 +99,29 @@ func init() { func init() { proto.RegisterFile("osmosis/superfluid/genesis.proto", fileDescriptor_d5256ebb7c83fff3) } var fileDescriptor_d5256ebb7c83fff3 = []byte{ - // 342 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x41, 0x4b, 0x02, 0x41, - 0x14, 0xc7, 0x77, 0x55, 0x3c, 0xac, 0x1d, 0x6a, 0x30, 0x58, 0x3c, 0xac, 0x92, 0x17, 0x21, 0xda, - 0x25, 0xbb, 0x74, 0x55, 0x90, 0x08, 0x82, 0x44, 0xa3, 0xa0, 0xcb, 0x32, 0x8e, 0xd3, 0x3a, 0xb0, - 0xbb, 0x33, 0xcd, 0x9b, 0xad, 0xfc, 0x16, 0x7d, 0x2c, 0x8f, 0x1e, 0x3b, 0x45, 0xe8, 0x07, 0xe8, - 0x2b, 0xc4, 0xee, 0x8e, 0x69, 0xb8, 0x74, 0x7b, 0x33, 0xef, 0xf7, 0x7e, 0xff, 0x07, 0xcf, 0x6a, - 0x71, 0x88, 0x38, 0x30, 0xf0, 0x20, 0x11, 0x54, 0x3e, 0x85, 0x09, 0x9b, 0x7a, 0x01, 0x8d, 0x29, - 0x30, 0x70, 0x85, 0xe4, 0x8a, 0x23, 0xa4, 0x09, 0x77, 0x4b, 0x34, 0xea, 0x01, 0x0f, 0x78, 0xd6, - 0xf6, 0xd2, 0x2a, 0x27, 0x1b, 0xed, 0x02, 0xd7, 0xb6, 0xd4, 0x50, 0xb3, 0x00, 0x12, 0x58, 0xe2, - 0x48, 0xe7, 0x9d, 0x7c, 0x97, 0xac, 0x83, 0xab, 0x7c, 0x83, 0xb1, 0xc2, 0x8a, 0xa2, 0x4b, 0xab, - 0x9a, 0x03, 0xb6, 0xd9, 0x32, 0x3b, 0xb5, 0x6e, 0xc3, 0xdd, 0xdf, 0xc8, 0x1d, 0x66, 0x44, 0xbf, - 0xb2, 0xf8, 0x6c, 0x1a, 0x23, 0xcd, 0xa3, 0x7b, 0xeb, 0x68, 0x8b, 0xf8, 0x18, 0x80, 0x2a, 0xb0, - 0x4b, 0xad, 0x72, 0xa7, 0xd6, 0x6d, 0x17, 0x49, 0xc6, 0xbf, 0x65, 0x2f, 0x65, 0xb5, 0xed, 0x10, - 0xfe, 0x7e, 0x03, 0xf2, 0x2d, 0xa4, 0x5e, 0xb1, 0xf0, 0x85, 0x64, 0x84, 0xfa, 0x92, 0x12, 0x2e, - 0xa7, 0x60, 0x97, 0x33, 0xf1, 0x69, 0x91, 0x78, 0x20, 0x38, 0x99, 0xdd, 0x42, 0xc4, 0x07, 0xcf, - 0x09, 0x7b, 0xc1, 0x21, 0x8d, 0xd5, 0xdd, 0x43, 0x6f, 0xb8, 0x09, 0x48, 0x65, 0xc3, 0xd4, 0x35, - 0xca, 0x55, 0x28, 0xb4, 0x8e, 0x59, 0xac, 0xa8, 0x8c, 0xe8, 0x94, 0x61, 0x39, 0xf7, 0x31, 0x21, - 0x3c, 0x89, 0x15, 0xd8, 0x95, 0x2c, 0xe3, 0xfc, 0xff, 0xe5, 0xaf, 0x77, 0x46, 0x7b, 0xf9, 0xa4, - 0x4e, 0xaa, 0xb3, 0xfd, 0x16, 0xf4, 0x6f, 0x16, 0x2b, 0xc7, 0x5c, 0xae, 0x1c, 0xf3, 0x6b, 0xe5, - 0x98, 0xef, 0x6b, 0xc7, 0x58, 0xae, 0x1d, 0xe3, 0x63, 0xed, 0x18, 0x8f, 0xdd, 0x80, 0xa9, 0x59, - 0x32, 0x71, 0x09, 0x8f, 0x3c, 0x1d, 0x79, 0x16, 0xe2, 0x09, 0x6c, 0x1e, 0xde, 0xdb, 0xee, 0x19, - 0xd5, 0x5c, 0x50, 0x98, 0x54, 0xb3, 0x33, 0x5e, 0xfc, 0x04, 0x00, 0x00, 0xff, 0xff, 0xa0, 0xb1, - 0x37, 0xad, 0x5a, 0x02, 0x00, 0x00, + // 346 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xc1, 0x6a, 0xf2, 0x40, + 0x10, 0xc7, 0x13, 0x15, 0x0f, 0xf1, 0x3b, 0x7c, 0x5d, 0x2c, 0x04, 0x0f, 0x51, 0xea, 0x45, 0x28, + 0x4d, 0xa8, 0xa5, 0xb4, 0x57, 0x05, 0x29, 0x3d, 0x29, 0x5a, 0x5a, 0xe8, 0x25, 0xac, 0x71, 0x1b, + 0x17, 0x92, 0xec, 0x76, 0x67, 0x63, 0xeb, 0x5b, 0xf4, 0xb1, 0x3c, 0x7a, 0xec, 0xa9, 0x14, 0x7d, + 0x80, 0xbe, 0x42, 0x49, 0xb2, 0x36, 0x16, 0x43, 0x6f, 0xb3, 0x3b, 0xbf, 0xf9, 0xfd, 0x07, 0xc6, + 0x68, 0x31, 0x08, 0x19, 0x50, 0x70, 0x20, 0xe6, 0x44, 0x3c, 0x05, 0x31, 0x9d, 0x39, 0x3e, 0x89, + 0x08, 0x50, 0xb0, 0xb9, 0x60, 0x92, 0x21, 0xa4, 0x08, 0x3b, 0x27, 0x1a, 0x75, 0x9f, 0xf9, 0x2c, + 0x6d, 0x3b, 0x49, 0x95, 0x91, 0x8d, 0x76, 0x81, 0x2b, 0x2f, 0x15, 0xd4, 0x2c, 0x80, 0x38, 0x16, + 0x38, 0x54, 0x79, 0x27, 0x5f, 0x25, 0xe3, 0xdf, 0x4d, 0xb6, 0xc1, 0x44, 0x62, 0x49, 0xd0, 0xb5, + 0x51, 0xcd, 0x00, 0x53, 0x6f, 0xe9, 0x9d, 0x5a, 0xb7, 0x61, 0x1f, 0x6e, 0x64, 0x8f, 0x52, 0xa2, + 0x5f, 0x59, 0x7d, 0x34, 0xb5, 0xb1, 0xe2, 0xd1, 0xbd, 0x71, 0x94, 0x23, 0x2e, 0x06, 0x20, 0x12, + 0xcc, 0x52, 0xab, 0xdc, 0xa9, 0x75, 0xdb, 0x45, 0x92, 0xc9, 0x4f, 0xd9, 0x4b, 0x58, 0x65, 0xfb, + 0x0f, 0xbf, 0xbf, 0x01, 0xb9, 0x06, 0x92, 0x2f, 0x98, 0xbb, 0x5c, 0x50, 0x8f, 0xb8, 0x82, 0x78, + 0x4c, 0xcc, 0xc0, 0x2c, 0xa7, 0xe2, 0xd3, 0x22, 0xf1, 0x80, 0x33, 0x6f, 0x3e, 0x84, 0x90, 0x0d, + 0x9e, 0x63, 0xba, 0xc0, 0x01, 0x89, 0xe4, 0xdd, 0x43, 0x6f, 0xb4, 0x0b, 0x48, 0x64, 0xa3, 0xc4, + 0x35, 0xce, 0x54, 0x28, 0x30, 0x8e, 0x69, 0x24, 0x89, 0x08, 0xc9, 0x8c, 0x62, 0xb1, 0x74, 0xb1, + 0xe7, 0xb1, 0x38, 0x92, 0x60, 0x56, 0xd2, 0x8c, 0xf3, 0xbf, 0x97, 0xbf, 0xdd, 0x1b, 0xed, 0x65, + 0x93, 0x2a, 0xa9, 0x4e, 0x0f, 0x5b, 0xd0, 0x1f, 0xae, 0x36, 0x96, 0xbe, 0xde, 0x58, 0xfa, 0xe7, + 0xc6, 0xd2, 0xdf, 0xb6, 0x96, 0xb6, 0xde, 0x5a, 0xda, 0xfb, 0xd6, 0xd2, 0x1e, 0x2f, 0x7d, 0x2a, + 0xe7, 0xf1, 0xd4, 0xf6, 0x58, 0xe8, 0xa8, 0xc8, 0xb3, 0x00, 0x4f, 0x61, 0xf7, 0x70, 0x16, 0x57, + 0xce, 0xeb, 0xfe, 0x25, 0xe5, 0x92, 0x13, 0x98, 0x56, 0xd3, 0x4b, 0x5e, 0x7c, 0x07, 0x00, 0x00, + 0xff, 0xff, 0xf7, 0xce, 0x41, 0x6b, 0x5d, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/superfluid/types/gov.go b/x/superfluid/types/gov.go index 468fa813d38..4255c203dd1 100644 --- a/x/superfluid/types/gov.go +++ b/x/superfluid/types/gov.go @@ -5,7 +5,7 @@ import ( "strings" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) const ( diff --git a/x/superfluid/types/gov.pb.go b/x/superfluid/types/gov.pb.go index 2f9a0935200..42acb8bf051 100644 --- a/x/superfluid/types/gov.pb.go +++ b/x/superfluid/types/gov.pb.go @@ -111,7 +111,7 @@ func init() { func init() { proto.RegisterFile("osmosis/superfluid/gov.proto", fileDescriptor_7c729e4c39568a58) } var fileDescriptor_7c729e4c39568a58 = []byte{ - // 305 bytes of a gzipped FileDescriptorProto + // 308 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0xc9, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0x2e, 0x2d, 0x48, 0x2d, 0x4a, 0xcb, 0x29, 0xcd, 0x4c, 0xd1, 0x4f, 0xcf, 0x2f, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x82, 0xca, 0xea, 0x21, 0x64, 0xf5, @@ -126,12 +126,12 @@ var fileDescriptor_7c729e4c39568a58 = []byte{ 0xcc, 0x58, 0x20, 0xcf, 0xf0, 0x62, 0x81, 0x3c, 0xa3, 0xd2, 0x3c, 0x46, 0x2e, 0xb9, 0xa0, 0xd4, 0xdc, 0xfc, 0xb2, 0x54, 0xaa, 0xbb, 0xd5, 0x8c, 0x4b, 0x1c, 0xe1, 0xa8, 0x78, 0xb0, 0xed, 0xf1, 0x29, 0xa9, 0x79, 0xf9, 0xb9, 0x10, 0xc7, 0x73, 0x06, 0x89, 0x16, 0xa3, 0x5a, 0xe9, 0x02, 0x96, - 0x44, 0x75, 0xa0, 0x93, 0xcf, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, - 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x19, - 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0x43, 0x41, 0x37, 0x27, - 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0xaf, 0x40, 0x8e, 0xa2, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, - 0x70, 0xf4, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xea, 0x71, 0xc7, 0xd5, 0x15, 0x02, 0x00, - 0x00, + 0x44, 0x75, 0xa0, 0x93, 0xff, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, + 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x99, + 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0x43, 0x41, 0x37, 0x27, + 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, 0x33, 0xd7, 0xaf, 0x40, 0x8e, 0xa5, 0x92, 0xca, 0x82, 0xd4, + 0xe2, 0x24, 0x36, 0x70, 0x0c, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xcb, 0xe3, 0x0b, 0x60, + 0x18, 0x02, 0x00, 0x00, } func (this *SetSuperfluidAssetsProposal) Equal(that interface{}) bool { diff --git a/x/superfluid/types/params.go b/x/superfluid/types/params.go index 9251322dab7..a5f8b5277d5 100644 --- a/x/superfluid/types/params.go +++ b/x/superfluid/types/params.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" + epochtypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types" ) // Parameter store keys diff --git a/x/superfluid/types/params.pb.go b/x/superfluid/types/params.pb.go index c2456830e5f..4813f09fb9b 100644 --- a/x/superfluid/types/params.pb.go +++ b/x/superfluid/types/params.pb.go @@ -93,30 +93,30 @@ func init() { func init() { proto.RegisterFile("osmosis/superfluid/params.proto", fileDescriptor_0985261dfaf2a82e) } var fileDescriptor_0985261dfaf2a82e = []byte{ - // 361 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xcd, 0x4a, 0xeb, 0x40, - 0x14, 0xc7, 0x93, 0x5e, 0x28, 0xdc, 0xdc, 0x55, 0x73, 0x2f, 0x97, 0xb4, 0x8b, 0x4c, 0x89, 0x28, - 0xdd, 0x34, 0x03, 0x75, 0xe7, 0xb2, 0x54, 0x41, 0xe8, 0x42, 0xb2, 0x14, 0x24, 0xe4, 0x63, 0x92, - 0x0e, 0xcd, 0xe4, 0x84, 0x99, 0x0c, 0x58, 0xf0, 0x21, 0x5c, 0xfa, 0x48, 0x5d, 0x76, 0x25, 0xe2, - 0x22, 0x4a, 0xfb, 0x06, 0x7d, 0x02, 0xe9, 0x24, 0xad, 0x05, 0x75, 0x35, 0x73, 0xce, 0xef, 0x3f, - 0xff, 0x39, 0x1f, 0x06, 0x02, 0xc1, 0x40, 0x50, 0x81, 0x85, 0x2c, 0x08, 0x4f, 0x32, 0x49, 0x63, - 0x5c, 0x04, 0x3c, 0x60, 0xc2, 0x2d, 0x38, 0x94, 0x60, 0x9a, 0x8d, 0xc0, 0xfd, 0x14, 0xf4, 0xfe, - 0xa5, 0x90, 0x82, 0xc2, 0x78, 0x77, 0xab, 0x95, 0x3d, 0x3b, 0x05, 0x48, 0x33, 0x82, 0x55, 0x14, - 0xca, 0x04, 0xc7, 0x92, 0x07, 0x25, 0x85, 0xbc, 0xe6, 0xce, 0x73, 0xcb, 0x68, 0xdf, 0x28, 0x6b, - 0xf3, 0xce, 0xb0, 0x38, 0x49, 0x38, 0x11, 0x33, 0x9f, 0x14, 0x10, 0xcd, 0x7c, 0x1a, 0x93, 0xbc, - 0xa4, 0x09, 0x25, 0xdc, 0xd2, 0xfb, 0xfa, 0xe0, 0xf7, 0xf8, 0x64, 0x5b, 0x21, 0xb4, 0x08, 0x58, - 0x76, 0xe1, 0xfc, 0xa4, 0x74, 0xbc, 0xff, 0x0d, 0xba, 0xdc, 0x91, 0xeb, 0x03, 0x30, 0x1f, 0x8c, - 0xbf, 0x8c, 0xe6, 0x94, 0x49, 0xe6, 0x73, 0x2a, 0xe6, 0x7e, 0x12, 0x44, 0x25, 0x70, 0xab, 0xa5, - 0x9c, 0xa7, 0xcb, 0x0a, 0x69, 0xaf, 0x15, 0x3a, 0x4b, 0x69, 0x39, 0x93, 0xa1, 0x1b, 0x01, 0xc3, - 0x91, 0x6a, 0xb2, 0x39, 0x86, 0x22, 0x9e, 0xe3, 0x72, 0x51, 0x10, 0xe1, 0x4e, 0x48, 0xb4, 0xad, - 0x50, 0xaf, 0xae, 0xe3, 0x1b, 0x4b, 0xc7, 0xeb, 0x34, 0x59, 0x8f, 0x8a, 0xf9, 0x95, 0xca, 0x99, - 0x60, 0x98, 0x32, 0x0f, 0x21, 0x8f, 0x69, 0x9e, 0xfa, 0xfb, 0x19, 0x58, 0xbf, 0xfa, 0xfa, 0xe0, - 0xcf, 0xa8, 0xeb, 0xd6, 0x43, 0x72, 0xf7, 0x43, 0x72, 0x27, 0x8d, 0x60, 0x7c, 0xba, 0xab, 0x6b, - 0x5b, 0xa1, 0x6e, 0xfd, 0xdb, 0x57, 0x0b, 0xe7, 0xe9, 0x0d, 0xe9, 0x5e, 0xe7, 0x00, 0x0e, 0x2f, - 0xa7, 0xcb, 0xb5, 0xad, 0xaf, 0xd6, 0xb6, 0xfe, 0xbe, 0xb6, 0xf5, 0xc7, 0x8d, 0xad, 0xad, 0x36, - 0xb6, 0xf6, 0xb2, 0xb1, 0xb5, 0xdb, 0xd1, 0x51, 0x8f, 0xcd, 0x1e, 0x87, 0x59, 0x10, 0x8a, 0x7d, - 0x80, 0xef, 0x8f, 0xf7, 0xae, 0x7a, 0x0e, 0xdb, 0xaa, 0xb4, 0xf3, 0x8f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x68, 0x84, 0x07, 0xd8, 0x1a, 0x02, 0x00, 0x00, + // 363 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xcd, 0x4a, 0xf3, 0x40, + 0x14, 0x86, 0x93, 0x7e, 0x50, 0xf8, 0xe2, 0xaa, 0x51, 0x24, 0xed, 0x22, 0x53, 0x22, 0x4a, 0x37, + 0xcd, 0x80, 0x22, 0x82, 0xcb, 0x52, 0x05, 0x41, 0x50, 0xb2, 0x14, 0x24, 0xe4, 0x67, 0x92, 0x0e, + 0x4d, 0x72, 0xc2, 0x4c, 0x46, 0x2c, 0x78, 0x11, 0x2e, 0xbd, 0xa4, 0x2e, 0xbb, 0x12, 0x71, 0x11, + 0xa5, 0xbd, 0x83, 0x5e, 0x81, 0x74, 0x92, 0xd6, 0x82, 0xba, 0x9a, 0x39, 0xe7, 0x79, 0xe7, 0x9d, + 0xf3, 0xa3, 0x21, 0xe0, 0x29, 0x70, 0xca, 0x31, 0x17, 0x39, 0x61, 0x51, 0x22, 0x68, 0x88, 0x73, + 0x8f, 0x79, 0x29, 0xb7, 0x73, 0x06, 0x05, 0xe8, 0x7a, 0x2d, 0xb0, 0xbf, 0x05, 0x9d, 0xbd, 0x18, + 0x62, 0x90, 0x18, 0xaf, 0x6e, 0x95, 0xb2, 0x63, 0xc6, 0x00, 0x71, 0x42, 0xb0, 0x8c, 0x7c, 0x11, + 0xe1, 0x50, 0x30, 0xaf, 0xa0, 0x90, 0x55, 0xdc, 0x7a, 0x6d, 0x68, 0xcd, 0x5b, 0x69, 0xad, 0xdf, + 0x6b, 0x06, 0x23, 0x11, 0x23, 0x7c, 0xe4, 0x92, 0x1c, 0x82, 0x91, 0x4b, 0x43, 0x92, 0x15, 0x34, + 0xa2, 0x84, 0x19, 0x6a, 0x57, 0xed, 0xfd, 0x1f, 0x1c, 0x2c, 0x4b, 0x84, 0x26, 0x5e, 0x9a, 0x9c, + 0x5b, 0x7f, 0x29, 0x2d, 0x67, 0xbf, 0x46, 0x17, 0x2b, 0x72, 0xb5, 0x01, 0xfa, 0x93, 0xb6, 0x9b, + 0xd2, 0x8c, 0xa6, 0x22, 0x75, 0x19, 0xe5, 0x63, 0x37, 0xf2, 0x82, 0x02, 0x98, 0xd1, 0x90, 0xce, + 0xd7, 0xd3, 0x12, 0x29, 0xef, 0x25, 0x3a, 0x8a, 0x69, 0x31, 0x12, 0xbe, 0x1d, 0x40, 0x8a, 0x03, + 0xd9, 0x64, 0x7d, 0xf4, 0x79, 0x38, 0xc6, 0xc5, 0x24, 0x27, 0xdc, 0x1e, 0x92, 0x60, 0x59, 0xa2, + 0x4e, 0x55, 0xc7, 0x2f, 0x96, 0x96, 0xd3, 0xaa, 0xb3, 0x0e, 0xe5, 0xe3, 0x4b, 0x99, 0xd3, 0x41, + 0xd3, 0x45, 0xe6, 0x43, 0x16, 0xd2, 0x2c, 0x76, 0xd7, 0x33, 0x30, 0xfe, 0x75, 0xd5, 0xde, 0xce, + 0x71, 0xdb, 0xae, 0x86, 0x64, 0xaf, 0x87, 0x64, 0x0f, 0x6b, 0xc1, 0xe0, 0x70, 0x55, 0xd7, 0xb2, + 0x44, 0xed, 0xea, 0xb7, 0x9f, 0x16, 0xd6, 0xcb, 0x07, 0x52, 0x9d, 0xd6, 0x06, 0x6c, 0x5e, 0xde, + 0x4c, 0xe7, 0xa6, 0x3a, 0x9b, 0x9b, 0xea, 0xe7, 0xdc, 0x54, 0x9f, 0x17, 0xa6, 0x32, 0x5b, 0x98, + 0xca, 0xdb, 0xc2, 0x54, 0xee, 0x4e, 0xb7, 0x7a, 0xac, 0xf7, 0xd8, 0x4f, 0x3c, 0x9f, 0xaf, 0x03, + 0xfc, 0x70, 0x86, 0x1f, 0xb7, 0x57, 0x2f, 0xdb, 0xf6, 0x9b, 0xb2, 0xba, 0x93, 0xaf, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x60, 0xfb, 0x15, 0x70, 0x1d, 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/superfluid/types/query.pb.go b/x/superfluid/types/query.pb.go index 8506d932a10..8cd7e8367f1 100644 --- a/x/superfluid/types/query.pb.go +++ b/x/superfluid/types/query.pb.go @@ -558,57 +558,57 @@ func init() { func init() { proto.RegisterFile("osmosis/superfluid/query.proto", fileDescriptor_e3d9448e4ed3943f) } var fileDescriptor_e3d9448e4ed3943f = []byte{ - // 794 bytes of a gzipped FileDescriptorProto + // 796 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x4f, 0xdb, 0x48, 0x14, 0x8e, 0x21, 0x24, 0x30, 0x48, 0x2b, 0x18, 0x21, 0x91, 0x8d, 0x90, 0x61, 0x0d, 0x0b, 0xd1, - 0xae, 0xd6, 0x5e, 0x82, 0x58, 0xf6, 0xd2, 0x56, 0xa1, 0x85, 0x2a, 0x12, 0x12, 0x34, 0x45, 0x45, - 0x6a, 0x0f, 0xd1, 0xc4, 0x1e, 0x8c, 0x55, 0xc7, 0x63, 0x3c, 0xe3, 0xa4, 0x11, 0xe2, 0xd2, 0x53, - 0x7b, 0x43, 0xea, 0x5f, 0x54, 0xf5, 0xc2, 0x11, 0xa9, 0x97, 0x9e, 0x68, 0x05, 0xfd, 0x43, 0x2a, - 0x8f, 0xc7, 0xb1, 0x49, 0x1d, 0x03, 0xbd, 0xcd, 0xf8, 0xfd, 0xfa, 0xbe, 0x6f, 0xde, 0x7b, 0x06, - 0x32, 0xa1, 0x6d, 0x42, 0x2d, 0xaa, 0x51, 0xdf, 0xc5, 0xde, 0xa1, 0xed, 0x5b, 0x86, 0x76, 0xec, - 0x63, 0xaf, 0xa7, 0xba, 0x1e, 0x61, 0x04, 0x42, 0x61, 0x57, 0x63, 0x7b, 0x79, 0xc6, 0x24, 0x26, - 0xe1, 0x66, 0x2d, 0x38, 0x85, 0x9e, 0x65, 0x59, 0xe7, 0xae, 0x5a, 0x0b, 0x51, 0xac, 0x75, 0x56, - 0x5b, 0x98, 0xa1, 0x55, 0x4d, 0x27, 0x96, 0x23, 0xec, 0x73, 0x26, 0x21, 0xa6, 0x8d, 0x35, 0xe4, - 0x5a, 0x1a, 0x72, 0x1c, 0xc2, 0x10, 0xb3, 0x88, 0x43, 0x85, 0x75, 0x5e, 0x58, 0xf9, 0xad, 0xe5, - 0x1f, 0x6a, 0xcc, 0x6a, 0x63, 0xca, 0x50, 0xdb, 0x8d, 0xd2, 0x0f, 0x3a, 0x18, 0xbe, 0xc7, 0x33, - 0x08, 0xfb, 0x62, 0x0a, 0x91, 0xf8, 0x28, 0x9c, 0xfe, 0x4a, 0x62, 0xe4, 0x34, 0xfb, 0x48, 0x5d, - 0x64, 0x5a, 0x4e, 0x22, 0xa1, 0x52, 0x01, 0x53, 0x35, 0x4a, 0x31, 0xdb, 0xef, 0xb9, 0xb8, 0x81, - 0x8f, 0x7d, 0x4c, 0x19, 0x9c, 0x01, 0x63, 0x06, 0x76, 0x48, 0xbb, 0x24, 0x2d, 0x48, 0x95, 0x89, - 0x46, 0x78, 0x51, 0x5e, 0x81, 0xe9, 0x84, 0x27, 0x75, 0x89, 0x43, 0x31, 0xdc, 0x06, 0x00, 0x05, - 0x1f, 0x9b, 0xac, 0xe7, 0x62, 0xee, 0xff, 0x5b, 0x75, 0x45, 0xfd, 0x59, 0x4d, 0xf5, 0x79, 0xff, - 0x18, 0x27, 0x99, 0x40, 0xd1, 0x51, 0x81, 0x60, 0xaa, 0x66, 0xdb, 0xdc, 0x44, 0x05, 0x0c, 0xe5, - 0x05, 0x98, 0x4e, 0x7c, 0x13, 0x05, 0x6b, 0xa0, 0xc0, 0xa3, 0x68, 0x49, 0x5a, 0x18, 0xad, 0x4c, - 0x56, 0x17, 0xef, 0x50, 0x6c, 0x33, 0x7f, 0x7e, 0x39, 0x9f, 0x6b, 0x88, 0xc0, 0x98, 0x72, 0x17, - 0xb9, 0xd9, 0x94, 0xf7, 0x23, 0xca, 0xdc, 0x53, 0x20, 0x78, 0x04, 0xf2, 0xac, 0x8b, 0x5c, 0xee, - 0x39, 0x59, 0xfd, 0x3b, 0xad, 0xfe, 0x96, 0x4b, 0xf4, 0xa3, 0x5d, 0xda, 0x26, 0x5b, 0xc7, 0xbe, - 0xd5, 0x41, 0x36, 0x76, 0xd8, 0xfe, 0x41, 0x6d, 0xaf, 0xc1, 0x03, 0x95, 0xf7, 0x12, 0xf8, 0x23, - 0x46, 0x58, 0x77, 0x18, 0xf6, 0xda, 0xd8, 0xb0, 0x90, 0xd7, 0xab, 0xe9, 0x3a, 0xf1, 0x1d, 0x56, - 0x77, 0x0e, 0x49, 0x3a, 0x22, 0xf8, 0x3b, 0x18, 0xef, 0x20, 0xbb, 0x89, 0x0c, 0xc3, 0x2b, 0x8d, - 0x70, 0x43, 0xb1, 0x83, 0xec, 0x9a, 0x61, 0x78, 0x81, 0xc9, 0x44, 0xbe, 0x89, 0x9b, 0x96, 0x51, - 0x1a, 0x5d, 0x90, 0x2a, 0xf9, 0x46, 0x91, 0xdf, 0xeb, 0x06, 0x2c, 0x81, 0x62, 0x10, 0x81, 0x29, - 0x2d, 0xe5, 0xc3, 0x20, 0x71, 0x55, 0x8e, 0x80, 0x5c, 0xb3, 0xed, 0x14, 0x0c, 0xd1, 0x2b, 0x04, - 0x2f, 0x1c, 0x37, 0x8d, 0x20, 0xbd, 0xac, 0x86, 0x1d, 0xa6, 0x06, 0x1d, 0xa6, 0x86, 0x83, 0x24, - 0x3a, 0x4c, 0xdd, 0x43, 0x66, 0xd4, 0x48, 0x8d, 0x44, 0xa4, 0xf2, 0x49, 0x02, 0xf3, 0x43, 0x4b, - 0x09, 0x69, 0x0f, 0xc0, 0x38, 0x12, 0xdf, 0xc4, 0xf3, 0xae, 0x67, 0x3f, 0xef, 0x10, 0xf1, 0xc4, - 0x83, 0xf7, 0x93, 0xc1, 0xa7, 0x37, 0x48, 0x8c, 0x70, 0x12, 0x2b, 0xb7, 0x92, 0x08, 0x51, 0xdd, - 0x60, 0xf1, 0x10, 0x2c, 0x3e, 0x26, 0x8e, 0x83, 0x75, 0x86, 0xd3, 0x8a, 0x47, 0xa2, 0xcd, 0x82, - 0xa2, 0x4d, 0xf4, 0xd7, 0xc1, 0x53, 0x48, 0xfc, 0x29, 0x0a, 0xc1, 0xb5, 0x6e, 0x28, 0x5d, 0xb0, - 0x94, 0x1d, 0x2f, 0x94, 0xd8, 0x05, 0x45, 0x01, 0x5e, 0x48, 0xfe, 0x6b, 0x42, 0x34, 0xa2, 0x2c, - 0xd5, 0xcb, 0x02, 0x18, 0x7b, 0x16, 0x70, 0x84, 0x67, 0x12, 0x98, 0xe8, 0xcf, 0x20, 0x5c, 0x4a, - 0xcb, 0x3b, 0xb8, 0x11, 0xca, 0x7f, 0xde, 0xe2, 0x15, 0xa2, 0x56, 0xfe, 0x7b, 0xfb, 0xf9, 0xfb, - 0x87, 0x91, 0x7f, 0xa1, 0xaa, 0xa5, 0xac, 0xa9, 0x68, 0x05, 0xc5, 0xfb, 0x42, 0x3b, 0xe1, 0x4d, - 0x7d, 0x0a, 0xdf, 0x05, 0x90, 0xa2, 0x51, 0x1f, 0x02, 0x69, 0x60, 0x3b, 0x0c, 0x81, 0x34, 0xb8, - 0x2f, 0x14, 0x95, 0x43, 0xaa, 0xc0, 0xe5, 0x4c, 0x48, 0xb6, 0xdd, 0x0c, 0x97, 0x43, 0x42, 0x9d, - 0x2e, 0x72, 0xb3, 0xd4, 0x89, 0x97, 0x47, 0x96, 0x3a, 0x89, 0xc5, 0x71, 0x2f, 0x75, 0xba, 0xc8, - 0xed, 0xab, 0xf3, 0x51, 0x02, 0xb3, 0x43, 0x26, 0x07, 0x56, 0x87, 0xa8, 0x90, 0x31, 0xd1, 0xe5, - 0xb5, 0x7b, 0xc5, 0x08, 0xf0, 0x0f, 0x38, 0xf8, 0x0d, 0xb8, 0x7e, 0x9b, 0x8e, 0x56, 0x22, 0x4b, - 0xb3, 0x3f, 0x80, 0x5f, 0x25, 0x30, 0x97, 0xd5, 0xf8, 0x70, 0x23, 0x0d, 0xd4, 0x1d, 0x46, 0xad, - 0xfc, 0xff, 0xfd, 0x03, 0x05, 0xa5, 0x1d, 0x4e, 0x69, 0x1b, 0x3e, 0xc9, 0xa2, 0xa4, 0x47, 0x99, - 0x52, 0x89, 0x69, 0x27, 0x62, 0xcc, 0x4f, 0x37, 0x77, 0xce, 0xaf, 0x64, 0xe9, 0xe2, 0x4a, 0x96, - 0xbe, 0x5d, 0xc9, 0xd2, 0xd9, 0xb5, 0x9c, 0xbb, 0xb8, 0x96, 0x73, 0x5f, 0xae, 0xe5, 0xdc, 0xcb, - 0xaa, 0x69, 0xb1, 0x23, 0xbf, 0xa5, 0xea, 0xa4, 0x1d, 0x55, 0xfa, 0xc7, 0x46, 0x2d, 0xda, 0x2f, - 0xfb, 0x26, 0x59, 0x38, 0x18, 0x0c, 0xda, 0x2a, 0xf0, 0xbf, 0xf3, 0xda, 0x8f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x60, 0xdb, 0xa2, 0x40, 0xb9, 0x08, 0x00, 0x00, + 0xae, 0xd6, 0x5e, 0x82, 0x28, 0xbd, 0xb4, 0x55, 0x68, 0xa1, 0x8a, 0x54, 0x09, 0x9a, 0xa2, 0x22, + 0xb5, 0x87, 0x68, 0x62, 0x0f, 0xc6, 0xaa, 0xe3, 0x31, 0x9e, 0x71, 0xd2, 0x08, 0x71, 0xe9, 0xa9, + 0xbd, 0x21, 0xf5, 0x2f, 0xaa, 0x7a, 0xe1, 0x88, 0xd4, 0x4b, 0x4f, 0xb4, 0x82, 0xfe, 0x21, 0x95, + 0xc7, 0xe3, 0xd8, 0xa4, 0x8e, 0x81, 0xde, 0x66, 0xfc, 0x7e, 0x7d, 0xdf, 0x37, 0xef, 0x3d, 0x03, + 0x99, 0xd0, 0x36, 0xa1, 0x16, 0xd5, 0xa8, 0xef, 0x62, 0xef, 0xc0, 0xf6, 0x2d, 0x43, 0x3b, 0xf2, + 0xb1, 0xd7, 0x53, 0x5d, 0x8f, 0x30, 0x02, 0xa1, 0xb0, 0xab, 0xb1, 0xbd, 0x3c, 0x63, 0x12, 0x93, + 0x70, 0xb3, 0x16, 0x9c, 0x42, 0xcf, 0xb2, 0xac, 0x73, 0x57, 0xad, 0x85, 0x28, 0xd6, 0x3a, 0xab, + 0x2d, 0xcc, 0xd0, 0xaa, 0xa6, 0x13, 0xcb, 0x11, 0xf6, 0x39, 0x93, 0x10, 0xd3, 0xc6, 0x1a, 0x72, + 0x2d, 0x0d, 0x39, 0x0e, 0x61, 0x88, 0x59, 0xc4, 0xa1, 0xc2, 0x3a, 0x2f, 0xac, 0xfc, 0xd6, 0xf2, + 0x0f, 0x34, 0x66, 0xb5, 0x31, 0x65, 0xa8, 0xed, 0x46, 0xe9, 0x07, 0x1d, 0x0c, 0xdf, 0xe3, 0x19, + 0x84, 0x7d, 0x31, 0x85, 0x48, 0x7c, 0x14, 0x4e, 0xff, 0x24, 0x31, 0x72, 0x9a, 0x7d, 0xa4, 0x2e, + 0x32, 0x2d, 0x27, 0x91, 0x50, 0xa9, 0x80, 0xa9, 0x1a, 0xa5, 0x98, 0xed, 0xf5, 0x5c, 0xdc, 0xc0, + 0x47, 0x3e, 0xa6, 0x0c, 0xce, 0x80, 0x31, 0x03, 0x3b, 0xa4, 0x5d, 0x92, 0x16, 0xa4, 0xca, 0x44, + 0x23, 0xbc, 0x28, 0xaf, 0xc1, 0x74, 0xc2, 0x93, 0xba, 0xc4, 0xa1, 0x18, 0x6e, 0x03, 0x80, 0x82, + 0x8f, 0x4d, 0xd6, 0x73, 0x31, 0xf7, 0xff, 0xa3, 0xba, 0xa2, 0xfe, 0xaa, 0xa6, 0xfa, 0xa2, 0x7f, + 0x8c, 0x93, 0x4c, 0xa0, 0xe8, 0xa8, 0x40, 0x30, 0x55, 0xb3, 0x6d, 0x6e, 0xa2, 0x02, 0x86, 0xf2, + 0x12, 0x4c, 0x27, 0xbe, 0x89, 0x82, 0x35, 0x50, 0xe0, 0x51, 0xb4, 0x24, 0x2d, 0x8c, 0x56, 0x26, + 0xab, 0x8b, 0xb7, 0x28, 0xb6, 0x99, 0x3f, 0xbb, 0x98, 0xcf, 0x35, 0x44, 0x60, 0x4c, 0xb9, 0x8b, + 0xdc, 0x6c, 0xca, 0x7b, 0x11, 0x65, 0xee, 0x29, 0x10, 0x3c, 0x02, 0x79, 0xd6, 0x45, 0x2e, 0xf7, + 0x9c, 0xac, 0xfe, 0x9b, 0x56, 0x7f, 0xcb, 0x25, 0xfa, 0xe1, 0x0e, 0x6d, 0x93, 0xad, 0x23, 0xdf, + 0xea, 0x20, 0x1b, 0x3b, 0x6c, 0x6f, 0xbf, 0xb6, 0xdb, 0xe0, 0x81, 0xca, 0x07, 0x09, 0xfc, 0x15, + 0x23, 0xac, 0x3b, 0x0c, 0x7b, 0x6d, 0x6c, 0x58, 0xc8, 0xeb, 0xd5, 0x74, 0x9d, 0xf8, 0x0e, 0xab, + 0x3b, 0x07, 0x24, 0x1d, 0x11, 0xfc, 0x13, 0x8c, 0x77, 0x90, 0xdd, 0x44, 0x86, 0xe1, 0x95, 0x46, + 0xb8, 0xa1, 0xd8, 0x41, 0x76, 0xcd, 0x30, 0xbc, 0xc0, 0x64, 0x22, 0xdf, 0xc4, 0x4d, 0xcb, 0x28, + 0x8d, 0x2e, 0x48, 0x95, 0x7c, 0xa3, 0xc8, 0xef, 0x75, 0x03, 0x96, 0x40, 0x31, 0x88, 0xc0, 0x94, + 0x96, 0xf2, 0x61, 0x90, 0xb8, 0x2a, 0x87, 0x40, 0xae, 0xd9, 0x76, 0x0a, 0x86, 0xe8, 0x15, 0x82, + 0x17, 0x8e, 0x9b, 0x46, 0x90, 0x5e, 0x56, 0xc3, 0x0e, 0x53, 0x83, 0x0e, 0x53, 0xc3, 0x41, 0x12, + 0x1d, 0xa6, 0xee, 0x22, 0x33, 0x6a, 0xa4, 0x46, 0x22, 0x52, 0xf9, 0x2c, 0x81, 0xf9, 0xa1, 0xa5, + 0x84, 0xb4, 0xfb, 0x60, 0x1c, 0x89, 0x6f, 0xe2, 0x79, 0xd7, 0xb3, 0x9f, 0x77, 0x88, 0x78, 0xe2, + 0xc1, 0xfb, 0xc9, 0xe0, 0xd3, 0x6b, 0x24, 0x46, 0x38, 0x89, 0x95, 0x1b, 0x49, 0x84, 0xa8, 0xae, + 0xb1, 0x78, 0x08, 0x16, 0x1f, 0x13, 0xc7, 0xc1, 0x3a, 0xc3, 0x69, 0xc5, 0x23, 0xd1, 0x66, 0x41, + 0xd1, 0x26, 0xfa, 0x9b, 0xe0, 0x29, 0x24, 0xfe, 0x14, 0x85, 0xe0, 0x5a, 0x37, 0x94, 0x2e, 0x58, + 0xca, 0x8e, 0x17, 0x4a, 0xec, 0x80, 0xa2, 0x00, 0x2f, 0x24, 0xff, 0x3d, 0x21, 0x1a, 0x51, 0x96, + 0xea, 0x45, 0x01, 0x8c, 0x3d, 0x0f, 0x38, 0xc2, 0x53, 0x09, 0x4c, 0xf4, 0x67, 0x10, 0x2e, 0xa5, + 0xe5, 0x1d, 0xdc, 0x08, 0xe5, 0xbf, 0x6f, 0xf0, 0x0a, 0x51, 0x2b, 0xf7, 0xde, 0x7d, 0xf9, 0xf1, + 0x71, 0xe4, 0x7f, 0xa8, 0x6a, 0x29, 0x6b, 0x2a, 0x5a, 0x41, 0xf1, 0xbe, 0xd0, 0x8e, 0x79, 0x53, + 0x9f, 0xc0, 0xf7, 0x01, 0xa4, 0x68, 0xd4, 0x87, 0x40, 0x1a, 0xd8, 0x0e, 0x43, 0x20, 0x0d, 0xee, + 0x0b, 0x45, 0xe5, 0x90, 0x2a, 0x70, 0x39, 0x13, 0x92, 0x6d, 0x37, 0xc3, 0xe5, 0x90, 0x50, 0xa7, + 0x8b, 0xdc, 0x2c, 0x75, 0xe2, 0xe5, 0x91, 0xa5, 0x4e, 0x62, 0x71, 0xdc, 0x49, 0x9d, 0x2e, 0x72, + 0xfb, 0xea, 0x7c, 0x92, 0xc0, 0xec, 0x90, 0xc9, 0x81, 0xd5, 0x21, 0x2a, 0x64, 0x4c, 0x74, 0x79, + 0xed, 0x4e, 0x31, 0x02, 0xfc, 0x03, 0x0e, 0x7e, 0x03, 0xae, 0xdf, 0xa4, 0xa3, 0x95, 0xc8, 0xd2, + 0xec, 0x0f, 0xe0, 0x37, 0x09, 0xcc, 0x65, 0x35, 0x3e, 0xdc, 0x48, 0x03, 0x75, 0x8b, 0x51, 0x2b, + 0xdf, 0xbf, 0x7b, 0xa0, 0xa0, 0xf4, 0x8c, 0x53, 0xda, 0x86, 0x4f, 0xb2, 0x28, 0xe9, 0x51, 0xa6, + 0x54, 0x62, 0xda, 0xb1, 0x18, 0xf3, 0x93, 0xcd, 0x9d, 0xb3, 0x4b, 0x59, 0x3a, 0xbf, 0x94, 0xa5, + 0xef, 0x97, 0xb2, 0x74, 0x7a, 0x25, 0xe7, 0xce, 0xaf, 0xe4, 0xdc, 0xd7, 0x2b, 0x39, 0xf7, 0x6a, + 0xdd, 0xb4, 0xd8, 0xa1, 0xdf, 0x52, 0x75, 0xd2, 0x8e, 0x2a, 0xfd, 0x67, 0xa3, 0x16, 0xed, 0x97, + 0xed, 0x6c, 0x68, 0x6f, 0x93, 0xb5, 0x83, 0xd9, 0xa0, 0xad, 0x02, 0xff, 0x41, 0xaf, 0xfd, 0x0c, + 0x00, 0x00, 0xff, 0xff, 0xbc, 0xbc, 0x99, 0xe5, 0xbc, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/superfluid/types/superfluid.pb.go b/x/superfluid/types/superfluid.pb.go index 74df33633c1..c84270a6186 100644 --- a/x/superfluid/types/superfluid.pb.go +++ b/x/superfluid/types/superfluid.pb.go @@ -224,38 +224,39 @@ func init() { } var fileDescriptor_79d3c29d82dbb734 = []byte{ - // 493 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x41, 0x6b, 0xdb, 0x30, - 0x14, 0xc7, 0xad, 0xb6, 0x5b, 0x1b, 0x6d, 0x74, 0xc1, 0x2b, 0x34, 0x0d, 0xd4, 0xce, 0x32, 0xd8, - 0xc2, 0xa0, 0x16, 0xed, 0x6e, 0xbd, 0xa5, 0xac, 0x83, 0x40, 0xe9, 0x82, 0x1b, 0x18, 0xf4, 0x62, - 0x64, 0x4b, 0x75, 0x44, 0x6d, 0xcb, 0x93, 0x64, 0x77, 0xfe, 0x06, 0x3d, 0xee, 0x23, 0x14, 0xf6, - 0x61, 0xd6, 0x63, 0x8f, 0x63, 0x87, 0x30, 0x92, 0xcb, 0xce, 0xfb, 0x04, 0xc3, 0x8a, 0xb3, 0x84, - 0x2c, 0x3b, 0xf9, 0xbd, 0xff, 0xef, 0xf9, 0xbd, 0xff, 0x93, 0x04, 0x5f, 0x72, 0x19, 0x73, 0xc9, - 0x24, 0x92, 0x59, 0x4a, 0xc5, 0x55, 0x94, 0x31, 0xb2, 0x10, 0x3a, 0xa9, 0xe0, 0x8a, 0x9b, 0x66, - 0x55, 0xe4, 0xcc, 0x49, 0x73, 0x27, 0xe4, 0x21, 0xd7, 0x18, 0x95, 0xd1, 0xb4, 0xb2, 0x69, 0x85, - 0x9c, 0x87, 0x11, 0x45, 0x3a, 0xf3, 0xb3, 0x2b, 0x44, 0x32, 0x81, 0x15, 0xe3, 0x49, 0xc5, 0xed, - 0x65, 0xae, 0x58, 0x4c, 0xa5, 0xc2, 0x71, 0x3a, 0x6b, 0x10, 0xe8, 0x59, 0xc8, 0xc7, 0x92, 0xa2, - 0xfc, 0xd0, 0xa7, 0x0a, 0x1f, 0xa2, 0x80, 0xb3, 0xaa, 0x41, 0xbb, 0x80, 0xcf, 0x2e, 0xfe, 0x9a, - 0xe8, 0x4a, 0x49, 0x95, 0xb9, 0x03, 0x1f, 0x11, 0x9a, 0xf0, 0xb8, 0x01, 0x5a, 0xa0, 0x53, 0x73, - 0xa7, 0x89, 0xf9, 0x1e, 0x42, 0x5c, 0x62, 0x4f, 0x15, 0x29, 0x6d, 0xac, 0xb5, 0x40, 0x67, 0xfb, - 0xe8, 0xb5, 0xf3, 0xef, 0x22, 0xce, 0x52, 0xbb, 0x41, 0x91, 0x52, 0xb7, 0x86, 0x67, 0xe1, 0xf1, - 0xd6, 0xed, 0x9d, 0x6d, 0xfc, 0xba, 0xb3, 0x41, 0xfb, 0x1a, 0xee, 0xcf, 0x6b, 0x7b, 0x89, 0xa2, - 0x22, 0xa6, 0x84, 0x61, 0x51, 0x74, 0x83, 0x80, 0x67, 0xc9, 0xff, 0x8c, 0xec, 0xc1, 0xad, 0x1c, - 0x47, 0x1e, 0x26, 0x44, 0x68, 0x1b, 0x35, 0x77, 0x33, 0xc7, 0x51, 0x97, 0x10, 0x51, 0xa2, 0x10, - 0x67, 0x21, 0xf5, 0x18, 0x69, 0xac, 0xb7, 0x40, 0x67, 0xc3, 0xdd, 0xd4, 0x79, 0x8f, 0xb4, 0xbf, - 0x01, 0xb8, 0x7b, 0x9a, 0xf2, 0x60, 0xf8, 0x41, 0xc6, 0xfc, 0xf4, 0x53, 0xc6, 0x72, 0x1c, 0xd1, - 0x44, 0x0d, 0x3e, 0x76, 0xfb, 0xe6, 0x0b, 0xf8, 0x94, 0x96, 0xc8, 0x4b, 0xb2, 0xd8, 0xa7, 0x42, - 0x8f, 0x5b, 0x77, 0x9f, 0x68, 0xed, 0x5c, 0x4b, 0x73, 0x2b, 0x6b, 0x8b, 0x56, 0x24, 0xac, 0x4f, - 0x7f, 0x54, 0x37, 0x38, 0xf5, 0x52, 0xc1, 0x02, 0xaa, 0xe7, 0xd6, 0x4e, 0x7a, 0xf7, 0x23, 0xdb, - 0xf8, 0x31, 0xb2, 0x5f, 0x85, 0x4c, 0x0d, 0x33, 0xdf, 0x09, 0x78, 0x8c, 0xaa, 0x9b, 0x98, 0x7e, - 0x0e, 0x24, 0xb9, 0x46, 0xe5, 0x51, 0x4a, 0xe7, 0x1d, 0x0d, 0x7e, 0x8f, 0xec, 0xdd, 0x02, 0xc7, - 0xd1, 0x71, 0x7b, 0xb9, 0x5f, 0xdb, 0xdd, 0xd6, 0xd2, 0xe0, 0x06, 0xa7, 0xfd, 0x52, 0x78, 0x73, - 0x09, 0x9f, 0xaf, 0x38, 0x62, 0x73, 0x1f, 0xee, 0xad, 0x90, 0xcf, 0xb1, 0x62, 0x39, 0xad, 0x1b, - 0xa6, 0x05, 0x9b, 0x2b, 0xf0, 0x59, 0xff, 0x62, 0x88, 0x05, 0xad, 0x83, 0xe6, 0xc6, 0xed, 0x57, - 0xcb, 0x38, 0x39, 0xbb, 0x1f, 0x5b, 0xe0, 0x61, 0x6c, 0x81, 0x9f, 0x63, 0x0b, 0x7c, 0x99, 0x58, - 0xc6, 0xc3, 0xc4, 0x32, 0xbe, 0x4f, 0x2c, 0xe3, 0xf2, 0x68, 0x61, 0x91, 0xea, 0xd2, 0x0f, 0x22, - 0xec, 0xcb, 0x59, 0x82, 0x3e, 0x2f, 0xbe, 0x78, 0xbd, 0x98, 0xff, 0x58, 0x3f, 0xb1, 0xb7, 0x7f, - 0x02, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x1c, 0x37, 0xf8, 0x14, 0x03, 0x00, 0x00, + // 498 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xd1, 0x6a, 0xdb, 0x3c, + 0x14, 0xc7, 0xad, 0xb6, 0xdf, 0xd7, 0x46, 0x1b, 0x5d, 0xf0, 0x0a, 0x4d, 0x03, 0xb5, 0xb3, 0x0c, + 0xb6, 0x30, 0xa8, 0x45, 0x37, 0xc6, 0xa0, 0x77, 0x29, 0xeb, 0x20, 0x30, 0xda, 0xe0, 0x06, 0x06, + 0xbd, 0x31, 0xb2, 0xa5, 0x3a, 0xa2, 0xb6, 0xe5, 0x49, 0xb2, 0x3b, 0xbf, 0x41, 0x2f, 0xf7, 0x08, + 0x85, 0x3d, 0xcc, 0x7a, 0xd9, 0xcb, 0xb1, 0x8b, 0x30, 0x92, 0x9b, 0x5d, 0xef, 0x09, 0x86, 0x15, + 0x67, 0x09, 0x59, 0x76, 0xe5, 0x73, 0xfe, 0xbf, 0xe3, 0x73, 0xfe, 0x47, 0x12, 0x7c, 0xca, 0x65, + 0xcc, 0x25, 0x93, 0x48, 0x66, 0x29, 0x15, 0x97, 0x51, 0xc6, 0xc8, 0x42, 0xe8, 0xa4, 0x82, 0x2b, + 0x6e, 0x9a, 0x55, 0x91, 0x33, 0x27, 0xcd, 0x9d, 0x90, 0x87, 0x5c, 0x63, 0x54, 0x46, 0xd3, 0xca, + 0xa6, 0x15, 0x72, 0x1e, 0x46, 0x14, 0xe9, 0xcc, 0xcf, 0x2e, 0x11, 0xc9, 0x04, 0x56, 0x8c, 0x27, + 0x15, 0xb7, 0x97, 0xb9, 0x62, 0x31, 0x95, 0x0a, 0xc7, 0xe9, 0xac, 0x41, 0xa0, 0x67, 0x21, 0x1f, + 0x4b, 0x8a, 0xf2, 0x43, 0x9f, 0x2a, 0x7c, 0x88, 0x02, 0xce, 0xaa, 0x06, 0xed, 0x02, 0x3e, 0x3a, + 0xff, 0x63, 0xa2, 0x2b, 0x25, 0x55, 0xe6, 0x0e, 0xfc, 0x8f, 0xd0, 0x84, 0xc7, 0x0d, 0xd0, 0x02, + 0x9d, 0x9a, 0x3b, 0x4d, 0xcc, 0x77, 0x10, 0xe2, 0x12, 0x7b, 0xaa, 0x48, 0x69, 0x63, 0xad, 0x05, + 0x3a, 0xdb, 0x2f, 0x9f, 0x3b, 0x7f, 0x2f, 0xe2, 0x2c, 0xb5, 0x1b, 0x14, 0x29, 0x75, 0x6b, 0x78, + 0x16, 0x1e, 0x6d, 0xdd, 0xdc, 0xda, 0xc6, 0xcf, 0x5b, 0x1b, 0xb4, 0xaf, 0xe0, 0xfe, 0xbc, 0xb6, + 0x97, 0x28, 0x2a, 0x62, 0x4a, 0x18, 0x16, 0x45, 0x37, 0x08, 0x78, 0x96, 0xfc, 0xcb, 0xc8, 0x1e, + 0xdc, 0xca, 0x71, 0xe4, 0x61, 0x42, 0x84, 0xb6, 0x51, 0x73, 0x37, 0x73, 0x1c, 0x75, 0x09, 0x11, + 0x25, 0x0a, 0x71, 0x16, 0x52, 0x8f, 0x91, 0xc6, 0x7a, 0x0b, 0x74, 0x36, 0xdc, 0x4d, 0x9d, 0xf7, + 0x48, 0xfb, 0x2b, 0x80, 0xbb, 0x27, 0x29, 0x0f, 0x86, 0x67, 0x32, 0xe6, 0x27, 0x1f, 0x33, 0x96, + 0xe3, 0x88, 0x26, 0x6a, 0xf0, 0xa1, 0xdb, 0x37, 0x9f, 0xc0, 0x87, 0xb4, 0x44, 0x5e, 0x92, 0xc5, + 0x3e, 0x15, 0x7a, 0xdc, 0xba, 0xfb, 0x40, 0x6b, 0xa7, 0x5a, 0x9a, 0x5b, 0x59, 0x5b, 0xb4, 0x22, + 0x61, 0x7d, 0xfa, 0xa3, 0xba, 0xc6, 0xa9, 0x97, 0x0a, 0x16, 0x50, 0x3d, 0xb7, 0x76, 0xdc, 0xbb, + 0x1b, 0xd9, 0xc6, 0xf7, 0x91, 0xfd, 0x2c, 0x64, 0x6a, 0x98, 0xf9, 0x4e, 0xc0, 0x63, 0x54, 0xdd, + 0xc4, 0xf4, 0x73, 0x20, 0xc9, 0x15, 0x2a, 0x8f, 0x52, 0x3a, 0x6f, 0x69, 0xf0, 0x6b, 0x64, 0xef, + 0x16, 0x38, 0x8e, 0x8e, 0xda, 0xcb, 0xfd, 0xda, 0xee, 0xb6, 0x96, 0x06, 0xd7, 0x38, 0xed, 0x97, + 0xc2, 0x8b, 0x0b, 0xf8, 0x78, 0xc5, 0x11, 0x9b, 0xfb, 0x70, 0x6f, 0x85, 0x7c, 0x8a, 0x15, 0xcb, + 0x69, 0xdd, 0x30, 0x2d, 0xd8, 0x5c, 0x81, 0xdf, 0xf7, 0xcf, 0x87, 0x58, 0xd0, 0x3a, 0x68, 0x6e, + 0xdc, 0x7c, 0xb1, 0x8c, 0xe3, 0xb3, 0xbb, 0xb1, 0x05, 0xee, 0xc7, 0x16, 0xf8, 0x31, 0xb6, 0xc0, + 0xe7, 0x89, 0x65, 0xdc, 0x4f, 0x2c, 0xe3, 0xdb, 0xc4, 0x32, 0x2e, 0x5e, 0x2f, 0x2c, 0x52, 0x5d, + 0xfa, 0x41, 0x84, 0x7d, 0x39, 0x4b, 0x50, 0xfe, 0x06, 0x7d, 0x5a, 0x7c, 0xf4, 0x7a, 0x37, 0xff, + 0x7f, 0xfd, 0xca, 0x5e, 0xfd, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x9c, 0xc4, 0x1d, 0x5e, 0x17, 0x03, + 0x00, 0x00, } func (this *SuperfluidAsset) Equal(that interface{}) bool { diff --git a/x/superfluid/types/tx.pb.go b/x/superfluid/types/tx.pb.go index 3c814871d33..e029d0a2e72 100644 --- a/x/superfluid/types/tx.pb.go +++ b/x/superfluid/types/tx.pb.go @@ -224,30 +224,31 @@ func init() { func init() { proto.RegisterFile("osmosis/superfluid/tx.proto", fileDescriptor_55b645f187d22814) } var fileDescriptor_55b645f187d22814 = []byte{ - // 367 bytes of a gzipped FileDescriptorProto + // 371 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0xc1, 0x4a, 0xf3, 0x40, - 0x10, 0xc7, 0x9b, 0xaf, 0x1f, 0xad, 0x2e, 0x78, 0x70, 0xa9, 0xb4, 0x46, 0xdc, 0xd6, 0x78, 0xa9, - 0x88, 0x59, 0xda, 0xde, 0xbc, 0x59, 0xbc, 0x08, 0xf6, 0x12, 0xf1, 0x22, 0x48, 0xd9, 0x64, 0xb7, - 0x6b, 0x70, 0x9b, 0x0d, 0xbb, 0x49, 0x68, 0xdf, 0xc2, 0xc7, 0xf2, 0xd8, 0xa3, 0x27, 0x91, 0xf6, - 0x0d, 0xf4, 0x05, 0xa4, 0x69, 0x63, 0x29, 0x46, 0x54, 0xf0, 0x36, 0x33, 0xff, 0x1f, 0xff, 0x99, - 0xd9, 0x1d, 0xb0, 0x27, 0xf5, 0x50, 0x6a, 0x5f, 0x63, 0x1d, 0x87, 0x4c, 0x0d, 0x44, 0xec, 0x53, - 0x1c, 0x8d, 0xec, 0x50, 0xc9, 0x48, 0x42, 0xb8, 0x14, 0xed, 0x95, 0x68, 0x56, 0xb8, 0xe4, 0x32, - 0x95, 0xf1, 0x3c, 0x5a, 0x90, 0x26, 0xe2, 0x52, 0x72, 0xc1, 0x70, 0x9a, 0xb9, 0xf1, 0x00, 0xd3, - 0x58, 0x91, 0xc8, 0x97, 0x41, 0xa6, 0x7b, 0xa9, 0x15, 0x76, 0x89, 0x66, 0x38, 0x69, 0xb9, 0x2c, - 0x22, 0x2d, 0xec, 0x49, 0x3f, 0xd3, 0x0f, 0x73, 0xc6, 0x58, 0x85, 0x0b, 0xc8, 0x4a, 0xc0, 0x4e, - 0x4f, 0xf3, 0xab, 0x8f, 0xf2, 0x39, 0x13, 0x8c, 0x93, 0x88, 0xc1, 0x23, 0x50, 0xd2, 0x2c, 0xa0, - 0x4c, 0xd5, 0x8c, 0x86, 0xd1, 0xdc, 0xec, 0x6e, 0xbf, 0x3e, 0xd7, 0xb7, 0xc6, 0x64, 0x28, 0x4e, - 0xad, 0x45, 0xdd, 0x72, 0x96, 0x00, 0xac, 0x82, 0xb2, 0x90, 0xde, 0x7d, 0xdf, 0xa7, 0xb5, 0x7f, - 0x0d, 0xa3, 0xf9, 0xdf, 0x29, 0xcd, 0xd3, 0x0b, 0x0a, 0x77, 0xc1, 0x46, 0x42, 0x44, 0x9f, 0x50, - 0xaa, 0x6a, 0xc5, 0xb9, 0x8b, 0x53, 0x4e, 0x88, 0x38, 0xa3, 0x54, 0x59, 0x75, 0xb0, 0x9f, 0xdb, - 0xd7, 0x61, 0x3a, 0x94, 0x81, 0x66, 0xd6, 0x2d, 0xa8, 0xae, 0x01, 0xd7, 0x01, 0xfd, 0xc3, 0xd1, - 0xac, 0x03, 0x50, 0xff, 0xc2, 0x3e, 0x9b, 0xa0, 0xfd, 0x66, 0x80, 0x62, 0x4f, 0x73, 0xa8, 0x00, - 0xcc, 0x7b, 0x1f, 0xfb, 0xf3, 0x47, 0xda, 0xb9, 0x2b, 0x99, 0xad, 0x1f, 0xa3, 0x59, 0x6f, 0x38, - 0x02, 0x95, 0xdc, 0xd5, 0x8f, 0xbf, 0xb5, 0x5a, 0xc1, 0x66, 0xe7, 0x17, 0x70, 0xd6, 0xb9, 0x7b, - 0xf9, 0x38, 0x45, 0xc6, 0x64, 0x8a, 0x8c, 0x97, 0x29, 0x32, 0x1e, 0x66, 0xa8, 0x30, 0x99, 0xa1, - 0xc2, 0xd3, 0x0c, 0x15, 0x6e, 0xda, 0xdc, 0x8f, 0xee, 0x62, 0xd7, 0xf6, 0xe4, 0x10, 0x2f, 0x8d, - 0x4f, 0x04, 0x71, 0x75, 0x96, 0xe0, 0xd1, 0xda, 0xc1, 0x8f, 0x43, 0xa6, 0xdd, 0x52, 0x7a, 0x65, - 0x9d, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x88, 0xc4, 0x5e, 0x13, 0x03, 0x00, 0x00, + 0x10, 0xc7, 0x9b, 0xaf, 0x1f, 0xed, 0xf7, 0x2d, 0x78, 0x70, 0xa9, 0xb4, 0x46, 0xdc, 0xd6, 0x78, + 0xa9, 0x88, 0x59, 0x6a, 0x11, 0xc1, 0x9b, 0xc5, 0x8b, 0x87, 0x22, 0x44, 0xbc, 0x08, 0x52, 0x36, + 0xd9, 0xed, 0x1a, 0xdc, 0x66, 0xc3, 0x6e, 0x12, 0xda, 0xb7, 0xf0, 0xb1, 0x3c, 0xf6, 0xe8, 0x49, + 0xa4, 0x7d, 0x03, 0x7d, 0x01, 0x69, 0xda, 0x58, 0x8a, 0x11, 0x15, 0xbc, 0xcd, 0xcc, 0xff, 0xc7, + 0x7f, 0x66, 0x76, 0x07, 0x6c, 0x49, 0x3d, 0x90, 0xda, 0xd7, 0x58, 0xc7, 0x21, 0x53, 0x7d, 0x11, + 0xfb, 0x14, 0x47, 0x43, 0x3b, 0x54, 0x32, 0x92, 0x10, 0x2e, 0x44, 0x7b, 0x29, 0x9a, 0x15, 0x2e, + 0xb9, 0x4c, 0x65, 0x3c, 0x8b, 0xe6, 0xa4, 0x89, 0xb8, 0x94, 0x5c, 0x30, 0x9c, 0x66, 0x6e, 0xdc, + 0xc7, 0x34, 0x56, 0x24, 0xf2, 0x65, 0x90, 0xe9, 0x5e, 0x6a, 0x85, 0x5d, 0xa2, 0x19, 0x4e, 0x5a, + 0x2e, 0x8b, 0x48, 0x0b, 0x7b, 0xd2, 0xcf, 0xf4, 0xdd, 0x9c, 0x31, 0x96, 0xe1, 0x1c, 0xb2, 0x12, + 0xb0, 0xd1, 0xd5, 0xfc, 0xf2, 0xbd, 0x7c, 0xc6, 0x04, 0xe3, 0x24, 0x62, 0x70, 0x0f, 0x94, 0x34, + 0x0b, 0x28, 0x53, 0x35, 0xa3, 0x61, 0x34, 0xff, 0x77, 0xd6, 0x5f, 0x9e, 0xea, 0x6b, 0x23, 0x32, + 0x10, 0x27, 0xd6, 0xbc, 0x6e, 0x39, 0x0b, 0x00, 0x56, 0x41, 0x59, 0x48, 0xef, 0xae, 0xe7, 0xd3, + 0xda, 0x9f, 0x86, 0xd1, 0xfc, 0xeb, 0x94, 0x66, 0xe9, 0x39, 0x85, 0x9b, 0xe0, 0x5f, 0x42, 0x44, + 0x8f, 0x50, 0xaa, 0x6a, 0xc5, 0x99, 0x8b, 0x53, 0x4e, 0x88, 0x38, 0xa5, 0x54, 0x59, 0x75, 0xb0, + 0x9d, 0xdb, 0xd7, 0x61, 0x3a, 0x94, 0x81, 0x66, 0xd6, 0x0d, 0xa8, 0xae, 0x00, 0x57, 0x01, 0xfd, + 0xc5, 0xd1, 0xac, 0x1d, 0x50, 0xff, 0xc4, 0x3e, 0x9b, 0xe0, 0xf0, 0xd5, 0x00, 0xc5, 0xae, 0xe6, + 0x50, 0x01, 0x98, 0xf7, 0x3e, 0xf6, 0xc7, 0x8f, 0xb4, 0x73, 0x57, 0x32, 0x5b, 0xdf, 0x46, 0xb3, + 0xde, 0x70, 0x08, 0x2a, 0xb9, 0xab, 0xef, 0x7f, 0x69, 0xb5, 0x84, 0xcd, 0xf6, 0x0f, 0xe0, 0xac, + 0x73, 0xe7, 0xe2, 0x61, 0x82, 0x8c, 0xf1, 0x04, 0x19, 0xcf, 0x13, 0x64, 0xdc, 0x4f, 0x51, 0x61, + 0x3c, 0x45, 0x85, 0xc7, 0x29, 0x2a, 0x5c, 0x1f, 0x71, 0x3f, 0xba, 0x8d, 0x5d, 0xdb, 0x93, 0x03, + 0xbc, 0x30, 0x3e, 0x10, 0xc4, 0xd5, 0x59, 0x82, 0x93, 0x63, 0x3c, 0x5c, 0xb9, 0xf9, 0x51, 0xc8, + 0xb4, 0x5b, 0x4a, 0x0f, 0xad, 0xfd, 0x16, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x00, 0x6d, 0xfc, 0x16, + 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/txfees/client/cli/query.go b/x/txfees/client/cli/query.go index b7a5fe85fd5..16e9e95b6dc 100644 --- a/x/txfees/client/cli/query.go +++ b/x/txfees/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" "github.com/spf13/cobra" ) diff --git a/x/txfees/client/cli/tx.go b/x/txfees/client/cli/tx.go index d63ea0e2bc9..4991d5f5476 100644 --- a/x/txfees/client/cli/tx.go +++ b/x/txfees/client/cli/tx.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/client/cli" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) func NewTxCmd() *cobra.Command { diff --git a/x/txfees/genesis.go b/x/txfees/genesis.go index 235d8d01749..db185abbbdd 100644 --- a/x/txfees/genesis.go +++ b/x/txfees/genesis.go @@ -2,8 +2,8 @@ package txfees import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/txfees/keeper" - "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) // InitGenesis initializes the txfees module's state from a provided genesis diff --git a/x/txfees/handler.go b/x/txfees/handler.go index c8b141f07a1..2eb01c9052b 100644 --- a/x/txfees/handler.go +++ b/x/txfees/handler.go @@ -5,8 +5,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/x/txfees/keeper" - "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) func NewUpdateFeeTokenProposalHandler(k keeper.Keeper) govtypes.Handler { diff --git a/x/txfees/keeper/feedecorator.go b/x/txfees/keeper/feedecorator.go index 1cfe2d8231b..516a0c8c130 100644 --- a/x/txfees/keeper/feedecorator.go +++ b/x/txfees/keeper/feedecorator.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/x/txfees/keeper/txfee_filters" - "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper/txfee_filters" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) // MempoolFeeDecorator will check if the transaction's fee is at least as large diff --git a/x/txfees/keeper/feedecorator_test.go b/x/txfees/keeper/feedecorator_test.go index 84669934fb2..5fc04171160 100644 --- a/x/txfees/keeper/feedecorator_test.go +++ b/x/txfees/keeper/feedecorator_test.go @@ -2,11 +2,11 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" "github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx" - "github.com/osmosis-labs/osmosis/x/txfees/keeper" + "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper" ) func (suite *KeeperTestSuite) TestFeeDecorator() { diff --git a/x/txfees/keeper/feetokens.go b/x/txfees/keeper/feetokens.go index 203edea7bc0..71ff747a29a 100644 --- a/x/txfees/keeper/feetokens.go +++ b/x/txfees/keeper/feetokens.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) // ConvertToBaseToken converts a fee amount in a whitelisted fee token to the base fee token amount diff --git a/x/txfees/keeper/feetokens_test.go b/x/txfees/keeper/feetokens_test.go index 341b3fdf6eb..6c0ab189c42 100644 --- a/x/txfees/keeper/feetokens_test.go +++ b/x/txfees/keeper/feetokens_test.go @@ -2,7 +2,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) func (suite *KeeperTestSuite) TestBaseDenom() { diff --git a/x/txfees/keeper/gov.go b/x/txfees/keeper/gov.go index 449bae918e5..8d2550b4843 100644 --- a/x/txfees/keeper/gov.go +++ b/x/txfees/keeper/gov.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) func (k Keeper) HandleUpdateFeeTokenProposal(ctx sdk.Context, p *types.UpdateFeeTokenProposal) error { diff --git a/x/txfees/keeper/grpc_query.go b/x/txfees/keeper/grpc_query.go index 71320289c1e..6c73ecebdcd 100644 --- a/x/txfees/keeper/grpc_query.go +++ b/x/txfees/keeper/grpc_query.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/txfees/keeper/keeper.go b/x/txfees/keeper/keeper.go index 51adf6edb99..f0e5b021dcb 100644 --- a/x/txfees/keeper/keeper.go +++ b/x/txfees/keeper/keeper.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) type ( diff --git a/x/txfees/keeper/keeper_test.go b/x/txfees/keeper/keeper_test.go index c0229d349ae..f9f739f2ade 100644 --- a/x/txfees/keeper/keeper_test.go +++ b/x/txfees/keeper/keeper_test.go @@ -13,10 +13,10 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/app" - balancertypes "github.com/osmosis-labs/osmosis/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" - "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/app" + balancertypes "github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) type KeeperTestSuite struct { diff --git a/x/txfees/keeper/txfee_filters/arb_tx.go b/x/txfees/keeper/txfee_filters/arb_tx.go index 8c8140783c3..7d243553a3c 100644 --- a/x/txfees/keeper/txfee_filters/arb_tx.go +++ b/x/txfees/keeper/txfee_filters/arb_tx.go @@ -2,7 +2,7 @@ package txfee_filters import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types" ) // We check if a tx is an arbitrage for the mempool right now by seeing: diff --git a/x/txfees/module.go b/x/txfees/module.go index aeaea7a08a2..9176a3cdea5 100644 --- a/x/txfees/module.go +++ b/x/txfees/module.go @@ -19,9 +19,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/x/txfees/client/cli" - "github.com/osmosis-labs/osmosis/x/txfees/keeper" - "github.com/osmosis-labs/osmosis/x/txfees/types" + "github.com/osmosis-labs/osmosis/v7/x/txfees/client/cli" + "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper" + "github.com/osmosis-labs/osmosis/v7/x/txfees/types" ) var ( diff --git a/x/txfees/module_test.go b/x/txfees/module_test.go index b4c3d278534..af76b0eec12 100644 --- a/x/txfees/module_test.go +++ b/x/txfees/module_test.go @@ -7,7 +7,7 @@ import ( abcitypes "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/app" + simapp "github.com/osmosis-labs/osmosis/v7/app" ) func TestSetBaseDenomOnInitBlock(t *testing.T) { diff --git a/x/txfees/types/feetoken.pb.go b/x/txfees/types/feetoken.pb.go index e2280605d57..e532700ac28 100644 --- a/x/txfees/types/feetoken.pb.go +++ b/x/txfees/types/feetoken.pb.go @@ -88,7 +88,7 @@ func init() { } var fileDescriptor_c50689857adfcfe0 = []byte{ - // 232 bytes of a gzipped FileDescriptorProto + // 235 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcd, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0xa9, 0x48, 0x4b, 0x4d, 0x2d, 0xd6, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4b, 0x4d, 0x2d, 0xc9, 0xcf, 0x4e, 0xcd, 0xd3, 0x2b, 0x28, 0xca, 0x2f, @@ -98,12 +98,12 @@ var fileDescriptor_c50689857adfcfe0 = []byte{ 0x38, 0x9d, 0x04, 0x3e, 0xdd, 0x93, 0xe7, 0xa9, 0x4c, 0xcc, 0xcd, 0xb1, 0x52, 0x02, 0x0b, 0x2b, 0x05, 0x41, 0xa4, 0x85, 0xb4, 0xb8, 0xd8, 0x0a, 0xf2, 0xf3, 0x73, 0x3c, 0x5d, 0x24, 0x98, 0x14, 0x18, 0x35, 0x58, 0x9c, 0x84, 0x3e, 0xdd, 0x93, 0xe7, 0x83, 0x28, 0x04, 0x89, 0xc7, 0x67, 0xa6, - 0x28, 0x05, 0x41, 0x55, 0x58, 0xb1, 0xbc, 0x58, 0x20, 0xcf, 0xe8, 0xe4, 0x71, 0xe2, 0x91, 0x1c, + 0x28, 0x05, 0x41, 0x55, 0x58, 0xb1, 0xbc, 0x58, 0x20, 0xcf, 0xe8, 0xe4, 0x7d, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, - 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x7a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, - 0xf9, 0xb9, 0xfa, 0x50, 0x87, 0xeb, 0xe6, 0x24, 0x26, 0x15, 0xc3, 0x38, 0xfa, 0x15, 0x30, 0xef, - 0x96, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x9d, 0x6d, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, - 0xbc, 0x13, 0x05, 0xd8, 0x0d, 0x01, 0x00, 0x00, + 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x86, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, + 0xf9, 0xb9, 0xfa, 0x50, 0x87, 0xeb, 0xe6, 0x24, 0x26, 0x15, 0xc3, 0x38, 0xfa, 0x65, 0xe6, 0xfa, + 0x15, 0x30, 0x1f, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x5d, 0x6e, 0x0c, 0x08, 0x00, + 0x00, 0xff, 0xff, 0x6f, 0x91, 0x61, 0xbb, 0x10, 0x01, 0x00, 0x00, } func (this *FeeToken) Equal(that interface{}) bool { diff --git a/x/txfees/types/genesis.pb.go b/x/txfees/types/genesis.pb.go index eeabe8be8e5..141fe5bb96e 100644 --- a/x/txfees/types/genesis.pb.go +++ b/x/txfees/types/genesis.pb.go @@ -85,7 +85,7 @@ func init() { } var fileDescriptor_4423c18e3d020b37 = []byte{ - // 232 bytes of a gzipped FileDescriptorProto + // 235 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc9, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0xa9, 0x48, 0x4b, 0x4d, 0x2d, 0xd6, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, @@ -95,12 +95,12 @@ var fileDescriptor_4423c18e3d020b37 = []byte{ 0x24, 0x55, 0x48, 0x86, 0x8b, 0x33, 0x29, 0xb1, 0x38, 0x35, 0x25, 0x35, 0x2f, 0x3f, 0x57, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x08, 0x21, 0x20, 0xe4, 0xc2, 0xc5, 0x09, 0xd3, 0x5f, 0x2c, 0xc1, 0xa4, 0xc0, 0xac, 0xc1, 0x6d, 0xa4, 0xa0, 0x87, 0xdd, 0x59, 0x7a, 0x6e, 0xa9, 0xa9, 0x21, 0x20, - 0x85, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x21, 0x34, 0x3a, 0x79, 0x9c, 0x78, 0x24, 0xc7, + 0x85, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x21, 0x34, 0x3a, 0x79, 0x9f, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, - 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x5e, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, - 0x7e, 0xae, 0x3e, 0xd4, 0x58, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0x02, 0xe6, 0x9d, - 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x27, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, - 0x3d, 0x5c, 0xe7, 0x43, 0x41, 0x01, 0x00, 0x00, + 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x61, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, + 0x7e, 0xae, 0x3e, 0xd4, 0x58, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0x5c, 0xbf, + 0x02, 0xe6, 0xa3, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x3f, 0x8c, 0x01, 0x01, 0x00, + 0x00, 0xff, 0xff, 0xdd, 0x30, 0x73, 0x62, 0x44, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/txfees/types/gov.pb.go b/x/txfees/types/gov.pb.go index c8142eeb056..34add7f87d3 100644 --- a/x/txfees/types/gov.pb.go +++ b/x/txfees/types/gov.pb.go @@ -73,7 +73,7 @@ func init() { func init() { proto.RegisterFile("osmosis/txfees/v1beta1/gov.proto", fileDescriptor_2c4a51bafc82863d) } var fileDescriptor_2c4a51bafc82863d = []byte{ - // 308 bytes of a gzipped FileDescriptorProto + // 311 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc8, 0x2f, 0xce, 0xcd, 0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0xa9, 0x48, 0x4b, 0x4d, 0x2d, 0xd6, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0xcf, 0x2f, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x83, 0xaa, @@ -88,12 +88,12 @@ var fileDescriptor_2c4a51bafc82863d = []byte{ 0x98, 0x73, 0x24, 0x98, 0x15, 0x18, 0x35, 0xb8, 0x8d, 0x14, 0xf4, 0xb0, 0x7b, 0x52, 0x0f, 0xe6, 0x3a, 0x27, 0x89, 0x13, 0xf7, 0xe4, 0x19, 0x3e, 0xdd, 0x93, 0x17, 0x80, 0x18, 0x9e, 0x96, 0x9a, 0x1a, 0x0f, 0x36, 0x40, 0x29, 0x08, 0x6e, 0x96, 0x15, 0x4f, 0xc7, 0x02, 0x79, 0x86, 0x19, 0x0b, - 0xe4, 0x19, 0x5e, 0x2c, 0x90, 0x67, 0x74, 0xf2, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, + 0xe4, 0x19, 0x5e, 0x2c, 0x90, 0x67, 0x74, 0xf2, 0x3e, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, - 0x39, 0x86, 0x28, 0xbd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, - 0xbd, 0xba, 0x39, 0x89, 0x49, 0xc5, 0x30, 0x8e, 0x7e, 0x05, 0x2c, 0xf4, 0x4a, 0x2a, 0x0b, 0x52, - 0x8b, 0x93, 0xd8, 0xc0, 0x61, 0x66, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xf9, 0xcd, 0xf6, 0xeb, - 0xac, 0x01, 0x00, 0x00, + 0x39, 0x86, 0x28, 0xc3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, + 0xbd, 0xba, 0x39, 0x89, 0x49, 0xc5, 0x30, 0x8e, 0x7e, 0x99, 0xb9, 0x7e, 0x05, 0x2c, 0x00, 0x4b, + 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xc1, 0x66, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x40, + 0x95, 0x3f, 0xf6, 0xaf, 0x01, 0x00, 0x00, } func (this *UpdateFeeTokenProposal) Equal(that interface{}) bool { diff --git a/x/txfees/types/query.pb.go b/x/txfees/types/query.pb.go index f0426c35caa..6237da392da 100644 --- a/x/txfees/types/query.pb.go +++ b/x/txfees/types/query.pb.go @@ -292,38 +292,39 @@ func init() { } var fileDescriptor_6cbc1b48c44dfdd6 = []byte{ - // 496 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x41, 0x6b, 0x13, 0x41, - 0x18, 0xcd, 0x5a, 0x5b, 0xc8, 0x54, 0x44, 0x07, 0xdb, 0xc6, 0x20, 0x9b, 0x30, 0xa8, 0x94, 0x42, - 0x66, 0x6c, 0xd5, 0x8b, 0x37, 0x97, 0x52, 0xf4, 0x22, 0xba, 0x78, 0xea, 0x25, 0xcc, 0x9a, 0x6f, - 0xd7, 0xc5, 0x64, 0xbf, 0x6d, 0x66, 0x56, 0x1a, 0xc4, 0x8b, 0xbf, 0x40, 0x10, 0xfc, 0x0b, 0xfe, - 0x95, 0x1e, 0x0b, 0x5e, 0x3c, 0x05, 0x49, 0xfc, 0x05, 0xf9, 0x05, 0xb2, 0xb3, 0xb3, 0x49, 0x68, - 0x9a, 0xa6, 0xb7, 0xcc, 0xf7, 0xde, 0xbc, 0xef, 0xcd, 0x7b, 0x59, 0xc2, 0x50, 0xf5, 0x50, 0xc5, - 0x4a, 0xe8, 0xd3, 0x10, 0x40, 0x89, 0xcf, 0xfb, 0x01, 0x68, 0xb9, 0x2f, 0x4e, 0x32, 0xe8, 0x0f, - 0x78, 0xda, 0x47, 0x8d, 0x74, 0xdb, 0x72, 0x78, 0xc1, 0xe1, 0x96, 0x53, 0xbf, 0x17, 0x61, 0x84, - 0x86, 0x22, 0xf2, 0x5f, 0x05, 0xbb, 0xfe, 0x20, 0x42, 0x8c, 0xba, 0x20, 0x64, 0x1a, 0x0b, 0x99, - 0x24, 0xa8, 0xa5, 0x8e, 0x31, 0x51, 0x16, 0x75, 0x2d, 0x6a, 0x4e, 0x41, 0x16, 0x8a, 0x4e, 0xd6, - 0x37, 0x04, 0x8b, 0x3f, 0x5a, 0xe2, 0x27, 0x04, 0xd0, 0xf8, 0x09, 0x2c, 0x8d, 0xed, 0x90, 0xad, - 0x77, 0xb9, 0xc3, 0x23, 0x80, 0xf7, 0xf9, 0x58, 0xf9, 0x70, 0x92, 0x81, 0xd2, 0x4c, 0x93, 0xed, - 0x8b, 0x80, 0x4a, 0x31, 0x51, 0x40, 0x8f, 0x09, 0x09, 0x01, 0xda, 0x46, 0x45, 0xd5, 0x9c, 0xe6, - 0xda, 0xee, 0xe6, 0x41, 0x93, 0x5f, 0xfe, 0x34, 0x5e, 0x5e, 0xf7, 0xee, 0x9f, 0x0d, 0x1b, 0x95, - 0xc9, 0xb0, 0x71, 0x77, 0x20, 0x7b, 0xdd, 0x17, 0x6c, 0xa6, 0xc0, 0xfc, 0x6a, 0x58, 0xee, 0x60, - 0x2f, 0xc9, 0x8e, 0xd9, 0x7a, 0x08, 0x09, 0xf6, 0xde, 0x22, 0x76, 0x5f, 0x77, 0xac, 0x21, 0xfa, - 0x98, 0xac, 0x77, 0xf2, 0x69, 0xcd, 0x69, 0x3a, 0xbb, 0x55, 0xef, 0xce, 0x64, 0xd8, 0xb8, 0x55, - 0x68, 0x99, 0x31, 0xf3, 0x0b, 0x98, 0x1d, 0x91, 0xda, 0xa2, 0x84, 0xb5, 0xbe, 0x47, 0x36, 0xd2, - 0x7c, 0x72, 0x68, 0x44, 0x6e, 0x7a, 0x74, 0x32, 0x6c, 0xdc, 0x2e, 0x44, 0xf2, 0x79, 0x3b, 0xee, - 0x30, 0xdf, 0x32, 0xa6, 0xc9, 0x78, 0x52, 0x81, 0xd1, 0x2a, 0x93, 0x79, 0x63, 0x93, 0x99, 0x03, - 0xac, 0xfc, 0x33, 0x42, 0x02, 0xa9, 0xa0, 0x3d, 0xef, 0x73, 0x6b, 0xf6, 0xe6, 0x19, 0xc6, 0xfc, - 0x6a, 0x50, 0xde, 0x3e, 0x18, 0xaf, 0x91, 0x75, 0x23, 0x48, 0x7f, 0x3a, 0xa4, 0x3a, 0xcd, 0x9b, - 0xb6, 0x96, 0x65, 0x7a, 0x69, 0x61, 0x75, 0x7e, 0x5d, 0x7a, 0x61, 0x96, 0xed, 0x7d, 0xfb, 0xfd, - 0xef, 0xc7, 0x8d, 0x87, 0x94, 0x89, 0xe5, 0xff, 0x14, 0x5b, 0x11, 0xfd, 0xe5, 0x90, 0xcd, 0xb9, - 0x3c, 0xa9, 0xb8, 0x72, 0xd7, 0x62, 0x79, 0xf5, 0x27, 0xd7, 0xbf, 0x60, 0xed, 0x3d, 0x37, 0xf6, - 0x04, 0x6d, 0x2d, 0xb3, 0x67, 0x82, 0x6c, 0xdb, 0xda, 0xc4, 0x17, 0x73, 0xfc, 0x6a, 0x22, 0x9c, - 0x16, 0xb3, 0x22, 0xc2, 0x8b, 0xcd, 0xae, 0x88, 0x70, 0xa1, 0xef, 0xd5, 0x11, 0xce, 0x1a, 0xf7, - 0x5e, 0x9d, 0x8d, 0x5c, 0xe7, 0x7c, 0xe4, 0x3a, 0x7f, 0x47, 0xae, 0xf3, 0x7d, 0xec, 0x56, 0xce, - 0xc7, 0x6e, 0xe5, 0xcf, 0xd8, 0xad, 0x1c, 0xf3, 0x28, 0xd6, 0x1f, 0xb3, 0x80, 0x7f, 0xc0, 0x5e, - 0xa9, 0xd3, 0xea, 0xca, 0x40, 0x4d, 0x45, 0x4f, 0x4b, 0x59, 0x3d, 0x48, 0x41, 0x05, 0x1b, 0xe6, - 0xcb, 0x7d, 0xfa, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x10, 0xa1, 0xf9, 0xc5, 0x72, 0x04, 0x00, 0x00, + // 500 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xd1, 0x6a, 0x13, 0x41, + 0x14, 0xcd, 0x5a, 0x5b, 0xc8, 0x54, 0x44, 0x07, 0xdb, 0xc6, 0x20, 0x9b, 0x30, 0xa8, 0x94, 0x42, + 0x76, 0x4c, 0x55, 0x04, 0xdf, 0x5c, 0x4a, 0x41, 0x04, 0xd1, 0xc5, 0xa7, 0xbe, 0x84, 0x59, 0x73, + 0x77, 0x5d, 0x4c, 0xf6, 0x6e, 0x33, 0xb3, 0xa5, 0x41, 0x7c, 0xf1, 0x0b, 0x04, 0xc1, 0x5f, 0xf0, + 0x57, 0xfa, 0x58, 0xf0, 0xc5, 0xa7, 0x20, 0x89, 0x5f, 0x90, 0x2f, 0x90, 0x9d, 0x9d, 0x4d, 0x42, + 0xd3, 0x6d, 0xfa, 0x96, 0xb9, 0xe7, 0xcc, 0xb9, 0x67, 0xce, 0xc9, 0x12, 0x86, 0xb2, 0x8f, 0x32, + 0x92, 0x5c, 0x9d, 0x06, 0x00, 0x92, 0x9f, 0xb4, 0x7d, 0x50, 0xa2, 0xcd, 0x8f, 0x53, 0x18, 0x0c, + 0x9d, 0x64, 0x80, 0x0a, 0xe9, 0xb6, 0xe1, 0x38, 0x39, 0xc7, 0x31, 0x9c, 0xfa, 0xbd, 0x10, 0x43, + 0xd4, 0x14, 0x9e, 0xfd, 0xca, 0xd9, 0xf5, 0x07, 0x21, 0x62, 0xd8, 0x03, 0x2e, 0x92, 0x88, 0x8b, + 0x38, 0x46, 0x25, 0x54, 0x84, 0xb1, 0x34, 0xa8, 0x6d, 0x50, 0x7d, 0xf2, 0xd3, 0x80, 0x77, 0xd3, + 0x81, 0x26, 0x18, 0xfc, 0x51, 0x89, 0x9f, 0x00, 0x40, 0xe1, 0x67, 0x30, 0x34, 0xb6, 0x43, 0xb6, + 0xde, 0x67, 0x0e, 0x0f, 0x01, 0x3e, 0x64, 0x63, 0xe9, 0xc1, 0x71, 0x0a, 0x52, 0x31, 0x45, 0xb6, + 0x2f, 0x02, 0x32, 0xc1, 0x58, 0x02, 0x3d, 0x22, 0x24, 0x00, 0xe8, 0x68, 0x15, 0x59, 0xb3, 0x9a, + 0x6b, 0xbb, 0x9b, 0xfb, 0x4d, 0xe7, 0xf2, 0xa7, 0x39, 0xc5, 0x75, 0xf7, 0xfe, 0xd9, 0xa8, 0x51, + 0x99, 0x8e, 0x1a, 0x77, 0x87, 0xa2, 0xdf, 0x7b, 0xc9, 0xe6, 0x0a, 0xcc, 0xab, 0x06, 0xc5, 0x0e, + 0xf6, 0x8a, 0xec, 0xe8, 0xad, 0x07, 0x10, 0x63, 0xff, 0x1d, 0x62, 0xef, 0x75, 0xd7, 0x18, 0xa2, + 0x8f, 0xc9, 0x7a, 0x37, 0x9b, 0xd6, 0xac, 0xa6, 0xb5, 0x5b, 0x75, 0xef, 0x4c, 0x47, 0x8d, 0x5b, + 0xb9, 0x96, 0x1e, 0x33, 0x2f, 0x87, 0xd9, 0x21, 0xa9, 0x2d, 0x4b, 0x18, 0xeb, 0x7b, 0x64, 0x23, + 0xc9, 0x26, 0x07, 0x5a, 0xe4, 0xa6, 0x4b, 0xa7, 0xa3, 0xc6, 0xed, 0x5c, 0x24, 0x9b, 0x77, 0xa2, + 0x2e, 0xf3, 0x0c, 0x63, 0x96, 0x8c, 0x2b, 0x24, 0x68, 0xad, 0x22, 0x99, 0xb7, 0x26, 0x99, 0x05, + 0xc0, 0xc8, 0x3f, 0x23, 0xc4, 0x17, 0x12, 0x3a, 0x8b, 0x3e, 0xb7, 0xe6, 0x6f, 0x9e, 0x63, 0xcc, + 0xab, 0xfa, 0xc5, 0xed, 0xfd, 0xc9, 0x1a, 0x59, 0xd7, 0x82, 0xf4, 0xa7, 0x45, 0xaa, 0xb3, 0xbc, + 0x69, 0xab, 0x2c, 0xd3, 0x4b, 0x0b, 0xab, 0x3b, 0xd7, 0xa5, 0xe7, 0x66, 0xd9, 0xde, 0xb7, 0xdf, + 0xff, 0x7e, 0xdc, 0x78, 0x48, 0x19, 0x2f, 0xff, 0xa7, 0x98, 0x8a, 0xe8, 0x2f, 0x8b, 0x6c, 0x2e, + 0xe4, 0x49, 0xf9, 0x95, 0xbb, 0x96, 0xcb, 0xab, 0x3f, 0xb9, 0xfe, 0x05, 0x63, 0xef, 0xb9, 0xb6, + 0xc7, 0x69, 0xab, 0xcc, 0x9e, 0x0e, 0xb2, 0x63, 0x6a, 0xe3, 0x5f, 0xf4, 0xf1, 0xab, 0x8e, 0x70, + 0x56, 0xcc, 0x8a, 0x08, 0x2f, 0x36, 0xbb, 0x22, 0xc2, 0xa5, 0xbe, 0x57, 0x47, 0x38, 0x6f, 0xdc, + 0x7d, 0x73, 0x36, 0xb6, 0xad, 0xf3, 0xb1, 0x6d, 0xfd, 0x1d, 0xdb, 0xd6, 0xf7, 0x89, 0x5d, 0x39, + 0x9f, 0xd8, 0x95, 0x3f, 0x13, 0xbb, 0x72, 0xd4, 0x0e, 0x23, 0xf5, 0x29, 0xf5, 0x9d, 0x8f, 0xd8, + 0x2f, 0x74, 0x5a, 0x3d, 0xe1, 0xcb, 0x99, 0xe8, 0xc9, 0x0b, 0x7e, 0x5a, 0x28, 0xab, 0x61, 0x02, + 0xd2, 0xdf, 0xd0, 0x1f, 0xef, 0xd3, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x47, 0xfb, 0x09, + 0x75, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used.