From f8586428a1d5d82ea2d71cf253c626604bb04c29 Mon Sep 17 00:00:00 2001 From: Osmosis <105710778+osmo-bot@users.noreply.github.com> Date: Tue, 30 Apr 2024 12:01:00 +0200 Subject: [PATCH] auto: update Go import paths to v25 on branch main (#8172) * auto: update Go import paths to v25 * Generated protofile changes * chore: update sqsdomain to v25 * chore: update osmoutils to latest version --------- Co-authored-by: PaddyMc <6751821+PaddyMc@users.noreply.github.com> Co-authored-by: github-actions Co-authored-by: PaddyMc --- app/ante.go | 12 +- app/ante_no_seq.go | 12 +- app/app.go | 74 ++--- app/apptesting/concentrated_liquidity.go | 10 +- app/apptesting/cosmwasmpool.go | 8 +- app/apptesting/gamm.go | 10 +- app/apptesting/pool_manager.go | 6 +- app/apptesting/superfluid.go | 4 +- app/apptesting/test_suite.go | 14 +- app/apptesting/txfees.go | 4 +- app/encoding.go | 2 +- app/keepers/keepers.go | 88 +++--- app/keepers/keys.go | 4 +- app/keepers/modules.go | 52 ++-- app/modules.go | 74 ++--- app/posthandler.go | 6 +- app/upgrades/types.go | 2 +- app/upgrades/v10/constants.go | 2 +- app/upgrades/v10/fork.go | 2 +- app/upgrades/v10/upgrades_test.go | 4 +- app/upgrades/v11/constants.go | 2 +- app/upgrades/v11/upgrades.go | 4 +- app/upgrades/v12/constants.go | 4 +- app/upgrades/v12/upgrade_test.go | 2 +- app/upgrades/v12/upgrades.go | 10 +- app/upgrades/v13/constants.go | 2 +- app/upgrades/v13/upgrade_test.go | 4 +- app/upgrades/v13/upgrades.go | 8 +- app/upgrades/v14/constants.go | 4 +- app/upgrades/v14/upgrades.go | 4 +- app/upgrades/v15/constants.go | 8 +- app/upgrades/v15/export_test.go | 6 +- app/upgrades/v15/upgrade_test.go | 12 +- app/upgrades/v15/upgrades.go | 22 +- app/upgrades/v16/constants.go | 6 +- app/upgrades/v16/export_test.go | 2 +- app/upgrades/v16/upgrades.go | 14 +- app/upgrades/v16/upgrades_test.go | 12 +- app/upgrades/v17/constants.go | 12 +- app/upgrades/v17/upgrades.go | 16 +- app/upgrades/v17/upgrades_test.go | 14 +- app/upgrades/v18/constants.go | 2 +- app/upgrades/v18/upgrades.go | 6 +- app/upgrades/v18/upgrades_test.go | 12 +- app/upgrades/v19/constants.go | 2 +- app/upgrades/v19/upgrades.go | 10 +- app/upgrades/v19/upgrades_test.go | 6 +- app/upgrades/v20/constants.go | 2 +- app/upgrades/v20/export_test.go | 2 +- app/upgrades/v20/upgrades.go | 14 +- app/upgrades/v20/upgrades_test.go | 8 +- app/upgrades/v21/constants.go | 2 +- app/upgrades/v21/upgrades.go | 26 +- app/upgrades/v21/upgrades_test.go | 8 +- app/upgrades/v22/constants.go | 2 +- app/upgrades/v22/upgrades.go | 4 +- app/upgrades/v22/upgrades_test.go | 6 +- app/upgrades/v23/constants.go | 2 +- app/upgrades/v23/upgrades.go | 10 +- app/upgrades/v23/upgrades_test.go | 4 +- app/upgrades/v24/constants.go | 2 +- app/upgrades/v24/upgrades.go | 14 +- app/upgrades/v24/upgrades_test.go | 22 +- app/upgrades/v25/constants.go | 4 +- app/upgrades/v25/upgrades.go | 8 +- app/upgrades/v25/upgrades_test.go | 6 +- app/upgrades/v3/constants.go | 2 +- app/upgrades/v3/forks.go | 2 +- app/upgrades/v4/constants.go | 2 +- app/upgrades/v4/upgrade_test.go | 4 +- app/upgrades/v4/upgrades.go | 4 +- app/upgrades/v5/constants.go | 2 +- app/upgrades/v5/upgrades.go | 6 +- app/upgrades/v5/whitelist_feetokens.go | 4 +- app/upgrades/v6/constants.go | 2 +- app/upgrades/v6/forks.go | 2 +- app/upgrades/v7/constants.go | 4 +- app/upgrades/v7/upgrades.go | 8 +- app/upgrades/v8/constants.go | 4 +- app/upgrades/v8/forks.go | 2 +- app/upgrades/v8/incentive_props.go | 4 +- app/upgrades/v8/msg_filter_ante.go | 2 +- app/upgrades/v8/msg_filter_ante_test.go | 6 +- app/upgrades/v8/unpool_whitelist.go | 4 +- app/upgrades/v9/constants.go | 4 +- app/upgrades/v9/msg_filter_ante_test.go | 6 +- app/upgrades/v9/prop214.go | 4 +- app/upgrades/v9/prop214_test.go | 4 +- app/upgrades/v9/upgrades.go | 6 +- .../cmd/balances_from_state_export.go | 6 +- cmd/osmosisd/cmd/change_environment.go | 2 +- cmd/osmosisd/cmd/genesis.go | 8 +- cmd/osmosisd/cmd/init.go | 2 +- cmd/osmosisd/cmd/root.go | 8 +- cmd/osmosisd/cmd/stargate-query.go | 24 +- cmd/osmosisd/main.go | 6 +- cmd/querygen/main.go | 2 +- cmd/querygen/templates/queryyml.go | 4 +- cmd/querygen/templates/queryyml_test.go | 2 +- go.mod | 11 +- go.sum | 17 +- ingest/sqs/domain/asset_list_test.go | 4 +- ingest/sqs/domain/ingester.go | 2 +- ingest/sqs/domain/keepers.go | 6 +- .../domain/mocks/asset_list_getter_mock.go | 2 +- .../domain/mocks/node_status_checker_mock.go | 2 +- ingest/sqs/domain/mocks/sqs_ingester_mock.go | 4 +- ingest/sqs/domain/service.go | 2 +- ingest/sqs/ingester.go | 4 +- ingest/sqs/pools/transformer/export_test.go | 4 +- .../sqs/pools/transformer/pool_transformer.go | 10 +- .../transformer/pool_transformer_test.go | 16 +- ingest/sqs/pools/transformer/taker_fee.go | 2 +- .../sqs/pools/transformer/taker_fee_test.go | 2 +- ingest/sqs/service/grpc_client.go | 4 +- ingest/sqs/service/node_status_checker.go | 2 +- ingest/sqs/service/sqs_pool_tracker.go | 4 +- ingest/sqs/service/sqs_pool_tracker_test.go | 4 +- ingest/sqs/service/sqs_streaming_service.go | 2 +- .../sqs/service/sqs_streaming_service_test.go | 6 +- .../writelistener/cfmm_write_listener.go | 4 +- .../writelistener/cfmm_write_listener_test.go | 6 +- .../concentrated_write_listener.go | 6 +- .../concentrated_write_listener_test.go | 10 +- .../cosmwasmpool_write_listener.go | 8 +- .../cosmwasmpool_write_listener_test.go | 8 +- ingest/sqs/sqs_config.go | 6 +- osmoutils/cosmwasm/helpers_test.go | 2 +- osmoutils/go.mod | 20 +- osmoutils/go.sum | 25 +- .../concentratedliquidity/params.proto | 2 +- .../poolmodel/concentrated/v1beta1/tx.proto | 2 +- .../v1beta1/genesis.proto | 2 +- .../concentratedliquidity/v1beta1/gov.proto | 2 +- .../v1beta1/incentive_record.proto | 2 +- .../concentratedliquidity/v1beta1/pool.proto | 2 +- .../v1beta1/position.proto | 2 +- .../concentratedliquidity/v1beta1/query.proto | 2 +- .../concentratedliquidity/v1beta1/query.yml | 4 +- .../v1beta1/tick_info.proto | 2 +- .../concentratedliquidity/v1beta1/tx.proto | 2 +- .../cosmwasmpool/v1beta1/genesis.proto | 2 +- proto/osmosis/cosmwasmpool/v1beta1/gov.proto | 2 +- .../v1beta1/model/instantiate_msg.proto | 2 +- .../v1beta1/model/module_query_msg.proto | 2 +- .../v1beta1/model/module_sudo_msg.proto | 2 +- .../cosmwasmpool/v1beta1/model/pool.proto | 2 +- .../v1beta1/model/pool_query_msg.proto | 2 +- .../v1beta1/model/transmuter_msgs.proto | 2 +- .../cosmwasmpool/v1beta1/model/tx.proto | 2 +- .../osmosis/cosmwasmpool/v1beta1/params.proto | 2 +- .../osmosis/cosmwasmpool/v1beta1/query.proto | 2 +- proto/osmosis/cosmwasmpool/v1beta1/query.yml | 4 +- proto/osmosis/cosmwasmpool/v1beta1/tx.proto | 2 +- .../v1beta1/downtime_duration.proto | 2 +- .../downtimedetector/v1beta1/genesis.proto | 2 +- .../downtimedetector/v1beta1/query.proto | 2 +- .../downtimedetector/v1beta1/query.yml | 4 +- .../gamm/poolmodels/balancer/v1beta1/tx.proto | 2 +- .../stableswap/v1beta1/stableswap_pool.proto | 2 +- .../poolmodels/stableswap/v1beta1/tx.proto | 2 +- proto/osmosis/gamm/v1beta1/balancerPool.proto | 2 +- proto/osmosis/gamm/v1beta1/genesis.proto | 2 +- proto/osmosis/gamm/v1beta1/gov.proto | 2 +- proto/osmosis/gamm/v1beta1/query.proto | 2 +- proto/osmosis/gamm/v1beta1/shared.proto | 2 +- proto/osmosis/gamm/v1beta1/tx.proto | 2 +- proto/osmosis/gamm/v2/query.proto | 2 +- proto/osmosis/ibchooks/genesis.proto | 2 +- proto/osmosis/ibchooks/params.proto | 2 +- proto/osmosis/ibchooks/tx.proto | 2 +- .../ibcratelimit/v1beta1/genesis.proto | 2 +- .../osmosis/ibcratelimit/v1beta1/params.proto | 2 +- .../osmosis/ibcratelimit/v1beta1/query.proto | 2 +- proto/osmosis/ibcratelimit/v1beta1/query.yml | 4 +- proto/osmosis/incentives/gauge.proto | 2 +- proto/osmosis/incentives/genesis.proto | 2 +- proto/osmosis/incentives/gov.proto | 2 +- proto/osmosis/incentives/group.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/params.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 +- .../poolincentives/v1beta1/genesis.proto | 2 +- .../osmosis/poolincentives/v1beta1/gov.proto | 2 +- .../poolincentives/v1beta1/incentives.proto | 2 +- .../poolincentives/v1beta1/query.proto | 2 +- .../poolincentives/v1beta1/shared.proto | 2 +- .../osmosis/poolmanager/v1beta1/genesis.proto | 2 +- proto/osmosis/poolmanager/v1beta1/gov.proto | 2 +- .../poolmanager/v1beta1/module_route.proto | 2 +- proto/osmosis/poolmanager/v1beta1/query.proto | 2 +- proto/osmosis/poolmanager/v1beta1/query.yml | 4 +- .../poolmanager/v1beta1/swap_route.proto | 2 +- .../poolmanager/v1beta1/tracked_volume.proto | 2 +- proto/osmosis/poolmanager/v1beta1/tx.proto | 2 +- proto/osmosis/poolmanager/v2/query.proto | 2 +- proto/osmosis/poolmanager/v2/query.yml | 4 +- proto/osmosis/protorev/v1beta1/genesis.proto | 2 +- proto/osmosis/protorev/v1beta1/gov.proto | 2 +- proto/osmosis/protorev/v1beta1/params.proto | 2 +- proto/osmosis/protorev/v1beta1/protorev.proto | 2 +- proto/osmosis/protorev/v1beta1/query.proto | 2 +- proto/osmosis/protorev/v1beta1/tx.proto | 2 +- .../smartaccount/v1beta1/genesis.proto | 2 +- .../osmosis/smartaccount/v1beta1/models.proto | 2 +- .../osmosis/smartaccount/v1beta1/params.proto | 2 +- .../osmosis/smartaccount/v1beta1/query.proto | 2 +- proto/osmosis/smartaccount/v1beta1/tx.proto | 2 +- proto/osmosis/superfluid/genesis.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/superfluid/v1beta1/gov.proto | 2 +- .../v1beta1/authorityMetadata.proto | 2 +- .../tokenfactory/v1beta1/genesis.proto | 2 +- .../osmosis/tokenfactory/v1beta1/params.proto | 2 +- .../osmosis/tokenfactory/v1beta1/query.proto | 2 +- proto/osmosis/tokenfactory/v1beta1/tx.proto | 2 +- proto/osmosis/twap/v1beta1/genesis.proto | 2 +- proto/osmosis/twap/v1beta1/query.proto | 2 +- proto/osmosis/twap/v1beta1/query.yml | 4 +- proto/osmosis/twap/v1beta1/twap_record.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/params.proto | 2 +- proto/osmosis/txfees/v1beta1/query.proto | 2 +- proto/osmosis/txfees/v1beta1/tx.proto | 2 +- proto/osmosis/valsetpref/v1beta1/query.proto | 2 +- proto/osmosis/valsetpref/v1beta1/query.yml | 4 +- proto/osmosis/valsetpref/v1beta1/state.proto | 2 +- proto/osmosis/valsetpref/v1beta1/tx.proto | 2 +- scripts/cl/in_given_out.py | 14 +- scripts/cl/out_given_in.py | 14 +- scripts/protocgen.sh | 2 +- scripts/replace_import_paths.sh | 2 +- .../internal/executortypes/actions.go | 2 +- .../internal/executortypes/frequency.go | 2 +- .../internal/executortypes/simmanager.go | 2 +- .../executor/internal/pubsub/manager.go | 2 +- simulation/executor/legacyconfig.go | 4 +- simulation/executor/mock_tendermint.go | 2 +- simulation/executor/params.go | 2 +- simulation/executor/simulate.go | 6 +- simulation/executor/simulate_dev.go | 4 +- simulation/executor/types.go | 2 +- simulation/executor/util.go | 2 +- simulation/simtypes/account.go | 2 +- simulation/simtypes/app.go | 2 +- simulation/simtypes/legacy.go | 2 +- simulation/simtypes/randutil.go | 2 +- simulation/simtypes/txbuilder.go | 4 +- tests/e2e/configurer/base.go | 8 +- tests/e2e/configurer/chain/chain.go | 6 +- tests/e2e/configurer/chain/commands.go | 14 +- tests/e2e/configurer/chain/node.go | 4 +- tests/e2e/configurer/chain/queries.go | 20 +- tests/e2e/configurer/current.go | 6 +- tests/e2e/configurer/factory.go | 6 +- tests/e2e/configurer/upgrade.go | 10 +- tests/e2e/containers/containers.go | 4 +- tests/e2e/e2e_cl_test.go | 16 +- tests/e2e/e2e_setup_test.go | 2 +- tests/e2e/e2e_test.go | 10 +- tests/e2e/helpers_e2e_test.go | 8 +- tests/e2e/initialization/chain/main.go | 2 +- tests/e2e/initialization/config.go | 20 +- tests/e2e/initialization/init.go | 2 +- tests/e2e/initialization/init_test.go | 2 +- tests/e2e/initialization/node.go | 4 +- tests/e2e/initialization/node/main.go | 2 +- tests/e2e/initialization/util.go | 2 +- tests/e2e/sync_test.go | 2 +- tests/e2e/util/codec.go | 4 +- tests/ibc-hooks/async_acks_test.go | 2 +- tests/ibc-hooks/ibc_middleware_test.go | 14 +- tests/ibc-hooks/xcs_cw20_test.go | 2 +- tests/mocks/cfmm_pool.go | 2 +- tests/mocks/cl_pool.go | 2 +- tests/mocks/pool.go | 2 +- tests/mocks/pool_module.go | 2 +- tests/osmosisibctesting/chain.go | 4 +- tests/osmosisibctesting/wasm.go | 2 +- tests/simulator/osmosis_helper.go | 6 +- tests/simulator/sim_test.go | 4 +- tests/simulator/state.go | 6 +- wasmbinding/message_plugin.go | 6 +- wasmbinding/queries.go | 4 +- wasmbinding/query_plugin.go | 2 +- wasmbinding/query_plugin_test.go | 12 +- wasmbinding/stargate_whitelist.go | 32 +-- wasmbinding/test/custom_msg_test.go | 6 +- wasmbinding/test/custom_query_test.go | 6 +- wasmbinding/test/helpers_test.go | 2 +- wasmbinding/test/messages_test.go | 6 +- wasmbinding/test/queries_test.go | 4 +- wasmbinding/test/store_run_test.go | 4 +- wasmbinding/wasm.go | 2 +- x/concentrated-liquidity/bench_test.go | 14 +- x/concentrated-liquidity/client/cli/query.go | 4 +- x/concentrated-liquidity/client/cli/tx.go | 4 +- .../client/grpc/grpc_query.go | 4 +- .../client/proposal_handler.go | 2 +- .../client/query_proto_wrap.go | 6 +- .../client/queryproto/query.pb.go | 218 +++++++------- x/concentrated-liquidity/clmocks/listeners.go | 2 +- x/concentrated-liquidity/clmodule/module.go | 22 +- x/concentrated-liquidity/event.go | 2 +- x/concentrated-liquidity/export_test.go | 8 +- x/concentrated-liquidity/fuzz_test.go | 4 +- x/concentrated-liquidity/genesis.go | 4 +- x/concentrated-liquidity/genesis_test.go | 12 +- x/concentrated-liquidity/gov.go | 6 +- x/concentrated-liquidity/incentives.go | 4 +- x/concentrated-liquidity/incentives_test.go | 12 +- x/concentrated-liquidity/invariant_test.go | 4 +- x/concentrated-liquidity/keeper.go | 2 +- x/concentrated-liquidity/keeper_test.go | 16 +- x/concentrated-liquidity/lp.go | 6 +- x/concentrated-liquidity/lp_test.go | 10 +- x/concentrated-liquidity/math/math_test.go | 4 +- x/concentrated-liquidity/math/precompute.go | 2 +- x/concentrated-liquidity/math/tick.go | 2 +- x/concentrated-liquidity/math/tick_test.go | 4 +- x/concentrated-liquidity/model/codec.go | 4 +- x/concentrated-liquidity/model/msgs.go | 4 +- x/concentrated-liquidity/model/msgs_test.go | 6 +- x/concentrated-liquidity/model/pool.go | 6 +- x/concentrated-liquidity/model/pool.pb.go | 82 +++--- x/concentrated-liquidity/model/pool_test.go | 8 +- x/concentrated-liquidity/model/position.pb.go | 80 +++--- .../model/tick_info.pb.go | 70 ++--- x/concentrated-liquidity/model/tx.pb.go | 52 ++-- x/concentrated-liquidity/msg_server.go | 4 +- x/concentrated-liquidity/msg_server_test.go | 10 +- x/concentrated-liquidity/pool.go | 8 +- x/concentrated-liquidity/pool_hooks.go | 2 +- x/concentrated-liquidity/pool_hooks_test.go | 2 +- x/concentrated-liquidity/pool_test.go | 14 +- x/concentrated-liquidity/position.go | 6 +- x/concentrated-liquidity/position_test.go | 12 +- x/concentrated-liquidity/query.go | 10 +- x/concentrated-liquidity/query_test.go | 6 +- x/concentrated-liquidity/range_test.go | 6 +- .../simulation/sim_msgs.go | 14 +- x/concentrated-liquidity/spread_rewards.go | 2 +- .../spread_rewards_test.go | 10 +- x/concentrated-liquidity/store.go | 6 +- x/concentrated-liquidity/store_test.go | 8 +- x/concentrated-liquidity/swaps.go | 10 +- x/concentrated-liquidity/swaps_test.go | 12 +- .../swaps_tick_cross_test.go | 6 +- .../swapstrategy/one_for_zero.go | 4 +- .../swapstrategy/one_for_zero_test.go | 6 +- .../swapstrategy/spread_rewards_test.go | 2 +- .../swapstrategy/swap_strategy.go | 2 +- .../swapstrategy/swap_strategy_test.go | 8 +- .../swapstrategy/zero_for_one.go | 4 +- .../swapstrategy/zero_for_one_test.go | 4 +- x/concentrated-liquidity/telemetry.go | 2 +- x/concentrated-liquidity/tick.go | 8 +- x/concentrated-liquidity/tick_test.go | 8 +- x/concentrated-liquidity/total_liquidity.go | 2 +- .../types/cl_pool_extensionI.go | 2 +- x/concentrated-liquidity/types/cl_test.go | 2 +- .../types/expected_keepers.go | 4 +- .../types/genesis/genesis.go | 2 +- .../types/genesis/genesis.pb.go | 124 ++++---- .../types/genesis/genesis_test.go | 4 +- x/concentrated-liquidity/types/gov.pb.go | 64 ++--- x/concentrated-liquidity/types/gov_test.go | 2 +- .../types/incentive_record.pb.go | 68 ++--- x/concentrated-liquidity/types/keys_test.go | 2 +- x/concentrated-liquidity/types/msgs_test.go | 8 +- x/concentrated-liquidity/types/params.pb.go | 76 ++--- x/concentrated-liquidity/types/params_test.go | 2 +- x/concentrated-liquidity/types/tx.pb.go | 148 +++++----- x/cosmwasmpool/client/cli/query.go | 4 +- x/cosmwasmpool/client/cli/tx.go | 4 +- x/cosmwasmpool/client/grpc/grpc_query.go | 4 +- x/cosmwasmpool/client/proposal_handler.go | 2 +- x/cosmwasmpool/client/query_proto_wrap.go | 4 +- x/cosmwasmpool/client/queryproto/query.pb.go | 70 ++--- .../cosmwasm/msg/instantiate_msg.pb.go | 4 +- .../cosmwasm/msg/module_query_msg.pb.go | 54 ++-- .../cosmwasm/msg/module_sudo_msg.pb.go | 70 ++--- .../cosmwasm/msg/pool_query_msg.pb.go | 4 +- .../msg/transmuter/transmuter_msgs.pb.go | 32 +-- .../msg/transmuter/transmuter_test.go | 8 +- x/cosmwasmpool/genesis.go | 2 +- x/cosmwasmpool/genesis_test.go | 2 +- x/cosmwasmpool/gov.go | 2 +- x/cosmwasmpool/gov_test.go | 4 +- x/cosmwasmpool/keeper.go | 4 +- x/cosmwasmpool/model/codec.go | 4 +- x/cosmwasmpool/model/msgs.go | 4 +- x/cosmwasmpool/model/pool.go | 6 +- x/cosmwasmpool/model/pool.pb.go | 4 +- x/cosmwasmpool/model/pool_test.go | 2 +- x/cosmwasmpool/model/store_model.go | 4 +- x/cosmwasmpool/model/tx.pb.go | 42 +-- x/cosmwasmpool/module/module.go | 16 +- x/cosmwasmpool/msg_server.go | 4 +- x/cosmwasmpool/pool_module.go | 10 +- x/cosmwasmpool/pool_module_test.go | 10 +- x/cosmwasmpool/store.go | 4 +- x/cosmwasmpool/types/expected_keepers.go | 2 +- x/cosmwasmpool/types/genesis.pb.go | 4 +- x/cosmwasmpool/types/gov.pb.go | 4 +- x/cosmwasmpool/types/gov_test.go | 4 +- x/cosmwasmpool/types/params.pb.go | 4 +- x/cosmwasmpool/types/pool.go | 2 +- x/cosmwasmpool/types/tx.pb.go | 4 +- x/cosmwasmpool/whitelist_test.go | 2 +- x/downtime-detector/abci.go | 2 +- x/downtime-detector/client/cli/query.go | 4 +- x/downtime-detector/client/cli/query_test.go | 6 +- x/downtime-detector/client/grpc/grpc_query.go | 4 +- .../client/query_proto_wrap.go | 4 +- .../client/queryproto/query.pb.go | 60 ++-- x/downtime-detector/genesis.go | 2 +- x/downtime-detector/genesis_test.go | 2 +- x/downtime-detector/keeper_test.go | 4 +- x/downtime-detector/module/module.go | 12 +- x/downtime-detector/query.go | 2 +- x/downtime-detector/store.go | 2 +- .../types/downtime_duration.pb.go | 18 +- x/downtime-detector/types/genesis.pb.go | 6 +- x/gamm/client/cli/cli_test.go | 8 +- x/gamm/client/cli/query.go | 4 +- x/gamm/client/cli/query_test.go | 4 +- x/gamm/client/cli/tx.go | 10 +- x/gamm/client/cli/tx_test.go | 2 +- x/gamm/client/proposal_handler.go | 2 +- x/gamm/handler.go | 4 +- x/gamm/keeper/export_test.go | 4 +- x/gamm/keeper/gas_test.go | 4 +- x/gamm/keeper/genesis.go | 4 +- x/gamm/keeper/genesis_test.go | 6 +- x/gamm/keeper/gov.go | 2 +- x/gamm/keeper/grpc_query.go | 8 +- x/gamm/keeper/grpc_query_test.go | 10 +- x/gamm/keeper/invariants.go | 2 +- x/gamm/keeper/keeper.go | 2 +- x/gamm/keeper/keeper_test.go | 8 +- x/gamm/keeper/migrate.go | 12 +- x/gamm/keeper/migrate_test.go | 8 +- x/gamm/keeper/msg_server.go | 8 +- x/gamm/keeper/msg_server_test.go | 6 +- x/gamm/keeper/pool.go | 8 +- x/gamm/keeper/pool_service.go | 4 +- x/gamm/keeper/pool_service_test.go | 8 +- x/gamm/keeper/pool_test.go | 14 +- x/gamm/keeper/share.go | 6 +- x/gamm/keeper/swap.go | 6 +- x/gamm/keeper/swap_test.go | 6 +- x/gamm/keeper/total_liquidity.go | 2 +- x/gamm/module.go | 16 +- x/gamm/pool-models/balancer/amm.go | 2 +- x/gamm/pool-models/balancer/amm_test.go | 6 +- .../pool-models/balancer/balancerPool.pb.go | 106 +++---- x/gamm/pool-models/balancer/codec.go | 4 +- x/gamm/pool-models/balancer/marshal_test.go | 2 +- x/gamm/pool-models/balancer/msgs.go | 4 +- x/gamm/pool-models/balancer/msgs_test.go | 8 +- x/gamm/pool-models/balancer/pool.go | 6 +- x/gamm/pool-models/balancer/pool_asset.go | 2 +- x/gamm/pool-models/balancer/pool_params.go | 2 +- .../pool-models/balancer/pool_suite_test.go | 8 +- x/gamm/pool-models/balancer/pool_test.go | 8 +- x/gamm/pool-models/balancer/tx.pb.go | 58 ++-- x/gamm/pool-models/balancer/util_test.go | 2 +- x/gamm/pool-models/internal/cfmm_common/lp.go | 2 +- .../internal/cfmm_common/lp_test.go | 10 +- .../internal/test_helpers/test_helpers.go | 4 +- x/gamm/pool-models/stableswap/amm.go | 4 +- x/gamm/pool-models/stableswap/amm_test.go | 8 +- x/gamm/pool-models/stableswap/codec.go | 4 +- .../stableswap/integration_test.go | 4 +- x/gamm/pool-models/stableswap/msgs.go | 4 +- x/gamm/pool-models/stableswap/msgs_test.go | 6 +- x/gamm/pool-models/stableswap/pool.go | 6 +- x/gamm/pool-models/stableswap/pool_params.go | 2 +- x/gamm/pool-models/stableswap/pool_test.go | 6 +- .../stableswap/stableswap_pool.pb.go | 4 +- x/gamm/pool-models/stableswap/tx.pb.go | 4 +- x/gamm/pool-models/stableswap/util_test.go | 2 +- x/gamm/simulation/sim_msgs.go | 10 +- x/gamm/simulation/sim_setup.go | 4 +- x/gamm/types/expected_keepers.go | 8 +- x/gamm/types/genesis.go | 2 +- x/gamm/types/genesis.pb.go | 54 ++-- x/gamm/types/gov.go | 2 +- x/gamm/types/gov.pb.go | 50 ++-- x/gamm/types/gov_test.go | 4 +- x/gamm/types/key_test.go | 2 +- x/gamm/types/migration/shared.pb.go | 44 +-- x/gamm/types/msg_swap.go | 2 +- x/gamm/types/msgs_test.go | 10 +- x/gamm/types/params.go | 2 +- x/gamm/types/pool.go | 2 +- x/gamm/types/query.pb.go | 204 ++++++------- x/gamm/types/route.go | 2 +- x/gamm/types/tx.pb.go | 6 +- x/gamm/v2types/query.pb.go | 60 ++-- x/ibc-hooks/types/genesis.pb.go | 4 +- x/ibc-hooks/types/params.pb.go | 4 +- x/ibc-hooks/types/tx.pb.go | 42 +-- x/ibc-rate-limit/client/cli/query.go | 4 +- x/ibc-rate-limit/client/grpc/grpc_query.go | 4 +- x/ibc-rate-limit/client/query_proto_wrap.go | 4 +- .../client/queryproto/query.pb.go | 38 +-- x/ibc-rate-limit/genesis.go | 2 +- x/ibc-rate-limit/genesis_test.go | 4 +- x/ibc-rate-limit/ibc_middleware_test.go | 8 +- x/ibc-rate-limit/ibc_module.go | 2 +- x/ibc-rate-limit/ibcratelimitmodule/module.go | 12 +- x/ibc-rate-limit/ics4_wrapper.go | 2 +- x/ibc-rate-limit/rate_limit.go | 2 +- x/ibc-rate-limit/types/genesis.pb.go | 4 +- x/ibc-rate-limit/types/params.pb.go | 4 +- x/incentives/client/cli/cli_test.go | 2 +- x/incentives/client/cli/query.go | 4 +- x/incentives/client/cli/query_test.go | 4 +- x/incentives/client/cli/tx.go | 4 +- x/incentives/client/proposal_handler.go | 2 +- x/incentives/keeper/bench_test.go | 6 +- x/incentives/keeper/distribute.go | 6 +- x/incentives/keeper/distribute_test.go | 14 +- x/incentives/keeper/export_test.go | 4 +- x/incentives/keeper/gauge.go | 8 +- x/incentives/keeper/gauge_test.go | 8 +- x/incentives/keeper/genesis.go | 2 +- x/incentives/keeper/genesis_test.go | 10 +- x/incentives/keeper/gov.go | 2 +- x/incentives/keeper/group.go | 4 +- x/incentives/keeper/group_test.go | 10 +- x/incentives/keeper/grpc_query.go | 4 +- x/incentives/keeper/grpc_query_test.go | 6 +- x/incentives/keeper/hooks.go | 4 +- x/incentives/keeper/hooks_test.go | 6 +- x/incentives/keeper/iterator.go | 4 +- x/incentives/keeper/iterator_test.go | 4 +- x/incentives/keeper/keeper.go | 2 +- x/incentives/keeper/keeper_test.go | 10 +- x/incentives/keeper/msg_server.go | 2 +- x/incentives/keeper/msg_server_test.go | 8 +- x/incentives/keeper/params.go | 2 +- x/incentives/keeper/store.go | 2 +- x/incentives/keeper/store_test.go | 4 +- x/incentives/keeper/suite_test.go | 6 +- 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/errors.go | 2 +- x/incentives/types/expected_keepers.go | 6 +- x/incentives/types/gauge.go | 2 +- x/incentives/types/gauge.pb.go | 6 +- x/incentives/types/genesis.pb.go | 48 ++-- x/incentives/types/gov.pb.go | 4 +- x/incentives/types/gov_test.go | 2 +- x/incentives/types/group.pb.go | 42 +-- x/incentives/types/msgs.go | 2 +- x/incentives/types/msgs_test.go | 10 +- x/incentives/types/params.go | 2 +- x/incentives/types/params.pb.go | 4 +- x/incentives/types/query.pb.go | 8 +- x/incentives/types/tx.pb.go | 6 +- x/lockup/abci.go | 2 +- x/lockup/client/cli/cli_test.go | 2 +- x/lockup/client/cli/query.go | 2 +- x/lockup/client/cli/tx.go | 2 +- x/lockup/keeper/admin_keeper.go | 2 +- x/lockup/keeper/admin_keeper_test.go | 2 +- x/lockup/keeper/bench_test.go | 4 +- x/lockup/keeper/export_test.go | 2 +- x/lockup/keeper/genesis.go | 2 +- x/lockup/keeper/genesis_test.go | 6 +- 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 | 6 +- x/lockup/keeper/lock.go | 4 +- x/lockup/keeper/lock_refs.go | 2 +- x/lockup/keeper/lock_test.go | 8 +- x/lockup/keeper/migration.go | 2 +- x/lockup/keeper/migration_test.go | 2 +- x/lockup/keeper/msg_server.go | 2 +- x/lockup/keeper/msg_server_test.go | 6 +- x/lockup/keeper/store.go | 2 +- x/lockup/keeper/synthetic_lock.go | 2 +- x/lockup/keeper/synthetic_lock_test.go | 4 +- 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 | 6 +- x/lockup/types/lock.pb.go | 78 ++--- x/lockup/types/msgs_test.go | 6 +- x/lockup/types/params.pb.go | 6 +- x/lockup/types/query.pb.go | 213 +++++++------- x/lockup/types/tx.pb.go | 106 +++---- x/mint/client/cli/cli_test.go | 4 +- x/mint/client/cli/query.go | 2 +- x/mint/keeper/export_test.go | 2 +- x/mint/keeper/genesis.go | 2 +- x/mint/keeper/genesis_test.go | 4 +- x/mint/keeper/grpc_query.go | 2 +- x/mint/keeper/grpc_query_test.go | 2 +- x/mint/keeper/hooks.go | 2 +- x/mint/keeper/hooks_test.go | 6 +- x/mint/keeper/keeper.go | 4 +- x/mint/keeper/keeper_test.go | 8 +- x/mint/module.go | 8 +- 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/types/genesis.pb.go | 4 +- x/mint/types/mint.pb.go | 100 +++---- x/mint/types/minter_test.go | 2 +- x/mint/types/params_test.go | 2 +- x/mint/types/query.pb.go | 46 +-- x/pool-incentives/client/cli/query.go | 2 +- x/pool-incentives/client/cli/query_test.go | 4 +- x/pool-incentives/client/cli/tx.go | 2 +- x/pool-incentives/client/proposal_handler.go | 2 +- 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/genesis.go | 4 +- x/pool-incentives/keeper/genesis_test.go | 10 +- x/pool-incentives/keeper/gov.go | 2 +- x/pool-incentives/keeper/grpc_query.go | 8 +- x/pool-incentives/keeper/grpc_query_test.go | 8 +- x/pool-incentives/keeper/hooks.go | 4 +- x/pool-incentives/keeper/keeper.go | 10 +- x/pool-incentives/keeper/keeper_test.go | 12 +- x/pool-incentives/keeper/params.go | 2 +- x/pool-incentives/module.go | 6 +- x/pool-incentives/types/errors.go | 2 +- x/pool-incentives/types/expected_keepers.go | 8 +- x/pool-incentives/types/genesis.pb.go | 4 +- x/pool-incentives/types/genesis_test.go | 2 +- x/pool-incentives/types/gov.pb.go | 4 +- x/pool-incentives/types/gov_test.go | 2 +- x/pool-incentives/types/incentives.pb.go | 16 +- x/pool-incentives/types/incentives_test.go | 2 +- x/pool-incentives/types/query.pb.go | 22 +- x/pool-incentives/types/query_test.go | 2 +- x/pool-incentives/types/record_test.go | 2 +- x/pool-incentives/types/shared.pb.go | 38 +-- x/poolmanager/client/cli/cli_test.go | 10 +- x/poolmanager/client/cli/common.go | 2 +- x/poolmanager/client/cli/flags.go | 2 +- x/poolmanager/client/cli/query.go | 4 +- x/poolmanager/client/cli/query_test.go | 6 +- x/poolmanager/client/cli/tx.go | 6 +- x/poolmanager/client/cli/tx_test.go | 2 +- x/poolmanager/client/grpc/grpc_query.go | 4 +- x/poolmanager/client/grpcv2/grpc_query.go | 4 +- x/poolmanager/client/proposal_handler.go | 2 +- x/poolmanager/client/query_proto_wrap.go | 8 +- x/poolmanager/client/queryproto/query.pb.go | 260 ++++++++--------- x/poolmanager/client/queryprotov2/query.pb.go | 4 +- x/poolmanager/client/testutil/test_helpers.go | 6 +- x/poolmanager/create_pool.go | 2 +- x/poolmanager/create_pool_test.go | 14 +- x/poolmanager/events/emit.go | 2 +- x/poolmanager/events/emit_test.go | 6 +- x/poolmanager/export_test.go | 2 +- x/poolmanager/gov.go | 2 +- x/poolmanager/keeper.go | 2 +- x/poolmanager/keeper_test.go | 6 +- x/poolmanager/module/module.go | 20 +- x/poolmanager/msg_server.go | 2 +- x/poolmanager/msg_server_test.go | 4 +- x/poolmanager/protorev.go | 2 +- x/poolmanager/router.go | 6 +- x/poolmanager/router_test.go | 28 +- x/poolmanager/taker_fee.go | 4 +- x/poolmanager/taker_fee_test.go | 4 +- x/poolmanager/types/genesis.pb.go | 4 +- x/poolmanager/types/gov.pb.go | 4 +- x/poolmanager/types/gov_test.go | 2 +- x/poolmanager/types/keys_test.go | 2 +- x/poolmanager/types/module_route.pb.go | 4 +- x/poolmanager/types/msgs_test.go | 6 +- x/poolmanager/types/params.go | 2 +- x/poolmanager/types/swap_route.pb.go | 4 +- x/poolmanager/types/tracked_volume.pb.go | 4 +- x/poolmanager/types/tx.pb.go | 120 ++++---- x/protorev/client/cli/query.go | 2 +- x/protorev/client/cli/tx.go | 2 +- x/protorev/client/cli/utils.go | 2 +- x/protorev/keeper/developer_fees.go | 2 +- x/protorev/keeper/developer_fees_test.go | 4 +- x/protorev/keeper/emit.go | 2 +- x/protorev/keeper/emit_test.go | 4 +- x/protorev/keeper/epoch_hook.go | 2 +- x/protorev/keeper/epoch_hook_test.go | 6 +- x/protorev/keeper/genesis.go | 2 +- x/protorev/keeper/grpc_query.go | 2 +- x/protorev/keeper/grpc_query_test.go | 6 +- x/protorev/keeper/hooks.go | 4 +- x/protorev/keeper/hooks_test.go | 8 +- x/protorev/keeper/keeper.go | 2 +- x/protorev/keeper/keeper_test.go | 14 +- x/protorev/keeper/msg_server.go | 2 +- x/protorev/keeper/msg_server_test.go | 6 +- x/protorev/keeper/params.go | 2 +- x/protorev/keeper/posthandler_test.go | 8 +- x/protorev/keeper/proposal_test.go | 6 +- x/protorev/keeper/protorev.go | 4 +- x/protorev/keeper/protorev_test.go | 4 +- x/protorev/keeper/rebalance.go | 4 +- x/protorev/keeper/rebalance_test.go | 12 +- x/protorev/keeper/routes.go | 4 +- x/protorev/keeper/routes_test.go | 4 +- x/protorev/keeper/statistics.go | 4 +- x/protorev/keeper/statistics_test.go | 4 +- x/protorev/module.go | 6 +- x/protorev/proposal_handler.go | 4 +- x/protorev/types/expected_keepers.go | 4 +- x/protorev/types/genesis.pb.go | 90 +++--- x/protorev/types/genesis_test.go | 2 +- x/protorev/types/gov.pb.go | 4 +- x/protorev/types/gov_test.go | 4 +- x/protorev/types/msg_test.go | 2 +- x/protorev/types/params.pb.go | 4 +- x/protorev/types/protorev.pb.go | 74 ++--- x/protorev/types/query.pb.go | 204 ++++++------- x/protorev/types/tx.pb.go | 112 ++++---- x/smart-account/ante/ante.go | 8 +- x/smart-account/ante/ante_test.go | 12 +- x/smart-account/ante/circuit_breaker.go | 4 +- x/smart-account/ante/circuit_breaker_test.go | 6 +- x/smart-account/ante/pubkey_test.go | 6 +- x/smart-account/authenticator/base_test.go | 8 +- .../authenticator/composition_test.go | 6 +- x/smart-account/authenticator/cosmwasm.go | 2 +- .../authenticator/cosmwasm_test.go | 10 +- x/smart-account/authenticator/manager_test.go | 2 +- .../authenticator/message_filter.go | 2 +- .../authenticator/message_filter_test.go | 8 +- .../signature_authenticator_test.go | 4 +- .../authenticator/spend_limits_test.go | 16 +- x/smart-account/client/cli/query.go | 2 +- x/smart-account/client/cli/tx.go | 2 +- x/smart-account/genesis.go | 4 +- x/smart-account/integration_test.go | 14 +- x/smart-account/keeper/genesis.go | 2 +- x/smart-account/keeper/genesis_test.go | 2 +- x/smart-account/keeper/keeper.go | 4 +- x/smart-account/keeper/keeper_test.go | 6 +- x/smart-account/keeper/msg_server.go | 2 +- x/smart-account/keeper/msg_server_test.go | 6 +- x/smart-account/keeper/params.go | 2 +- x/smart-account/keeper/query.go | 2 +- x/smart-account/keeper/query_params.go | 2 +- x/smart-account/module.go | 6 +- x/smart-account/post/post.go | 8 +- x/smart-account/post/post_test.go | 10 +- .../testutils/generic_authenticator.go | 2 +- .../testutils/max_value_authenticator.go | 2 +- .../testutils/spy_authenticator.go | 2 +- .../testutils/stateful_authenticator.go | 2 +- x/smart-account/types/genesis.pb.go | 40 +-- x/smart-account/types/genesis_test.go | 2 +- x/smart-account/types/models.pb.go | 4 +- x/smart-account/types/params.pb.go | 38 +-- x/smart-account/types/query.pb.go | 28 +- x/smart-account/types/tx.pb.go | 50 ++-- x/superfluid/abci.go | 4 +- x/superfluid/client/cli/query.go | 2 +- x/superfluid/client/cli/query_test.go | 4 +- x/superfluid/client/cli/tx.go | 6 +- x/superfluid/client/proposal_handler.go | 2 +- x/superfluid/keeper/concentrated_liquidity.go | 4 +- .../keeper/concentrated_liquidity_test.go | 8 +- x/superfluid/keeper/edge_case_test.go | 2 +- x/superfluid/keeper/epoch.go | 14 +- x/superfluid/keeper/epoch_test.go | 14 +- x/superfluid/keeper/export_test.go | 6 +- x/superfluid/keeper/genesis.go | 2 +- x/superfluid/keeper/genesis_test.go | 6 +- x/superfluid/keeper/gov/gov.go | 8 +- x/superfluid/keeper/gov/gov_test.go | 12 +- x/superfluid/keeper/gov/suite_test.go | 6 +- x/superfluid/keeper/grpc_query.go | 10 +- x/superfluid/keeper/grpc_query_test.go | 4 +- x/superfluid/keeper/hooks.go | 4 +- x/superfluid/keeper/hooks_test.go | 8 +- x/superfluid/keeper/intermediary_account.go | 4 +- .../keeper/intermediary_account_test.go | 2 +- x/superfluid/keeper/internal/events/emit.go | 2 +- .../keeper/internal/events/emit_test.go | 6 +- x/superfluid/keeper/invariants.go | 2 +- x/superfluid/keeper/keeper.go | 2 +- x/superfluid/keeper/keeper_test.go | 16 +- x/superfluid/keeper/migrate.go | 8 +- x/superfluid/keeper/migrate_test.go | 16 +- x/superfluid/keeper/msg_server.go | 8 +- x/superfluid/keeper/msg_server_test.go | 18 +- x/superfluid/keeper/params.go | 2 +- x/superfluid/keeper/slash.go | 6 +- x/superfluid/keeper/slash_test.go | 10 +- x/superfluid/keeper/stake.go | 8 +- 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/synthetic_lock_wrapper.go | 2 +- x/superfluid/keeper/twap_price.go | 4 +- x/superfluid/keeper/twap_price_test.go | 4 +- x/superfluid/keeper/unpool.go | 6 +- x/superfluid/keeper/unpool_test.go | 10 +- x/superfluid/module.go | 10 +- x/superfluid/proposal_handler.go | 6 +- x/superfluid/simulation/genesis.go | 2 +- x/superfluid/simulation/operations.go | 8 +- x/superfluid/simulation/proposals.go | 6 +- x/superfluid/types/errors.go | 2 +- x/superfluid/types/expected_keepers.go | 12 +- x/superfluid/types/genesis.pb.go | 50 ++-- x/superfluid/types/gov.go | 4 +- x/superfluid/types/gov.pb.go | 4 +- x/superfluid/types/msg_test.go | 4 +- x/superfluid/types/params.pb.go | 4 +- x/superfluid/types/query.pb.go | 268 +++++++++--------- x/superfluid/types/superfluid.pb.go | 6 +- x/superfluid/types/tx.pb.go | 6 +- x/tokenfactory/client/cli/cli_test.go | 4 +- x/tokenfactory/client/cli/query.go | 2 +- x/tokenfactory/client/cli/query_test.go | 4 +- x/tokenfactory/client/cli/tx.go | 2 +- x/tokenfactory/keeper/admins.go | 2 +- x/tokenfactory/keeper/admins_test.go | 2 +- x/tokenfactory/keeper/bankactions.go | 2 +- x/tokenfactory/keeper/before_send.go | 2 +- x/tokenfactory/keeper/before_send_test.go | 2 +- x/tokenfactory/keeper/createdenom.go | 2 +- x/tokenfactory/keeper/createdenom_test.go | 4 +- x/tokenfactory/keeper/genesis.go | 2 +- x/tokenfactory/keeper/genesis_test.go | 2 +- x/tokenfactory/keeper/grpc_query.go | 2 +- x/tokenfactory/keeper/keeper.go | 2 +- x/tokenfactory/keeper/keeper_test.go | 6 +- x/tokenfactory/keeper/msg_server.go | 2 +- x/tokenfactory/keeper/msg_server_test.go | 2 +- x/tokenfactory/keeper/params.go | 2 +- x/tokenfactory/module.go | 10 +- x/tokenfactory/simulation/sim_msgs.go | 6 +- x/tokenfactory/types/authorityMetadata.pb.go | 4 +- x/tokenfactory/types/denoms_test.go | 4 +- x/tokenfactory/types/genesis.pb.go | 4 +- x/tokenfactory/types/genesis_test.go | 2 +- x/tokenfactory/types/msgs_test.go | 4 +- x/tokenfactory/types/params.pb.go | 44 +-- x/tokenfactory/types/query.pb.go | 98 +++---- x/tokenfactory/types/tx.pb.go | 112 ++++---- x/twap/api.go | 2 +- x/twap/api_test.go | 8 +- x/twap/client/cli/query.go | 6 +- x/twap/client/grpc/grpc_query.go | 4 +- x/twap/client/query_proto_wrap.go | 4 +- x/twap/client/query_proto_wrap_test.go | 6 +- x/twap/client/queryproto/query.pb.go | 98 +++---- x/twap/export_test.go | 2 +- x/twap/keeper.go | 2 +- x/twap/keeper_test.go | 6 +- x/twap/listeners.go | 6 +- x/twap/listeners_test.go | 6 +- x/twap/logic.go | 2 +- x/twap/logic_test.go | 10 +- x/twap/store.go | 2 +- x/twap/store_test.go | 8 +- x/twap/strategy.go | 4 +- x/twap/strategy_test.go | 6 +- x/twap/twapmodule/module.go | 12 +- x/twap/types/genesis.pb.go | 50 ++-- x/twap/types/twap_record.pb.go | 74 ++--- x/twap/types/twapmock/amminterface.go | 2 +- x/twap/types/utils_test.go | 2 +- x/txfees/client/cli/query.go | 4 +- x/txfees/client/cli/query_test.go | 4 +- x/txfees/client/cli/tx.go | 2 +- x/txfees/client/proposal_handler.go | 2 +- x/txfees/handler.go | 4 +- x/txfees/keeper/feedecorator.go | 6 +- x/txfees/keeper/feedecorator_test.go | 2 +- x/txfees/keeper/feetokens.go | 2 +- x/txfees/keeper/feetokens_test.go | 2 +- x/txfees/keeper/genesis.go | 2 +- x/txfees/keeper/genesis_test.go | 2 +- x/txfees/keeper/gov.go | 2 +- x/txfees/keeper/grpc_query.go | 4 +- x/txfees/keeper/hooks.go | 2 +- x/txfees/keeper/hooks_test.go | 8 +- x/txfees/keeper/keeper.go | 2 +- x/txfees/keeper/keeper_test.go | 8 +- x/txfees/keeper/msg_server.go | 2 +- x/txfees/keeper/txfee_filters/arb_tx.go | 4 +- x/txfees/keeper/txfee_filters/arb_tx_test.go | 8 +- x/txfees/keeper/txfee_filters/export_test.go | 2 +- x/txfees/module.go | 8 +- x/txfees/module_test.go | 6 +- x/txfees/types/expected_keepers.go | 2 +- x/txfees/types/feetoken.pb.go | 4 +- x/txfees/types/genesis.pb.go | 37 +-- x/txfees/types/gov.pb.go | 4 +- x/txfees/types/msgs_test.go | 4 +- x/txfees/types/params.pb.go | 6 +- x/txfees/types/query.pb.go | 26 +- x/txfees/types/tx.pb.go | 4 +- x/valset-pref/client/cli/query.go | 4 +- x/valset-pref/client/cli/query_test.go | 8 +- x/valset-pref/client/cli/tx.go | 2 +- x/valset-pref/client/grpc/grpc_query.go | 4 +- x/valset-pref/client/query_proto_wrap.go | 4 +- x/valset-pref/client/queryproto/query.pb.go | 42 +-- x/valset-pref/export_test.go | 4 +- x/valset-pref/keeper.go | 2 +- x/valset-pref/keeper_test.go | 10 +- x/valset-pref/msg_server.go | 2 +- x/valset-pref/msg_server_test.go | 6 +- x/valset-pref/simulation/sim_msgs.go | 6 +- x/valset-pref/types/expected_interfaces.go | 2 +- x/valset-pref/types/msgs_test.go | 6 +- x/valset-pref/types/state.pb.go | 4 +- x/valset-pref/types/tx.pb.go | 88 +++--- x/valset-pref/validator_set.go | 6 +- x/valset-pref/validator_set_test.go | 4 +- x/valset-pref/valpref-module/module.go | 14 +- 947 files changed, 4612 insertions(+), 4619 deletions(-) diff --git a/app/ante.go b/app/ante.go index 08cf195f4e4..14c484cfc77 100644 --- a/app/ante.go +++ b/app/ante.go @@ -15,18 +15,18 @@ import ( ante "github.com/cosmos/cosmos-sdk/x/auth/ante" "github.com/cosmos/cosmos-sdk/x/auth/signing" - osmoante "github.com/osmosis-labs/osmosis/v24/ante" - v9 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v9" + osmoante "github.com/osmosis-labs/osmosis/v25/ante" + v9 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v9" storetypes "github.com/cosmos/cosmos-sdk/store/types" - smartaccountante "github.com/osmosis-labs/osmosis/v24/x/smart-account/ante" - smartaccountkeeper "github.com/osmosis-labs/osmosis/v24/x/smart-account/keeper" + smartaccountante "github.com/osmosis-labs/osmosis/v25/x/smart-account/ante" + smartaccountkeeper "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper" auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" - txfeeskeeper "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + txfeeskeeper "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" auctionante "github.com/skip-mev/block-sdk/x/auction/ante" ) diff --git a/app/ante_no_seq.go b/app/ante_no_seq.go index b7a5b5f251f..2811a81fdf8 100644 --- a/app/ante_no_seq.go +++ b/app/ante_no_seq.go @@ -15,18 +15,18 @@ import ( ante "github.com/cosmos/cosmos-sdk/x/auth/ante" "github.com/cosmos/cosmos-sdk/x/auth/signing" - osmoante "github.com/osmosis-labs/osmosis/v24/ante" - v9 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v9" + osmoante "github.com/osmosis-labs/osmosis/v25/ante" + v9 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v9" storetypes "github.com/cosmos/cosmos-sdk/store/types" - smartaccountante "github.com/osmosis-labs/osmosis/v24/x/smart-account/ante" - smartaccountkeeper "github.com/osmosis-labs/osmosis/v24/x/smart-account/keeper" + smartaccountante "github.com/osmosis-labs/osmosis/v25/x/smart-account/ante" + smartaccountkeeper "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper" auctionkeeper "github.com/skip-mev/block-sdk/x/auction/keeper" - txfeeskeeper "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + txfeeskeeper "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" auctionante "github.com/skip-mev/block-sdk/x/auction/ante" ) diff --git a/app/app.go b/app/app.go index bbe8de73990..34efb4f48d7 100644 --- a/app/app.go +++ b/app/app.go @@ -36,16 +36,16 @@ import ( "github.com/cosmos/ibc-go/v7/modules/apps/transfer" ibc "github.com/cosmos/ibc-go/v7/modules/core" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" - concentratedtypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" + concentratedtypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/service" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/service/writelistener" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/service" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/service/writelistener" "github.com/osmosis-labs/osmosis/osmoutils" @@ -89,36 +89,36 @@ import ( authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" "github.com/cosmos/cosmos-sdk/x/crisis" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" - - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - v10 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v10" - v11 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v11" - v12 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v12" - v13 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v13" - v14 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v14" - v15 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v15" - v16 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v16" - v17 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v17" - v18 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v18" - v19 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v19" - v20 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v20" - v21 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v21" - v22 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v22" - v23 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v23" - v24 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v24" - v25 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v25" - v3 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v3" - v4 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v4" - v5 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v5" - v6 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v6" - v7 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v7" - v8 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v8" - v9 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v9" - _ "github.com/osmosis-labs/osmosis/v24/client/docs/statik" - "github.com/osmosis-labs/osmosis/v24/x/mint" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" + + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + v10 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v10" + v11 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v11" + v12 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v12" + v13 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v13" + v14 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v14" + v15 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v15" + v16 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v16" + v17 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v17" + v18 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v18" + v19 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v19" + v20 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v20" + v21 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v21" + v22 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v22" + v23 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v23" + v24 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v24" + v25 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v25" + v3 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v3" + v4 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v4" + v5 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v5" + v6 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v6" + v7 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v7" + v8 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v8" + v9 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v9" + _ "github.com/osmosis-labs/osmosis/v25/client/docs/statik" + "github.com/osmosis-labs/osmosis/v25/x/mint" blocksdkabci "github.com/skip-mev/block-sdk/abci" "github.com/skip-mev/block-sdk/abci/checktx" diff --git a/app/apptesting/concentrated_liquidity.go b/app/apptesting/concentrated_liquidity.go index bf01496a9d1..05ed65afa99 100644 --- a/app/apptesting/concentrated_liquidity.go +++ b/app/apptesting/concentrated_liquidity.go @@ -6,12 +6,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - clmath "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + clmath "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" ) type ConcentratedKeeperTestHelper struct { diff --git a/app/apptesting/cosmwasmpool.go b/app/apptesting/cosmwasmpool.go index c340f1782c0..1789e8a29ac 100644 --- a/app/apptesting/cosmwasmpool.go +++ b/app/apptesting/cosmwasmpool.go @@ -10,11 +10,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmoutils/cosmwasm" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/cosmwasm/msg" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/cosmwasm/msg/transmuter" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/cosmwasm/msg" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/cosmwasm/msg/transmuter" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model" - cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" ) const ( diff --git a/app/apptesting/gamm.go b/app/apptesting/gamm.go index fba3dff6fae..b37a5b77d12 100644 --- a/app/apptesting/gamm.go +++ b/app/apptesting/gamm.go @@ -4,11 +4,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - gammkeeper "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + gammkeeper "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) const ( diff --git a/app/apptesting/pool_manager.go b/app/apptesting/pool_manager.go index 5af75bf6b88..3992311b732 100644 --- a/app/apptesting/pool_manager.go +++ b/app/apptesting/pool_manager.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - poolmanager "github.com/osmosis-labs/osmosis/v24/x/poolmanager" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + poolmanager "github.com/osmosis-labs/osmosis/v25/x/poolmanager" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func (s *KeeperTestHelper) RunBasicSwap(poolId uint64) { diff --git a/app/apptesting/superfluid.go b/app/apptesting/superfluid.go index 1cb342ef697..d11171572bd 100644 --- a/app/apptesting/superfluid.go +++ b/app/apptesting/superfluid.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func (s *KeeperTestHelper) SuperfluidDelegateToDefaultVal(sender sdk.AccAddress, poolId uint64, lockId uint64) error { diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go index e270c8d4666..29ad19c6d94 100644 --- a/app/apptesting/test_suite.go +++ b/app/apptesting/test_suite.go @@ -32,17 +32,17 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app" + "github.com/osmosis-labs/osmosis/v25/app" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - lockupkeeper "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + lockupkeeper "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type KeeperTestHelper struct { diff --git a/app/apptesting/txfees.go b/app/apptesting/txfees.go index d4b1c58a305..8747f37c23a 100644 --- a/app/apptesting/txfees.go +++ b/app/apptesting/txfees.go @@ -12,8 +12,8 @@ import ( clienttx "github.com/cosmos/cosmos-sdk/client/tx" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) var baseGas = uint64(10000) diff --git a/app/encoding.go b/app/encoding.go index c3e000360b3..88f1be026f3 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -1,7 +1,7 @@ package app import ( - "github.com/osmosis-labs/osmosis/v24/app/params" + "github.com/osmosis-labs/osmosis/v25/app/params" "github.com/cosmos/cosmos-sdk/std" ) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 3ec57bb33f8..3ffb75f37cb 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -42,17 +42,17 @@ import ( icacontrollerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper" icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool" - cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - downtimedetector "github.com/osmosis-labs/osmosis/v24/x/downtime-detector" - downtimetypes "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm" - ibcratelimit "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit" - ibcratelimittypes "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool" + cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + downtimedetector "github.com/osmosis-labs/osmosis/v25/x/downtime-detector" + downtimetypes "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm" + ibcratelimit "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit" + ibcratelimittypes "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev" ibchooks "github.com/osmosis-labs/osmosis/x/ibc-hooks" ibchookskeeper "github.com/osmosis-labs/osmosis/x/ibc-hooks/keeper" ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types" @@ -78,39 +78,39 @@ import ( // IBC Transfer: Defines the "transfer" IBC port transfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" - smartaccountkeeper "github.com/osmosis-labs/osmosis/v24/x/smart-account/keeper" - smartaccounttypes "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" - - _ "github.com/osmosis-labs/osmosis/v24/client/docs/statik" - owasm "github.com/osmosis-labs/osmosis/v24/wasmbinding" - concentratedliquidity "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - gammkeeper "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - incentiveskeeper "github.com/osmosis-labs/osmosis/v24/x/incentives/keeper" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockupkeeper "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - mintkeeper "github.com/osmosis-labs/osmosis/v24/x/mint/keeper" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" - poolincentives "github.com/osmosis-labs/osmosis/v24/x/pool-incentives" - poolincentiveskeeper "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/keeper" - poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - protorevkeeper "github.com/osmosis-labs/osmosis/v24/x/protorev/keeper" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid" - superfluidkeeper "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" - tokenfactorykeeper "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/keeper" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" - "github.com/osmosis-labs/osmosis/v24/x/twap" - twaptypes "github.com/osmosis-labs/osmosis/v24/x/twap/types" - "github.com/osmosis-labs/osmosis/v24/x/txfees" - txfeeskeeper "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" - valsetpref "github.com/osmosis-labs/osmosis/v24/x/valset-pref" - valsetpreftypes "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" + smartaccountkeeper "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper" + smartaccounttypes "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" + + _ "github.com/osmosis-labs/osmosis/v25/client/docs/statik" + owasm "github.com/osmosis-labs/osmosis/v25/wasmbinding" + concentratedliquidity "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + gammkeeper "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + incentiveskeeper "github.com/osmosis-labs/osmosis/v25/x/incentives/keeper" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockupkeeper "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + mintkeeper "github.com/osmosis-labs/osmosis/v25/x/mint/keeper" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" + poolincentives "github.com/osmosis-labs/osmosis/v25/x/pool-incentives" + poolincentiveskeeper "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/keeper" + poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + protorevkeeper "github.com/osmosis-labs/osmosis/v25/x/protorev/keeper" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid" + superfluidkeeper "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" + tokenfactorykeeper "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/keeper" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/twap" + twaptypes "github.com/osmosis-labs/osmosis/v25/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees" + txfeeskeeper "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" + valsetpref "github.com/osmosis-labs/osmosis/v25/x/valset-pref" + valsetpreftypes "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" epochskeeper "github.com/osmosis-labs/osmosis/x/epochs/keeper" epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 3f8070fd0a0..927b059c70f 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -7,8 +7,8 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" - twaptypes "github.com/osmosis-labs/osmosis/v24/x/twap/types" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" + twaptypes "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) // GenerateKeys generates new keys (KV Store, Transient store, and memory store). diff --git a/app/keepers/modules.go b/app/keepers/modules.go index ff2a5425be0..339d8d19d37 100644 --- a/app/keepers/modules.go +++ b/app/keepers/modules.go @@ -34,35 +34,35 @@ import ( genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - smartaccount "github.com/osmosis-labs/osmosis/v24/x/smart-account" + smartaccount "github.com/osmosis-labs/osmosis/v25/x/smart-account" "github.com/skip-mev/block-sdk/x/auction" - _ "github.com/osmosis-labs/osmosis/v24/client/docs/statik" - clclient "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client" - concentratedliquidity "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/clmodule" - cwpoolclient "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/client" - cosmwasmpoolmodule "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/module" - downtimemodule "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/module" - "github.com/osmosis-labs/osmosis/v24/x/gamm" - gammclient "github.com/osmosis-labs/osmosis/v24/x/gamm/client" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/ibcratelimitmodule" - "github.com/osmosis-labs/osmosis/v24/x/incentives" - incentivesclient "github.com/osmosis-labs/osmosis/v24/x/incentives/client" - "github.com/osmosis-labs/osmosis/v24/x/lockup" - "github.com/osmosis-labs/osmosis/v24/x/mint" - poolincentives "github.com/osmosis-labs/osmosis/v24/x/pool-incentives" - poolincentivesclient "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/client" - poolmanagerclient "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client" - poolmanager "github.com/osmosis-labs/osmosis/v24/x/poolmanager/module" - "github.com/osmosis-labs/osmosis/v24/x/protorev" - superfluid "github.com/osmosis-labs/osmosis/v24/x/superfluid" - superfluidclient "github.com/osmosis-labs/osmosis/v24/x/superfluid/client" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory" - "github.com/osmosis-labs/osmosis/v24/x/twap/twapmodule" - "github.com/osmosis-labs/osmosis/v24/x/txfees" - txfeesclient "github.com/osmosis-labs/osmosis/v24/x/txfees/client" - valsetprefmodule "github.com/osmosis-labs/osmosis/v24/x/valset-pref/valpref-module" + _ "github.com/osmosis-labs/osmosis/v25/client/docs/statik" + clclient "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client" + concentratedliquidity "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/clmodule" + cwpoolclient "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/client" + cosmwasmpoolmodule "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/module" + downtimemodule "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/module" + "github.com/osmosis-labs/osmosis/v25/x/gamm" + gammclient "github.com/osmosis-labs/osmosis/v25/x/gamm/client" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/ibcratelimitmodule" + "github.com/osmosis-labs/osmosis/v25/x/incentives" + incentivesclient "github.com/osmosis-labs/osmosis/v25/x/incentives/client" + "github.com/osmosis-labs/osmosis/v25/x/lockup" + "github.com/osmosis-labs/osmosis/v25/x/mint" + poolincentives "github.com/osmosis-labs/osmosis/v25/x/pool-incentives" + poolincentivesclient "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/client" + poolmanagerclient "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client" + poolmanager "github.com/osmosis-labs/osmosis/v25/x/poolmanager/module" + "github.com/osmosis-labs/osmosis/v25/x/protorev" + superfluid "github.com/osmosis-labs/osmosis/v25/x/superfluid" + superfluidclient "github.com/osmosis-labs/osmosis/v25/x/superfluid/client" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory" + "github.com/osmosis-labs/osmosis/v25/x/twap/twapmodule" + "github.com/osmosis-labs/osmosis/v25/x/txfees" + txfeesclient "github.com/osmosis-labs/osmosis/v25/x/txfees/client" + valsetprefmodule "github.com/osmosis-labs/osmosis/v25/x/valset-pref/valpref-module" "github.com/osmosis-labs/osmosis/x/epochs" ibc_hooks "github.com/osmosis-labs/osmosis/x/ibc-hooks" ) diff --git a/app/modules.go b/app/modules.go index 7a8b2882c48..a631d37c5d6 100644 --- a/app/modules.go +++ b/app/modules.go @@ -30,8 +30,8 @@ import ( icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types" - downtimemodule "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/module" - downtimetypes "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types" + downtimemodule "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/module" + downtimetypes "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types" ibc_hooks "github.com/osmosis-labs/osmosis/x/ibc-hooks" @@ -68,42 +68,42 @@ import ( auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" "github.com/osmosis-labs/osmosis/osmoutils/partialord" - smartaccount "github.com/osmosis-labs/osmosis/v24/x/smart-account" - smartaccounttypes "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + smartaccount "github.com/osmosis-labs/osmosis/v25/x/smart-account" + smartaccounttypes "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - _ "github.com/osmosis-labs/osmosis/v24/client/docs/statik" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - concentratedliquidity "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/clmodule" - concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - cwpoolmodule "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/module" - cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/ibcratelimitmodule" - ibcratelimittypes "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" - "github.com/osmosis-labs/osmosis/v24/x/incentives" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - "github.com/osmosis-labs/osmosis/v24/x/lockup" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/mint" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" - poolincentives "github.com/osmosis-labs/osmosis/v24/x/pool-incentives" - poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - poolmanager "github.com/osmosis-labs/osmosis/v24/x/poolmanager/module" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" - superfluid "github.com/osmosis-labs/osmosis/v24/x/superfluid" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" - "github.com/osmosis-labs/osmosis/v24/x/twap/twapmodule" - twaptypes "github.com/osmosis-labs/osmosis/v24/x/twap/types" - "github.com/osmosis-labs/osmosis/v24/x/txfees" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" - valsetpreftypes "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" - valsetprefmodule "github.com/osmosis-labs/osmosis/v24/x/valset-pref/valpref-module" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + _ "github.com/osmosis-labs/osmosis/v25/client/docs/statik" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + concentratedliquidity "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/clmodule" + concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + cwpoolmodule "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/module" + cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/ibcratelimitmodule" + ibcratelimittypes "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/mint" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" + poolincentives "github.com/osmosis-labs/osmosis/v25/x/pool-incentives" + poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + poolmanager "github.com/osmosis-labs/osmosis/v25/x/poolmanager/module" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" + superfluid "github.com/osmosis-labs/osmosis/v25/x/superfluid" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/twap/twapmodule" + twaptypes "github.com/osmosis-labs/osmosis/v25/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" + valsetpreftypes "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" + valsetprefmodule "github.com/osmosis-labs/osmosis/v25/x/valset-pref/valpref-module" "github.com/osmosis-labs/osmosis/x/epochs" epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/app/posthandler.go b/app/posthandler.go index aaf90788fe7..548c11a5068 100644 --- a/app/posthandler.go +++ b/app/posthandler.go @@ -5,10 +5,10 @@ import ( authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" - smartaccountkeeper "github.com/osmosis-labs/osmosis/v24/x/smart-account/keeper" - smartaccountpost "github.com/osmosis-labs/osmosis/v24/x/smart-account/post" + smartaccountkeeper "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper" + smartaccountpost "github.com/osmosis-labs/osmosis/v25/x/smart-account/post" - protorevkeeper "github.com/osmosis-labs/osmosis/v24/x/protorev/keeper" + protorevkeeper "github.com/osmosis-labs/osmosis/v25/x/protorev/keeper" ) func NewPostHandler( diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 6e9d6828819..b5cc4d29f03 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/keepers" ) // BaseAppParamManager defines an interrace that BaseApp is expected to fulfill diff --git a/app/upgrades/v10/constants.go b/app/upgrades/v10/constants.go index 51fa674e8a5..aa899a04947 100644 --- a/app/upgrades/v10/constants.go +++ b/app/upgrades/v10/constants.go @@ -1,7 +1,7 @@ package v10 import ( - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" ) // Last executed block on the v9 code was 4713064. diff --git a/app/upgrades/v10/fork.go b/app/upgrades/v10/fork.go index 1864803ba37..a281d796bd5 100644 --- a/app/upgrades/v10/fork.go +++ b/app/upgrades/v10/fork.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/keepers" ) func RunForkLogic(ctx sdk.Context, appKeepers *keepers.AppKeepers) { diff --git a/app/upgrades/v10/upgrades_test.go b/app/upgrades/v10/upgrades_test.go index c27017e77f7..e8d52e3050d 100644 --- a/app/upgrades/v10/upgrades_test.go +++ b/app/upgrades/v10/upgrades_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - v10 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v10" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + v10 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v10" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v11/constants.go b/app/upgrades/v11/constants.go index f8ccee49d5c..c24ae99169a 100644 --- a/app/upgrades/v11/constants.go +++ b/app/upgrades/v11/constants.go @@ -3,7 +3,7 @@ package v11 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the Osmosis v11 upgrade. diff --git a/app/upgrades/v11/upgrades.go b/app/upgrades/v11/upgrades.go index c10fbef9db4..a67c2912850 100644 --- a/app/upgrades/v11/upgrades.go +++ b/app/upgrades/v11/upgrades.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v12/constants.go b/app/upgrades/v12/constants.go index 3a94468cc00..8ecefeb7bc7 100644 --- a/app/upgrades/v12/constants.go +++ b/app/upgrades/v12/constants.go @@ -1,8 +1,8 @@ package v12 import ( - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - twaptypes "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + twaptypes "github.com/osmosis-labs/osmosis/v25/x/twap/types" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v12/upgrade_test.go b/app/upgrades/v12/upgrade_test.go index 5d3510fa75d..e43aeb9c71f 100644 --- a/app/upgrades/v12/upgrade_test.go +++ b/app/upgrades/v12/upgrade_test.go @@ -8,7 +8,7 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v12/upgrades.go b/app/upgrades/v12/upgrades.go index 36381f46d48..3722c5b03d0 100644 --- a/app/upgrades/v12/upgrades.go +++ b/app/upgrades/v12/upgrades.go @@ -11,12 +11,12 @@ import ( icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - twaptypes "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + twaptypes "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) // We set the app version to pre-upgrade because it will be incremented by one diff --git a/app/upgrades/v13/constants.go b/app/upgrades/v13/constants.go index 33243dea270..a9610766a1a 100644 --- a/app/upgrades/v13/constants.go +++ b/app/upgrades/v13/constants.go @@ -3,7 +3,7 @@ package v13 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the Osmosis v13 upgrade. diff --git a/app/upgrades/v13/upgrade_test.go b/app/upgrades/v13/upgrade_test.go index 0dcc17680ff..f0a15473783 100644 --- a/app/upgrades/v13/upgrade_test.go +++ b/app/upgrades/v13/upgrade_test.go @@ -6,14 +6,14 @@ import ( ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types" - ibcratelimittypes "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" + ibcratelimittypes "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/store/prefix" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v13/upgrades.go b/app/upgrades/v13/upgrades.go index 8ced63ebd37..e816ec3d476 100644 --- a/app/upgrades/v13/upgrades.go +++ b/app/upgrades/v13/upgrades.go @@ -13,10 +13,10 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - ibcratelimittypes "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + ibcratelimittypes "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) //go:embed rate_limiter.wasm diff --git a/app/upgrades/v14/constants.go b/app/upgrades/v14/constants.go index a68be0300b2..3684cc19c79 100644 --- a/app/upgrades/v14/constants.go +++ b/app/upgrades/v14/constants.go @@ -5,8 +5,8 @@ import ( ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - downtimetypes "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + downtimetypes "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types" ) // UpgradeName defines the on-chain upgrade name for the Osmosis v14 upgrade. diff --git a/app/upgrades/v14/upgrades.go b/app/upgrades/v14/upgrades.go index 38df34a7b20..b827f887a1a 100644 --- a/app/upgrades/v14/upgrades.go +++ b/app/upgrades/v14/upgrades.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v15/constants.go b/app/upgrades/v15/constants.go index a966db1ebac..fa7cc2f24a2 100644 --- a/app/upgrades/v15/constants.go +++ b/app/upgrades/v15/constants.go @@ -5,10 +5,10 @@ import ( packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" - valsetpreftypes "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" + valsetpreftypes "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" ) // UpgradeName defines the on-chain upgrade name for the Osmosis v15 upgrade. diff --git a/app/upgrades/v15/export_test.go b/app/upgrades/v15/export_test.go index d25b2e74e66..2258ea8a617 100644 --- a/app/upgrades/v15/export_test.go +++ b/app/upgrades/v15/export_test.go @@ -6,12 +6,12 @@ import ( authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" icqkeeper "github.com/cosmos/ibc-apps/modules/async-icq/v7/keeper" - ibcratelimit "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit" + ibcratelimit "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - gammkeeper "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager" + gammkeeper "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager" ) func MigrateNextPoolId(ctx sdk.Context, gammKeeper *gammkeeper.Keeper, poolmanager *poolmanager.Keeper) { diff --git a/app/upgrades/v15/upgrade_test.go b/app/upgrades/v15/upgrade_test.go index 4334ad8bb8f..25b3b1bf28c 100644 --- a/app/upgrades/v15/upgrade_test.go +++ b/app/upgrades/v15/upgrade_test.go @@ -14,15 +14,15 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - ibcratelimittypes "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" + ibcratelimittypes "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - v15 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v15" - gamm "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - balancer "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + v15 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v15" + gamm "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + balancer "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v15/upgrades.go b/app/upgrades/v15/upgrades.go index c9bec5658cd..91664154e89 100644 --- a/app/upgrades/v15/upgrades.go +++ b/app/upgrades/v15/upgrades.go @@ -3,7 +3,7 @@ package v15 import ( packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" sdk "github.com/cosmos/cosmos-sdk/types" @@ -15,19 +15,19 @@ import ( icqkeeper "github.com/cosmos/ibc-apps/modules/async-icq/v7/keeper" icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types" - "github.com/osmosis-labs/osmosis/v24/wasmbinding" - ibcratelimit "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit" - ibcratelimittypes "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" + "github.com/osmosis-labs/osmosis/v25/wasmbinding" + ibcratelimit "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit" + ibcratelimittypes "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - gammkeeper "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + gammkeeper "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v16/constants.go b/app/upgrades/v16/constants.go index 6398ca7d924..0bfbccbb62c 100644 --- a/app/upgrades/v16/constants.go +++ b/app/upgrades/v16/constants.go @@ -1,12 +1,12 @@ package v16 import ( - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" ) // UpgradeName defines the on-chain upgrade name for the Osmosis v16 upgrade. diff --git a/app/upgrades/v16/export_test.go b/app/upgrades/v16/export_test.go index 92688a95229..baa12cb4246 100644 --- a/app/upgrades/v16/export_test.go +++ b/app/upgrades/v16/export_test.go @@ -3,7 +3,7 @@ package v16 import ( sdk "github.com/cosmos/cosmos-sdk/types" - tokenfactorykeeper "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/keeper" + tokenfactorykeeper "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/keeper" ) var ( diff --git a/app/upgrades/v16/upgrades.go b/app/upgrades/v16/upgrades.go index ebb05ce023f..9b050afda10 100644 --- a/app/upgrades/v16/upgrades.go +++ b/app/upgrades/v16/upgrades.go @@ -9,17 +9,17 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" cosmwasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" - tokenfactorykeeper "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/keeper" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" + tokenfactorykeeper "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/keeper" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) const ( diff --git a/app/upgrades/v16/upgrades_test.go b/app/upgrades/v16/upgrades_test.go index 40a3086270a..8b3d2c5b24d 100644 --- a/app/upgrades/v16/upgrades_test.go +++ b/app/upgrades/v16/upgrades_test.go @@ -15,12 +15,12 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - v16 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v16" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + v16 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v16" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) var ( diff --git a/app/upgrades/v17/constants.go b/app/upgrades/v17/constants.go index 6c4612631e3..5687f057870 100644 --- a/app/upgrades/v17/constants.go +++ b/app/upgrades/v17/constants.go @@ -7,16 +7,16 @@ import ( errorsmod "cosmossdk.io/errors" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolManagerTypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolManagerTypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" store "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/keepers" ) // UpgradeName defines the on-chain upgrade name for the Osmosis v17 upgrade. diff --git a/app/upgrades/v17/upgrades.go b/app/upgrades/v17/upgrades.go index fecf1c599ab..421ba12b972 100644 --- a/app/upgrades/v17/upgrades.go +++ b/app/upgrades/v17/upgrades.go @@ -15,16 +15,16 @@ import ( distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // clPoolCreationInfo encapsulates the returns from CL pool diff --git a/app/upgrades/v17/upgrades_test.go b/app/upgrades/v17/upgrades_test.go index 77dbf273de6..66d70734d15 100644 --- a/app/upgrades/v17/upgrades_test.go +++ b/app/upgrades/v17/upgrades_test.go @@ -15,13 +15,13 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - v17 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v17" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + v17 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v17" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v18/constants.go b/app/upgrades/v18/constants.go index 63a5254189c..f6ce84d2ba7 100644 --- a/app/upgrades/v18/constants.go +++ b/app/upgrades/v18/constants.go @@ -1,7 +1,7 @@ package v18 import ( - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v18/upgrades.go b/app/upgrades/v18/upgrades.go index c457ddfc4b2..93f9d2c14e6 100644 --- a/app/upgrades/v18/upgrades.go +++ b/app/upgrades/v18/upgrades.go @@ -5,10 +5,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" ) // OSMO / DAI CL pool ID diff --git a/app/upgrades/v18/upgrades_test.go b/app/upgrades/v18/upgrades_test.go index a1faa48bdcf..e42dc046d41 100644 --- a/app/upgrades/v18/upgrades_test.go +++ b/app/upgrades/v18/upgrades_test.go @@ -14,13 +14,13 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - v17 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v17" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + v17 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v17" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v19/constants.go b/app/upgrades/v19/constants.go index dcea0a9726d..87c70d0c0a3 100644 --- a/app/upgrades/v19/constants.go +++ b/app/upgrades/v19/constants.go @@ -1,7 +1,7 @@ package v19 import ( - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v19/upgrades.go b/app/upgrades/v19/upgrades.go index 7cea7ea0dc8..582268a6d8b 100644 --- a/app/upgrades/v19/upgrades.go +++ b/app/upgrades/v19/upgrades.go @@ -6,13 +6,13 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/osmosis-labs/osmosis/osmomath" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" - v18 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v18" + v18 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v18" ) const lastPoolToCorrect = v18.FirstCLPoolId - 1 diff --git a/app/upgrades/v19/upgrades_test.go b/app/upgrades/v19/upgrades_test.go index 1c2d29cc10f..138494941be 100644 --- a/app/upgrades/v19/upgrades_test.go +++ b/app/upgrades/v19/upgrades_test.go @@ -14,10 +14,10 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) const ( diff --git a/app/upgrades/v20/constants.go b/app/upgrades/v20/constants.go index d0fe031199b..70133e6ca81 100644 --- a/app/upgrades/v20/constants.go +++ b/app/upgrades/v20/constants.go @@ -1,7 +1,7 @@ package v20 import ( - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v20/export_test.go b/app/upgrades/v20/export_test.go index 563ce1a253f..e8f312643bc 100644 --- a/app/upgrades/v20/export_test.go +++ b/app/upgrades/v20/export_test.go @@ -3,7 +3,7 @@ package v20 import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/keepers" ) func CreateGroupsForIncentivePairs(ctx sdk.Context, keepers *keepers.AppKeepers) error { diff --git a/app/upgrades/v20/upgrades.go b/app/upgrades/v20/upgrades.go index b4793b0d61e..5f15ecbe0b2 100644 --- a/app/upgrades/v20/upgrades.go +++ b/app/upgrades/v20/upgrades.go @@ -8,13 +8,13 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - poolincenitvestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + poolincenitvestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type IncentivizedCFMMDirectWhenMigrationLinkPresentError struct { diff --git a/app/upgrades/v20/upgrades_test.go b/app/upgrades/v20/upgrades_test.go index f9409c425a5..40eac9b53d1 100644 --- a/app/upgrades/v20/upgrades_test.go +++ b/app/upgrades/v20/upgrades_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - v20 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v20" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" - poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + v20 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v20" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" + poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v21/constants.go b/app/upgrades/v21/constants.go index b6fde1fd706..cf1b0d3d087 100644 --- a/app/upgrades/v21/constants.go +++ b/app/upgrades/v21/constants.go @@ -1,7 +1,7 @@ package v21 import ( - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types" diff --git a/app/upgrades/v21/upgrades.go b/app/upgrades/v21/upgrades.go index 53e5b6a1bb4..5c1fcbda17d 100644 --- a/app/upgrades/v21/upgrades.go +++ b/app/upgrades/v21/upgrades.go @@ -14,19 +14,19 @@ import ( icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" - twaptypes "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" + twaptypes "github.com/osmosis-labs/osmosis/v25/x/twap/types" // SDK v47 modules authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/app/upgrades/v21/upgrades_test.go b/app/upgrades/v21/upgrades_test.go index 6e0f055cc08..7a839e9ebce 100644 --- a/app/upgrades/v21/upgrades_test.go +++ b/app/upgrades/v21/upgrades_test.go @@ -7,17 +7,17 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - v21 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v21" + v21 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v21" abci "github.com/cometbft/cometbft/abci/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" sdk "github.com/cosmos/cosmos-sdk/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) const ( diff --git a/app/upgrades/v22/constants.go b/app/upgrades/v22/constants.go index 05679567e8a..d18f3d9a31e 100644 --- a/app/upgrades/v22/constants.go +++ b/app/upgrades/v22/constants.go @@ -1,7 +1,7 @@ package v22 import ( - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v22/upgrades.go b/app/upgrades/v22/upgrades.go index f4dde652ee4..a02ade0db6f 100644 --- a/app/upgrades/v22/upgrades.go +++ b/app/upgrades/v22/upgrades.go @@ -7,8 +7,8 @@ import ( tmtypes "github.com/cometbft/cometbft/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v22/upgrades_test.go b/app/upgrades/v22/upgrades_test.go index 83f881cc4de..50e35cc205a 100644 --- a/app/upgrades/v22/upgrades_test.go +++ b/app/upgrades/v22/upgrades_test.go @@ -11,12 +11,12 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" sdk "github.com/cosmos/cosmos-sdk/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) const ( diff --git a/app/upgrades/v23/constants.go b/app/upgrades/v23/constants.go index c20171eded1..5a9d2d0ed4c 100644 --- a/app/upgrades/v23/constants.go +++ b/app/upgrades/v23/constants.go @@ -1,7 +1,7 @@ package v23 import ( - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v23/upgrades.go b/app/upgrades/v23/upgrades.go index 9b5c55324e6..e3c55403fda 100644 --- a/app/upgrades/v23/upgrades.go +++ b/app/upgrades/v23/upgrades.go @@ -9,12 +9,12 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - concentratedliquidity "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - concentratedtypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + concentratedliquidity "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + concentratedtypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) const ( diff --git a/app/upgrades/v23/upgrades_test.go b/app/upgrades/v23/upgrades_test.go index 7fa2b7789a1..7ddb2d4ccf9 100644 --- a/app/upgrades/v23/upgrades_test.go +++ b/app/upgrades/v23/upgrades_test.go @@ -12,9 +12,9 @@ import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" - concentratedtypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + concentratedtypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) const ( diff --git a/app/upgrades/v24/constants.go b/app/upgrades/v24/constants.go index 9ceaf414f77..83f9a369cb7 100644 --- a/app/upgrades/v24/constants.go +++ b/app/upgrades/v24/constants.go @@ -4,7 +4,7 @@ import ( ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v24/upgrades.go b/app/upgrades/v24/upgrades.go index e6114f33e12..025a8d0452b 100644 --- a/app/upgrades/v24/upgrades.go +++ b/app/upgrades/v24/upgrades.go @@ -8,13 +8,13 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - concentratedliquidity "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - concentratedtypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - cwpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + concentratedliquidity "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + concentratedtypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + cwpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) const ( diff --git a/app/upgrades/v24/upgrades_test.go b/app/upgrades/v24/upgrades_test.go index 324850dea4d..ac4c210e418 100644 --- a/app/upgrades/v24/upgrades_test.go +++ b/app/upgrades/v24/upgrades_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model" - cwpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model" + cwpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" "github.com/stretchr/testify/suite" @@ -18,15 +18,15 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - - v24 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v24" - concentratedtypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" - twap "github.com/osmosis-labs/osmosis/v24/x/twap" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" - twaptypes "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + + v24 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v24" + concentratedtypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" + twap "github.com/osmosis-labs/osmosis/v25/x/twap" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" + twaptypes "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) const ( diff --git a/app/upgrades/v25/constants.go b/app/upgrades/v25/constants.go index 66c76556059..ac6276bfe53 100644 --- a/app/upgrades/v25/constants.go +++ b/app/upgrades/v25/constants.go @@ -2,13 +2,13 @@ package v25 import ( "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" auctiontypes "github.com/skip-mev/block-sdk/x/auction/types" - smartaccounttypes "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + smartaccounttypes "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) // UpgradeName defines the on-chain upgrade name for the Osmosis v25 upgrade. diff --git a/app/upgrades/v25/upgrades.go b/app/upgrades/v25/upgrades.go index 5e6371c08b3..1e4684e757e 100644 --- a/app/upgrades/v25/upgrades.go +++ b/app/upgrades/v25/upgrades.go @@ -11,11 +11,11 @@ import ( slashing "github.com/cosmos/cosmos-sdk/x/slashing/keeper" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" - concentratedliquidity "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - concentratedtypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + concentratedliquidity "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + concentratedtypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) const ( diff --git a/app/upgrades/v25/upgrades_test.go b/app/upgrades/v25/upgrades_test.go index c0909d0acea..cd7f6ee25a9 100644 --- a/app/upgrades/v25/upgrades_test.go +++ b/app/upgrades/v25/upgrades_test.go @@ -14,9 +14,9 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - v25 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v25" - concentratedtypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + v25 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v25" + concentratedtypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) const ( diff --git a/app/upgrades/v3/constants.go b/app/upgrades/v3/constants.go index ea1b52b9af6..c7d3870d02d 100644 --- a/app/upgrades/v3/constants.go +++ b/app/upgrades/v3/constants.go @@ -1,6 +1,6 @@ package v3 -import "github.com/osmosis-labs/osmosis/v24/app/upgrades" +import "github.com/osmosis-labs/osmosis/v25/app/upgrades" const ( // UpgradeName defines the on-chain upgrade name for the Osmosis v3 upgrade. diff --git a/app/upgrades/v3/forks.go b/app/upgrades/v3/forks.go index d12aa613bbc..cb0490121c8 100644 --- a/app/upgrades/v3/forks.go +++ b/app/upgrades/v3/forks.go @@ -5,7 +5,7 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/osmosis-labs/osmosis/v24/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/keepers" ) // RunForkLogic executes height-gated on-chain fork logic for the Osmosis v3 diff --git a/app/upgrades/v4/constants.go b/app/upgrades/v4/constants.go index 0ffd680db4c..a306f4b7c88 100644 --- a/app/upgrades/v4/constants.go +++ b/app/upgrades/v4/constants.go @@ -1,7 +1,7 @@ package v4 import ( - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v4/upgrade_test.go b/app/upgrades/v4/upgrade_test.go index d4719b219fa..6ce11d94f8b 100644 --- a/app/upgrades/v4/upgrade_test.go +++ b/app/upgrades/v4/upgrade_test.go @@ -11,8 +11,8 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app" - v4 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v4" + "github.com/osmosis-labs/osmosis/v25/app" + v4 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v4" sdk "github.com/cosmos/cosmos-sdk/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index 73ecfc0f082..7f0309bc6fc 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" ) // CreateUpgradeHandler returns an x/upgrade handler for the Osmosis v4 on-chain diff --git a/app/upgrades/v5/constants.go b/app/upgrades/v5/constants.go index cc4bae5e099..7b880027f3b 100644 --- a/app/upgrades/v5/constants.go +++ b/app/upgrades/v5/constants.go @@ -1,7 +1,7 @@ package v5 import ( - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v5/upgrades.go b/app/upgrades/v5/upgrades.go index 057c836f13f..4eb41ad6321 100644 --- a/app/upgrades/v5/upgrades.go +++ b/app/upgrades/v5/upgrades.go @@ -10,9 +10,9 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v5/whitelist_feetokens.go b/app/upgrades/v5/whitelist_feetokens.go index 2031111d944..d294072842d 100644 --- a/app/upgrades/v5/whitelist_feetokens.go +++ b/app/upgrades/v5/whitelist_feetokens.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammkeeper "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + gammkeeper "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) // Every asset with a liquid osmo pairing pool on Osmosis, as of 12/01/21 diff --git a/app/upgrades/v6/constants.go b/app/upgrades/v6/constants.go index 31c201dd985..e8305781522 100644 --- a/app/upgrades/v6/constants.go +++ b/app/upgrades/v6/constants.go @@ -1,6 +1,6 @@ package v6 -import "github.com/osmosis-labs/osmosis/v24/app/upgrades" +import "github.com/osmosis-labs/osmosis/v25/app/upgrades" const ( // UpgradeName defines the on-chain upgrade name for the Osmosis v6 upgrade. diff --git a/app/upgrades/v6/forks.go b/app/upgrades/v6/forks.go index 78d206f03c6..0b9b4c7ff46 100644 --- a/app/upgrades/v6/forks.go +++ b/app/upgrades/v6/forks.go @@ -3,7 +3,7 @@ package v6 import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/keepers" ) // RunForkLogic executes height-gated on-chain fork logic for the Osmosis v6 diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go index df4dcac0fd3..7a25aba6977 100644 --- a/app/upgrades/v7/constants.go +++ b/app/upgrades/v7/constants.go @@ -3,8 +3,8 @@ package v7 import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go index c932719e077..4af75cb2b94 100644 --- a/app/upgrades/v7/upgrades.go +++ b/app/upgrades/v7/upgrades.go @@ -7,10 +7,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - lockupkeeper "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + lockupkeeper "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v8/constants.go b/app/upgrades/v8/constants.go index 439b3be8f60..c573e65f567 100644 --- a/app/upgrades/v8/constants.go +++ b/app/upgrades/v8/constants.go @@ -1,8 +1,8 @@ package v8 import ( - "github.com/osmosis-labs/osmosis/v24/app/upgrades" - v8constants "github.com/osmosis-labs/osmosis/v24/app/upgrades/v8/constants" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" + v8constants "github.com/osmosis-labs/osmosis/v25/app/upgrades/v8/constants" ) const ( diff --git a/app/upgrades/v8/forks.go b/app/upgrades/v8/forks.go index 181e1a57aa3..9273719fcde 100644 --- a/app/upgrades/v8/forks.go +++ b/app/upgrades/v8/forks.go @@ -3,7 +3,7 @@ package v8 import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/keepers" ) // RunForkLogic executes height-gated on-chain fork logic for the Osmosis v8 diff --git a/app/upgrades/v8/incentive_props.go b/app/upgrades/v8/incentive_props.go index 4544ea4957f..da04feba9f7 100644 --- a/app/upgrades/v8/incentive_props.go +++ b/app/upgrades/v8/incentive_props.go @@ -5,8 +5,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - poolincentiveskeeper "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/keeper" - poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + poolincentiveskeeper "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/keeper" + poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) // This file implements logic for accelerated incentive proposals. diff --git a/app/upgrades/v8/msg_filter_ante.go b/app/upgrades/v8/msg_filter_ante.go index 283fd034cbc..820ae28ee8a 100644 --- a/app/upgrades/v8/msg_filter_ante.go +++ b/app/upgrades/v8/msg_filter_ante.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) // MsgFilterDecorator defines an AnteHandler decorator for the v8 upgrade that diff --git a/app/upgrades/v8/msg_filter_ante_test.go b/app/upgrades/v8/msg_filter_ante_test.go index 139031a3fb4..c78b161aa3c 100644 --- a/app/upgrades/v8/msg_filter_ante_test.go +++ b/app/upgrades/v8/msg_filter_ante_test.go @@ -7,9 +7,9 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/app" - v8 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v8" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/app" + v8 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v8" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func noOpAnteDecorator() sdk.AnteHandler { diff --git a/app/upgrades/v8/unpool_whitelist.go b/app/upgrades/v8/unpool_whitelist.go index 56ddebc4b6c..951899b5bd2 100644 --- a/app/upgrades/v8/unpool_whitelist.go +++ b/app/upgrades/v8/unpool_whitelist.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammkeeper "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - superfluidkeeper "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" + gammkeeper "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + superfluidkeeper "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" ) const ustDenom = "ibc/BE1BB42D4BE3C30D50B68D7C41DB4DFCE9678E8EF8C539F6E6A9345048894FCC" diff --git a/app/upgrades/v9/constants.go b/app/upgrades/v9/constants.go index cf980502e9d..89944802073 100644 --- a/app/upgrades/v9/constants.go +++ b/app/upgrades/v9/constants.go @@ -1,13 +1,13 @@ package v9 import ( - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) // UpgradeName defines the on-chain upgrade name for the Osmosis v9 upgrade. diff --git a/app/upgrades/v9/msg_filter_ante_test.go b/app/upgrades/v9/msg_filter_ante_test.go index cb548bd531b..80841f0cc8e 100644 --- a/app/upgrades/v9/msg_filter_ante_test.go +++ b/app/upgrades/v9/msg_filter_ante_test.go @@ -9,9 +9,9 @@ import ( ibcchanneltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/osmosis-labs/osmosis/v24/app" - v8 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v8" - v9 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v9" + "github.com/osmosis-labs/osmosis/v25/app" + v8 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v8" + v9 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v9" ) func noOpAnteDecorator() sdk.AnteHandler { diff --git a/app/upgrades/v9/prop214.go b/app/upgrades/v9/prop214.go index b0e9f65daaf..17aaf6f02a9 100644 --- a/app/upgrades/v9/prop214.go +++ b/app/upgrades/v9/prop214.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - gammkeeper "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" + gammkeeper "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" ) // Executes prop214, https://www.mintscan.io/osmosis/proposals/214 diff --git a/app/upgrades/v9/prop214_test.go b/app/upgrades/v9/prop214_test.go index 464e7c9327a..ae303b13435 100644 --- a/app/upgrades/v9/prop214_test.go +++ b/app/upgrades/v9/prop214_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - v9 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v9" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + v9 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v9" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go index de85ac45ca0..c048451ab86 100644 --- a/app/upgrades/v9/upgrades.go +++ b/app/upgrades/v9/upgrades.go @@ -10,15 +10,15 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts" icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" - "github.com/osmosis-labs/osmosis/v24/app/keepers" - "github.com/osmosis-labs/osmosis/v24/app/upgrades" + "github.com/osmosis-labs/osmosis/v25/app/keepers" + "github.com/osmosis-labs/osmosis/v25/app/upgrades" ) const preUpgradeAppVersion = 8 diff --git a/cmd/osmosisd/cmd/balances_from_state_export.go b/cmd/osmosisd/cmd/balances_from_state_export.go index 882e614ef78..8bfef9075b5 100644 --- a/cmd/osmosisd/cmd/balances_from_state_export.go +++ b/cmd/osmosisd/cmd/balances_from_state_export.go @@ -14,9 +14,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/server" diff --git a/cmd/osmosisd/cmd/change_environment.go b/cmd/osmosisd/cmd/change_environment.go index 331af424f8b..34ceeab627f 100644 --- a/cmd/osmosisd/cmd/change_environment.go +++ b/cmd/osmosisd/cmd/change_environment.go @@ -11,7 +11,7 @@ import ( "github.com/joho/godotenv" "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v24/app" + "github.com/osmosis-labs/osmosis/v25/app" ) const ( diff --git a/cmd/osmosisd/cmd/genesis.go b/cmd/osmosisd/cmd/genesis.go index cc348739ed3..04d0d751ad3 100644 --- a/cmd/osmosisd/cmd/genesis.go +++ b/cmd/osmosisd/cmd/genesis.go @@ -26,11 +26,11 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/cmd/osmosisd/cmd/init.go b/cmd/osmosisd/cmd/init.go index 35624cde88c..0bd46374cf0 100644 --- a/cmd/osmosisd/cmd/init.go +++ b/cmd/osmosisd/cmd/init.go @@ -29,7 +29,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/genutil" - "github.com/osmosis-labs/osmosis/v24/app" + "github.com/osmosis-labs/osmosis/v25/app" ) const ( diff --git a/cmd/osmosisd/cmd/root.go b/cmd/osmosisd/cmd/root.go index 316b180be6a..2573b328453 100644 --- a/cmd/osmosisd/cmd/root.go +++ b/cmd/osmosisd/cmd/root.go @@ -18,9 +18,9 @@ import ( cometbftdb "github.com/cometbft/cometbft-db" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/params" - v23 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v23" // should be automated to be updated to current version every upgrade - "github.com/osmosis-labs/osmosis/v24/ingest/sqs" + "github.com/osmosis-labs/osmosis/v25/app/params" + v23 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v23" // should be automated to be updated to current version every upgrade + "github.com/osmosis-labs/osmosis/v25/ingest/sqs" tmcfg "github.com/cometbft/cometbft/config" "github.com/cometbft/cometbft/crypto" @@ -65,7 +65,7 @@ import ( "github.com/joho/godotenv" - osmosis "github.com/osmosis-labs/osmosis/v24/app" + osmosis "github.com/osmosis-labs/osmosis/v25/app" ) type AssetList struct { diff --git a/cmd/osmosisd/cmd/stargate-query.go b/cmd/osmosisd/cmd/stargate-query.go index 6e0851f8682..4512a953c52 100644 --- a/cmd/osmosisd/cmd/stargate-query.go +++ b/cmd/osmosisd/cmd/stargate-query.go @@ -14,7 +14,7 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/wasmbinding" + "github.com/osmosis-labs/osmosis/v25/wasmbinding" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" @@ -24,17 +24,17 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - concentratedliquidityquery "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/queryproto" - downtimequerytypes "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client/queryproto" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryproto" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" - twapquerytypes "github.com/osmosis-labs/osmosis/v24/x/twap/client/queryproto" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + concentratedliquidityquery "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/queryproto" + downtimequerytypes "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client/queryproto" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryproto" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" + twapquerytypes "github.com/osmosis-labs/osmosis/v25/x/twap/client/queryproto" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/cmd/osmosisd/main.go b/cmd/osmosisd/main.go index e30e1b10e5e..766e7113052 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/v24/app" - "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/cmd/osmosisd/cmd" + osmosis "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/cmd/osmosisd/cmd" ) func main() { diff --git a/cmd/querygen/main.go b/cmd/querygen/main.go index e956f06104a..02aecd595c7 100644 --- a/cmd/querygen/main.go +++ b/cmd/querygen/main.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" - "github.com/osmosis-labs/osmosis/v24/cmd/querygen/templates" + "github.com/osmosis-labs/osmosis/v25/cmd/querygen/templates" ) const V2 = "v2" diff --git a/cmd/querygen/templates/queryyml.go b/cmd/querygen/templates/queryyml.go index 6089552ee19..a1191106c0c 100644 --- a/cmd/querygen/templates/queryyml.go +++ b/cmd/querygen/templates/queryyml.go @@ -10,7 +10,7 @@ import ( type QueryYml struct { // Keeper struct descriptor Keeper Keeper `yaml:"keeper"` - // Path to client folder e.g. "github.com/osmosis-labs/osmosis/v24/x/twap/client" + // Path to client folder e.g. "github.com/osmosis-labs/osmosis/v25/x/twap/client" ClientPath string `yaml:"client_path"` // list of all queries, key is the query name, e.g. `GetArithmeticTwap` Queries map[string]YmlQueryDescriptor `yaml:"queries"` @@ -19,7 +19,7 @@ type QueryYml struct { } type Keeper struct { - // e.g. github.com/osmosis-labs/osmosis/v24/x/twap + // e.g. github.com/osmosis-labs/osmosis/v25/x/twap Path string `yaml:"path"` // e.g. Keeper Struct string `yaml:"struct"` diff --git a/cmd/querygen/templates/queryyml_test.go b/cmd/querygen/templates/queryyml_test.go index ff11a24de2c..b7bb9504f5a 100644 --- a/cmd/querygen/templates/queryyml_test.go +++ b/cmd/querygen/templates/queryyml_test.go @@ -11,7 +11,7 @@ func TestParseFilePathFromImportPath(t *testing.T) { importPath string expectedFilePath string }{ - "standard": {importPath: "github.com/osmosis-labs/osmosis/v24/x/twap", expectedFilePath: "x/twap"}, + "standard": {importPath: "github.com/osmosis-labs/osmosis/v25/x/twap", expectedFilePath: "x/twap"}, } for name, test := range tests { t.Run(name, func(t *testing.T) { diff --git a/go.mod b/go.mod index fa333f4ea18..4bdbf663b8c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/osmosis-labs/osmosis/v24 +module github.com/osmosis-labs/osmosis/v25 go 1.21.4 @@ -31,10 +31,10 @@ require ( github.com/ory/dockertest/v3 v3.10.0 github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3 github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662 - github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240423073233-246239a8f662 + github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240430090100-86b41c48fe1b github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662 github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662 - github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240404053421-41aab009fb04 + github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea github.com/pkg/errors v0.9.1 github.com/rakyll/statik v0.1.7 github.com/skip-mev/block-sdk v1.4.2 @@ -109,7 +109,7 @@ require ( github.com/ghostiam/protogetter v0.3.4 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect github.com/gobwas/httphead v0.1.0 // indirect github.com/gobwas/pool v0.2.1 // indirect @@ -128,6 +128,7 @@ require ( github.com/kkHAIKE/contextcheck v1.1.4 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect + github.com/leodido/go-urn v1.2.4 // indirect github.com/linxGnu/grocksdb v1.8.12 // indirect github.com/macabu/inamedparam v0.1.3 // indirect github.com/manifoldco/promptui v0.9.0 // indirect @@ -400,7 +401,7 @@ replace ( github.com/cosmos/iavl => github.com/cosmos/iavl v1.1.2-0.20240405172238-7f92c6b356ac github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - github.com/osmosis-labs/sqs/sqsdomain => github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240404053421-41aab009fb04 + github.com/osmosis-labs/sqs/sqsdomain => github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea // replace as directed by sdk upgrading.md https://github.com/cosmos/cosmos-sdk/blob/393de266c8675dc16cc037c1a15011b1e990975f/UPGRADING.md?plain=1#L713 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 diff --git a/go.sum b/go.sum index fb6b8e8e50e..f88fdea76ad 100644 --- a/go.sum +++ b/go.sum @@ -936,8 +936,8 @@ github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTM github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= -github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js= github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= @@ -1327,8 +1327,8 @@ github.com/ldez/gomoddirectives v0.2.3/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdB github.com/ldez/tagliatelle v0.5.0 h1:epgfuYt9v0CG3fms0pEgIMNPuFf/LpPIfjk4kyqSioo= github.com/ldez/tagliatelle v0.5.0/go.mod h1:rj1HmWiL1MiKQuOONhd09iySTEkUuE/8+5jtPYz9xa4= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= -github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= -github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= +github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= github.com/leonklingele/grouper v1.1.1 h1:suWXRU57D4/Enn6pXR0QVqqWWrnJ9Osrz+5rjt8ivzU= github.com/leonklingele/grouper v1.1.1/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= @@ -1487,14 +1487,14 @@ github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3 h1:Ylmch github.com/osmosis-labs/go-mutesting v0.0.0-20221208041716-b43bcd97b3b3/go.mod h1:lV6KnqXYD/ayTe7310MHtM3I2q8Z6bBfMAi+bhwPYtI= github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662 h1:P6deXtGtSXJgPtvo6f/1vAQgF38HUsrIT6Mq7LMGYrs= github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662/go.mod h1:ubFhAjLis9cH6GPIhaCjf4JdXrn8HBBOxvOYMxPtgSM= -github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240423073233-246239a8f662 h1:evQCSCvgkEXpm3NanU54PK8OtUEPQHCV8EEIbRZ417k= -github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240423073233-246239a8f662/go.mod h1:1uK78efyukxFZf0JVzU4YSSY4EGO0rignHh/NC/C6l8= +github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240430090100-86b41c48fe1b h1:VT4eKfFkL9FxuVAO05I06z6Wp6sD99eB7z1ZzaqoMF0= +github.com/osmosis-labs/osmosis/osmoutils v0.0.12-0.20240430090100-86b41c48fe1b/go.mod h1:sHrm1JXicWHDt74cJavXKe19OWongf/kiVX9SBI+Dec= github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662 h1:bG3Fll3ryw+yo+70u0oOUjxq1SZ2GgTRDgmivZEdPKE= github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662/go.mod h1:3BTKszIZFP/3ut/sW0izJOZRNDXWINU5zfZGo+a8QhE= github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662 h1:1GiW1IDHH6BfmBYdP5YGnS+TkO6ZKKVzSFccG9RH9gA= github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662/go.mod h1:VBMzVCCaiVJokiQ+6+O6KAU9XaH656o6kCeHoVCiTL8= -github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240404053421-41aab009fb04 h1:mvkk1A/jIe+lsFFpRNfyd9UfvhagATdpnjy8K7kANeo= -github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240404053421-41aab009fb04/go.mod h1:mYYf7pYb7sGJ9zYIOw2aYlIl5cgKT0K93rZx4LvDAuA= +github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea h1:jcwN05LSSV7Vdp+FHp3WtabuFtBb7l+ki4O5R2P1Sr4= +github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea/go.mod h1:d3wAamev0J2ABDeUvCDTUnw0mMrraXRia1e/dqq/xFI= github.com/osmosis-labs/wasmd v0.45.0-osmo h1:NIp7pvJV5HuBN1HwPgEmXKQM2TjVIVdJErIHnB9IMO8= github.com/osmosis-labs/wasmd v0.45.0-osmo/go.mod h1:J6eRvwii5T1WxhetZkBg1kOJS3GTn1Bw2OLyZBb8EVU= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= @@ -1710,6 +1710,7 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= diff --git a/ingest/sqs/domain/asset_list_test.go b/ingest/sqs/domain/asset_list_test.go index bd7bb7f369e..4846841feae 100644 --- a/ingest/sqs/domain/asset_list_test.go +++ b/ingest/sqs/domain/asset_list_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" ) type AssetListTestSuite struct { diff --git a/ingest/sqs/domain/ingester.go b/ingest/sqs/domain/ingester.go index 19d56621587..702f0d1fb1b 100644 --- a/ingest/sqs/domain/ingester.go +++ b/ingest/sqs/domain/ingester.go @@ -7,7 +7,7 @@ import ( "github.com/osmosis-labs/sqs/sqsdomain" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // Ingester is an interface that defines the methods for the ingester. diff --git a/ingest/sqs/domain/keepers.go b/ingest/sqs/domain/keepers.go index 66276e158f9..4d026eef0bb 100644 --- a/ingest/sqs/domain/keepers.go +++ b/ingest/sqs/domain/keepers.go @@ -5,9 +5,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/queryproto" - concentratedtypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/queryproto" + concentratedtypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // Chain keepers required for sqs ingest. diff --git a/ingest/sqs/domain/mocks/asset_list_getter_mock.go b/ingest/sqs/domain/mocks/asset_list_getter_mock.go index 0337ae029da..b70925bc6a2 100644 --- a/ingest/sqs/domain/mocks/asset_list_getter_mock.go +++ b/ingest/sqs/domain/mocks/asset_list_getter_mock.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" ) type AssetListGetterMock struct { diff --git a/ingest/sqs/domain/mocks/node_status_checker_mock.go b/ingest/sqs/domain/mocks/node_status_checker_mock.go index c7911fa3cf0..f52ece420fc 100644 --- a/ingest/sqs/domain/mocks/node_status_checker_mock.go +++ b/ingest/sqs/domain/mocks/node_status_checker_mock.go @@ -3,7 +3,7 @@ package mocks import ( "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" ) // NodeStatusCheckerMock is a mock implementation of domain.NodeStatusChecker. diff --git a/ingest/sqs/domain/mocks/sqs_ingester_mock.go b/ingest/sqs/domain/mocks/sqs_ingester_mock.go index 9d27c593167..c8495903012 100644 --- a/ingest/sqs/domain/mocks/sqs_ingester_mock.go +++ b/ingest/sqs/domain/mocks/sqs_ingester_mock.go @@ -3,9 +3,9 @@ package mocks import ( "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var _ domain.Ingester = &SQSIngesterMock{} diff --git a/ingest/sqs/domain/service.go b/ingest/sqs/domain/service.go index 37832f8e0e8..3fb78b6e791 100644 --- a/ingest/sqs/domain/service.go +++ b/ingest/sqs/domain/service.go @@ -3,7 +3,7 @@ package domain import ( sdk "github.com/cosmos/cosmos-sdk/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // BlockPoolUpdateTracker is an interface for tracking diff --git a/ingest/sqs/ingester.go b/ingest/sqs/ingester.go index 610bbf4b865..f970d79ef0c 100644 --- a/ingest/sqs/ingester.go +++ b/ingest/sqs/ingester.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var _ domain.Ingester = &sqsIngester{} diff --git a/ingest/sqs/pools/transformer/export_test.go b/ingest/sqs/pools/transformer/export_test.go index 53805fd4c44..9088a260dbf 100644 --- a/ingest/sqs/pools/transformer/export_test.go +++ b/ingest/sqs/pools/transformer/export_test.go @@ -5,8 +5,8 @@ import ( "github.com/osmosis-labs/sqs/sqsdomain" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) const ( diff --git a/ingest/sqs/pools/transformer/pool_transformer.go b/ingest/sqs/pools/transformer/pool_transformer.go index 966b8b88d24..f975ac95fc3 100644 --- a/ingest/sqs/pools/transformer/pool_transformer.go +++ b/ingest/sqs/pools/transformer/pool_transformer.go @@ -10,14 +10,14 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/sqs/sqsdomain" - cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/queryproto" - concentratedtypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/queryproto" + concentratedtypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // poolTransformer is a transformer for pools. diff --git a/ingest/sqs/pools/transformer/pool_transformer_test.go b/ingest/sqs/pools/transformer/pool_transformer_test.go index dca97546213..824f04dfbfd 100644 --- a/ingest/sqs/pools/transformer/pool_transformer_test.go +++ b/ingest/sqs/pools/transformer/pool_transformer_test.go @@ -11,14 +11,14 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain/mocks" - poolstransformer "github.com/osmosis-labs/osmosis/v24/ingest/sqs/pools/transformer" - clqueryproto "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/queryproto" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain/mocks" + poolstransformer "github.com/osmosis-labs/osmosis/v25/ingest/sqs/pools/transformer" + clqueryproto "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/queryproto" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) type PoolTransformerTestSuite struct { diff --git a/ingest/sqs/pools/transformer/taker_fee.go b/ingest/sqs/pools/transformer/taker_fee.go index a5fa75ff1fb..69d16bdd337 100644 --- a/ingest/sqs/pools/transformer/taker_fee.go +++ b/ingest/sqs/pools/transformer/taker_fee.go @@ -5,7 +5,7 @@ import ( "github.com/osmosis-labs/sqs/sqsdomain" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" ) // retrieveTakerFeeToMapIfNotExists retrieves the taker fee for the denom pair if it does not exist in the map diff --git a/ingest/sqs/pools/transformer/taker_fee_test.go b/ingest/sqs/pools/transformer/taker_fee_test.go index fb9cc939677..69af8f53167 100644 --- a/ingest/sqs/pools/transformer/taker_fee_test.go +++ b/ingest/sqs/pools/transformer/taker_fee_test.go @@ -4,7 +4,7 @@ import ( "github.com/osmosis-labs/sqs/sqsdomain" "github.com/osmosis-labs/osmosis/osmomath" - poolstransformer "github.com/osmosis-labs/osmosis/v24/ingest/sqs/pools/transformer" + poolstransformer "github.com/osmosis-labs/osmosis/v25/ingest/sqs/pools/transformer" ) var ( diff --git a/ingest/sqs/service/grpc_client.go b/ingest/sqs/service/grpc_client.go index d4c612bc527..61404676ab5 100644 --- a/ingest/sqs/service/grpc_client.go +++ b/ingest/sqs/service/grpc_client.go @@ -15,8 +15,8 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/status" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type GRPCClient struct { diff --git a/ingest/sqs/service/node_status_checker.go b/ingest/sqs/service/node_status_checker.go index 7243a127d35..fcab2657794 100644 --- a/ingest/sqs/service/node_status_checker.go +++ b/ingest/sqs/service/node_status_checker.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" ) type nodeStatusChecker struct { diff --git a/ingest/sqs/service/sqs_pool_tracker.go b/ingest/sqs/service/sqs_pool_tracker.go index 6e5c87988de..e97c943be85 100644 --- a/ingest/sqs/service/sqs_pool_tracker.go +++ b/ingest/sqs/service/sqs_pool_tracker.go @@ -1,8 +1,8 @@ package service import ( - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // poolBlockUpdateTracker is a struct that tracks the pools that were updated in a block. diff --git a/ingest/sqs/service/sqs_pool_tracker_test.go b/ingest/sqs/service/sqs_pool_tracker_test.go index 91d22e98e97..be3185b1d8c 100644 --- a/ingest/sqs/service/sqs_pool_tracker_test.go +++ b/ingest/sqs/service/sqs_pool_tracker_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/service" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/service" ) type SQSServiceTestSuite struct { diff --git a/ingest/sqs/service/sqs_streaming_service.go b/ingest/sqs/service/sqs_streaming_service.go index 12d58e363bf..5409dab0ef5 100644 --- a/ingest/sqs/service/sqs_streaming_service.go +++ b/ingest/sqs/service/sqs_streaming_service.go @@ -14,7 +14,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" ) var _ baseapp.StreamingService = (*sqsStreamingService)(nil) diff --git a/ingest/sqs/service/sqs_streaming_service_test.go b/ingest/sqs/service/sqs_streaming_service_test.go index ad8f7831f96..4e4db67e65e 100644 --- a/ingest/sqs/service/sqs_streaming_service_test.go +++ b/ingest/sqs/service/sqs_streaming_service_test.go @@ -5,9 +5,9 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain/mocks" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/service" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain/mocks" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/service" ) var ( diff --git a/ingest/sqs/service/writelistener/cfmm_write_listener.go b/ingest/sqs/service/writelistener/cfmm_write_listener.go index 6b7473c8e84..506fbb17636 100644 --- a/ingest/sqs/service/writelistener/cfmm_write_listener.go +++ b/ingest/sqs/service/writelistener/cfmm_write_listener.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) var _ storetypes.WriteListener = (*cfmmPoolWriteListener)(nil) diff --git a/ingest/sqs/service/writelistener/cfmm_write_listener_test.go b/ingest/sqs/service/writelistener/cfmm_write_listener_test.go index 791a57a648d..f48933b2454 100644 --- a/ingest/sqs/service/writelistener/cfmm_write_listener_test.go +++ b/ingest/sqs/service/writelistener/cfmm_write_listener_test.go @@ -1,9 +1,9 @@ package writelistener_test import ( - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/service" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/service/writelistener" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/service" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/service/writelistener" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) // Tests that the concentrated write listener correctly tracks pool and tick updates. diff --git a/ingest/sqs/service/writelistener/concentrated_write_listener.go b/ingest/sqs/service/writelistener/concentrated_write_listener.go index e231382c0c7..86a7b65a714 100644 --- a/ingest/sqs/service/writelistener/concentrated_write_listener.go +++ b/ingest/sqs/service/writelistener/concentrated_write_listener.go @@ -6,9 +6,9 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - concentratedtypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + concentratedtypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) var _ storetypes.WriteListener = (*concentratedPoolWriteListener)(nil) diff --git a/ingest/sqs/service/writelistener/concentrated_write_listener_test.go b/ingest/sqs/service/writelistener/concentrated_write_listener_test.go index 37da719e243..ba21a0dd13c 100644 --- a/ingest/sqs/service/writelistener/concentrated_write_listener_test.go +++ b/ingest/sqs/service/writelistener/concentrated_write_listener_test.go @@ -5,11 +5,11 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/service" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/service/writelistener" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - concentratedtypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/service" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/service/writelistener" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + concentratedtypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) type WriteListenerTestSuite struct { diff --git a/ingest/sqs/service/writelistener/cosmwasmpool_write_listener.go b/ingest/sqs/service/writelistener/cosmwasmpool_write_listener.go index f9ad190d366..8e1d3a8c80c 100644 --- a/ingest/sqs/service/writelistener/cosmwasmpool_write_listener.go +++ b/ingest/sqs/service/writelistener/cosmwasmpool_write_listener.go @@ -8,10 +8,10 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" - cosmwasmpoolmodel "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model" - cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" + cosmwasmpoolmodel "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model" + cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var _ storetypes.WriteListener = (*cosmwasmPoolWriteListener)(nil) diff --git a/ingest/sqs/service/writelistener/cosmwasmpool_write_listener_test.go b/ingest/sqs/service/writelistener/cosmwasmpool_write_listener_test.go index 449b53ebe6f..246972f7f0a 100644 --- a/ingest/sqs/service/writelistener/cosmwasmpool_write_listener_test.go +++ b/ingest/sqs/service/writelistener/cosmwasmpool_write_listener_test.go @@ -4,10 +4,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/service" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/service/writelistener" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model" - cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/service" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/service/writelistener" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model" + cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" ) // Tests that the cosmwasm write listener correctly tracks pool updates diff --git a/ingest/sqs/sqs_config.go b/ingest/sqs/sqs_config.go index db1c5e7c5cc..c446fde1e84 100644 --- a/ingest/sqs/sqs_config.go +++ b/ingest/sqs/sqs_config.go @@ -5,9 +5,9 @@ import ( servertypes "github.com/cosmos/cosmos-sdk/server/types" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/domain" - poolstransformer "github.com/osmosis-labs/osmosis/v24/ingest/sqs/pools/transformer" - "github.com/osmosis-labs/osmosis/v24/ingest/sqs/service" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/domain" + poolstransformer "github.com/osmosis-labs/osmosis/v25/ingest/sqs/pools/transformer" + "github.com/osmosis-labs/osmosis/v25/ingest/sqs/service" ) // Config defines the config for the sidecar query server. diff --git a/osmoutils/cosmwasm/helpers_test.go b/osmoutils/cosmwasm/helpers_test.go index 432b6bddfb0..0dd7c32ec6d 100644 --- a/osmoutils/cosmwasm/helpers_test.go +++ b/osmoutils/cosmwasm/helpers_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmoutils/cosmwasm" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" ) type KeeperTestSuite struct { diff --git a/osmoutils/go.mod b/osmoutils/go.mod index e5dd4deacf8..d40e1e5b31b 100644 --- a/osmoutils/go.mod +++ b/osmoutils/go.mod @@ -1,6 +1,8 @@ module github.com/osmosis-labs/osmosis/osmoutils -go 1.21 +go 1.21.4 + +toolchain go1.22.0 require ( cosmossdk.io/log v1.3.0 @@ -14,14 +16,16 @@ require ( github.com/cosmos/iavl v1.1.2-0.20240405173644-e52f7630d3b7 github.com/cosmos/ibc-go/v7 v7.4.0 github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662 - github.com/osmosis-labs/osmosis/v24 v24.0.0-rc0 + github.com/osmosis-labs/osmosis/v25 v25.0.0-20240429183841-537ba1600888 github.com/spf13/cast v1.6.0 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 - golang.org/x/exp v0.0.0-20230905200255-921286631fa9 + golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc ) +require github.com/skip-mev/block-sdk v1.4.2 // indirect + require ( cloud.google.com/go v0.112.0 // indirect cloud.google.com/go/compute v1.24.0 // indirect @@ -80,7 +84,6 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.4 // indirect github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect - github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.6.0 // indirect @@ -133,7 +136,6 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect - github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.0 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/kr/pretty v0.3.1 // indirect @@ -149,15 +151,13 @@ require ( github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae // indirect - github.com/onsi/gomega v1.28.1 // indirect + github.com/onsi/gomega v1.31.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662 // indirect github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662 // indirect - github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240404053421-41aab009fb04 // indirect + github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -168,7 +168,6 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/redis/go-redis/v9 v9.5.1 // indirect github.com/rogpeppe/go-internal v1.12.0 // indirect github.com/rs/cors v1.9.0 // indirect github.com/rs/zerolog v1.31.0 // indirect @@ -236,6 +235,7 @@ replace ( github.com/cosmos/iavl => github.com/cosmos/iavl v1.1.2-0.20240405172238-7f92c6b356ac github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 + github.com/osmosis-labs/sqs/sqsdomain => github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea // replace as directed by sdk upgrading.md https://github.com/cosmos/cosmos-sdk/blob/393de266c8675dc16cc037c1a15011b1e990975f/UPGRADING.md?plain=1#L713 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 diff --git a/osmoutils/go.sum b/osmoutils/go.sum index fa1c433712f..688545f3669 100644 --- a/osmoutils/go.sum +++ b/osmoutils/go.sum @@ -606,10 +606,6 @@ github.com/bits-and-blooms/bitset v1.8.0 h1:FD+XqgOZDUxxZ8hzoBFuV9+cGWY9CslN6d5M github.com/bits-and-blooms/bitset v1.8.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= -github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= -github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= -github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= -github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M= github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A= @@ -779,8 +775,6 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= -github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= @@ -1260,8 +1254,7 @@ github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.28.1 h1:MijcGUbfYuznzK/5R4CPNoUP/9Xvuo20sXfEm6XxoTA= -github.com/onsi/gomega v1.28.1/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -1285,14 +1278,13 @@ github.com/osmosis-labs/cosmos-sdk v0.47.5-v24-osmo-5 h1:fnt89Cw+55vbnIEGkpCmj0c github.com/osmosis-labs/cosmos-sdk v0.47.5-v24-osmo-5/go.mod h1:eSRUVYwL3eG1jnh01CnBbHiqOM3xJO49p5rTOrSFX1k= github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662 h1:P6deXtGtSXJgPtvo6f/1vAQgF38HUsrIT6Mq7LMGYrs= github.com/osmosis-labs/osmosis/osmomath v0.0.12-0.20240423073233-246239a8f662/go.mod h1:ubFhAjLis9cH6GPIhaCjf4JdXrn8HBBOxvOYMxPtgSM= -github.com/osmosis-labs/osmosis/v24 v24.0.0-rc0 h1:wAcm5rvcAMwSPFWgzUr/lR7U+e+4PvZ8fkehhpwiJho= -github.com/osmosis-labs/osmosis/v24 v24.0.0-rc0/go.mod h1:5QdPU/ttG3dPeg1EtX/LVT7yuxdz3E+BXnEqxwgh+ec= +github.com/osmosis-labs/osmosis/v25 v25.0.0-20240429183841-537ba1600888 h1:c+b4PKumqTYNDOOP+R53lnjxiocmYwjLgfBR6VfnGes= +github.com/osmosis-labs/osmosis/v25 v25.0.0-20240429183841-537ba1600888/go.mod h1:TI3Qr4dqna7/afmPJUlueSg2iX5gI4YzHuye3y83S5E= github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662 h1:bG3Fll3ryw+yo+70u0oOUjxq1SZ2GgTRDgmivZEdPKE= github.com/osmosis-labs/osmosis/x/epochs v0.0.8-0.20240423073233-246239a8f662/go.mod h1:3BTKszIZFP/3ut/sW0izJOZRNDXWINU5zfZGo+a8QhE= github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662 h1:1GiW1IDHH6BfmBYdP5YGnS+TkO6ZKKVzSFccG9RH9gA= github.com/osmosis-labs/osmosis/x/ibc-hooks v0.0.14-0.20240423073233-246239a8f662/go.mod h1:VBMzVCCaiVJokiQ+6+O6KAU9XaH656o6kCeHoVCiTL8= -github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240404053421-41aab009fb04 h1:mvkk1A/jIe+lsFFpRNfyd9UfvhagATdpnjy8K7kANeo= -github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240404053421-41aab009fb04/go.mod h1:mYYf7pYb7sGJ9zYIOw2aYlIl5cgKT0K93rZx4LvDAuA= +github.com/osmosis-labs/sqs/sqsdomain v0.0.0-20240429202838-7d69de2c9bea h1:jcwN05LSSV7Vdp+FHp3WtabuFtBb7l+ki4O5R2P1Sr4= github.com/osmosis-labs/wasmd v0.45.0-osmo h1:NIp7pvJV5HuBN1HwPgEmXKQM2TjVIVdJErIHnB9IMO8= github.com/osmosis-labs/wasmd v0.45.0-osmo/go.mod h1:J6eRvwii5T1WxhetZkBg1kOJS3GTn1Bw2OLyZBb8EVU= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= @@ -1365,8 +1357,6 @@ github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Ung github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8= -github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= @@ -1404,6 +1394,7 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/skip-mev/block-sdk v1.4.2 h1:oNXPnNjeSEthCcdMd7L0aB+6/v4W4ydfpIm2miekJ/U= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -1606,8 +1597,7 @@ golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1941,8 +1931,7 @@ golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/proto/osmosis/concentratedliquidity/params.proto b/proto/osmosis/concentratedliquidity/params.proto index a7f2bc57d49..7ac8044043f 100644 --- a/proto/osmosis/concentratedliquidity/params.proto +++ b/proto/osmosis/concentratedliquidity/params.proto @@ -4,7 +4,7 @@ package osmosis.concentratedliquidity; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types"; message Params { // authorized_tick_spacing is an array of uint64s that represents the tick diff --git a/proto/osmosis/concentratedliquidity/poolmodel/concentrated/v1beta1/tx.proto b/proto/osmosis/concentratedliquidity/poolmodel/concentrated/v1beta1/tx.proto index ac24072f7ab..b495bc802e6 100644 --- a/proto/osmosis/concentratedliquidity/poolmodel/concentrated/v1beta1/tx.proto +++ b/proto/osmosis/concentratedliquidity/poolmodel/concentrated/v1beta1/tx.proto @@ -3,7 +3,7 @@ package osmosis.concentratedliquidity.poolmodel.concentrated.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model"; service Msg { rpc CreateConcentratedPool(MsgCreateConcentratedPool) diff --git a/proto/osmosis/concentratedliquidity/v1beta1/genesis.proto b/proto/osmosis/concentratedliquidity/v1beta1/genesis.proto index eb7e01d2cb5..12e4751c8bc 100644 --- a/proto/osmosis/concentratedliquidity/v1beta1/genesis.proto +++ b/proto/osmosis/concentratedliquidity/v1beta1/genesis.proto @@ -10,7 +10,7 @@ import "osmosis/concentratedliquidity/v1beta1/position.proto"; import "osmosis/concentratedliquidity/v1beta1/tick_info.proto"; import "osmosis/concentratedliquidity/v1beta1/incentive_record.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types/genesis"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types/genesis"; // FullTick contains tick index and pool id along with other tick model // information. diff --git a/proto/osmosis/concentratedliquidity/v1beta1/gov.proto b/proto/osmosis/concentratedliquidity/v1beta1/gov.proto index 5d683263140..282934cc344 100644 --- a/proto/osmosis/concentratedliquidity/v1beta1/gov.proto +++ b/proto/osmosis/concentratedliquidity/v1beta1/gov.proto @@ -3,7 +3,7 @@ package osmosis.concentratedliquidity.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types"; // CreateConcentratedLiquidityPoolsProposal is a gov Content type for creating // concentrated liquidity pools. If a CreateConcentratedLiquidityPoolsProposal diff --git a/proto/osmosis/concentratedliquidity/v1beta1/incentive_record.proto b/proto/osmosis/concentratedliquidity/v1beta1/incentive_record.proto index 9f670106f4f..3dce7263cee 100644 --- a/proto/osmosis/concentratedliquidity/v1beta1/incentive_record.proto +++ b/proto/osmosis/concentratedliquidity/v1beta1/incentive_record.proto @@ -6,7 +6,7 @@ import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types"; // IncentiveRecord is the high-level struct we use to deal with an independent // incentive being distributed on a pool. Note that PoolId, Denom, and MinUptime diff --git a/proto/osmosis/concentratedliquidity/v1beta1/pool.proto b/proto/osmosis/concentratedliquidity/v1beta1/pool.proto index 7be00405c19..3a6d8059fe1 100644 --- a/proto/osmosis/concentratedliquidity/v1beta1/pool.proto +++ b/proto/osmosis/concentratedliquidity/v1beta1/pool.proto @@ -9,7 +9,7 @@ import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model"; message Pool { option (gogoproto.goproto_getters) = false; diff --git a/proto/osmosis/concentratedliquidity/v1beta1/position.proto b/proto/osmosis/concentratedliquidity/v1beta1/position.proto index f564ce79db1..523f55dd8c1 100644 --- a/proto/osmosis/concentratedliquidity/v1beta1/position.proto +++ b/proto/osmosis/concentratedliquidity/v1beta1/position.proto @@ -10,7 +10,7 @@ import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model"; // Position contains position's id, address, pool id, lower tick, upper tick // join time, and liquidity. diff --git a/proto/osmosis/concentratedliquidity/v1beta1/query.proto b/proto/osmosis/concentratedliquidity/v1beta1/query.proto index 9d2df7134fa..03e812d6ef8 100644 --- a/proto/osmosis/concentratedliquidity/v1beta1/query.proto +++ b/proto/osmosis/concentratedliquidity/v1beta1/query.proto @@ -14,7 +14,7 @@ import "cosmos_proto/cosmos.proto"; import "osmosis/concentratedliquidity/v1beta1/position.proto"; import "osmosis/concentratedliquidity/v1beta1/incentive_record.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/queryproto"; service Query { // Pools returns all concentrated liquidity pools diff --git a/proto/osmosis/concentratedliquidity/v1beta1/query.yml b/proto/osmosis/concentratedliquidity/v1beta1/query.yml index 7f4d324d659..b42fe2002f3 100644 --- a/proto/osmosis/concentratedliquidity/v1beta1/query.yml +++ b/proto/osmosis/concentratedliquidity/v1beta1/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" + path: "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client" +client_path: "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client" queries: Pools: proto_wrapper: diff --git a/proto/osmosis/concentratedliquidity/v1beta1/tick_info.proto b/proto/osmosis/concentratedliquidity/v1beta1/tick_info.proto index ef30a474e5e..b896d2c2144 100644 --- a/proto/osmosis/concentratedliquidity/v1beta1/tick_info.proto +++ b/proto/osmosis/concentratedliquidity/v1beta1/tick_info.proto @@ -8,7 +8,7 @@ package osmosis.concentratedliquidity.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model"; message TickInfo { string liquidity_gross = 1 [ diff --git a/proto/osmosis/concentratedliquidity/v1beta1/tx.proto b/proto/osmosis/concentratedliquidity/v1beta1/tx.proto index 754d86ddeab..5b22c87f271 100644 --- a/proto/osmosis/concentratedliquidity/v1beta1/tx.proto +++ b/proto/osmosis/concentratedliquidity/v1beta1/tx.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "amino/amino.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types"; service Msg { rpc CreatePosition(MsgCreatePosition) returns (MsgCreatePositionResponse); diff --git a/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto b/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto index c19faa61e34..909a8f190b8 100644 --- a/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto +++ b/proto/osmosis/cosmwasmpool/v1beta1/genesis.proto @@ -7,7 +7,7 @@ import "cosmos_proto/cosmos.proto"; import "osmosis/cosmwasmpool/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types"; // GenesisState defines the cosmwasmpool module's genesis state. message GenesisState { diff --git a/proto/osmosis/cosmwasmpool/v1beta1/gov.proto b/proto/osmosis/cosmwasmpool/v1beta1/gov.proto index de374896c54..b7dfc932ad3 100644 --- a/proto/osmosis/cosmwasmpool/v1beta1/gov.proto +++ b/proto/osmosis/cosmwasmpool/v1beta1/gov.proto @@ -3,7 +3,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types"; // UploadCosmWasmPoolCodeAndWhiteListProposal is a gov Content type for // uploading coswasm pool code and adding it to internal whitelist. Only the diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto index 5fd979c6215..3beeebf7acb 100644 --- a/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto +++ b/proto/osmosis/cosmwasmpool/v1beta1/model/instantiate_msg.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package osmosis.cosmwasmpool.v1beta1; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/cosmwasm/msg"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/cosmwasm/msg"; // ===================== InstantiateMsg message InstantiateMsg { diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto index 2b4ee637561..d68bf707b7c 100644 --- a/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto +++ b/proto/osmosis/cosmwasmpool/v1beta1/model/module_query_msg.proto @@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/cosmwasm/msg"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/cosmwasm/msg"; // ===================== CalcOutAmtGivenIn message CalcOutAmtGivenIn { diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto index b2ba0ca93e4..2aea787b8e8 100644 --- a/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto +++ b/proto/osmosis/cosmwasmpool/v1beta1/model/module_sudo_msg.proto @@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/cosmwasm/msg"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/cosmwasm/msg"; // ===================== SwapExactAmountIn message SwapExactAmountIn { diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto index 10558680dcd..71904da025b 100644 --- a/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto +++ b/proto/osmosis/cosmwasmpool/v1beta1/model/pool.proto @@ -5,7 +5,7 @@ package osmosis.cosmwasmpool.v1beta1; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model"; // CosmWasmPool represents the data serialized into state for each CW pool. // diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto index a80572cf2fe..5574c3a4036 100644 --- a/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto +++ b/proto/osmosis/cosmwasmpool/v1beta1/model/pool_query_msg.proto @@ -4,7 +4,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/cosmwasm/msg"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/cosmwasm/msg"; // ===================== GetSwapFeeQueryMsg message GetSwapFeeQueryMsg { diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto index 31b3a298d79..1dc1754a041 100644 --- a/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto +++ b/proto/osmosis/cosmwasmpool/v1beta1/model/transmuter_msgs.proto @@ -3,7 +3,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/cosmwasm/msg/transmuter"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/cosmwasm/msg/transmuter"; // ===================== JoinPoolExecuteMsg message EmptyRequest {} diff --git a/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto b/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto index d701538d907..a7067153042 100644 --- a/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto +++ b/proto/osmosis/cosmwasmpool/v1beta1/model/tx.proto @@ -3,7 +3,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model"; service MsgCreator { rpc CreateCosmWasmPool(MsgCreateCosmWasmPool) diff --git a/proto/osmosis/cosmwasmpool/v1beta1/params.proto b/proto/osmosis/cosmwasmpool/v1beta1/params.proto index 835dd7790f6..827c95552bf 100644 --- a/proto/osmosis/cosmwasmpool/v1beta1/params.proto +++ b/proto/osmosis/cosmwasmpool/v1beta1/params.proto @@ -3,7 +3,7 @@ package osmosis.cosmwasmpool.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types"; message Params { // code_ide_whitelist contains the list of code ids that are allowed to be diff --git a/proto/osmosis/cosmwasmpool/v1beta1/query.proto b/proto/osmosis/cosmwasmpool/v1beta1/query.proto index 45ea09b8e0c..28a180f1c71 100644 --- a/proto/osmosis/cosmwasmpool/v1beta1/query.proto +++ b/proto/osmosis/cosmwasmpool/v1beta1/query.proto @@ -9,7 +9,7 @@ import "google/api/annotations.proto"; import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/client/queryproto"; service Query { // Pools returns all cosmwasm pools diff --git a/proto/osmosis/cosmwasmpool/v1beta1/query.yml b/proto/osmosis/cosmwasmpool/v1beta1/query.yml index 700e3fa4e67..ac75151efa1 100644 --- a/proto/osmosis/cosmwasmpool/v1beta1/query.yml +++ b/proto/osmosis/cosmwasmpool/v1beta1/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool" + path: "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/client" +client_path: "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/client" queries: Params: proto_wrapper: diff --git a/proto/osmosis/cosmwasmpool/v1beta1/tx.proto b/proto/osmosis/cosmwasmpool/v1beta1/tx.proto index ebc24cf7597..5170094f5c4 100644 --- a/proto/osmosis/cosmwasmpool/v1beta1/tx.proto +++ b/proto/osmosis/cosmwasmpool/v1beta1/tx.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package osmosis.cosmwasmpool.v1beta1; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types"; service Msg {} diff --git a/proto/osmosis/downtimedetector/v1beta1/downtime_duration.proto b/proto/osmosis/downtimedetector/v1beta1/downtime_duration.proto index 9b677588f06..0ff4461c333 100644 --- a/proto/osmosis/downtimedetector/v1beta1/downtime_duration.proto +++ b/proto/osmosis/downtimedetector/v1beta1/downtime_duration.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package osmosis.downtimedetector.v1beta1; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types"; enum Downtime { DURATION_30S = 0; diff --git a/proto/osmosis/downtimedetector/v1beta1/genesis.proto b/proto/osmosis/downtimedetector/v1beta1/genesis.proto index 9e75c2160ec..0c0cbbc442e 100644 --- a/proto/osmosis/downtimedetector/v1beta1/genesis.proto +++ b/proto/osmosis/downtimedetector/v1beta1/genesis.proto @@ -8,7 +8,7 @@ import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "osmosis/downtimedetector/v1beta1/downtime_duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types"; message GenesisDowntimeEntry { Downtime duration = 1 [ (gogoproto.moretags) = "yaml:\"duration\"" ]; diff --git a/proto/osmosis/downtimedetector/v1beta1/query.proto b/proto/osmosis/downtimedetector/v1beta1/query.proto index 158101dd0aa..eb8152479c8 100644 --- a/proto/osmosis/downtimedetector/v1beta1/query.proto +++ b/proto/osmosis/downtimedetector/v1beta1/query.proto @@ -13,7 +13,7 @@ import "cosmos_proto/cosmos.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client/queryproto"; service Query { rpc RecoveredSinceDowntimeOfLength(RecoveredSinceDowntimeOfLengthRequest) diff --git a/proto/osmosis/downtimedetector/v1beta1/query.yml b/proto/osmosis/downtimedetector/v1beta1/query.yml index 9c2ed6ddfe7..ca6ee4a8530 100644 --- a/proto/osmosis/downtimedetector/v1beta1/query.yml +++ b/proto/osmosis/downtimedetector/v1beta1/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v24/x/downtime-detector" + path: "github.com/osmosis-labs/osmosis/v25/x/downtime-detector" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client" +client_path: "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client" queries: RecoveredSinceDowntimeOfLength: proto_wrapper: diff --git a/proto/osmosis/gamm/poolmodels/balancer/v1beta1/tx.proto b/proto/osmosis/gamm/poolmodels/balancer/v1beta1/tx.proto index 3c14c4fa0e2..35581a9681d 100644 --- a/proto/osmosis/gamm/poolmodels/balancer/v1beta1/tx.proto +++ b/proto/osmosis/gamm/poolmodels/balancer/v1beta1/tx.proto @@ -7,7 +7,7 @@ import "osmosis/gamm/v1beta1/balancerPool.proto"; import "cosmos/base/v1beta1/coin.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer"; service Msg { rpc CreateBalancerPool(MsgCreateBalancerPool) diff --git a/proto/osmosis/gamm/poolmodels/stableswap/v1beta1/stableswap_pool.proto b/proto/osmosis/gamm/poolmodels/stableswap/v1beta1/stableswap_pool.proto index ea51a546161..0444edda118 100644 --- a/proto/osmosis/gamm/poolmodels/stableswap/v1beta1/stableswap_pool.proto +++ b/proto/osmosis/gamm/poolmodels/stableswap/v1beta1/stableswap_pool.proto @@ -11,7 +11,7 @@ import "google/protobuf/timestamp.proto"; import "cosmos/auth/v1beta1/auth.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap"; // PoolParams defined the parameters that will be managed by the pool // governance in the future. This params are not managed by the chain diff --git a/proto/osmosis/gamm/poolmodels/stableswap/v1beta1/tx.proto b/proto/osmosis/gamm/poolmodels/stableswap/v1beta1/tx.proto index 64c98260ee9..ab7fae83731 100644 --- a/proto/osmosis/gamm/poolmodels/stableswap/v1beta1/tx.proto +++ b/proto/osmosis/gamm/poolmodels/stableswap/v1beta1/tx.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "amino/amino.proto"; import "osmosis/gamm/poolmodels/stableswap/v1beta1/stableswap_pool.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap"; service Msg { rpc CreateStableswapPool(MsgCreateStableswapPool) diff --git a/proto/osmosis/gamm/v1beta1/balancerPool.proto b/proto/osmosis/gamm/v1beta1/balancerPool.proto index 4de2485b74e..8b7c037ddd9 100644 --- a/proto/osmosis/gamm/v1beta1/balancerPool.proto +++ b/proto/osmosis/gamm/v1beta1/balancerPool.proto @@ -15,7 +15,7 @@ import "google/protobuf/timestamp.proto"; import "cosmos/auth/v1beta1/auth.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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/v1beta1/genesis.proto b/proto/osmosis/gamm/v1beta1/genesis.proto index 758cefe8045..e98b137e8f4 100644 --- a/proto/osmosis/gamm/v1beta1/genesis.proto +++ b/proto/osmosis/gamm/v1beta1/genesis.proto @@ -16,7 +16,7 @@ message Params { ]; } -option go_package = "github.com/osmosis-labs/osmosis/v24/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/gamm/types"; // GenesisState defines the gamm module's genesis state. message GenesisState { diff --git a/proto/osmosis/gamm/v1beta1/gov.proto b/proto/osmosis/gamm/v1beta1/gov.proto index 0c1b199282a..cbf7369c106 100644 --- a/proto/osmosis/gamm/v1beta1/gov.proto +++ b/proto/osmosis/gamm/v1beta1/gov.proto @@ -7,7 +7,7 @@ import "osmosis/gamm/v1beta1/shared.proto"; import "cosmos_proto/cosmos.proto"; import "amino/amino.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/gamm/types"; // ReplaceMigrationRecordsProposal is a gov Content type for updating the // migration records. If a ReplaceMigrationRecordsProposal passes, the diff --git a/proto/osmosis/gamm/v1beta1/query.proto b/proto/osmosis/gamm/v1beta1/query.proto index 5a9d8640e9b..fca837c5c7b 100644 --- a/proto/osmosis/gamm/v1beta1/query.proto +++ b/proto/osmosis/gamm/v1beta1/query.proto @@ -12,7 +12,7 @@ import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "osmosis/gamm/v1beta1/shared.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/gamm/types"; service Query { rpc Pools(QueryPoolsRequest) returns (QueryPoolsResponse) { diff --git a/proto/osmosis/gamm/v1beta1/shared.proto b/proto/osmosis/gamm/v1beta1/shared.proto index 06a4ef29791..7be5db14062 100644 --- a/proto/osmosis/gamm/v1beta1/shared.proto +++ b/proto/osmosis/gamm/v1beta1/shared.proto @@ -6,7 +6,7 @@ import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration"; // MigrationRecords contains all the links between balancer and concentrated // pools diff --git a/proto/osmosis/gamm/v1beta1/tx.proto b/proto/osmosis/gamm/v1beta1/tx.proto index 8c6cd6af6e5..3a498c0f5a0 100644 --- a/proto/osmosis/gamm/v1beta1/tx.proto +++ b/proto/osmosis/gamm/v1beta1/tx.proto @@ -6,7 +6,7 @@ import "amino/amino.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/poolmanager/v1beta1/swap_route.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/gamm/types"; service Msg { rpc JoinPool(MsgJoinPool) returns (MsgJoinPoolResponse); diff --git a/proto/osmosis/gamm/v2/query.proto b/proto/osmosis/gamm/v2/query.proto index acfd865ecf9..26f18056b96 100644 --- a/proto/osmosis/gamm/v2/query.proto +++ b/proto/osmosis/gamm/v2/query.proto @@ -10,7 +10,7 @@ import "google/api/annotations.proto"; import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/gamm/v2types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/gamm/v2types"; service Query { // Deprecated: please use alternate in x/poolmanager diff --git a/proto/osmosis/ibchooks/genesis.proto b/proto/osmosis/ibchooks/genesis.proto index ebd272b351c..6997a402397 100644 --- a/proto/osmosis/ibchooks/genesis.proto +++ b/proto/osmosis/ibchooks/genesis.proto @@ -5,6 +5,6 @@ import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; import "osmosis/ibchooks/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/ibc-hooks/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/ibc-hooks/types"; message GenesisState { Params params = 1 [ (gogoproto.nullable) = false ]; } diff --git a/proto/osmosis/ibchooks/params.proto b/proto/osmosis/ibchooks/params.proto index 604af7df0d3..deca359ac3b 100644 --- a/proto/osmosis/ibchooks/params.proto +++ b/proto/osmosis/ibchooks/params.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/ibc-hooks/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/ibc-hooks/types"; message Params { repeated string allowed_async_ack_contracts = 1 diff --git a/proto/osmosis/ibchooks/tx.proto b/proto/osmosis/ibchooks/tx.proto index b5d7a2c390b..a9fc001f0d4 100644 --- a/proto/osmosis/ibchooks/tx.proto +++ b/proto/osmosis/ibchooks/tx.proto @@ -3,7 +3,7 @@ package osmosis.ibchooks; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/ibc-hooks/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/ibc-hooks/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/osmosis/ibcratelimit/v1beta1/genesis.proto b/proto/osmosis/ibcratelimit/v1beta1/genesis.proto index 48dcedf69c0..f9ba1fea80b 100644 --- a/proto/osmosis/ibcratelimit/v1beta1/genesis.proto +++ b/proto/osmosis/ibcratelimit/v1beta1/genesis.proto @@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto"; import "google/protobuf/any.proto"; import "osmosis/ibcratelimit/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types"; // GenesisState defines the ibc-rate-limit module's genesis state. message GenesisState { diff --git a/proto/osmosis/ibcratelimit/v1beta1/params.proto b/proto/osmosis/ibcratelimit/v1beta1/params.proto index 225dd4b5c71..20fd2db861f 100644 --- a/proto/osmosis/ibcratelimit/v1beta1/params.proto +++ b/proto/osmosis/ibcratelimit/v1beta1/params.proto @@ -3,7 +3,7 @@ package osmosis.ibcratelimit.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types"; // Params defines the parameters for the ibc-rate-limit module. message Params { diff --git a/proto/osmosis/ibcratelimit/v1beta1/query.proto b/proto/osmosis/ibcratelimit/v1beta1/query.proto index 6163508e411..aa6f1ddafa5 100644 --- a/proto/osmosis/ibcratelimit/v1beta1/query.proto +++ b/proto/osmosis/ibcratelimit/v1beta1/query.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "osmosis/ibcratelimit/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/client/queryproto"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/ibcratelimit/v1beta1/query.yml b/proto/osmosis/ibcratelimit/v1beta1/query.yml index 24007126fa9..f8524ff7706 100644 --- a/proto/osmosis/ibcratelimit/v1beta1/query.yml +++ b/proto/osmosis/ibcratelimit/v1beta1/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit" + path: "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/client" +client_path: "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/client" queries: Params: proto_wrapper: diff --git a/proto/osmosis/incentives/gauge.proto b/proto/osmosis/incentives/gauge.proto index de5c6e59b67..0b986fe311c 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/v24/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/incentives/types"; // Gauge is an object that stores and distributes yields to recipients who // satisfy certain conditions. Currently gauges support conditions around the diff --git a/proto/osmosis/incentives/genesis.proto b/proto/osmosis/incentives/genesis.proto index ca3cc8b5e0a..c388e56b793 100644 --- a/proto/osmosis/incentives/genesis.proto +++ b/proto/osmosis/incentives/genesis.proto @@ -7,7 +7,7 @@ import "osmosis/incentives/params.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/incentives/group.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/incentives/types"; // GenesisState defines the incentives module's various parameters when first // initialized diff --git a/proto/osmosis/incentives/gov.proto b/proto/osmosis/incentives/gov.proto index 60e2c1fa7e4..b799b5bc7c2 100644 --- a/proto/osmosis/incentives/gov.proto +++ b/proto/osmosis/incentives/gov.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; import "osmosis/incentives/group.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/incentives/types"; // CreateGroupsProposal is a type for creating one or more groups via // governance. This is useful for creating groups without having to pay diff --git a/proto/osmosis/incentives/group.proto b/proto/osmosis/incentives/group.proto index 612911e1a1a..9683af4e97b 100644 --- a/proto/osmosis/incentives/group.proto +++ b/proto/osmosis/incentives/group.proto @@ -8,7 +8,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "osmosis/lockup/lock.proto"; import "osmosis/incentives/gauge.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/incentives/types"; // SplittingPolicy determines the way we want to split incentives in groupGauges enum SplittingPolicy { diff --git a/proto/osmosis/incentives/params.proto b/proto/osmosis/incentives/params.proto index 42c24bfcfb9..381cd23e552 100644 --- a/proto/osmosis/incentives/params.proto +++ b/proto/osmosis/incentives/params.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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 4d5e049d9d6..a5a9ff16e8a 100644 --- a/proto/osmosis/incentives/query.proto +++ b/proto/osmosis/incentives/query.proto @@ -10,7 +10,7 @@ import "osmosis/incentives/gauge.proto"; import "osmosis/lockup/lock.proto"; import "osmosis/incentives/group.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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 4778a3be122..e9de9dea027 100644 --- a/proto/osmosis/incentives/tx.proto +++ b/proto/osmosis/incentives/tx.proto @@ -8,7 +8,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/v24/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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 c6a0fc0eae4..8290021520d 100644 --- a/proto/osmosis/lockup/genesis.proto +++ b/proto/osmosis/lockup/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "osmosis/lockup/lock.proto"; import "osmosis/lockup/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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 489f25d784e..8dbf9086672 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/v24/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/lockup/types"; // PeriodLock is a single lock unit by period defined by the x/lockup module. // It's a record of a locked coin at a specific time. It stores owner, duration, diff --git a/proto/osmosis/lockup/params.proto b/proto/osmosis/lockup/params.proto index 2bc8b6e6cb8..15a15077472 100644 --- a/proto/osmosis/lockup/params.proto +++ b/proto/osmosis/lockup/params.proto @@ -3,7 +3,7 @@ package osmosis.lockup; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/lockup/types"; message Params { repeated string force_unlock_allowed_addresses = 1 diff --git a/proto/osmosis/lockup/query.proto b/proto/osmosis/lockup/query.proto index d570cd7e0a1..359420a3bf4 100644 --- a/proto/osmosis/lockup/query.proto +++ b/proto/osmosis/lockup/query.proto @@ -9,7 +9,7 @@ import "google/protobuf/duration.proto"; import "osmosis/lockup/lock.proto"; import "osmosis/lockup/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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 c5f14310629..5310e4e85a0 100644 --- a/proto/osmosis/lockup/tx.proto +++ b/proto/osmosis/lockup/tx.proto @@ -7,7 +7,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/v24/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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 bf4344d5b2a..fbfe3e8d84c 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/v24/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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 4f53791322e..28e2ef206a8 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/v24/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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 94d7a449b25..fb1abb51290 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/v24/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/mint/types"; // Query provides defines the gRPC querier service. service Query { diff --git a/proto/osmosis/poolincentives/v1beta1/genesis.proto b/proto/osmosis/poolincentives/v1beta1/genesis.proto index a115676e51c..bb12576f34a 100644 --- a/proto/osmosis/poolincentives/v1beta1/genesis.proto +++ b/proto/osmosis/poolincentives/v1beta1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "osmosis/poolincentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types"; // GenesisState defines the pool incentives module's genesis state. message GenesisState { diff --git a/proto/osmosis/poolincentives/v1beta1/gov.proto b/proto/osmosis/poolincentives/v1beta1/gov.proto index d5bc3f1f883..1f011873066 100644 --- a/proto/osmosis/poolincentives/v1beta1/gov.proto +++ b/proto/osmosis/poolincentives/v1beta1/gov.proto @@ -6,7 +6,7 @@ import "amino/amino.proto"; import "gogoproto/gogo.proto"; import "osmosis/poolincentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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/poolincentives/v1beta1/incentives.proto b/proto/osmosis/poolincentives/v1beta1/incentives.proto index 7f2aa793721..875971f55dc 100644 --- a/proto/osmosis/poolincentives/v1beta1/incentives.proto +++ b/proto/osmosis/poolincentives/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/v24/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types"; message Params { option (gogoproto.goproto_stringer) = false; diff --git a/proto/osmosis/poolincentives/v1beta1/query.proto b/proto/osmosis/poolincentives/v1beta1/query.proto index 485722a876c..8eeababe6be 100644 --- a/proto/osmosis/poolincentives/v1beta1/query.proto +++ b/proto/osmosis/poolincentives/v1beta1/query.proto @@ -7,7 +7,7 @@ import "google/protobuf/duration.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/poolincentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types"; service Query { // GaugeIds takes the pool id and returns the matching gauge ids and durations diff --git a/proto/osmosis/poolincentives/v1beta1/shared.proto b/proto/osmosis/poolincentives/v1beta1/shared.proto index 6b872a1e620..d63ce313d9e 100644 --- a/proto/osmosis/poolincentives/v1beta1/shared.proto +++ b/proto/osmosis/poolincentives/v1beta1/shared.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "osmosis/poolincentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types"; // MigrationRecords contains all the links between balancer and concentrated // pools. diff --git a/proto/osmosis/poolmanager/v1beta1/genesis.proto b/proto/osmosis/poolmanager/v1beta1/genesis.proto index 95095489417..62be9fbea25 100644 --- a/proto/osmosis/poolmanager/v1beta1/genesis.proto +++ b/proto/osmosis/poolmanager/v1beta1/genesis.proto @@ -9,7 +9,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "osmosis/poolmanager/v1beta1/module_route.proto"; import "osmosis/poolmanager/v1beta1/tx.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types"; // Params holds parameters for the poolmanager module message Params { diff --git a/proto/osmosis/poolmanager/v1beta1/gov.proto b/proto/osmosis/poolmanager/v1beta1/gov.proto index a8e3dca4d58..d452f500178 100644 --- a/proto/osmosis/poolmanager/v1beta1/gov.proto +++ b/proto/osmosis/poolmanager/v1beta1/gov.proto @@ -4,7 +4,7 @@ package osmosis.poolmanager.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/poolmanager/v1beta1/tx.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types"; // DenomPairTakerFeeProposal is a type for adding/removing a custom taker fee(s) // for one or more denom pairs. diff --git a/proto/osmosis/poolmanager/v1beta1/module_route.proto b/proto/osmosis/poolmanager/v1beta1/module_route.proto index 7823571bd42..6ee1404d396 100644 --- a/proto/osmosis/poolmanager/v1beta1/module_route.proto +++ b/proto/osmosis/poolmanager/v1beta1/module_route.proto @@ -3,7 +3,7 @@ package osmosis.poolmanager.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types"; // PoolType is an enumeration of all supported pool types. enum PoolType { diff --git a/proto/osmosis/poolmanager/v1beta1/query.proto b/proto/osmosis/poolmanager/v1beta1/query.proto index 4c090c60d63..0be354028a9 100644 --- a/proto/osmosis/poolmanager/v1beta1/query.proto +++ b/proto/osmosis/poolmanager/v1beta1/query.proto @@ -13,7 +13,7 @@ import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryproto"; service Query { rpc Params(ParamsRequest) returns (ParamsResponse) { diff --git a/proto/osmosis/poolmanager/v1beta1/query.yml b/proto/osmosis/poolmanager/v1beta1/query.yml index 1365a28221f..d2b071177cb 100644 --- a/proto/osmosis/poolmanager/v1beta1/query.yml +++ b/proto/osmosis/poolmanager/v1beta1/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v24/x/poolmanager" + path: "github.com/osmosis-labs/osmosis/v25/x/poolmanager" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client" +client_path: "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client" queries: Params: proto_wrapper: diff --git a/proto/osmosis/poolmanager/v1beta1/swap_route.proto b/proto/osmosis/poolmanager/v1beta1/swap_route.proto index cade7bdf28b..596efad4bd2 100644 --- a/proto/osmosis/poolmanager/v1beta1/swap_route.proto +++ b/proto/osmosis/poolmanager/v1beta1/swap_route.proto @@ -3,7 +3,7 @@ package osmosis.poolmanager.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types"; message SwapAmountInRoute { uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ]; diff --git a/proto/osmosis/poolmanager/v1beta1/tracked_volume.proto b/proto/osmosis/poolmanager/v1beta1/tracked_volume.proto index 1f47fdb2c4b..9e313f866a2 100644 --- a/proto/osmosis/poolmanager/v1beta1/tracked_volume.proto +++ b/proto/osmosis/poolmanager/v1beta1/tracked_volume.proto @@ -4,7 +4,7 @@ package osmosis.poolmanager.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types"; message TrackedVolume { repeated cosmos.base.v1beta1.Coin amount = 1 [ diff --git a/proto/osmosis/poolmanager/v1beta1/tx.proto b/proto/osmosis/poolmanager/v1beta1/tx.proto index f5ac4542321..8f147e71a4a 100644 --- a/proto/osmosis/poolmanager/v1beta1/tx.proto +++ b/proto/osmosis/poolmanager/v1beta1/tx.proto @@ -6,7 +6,7 @@ import "amino/amino.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/poolmanager/v1beta1/swap_route.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types"; service Msg { rpc SwapExactAmountIn(MsgSwapExactAmountIn) diff --git a/proto/osmosis/poolmanager/v2/query.proto b/proto/osmosis/poolmanager/v2/query.proto index f715fec0575..b4626018cf4 100644 --- a/proto/osmosis/poolmanager/v2/query.proto +++ b/proto/osmosis/poolmanager/v2/query.proto @@ -8,7 +8,7 @@ import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryprotov2"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryprotov2"; service Query { // SpotPriceV2 defines a gRPC query handler that returns the spot price given diff --git a/proto/osmosis/poolmanager/v2/query.yml b/proto/osmosis/poolmanager/v2/query.yml index ccf0456beca..3dde90a0ade 100644 --- a/proto/osmosis/poolmanager/v2/query.yml +++ b/proto/osmosis/poolmanager/v2/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v24/x/poolmanager" + path: "github.com/osmosis-labs/osmosis/v25/x/poolmanager" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client" +client_path: "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client" queries: SpotPrice: proto_wrapper: diff --git a/proto/osmosis/protorev/v1beta1/genesis.proto b/proto/osmosis/protorev/v1beta1/genesis.proto index 4debe3aadb1..3c23e7a614d 100644 --- a/proto/osmosis/protorev/v1beta1/genesis.proto +++ b/proto/osmosis/protorev/v1beta1/genesis.proto @@ -8,7 +8,7 @@ import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/protorev/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/protorev/types"; // GenesisState defines the protorev module's genesis state. message GenesisState { diff --git a/proto/osmosis/protorev/v1beta1/gov.proto b/proto/osmosis/protorev/v1beta1/gov.proto index 51866ad27bd..7ee18b95fe3 100644 --- a/proto/osmosis/protorev/v1beta1/gov.proto +++ b/proto/osmosis/protorev/v1beta1/gov.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; import "osmosis/protorev/v1beta1/protorev.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/protorev/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/protorev/types"; // SetProtoRevEnabledProposal is a gov Content type to update whether the // protorev module is enabled diff --git a/proto/osmosis/protorev/v1beta1/params.proto b/proto/osmosis/protorev/v1beta1/params.proto index 443179c1760..6bd09f0c0d5 100644 --- a/proto/osmosis/protorev/v1beta1/params.proto +++ b/proto/osmosis/protorev/v1beta1/params.proto @@ -4,7 +4,7 @@ package osmosis.protorev.v1beta1; import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/protorev/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/protorev/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/osmosis/protorev/v1beta1/protorev.proto b/proto/osmosis/protorev/v1beta1/protorev.proto index 4c3bca4e797..f0334ce92cb 100644 --- a/proto/osmosis/protorev/v1beta1/protorev.proto +++ b/proto/osmosis/protorev/v1beta1/protorev.proto @@ -8,7 +8,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "osmosis/poolmanager/v1beta1/genesis.proto"; import "osmosis/txfees/v1beta1/genesis.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/protorev/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/protorev/types"; // TokenPairArbRoutes tracks all of the hot routes for a given pair of tokens message TokenPairArbRoutes { diff --git a/proto/osmosis/protorev/v1beta1/query.proto b/proto/osmosis/protorev/v1beta1/query.proto index 2e08e5ced2a..28904b55d5f 100644 --- a/proto/osmosis/protorev/v1beta1/query.proto +++ b/proto/osmosis/protorev/v1beta1/query.proto @@ -9,7 +9,7 @@ import "osmosis/protorev/v1beta1/protorev.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/protorev/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/protorev/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/protorev/v1beta1/tx.proto b/proto/osmosis/protorev/v1beta1/tx.proto index 2de54c73fd1..ad9fa0d501b 100644 --- a/proto/osmosis/protorev/v1beta1/tx.proto +++ b/proto/osmosis/protorev/v1beta1/tx.proto @@ -7,7 +7,7 @@ import "google/api/annotations.proto"; import "osmosis/protorev/v1beta1/protorev.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/protorev/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/protorev/types"; service Msg { // SetHotRoutes sets the hot routes that will be explored when creating diff --git a/proto/osmosis/smartaccount/v1beta1/genesis.proto b/proto/osmosis/smartaccount/v1beta1/genesis.proto index 5b075cde1e9..12d5c9a83fc 100644 --- a/proto/osmosis/smartaccount/v1beta1/genesis.proto +++ b/proto/osmosis/smartaccount/v1beta1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "osmosis/smartaccount/v1beta1/params.proto"; import "osmosis/smartaccount/v1beta1/models.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/smart-account/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/smart-account/types"; // AuthenticatorData represents a genesis exported account with Authenticators. // The address is used as the key, and the account authenticators are stored in diff --git a/proto/osmosis/smartaccount/v1beta1/models.proto b/proto/osmosis/smartaccount/v1beta1/models.proto index 16fb3543abf..d80a0391fce 100644 --- a/proto/osmosis/smartaccount/v1beta1/models.proto +++ b/proto/osmosis/smartaccount/v1beta1/models.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package osmosis.smartaccount.v1beta1; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/smart-account/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/smart-account/types"; // AccountAuthenticator represents a foundational model for all authenticators. // It provides extensibility by allowing concrete types to interpret and diff --git a/proto/osmosis/smartaccount/v1beta1/params.proto b/proto/osmosis/smartaccount/v1beta1/params.proto index cebbdee8e2c..734d19dcc76 100644 --- a/proto/osmosis/smartaccount/v1beta1/params.proto +++ b/proto/osmosis/smartaccount/v1beta1/params.proto @@ -3,7 +3,7 @@ package osmosis.smartaccount.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/smart-account/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/smart-account/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/osmosis/smartaccount/v1beta1/query.proto b/proto/osmosis/smartaccount/v1beta1/query.proto index 74ab0d7b527..75196ff84e1 100644 --- a/proto/osmosis/smartaccount/v1beta1/query.proto +++ b/proto/osmosis/smartaccount/v1beta1/query.proto @@ -7,7 +7,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "osmosis/smartaccount/v1beta1/params.proto"; import "osmosis/smartaccount/v1beta1/models.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/smart-account/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/smart-account/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/smartaccount/v1beta1/tx.proto b/proto/osmosis/smartaccount/v1beta1/tx.proto index d3342026b12..01cd0f709eb 100644 --- a/proto/osmosis/smartaccount/v1beta1/tx.proto +++ b/proto/osmosis/smartaccount/v1beta1/tx.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package osmosis.smartaccount.v1beta1; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/smart-account/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/smart-account/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/osmosis/superfluid/genesis.proto b/proto/osmosis/superfluid/genesis.proto index 1712e4c3782..a2b17617a65 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/v24/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/superfluid/types"; // GenesisState defines the module's genesis state. message GenesisState { diff --git a/proto/osmosis/superfluid/params.proto b/proto/osmosis/superfluid/params.proto index 6e044f9ffa3..0cb84ad40ae 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/v24/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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 3d566f3b4ba..682db8046b7 100644 --- a/proto/osmosis/superfluid/query.proto +++ b/proto/osmosis/superfluid/query.proto @@ -12,7 +12,7 @@ import "osmosis/lockup/lock.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "cosmos/staking/v1beta1/staking.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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 074eddfe0e6..e3ce43a54d9 100644 --- a/proto/osmosis/superfluid/superfluid.proto +++ b/proto/osmosis/superfluid/superfluid.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/v24/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/superfluid/types"; // SuperfluidAssetType indicates whether the superfluid asset is // a native token, lp share of a pool, or concentrated share of a pool diff --git a/proto/osmosis/superfluid/tx.proto b/proto/osmosis/superfluid/tx.proto index aaf4b56b488..3acd17ce4fd 100644 --- a/proto/osmosis/superfluid/tx.proto +++ b/proto/osmosis/superfluid/tx.proto @@ -8,7 +8,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "google/protobuf/timestamp.proto"; import "osmosis/superfluid/superfluid.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/superfluid/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/osmosis/superfluid/v1beta1/gov.proto b/proto/osmosis/superfluid/v1beta1/gov.proto index e9aa1cf9fab..80a4494f746 100644 --- a/proto/osmosis/superfluid/v1beta1/gov.proto +++ b/proto/osmosis/superfluid/v1beta1/gov.proto @@ -6,7 +6,7 @@ import "amino/amino.proto"; import "cosmos_proto/cosmos.proto"; import "osmosis/superfluid/superfluid.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/superfluid/types"; // SetSuperfluidAssetsProposal is a gov Content type to update the superfluid // assets diff --git a/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto b/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto index f59f025ef32..cfa489da281 100644 --- a/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto +++ b/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto @@ -4,7 +4,7 @@ package osmosis.tokenfactory.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types"; // DenomAuthorityMetadata specifies metadata for addresses that have specific // capabilities over a token factory denom. Right now there is only one Admin diff --git a/proto/osmosis/tokenfactory/v1beta1/genesis.proto b/proto/osmosis/tokenfactory/v1beta1/genesis.proto index 58eef152f32..ba90a727fd3 100644 --- a/proto/osmosis/tokenfactory/v1beta1/genesis.proto +++ b/proto/osmosis/tokenfactory/v1beta1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto"; import "osmosis/tokenfactory/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types"; // GenesisState defines the tokenfactory module's genesis state. message GenesisState { diff --git a/proto/osmosis/tokenfactory/v1beta1/params.proto b/proto/osmosis/tokenfactory/v1beta1/params.proto index 1f90702a226..341c7d5dba2 100644 --- a/proto/osmosis/tokenfactory/v1beta1/params.proto +++ b/proto/osmosis/tokenfactory/v1beta1/params.proto @@ -6,7 +6,7 @@ import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto"; import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types"; // Params defines the parameters for the tokenfactory module. message Params { diff --git a/proto/osmosis/tokenfactory/v1beta1/query.proto b/proto/osmosis/tokenfactory/v1beta1/query.proto index 2b557176f60..f863f18b691 100644 --- a/proto/osmosis/tokenfactory/v1beta1/query.proto +++ b/proto/osmosis/tokenfactory/v1beta1/query.proto @@ -7,7 +7,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "osmosis/tokenfactory/v1beta1/authorityMetadata.proto"; import "osmosis/tokenfactory/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/tokenfactory/v1beta1/tx.proto b/proto/osmosis/tokenfactory/v1beta1/tx.proto index e2d24073368..267ef85583a 100644 --- a/proto/osmosis/tokenfactory/v1beta1/tx.proto +++ b/proto/osmosis/tokenfactory/v1beta1/tx.proto @@ -6,7 +6,7 @@ import "amino/amino.proto"; import "cosmos/base/v1beta1/coin.proto"; import "cosmos/bank/v1beta1/bank.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types"; // Msg defines the tokefactory module's gRPC message service. service Msg { diff --git a/proto/osmosis/twap/v1beta1/genesis.proto b/proto/osmosis/twap/v1beta1/genesis.proto index 17bc01cb591..016309816ed 100644 --- a/proto/osmosis/twap/v1beta1/genesis.proto +++ b/proto/osmosis/twap/v1beta1/genesis.proto @@ -7,7 +7,7 @@ import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/twap/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/twap/types"; // Params holds parameters for the twap module message Params { diff --git a/proto/osmosis/twap/v1beta1/query.proto b/proto/osmosis/twap/v1beta1/query.proto index e592d3e6784..3ea39d7cf41 100644 --- a/proto/osmosis/twap/v1beta1/query.proto +++ b/proto/osmosis/twap/v1beta1/query.proto @@ -12,7 +12,7 @@ import "google/protobuf/any.proto"; import "cosmos_proto/cosmos.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/twap/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/twap/client/queryproto"; service Query { rpc Params(ParamsRequest) returns (ParamsResponse) { diff --git a/proto/osmosis/twap/v1beta1/query.yml b/proto/osmosis/twap/v1beta1/query.yml index 29825d79955..b2ec3c0cc7e 100644 --- a/proto/osmosis/twap/v1beta1/query.yml +++ b/proto/osmosis/twap/v1beta1/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v24/x/twap" + path: "github.com/osmosis-labs/osmosis/v25/x/twap" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v24/x/twap/client" +client_path: "github.com/osmosis-labs/osmosis/v25/x/twap/client" queries: ArithmeticTwap: proto_wrapper: diff --git a/proto/osmosis/twap/v1beta1/twap_record.proto b/proto/osmosis/twap/v1beta1/twap_record.proto index a36a9be55e4..6bad4a6dbc0 100644 --- a/proto/osmosis/twap/v1beta1/twap_record.proto +++ b/proto/osmosis/twap/v1beta1/twap_record.proto @@ -4,7 +4,7 @@ package osmosis.twap.v1beta1; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/twap/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/twap/types"; // A TWAP record should be indexed in state by pool_id, (asset pair), timestamp // The asset pair assets should be lexicographically sorted. diff --git a/proto/osmosis/txfees/v1beta1/feetoken.proto b/proto/osmosis/txfees/v1beta1/feetoken.proto index 9b2fe7d9091..6a78c87e7f6 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/v24/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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 db7d6c8df8d..8e1acf3d11b 100644 --- a/proto/osmosis/txfees/v1beta1/genesis.proto +++ b/proto/osmosis/txfees/v1beta1/genesis.proto @@ -6,7 +6,7 @@ import "osmosis/txfees/v1beta1/feetoken.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/txfees/v1beta1/params.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/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 b431172c3cb..8d136d46c4c 100644 --- a/proto/osmosis/txfees/v1beta1/gov.proto +++ b/proto/osmosis/txfees/v1beta1/gov.proto @@ -6,7 +6,7 @@ import "cosmos_proto/cosmos.proto"; import "amino/amino.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/txfees/types"; // UpdateFeeTokenProposal is a gov Content type for adding new whitelisted fee // token(s). It must specify a denom along with gamm pool ID to use as a spot diff --git a/proto/osmosis/txfees/v1beta1/params.proto b/proto/osmosis/txfees/v1beta1/params.proto index 3f8a7e10c6b..7c46fea1e6b 100644 --- a/proto/osmosis/txfees/v1beta1/params.proto +++ b/proto/osmosis/txfees/v1beta1/params.proto @@ -3,7 +3,7 @@ package osmosis.txfees.v1beta1; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/txfees/types"; // Params holds parameters for the txfees module message Params { diff --git a/proto/osmosis/txfees/v1beta1/query.proto b/proto/osmosis/txfees/v1beta1/query.proto index 1d30a0f5a55..f5ca03ff11f 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/v24/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/txfees/types"; service Query { // FeeTokens returns a list of all the whitelisted fee tokens and their diff --git a/proto/osmosis/txfees/v1beta1/tx.proto b/proto/osmosis/txfees/v1beta1/tx.proto index c96e9638b88..b25975e861f 100644 --- a/proto/osmosis/txfees/v1beta1/tx.proto +++ b/proto/osmosis/txfees/v1beta1/tx.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "amino/amino.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/txfees/types"; service Msg { rpc SetFeeTokens(MsgSetFeeTokens) returns (MsgSetFeeTokensResponse); diff --git a/proto/osmosis/valsetpref/v1beta1/query.proto b/proto/osmosis/valsetpref/v1beta1/query.proto index 09dc8903699..af39b46c37b 100644 --- a/proto/osmosis/valsetpref/v1beta1/query.proto +++ b/proto/osmosis/valsetpref/v1beta1/query.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "osmosis/valsetpref/v1beta1/state.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/valset-pref/client/queryproto"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/valset-pref/client/queryproto"; option (gogoproto.goproto_getters_all) = false; // Query defines the gRPC querier service. diff --git a/proto/osmosis/valsetpref/v1beta1/query.yml b/proto/osmosis/valsetpref/v1beta1/query.yml index a910fbba08a..97224037379 100644 --- a/proto/osmosis/valsetpref/v1beta1/query.yml +++ b/proto/osmosis/valsetpref/v1beta1/query.yml @@ -1,7 +1,7 @@ keeper: - path: "github.com/osmosis-labs/osmosis/v24/x/valset-pref" + path: "github.com/osmosis-labs/osmosis/v25/x/valset-pref" struct: "Keeper" -client_path: "github.com/osmosis-labs/osmosis/v24/x/valset-pref/client" +client_path: "github.com/osmosis-labs/osmosis/v25/x/valset-pref/client" queries: UserValidatorPreferences: proto_wrapper: diff --git a/proto/osmosis/valsetpref/v1beta1/state.proto b/proto/osmosis/valsetpref/v1beta1/state.proto index ab0f1845296..e1bbcfd12b7 100644 --- a/proto/osmosis/valsetpref/v1beta1/state.proto +++ b/proto/osmosis/valsetpref/v1beta1/state.proto @@ -4,7 +4,7 @@ package osmosis.valsetpref.v1beta1; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types"; option (gogoproto.goproto_getters_all) = false; // ValidatorPreference defines the message structure for diff --git a/proto/osmosis/valsetpref/v1beta1/tx.proto b/proto/osmosis/valsetpref/v1beta1/tx.proto index dec15702b13..c72bba0a935 100644 --- a/proto/osmosis/valsetpref/v1beta1/tx.proto +++ b/proto/osmosis/valsetpref/v1beta1/tx.proto @@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/valsetpref/v1beta1/state.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types"; +option go_package = "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types"; // Msg defines the valset-pref module's gRPC message service. service Msg { diff --git a/scripts/cl/in_given_out.py b/scripts/cl/in_given_out.py index 4decf626a56..5de34f87023 100644 --- a/scripts/cl/in_given_out.py +++ b/scripts/cl/in_given_out.py @@ -77,7 +77,7 @@ def estimate_single_position_within_one_tick_ofz_in_given_out(): """Estimates and prints the results of a calc concentrated liquidity test case with a single position within one tick when swapping token one for token zero (ofz). - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_1 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_1 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ is_zero_for_one = False @@ -99,7 +99,7 @@ def estimate_two_positions_within_one_tick_zfo_in_given_out(): """Estimates and prints the results of a calc concentrated liquidity test case with two positions within one tick when swapping token zero for one (zfo). - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_2 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_2 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ is_zero_for_one = True @@ -121,7 +121,7 @@ def estimate_two_consecutive_positions_zfo_in_given_out(spread_factor: str, expe """Estimates and prints the results of a calc concentrated liquidity test case with two consecutive positions when swapping token zero for one (zfo). - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_3 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_3 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ is_zero_for_one = True @@ -144,7 +144,7 @@ def estimate_overlapping_price_range_ofz_test_in_given_out(): """Estimates and prints the results of a calc concentrated liquidity test case with overlapping price ranges when swapping token one for token zero (ofz). - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_4 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_4 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ is_zero_for_one = False @@ -168,7 +168,7 @@ def estimate_overlapping_price_range_zfo_test_in_given_out(tokein_in_initial: st """Estimates and prints the results of a calc concentrated liquidity test case with overlapping price ranges when swapping token zero for one (zfo) and not consuming full liquidity of the second position. - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_5 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_5 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ is_zero_for_one = True @@ -192,7 +192,7 @@ def estimate_consecutive_positions_gap_ofz_test_in_given_out(): """Estimates and prints the results of a calc concentrated liquidity test case with consecutive positions with a gap when swapping token one for zero (ofz). - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_6 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_6 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ is_zero_for_one = False @@ -215,7 +215,7 @@ def estimate_slippage_protection_zfo_test_in_given_out(): """Estimates and prints the results of a calc concentrated liquidity test case with slippage protection when swapping token zero for one (zfo). - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_7 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapInAmtGivenOut/fee_7 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ is_zero_for_one = True diff --git a/scripts/cl/out_given_in.py b/scripts/cl/out_given_in.py index c6cd2a13507..29ea2ee687a 100644 --- a/scripts/cl/out_given_in.py +++ b/scripts/cl/out_given_in.py @@ -77,7 +77,7 @@ def estimate_single_position_within_one_tick_ofz(): """Estimates and prints the results of a calc concentrated liquidity test case with a single position within one tick when swapping token one for token zero (ofz). - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_1 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_1 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ is_zero_for_one = False @@ -101,7 +101,7 @@ def estimate_two_positions_within_one_tick_zfo(): """Estimates and prints the results of a calc concentrated liquidity test case with two positions within one tick when swapping token zero for one (zfo). - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_2 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_2 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ is_zero_for_one = True @@ -123,7 +123,7 @@ def estimate_two_consecutive_positions_zfo(spread_factor: str, expected_token_ou """Estimates and prints the results of a calc concentrated liquidity test case with two consecutive positions when swapping token zero for one (zfo). - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_3 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_3 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ spread_factor = sdk_dec.new(spread_factor) @@ -149,7 +149,7 @@ def estimate_overlapping_price_range_ofz_test(spread_factor: str, expected_token """Estimates and prints the results of a calc concentrated liquidity test case with overlapping price ranges when swapping token one for token zero (ofz). - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_4 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_4 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ is_zero_for_one = False @@ -176,7 +176,7 @@ def estimate_overlapping_price_range_zfo_test(token_in_initial: str, spread_fact """Estimates and prints the results of a calc concentrated liquidity test case with overlapping price ranges when swapping token zero for one (zfo) and not consuming full liquidity of the second position. - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_5 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_5 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ is_zero_for_one = True @@ -200,7 +200,7 @@ def estimate_consecutive_positions_gap_ofz_test(): """Estimates and prints the results of a calc concentrated liquidity test case with consecutive positions with a gap when swapping token one for zero (ofz). - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_6 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_6 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ is_zero_for_one = False @@ -223,7 +223,7 @@ def estimate_slippage_protection_zfo_test(): """Estimates and prints the results of a calc concentrated liquidity test case with slippage protection when swapping token zero for one (zfo). - go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_7 github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity + go test -timeout 30s -v -run TestKeeperTestSuite/TestCalcAndSwapOutAmtGivenIn/fee_7 github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity """ is_zero_for_one = True diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index ea3fdbc3588..703783538d4 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -20,7 +20,7 @@ cd .. # move proto files to the right places # # Note: Proto files are suffixed with the current binary version. -cp -r github.com/osmosis-labs/osmosis/v24/* ./ +cp -r github.com/osmosis-labs/osmosis/v25/* ./ cp -r github.com/osmosis-labs/osmosis/osmoutils ./ cp -r github.com/osmosis-labs/osmosis/x/epochs ./x/ rm -rf github.com diff --git a/scripts/replace_import_paths.sh b/scripts/replace_import_paths.sh index 44c723b9480..3a018b0a38a 100755 --- a/scripts/replace_import_paths.sh +++ b/scripts/replace_import_paths.sh @@ -15,7 +15,7 @@ modules=$(go list -tags e2e ./... | sed "s/g.*v${version_to_replace}\///") while IFS= read -r line; do modules_to_upgrade_manually+=("$line") -done < <(find . -name go.mod -exec grep -l "github.com/osmosis-labs/osmosis/v24" {} \; | grep -v "^./go.mod$" | sed 's|/go.mod||' | sed 's|^./||') +done < <(find . -name go.mod -exec grep -l "github.com/osmosis-labs/osmosis/v25" {} \; | grep -v "^./go.mod$" | sed 's|/go.mod||' | sed 's|^./||') replace_paths() { file="${1}" diff --git a/simulation/executor/internal/executortypes/actions.go b/simulation/executor/internal/executortypes/actions.go index 5f4024e7141..4a8cd6043d4 100644 --- a/simulation/executor/internal/executortypes/actions.go +++ b/simulation/executor/internal/executortypes/actions.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" ) type selectActionFn func(r *rand.Rand) simtypes.ActionsWithMetadata diff --git a/simulation/executor/internal/executortypes/frequency.go b/simulation/executor/internal/executortypes/frequency.go index 1c40c68cb95..6cd260f0b78 100644 --- a/simulation/executor/internal/executortypes/frequency.go +++ b/simulation/executor/internal/executortypes/frequency.go @@ -1,6 +1,6 @@ package executortypes -import "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" +import "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" func totalFrequency(actions []simtypes.ActionsWithMetadata) int { totalFrequency := 0 diff --git a/simulation/executor/internal/executortypes/simmanager.go b/simulation/executor/internal/executortypes/simmanager.go index 9353d9e3953..70fcdeef41d 100644 --- a/simulation/executor/internal/executortypes/simmanager.go +++ b/simulation/executor/internal/executortypes/simmanager.go @@ -17,7 +17,7 @@ import ( "golang.org/x/exp/maps" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" ) // Manager defines a simulation manager that provides the high level utility diff --git a/simulation/executor/internal/pubsub/manager.go b/simulation/executor/internal/pubsub/manager.go index 0ad1241c950..afd0836561b 100644 --- a/simulation/executor/internal/pubsub/manager.go +++ b/simulation/executor/internal/pubsub/manager.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "go.uber.org/multierr" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" ) var _ simtypes.PubSubManager = &Manager{} diff --git a/simulation/executor/legacyconfig.go b/simulation/executor/legacyconfig.go index 73e92e733b4..3978fb66855 100644 --- a/simulation/executor/legacyconfig.go +++ b/simulation/executor/legacyconfig.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/store" - "github.com/osmosis-labs/osmosis/v24/simulation/executor/internal/stats" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes/simlogger" + "github.com/osmosis-labs/osmosis/v25/simulation/executor/internal/stats" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes/simlogger" ) const SimAppChainID = "osmosis-test" diff --git a/simulation/executor/mock_tendermint.go b/simulation/executor/mock_tendermint.go index e1ac65824ec..cb5fce0ffd1 100644 --- a/simulation/executor/mock_tendermint.go +++ b/simulation/executor/mock_tendermint.go @@ -14,7 +14,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/simulation" "golang.org/x/exp/maps" - markov "github.com/osmosis-labs/osmosis/v24/simulation/simtypes/transitionmatrix" + markov "github.com/osmosis-labs/osmosis/v25/simulation/simtypes/transitionmatrix" ) type mockValidator struct { diff --git a/simulation/executor/params.go b/simulation/executor/params.go index 4004bd6e212..f09be86ced2 100644 --- a/simulation/executor/params.go +++ b/simulation/executor/params.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - markov "github.com/osmosis-labs/osmosis/v24/simulation/simtypes/transitionmatrix" + markov "github.com/osmosis-labs/osmosis/v25/simulation/simtypes/transitionmatrix" ) const ( diff --git a/simulation/executor/simulate.go b/simulation/executor/simulate.go index 8f30729ab8b..a80aa18e049 100644 --- a/simulation/executor/simulate.go +++ b/simulation/executor/simulate.go @@ -21,9 +21,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/v24/simulation/executor/internal/executortypes" - "github.com/osmosis-labs/osmosis/v24/simulation/executor/internal/stats" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/simulation/executor/internal/executortypes" + "github.com/osmosis-labs/osmosis/v25/simulation/executor/internal/stats" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" ) const AverageBlockTime = 6 * time.Second diff --git a/simulation/executor/simulate_dev.go b/simulation/executor/simulate_dev.go index 498b3b4b194..d0a1f94b3e9 100644 --- a/simulation/executor/simulate_dev.go +++ b/simulation/executor/simulate_dev.go @@ -13,8 +13,8 @@ import ( tmtypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/v24/simulation/executor/internal/stats" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/simulation/executor/internal/stats" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" ) type simState struct { diff --git a/simulation/executor/types.go b/simulation/executor/types.go index 297c581c20c..595b935834d 100644 --- a/simulation/executor/types.go +++ b/simulation/executor/types.go @@ -8,7 +8,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" legacysim "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" ) // AppStateFn returns the app state json bytes and the genesis accounts diff --git a/simulation/executor/util.go b/simulation/executor/util.go index 435d15ac792..7928d8308cf 100644 --- a/simulation/executor/util.go +++ b/simulation/executor/util.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" ) //nolint:unparam diff --git a/simulation/simtypes/account.go b/simulation/simtypes/account.go index 1a9f24efbbe..e91365a5bdf 100644 --- a/simulation/simtypes/account.go +++ b/simulation/simtypes/account.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/simulation" - sdkrand "github.com/osmosis-labs/osmosis/v24/simulation/simtypes/random" + sdkrand "github.com/osmosis-labs/osmosis/v25/simulation/simtypes/random" ) func (sim *SimCtx) RandomSimAccount() simulation.Account { diff --git a/simulation/simtypes/app.go b/simulation/simtypes/app.go index e94751c609d..7ec1ea4525d 100644 --- a/simulation/simtypes/app.go +++ b/simulation/simtypes/app.go @@ -12,7 +12,7 @@ import ( ibctestingtypes "github.com/cosmos/ibc-go/v7/testing/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type AppCreator = func(homepath string, legacyInvariantPeriod uint, baseappOptions ...func(*baseapp.BaseApp)) App diff --git a/simulation/simtypes/legacy.go b/simulation/simtypes/legacy.go index 59f73692e8b..f455b48ac61 100644 --- a/simulation/simtypes/legacy.go +++ b/simulation/simtypes/legacy.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" - "github.com/osmosis-labs/osmosis/v24/app/params" + "github.com/osmosis-labs/osmosis/v25/app/params" ) // TODO: Must delete diff --git a/simulation/simtypes/randutil.go b/simulation/simtypes/randutil.go index f6dceb9acca..3241d1787b9 100644 --- a/simulation/simtypes/randutil.go +++ b/simulation/simtypes/randutil.go @@ -7,7 +7,7 @@ import ( "golang.org/x/exp/constraints" "github.com/osmosis-labs/osmosis/osmomath" - sdkrand "github.com/osmosis-labs/osmosis/v24/simulation/simtypes/random" + sdkrand "github.com/osmosis-labs/osmosis/v25/simulation/simtypes/random" ) func RandLTBound[T constraints.Integer](sim *SimCtx, upperbound T) T { diff --git a/simulation/simtypes/txbuilder.go b/simulation/simtypes/txbuilder.go index 5bf3eb1b5af..e0613cd628c 100644 --- a/simulation/simtypes/txbuilder.go +++ b/simulation/simtypes/txbuilder.go @@ -11,8 +11,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/types/tx/signing" - "github.com/osmosis-labs/osmosis/v24/app/params" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/app/params" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" authsign "github.com/cosmos/cosmos-sdk/x/auth/signing" diff --git a/tests/e2e/configurer/base.go b/tests/e2e/configurer/base.go index 0c31a589ec0..cfb53e669a2 100644 --- a/tests/e2e/configurer/base.go +++ b/tests/e2e/configurer/base.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/configurer/chain" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/containers" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/util" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/configurer/chain" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/containers" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/util" ) // baseConfigurer is the base implementation for the diff --git a/tests/e2e/configurer/chain/chain.go b/tests/e2e/configurer/chain/chain.go index 2a9a595e718..de763cc20e4 100644 --- a/tests/e2e/configurer/chain/chain.go +++ b/tests/e2e/configurer/chain/chain.go @@ -10,11 +10,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/configurer/config" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/configurer/config" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/containers" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/containers" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" ) type Config struct { diff --git a/tests/e2e/configurer/chain/commands.go b/tests/e2e/configurer/chain/commands.go index 1f76460f85a..35bb5df20b7 100644 --- a/tests/e2e/configurer/chain/commands.go +++ b/tests/e2e/configurer/chain/commands.go @@ -16,13 +16,13 @@ import ( transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/osmosis-labs/osmosis/osmomath" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/configurer/config" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/util" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/configurer/config" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/util" - ibcratelimittypes "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + ibcratelimittypes "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -31,7 +31,7 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/stretchr/testify/require" - app "github.com/osmosis-labs/osmosis/v24/app" + app "github.com/osmosis-labs/osmosis/v25/app" paramsutils "github.com/cosmos/cosmos-sdk/x/params/client/utils" ) diff --git a/tests/e2e/configurer/chain/node.go b/tests/e2e/configurer/chain/node.go index c567d4d8f11..3c07fdcc40f 100644 --- a/tests/e2e/configurer/chain/node.go +++ b/tests/e2e/configurer/chain/node.go @@ -12,8 +12,8 @@ import ( coretypes "github.com/cometbft/cometbft/rpc/core/types" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/containers" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/containers" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" ) type NodeConfig struct { diff --git a/tests/e2e/configurer/chain/queries.go b/tests/e2e/configurer/chain/queries.go index b058cc25f5a..d4d343d4810 100644 --- a/tests/e2e/configurer/chain/queries.go +++ b/tests/e2e/configurer/chain/queries.go @@ -21,16 +21,16 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/util" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryproto" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" - twapqueryproto "github.com/osmosis-labs/osmosis/v24/x/twap/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/util" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryproto" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" + twapqueryproto "github.com/osmosis-labs/osmosis/v25/x/twap/client/queryproto" epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/tests/e2e/configurer/current.go b/tests/e2e/configurer/current.go index 7c23920955e..710c167ca0d 100644 --- a/tests/e2e/configurer/current.go +++ b/tests/e2e/configurer/current.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/configurer/chain" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/containers" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/configurer/chain" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/containers" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" ) type CurrentBranchConfigurer struct { diff --git a/tests/e2e/configurer/factory.go b/tests/e2e/configurer/factory.go index 814e246349f..04139377387 100644 --- a/tests/e2e/configurer/factory.go +++ b/tests/e2e/configurer/factory.go @@ -4,9 +4,9 @@ import ( "errors" "testing" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/configurer/chain" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/containers" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/configurer/chain" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/containers" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" ) type Configurer interface { diff --git a/tests/e2e/configurer/upgrade.go b/tests/e2e/configurer/upgrade.go index 3b5a23edc48..376398d5e25 100644 --- a/tests/e2e/configurer/upgrade.go +++ b/tests/e2e/configurer/upgrade.go @@ -11,11 +11,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/configurer/chain" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/configurer/config" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/containers" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/configurer/chain" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/configurer/config" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/containers" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" ) type UpgradeSettings struct { diff --git a/tests/e2e/containers/containers.go b/tests/e2e/containers/containers.go index b9e1d94c90c..e6520a6580e 100644 --- a/tests/e2e/containers/containers.go +++ b/tests/e2e/containers/containers.go @@ -19,8 +19,8 @@ import ( "gopkg.in/yaml.v2" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) type TxResponse struct { diff --git a/tests/e2e/e2e_cl_test.go b/tests/e2e/e2e_cl_test.go index 1bc8b63bc38..9f830c0da43 100644 --- a/tests/e2e/e2e_cl_test.go +++ b/tests/e2e/e2e_cl_test.go @@ -11,17 +11,17 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/configurer/chain" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" - clmath "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/configurer/chain" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" + clmath "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // Note: do not use chain B in this test as it has taker fee set. diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go index 29dffd1928f..3eda216ef62 100644 --- a/tests/e2e/e2e_setup_test.go +++ b/tests/e2e/e2e_setup_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/suite" - configurer "github.com/osmosis-labs/osmosis/v24/tests/e2e/configurer" + configurer "github.com/osmosis-labs/osmosis/v25/tests/e2e/configurer" ) const ( diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index ef0f7cc132b..c73854e79ac 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -21,15 +21,15 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" ibchookskeeper "github.com/osmosis-labs/osmosis/x/ibc-hooks/keeper" - ibcratelimittypes "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + ibcratelimittypes "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/configurer/chain" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/configurer/config" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/configurer/chain" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/configurer/config" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" ) var ( diff --git a/tests/e2e/helpers_e2e_test.go b/tests/e2e/helpers_e2e_test.go index 08e63f4ae26..69aeb8f1b33 100644 --- a/tests/e2e/helpers_e2e_test.go +++ b/tests/e2e/helpers_e2e_test.go @@ -11,10 +11,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/configurer/chain" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/util" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/configurer/chain" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/util" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) var defaultFeePerTx = osmomath.NewInt(1000) diff --git a/tests/e2e/initialization/chain/main.go b/tests/e2e/initialization/chain/main.go index b2029ff9232..7cbac924210 100644 --- a/tests/e2e/initialization/chain/main.go +++ b/tests/e2e/initialization/chain/main.go @@ -7,7 +7,7 @@ import ( "os" "time" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" ) func main() { diff --git a/tests/e2e/initialization/config.go b/tests/e2e/initialization/config.go index 2b90cfc0d1d..bb360a4ea45 100644 --- a/tests/e2e/initialization/config.go +++ b/tests/e2e/initialization/config.go @@ -20,20 +20,20 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" - poolitypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" - twaptypes "github.com/osmosis-labs/osmosis/v24/x/twap/types" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" + poolitypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" + twaptypes "github.com/osmosis-labs/osmosis/v25/x/twap/types" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" types1 "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/util" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/util" ) // NodeConfig is a confiuration for the node supplied from the test runner diff --git a/tests/e2e/initialization/init.go b/tests/e2e/initialization/init.go index 439b8749510..eda4a7e7959 100644 --- a/tests/e2e/initialization/init.go +++ b/tests/e2e/initialization/init.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/util" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/util" ) func InitChain(id, dataDir string, nodeConfigs []*NodeConfig, votingPeriod, expeditedVotingPeriod time.Duration, forkHeight int) (*Chain, error) { diff --git a/tests/e2e/initialization/init_test.go b/tests/e2e/initialization/init_test.go index 018387a2e36..3b8502544d7 100644 --- a/tests/e2e/initialization/init_test.go +++ b/tests/e2e/initialization/init_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" ) const forkHeight = 10 diff --git a/tests/e2e/initialization/node.go b/tests/e2e/initialization/node.go index 8c24779d98b..7952a95f1de 100644 --- a/tests/e2e/initialization/node.go +++ b/tests/e2e/initialization/node.go @@ -31,8 +31,8 @@ import ( "github.com/spf13/viper" "github.com/osmosis-labs/osmosis/osmomath" - osmosisApp "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/util" + osmosisApp "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/util" ) type internalNode struct { diff --git a/tests/e2e/initialization/node/main.go b/tests/e2e/initialization/node/main.go index feadc0ba76d..fc5d19cd855 100644 --- a/tests/e2e/initialization/node/main.go +++ b/tests/e2e/initialization/node/main.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" ) func main() { diff --git a/tests/e2e/initialization/util.go b/tests/e2e/initialization/util.go index 83518e19986..946982d525e 100644 --- a/tests/e2e/initialization/util.go +++ b/tests/e2e/initialization/util.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec/unknownproto" sdktx "github.com/cosmos/cosmos-sdk/types/tx" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/util" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/util" ) func decodeTx(txBytes []byte) (*sdktx.Tx, error) { diff --git a/tests/e2e/sync_test.go b/tests/e2e/sync_test.go index a6a7b90e8b3..6140d812e5b 100644 --- a/tests/e2e/sync_test.go +++ b/tests/e2e/sync_test.go @@ -8,7 +8,7 @@ import ( coretypes "github.com/cometbft/cometbft/rpc/core/types" - "github.com/osmosis-labs/osmosis/v24/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v25/tests/e2e/initialization" ) // TODO: Consider moving this to its own package and having separate test instantiation for it. diff --git a/tests/e2e/util/codec.go b/tests/e2e/util/codec.go index 414af178199..c28b921957b 100644 --- a/tests/e2e/util/codec.go +++ b/tests/e2e/util/codec.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - osmosisApp "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/app/params" + osmosisApp "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/app/params" ) var ( diff --git a/tests/ibc-hooks/async_acks_test.go b/tests/ibc-hooks/async_acks_test.go index ba5a8daa038..6a7b4a2316a 100644 --- a/tests/ibc-hooks/async_acks_test.go +++ b/tests/ibc-hooks/async_acks_test.go @@ -13,7 +13,7 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/app" + "github.com/osmosis-labs/osmosis/v25/app" "github.com/osmosis-labs/osmosis/x/ibc-hooks/types" ) diff --git a/tests/ibc-hooks/ibc_middleware_test.go b/tests/ibc-hooks/ibc_middleware_test.go index ab74e6243c6..4ce879065d5 100644 --- a/tests/ibc-hooks/ibc_middleware_test.go +++ b/tests/ibc-hooks/ibc_middleware_test.go @@ -19,12 +19,12 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" - txfeetypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" + txfeetypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" "github.com/stretchr/testify/suite" @@ -35,9 +35,9 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibctesting "github.com/cosmos/ibc-go/v7/testing" - "github.com/osmosis-labs/osmosis/v24/tests/osmosisibctesting" + "github.com/osmosis-labs/osmosis/v25/tests/osmosisibctesting" - "github.com/osmosis-labs/osmosis/v24/tests/ibc-hooks/testutils" + "github.com/osmosis-labs/osmosis/v25/tests/ibc-hooks/testutils" ) type HooksTestSuite struct { diff --git a/tests/ibc-hooks/xcs_cw20_test.go b/tests/ibc-hooks/xcs_cw20_test.go index 76c7ec1536a..b69f76f444f 100644 --- a/tests/ibc-hooks/xcs_cw20_test.go +++ b/tests/ibc-hooks/xcs_cw20_test.go @@ -11,7 +11,7 @@ import ( ibctesting "github.com/cosmos/ibc-go/v7/testing" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/tests/osmosisibctesting" + "github.com/osmosis-labs/osmosis/v25/tests/osmosisibctesting" ) // Instantiate the cw20 and cw20-ics20 contract diff --git a/tests/mocks/cfmm_pool.go b/tests/mocks/cfmm_pool.go index ae29214008b..752ac9a5f35 100644 --- a/tests/mocks/cfmm_pool.go +++ b/tests/mocks/cfmm_pool.go @@ -11,7 +11,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" gomock "github.com/golang/mock/gomock" osmomath "github.com/osmosis-labs/osmosis/osmomath" - types0 "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + types0 "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // MockCFMMPoolI is a mock of CFMMPoolI interface. diff --git a/tests/mocks/cl_pool.go b/tests/mocks/cl_pool.go index f23ce3a68da..d223b60953f 100644 --- a/tests/mocks/cl_pool.go +++ b/tests/mocks/cl_pool.go @@ -11,7 +11,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" gomock "github.com/golang/mock/gomock" osmomath "github.com/osmosis-labs/osmosis/osmomath" - types0 "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + types0 "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // MockConcentratedPoolExtension is a mock of ConcentratedPoolExtension interface. diff --git a/tests/mocks/pool.go b/tests/mocks/pool.go index 2b1b13c3058..b50db71a1a5 100644 --- a/tests/mocks/pool.go +++ b/tests/mocks/pool.go @@ -10,7 +10,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" gomock "github.com/golang/mock/gomock" osmomath "github.com/osmosis-labs/osmosis/osmomath" - types0 "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + types0 "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // MockPoolI is a mock of PoolI interface. diff --git a/tests/mocks/pool_module.go b/tests/mocks/pool_module.go index c4edb5f2f22..d4a127855b0 100644 --- a/tests/mocks/pool_module.go +++ b/tests/mocks/pool_module.go @@ -12,7 +12,7 @@ import ( types1 "github.com/cosmos/cosmos-sdk/x/bank/types" gomock "github.com/golang/mock/gomock" osmomath "github.com/osmosis-labs/osmosis/osmomath" - types2 "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + types2 "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // MockAccountI is a mock of AccountI interface. diff --git a/tests/osmosisibctesting/chain.go b/tests/osmosisibctesting/chain.go index 1950110e4e6..f4725678f58 100644 --- a/tests/osmosisibctesting/chain.go +++ b/tests/osmosisibctesting/chain.go @@ -12,7 +12,7 @@ import ( authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" - smartaccounttypes "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + smartaccounttypes "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" @@ -23,7 +23,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ibctesting "github.com/cosmos/ibc-go/v7/testing" - "github.com/osmosis-labs/osmosis/v24/app" + "github.com/osmosis-labs/osmosis/v25/app" ) const SimAppChainID = "simulation-app" diff --git a/tests/osmosisibctesting/wasm.go b/tests/osmosisibctesting/wasm.go index 5dbb7c1a9fa..03cf16a4e46 100644 --- a/tests/osmosisibctesting/wasm.go +++ b/tests/osmosisibctesting/wasm.go @@ -15,7 +15,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" ) func (chain *TestChain) StoreContractCode(suite *suite.Suite, path string) { diff --git a/tests/simulator/osmosis_helper.go b/tests/simulator/osmosis_helper.go index 0856ced0050..9c8e83169db 100644 --- a/tests/simulator/osmosis_helper.go +++ b/tests/simulator/osmosis_helper.go @@ -7,10 +7,10 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/types/simulation" - simexec "github.com/osmosis-labs/osmosis/v24/simulation/executor" + simexec "github.com/osmosis-labs/osmosis/v25/simulation/executor" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" ) func OsmosisAppCreator(logger log.Logger, db db.DB) simtypes.AppCreator { diff --git a/tests/simulator/sim_test.go b/tests/simulator/sim_test.go index 6c83b2fc394..d07d8ff1005 100644 --- a/tests/simulator/sim_test.go +++ b/tests/simulator/sim_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/osmosis-labs/osmosis/osmomath" - osmosim "github.com/osmosis-labs/osmosis/v24/simulation/executor" - txfeetypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + osmosim "github.com/osmosis-labs/osmosis/v25/simulation/executor" + txfeetypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) const SimAppChainID = "simulation-app" diff --git a/tests/simulator/state.go b/tests/simulator/state.go index 5de4d60c874..1dfcb6b38e8 100644 --- a/tests/simulator/state.go +++ b/tests/simulator/state.go @@ -8,9 +8,9 @@ import ( "time" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app" - osmosim "github.com/osmosis-labs/osmosis/v24/simulation/executor" - osmosimtypes "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/app" + osmosim "github.com/osmosis-labs/osmosis/v25/simulation/executor" + osmosimtypes "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/codec" diff --git a/wasmbinding/message_plugin.go b/wasmbinding/message_plugin.go index 8c8cbfc3304..5845393b7cc 100644 --- a/wasmbinding/message_plugin.go +++ b/wasmbinding/message_plugin.go @@ -9,10 +9,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - "github.com/osmosis-labs/osmosis/v24/wasmbinding/bindings" + "github.com/osmosis-labs/osmosis/v25/wasmbinding/bindings" - tokenfactorykeeper "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/keeper" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + tokenfactorykeeper "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/keeper" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) // CustomMessageDecorator returns decorator for custom CosmWasm bindings messages diff --git a/wasmbinding/queries.go b/wasmbinding/queries.go index 02b15743796..741a3bf7b3f 100644 --- a/wasmbinding/queries.go +++ b/wasmbinding/queries.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/wasmbinding/bindings" - tokenfactorykeeper "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/keeper" + "github.com/osmosis-labs/osmosis/v25/wasmbinding/bindings" + tokenfactorykeeper "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/keeper" ) type QueryPlugin struct { diff --git a/wasmbinding/query_plugin.go b/wasmbinding/query_plugin.go index 1570eb9c907..bae10f30db1 100644 --- a/wasmbinding/query_plugin.go +++ b/wasmbinding/query_plugin.go @@ -11,7 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/wasmbinding/bindings" + "github.com/osmosis-labs/osmosis/v25/wasmbinding/bindings" ) // StargateQuerier dispatches whitelisted stargate queries diff --git a/wasmbinding/query_plugin_test.go b/wasmbinding/query_plugin_test.go index d211ff0734f..a0f276eef58 100644 --- a/wasmbinding/query_plugin_test.go +++ b/wasmbinding/query_plugin_test.go @@ -20,15 +20,15 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - gammv2types "github.com/osmosis-labs/osmosis/v24/x/gamm/v2types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + gammv2types "github.com/osmosis-labs/osmosis/v25/x/gamm/v2types" - "github.com/osmosis-labs/osmosis/v24/app" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/app" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" - "github.com/osmosis-labs/osmosis/v24/wasmbinding" + "github.com/osmosis-labs/osmosis/v25/wasmbinding" ) type StargateTestSuite struct { diff --git a/wasmbinding/stargate_whitelist.go b/wasmbinding/stargate_whitelist.go index 58b26d7834a..536c55ac176 100644 --- a/wasmbinding/stargate_whitelist.go +++ b/wasmbinding/stargate_whitelist.go @@ -15,22 +15,22 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - gammv2types "github.com/osmosis-labs/osmosis/v24/x/gamm/v2types" - - concentratedliquidityquery "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/queryproto" - cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/client/queryproto" - downtimequerytypes "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client/queryproto" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryproto" - smartaccounttypes "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" - twapquerytypes "github.com/osmosis-labs/osmosis/v24/x/twap/client/queryproto" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + gammv2types "github.com/osmosis-labs/osmosis/v25/x/gamm/v2types" + + concentratedliquidityquery "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/queryproto" + cosmwasmpooltypes "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/client/queryproto" + downtimequerytypes "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client/queryproto" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryproto" + smartaccounttypes "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" + twapquerytypes "github.com/osmosis-labs/osmosis/v25/x/twap/client/queryproto" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/wasmbinding/test/custom_msg_test.go b/wasmbinding/test/custom_msg_test.go index f3c025848f6..a51b829fc2d 100644 --- a/wasmbinding/test/custom_msg_test.go +++ b/wasmbinding/test/custom_msg_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" "github.com/stretchr/testify/require" @@ -14,8 +14,8 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/wasmbinding/bindings" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/wasmbinding/bindings" ) func TestCreateDenomMsg(t *testing.T) { diff --git a/wasmbinding/test/custom_query_test.go b/wasmbinding/test/custom_query_test.go index 2889209d4f6..8a82e735d43 100644 --- a/wasmbinding/test/custom_query_test.go +++ b/wasmbinding/test/custom_query_test.go @@ -15,9 +15,9 @@ import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/wasmbinding/bindings" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/wasmbinding/bindings" ) func SetupCustomApp(t *testing.T, addr sdk.AccAddress) (*app.OsmosisApp, sdk.Context) { diff --git a/wasmbinding/test/helpers_test.go b/wasmbinding/test/helpers_test.go index 6a7bc990d81..c3c7dbf3b64 100644 --- a/wasmbinding/test/helpers_test.go +++ b/wasmbinding/test/helpers_test.go @@ -14,7 +14,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/bank/testutil" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app" + "github.com/osmosis-labs/osmosis/v25/app" ) func CreateTestInput() (*app.OsmosisApp, sdk.Context) { diff --git a/wasmbinding/test/messages_test.go b/wasmbinding/test/messages_test.go index 6ba866f5a11..8a20f081e75 100644 --- a/wasmbinding/test/messages_test.go +++ b/wasmbinding/test/messages_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/wasmbinding" - "github.com/osmosis-labs/osmosis/v24/wasmbinding/bindings" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/wasmbinding" + "github.com/osmosis-labs/osmosis/v25/wasmbinding/bindings" "github.com/stretchr/testify/require" ) diff --git a/wasmbinding/test/queries_test.go b/wasmbinding/test/queries_test.go index fc1f1b6578b..696d35840ff 100644 --- a/wasmbinding/test/queries_test.go +++ b/wasmbinding/test/queries_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/wasmbinding" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/wasmbinding" ) func TestFullDenom(t *testing.T) { diff --git a/wasmbinding/test/store_run_test.go b/wasmbinding/test/store_run_test.go index 3e582eb5eae..2cb085ed12a 100644 --- a/wasmbinding/test/store_run_test.go +++ b/wasmbinding/test/store_run_test.go @@ -15,8 +15,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" ) func TestNoStorageWithoutProposal(t *testing.T) { diff --git a/wasmbinding/wasm.go b/wasmbinding/wasm.go index 7063a1d8b90..5c34b6b0417 100644 --- a/wasmbinding/wasm.go +++ b/wasmbinding/wasm.go @@ -7,7 +7,7 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - tokenfactorykeeper "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/keeper" + tokenfactorykeeper "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/keeper" ) func RegisterCustomPlugins( diff --git a/x/concentrated-liquidity/bench_test.go b/x/concentrated-liquidity/bench_test.go index 3a9624efcb6..9bbcbdc8b74 100644 --- a/x/concentrated-liquidity/bench_test.go +++ b/x/concentrated-liquidity/bench_test.go @@ -11,13 +11,13 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - clmath "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + clmath "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" ) type BenchTestSuite struct { diff --git a/x/concentrated-liquidity/client/cli/query.go b/x/concentrated-liquidity/client/cli/query.go index 47702bb223e..b9516583de3 100644 --- a/x/concentrated-liquidity/client/cli/query.go +++ b/x/concentrated-liquidity/client/cli/query.go @@ -5,8 +5,8 @@ import ( flag "github.com/spf13/pflag" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) // GetQueryCmd returns the cli query commands for this module. diff --git a/x/concentrated-liquidity/client/cli/tx.go b/x/concentrated-liquidity/client/cli/tx.go index a5248d3d792..e221bbc1a29 100644 --- a/x/concentrated-liquidity/client/cli/tx.go +++ b/x/concentrated-liquidity/client/cli/tx.go @@ -17,8 +17,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) func NewTxCmd() *cobra.Command { diff --git a/x/concentrated-liquidity/client/grpc/grpc_query.go b/x/concentrated-liquidity/client/grpc/grpc_query.go index 03df907543f..bd26d535f8a 100644 --- a/x/concentrated-liquidity/client/grpc/grpc_query.go +++ b/x/concentrated-liquidity/client/grpc/grpc_query.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc/status" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/queryproto" ) type Querier struct { diff --git a/x/concentrated-liquidity/client/proposal_handler.go b/x/concentrated-liquidity/client/proposal_handler.go index feb8a1e2a20..09789975ca8 100644 --- a/x/concentrated-liquidity/client/proposal_handler.go +++ b/x/concentrated-liquidity/client/proposal_handler.go @@ -1,7 +1,7 @@ package client import ( - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/cli" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" ) diff --git a/x/concentrated-liquidity/client/query_proto_wrap.go b/x/concentrated-liquidity/client/query_proto_wrap.go index f81adf2d239..ece8e4b26f9 100644 --- a/x/concentrated-liquidity/client/query_proto_wrap.go +++ b/x/concentrated-liquidity/client/query_proto_wrap.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - clquery "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + clquery "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" ) // Querier defines a wrapper around the x/concentrated-liquidity keeper providing gRPC method diff --git a/x/concentrated-liquidity/client/queryproto/query.pb.go b/x/concentrated-liquidity/client/queryproto/query.pb.go index aa769d63125..5db6bf943a6 100644 --- a/x/concentrated-liquidity/client/queryproto/query.pb.go +++ b/x/concentrated-liquidity/client/queryproto/query.pb.go @@ -16,8 +16,8 @@ import ( grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_osmosis_labs_osmosis_osmomath "github.com/osmosis-labs/osmosis/osmomath" - model "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - types1 "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + model "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + types1 "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -1759,92 +1759,92 @@ func init() { } var fileDescriptor_5da291368ba4d8e3 = []byte{ - // 2355 bytes of a gzipped FileDescriptorProto + // 2354 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4d, 0x6c, 0x1c, 0x49, 0x15, 0x4e, 0x39, 0x3f, 0x9b, 0x79, 0x71, 0x9c, 0xa4, 0xec, 0xd8, 0xce, 0x24, 0x99, 0xc9, 0x16, - 0x84, 0xb5, 0x48, 0x32, 0x43, 0x12, 0x87, 0x90, 0xbf, 0x4d, 0x3c, 0xf6, 0x3a, 0x1a, 0xad, 0xe3, - 0x75, 0x3a, 0x31, 0x20, 0x84, 0xe8, 0xed, 0xe9, 0x2e, 0x8f, 0x5b, 0xd3, 0xd3, 0x35, 0xee, 0xae, - 0x4e, 0x62, 0x96, 0x48, 0xab, 0xdd, 0x23, 0x12, 0x2c, 0xe2, 0x8a, 0x90, 0x10, 0x17, 0xb4, 0xe2, - 0xc8, 0x05, 0x2e, 0x08, 0x0e, 0x28, 0xe2, 0xb0, 0x5a, 0x09, 0x21, 0xa1, 0x3d, 0xcc, 0x42, 0xc2, - 0x01, 0x69, 0x01, 0x09, 0x73, 0xe1, 0x88, 0xba, 0xba, 0xfa, 0x67, 0x66, 0x7a, 0xec, 0x9e, 0x71, - 0x38, 0x71, 0xf2, 0x54, 0xbf, 0x7a, 0xef, 0x7d, 0xef, 0xa7, 0x5e, 0xd7, 0x7b, 0x6d, 0xb8, 0xc8, - 0xdc, 0x26, 0x73, 0x4d, 0xb7, 0xac, 0x33, 0x5b, 0xa7, 0x36, 0x77, 0x34, 0x4e, 0x0d, 0xcb, 0xdc, - 0xf0, 0x4c, 0xc3, 0xe4, 0x9b, 0xe5, 0x47, 0x17, 0x6b, 0x94, 0x6b, 0x17, 0xcb, 0x1b, 0x1e, 0x75, - 0x36, 0x4b, 0x2d, 0x87, 0x71, 0x86, 0xcf, 0x4a, 0x96, 0x52, 0x2a, 0x4b, 0x49, 0xb2, 0xe4, 0x27, - 0xea, 0xac, 0xce, 0x04, 0x47, 0xd9, 0xff, 0x15, 0x30, 0xe7, 0xbf, 0xb8, 0xbd, 0xbe, 0x96, 0xe6, - 0x68, 0x4d, 0x57, 0xee, 0xbd, 0x92, 0x0d, 0x1b, 0x37, 0xf5, 0x86, 0x6a, 0xda, 0x6b, 0xa1, 0x8a, - 0x82, 0x2e, 0xf8, 0xca, 0x35, 0xcd, 0xa5, 0xd1, 0x26, 0x9d, 0x99, 0x76, 0x08, 0x21, 0x49, 0x17, - 0x86, 0x45, 0xbb, 0x5a, 0x5a, 0xdd, 0xb4, 0x35, 0x6e, 0xb2, 0x70, 0xef, 0xa9, 0x3a, 0x63, 0x75, - 0x8b, 0x96, 0xb5, 0x96, 0x59, 0xd6, 0x6c, 0x9b, 0x71, 0x41, 0x0c, 0x01, 0x9e, 0x90, 0x54, 0xb1, - 0xaa, 0x79, 0x6b, 0x65, 0xcd, 0xde, 0x0c, 0x49, 0x81, 0x12, 0x35, 0x70, 0x40, 0xb0, 0x90, 0xa4, - 0xd9, 0x6c, 0x66, 0xb5, 0x98, 0x6b, 0x26, 0x90, 0xdc, 0xcc, 0xc6, 0x65, 0x0a, 0xa2, 0xf9, 0x88, - 0xaa, 0x0e, 0xd5, 0x99, 0x63, 0x04, 0xdc, 0xe4, 0x97, 0x08, 0x26, 0x56, 0x5d, 0xea, 0xac, 0x48, - 0xa1, 0xae, 0x42, 0x37, 0x3c, 0xea, 0x72, 0x7c, 0x1e, 0x5e, 0xd1, 0x0c, 0xc3, 0xa1, 0xae, 0x3b, - 0x8d, 0xce, 0xa0, 0x99, 0x5c, 0x05, 0x6f, 0xb5, 0x8b, 0x63, 0x9b, 0x5a, 0xd3, 0xba, 0x4e, 0x24, - 0x81, 0x28, 0xe1, 0x16, 0x7c, 0x0e, 0x5e, 0x69, 0x31, 0x66, 0xa9, 0xa6, 0x31, 0x3d, 0x72, 0x06, - 0xcd, 0xec, 0x4b, 0xee, 0x96, 0x04, 0xa2, 0x1c, 0xf0, 0x7f, 0x55, 0x0d, 0xbc, 0x08, 0x10, 0xfb, - 0x73, 0x7a, 0xef, 0x19, 0x34, 0x73, 0xe8, 0xd2, 0x17, 0x4a, 0xd2, 0x15, 0xbe, 0xf3, 0x4b, 0x41, - 0x56, 0x49, 0xe8, 0xa5, 0x15, 0xad, 0x4e, 0x25, 0x2c, 0x25, 0xc1, 0x49, 0x7e, 0x8b, 0xe0, 0x78, - 0x17, 0x76, 0xb7, 0xc5, 0x6c, 0x97, 0xe2, 0xb7, 0x21, 0x17, 0x7a, 0xc9, 0x87, 0xbf, 0x77, 0xe6, - 0xd0, 0xa5, 0x9b, 0xa5, 0x4c, 0xd9, 0x59, 0x5a, 0xf4, 0x2c, 0x2b, 0x14, 0x58, 0x71, 0xa8, 0xd6, - 0x30, 0xd8, 0x63, 0xbb, 0xb2, 0xef, 0x59, 0xbb, 0xb8, 0x47, 0x89, 0x85, 0xe2, 0xbb, 0x1d, 0x36, - 0x8c, 0x08, 0x1b, 0x5e, 0xdb, 0xd1, 0x86, 0x00, 0x5e, 0x87, 0x11, 0xcb, 0x30, 0x1e, 0xa9, 0xdb, - 0xac, 0x1a, 0xa1, 0xfb, 0xaf, 0xc2, 0xa1, 0x50, 0x99, 0xef, 0x54, 0x24, 0x9c, 0x3a, 0xb9, 0xd5, - 0x2e, 0xe2, 0xd0, 0xa9, 0x11, 0x91, 0x28, 0x10, 0xae, 0xaa, 0x06, 0x79, 0x04, 0x13, 0x9d, 0xf2, - 0xa4, 0x4b, 0xbe, 0x05, 0x07, 0xc3, 0x5d, 0x42, 0xda, 0xcb, 0xf1, 0x48, 0x24, 0x93, 0x2c, 0xc2, - 0xd4, 0xb2, 0xd7, 0x5c, 0x61, 0xcc, 0xea, 0x49, 0xa5, 0x44, 0x72, 0xa0, 0x9d, 0x92, 0x83, 0x7c, - 0x13, 0xa6, 0x7b, 0xe5, 0x48, 0x1b, 0xee, 0xc0, 0x58, 0x64, 0xb7, 0xce, 0x3c, 0x9b, 0x4b, 0x79, - 0x27, 0xb6, 0xda, 0xc5, 0xe3, 0x5d, 0x7e, 0x11, 0x74, 0xa2, 0x1c, 0x0e, 0x1f, 0xcc, 0x8b, 0xf5, - 0x57, 0x61, 0xd4, 0x17, 0x1d, 0x41, 0x5b, 0x4c, 0x09, 0xe3, 0x30, 0xa9, 0xf8, 0x7d, 0x04, 0x87, - 0xa5, 0x60, 0x89, 0xf5, 0x0a, 0xec, 0xf7, 0x2d, 0x0a, 0xd3, 0x6f, 0xa2, 0x14, 0x94, 0x84, 0x52, - 0x58, 0x12, 0x4a, 0x73, 0xf6, 0x66, 0x25, 0xf7, 0xfb, 0x5f, 0x5c, 0xd8, 0xef, 0xf3, 0x55, 0x95, - 0x60, 0xf7, 0xcb, 0xcb, 0xab, 0x23, 0x70, 0x78, 0x45, 0xd4, 0x4c, 0x09, 0x97, 0xac, 0xc2, 0x58, - 0xf8, 0x40, 0x42, 0x9c, 0x87, 0x03, 0x41, 0x59, 0x95, 0x09, 0x71, 0x76, 0x87, 0x84, 0x08, 0xd8, - 0x65, 0xe4, 0x25, 0x2b, 0xf9, 0x10, 0xc1, 0xd1, 0x87, 0xa6, 0xde, 0x58, 0x0a, 0xb7, 0x2d, 0x53, - 0x8e, 0xdf, 0x86, 0xc3, 0x11, 0x9b, 0x6a, 0x53, 0x2e, 0x4b, 0xc8, 0x0d, 0x9f, 0xf3, 0x93, 0x76, - 0xf1, 0x64, 0x60, 0x8f, 0x6b, 0x34, 0x4a, 0x26, 0x2b, 0x37, 0x35, 0xbe, 0x5e, 0x5a, 0xa2, 0x75, - 0x4d, 0xdf, 0x5c, 0xa0, 0xfa, 0x56, 0xbb, 0x38, 0x11, 0x84, 0xb2, 0x43, 0x02, 0x51, 0x46, 0xad, - 0xa4, 0x86, 0x59, 0x00, 0x59, 0xde, 0x0d, 0xfa, 0x44, 0xf8, 0x69, 0x6f, 0xe5, 0xf8, 0x56, 0xbb, - 0x78, 0x2c, 0xe0, 0x8d, 0x69, 0x44, 0xc9, 0xf9, 0x8b, 0xaa, 0xf8, 0xfd, 0x0f, 0x04, 0x53, 0x11, - 0xd0, 0x05, 0xda, 0xe2, 0xeb, 0x5f, 0x33, 0xf9, 0xba, 0xa2, 0xd9, 0x75, 0x8a, 0xd7, 0xe0, 0x68, - 0xac, 0x51, 0x6b, 0x46, 0xe9, 0xb5, 0x4b, 0xd8, 0x47, 0xa2, 0xf5, 0x9c, 0x90, 0xe9, 0x23, 0xb7, - 0xd8, 0x63, 0xea, 0xa8, 0x3e, 0xac, 0x5e, 0xe4, 0x31, 0x8d, 0x28, 0x39, 0xb1, 0xf0, 0xbd, 0xeb, - 0x73, 0x79, 0xad, 0x56, 0xc8, 0xb5, 0xb7, 0x9b, 0x2b, 0xa6, 0x11, 0x25, 0x27, 0x16, 0x3e, 0x17, - 0xf9, 0x74, 0x04, 0x0a, 0xc9, 0xc0, 0x54, 0xed, 0x05, 0xd3, 0xa1, 0xba, 0x9f, 0x20, 0xc3, 0x1c, - 0x4e, 0x5c, 0x82, 0x83, 0x9c, 0x35, 0xa8, 0xad, 0x9a, 0x41, 0x6e, 0xe6, 0x2a, 0xe3, 0x5b, 0xed, - 0xe2, 0x11, 0xe9, 0x73, 0x49, 0x21, 0xca, 0x2b, 0xe2, 0x67, 0xd5, 0xf6, 0x51, 0xbb, 0x5c, 0x73, - 0x78, 0x1f, 0xd4, 0x31, 0x8d, 0x28, 0x39, 0xb1, 0x10, 0xb6, 0x5e, 0x83, 0x51, 0xcf, 0xa5, 0xaa, - 0xee, 0x49, 0x6b, 0xf7, 0x9d, 0x41, 0x33, 0x07, 0x2b, 0x53, 0x5b, 0xed, 0xe2, 0xb8, 0xb4, 0x36, - 0x41, 0x25, 0x0a, 0x78, 0x2e, 0x9d, 0xf7, 0x22, 0x37, 0xd5, 0x98, 0x67, 0x1b, 0x01, 0xe3, 0xfe, - 0x6e, 0x85, 0x31, 0x8d, 0x28, 0x39, 0xb1, 0x48, 0x2a, 0xb4, 0x99, 0x2a, 0x9e, 0x4d, 0x1f, 0x48, - 0x53, 0x18, 0x52, 0x03, 0x85, 0xcb, 0xac, 0x22, 0x16, 0x3f, 0xd9, 0x0b, 0xc5, 0xbe, 0x1e, 0x96, - 0xe7, 0x6c, 0x3d, 0x99, 0x59, 0x86, 0x9f, 0x75, 0x61, 0x55, 0xb8, 0x9a, 0xb1, 0x04, 0x77, 0x1f, - 0x30, 0x79, 0x06, 0xe3, 0xdc, 0x12, 0xb9, 0xec, 0xe2, 0x57, 0x61, 0x54, 0xf7, 0x1c, 0x87, 0xda, - 0x3c, 0x91, 0x5d, 0xca, 0x21, 0xf9, 0x4c, 0xd8, 0x6a, 0xc1, 0xb1, 0x70, 0x4b, 0xc4, 0x2d, 0x22, - 0x93, 0xab, 0xdc, 0xce, 0x96, 0xe7, 0xd3, 0x81, 0x4f, 0x7a, 0xa4, 0x10, 0xe5, 0xa8, 0x7c, 0x16, - 0x41, 0xc5, 0xef, 0x21, 0xc0, 0xe1, 0x46, 0x77, 0xc3, 0xe1, 0x6a, 0xcb, 0x31, 0x75, 0x2a, 0x22, - 0x9a, 0xab, 0x3c, 0x94, 0xfa, 0xca, 0x75, 0x93, 0xaf, 0x7b, 0xb5, 0x92, 0xce, 0x9a, 0x65, 0xe9, - 0x8f, 0x0b, 0x96, 0x56, 0x73, 0xc3, 0x85, 0xf8, 0x2b, 0x60, 0x54, 0xcc, 0x7a, 0x80, 0xe1, 0x44, - 0x27, 0x86, 0x58, 0x74, 0x0c, 0xe2, 0xc1, 0x86, 0xc3, 0x57, 0xc4, 0xa3, 0x37, 0xe1, 0x54, 0x84, - 0x68, 0x25, 0x38, 0x19, 0xe2, 0xc8, 0x0f, 0xf5, 0x7e, 0xfa, 0x35, 0x82, 0xd3, 0x7d, 0xa4, 0xc9, - 0x70, 0xd7, 0x20, 0x17, 0x7b, 0x36, 0x88, 0xf3, 0xeb, 0x19, 0xe3, 0xdc, 0xa7, 0x36, 0x85, 0xd7, - 0x8f, 0x88, 0x01, 0x5f, 0x87, 0xd1, 0x9a, 0xa7, 0x37, 0x28, 0xef, 0x28, 0x80, 0x89, 0x8c, 0x4d, - 0x52, 0x89, 0x72, 0x28, 0x58, 0x06, 0x45, 0xf0, 0xeb, 0x70, 0x7a, 0xde, 0xd2, 0xcc, 0xa6, 0x56, - 0xb3, 0xe8, 0x83, 0x96, 0x43, 0x35, 0x43, 0xa1, 0x8f, 0x35, 0xc7, 0x70, 0x77, 0x7d, 0xf7, 0xf8, - 0x31, 0x82, 0x42, 0x3f, 0xd1, 0xd2, 0x39, 0xdf, 0x81, 0x69, 0x3d, 0xdc, 0xa1, 0xba, 0x62, 0x8b, - 0xea, 0x04, 0x7b, 0xa4, 0xaf, 0x4e, 0x74, 0xbc, 0xed, 0x42, 0xcf, 0xcc, 0x33, 0xd3, 0xae, 0xbc, - 0xe6, 0xbb, 0x61, 0xab, 0x5d, 0x2c, 0xca, 0xe8, 0xf7, 0x11, 0x44, 0x94, 0x49, 0x3d, 0x15, 0x05, - 0x59, 0x85, 0x7c, 0x84, 0xaf, 0x1a, 0x5e, 0x88, 0x77, 0x6f, 0xf7, 0xfb, 0x23, 0x70, 0x32, 0x55, - 0xae, 0x34, 0x7a, 0x03, 0x26, 0x62, 0xac, 0xd1, 0x45, 0x3c, 0x83, 0xc1, 0x9f, 0x93, 0x06, 0x9f, - 0xec, 0x36, 0x38, 0x16, 0x42, 0x94, 0x71, 0xbd, 0x57, 0xb5, 0xaf, 0x72, 0x8d, 0x39, 0x6b, 0xd4, - 0xe4, 0xd4, 0x48, 0xaa, 0x1c, 0x19, 0x50, 0x65, 0x9a, 0x10, 0xa2, 0x8c, 0x47, 0x8f, 0x63, 0x95, - 0x64, 0x09, 0x4e, 0xfb, 0x57, 0x99, 0x39, 0x5d, 0xf7, 0x9a, 0x9e, 0xa5, 0x71, 0xe6, 0x74, 0xe5, - 0xd5, 0x40, 0xe7, 0xec, 0x37, 0x23, 0x50, 0xe8, 0x27, 0x4e, 0xba, 0xf5, 0x03, 0x04, 0x27, 0x3b, - 0x22, 0xaf, 0xd6, 0x1d, 0xf6, 0x98, 0xaf, 0xab, 0x75, 0x8b, 0xd5, 0x34, 0x4b, 0xba, 0xf7, 0x54, - 0xaa, 0xad, 0x0b, 0x54, 0x17, 0xe6, 0x5e, 0xf6, 0xcd, 0xfd, 0xf0, 0xd3, 0xe2, 0xb9, 0x44, 0x0d, - 0x92, 0x6d, 0x60, 0xf0, 0xe7, 0x82, 0x6b, 0x34, 0xca, 0x7c, 0xb3, 0x45, 0xdd, 0x90, 0xc7, 0x55, - 0xa6, 0xdd, 0x44, 0x56, 0xdd, 0x15, 0x3a, 0xef, 0x0a, 0x95, 0xf8, 0xbb, 0x08, 0x26, 0xbc, 0x16, - 0x37, 0x9b, 0xb4, 0x0b, 0x4b, 0xe0, 0xf7, 0xd9, 0x8c, 0x75, 0x60, 0x55, 0x88, 0x78, 0xe8, 0x68, + 0x84, 0xb5, 0x48, 0x32, 0x43, 0x7e, 0x4c, 0xc8, 0xdf, 0x26, 0x1e, 0x7b, 0x1d, 0x8d, 0xd6, 0xf1, + 0x3a, 0x9d, 0x18, 0x10, 0x42, 0xf4, 0xf6, 0x74, 0x97, 0xc7, 0xad, 0xe9, 0xe9, 0x1a, 0x77, 0x57, + 0x27, 0x31, 0x4b, 0xa4, 0xd5, 0xee, 0x11, 0x09, 0x16, 0x71, 0x45, 0x48, 0x88, 0x0b, 0x5a, 0x71, + 0xe4, 0x02, 0x17, 0x04, 0x07, 0x14, 0x71, 0x58, 0xad, 0x84, 0x90, 0xd0, 0x1e, 0x66, 0x21, 0xe1, + 0x80, 0xb4, 0x80, 0x84, 0xb9, 0x70, 0x44, 0x5d, 0x5d, 0xfd, 0x33, 0x33, 0x3d, 0x76, 0xcf, 0x38, + 0x9c, 0x38, 0x79, 0xaa, 0x5f, 0xbd, 0xf7, 0xbe, 0xf7, 0x53, 0xaf, 0xeb, 0xbd, 0x36, 0x5c, 0x64, + 0x6e, 0x93, 0xb9, 0xa6, 0x5b, 0xd6, 0x99, 0xad, 0x53, 0x9b, 0x3b, 0x1a, 0xa7, 0x86, 0x65, 0x6e, + 0x78, 0xa6, 0x61, 0xf2, 0xcd, 0xf2, 0xa3, 0x8b, 0x35, 0xca, 0xb5, 0x8b, 0xe5, 0x0d, 0x8f, 0x3a, + 0x9b, 0xa5, 0x96, 0xc3, 0x38, 0xc3, 0x67, 0x25, 0x4b, 0x29, 0x95, 0xa5, 0x24, 0x59, 0xf2, 0x13, + 0x75, 0x56, 0x67, 0x82, 0xa3, 0xec, 0xff, 0x0a, 0x98, 0xf3, 0x5f, 0xdc, 0x5e, 0x5f, 0x4b, 0x73, + 0xb4, 0xa6, 0x2b, 0xf7, 0xce, 0x66, 0xc3, 0xc6, 0x4d, 0xbd, 0xa1, 0x9a, 0xf6, 0x5a, 0xa8, 0xa2, + 0xa0, 0x0b, 0xbe, 0x72, 0x4d, 0x73, 0x69, 0xb4, 0x49, 0x67, 0xa6, 0x1d, 0x42, 0x48, 0xd2, 0x85, + 0x61, 0xd1, 0xae, 0x96, 0x56, 0x37, 0x6d, 0x8d, 0x9b, 0x2c, 0xdc, 0x7b, 0xaa, 0xce, 0x58, 0xdd, + 0xa2, 0x65, 0xad, 0x65, 0x96, 0x35, 0xdb, 0x66, 0x5c, 0x10, 0x43, 0x80, 0x27, 0x24, 0x55, 0xac, + 0x6a, 0xde, 0x5a, 0x59, 0xb3, 0x37, 0x43, 0x52, 0xa0, 0x44, 0x0d, 0x1c, 0x10, 0x2c, 0x24, 0xe9, + 0x4a, 0x36, 0xb3, 0x5a, 0xcc, 0x35, 0x13, 0x48, 0x6e, 0x66, 0xe3, 0x32, 0x05, 0xd1, 0x7c, 0x44, + 0x55, 0x87, 0xea, 0xcc, 0x31, 0x02, 0x6e, 0xf2, 0x4b, 0x04, 0x13, 0xab, 0x2e, 0x75, 0x56, 0xa4, + 0x50, 0x57, 0xa1, 0x1b, 0x1e, 0x75, 0x39, 0x3e, 0x0f, 0xaf, 0x68, 0x86, 0xe1, 0x50, 0xd7, 0x9d, + 0x46, 0x67, 0xd0, 0x4c, 0xae, 0x82, 0xb7, 0xda, 0xc5, 0xb1, 0x4d, 0xad, 0x69, 0x5d, 0x27, 0x92, + 0x40, 0x94, 0x70, 0x0b, 0x3e, 0x07, 0xaf, 0xb4, 0x18, 0xb3, 0x54, 0xd3, 0x98, 0x1e, 0x39, 0x83, + 0x66, 0xf6, 0x25, 0x77, 0x4b, 0x02, 0x51, 0x0e, 0xf8, 0xbf, 0xaa, 0x06, 0x5e, 0x04, 0x88, 0xfd, + 0x39, 0xbd, 0xf7, 0x0c, 0x9a, 0x39, 0x74, 0xe9, 0x0b, 0x25, 0xe9, 0x0a, 0xdf, 0xf9, 0xa5, 0x20, + 0xab, 0x24, 0xf4, 0xd2, 0x8a, 0x56, 0xa7, 0x12, 0x96, 0x92, 0xe0, 0x24, 0xbf, 0x45, 0x70, 0xbc, + 0x0b, 0xbb, 0xdb, 0x62, 0xb6, 0x4b, 0xf1, 0xdb, 0x90, 0x0b, 0xbd, 0xe4, 0xc3, 0xdf, 0x3b, 0x73, + 0xe8, 0xd2, 0xcd, 0x52, 0xa6, 0xec, 0x2c, 0x2d, 0x7a, 0x96, 0x15, 0x0a, 0xac, 0x38, 0x54, 0x6b, + 0x18, 0xec, 0xb1, 0x5d, 0xd9, 0xf7, 0xac, 0x5d, 0xdc, 0xa3, 0xc4, 0x42, 0xf1, 0xdd, 0x0e, 0x1b, + 0x46, 0x84, 0x0d, 0xaf, 0xed, 0x68, 0x43, 0x00, 0xaf, 0xc3, 0x88, 0x65, 0x18, 0x8f, 0xd4, 0x6d, + 0x56, 0x8d, 0xd0, 0xfd, 0x57, 0xe1, 0x50, 0xa8, 0xcc, 0x77, 0x2a, 0x12, 0x4e, 0x9d, 0xdc, 0x6a, + 0x17, 0x71, 0xe8, 0xd4, 0x88, 0x48, 0x14, 0x08, 0x57, 0x55, 0x83, 0x3c, 0x82, 0x89, 0x4e, 0x79, + 0xd2, 0x25, 0xdf, 0x82, 0x83, 0xe1, 0x2e, 0x21, 0xed, 0xe5, 0x78, 0x24, 0x92, 0x49, 0x16, 0x61, + 0x6a, 0xd9, 0x6b, 0xae, 0x30, 0x66, 0xf5, 0xa4, 0x52, 0x22, 0x39, 0xd0, 0x4e, 0xc9, 0x41, 0xbe, + 0x09, 0xd3, 0xbd, 0x72, 0xa4, 0x0d, 0x77, 0x60, 0x2c, 0xb2, 0x5b, 0x67, 0x9e, 0xcd, 0xa5, 0xbc, + 0x13, 0x5b, 0xed, 0xe2, 0xf1, 0x2e, 0xbf, 0x08, 0x3a, 0x51, 0x0e, 0x87, 0x0f, 0xe6, 0xc5, 0xfa, + 0xab, 0x30, 0xea, 0x8b, 0x8e, 0xa0, 0x2d, 0xa6, 0x84, 0x71, 0x98, 0x54, 0xfc, 0x3e, 0x82, 0xc3, + 0x52, 0xb0, 0xc4, 0x3a, 0x0b, 0xfb, 0x7d, 0x8b, 0xc2, 0xf4, 0x9b, 0x28, 0x05, 0x25, 0xa1, 0x14, + 0x96, 0x84, 0xd2, 0x9c, 0xbd, 0x59, 0xc9, 0xfd, 0xfe, 0x17, 0x17, 0xf6, 0xfb, 0x7c, 0x55, 0x25, + 0xd8, 0xfd, 0xf2, 0xf2, 0xea, 0x08, 0x1c, 0x5e, 0x11, 0x35, 0x53, 0xc2, 0x25, 0xab, 0x30, 0x16, + 0x3e, 0x90, 0x10, 0xe7, 0xe1, 0x40, 0x50, 0x56, 0x65, 0x42, 0x9c, 0xdd, 0x21, 0x21, 0x02, 0x76, + 0x19, 0x79, 0xc9, 0x4a, 0x3e, 0x44, 0x70, 0xf4, 0xa1, 0xa9, 0x37, 0x96, 0xc2, 0x6d, 0xcb, 0x94, + 0xe3, 0xb7, 0xe1, 0x70, 0xc4, 0xa6, 0xda, 0x94, 0xcb, 0x12, 0x72, 0xc3, 0xe7, 0xfc, 0xa4, 0x5d, + 0x3c, 0x19, 0xd8, 0xe3, 0x1a, 0x8d, 0x92, 0xc9, 0xca, 0x4d, 0x8d, 0xaf, 0x97, 0x96, 0x68, 0x5d, + 0xd3, 0x37, 0x17, 0xa8, 0xbe, 0xd5, 0x2e, 0x4e, 0x04, 0xa1, 0xec, 0x90, 0x40, 0x94, 0x51, 0x2b, + 0xa9, 0xe1, 0x0a, 0x80, 0x2c, 0xef, 0x06, 0x7d, 0x22, 0xfc, 0xb4, 0xb7, 0x72, 0x7c, 0xab, 0x5d, + 0x3c, 0x16, 0xf0, 0xc6, 0x34, 0xa2, 0xe4, 0xfc, 0x45, 0x55, 0xfc, 0xfe, 0x07, 0x82, 0xa9, 0x08, + 0xe8, 0x02, 0x6d, 0xf1, 0xf5, 0xaf, 0x99, 0x7c, 0x5d, 0xd1, 0xec, 0x3a, 0xc5, 0x6b, 0x70, 0x34, + 0xd6, 0xa8, 0x35, 0xa3, 0xf4, 0xda, 0x25, 0xec, 0x23, 0xd1, 0x7a, 0x4e, 0xc8, 0xf4, 0x91, 0x5b, + 0xec, 0x31, 0x75, 0x54, 0x1f, 0x56, 0x2f, 0xf2, 0x98, 0x46, 0x94, 0x9c, 0x58, 0xf8, 0xde, 0xf5, + 0xb9, 0xbc, 0x56, 0x2b, 0xe4, 0xda, 0xdb, 0xcd, 0x15, 0xd3, 0x88, 0x92, 0x13, 0x0b, 0x9f, 0x8b, + 0x7c, 0x3a, 0x02, 0x85, 0x64, 0x60, 0xaa, 0xf6, 0x82, 0xe9, 0x50, 0xdd, 0x4f, 0x90, 0x61, 0x0e, + 0x27, 0x2e, 0xc1, 0x41, 0xce, 0x1a, 0xd4, 0x56, 0xcd, 0x20, 0x37, 0x73, 0x95, 0xf1, 0xad, 0x76, + 0xf1, 0x88, 0xf4, 0xb9, 0xa4, 0x10, 0xe5, 0x15, 0xf1, 0xb3, 0x6a, 0xfb, 0xa8, 0x5d, 0xae, 0x39, + 0xbc, 0x0f, 0xea, 0x98, 0x46, 0x94, 0x9c, 0x58, 0x08, 0x5b, 0xaf, 0xc1, 0xa8, 0xe7, 0x52, 0x55, + 0xf7, 0xa4, 0xb5, 0xfb, 0xce, 0xa0, 0x99, 0x83, 0x95, 0xa9, 0xad, 0x76, 0x71, 0x5c, 0x5a, 0x9b, + 0xa0, 0x12, 0x05, 0x3c, 0x97, 0xce, 0x7b, 0x91, 0x9b, 0x6a, 0xcc, 0xb3, 0x8d, 0x80, 0x71, 0x7f, + 0xb7, 0xc2, 0x98, 0x46, 0x94, 0x9c, 0x58, 0x24, 0x15, 0xda, 0x4c, 0x15, 0xcf, 0xa6, 0x0f, 0xa4, + 0x29, 0x0c, 0xa9, 0x81, 0xc2, 0x65, 0x56, 0x11, 0x8b, 0x9f, 0xec, 0x85, 0x62, 0x5f, 0x0f, 0xcb, + 0x73, 0xb6, 0x9e, 0xcc, 0x2c, 0xc3, 0xcf, 0xba, 0xb0, 0x2a, 0x5c, 0xcd, 0x58, 0x82, 0xbb, 0x0f, + 0x98, 0x3c, 0x83, 0x71, 0x6e, 0x89, 0x5c, 0x76, 0xf1, 0xab, 0x30, 0xaa, 0x7b, 0x8e, 0x43, 0x6d, + 0x9e, 0xc8, 0x2e, 0xe5, 0x90, 0x7c, 0x26, 0x6c, 0xb5, 0xe0, 0x58, 0xb8, 0x25, 0xe2, 0x16, 0x91, + 0xc9, 0x55, 0x6e, 0x67, 0xcb, 0xf3, 0xe9, 0xc0, 0x27, 0x3d, 0x52, 0x88, 0x72, 0x54, 0x3e, 0x8b, + 0xa0, 0xe2, 0xf7, 0x10, 0xe0, 0x70, 0xa3, 0xbb, 0xe1, 0x70, 0xb5, 0xe5, 0x98, 0x3a, 0x15, 0x11, + 0xcd, 0x55, 0x1e, 0x4a, 0x7d, 0xe5, 0xba, 0xc9, 0xd7, 0xbd, 0x5a, 0x49, 0x67, 0xcd, 0xb2, 0xf4, + 0xc7, 0x05, 0x4b, 0xab, 0xb9, 0xe1, 0x42, 0xfc, 0x15, 0x30, 0x2a, 0x66, 0x3d, 0xc0, 0x70, 0xa2, + 0x13, 0x43, 0x2c, 0x3a, 0x06, 0xf1, 0x60, 0xc3, 0xe1, 0x2b, 0xe2, 0xd1, 0x9b, 0x70, 0x2a, 0x42, + 0xb4, 0x12, 0x9c, 0x0c, 0x71, 0xe4, 0x87, 0x7a, 0x3f, 0xfd, 0x1a, 0xc1, 0xe9, 0x3e, 0xd2, 0x64, + 0xb8, 0x6b, 0x90, 0x8b, 0x3d, 0x1b, 0xc4, 0xf9, 0xf5, 0x8c, 0x71, 0xee, 0x53, 0x9b, 0xc2, 0xeb, + 0x47, 0xc4, 0x80, 0xaf, 0xc3, 0x68, 0xcd, 0xd3, 0x1b, 0x94, 0x77, 0x14, 0xc0, 0x44, 0xc6, 0x26, + 0xa9, 0x44, 0x39, 0x14, 0x2c, 0x83, 0x22, 0xf8, 0x75, 0x38, 0x3d, 0x6f, 0x69, 0x66, 0x53, 0xab, + 0x59, 0xf4, 0x41, 0xcb, 0xa1, 0x9a, 0xa1, 0xd0, 0xc7, 0x9a, 0x63, 0xb8, 0xbb, 0xbe, 0x7b, 0xfc, + 0x18, 0x41, 0xa1, 0x9f, 0x68, 0xe9, 0x9c, 0xef, 0xc0, 0xb4, 0x1e, 0xee, 0x50, 0x5d, 0xb1, 0x45, + 0x75, 0x82, 0x3d, 0xd2, 0x57, 0x27, 0x3a, 0xde, 0x76, 0xa1, 0x67, 0xe6, 0x99, 0x69, 0x57, 0x5e, + 0xf3, 0xdd, 0xb0, 0xd5, 0x2e, 0x16, 0x65, 0xf4, 0xfb, 0x08, 0x22, 0xca, 0xa4, 0x9e, 0x8a, 0x82, + 0xac, 0x42, 0x3e, 0xc2, 0x57, 0x0d, 0x2f, 0xc4, 0xbb, 0xb7, 0xfb, 0xfd, 0x11, 0x38, 0x99, 0x2a, + 0x57, 0x1a, 0xbd, 0x01, 0x13, 0x31, 0xd6, 0xe8, 0x22, 0x9e, 0xc1, 0xe0, 0xcf, 0x49, 0x83, 0x4f, + 0x76, 0x1b, 0x1c, 0x0b, 0x21, 0xca, 0xb8, 0xde, 0xab, 0xda, 0x57, 0xb9, 0xc6, 0x9c, 0x35, 0x6a, + 0x72, 0x6a, 0x24, 0x55, 0x8e, 0x0c, 0xa8, 0x32, 0x4d, 0x08, 0x51, 0xc6, 0xa3, 0xc7, 0xb1, 0x4a, + 0xb2, 0x04, 0xa7, 0xfd, 0xab, 0xcc, 0x9c, 0xae, 0x7b, 0x4d, 0xcf, 0xd2, 0x38, 0x73, 0xba, 0xf2, + 0x6a, 0xa0, 0x73, 0xf6, 0x9b, 0x11, 0x28, 0xf4, 0x13, 0x27, 0xdd, 0xfa, 0x01, 0x82, 0x93, 0x1d, + 0x91, 0x57, 0xeb, 0x0e, 0x7b, 0xcc, 0xd7, 0xd5, 0xba, 0xc5, 0x6a, 0x9a, 0x25, 0xdd, 0x7b, 0x2a, + 0xd5, 0xd6, 0x05, 0xaa, 0x0b, 0x73, 0x2f, 0xfb, 0xe6, 0x7e, 0xf8, 0x69, 0xf1, 0x5c, 0xa2, 0x06, + 0xc9, 0x36, 0x30, 0xf8, 0x73, 0xc1, 0x35, 0x1a, 0x65, 0xbe, 0xd9, 0xa2, 0x6e, 0xc8, 0xe3, 0x2a, + 0xd3, 0x6e, 0x22, 0xab, 0xee, 0x0a, 0x9d, 0x77, 0x85, 0x4a, 0xfc, 0x5d, 0x04, 0x13, 0x5e, 0x8b, + 0x9b, 0x4d, 0xda, 0x85, 0x25, 0xf0, 0xfb, 0x95, 0x8c, 0x75, 0x60, 0x55, 0x88, 0x78, 0xe8, 0x68, 0x7a, 0x83, 0x3a, 0xdd, 0x21, 0x49, 0x93, 0x4f, 0x14, 0x1c, 0x3c, 0x4e, 0xa2, 0x21, 0xef, 0x23, 0x28, 0xf8, 0xf5, 0x29, 0xe1, 0x43, 0x29, 0x73, 0xa8, 0x98, 0x0c, 0x79, 0xe9, 0xfa, 0x6c, 0x04, 0x8a, 0x7d, 0x51, 0xc8, 0x50, 0x3e, 0x43, 0x70, 0x2d, 0x35, 0x94, 0xac, 0x25, 0xce, 0x19, 0x55, @@ -1873,9 +1873,9 @@ var fileDescriptor_5da291368ba4d8e3 = []byte{ 0xbb, 0xb1, 0xaf, 0x72, 0x76, 0xab, 0x5d, 0x7c, 0x35, 0x10, 0xd6, 0x7f, 0x2f, 0x51, 0xa6, 0xec, 0x74, 0xc3, 0xc8, 0x8f, 0x46, 0xa0, 0xd8, 0xd7, 0xe8, 0xff, 0xfb, 0xd6, 0xeb, 0xd2, 0xbf, 0xf2, 0xb0, 0xff, 0xbe, 0x5f, 0xd1, 0xf0, 0xcf, 0x10, 0x88, 0x21, 0x93, 0x8b, 0x2f, 0x67, 0x3e, 0x35, - 0xf1, 0x8c, 0x2c, 0x3f, 0x3b, 0x18, 0x53, 0xe0, 0x79, 0x32, 0xfb, 0xde, 0x1f, 0xfe, 0xfa, 0xc3, - 0x91, 0x12, 0x3e, 0x5f, 0xce, 0x3a, 0xd5, 0xf6, 0x01, 0xfe, 0x1c, 0xc1, 0x81, 0x60, 0xcc, 0x84, - 0x33, 0xab, 0x4d, 0x4e, 0xb9, 0xf2, 0x57, 0x06, 0xe4, 0x92, 0x68, 0xaf, 0x08, 0xb4, 0x65, 0x7c, + 0xf1, 0x8c, 0x2c, 0x7f, 0x65, 0x30, 0xa6, 0xc0, 0xf3, 0xe4, 0xca, 0x7b, 0x7f, 0xf8, 0xeb, 0x0f, + 0x47, 0x4a, 0xf8, 0x7c, 0x39, 0xeb, 0x54, 0xdb, 0x07, 0xf8, 0x73, 0x04, 0x07, 0x82, 0x31, 0x13, + 0xce, 0xac, 0x36, 0x39, 0xe5, 0xca, 0xcf, 0x0e, 0xc8, 0x25, 0xd1, 0xce, 0x0a, 0xb4, 0x65, 0x7c, 0x21, 0x2b, 0xda, 0x00, 0xe3, 0x47, 0x08, 0x0e, 0x77, 0x4c, 0xa0, 0xf1, 0x8d, 0xac, 0x2f, 0xf9, 0x94, 0x99, 0x7b, 0xfe, 0xe6, 0x70, 0xcc, 0xd2, 0x86, 0x8a, 0xb0, 0xe1, 0x26, 0xbe, 0x5e, 0x1e, 0xec, 0x3b, 0x82, 0x5b, 0x7e, 0x47, 0x56, 0xe7, 0xa7, 0xf8, 0x33, 0x04, 0xc7, 0x53, 0xbb, 0x5b, @@ -1888,26 +1888,26 @@ var fileDescriptor_5da291368ba4d8e3 = []byte{ 0x83, 0xe2, 0xec, 0x19, 0x19, 0xe4, 0x2b, 0xbb, 0x11, 0x21, 0xed, 0x9c, 0x17, 0x76, 0xde, 0xc2, 0x37, 0x06, 0xb6, 0x33, 0x6e, 0xc9, 0xf1, 0xef, 0x10, 0x8c, 0x26, 0xbf, 0xfb, 0xe0, 0xeb, 0x03, 0x5e, 0x90, 0x12, 0x1f, 0x9f, 0xf2, 0x37, 0x86, 0xe2, 0x95, 0xe6, 0xdc, 0x12, 0xe6, 0x5c, 0xc5, - 0x57, 0x06, 0x2c, 0x43, 0x6a, 0x6d, 0x53, 0x35, 0x0d, 0xfc, 0x37, 0x04, 0x93, 0xe9, 0x7d, 0x7f, - 0xe6, 0xec, 0xdc, 0x76, 0x0a, 0x91, 0x39, 0x3b, 0xb7, 0x1f, 0x3e, 0x90, 0x39, 0x61, 0xe6, 0x0d, - 0x7c, 0x6d, 0x80, 0xf7, 0x9b, 0xaa, 0xf9, 0xf2, 0xa2, 0xbc, 0xfc, 0x23, 0x82, 0xa3, 0xdd, 0x9d, - 0x11, 0x7e, 0x7d, 0xb8, 0xb6, 0x27, 0x32, 0xef, 0xf6, 0xd0, 0xfc, 0xd2, 0xb0, 0x3b, 0xc2, 0xb0, - 0xeb, 0xf8, 0x2b, 0xe5, 0xe1, 0x3e, 0x2c, 0xbb, 0xf8, 0xef, 0x08, 0xa6, 0xfa, 0x34, 0xfc, 0x99, - 0xcb, 0xea, 0xf6, 0x63, 0x8b, 0xcc, 0x65, 0x75, 0x87, 0xb9, 0xc3, 0xc0, 0xef, 0x4c, 0xf1, 0xf2, - 0x08, 0xa2, 0x18, 0xb6, 0xe0, 0xf8, 0x57, 0x23, 0xf0, 0xf9, 0x2c, 0xdd, 0x18, 0x56, 0xb2, 0x16, - 0x8b, 0xec, 0xcd, 0x65, 0xfe, 0xc1, 0x4b, 0x95, 0x29, 0xbd, 0x62, 0x0a, 0xaf, 0xe8, 0x58, 0xcb, - 0x5a, 0x91, 0x12, 0xdd, 0xa3, 0x6a, 0x99, 0x76, 0x43, 0x5d, 0x73, 0x58, 0x53, 0x4d, 0x32, 0x95, - 0xdf, 0x49, 0xeb, 0x6e, 0x9f, 0xe2, 0xff, 0x20, 0x98, 0x4c, 0xef, 0x07, 0x33, 0x1f, 0xf7, 0x6d, - 0xdb, 0xd3, 0xcc, 0xc7, 0x7d, 0xfb, 0xa6, 0x94, 0xdc, 0x17, 0x2e, 0x79, 0x13, 0x57, 0x33, 0xba, - 0xc4, 0x73, 0xa9, 0xa3, 0x7a, 0xa1, 0x3c, 0x35, 0xed, 0xae, 0xf5, 0x09, 0x82, 0x63, 0x3d, 0x8d, - 0x24, 0xce, 0x7a, 0x7e, 0xfb, 0xf5, 0xa7, 0xf9, 0x3b, 0xc3, 0x0b, 0x18, 0xf2, 0x50, 0xd4, 0x29, - 0x57, 0xbb, 0x9a, 0x5e, 0x71, 0xb5, 0xea, 0xd3, 0x9c, 0x65, 0xae, 0x01, 0xdb, 0x77, 0xb4, 0x99, - 0x6b, 0xc0, 0x0e, 0x3d, 0xe2, 0xc0, 0x57, 0xab, 0xfe, 0xcd, 0x6a, 0x65, 0xfd, 0xd9, 0xf3, 0x02, - 0xfa, 0xf8, 0x79, 0x01, 0xfd, 0xf9, 0x79, 0x01, 0x7d, 0xf0, 0xa2, 0xb0, 0xe7, 0xe3, 0x17, 0x85, - 0x3d, 0x7f, 0x7a, 0x51, 0xd8, 0xf3, 0x8d, 0xe5, 0x9d, 0xbe, 0x71, 0x3d, 0xba, 0x34, 0x5b, 0x7e, - 0xd2, 0xa1, 0xf9, 0x42, 0xac, 0x5a, 0xb7, 0x4c, 0x6a, 0xf3, 0xe0, 0x7f, 0x92, 0x82, 0x7f, 0x20, - 0x38, 0x20, 0xfe, 0x5c, 0xfe, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x62, 0x72, 0xe6, 0xe2, 0xa7, - 0x25, 0x00, 0x00, + 0xb3, 0x03, 0x96, 0x21, 0xb5, 0xb6, 0xa9, 0x9a, 0x06, 0xfe, 0x1b, 0x82, 0xc9, 0xf4, 0xbe, 0x3f, + 0x73, 0x76, 0x6e, 0x3b, 0x85, 0xc8, 0x9c, 0x9d, 0xdb, 0x0f, 0x1f, 0xc8, 0x9c, 0x30, 0xf3, 0x06, + 0xbe, 0x36, 0xc0, 0xfb, 0x4d, 0xd5, 0x7c, 0x79, 0x51, 0x5e, 0xfe, 0x11, 0xc1, 0xd1, 0xee, 0xce, + 0x08, 0xbf, 0x3e, 0x5c, 0xdb, 0x13, 0x99, 0x77, 0x7b, 0x68, 0x7e, 0x69, 0xd8, 0x1d, 0x61, 0xd8, + 0x75, 0xfc, 0x95, 0xf2, 0x70, 0x1f, 0x96, 0x5d, 0xfc, 0x77, 0x04, 0x53, 0x7d, 0x1a, 0xfe, 0xcc, + 0x65, 0x75, 0xfb, 0xb1, 0x45, 0xe6, 0xb2, 0xba, 0xc3, 0xdc, 0x61, 0xe0, 0x77, 0xa6, 0x78, 0x79, + 0x04, 0x51, 0x0c, 0x5b, 0x70, 0xfc, 0xab, 0x11, 0xf8, 0x7c, 0x96, 0x6e, 0x0c, 0x2b, 0x59, 0x8b, + 0x45, 0xf6, 0xe6, 0x32, 0xff, 0xe0, 0xa5, 0xca, 0x94, 0x5e, 0x31, 0x85, 0x57, 0x74, 0xac, 0x65, + 0xad, 0x48, 0x89, 0xee, 0x51, 0xb5, 0x4c, 0xbb, 0xa1, 0xae, 0x39, 0xac, 0xa9, 0x26, 0x99, 0xca, + 0xef, 0xa4, 0x75, 0xb7, 0x4f, 0xf1, 0x7f, 0x10, 0x4c, 0xa6, 0xf7, 0x83, 0x99, 0x8f, 0xfb, 0xb6, + 0xed, 0x69, 0xe6, 0xe3, 0xbe, 0x7d, 0x53, 0x4a, 0xee, 0x0b, 0x97, 0xbc, 0x89, 0xab, 0x19, 0x5d, + 0xe2, 0xb9, 0xd4, 0x51, 0xbd, 0x50, 0x9e, 0x9a, 0x76, 0xd7, 0xfa, 0x04, 0xc1, 0xb1, 0x9e, 0x46, + 0x12, 0x67, 0x3d, 0xbf, 0xfd, 0xfa, 0xd3, 0xfc, 0x9d, 0xe1, 0x05, 0x0c, 0x79, 0x28, 0xea, 0x94, + 0xab, 0x5d, 0x4d, 0xaf, 0xb8, 0x5a, 0xf5, 0x69, 0xce, 0x32, 0xd7, 0x80, 0xed, 0x3b, 0xda, 0xcc, + 0x35, 0x60, 0x87, 0x1e, 0x71, 0xe0, 0xab, 0x55, 0xff, 0x66, 0xb5, 0xb2, 0xfe, 0xec, 0x79, 0x01, + 0x7d, 0xfc, 0xbc, 0x80, 0xfe, 0xfc, 0xbc, 0x80, 0x3e, 0x78, 0x51, 0xd8, 0xf3, 0xf1, 0x8b, 0xc2, + 0x9e, 0x3f, 0xbd, 0x28, 0xec, 0xf9, 0xc6, 0xf2, 0x4e, 0xdf, 0xb8, 0x1e, 0x5d, 0x9a, 0x2d, 0x3f, + 0xe9, 0xd0, 0x7c, 0x21, 0x56, 0xad, 0x5b, 0x26, 0xb5, 0x79, 0xf0, 0x3f, 0x49, 0xc1, 0x3f, 0x10, + 0x1c, 0x10, 0x7f, 0x2e, 0xff, 0x37, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x8e, 0x2a, 0x8b, 0xa7, 0x25, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/concentrated-liquidity/clmocks/listeners.go b/x/concentrated-liquidity/clmocks/listeners.go index 64c78908038..1a063d10081 100644 --- a/x/concentrated-liquidity/clmocks/listeners.go +++ b/x/concentrated-liquidity/clmocks/listeners.go @@ -1,7 +1,7 @@ package clmocks import ( - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/concentrated-liquidity/clmodule/module.go b/x/concentrated-liquidity/clmodule/module.go index 51b4f36a14e..d262dc0582e 100644 --- a/x/concentrated-liquidity/clmodule/module.go +++ b/x/concentrated-liquidity/clmodule/module.go @@ -15,17 +15,17 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/queryproto" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/simulation" - - clkeeper "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - clclient "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/grpc" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types/genesis" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/queryproto" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/simulation" + + clkeeper "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + clclient "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/grpc" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types/genesis" ) var ( diff --git a/x/concentrated-liquidity/event.go b/x/concentrated-liquidity/event.go index 12a3ed55bba..2db49995dd2 100644 --- a/x/concentrated-liquidity/event.go +++ b/x/concentrated-liquidity/event.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - types "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + types "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) // event is the interface all event types should be implementing diff --git a/x/concentrated-liquidity/export_test.go b/x/concentrated-liquidity/export_test.go index bb15c85d511..a0df2044e44 100644 --- a/x/concentrated-liquidity/export_test.go +++ b/x/concentrated-liquidity/export_test.go @@ -7,10 +7,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/accum" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/swapstrategy" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/swapstrategy" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) const ( diff --git a/x/concentrated-liquidity/fuzz_test.go b/x/concentrated-liquidity/fuzz_test.go index 11298a997e2..fc1639a2270 100644 --- a/x/concentrated-liquidity/fuzz_test.go +++ b/x/concentrated-liquidity/fuzz_test.go @@ -13,8 +13,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/swapstrategy" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/swapstrategy" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) const ( diff --git a/x/concentrated-liquidity/genesis.go b/x/concentrated-liquidity/genesis.go index 1be31df2026..fe7c22fb800 100644 --- a/x/concentrated-liquidity/genesis.go +++ b/x/concentrated-liquidity/genesis.go @@ -10,8 +10,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/accum" - types "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types/genesis" + types "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types/genesis" ) // InitGenesis initializes the concentrated-liquidity module with the provided genesis state. diff --git a/x/concentrated-liquidity/genesis_test.go b/x/concentrated-liquidity/genesis_test.go index 4ae29c4a037..6574d1cff4d 100644 --- a/x/concentrated-liquidity/genesis_test.go +++ b/x/concentrated-liquidity/genesis_test.go @@ -12,12 +12,12 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/accum" - osmoapp "github.com/osmosis-labs/osmosis/v24/app" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - clmodule "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/clmodule" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types/genesis" + osmoapp "github.com/osmosis-labs/osmosis/v25/app" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + clmodule "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/clmodule" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types/genesis" ) type singlePoolGenesisEntry struct { diff --git a/x/concentrated-liquidity/gov.go b/x/concentrated-liquidity/gov.go index c78fff8ea61..fd48099cd9e 100644 --- a/x/concentrated-liquidity/gov.go +++ b/x/concentrated-liquidity/gov.go @@ -7,9 +7,9 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func (k Keeper) HandleCreateConcentratedLiquidityPoolsProposal(ctx sdk.Context, p *types.CreateConcentratedLiquidityPoolsProposal) error { diff --git a/x/concentrated-liquidity/incentives.go b/x/concentrated-liquidity/incentives.go index c667ae131ca..35ed989d820 100644 --- a/x/concentrated-liquidity/incentives.go +++ b/x/concentrated-liquidity/incentives.go @@ -15,8 +15,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/accum" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) // We choose 10^27 to allow sufficient buffer before the accumulator starts getting truncated again. diff --git a/x/concentrated-liquidity/incentives_test.go b/x/concentrated-liquidity/incentives_test.go index b460a1ec70b..a7067f4a71e 100644 --- a/x/concentrated-liquidity/incentives_test.go +++ b/x/concentrated-liquidity/incentives_test.go @@ -11,12 +11,12 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/accum" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) var ( diff --git a/x/concentrated-liquidity/invariant_test.go b/x/concentrated-liquidity/invariant_test.go index 3bd0b080aaa..60e9fa74c9d 100644 --- a/x/concentrated-liquidity/invariant_test.go +++ b/x/concentrated-liquidity/invariant_test.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) type ExpectedGlobalRewardValues struct { diff --git a/x/concentrated-liquidity/keeper.go b/x/concentrated-liquidity/keeper.go index 4479602ec23..8a7b97c2d1a 100644 --- a/x/concentrated-liquidity/keeper.go +++ b/x/concentrated-liquidity/keeper.go @@ -9,7 +9,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) type Keeper struct { diff --git a/x/concentrated-liquidity/keeper_test.go b/x/concentrated-liquidity/keeper_test.go index 8b55a5d3cb3..d81b305897f 100644 --- a/x/concentrated-liquidity/keeper_test.go +++ b/x/concentrated-liquidity/keeper_test.go @@ -13,16 +13,16 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/accum" - concentrated_liquidity "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/clmocks" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + concentrated_liquidity "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/clmocks" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" ) var ( diff --git a/x/concentrated-liquidity/lp.go b/x/concentrated-liquidity/lp.go index 1f44c6b3075..f70f6213084 100644 --- a/x/concentrated-liquidity/lp.go +++ b/x/concentrated-liquidity/lp.go @@ -9,9 +9,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - types "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + types "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) const noUnderlyingLockId = uint64(0) diff --git a/x/concentrated-liquidity/lp_test.go b/x/concentrated-liquidity/lp_test.go index 849fa219971..c9e05d19c0b 100644 --- a/x/concentrated-liquidity/lp_test.go +++ b/x/concentrated-liquidity/lp_test.go @@ -9,11 +9,11 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - types "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + types "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) type lpTest struct { diff --git a/x/concentrated-liquidity/math/math_test.go b/x/concentrated-liquidity/math/math_test.go index bcf13685ddb..214bf0390a5 100644 --- a/x/concentrated-liquidity/math/math_test.go +++ b/x/concentrated-liquidity/math/math_test.go @@ -7,8 +7,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) var ( diff --git a/x/concentrated-liquidity/math/precompute.go b/x/concentrated-liquidity/math/precompute.go index 8fee0fb5f78..17e80f36623 100644 --- a/x/concentrated-liquidity/math/precompute.go +++ b/x/concentrated-liquidity/math/precompute.go @@ -2,7 +2,7 @@ package math import ( "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) var ( diff --git a/x/concentrated-liquidity/math/tick.go b/x/concentrated-liquidity/math/tick.go index c0d4a35d0e9..ecd0b59efe0 100644 --- a/x/concentrated-liquidity/math/tick.go +++ b/x/concentrated-liquidity/math/tick.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) // TicksToSqrtPrice returns the sqrtPrice for the lower and upper ticks by diff --git a/x/concentrated-liquidity/math/tick_test.go b/x/concentrated-liquidity/math/tick_test.go index 1a9d74d7b25..5b129e29f33 100644 --- a/x/concentrated-liquidity/math/tick_test.go +++ b/x/concentrated-liquidity/math/tick_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) const ( diff --git a/x/concentrated-liquidity/model/codec.go b/x/concentrated-liquidity/model/codec.go index 56fcbd47a79..4f0dd0aa082 100644 --- a/x/concentrated-liquidity/model/codec.go +++ b/x/concentrated-liquidity/model/codec.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func RegisterCodec(cdc *codec.LegacyAmino) { diff --git a/x/concentrated-liquidity/model/msgs.go b/x/concentrated-liquidity/model/msgs.go index cdcfb990385..abae2d90c70 100644 --- a/x/concentrated-liquidity/model/msgs.go +++ b/x/concentrated-liquidity/model/msgs.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // constants. diff --git a/x/concentrated-liquidity/model/msgs_test.go b/x/concentrated-liquidity/model/msgs_test.go index 4902c467735..aba138448a9 100644 --- a/x/concentrated-liquidity/model/msgs_test.go +++ b/x/concentrated-liquidity/model/msgs_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) func TestMsgCreateConcentratedPool(t *testing.T) { diff --git a/x/concentrated-liquidity/model/pool.go b/x/concentrated-liquidity/model/pool.go index 53f715c946c..f1eef0efe6d 100644 --- a/x/concentrated-liquidity/model/pool.go +++ b/x/concentrated-liquidity/model/pool.go @@ -9,9 +9,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) const ( diff --git a/x/concentrated-liquidity/model/pool.pb.go b/x/concentrated-liquidity/model/pool.pb.go index 927cda93924..7996e647c15 100644 --- a/x/concentrated-liquidity/model/pool.pb.go +++ b/x/concentrated-liquidity/model/pool.pb.go @@ -101,49 +101,49 @@ func init() { } var fileDescriptor_8b899353e6a19a1a = []byte{ - // 660 bytes of a gzipped FileDescriptorProto + // 661 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xcd, 0x4e, 0xdb, 0x40, 0x10, 0x8e, 0xf9, 0x2d, 0x1b, 0x40, 0x65, 0x09, 0xd4, 0xd0, 0x12, 0xa7, 0x96, 0x2a, 0xe5, 0x50, - 0x6c, 0x42, 0x7b, 0xa2, 0x27, 0x22, 0x54, 0xa9, 0x52, 0xa4, 0xa2, 0x85, 0xaa, 0x52, 0x55, 0xc9, - 0xdd, 0xd8, 0x8b, 0x59, 0xc5, 0xf1, 0x1a, 0xef, 0x86, 0x02, 0x4f, 0xd0, 0x23, 0xc7, 0x1e, 0x79, - 0x88, 0x3e, 0x04, 0xea, 0xa5, 0x1c, 0xab, 0x1e, 0xdc, 0x0a, 0xde, 0x20, 0x4f, 0x50, 0x79, 0x77, - 0x4d, 0x82, 0x88, 0xd4, 0x9e, 0x92, 0xf9, 0x66, 0xbe, 0x6f, 0xbf, 0x19, 0xcf, 0x2e, 0xd8, 0x60, - 0xbc, 0xcb, 0x38, 0xe5, 0xae, 0xcf, 0x62, 0x9f, 0xc4, 0x22, 0xc5, 0x82, 0x04, 0x11, 0x3d, 0xea, - 0xd1, 0x80, 0x8a, 0x53, 0xf7, 0xb8, 0xd1, 0x26, 0x02, 0x37, 0xdc, 0x84, 0xb1, 0xc8, 0x49, 0x52, - 0x26, 0x18, 0x7c, 0xa6, 0x19, 0xce, 0x48, 0x86, 0xa3, 0x19, 0xab, 0x2b, 0xbe, 0xac, 0xf3, 0x24, - 0xc9, 0x55, 0x81, 0x52, 0x58, 0xad, 0x84, 0x2c, 0x64, 0x0a, 0xcf, 0xff, 0x69, 0xd4, 0x0a, 0x19, - 0x0b, 0x23, 0xe2, 0xca, 0xa8, 0xdd, 0x3b, 0x70, 0x05, 0xed, 0x12, 0x2e, 0x70, 0x37, 0x51, 0x05, - 0xf6, 0x8f, 0x69, 0x30, 0xb1, 0xcb, 0x58, 0x04, 0x9f, 0x83, 0x69, 0x1c, 0x04, 0x29, 0xe1, 0xdc, - 0x34, 0x6a, 0x46, 0x7d, 0xa6, 0x09, 0xfb, 0x99, 0x35, 0x7f, 0x8a, 0xbb, 0xd1, 0x96, 0xad, 0x13, - 0x36, 0x2a, 0x4a, 0x60, 0x0b, 0x40, 0x2a, 0x8d, 0xd2, 0x63, 0xc2, 0xbd, 0x82, 0x38, 0x26, 0x89, - 0x6b, 0xfd, 0xcc, 0x5a, 0x51, 0xc4, 0xfb, 0x35, 0x36, 0x5a, 0x18, 0x80, 0xdb, 0x5a, 0xed, 0x3d, - 0x58, 0xe6, 0x49, 0x4a, 0x70, 0xe0, 0xa5, 0xe4, 0x33, 0x4e, 0x83, 0x81, 0xe2, 0xb8, 0x54, 0x7c, - 0xda, 0xcf, 0xac, 0x35, 0xa5, 0x38, 0xba, 0xce, 0x46, 0x15, 0x95, 0x40, 0x0a, 0x2f, 0x84, 0xe7, - 0xc1, 0x18, 0x0d, 0xcc, 0x89, 0x9a, 0x51, 0x9f, 0x40, 0x63, 0x34, 0x80, 0x67, 0x60, 0xd9, 0xef, - 0xa5, 0x29, 0x89, 0x85, 0x27, 0xa8, 0xdf, 0xf1, 0x6e, 0x27, 0x6c, 0x4e, 0xca, 0x83, 0x76, 0x2e, - 0x33, 0xab, 0xf4, 0x2b, 0xb3, 0x1e, 0xab, 0xd1, 0xf2, 0xa0, 0xe3, 0x50, 0xe6, 0x76, 0xb1, 0x38, - 0x74, 0x5a, 0x24, 0xc4, 0xfe, 0xe9, 0x0e, 0xf1, 0x07, 0x5e, 0x46, 0x4b, 0xd9, 0xa8, 0xa2, 0x13, - 0xfb, 0xd4, 0xef, 0xb4, 0x0a, 0x18, 0x2e, 0x83, 0x29, 0xc1, 0x3a, 0x24, 0xde, 0x30, 0xa7, 0xf2, - 0xb3, 0x90, 0x8e, 0x6e, 0xf1, 0x86, 0x39, 0x3d, 0x84, 0x37, 0xe0, 0x19, 0x80, 0xc5, 0x01, 0xfc, - 0x28, 0x15, 0x5e, 0x92, 0x52, 0x9f, 0x98, 0x0f, 0xa4, 0xcf, 0x96, 0xf6, 0xe9, 0x86, 0x54, 0x1c, - 0xf6, 0xda, 0x8e, 0xcf, 0xba, 0xae, 0xde, 0xa0, 0xf5, 0x08, 0xb7, 0x79, 0x11, 0xc8, 0x5f, 0x69, - 0xbf, 0x49, 0x43, 0xe5, 0x7d, 0xa1, 0x98, 0x23, 0xd3, 0x92, 0x36, 0x7a, 0xa8, 0xcf, 0xd9, 0x3b, - 0x4a, 0xc5, 0x6e, 0x0e, 0xc1, 0x2d, 0x30, 0x3b, 0xdc, 0x9c, 0x39, 0x53, 0x33, 0xea, 0xe3, 0xcd, - 0x47, 0xfd, 0xcc, 0x5a, 0xbc, 0xdf, 0xba, 0x8d, 0xca, 0x43, 0x0d, 0xe7, 0x5c, 0x39, 0x10, 0x9e, - 0x60, 0x9f, 0xc6, 0xa1, 0x09, 0xf2, 0xe9, 0x0f, 0x73, 0x87, 0xb3, 0x36, 0x2a, 0xe7, 0xe1, 0x9e, - 0x8a, 0xe0, 0x1e, 0x58, 0x22, 0x27, 0x09, 0x8b, 0x73, 0x69, 0xac, 0xfd, 0x79, 0x2c, 0x26, 0x66, - 0x59, 0x1a, 0xa8, 0xf5, 0x33, 0xeb, 0x89, 0x12, 0x19, 0x59, 0x66, 0x23, 0x58, 0xe0, 0xdb, 0xaa, - 0x93, 0xb7, 0x31, 0x81, 0x9f, 0xc0, 0x9c, 0xde, 0x9a, 0x03, 0xec, 0x0b, 0x96, 0x9a, 0xb3, 0x72, - 0x86, 0xaf, 0xfe, 0xef, 0x5b, 0x57, 0xee, 0xec, 0x9d, 0x52, 0xb0, 0xd1, 0xac, 0x8a, 0x5f, 0xcb, - 0x10, 0x9e, 0x80, 0xa5, 0x08, 0x73, 0x31, 0xd8, 0x01, 0xaf, 0x97, 0x04, 0x58, 0x10, 0x73, 0xae, - 0x66, 0xd4, 0xcb, 0x9b, 0xab, 0x8e, 0xba, 0x85, 0x4e, 0x71, 0x0b, 0x9d, 0xfd, 0xe2, 0x16, 0x36, - 0xeb, 0xb9, 0x8b, 0x41, 0x5b, 0x23, 0x65, 0xec, 0xf3, 0xdf, 0x96, 0x81, 0x16, 0xf3, 0xdc, 0xed, - 0x3a, 0xbd, 0x93, 0x99, 0xad, 0x85, 0x2f, 0x17, 0x56, 0xe9, 0xeb, 0x85, 0x55, 0xfa, 0xfe, 0x6d, - 0x7d, 0x32, 0xbf, 0xc7, 0x6f, 0x9a, 0x1f, 0x2f, 0xaf, 0xab, 0xc6, 0xd5, 0x75, 0xd5, 0xf8, 0x73, - 0x5d, 0x35, 0xce, 0x6f, 0xaa, 0xa5, 0xab, 0x9b, 0x6a, 0xe9, 0xe7, 0x4d, 0xb5, 0xf4, 0xa1, 0xf9, - 0xaf, 0x6d, 0x39, 0xde, 0x7c, 0xe9, 0x9e, 0xdc, 0x79, 0xb4, 0xd6, 0x07, 0xaf, 0x56, 0x97, 0x05, - 0x24, 0x6a, 0x4f, 0xc9, 0x1e, 0x5e, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x5c, 0x52, 0xa9, 0xdd, - 0xe3, 0x04, 0x00, 0x00, + 0x6c, 0x42, 0xd5, 0x0b, 0x3d, 0x11, 0xa1, 0x4a, 0x95, 0x22, 0x15, 0x2d, 0x54, 0x95, 0xaa, 0x4a, + 0xee, 0xc6, 0x5e, 0xcc, 0x2a, 0x8e, 0xd7, 0x78, 0x37, 0x14, 0x78, 0x82, 0x1e, 0x39, 0xf6, 0xc8, + 0x43, 0xf4, 0x21, 0x50, 0x2f, 0xe5, 0x58, 0xf5, 0xe0, 0x56, 0xf0, 0x06, 0x79, 0x82, 0xca, 0xbb, + 0x6b, 0x12, 0x44, 0xa4, 0xf6, 0x94, 0xcc, 0x37, 0xf3, 0x7d, 0xfb, 0xcd, 0x78, 0x76, 0xc1, 0x06, + 0xe3, 0x5d, 0xc6, 0x29, 0x77, 0x7d, 0x16, 0xfb, 0x24, 0x16, 0x29, 0x16, 0x24, 0x88, 0xe8, 0x51, + 0x8f, 0x06, 0x54, 0x9c, 0xba, 0xc7, 0x8d, 0x36, 0x11, 0xb8, 0xe1, 0x26, 0x8c, 0x45, 0x4e, 0x92, + 0x32, 0xc1, 0xe0, 0x33, 0xcd, 0x70, 0x46, 0x32, 0x1c, 0xcd, 0x58, 0x5d, 0xf1, 0x65, 0x9d, 0x27, + 0x49, 0xae, 0x0a, 0x94, 0xc2, 0x6a, 0x25, 0x64, 0x21, 0x53, 0x78, 0xfe, 0x4f, 0xa3, 0x56, 0xc8, + 0x58, 0x18, 0x11, 0x57, 0x46, 0xed, 0xde, 0x81, 0x2b, 0x68, 0x97, 0x70, 0x81, 0xbb, 0x89, 0x2a, + 0xb0, 0x7f, 0x4c, 0x83, 0x89, 0x5d, 0xc6, 0x22, 0xf8, 0x1c, 0x4c, 0xe3, 0x20, 0x48, 0x09, 0xe7, + 0xa6, 0x51, 0x33, 0xea, 0x33, 0x4d, 0xd8, 0xcf, 0xac, 0xf9, 0x53, 0xdc, 0x8d, 0xb6, 0x6c, 0x9d, + 0xb0, 0x51, 0x51, 0x02, 0x5b, 0x00, 0x52, 0x69, 0x94, 0x1e, 0x13, 0xee, 0x15, 0xc4, 0x31, 0x49, + 0x5c, 0xeb, 0x67, 0xd6, 0x8a, 0x22, 0xde, 0xaf, 0xb1, 0xd1, 0xc2, 0x00, 0xdc, 0xd6, 0x6a, 0xef, + 0xc1, 0x32, 0x4f, 0x52, 0x82, 0x03, 0x2f, 0x25, 0x9f, 0x71, 0x1a, 0x0c, 0x14, 0xc7, 0xa5, 0xe2, + 0xd3, 0x7e, 0x66, 0xad, 0x29, 0xc5, 0xd1, 0x75, 0x36, 0xaa, 0xa8, 0x04, 0x52, 0x78, 0x21, 0x3c, + 0x0f, 0xc6, 0x68, 0x60, 0x4e, 0xd4, 0x8c, 0xfa, 0x04, 0x1a, 0xa3, 0x01, 0x3c, 0x03, 0xcb, 0x7e, + 0x2f, 0x4d, 0x49, 0x2c, 0x3c, 0x41, 0xfd, 0x8e, 0x77, 0x3b, 0x61, 0x73, 0x52, 0x1e, 0xb4, 0x73, + 0x99, 0x59, 0xa5, 0x5f, 0x99, 0xf5, 0x58, 0x8d, 0x96, 0x07, 0x1d, 0x87, 0x32, 0xb7, 0x8b, 0xc5, + 0xa1, 0xd3, 0x22, 0x21, 0xf6, 0x4f, 0x77, 0x88, 0x3f, 0xf0, 0x32, 0x5a, 0xca, 0x46, 0x15, 0x9d, + 0xd8, 0xa7, 0x7e, 0xa7, 0x55, 0xc0, 0x70, 0x19, 0x4c, 0x09, 0xd6, 0x21, 0xf1, 0x86, 0x39, 0x95, + 0x9f, 0x85, 0x74, 0x74, 0x8b, 0x37, 0xcc, 0xe9, 0x21, 0xbc, 0x01, 0xcf, 0x00, 0x2c, 0x0e, 0xe0, + 0x47, 0xa9, 0xf0, 0x92, 0x94, 0xfa, 0xc4, 0x7c, 0x20, 0x7d, 0xb6, 0xb4, 0x4f, 0x37, 0xa4, 0xe2, + 0xb0, 0xd7, 0x76, 0x7c, 0xd6, 0x75, 0xf5, 0x06, 0xad, 0x47, 0xb8, 0xcd, 0x8b, 0x40, 0xfe, 0x4a, + 0xfb, 0x4d, 0x1a, 0x2a, 0xef, 0x0b, 0xc5, 0x1c, 0x99, 0x96, 0xb4, 0xd1, 0x43, 0x7d, 0xce, 0xde, + 0x51, 0x2a, 0x76, 0x73, 0x08, 0x6e, 0x81, 0xd9, 0xe1, 0xe6, 0xcc, 0x99, 0x9a, 0x51, 0x1f, 0x6f, + 0x3e, 0xea, 0x67, 0xd6, 0xe2, 0xfd, 0xd6, 0x6d, 0x54, 0x1e, 0x6a, 0x38, 0xe7, 0xca, 0x81, 0xf0, + 0x04, 0xfb, 0x34, 0x0e, 0x4d, 0x90, 0x4f, 0x7f, 0x98, 0x3b, 0x9c, 0xb5, 0x51, 0x39, 0x0f, 0xf7, + 0x54, 0x04, 0xf7, 0xc0, 0x12, 0x39, 0x49, 0x58, 0x9c, 0x4b, 0x63, 0xed, 0xcf, 0x63, 0x31, 0x31, + 0xcb, 0xd2, 0x40, 0xad, 0x9f, 0x59, 0x4f, 0x94, 0xc8, 0xc8, 0x32, 0x1b, 0xc1, 0x02, 0xdf, 0x56, + 0x9d, 0xbc, 0x8d, 0x09, 0xfc, 0x04, 0xe6, 0xf4, 0xd6, 0x1c, 0x60, 0x5f, 0xb0, 0xd4, 0x9c, 0x95, + 0x33, 0x7c, 0xf5, 0x7f, 0xdf, 0xba, 0x72, 0x67, 0xef, 0x94, 0x82, 0x8d, 0x66, 0x55, 0xfc, 0x5a, + 0x86, 0xf0, 0x04, 0x2c, 0x45, 0x98, 0x8b, 0xc1, 0x0e, 0x78, 0xbd, 0x24, 0xc0, 0x82, 0x98, 0x73, + 0x35, 0xa3, 0x5e, 0xde, 0x5c, 0x75, 0xd4, 0x2d, 0x74, 0x8a, 0x5b, 0xe8, 0xec, 0x17, 0xb7, 0xb0, + 0x59, 0xcf, 0x5d, 0x0c, 0xda, 0x1a, 0x29, 0x63, 0x9f, 0xff, 0xb6, 0x0c, 0xb4, 0x98, 0xe7, 0x6e, + 0xd7, 0xe9, 0x9d, 0xcc, 0x6c, 0x2d, 0x7c, 0xb9, 0xb0, 0x4a, 0x5f, 0x2f, 0xac, 0xd2, 0xf7, 0x6f, + 0xeb, 0x93, 0xf9, 0x3d, 0x7e, 0xd3, 0xfc, 0x78, 0x79, 0x5d, 0x35, 0xae, 0xae, 0xab, 0xc6, 0x9f, + 0xeb, 0xaa, 0x71, 0x7e, 0x53, 0x2d, 0x5d, 0xdd, 0x54, 0x4b, 0x3f, 0x6f, 0xaa, 0xa5, 0x0f, 0xcd, + 0x7f, 0x6d, 0xcb, 0xf1, 0xe6, 0x4b, 0xf7, 0xe4, 0xce, 0xa3, 0xb5, 0x3e, 0x78, 0xb5, 0xba, 0x2c, + 0x20, 0x51, 0x7b, 0x4a, 0xf6, 0xf0, 0xe2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xc0, 0xed, + 0x72, 0xe3, 0x04, 0x00, 0x00, } func (m *Pool) Marshal() (dAtA []byte, err error) { diff --git a/x/concentrated-liquidity/model/pool_test.go b/x/concentrated-liquidity/model/pool_test.go index 0a33ec67284..66b20bf8a1f 100644 --- a/x/concentrated-liquidity/model/pool_test.go +++ b/x/concentrated-liquidity/model/pool_test.go @@ -11,10 +11,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - clmath "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + clmath "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) const ( diff --git a/x/concentrated-liquidity/model/position.pb.go b/x/concentrated-liquidity/model/position.pb.go index 248cce3bf52..64c516fbf5b 100644 --- a/x/concentrated-liquidity/model/position.pb.go +++ b/x/concentrated-liquidity/model/position.pb.go @@ -15,7 +15,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - types1 "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + types1 "github.com/osmosis-labs/osmosis/v25/x/lockup/types" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" @@ -279,48 +279,48 @@ var fileDescriptor_1363e25aa5179fb1 = []byte{ // 697 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcd, 0x6e, 0xd3, 0x4c, 0x14, 0x8d, 0xbf, 0xfc, 0xb4, 0x9d, 0x48, 0x9f, 0x90, 0x5b, 0x2a, 0x37, 0x85, 0x38, 0x32, 0x42, - 0x8d, 0x04, 0xf5, 0x90, 0x50, 0x51, 0x89, 0x65, 0x40, 0x48, 0x95, 0xba, 0x28, 0xa6, 0x08, 0x09, + 0x8d, 0x04, 0xf5, 0x90, 0xf0, 0x53, 0x89, 0x65, 0x40, 0x48, 0x95, 0xba, 0x28, 0xa6, 0x08, 0x09, 0x21, 0x45, 0x63, 0xcf, 0x34, 0x1d, 0x62, 0x67, 0x5c, 0xcf, 0xa4, 0x25, 0x12, 0x4f, 0xc0, 0xaa, 0x2b, 0x5e, 0x80, 0x1d, 0x4f, 0xd2, 0x65, 0x97, 0x88, 0x45, 0x8a, 0xda, 0x37, 0xe8, 0x13, 0xa0, 0x19, 0x8f, 0xed, 0x80, 0xca, 0xdf, 0xa2, 0x2b, 0xcf, 0xdc, 0x33, 0xe7, 0x9c, 0xeb, 0x7b, 0xaf, - 0x2e, 0xd8, 0x60, 0x3c, 0x62, 0x9c, 0x72, 0x18, 0xb0, 0x51, 0x40, 0x46, 0x22, 0x41, 0x82, 0xe0, - 0x90, 0x1e, 0x8c, 0x29, 0xa6, 0x62, 0x02, 0x0f, 0x3b, 0x3e, 0x11, 0xa8, 0x03, 0x63, 0xc6, 0xa9, - 0xa0, 0x6c, 0xe4, 0xc6, 0x09, 0x13, 0xcc, 0xbc, 0xab, 0x59, 0xee, 0x95, 0x2c, 0x57, 0xb3, 0x1a, - 0xf6, 0x80, 0xb1, 0x41, 0x48, 0xa0, 0x22, 0xf9, 0xe3, 0x3d, 0x28, 0x68, 0x44, 0xb8, 0x40, 0x51, - 0x9c, 0xea, 0x34, 0x96, 0x06, 0x6c, 0xc0, 0xd4, 0x11, 0xca, 0x93, 0x8e, 0x36, 0x03, 0x25, 0x0f, - 0x7d, 0xc4, 0x49, 0x9e, 0x41, 0xc0, 0xa8, 0x76, 0x6f, 0xac, 0x64, 0x39, 0x87, 0x2c, 0x18, 0x8e, - 0x63, 0xf5, 0x49, 0x21, 0xe7, 0x43, 0x19, 0xcc, 0xef, 0xe8, 0x5c, 0xcd, 0x4d, 0x50, 0xcf, 0xf2, - 0xee, 0x53, 0x6c, 0x19, 0x2d, 0xa3, 0x5d, 0xe9, 0x2d, 0x5f, 0x4e, 0x6d, 0x73, 0x82, 0xa2, 0xf0, - 0xb1, 0x33, 0x03, 0x3a, 0x1e, 0xc8, 0x6e, 0x5b, 0xd8, 0xbc, 0x0f, 0xe6, 0x10, 0xc6, 0x09, 0xe1, - 0xdc, 0xfa, 0xaf, 0x65, 0xb4, 0x17, 0x7a, 0xe6, 0xe5, 0xd4, 0xfe, 0x3f, 0x25, 0x69, 0xc0, 0xf1, - 0xb2, 0x27, 0xe6, 0x3d, 0x30, 0x17, 0x33, 0x16, 0x4a, 0x8b, 0xb2, 0xb2, 0x98, 0x79, 0xad, 0x01, - 0xc7, 0xab, 0xc9, 0xd3, 0x16, 0x36, 0x6f, 0x03, 0x10, 0xb2, 0x23, 0x92, 0xf4, 0x05, 0x0d, 0x86, - 0x56, 0xa5, 0x65, 0xb4, 0xcb, 0xde, 0x82, 0x8a, 0xec, 0xd2, 0x60, 0x28, 0xe1, 0x71, 0x1c, 0x67, - 0x70, 0x35, 0x85, 0x55, 0x44, 0xc1, 0x2f, 0xc1, 0xc2, 0x5b, 0x46, 0x47, 0x7d, 0x59, 0x47, 0xab, - 0xd6, 0x32, 0xda, 0xf5, 0x6e, 0xc3, 0x4d, 0x8b, 0xec, 0x66, 0x45, 0x76, 0x77, 0xb3, 0x22, 0xf7, - 0x6e, 0x9d, 0x4c, 0xed, 0xd2, 0xe5, 0xd4, 0xbe, 0x91, 0x26, 0x93, 0x53, 0x9d, 0xe3, 0x33, 0xdb, - 0xf0, 0xe6, 0xe5, 0x5d, 0x3e, 0x96, 0xb2, 0x79, 0xf3, 0xac, 0x39, 0xf5, 0xc7, 0x9b, 0x92, 0xfa, - 0x75, 0x6a, 0xaf, 0xa6, 0xbd, 0xe0, 0x78, 0xe8, 0x52, 0x06, 0x23, 0x24, 0xf6, 0xdd, 0x6d, 0x32, - 0x40, 0xc1, 0xe4, 0x29, 0x09, 0x0a, 0xe5, 0x9c, 0xed, 0x78, 0x85, 0x92, 0xf3, 0xb1, 0x0a, 0x6e, - 0x3e, 0x1b, 0x87, 0x61, 0xd6, 0x90, 0x5e, 0x42, 0xd0, 0x10, 0xb3, 0xa3, 0x91, 0xf9, 0x1c, 0xcc, - 0x67, 0xe5, 0x56, 0x6d, 0xa9, 0x77, 0xa1, 0xfb, 0x57, 0x23, 0xe5, 0xe6, 0x5a, 0x15, 0x99, 0xa0, - 0x97, 0xcb, 0x98, 0x3e, 0xa8, 0x21, 0xce, 0x89, 0x78, 0xa0, 0x5a, 0x56, 0xef, 0xae, 0xb8, 0x69, - 0xe6, 0xae, 0x9c, 0xa2, 0x9c, 0xfe, 0x84, 0xd1, 0x51, 0x0f, 0x4a, 0xea, 0xe7, 0x33, 0x7b, 0x6d, - 0x40, 0xc5, 0xfe, 0xd8, 0x77, 0x03, 0x16, 0x41, 0x3d, 0x72, 0xe9, 0x67, 0x9d, 0xe3, 0x21, 0x14, - 0x93, 0x98, 0x70, 0x45, 0xf0, 0xb4, 0x72, 0xee, 0xd1, 0x51, 0x8d, 0xbe, 0x0e, 0x8f, 0x8e, 0xf9, - 0x1e, 0x58, 0x41, 0x88, 0x68, 0x84, 0xfc, 0x90, 0xf4, 0x79, 0x9c, 0x10, 0x84, 0xfb, 0x09, 0x39, - 0x42, 0x09, 0xe6, 0x56, 0xa5, 0x55, 0xfe, 0xbd, 0xeb, 0x9a, 0x6e, 0xb8, 0x9d, 0xb6, 0xe5, 0x57, - 0x42, 0x8e, 0xb7, 0x9c, 0x43, 0x2f, 0x14, 0xe2, 0xa5, 0x80, 0x79, 0x00, 0x96, 0x0a, 0x12, 0x55, - 0x8d, 0xa0, 0x87, 0x84, 0x5b, 0xd5, 0x3f, 0x39, 0xdf, 0xd1, 0xce, 0xab, 0x3f, 0x3b, 0x17, 0x22, - 0x8e, 0xb7, 0x98, 0x87, 0xb7, 0xf2, 0xa8, 0xb4, 0xdc, 0x63, 0xc9, 0x1e, 0xa1, 0x82, 0xe0, 0x59, - 0xcb, 0xda, 0x3f, 0x5a, 0x5e, 0x25, 0xe2, 0x78, 0x8b, 0x79, 0xb8, 0xb0, 0x74, 0x3e, 0x19, 0x60, - 0x39, 0x1b, 0xa4, 0x57, 0x54, 0xec, 0xef, 0x90, 0x84, 0x32, 0xbc, 0xcd, 0x82, 0xe1, 0x75, 0x4c, - 0xe6, 0x23, 0x50, 0x95, 0x1b, 0x8a, 0xeb, 0xc1, 0x6c, 0xe4, 0x7a, 0xe9, 0xfa, 0x72, 0x0b, 0x77, - 0x4d, 0x4d, 0x9f, 0xf7, 0xde, 0x9c, 0x9c, 0x37, 0x8d, 0xd3, 0xf3, 0xa6, 0xf1, 0xed, 0xbc, 0x69, - 0x1c, 0x5f, 0x34, 0x4b, 0xa7, 0x17, 0xcd, 0xd2, 0x97, 0x8b, 0x66, 0xe9, 0x75, 0x6f, 0x66, 0xa8, - 0xb4, 0xd8, 0x7a, 0x88, 0x7c, 0x9e, 0x5d, 0xe0, 0x61, 0x77, 0x03, 0xbe, 0xfb, 0x61, 0xa5, 0xaf, - 0x17, 0x3b, 0x3d, 0x62, 0x98, 0x84, 0x7e, 0x4d, 0xed, 0x8b, 0x87, 0xdf, 0x03, 0x00, 0x00, 0xff, - 0xff, 0x8a, 0xc7, 0x85, 0x89, 0x01, 0x06, 0x00, 0x00, + 0x2e, 0x78, 0xc0, 0x78, 0xc4, 0x38, 0xe5, 0x30, 0x60, 0xa3, 0x80, 0x8c, 0x44, 0x82, 0x04, 0xc1, + 0x21, 0xdd, 0x1f, 0x53, 0x4c, 0xc5, 0x04, 0x1e, 0x74, 0x7c, 0x22, 0x50, 0x07, 0xc6, 0x8c, 0x53, + 0x41, 0xd9, 0xc8, 0x8d, 0x13, 0x26, 0x98, 0x79, 0x5b, 0xb3, 0xdc, 0x4b, 0x59, 0xae, 0x66, 0x35, + 0xec, 0x01, 0x63, 0x83, 0x90, 0x40, 0x45, 0xf2, 0xc7, 0xbb, 0x50, 0xd0, 0x88, 0x70, 0x81, 0xa2, + 0x38, 0xd5, 0x69, 0x2c, 0x0d, 0xd8, 0x80, 0xa9, 0x23, 0x94, 0x27, 0x1d, 0x6d, 0x06, 0x4a, 0x1e, + 0xfa, 0x88, 0x93, 0x3c, 0x83, 0x80, 0x51, 0xed, 0xde, 0x58, 0xc9, 0x72, 0x0e, 0x59, 0x30, 0x1c, + 0xc7, 0xea, 0x93, 0x42, 0xce, 0x87, 0x32, 0x98, 0xdf, 0xd6, 0xb9, 0x9a, 0x1b, 0xa0, 0x9e, 0xe5, + 0xdd, 0xa7, 0xd8, 0x32, 0x5a, 0x46, 0xbb, 0xd2, 0x5b, 0xbe, 0x98, 0xda, 0xe6, 0x04, 0x45, 0xe1, + 0x63, 0x67, 0x06, 0x74, 0x3c, 0x90, 0xdd, 0x36, 0xb1, 0x79, 0x17, 0xcc, 0x21, 0x8c, 0x13, 0xc2, + 0xb9, 0xf5, 0x5f, 0xcb, 0x68, 0x2f, 0xf4, 0xcc, 0x8b, 0xa9, 0xfd, 0x7f, 0x4a, 0xd2, 0x80, 0xe3, + 0x65, 0x4f, 0xcc, 0x3b, 0x60, 0x2e, 0x66, 0x2c, 0x94, 0x16, 0x65, 0x65, 0x31, 0xf3, 0x5a, 0x03, + 0x8e, 0x57, 0x93, 0xa7, 0x4d, 0x6c, 0xde, 0x04, 0x20, 0x64, 0x87, 0x24, 0xe9, 0x0b, 0x1a, 0x0c, + 0xad, 0x4a, 0xcb, 0x68, 0x97, 0xbd, 0x05, 0x15, 0xd9, 0xa1, 0xc1, 0x50, 0xc2, 0xe3, 0x38, 0xce, + 0xe0, 0x6a, 0x0a, 0xab, 0x88, 0x82, 0x5f, 0x82, 0x85, 0xb7, 0x8c, 0x8e, 0xfa, 0xb2, 0x8e, 0x56, + 0xad, 0x65, 0xb4, 0xeb, 0xdd, 0x86, 0x9b, 0x16, 0xd9, 0xcd, 0x8a, 0xec, 0xee, 0x64, 0x45, 0xee, + 0xdd, 0x38, 0x9e, 0xda, 0xa5, 0x8b, 0xa9, 0x7d, 0x2d, 0x4d, 0x26, 0xa7, 0x3a, 0x47, 0xa7, 0xb6, + 0xe1, 0xcd, 0xcb, 0xbb, 0x7c, 0x2c, 0x65, 0xf3, 0xe6, 0x59, 0x73, 0xea, 0x8f, 0x37, 0x24, 0xf5, + 0xeb, 0xd4, 0x5e, 0x4d, 0x7b, 0xc1, 0xf1, 0xd0, 0xa5, 0x0c, 0x46, 0x48, 0xec, 0xb9, 0x5b, 0x64, + 0x80, 0x82, 0xc9, 0x53, 0x12, 0x14, 0xca, 0x39, 0xdb, 0xf1, 0x0a, 0x25, 0xe7, 0x63, 0x15, 0x5c, + 0x7f, 0x36, 0x0e, 0xc3, 0xac, 0x21, 0xbd, 0x84, 0xa0, 0x21, 0x66, 0x87, 0x23, 0xf3, 0x39, 0x98, + 0xcf, 0xca, 0xad, 0xda, 0x52, 0xef, 0x42, 0xf7, 0xaf, 0x46, 0xca, 0xcd, 0xb5, 0x2a, 0x32, 0x41, + 0x2f, 0x97, 0x31, 0x7d, 0x50, 0x43, 0x9c, 0x13, 0x71, 0x4f, 0xb5, 0xac, 0xde, 0x5d, 0x71, 0xd3, + 0xcc, 0x5d, 0x39, 0x45, 0x39, 0xfd, 0x09, 0xa3, 0xa3, 0x1e, 0x94, 0xd4, 0xcf, 0xa7, 0xf6, 0xda, + 0x80, 0x8a, 0xbd, 0xb1, 0xef, 0x06, 0x2c, 0x82, 0x7a, 0xe4, 0xd2, 0xcf, 0x3a, 0xc7, 0x43, 0x28, + 0x26, 0x31, 0xe1, 0x8a, 0xe0, 0x69, 0xe5, 0xdc, 0xa3, 0xa3, 0x1a, 0x7d, 0x15, 0x1e, 0x1d, 0xf3, + 0x3d, 0xb0, 0x82, 0x10, 0xd1, 0x08, 0xf9, 0x21, 0xe9, 0xf3, 0x38, 0x21, 0x08, 0xf7, 0x13, 0x72, + 0x88, 0x12, 0xcc, 0xad, 0x4a, 0xab, 0xfc, 0x7b, 0xd7, 0x35, 0xdd, 0x70, 0x3b, 0x6d, 0xcb, 0xaf, + 0x84, 0x1c, 0x6f, 0x39, 0x87, 0x5e, 0x28, 0xc4, 0x4b, 0x01, 0x73, 0x1f, 0x2c, 0x15, 0x24, 0xaa, + 0x1a, 0x41, 0x0f, 0x08, 0xb7, 0xaa, 0x7f, 0x72, 0xbe, 0xa5, 0x9d, 0x57, 0x7f, 0x76, 0x2e, 0x44, + 0x1c, 0x6f, 0x31, 0x0f, 0x6f, 0xe6, 0x51, 0x69, 0xb9, 0xcb, 0x92, 0x5d, 0x42, 0x05, 0xc1, 0xb3, + 0x96, 0xb5, 0x7f, 0xb4, 0xbc, 0x4c, 0xc4, 0xf1, 0x16, 0xf3, 0x70, 0x61, 0xe9, 0x7c, 0x32, 0xc0, + 0x72, 0x36, 0x48, 0xaf, 0xa8, 0xd8, 0xdb, 0x26, 0x09, 0x65, 0x78, 0x8b, 0x05, 0xc3, 0xab, 0x98, + 0xcc, 0x47, 0xa0, 0x2a, 0x37, 0x14, 0xd7, 0x83, 0xd9, 0xc8, 0xf5, 0xd2, 0xf5, 0xe5, 0x16, 0xee, + 0x9a, 0x9a, 0x3e, 0xef, 0xbd, 0x39, 0x3e, 0x6b, 0x1a, 0x27, 0x67, 0x4d, 0xe3, 0xdb, 0x59, 0xd3, + 0x38, 0x3a, 0x6f, 0x96, 0x4e, 0xce, 0x9b, 0xa5, 0x2f, 0xe7, 0xcd, 0xd2, 0xeb, 0xde, 0xcc, 0x50, + 0x69, 0xb1, 0xf5, 0x10, 0xf9, 0x3c, 0xbb, 0xc0, 0x83, 0xee, 0x43, 0xf8, 0xee, 0x87, 0x95, 0xbe, + 0x5e, 0xec, 0xf4, 0x88, 0x61, 0x12, 0xfa, 0x35, 0xb5, 0x2f, 0xee, 0x7f, 0x0f, 0x00, 0x00, 0xff, + 0xff, 0xcd, 0x55, 0xc1, 0x26, 0x01, 0x06, 0x00, 0x00, } func (m *Position) Marshal() (dAtA []byte, err error) { diff --git a/x/concentrated-liquidity/model/tick_info.pb.go b/x/concentrated-liquidity/model/tick_info.pb.go index b5312b521dd..0cf5ec792f1 100644 --- a/x/concentrated-liquidity/model/tick_info.pb.go +++ b/x/concentrated-liquidity/model/tick_info.pb.go @@ -203,41 +203,41 @@ func init() { } var fileDescriptor_193d635744e474d2 = []byte{ - // 543 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0xc1, 0x8b, 0xd3, 0x4e, - 0x14, 0xc7, 0x9b, 0xdf, 0x96, 0x1f, 0x9a, 0xba, 0x5d, 0xc8, 0xae, 0x52, 0x56, 0x49, 0x4b, 0x40, - 0x28, 0x48, 0x27, 0x6c, 0x77, 0xf7, 0xa0, 0xe2, 0x25, 0x16, 0x16, 0x61, 0x71, 0x21, 0xd4, 0x8b, - 0x28, 0x71, 0x3a, 0x99, 0xb6, 0x43, 0x93, 0x4c, 0xcc, 0x7b, 0xed, 0xda, 0x8b, 0x37, 0xef, 0xde, - 0x3c, 0x7a, 0xf7, 0x2f, 0xe9, 0x71, 0x8f, 0xe2, 0xa1, 0x4a, 0xfb, 0x1f, 0xf8, 0x17, 0x48, 0x92, - 0x49, 0x6b, 0x8b, 0x87, 0x45, 0xf0, 0x94, 0xcc, 0xe4, 0x7d, 0xbf, 0xdf, 0x0f, 0xef, 0xe5, 0xe9, - 0xa7, 0x12, 0x42, 0x09, 0x02, 0x6c, 0x26, 0x23, 0xc6, 0x23, 0x4c, 0x28, 0x72, 0x3f, 0x10, 0x6f, - 0xc7, 0xc2, 0x17, 0x38, 0xb5, 0x27, 0x47, 0x3d, 0x8e, 0xf4, 0xc8, 0x46, 0xc1, 0x46, 0x9e, 0x88, - 0xfa, 0x92, 0xc4, 0x89, 0x44, 0x69, 0xdc, 0x57, 0x32, 0xf2, 0x47, 0x19, 0x51, 0xb2, 0xc3, 0x83, - 0x81, 0x1c, 0xc8, 0x4c, 0x61, 0xa7, 0x6f, 0xb9, 0xf8, 0xd0, 0x64, 0x99, 0xda, 0xee, 0x51, 0xe0, - 0xab, 0x04, 0x26, 0x45, 0x94, 0x7f, 0xb7, 0x3e, 0x97, 0xf5, 0x1b, 0x5d, 0xc1, 0x46, 0xcf, 0xa2, - 0xbe, 0x34, 0xfa, 0xfa, 0xde, 0xca, 0xd7, 0x1b, 0x24, 0x12, 0xa0, 0xa6, 0x35, 0xb4, 0xe6, 0x4d, - 0xe7, 0xc9, 0x6c, 0x5e, 0x2f, 0x7d, 0x9b, 0xd7, 0xef, 0xe6, 0x6e, 0xe0, 0x8f, 0x88, 0x90, 0x76, - 0x48, 0x71, 0x48, 0xce, 0xf9, 0x80, 0xb2, 0x69, 0x87, 0xb3, 0x9f, 0xf3, 0xfa, 0x9d, 0x29, 0x0d, - 0x83, 0x47, 0xd6, 0x96, 0x87, 0xe5, 0x56, 0x57, 0x37, 0x67, 0xe9, 0x85, 0xf1, 0x46, 0xdf, 0x5d, - 0xd7, 0x44, 0x1c, 0x6b, 0xff, 0x65, 0x29, 0x8f, 0xaf, 0x97, 0x72, 0xb0, 0x9d, 0x12, 0x71, 0xb4, - 0xdc, 0x5b, 0xab, 0xf3, 0x73, 0x8e, 0xc6, 0x4c, 0xd3, 0x1f, 0x42, 0x9c, 0x70, 0xea, 0x7b, 0x09, - 0xbf, 0xa4, 0x89, 0x9f, 0xa2, 0x5c, 0xe2, 0xd0, 0x93, 0x71, 0x2c, 0x41, 0x20, 0xf7, 0x7c, 0x91, - 0x70, 0x86, 0x42, 0x46, 0x9e, 0xec, 0x7b, 0x01, 0x05, 0xf4, 0x30, 0xa1, 0x13, 0x9e, 0x00, 0x0d, - 0x6a, 0x3b, 0x8d, 0x9d, 0x66, 0xa5, 0x7d, 0x8f, 0xe4, 0x1c, 0x24, 0xed, 0x5d, 0xd1, 0x66, 0xd2, - 0xe1, 0xec, 0xa9, 0x14, 0x91, 0x73, 0x9c, 0xc2, 0x7e, 0xf9, 0x5e, 0x7f, 0x30, 0x10, 0x38, 0x1c, - 0xf7, 0x08, 0x93, 0xa1, 0xad, 0x7a, 0x9d, 0x3f, 0x5a, 0xe0, 0x8f, 0x6c, 0x9c, 0xc6, 0x1c, 0x0a, - 0x0d, 0xb8, 0xed, 0x9c, 0xc9, 0xcd, 0x90, 0xce, 0x32, 0xa2, 0x0b, 0x05, 0xd4, 0x29, 0x78, 0x2e, - 0xfa, 0xe7, 0x14, 0xb0, 0x5b, 0xc0, 0x18, 0xef, 0xf5, 0xbd, 0x71, 0x8c, 0x22, 0xe4, 0x29, 0x20, - 0x1b, 0xf1, 0x04, 0x6a, 0xe5, 0x86, 0xd6, 0xac, 0xb4, 0x4f, 0xc9, 0xb5, 0x7e, 0x0c, 0xf2, 0x22, - 0x53, 0x77, 0x95, 0xd8, 0x31, 0x53, 0xf0, 0xf5, 0xb0, 0xb6, 0xbc, 0x2d, 0xb7, 0x3a, 0xde, 0xa8, - 0xb7, 0xa4, 0x5e, 0xdd, 0x74, 0x30, 0x5e, 0xeb, 0xe5, 0x40, 0x00, 0xd6, 0xb4, 0xac, 0x4d, 0x27, - 0x7f, 0x83, 0xe1, 0xec, 0x2b, 0x8a, 0x4a, 0x31, 0x4c, 0x40, 0xcb, 0xcd, 0x6c, 0xad, 0x4f, 0x9a, - 0xbe, 0xbb, 0x51, 0x6c, 0x7c, 0xd0, 0xf4, 0xdb, 0x8a, 0xb3, 0x18, 0xe3, 0x18, 0x41, 0xf8, 0x5c, - 0x21, 0xfc, 0x83, 0x49, 0xed, 0xe7, 0x79, 0x6a, 0x46, 0x79, 0x9a, 0xf3, 0x6a, 0xb6, 0x30, 0xb5, - 0xab, 0x85, 0xa9, 0xfd, 0x58, 0x98, 0xda, 0xc7, 0xa5, 0x59, 0xba, 0x5a, 0x9a, 0xa5, 0xaf, 0x4b, - 0xb3, 0xf4, 0xd2, 0xf9, 0xcd, 0x5b, 0xb5, 0xa3, 0x15, 0xd0, 0x1e, 0x14, 0x07, 0x7b, 0xd2, 0x3e, - 0xb1, 0xdf, 0x6d, 0x2c, 0x7e, 0x6b, 0xbd, 0xf9, 0xa1, 0xf4, 0x79, 0xd0, 0xfb, 0x3f, 0xdb, 0xc8, - 0xe3, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x82, 0x49, 0x10, 0x30, 0x27, 0x04, 0x00, 0x00, + // 541 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x41, 0x8b, 0xd3, 0x40, + 0x14, 0xc7, 0x1b, 0x77, 0x11, 0x4d, 0xdd, 0x2e, 0x64, 0x57, 0x29, 0xab, 0xa4, 0x25, 0x20, 0x14, + 0xa4, 0x13, 0xb6, 0x6b, 0x0f, 0x2a, 0x5e, 0x62, 0x61, 0x11, 0x16, 0x17, 0x42, 0xbd, 0x88, 0x12, + 0xa7, 0x93, 0x69, 0x3b, 0x34, 0xc9, 0xc4, 0xbc, 0xd7, 0xae, 0xbd, 0x78, 0xf3, 0xee, 0xcd, 0xa3, + 0x77, 0x3f, 0x49, 0x8f, 0x7b, 0x14, 0x0f, 0x55, 0xda, 0x6f, 0xe0, 0x27, 0x90, 0x24, 0x93, 0xd6, + 0x16, 0x0f, 0x8b, 0xe0, 0x29, 0x99, 0xc9, 0xfb, 0xff, 0xff, 0x3f, 0xde, 0xcb, 0xd3, 0xdb, 0x12, + 0x42, 0x09, 0x02, 0x6c, 0x26, 0x23, 0xc6, 0x23, 0x4c, 0x28, 0x72, 0x3f, 0x10, 0xef, 0xc6, 0xc2, + 0x17, 0x38, 0xb5, 0x27, 0xc7, 0x3d, 0x8e, 0xf4, 0xd8, 0x46, 0xc1, 0x46, 0x9e, 0x88, 0xfa, 0x92, + 0xc4, 0x89, 0x44, 0x69, 0xdc, 0x57, 0x32, 0xf2, 0x57, 0x19, 0x51, 0xb2, 0xa3, 0xc3, 0x81, 0x1c, + 0xc8, 0x4c, 0x61, 0xa7, 0x6f, 0xb9, 0xf8, 0xc8, 0x64, 0x99, 0xda, 0xee, 0x51, 0xe0, 0xab, 0x04, + 0x26, 0x45, 0x94, 0x7f, 0xb7, 0xbe, 0xec, 0xea, 0x37, 0xba, 0x82, 0x8d, 0x9e, 0x47, 0x7d, 0x69, + 0xf4, 0xf5, 0xfd, 0x95, 0xaf, 0x37, 0x48, 0x24, 0x40, 0x55, 0xab, 0x6b, 0x8d, 0x9b, 0xce, 0xd3, + 0xd9, 0xbc, 0x56, 0xfa, 0x3e, 0xaf, 0xdd, 0xcd, 0xdd, 0xc0, 0x1f, 0x11, 0x21, 0xed, 0x90, 0xe2, + 0x90, 0x9c, 0xf1, 0x01, 0x65, 0xd3, 0x0e, 0x67, 0xbf, 0xe6, 0xb5, 0x3b, 0x53, 0x1a, 0x06, 0x8f, + 0xad, 0x2d, 0x0f, 0xcb, 0xad, 0xac, 0x6e, 0x4e, 0xd3, 0x0b, 0xe3, 0xad, 0xbe, 0xb7, 0xae, 0x89, + 0x38, 0x56, 0xaf, 0x65, 0x29, 0x4f, 0xae, 0x96, 0x72, 0xb8, 0x9d, 0x12, 0x71, 0xb4, 0xdc, 0x5b, + 0xab, 0xf3, 0x0b, 0x8e, 0xc6, 0x4c, 0xd3, 0x1f, 0x41, 0x9c, 0x70, 0xea, 0x7b, 0x09, 0xbf, 0xa0, + 0x89, 0x9f, 0xa2, 0x5c, 0xe0, 0xd0, 0x93, 0x71, 0x2c, 0x41, 0x20, 0xf7, 0x7c, 0x91, 0x70, 0x86, + 0x42, 0x46, 0x9e, 0xec, 0x7b, 0x01, 0x05, 0xf4, 0x30, 0xa1, 0x13, 0x9e, 0x00, 0x0d, 0xaa, 0x3b, + 0xf5, 0x9d, 0x46, 0xb9, 0x75, 0x8f, 0xe4, 0x1c, 0x24, 0xed, 0x5d, 0xd1, 0x66, 0xd2, 0xe1, 0xec, + 0x99, 0x14, 0x91, 0x73, 0x92, 0xc2, 0x7e, 0xfd, 0x51, 0x7b, 0x30, 0x10, 0x38, 0x1c, 0xf7, 0x08, + 0x93, 0xa1, 0xad, 0x7a, 0x9d, 0x3f, 0x9a, 0xe0, 0x8f, 0x6c, 0x9c, 0xc6, 0x1c, 0x0a, 0x0d, 0xb8, + 0xad, 0x9c, 0xc9, 0xcd, 0x90, 0x4e, 0x33, 0xa2, 0x73, 0x05, 0xd4, 0x29, 0x78, 0xce, 0xfb, 0x67, + 0x14, 0xb0, 0x5b, 0xc0, 0x18, 0x1f, 0xf4, 0xfd, 0x71, 0x8c, 0x22, 0xe4, 0x29, 0x20, 0x1b, 0xf1, + 0x04, 0xaa, 0xbb, 0x75, 0xad, 0x51, 0x6e, 0xb5, 0xc9, 0x95, 0x7e, 0x0c, 0xf2, 0x32, 0x53, 0x77, + 0x95, 0xd8, 0x31, 0x53, 0xf0, 0xf5, 0xb0, 0xb6, 0xbc, 0x2d, 0xb7, 0x32, 0xde, 0xa8, 0xb7, 0xa4, + 0x5e, 0xd9, 0x74, 0x30, 0xde, 0xe8, 0xbb, 0x81, 0x00, 0xac, 0x6a, 0x59, 0x9b, 0x1e, 0xfe, 0x0b, + 0x86, 0x73, 0xa0, 0x28, 0xca, 0xc5, 0x30, 0x01, 0x2d, 0x37, 0xb3, 0xb5, 0x3e, 0x6b, 0xfa, 0xde, + 0x46, 0xb1, 0xf1, 0x51, 0xd3, 0x6f, 0x2b, 0xce, 0x62, 0x8c, 0x63, 0x04, 0xe1, 0x73, 0x85, 0xf0, + 0x1f, 0x26, 0x75, 0x90, 0xe7, 0xa9, 0x19, 0xe5, 0x69, 0xce, 0xeb, 0xd9, 0xc2, 0xd4, 0x2e, 0x17, + 0xa6, 0xf6, 0x73, 0x61, 0x6a, 0x9f, 0x96, 0x66, 0xe9, 0x72, 0x69, 0x96, 0xbe, 0x2d, 0xcd, 0xd2, + 0x2b, 0xe7, 0x0f, 0x6f, 0xd5, 0x8e, 0x66, 0x40, 0x7b, 0x50, 0x1c, 0xec, 0x49, 0xab, 0x6d, 0xbf, + 0xdf, 0x58, 0xfc, 0xe6, 0x7a, 0xf3, 0x43, 0xe9, 0xf3, 0xa0, 0x77, 0x3d, 0xdb, 0xc8, 0x93, 0xdf, + 0x01, 0x00, 0x00, 0xff, 0xff, 0xc5, 0xdb, 0x54, 0x9f, 0x27, 0x04, 0x00, 0x00, } func (m *TickInfo) Marshal() (dAtA []byte, err error) { diff --git a/x/concentrated-liquidity/model/tx.pb.go b/x/concentrated-liquidity/model/tx.pb.go index a04ab94f6f7..c8aba201c94 100644 --- a/x/concentrated-liquidity/model/tx.pb.go +++ b/x/concentrated-liquidity/model/tx.pb.go @@ -157,32 +157,32 @@ var fileDescriptor_ce205b40e975faec = []byte{ // 445 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x4f, 0x6e, 0xd4, 0x30, 0x14, 0xc6, 0xc7, 0xed, 0x30, 0x08, 0xd3, 0x2e, 0x08, 0x15, 0x84, 0x22, 0x25, 0x25, 0x6c, 0xca, - 0xa2, 0x36, 0x29, 0xac, 0x0a, 0xab, 0xb4, 0x20, 0x2a, 0x51, 0x09, 0x85, 0x05, 0x12, 0x42, 0x1a, - 0x1c, 0xdb, 0xa4, 0x56, 0x93, 0xbc, 0x10, 0xbb, 0x55, 0xe7, 0x16, 0x9c, 0x87, 0x13, 0x74, 0x59, - 0xb1, 0x42, 0x5d, 0x44, 0x28, 0x73, 0x83, 0x39, 0x01, 0xca, 0x9f, 0x29, 0x33, 0x68, 0x66, 0x85, - 0xd8, 0xe5, 0xf3, 0xfb, 0xfc, 0xcb, 0xcb, 0xf7, 0xf2, 0xf0, 0x2b, 0xd0, 0x29, 0x68, 0xa5, 0x29, - 0x87, 0x8c, 0xcb, 0xcc, 0x14, 0xcc, 0x48, 0x91, 0xa8, 0xaf, 0xa7, 0x4a, 0x28, 0x33, 0xa2, 0x39, - 0x40, 0x92, 0x82, 0x90, 0xc9, 0x5c, 0x9d, 0x9e, 0xf9, 0x91, 0x34, 0xcc, 0xa7, 0xe6, 0x9c, 0xe4, - 0x05, 0x18, 0xb0, 0x5e, 0x76, 0x18, 0xb2, 0x10, 0x43, 0xae, 0x31, 0x73, 0x75, 0xd2, 0x61, 0x36, - 0x37, 0x62, 0x88, 0xa1, 0x01, 0xd1, 0xfa, 0xa9, 0x65, 0x7a, 0xdf, 0x57, 0xf0, 0x83, 0x23, 0x1d, - 0xef, 0x17, 0x92, 0x19, 0xb9, 0x3f, 0x73, 0xef, 0x1d, 0x40, 0x62, 0x3d, 0xc1, 0x03, 0x2d, 0x33, - 0x21, 0x0b, 0x1b, 0x6d, 0xa1, 0xed, 0x5b, 0xc1, 0x9d, 0x49, 0xe9, 0xae, 0x8f, 0x58, 0x9a, 0xec, - 0x79, 0xed, 0xb9, 0x17, 0x76, 0x86, 0xda, 0x2a, 0x64, 0x06, 0xe9, 0x53, 0x7b, 0xe5, 0x6f, 0x6b, - 0x7b, 0xee, 0x85, 0x9d, 0xe1, 0xda, 0xea, 0xdb, 0xab, 0x0b, 0xad, 0xfe, 0xd4, 0xea, 0x5b, 0x7b, - 0x78, 0xcd, 0x28, 0x7e, 0x32, 0xd4, 0x39, 0xe3, 0x2a, 0x8b, 0xed, 0xfe, 0x16, 0xda, 0xee, 0x07, - 0xf7, 0x27, 0xa5, 0x7b, 0xb7, 0xbd, 0x30, 0x5b, 0xf5, 0xc2, 0xdb, 0xb5, 0x7c, 0xdf, 0x2a, 0xeb, - 0x33, 0x5e, 0xd7, 0x79, 0x21, 0x99, 0x18, 0x7e, 0x61, 0xdc, 0x40, 0x61, 0xdf, 0x68, 0xde, 0xf6, - 0xe2, 0xa2, 0x74, 0x7b, 0x57, 0xa5, 0xfb, 0x90, 0x37, 0x71, 0x6a, 0x71, 0x42, 0x14, 0xd0, 0x94, - 0x99, 0x63, 0xf2, 0x56, 0xc6, 0x8c, 0x8f, 0x0e, 0x24, 0x9f, 0x94, 0xee, 0x46, 0xf7, 0x99, 0xb3, - 0x04, 0x2f, 0x5c, 0x6b, 0xf5, 0xeb, 0x56, 0xbe, 0xc1, 0x8f, 0x96, 0x66, 0x17, 0x4a, 0x9d, 0x43, - 0xa6, 0xa5, 0xf5, 0x18, 0xdf, 0xac, 0x27, 0x33, 0x54, 0xa2, 0x09, 0xb1, 0x1f, 0xe0, 0xaa, 0x74, - 0x07, 0xb5, 0xe5, 0xf0, 0x20, 0x1c, 0xd4, 0xa5, 0x43, 0xb1, 0x7b, 0x85, 0xf0, 0xea, 0x91, 0x8e, - 0xad, 0x1f, 0x08, 0xdf, 0x5b, 0x32, 0x8b, 0x0f, 0xe4, 0x5f, 0xc6, 0x4f, 0x96, 0x36, 0xba, 0x39, - 0xfc, 0x4f, 0xe0, 0x69, 0x02, 0xc1, 0xa7, 0x8b, 0xca, 0x41, 0x97, 0x95, 0x83, 0x7e, 0x55, 0x0e, - 0xfa, 0x36, 0x76, 0x7a, 0x97, 0x63, 0xa7, 0xf7, 0x73, 0xec, 0xf4, 0x3e, 0x06, 0xb1, 0x32, 0xc7, - 0xa7, 0x11, 0xe1, 0x90, 0xd2, 0xae, 0x89, 0x9d, 0x84, 0x45, 0x7a, 0x2a, 0xe8, 0xd9, 0xee, 0x73, - 0x7a, 0x3e, 0xb7, 0x16, 0x3b, 0x7f, 0xf6, 0xa6, 0x69, 0x2a, 0x1a, 0x34, 0x3f, 0xf2, 0xb3, 0xdf, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x97, 0xee, 0x28, 0xea, 0x65, 0x03, 0x00, 0x00, + 0xa2, 0x36, 0x29, 0x62, 0x53, 0x58, 0xa5, 0x05, 0x51, 0x89, 0x4a, 0x28, 0x2c, 0x90, 0x10, 0xd2, + 0xe0, 0xd8, 0x26, 0xb5, 0x9a, 0xe4, 0x85, 0xd8, 0xad, 0x3a, 0xb7, 0xe0, 0x3c, 0x9c, 0xa0, 0xcb, + 0x8a, 0x15, 0xea, 0x22, 0x42, 0x99, 0x1b, 0xcc, 0x09, 0x50, 0xfe, 0x4c, 0x99, 0x41, 0x33, 0x2b, + 0xc4, 0x2e, 0x9f, 0xdf, 0xe7, 0x5f, 0x5e, 0xbe, 0x97, 0x87, 0x5f, 0x81, 0x4e, 0x41, 0x2b, 0x4d, + 0x39, 0x64, 0x5c, 0x66, 0xa6, 0x60, 0x46, 0x8a, 0x44, 0x7d, 0x3d, 0x55, 0x42, 0x99, 0x11, 0xcd, + 0x01, 0x92, 0x14, 0x84, 0x4c, 0xe6, 0xea, 0xf4, 0xcc, 0x8f, 0xa4, 0x61, 0x3e, 0x35, 0xe7, 0x24, + 0x2f, 0xc0, 0x80, 0xf5, 0xb2, 0xc3, 0x90, 0x85, 0x18, 0x72, 0x8d, 0x99, 0xab, 0x93, 0x0e, 0xb3, + 0xb9, 0x11, 0x43, 0x0c, 0x0d, 0x88, 0xd6, 0x4f, 0x2d, 0xd3, 0xfb, 0xbe, 0x82, 0x1f, 0x1c, 0xe9, + 0x78, 0xbf, 0x90, 0xcc, 0xc8, 0xfd, 0x99, 0x7b, 0xef, 0x00, 0x12, 0xeb, 0x09, 0x1e, 0x68, 0x99, + 0x09, 0x59, 0xd8, 0x68, 0x0b, 0x6d, 0xdf, 0x0a, 0xee, 0x4c, 0x4a, 0x77, 0x7d, 0xc4, 0xd2, 0x64, + 0xcf, 0x6b, 0xcf, 0xbd, 0xb0, 0x33, 0xd4, 0x56, 0x21, 0x33, 0x48, 0x9f, 0xda, 0x2b, 0x7f, 0x5b, + 0xdb, 0x73, 0x2f, 0xec, 0x0c, 0xd7, 0x56, 0xdf, 0x5e, 0x5d, 0x68, 0xf5, 0xa7, 0x56, 0xdf, 0xda, + 0xc3, 0x6b, 0x46, 0xf1, 0x93, 0xa1, 0xce, 0x19, 0x57, 0x59, 0x6c, 0xf7, 0xb7, 0xd0, 0x76, 0x3f, + 0xb8, 0x3f, 0x29, 0xdd, 0xbb, 0xed, 0x85, 0xd9, 0xaa, 0x17, 0xde, 0xae, 0xe5, 0xfb, 0x56, 0x59, + 0x9f, 0xf1, 0xba, 0xce, 0x0b, 0xc9, 0xc4, 0xf0, 0x0b, 0xe3, 0x06, 0x0a, 0xfb, 0x46, 0xf3, 0xb6, + 0x17, 0x17, 0xa5, 0xdb, 0xbb, 0x2a, 0xdd, 0x87, 0xbc, 0x89, 0x53, 0x8b, 0x13, 0xa2, 0x80, 0xa6, + 0xcc, 0x1c, 0x93, 0xb7, 0x32, 0x66, 0x7c, 0x74, 0x20, 0xf9, 0xa4, 0x74, 0x37, 0xba, 0xcf, 0x9c, + 0x25, 0x78, 0xe1, 0x5a, 0xab, 0x5f, 0xb7, 0xf2, 0x0d, 0x7e, 0xb4, 0x34, 0xbb, 0x50, 0xea, 0x1c, + 0x32, 0x2d, 0xad, 0xc7, 0xf8, 0x66, 0x3d, 0x99, 0xa1, 0x12, 0x4d, 0x88, 0xfd, 0x00, 0x57, 0xa5, + 0x3b, 0xa8, 0x2d, 0x87, 0x07, 0xe1, 0xa0, 0x2e, 0x1d, 0x8a, 0xdd, 0x2b, 0x84, 0x57, 0x8f, 0x74, + 0x6c, 0xfd, 0x40, 0xf8, 0xde, 0x92, 0x59, 0x7c, 0x20, 0xff, 0x32, 0x7e, 0xb2, 0xb4, 0xd1, 0xcd, + 0xe1, 0x7f, 0x02, 0x4f, 0x13, 0x08, 0x3e, 0x5d, 0x54, 0x0e, 0xba, 0xac, 0x1c, 0xf4, 0xab, 0x72, + 0xd0, 0xb7, 0xb1, 0xd3, 0xbb, 0x1c, 0x3b, 0xbd, 0x9f, 0x63, 0xa7, 0xf7, 0x31, 0x88, 0x95, 0x39, + 0x3e, 0x8d, 0x08, 0x87, 0x94, 0x76, 0x4d, 0xec, 0x24, 0x2c, 0xd2, 0x53, 0x41, 0xcf, 0x76, 0x9f, + 0xd3, 0xf3, 0xb9, 0xb5, 0xd8, 0xf9, 0xb3, 0x37, 0x4d, 0x53, 0xd1, 0xa0, 0xf9, 0x91, 0x9f, 0xfd, + 0x0e, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x7c, 0x6c, 0x45, 0x65, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/concentrated-liquidity/msg_server.go b/x/concentrated-liquidity/msg_server.go index 66e78cfd5e9..860611aa90d 100644 --- a/x/concentrated-liquidity/msg_server.go +++ b/x/concentrated-liquidity/msg_server.go @@ -7,8 +7,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) type msgServer struct { diff --git a/x/concentrated-liquidity/msg_server_test.go b/x/concentrated-liquidity/msg_server_test.go index b8a711c0f08..65300898151 100644 --- a/x/concentrated-liquidity/msg_server_test.go +++ b/x/concentrated-liquidity/msg_server_test.go @@ -7,11 +7,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // TestCreateConcentratedPool_Events tests that events are correctly emitted diff --git a/x/concentrated-liquidity/pool.go b/x/concentrated-liquidity/pool.go index 4182268d628..d7ee5766e59 100644 --- a/x/concentrated-liquidity/pool.go +++ b/x/concentrated-liquidity/pool.go @@ -14,10 +14,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/accum" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - types "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + types "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // InitializePool initializes a new concentrated liquidity pool with the given PoolI interface and creator address. diff --git a/x/concentrated-liquidity/pool_hooks.go b/x/concentrated-liquidity/pool_hooks.go index f7121f44d8e..ced0d6d82c1 100644 --- a/x/concentrated-liquidity/pool_hooks.go +++ b/x/concentrated-liquidity/pool_hooks.go @@ -8,7 +8,7 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - types "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + types "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) // --- Pool Hooks --- diff --git a/x/concentrated-liquidity/pool_hooks_test.go b/x/concentrated-liquidity/pool_hooks_test.go index 606b76a9935..49789c7ce36 100644 --- a/x/concentrated-liquidity/pool_hooks_test.go +++ b/x/concentrated-liquidity/pool_hooks_test.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) var ( diff --git a/x/concentrated-liquidity/pool_test.go b/x/concentrated-liquidity/pool_test.go index f89ad918a51..06b3789207e 100644 --- a/x/concentrated-liquidity/pool_test.go +++ b/x/concentrated-liquidity/pool_test.go @@ -8,13 +8,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - sftypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + sftypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func (s *KeeperTestSuite) TestInitializePool() { diff --git a/x/concentrated-liquidity/position.go b/x/concentrated-liquidity/position.go index 0a3d255c7ff..789b1c52108 100644 --- a/x/concentrated-liquidity/position.go +++ b/x/concentrated-liquidity/position.go @@ -16,9 +16,9 @@ import ( "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/accum" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) const MinNumPositions = 2 diff --git a/x/concentrated-liquidity/position_test.go b/x/concentrated-liquidity/position_test.go index 917bd2b1813..cf2158a47e6 100644 --- a/x/concentrated-liquidity/position_test.go +++ b/x/concentrated-liquidity/position_test.go @@ -12,12 +12,12 @@ import ( "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/accum" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) const ( diff --git a/x/concentrated-liquidity/query.go b/x/concentrated-liquidity/query.go index 79df4ae33bb..707d4d7bff8 100644 --- a/x/concentrated-liquidity/query.go +++ b/x/concentrated-liquidity/query.go @@ -10,11 +10,11 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/swapstrategy" - types "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/swapstrategy" + types "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) const invalidTickIndex = int64(-1) diff --git a/x/concentrated-liquidity/query_test.go b/x/concentrated-liquidity/query_test.go index bf21741c7b0..ea0a0b0520c 100644 --- a/x/concentrated-liquidity/query_test.go +++ b/x/concentrated-liquidity/query_test.go @@ -4,9 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types/genesis" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types/genesis" ) var tenDec = osmomath.NewDec(10) diff --git a/x/concentrated-liquidity/range_test.go b/x/concentrated-liquidity/range_test.go index 23282865434..e9a8eadeeb9 100644 --- a/x/concentrated-liquidity/range_test.go +++ b/x/concentrated-liquidity/range_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) type RangeTestParams struct { diff --git a/x/concentrated-liquidity/simulation/sim_msgs.go b/x/concentrated-liquidity/simulation/sim_msgs.go index 1e90e5db369..9dc80e81d36 100644 --- a/x/concentrated-liquidity/simulation/sim_msgs.go +++ b/x/concentrated-liquidity/simulation/sim_msgs.go @@ -9,13 +9,13 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/osmosis-labs/osmosis/osmomath" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" - osmosimtypes "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - sdkrand "github.com/osmosis-labs/osmosis/v24/simulation/simtypes/random" - clkeeper "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - clmodeltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" + osmosimtypes "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + sdkrand "github.com/osmosis-labs/osmosis/v25/simulation/simtypes/random" + clkeeper "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + clmodeltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" ) // preparePoolConfig defines the parameters for creating a new pool diff --git a/x/concentrated-liquidity/spread_rewards.go b/x/concentrated-liquidity/spread_rewards.go index 27e24b711a3..459c3b18fa6 100644 --- a/x/concentrated-liquidity/spread_rewards.go +++ b/x/concentrated-liquidity/spread_rewards.go @@ -8,7 +8,7 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/accum" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) var emptyCoins = sdk.DecCoins(nil) diff --git a/x/concentrated-liquidity/spread_rewards_test.go b/x/concentrated-liquidity/spread_rewards_test.go index cfde909b80a..028c4de438f 100644 --- a/x/concentrated-liquidity/spread_rewards_test.go +++ b/x/concentrated-liquidity/spread_rewards_test.go @@ -8,11 +8,11 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/accum" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - clmath "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + clmath "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) const ( diff --git a/x/concentrated-liquidity/store.go b/x/concentrated-liquidity/store.go index dac630f2cb2..d5c8a79f932 100644 --- a/x/concentrated-liquidity/store.go +++ b/x/concentrated-liquidity/store.go @@ -11,9 +11,9 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types/genesis" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types/genesis" ) const ( diff --git a/x/concentrated-liquidity/store_test.go b/x/concentrated-liquidity/store_test.go index f50eef49ff5..2be2fa50979 100644 --- a/x/concentrated-liquidity/store_test.go +++ b/x/concentrated-liquidity/store_test.go @@ -5,10 +5,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types/genesis" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types/genesis" ) const ( diff --git a/x/concentrated-liquidity/swaps.go b/x/concentrated-liquidity/swaps.go index 155f7bf6e84..706c7337f1f 100644 --- a/x/concentrated-liquidity/swaps.go +++ b/x/concentrated-liquidity/swaps.go @@ -8,12 +8,12 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/accum" - events "github.com/osmosis-labs/osmosis/v24/x/poolmanager/events" + events "github.com/osmosis-labs/osmosis/v25/x/poolmanager/events" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/swapstrategy" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/swapstrategy" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // SwapState defines the state of a swap. diff --git a/x/concentrated-liquidity/swaps_test.go b/x/concentrated-liquidity/swaps_test.go index a5052d25dbb..38d37bbbf3e 100644 --- a/x/concentrated-liquidity/swaps_test.go +++ b/x/concentrated-liquidity/swaps_test.go @@ -8,12 +8,12 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - clmath "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + clmath "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var _ = suite.TestingSuite(nil) diff --git a/x/concentrated-liquidity/swaps_tick_cross_test.go b/x/concentrated-liquidity/swaps_tick_cross_test.go index 5613b892bdf..d11c3c4fd70 100644 --- a/x/concentrated-liquidity/swaps_tick_cross_test.go +++ b/x/concentrated-liquidity/swaps_tick_cross_test.go @@ -7,9 +7,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/swapstrategy" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/swapstrategy" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) const ( diff --git a/x/concentrated-liquidity/swapstrategy/one_for_zero.go b/x/concentrated-liquidity/swapstrategy/one_for_zero.go index 650da639244..83ae78e33d0 100644 --- a/x/concentrated-liquidity/swapstrategy/one_for_zero.go +++ b/x/concentrated-liquidity/swapstrategy/one_for_zero.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/x/concentrated-liquidity/swapstrategy/one_for_zero_test.go b/x/concentrated-liquidity/swapstrategy/one_for_zero_test.go index bffae230755..33443a9baf9 100644 --- a/x/concentrated-liquidity/swapstrategy/one_for_zero_test.go +++ b/x/concentrated-liquidity/swapstrategy/one_for_zero_test.go @@ -2,9 +2,9 @@ package swapstrategy_test import ( "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/swapstrategy" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/swapstrategy" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) func (suite *StrategyTestSuite) setupNewOneForZeroSwapStrategy(sqrtPriceLimit osmomath.Dec, spread osmomath.Dec) swapstrategy.SwapStrategy { diff --git a/x/concentrated-liquidity/swapstrategy/spread_rewards_test.go b/x/concentrated-liquidity/swapstrategy/spread_rewards_test.go index 968a90a9958..adb63871b9c 100644 --- a/x/concentrated-liquidity/swapstrategy/spread_rewards_test.go +++ b/x/concentrated-liquidity/swapstrategy/spread_rewards_test.go @@ -3,7 +3,7 @@ package swapstrategy_test import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/swapstrategy" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/swapstrategy" ) var onePercentSpreadFactor = osmomath.NewDecWithPrec(1, 2) diff --git a/x/concentrated-liquidity/swapstrategy/swap_strategy.go b/x/concentrated-liquidity/swapstrategy/swap_strategy.go index 941d17d039f..a2477e88773 100644 --- a/x/concentrated-liquidity/swapstrategy/swap_strategy.go +++ b/x/concentrated-liquidity/swapstrategy/swap_strategy.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/x/concentrated-liquidity/swapstrategy/swap_strategy_test.go b/x/concentrated-liquidity/swapstrategy/swap_strategy_test.go index 3684a0accd8..9bbb574fd22 100644 --- a/x/concentrated-liquidity/swapstrategy/swap_strategy_test.go +++ b/x/concentrated-liquidity/swapstrategy/swap_strategy_test.go @@ -9,10 +9,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/swapstrategy" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/swapstrategy" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) type StrategyTestSuite struct { diff --git a/x/concentrated-liquidity/swapstrategy/zero_for_one.go b/x/concentrated-liquidity/swapstrategy/zero_for_one.go index 58325513e76..6e1565028ec 100644 --- a/x/concentrated-liquidity/swapstrategy/zero_for_one.go +++ b/x/concentrated-liquidity/swapstrategy/zero_for_one.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/x/concentrated-liquidity/swapstrategy/zero_for_one_test.go b/x/concentrated-liquidity/swapstrategy/zero_for_one_test.go index 94a2b572916..77f9517c652 100644 --- a/x/concentrated-liquidity/swapstrategy/zero_for_one_test.go +++ b/x/concentrated-liquidity/swapstrategy/zero_for_one_test.go @@ -2,8 +2,8 @@ package swapstrategy_test import ( "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/swapstrategy" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/swapstrategy" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) var hundredDec = osmomath.NewDec(100) diff --git a/x/concentrated-liquidity/telemetry.go b/x/concentrated-liquidity/telemetry.go index 43246c34e84..d83eeba2911 100644 --- a/x/concentrated-liquidity/telemetry.go +++ b/x/concentrated-liquidity/telemetry.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" "github.com/osmosis-labs/osmosis/osmomath" - types "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + types "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) // emitAccumulatorUpdateTelemetry emits telemetry for accumulator updates diff --git a/x/concentrated-liquidity/tick.go b/x/concentrated-liquidity/tick.go index 296f7a2d07d..2915555fa90 100644 --- a/x/concentrated-liquidity/tick.go +++ b/x/concentrated-liquidity/tick.go @@ -8,10 +8,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/accum" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/math" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types/genesis" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/math" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types/genesis" ) // initOrUpdateTick retrieves the tickInfo from the specified tickIndex and updates both the liquidityNet and LiquidityGross. diff --git a/x/concentrated-liquidity/tick_test.go b/x/concentrated-liquidity/tick_test.go index 9d12d1a5043..e6db5f94528 100644 --- a/x/concentrated-liquidity/tick_test.go +++ b/x/concentrated-liquidity/tick_test.go @@ -9,10 +9,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/accum" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types/genesis" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types/genesis" ) const validPoolId = 1 diff --git a/x/concentrated-liquidity/total_liquidity.go b/x/concentrated-liquidity/total_liquidity.go index e7bcb83402f..8ef9a771576 100644 --- a/x/concentrated-liquidity/total_liquidity.go +++ b/x/concentrated-liquidity/total_liquidity.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) func (k Keeper) GetTotalLiquidity(ctx sdk.Context) (sdk.Coins, error) { diff --git a/x/concentrated-liquidity/types/cl_pool_extensionI.go b/x/concentrated-liquidity/types/cl_pool_extensionI.go index cdba3c56c74..f1977a57c31 100644 --- a/x/concentrated-liquidity/types/cl_pool_extensionI.go +++ b/x/concentrated-liquidity/types/cl_pool_extensionI.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type ConcentratedPoolExtension interface { diff --git a/x/concentrated-liquidity/types/cl_test.go b/x/concentrated-liquidity/types/cl_test.go index 093f3714a11..0ff84a76bbe 100644 --- a/x/concentrated-liquidity/types/cl_test.go +++ b/x/concentrated-liquidity/types/cl_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) func TestGetConcentratedLockupDenomFromPoolId(t *testing.T) { diff --git a/x/concentrated-liquidity/types/expected_keepers.go b/x/concentrated-liquidity/types/expected_keepers.go index 0163403dc9c..a193a3c339f 100644 --- a/x/concentrated-liquidity/types/expected_keepers.go +++ b/x/concentrated-liquidity/types/expected_keepers.go @@ -8,8 +8,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/osmosis-labs/osmosis/osmomath" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type AccountKeeper interface { diff --git a/x/concentrated-liquidity/types/genesis/genesis.go b/x/concentrated-liquidity/types/genesis/genesis.go index 60383a8e799..07195429b7f 100644 --- a/x/concentrated-liquidity/types/genesis/genesis.go +++ b/x/concentrated-liquidity/types/genesis/genesis.go @@ -1,7 +1,7 @@ package genesis import ( - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) // DefaultGenesis returns the default GenesisState for the concentrated-liquidity module. diff --git a/x/concentrated-liquidity/types/genesis/genesis.pb.go b/x/concentrated-liquidity/types/genesis/genesis.pb.go index 0805d235826..6c7776c7bcd 100644 --- a/x/concentrated-liquidity/types/genesis/genesis.pb.go +++ b/x/concentrated-liquidity/types/genesis/genesis.pb.go @@ -10,8 +10,8 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" accum "github.com/osmosis-labs/osmosis/osmoutils/accum" - model "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - types1 "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + model "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + types1 "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" io "io" math "math" math_bits "math/bits" @@ -403,67 +403,67 @@ func init() { } var fileDescriptor_4cdf50d18c43a7c5 = []byte{ - // 947 bytes of a gzipped FileDescriptorProto + // 948 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4d, 0x6f, 0x1b, 0x45, - 0x18, 0xce, 0x26, 0x8e, 0x9b, 0x8c, 0xdd, 0x92, 0x8e, 0x52, 0xb2, 0x0d, 0xaa, 0xd7, 0x4c, 0x89, - 0x94, 0x82, 0xe2, 0xa5, 0x4e, 0x40, 0x02, 0xc1, 0x21, 0x2e, 0x14, 0x19, 0x04, 0x44, 0x43, 0xb8, - 0xf0, 0x65, 0xc6, 0xbb, 0x63, 0x67, 0xe8, 0x7a, 0x67, 0xd9, 0x19, 0x87, 0xf8, 0xca, 0x1d, 0x09, - 0x71, 0xe2, 0x27, 0xf0, 0x03, 0x90, 0x38, 0x73, 0xab, 0x10, 0x87, 0x1e, 0x39, 0xad, 0x50, 0x72, - 0xe0, 0xee, 0x5f, 0x80, 0x76, 0x3e, 0xfc, 0x11, 0x9c, 0xc4, 0xe1, 0x36, 0xe3, 0xf7, 0x7d, 0x9e, - 0xf7, 0x99, 0xf7, 0xcb, 0x0b, 0x76, 0xb9, 0xe8, 0x71, 0xc1, 0x84, 0x1f, 0xf0, 0x38, 0xa0, 0xb1, - 0x4c, 0x89, 0xa4, 0x61, 0xc4, 0xbe, 0xed, 0xb3, 0x90, 0xc9, 0x81, 0x7f, 0xfc, 0xb0, 0x4d, 0x25, - 0x79, 0xe8, 0x77, 0x69, 0x4c, 0x05, 0x13, 0xb5, 0x24, 0xe5, 0x92, 0xc3, 0x2d, 0x03, 0xaa, 0xcd, - 0x04, 0xd5, 0x0c, 0x68, 0x73, 0xbd, 0xcb, 0xbb, 0x5c, 0x21, 0xfc, 0xfc, 0xa4, 0xc1, 0x9b, 0x77, - 0x03, 0x85, 0x6e, 0x69, 0x83, 0xbe, 0x58, 0x53, 0x97, 0xf3, 0x6e, 0x44, 0x7d, 0x75, 0x6b, 0xf7, - 0x3b, 0x3e, 0x89, 0x07, 0xc6, 0xf4, 0xa2, 0xd5, 0x49, 0x82, 0xa0, 0xdf, 0x1b, 0xe9, 0x52, 0x37, - 0xe3, 0xf2, 0xf2, 0xe5, 0x4f, 0x49, 0x48, 0x4a, 0x7a, 0x36, 0xd2, 0xde, 0x7c, 0xcf, 0x4e, 0xb8, - 0x60, 0x92, 0xf1, 0xd8, 0xa0, 0x5e, 0x9b, 0x0f, 0x25, 0x59, 0xf0, 0xa4, 0xc5, 0xe2, 0x8e, 0x7d, - 0xf1, 0x5b, 0xf3, 0xc1, 0x98, 0x32, 0xb2, 0x63, 0xda, 0x4a, 0x69, 0xc0, 0xd3, 0x50, 0xa3, 0xd1, - 0x9f, 0x0e, 0x58, 0x79, 0xdc, 0x8f, 0xa2, 0x43, 0x16, 0x3c, 0x81, 0xaf, 0x80, 0x1b, 0x09, 0xe7, - 0x51, 0x8b, 0x85, 0xae, 0x53, 0x75, 0xb6, 0x0b, 0x0d, 0x38, 0xcc, 0xbc, 0x5b, 0x03, 0xd2, 0x8b, - 0xde, 0x44, 0xc6, 0x80, 0x70, 0x31, 0x3f, 0x35, 0x43, 0xb8, 0x07, 0x80, 0x91, 0x12, 0xd2, 0x13, - 0x77, 0xb1, 0xea, 0x6c, 0x2f, 0x35, 0xee, 0x0c, 0x33, 0xef, 0xb6, 0xf6, 0x1f, 0xdb, 0x10, 0x5e, - 0xcd, 0x2f, 0xcd, 0xfc, 0x0c, 0xbf, 0x04, 0x85, 0x5c, 0xbb, 0xbb, 0x54, 0x75, 0xb6, 0x4b, 0x75, - 0xbf, 0x36, 0x57, 0xad, 0x6b, 0x87, 0x0a, 0xdf, 0xe1, 0x0d, 0xf7, 0x69, 0xe6, 0x2d, 0x0c, 0x33, - 0x6f, 0x6d, 0x2a, 0x48, 0x87, 0x23, 0xac, 0x68, 0xd1, 0x6f, 0x05, 0xb0, 0x72, 0xc0, 0x79, 0xf4, - 0x0e, 0x91, 0x04, 0xee, 0x82, 0x42, 0xae, 0x55, 0xbd, 0xa5, 0x54, 0x5f, 0xaf, 0xe9, 0xfa, 0xd7, - 0x6c, 0xfd, 0x6b, 0xfb, 0xf1, 0xa0, 0xb1, 0xfa, 0xc7, 0xaf, 0x3b, 0xcb, 0x39, 0xa2, 0x89, 0x95, - 0x33, 0xfc, 0x1c, 0x2c, 0xe7, 0xac, 0xc2, 0x5d, 0xac, 0x2e, 0x5d, 0x43, 0xa1, 0xcd, 0x61, 0x63, - 0xdd, 0x28, 0x2c, 0x8f, 0x15, 0x0a, 0x84, 0x35, 0x27, 0xfc, 0xd9, 0x01, 0x77, 0x45, 0x92, 0x52, - 0x12, 0xb6, 0x52, 0xfa, 0x1d, 0x49, 0xc3, 0x96, 0x6a, 0xb1, 0x7e, 0x44, 0x24, 0x4f, 0x4d, 0x4e, - 0xea, 0x73, 0x46, 0xdc, 0xcf, 0x91, 0x1f, 0xb7, 0xbf, 0xa1, 0x81, 0x6c, 0x6c, 0x9b, 0xa0, 0x55, - 0x1d, 0xf4, 0xc2, 0x10, 0x08, 0x6f, 0x68, 0x1b, 0x56, 0xa6, 0xfd, 0xb1, 0x05, 0xfe, 0xe4, 0x80, - 0x8d, 0x51, 0x8f, 0x88, 0x49, 0x90, 0x70, 0x0b, 0x2a, 0x15, 0xff, 0x47, 0xd8, 0x96, 0x11, 0x76, - 0x4f, 0x0b, 0x9b, 0x1d, 0x00, 0xe1, 0xe7, 0xc7, 0x86, 0x09, 0x4d, 0x02, 0x32, 0x70, 0xfb, 0x7c, - 0xdf, 0x0a, 0x77, 0x59, 0xa9, 0x79, 0x7d, 0x4e, 0x35, 0x4d, 0x8b, 0xc7, 0x0a, 0xde, 0x28, 0xe4, - 0x8a, 0xf0, 0x1a, 0x9b, 0xfe, 0x59, 0xa0, 0xdf, 0x17, 0x41, 0xf9, 0xc0, 0x0c, 0xa4, 0xea, 0x9e, - 0x0f, 0xc0, 0x8a, 0x1d, 0x50, 0xd3, 0x41, 0xf3, 0xf6, 0x82, 0xa5, 0xc1, 0x23, 0x82, 0x7c, 0xb2, - 0x22, 0x9e, 0xf7, 0x6a, 0xa8, 0x26, 0x65, 0x6a, 0xb2, 0x8c, 0x01, 0xe1, 0x62, 0x7e, 0x6a, 0x86, - 0xf0, 0x6b, 0xb0, 0x39, 0xa3, 0x82, 0xe6, 0xfd, 0xa6, 0x4b, 0xee, 0x8d, 0xb4, 0xe8, 0x25, 0x65, - 0x63, 0x4f, 0xbd, 0xf2, 0xbf, 0xc5, 0xd6, 0x66, 0xf8, 0x29, 0x58, 0xef, 0x27, 0x92, 0xf5, 0xe8, - 0x14, 0xb5, 0x2d, 0xf4, 0x5c, 0xdc, 0x50, 0x13, 0x4c, 0xb0, 0x0a, 0xf4, 0xcf, 0x32, 0x28, 0xbf, - 0xa7, 0x77, 0xf9, 0x27, 0x92, 0x48, 0x0a, 0x1f, 0x81, 0xa2, 0x5e, 0x8c, 0x26, 0x83, 0x5b, 0x57, - 0x64, 0xf0, 0x40, 0x39, 0x9b, 0x08, 0x06, 0x0a, 0x31, 0x58, 0x55, 0xcb, 0x27, 0x24, 0x92, 0x5c, - 0x73, 0x2a, 0xed, 0x2a, 0x30, 0x8c, 0x2b, 0x89, 0x5d, 0x0d, 0x5f, 0x81, 0x9b, 0xb6, 0x36, 0x9a, - 0x77, 0x49, 0xf1, 0xee, 0x5e, 0xb3, 0xc2, 0x13, 0xdc, 0xe5, 0x64, 0xb2, 0x79, 0xde, 0x05, 0x6b, - 0x31, 0x3d, 0x91, 0xad, 0x51, 0x10, 0x16, 0xba, 0x05, 0x55, 0xf8, 0x17, 0x86, 0x99, 0xb7, 0xa1, - 0x0b, 0x7f, 0xde, 0x03, 0xe1, 0x5b, 0xf9, 0x4f, 0x96, 0xbc, 0x19, 0xc2, 0x2f, 0x80, 0xab, 0x9c, - 0xce, 0x0f, 0x41, 0x4e, 0xb7, 0xac, 0xe8, 0xee, 0x0f, 0x33, 0xcf, 0x9b, 0xa0, 0x9b, 0xe1, 0x89, - 0xf0, 0x9d, 0xdc, 0x74, 0x6e, 0x10, 0x9a, 0x21, 0xfc, 0xc5, 0x01, 0xf5, 0xd9, 0x13, 0xd9, 0x32, - 0xdb, 0xbe, 0xd5, 0x63, 0xdd, 0x94, 0x28, 0x79, 0xf2, 0x28, 0xa5, 0xe2, 0x88, 0x47, 0xa1, 0x5b, - 0x54, 0x81, 0xdf, 0x1e, 0x66, 0xde, 0x1b, 0x97, 0x4d, 0xf5, 0x65, 0x1c, 0x08, 0xef, 0xcc, 0x9c, - 0x78, 0xb5, 0x88, 0xc3, 0x0f, 0x2d, 0xe0, 0xd0, 0xfa, 0xc3, 0x1f, 0x1c, 0xf0, 0xc0, 0xcc, 0x44, - 0x87, 0x04, 0x57, 0x29, 0xbc, 0xa1, 0x14, 0xee, 0x0d, 0x33, 0xef, 0xd5, 0xa9, 0x85, 0x78, 0x35, - 0x14, 0xe1, 0x97, 0xb4, 0xef, 0x63, 0xe5, 0x7a, 0x91, 0x1e, 0xf4, 0xbd, 0x03, 0x4a, 0x13, 0x7b, - 0x0e, 0xde, 0x07, 0x85, 0x98, 0xf4, 0xa8, 0x6a, 0xf3, 0xd5, 0xc6, 0x73, 0xc3, 0xcc, 0x2b, 0x99, - 0xa2, 0x90, 0x1e, 0x45, 0x58, 0x19, 0xe1, 0x47, 0xe0, 0xa6, 0x1e, 0xb7, 0x80, 0xc7, 0x92, 0xc6, - 0x52, 0xad, 0x82, 0x52, 0xfd, 0xc1, 0x05, 0xe3, 0x36, 0x91, 0x97, 0x47, 0x1a, 0x80, 0xcb, 0xca, - 0xc3, 0xdc, 0x1a, 0xe1, 0xd3, 0xd3, 0x8a, 0xf3, 0xec, 0xb4, 0xe2, 0xfc, 0x7d, 0x5a, 0x71, 0x7e, - 0x3c, 0xab, 0x2c, 0x3c, 0x3b, 0xab, 0x2c, 0xfc, 0x75, 0x56, 0x59, 0xf8, 0xec, 0xfd, 0x2e, 0x93, - 0x47, 0xfd, 0x76, 0x2d, 0xe0, 0x3d, 0xdf, 0x90, 0xef, 0x44, 0xa4, 0x2d, 0xec, 0xc5, 0x3f, 0xae, - 0xef, 0xf9, 0x27, 0x53, 0x5f, 0x0c, 0x3b, 0xe3, 0x4f, 0x06, 0x39, 0x48, 0xa8, 0xb0, 0x1f, 0x65, - 0xed, 0xa2, 0xfa, 0xbf, 0xdc, 0xfd, 0x37, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xdf, 0xe6, 0x31, 0xcc, - 0x09, 0x00, 0x00, + 0x18, 0xce, 0x26, 0xb6, 0x9b, 0x8c, 0xdd, 0x92, 0x8e, 0x52, 0xb2, 0x0d, 0xaa, 0xd7, 0x4c, 0x89, + 0x94, 0x82, 0xe2, 0xa5, 0x4e, 0x8a, 0x04, 0x82, 0x43, 0x5c, 0x28, 0x32, 0x08, 0x88, 0x86, 0x70, + 0xe1, 0xcb, 0x8c, 0x77, 0xc7, 0xce, 0xd0, 0xf5, 0x8e, 0xd9, 0x19, 0x87, 0xf8, 0xca, 0x1d, 0x09, + 0x71, 0xe2, 0x27, 0xf0, 0x03, 0x90, 0x38, 0x73, 0xab, 0x10, 0x87, 0x1c, 0x39, 0xad, 0x50, 0x72, + 0xe0, 0xee, 0x5f, 0x80, 0x76, 0x3e, 0xfc, 0x11, 0x9c, 0xc4, 0xe9, 0x6d, 0xc6, 0xef, 0xfb, 0x3c, + 0xef, 0x33, 0xef, 0x97, 0x17, 0xec, 0x70, 0xd1, 0xe5, 0x82, 0x09, 0x3f, 0xe0, 0x71, 0x40, 0x63, + 0x99, 0x10, 0x49, 0xc3, 0x88, 0x7d, 0xd7, 0x67, 0x21, 0x93, 0x03, 0xff, 0xe8, 0x61, 0x8b, 0x4a, + 0xf2, 0xd0, 0xef, 0xd0, 0x98, 0x0a, 0x26, 0xaa, 0xbd, 0x84, 0x4b, 0x0e, 0x37, 0x0d, 0xa8, 0x3a, + 0x13, 0x54, 0x35, 0xa0, 0x8d, 0xb5, 0x0e, 0xef, 0x70, 0x85, 0xf0, 0xb3, 0x93, 0x06, 0x6f, 0xdc, + 0x0d, 0x14, 0xba, 0xa9, 0x0d, 0xfa, 0x62, 0x4d, 0x1d, 0xce, 0x3b, 0x11, 0xf5, 0xd5, 0xad, 0xd5, + 0x6f, 0xfb, 0x24, 0x1e, 0x18, 0xd3, 0xcb, 0x56, 0x27, 0x09, 0x82, 0x7e, 0x77, 0xa4, 0x4b, 0xdd, + 0x8c, 0xcb, 0xab, 0x97, 0x3f, 0xa5, 0x47, 0x12, 0xd2, 0xb5, 0x91, 0x76, 0xe7, 0x7b, 0x76, 0x8f, + 0x0b, 0x26, 0x19, 0x8f, 0x0d, 0xea, 0xd1, 0x7c, 0x28, 0xc9, 0x82, 0xa7, 0x4d, 0x16, 0xb7, 0xed, + 0x8b, 0xdf, 0x9e, 0x0f, 0xc6, 0x94, 0x91, 0x1d, 0xd1, 0x66, 0x42, 0x03, 0x9e, 0x84, 0x1a, 0x8d, + 0xfe, 0x72, 0xc0, 0xf2, 0x93, 0x7e, 0x14, 0x1d, 0xb0, 0xe0, 0x29, 0x7c, 0x0d, 0xdc, 0xe8, 0x71, + 0x1e, 0x35, 0x59, 0xe8, 0x3a, 0x15, 0x67, 0x2b, 0x57, 0x87, 0xc3, 0xd4, 0xbb, 0x35, 0x20, 0xdd, + 0xe8, 0x2d, 0x64, 0x0c, 0x08, 0x17, 0xb2, 0x53, 0x23, 0x84, 0xbb, 0x00, 0x18, 0x29, 0x21, 0x3d, + 0x76, 0x17, 0x2b, 0xce, 0xd6, 0x52, 0xfd, 0xce, 0x30, 0xf5, 0x6e, 0x6b, 0xff, 0xb1, 0x0d, 0xe1, + 0x95, 0xec, 0xd2, 0xc8, 0xce, 0xf0, 0x2b, 0x90, 0xcb, 0xb4, 0xbb, 0x4b, 0x15, 0x67, 0xab, 0x58, + 0xf3, 0xab, 0x73, 0xd5, 0xba, 0x7a, 0xa0, 0xf0, 0x6d, 0x5e, 0x77, 0x9f, 0xa5, 0xde, 0xc2, 0x30, + 0xf5, 0x56, 0xa7, 0x82, 0xb4, 0x39, 0xc2, 0x8a, 0x16, 0xfd, 0x9e, 0x03, 0xcb, 0xfb, 0x9c, 0x47, + 0xef, 0x12, 0x49, 0xe0, 0x0e, 0xc8, 0x65, 0x5a, 0xd5, 0x5b, 0x8a, 0xb5, 0xb5, 0xaa, 0xae, 0x7f, + 0xd5, 0xd6, 0xbf, 0xba, 0x17, 0x0f, 0xea, 0x2b, 0x7f, 0xfe, 0xb6, 0x9d, 0xcf, 0x10, 0x0d, 0xac, + 0x9c, 0xe1, 0x17, 0x20, 0x9f, 0xb1, 0x0a, 0x77, 0xb1, 0xb2, 0x74, 0x0d, 0x85, 0x36, 0x87, 0xf5, + 0x35, 0xa3, 0xb0, 0x34, 0x56, 0x28, 0x10, 0xd6, 0x9c, 0xf0, 0x17, 0x07, 0xdc, 0x15, 0xbd, 0x84, + 0x92, 0xb0, 0x99, 0xd0, 0xef, 0x49, 0x12, 0x36, 0x55, 0x8b, 0xf5, 0x23, 0x22, 0x79, 0x62, 0x72, + 0x52, 0x9b, 0x33, 0xe2, 0x5e, 0x86, 0xfc, 0xa4, 0xf5, 0x2d, 0x0d, 0x64, 0x7d, 0xcb, 0x04, 0xad, + 0xe8, 0xa0, 0x17, 0x86, 0x40, 0x78, 0x5d, 0xdb, 0xb0, 0x32, 0xed, 0x8d, 0x2d, 0xf0, 0x67, 0x07, + 0xac, 0x8f, 0x7a, 0x44, 0x4c, 0x82, 0x84, 0x9b, 0x53, 0xa9, 0x78, 0x1e, 0x61, 0x9b, 0x46, 0xd8, + 0x3d, 0x2d, 0x6c, 0x76, 0x00, 0x84, 0x5f, 0x1c, 0x1b, 0x26, 0x34, 0x09, 0xc8, 0xc0, 0xed, 0xf3, + 0x7d, 0x2b, 0xdc, 0xbc, 0x52, 0xf3, 0xc6, 0x9c, 0x6a, 0x1a, 0x16, 0x8f, 0x15, 0xbc, 0x9e, 0xcb, + 0x14, 0xe1, 0x55, 0x36, 0xfd, 0xb3, 0x40, 0x7f, 0x2c, 0x82, 0xd2, 0xbe, 0x19, 0x48, 0xd5, 0x3d, + 0x1f, 0x82, 0x65, 0x3b, 0xa0, 0xa6, 0x83, 0xe6, 0xed, 0x05, 0x4b, 0x83, 0x47, 0x04, 0xd9, 0x64, + 0x45, 0x3c, 0xeb, 0xd5, 0x50, 0x4d, 0xca, 0xd4, 0x64, 0x19, 0x03, 0xc2, 0x85, 0xec, 0xd4, 0x08, + 0xe1, 0x37, 0x60, 0x63, 0x46, 0x05, 0xcd, 0xfb, 0x4d, 0x97, 0xdc, 0x1b, 0x69, 0xd1, 0x4b, 0xca, + 0xc6, 0x9e, 0x7a, 0xe5, 0xff, 0x8b, 0xad, 0xcd, 0xf0, 0x33, 0xb0, 0xd6, 0xef, 0x49, 0xd6, 0xa5, + 0x53, 0xd4, 0xb6, 0xd0, 0x73, 0x71, 0x43, 0x4d, 0x30, 0xc1, 0x2a, 0xd0, 0xbf, 0x79, 0x50, 0x7a, + 0x5f, 0xef, 0xf2, 0x4f, 0x25, 0x91, 0x14, 0x3e, 0x06, 0x05, 0xbd, 0x18, 0x4d, 0x06, 0x37, 0xaf, + 0xc8, 0xe0, 0xbe, 0x72, 0x36, 0x11, 0x0c, 0x14, 0x62, 0xb0, 0xa2, 0x96, 0x4f, 0x48, 0x24, 0xb9, + 0xe6, 0x54, 0xda, 0x55, 0x60, 0x18, 0x97, 0x7b, 0x76, 0x35, 0x7c, 0x0d, 0x6e, 0xda, 0xda, 0x68, + 0xde, 0x25, 0xc5, 0xbb, 0x73, 0xcd, 0x0a, 0x4f, 0x70, 0x97, 0x7a, 0x93, 0xcd, 0xf3, 0x1e, 0x58, + 0x8d, 0xe9, 0xb1, 0x6c, 0x8e, 0x82, 0xb0, 0xd0, 0xcd, 0xa9, 0xc2, 0xbf, 0x34, 0x4c, 0xbd, 0x75, + 0x5d, 0xf8, 0xf3, 0x1e, 0x08, 0xdf, 0xca, 0x7e, 0xb2, 0xe4, 0x8d, 0x10, 0x7e, 0x09, 0x5c, 0xe5, + 0x74, 0x7e, 0x08, 0x32, 0xba, 0xbc, 0xa2, 0xbb, 0x3f, 0x4c, 0x3d, 0x6f, 0x82, 0x6e, 0x86, 0x27, + 0xc2, 0x77, 0x32, 0xd3, 0xb9, 0x41, 0x68, 0x84, 0xf0, 0x57, 0x07, 0xd4, 0x66, 0x4f, 0x64, 0xd3, + 0x6c, 0xfb, 0x66, 0x97, 0x75, 0x12, 0xa2, 0xe4, 0xc9, 0xc3, 0x84, 0x8a, 0x43, 0x1e, 0x85, 0x6e, + 0x41, 0x05, 0x7e, 0x67, 0x98, 0x7a, 0x6f, 0x5e, 0x36, 0xd5, 0x97, 0x71, 0x20, 0xbc, 0x3d, 0x73, + 0xe2, 0xd5, 0x22, 0x0e, 0x3f, 0xb2, 0x80, 0x03, 0xeb, 0x0f, 0x7f, 0x74, 0xc0, 0x03, 0x33, 0x13, + 0x6d, 0x12, 0x5c, 0xa5, 0xf0, 0x86, 0x52, 0xb8, 0x3b, 0x4c, 0xbd, 0xd7, 0xa7, 0x16, 0xe2, 0xd5, + 0x50, 0x84, 0x5f, 0xd1, 0xbe, 0x4f, 0x94, 0xeb, 0x45, 0x7a, 0xd0, 0x0f, 0x0e, 0x28, 0x4e, 0xec, + 0x39, 0x78, 0x1f, 0xe4, 0x62, 0xd2, 0xa5, 0xaa, 0xcd, 0x57, 0xea, 0x2f, 0x0c, 0x53, 0xaf, 0x68, + 0x8a, 0x42, 0xba, 0x14, 0x61, 0x65, 0x84, 0x1f, 0x83, 0x9b, 0x7a, 0xdc, 0x02, 0x1e, 0x4b, 0x1a, + 0x4b, 0xb5, 0x0a, 0x8a, 0xb5, 0x07, 0x17, 0x8c, 0xdb, 0x44, 0x5e, 0x1e, 0x6b, 0x00, 0x2e, 0x29, + 0x0f, 0x73, 0xab, 0x87, 0xcf, 0x4e, 0xcb, 0xce, 0xc9, 0x69, 0xd9, 0xf9, 0xe7, 0xb4, 0xec, 0xfc, + 0x74, 0x56, 0x5e, 0x38, 0x39, 0x2b, 0x2f, 0xfc, 0x7d, 0x56, 0x5e, 0xf8, 0xfc, 0x83, 0x0e, 0x93, + 0x87, 0xfd, 0x56, 0x35, 0xe0, 0x5d, 0xdf, 0x90, 0x6f, 0x47, 0xa4, 0x25, 0xec, 0xc5, 0x3f, 0xaa, + 0x3d, 0xf2, 0x8f, 0xa7, 0xbe, 0x18, 0xb6, 0xc7, 0x9f, 0x0c, 0x72, 0xd0, 0xa3, 0xc2, 0x7e, 0x94, + 0xb5, 0x0a, 0xea, 0xff, 0x72, 0xe7, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x33, 0x57, 0x0c, + 0xcc, 0x09, 0x00, 0x00, } func (m *FullTick) Marshal() (dAtA []byte, err error) { diff --git a/x/concentrated-liquidity/types/genesis/genesis_test.go b/x/concentrated-liquidity/types/genesis/genesis_test.go index 5cad474f1ec..e43227d1de8 100644 --- a/x/concentrated-liquidity/types/genesis/genesis_test.go +++ b/x/concentrated-liquidity/types/genesis/genesis_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types/genesis" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types/genesis" ) func TestValidateGenesis(t *testing.T) { diff --git a/x/concentrated-liquidity/types/gov.pb.go b/x/concentrated-liquidity/types/gov.pb.go index b3b68e9c2e3..c37a0999bec 100644 --- a/x/concentrated-liquidity/types/gov.pb.go +++ b/x/concentrated-liquidity/types/gov.pb.go @@ -239,38 +239,38 @@ var fileDescriptor_a96adc35f4989ef7 = []byte{ // 548 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0xcd, 0x6e, 0xd3, 0x4c, 0x14, 0xb5, 0x5b, 0x27, 0xdf, 0xc7, 0x24, 0x45, 0xc5, 0x44, 0x6a, 0x68, 0x24, 0x3b, 0xb2, 0x84, - 0x14, 0x16, 0xb5, 0x71, 0x61, 0x15, 0x36, 0x28, 0xad, 0x90, 0x40, 0x5d, 0x54, 0xa6, 0x2b, 0x84, - 0x14, 0x26, 0xe3, 0xc1, 0x1d, 0xc5, 0xf1, 0x75, 0x3d, 0xd3, 0x94, 0xbc, 0x01, 0x12, 0x2c, 0x58, - 0xb2, 0xcc, 0xe3, 0x74, 0xd9, 0x25, 0x62, 0x11, 0xa1, 0x64, 0xc3, 0x96, 0x3c, 0x01, 0xca, 0x4c, - 0x7e, 0x9c, 0x42, 0x25, 0x10, 0x3b, 0xcf, 0xcc, 0x39, 0xe7, 0x9e, 0x73, 0xaf, 0x2f, 0xf2, 0x80, - 0xf7, 0x80, 0x33, 0xee, 0x11, 0x48, 0x08, 0x4d, 0x44, 0x86, 0x05, 0x0d, 0x63, 0x76, 0x76, 0xce, - 0x42, 0x26, 0x06, 0x5e, 0xdf, 0xef, 0x50, 0x81, 0x7d, 0x2f, 0x82, 0xbe, 0x9b, 0x66, 0x20, 0xc0, - 0xbc, 0x3f, 0x27, 0xb8, 0xbf, 0x25, 0xb8, 0x73, 0xc2, 0x6e, 0x25, 0x82, 0x08, 0x24, 0xc3, 0x9b, - 0x7d, 0x29, 0xb2, 0x33, 0xd1, 0x51, 0xe3, 0x20, 0xa3, 0x58, 0xd0, 0x83, 0x1c, 0xfb, 0x68, 0xc1, - 0x3e, 0x06, 0x88, 0xf9, 0x71, 0x06, 0x29, 0x70, 0x1c, 0x9b, 0x15, 0x54, 0x10, 0x4c, 0xc4, 0xb4, - 0xaa, 0xd7, 0xf5, 0xc6, 0xad, 0x40, 0x1d, 0xcc, 0x3a, 0x2a, 0x85, 0x94, 0x93, 0x8c, 0xa5, 0x82, - 0x41, 0x52, 0xdd, 0x90, 0x6f, 0xf9, 0x2b, 0xf3, 0x0c, 0x95, 0x53, 0x80, 0xb8, 0x9d, 0x51, 0x02, - 0x59, 0xc8, 0xab, 0x9b, 0xf5, 0xcd, 0x46, 0x69, 0xdf, 0x77, 0xff, 0xc8, 0xb8, 0x3b, 0xf3, 0x10, - 0x48, 0x66, 0xab, 0x76, 0x39, 0xb2, 0xb5, 0xe9, 0xc8, 0xbe, 0x3b, 0xc0, 0xbd, 0xb8, 0xe9, 0xe4, - 0x45, 0x9d, 0xa0, 0x94, 0x2e, 0x81, 0xbc, 0x59, 0x7e, 0x3f, 0xb4, 0xb5, 0xcf, 0x43, 0x5b, 0xfb, - 0x3e, 0xb4, 0x75, 0xe7, 0x87, 0x8e, 0x6a, 0x27, 0x8c, 0x74, 0x5f, 0xa6, 0x98, 0xb0, 0x24, 0x3a, - 0xa4, 0x24, 0xa3, 0x98, 0xd3, 0x7f, 0x0e, 0xf6, 0x41, 0x47, 0xb6, 0x34, 0xc1, 0xc2, 0xb6, 0x80, - 0xb6, 0x60, 0xa4, 0xdb, 0xe6, 0xaa, 0xc6, 0xb5, 0xb0, 0x4f, 0xff, 0x22, 0xec, 0xf3, 0xf0, 0x04, - 0x72, 0x6e, 0xe7, 0xd9, 0x8d, 0x59, 0xf6, 0x60, 0x37, 0xbd, 0x09, 0x70, 0x3d, 0x73, 0x88, 0xee, - 0xdd, 0x28, 0x66, 0xee, 0xa0, 0xff, 0xe6, 0xbe, 0x65, 0x64, 0x23, 0x28, 0x2a, 0x5d, 0xb3, 0x81, - 0xb6, 0x13, 0x7a, 0xb1, 0x96, 0x44, 0x06, 0x37, 0x82, 0xdb, 0x09, 0xbd, 0xc8, 0x09, 0x35, 0x0d, - 0x59, 0xe5, 0xe3, 0x06, 0x42, 0xab, 0x01, 0x99, 0x0f, 0x50, 0x31, 0xa4, 0x09, 0xf4, 0x1e, 0xaa, - 0x4e, 0xb6, 0xee, 0x4c, 0x47, 0xf6, 0x96, 0x1a, 0x96, 0xba, 0x77, 0x82, 0x39, 0x60, 0x09, 0xf5, - 0x55, 0x63, 0x7f, 0x81, 0xfa, 0x0b, 0xa8, 0x6f, 0x36, 0x51, 0x79, 0xcd, 0xd0, 0xe6, 0xcc, 0x50, - 0x6b, 0x67, 0xf5, 0x23, 0xe4, 0x5f, 0x9d, 0xa0, 0x24, 0x56, 0x36, 0xcd, 0x37, 0x68, 0x8b, 0xa7, - 0x19, 0xc5, 0x61, 0xfb, 0x2d, 0x26, 0x02, 0xb2, 0x6a, 0x41, 0x56, 0x7b, 0x32, 0xeb, 0xe6, 0xd7, - 0x91, 0x5d, 0x23, 0x72, 0x2e, 0x3c, 0xec, 0xba, 0x0c, 0xbc, 0x1e, 0x16, 0xa7, 0xee, 0x11, 0x8d, - 0x30, 0x19, 0x1c, 0x52, 0x32, 0x1d, 0xd9, 0x15, 0xa5, 0xbf, 0xa6, 0xe0, 0x04, 0x65, 0x75, 0x7e, - 0x26, 0x8f, 0xaa, 0x11, 0x2f, 0x8c, 0xff, 0x8d, 0xed, 0x42, 0xeb, 0xf5, 0xe5, 0xd8, 0xd2, 0xaf, - 0xc6, 0x96, 0xfe, 0x6d, 0x6c, 0xe9, 0x9f, 0x26, 0x96, 0x76, 0x35, 0xb1, 0xb4, 0x2f, 0x13, 0x4b, - 0x7b, 0xd5, 0x8a, 0x98, 0x38, 0x3d, 0xef, 0xb8, 0x04, 0x7a, 0x8b, 0x0d, 0xdf, 0x8b, 0x71, 0x87, - 0x2f, 0xd7, 0xbd, 0xbf, 0xff, 0xd8, 0x7b, 0xb7, 0xb6, 0xf4, 0x7b, 0xab, 0xad, 0x17, 0x83, 0x94, - 0xf2, 0x4e, 0x51, 0xee, 0xec, 0xa3, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb1, 0x8f, 0x91, 0x17, + 0x14, 0x16, 0xb5, 0x71, 0x11, 0x9b, 0xb0, 0x41, 0x69, 0x85, 0x04, 0xea, 0xa2, 0x32, 0x5d, 0x21, + 0xa4, 0x30, 0x19, 0x0f, 0xee, 0x28, 0x8e, 0xaf, 0xeb, 0x99, 0xa6, 0xe4, 0x0d, 0x90, 0x60, 0xc1, + 0x92, 0x65, 0x1e, 0xa7, 0xcb, 0x2e, 0x11, 0x8b, 0x08, 0x25, 0x1b, 0xb6, 0xe4, 0x09, 0x50, 0x66, + 0xf2, 0xe3, 0x14, 0x2a, 0x81, 0xd8, 0x79, 0x66, 0xce, 0x39, 0xf7, 0x9c, 0x7b, 0x7d, 0x91, 0x07, + 0xbc, 0x07, 0x9c, 0x71, 0x8f, 0x40, 0x42, 0x68, 0x22, 0x32, 0x2c, 0x68, 0x18, 0xb3, 0xb3, 0x73, + 0x16, 0x32, 0x31, 0xf0, 0xfa, 0x7e, 0x87, 0x0a, 0xec, 0x7b, 0x11, 0xf4, 0xdd, 0x34, 0x03, 0x01, + 0xe6, 0xfd, 0x39, 0xc1, 0xfd, 0x2d, 0xc1, 0x9d, 0x13, 0x76, 0x2b, 0x11, 0x44, 0x20, 0x19, 0xde, + 0xec, 0x4b, 0x91, 0x9d, 0x89, 0x8e, 0x1a, 0x07, 0x19, 0xc5, 0x82, 0x1e, 0xe4, 0xd8, 0x47, 0x0b, + 0xf6, 0x31, 0x40, 0xcc, 0x8f, 0x33, 0x48, 0x81, 0xe3, 0xd8, 0xac, 0xa0, 0x82, 0x60, 0x22, 0xa6, + 0x55, 0xbd, 0xae, 0x37, 0x6e, 0x05, 0xea, 0x60, 0xd6, 0x51, 0x29, 0xa4, 0x9c, 0x64, 0x2c, 0x15, + 0x0c, 0x92, 0xea, 0x86, 0x7c, 0xcb, 0x5f, 0x99, 0x67, 0xa8, 0x9c, 0x02, 0xc4, 0xed, 0x8c, 0x12, + 0xc8, 0x42, 0x5e, 0xdd, 0xac, 0x6f, 0x36, 0x4a, 0xfb, 0xbe, 0xfb, 0x47, 0xc6, 0xdd, 0x99, 0x87, + 0x40, 0x32, 0x5b, 0xb5, 0xcb, 0x91, 0xad, 0x4d, 0x47, 0xf6, 0xdd, 0x01, 0xee, 0xc5, 0x4d, 0x27, + 0x2f, 0xea, 0x04, 0xa5, 0x74, 0x09, 0xe4, 0xcd, 0xf2, 0xfb, 0xa1, 0xad, 0x7d, 0x1e, 0xda, 0xda, + 0xf7, 0xa1, 0xad, 0x3b, 0x3f, 0x74, 0x54, 0x3b, 0x61, 0xa4, 0xfb, 0x32, 0xc5, 0x84, 0x25, 0xd1, + 0x21, 0x25, 0x19, 0xc5, 0x9c, 0xfe, 0x73, 0xb0, 0x0f, 0x3a, 0xb2, 0xa5, 0x09, 0x16, 0xb6, 0x05, + 0xb4, 0x05, 0x23, 0xdd, 0x36, 0x57, 0x35, 0xae, 0x85, 0x7d, 0xfa, 0x17, 0x61, 0x9f, 0x87, 0x27, + 0x90, 0x73, 0x3b, 0xcf, 0x6e, 0xcc, 0xb2, 0x07, 0xbb, 0xe9, 0x4d, 0x80, 0xeb, 0x99, 0x43, 0x74, + 0xef, 0x46, 0x31, 0x73, 0x07, 0xfd, 0x37, 0xf7, 0x2d, 0x23, 0x1b, 0x41, 0x51, 0xe9, 0x9a, 0x0d, + 0xb4, 0x9d, 0xd0, 0x8b, 0xb5, 0x24, 0x32, 0xb8, 0x11, 0xdc, 0x4e, 0xe8, 0x45, 0x4e, 0xa8, 0x69, + 0xc8, 0x2a, 0x1f, 0x37, 0x10, 0x5a, 0x0d, 0xc8, 0x7c, 0x80, 0x8a, 0x21, 0x4d, 0xa0, 0xf7, 0x50, + 0x75, 0xb2, 0x75, 0x67, 0x3a, 0xb2, 0xb7, 0xd4, 0xb0, 0xd4, 0xbd, 0x13, 0xcc, 0x01, 0x4b, 0xa8, + 0xaf, 0x1a, 0xfb, 0x0b, 0xd4, 0x5f, 0x40, 0x7d, 0xb3, 0x89, 0xca, 0x6b, 0x86, 0x36, 0x67, 0x86, + 0x5a, 0x3b, 0xab, 0x1f, 0x21, 0xff, 0xea, 0x04, 0x25, 0xb1, 0xb2, 0x69, 0xbe, 0x41, 0x5b, 0x3c, + 0xcd, 0x28, 0x0e, 0xdb, 0x6f, 0x31, 0x11, 0x90, 0x55, 0x0b, 0xb2, 0xda, 0x93, 0x59, 0x37, 0xbf, + 0x8e, 0xec, 0x1a, 0x91, 0x73, 0xe1, 0x61, 0xd7, 0x65, 0xe0, 0xf5, 0xb0, 0x38, 0x75, 0x8f, 0x68, + 0x84, 0xc9, 0xe0, 0x90, 0x92, 0xe9, 0xc8, 0xae, 0x28, 0xfd, 0x35, 0x05, 0x27, 0x28, 0xab, 0xf3, + 0x33, 0x79, 0x54, 0x8d, 0x78, 0x61, 0xfc, 0x6f, 0x6c, 0x17, 0x5a, 0xaf, 0x2f, 0xc7, 0x96, 0x7e, + 0x35, 0xb6, 0xf4, 0x6f, 0x63, 0x4b, 0xff, 0x34, 0xb1, 0xb4, 0xab, 0x89, 0xa5, 0x7d, 0x99, 0x58, + 0xda, 0xab, 0x56, 0xc4, 0xc4, 0xe9, 0x79, 0xc7, 0x25, 0xd0, 0x5b, 0x6c, 0xf8, 0x5e, 0x8c, 0x3b, + 0x7c, 0xb9, 0xee, 0xfd, 0xfd, 0xc7, 0xde, 0xbb, 0xb5, 0xa5, 0xdf, 0x5b, 0x6d, 0xbd, 0x18, 0xa4, + 0x94, 0x77, 0x8a, 0x72, 0x67, 0x1f, 0xfd, 0x0c, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x1d, 0xd5, 0xb8, 0x23, 0x04, 0x00, 0x00, } diff --git a/x/concentrated-liquidity/types/gov_test.go b/x/concentrated-liquidity/types/gov_test.go index 664fd2fdde1..13980f3dea3 100644 --- a/x/concentrated-liquidity/types/gov_test.go +++ b/x/concentrated-liquidity/types/gov_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) func TestCreateConcentratedLiquidityPoolsProposalMarshalUnmarshal(t *testing.T) { diff --git a/x/concentrated-liquidity/types/incentive_record.pb.go b/x/concentrated-liquidity/types/incentive_record.pb.go index 2d6ef000754..49ff92c5e98 100644 --- a/x/concentrated-liquidity/types/incentive_record.pb.go +++ b/x/concentrated-liquidity/types/incentive_record.pb.go @@ -175,42 +175,42 @@ func init() { } var fileDescriptor_bef31b586e827443 = []byte{ - // 557 bytes of a gzipped FileDescriptorProto + // 558 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x4f, 0x6f, 0xd3, 0x30, 0x18, 0xc6, 0x9b, 0x32, 0x86, 0xe6, 0x6e, 0x20, 0xd2, 0xc1, 0x4a, 0x19, 0xc9, 0x14, 0x81, 0x34, - 0x21, 0xd5, 0xd6, 0x0a, 0xa7, 0xc2, 0x29, 0xf4, 0x52, 0x69, 0xa7, 0x08, 0x04, 0x42, 0x48, 0xc1, - 0x89, 0x4d, 0x66, 0xad, 0x89, 0x4b, 0xec, 0x56, 0xe4, 0x5b, 0x0c, 0x89, 0x03, 0x9f, 0x81, 0x4f, - 0xb2, 0xe3, 0x4e, 0x08, 0x71, 0xe8, 0x50, 0x2b, 0xbe, 0x40, 0x3f, 0x01, 0xb2, 0x93, 0xf4, 0xdf, - 0x76, 0xe0, 0xd4, 0xbe, 0x79, 0xfd, 0xbc, 0xcf, 0xe3, 0xdf, 0x9b, 0x80, 0x97, 0x5c, 0xc4, 0x5c, - 0x30, 0x81, 0x42, 0x9e, 0x84, 0x34, 0x91, 0x29, 0x96, 0x94, 0xf4, 0xd9, 0xe7, 0x21, 0x23, 0x4c, - 0x66, 0x68, 0x74, 0x14, 0x50, 0x89, 0x8f, 0x10, 0xd3, 0x4d, 0x36, 0xa2, 0x7e, 0x4a, 0x43, 0x9e, - 0x12, 0x38, 0x48, 0xb9, 0xe4, 0xe6, 0x93, 0x42, 0x0d, 0xaf, 0x55, 0xc3, 0x42, 0xdd, 0xdc, 0x8d, - 0x78, 0xc4, 0xb5, 0x02, 0xa9, 0x7f, 0xb9, 0xb8, 0x69, 0x47, 0x9c, 0x47, 0x7d, 0x8a, 0x74, 0x15, - 0x0c, 0x3f, 0x21, 0xc9, 0x62, 0x2a, 0x24, 0x8e, 0x07, 0xc5, 0x01, 0x6b, 0xfd, 0x00, 0x19, 0xa6, - 0x58, 0x32, 0x9e, 0x94, 0xfd, 0x50, 0xdb, 0xa3, 0x00, 0x0b, 0x3a, 0x4f, 0x1a, 0x72, 0x56, 0xf4, - 0x9d, 0x9f, 0x55, 0x70, 0xa7, 0x57, 0x06, 0xf7, 0x74, 0x6e, 0xb3, 0x03, 0xb6, 0x17, 0x77, 0x61, - 0xa4, 0x61, 0x1c, 0x18, 0x87, 0x1b, 0xee, 0xde, 0x6c, 0x6c, 0xd7, 0x33, 0x1c, 0xf7, 0x3b, 0xce, - 0x72, 0xd7, 0xf1, 0x6a, 0xf3, 0xb2, 0x47, 0xcc, 0x3d, 0x70, 0x6b, 0xc0, 0x79, 0x5f, 0xc9, 0xaa, - 0x4a, 0xe6, 0x6d, 0xaa, 0xb2, 0x47, 0xcc, 0x6f, 0x06, 0xb8, 0xb7, 0x4e, 0xc8, 0x0f, 0x38, 0xc9, - 0x1a, 0x1b, 0x07, 0xc6, 0x61, 0xad, 0xdd, 0x81, 0xff, 0xc5, 0x09, 0xae, 0x85, 0x75, 0x39, 0xc9, - 0xdc, 0xc7, 0xe7, 0x63, 0xbb, 0x32, 0x1b, 0xdb, 0xfb, 0xeb, 0xf1, 0x96, 0x6c, 0x1c, 0xaf, 0xce, - 0xae, 0x4a, 0xcd, 0xb7, 0x00, 0xc4, 0x2c, 0xf1, 0x87, 0x03, 0x05, 0xb6, 0x71, 0x53, 0x47, 0x79, - 0x00, 0x73, 0xa8, 0xb0, 0x84, 0x0a, 0xbb, 0x05, 0x54, 0xf7, 0x51, 0xe1, 0x74, 0x37, 0x77, 0x5a, - 0x48, 0x9d, 0xef, 0x97, 0xb6, 0xe1, 0x6d, 0xc5, 0x2c, 0x79, 0x93, 0xd7, 0x7f, 0xab, 0xa0, 0x7e, - 0x4d, 0x56, 0xf3, 0xab, 0x01, 0x6e, 0xa7, 0x34, 0xc6, 0x2c, 0x61, 0x49, 0xe4, 0xab, 0x4d, 0x68, - 0xbe, 0xb5, 0xf6, 0x3e, 0xcc, 0x57, 0x05, 0xd5, 0xaa, 0xe6, 0xd7, 0xed, 0xd2, 0xf0, 0x15, 0x67, - 0x89, 0x7b, 0x5c, 0x18, 0xdf, 0xcf, 0x8d, 0x57, 0x27, 0x08, 0xe7, 0xc7, 0xa5, 0xfd, 0x34, 0x62, - 0xf2, 0x64, 0x18, 0xc0, 0x90, 0xc7, 0xa8, 0x58, 0x7a, 0xfe, 0xd3, 0x12, 0xe4, 0x14, 0xc9, 0x6c, - 0x40, 0x45, 0x39, 0xcd, 0xdb, 0x99, 0xeb, 0x55, 0x69, 0x7e, 0x04, 0x3b, 0x34, 0x66, 0x42, 0x30, - 0x9e, 0xf8, 0x0a, 0xbb, 0x5e, 0xdd, 0x96, 0xfb, 0x42, 0x79, 0xfe, 0x1e, 0xdb, 0x0f, 0xf3, 0x39, - 0x82, 0x9c, 0x42, 0xc6, 0x51, 0x8c, 0xe5, 0x09, 0x3c, 0xa6, 0x11, 0x0e, 0xb3, 0x2e, 0x0d, 0x67, - 0x63, 0x7b, 0x37, 0x8f, 0xb4, 0x32, 0xc1, 0xf1, 0xb6, 0xcb, 0xda, 0xc3, 0x92, 0x9a, 0xef, 0x00, - 0x10, 0x12, 0xa7, 0xd2, 0xd7, 0x98, 0x6f, 0xe8, 0x0b, 0x37, 0xaf, 0x60, 0x7e, 0x5d, 0xbe, 0xdc, - 0xeb, 0x9c, 0x17, 0x5a, 0xe7, 0x4c, 0x73, 0xd6, 0x0f, 0xd4, 0x71, 0xf7, 0xc3, 0xf9, 0xc4, 0x32, - 0x2e, 0x26, 0x96, 0xf1, 0x67, 0x62, 0x19, 0x67, 0x53, 0xab, 0x72, 0x31, 0xb5, 0x2a, 0xbf, 0xa6, - 0x56, 0xe5, 0xbd, 0xbb, 0x04, 0xa4, 0x78, 0xb7, 0x5a, 0x7d, 0x1c, 0x88, 0xb2, 0x40, 0xa3, 0xf6, - 0x73, 0xf4, 0x65, 0xe5, 0xa3, 0x6e, 0x2d, 0xbe, 0x6a, 0x0d, 0x2c, 0xd8, 0xd4, 0xd9, 0x9e, 0xfd, - 0x0b, 0x00, 0x00, 0xff, 0xff, 0x71, 0x26, 0x32, 0x72, 0x03, 0x04, 0x00, 0x00, + 0x21, 0xd5, 0xd6, 0x8a, 0xb8, 0x14, 0x4e, 0xa1, 0x97, 0x4a, 0x3b, 0x45, 0x20, 0x10, 0x42, 0x0a, + 0x4e, 0x6c, 0x32, 0x6b, 0x4d, 0x5c, 0x62, 0xb7, 0x22, 0xdf, 0x62, 0x48, 0x1c, 0xf8, 0x0c, 0x7c, + 0x92, 0x1d, 0x77, 0x42, 0x88, 0x43, 0x87, 0x5a, 0xf1, 0x05, 0xfa, 0x09, 0x90, 0x9d, 0xa4, 0xff, + 0xb6, 0x03, 0xa7, 0xf6, 0xcd, 0xeb, 0xe7, 0x7d, 0x1e, 0xff, 0xde, 0x04, 0xbc, 0xe4, 0x22, 0xe6, + 0x82, 0x09, 0x14, 0xf2, 0x24, 0xa4, 0x89, 0x4c, 0xb1, 0xa4, 0xa4, 0xcf, 0x3e, 0x0f, 0x19, 0x61, + 0x32, 0x43, 0xa3, 0xa3, 0x80, 0x4a, 0x7c, 0x84, 0x98, 0x6e, 0xb2, 0x11, 0xf5, 0x53, 0x1a, 0xf2, + 0x94, 0xc0, 0x41, 0xca, 0x25, 0x37, 0x9f, 0x14, 0x6a, 0x78, 0xad, 0x1a, 0x16, 0xea, 0xe6, 0x6e, + 0xc4, 0x23, 0xae, 0x15, 0x48, 0xfd, 0xcb, 0xc5, 0x4d, 0x3b, 0xe2, 0x3c, 0xea, 0x53, 0xa4, 0xab, + 0x60, 0xf8, 0x09, 0x49, 0x16, 0x53, 0x21, 0x71, 0x3c, 0x28, 0x0e, 0x58, 0xeb, 0x07, 0xc8, 0x30, + 0xc5, 0x92, 0xf1, 0xa4, 0xec, 0x87, 0xda, 0x1e, 0x05, 0x58, 0xd0, 0x79, 0xd2, 0x90, 0xb3, 0xa2, + 0xef, 0xfc, 0xac, 0x82, 0x3b, 0xbd, 0x32, 0xb8, 0xa7, 0x73, 0x9b, 0x1d, 0xb0, 0xbd, 0xb8, 0x0b, + 0x23, 0x0d, 0xe3, 0xc0, 0x38, 0xdc, 0x70, 0xf7, 0x66, 0x63, 0xbb, 0x9e, 0xe1, 0xb8, 0xdf, 0x71, + 0x96, 0xbb, 0x8e, 0x57, 0x9b, 0x97, 0x3d, 0x62, 0xee, 0x81, 0x5b, 0x03, 0xce, 0xfb, 0x4a, 0x56, + 0x55, 0x32, 0x6f, 0x53, 0x95, 0x3d, 0x62, 0x7e, 0x33, 0xc0, 0xbd, 0x75, 0x42, 0x7e, 0xc0, 0x49, + 0xd6, 0xd8, 0x38, 0x30, 0x0e, 0x6b, 0xed, 0x0e, 0xfc, 0x2f, 0x4e, 0x70, 0x2d, 0xac, 0xcb, 0x49, + 0xe6, 0x3e, 0x3e, 0x1f, 0xdb, 0x95, 0xd9, 0xd8, 0xde, 0x5f, 0x8f, 0xb7, 0x64, 0xe3, 0x78, 0x75, + 0x76, 0x55, 0x6a, 0xbe, 0x05, 0x20, 0x66, 0x89, 0x3f, 0x1c, 0x28, 0xb0, 0x8d, 0x9b, 0x3a, 0xca, + 0x03, 0x98, 0x43, 0x85, 0x25, 0x54, 0xd8, 0x2d, 0xa0, 0xba, 0x8f, 0x0a, 0xa7, 0xbb, 0xb9, 0xd3, + 0x42, 0xea, 0x7c, 0xbf, 0xb4, 0x0d, 0x6f, 0x2b, 0x66, 0xc9, 0x9b, 0xbc, 0xfe, 0x5b, 0x05, 0xf5, + 0x6b, 0xb2, 0x9a, 0x5f, 0x0d, 0x70, 0x3b, 0xa5, 0x31, 0x66, 0x09, 0x4b, 0x22, 0x5f, 0x6d, 0x42, + 0xf3, 0xad, 0xb5, 0xf7, 0x61, 0xbe, 0x2a, 0xa8, 0x56, 0x35, 0xbf, 0x6e, 0x97, 0x86, 0xaf, 0x38, + 0x4b, 0xdc, 0xe3, 0xc2, 0xf8, 0x7e, 0x6e, 0xbc, 0x3a, 0x41, 0x38, 0x3f, 0x2e, 0xed, 0xa7, 0x11, + 0x93, 0x27, 0xc3, 0x00, 0x86, 0x3c, 0x46, 0xc5, 0xd2, 0xf3, 0x9f, 0x96, 0x20, 0xa7, 0x48, 0x66, + 0x03, 0x2a, 0xca, 0x69, 0xde, 0xce, 0x5c, 0xaf, 0x4a, 0xf3, 0x23, 0xd8, 0xa1, 0x31, 0x13, 0x82, + 0xf1, 0xc4, 0x57, 0xd8, 0xf5, 0xea, 0xb6, 0xdc, 0x17, 0xca, 0xf3, 0xf7, 0xd8, 0x7e, 0x98, 0xcf, + 0x11, 0xe4, 0x14, 0x32, 0x8e, 0x62, 0x2c, 0x4f, 0xe0, 0x31, 0x8d, 0x70, 0x98, 0x75, 0x69, 0x38, + 0x1b, 0xdb, 0xbb, 0x79, 0xa4, 0x95, 0x09, 0x8e, 0xb7, 0x5d, 0xd6, 0x1e, 0x96, 0xd4, 0x7c, 0x07, + 0x80, 0x90, 0x38, 0x95, 0xbe, 0xc6, 0x7c, 0x43, 0x5f, 0xb8, 0x79, 0x05, 0xf3, 0xeb, 0xf2, 0xe5, + 0x5e, 0xe7, 0xbc, 0xd0, 0x3a, 0x67, 0x9a, 0xb3, 0x7e, 0xa0, 0x8e, 0xbb, 0x1f, 0xce, 0x27, 0x96, + 0x71, 0x31, 0xb1, 0x8c, 0x3f, 0x13, 0xcb, 0x38, 0x9b, 0x5a, 0x95, 0x8b, 0xa9, 0x55, 0xf9, 0x35, + 0xb5, 0x2a, 0xef, 0xdd, 0x25, 0x20, 0xc5, 0xbb, 0xd5, 0xea, 0xe3, 0x40, 0x94, 0x05, 0x1a, 0xb5, + 0x9f, 0xa3, 0x2f, 0x2b, 0x1f, 0x75, 0x6b, 0xf1, 0x55, 0x6b, 0x60, 0xc1, 0xa6, 0xce, 0xf6, 0xec, + 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36, 0xb4, 0x76, 0xdd, 0x03, 0x04, 0x00, 0x00, } func (m *IncentiveRecord) Marshal() (dAtA []byte, err error) { diff --git a/x/concentrated-liquidity/types/keys_test.go b/x/concentrated-liquidity/types/keys_test.go index 8544188e3d6..df95bd56aca 100644 --- a/x/concentrated-liquidity/types/keys_test.go +++ b/x/concentrated-liquidity/types/keys_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmoutils/accum" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) // TestReverseRelationTickIndexToBytes tests if TickIndexToBytes and TickIndexFromBytes diff --git a/x/concentrated-liquidity/types/msgs_test.go b/x/concentrated-liquidity/types/msgs_test.go index 91fb1af6912..f83478e91e6 100644 --- a/x/concentrated-liquidity/types/msgs_test.go +++ b/x/concentrated-liquidity/types/msgs_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) type extMsg interface { diff --git a/x/concentrated-liquidity/types/params.pb.go b/x/concentrated-liquidity/types/params.pb.go index 98323aef16e..26eb173ca09 100644 --- a/x/concentrated-liquidity/types/params.pb.go +++ b/x/concentrated-liquidity/types/params.pb.go @@ -152,44 +152,44 @@ var fileDescriptor_42a3f6981164624c = []byte{ // 633 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xcf, 0x6b, 0xd4, 0x5a, 0x14, 0xc7, 0x27, 0x6f, 0xfa, 0xfa, 0x23, 0xef, 0xf1, 0xe0, 0x05, 0x8b, 0x99, 0xaa, 0x49, 0x48, - 0x41, 0x87, 0x62, 0x13, 0xa8, 0xae, 0x74, 0x21, 0xc4, 0xd1, 0x6e, 0x2a, 0xd4, 0x54, 0x11, 0x8a, - 0x70, 0xb9, 0x73, 0x73, 0x9b, 0xb9, 0x4c, 0x92, 0x93, 0xde, 0x73, 0x63, 0x1d, 0xc1, 0x95, 0x08, - 0x2e, 0x5d, 0xb8, 0xf0, 0xcf, 0xf0, 0xcf, 0xe8, 0xb2, 0x4b, 0x71, 0x11, 0xa5, 0xdd, 0xb9, 0x9c, - 0xbf, 0x40, 0x26, 0x99, 0xb1, 0x33, 0xb6, 0x62, 0x77, 0xb9, 0xe7, 0xfb, 0x39, 0x3f, 0xf2, 0xe5, - 0x70, 0xf4, 0x35, 0xc0, 0x14, 0x50, 0xa0, 0xcf, 0x20, 0x63, 0x3c, 0x53, 0x92, 0x2a, 0x1e, 0x25, - 0x62, 0xbf, 0x10, 0x91, 0x50, 0x03, 0x3f, 0xa7, 0x92, 0xa6, 0xe8, 0xe5, 0x12, 0x14, 0x18, 0xd7, - 0xc6, 0xac, 0x77, 0x2e, 0xbb, 0x72, 0x29, 0x86, 0x18, 0x2a, 0xd2, 0x1f, 0x7d, 0xd5, 0x49, 0x2b, - 0x56, 0x0c, 0x10, 0x27, 0xdc, 0xaf, 0x5e, 0xdd, 0x62, 0xcf, 0x8f, 0x0a, 0x49, 0x95, 0x80, 0xac, - 0xd6, 0xdd, 0x4f, 0x0b, 0xfa, 0xfc, 0x76, 0xd5, 0xc5, 0xd8, 0xd5, 0x2f, 0xd3, 0x42, 0xf5, 0x40, - 0x8a, 0x57, 0x3c, 0x22, 0x4a, 0xb0, 0x3e, 0xc1, 0x9c, 0x32, 0x91, 0xc5, 0xa6, 0xe6, 0x34, 0xdb, - 0x73, 0x81, 0x3b, 0x2c, 0x6d, 0x6b, 0x40, 0xd3, 0xe4, 0x8e, 0xfb, 0x1b, 0xd0, 0x0d, 0x97, 0x4f, - 0x95, 0x27, 0x82, 0xf5, 0x77, 0xea, 0xb8, 0xf1, 0x46, 0xd3, 0x5b, 0x53, 0x39, 0x98, 0x4b, 0x4e, - 0x23, 0xb2, 0x47, 0x99, 0x02, 0x89, 0xe6, 0x5f, 0x4e, 0xb3, 0xbd, 0x14, 0x6c, 0x1e, 0x96, 0x76, - 0xe3, 0x4b, 0x69, 0x5f, 0x61, 0xd5, 0x8f, 0x62, 0xd4, 0xf7, 0x04, 0xf8, 0x29, 0x55, 0x3d, 0x6f, - 0x8b, 0xc7, 0x94, 0x0d, 0x3a, 0x9c, 0x0d, 0x4b, 0xdb, 0x39, 0x33, 0xc1, 0x6c, 0x35, 0x37, 0x9c, - 0xfa, 0x8d, 0x9d, 0x4a, 0x7a, 0x58, 0x2b, 0xc6, 0x07, 0x4d, 0xb7, 0xbb, 0x34, 0xa1, 0x19, 0xe3, - 0x92, 0x60, 0x8f, 0x4a, 0x8e, 0x44, 0xf2, 0x03, 0x2a, 0x23, 0x12, 0x09, 0x64, 0x50, 0x64, 0xca, - 0x6c, 0x3a, 0x5a, 0x7b, 0x29, 0x78, 0x74, 0xb1, 0x59, 0xae, 0xd7, 0xb3, 0xfc, 0xa1, 0xa6, 0x1b, - 0x5e, 0x9d, 0x10, 0x3b, 0x15, 0x10, 0x56, 0x7a, 0x67, 0x2c, 0xff, 0x62, 0xfc, 0x7e, 0x01, 0x8a, - 0x93, 0x88, 0x67, 0x90, 0xa2, 0x39, 0x57, 0x39, 0x73, 0xbe, 0xf1, 0xd3, 0xe0, 0x8c, 0xf1, 0x8f, - 0x47, 0x42, 0xa7, 0x8a, 0x1b, 0x6f, 0x35, 0xdd, 0x98, 0xca, 0x29, 0x72, 0x25, 0x52, 0x8e, 0xe6, - 0xdf, 0x4e, 0xb3, 0xfd, 0xcf, 0x46, 0xcb, 0xab, 0xb7, 0xc3, 0x9b, 0x6c, 0x87, 0xd7, 0x19, 0x6f, - 0x47, 0x70, 0x77, 0x64, 0xc0, 0xf7, 0xd2, 0x36, 0x26, 0xfb, 0x72, 0x13, 0x52, 0xa1, 0x78, 0x9a, - 0xab, 0xc1, 0xb0, 0xb4, 0x5b, 0x67, 0x86, 0x19, 0x17, 0x76, 0x3f, 0x7e, 0xb5, 0xb5, 0xf0, 0xff, - 0x53, 0xe1, 0x69, 0x1d, 0x37, 0xde, 0x69, 0xfa, 0x0d, 0x81, 0x24, 0xe7, 0x32, 0x15, 0x88, 0x02, - 0xb2, 0x84, 0x23, 0x92, 0x1c, 0x20, 0x21, 0x4c, 0xf2, 0xaa, 0x03, 0xe1, 0x19, 0xed, 0x26, 0x3c, - 0x32, 0xe7, 0x1d, 0xad, 0xbd, 0x18, 0x6c, 0x0c, 0x4b, 0xdb, 0xab, 0xfb, 0x5c, 0x30, 0xd1, 0x0d, - 0x57, 0x05, 0x6e, 0xcf, 0x80, 0xdb, 0x00, 0xc9, 0xfd, 0x31, 0xf6, 0xa0, 0xa6, 0x8c, 0xd7, 0xfa, - 0x6a, 0x91, 0x49, 0x8e, 0x4a, 0x0a, 0xa6, 0x78, 0x34, 0x55, 0x0b, 0x24, 0x39, 0xe8, 0x09, 0xc5, - 0x13, 0x81, 0xca, 0x5c, 0xa8, 0xac, 0xf7, 0x86, 0xa5, 0xbd, 0x56, 0x4f, 0x71, 0x81, 0x24, 0x37, - 0x74, 0xa6, 0xa9, 0x9f, 0xdd, 0x41, 0x3e, 0x9b, 0x20, 0xc6, 0x3d, 0xfd, 0xbf, 0x1e, 0x40, 0x9f, - 0xc4, 0x14, 0x49, 0x22, 0x52, 0xa1, 0xcc, 0x45, 0x47, 0x6b, 0xcf, 0x05, 0xad, 0x61, 0x69, 0x2f, - 0xd7, 0x9d, 0x66, 0x75, 0x37, 0xfc, 0x77, 0x14, 0xd8, 0xa4, 0xb8, 0x35, 0x7a, 0x06, 0xcf, 0x0f, - 0x8f, 0x2d, 0xed, 0xe8, 0xd8, 0xd2, 0xbe, 0x1d, 0x5b, 0xda, 0xfb, 0x13, 0xab, 0x71, 0x74, 0x62, - 0x35, 0x3e, 0x9f, 0x58, 0x8d, 0xdd, 0x20, 0x16, 0xaa, 0x57, 0x74, 0x3d, 0x06, 0xa9, 0x3f, 0x3e, - 0x16, 0xeb, 0x09, 0xed, 0xe2, 0xe4, 0xe1, 0xbf, 0xd8, 0xb8, 0xed, 0xbf, 0x9c, 0xb9, 0x35, 0xeb, - 0xa7, 0xc7, 0x46, 0x0d, 0x72, 0x8e, 0xdd, 0xf9, 0x6a, 0x17, 0x6e, 0xfd, 0x08, 0x00, 0x00, 0xff, - 0xff, 0x75, 0x93, 0x76, 0xf7, 0x9a, 0x04, 0x00, 0x00, + 0x41, 0x87, 0x62, 0x13, 0xa8, 0xb8, 0xd1, 0x85, 0x10, 0x47, 0xbb, 0xa9, 0x50, 0x53, 0x45, 0x28, + 0xc2, 0xe5, 0xce, 0xcd, 0x6d, 0xe6, 0x32, 0x49, 0x4e, 0x7a, 0xcf, 0x8d, 0x75, 0x04, 0x57, 0x22, + 0xb8, 0x74, 0xe1, 0xc2, 0x3f, 0xc3, 0x3f, 0xa3, 0xcb, 0x2e, 0xc5, 0x45, 0x94, 0x76, 0xe7, 0x72, + 0xfe, 0x02, 0x99, 0x64, 0xc6, 0xce, 0xd8, 0x8a, 0xdd, 0xe5, 0x9e, 0xef, 0xe7, 0xfc, 0xc8, 0x97, + 0xc3, 0xd1, 0xd7, 0x00, 0x53, 0x40, 0x81, 0x3e, 0x83, 0x8c, 0xf1, 0x4c, 0x49, 0xaa, 0x78, 0x94, + 0x88, 0xfd, 0x42, 0x44, 0x42, 0x0d, 0xfc, 0x9c, 0x4a, 0x9a, 0xa2, 0x97, 0x4b, 0x50, 0x60, 0x5c, + 0x1b, 0xb3, 0xde, 0xb9, 0xec, 0xca, 0xa5, 0x18, 0x62, 0xa8, 0x48, 0x7f, 0xf4, 0x55, 0x27, 0xad, + 0x58, 0x31, 0x40, 0x9c, 0x70, 0xbf, 0x7a, 0x75, 0x8b, 0x3d, 0x3f, 0x2a, 0x24, 0x55, 0x02, 0xb2, + 0x5a, 0x77, 0x3f, 0x2d, 0xe8, 0xf3, 0xdb, 0x55, 0x17, 0x63, 0x57, 0xbf, 0x4c, 0x0b, 0xd5, 0x03, + 0x29, 0x5e, 0xf1, 0x88, 0x28, 0xc1, 0xfa, 0x04, 0x73, 0xca, 0x44, 0x16, 0x9b, 0x9a, 0xd3, 0x6c, + 0xcf, 0x05, 0xee, 0xb0, 0xb4, 0xad, 0x01, 0x4d, 0x93, 0x3b, 0xee, 0x6f, 0x40, 0x37, 0x5c, 0x3e, + 0x55, 0x9e, 0x08, 0xd6, 0xdf, 0xa9, 0xe3, 0xc6, 0x1b, 0x4d, 0x6f, 0x4d, 0xe5, 0x60, 0x2e, 0x39, + 0x8d, 0xc8, 0x1e, 0x65, 0x0a, 0x24, 0x9a, 0x7f, 0x39, 0xcd, 0xf6, 0x52, 0xb0, 0x79, 0x58, 0xda, + 0x8d, 0x2f, 0xa5, 0x7d, 0x85, 0x55, 0x3f, 0x8a, 0x51, 0xdf, 0x13, 0xe0, 0xa7, 0x54, 0xf5, 0xbc, + 0x2d, 0x1e, 0x53, 0x36, 0xe8, 0x70, 0x36, 0x2c, 0x6d, 0xe7, 0xcc, 0x04, 0xb3, 0xd5, 0xdc, 0x70, + 0xea, 0x37, 0x76, 0x2a, 0xe9, 0x61, 0xad, 0x18, 0x1f, 0x34, 0xdd, 0xee, 0xd2, 0x84, 0x66, 0x8c, + 0x4b, 0x82, 0x3d, 0x2a, 0x39, 0x12, 0xc9, 0x0f, 0xa8, 0x8c, 0x48, 0x24, 0x90, 0x41, 0x91, 0x29, + 0xb3, 0xe9, 0x68, 0xed, 0xa5, 0xe0, 0xd1, 0xc5, 0x66, 0xb9, 0x5e, 0xcf, 0xf2, 0x87, 0x9a, 0x6e, + 0x78, 0x75, 0x42, 0xec, 0x54, 0x40, 0x58, 0xe9, 0x9d, 0xb1, 0xfc, 0x8b, 0xf1, 0xfb, 0x05, 0x28, + 0x4e, 0x22, 0x9e, 0x41, 0x8a, 0xe6, 0x5c, 0xe5, 0xcc, 0xf9, 0xc6, 0x4f, 0x83, 0x33, 0xc6, 0x3f, + 0x1e, 0x09, 0x9d, 0x2a, 0x6e, 0xbc, 0xd5, 0x74, 0x63, 0x2a, 0xa7, 0xc8, 0x95, 0x48, 0x39, 0x9a, + 0x7f, 0x3b, 0xcd, 0xf6, 0x3f, 0x1b, 0x2d, 0xaf, 0xde, 0x0e, 0x6f, 0xb2, 0x1d, 0x5e, 0x67, 0xbc, + 0x1d, 0xc1, 0xdd, 0x91, 0x01, 0xdf, 0x4b, 0xdb, 0x98, 0xec, 0xcb, 0x4d, 0x48, 0x85, 0xe2, 0x69, + 0xae, 0x06, 0xc3, 0xd2, 0x6e, 0x9d, 0x19, 0x66, 0x5c, 0xd8, 0xfd, 0xf8, 0xd5, 0xd6, 0xc2, 0xff, + 0x4f, 0x85, 0xa7, 0x75, 0xdc, 0x78, 0xa7, 0xe9, 0x37, 0x04, 0x92, 0x9c, 0xcb, 0x54, 0x20, 0x0a, + 0xc8, 0x12, 0x8e, 0x48, 0x72, 0x80, 0x84, 0x30, 0xc9, 0xab, 0x0e, 0x84, 0x67, 0xb4, 0x9b, 0xf0, + 0xc8, 0x9c, 0x77, 0xb4, 0xf6, 0x62, 0xb0, 0x31, 0x2c, 0x6d, 0xaf, 0xee, 0x73, 0xc1, 0x44, 0x37, + 0x5c, 0x15, 0xb8, 0x3d, 0x03, 0x6e, 0x03, 0x24, 0xf7, 0xc7, 0xd8, 0x83, 0x9a, 0x32, 0x5e, 0xeb, + 0xab, 0x45, 0x26, 0x39, 0x2a, 0x29, 0x98, 0xe2, 0xd1, 0x54, 0x2d, 0x90, 0xe4, 0xa0, 0x27, 0x14, + 0x4f, 0x04, 0x2a, 0x73, 0xa1, 0xb2, 0xde, 0x1b, 0x96, 0xf6, 0x5a, 0x3d, 0xc5, 0x05, 0x92, 0xdc, + 0xd0, 0x99, 0xa6, 0x7e, 0x76, 0x07, 0xf9, 0x6c, 0x82, 0x18, 0xf7, 0xf4, 0xff, 0x7a, 0x00, 0x7d, + 0x12, 0x53, 0x24, 0x89, 0x48, 0x85, 0x32, 0x17, 0x1d, 0xad, 0x3d, 0x17, 0xb4, 0x86, 0xa5, 0xbd, + 0x5c, 0x77, 0x9a, 0xd5, 0xdd, 0xf0, 0xdf, 0x51, 0x60, 0x93, 0xe2, 0xd6, 0xe8, 0x19, 0x3c, 0x3f, + 0x3c, 0xb6, 0xb4, 0xa3, 0x63, 0x4b, 0xfb, 0x76, 0x6c, 0x69, 0xef, 0x4f, 0xac, 0xc6, 0xd1, 0x89, + 0xd5, 0xf8, 0x7c, 0x62, 0x35, 0x76, 0x83, 0x58, 0xa8, 0x5e, 0xd1, 0xf5, 0x18, 0xa4, 0xfe, 0xf8, + 0x58, 0xac, 0x27, 0xb4, 0x8b, 0x93, 0x87, 0xff, 0x62, 0xe3, 0xb6, 0xff, 0x72, 0xe6, 0xd6, 0xac, + 0x9f, 0x1e, 0x1b, 0x35, 0xc8, 0x39, 0x76, 0xe7, 0xab, 0x5d, 0xb8, 0xf5, 0x23, 0x00, 0x00, 0xff, + 0xff, 0x32, 0x01, 0x32, 0x58, 0x9a, 0x04, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/concentrated-liquidity/types/params_test.go b/x/concentrated-liquidity/types/params_test.go index 93b06097edd..3e679175ae4 100644 --- a/x/concentrated-liquidity/types/params_test.go +++ b/x/concentrated-liquidity/types/params_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) func TestValidateTicks(t *testing.T) { diff --git a/x/concentrated-liquidity/types/tx.pb.go b/x/concentrated-liquidity/types/tx.pb.go index 142a09867a7..31931ab77e1 100644 --- a/x/concentrated-liquidity/types/tx.pb.go +++ b/x/concentrated-liquidity/types/tx.pb.go @@ -808,80 +808,80 @@ var fileDescriptor_b181243e31403684 = []byte{ // 1215 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xcf, 0x6f, 0xe3, 0x44, 0x1b, 0xee, 0x34, 0xdd, 0xf4, 0xeb, 0xf4, 0xeb, 0x8f, 0xb8, 0xdd, 0x36, 0x4d, 0x97, 0xb8, 0x8c, - 0x40, 0xca, 0x82, 0x62, 0x37, 0x65, 0x25, 0x20, 0x48, 0xbb, 0x6c, 0x8a, 0x56, 0xca, 0x8a, 0x68, - 0x57, 0xde, 0x4a, 0x48, 0x08, 0x29, 0x72, 0xed, 0xa9, 0x3b, 0x6a, 0xe2, 0x09, 0x1e, 0xb7, 0xd9, - 0xfe, 0x03, 0x20, 0x10, 0x07, 0x84, 0xc4, 0x11, 0x04, 0x37, 0xc4, 0x01, 0x21, 0x71, 0xe5, 0xc8, - 0x61, 0x0f, 0x1c, 0xf6, 0xc0, 0x01, 0x71, 0x30, 0xa8, 0x3d, 0x20, 0xae, 0xb9, 0x23, 0x21, 0x7b, - 0x9c, 0xb1, 0x1b, 0xa7, 0xb4, 0x4e, 0x21, 0x07, 0x2e, 0x89, 0x3d, 0x33, 0xef, 0x33, 0xcf, 0x3c, - 0xcf, 0xfb, 0xce, 0xd8, 0x86, 0x0a, 0x65, 0x6d, 0xca, 0x08, 0x53, 0x0d, 0x6a, 0x1b, 0xd8, 0x76, - 0x1d, 0xdd, 0xc5, 0x66, 0x8b, 0xbc, 0x7b, 0x48, 0x4c, 0xe2, 0x1e, 0xab, 0x47, 0x95, 0x5d, 0xec, - 0xea, 0x15, 0xd5, 0x7d, 0xac, 0x74, 0x1c, 0xea, 0x52, 0xe9, 0xf9, 0x70, 0xbc, 0x32, 0x74, 0xbc, - 0x12, 0x8e, 0x2f, 0x2c, 0x5b, 0xd4, 0xa2, 0x41, 0x84, 0xea, 0x5f, 0xf1, 0xe0, 0x42, 0x4e, 0x6f, - 0x13, 0x9b, 0xaa, 0xc1, 0x6f, 0xd8, 0x54, 0x34, 0x02, 0x40, 0x75, 0x57, 0x67, 0x58, 0xcc, 0x66, - 0x50, 0x62, 0xf3, 0x7e, 0xf4, 0xfd, 0x14, 0xcc, 0x35, 0x98, 0xb5, 0xed, 0x60, 0xdd, 0xc5, 0x0f, - 0x29, 0x23, 0x2e, 0xa1, 0xb6, 0xf4, 0x22, 0x9c, 0xee, 0x50, 0xda, 0x6a, 0x12, 0x33, 0x0f, 0x36, - 0x40, 0x69, 0xaa, 0x26, 0xf5, 0x3c, 0x79, 0xfe, 0x58, 0x6f, 0xb7, 0xaa, 0x28, 0xec, 0x40, 0x5a, - 0xd6, 0xbf, 0xaa, 0x9b, 0xd2, 0x4d, 0x98, 0x65, 0xd8, 0x36, 0xb1, 0x93, 0x9f, 0xdc, 0x00, 0xa5, - 0x99, 0x5a, 0xae, 0xe7, 0xc9, 0x73, 0x7c, 0x2c, 0x6f, 0x47, 0x5a, 0x38, 0x40, 0xba, 0x05, 0x61, - 0x8b, 0x76, 0xb1, 0xd3, 0x74, 0x89, 0x71, 0x90, 0xcf, 0x6c, 0x80, 0x52, 0xa6, 0x76, 0xbd, 0xe7, - 0xc9, 0x39, 0x3e, 0x3c, 0xea, 0x43, 0xda, 0x4c, 0x70, 0xb3, 0x43, 0x8c, 0x03, 0x3f, 0xea, 0xb0, - 0xd3, 0xe9, 0x47, 0x4d, 0x0d, 0x46, 0x45, 0x7d, 0x48, 0x9b, 0x09, 0x6e, 0x82, 0x28, 0x17, 0x2e, - 0xb8, 0xf4, 0x00, 0xdb, 0xac, 0xd9, 0x71, 0xe8, 0x11, 0x31, 0xb1, 0x99, 0xbf, 0xb6, 0x91, 0x29, - 0xcd, 0x6e, 0xad, 0x29, 0x5c, 0x13, 0xc5, 0xd7, 0xa4, 0xaf, 0xa8, 0xb2, 0x4d, 0x89, 0x5d, 0xdb, - 0x7c, 0xe2, 0xc9, 0x13, 0x5f, 0xff, 0x2a, 0x97, 0x2c, 0xe2, 0xee, 0x1f, 0xee, 0x2a, 0x06, 0x6d, - 0xab, 0xa1, 0x80, 0xfc, 0xaf, 0xcc, 0xcc, 0x03, 0xd5, 0x3d, 0xee, 0x60, 0x16, 0x04, 0x30, 0x6d, - 0x9e, 0xcf, 0xf1, 0x30, 0x9c, 0x42, 0xc2, 0x30, 0x17, 0xb4, 0x34, 0xdb, 0xc4, 0x6e, 0xea, 0x6d, - 0x7a, 0x68, 0xbb, 0x9b, 0xf9, 0x6c, 0xa0, 0xcb, 0xab, 0x3e, 0xf8, 0x2f, 0x9e, 0x7c, 0x9d, 0x43, - 0x31, 0xf3, 0x40, 0x21, 0x54, 0x6d, 0xeb, 0xee, 0xbe, 0x52, 0xb7, 0xdd, 0x9e, 0x27, 0xe7, 0xf9, - 0x7a, 0x12, 0xf1, 0x48, 0xe3, 0x2b, 0x69, 0x10, 0xfb, 0x2e, 0x6f, 0x19, 0x36, 0x4d, 0x25, 0x3f, - 0x7d, 0xa5, 0x69, 0x2a, 0x89, 0x69, 0x2a, 0x55, 0xf9, 0xc3, 0xdf, 0xbf, 0x7d, 0xa1, 0x20, 0x52, - 0xb8, 0x55, 0x36, 0x82, 0x3c, 0x29, 0x77, 0xc2, 0x44, 0x41, 0x3f, 0x64, 0xe0, 0x5a, 0x22, 0x7d, - 0x34, 0xcc, 0x3a, 0xd4, 0x66, 0x58, 0x7a, 0x19, 0xce, 0xf6, 0x47, 0x46, 0xa9, 0xb4, 0xd2, 0xf3, - 0x64, 0xa9, 0x9f, 0x4a, 0xa2, 0x13, 0x69, 0xb0, 0x7f, 0x57, 0x37, 0xa5, 0x3a, 0x9c, 0xee, 0x6b, - 0xc7, 0x73, 0x4a, 0xbd, 0x68, 0x51, 0x61, 0x72, 0x0a, 0xc5, 0xfa, 0xf1, 0x11, 0x54, 0x25, 0xc8, - 0xb7, 0xb4, 0x50, 0x15, 0x01, 0x55, 0x91, 0x5a, 0x30, 0x27, 0x2a, 0xb1, 0xc9, 0x95, 0xf0, 0x73, - 0xca, 0x07, 0xbd, 0x13, 0x82, 0xae, 0x27, 0x41, 0xdf, 0xc4, 0x96, 0x6e, 0x1c, 0xbf, 0x81, 0x8d, - 0x48, 0xfa, 0x04, 0x0a, 0xd2, 0x16, 0x45, 0x1b, 0xd7, 0xd2, 0x1c, 0xa8, 0x95, 0xec, 0x48, 0xb5, - 0x32, 0x7d, 0xb9, 0x5a, 0x41, 0x7f, 0x66, 0xe0, 0x62, 0x83, 0x59, 0x77, 0x4d, 0x73, 0x87, 0x8a, - 0x4d, 0x60, 0x64, 0xf7, 0x52, 0x6c, 0x08, 0xf7, 0x23, 0xa3, 0xb9, 0x3b, 0x9b, 0x17, 0xb9, 0xb3, - 0x10, 0x77, 0xa7, 0x19, 0x77, 0xfa, 0x7e, 0xe4, 0xf4, 0xd4, 0x28, 0x58, 0x71, 0xab, 0x87, 0x96, - 0xf1, 0xb5, 0xf1, 0x94, 0x71, 0xf6, 0xdf, 0x2f, 0x63, 0xdd, 0x34, 0xcb, 0x2e, 0x8d, 0xca, 0xf8, - 0x0f, 0x00, 0xf3, 0x83, 0xfe, 0xff, 0x47, 0xab, 0x18, 0xbd, 0x3f, 0x09, 0x97, 0x1a, 0xcc, 0x7a, - 0x8b, 0xb8, 0xfb, 0xa6, 0xa3, 0x77, 0xc7, 0x9a, 0xee, 0x04, 0x46, 0x75, 0x1e, 0xfa, 0x15, 0xae, - 0xe7, 0xf6, 0xe5, 0x36, 0x90, 0xd5, 0xc1, 0x0d, 0x84, 0x83, 0x20, 0x6d, 0x41, 0x34, 0x71, 0xd3, - 0xab, 0xcf, 0xfa, 0x9e, 0xdf, 0x88, 0x79, 0xde, 0x0d, 0x17, 0x1c, 0xb9, 0xfe, 0x1d, 0x80, 0xeb, - 0x43, 0x94, 0x10, 0xc6, 0xc7, 0xfc, 0x03, 0xff, 0x9c, 0x7f, 0x93, 0x57, 0xf4, 0xef, 0x0b, 0x00, - 0x57, 0xfd, 0x23, 0x87, 0xb6, 0x5a, 0xd8, 0x70, 0x1f, 0x75, 0x1c, 0xac, 0x9b, 0x1a, 0xee, 0xea, - 0x8e, 0xc9, 0xa4, 0x2a, 0xfc, 0x7f, 0xcc, 0x26, 0x96, 0x07, 0x1b, 0x99, 0xd2, 0x54, 0x6d, 0xb5, - 0xe7, 0xc9, 0x4b, 0x09, 0x13, 0x19, 0xd2, 0x66, 0x23, 0x17, 0x59, 0x0a, 0x1b, 0xab, 0x45, 0x5f, - 0xdb, 0xb5, 0xf8, 0xb1, 0x48, 0x5b, 0x65, 0xd6, 0x29, 0x3b, 0x9c, 0x06, 0xfa, 0x11, 0x40, 0xf9, - 0x1c, 0x8a, 0x42, 0xdc, 0xaf, 0x00, 0xcc, 0x1b, 0x7c, 0x00, 0x36, 0x9b, 0x2c, 0x18, 0xd3, 0x0c, - 0x01, 0x02, 0xde, 0x7f, 0xfb, 0xa0, 0xf2, 0xc8, 0x97, 0xaf, 0xe7, 0xc9, 0x32, 0x27, 0x78, 0x1e, - 0x10, 0x4a, 0xf5, 0x2c, 0xb3, 0x22, 0x60, 0xce, 0x50, 0x46, 0x5f, 0x02, 0xb8, 0x1c, 0x2d, 0xa7, - 0x1e, 0x3c, 0x97, 0x92, 0x23, 0x3c, 0x36, 0xb9, 0x91, 0x2f, 0xf7, 0x33, 0x67, 0xe5, 0xf6, 0x99, - 0x94, 0x89, 0xa0, 0x82, 0xbc, 0x49, 0x78, 0x63, 0x18, 0x47, 0xa1, 0xf7, 0x67, 0x00, 0x2e, 0x47, - 0x32, 0x45, 0x91, 0x17, 0x6b, 0xfd, 0x20, 0xd4, 0x7a, 0x7d, 0x50, 0xeb, 0xd8, 0xf4, 0xa9, 0x74, - 0x5e, 0x12, 0x10, 0x31, 0x2d, 0x7d, 0x7e, 0x7b, 0xd4, 0xd9, 0xc3, 0x64, 0x80, 0xdf, 0x64, 0x4a, - 0x7e, 0xc3, 0x40, 0x52, 0xf2, 0x13, 0x10, 0x11, 0x3f, 0xf4, 0x0d, 0x80, 0x85, 0x06, 0xb3, 0xee, - 0x1d, 0xda, 0x16, 0xd9, 0x3b, 0xde, 0xde, 0xd7, 0x1d, 0x0b, 0x9b, 0xfd, 0x2d, 0x63, 0x6c, 0xa9, - 0x70, 0xd3, 0x4f, 0x85, 0xe7, 0x62, 0xa9, 0xb0, 0xc7, 0xf9, 0x94, 0x0d, 0x4e, 0x48, 0x6c, 0x6e, - 0x0c, 0xed, 0x43, 0x74, 0x3e, 0x5f, 0x91, 0x16, 0x35, 0xb8, 0x60, 0xe3, 0x6e, 0x33, 0xb9, 0xf3, - 0x17, 0x7a, 0x9e, 0xbc, 0xc2, 0x49, 0x0c, 0x0c, 0x40, 0xda, 0x9c, 0x8d, 0xc5, 0x6e, 0x59, 0x37, - 0xd1, 0x4f, 0xbc, 0x3e, 0x76, 0x1c, 0xdd, 0x66, 0x7b, 0xd8, 0x19, 0xb7, 0x28, 0x52, 0x05, 0xce, - 0xf8, 0x14, 0x69, 0xd7, 0xc6, 0x4e, 0x78, 0x9c, 0x2c, 0xf7, 0x3c, 0x79, 0x31, 0x62, 0x1f, 0x74, - 0x21, 0xed, 0x7f, 0x36, 0xee, 0x3e, 0xf0, 0x2f, 0x93, 0x25, 0xe5, 0x86, 0xe4, 0x63, 0x02, 0x16, - 0x83, 0x8a, 0x4a, 0xac, 0xaa, 0x2f, 0xdd, 0xd6, 0x7b, 0xd3, 0x30, 0xd3, 0x60, 0x96, 0xf4, 0x11, - 0x80, 0xf3, 0x03, 0xef, 0x8f, 0xaf, 0x28, 0x97, 0x7a, 0x8d, 0x55, 0x12, 0xaf, 0x0e, 0x85, 0xd7, - 0x47, 0x8d, 0x14, 0x8e, 0x7e, 0x02, 0xe0, 0x62, 0xe2, 0x70, 0xaf, 0x5e, 0x1e, 0x76, 0x30, 0xb6, - 0x50, 0x1b, 0x3d, 0x56, 0x90, 0xfa, 0x00, 0xc0, 0xb9, 0x81, 0xa7, 0xeb, 0xcb, 0xa3, 0x9e, 0x09, - 0x2c, 0xdc, 0x19, 0x31, 0x50, 0x70, 0xf9, 0x1c, 0xc0, 0xe5, 0xa1, 0xa7, 0xe7, 0xed, 0x14, 0xda, - 0x0f, 0x89, 0x2f, 0xdc, 0xbb, 0x5a, 0xbc, 0x20, 0xf8, 0x29, 0x80, 0xb9, 0xe4, 0x61, 0xf3, 0x5a, - 0x6a, 0xf4, 0x28, 0xb8, 0xb0, 0x7d, 0x85, 0xe0, 0x33, 0xbc, 0x92, 0x45, 0x9e, 0x82, 0x57, 0x22, - 0x38, 0x0d, 0xaf, 0x73, 0x0b, 0xb1, 0xf6, 0xce, 0x93, 0x93, 0x22, 0x78, 0x7a, 0x52, 0x04, 0xbf, - 0x9d, 0x14, 0xc1, 0xc7, 0xa7, 0xc5, 0x89, 0xa7, 0xa7, 0xc5, 0x89, 0x9f, 0x4f, 0x8b, 0x13, 0x6f, - 0xd7, 0x62, 0x7b, 0x7e, 0x38, 0x51, 0xb9, 0xa5, 0xef, 0xb2, 0xfe, 0x8d, 0x7a, 0xb4, 0x75, 0x4b, - 0x7d, 0x7c, 0xe6, 0xdb, 0x54, 0x39, 0xfa, 0x38, 0x15, 0x9c, 0x09, 0xbb, 0xd9, 0xe0, 0x43, 0xd1, - 0x4b, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x5e, 0x95, 0xe5, 0xca, 0x12, 0x00, 0x00, + 0x40, 0xca, 0x82, 0x62, 0x37, 0x05, 0x04, 0x04, 0x69, 0x97, 0x4d, 0xd1, 0x4a, 0x59, 0x11, 0xed, + 0xca, 0x5b, 0x09, 0x09, 0x21, 0x45, 0xae, 0x3d, 0x75, 0x47, 0x4d, 0x3c, 0xc1, 0xe3, 0x36, 0xdb, + 0x7f, 0x00, 0x04, 0xe2, 0x80, 0x90, 0x38, 0x82, 0xe0, 0x86, 0x38, 0x20, 0x24, 0xae, 0x1c, 0x39, + 0xec, 0x81, 0xc3, 0x1e, 0x38, 0x20, 0x0e, 0x06, 0xb5, 0x07, 0xc4, 0x35, 0x77, 0x24, 0x64, 0x8f, + 0x33, 0x76, 0xe3, 0x94, 0xd6, 0x29, 0xe4, 0xc0, 0x25, 0xb1, 0x67, 0xe6, 0x7d, 0xe6, 0x99, 0xe7, + 0x79, 0xdf, 0x19, 0xdb, 0x50, 0xa1, 0xac, 0x4d, 0x19, 0x61, 0xaa, 0x41, 0x6d, 0x03, 0xdb, 0xae, + 0xa3, 0xbb, 0xd8, 0x6c, 0x91, 0x77, 0x0f, 0x89, 0x49, 0xdc, 0x63, 0xf5, 0xa8, 0xb2, 0x8b, 0x5d, + 0xbd, 0xa2, 0xba, 0x8f, 0x94, 0x8e, 0x43, 0x5d, 0x2a, 0x3d, 0x1b, 0x8e, 0x57, 0x86, 0x8e, 0x57, + 0xc2, 0xf1, 0x85, 0x65, 0x8b, 0x5a, 0x34, 0x88, 0x50, 0xfd, 0x2b, 0x1e, 0x5c, 0xc8, 0xe9, 0x6d, + 0x62, 0x53, 0x35, 0xf8, 0x0d, 0x9b, 0x8a, 0x46, 0x00, 0xa8, 0xee, 0xea, 0x0c, 0x8b, 0xd9, 0x0c, + 0x4a, 0x6c, 0xde, 0x8f, 0xbe, 0x9f, 0x82, 0xb9, 0x06, 0xb3, 0xb6, 0x1d, 0xac, 0xbb, 0xf8, 0x01, + 0x65, 0xc4, 0x25, 0xd4, 0x96, 0x9e, 0x87, 0xd3, 0x1d, 0x4a, 0x5b, 0x4d, 0x62, 0xe6, 0xc1, 0x06, + 0x28, 0x4d, 0xd5, 0xa4, 0x9e, 0x27, 0xcf, 0x1f, 0xeb, 0xed, 0x56, 0x15, 0x85, 0x1d, 0x48, 0xcb, + 0xfa, 0x57, 0x75, 0x53, 0xba, 0x09, 0xb3, 0x0c, 0xdb, 0x26, 0x76, 0xf2, 0x93, 0x1b, 0xa0, 0x34, + 0x53, 0xcb, 0xf5, 0x3c, 0x79, 0x8e, 0x8f, 0xe5, 0xed, 0x48, 0x0b, 0x07, 0x48, 0x2f, 0x42, 0xd8, + 0xa2, 0x5d, 0xec, 0x34, 0x5d, 0x62, 0x1c, 0xe4, 0x33, 0x1b, 0xa0, 0x94, 0xa9, 0x5d, 0xef, 0x79, + 0x72, 0x8e, 0x0f, 0x8f, 0xfa, 0x90, 0x36, 0x13, 0xdc, 0xec, 0x10, 0xe3, 0xc0, 0x8f, 0x3a, 0xec, + 0x74, 0xfa, 0x51, 0x53, 0x83, 0x51, 0x51, 0x1f, 0xd2, 0x66, 0x82, 0x9b, 0x20, 0xca, 0x85, 0x0b, + 0x2e, 0x3d, 0xc0, 0x36, 0x6b, 0x76, 0x1c, 0x7a, 0x44, 0x4c, 0x6c, 0xe6, 0xaf, 0x6d, 0x64, 0x4a, + 0xb3, 0x5b, 0x6b, 0x0a, 0xd7, 0x44, 0xf1, 0x35, 0xe9, 0x2b, 0xaa, 0x6c, 0x53, 0x62, 0xd7, 0x36, + 0x1f, 0x7b, 0xf2, 0xc4, 0xd7, 0xbf, 0xca, 0x25, 0x8b, 0xb8, 0xfb, 0x87, 0xbb, 0x8a, 0x41, 0xdb, + 0x6a, 0x28, 0x20, 0xff, 0x2b, 0x33, 0xf3, 0x40, 0x75, 0x8f, 0x3b, 0x98, 0x05, 0x01, 0x4c, 0x9b, + 0xe7, 0x73, 0x3c, 0x08, 0xa7, 0x90, 0x30, 0xcc, 0x05, 0x2d, 0xcd, 0x36, 0xb1, 0x9b, 0x7a, 0x9b, + 0x1e, 0xda, 0xee, 0x66, 0x3e, 0x1b, 0xe8, 0xf2, 0xaa, 0x0f, 0xfe, 0x8b, 0x27, 0x5f, 0xe7, 0x50, + 0xcc, 0x3c, 0x50, 0x08, 0x55, 0xdb, 0xba, 0xbb, 0xaf, 0xd4, 0x6d, 0xb7, 0xe7, 0xc9, 0x79, 0xbe, + 0x9e, 0x44, 0x3c, 0xd2, 0xf8, 0x4a, 0x1a, 0xc4, 0xbe, 0xc3, 0x5b, 0x86, 0x4d, 0x53, 0xc9, 0x4f, + 0x5f, 0x69, 0x9a, 0x4a, 0x62, 0x9a, 0x4a, 0x55, 0xfe, 0xf0, 0xf7, 0x6f, 0x9f, 0x2b, 0x88, 0x14, + 0x6e, 0x95, 0x8d, 0x20, 0x4f, 0xca, 0x9d, 0x30, 0x51, 0xd0, 0x0f, 0x19, 0xb8, 0x96, 0x48, 0x1f, + 0x0d, 0xb3, 0x0e, 0xb5, 0x19, 0x96, 0x5e, 0x86, 0xb3, 0xfd, 0x91, 0x51, 0x2a, 0xad, 0xf4, 0x3c, + 0x59, 0xea, 0xa7, 0x92, 0xe8, 0x44, 0x1a, 0xec, 0xdf, 0xd5, 0x4d, 0xa9, 0x0e, 0xa7, 0xfb, 0xda, + 0xf1, 0x9c, 0x52, 0x2f, 0x5a, 0x54, 0x98, 0x9c, 0x42, 0xb1, 0x7e, 0x7c, 0x04, 0x55, 0x09, 0xf2, + 0x2d, 0x2d, 0x54, 0x45, 0x40, 0x55, 0xa4, 0x16, 0xcc, 0x89, 0x4a, 0x6c, 0x72, 0x25, 0xfc, 0x9c, + 0xf2, 0x41, 0x6f, 0x87, 0xa0, 0xeb, 0x49, 0xd0, 0x37, 0xb1, 0xa5, 0x1b, 0xc7, 0x6f, 0x60, 0x23, + 0x92, 0x3e, 0x81, 0x82, 0xb4, 0x45, 0xd1, 0xc6, 0xb5, 0x34, 0x07, 0x6a, 0x25, 0x3b, 0x52, 0xad, + 0x4c, 0x5f, 0xae, 0x56, 0xd0, 0x9f, 0x19, 0xb8, 0xd8, 0x60, 0xd6, 0x1d, 0xd3, 0xdc, 0xa1, 0x62, + 0x13, 0x18, 0xd9, 0xbd, 0x14, 0x1b, 0xc2, 0xbd, 0xc8, 0x68, 0xee, 0xce, 0xe6, 0x45, 0xee, 0x2c, + 0xc4, 0xdd, 0x69, 0xc6, 0x9d, 0xbe, 0x17, 0x39, 0x3d, 0x35, 0x0a, 0x56, 0xdc, 0xea, 0xa1, 0x65, + 0x7c, 0x6d, 0x3c, 0x65, 0x9c, 0xfd, 0xf7, 0xcb, 0x58, 0x37, 0xcd, 0xb2, 0x4b, 0xa3, 0x32, 0xfe, + 0x03, 0xc0, 0xfc, 0xa0, 0xff, 0xff, 0xd1, 0x2a, 0x46, 0xef, 0x4f, 0xc2, 0xa5, 0x06, 0xb3, 0xde, + 0x22, 0xee, 0xbe, 0xe9, 0xe8, 0xdd, 0xb1, 0xa6, 0x3b, 0x81, 0x51, 0x9d, 0x87, 0x7e, 0x85, 0xeb, + 0xb9, 0x75, 0xb9, 0x0d, 0x64, 0x75, 0x70, 0x03, 0xe1, 0x20, 0x48, 0x5b, 0x10, 0x4d, 0xdc, 0xf4, + 0xea, 0xd3, 0xbe, 0xe7, 0x37, 0x62, 0x9e, 0x77, 0xc3, 0x05, 0x47, 0xae, 0x7f, 0x07, 0xe0, 0xfa, + 0x10, 0x25, 0x84, 0xf1, 0x31, 0xff, 0xc0, 0x3f, 0xe7, 0xdf, 0xe4, 0x15, 0xfd, 0xfb, 0x02, 0xc0, + 0x55, 0xff, 0xc8, 0xa1, 0xad, 0x16, 0x36, 0xdc, 0x87, 0x1d, 0x07, 0xeb, 0xa6, 0x86, 0xbb, 0xba, + 0x63, 0x32, 0xa9, 0x0a, 0xff, 0x1f, 0xb3, 0x89, 0xe5, 0xc1, 0x46, 0xa6, 0x34, 0x55, 0x5b, 0xed, + 0x79, 0xf2, 0x52, 0xc2, 0x44, 0x86, 0xb4, 0xd9, 0xc8, 0x45, 0x96, 0xc2, 0xc6, 0x6a, 0xd1, 0xd7, + 0x76, 0x2d, 0x7e, 0x2c, 0xd2, 0x56, 0x99, 0x75, 0xca, 0x0e, 0xa7, 0x81, 0x7e, 0x04, 0x50, 0x3e, + 0x87, 0xa2, 0x10, 0xf7, 0x2b, 0x00, 0xf3, 0x06, 0x1f, 0x80, 0xcd, 0x26, 0x0b, 0xc6, 0x34, 0x43, + 0x80, 0x80, 0xf7, 0xdf, 0x3e, 0xa8, 0x3c, 0xf4, 0xe5, 0xeb, 0x79, 0xb2, 0xcc, 0x09, 0x9e, 0x07, + 0x84, 0x52, 0x3d, 0xcb, 0xac, 0x08, 0x98, 0x33, 0x94, 0xd1, 0x97, 0x00, 0x2e, 0x47, 0xcb, 0xa9, + 0x07, 0xcf, 0xa5, 0xe4, 0x08, 0x8f, 0x4d, 0x6e, 0xe4, 0xcb, 0xfd, 0xd4, 0x59, 0xb9, 0x7d, 0x26, + 0x65, 0x22, 0xa8, 0x20, 0x6f, 0x12, 0xde, 0x18, 0xc6, 0x51, 0xe8, 0xfd, 0x19, 0x80, 0xcb, 0x91, + 0x4c, 0x51, 0xe4, 0xc5, 0x5a, 0xdf, 0x0f, 0xb5, 0x5e, 0x1f, 0xd4, 0x3a, 0x36, 0x7d, 0x2a, 0x9d, + 0x97, 0x04, 0x44, 0x4c, 0x4b, 0x9f, 0xdf, 0x1e, 0x75, 0xf6, 0x30, 0x19, 0xe0, 0x37, 0x99, 0x92, + 0xdf, 0x30, 0x90, 0x94, 0xfc, 0x04, 0x44, 0xc4, 0x0f, 0x7d, 0x03, 0x60, 0xa1, 0xc1, 0xac, 0xbb, + 0x87, 0xb6, 0x45, 0xf6, 0x8e, 0xb7, 0xf7, 0x75, 0xc7, 0xc2, 0x66, 0x7f, 0xcb, 0x18, 0x5b, 0x2a, + 0xdc, 0xf4, 0x53, 0xe1, 0x99, 0x58, 0x2a, 0xec, 0x71, 0x3e, 0x65, 0x83, 0x13, 0x12, 0x9b, 0x1b, + 0x43, 0xfb, 0x10, 0x9d, 0xcf, 0x57, 0xa4, 0x45, 0x0d, 0x2e, 0xd8, 0xb8, 0xdb, 0x4c, 0xee, 0xfc, + 0x85, 0x9e, 0x27, 0xaf, 0x70, 0x12, 0x03, 0x03, 0x90, 0x36, 0x67, 0x63, 0xb1, 0x5b, 0xd6, 0x4d, + 0xf4, 0x13, 0xaf, 0x8f, 0x1d, 0x47, 0xb7, 0xd9, 0x1e, 0x76, 0xc6, 0x2d, 0x8a, 0x54, 0x81, 0x33, + 0x3e, 0x45, 0xda, 0xb5, 0xb1, 0x13, 0x1e, 0x27, 0xcb, 0x3d, 0x4f, 0x5e, 0x8c, 0xd8, 0x07, 0x5d, + 0x48, 0xfb, 0x9f, 0x8d, 0xbb, 0xf7, 0xfd, 0xcb, 0x64, 0x49, 0xb9, 0x21, 0xf9, 0x98, 0x80, 0xc5, + 0xa0, 0xa2, 0x12, 0xab, 0xea, 0x4b, 0xb7, 0xf5, 0xde, 0x34, 0xcc, 0x34, 0x98, 0x25, 0x7d, 0x04, + 0xe0, 0xfc, 0xc0, 0xfb, 0xe3, 0x2b, 0xca, 0xa5, 0x5e, 0x63, 0x95, 0xc4, 0xab, 0x43, 0xe1, 0xf5, + 0x51, 0x23, 0x85, 0xa3, 0x9f, 0x00, 0xb8, 0x98, 0x38, 0xdc, 0xab, 0x97, 0x87, 0x1d, 0x8c, 0x2d, + 0xd4, 0x46, 0x8f, 0x15, 0xa4, 0x3e, 0x00, 0x70, 0x6e, 0xe0, 0xe9, 0xfa, 0xf2, 0xa8, 0x67, 0x02, + 0x0b, 0xb7, 0x47, 0x0c, 0x14, 0x5c, 0x3e, 0x07, 0x70, 0x79, 0xe8, 0xe9, 0x79, 0x2b, 0x85, 0xf6, + 0x43, 0xe2, 0x0b, 0x77, 0xaf, 0x16, 0x2f, 0x08, 0x7e, 0x0a, 0x60, 0x2e, 0x79, 0xd8, 0xbc, 0x96, + 0x1a, 0x3d, 0x0a, 0x2e, 0x6c, 0x5f, 0x21, 0xf8, 0x0c, 0xaf, 0x64, 0x91, 0xa7, 0xe0, 0x95, 0x08, + 0x4e, 0xc3, 0xeb, 0xdc, 0x42, 0xac, 0xbd, 0xf3, 0xf8, 0xa4, 0x08, 0x9e, 0x9c, 0x14, 0xc1, 0x6f, + 0x27, 0x45, 0xf0, 0xf1, 0x69, 0x71, 0xe2, 0xc9, 0x69, 0x71, 0xe2, 0xe7, 0xd3, 0xe2, 0xc4, 0xdb, + 0xb5, 0xd8, 0x9e, 0x1f, 0x4e, 0x54, 0x6e, 0xe9, 0xbb, 0xac, 0x7f, 0xa3, 0x1e, 0x6d, 0xbd, 0xa4, + 0x3e, 0x3a, 0xf3, 0x6d, 0xaa, 0x1c, 0x7d, 0x9c, 0x0a, 0xce, 0x84, 0xdd, 0x6c, 0xf0, 0xa1, 0xe8, + 0x85, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf1, 0xcc, 0xd1, 0x4a, 0xca, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cosmwasmpool/client/cli/query.go b/x/cosmwasmpool/client/cli/query.go index 4e29f8abda6..1a99309b125 100644 --- a/x/cosmwasmpool/client/cli/query.go +++ b/x/cosmwasmpool/client/cli/query.go @@ -4,8 +4,8 @@ import ( "github.com/spf13/cobra" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" ) // NewQueryCmd returns the cli query commands for this module. diff --git a/x/cosmwasmpool/client/cli/tx.go b/x/cosmwasmpool/client/cli/tx.go index ba27ea33bc0..5570a5bbe39 100644 --- a/x/cosmwasmpool/client/cli/tx.go +++ b/x/cosmwasmpool/client/cli/tx.go @@ -18,8 +18,8 @@ import ( "github.com/spf13/pflag" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" ) func NewTxCmd() *cobra.Command { diff --git a/x/cosmwasmpool/client/grpc/grpc_query.go b/x/cosmwasmpool/client/grpc/grpc_query.go index 8e7665682dd..293f80c614b 100644 --- a/x/cosmwasmpool/client/grpc/grpc_query.go +++ b/x/cosmwasmpool/client/grpc/grpc_query.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc/status" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/client" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/client" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/client/queryproto" ) type Querier struct { diff --git a/x/cosmwasmpool/client/proposal_handler.go b/x/cosmwasmpool/client/proposal_handler.go index 8e818d5dd53..93875ced6c8 100644 --- a/x/cosmwasmpool/client/proposal_handler.go +++ b/x/cosmwasmpool/client/proposal_handler.go @@ -1,7 +1,7 @@ package client import ( - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/client/cli" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" ) diff --git a/x/cosmwasmpool/client/query_proto_wrap.go b/x/cosmwasmpool/client/query_proto_wrap.go index 7c0a938306d..b78880fb7f6 100644 --- a/x/cosmwasmpool/client/query_proto_wrap.go +++ b/x/cosmwasmpool/client/query_proto_wrap.go @@ -3,8 +3,8 @@ package client import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/client/queryproto" ) // This file should evolve to being code gen'd, off of `proto/poolmanager/v1beta/query.yml` diff --git a/x/cosmwasmpool/client/queryproto/query.pb.go b/x/cosmwasmpool/client/queryproto/query.pb.go index be5d1e90c84..d100a8da8e2 100644 --- a/x/cosmwasmpool/client/queryproto/query.pb.go +++ b/x/cosmwasmpool/client/queryproto/query.pb.go @@ -12,7 +12,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + types "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -331,42 +331,42 @@ var fileDescriptor_733c758985c393b2 = []byte{ // 601 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x4d, 0x4f, 0x13, 0x41, 0x18, 0xc7, 0xbb, 0xbc, 0xd4, 0x30, 0x08, 0x98, 0x09, 0x89, 0x58, 0x9a, 0xad, 0x59, 0x11, 0x2b, - 0xa5, 0x33, 0xa1, 0xe8, 0x41, 0x6e, 0xac, 0x06, 0x53, 0x4f, 0xb8, 0x31, 0x1e, 0x3c, 0xd8, 0x4c, - 0x77, 0x87, 0x75, 0x93, 0xdd, 0x9d, 0xa5, 0xb3, 0x45, 0x7b, 0xf5, 0x6e, 0xd4, 0xf0, 0x55, 0xfc, - 0x04, 0x9e, 0x88, 0x27, 0x12, 0x2f, 0x9e, 0x1a, 0xd3, 0xfa, 0x01, 0x0c, 0x9f, 0xc0, 0xcc, 0xcb, - 0x42, 0x21, 0xcd, 0xd2, 0x78, 0xea, 0xce, 0x3c, 0xff, 0xe7, 0xff, 0xfc, 0xe6, 0x99, 0x67, 0x0a, - 0xaa, 0x8c, 0x47, 0x8c, 0x07, 0x1c, 0xbb, 0x8c, 0x47, 0xef, 0x09, 0x8f, 0x12, 0xc6, 0x42, 0x7c, - 0xb4, 0xd5, 0xa6, 0x29, 0xd9, 0xc2, 0x87, 0x5d, 0xda, 0xe9, 0xa1, 0xa4, 0xc3, 0x52, 0x06, 0xcb, - 0x5a, 0x89, 0x46, 0x95, 0x48, 0x2b, 0x4b, 0xcb, 0x3e, 0xf3, 0x99, 0x14, 0x62, 0xf1, 0xa5, 0x72, - 0x4a, 0x0f, 0x73, 0xdd, 0x13, 0xd2, 0x21, 0x11, 0xd7, 0xd2, 0x0d, 0x57, 0x6a, 0x71, 0x9b, 0x70, - 0xaa, 0xea, 0x8e, 0xe8, 0xfc, 0x20, 0x26, 0x69, 0xc0, 0x62, 0xad, 0x2d, 0xfb, 0x8c, 0xf9, 0x21, - 0xc5, 0x24, 0x09, 0x30, 0x89, 0x63, 0x96, 0xca, 0x60, 0xe6, 0x74, 0x47, 0x47, 0xe5, 0xaa, 0xdd, - 0x3d, 0xc0, 0x24, 0xee, 0x65, 0x21, 0x55, 0xa4, 0xa5, 0x40, 0xd5, 0x42, 0x85, 0xac, 0x25, 0xb0, - 0xb0, 0x2f, 0x79, 0x1c, 0x7a, 0xd8, 0xa5, 0x3c, 0xb5, 0x5e, 0x81, 0xc5, 0x6c, 0x83, 0x27, 0x2c, - 0xe6, 0x14, 0xda, 0xa0, 0xa8, 0x90, 0x57, 0x8c, 0xbb, 0x46, 0x75, 0xbe, 0xb1, 0x86, 0xf2, 0x5a, - 0x82, 0x54, 0xb6, 0x3d, 0x73, 0xd2, 0xaf, 0x14, 0x1c, 0x9d, 0x69, 0xbd, 0x06, 0x37, 0xf7, 0x19, - 0x0b, 0xb3, 0x2a, 0x70, 0x0f, 0x80, 0x8b, 0xe3, 0xad, 0x4c, 0x49, 0xdf, 0x75, 0xa4, 0xc9, 0x44, - 0x2f, 0x90, 0xba, 0x83, 0x0b, 0x53, 0x9f, 0xea, 0x5c, 0x67, 0x24, 0xd3, 0xfa, 0x6c, 0x80, 0x05, - 0x6d, 0xac, 0x69, 0x1f, 0x83, 0x59, 0x81, 0x23, 0x60, 0xa7, 0xab, 0xf3, 0x8d, 0x65, 0xa4, 0xda, - 0x82, 0xb2, 0xb6, 0xa0, 0xdd, 0xb8, 0x67, 0xcf, 0xfd, 0xf8, 0x56, 0x9f, 0x15, 0x79, 0x4d, 0x47, - 0xa9, 0xe1, 0xf3, 0x31, 0x40, 0x0f, 0xae, 0x05, 0x52, 0x35, 0x2f, 0x11, 0xbd, 0x00, 0xab, 0x4f, - 0x59, 0x9c, 0x76, 0x88, 0x9b, 0x36, 0xe3, 0x03, 0x66, 0xf7, 0x64, 0x19, 0x2f, 0x3b, 0x78, 0x0d, - 0xdc, 0x10, 0x05, 0x5b, 0x81, 0x27, 0xbb, 0x39, 0x63, 0xc3, 0xb3, 0x7e, 0x65, 0xb1, 0x47, 0xa2, - 0x70, 0xc7, 0xd2, 0x01, 0xcb, 0x29, 0x26, 0x32, 0xc7, 0x3a, 0x36, 0x40, 0x79, 0xbc, 0x99, 0x3e, - 0xec, 0x1e, 0xb8, 0xe5, 0xea, 0x78, 0x8b, 0x78, 0x5e, 0x87, 0x72, 0x75, 0x49, 0x73, 0xf6, 0xea, - 0x59, 0xbf, 0x72, 0x5b, 0xd9, 0x5e, 0x55, 0x58, 0xce, 0x52, 0xb6, 0xb5, 0xab, 0x76, 0x04, 0x95, - 0xcb, 0x3c, 0x2a, 0xa8, 0xa6, 0xae, 0x52, 0xe9, 0x80, 0xe5, 0x14, 0xc5, 0x57, 0xd3, 0x6b, 0xfc, - 0x9d, 0x06, 0xb3, 0x2f, 0x45, 0x33, 0xe0, 0x27, 0x03, 0xc8, 0x2e, 0x72, 0xb8, 0x71, 0xcd, 0x4c, - 0x8c, 0xdc, 0x7d, 0xa9, 0x36, 0x91, 0x56, 0x9d, 0xd0, 0xaa, 0x7d, 0xfc, 0xf9, 0xe7, 0x78, 0xea, - 0x3e, 0xbc, 0x87, 0xf3, 0xdf, 0x94, 0xa4, 0xf8, 0x6a, 0x80, 0xa2, 0x1a, 0x3f, 0x58, 0x9b, 0x64, + 0xa5, 0x33, 0xa1, 0x84, 0x83, 0xdc, 0x58, 0x0d, 0xa6, 0x9e, 0x70, 0x63, 0x3c, 0x78, 0xb0, 0x99, + 0xee, 0x0e, 0xeb, 0x26, 0xbb, 0x3b, 0x4b, 0x67, 0x8b, 0xf6, 0xea, 0xdd, 0xa8, 0xe1, 0xab, 0xf8, + 0x09, 0x3c, 0x11, 0x4f, 0x24, 0x5e, 0x3c, 0x35, 0xa6, 0xf5, 0x03, 0x18, 0x3e, 0x81, 0x99, 0x97, + 0x85, 0x42, 0x9a, 0xa5, 0xf1, 0xd4, 0x9d, 0x79, 0xfe, 0xcf, 0xff, 0xf9, 0xcd, 0x33, 0xcf, 0x14, + 0x54, 0x19, 0x8f, 0x18, 0x0f, 0x38, 0x76, 0x19, 0x8f, 0xde, 0x13, 0x1e, 0x25, 0x8c, 0x85, 0xf8, + 0x78, 0xab, 0x4d, 0x53, 0xb2, 0x85, 0x8f, 0xba, 0xb4, 0xd3, 0x43, 0x49, 0x87, 0xa5, 0x0c, 0x96, + 0xb5, 0x12, 0x8d, 0x2a, 0x91, 0x56, 0x96, 0x96, 0x7d, 0xe6, 0x33, 0x29, 0xc4, 0xe2, 0x4b, 0xe5, + 0x94, 0x1e, 0xe7, 0xba, 0x27, 0xa4, 0x43, 0x22, 0xae, 0xa5, 0x1b, 0xae, 0xd4, 0xe2, 0x36, 0xe1, + 0x54, 0xd5, 0x1d, 0xd1, 0xf9, 0x41, 0x4c, 0xd2, 0x80, 0xc5, 0x5a, 0x5b, 0xf6, 0x19, 0xf3, 0x43, + 0x8a, 0x49, 0x12, 0x60, 0x12, 0xc7, 0x2c, 0x95, 0xc1, 0xcc, 0xe9, 0x9e, 0x8e, 0xca, 0x55, 0xbb, + 0x7b, 0x88, 0x49, 0xdc, 0xcb, 0x42, 0xaa, 0x48, 0x4b, 0x81, 0xaa, 0x85, 0x0a, 0x59, 0x4b, 0x60, + 0xe1, 0x40, 0xf2, 0x38, 0xf4, 0xa8, 0x4b, 0x79, 0x6a, 0xbd, 0x02, 0x8b, 0xd9, 0x06, 0x4f, 0x58, + 0xcc, 0x29, 0xb4, 0x41, 0x51, 0x21, 0xaf, 0x18, 0xf7, 0x8d, 0xea, 0x7c, 0x63, 0x0d, 0xe5, 0xb5, + 0x04, 0xa9, 0x6c, 0x7b, 0xe6, 0xb4, 0x5f, 0x29, 0x38, 0x3a, 0xd3, 0x7a, 0x0d, 0x6e, 0x1f, 0x30, + 0x16, 0x66, 0x55, 0xe0, 0x3e, 0x00, 0x97, 0xc7, 0x5b, 0x99, 0x92, 0xbe, 0xeb, 0x48, 0x93, 0x89, + 0x5e, 0x20, 0x75, 0x07, 0x97, 0xa6, 0x3e, 0xd5, 0xb9, 0xce, 0x48, 0xa6, 0xf5, 0xd9, 0x00, 0x0b, + 0xda, 0x58, 0xd3, 0xee, 0x80, 0x59, 0x81, 0x23, 0x60, 0xa7, 0xab, 0xf3, 0x8d, 0x65, 0xa4, 0xda, + 0x82, 0xb2, 0xb6, 0xa0, 0xbd, 0xb8, 0x67, 0xcf, 0xfd, 0xf8, 0x56, 0x9f, 0x15, 0x79, 0x4d, 0x47, + 0xa9, 0xe1, 0xf3, 0x31, 0x40, 0x8f, 0x6e, 0x04, 0x52, 0x35, 0xaf, 0x10, 0xbd, 0x00, 0xab, 0x4f, + 0x59, 0x9c, 0x76, 0x88, 0x9b, 0x36, 0xe3, 0x43, 0x66, 0xf7, 0x64, 0x19, 0x2f, 0x3b, 0x78, 0x0d, + 0xdc, 0x12, 0x05, 0x5b, 0x81, 0x27, 0xbb, 0x39, 0x63, 0xc3, 0xf3, 0x7e, 0x65, 0xb1, 0x47, 0xa2, + 0x70, 0xd7, 0xd2, 0x01, 0xcb, 0x29, 0x26, 0x32, 0xc7, 0x3a, 0x31, 0x40, 0x79, 0xbc, 0x99, 0x3e, + 0xec, 0x3e, 0xb8, 0xe3, 0xea, 0x78, 0x8b, 0x78, 0x5e, 0x87, 0x72, 0x75, 0x49, 0x73, 0xf6, 0xea, + 0x79, 0xbf, 0x72, 0x57, 0xd9, 0x5e, 0x57, 0x58, 0xce, 0x52, 0xb6, 0xb5, 0xa7, 0x76, 0x04, 0x95, + 0xcb, 0x3c, 0x2a, 0xa8, 0xa6, 0xae, 0x53, 0xe9, 0x80, 0xe5, 0x14, 0xc5, 0x57, 0xd3, 0x6b, 0xfc, + 0x9d, 0x06, 0xb3, 0x2f, 0x45, 0x33, 0xe0, 0x27, 0x03, 0xc8, 0x2e, 0x72, 0xb8, 0x71, 0xc3, 0x4c, + 0x8c, 0xdc, 0x7d, 0xa9, 0x36, 0x91, 0x56, 0x9d, 0xd0, 0xaa, 0x7d, 0xfc, 0xf9, 0xe7, 0x64, 0xea, + 0x21, 0x7c, 0x80, 0xf3, 0xdf, 0x94, 0xa4, 0xf8, 0x6a, 0x80, 0xa2, 0x1a, 0x3f, 0x58, 0x9b, 0x64, 0x48, 0x33, 0xa2, 0xcd, 0xc9, 0xc4, 0x1a, 0x69, 0x53, 0x22, 0xad, 0xc3, 0x35, 0x3c, 0xc1, 0x33, - 0x87, 0xdf, 0x0d, 0xb0, 0x3c, 0xee, 0x0e, 0xe1, 0x93, 0xfc, 0xa2, 0x39, 0x43, 0x54, 0xda, 0xf9, - 0x9f, 0x54, 0x4d, 0xbf, 0x2d, 0xe9, 0xeb, 0xb0, 0x96, 0x4f, 0x7f, 0x3e, 0x34, 0x81, 0x30, 0x79, - 0x7b, 0x32, 0x30, 0x8d, 0xd3, 0x81, 0x69, 0xfc, 0x1e, 0x98, 0xc6, 0x97, 0xa1, 0x59, 0x38, 0x1d, + 0x87, 0xdf, 0x0d, 0xb0, 0x3c, 0xee, 0x0e, 0xe1, 0x93, 0xfc, 0xa2, 0x39, 0x43, 0x54, 0xda, 0xfd, + 0x9f, 0x54, 0x4d, 0xbf, 0x2d, 0xe9, 0xeb, 0xb0, 0x96, 0x4f, 0x7f, 0x31, 0x34, 0x81, 0x30, 0x79, + 0x7b, 0x3a, 0x30, 0x8d, 0xb3, 0x81, 0x69, 0xfc, 0x1e, 0x98, 0xc6, 0x97, 0xa1, 0x59, 0x38, 0x1b, 0x9a, 0x85, 0x5f, 0x43, 0xb3, 0xf0, 0xe6, 0x99, 0x1f, 0xa4, 0xef, 0xba, 0x6d, 0xe4, 0xb2, 0x28, - 0x33, 0xac, 0x87, 0xa4, 0xcd, 0xcf, 0xdd, 0x8f, 0x1a, 0x8f, 0xf0, 0x87, 0xcb, 0x35, 0xdc, 0x30, - 0xa0, 0x71, 0xaa, 0xfe, 0xed, 0xd4, 0xb3, 0x2c, 0xca, 0x9f, 0xed, 0x7f, 0x01, 0x00, 0x00, 0xff, - 0xff, 0xed, 0x85, 0xb1, 0x3e, 0x97, 0x05, 0x00, 0x00, + 0x33, 0xac, 0x87, 0xa4, 0xcd, 0x2f, 0xdc, 0x8f, 0x1b, 0x3b, 0xf8, 0xc3, 0xd5, 0x1a, 0x6e, 0x18, + 0xd0, 0x38, 0x55, 0xff, 0x76, 0xea, 0x59, 0x16, 0xe5, 0xcf, 0xf6, 0xbf, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x03, 0x01, 0x88, 0x9f, 0x97, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cosmwasmpool/cosmwasm/msg/instantiate_msg.pb.go b/x/cosmwasmpool/cosmwasm/msg/instantiate_msg.pb.go index 06e7ccb068d..a74c2b49303 100644 --- a/x/cosmwasmpool/cosmwasm/msg/instantiate_msg.pb.go +++ b/x/cosmwasmpool/cosmwasm/msg/instantiate_msg.pb.go @@ -90,8 +90,8 @@ var fileDescriptor_834d7406456b7712 = []byte{ 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x3e, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0xea, 0x00, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xc8, - 0x44, 0xbf, 0x02, 0xd5, 0x37, 0x30, 0x8e, 0x7e, 0x6e, 0x71, 0x7a, 0x12, 0x1b, 0xd8, 0xf5, 0xc6, - 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x52, 0xd8, 0x73, 0xf9, 0x00, 0x00, 0x00, + 0x54, 0xbf, 0x02, 0xd5, 0x37, 0x30, 0x8e, 0x7e, 0x6e, 0x71, 0x7a, 0x12, 0x1b, 0xd8, 0xf5, 0xc6, + 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1d, 0x45, 0x28, 0xf3, 0xf9, 0x00, 0x00, 0x00, } func (m *InstantiateMsg) Marshal() (dAtA []byte, err error) { diff --git a/x/cosmwasmpool/cosmwasm/msg/module_query_msg.pb.go b/x/cosmwasmpool/cosmwasm/msg/module_query_msg.pb.go index c5b1e4a6b4a..f75120b3571 100644 --- a/x/cosmwasmpool/cosmwasm/msg/module_query_msg.pb.go +++ b/x/cosmwasmpool/cosmwasm/msg/module_query_msg.pb.go @@ -338,33 +338,33 @@ var fileDescriptor_4e43e2b40a371ec3 = []byte{ // 466 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0x4d, 0x6b, 0x13, 0x41, 0x18, 0xc7, 0xb3, 0x2a, 0x36, 0x1d, 0xdf, 0xe8, 0xa2, 0x90, 0x56, 0xd9, 0x96, 0x28, 0xd2, 0x8b, - 0x33, 0xb4, 0x7a, 0x51, 0x44, 0x31, 0x2d, 0x4a, 0x40, 0x08, 0xe4, 0x22, 0xf5, 0xb2, 0xcc, 0x4e, - 0x1e, 0xb7, 0x43, 0x77, 0xe6, 0x49, 0x3b, 0x33, 0xa9, 0x3d, 0xfb, 0x05, 0xfc, 0x36, 0x7e, 0x85, - 0x1e, 0x7b, 0x14, 0x0f, 0x45, 0x92, 0x2f, 0x22, 0xb3, 0x2f, 0x69, 0x36, 0x15, 0x29, 0xc4, 0xcb, - 0xb2, 0x33, 0xcf, 0xfc, 0xff, 0xcf, 0xcb, 0x6f, 0x86, 0xbc, 0x44, 0xa3, 0xd0, 0x48, 0xc3, 0x04, - 0x1a, 0x75, 0xcc, 0x8d, 0x1a, 0x22, 0x66, 0x6c, 0xb4, 0x95, 0x80, 0xe5, 0x5b, 0x4c, 0xe1, 0x00, - 0x32, 0xff, 0x75, 0x19, 0xc4, 0x87, 0x0e, 0x8e, 0x4e, 0x62, 0x65, 0x52, 0x3a, 0x3c, 0x42, 0x8b, - 0xe1, 0xa3, 0x52, 0x4a, 0x67, 0xa5, 0xb4, 0x94, 0xae, 0xdd, 0x4f, 0x31, 0xc5, 0xfc, 0x20, 0xf3, - 0x7f, 0x85, 0x66, 0x2d, 0x12, 0xb9, 0x88, 0x25, 0xdc, 0xc0, 0x34, 0x8b, 0x40, 0xa9, 0x8b, 0x78, - 0xfb, 0x47, 0x40, 0x56, 0x76, 0x78, 0x26, 0x7a, 0xce, 0xbe, 0x53, 0xf6, 0x83, 0x1c, 0x81, 0xee, - 0xea, 0xf0, 0x15, 0x69, 0x5a, 0x3c, 0x00, 0x1d, 0x4b, 0xdd, 0x0a, 0x36, 0x82, 0xcd, 0x5b, 0xdb, - 0xab, 0xb4, 0x30, 0xa2, 0xde, 0xa8, 0xca, 0x49, 0x77, 0x50, 0xea, 0xce, 0x8d, 0xd3, 0xf3, 0xf5, - 0x46, 0x7f, 0x29, 0x17, 0x74, 0x75, 0xf8, 0x94, 0xdc, 0x2b, 0xb4, 0xe8, 0x6c, 0x3c, 0x00, 0x8d, - 0xaa, 0x75, 0x6d, 0x23, 0xd8, 0x5c, 0xee, 0xdf, 0xc9, 0xb7, 0x7b, 0xce, 0xee, 0xfa, 0xcd, 0xf0, - 0x0d, 0x69, 0x9a, 0x63, 0x3e, 0x8c, 0xbf, 0x00, 0xb4, 0xae, 0xfb, 0x03, 0x9d, 0xc7, 0xde, 0xe8, - 0xd7, 0xf9, 0xfa, 0xc3, 0x22, 0x95, 0x19, 0x1c, 0x50, 0x89, 0x4c, 0x71, 0xbb, 0x4f, 0x3f, 0x42, - 0xca, 0xc5, 0xc9, 0x2e, 0x88, 0xfe, 0x92, 0x17, 0xbd, 0x07, 0x68, 0x7f, 0x0b, 0x48, 0xeb, 0x52, - 0xe5, 0x7d, 0x38, 0x74, 0x60, 0x6c, 0x98, 0x92, 0x07, 0x82, 0x67, 0x22, 0xaf, 0x81, 0x2b, 0x1b, - 0xa7, 0x3e, 0x7c, 0xd1, 0x0d, 0xa3, 0xff, 0x1a, 0x25, 0xbd, 0x64, 0x5b, 0xf6, 0xb8, 0x22, 0xe6, - 0x03, 0xed, 0x3d, 0xb2, 0xfa, 0x97, 0x22, 0xcc, 0x10, 0xb5, 0x81, 0xf0, 0x35, 0x59, 0x9e, 0x8e, - 0xe2, 0xaa, 0x73, 0x6c, 0x56, 0x53, 0x9a, 0xa2, 0xe9, 0xea, 0xca, 0xba, 0xe7, 0xec, 0x62, 0x9e, - 0xe1, 0x13, 0x72, 0xb7, 0x02, 0x5b, 0x63, 0x73, 0xbb, 0xa4, 0xf7, 0x7f, 0xd1, 0xd4, 0x2a, 0x9f, - 0x47, 0x23, 0xf5, 0x0c, 0x99, 0x8b, 0x66, 0xae, 0x80, 0xa6, 0x66, 0x3b, 0x8b, 0xa6, 0x16, 0x68, - 0x7f, 0x2a, 0xd0, 0xcc, 0x15, 0x51, 0xa2, 0x59, 0xe0, 0x86, 0x77, 0xf6, 0x4e, 0xc7, 0x51, 0x70, - 0x36, 0x8e, 0x82, 0xdf, 0xe3, 0x28, 0xf8, 0x3e, 0x89, 0x1a, 0x67, 0x93, 0xa8, 0xf1, 0x73, 0x12, - 0x35, 0x3e, 0xbf, 0x4d, 0xa5, 0xdd, 0x77, 0x09, 0x15, 0xa8, 0x58, 0xd9, 0xc6, 0xb3, 0x8c, 0x27, - 0xa6, 0x5a, 0xb0, 0xd1, 0xf6, 0x0b, 0xf6, 0xb5, 0xfe, 0xf4, 0xab, 0x05, 0x53, 0x26, 0x4d, 0x6e, - 0xe6, 0xaf, 0xf2, 0xf9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x79, 0xa9, 0x0a, 0x3b, 0x26, 0x04, + 0x33, 0xb4, 0xe2, 0x41, 0x11, 0xc5, 0xb4, 0x28, 0x01, 0x21, 0x90, 0x8b, 0xd4, 0xcb, 0x32, 0x3b, + 0x79, 0xdc, 0x0e, 0xdd, 0x99, 0x27, 0xed, 0xcc, 0xa4, 0xf6, 0xec, 0x17, 0xf0, 0xdb, 0xf8, 0x15, + 0x7a, 0xec, 0x51, 0x3c, 0x14, 0x49, 0xbe, 0x88, 0xcc, 0xbe, 0xa4, 0xd9, 0x54, 0xa4, 0x10, 0x2f, + 0xcb, 0xce, 0x3c, 0xf3, 0xff, 0x3f, 0x2f, 0xbf, 0x19, 0xf2, 0x12, 0x8d, 0x42, 0x23, 0x0d, 0x13, + 0x68, 0xd4, 0x31, 0x37, 0x6a, 0x88, 0x98, 0xb1, 0xd1, 0x56, 0x02, 0x96, 0x6f, 0x31, 0x85, 0x03, + 0xc8, 0xfc, 0xd7, 0x65, 0x10, 0x1f, 0x3a, 0x38, 0x3a, 0x89, 0x95, 0x49, 0xe9, 0xf0, 0x08, 0x2d, + 0x86, 0x8f, 0x4a, 0x29, 0x9d, 0x95, 0xd2, 0x52, 0xba, 0x76, 0x3f, 0xc5, 0x14, 0xf3, 0x83, 0xcc, + 0xff, 0x15, 0x9a, 0xb5, 0x48, 0xe4, 0x22, 0x96, 0x70, 0x03, 0xd3, 0x2c, 0x02, 0xa5, 0x2e, 0xe2, + 0xed, 0x1f, 0x01, 0x59, 0xd9, 0xe1, 0x99, 0xe8, 0x39, 0xfb, 0x4e, 0xd9, 0x0f, 0x72, 0x04, 0xba, + 0xab, 0xc3, 0x57, 0xa4, 0x69, 0xf1, 0x00, 0x74, 0x2c, 0x75, 0x2b, 0xd8, 0x08, 0x36, 0x6f, 0x6d, + 0xaf, 0xd2, 0xc2, 0x88, 0x7a, 0xa3, 0x2a, 0x27, 0xdd, 0x41, 0xa9, 0x3b, 0x37, 0x4e, 0xcf, 0xd7, + 0x1b, 0xfd, 0xa5, 0x5c, 0xd0, 0xd5, 0xe1, 0x53, 0x72, 0xaf, 0xd0, 0xa2, 0xb3, 0xf1, 0x00, 0x34, + 0xaa, 0xd6, 0xb5, 0x8d, 0x60, 0x73, 0xb9, 0x7f, 0x27, 0xdf, 0xee, 0x39, 0xbb, 0xeb, 0x37, 0xc3, + 0x37, 0xa4, 0x69, 0x8e, 0xf9, 0x30, 0xfe, 0x02, 0xd0, 0xba, 0xee, 0x0f, 0x74, 0x1e, 0x7b, 0xa3, + 0x5f, 0xe7, 0xeb, 0x0f, 0x8b, 0x54, 0x66, 0x70, 0x40, 0x25, 0x32, 0xc5, 0xed, 0x3e, 0xfd, 0x08, + 0x29, 0x17, 0x27, 0xbb, 0x20, 0xfa, 0x4b, 0x5e, 0xf4, 0x1e, 0xa0, 0xfd, 0x2d, 0x20, 0xad, 0x4b, + 0x95, 0xf7, 0xe1, 0xd0, 0x81, 0xb1, 0x61, 0x4a, 0x1e, 0x08, 0x9e, 0x89, 0xbc, 0x06, 0xae, 0x6c, + 0x9c, 0xfa, 0xf0, 0x45, 0x37, 0x8c, 0xfe, 0x6b, 0x94, 0xf4, 0x92, 0x6d, 0xd9, 0xe3, 0x8a, 0x98, + 0x0f, 0xb4, 0xf7, 0xc8, 0xea, 0x5f, 0x8a, 0x30, 0x43, 0xd4, 0x06, 0xc2, 0xd7, 0x64, 0x79, 0x3a, + 0x8a, 0xab, 0xce, 0xb1, 0x59, 0x4d, 0x69, 0x8a, 0xa6, 0xab, 0x2b, 0xeb, 0x9e, 0xb3, 0x8b, 0x79, + 0x86, 0x4f, 0xc8, 0xdd, 0x0a, 0x6c, 0x8d, 0xcd, 0xed, 0x92, 0xde, 0xff, 0x45, 0x53, 0xab, 0x7c, + 0x1e, 0x8d, 0xd4, 0x33, 0x64, 0x2e, 0x9a, 0xb9, 0x02, 0x9a, 0x9a, 0xed, 0x2c, 0x9a, 0x5a, 0xa0, + 0xfd, 0xa9, 0x40, 0x33, 0x57, 0x44, 0x89, 0x66, 0x81, 0x1b, 0xde, 0xd9, 0x3b, 0x1d, 0x47, 0xc1, + 0xd9, 0x38, 0x0a, 0x7e, 0x8f, 0xa3, 0xe0, 0xfb, 0x24, 0x6a, 0x9c, 0x4d, 0xa2, 0xc6, 0xcf, 0x49, + 0xd4, 0xf8, 0xfc, 0x36, 0x95, 0x76, 0xdf, 0x25, 0x54, 0xa0, 0x62, 0x65, 0x1b, 0xcf, 0x32, 0x9e, + 0x98, 0x6a, 0xc1, 0x46, 0xdb, 0x2f, 0xd8, 0xd7, 0xfa, 0xd3, 0xaf, 0x16, 0x4c, 0x99, 0x34, 0xb9, + 0x99, 0xbf, 0xca, 0xe7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x66, 0xbe, 0xfa, 0xbb, 0x26, 0x04, 0x00, 0x00, } diff --git a/x/cosmwasmpool/cosmwasm/msg/module_sudo_msg.pb.go b/x/cosmwasmpool/cosmwasm/msg/module_sudo_msg.pb.go index 04534aa4398..9bfc8dfcd2e 100644 --- a/x/cosmwasmpool/cosmwasm/msg/module_sudo_msg.pb.go +++ b/x/cosmwasmpool/cosmwasm/msg/module_sudo_msg.pb.go @@ -343,43 +343,43 @@ func init() { } var fileDescriptor_e3b9879c5388a3a5 = []byte{ - // 564 bytes of a gzipped FileDescriptorProto + // 565 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x6f, 0xd3, 0x30, 0x18, 0x6d, 0xc6, 0xd8, 0x0f, 0xc3, 0xc6, 0x6a, 0x3a, 0x94, 0x0d, 0xc8, 0x4a, 0x41, 0x68, 0x17, - 0x6c, 0x36, 0x38, 0x20, 0x84, 0x40, 0x94, 0x0d, 0x54, 0x69, 0xa5, 0x52, 0x77, 0x82, 0x4b, 0xe4, - 0x26, 0x5e, 0x16, 0x5a, 0xfb, 0xab, 0x66, 0x67, 0x2d, 0x57, 0x0e, 0x9c, 0xf9, 0x0b, 0xe0, 0xdf, - 0xd9, 0x71, 0x47, 0xc4, 0x61, 0x42, 0xed, 0x3f, 0x82, 0x92, 0x38, 0x2d, 0x5b, 0x54, 0xd4, 0x49, - 0x5c, 0xaa, 0xda, 0xdf, 0xf7, 0xde, 0xfb, 0xfc, 0xf2, 0x6c, 0xf4, 0x0c, 0x94, 0x00, 0x15, 0x2a, - 0xea, 0x81, 0x12, 0x3d, 0xa6, 0x44, 0x17, 0xa0, 0x43, 0x8f, 0xb7, 0x5a, 0x5c, 0xb3, 0x2d, 0x2a, - 0xc0, 0xe7, 0x9d, 0xf8, 0x37, 0xea, 0x70, 0x57, 0x45, 0x3e, 0xb8, 0x42, 0x05, 0xa4, 0x7b, 0x04, - 0x1a, 0xf0, 0x1d, 0x83, 0x24, 0x7f, 0x23, 0x89, 0x41, 0xae, 0x97, 0x02, 0x08, 0x20, 0x69, 0xa4, - 0xf1, 0xbf, 0x14, 0xb3, 0xee, 0x78, 0x09, 0x88, 0xb6, 0x98, 0xe2, 0x23, 0x11, 0x0f, 0x42, 0x99, - 0xd6, 0x2b, 0x3f, 0x66, 0x50, 0x71, 0xbf, 0xc7, 0xba, 0xbb, 0x7d, 0xe6, 0xe9, 0xd7, 0x02, 0x22, - 0xa9, 0x6b, 0x12, 0xdf, 0x42, 0x73, 0x8a, 0x4b, 0x9f, 0x1f, 0xd9, 0x56, 0xd9, 0xda, 0x5c, 0x6c, - 0x9a, 0x15, 0x7e, 0x8e, 0x16, 0x34, 0xb4, 0xb9, 0x74, 0x43, 0x69, 0xcf, 0x94, 0xad, 0xcd, 0x6b, - 0xdb, 0x6b, 0x24, 0x15, 0x20, 0xb1, 0x40, 0x36, 0x0b, 0x79, 0x03, 0xa1, 0xac, 0xce, 0x9e, 0x9c, - 0x6d, 0x14, 0x9a, 0xf3, 0x09, 0xa0, 0x26, 0xf1, 0x43, 0x74, 0x23, 0xc5, 0x42, 0xa4, 0x5d, 0x9f, - 0x4b, 0x10, 0xf6, 0x95, 0x84, 0x7c, 0x29, 0xd9, 0x6e, 0x44, 0x7a, 0x27, 0xde, 0xc4, 0xef, 0x51, - 0x69, 0xdc, 0x27, 0x42, 0xe9, 0xb2, 0x64, 0x2a, 0x7b, 0x36, 0x6e, 0xae, 0xde, 0x8d, 0x49, 0x7f, - 0x9d, 0x6d, 0xac, 0xa6, 0xb2, 0xca, 0x6f, 0x93, 0x10, 0xa8, 0x60, 0xfa, 0x90, 0xd4, 0xa4, 0x6e, - 0x16, 0x33, 0xae, 0x7a, 0x28, 0xd3, 0xd3, 0xe0, 0x97, 0x68, 0x41, 0xf5, 0x58, 0xd7, 0x3d, 0xe0, - 0xdc, 0xbe, 0x9a, 0x70, 0xdc, 0x37, 0x1c, 0xb7, 0xf3, 0x1c, 0x7b, 0x3c, 0x60, 0xde, 0xe7, 0x1d, - 0xee, 0x35, 0xe7, 0x63, 0xd0, 0x5b, 0xce, 0x2b, 0x5f, 0x2c, 0x64, 0xe7, 0x1c, 0xda, 0x8f, 0x7c, - 0xa8, 0xab, 0x00, 0x1f, 0xa0, 0x52, 0x42, 0xce, 0xe3, 0xa2, 0x99, 0x34, 0x36, 0xc7, 0x4a, 0xcc, - 0xa1, 0xe4, 0x5f, 0x5f, 0x8c, 0xe4, 0x58, 0x8d, 0x65, 0x45, 0x75, 0xb1, 0x50, 0x69, 0xa3, 0xf2, - 0xa4, 0x19, 0x9a, 0x5c, 0x75, 0x41, 0x2a, 0x8e, 0xdf, 0xa1, 0x95, 0xb1, 0x71, 0xc6, 0x34, 0x6b, - 0x1a, 0xd3, 0x96, 0x33, 0xd3, 0x52, 0xe6, 0xca, 0xf7, 0x19, 0x84, 0x2f, 0xa8, 0x35, 0x22, 0x3d, - 0x31, 0x14, 0x2f, 0xd0, 0xe2, 0x48, 0x77, 0xda, 0x54, 0x2c, 0x64, 0x92, 0xf8, 0x01, 0x5a, 0xce, - 0x22, 0x75, 0x2e, 0x15, 0xd7, 0x4d, 0x6e, 0xd2, 0x50, 0xec, 0xa1, 0x9b, 0xa3, 0x2e, 0xc1, 0xfa, - 0x97, 0xca, 0xc4, 0x8a, 0x61, 0xaa, 0xb3, 0xfe, 0x7f, 0x8a, 0xc4, 0x57, 0x0b, 0xad, 0xe5, 0x0d, - 0xca, 0x32, 0x11, 0xa2, 0xd5, 0x7c, 0x26, 0x62, 0x6f, 0xd2, 0x50, 0x3c, 0xbe, 0x54, 0x28, 0x1a, - 0x91, 0x36, 0x96, 0x61, 0x95, 0xab, 0x54, 0x3e, 0xa1, 0x7b, 0x13, 0xe7, 0x18, 0xe5, 0x62, 0x37, - 0xbb, 0x78, 0xe3, 0xbb, 0x34, 0x55, 0x2c, 0x96, 0x8c, 0x6f, 0x29, 0x71, 0xf5, 0xc3, 0xc9, 0xc0, - 0xb1, 0x4e, 0x07, 0x8e, 0xf5, 0x7b, 0xe0, 0x58, 0xdf, 0x86, 0x4e, 0xe1, 0x74, 0xe8, 0x14, 0x7e, - 0x0e, 0x9d, 0xc2, 0xc7, 0x57, 0x41, 0xa8, 0x0f, 0xa3, 0x16, 0xf1, 0x40, 0x50, 0x73, 0xb6, 0x47, - 0x1d, 0xd6, 0x52, 0xd9, 0x82, 0x1e, 0x6f, 0x3f, 0xa5, 0xfd, 0xf3, 0xef, 0x5d, 0xb6, 0xa0, 0x42, - 0x05, 0xad, 0xb9, 0xe4, 0x2d, 0x7a, 0xf2, 0x27, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x6a, 0xc5, 0x65, - 0x1b, 0x05, 0x00, 0x00, + 0x6c, 0x36, 0x84, 0x84, 0x10, 0x02, 0x51, 0x36, 0x50, 0xa5, 0x95, 0x4a, 0xdd, 0x09, 0x2e, 0x91, + 0x9b, 0x78, 0x59, 0x68, 0xed, 0xaf, 0x9a, 0x9d, 0xb5, 0x5c, 0x39, 0x70, 0xe6, 0x2f, 0x80, 0x7f, + 0x67, 0xc7, 0x1d, 0x11, 0x87, 0x09, 0xb5, 0xff, 0x08, 0x4a, 0xe2, 0xb4, 0x6c, 0x51, 0x51, 0x27, + 0x71, 0xa9, 0x6a, 0x7f, 0xdf, 0x7b, 0xef, 0xf3, 0xcb, 0xb3, 0xd1, 0x33, 0x50, 0x02, 0x54, 0xa8, + 0xa8, 0x07, 0x4a, 0xf4, 0x98, 0x12, 0x5d, 0x80, 0x0e, 0x3d, 0xde, 0x6a, 0x71, 0xcd, 0xb6, 0xa8, + 0x00, 0x9f, 0x77, 0xe2, 0xdf, 0xa8, 0xc3, 0x5d, 0x15, 0xf9, 0xe0, 0x0a, 0x15, 0x90, 0xee, 0x11, + 0x68, 0xc0, 0x77, 0x0c, 0x92, 0xfc, 0x8d, 0x24, 0x06, 0xb9, 0x5e, 0x0a, 0x20, 0x80, 0xa4, 0x91, + 0xc6, 0xff, 0x52, 0xcc, 0xba, 0xe3, 0x25, 0x20, 0xda, 0x62, 0x8a, 0x8f, 0x44, 0x3c, 0x08, 0x65, + 0x5a, 0xaf, 0xfc, 0x98, 0x41, 0xc5, 0xfd, 0x1e, 0xeb, 0xee, 0xf6, 0x99, 0xa7, 0x5f, 0x0b, 0x88, + 0xa4, 0xae, 0x49, 0x7c, 0x0b, 0xcd, 0x29, 0x2e, 0x7d, 0x7e, 0x64, 0x5b, 0x65, 0x6b, 0x73, 0xb1, + 0x69, 0x56, 0xf8, 0x39, 0x5a, 0xd0, 0xd0, 0xe6, 0xd2, 0x0d, 0xa5, 0x3d, 0x53, 0xb6, 0x36, 0xaf, + 0x6d, 0xaf, 0x91, 0x54, 0x80, 0xc4, 0x02, 0xd9, 0x2c, 0xe4, 0x0d, 0x84, 0xb2, 0x3a, 0x7b, 0x72, + 0xb6, 0x51, 0x68, 0xce, 0x27, 0x80, 0x9a, 0xc4, 0x0f, 0xd1, 0x8d, 0x14, 0x0b, 0x91, 0x76, 0x7d, + 0x2e, 0x41, 0xd8, 0x57, 0x12, 0xf2, 0xa5, 0x64, 0xbb, 0x11, 0xe9, 0x9d, 0x78, 0x13, 0xbf, 0x47, + 0xa5, 0x71, 0x9f, 0x08, 0xa5, 0xcb, 0x92, 0xa9, 0xec, 0xd9, 0xb8, 0xb9, 0x7a, 0x37, 0x26, 0xfd, + 0x75, 0xb6, 0xb1, 0x9a, 0xca, 0x2a, 0xbf, 0x4d, 0x42, 0xa0, 0x82, 0xe9, 0x43, 0x52, 0x93, 0xba, + 0x59, 0xcc, 0xb8, 0xea, 0xa1, 0x4c, 0x4f, 0x83, 0x5f, 0xa2, 0x05, 0xd5, 0x63, 0x5d, 0xf7, 0x80, + 0x73, 0xfb, 0x6a, 0xc2, 0x71, 0xdf, 0x70, 0xdc, 0xce, 0x73, 0xec, 0xf1, 0x80, 0x79, 0x9f, 0x77, + 0xb8, 0xd7, 0x9c, 0x8f, 0x41, 0x6f, 0x39, 0xaf, 0x7c, 0xb1, 0x90, 0x9d, 0x73, 0x68, 0x3f, 0xf2, + 0xa1, 0xae, 0x02, 0x7c, 0x80, 0x4a, 0x09, 0x39, 0x8f, 0x8b, 0x66, 0xd2, 0xd8, 0x1c, 0x2b, 0x31, + 0x87, 0x92, 0x7f, 0x7d, 0x31, 0x92, 0x63, 0x35, 0x96, 0x15, 0xd5, 0xc5, 0x42, 0xa5, 0x8d, 0xca, + 0x93, 0x66, 0x68, 0x72, 0xd5, 0x05, 0xa9, 0x38, 0x7e, 0x87, 0x56, 0xc6, 0xc6, 0x19, 0xd3, 0xac, + 0x69, 0x4c, 0x5b, 0xce, 0x4c, 0x4b, 0x99, 0x2b, 0xdf, 0x67, 0x10, 0xbe, 0xa0, 0xd6, 0x88, 0xf4, + 0xc4, 0x50, 0xbc, 0x40, 0x8b, 0x23, 0xdd, 0x69, 0x53, 0xb1, 0x90, 0x49, 0xe2, 0x07, 0x68, 0x39, + 0x8b, 0xd4, 0xb9, 0x54, 0x5c, 0x37, 0xb9, 0x49, 0x43, 0xb1, 0x87, 0x6e, 0x8e, 0xba, 0x04, 0xeb, + 0x5f, 0x2a, 0x13, 0x2b, 0x86, 0xa9, 0xce, 0xfa, 0xff, 0x29, 0x12, 0x5f, 0x2d, 0xb4, 0x96, 0x37, + 0x28, 0xcb, 0x44, 0x88, 0x56, 0xf3, 0x99, 0x88, 0xbd, 0x49, 0x43, 0xf1, 0xf8, 0x52, 0xa1, 0x68, + 0x44, 0xda, 0x58, 0x86, 0x55, 0xae, 0x52, 0xf9, 0x84, 0xee, 0x4d, 0x9c, 0x63, 0x94, 0x8b, 0xdd, + 0xec, 0xe2, 0x8d, 0xef, 0xd2, 0x54, 0xb1, 0x58, 0x32, 0xbe, 0xa5, 0xc4, 0xd5, 0x0f, 0x27, 0x03, + 0xc7, 0x3a, 0x1d, 0x38, 0xd6, 0xef, 0x81, 0x63, 0x7d, 0x1b, 0x3a, 0x85, 0xd3, 0xa1, 0x53, 0xf8, + 0x39, 0x74, 0x0a, 0x1f, 0x5f, 0x05, 0xa1, 0x3e, 0x8c, 0x5a, 0xc4, 0x03, 0x41, 0xcd, 0xd9, 0x1e, + 0x75, 0x58, 0x4b, 0x65, 0x0b, 0x7a, 0xbc, 0xfd, 0x94, 0xf6, 0xcf, 0xbf, 0x77, 0xd9, 0x82, 0x0a, + 0x15, 0xb4, 0xe6, 0x92, 0xb7, 0xe8, 0xc9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb5, 0x7d, 0x35, + 0xe5, 0x1b, 0x05, 0x00, 0x00, } func (m *SwapExactAmountIn) Marshal() (dAtA []byte, err error) { diff --git a/x/cosmwasmpool/cosmwasm/msg/pool_query_msg.pb.go b/x/cosmwasmpool/cosmwasm/msg/pool_query_msg.pb.go index d85ab2a3fe4..a17ee78af0b 100644 --- a/x/cosmwasmpool/cosmwasm/msg/pool_query_msg.pb.go +++ b/x/cosmwasmpool/cosmwasm/msg/pool_query_msg.pb.go @@ -497,7 +497,7 @@ var fileDescriptor_3251d17e76ef0dc1 = []byte{ // 544 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xc1, 0x6e, 0xd3, 0x40, 0x10, 0x86, 0x63, 0x8a, 0x00, 0x4f, 0x4a, 0x69, 0xad, 0x82, 0xda, 0x40, 0xdd, 0x62, 0x84, 0x08, - 0x48, 0xd8, 0x6a, 0x40, 0x42, 0xe2, 0x00, 0x22, 0x2d, 0xf4, 0x12, 0xa4, 0x26, 0xe1, 0x52, 0x84, + 0x48, 0xd8, 0x6a, 0x10, 0x42, 0xe2, 0x00, 0x22, 0x2d, 0xf4, 0x12, 0xa4, 0x26, 0xe1, 0x52, 0x84, 0x64, 0x6d, 0x9c, 0x65, 0x63, 0x61, 0x67, 0x9c, 0xcc, 0xa6, 0x21, 0xbc, 0x01, 0x37, 0x1e, 0xab, 0xc7, 0x1e, 0x11, 0x87, 0x0a, 0x25, 0x2f, 0x82, 0xd6, 0x71, 0x36, 0x89, 0x52, 0x72, 0xe8, 0x2d, 0x3b, 0x3b, 0xff, 0x7c, 0xf3, 0xcf, 0x6c, 0x0c, 0xaf, 0x90, 0x62, 0xa4, 0x90, 0xbc, 0x00, 0x29, @@ -528,7 +528,7 @@ var fileDescriptor_3251d17e76ef0dc1 = []byte{ 0x0e, 0x6d, 0xe3, 0xd7, 0xc8, 0xce, 0x9d, 0x8f, 0xec, 0xdc, 0xef, 0x91, 0x9d, 0xfb, 0xfc, 0x56, 0x84, 0xb2, 0xd5, 0x6b, 0xb8, 0x01, 0xc6, 0x5e, 0xd6, 0xe9, 0xf3, 0x88, 0x35, 0x68, 0x72, 0xf0, 0x4e, 0x4b, 0x2f, 0xbd, 0xef, 0xf3, 0x9f, 0x97, 0xc9, 0xc1, 0x8b, 0x49, 0x34, 0x6e, 0xa4, 0xff, - 0xfd, 0x17, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9d, 0x9f, 0x65, 0xf8, 0x8a, 0x04, 0x00, 0x00, + 0xfd, 0x17, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x82, 0x88, 0x95, 0x78, 0x8a, 0x04, 0x00, 0x00, } func (m *GetSwapFeeQueryMsg) Marshal() (dAtA []byte, err error) { diff --git a/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_msgs.pb.go b/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_msgs.pb.go index 9c807eed627..eb99501508b 100644 --- a/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_msgs.pb.go +++ b/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_msgs.pb.go @@ -241,22 +241,22 @@ var fileDescriptor_361e9d7404cffed5 = []byte{ // 289 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x91, 0xc1, 0x4a, 0xf3, 0x40, 0x14, 0x85, 0x13, 0xf8, 0xf9, 0xd1, 0x28, 0x2e, 0x8a, 0x0b, 0x2d, 0x65, 0x94, 0xac, 0x44, 0x70, - 0x86, 0x56, 0x17, 0xae, 0x0b, 0xd9, 0x14, 0x0a, 0xd2, 0xa5, 0x9b, 0x92, 0xa4, 0xc3, 0x38, 0x21, - 0x93, 0x1b, 0x73, 0x6f, 0x6a, 0x7c, 0x0b, 0x1f, 0xab, 0xcb, 0x2e, 0x5d, 0x89, 0x24, 0x2f, 0x22, - 0x69, 0xa7, 0x10, 0xa1, 0xba, 0x71, 0x37, 0x87, 0xb9, 0xe7, 0x9c, 0x0f, 0x8e, 0x77, 0x0f, 0x68, - 0x00, 0x35, 0x8a, 0x18, 0xd0, 0xbc, 0x84, 0x68, 0x72, 0x80, 0x54, 0x2c, 0x87, 0x91, 0xa4, 0x70, - 0x28, 0x0c, 0x2c, 0x64, 0x2a, 0xa8, 0x08, 0x33, 0x34, 0x25, 0xc9, 0x62, 0x6e, 0x50, 0x21, 0xcf, - 0x0b, 0x20, 0xe8, 0x0d, 0xac, 0x93, 0x77, 0x9d, 0xdc, 0x3a, 0xfb, 0xa7, 0x0a, 0x14, 0x6c, 0x0e, - 0x45, 0xfb, 0xda, 0x7a, 0xfc, 0x13, 0xef, 0x38, 0x30, 0x39, 0xbd, 0xce, 0xe4, 0x73, 0x29, 0x91, - 0xfc, 0xc4, 0x3b, 0x9f, 0x80, 0xce, 0x1e, 0x00, 0xd2, 0xa0, 0x92, 0x71, 0x49, 0x72, 0x8a, 0xca, - 0x7e, 0xf6, 0xa6, 0xde, 0x61, 0x02, 0x3a, 0x9b, 0xb7, 0xb9, 0x67, 0xee, 0xa5, 0x7b, 0x75, 0x34, - 0xba, 0xe6, 0xbf, 0x95, 0xf2, 0x6e, 0xf6, 0xf8, 0xdf, 0xea, 0xe3, 0xc2, 0x99, 0x1d, 0x24, 0x36, - 0xdf, 0x1f, 0x78, 0xfd, 0x7d, 0x5d, 0x98, 0x43, 0x86, 0xb2, 0x25, 0x09, 0x2a, 0x4d, 0x3f, 0x92, - 0xc8, 0x4a, 0xd3, 0x1f, 0x49, 0xa4, 0xcd, 0x6f, 0x49, 0xf6, 0x75, 0x6d, 0x49, 0xc6, 0x8b, 0x55, - 0xcd, 0xdc, 0x75, 0xcd, 0xdc, 0xcf, 0x9a, 0xb9, 0x6f, 0x0d, 0x73, 0xd6, 0x0d, 0x73, 0xde, 0x1b, - 0xe6, 0x3c, 0x4e, 0x94, 0xa6, 0xa7, 0x32, 0xe2, 0x31, 0x18, 0x61, 0xdb, 0x6f, 0xd2, 0x30, 0xc2, - 0x9d, 0x10, 0xcb, 0xd1, 0x9d, 0xa8, 0xbe, 0x2f, 0xb9, 0x13, 0xc2, 0xa0, 0xea, 0x0c, 0x19, 0xfd, - 0xdf, 0x0c, 0x72, 0xfb, 0x15, 0x00, 0x00, 0xff, 0xff, 0x79, 0x48, 0xd2, 0x1c, 0x00, 0x02, 0x00, + 0x86, 0x56, 0x04, 0xd7, 0x85, 0x6c, 0x0a, 0x05, 0xe9, 0xd2, 0x4d, 0x49, 0xd2, 0x61, 0x9c, 0x90, + 0xc9, 0x8d, 0xb9, 0x37, 0x35, 0xbe, 0x85, 0x8f, 0xd5, 0x65, 0x97, 0xae, 0x44, 0x92, 0x17, 0x91, + 0xb4, 0x53, 0x88, 0x50, 0xdd, 0xb8, 0x9b, 0xc3, 0xdc, 0x73, 0xce, 0x07, 0xc7, 0xbb, 0x07, 0x34, + 0x80, 0x1a, 0x45, 0x0c, 0x68, 0x5e, 0x42, 0x34, 0x39, 0x40, 0x2a, 0x96, 0xc3, 0x48, 0x52, 0x38, + 0x14, 0x06, 0x16, 0x32, 0x15, 0x54, 0x84, 0x19, 0x9a, 0x92, 0x64, 0x31, 0x37, 0xa8, 0x90, 0xe7, + 0x05, 0x10, 0xf4, 0x06, 0xd6, 0xc9, 0xbb, 0x4e, 0x6e, 0x9d, 0xfd, 0x53, 0x05, 0x0a, 0x36, 0x87, + 0xa2, 0x7d, 0x6d, 0x3d, 0xfe, 0x89, 0x77, 0x1c, 0x98, 0x9c, 0x5e, 0x67, 0xf2, 0xb9, 0x94, 0x48, + 0x7e, 0xe2, 0x9d, 0x4f, 0x40, 0x67, 0x0f, 0x00, 0x69, 0x50, 0xc9, 0xb8, 0x24, 0x39, 0x45, 0x65, + 0x3f, 0x7b, 0x53, 0xef, 0x30, 0x01, 0x9d, 0xcd, 0xdb, 0xdc, 0x33, 0xf7, 0xd2, 0xbd, 0x3a, 0x1a, + 0x5d, 0xf3, 0xdf, 0x4a, 0x79, 0x37, 0x7b, 0xfc, 0x6f, 0xf5, 0x71, 0xe1, 0xcc, 0x0e, 0x12, 0x9b, + 0xef, 0x0f, 0xbc, 0xfe, 0xbe, 0x2e, 0xcc, 0x21, 0x43, 0xd9, 0x92, 0x04, 0x95, 0xa6, 0x1f, 0x49, + 0x64, 0xa5, 0xe9, 0x8f, 0x24, 0xd2, 0xe6, 0xb7, 0x24, 0xfb, 0xba, 0xb6, 0x24, 0xe3, 0xc5, 0xaa, + 0x66, 0xee, 0xba, 0x66, 0xee, 0x67, 0xcd, 0xdc, 0xb7, 0x86, 0x39, 0xeb, 0x86, 0x39, 0xef, 0x0d, + 0x73, 0x1e, 0x27, 0x4a, 0xd3, 0x53, 0x19, 0xf1, 0x18, 0x8c, 0xb0, 0xed, 0x37, 0x69, 0x18, 0xe1, + 0x4e, 0x88, 0xe5, 0xe8, 0x4e, 0x54, 0xdf, 0x97, 0xdc, 0x09, 0x61, 0x50, 0x75, 0x86, 0x8c, 0xfe, + 0x6f, 0x06, 0xb9, 0xfd, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xa5, 0xa4, 0x63, 0x21, 0x00, 0x02, 0x00, 0x00, } diff --git a/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_test.go b/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_test.go index 438fff9a44f..50913890e57 100644 --- a/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_test.go +++ b/x/cosmwasmpool/cosmwasm/msg/transmuter/transmuter_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - incentivetypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + incentivetypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) const ( diff --git a/x/cosmwasmpool/genesis.go b/x/cosmwasmpool/genesis.go index 5a69569a2a4..1728a317f14 100644 --- a/x/cosmwasmpool/genesis.go +++ b/x/cosmwasmpool/genesis.go @@ -4,7 +4,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" ) // InitGenesis initializes the store state from a genesis state. diff --git a/x/cosmwasmpool/genesis_test.go b/x/cosmwasmpool/genesis_test.go index 71a37b59265..3a5677e123e 100644 --- a/x/cosmwasmpool/genesis_test.go +++ b/x/cosmwasmpool/genesis_test.go @@ -4,7 +4,7 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" ) diff --git a/x/cosmwasmpool/gov.go b/x/cosmwasmpool/gov.go index 8f29dbf054c..6c54fa33def 100644 --- a/x/cosmwasmpool/gov.go +++ b/x/cosmwasmpool/gov.go @@ -9,7 +9,7 @@ import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" ) func NewCosmWasmPoolProposalHandler(k Keeper) govtypesv1.Handler { diff --git a/x/cosmwasmpool/gov_test.go b/x/cosmwasmpool/gov_test.go index b014cc31af7..2c3b55b4b53 100644 --- a/x/cosmwasmpool/gov_test.go +++ b/x/cosmwasmpool/gov_test.go @@ -9,8 +9,8 @@ import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" ) type CWPoolGovSuite struct { diff --git a/x/cosmwasmpool/keeper.go b/x/cosmwasmpool/keeper.go index d2fb38bb298..ee03238f515 100644 --- a/x/cosmwasmpool/keeper.go +++ b/x/cosmwasmpool/keeper.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/cosmwasmpool/model/codec.go b/x/cosmwasmpool/model/codec.go index c39da5acafb..1a27a8f5aa2 100644 --- a/x/cosmwasmpool/model/codec.go +++ b/x/cosmwasmpool/model/codec.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func RegisterCodec(cdc *codec.LegacyAmino) { diff --git a/x/cosmwasmpool/model/msgs.go b/x/cosmwasmpool/model/msgs.go index fa98159cd28..d2fd71cf5ce 100644 --- a/x/cosmwasmpool/model/msgs.go +++ b/x/cosmwasmpool/model/msgs.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // constants. diff --git a/x/cosmwasmpool/model/pool.go b/x/cosmwasmpool/model/pool.go index c3ff999fd4e..84d97e9d61a 100644 --- a/x/cosmwasmpool/model/pool.go +++ b/x/cosmwasmpool/model/pool.go @@ -5,9 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/cosmwasm/msg" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/cosmwasm/msg" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" "github.com/osmosis-labs/osmosis/osmomath" cosmwasmutils "github.com/osmosis-labs/osmosis/osmoutils/cosmwasm" diff --git a/x/cosmwasmpool/model/pool.pb.go b/x/cosmwasmpool/model/pool.pb.go index 11f3efef5fe..0fc1f93425e 100644 --- a/x/cosmwasmpool/model/pool.pb.go +++ b/x/cosmwasmpool/model/pool.pb.go @@ -108,8 +108,8 @@ var fileDescriptor_a0cb64564a744af1 = []byte{ 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x16, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xd0, 0x60, 0xd5, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x8c, - 0x4c, 0xf4, 0x2b, 0x50, 0x23, 0x06, 0x1c, 0x21, 0x49, 0x6c, 0xe0, 0xd0, 0x33, 0x06, 0x04, 0x00, - 0x00, 0xff, 0xff, 0x8b, 0x90, 0xe7, 0x76, 0xbd, 0x01, 0x00, 0x00, + 0x4c, 0xf5, 0x2b, 0x50, 0x23, 0x06, 0x1c, 0x21, 0x49, 0x6c, 0xe0, 0xd0, 0x33, 0x06, 0x04, 0x00, + 0x00, 0xff, 0xff, 0x83, 0x73, 0x87, 0x4a, 0xbd, 0x01, 0x00, 0x00, } func (m *CosmWasmPool) Marshal() (dAtA []byte, err error) { diff --git a/x/cosmwasmpool/model/pool_test.go b/x/cosmwasmpool/model/pool_test.go index bb28cbd8d5d..e67bb37d030 100644 --- a/x/cosmwasmpool/model/pool_test.go +++ b/x/cosmwasmpool/model/pool_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" ) type CosmWasmPoolSuite struct { diff --git a/x/cosmwasmpool/model/store_model.go b/x/cosmwasmpool/model/store_model.go index 9e43c51a59d..dd8b8dcc6ec 100644 --- a/x/cosmwasmpool/model/store_model.go +++ b/x/cosmwasmpool/model/store_model.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var ( diff --git a/x/cosmwasmpool/model/tx.pb.go b/x/cosmwasmpool/model/tx.pb.go index 9b0b7d25a63..67572b50310 100644 --- a/x/cosmwasmpool/model/tx.pb.go +++ b/x/cosmwasmpool/model/tx.pb.go @@ -147,27 +147,27 @@ var fileDescriptor_2ff1ac8555d314d1 = []byte{ // 364 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xc1, 0x4a, 0xf3, 0x40, 0x10, 0xc7, 0xbb, 0xdf, 0xf7, 0x91, 0xf2, 0x2d, 0x5a, 0x71, 0x51, 0x29, 0x45, 0x93, 0x12, 0x2f, - 0x95, 0x62, 0x96, 0xb6, 0x1e, 0x44, 0x6f, 0x69, 0x2f, 0x3d, 0x14, 0x24, 0x17, 0xc1, 0x4b, 0xd9, - 0x34, 0x4b, 0x0c, 0x64, 0x33, 0x25, 0xbb, 0xd6, 0xfa, 0x02, 0x9e, 0xbd, 0xf8, 0x26, 0x3e, 0x84, - 0xc7, 0x1e, 0x3d, 0x05, 0x49, 0xdf, 0xa0, 0x4f, 0x20, 0x69, 0x52, 0xac, 0x52, 0x3c, 0x78, 0x9b, - 0x9d, 0xf9, 0xfd, 0x77, 0xff, 0x3b, 0x33, 0xb8, 0x09, 0x52, 0x80, 0x0c, 0x24, 0x1d, 0x81, 0x14, - 0xf7, 0x4c, 0x8a, 0x31, 0x40, 0x48, 0x27, 0x2d, 0x97, 0x2b, 0xd6, 0xa2, 0x02, 0x3c, 0x1e, 0x52, - 0x35, 0xb5, 0xc6, 0x31, 0x28, 0x20, 0x87, 0x05, 0x6c, 0xad, 0xc3, 0x56, 0x01, 0xd7, 0xf6, 0x7c, - 0xf0, 0x61, 0x09, 0xd2, 0x2c, 0xca, 0x35, 0xe6, 0x0b, 0xc2, 0xfb, 0x03, 0xe9, 0x77, 0x63, 0xce, - 0x14, 0xef, 0x82, 0x14, 0xd7, 0x4c, 0x8a, 0x2b, 0x80, 0x90, 0x34, 0x71, 0x79, 0x04, 0x1e, 0x1f, - 0x06, 0x5e, 0x15, 0xd5, 0x51, 0xe3, 0x9f, 0x4d, 0x16, 0x89, 0x51, 0x79, 0x60, 0x22, 0xbc, 0x30, - 0x8b, 0x82, 0xe9, 0x68, 0x59, 0xd4, 0xf7, 0x48, 0x17, 0xef, 0x04, 0x91, 0x54, 0x2c, 0x52, 0x01, - 0x53, 0x7c, 0x28, 0xa4, 0x5f, 0xfd, 0x53, 0x47, 0x8d, 0x2d, 0xbb, 0xb6, 0x48, 0x8c, 0x83, 0x5c, - 0xf4, 0x0d, 0x30, 0x9d, 0xca, 0x5a, 0x66, 0x20, 0x7d, 0x72, 0x82, 0x35, 0xc9, 0x23, 0x8f, 0xc7, - 0xd5, 0xbf, 0x75, 0xd4, 0xf8, 0x6f, 0xef, 0x2e, 0x12, 0x63, 0x3b, 0xd7, 0xe6, 0x79, 0xd3, 0x29, - 0x00, 0xb3, 0x87, 0x8f, 0x36, 0xba, 0x76, 0xb8, 0x1c, 0x43, 0x24, 0x39, 0x39, 0xc6, 0xe5, 0xec, - 0xf7, 0x9f, 0xee, 0x71, 0x9a, 0x18, 0x5a, 0x86, 0xf4, 0x7b, 0x8e, 0x96, 0x95, 0xfa, 0x5e, 0xfb, - 0x19, 0x61, 0xbc, 0xba, 0x06, 0x62, 0xf2, 0x88, 0x30, 0xd9, 0xd0, 0x88, 0x8e, 0xf5, 0x53, 0x5f, - 0xad, 0x8d, 0x3e, 0x6a, 0x97, 0xbf, 0x10, 0xad, 0xcc, 0xdb, 0xce, 0x6b, 0xaa, 0xa3, 0x59, 0xaa, - 0xa3, 0xf7, 0x54, 0x47, 0x4f, 0x73, 0xbd, 0x34, 0x9b, 0xeb, 0xa5, 0xb7, 0xb9, 0x5e, 0xba, 0x39, - 0xf7, 0x03, 0x75, 0x7b, 0xe7, 0x5a, 0x23, 0x10, 0xb4, 0x78, 0xe0, 0x34, 0x64, 0xae, 0x5c, 0x1d, - 0xe8, 0xa4, 0x7d, 0x46, 0xa7, 0x5f, 0xb7, 0x65, 0xb9, 0x25, 0xae, 0xb6, 0x9c, 0x77, 0xe7, 0x23, - 0x00, 0x00, 0xff, 0xff, 0xc3, 0x35, 0xc2, 0xc3, 0x52, 0x02, 0x00, 0x00, + 0x95, 0x62, 0x96, 0xb6, 0x08, 0xa2, 0xb7, 0xb4, 0x97, 0x1e, 0x0a, 0x92, 0x8b, 0xe0, 0xa5, 0x6c, + 0x9a, 0x25, 0x06, 0xb2, 0x99, 0x92, 0x5d, 0x6b, 0x7d, 0x01, 0xcf, 0x5e, 0x7c, 0x13, 0x1f, 0xc2, + 0x63, 0x8f, 0x9e, 0x82, 0xa4, 0x6f, 0xd0, 0x27, 0x90, 0x34, 0x29, 0x56, 0x29, 0x1e, 0xbc, 0xcd, + 0xce, 0xfc, 0xfe, 0xbb, 0xff, 0x9d, 0x19, 0xdc, 0x04, 0x29, 0x40, 0x06, 0x92, 0x8e, 0x40, 0x8a, + 0x7b, 0x26, 0xc5, 0x18, 0x20, 0xa4, 0x93, 0x96, 0xcb, 0x15, 0x6b, 0x51, 0x01, 0x1e, 0x0f, 0xa9, + 0x9a, 0x5a, 0xe3, 0x18, 0x14, 0x90, 0xc3, 0x02, 0xb6, 0xd6, 0x61, 0xab, 0x80, 0x6b, 0x7b, 0x3e, + 0xf8, 0xb0, 0x04, 0x69, 0x16, 0xe5, 0x1a, 0xf3, 0x05, 0xe1, 0xfd, 0x81, 0xf4, 0xbb, 0x31, 0x67, + 0x8a, 0x77, 0x41, 0x8a, 0x6b, 0x26, 0xc5, 0x15, 0x40, 0x48, 0x9a, 0xb8, 0x3c, 0x02, 0x8f, 0x0f, + 0x03, 0xaf, 0x8a, 0xea, 0xa8, 0xf1, 0xcf, 0x26, 0x8b, 0xc4, 0xa8, 0x3c, 0x30, 0x11, 0x5e, 0x98, + 0x45, 0xc1, 0x74, 0xb4, 0x2c, 0xea, 0x7b, 0xa4, 0x8b, 0x77, 0x82, 0x48, 0x2a, 0x16, 0xa9, 0x80, + 0x29, 0x3e, 0x14, 0xd2, 0xaf, 0xfe, 0xa9, 0xa3, 0xc6, 0x96, 0x5d, 0x5b, 0x24, 0xc6, 0x41, 0x2e, + 0xfa, 0x06, 0x98, 0x4e, 0x65, 0x2d, 0x33, 0x90, 0x3e, 0x39, 0xc1, 0x9a, 0xe4, 0x91, 0xc7, 0xe3, + 0xea, 0xdf, 0x3a, 0x6a, 0xfc, 0xb7, 0x77, 0x17, 0x89, 0xb1, 0x9d, 0x6b, 0xf3, 0xbc, 0xe9, 0x14, + 0x80, 0xd9, 0xc3, 0x47, 0x1b, 0x5d, 0x3b, 0x5c, 0x8e, 0x21, 0x92, 0x9c, 0x1c, 0xe3, 0x72, 0xf6, + 0xfb, 0x4f, 0xf7, 0x38, 0x4d, 0x0c, 0x2d, 0x43, 0xfa, 0x3d, 0x47, 0xcb, 0x4a, 0x7d, 0xaf, 0xfd, + 0x8c, 0x30, 0x5e, 0x5d, 0x03, 0x31, 0x79, 0x44, 0x98, 0x6c, 0x68, 0x44, 0xc7, 0xfa, 0xa9, 0xaf, + 0xd6, 0x46, 0x1f, 0xb5, 0xcb, 0x5f, 0x88, 0x56, 0xe6, 0x6d, 0xe7, 0x35, 0xd5, 0xd1, 0x2c, 0xd5, + 0xd1, 0x7b, 0xaa, 0xa3, 0xa7, 0xb9, 0x5e, 0x9a, 0xcd, 0xf5, 0xd2, 0xdb, 0x5c, 0x2f, 0xdd, 0x9c, + 0xfb, 0x81, 0xba, 0xbd, 0x73, 0xad, 0x11, 0x08, 0x5a, 0x3c, 0x70, 0x1a, 0x32, 0x57, 0xae, 0x0e, + 0x74, 0xd2, 0x3e, 0xa3, 0xd3, 0xaf, 0xdb, 0xb2, 0xdc, 0x12, 0x57, 0x5b, 0xce, 0xbb, 0xf3, 0x11, + 0x00, 0x00, 0xff, 0xff, 0xcb, 0xd6, 0xa2, 0xff, 0x52, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cosmwasmpool/module/module.go b/x/cosmwasmpool/module/module.go index e14444f90e6..2fa8b53c3c5 100644 --- a/x/cosmwasmpool/module/module.go +++ b/x/cosmwasmpool/module/module.go @@ -14,14 +14,14 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - cosmwasmpool "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool" - moduleclient "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/client" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/client/grpc" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + cosmwasmpool "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool" + moduleclient "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/client" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/client/grpc" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" ) var ( diff --git a/x/cosmwasmpool/msg_server.go b/x/cosmwasmpool/msg_server.go index 0018a6e9bd1..b770e506627 100644 --- a/x/cosmwasmpool/msg_server.go +++ b/x/cosmwasmpool/msg_server.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" ) type msgServer struct { diff --git a/x/cosmwasmpool/pool_module.go b/x/cosmwasmpool/pool_module.go index 3c0f05c98b9..cfaea105fc3 100644 --- a/x/cosmwasmpool/pool_module.go +++ b/x/cosmwasmpool/pool_module.go @@ -6,11 +6,11 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/cosmwasm/msg" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/events" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/cosmwasm/msg" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/events" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" "github.com/osmosis-labs/osmosis/osmoutils/cosmwasm" ) diff --git a/x/cosmwasmpool/pool_module_test.go b/x/cosmwasmpool/pool_module_test.go index 55d410dbfa8..9048f8282a5 100644 --- a/x/cosmwasmpool/pool_module_test.go +++ b/x/cosmwasmpool/pool_module_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) const ( diff --git a/x/cosmwasmpool/store.go b/x/cosmwasmpool/store.go index 81292907ebd..8479bb171d1 100644 --- a/x/cosmwasmpool/store.go +++ b/x/cosmwasmpool/store.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" ) // SetPool stores the given pool in state. diff --git a/x/cosmwasmpool/types/expected_keepers.go b/x/cosmwasmpool/types/expected_keepers.go index cdd622ee685..a5034e9a6be 100644 --- a/x/cosmwasmpool/types/expected_keepers.go +++ b/x/cosmwasmpool/types/expected_keepers.go @@ -6,7 +6,7 @@ import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // AccountKeeper defines the contract needed for AccountKeeper related APIs. diff --git a/x/cosmwasmpool/types/genesis.pb.go b/x/cosmwasmpool/types/genesis.pb.go index ba69e37a773..9bfa6ea6f82 100644 --- a/x/cosmwasmpool/types/genesis.pb.go +++ b/x/cosmwasmpool/types/genesis.pb.go @@ -104,9 +104,9 @@ var fileDescriptor_8fd7fc7fdf8fd2f4 = []byte{ 0xd6, 0x80, 0xfc, 0xfc, 0x1c, 0xcf, 0x20, 0x88, 0x6a, 0xa7, 0xa0, 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, 0xb2, 0x48, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, - 0xd5, 0x87, 0x3a, 0x47, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, 0x33, 0x32, 0xd1, 0xaf, + 0xd5, 0x87, 0x3a, 0x47, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, 0x33, 0x32, 0xd5, 0xaf, 0x40, 0xf5, 0x6e, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x4e, 0x63, 0x40, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x94, 0x31, 0xf7, 0x9c, 0xa9, 0x01, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x9c, 0xd2, 0x97, 0xa0, 0xa9, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/cosmwasmpool/types/gov.pb.go b/x/cosmwasmpool/types/gov.pb.go index 9db9805ce37..dc7ec22f439 100644 --- a/x/cosmwasmpool/types/gov.pb.go +++ b/x/cosmwasmpool/types/gov.pb.go @@ -158,7 +158,7 @@ var fileDescriptor_c184a48c55bbcf5c = []byte{ // 396 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0xb1, 0x8b, 0xd4, 0x40, 0x14, 0xc6, 0x33, 0xee, 0xde, 0xe9, 0xcd, 0x06, 0x91, 0x70, 0x45, 0x94, 0x23, 0x09, 0x57, 0x48, - 0x10, 0x4c, 0x38, 0x15, 0x11, 0xbb, 0xdb, 0xab, 0x0e, 0x5c, 0x38, 0x22, 0xb2, 0x60, 0x13, 0x26, + 0x10, 0x4c, 0x38, 0x45, 0x11, 0xbb, 0xdb, 0xab, 0x0e, 0x5c, 0x38, 0x22, 0xb2, 0x60, 0x13, 0x26, 0x99, 0x21, 0x37, 0x90, 0xc9, 0x0b, 0x79, 0xe3, 0xae, 0xfb, 0x1f, 0x58, 0x5a, 0x5a, 0x6e, 0xed, 0x5f, 0x62, 0xb9, 0xa5, 0x95, 0x48, 0xb6, 0xf1, 0x4f, 0xb0, 0x94, 0x49, 0xb2, 0xb0, 0x0b, 0x16, 0x82, 0xdd, 0x7c, 0x6f, 0xbe, 0xc7, 0xfc, 0xbe, 0xe1, 0xa3, 0x8f, 0x01, 0x15, 0xa0, 0xc4, 0x38, @@ -180,7 +180,7 @@ var fileDescriptor_c184a48c55bbcf5c = []byte{ 0xf5, 0xc8, 0xe7, 0xad, 0x67, 0x6d, 0xb6, 0x9e, 0xf5, 0x7d, 0xeb, 0x59, 0xef, 0x5f, 0x15, 0x52, 0xdf, 0x7e, 0xc8, 0xa2, 0x1c, 0x54, 0x3c, 0x14, 0xe0, 0x69, 0xc9, 0x32, 0xdc, 0x89, 0x78, 0xf1, 0xec, 0x45, 0xfc, 0xf1, 0xb0, 0x3b, 0x7a, 0x55, 0x0b, 0xcc, 0x8e, 0xbb, 0x0a, 0x3c, 0xff, 0x13, - 0x00, 0x00, 0xff, 0xff, 0x32, 0xf8, 0x72, 0x01, 0x60, 0x02, 0x00, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x3a, 0x1b, 0x12, 0x3d, 0x60, 0x02, 0x00, 0x00, } func (this *UploadCosmWasmPoolCodeAndWhiteListProposal) Equal(that interface{}) bool { diff --git a/x/cosmwasmpool/types/gov_test.go b/x/cosmwasmpool/types/gov_test.go index ad8c884cd4a..62aeb72d841 100644 --- a/x/cosmwasmpool/types/gov_test.go +++ b/x/cosmwasmpool/types/gov_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/types" ) type CWPoolGovTypesSuite struct { diff --git a/x/cosmwasmpool/types/params.pb.go b/x/cosmwasmpool/types/params.pb.go index d9e35e3b027..6ba2b55d0cb 100644 --- a/x/cosmwasmpool/types/params.pb.go +++ b/x/cosmwasmpool/types/params.pb.go @@ -105,9 +105,9 @@ var fileDescriptor_6cf69242a2b5e68e = []byte{ 0x12, 0x02, 0x09, 0xfb, 0xc2, 0x44, 0x7d, 0x40, 0x82, 0x4e, 0x41, 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, 0x91, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, - 0xab, 0x0f, 0x0d, 0x00, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xc8, 0x44, 0xbf, + 0xab, 0x0f, 0x0d, 0x00, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xc8, 0x54, 0xbf, 0x02, 0x35, 0xf8, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x41, 0x60, 0x0c, 0x08, 0x00, - 0x00, 0xff, 0xff, 0xe8, 0xee, 0xf4, 0xc6, 0x63, 0x01, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xe0, 0x0d, 0x94, 0xfa, 0x63, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/cosmwasmpool/types/pool.go b/x/cosmwasmpool/types/pool.go index 0981da0c0c5..ea0e7737924 100644 --- a/x/cosmwasmpool/types/pool.go +++ b/x/cosmwasmpool/types/pool.go @@ -3,7 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // CosmWasmExtension diff --git a/x/cosmwasmpool/types/tx.pb.go b/x/cosmwasmpool/types/tx.pb.go index 365407ecfe8..dd70401a29e 100644 --- a/x/cosmwasmpool/types/tx.pb.go +++ b/x/cosmwasmpool/types/tx.pb.go @@ -36,8 +36,8 @@ var fileDescriptor_93020a1fe95e1be8 = []byte{ 0x5b, 0x9c, 0xee, 0x14, 0x74, 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, 0x16, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x50, 0x93, 0x74, 0x73, 0x12, - 0x93, 0x8a, 0x61, 0x1c, 0xfd, 0x32, 0x23, 0x13, 0xfd, 0x0a, 0x54, 0x37, 0x94, 0x54, 0x16, 0xa4, - 0x16, 0x27, 0xb1, 0x81, 0xed, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xb2, 0x0e, 0x6d, 0xec, + 0x93, 0x8a, 0x61, 0x1c, 0xfd, 0x32, 0x23, 0x53, 0xfd, 0x0a, 0x54, 0x37, 0x94, 0x54, 0x16, 0xa4, + 0x16, 0x27, 0xb1, 0x81, 0xed, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xba, 0xed, 0x0d, 0xd0, 0xa8, 0x00, 0x00, 0x00, } diff --git a/x/cosmwasmpool/whitelist_test.go b/x/cosmwasmpool/whitelist_test.go index f98e1e3394d..5ba0ed8fcb3 100644 --- a/x/cosmwasmpool/whitelist_test.go +++ b/x/cosmwasmpool/whitelist_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" ) type WhitelistSuite struct { diff --git a/x/downtime-detector/abci.go b/x/downtime-detector/abci.go index b1295140233..0ff9956f1a1 100644 --- a/x/downtime-detector/abci.go +++ b/x/downtime-detector/abci.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types" ) func (k *Keeper) BeginBlock(ctx sdk.Context) { diff --git a/x/downtime-detector/client/cli/query.go b/x/downtime-detector/client/cli/query.go index c3e8ab69004..214d6b3c52d 100644 --- a/x/downtime-detector/client/cli/query.go +++ b/x/downtime-detector/client/cli/query.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/pflag" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/downtime-detector/client/cli/query_test.go b/x/downtime-detector/client/cli/query_test.go index 4673a33e213..bbe683653fe 100644 --- a/x/downtime-detector/client/cli/query_test.go +++ b/x/downtime-detector/client/cli/query_test.go @@ -5,9 +5,9 @@ import ( "time" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types" ) // We test the custom duration parser via this diff --git a/x/downtime-detector/client/grpc/grpc_query.go b/x/downtime-detector/client/grpc/grpc_query.go index 388ddddece3..6ac92dc5dcf 100644 --- a/x/downtime-detector/client/grpc/grpc_query.go +++ b/x/downtime-detector/client/grpc/grpc_query.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc/status" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client/queryproto" ) type Querier struct { diff --git a/x/downtime-detector/client/query_proto_wrap.go b/x/downtime-detector/client/query_proto_wrap.go index aa41900740e..b6d3b3c3ac2 100644 --- a/x/downtime-detector/client/query_proto_wrap.go +++ b/x/downtime-detector/client/query_proto_wrap.go @@ -3,8 +3,8 @@ package client import ( sdk "github.com/cosmos/cosmos-sdk/types" - downtimedetector "github.com/osmosis-labs/osmosis/v24/x/downtime-detector" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client/queryproto" + downtimedetector "github.com/osmosis-labs/osmosis/v25/x/downtime-detector" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client/queryproto" ) type Querier struct { diff --git a/x/downtime-detector/client/queryproto/query.pb.go b/x/downtime-detector/client/queryproto/query.pb.go index 9f804d4a4b4..6aa5a94bd2d 100644 --- a/x/downtime-detector/client/queryproto/query.pb.go +++ b/x/downtime-detector/client/queryproto/query.pb.go @@ -14,7 +14,7 @@ import ( grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - types "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types" + types "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -152,35 +152,35 @@ var fileDescriptor_3f82bc400cce002f = []byte{ // 488 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0xc1, 0x8b, 0xd3, 0x4e, 0x14, 0x6e, 0x0a, 0xbf, 0x1f, 0x4b, 0x04, 0x85, 0xb8, 0x42, 0xb7, 0x48, 0x52, 0x82, 0xca, 0xb2, - 0xb8, 0x33, 0x6c, 0xd7, 0x83, 0x78, 0xb3, 0x2e, 0xe8, 0x82, 0x20, 0xc6, 0x9b, 0x22, 0x65, 0x32, - 0x7d, 0xcd, 0x0e, 0x24, 0x33, 0xd9, 0xcc, 0xa4, 0x9a, 0xab, 0x27, 0x8f, 0x82, 0x17, 0xff, 0xa4, - 0x3d, 0x2e, 0x78, 0xf1, 0x54, 0xb5, 0xf5, 0x2f, 0xd8, 0x3f, 0x40, 0x24, 0x99, 0x4c, 0x28, 0x51, - 0x36, 0x82, 0xa7, 0x76, 0xf8, 0xbe, 0xf7, 0xbd, 0xef, 0x7b, 0x2f, 0xcf, 0xbe, 0x2b, 0x64, 0x22, - 0x24, 0x93, 0x78, 0x26, 0xde, 0x70, 0xc5, 0x12, 0x98, 0x81, 0x02, 0xaa, 0x44, 0x86, 0x17, 0x07, - 0x21, 0x28, 0x72, 0x80, 0x4f, 0x73, 0xc8, 0x0a, 0x94, 0x66, 0x42, 0x09, 0x67, 0x54, 0xb3, 0x51, - 0x9b, 0x8d, 0x6a, 0xf6, 0x70, 0x3b, 0x12, 0x91, 0xa8, 0xc8, 0xb8, 0xfc, 0xa7, 0xeb, 0x86, 0xa8, - 0xb3, 0x4b, 0x04, 0x1c, 0x4a, 0x61, 0xcd, 0xbf, 0xdf, 0xc9, 0x37, 0xc0, 0x74, 0x96, 0x67, 0x44, - 0x31, 0xc1, 0xeb, 0x4a, 0x97, 0x56, 0xa5, 0x38, 0x24, 0x12, 0x1a, 0x32, 0x15, 0xcc, 0xe0, 0x7b, - 0x9b, 0x78, 0x15, 0xad, 0x61, 0xa5, 0x24, 0x62, 0x7c, 0x53, 0xeb, 0x66, 0x24, 0x44, 0x14, 0x03, - 0x26, 0x29, 0xc3, 0x84, 0x73, 0xa1, 0x2a, 0xd0, 0x78, 0xdc, 0xa9, 0xd1, 0xea, 0x15, 0xe6, 0x73, - 0x4c, 0x78, 0x61, 0x20, 0xdd, 0x64, 0xaa, 0xe7, 0xa0, 0x1f, 0xc6, 0x5f, 0xbb, 0xaa, 0xe5, 0xdf, - 0x6b, 0xe3, 0x65, 0x48, 0xa9, 0x48, 0x92, 0x6a, 0x82, 0xff, 0xdd, 0xb2, 0x6f, 0x07, 0x40, 0xc5, - 0x02, 0x32, 0x98, 0xbd, 0x60, 0x9c, 0xc2, 0x51, 0x3d, 0x8a, 0x67, 0xf3, 0xa7, 0xc0, 0x23, 0x75, - 0x12, 0xc0, 0x69, 0x0e, 0x52, 0x39, 0xaf, 0xec, 0x2d, 0x33, 0xa5, 0x81, 0x35, 0xb2, 0x76, 0xaf, - 0x8e, 0xf7, 0x50, 0xd7, 0xfe, 0x90, 0x11, 0x9b, 0x5c, 0xbf, 0x58, 0x7a, 0xd7, 0x0a, 0x92, 0xc4, - 0x0f, 0x7c, 0x43, 0xf6, 0x83, 0x46, 0xb0, 0x14, 0xcf, 0xb4, 0x8b, 0x62, 0xd0, 0x1f, 0x59, 0xbb, - 0x57, 0xc6, 0x3b, 0x48, 0x5b, 0x47, 0xc6, 0x3a, 0x3a, 0xaa, 0xa3, 0x4d, 0x6e, 0x9d, 0x2d, 0xbd, - 0xde, 0xc5, 0xd2, 0x1b, 0x68, 0x3d, 0x53, 0xd8, 0xec, 0xce, 0xff, 0xf4, 0xd5, 0xb3, 0x82, 0x46, - 0xd0, 0x7f, 0x6d, 0xdf, 0xe9, 0x8a, 0x28, 0x53, 0xc1, 0x25, 0x38, 0x87, 0xf6, 0x0d, 0x99, 0x53, - 0x0a, 0x72, 0x9e, 0xc7, 0x71, 0x31, 0xcd, 0x4c, 0x55, 0x15, 0x78, 0x2b, 0xd8, 0xde, 0x00, 0x1b, - 0xc5, 0xf1, 0xfb, 0xbe, 0xfd, 0xdf, 0xf3, 0x72, 0xf5, 0xce, 0x4f, 0xcb, 0x76, 0x2f, 0xef, 0xe4, - 0x3c, 0xee, 0x9e, 0xd9, 0x5f, 0xad, 0x63, 0xf8, 0xe4, 0xdf, 0x85, 0x74, 0x68, 0xff, 0xf8, 0xdd, - 0xe7, 0x1f, 0x1f, 0xfb, 0x8f, 0x9c, 0x87, 0xb8, 0x7d, 0x26, 0xfb, 0xbf, 0xdd, 0xc9, 0xe5, 0x92, - 0x13, 0x7a, 0xb6, 0x72, 0xad, 0xf3, 0x95, 0x6b, 0x7d, 0x5b, 0xb9, 0xd6, 0x87, 0xb5, 0xdb, 0x3b, - 0x5f, 0xbb, 0xbd, 0x2f, 0x6b, 0xb7, 0xf7, 0xf2, 0x38, 0x62, 0xea, 0x24, 0x0f, 0x11, 0x15, 0x89, - 0x69, 0xb3, 0x1f, 0x93, 0x50, 0x36, 0x3d, 0x17, 0xe3, 0x7b, 0xf8, 0xed, 0x1f, 0x3a, 0xd3, 0x98, - 0x01, 0x57, 0xfa, 0xb6, 0xf4, 0xa7, 0xf0, 0x7f, 0xf5, 0x73, 0xf8, 0x2b, 0x00, 0x00, 0xff, 0xff, - 0x66, 0xf1, 0x43, 0xd2, 0x6c, 0x04, 0x00, 0x00, + 0xb8, 0x33, 0x6c, 0x17, 0x41, 0xbc, 0x59, 0x17, 0x74, 0x41, 0x10, 0xe3, 0x4d, 0x91, 0x32, 0x99, + 0xbe, 0x66, 0x07, 0x92, 0x99, 0x6c, 0x66, 0x52, 0xcd, 0xd5, 0x93, 0x47, 0xc1, 0x8b, 0x7f, 0xd2, + 0x1e, 0x17, 0xbc, 0x78, 0xaa, 0xda, 0xfa, 0x17, 0xec, 0x1f, 0x20, 0x92, 0x4c, 0x26, 0x94, 0x28, + 0x1b, 0xc1, 0x53, 0x3b, 0x7c, 0xdf, 0xfb, 0xde, 0xf7, 0xbd, 0x97, 0x67, 0xdf, 0x15, 0x32, 0x11, + 0x92, 0x49, 0x3c, 0x13, 0x6f, 0xb8, 0x62, 0x09, 0xcc, 0x40, 0x01, 0x55, 0x22, 0xc3, 0x8b, 0x83, + 0x10, 0x14, 0x39, 0xc0, 0xa7, 0x39, 0x64, 0x05, 0x4a, 0x33, 0xa1, 0x84, 0x33, 0xaa, 0xd9, 0xa8, + 0xcd, 0x46, 0x35, 0x7b, 0xb8, 0x1d, 0x89, 0x48, 0x54, 0x64, 0x5c, 0xfe, 0xd3, 0x75, 0x43, 0xd4, + 0xd9, 0x25, 0x02, 0x0e, 0xa5, 0xb0, 0xe6, 0xdf, 0xef, 0xe4, 0x1b, 0x60, 0x3a, 0xcb, 0x33, 0xa2, + 0x98, 0xe0, 0x75, 0xa5, 0x4b, 0xab, 0x52, 0x1c, 0x12, 0x09, 0x0d, 0x99, 0x0a, 0x66, 0xf0, 0xbd, + 0x4d, 0xbc, 0x8a, 0xd6, 0xb0, 0x52, 0x12, 0x31, 0xbe, 0xa9, 0x75, 0x33, 0x12, 0x22, 0x8a, 0x01, + 0x93, 0x94, 0x61, 0xc2, 0xb9, 0x50, 0x15, 0x68, 0x3c, 0xee, 0xd4, 0x68, 0xf5, 0x0a, 0xf3, 0x39, + 0x26, 0xbc, 0x30, 0x90, 0x6e, 0x32, 0xd5, 0x73, 0xd0, 0x0f, 0xe3, 0xaf, 0x5d, 0xd5, 0xf2, 0xef, + 0xb5, 0xf1, 0x32, 0xa4, 0x54, 0x24, 0x49, 0x35, 0xc1, 0xff, 0x6e, 0xd9, 0xb7, 0x03, 0xa0, 0x62, + 0x01, 0x19, 0xcc, 0x5e, 0x30, 0x4e, 0xe1, 0xa8, 0x1e, 0xc5, 0xb3, 0xf9, 0x53, 0xe0, 0x91, 0x3a, + 0x09, 0xe0, 0x34, 0x07, 0xa9, 0x9c, 0x57, 0xf6, 0x96, 0x99, 0xd2, 0xc0, 0x1a, 0x59, 0xbb, 0x57, + 0xc7, 0x7b, 0xa8, 0x6b, 0x7f, 0xc8, 0x88, 0x4d, 0xae, 0x5f, 0x2c, 0xbd, 0x6b, 0x05, 0x49, 0xe2, + 0x07, 0xbe, 0x21, 0xfb, 0x41, 0x23, 0x58, 0x8a, 0x67, 0xda, 0x45, 0x31, 0xe8, 0x8f, 0xac, 0xdd, + 0x2b, 0xe3, 0x1d, 0xa4, 0xad, 0x23, 0x63, 0x1d, 0x1d, 0xd5, 0xd1, 0x26, 0xb7, 0xce, 0x96, 0x5e, + 0xef, 0x62, 0xe9, 0x0d, 0xb4, 0x9e, 0x29, 0x6c, 0x76, 0xe7, 0x7f, 0xfa, 0xea, 0x59, 0x41, 0x23, + 0xe8, 0xbf, 0xb6, 0xef, 0x74, 0x45, 0x94, 0xa9, 0xe0, 0x12, 0x9c, 0x43, 0xfb, 0x86, 0xcc, 0x29, + 0x05, 0x39, 0xcf, 0xe3, 0xb8, 0x98, 0x66, 0xa6, 0xaa, 0x0a, 0xbc, 0x15, 0x6c, 0x6f, 0x80, 0x8d, + 0xe2, 0xf8, 0x7d, 0xdf, 0xfe, 0xef, 0x79, 0xb9, 0x7a, 0xe7, 0xa7, 0x65, 0xbb, 0x97, 0x77, 0x72, + 0x1e, 0x77, 0xcf, 0xec, 0xaf, 0xd6, 0x31, 0x7c, 0xf2, 0xef, 0x42, 0x3a, 0xb4, 0x7f, 0xfc, 0xee, + 0xf3, 0x8f, 0x8f, 0xfd, 0x47, 0xce, 0x43, 0xdc, 0x3e, 0x93, 0xfd, 0xdf, 0xee, 0xe4, 0x72, 0xc9, + 0x09, 0x3d, 0x5b, 0xb9, 0xd6, 0xf9, 0xca, 0xb5, 0xbe, 0xad, 0x5c, 0xeb, 0xc3, 0xda, 0xed, 0x9d, + 0xaf, 0xdd, 0xde, 0x97, 0xb5, 0xdb, 0x7b, 0x79, 0x1c, 0x31, 0x75, 0x92, 0x87, 0x88, 0x8a, 0xc4, + 0xb4, 0xd9, 0x8f, 0x49, 0x28, 0x9b, 0x9e, 0x8b, 0xf1, 0x3d, 0xfc, 0xf6, 0x0f, 0x9d, 0x69, 0xcc, + 0x80, 0x2b, 0x7d, 0x5b, 0xfa, 0x53, 0xf8, 0xbf, 0xfa, 0x39, 0xfc, 0x15, 0x00, 0x00, 0xff, 0xff, + 0x03, 0xfa, 0x3a, 0xbb, 0x6c, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/downtime-detector/genesis.go b/x/downtime-detector/genesis.go index f098d0814c8..9ab73edbcf7 100644 --- a/x/downtime-detector/genesis.go +++ b/x/downtime-detector/genesis.go @@ -3,7 +3,7 @@ package downtimedetector import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types" ) func (k *Keeper) InitGenesis(ctx sdk.Context, gen *types.GenesisState) { diff --git a/x/downtime-detector/genesis_test.go b/x/downtime-detector/genesis_test.go index 6431b6d1d27..7a31aac37a9 100644 --- a/x/downtime-detector/genesis_test.go +++ b/x/downtime-detector/genesis_test.go @@ -3,7 +3,7 @@ package downtimedetector_test import ( "time" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types" ) func (s *KeeperTestSuite) TestImportExport() { diff --git a/x/downtime-detector/keeper_test.go b/x/downtime-detector/keeper_test.go index 45ce8fa851c..f3076579c4e 100644 --- a/x/downtime-detector/keeper_test.go +++ b/x/downtime-detector/keeper_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types" ) var ( diff --git a/x/downtime-detector/module/module.go b/x/downtime-detector/module/module.go index a2a790f5241..7a12513f6d4 100644 --- a/x/downtime-detector/module/module.go +++ b/x/downtime-detector/module/module.go @@ -15,12 +15,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - downtimedetector "github.com/osmosis-labs/osmosis/v24/x/downtime-detector" - downtimeclient "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client" - downtimecli "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client/grpc" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types" + downtimedetector "github.com/osmosis-labs/osmosis/v25/x/downtime-detector" + downtimeclient "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client" + downtimecli "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client/grpc" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types" ) var ( diff --git a/x/downtime-detector/query.go b/x/downtime-detector/query.go index 36ef2fdb656..ba5152a30f7 100644 --- a/x/downtime-detector/query.go +++ b/x/downtime-detector/query.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types" ) func (k *Keeper) RecoveredSinceDowntimeOfLength(ctx sdk.Context, downtime types.Downtime, recoveryDuration time.Duration) (bool, error) { diff --git a/x/downtime-detector/store.go b/x/downtime-detector/store.go index a7f4823bf88..716d39c408a 100644 --- a/x/downtime-detector/store.go +++ b/x/downtime-detector/store.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/downtime-detector/types" + "github.com/osmosis-labs/osmosis/v25/x/downtime-detector/types" ) func (k *Keeper) GetLastBlockTime(ctx sdk.Context) (time.Time, error) { diff --git a/x/downtime-detector/types/downtime_duration.pb.go b/x/downtime-detector/types/downtime_duration.pb.go index af20b6db9d9..959db7f055b 100644 --- a/x/downtime-detector/types/downtime_duration.pb.go +++ b/x/downtime-detector/types/downtime_duration.pb.go @@ -125,7 +125,7 @@ func init() { var fileDescriptor_0e46a3f710ad43a8 = []byte{ // 327 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x92, 0xcb, 0x4e, 0xf2, 0x50, - 0x14, 0x85, 0xdb, 0x9f, 0x5f, 0xc4, 0x02, 0xb2, 0xa8, 0xd7, 0x51, 0xe3, 0xd8, 0x84, 0xde, 0x28, + 0x14, 0x85, 0xdb, 0x9f, 0x5f, 0xc4, 0x02, 0xb2, 0xa8, 0xd7, 0x51, 0xe3, 0xd8, 0x84, 0xde, 0xa0, 0x04, 0x07, 0x0e, 0x34, 0x0c, 0xb6, 0x83, 0xa3, 0x89, 0x97, 0x98, 0x38, 0x21, 0x14, 0x1a, 0x6d, 0x22, 0x1c, 0x42, 0x0f, 0xa8, 0x6f, 0xe1, 0x33, 0x39, 0x72, 0xc8, 0xd0, 0xa1, 0xa1, 0x2f, 0x62, 0x34, 0xb5, 0x66, 0x33, 0x3c, 0xdf, 0xde, 0x2b, 0x67, 0xaf, 0x95, 0x65, 0x74, 0x64, 0x32, 0x92, @@ -134,15 +134,15 @@ var fileDescriptor_0e46a3f710ad43a8 = []byte{ 0x53, 0xa9, 0xa4, 0x79, 0x90, 0x29, 0xed, 0x55, 0xa5, 0x9d, 0x29, 0x0f, 0xdf, 0x0a, 0x46, 0xa9, 0x9b, 0x0d, 0x4d, 0x18, 0x95, 0xee, 0xcd, 0xe5, 0xc9, 0xf5, 0xd9, 0xc5, 0x79, 0xaf, 0xe9, 0x5e, 0x41, 0x33, 0x6b, 0x46, 0x39, 0x27, 0x9e, 0x80, 0xce, 0x80, 0x2f, 0xf0, 0x8f, 0x81, 0xa6, 0x40, - 0x81, 0x81, 0x40, 0xe0, 0x3f, 0x03, 0x2d, 0x81, 0x35, 0xf6, 0x8d, 0xe7, 0x0a, 0x14, 0x19, 0xf1, - 0x5d, 0x81, 0xf5, 0x95, 0x53, 0x04, 0x4a, 0x8c, 0x04, 0xae, 0xc0, 0x06, 0x23, 0x2d, 0x57, 0xc0, - 0xe0, 0xe7, 0x12, 0xca, 0x66, 0xdd, 0xa8, 0xfe, 0x81, 0x5e, 0x8b, 0x50, 0xe1, 0x0e, 0x08, 0x55, - 0xb6, 0xe3, 0x7f, 0xef, 0x6c, 0x72, 0x53, 0x84, 0x1a, 0x37, 0x45, 0x00, 0x37, 0x45, 0xa8, 0x33, - 0xd0, 0x26, 0x98, 0x0c, 0x1c, 0x11, 0xb6, 0xb8, 0x6d, 0x9f, 0xb0, 0xcd, 0x49, 0x87, 0xb0, 0xc3, - 0x83, 0x08, 0x08, 0xbb, 0x3c, 0x88, 0x36, 0x61, 0x8f, 0x07, 0xd1, 0x21, 0xec, 0x9f, 0xde, 0xbe, + 0x81, 0x81, 0x96, 0xc0, 0x7f, 0x06, 0x02, 0x81, 0x35, 0xf6, 0x8d, 0xe7, 0x0a, 0x14, 0x19, 0xf1, + 0x5d, 0x81, 0xf5, 0x95, 0x53, 0x04, 0x4a, 0x8c, 0xb4, 0x5c, 0x81, 0x0d, 0x46, 0x02, 0x57, 0xc0, + 0xe0, 0xe7, 0x12, 0xca, 0x66, 0xdd, 0xa8, 0xfe, 0x81, 0x5e, 0x40, 0xa8, 0x70, 0x07, 0x84, 0x2a, + 0xdb, 0xf1, 0xbf, 0x77, 0x36, 0xb9, 0x29, 0x42, 0x8d, 0x9b, 0x22, 0x80, 0x9b, 0x22, 0xd4, 0x19, + 0x68, 0x13, 0x4c, 0x06, 0x8e, 0x08, 0x5b, 0xdc, 0xb6, 0x4f, 0xd8, 0xe6, 0xa4, 0x43, 0xd8, 0xe1, + 0x41, 0xb4, 0x08, 0xbb, 0x3c, 0x88, 0x36, 0x61, 0x8f, 0x07, 0xd1, 0x21, 0xec, 0x9f, 0xde, 0xbe, 0x2f, 0x2d, 0x7d, 0xb1, 0xb4, 0xf4, 0xcf, 0xa5, 0xa5, 0xbf, 0xa6, 0x96, 0xb6, 0x48, 0x2d, 0xed, 0x23, 0xb5, 0xb4, 0xbb, 0xe3, 0xfb, 0x58, 0x3d, 0xcc, 0x42, 0x7b, 0x20, 0x47, 0x4e, 0xd6, 0x85, 0xc6, 0x63, 0x3f, 0x4c, 0x7e, 0x1f, 0xce, 0xdc, 0x0f, 0x9c, 0xe7, 0xbc, 0x3f, 0x8d, 0xbc, 0x59, - 0xea, 0x65, 0x12, 0x25, 0x61, 0xf1, 0xa7, 0x46, 0xcd, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x15, - 0x46, 0x3d, 0x5e, 0x82, 0x02, 0x00, 0x00, + 0xea, 0x65, 0x12, 0x25, 0x61, 0xf1, 0xa7, 0x46, 0xcd, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdd, + 0x51, 0xa3, 0x91, 0x82, 0x02, 0x00, 0x00, } diff --git a/x/downtime-detector/types/genesis.pb.go b/x/downtime-detector/types/genesis.pb.go index 2ca2f2f5b91..e376e2818e9 100644 --- a/x/downtime-detector/types/genesis.pb.go +++ b/x/downtime-detector/types/genesis.pb.go @@ -148,7 +148,7 @@ var fileDescriptor_3d44d4cc05d2cb13 = []byte{ // 406 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xc1, 0x6a, 0xe2, 0x40, 0x1c, 0xc6, 0x33, 0xbb, 0xcb, 0xb2, 0x1b, 0xdd, 0x15, 0xb2, 0xb2, 0xb8, 0x1e, 0x92, 0x90, 0x93, - 0x2c, 0x38, 0x83, 0x69, 0x29, 0xa5, 0xd0, 0x4b, 0x68, 0xe9, 0xdd, 0x16, 0x0a, 0xf6, 0x10, 0x26, + 0x2c, 0x38, 0x83, 0x29, 0x2d, 0xa5, 0xd0, 0x4b, 0x68, 0xe9, 0xdd, 0x16, 0x0a, 0xf6, 0x10, 0x26, 0x71, 0x4c, 0x43, 0x93, 0x8c, 0x64, 0x46, 0xdb, 0xbc, 0x85, 0x8f, 0xe5, 0x51, 0x7a, 0x28, 0x3d, 0xd9, 0xa2, 0x6f, 0xe0, 0x13, 0x94, 0x24, 0x33, 0x5a, 0xa5, 0x60, 0x6f, 0xf9, 0xe7, 0xff, 0x7d, 0x1f, 0xdf, 0xef, 0xcf, 0xa8, 0x90, 0xb2, 0x98, 0xb2, 0x90, 0xa1, 0x3e, 0xbd, 0x4f, 0x78, 0x18, @@ -170,8 +170,8 @@ var fileDescriptor_3d44d4cc05d2cb13 = []byte{ 0xd7, 0xd3, 0x85, 0x0e, 0x66, 0x0b, 0x1d, 0xbc, 0x2e, 0x74, 0x30, 0x59, 0xea, 0xca, 0x6c, 0xa9, 0x2b, 0xcf, 0x4b, 0x5d, 0xe9, 0x9d, 0x06, 0x21, 0xbf, 0x1d, 0x79, 0xd0, 0xa7, 0x31, 0x12, 0x50, 0xed, 0x08, 0x7b, 0x4c, 0x0e, 0x68, 0x6c, 0x1f, 0xa2, 0x87, 0xf5, 0x33, 0x68, 0xaf, 0x1f, 0x08, - 0xcf, 0x86, 0x84, 0x79, 0xdf, 0x8b, 0x7e, 0x07, 0x6f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x84, 0xcc, - 0xb2, 0xe3, 0x28, 0x03, 0x00, 0x00, + 0xcf, 0x86, 0x84, 0x79, 0xdf, 0x8b, 0x7e, 0x07, 0x6f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4c, 0xdb, + 0x2c, 0x2c, 0x28, 0x03, 0x00, 0x00, } func (m *GenesisDowntimeEntry) Marshal() (dAtA []byte, err error) { diff --git a/x/gamm/client/cli/cli_test.go b/x/gamm/client/cli/cli_test.go index fe9f05c9f1e..b7b974e39cf 100644 --- a/x/gamm/client/cli/cli_test.go +++ b/x/gamm/client/cli/cli_test.go @@ -9,10 +9,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/gamm/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/gamm/client/cli/query.go b/x/gamm/client/cli/query.go index f1ca620529b..6ae558e105c 100644 --- a/x/gamm/client/cli/query.go +++ b/x/gamm/client/cli/query.go @@ -16,8 +16,8 @@ import ( "gopkg.in/yaml.v2" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) // GetQueryCmd returns the cli query commands for this module. diff --git a/x/gamm/client/cli/query_test.go b/x/gamm/client/cli/query_test.go index 618478a76eb..8d5444f6708 100644 --- a/x/gamm/client/cli/query_test.go +++ b/x/gamm/client/cli/query_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) type QueryTestSuite struct { diff --git a/x/gamm/client/cli/tx.go b/x/gamm/client/cli/tx.go index 6d5db9def96..60a089fdc7b 100644 --- a/x/gamm/client/cli/tx.go +++ b/x/gamm/client/cli/tx.go @@ -14,11 +14,11 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" diff --git a/x/gamm/client/cli/tx_test.go b/x/gamm/client/cli/tx_test.go index 71aaebd0472..0495d912385 100644 --- a/x/gamm/client/cli/tx_test.go +++ b/x/gamm/client/cli/tx_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/gamm/client/cli" ) func TestParseCoinsNoSort(t *testing.T) { diff --git a/x/gamm/client/proposal_handler.go b/x/gamm/client/proposal_handler.go index 35d8beb5bba..bec2ca2a177 100644 --- a/x/gamm/client/proposal_handler.go +++ b/x/gamm/client/proposal_handler.go @@ -1,7 +1,7 @@ package client import ( - "github.com/osmosis-labs/osmosis/v24/x/gamm/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/gamm/client/cli" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" ) diff --git a/x/gamm/handler.go b/x/gamm/handler.go index 877062c2357..3a5d2918900 100644 --- a/x/gamm/handler.go +++ b/x/gamm/handler.go @@ -7,8 +7,8 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) // NewGammProposalHandler is a handler for governance proposals for the GAMM module. diff --git a/x/gamm/keeper/export_test.go b/x/gamm/keeper/export_test.go index 4ddd2e72029..8fbf1d2d4e6 100644 --- a/x/gamm/keeper/export_test.go +++ b/x/gamm/keeper/export_test.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // SetParams sets the total set of params. diff --git a/x/gamm/keeper/gas_test.go b/x/gamm/keeper/gas_test.go index 5d06ec37c70..9f66157a7b8 100644 --- a/x/gamm/keeper/gas_test.go +++ b/x/gamm/keeper/gas_test.go @@ -6,8 +6,8 @@ import ( "time" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/gamm/keeper/genesis.go b/x/gamm/keeper/genesis.go index fb8ac033276..4102b4246d4 100644 --- a/x/gamm/keeper/genesis.go +++ b/x/gamm/keeper/genesis.go @@ -4,8 +4,8 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" ) // InitGenesis initializes the x/gamm module's state from a provided genesis diff --git a/x/gamm/keeper/genesis_test.go b/x/gamm/keeper/genesis_test.go index 56db53afed7..66103f630af 100644 --- a/x/gamm/keeper/genesis_test.go +++ b/x/gamm/keeper/genesis_test.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/x/bank/testutil" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" ) var DefaultMigrationRecords = gammmigration.MigrationRecords{BalancerToConcentratedPoolLinks: []gammmigration.BalancerToConcentratedPoolLink{ diff --git a/x/gamm/keeper/gov.go b/x/gamm/keeper/gov.go index 2b2af238061..b6b37743759 100644 --- a/x/gamm/keeper/gov.go +++ b/x/gamm/keeper/gov.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) func (k Keeper) HandleReplaceMigrationRecordsProposal(ctx sdk.Context, p *types.ReplaceMigrationRecordsProposal) error { diff --git a/x/gamm/keeper/grpc_query.go b/x/gamm/keeper/grpc_query.go index 5602e9188dd..8afe211508e 100644 --- a/x/gamm/keeper/grpc_query.go +++ b/x/gamm/keeper/grpc_query.go @@ -16,10 +16,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/v2types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/v2types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var _ types.QueryServer = Querier{} diff --git a/x/gamm/keeper/grpc_query_test.go b/x/gamm/keeper/grpc_query_test.go index 3ce9e3d9769..bfd87d0b0ff 100644 --- a/x/gamm/keeper/grpc_query_test.go +++ b/x/gamm/keeper/grpc_query_test.go @@ -9,11 +9,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/v2types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/v2types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func (s *KeeperTestSuite) TestCalcExitPoolCoinsFromShares() { diff --git a/x/gamm/keeper/invariants.go b/x/gamm/keeper/invariants.go index 15be4602fb0..4e29190918e 100644 --- a/x/gamm/keeper/invariants.go +++ b/x/gamm/keeper/invariants.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/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 b6251beda16..ee2bb8d02b9 100644 --- a/x/gamm/keeper/keeper.go +++ b/x/gamm/keeper/keeper.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" diff --git a/x/gamm/keeper/keeper_test.go b/x/gamm/keeper/keeper_test.go index 87e1995fd9f..60963d3fcf9 100644 --- a/x/gamm/keeper/keeper_test.go +++ b/x/gamm/keeper/keeper_test.go @@ -8,10 +8,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) type KeeperTestSuite struct { diff --git a/x/gamm/keeper/migrate.go b/x/gamm/keeper/migrate.go index 21e02848d78..55b996e9df7 100644 --- a/x/gamm/keeper/migrate.go +++ b/x/gamm/keeper/migrate.go @@ -6,12 +6,12 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - superfluidtypes "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + superfluidtypes "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/gamm/keeper/migrate_test.go b/x/gamm/keeper/migrate_test.go index d3d5e4f7237..5a1ab437788 100644 --- a/x/gamm/keeper/migrate_test.go +++ b/x/gamm/keeper/migrate_test.go @@ -9,10 +9,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" - poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" + poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) const ( diff --git a/x/gamm/keeper/msg_server.go b/x/gamm/keeper/msg_server.go index f5c4038c937..7fb9b1bb23c 100644 --- a/x/gamm/keeper/msg_server.go +++ b/x/gamm/keeper/msg_server.go @@ -5,10 +5,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type msgServer struct { diff --git a/x/gamm/keeper/msg_server_test.go b/x/gamm/keeper/msg_server_test.go index c3a4b9d6344..ad87cb3c48c 100644 --- a/x/gamm/keeper/msg_server_test.go +++ b/x/gamm/keeper/msg_server_test.go @@ -4,9 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) const ( diff --git a/x/gamm/keeper/pool.go b/x/gamm/keeper/pool.go index 0d794d55442..e331f9e5453 100644 --- a/x/gamm/keeper/pool.go +++ b/x/gamm/keeper/pool.go @@ -11,10 +11,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func (k Keeper) MarshalPool(pool poolmanagertypes.PoolI) ([]byte, error) { diff --git a/x/gamm/keeper/pool_service.go b/x/gamm/keeper/pool_service.go index a066f7acf15..9f6c21453a3 100644 --- a/x/gamm/keeper/pool_service.go +++ b/x/gamm/keeper/pool_service.go @@ -11,8 +11,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // CalculateSpotPrice returns the spot price of the quote asset in terms of the base asset, diff --git a/x/gamm/keeper/pool_service_test.go b/x/gamm/keeper/pool_service_test.go index ef701e1c520..43c4a00a8cc 100644 --- a/x/gamm/keeper/pool_service_test.go +++ b/x/gamm/keeper/pool_service_test.go @@ -11,10 +11,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" _ "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var ( diff --git a/x/gamm/keeper/pool_test.go b/x/gamm/keeper/pool_test.go index 3b2c205751f..7976a00a619 100644 --- a/x/gamm/keeper/pool_test.go +++ b/x/gamm/keeper/pool_test.go @@ -8,12 +8,12 @@ import ( "github.com/golang/mock/gomock" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/tests/mocks" - "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/tests/mocks" + "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var ( @@ -30,7 +30,7 @@ var ( // sdk "github.com/cosmos/cosmos-sdk/types" -// "github.com/osmosis-labs/osmosis/v24/x/gamm/types" +// "github.com/osmosis-labs/osmosis/v25/x/gamm/types" // ) // func (s *KeeperTestSuite) TestCleanupPool() { diff --git a/x/gamm/keeper/share.go b/x/gamm/keeper/share.go index 6018643d5cd..90a3fe6014e 100644 --- a/x/gamm/keeper/share.go +++ b/x/gamm/keeper/share.go @@ -4,9 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/events" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/events" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func (k Keeper) applyJoinPoolStateChange(ctx sdk.Context, pool poolmanagertypes.PoolI, joiner sdk.AccAddress, numShares osmomath.Int, joinCoins sdk.Coins) error { diff --git a/x/gamm/keeper/swap.go b/x/gamm/keeper/swap.go index 487a63a28e0..b56456c6aec 100644 --- a/x/gamm/keeper/swap.go +++ b/x/gamm/keeper/swap.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/events" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/events" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // swapExactAmountIn is an internal method for swapping an exact amount of tokens diff --git a/x/gamm/keeper/swap_test.go b/x/gamm/keeper/swap_test.go index 4d97f5cfd9d..fcf21474a0b 100644 --- a/x/gamm/keeper/swap_test.go +++ b/x/gamm/keeper/swap_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var _ = suite.TestingSuite(nil) diff --git a/x/gamm/keeper/total_liquidity.go b/x/gamm/keeper/total_liquidity.go index 0f14b0831ef..735d5f838a8 100644 --- a/x/gamm/keeper/total_liquidity.go +++ b/x/gamm/keeper/total_liquidity.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) func (k Keeper) GetTotalLiquidity(ctx sdk.Context) (sdk.Coins, error) { diff --git a/x/gamm/module.go b/x/gamm/module.go index e37f1a6d7e0..174516ea171 100644 --- a/x/gamm/module.go +++ b/x/gamm/module.go @@ -24,14 +24,14 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - "github.com/osmosis-labs/osmosis/v24/x/gamm/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - simulation "github.com/osmosis-labs/osmosis/v24/x/gamm/simulation" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/v2types" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/x/gamm/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + simulation "github.com/osmosis-labs/osmosis/v25/x/gamm/simulation" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/v2types" ) var ( diff --git a/x/gamm/pool-models/balancer/amm.go b/x/gamm/pool-models/balancer/amm.go index 2b294a82013..9708ace72b3 100644 --- a/x/gamm/pool-models/balancer/amm.go +++ b/x/gamm/pool-models/balancer/amm.go @@ -8,7 +8,7 @@ import ( errorsmod "cosmossdk.io/errors" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) // subPoolAssetWeights subtracts the weights of two different pool asset slices. diff --git a/x/gamm/pool-models/balancer/amm_test.go b/x/gamm/pool-models/balancer/amm_test.go index 5733abf85ab..88cf7d7938f 100644 --- a/x/gamm/pool-models/balancer/amm_test.go +++ b/x/gamm/pool-models/balancer/amm_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/internal/test_helpers" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/internal/test_helpers" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) type BalancerTestSuite struct { diff --git a/x/gamm/pool-models/balancer/balancerPool.pb.go b/x/gamm/pool-models/balancer/balancerPool.pb.go index a56126a43e7..dd66ae1585a 100644 --- a/x/gamm/pool-models/balancer/balancerPool.pb.go +++ b/x/gamm/pool-models/balancer/balancerPool.pb.go @@ -306,59 +306,59 @@ var fileDescriptor_8bed8b78c08e572f = []byte{ // 872 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x4f, 0x6f, 0x1b, 0x45, 0x14, 0xf7, 0x3a, 0x4e, 0xd2, 0x4c, 0x4a, 0x51, 0xa6, 0x46, 0x5a, 0xdb, 0xc2, 0x13, 0x0d, 0x48, - 0x54, 0x55, 0xb3, 0xab, 0x84, 0x8a, 0x43, 0x2e, 0x88, 0x6d, 0x29, 0xaa, 0xc4, 0xa1, 0x6c, 0x91, - 0x4a, 0x11, 0xd2, 0x6a, 0x6c, 0x8f, 0x77, 0x47, 0xdd, 0xdd, 0xb1, 0x76, 0xc6, 0x6e, 0xf3, 0x0d, - 0x10, 0xa7, 0x1e, 0x0b, 0xa7, 0x7e, 0x04, 0x0e, 0x7c, 0x02, 0x4e, 0x11, 0x5c, 0x7a, 0x44, 0x1c, - 0x16, 0x94, 0x1c, 0x90, 0x38, 0x5a, 0x7c, 0x00, 0x34, 0x7f, 0xd6, 0x7f, 0x52, 0x5b, 0x8d, 0x7a, - 0xb1, 0xf6, 0xbd, 0x79, 0xef, 0xf7, 0x7e, 0xef, 0xbd, 0xdf, 0x8c, 0xc1, 0x47, 0x5c, 0x64, 0x5c, - 0x30, 0xe1, 0xc7, 0x24, 0xcb, 0xfc, 0xc9, 0x61, 0x8f, 0x4a, 0x72, 0xe8, 0xf7, 0x48, 0x4a, 0xf2, - 0x3e, 0x2d, 0x1e, 0x70, 0x9e, 0x7a, 0xa3, 0x82, 0x4b, 0x0e, 0x9b, 0x36, 0xd0, 0x53, 0x81, 0x9e, - 0x0d, 0x6c, 0xb7, 0xfa, 0xda, 0x1d, 0xe9, 0x18, 0xdf, 0x18, 0x26, 0xa1, 0xdd, 0x8c, 0x79, 0xcc, - 0x8d, 0x5f, 0x7d, 0x59, 0xef, 0x1e, 0xc9, 0x58, 0xce, 0x7d, 0xfd, 0x6b, 0x5d, 0xdd, 0x98, 0xf3, - 0x38, 0xa5, 0xbe, 0xb6, 0x7a, 0xe3, 0xa1, 0x3f, 0x18, 0x17, 0x44, 0x32, 0x9e, 0xdb, 0x73, 0x74, - 0xf1, 0x5c, 0xb2, 0x8c, 0x0a, 0x49, 0xb2, 0x51, 0x05, 0x60, 0xea, 0xfa, 0x64, 0x2c, 0x93, 0x59, - 0x0b, 0xca, 0xb8, 0x70, 0xde, 0x23, 0x82, 0xce, 0xce, 0xfb, 0x9c, 0xd9, 0x02, 0xf8, 0xf7, 0x0d, - 0xe0, 0x3e, 0xcc, 0x38, 0x97, 0xc9, 0x23, 0xca, 0xe2, 0x44, 0xde, 0x49, 0x48, 0x1e, 0xd3, 0x07, - 0xa4, 0x20, 0x99, 0x80, 0xdf, 0x00, 0x20, 0x24, 0x29, 0x64, 0xa4, 0xaa, 0xba, 0xce, 0xbe, 0x73, - 0x63, 0xf7, 0xa8, 0xed, 0x19, 0x4a, 0x5e, 0x45, 0xc9, 0xfb, 0xba, 0xa2, 0x14, 0xbc, 0x7f, 0x5a, - 0xa2, 0xda, 0xb4, 0x44, 0x7b, 0x27, 0x24, 0x4b, 0x8f, 0xf1, 0x3c, 0x17, 0x3f, 0xff, 0x0b, 0x39, - 0xe1, 0x8e, 0x76, 0xa8, 0x70, 0x98, 0x80, 0x2b, 0x55, 0xa7, 0x6e, 0x5d, 0xe3, 0xb6, 0x5e, 0xc3, - 0xbd, 0x6b, 0x03, 0x82, 0x43, 0x05, 0xfb, 0x6f, 0x89, 0x60, 0x95, 0x72, 0x8b, 0x67, 0x4c, 0xd2, - 0x6c, 0x24, 0x4f, 0xa6, 0x25, 0x7a, 0xd7, 0x14, 0xab, 0xce, 0xf0, 0x0b, 0x55, 0x6a, 0x86, 0x0e, - 0x27, 0xa0, 0xc9, 0x72, 0x26, 0x19, 0x49, 0xa3, 0x11, 0xe7, 0x69, 0xf4, 0x54, 0xb7, 0x29, 0xdc, - 0x8d, 0xfd, 0x8d, 0x1b, 0xbb, 0x47, 0xc8, 0x5b, 0xb5, 0x5a, 0x4f, 0xed, 0xfe, 0x33, 0x21, 0xa8, - 0x0c, 0x3e, 0xb0, 0x2d, 0x75, 0x4c, 0x95, 0x55, 0x50, 0x38, 0x84, 0xd6, 0xad, 0xd2, 0xcc, 0x18, - 0x05, 0x14, 0xe0, 0xba, 0x24, 0x45, 0x4c, 0xe5, 0x72, 0xd9, 0xc6, 0xe5, 0xca, 0x62, 0x5b, 0xb6, - 0x6d, 0xca, 0xae, 0x40, 0xc2, 0xe1, 0x9e, 0xf1, 0x2e, 0x14, 0xc5, 0xff, 0xd5, 0x01, 0x50, 0xb6, - 0xdd, 0xdf, 0x57, 0xe0, 0x8a, 0x78, 0x4a, 0x46, 0xd1, 0x90, 0x9a, 0xed, 0xed, 0x04, 0x9f, 0x28, - 0xdc, 0x3f, 0x4b, 0xd4, 0x31, 0xb2, 0x10, 0x83, 0x27, 0x1e, 0xe3, 0x7e, 0x46, 0x64, 0xe2, 0x7d, - 0x49, 0x63, 0xd2, 0x3f, 0xb9, 0x4b, 0xfb, 0xf3, 0x99, 0x56, 0xc9, 0x38, 0xdc, 0x56, 0x9f, 0xf7, - 0x28, 0x55, 0x90, 0xf4, 0x19, 0x93, 0x1a, 0xb2, 0xfe, 0x16, 0x90, 0x55, 0x32, 0x0e, 0xb7, 0xd5, - 0xa7, 0x82, 0xfc, 0xd1, 0x01, 0x1d, 0xa1, 0x25, 0x68, 0x7b, 0x8b, 0xfa, 0x5a, 0x84, 0xd1, 0x48, - 0x77, 0xe1, 0x6e, 0x68, 0x7d, 0x78, 0xab, 0x47, 0xb6, 0x4e, 0xbb, 0xc1, 0xcd, 0xd3, 0x12, 0x39, - 0xd3, 0x12, 0x61, 0xdb, 0xca, 0xfa, 0x02, 0x38, 0x74, 0xc5, 0x1a, 0x94, 0xe3, 0x0f, 0x7f, 0xf8, - 0xe7, 0xe7, 0x9b, 0x68, 0xe9, 0x9d, 0x08, 0x16, 0xde, 0x07, 0x13, 0x85, 0x7f, 0x72, 0xc0, 0xce, - 0x6c, 0x77, 0xf0, 0x73, 0xb0, 0x29, 0xf9, 0x13, 0x9a, 0xdb, 0x0b, 0xd3, 0xf2, 0xec, 0xd3, 0xa0, - 0xae, 0xe0, 0x8c, 0xf7, 0x1d, 0xce, 0xf2, 0xa0, 0x69, 0xb7, 0x7c, 0xd5, 0x6e, 0x59, 0x65, 0xe1, - 0xd0, 0x64, 0xc3, 0x7b, 0x60, 0xcb, 0xb0, 0xb5, 0x73, 0xf6, 0xec, 0x9c, 0xdf, 0x7b, 0x7d, 0xce, - 0xf7, 0x73, 0x39, 0x2d, 0xd1, 0x3b, 0x06, 0xc5, 0x24, 0xe1, 0xd0, 0x66, 0xe3, 0x5f, 0x1b, 0xa0, - 0xa1, 0xc8, 0xc1, 0x5b, 0x60, 0x9b, 0x0c, 0x06, 0x05, 0x15, 0xc2, 0x8a, 0x01, 0x4e, 0x4b, 0x74, - 0xcd, 0x24, 0xd9, 0x03, 0x1c, 0x56, 0x21, 0xf0, 0x1a, 0xa8, 0xb3, 0x81, 0x2e, 0xdd, 0x08, 0xeb, - 0x6c, 0x00, 0x87, 0x60, 0x57, 0xcb, 0x6f, 0x69, 0x29, 0xfb, 0xeb, 0x75, 0x6c, 0xd7, 0x70, 0xe1, - 0xfe, 0x54, 0x8f, 0x6b, 0xb4, 0x80, 0x85, 0x43, 0x30, 0x5a, 0xd4, 0x6c, 0x73, 0x38, 0x96, 0xe3, - 0x82, 0x9a, 0x90, 0x98, 0x4f, 0x68, 0x91, 0xf3, 0xc2, 0x6d, 0x68, 0xca, 0x68, 0x0e, 0xb5, 0x2a, - 0x0a, 0x87, 0xd0, 0xb8, 0x15, 0x83, 0x2f, 0xac, 0x13, 0x3e, 0x06, 0x57, 0x25, 0x97, 0x24, 0x8d, - 0x44, 0x42, 0x0a, 0x2a, 0xdc, 0xcd, 0x37, 0xed, 0xa5, 0x63, 0x49, 0x5f, 0xaf, 0xf6, 0x32, 0x4f, - 0xc6, 0xe1, 0xae, 0x36, 0x1f, 0x6a, 0x0b, 0x7e, 0x67, 0xa7, 0x42, 0xd4, 0xe6, 0x85, 0xbb, 0x75, - 0xb9, 0xdb, 0xdd, 0xb6, 0xf8, 0xd0, 0xe0, 0x2f, 0x20, 0xd8, 0x59, 0xe8, 0x30, 0x01, 0x1f, 0x55, - 0xc4, 0xad, 0x10, 0xb6, 0xf5, 0x0c, 0x6e, 0xbf, 0x49, 0x08, 0x4b, 0xb4, 0x2b, 0x39, 0x18, 0xda, - 0x46, 0xe2, 0xc7, 0xfe, 0xf7, 0x2f, 0x51, 0xed, 0xc5, 0x4b, 0x54, 0xfb, 0xed, 0x97, 0x83, 0x4d, - 0xc5, 0xeb, 0xbe, 0xd2, 0x79, 0x6b, 0xad, 0xce, 0x83, 0xc7, 0xa7, 0x67, 0x5d, 0xe7, 0xd5, 0x59, - 0xd7, 0xf9, 0xfb, 0xac, 0xeb, 0x3c, 0x3f, 0xef, 0xd6, 0x5e, 0x9d, 0x77, 0x6b, 0x7f, 0x9c, 0x77, - 0x6b, 0xdf, 0x7e, 0x1a, 0x33, 0x99, 0x8c, 0x7b, 0x5e, 0x9f, 0x67, 0xbe, 0xcd, 0x3f, 0x48, 0x49, - 0x4f, 0x54, 0x86, 0x3f, 0x39, 0xba, 0xed, 0x3f, 0x33, 0x90, 0xaa, 0xb5, 0x83, 0x8c, 0x0f, 0x68, - 0x2a, 0x66, 0x7f, 0xb3, 0xbd, 0x2d, 0xfd, 0xe0, 0x7f, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xf0, 0x82, 0x73, 0xdf, 0x8e, 0x07, 0x00, 0x00, + 0x54, 0x55, 0xb3, 0xab, 0x84, 0x3f, 0x87, 0x5c, 0x10, 0xdb, 0x52, 0x54, 0x89, 0x43, 0xd9, 0x22, + 0x95, 0x22, 0xa4, 0xd5, 0xd8, 0x1e, 0xef, 0x8e, 0xba, 0xbb, 0x63, 0xed, 0x8c, 0xdd, 0xe6, 0x1b, + 0x20, 0x4e, 0x3d, 0x16, 0x4e, 0xfd, 0x08, 0x1c, 0xf8, 0x04, 0x9c, 0x22, 0xb8, 0xf4, 0x88, 0x38, + 0x2c, 0x28, 0x39, 0x20, 0x71, 0xb4, 0xf8, 0x00, 0x68, 0xfe, 0xac, 0xff, 0xa4, 0xb6, 0x1a, 0xf5, + 0x62, 0xed, 0x7b, 0xf3, 0xde, 0xef, 0xfd, 0xde, 0x7b, 0xbf, 0x19, 0x83, 0x0f, 0xb8, 0xc8, 0xb8, + 0x60, 0xc2, 0x8f, 0x49, 0x96, 0xf9, 0x93, 0xc3, 0x1e, 0x95, 0xe4, 0xd0, 0xef, 0x91, 0x94, 0xe4, + 0x7d, 0x5a, 0xdc, 0xe7, 0x3c, 0xf5, 0x46, 0x05, 0x97, 0x1c, 0x36, 0x6d, 0xa0, 0xa7, 0x02, 0x3d, + 0x1b, 0xd8, 0x6e, 0xf5, 0xb5, 0x3b, 0xd2, 0x31, 0xbe, 0x31, 0x4c, 0x42, 0xbb, 0x19, 0xf3, 0x98, + 0x1b, 0xbf, 0xfa, 0xb2, 0xde, 0x3d, 0x92, 0xb1, 0x9c, 0xfb, 0xfa, 0xd7, 0xba, 0xba, 0x31, 0xe7, + 0x71, 0x4a, 0x7d, 0x6d, 0xf5, 0xc6, 0x43, 0x7f, 0x30, 0x2e, 0x88, 0x64, 0x3c, 0xb7, 0xe7, 0xe8, + 0xe2, 0xb9, 0x64, 0x19, 0x15, 0x92, 0x64, 0xa3, 0x0a, 0xc0, 0xd4, 0xf5, 0xc9, 0x58, 0x26, 0xb3, + 0x16, 0x94, 0x71, 0xe1, 0xbc, 0x47, 0x04, 0x9d, 0x9d, 0xf7, 0x39, 0xb3, 0x05, 0xf0, 0xef, 0x1b, + 0xc0, 0x7d, 0x90, 0x71, 0x2e, 0x93, 0x87, 0x94, 0xc5, 0x89, 0xbc, 0x9d, 0x90, 0x3c, 0xa6, 0xf7, + 0x49, 0x41, 0x32, 0x01, 0xbf, 0x01, 0x40, 0x48, 0x52, 0xc8, 0x48, 0x55, 0x75, 0x9d, 0x7d, 0xe7, + 0xc6, 0xee, 0x51, 0xdb, 0x33, 0x94, 0xbc, 0x8a, 0x92, 0xf7, 0x75, 0x45, 0x29, 0x78, 0xf7, 0xb4, + 0x44, 0xb5, 0x69, 0x89, 0xf6, 0x4e, 0x48, 0x96, 0x1e, 0xe3, 0x79, 0x2e, 0x7e, 0xf6, 0x17, 0x72, + 0xc2, 0x1d, 0xed, 0x50, 0xe1, 0x30, 0x01, 0x57, 0xaa, 0x4e, 0xdd, 0xba, 0xc6, 0x6d, 0xbd, 0x82, + 0x7b, 0xc7, 0x06, 0x04, 0x87, 0x0a, 0xf6, 0xdf, 0x12, 0xc1, 0x2a, 0xe5, 0x16, 0xcf, 0x98, 0xa4, + 0xd9, 0x48, 0x9e, 0x4c, 0x4b, 0xf4, 0xb6, 0x29, 0x56, 0x9d, 0xe1, 0xe7, 0xaa, 0xd4, 0x0c, 0x1d, + 0x4e, 0x40, 0x93, 0xe5, 0x4c, 0x32, 0x92, 0x46, 0x23, 0xce, 0xd3, 0xe8, 0x89, 0x6e, 0x53, 0xb8, + 0x1b, 0xfb, 0x1b, 0x37, 0x76, 0x8f, 0x90, 0xb7, 0x6a, 0xb5, 0x9e, 0xda, 0xfd, 0x67, 0x42, 0x50, + 0x19, 0xbc, 0x67, 0x5b, 0xea, 0x98, 0x2a, 0xab, 0xa0, 0x70, 0x08, 0xad, 0x5b, 0xa5, 0x99, 0x31, + 0x0a, 0x28, 0xc0, 0x75, 0x49, 0x8a, 0x98, 0xca, 0xe5, 0xb2, 0x8d, 0xcb, 0x95, 0xc5, 0xb6, 0x6c, + 0xdb, 0x94, 0x5d, 0x81, 0x84, 0xc3, 0x3d, 0xe3, 0x5d, 0x28, 0x8a, 0xff, 0xab, 0x03, 0xa0, 0x6c, + 0xbb, 0xbf, 0xaf, 0xc0, 0x15, 0xf1, 0x84, 0x8c, 0xa2, 0x21, 0x35, 0xdb, 0xdb, 0x09, 0x3e, 0x51, + 0xb8, 0x7f, 0x96, 0xa8, 0x63, 0x64, 0x21, 0x06, 0x8f, 0x3d, 0xc6, 0xfd, 0x8c, 0xc8, 0xc4, 0xfb, + 0x92, 0xc6, 0xa4, 0x7f, 0x72, 0x87, 0xf6, 0xe7, 0x33, 0xad, 0x92, 0x71, 0xb8, 0xad, 0x3e, 0xef, + 0x52, 0xaa, 0x20, 0xe9, 0x53, 0x26, 0x35, 0x64, 0xfd, 0x0d, 0x20, 0xab, 0x64, 0x1c, 0x6e, 0xab, + 0x4f, 0x05, 0xf9, 0xa3, 0x03, 0x3a, 0x42, 0x4b, 0xd0, 0xf6, 0x16, 0xf5, 0xb5, 0x08, 0xa3, 0x91, + 0xee, 0xc2, 0xdd, 0xd0, 0xfa, 0xf0, 0x56, 0x8f, 0x6c, 0x9d, 0x76, 0x83, 0x9b, 0xa7, 0x25, 0x72, + 0xa6, 0x25, 0xc2, 0xb6, 0x95, 0xf5, 0x05, 0x70, 0xe8, 0x8a, 0x35, 0x28, 0xc7, 0xef, 0xff, 0xf0, + 0xcf, 0xcf, 0x37, 0xd1, 0xd2, 0x3b, 0x11, 0x2c, 0xbc, 0x0f, 0x26, 0x0a, 0xff, 0xe4, 0x80, 0x9d, + 0xd9, 0xee, 0xe0, 0xe7, 0x60, 0x53, 0xf2, 0xc7, 0x34, 0xb7, 0x17, 0xa6, 0xe5, 0xd9, 0xa7, 0x41, + 0x5d, 0xc1, 0x19, 0xef, 0xdb, 0x9c, 0xe5, 0x41, 0xd3, 0x6e, 0xf9, 0xaa, 0xdd, 0xb2, 0xca, 0xc2, + 0xa1, 0xc9, 0x86, 0x77, 0xc1, 0x96, 0x61, 0x6b, 0xe7, 0xec, 0xd9, 0x39, 0xbf, 0xf3, 0xea, 0x9c, + 0xef, 0xe5, 0x72, 0x5a, 0xa2, 0xb7, 0x0c, 0x8a, 0x49, 0xc2, 0xa1, 0xcd, 0xc6, 0xbf, 0x36, 0x40, + 0x43, 0x91, 0x83, 0xb7, 0xc0, 0x36, 0x19, 0x0c, 0x0a, 0x2a, 0x84, 0x15, 0x03, 0x9c, 0x96, 0xe8, + 0x9a, 0x49, 0xb2, 0x07, 0x38, 0xac, 0x42, 0xe0, 0x35, 0x50, 0x67, 0x03, 0x5d, 0xba, 0x11, 0xd6, + 0xd9, 0x00, 0x0e, 0xc1, 0xae, 0x96, 0xdf, 0xd2, 0x52, 0xf6, 0xd7, 0xeb, 0xd8, 0xae, 0xe1, 0xc2, + 0xfd, 0xa9, 0x1e, 0xd7, 0x68, 0x01, 0x0b, 0x87, 0x60, 0xb4, 0xa8, 0xd9, 0xe6, 0x70, 0x2c, 0xc7, + 0x05, 0x35, 0x21, 0x31, 0x9f, 0xd0, 0x22, 0xe7, 0x85, 0xdb, 0xd0, 0x94, 0xd1, 0x1c, 0x6a, 0x55, + 0x14, 0x0e, 0xa1, 0x71, 0x2b, 0x06, 0x5f, 0x58, 0x27, 0x7c, 0x04, 0xae, 0x4a, 0x2e, 0x49, 0x1a, + 0x89, 0x84, 0x14, 0x54, 0xb8, 0x9b, 0xaf, 0xdb, 0x4b, 0xc7, 0x92, 0xbe, 0x5e, 0xed, 0x65, 0x9e, + 0x8c, 0xc3, 0x5d, 0x6d, 0x3e, 0xd0, 0x16, 0xfc, 0xce, 0x4e, 0x85, 0xa8, 0xcd, 0x0b, 0x77, 0xeb, + 0x72, 0xb7, 0xbb, 0x6d, 0xf1, 0xa1, 0xc1, 0x5f, 0x40, 0xb0, 0xb3, 0xd0, 0x61, 0x02, 0x3e, 0xac, + 0x88, 0x5b, 0x21, 0x6c, 0xeb, 0x19, 0x7c, 0xf4, 0x3a, 0x21, 0x2c, 0xd1, 0xae, 0xe4, 0x60, 0x68, + 0x1b, 0x89, 0x1f, 0xfb, 0xdf, 0xbf, 0x40, 0xb5, 0xe7, 0x2f, 0x50, 0xed, 0xb7, 0x5f, 0x0e, 0x36, + 0x15, 0xaf, 0x7b, 0x4a, 0xe7, 0xad, 0xb5, 0x3a, 0x0f, 0x1e, 0x9d, 0x9e, 0x75, 0x9d, 0x97, 0x67, + 0x5d, 0xe7, 0xef, 0xb3, 0xae, 0xf3, 0xec, 0xbc, 0x5b, 0x7b, 0x79, 0xde, 0xad, 0xfd, 0x71, 0xde, + 0xad, 0x7d, 0xfb, 0x69, 0xcc, 0x64, 0x32, 0xee, 0x79, 0x7d, 0x9e, 0xf9, 0x36, 0xff, 0x20, 0x25, + 0x3d, 0x51, 0x19, 0xfe, 0xe4, 0xe8, 0x63, 0xff, 0xa9, 0x81, 0x54, 0xad, 0x1d, 0x64, 0x7c, 0x40, + 0x53, 0x31, 0xfb, 0x9b, 0xed, 0x6d, 0xe9, 0x07, 0xff, 0xc3, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, + 0xef, 0x95, 0x83, 0x5f, 0x8e, 0x07, 0x00, 0x00, } func (m *SmoothWeightChangeParams) Marshal() (dAtA []byte, err error) { diff --git a/x/gamm/pool-models/balancer/codec.go b/x/gamm/pool-models/balancer/codec.go index 2d34fd91f41..ab52f6a4a37 100644 --- a/x/gamm/pool-models/balancer/codec.go +++ b/x/gamm/pool-models/balancer/codec.go @@ -1,8 +1,8 @@ package balancer import ( - types "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + types "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/gamm/pool-models/balancer/marshal_test.go b/x/gamm/pool-models/balancer/marshal_test.go index 47ed3e49f70..634052e7b0b 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" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/gamm/pool-models/balancer/msgs.go b/x/gamm/pool-models/balancer/msgs.go index 1f38b4bad6b..c3ebd648962 100644 --- a/x/gamm/pool-models/balancer/msgs.go +++ b/x/gamm/pool-models/balancer/msgs.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/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) const ( diff --git a/x/gamm/pool-models/balancer/msgs_test.go b/x/gamm/pool-models/balancer/msgs_test.go index 9980e638704..eed7ffa2d07 100644 --- a/x/gamm/pool-models/balancer/msgs_test.go +++ b/x/gamm/pool-models/balancer/msgs_test.go @@ -9,10 +9,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" - balancer "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" + balancer "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) func TestMsgCreateBalancerPool_ValidateBasic(t *testing.T) { diff --git a/x/gamm/pool-models/balancer/pool.go b/x/gamm/pool-models/balancer/pool.go index 33c3527cad1..9fd9149f756 100644 --- a/x/gamm/pool-models/balancer/pool.go +++ b/x/gamm/pool-models/balancer/pool.go @@ -11,9 +11,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/internal/cfmm_common" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/internal/cfmm_common" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) //nolint:deadcode diff --git a/x/gamm/pool-models/balancer/pool_asset.go b/x/gamm/pool-models/balancer/pool_asset.go index 9ae943b6c1d..32abece69e2 100644 --- a/x/gamm/pool-models/balancer/pool_asset.go +++ b/x/gamm/pool-models/balancer/pool_asset.go @@ -8,7 +8,7 @@ import ( "gopkg.in/yaml.v2" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/gamm/pool-models/balancer/pool_params.go b/x/gamm/pool-models/balancer/pool_params.go index 87c5080d58d..08931497093 100644 --- a/x/gamm/pool-models/balancer/pool_params.go +++ b/x/gamm/pool-models/balancer/pool_params.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) func NewPoolParams(spreadFactor, exitFee osmomath.Dec, params *SmoothWeightChangeParams) PoolParams { diff --git a/x/gamm/pool-models/balancer/pool_suite_test.go b/x/gamm/pool-models/balancer/pool_suite_test.go index 161d4e93b7a..752a35d22f9 100644 --- a/x/gamm/pool-models/balancer/pool_suite_test.go +++ b/x/gamm/pool-models/balancer/pool_suite_test.go @@ -13,10 +13,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - v10 "github.com/osmosis-labs/osmosis/v24/app/upgrades/v10" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + v10 "github.com/osmosis-labs/osmosis/v25/app/upgrades/v10" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) const ( diff --git a/x/gamm/pool-models/balancer/pool_test.go b/x/gamm/pool-models/balancer/pool_test.go index 72b4fd53036..87ea35ff0c1 100644 --- a/x/gamm/pool-models/balancer/pool_test.go +++ b/x/gamm/pool-models/balancer/pool_test.go @@ -11,10 +11,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/internal/test_helpers" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/internal/test_helpers" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var ( diff --git a/x/gamm/pool-models/balancer/tx.pb.go b/x/gamm/pool-models/balancer/tx.pb.go index 98c97de0ec5..db08e2bf9d4 100644 --- a/x/gamm/pool-models/balancer/tx.pb.go +++ b/x/gamm/pool-models/balancer/tx.pb.go @@ -158,35 +158,35 @@ var fileDescriptor_4d22c5192b37962a = []byte{ // 494 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x41, 0x6f, 0xd3, 0x30, 0x14, 0xc7, 0x9b, 0xad, 0x2a, 0xc2, 0x15, 0x87, 0x59, 0x03, 0x55, 0x45, 0x24, 0x25, 0x48, 0x50, - 0x90, 0x6a, 0xab, 0x85, 0xd3, 0x2e, 0x13, 0x61, 0x62, 0xda, 0x61, 0xd2, 0xc8, 0x6d, 0x5c, 0x26, - 0x27, 0xf5, 0x42, 0xa4, 0x38, 0x2f, 0x8a, 0xdd, 0x6a, 0x7c, 0x05, 0x4e, 0x7c, 0x02, 0x8e, 0x9c, - 0xf9, 0x18, 0x3b, 0xee, 0xc8, 0x29, 0x9a, 0xda, 0x03, 0xf7, 0x7e, 0x02, 0x64, 0xc7, 0xd9, 0x56, - 0x54, 0x24, 0x24, 0x2e, 0x51, 0xfc, 0xfc, 0xfb, 0xff, 0xdf, 0xf3, 0x7b, 0x36, 0x1a, 0x83, 0x14, - 0x20, 0x53, 0x49, 0x13, 0x26, 0x04, 0x2d, 0x00, 0x32, 0x01, 0x53, 0x9e, 0x49, 0x1a, 0xb1, 0x8c, - 0xe5, 0x31, 0x2f, 0xe9, 0x7c, 0x1c, 0x71, 0xc5, 0xc6, 0x54, 0x5d, 0x90, 0xa2, 0x04, 0x05, 0x78, - 0x68, 0x25, 0x44, 0x4b, 0xc8, 0xad, 0x84, 0x34, 0x12, 0x62, 0x25, 0xfd, 0xdd, 0x04, 0x12, 0x30, - 0x22, 0xaa, 0xff, 0x6a, 0x7d, 0x7f, 0x87, 0x89, 0x34, 0x07, 0x6a, 0xbe, 0x36, 0xf4, 0x62, 0xad, - 0x8a, 0x26, 0x63, 0xe3, 0x77, 0x02, 0x90, 0x59, 0xd0, 0x8d, 0x0d, 0x49, 0x23, 0x26, 0xf9, 0x0d, - 0x17, 0x43, 0x9a, 0xdb, 0x7d, 0x2f, 0x01, 0x48, 0x32, 0x4e, 0xcd, 0x2a, 0x9a, 0x9d, 0x53, 0x95, - 0x0a, 0x2e, 0x15, 0x13, 0x45, 0x0d, 0xf8, 0xd7, 0x5b, 0xe8, 0xe1, 0xb1, 0x4c, 0xde, 0x95, 0x9c, - 0x29, 0x1e, 0xdc, 0x49, 0x80, 0x5f, 0xa2, 0x8e, 0xe4, 0xf9, 0x94, 0x97, 0x3d, 0x67, 0xe0, 0x0c, - 0xef, 0x07, 0x3b, 0xab, 0xca, 0x7b, 0xf0, 0x99, 0x89, 0x6c, 0xcf, 0xaf, 0xe3, 0x7e, 0x68, 0x01, - 0x7c, 0x8a, 0xba, 0xfa, 0xd8, 0x67, 0x05, 0x2b, 0x99, 0x90, 0xbd, 0xad, 0x81, 0x33, 0xec, 0x4e, - 0x06, 0x64, 0xad, 0x2f, 0xb6, 0x38, 0xa2, 0xbd, 0x4f, 0x0c, 0x17, 0x3c, 0x5a, 0x55, 0x1e, 0xae, - 0x1d, 0xef, 0xc8, 0xfd, 0x10, 0x15, 0x37, 0x0c, 0x7e, 0x6f, 0xad, 0x99, 0x94, 0x5c, 0xc9, 0xde, - 0xf6, 0x60, 0x7b, 0xd8, 0x9d, 0x78, 0x7f, 0xb7, 0x7e, 0xab, 0xb9, 0xa0, 0x7d, 0x59, 0x79, 0xad, - 0xda, 0xc7, 0x04, 0x24, 0xfe, 0x80, 0x76, 0xcf, 0x67, 0x6a, 0x56, 0xf2, 0x33, 0x63, 0x97, 0xc0, - 0x9c, 0x97, 0x39, 0x94, 0xbd, 0xb6, 0x39, 0x9b, 0xb7, 0xaa, 0xbc, 0xc7, 0x75, 0x25, 0x9b, 0x28, - 0x3f, 0xc4, 0x75, 0x58, 0x67, 0x38, 0xb4, 0xc1, 0xbd, 0xe7, 0x5f, 0x7e, 0xfd, 0x78, 0xf5, 0x74, - 0x6d, 0x52, 0xb1, 0x69, 0xe3, 0xa8, 0x19, 0xd4, 0x48, 0xbb, 0xf8, 0x07, 0xe8, 0xc9, 0xc6, 0x0e, - 0x87, 0x5c, 0x16, 0x90, 0x4b, 0x8e, 0x9f, 0xa1, 0x7b, 0x26, 0x5d, 0x3a, 0x35, 0xad, 0x6e, 0x07, - 0x68, 0x51, 0x79, 0x1d, 0x8d, 0x1c, 0x1d, 0x84, 0x1d, 0xbd, 0x75, 0x34, 0x9d, 0x7c, 0x77, 0xd0, - 0xf6, 0xb1, 0x4c, 0xf0, 0x37, 0x07, 0xe1, 0x0d, 0xd3, 0xda, 0x27, 0xff, 0x7a, 0x0b, 0xc9, 0xc6, - 0x62, 0xfa, 0x87, 0xff, 0x69, 0xd0, 0x9c, 0x26, 0x38, 0xbd, 0x5c, 0xb8, 0xce, 0xd5, 0xc2, 0x75, - 0xae, 0x17, 0xae, 0xf3, 0x75, 0xe9, 0xb6, 0xae, 0x96, 0x6e, 0xeb, 0xe7, 0xd2, 0x6d, 0x7d, 0xdc, - 0x4f, 0x52, 0xf5, 0x69, 0x16, 0x91, 0x18, 0x04, 0xb5, 0xc9, 0x46, 0x19, 0x8b, 0x64, 0xb3, 0xa0, - 0xf3, 0xc9, 0x1b, 0x7a, 0x71, 0xfb, 0xf2, 0x46, 0x7f, 0x3c, 0xbd, 0xa8, 0x63, 0xee, 0xec, 0xeb, - 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf5, 0x48, 0x49, 0x6e, 0xa5, 0x03, 0x00, 0x00, + 0x90, 0x6a, 0xab, 0x45, 0x5c, 0x76, 0x99, 0x08, 0x13, 0xd3, 0x0e, 0x93, 0x46, 0x6e, 0xe3, 0x32, + 0x39, 0xa9, 0x17, 0x22, 0xc5, 0x79, 0x51, 0xec, 0x56, 0xe3, 0x2b, 0x70, 0xe2, 0x13, 0x70, 0xe4, + 0xcc, 0xc7, 0xd8, 0x71, 0x47, 0x4e, 0xd1, 0xd4, 0x1e, 0xb8, 0xf7, 0x13, 0x20, 0x3b, 0xce, 0xb6, + 0xa2, 0x22, 0x21, 0x71, 0x89, 0xe2, 0xe7, 0xdf, 0xff, 0xff, 0x9e, 0xdf, 0xb3, 0xd1, 0x18, 0xa4, + 0x00, 0x99, 0x4a, 0x9a, 0x30, 0x21, 0x68, 0x01, 0x90, 0x09, 0x98, 0xf2, 0x4c, 0xd2, 0x88, 0x65, + 0x2c, 0x8f, 0x79, 0x49, 0xe7, 0xe3, 0x88, 0x2b, 0x36, 0xa6, 0xea, 0x82, 0x14, 0x25, 0x28, 0xc0, + 0x43, 0x2b, 0x21, 0x5a, 0x42, 0x6e, 0x25, 0xa4, 0x91, 0x10, 0x2b, 0xe9, 0xef, 0x26, 0x90, 0x80, + 0x11, 0x51, 0xfd, 0x57, 0xeb, 0xfb, 0x3b, 0x4c, 0xa4, 0x39, 0x50, 0xf3, 0xb5, 0xa1, 0x17, 0x6b, + 0x55, 0x34, 0x19, 0x1b, 0xbf, 0x13, 0x80, 0xcc, 0x82, 0x6e, 0x6c, 0x48, 0x1a, 0x31, 0xc9, 0x6f, + 0xb8, 0x18, 0xd2, 0xdc, 0xee, 0x7b, 0x09, 0x40, 0x92, 0x71, 0x6a, 0x56, 0xd1, 0xec, 0x9c, 0xaa, + 0x54, 0x70, 0xa9, 0x98, 0x28, 0x6a, 0xc0, 0xbf, 0xde, 0x42, 0x0f, 0x8f, 0x65, 0xf2, 0xae, 0xe4, + 0x4c, 0xf1, 0xe0, 0x4e, 0x02, 0xfc, 0x12, 0x75, 0x24, 0xcf, 0xa7, 0xbc, 0xec, 0x39, 0x03, 0x67, + 0x78, 0x3f, 0xd8, 0x59, 0x55, 0xde, 0x83, 0xcf, 0x4c, 0x64, 0x7b, 0x7e, 0x1d, 0xf7, 0x43, 0x0b, + 0xe0, 0x53, 0xd4, 0xd5, 0xc7, 0x3e, 0x2b, 0x58, 0xc9, 0x84, 0xec, 0x6d, 0x0d, 0x9c, 0x61, 0x77, + 0x32, 0x20, 0x6b, 0x7d, 0xb1, 0xc5, 0x11, 0xed, 0x7d, 0x62, 0xb8, 0xe0, 0xd1, 0xaa, 0xf2, 0x70, + 0xed, 0x78, 0x47, 0xee, 0x87, 0xa8, 0xb8, 0x61, 0xf0, 0x7b, 0x6b, 0xcd, 0xa4, 0xe4, 0x4a, 0xf6, + 0xb6, 0x07, 0xdb, 0xc3, 0xee, 0xc4, 0xfb, 0xbb, 0xf5, 0x5b, 0xcd, 0x05, 0xed, 0xcb, 0xca, 0x6b, + 0xd5, 0x3e, 0x26, 0x20, 0xf1, 0x07, 0xb4, 0x7b, 0x3e, 0x53, 0xb3, 0x92, 0x9f, 0x19, 0xbb, 0x04, + 0xe6, 0xbc, 0xcc, 0xa1, 0xec, 0xb5, 0xcd, 0xd9, 0xbc, 0x55, 0xe5, 0x3d, 0xae, 0x2b, 0xd9, 0x44, + 0xf9, 0x21, 0xae, 0xc3, 0x3a, 0xc3, 0xa1, 0x0d, 0xee, 0x3d, 0xff, 0xf2, 0xeb, 0xc7, 0xab, 0xa7, + 0x6b, 0x93, 0x8a, 0x4d, 0x1b, 0x47, 0xcd, 0xa0, 0x46, 0xda, 0xc5, 0x3f, 0x40, 0x4f, 0x36, 0x76, + 0x38, 0xe4, 0xb2, 0x80, 0x5c, 0x72, 0xfc, 0x0c, 0xdd, 0x33, 0xe9, 0xd2, 0xa9, 0x69, 0x75, 0x3b, + 0x40, 0x8b, 0xca, 0xeb, 0x68, 0xe4, 0xe8, 0x20, 0xec, 0xe8, 0xad, 0xa3, 0xe9, 0xe4, 0xbb, 0x83, + 0xb6, 0x8f, 0x65, 0x82, 0xbf, 0x39, 0x08, 0x6f, 0x98, 0xd6, 0x3e, 0xf9, 0xd7, 0x5b, 0x48, 0x36, + 0x16, 0xd3, 0x3f, 0xfc, 0x4f, 0x83, 0xe6, 0x34, 0xc1, 0xe9, 0xe5, 0xc2, 0x75, 0xae, 0x16, 0xae, + 0x73, 0xbd, 0x70, 0x9d, 0xaf, 0x4b, 0xb7, 0x75, 0xb5, 0x74, 0x5b, 0x3f, 0x97, 0x6e, 0xeb, 0xe3, + 0x7e, 0x92, 0xaa, 0x4f, 0xb3, 0x88, 0xc4, 0x20, 0xa8, 0x4d, 0x36, 0xca, 0x58, 0x24, 0x9b, 0x05, + 0x9d, 0x4f, 0xde, 0xd0, 0x8b, 0xdb, 0x97, 0x37, 0xfa, 0xe3, 0xe9, 0x45, 0x1d, 0x73, 0x67, 0x5f, + 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xea, 0x5f, 0xb9, 0xee, 0xa5, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gamm/pool-models/balancer/util_test.go b/x/gamm/pool-models/balancer/util_test.go index 7c1d4e503c0..0e54c065557 100644 --- a/x/gamm/pool-models/balancer/util_test.go +++ b/x/gamm/pool-models/balancer/util_test.go @@ -9,7 +9,7 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" ) func createTestPool(t *testing.T, spreadFactor, exitFee osmomath.Dec, poolAssets ...balancer.PoolAsset) *balancer.Pool { diff --git a/x/gamm/pool-models/internal/cfmm_common/lp.go b/x/gamm/pool-models/internal/cfmm_common/lp.go index d953d8763a6..b0611332db4 100644 --- a/x/gamm/pool-models/internal/cfmm_common/lp.go +++ b/x/gamm/pool-models/internal/cfmm_common/lp.go @@ -8,7 +8,7 @@ import ( errorsmod "cosmossdk.io/errors" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) const errMsgFormatSharesLargerThanMax = "cannot exit all shares in a pool. Attempted to exit %s shares, max allowed is %s" diff --git a/x/gamm/pool-models/internal/cfmm_common/lp_test.go b/x/gamm/pool-models/internal/cfmm_common/lp_test.go index 66d4f8e90ad..686212cde59 100644 --- a/x/gamm/pool-models/internal/cfmm_common/lp_test.go +++ b/x/gamm/pool-models/internal/cfmm_common/lp_test.go @@ -7,11 +7,11 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/internal/cfmm_common" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/internal/cfmm_common" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/gamm/pool-models/internal/test_helpers/test_helpers.go b/x/gamm/pool-models/internal/test_helpers/test_helpers.go index 51c77cf5655..b1a3b0daa93 100644 --- a/x/gamm/pool-models/internal/test_helpers/test_helpers.go +++ b/x/gamm/pool-models/internal/test_helpers/test_helpers.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - sdkrand "github.com/osmosis-labs/osmosis/v24/simulation/simtypes/random" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + sdkrand "github.com/osmosis-labs/osmosis/v25/simulation/simtypes/random" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) // CfmmCommonTestSuite is the common test suite struct of Constant Function Market Maker, diff --git a/x/gamm/pool-models/stableswap/amm.go b/x/gamm/pool-models/stableswap/amm.go index c5262a0d8d9..e6caad6a323 100644 --- a/x/gamm/pool-models/stableswap/amm.go +++ b/x/gamm/pool-models/stableswap/amm.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/internal/cfmm_common" - types "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/internal/cfmm_common" + types "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) // Simplified multi-asset CFMM is xy(x^2 + y^2 + w) = k, diff --git a/x/gamm/pool-models/stableswap/amm_test.go b/x/gamm/pool-models/stableswap/amm_test.go index 35b8d02bca5..1e36eab344c 100644 --- a/x/gamm/pool-models/stableswap/amm_test.go +++ b/x/gamm/pool-models/stableswap/amm_test.go @@ -12,10 +12,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - sdkrand "github.com/osmosis-labs/osmosis/v24/simulation/simtypes/random" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/internal/cfmm_common" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/internal/test_helpers" - types "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + sdkrand "github.com/osmosis-labs/osmosis/v25/simulation/simtypes/random" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/internal/cfmm_common" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/internal/test_helpers" + types "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) var ( diff --git a/x/gamm/pool-models/stableswap/codec.go b/x/gamm/pool-models/stableswap/codec.go index 1d5fab6cdc2..448187065bb 100644 --- a/x/gamm/pool-models/stableswap/codec.go +++ b/x/gamm/pool-models/stableswap/codec.go @@ -8,8 +8,8 @@ import ( authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" - types "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + types "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // RegisterLegacyAminoCodec registers the necessary x/gamm interfaces and concrete types diff --git a/x/gamm/pool-models/stableswap/integration_test.go b/x/gamm/pool-models/stableswap/integration_test.go index 963154a8da7..54e1ca82951 100644 --- a/x/gamm/pool-models/stableswap/integration_test.go +++ b/x/gamm/pool-models/stableswap/integration_test.go @@ -11,8 +11,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" ) type TestSuite struct { diff --git a/x/gamm/pool-models/stableswap/msgs.go b/x/gamm/pool-models/stableswap/msgs.go index 9918cdda619..3a63421c0b9 100644 --- a/x/gamm/pool-models/stableswap/msgs.go +++ b/x/gamm/pool-models/stableswap/msgs.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/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) const ( diff --git a/x/gamm/pool-models/stableswap/msgs_test.go b/x/gamm/pool-models/stableswap/msgs_test.go index 8ce7a5e5d74..a3057eadc10 100644 --- a/x/gamm/pool-models/stableswap/msgs_test.go +++ b/x/gamm/pool-models/stableswap/msgs_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" - stableswap "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" + stableswap "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) func baseCreatePoolMsgGen(sender sdk.AccAddress) *stableswap.MsgCreateStableswapPool { diff --git a/x/gamm/pool-models/stableswap/pool.go b/x/gamm/pool-models/stableswap/pool.go index f6ca7966fca..ad009451924 100644 --- a/x/gamm/pool-models/stableswap/pool.go +++ b/x/gamm/pool-models/stableswap/pool.go @@ -10,9 +10,9 @@ import ( errorsmod "cosmossdk.io/errors" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/internal/cfmm_common" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/internal/cfmm_common" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var ( diff --git a/x/gamm/pool-models/stableswap/pool_params.go b/x/gamm/pool-models/stableswap/pool_params.go index f0b1153db38..7fb2cf08faa 100644 --- a/x/gamm/pool-models/stableswap/pool_params.go +++ b/x/gamm/pool-models/stableswap/pool_params.go @@ -2,7 +2,7 @@ package stableswap import ( "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) func (params PoolParams) Validate() error { diff --git a/x/gamm/pool-models/stableswap/pool_test.go b/x/gamm/pool-models/stableswap/pool_test.go index db737bf153b..787f22e6a4c 100644 --- a/x/gamm/pool-models/stableswap/pool_test.go +++ b/x/gamm/pool-models/stableswap/pool_test.go @@ -11,9 +11,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/internal/cfmm_common" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/internal/cfmm_common" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var ( diff --git a/x/gamm/pool-models/stableswap/stableswap_pool.pb.go b/x/gamm/pool-models/stableswap/stableswap_pool.pb.go index 9faf1099895..ae065273711 100644 --- a/x/gamm/pool-models/stableswap/stableswap_pool.pb.go +++ b/x/gamm/pool-models/stableswap/stableswap_pool.pb.go @@ -145,7 +145,7 @@ var fileDescriptor_b99ab4400f54fe92 = []byte{ // 686 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x3d, 0x6f, 0xd3, 0x4e, 0x18, 0xc0, 0xe3, 0x36, 0x6d, 0xfa, 0x77, 0xff, 0xa4, 0xc2, 0x54, 0xc2, 0x6d, 0x84, 0x9d, 0x5a, - 0x14, 0x45, 0x15, 0xf1, 0xd1, 0x82, 0x3a, 0x74, 0x82, 0x14, 0x15, 0x21, 0x55, 0xa8, 0xb8, 0x13, + 0x14, 0x45, 0x15, 0xf1, 0xd1, 0x22, 0x3a, 0x74, 0x82, 0x14, 0x15, 0x21, 0x55, 0xa8, 0xb8, 0x13, 0x30, 0x84, 0xb3, 0x7d, 0x71, 0x4e, 0xb5, 0x73, 0xc6, 0x77, 0x2e, 0xcd, 0xc2, 0x8c, 0x98, 0x18, 0x19, 0x3b, 0x33, 0x31, 0xf0, 0x21, 0x2a, 0x58, 0x3a, 0xa2, 0x0e, 0x06, 0xb5, 0x03, 0x7b, 0x3e, 0x01, 0xba, 0xf3, 0xe5, 0xad, 0x85, 0x0a, 0xb1, 0x24, 0xf7, 0xbc, 0xfd, 0x9e, 0x97, 0x7b, 0x7c, @@ -185,7 +185,7 @@ var fileDescriptor_b99ab4400f54fe92 = []byte{ 0x50, 0x8e, 0x4f, 0x0d, 0xe5, 0xc7, 0xa9, 0xa1, 0xbc, 0x3f, 0x33, 0x0a, 0xc7, 0x67, 0x46, 0xe1, 0xdb, 0x99, 0x51, 0x78, 0xfe, 0x60, 0x64, 0x6e, 0x92, 0x50, 0x0f, 0xa1, 0x4b, 0xfb, 0x02, 0xd8, 0x5f, 0xbb, 0x07, 0x0e, 0x86, 0xaf, 0x62, 0xfd, 0xc2, 0xb3, 0xe8, 0x4e, 0x8b, 0xe7, 0xe0, 0xee, - 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x39, 0x0a, 0x08, 0xef, 0x43, 0x05, 0x00, 0x00, + 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x90, 0x01, 0x81, 0xa1, 0x43, 0x05, 0x00, 0x00, } func (m *PoolParams) Marshal() (dAtA []byte, err error) { diff --git a/x/gamm/pool-models/stableswap/tx.pb.go b/x/gamm/pool-models/stableswap/tx.pb.go index 31a105c58fb..e9ccf549790 100644 --- a/x/gamm/pool-models/stableswap/tx.pb.go +++ b/x/gamm/pool-models/stableswap/tx.pb.go @@ -278,7 +278,7 @@ var fileDescriptor_3a59a47ae7445405 = []byte{ // 671 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xbf, 0x6f, 0xd3, 0x40, 0x14, 0x8e, 0x9b, 0x10, 0xc4, 0x55, 0x80, 0x6a, 0x45, 0x6d, 0x1a, 0x24, 0x3b, 0xb8, 0x0c, 0x69, - 0x91, 0x6d, 0x9a, 0x22, 0x86, 0x4e, 0x34, 0x41, 0x45, 0x15, 0x44, 0x2a, 0xae, 0x58, 0x60, 0x08, + 0x91, 0x6d, 0x9a, 0x0a, 0x86, 0x4e, 0x34, 0x41, 0x45, 0x15, 0x44, 0x2a, 0xae, 0x58, 0x60, 0x08, 0x17, 0xfb, 0x6a, 0x0e, 0x6c, 0x9f, 0xf1, 0x5d, 0xfa, 0x63, 0x64, 0x65, 0xe2, 0xcf, 0x40, 0x4c, 0xfc, 0x15, 0xa8, 0x63, 0x47, 0xa6, 0x80, 0xd2, 0xa1, 0x7b, 0x16, 0xc4, 0x86, 0xee, 0x7c, 0xf9, 0x25, 0x12, 0x4a, 0x50, 0x97, 0xc4, 0x7e, 0x7e, 0xdf, 0xf7, 0xbd, 0xf7, 0xbd, 0x77, 0x07, 0x36, @@ -317,7 +317,7 @@ var fileDescriptor_3a59a47ae7445405 = []byte{ 0xd5, 0x94, 0xd3, 0xae, 0xa6, 0xfc, 0xe8, 0x6a, 0xca, 0xc7, 0x33, 0x2d, 0x73, 0x7a, 0xa6, 0x65, 0xbe, 0x9d, 0x69, 0x99, 0x17, 0x5b, 0x23, 0x57, 0x8e, 0x94, 0x36, 0x03, 0xd8, 0xa2, 0xfd, 0x17, 0xfb, 0xa0, 0x7a, 0xdf, 0x3e, 0x1a, 0x5e, 0xe7, 0xe6, 0x1f, 0xf7, 0x79, 0x2b, 0x2f, 0x2e, 0xee, - 0x8d, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x81, 0x18, 0x96, 0x4f, 0xa6, 0x06, 0x00, 0x00, + 0x8d, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x28, 0x13, 0x1f, 0x01, 0xa6, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gamm/pool-models/stableswap/util_test.go b/x/gamm/pool-models/stableswap/util_test.go index 2165734845f..af354b9ebe8 100644 --- a/x/gamm/pool-models/stableswap/util_test.go +++ b/x/gamm/pool-models/stableswap/util_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) func createTestPool(t *testing.T, poolLiquidity sdk.Coins, spreadFactor, exitFee osmomath.Dec, scalingFactors []uint64) types.CFMMPoolI { diff --git a/x/gamm/simulation/sim_msgs.go b/x/gamm/simulation/sim_msgs.go index 8492bfe6008..8bcd270fb3d 100644 --- a/x/gamm/simulation/sim_msgs.go +++ b/x/gamm/simulation/sim_msgs.go @@ -9,11 +9,11 @@ import ( legacysimulationtype "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - balancertypes "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + balancertypes "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var PoolCreationFee = sdk.NewInt64Coin("stake", 10_000_000) diff --git a/x/gamm/simulation/sim_setup.go b/x/gamm/simulation/sim_setup.go index 0e1dd18f0e6..150b5ff53b1 100644 --- a/x/gamm/simulation/sim_setup.go +++ b/x/gamm/simulation/sim_setup.go @@ -1,8 +1,8 @@ package gammsimulation import ( - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" ) func DefaultActions(keeper keeper.Keeper) []simtypes.Action { diff --git a/x/gamm/types/expected_keepers.go b/x/gamm/types/expected_keepers.go index da965ffe58e..f96a9493397 100644 --- a/x/gamm/types/expected_keepers.go +++ b/x/gamm/types/expected_keepers.go @@ -8,10 +8,10 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/osmosis-labs/osmosis/osmomath" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/x/gamm/types/genesis.go b/x/gamm/types/genesis.go index 106a1c0abe0..4b97d4432cb 100644 --- a/x/gamm/types/genesis.go +++ b/x/gamm/types/genesis.go @@ -2,7 +2,7 @@ package types import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" ) // DefaultGenesis creates a default GenesisState object. diff --git a/x/gamm/types/genesis.pb.go b/x/gamm/types/genesis.pb.go index 8c9cf6985a0..90999e4c7fa 100644 --- a/x/gamm/types/genesis.pb.go +++ b/x/gamm/types/genesis.pb.go @@ -11,7 +11,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - migration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" + migration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" io "io" math "math" math_bits "math/bits" @@ -156,32 +156,32 @@ var fileDescriptor_5a324eb7f1dd793e = []byte{ // 444 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xcf, 0x6e, 0xd3, 0x40, 0x10, 0xc6, 0xe3, 0x36, 0x8d, 0x84, 0x8b, 0xa0, 0xb5, 0x72, 0x70, 0x2b, 0xe4, 0x04, 0x1f, 0x90, - 0x2f, 0xd9, 0xa5, 0x01, 0x2e, 0xbd, 0x91, 0x4a, 0x20, 0x10, 0xa0, 0xca, 0xbd, 0x71, 0x89, 0xd6, - 0xce, 0xd4, 0xb5, 0xf0, 0x7a, 0xa2, 0xdd, 0x4d, 0x55, 0xdf, 0x78, 0x04, 0x24, 0xee, 0x3c, 0x00, - 0x67, 0x1e, 0xa2, 0xe2, 0xd4, 0x23, 0xa7, 0x80, 0x92, 0x37, 0xe0, 0x09, 0xd0, 0xfe, 0x31, 0x42, - 0x34, 0x27, 0x7b, 0x66, 0x7e, 0xf3, 0xed, 0xcc, 0x37, 0x7e, 0x8c, 0x92, 0xa3, 0x2c, 0x25, 0x2d, - 0x18, 0xe7, 0xf4, 0xf2, 0x28, 0x03, 0xc5, 0x8e, 0x68, 0x01, 0x35, 0xc8, 0x52, 0x92, 0xb9, 0x40, - 0x85, 0x41, 0xdf, 0x31, 0x44, 0x33, 0xc4, 0x31, 0x87, 0xfd, 0x02, 0x0b, 0x34, 0x00, 0xd5, 0x7f, - 0x96, 0x3d, 0x3c, 0x28, 0x10, 0x8b, 0x0a, 0xa8, 0x89, 0xb2, 0xc5, 0x39, 0x65, 0x75, 0xd3, 0x96, - 0x72, 0xa3, 0x33, 0xb5, 0x3d, 0x36, 0x70, 0xa5, 0xc8, 0x46, 0x34, 0x63, 0x12, 0xfe, 0x0e, 0x91, - 0x63, 0x59, 0xbb, 0xfa, 0xc3, 0x8d, 0x53, 0xca, 0x0b, 0x26, 0x60, 0x66, 0x91, 0xf8, 0x8b, 0xe7, - 0xf7, 0x4e, 0x99, 0x60, 0x5c, 0x06, 0x9f, 0x3d, 0x7f, 0x7f, 0x8e, 0x58, 0x4d, 0x73, 0x01, 0x4c, - 0x95, 0x58, 0x4f, 0xcf, 0x01, 0x42, 0x6f, 0xb8, 0x9d, 0xec, 0x8e, 0x0f, 0x88, 0x7b, 0x58, 0x3f, - 0xd5, 0xee, 0x42, 0x4e, 0xb0, 0xac, 0x27, 0x6f, 0xae, 0x97, 0x83, 0xce, 0xef, 0xe5, 0x20, 0x6c, - 0x18, 0xaf, 0x8e, 0xe3, 0x5b, 0x0a, 0xf1, 0xd7, 0x9f, 0x83, 0xa4, 0x28, 0xd5, 0xc5, 0x22, 0x23, - 0x39, 0x72, 0xb7, 0x81, 0xfb, 0x8c, 0xe4, 0xec, 0x03, 0x55, 0xcd, 0x1c, 0xa4, 0x11, 0x93, 0xe9, - 0x7d, 0xdd, 0x7f, 0xe2, 0xda, 0x5f, 0x00, 0xc4, 0x1f, 0xb7, 0xfc, 0xbb, 0x2f, 0xad, 0xaf, 0x67, - 0x8a, 0x29, 0x08, 0x9e, 0xf9, 0x3b, 0x9a, 0x91, 0x6e, 0xb2, 0x3e, 0xb1, 0xd6, 0x91, 0xd6, 0x3a, - 0xf2, 0xbc, 0x6e, 0x26, 0x77, 0xbe, 0x7f, 0x1b, 0xed, 0x9c, 0x22, 0x56, 0xaf, 0x52, 0x4b, 0x07, - 0x89, 0xbf, 0x57, 0xc3, 0x95, 0x9a, 0x9a, 0xf9, 0xea, 0x05, 0xcf, 0x40, 0x84, 0x5b, 0x43, 0x2f, - 0xe9, 0xa6, 0xf7, 0x74, 0x5e, 0xb3, 0xef, 0x4c, 0x36, 0x38, 0xf6, 0x7b, 0x73, 0xe3, 0x48, 0xb8, - 0x3d, 0xf4, 0x92, 0xdd, 0xf1, 0x03, 0xb2, 0xe9, 0x90, 0xc4, 0xba, 0x36, 0xe9, 0xea, 0xf5, 0x53, - 0xd7, 0x11, 0x9c, 0xf9, 0xfb, 0xbc, 0x2c, 0x84, 0x5d, 0x5e, 0x40, 0x8e, 0x62, 0x26, 0xc3, 0xae, - 0x91, 0x79, 0xb4, 0x59, 0xe6, 0x6d, 0x8b, 0xa7, 0x96, 0x4e, 0xf7, 0xf8, 0x7f, 0x99, 0xc9, 0xeb, - 0xeb, 0x55, 0xe4, 0xdd, 0xac, 0x22, 0xef, 0xd7, 0x2a, 0xf2, 0x3e, 0xad, 0xa3, 0xce, 0xcd, 0x3a, - 0xea, 0xfc, 0x58, 0x47, 0x9d, 0xf7, 0x8f, 0xff, 0xf1, 0xd5, 0xa9, 0x8f, 0x2a, 0x96, 0xc9, 0x36, - 0xa0, 0x97, 0xe3, 0xa7, 0xf4, 0xca, 0x9e, 0xdf, 0xb8, 0x9c, 0xf5, 0x8c, 0x4d, 0x4f, 0xfe, 0x04, - 0x00, 0x00, 0xff, 0xff, 0x7f, 0xd4, 0xe2, 0x7f, 0xc1, 0x02, 0x00, 0x00, + 0x2f, 0xd9, 0xa5, 0x41, 0xbd, 0xf4, 0x46, 0x2a, 0x81, 0x40, 0x80, 0x2a, 0xf7, 0xc6, 0x25, 0x5a, + 0x3b, 0x53, 0xd7, 0xc2, 0xeb, 0x89, 0x76, 0x37, 0x55, 0x7d, 0xe3, 0x11, 0x90, 0xb8, 0xf3, 0x00, + 0x9c, 0x79, 0x88, 0x8a, 0x53, 0x8f, 0x9c, 0x02, 0x4a, 0xde, 0x80, 0x27, 0x40, 0xfb, 0xc7, 0x08, + 0xd1, 0x9c, 0xec, 0x99, 0xf9, 0xcd, 0xb7, 0x33, 0xdf, 0xf8, 0x31, 0x4a, 0x8e, 0xb2, 0x94, 0xb4, + 0x60, 0x9c, 0xd3, 0xab, 0xa3, 0x0c, 0x14, 0x3b, 0xa2, 0x05, 0xd4, 0x20, 0x4b, 0x49, 0xe6, 0x02, + 0x15, 0x06, 0x7d, 0xc7, 0x10, 0xcd, 0x10, 0xc7, 0x1c, 0xf6, 0x0b, 0x2c, 0xd0, 0x00, 0x54, 0xff, + 0x59, 0xf6, 0xf0, 0xa0, 0x40, 0x2c, 0x2a, 0xa0, 0x26, 0xca, 0x16, 0x17, 0x94, 0xd5, 0x4d, 0x5b, + 0xca, 0x8d, 0xce, 0xd4, 0xf6, 0xd8, 0xc0, 0x95, 0x22, 0x1b, 0xd1, 0x8c, 0x49, 0xf8, 0x3b, 0x44, + 0x8e, 0x65, 0xed, 0xea, 0x8f, 0x37, 0x4e, 0x29, 0x2f, 0x99, 0x80, 0x99, 0x45, 0xe2, 0x2f, 0x9e, + 0xdf, 0x3b, 0x63, 0x82, 0x71, 0x19, 0x7c, 0xf6, 0xfc, 0xfd, 0x39, 0x62, 0x35, 0xcd, 0x05, 0x30, + 0x55, 0x62, 0x3d, 0xbd, 0x00, 0x08, 0xbd, 0xe1, 0x76, 0xb2, 0x3b, 0x3e, 0x20, 0xee, 0x61, 0xfd, + 0x54, 0xbb, 0x0b, 0x39, 0xc5, 0xb2, 0x9e, 0xbc, 0xb9, 0x59, 0x0e, 0x3a, 0xbf, 0x97, 0x83, 0xb0, + 0x61, 0xbc, 0x3a, 0x89, 0xef, 0x28, 0xc4, 0x5f, 0x7f, 0x0e, 0x92, 0xa2, 0x54, 0x97, 0x8b, 0x8c, + 0xe4, 0xc8, 0xdd, 0x06, 0xee, 0x33, 0x92, 0xb3, 0x0f, 0x54, 0x35, 0x73, 0x90, 0x46, 0x4c, 0xa6, + 0x0f, 0x75, 0xff, 0xa9, 0x6b, 0x7f, 0x01, 0x10, 0x7f, 0xdc, 0xf2, 0xef, 0xbf, 0xb4, 0xbe, 0x9e, + 0x2b, 0xa6, 0x20, 0x38, 0xf6, 0x77, 0x34, 0x23, 0xdd, 0x64, 0x7d, 0x62, 0xad, 0x23, 0xad, 0x75, + 0xe4, 0x79, 0xdd, 0x4c, 0xee, 0x7d, 0xff, 0x36, 0xda, 0x39, 0x43, 0xac, 0x5e, 0xa5, 0x96, 0x0e, + 0x12, 0x7f, 0xaf, 0x86, 0x6b, 0x35, 0x35, 0xf3, 0xd5, 0x0b, 0x9e, 0x81, 0x08, 0xb7, 0x86, 0x5e, + 0xd2, 0x4d, 0x1f, 0xe8, 0xbc, 0x66, 0xdf, 0x99, 0x6c, 0x70, 0xe2, 0xf7, 0xe6, 0xc6, 0x91, 0x70, + 0x7b, 0xe8, 0x25, 0xbb, 0xe3, 0x47, 0x64, 0xd3, 0x21, 0x89, 0x75, 0x6d, 0xd2, 0xd5, 0xeb, 0xa7, + 0xae, 0x23, 0x38, 0xf7, 0xf7, 0x79, 0x59, 0x08, 0xbb, 0xbc, 0x80, 0x1c, 0xc5, 0x4c, 0x86, 0x5d, + 0x23, 0xf3, 0x64, 0xb3, 0xcc, 0xdb, 0x16, 0x4f, 0x2d, 0x9d, 0xee, 0xf1, 0xff, 0x32, 0x93, 0xd7, + 0x37, 0xab, 0xc8, 0xbb, 0x5d, 0x45, 0xde, 0xaf, 0x55, 0xe4, 0x7d, 0x5a, 0x47, 0x9d, 0xdb, 0x75, + 0xd4, 0xf9, 0xb1, 0x8e, 0x3a, 0xef, 0x9f, 0xfe, 0xe3, 0xab, 0x53, 0x1f, 0x55, 0x2c, 0x93, 0x6d, + 0x40, 0xaf, 0xc6, 0xc7, 0xf4, 0xda, 0x9e, 0xdf, 0xb8, 0x9c, 0xf5, 0x8c, 0x4d, 0xcf, 0xfe, 0x04, + 0x00, 0x00, 0xff, 0xff, 0xbf, 0xb0, 0xca, 0x68, 0xc1, 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/gamm/types/gov.go b/x/gamm/types/gov.go index ab9026f9bab..351fe6d8482 100644 --- a/x/gamm/types/gov.go +++ b/x/gamm/types/gov.go @@ -9,7 +9,7 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/osmosis-labs/osmosis/osmomath" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" ) const ( diff --git a/x/gamm/types/gov.pb.go b/x/gamm/types/gov.pb.go index d4b180e40fa..f2fa56077c7 100644 --- a/x/gamm/types/gov.pb.go +++ b/x/gamm/types/gov.pb.go @@ -10,7 +10,7 @@ import ( _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - migration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" + migration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" io "io" math "math" math_bits "math/bits" @@ -283,7 +283,7 @@ var fileDescriptor_f31b9a6c0dbbdfa3 = []byte{ // 805 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x55, 0x41, 0x6f, 0xe3, 0x44, 0x14, 0x8e, 0x93, 0x6c, 0x56, 0x4c, 0x77, 0x11, 0x35, 0x59, 0x12, 0x5a, 0x64, 0x07, 0x1f, 0x96, - 0xb2, 0xa2, 0xf6, 0x66, 0x59, 0x2e, 0x41, 0x7b, 0x68, 0x02, 0x2b, 0x2d, 0x6a, 0x45, 0xe5, 0xee, + 0xb2, 0xa2, 0xf6, 0x66, 0x61, 0x2f, 0x41, 0x7b, 0x68, 0x02, 0x2b, 0x2d, 0x6a, 0x45, 0xe5, 0xee, 0x82, 0xe0, 0x62, 0x26, 0xe3, 0xa9, 0x33, 0x8a, 0x3d, 0x63, 0x66, 0xa6, 0xa5, 0xf9, 0x01, 0x08, 0xc4, 0x89, 0x23, 0xe2, 0xd4, 0x9f, 0xc0, 0x81, 0x1f, 0x51, 0xc1, 0xa5, 0x47, 0xc4, 0xc1, 0x42, 0xed, 0x01, 0xce, 0x39, 0x72, 0x01, 0xcd, 0x8c, 0x5d, 0x0a, 0x8d, 0xa8, 0x4a, 0x4f, 0x5c, 0xa2, @@ -296,27 +296,27 @@ var fileDescriptor_f31b9a6c0dbbdfa3 = []byte{ 0x38, 0x94, 0x84, 0xd1, 0x10, 0x23, 0xc6, 0x63, 0xb1, 0xcd, 0x59, 0xce, 0x04, 0x4c, 0xed, 0x36, 0xb8, 0x21, 0x89, 0x4c, 0x71, 0xd7, 0xea, 0x59, 0x6b, 0xcf, 0x85, 0x26, 0xb0, 0x7b, 0x60, 0x29, 0xc6, 0x02, 0x71, 0x92, 0xab, 0x67, 0xba, 0x75, 0x5d, 0x3b, 0x9f, 0xb2, 0x9f, 0x82, 0x9b, 0xdc, - 0x50, 0x75, 0x1b, 0xbd, 0xc6, 0xda, 0xd2, 0x83, 0x87, 0xfe, 0x22, 0x3b, 0xfc, 0x21, 0x4c, 0x21, - 0x45, 0x98, 0x3f, 0x65, 0x23, 0x46, 0x11, 0xa6, 0x92, 0x43, 0x89, 0xe3, 0x6d, 0xc6, 0xd2, 0x4d, - 0x42, 0xa7, 0xc3, 0xe6, 0x51, 0xe1, 0xd6, 0xc2, 0x8a, 0x6a, 0xf0, 0xc1, 0x97, 0x87, 0x6e, 0xed, - 0x9b, 0x43, 0xb7, 0xf6, 0xdb, 0xa1, 0x6b, 0xfd, 0xf0, 0xfd, 0xfa, 0x4a, 0xd9, 0xa2, 0x32, 0xbd, - 0x62, 0x1c, 0x31, 0x2a, 0x31, 0x95, 0x5f, 0xfd, 0xfa, 0xdd, 0xbd, 0xd7, 0x2a, 0xc7, 0x2e, 0xe9, - 0xd2, 0xfb, 0xbc, 0x0e, 0x9c, 0x67, 0x79, 0x0c, 0xe5, 0xff, 0xc5, 0x88, 0x67, 0x57, 0x33, 0xe2, - 0x6e, 0x65, 0xc4, 0xbf, 0x37, 0xe9, 0xfd, 0xd8, 0x00, 0x2f, 0x29, 0x49, 0x93, 0xff, 0x90, 0xc8, - 0xc9, 0xe8, 0xf1, 0xd6, 0x96, 0x7a, 0x01, 0xfb, 0x75, 0xd0, 0x8a, 0x31, 0x65, 0xd9, 0x7d, 0x63, - 0xc0, 0x70, 0x79, 0x5e, 0xb8, 0xb7, 0x67, 0x30, 0x4b, 0x07, 0x9e, 0xc9, 0x7b, 0x61, 0x09, 0x38, - 0x83, 0xf6, 0x8d, 0x1f, 0x17, 0xa0, 0xfd, 0x0a, 0xda, 0xb7, 0x07, 0xe0, 0x96, 0x24, 0x68, 0x1a, - 0x89, 0x1c, 0x22, 0x42, 0x93, 0x6e, 0xa3, 0x67, 0xad, 0x35, 0x87, 0x9d, 0x79, 0xe1, 0xbe, 0x68, - 0x1e, 0x38, 0x5f, 0xf5, 0xc2, 0x25, 0x15, 0xee, 0x98, 0xc8, 0xce, 0xc1, 0x1d, 0x7c, 0x90, 0x33, - 0x8a, 0xa9, 0x8c, 0xa0, 0x8c, 0x72, 0x4e, 0x10, 0x8e, 0x18, 0xc5, 0xdd, 0xa6, 0x56, 0x7d, 0xa4, - 0x1c, 0xfb, 0xb9, 0x70, 0xef, 0x18, 0x6b, 0x44, 0x3c, 0xf5, 0x09, 0x0b, 0x32, 0x28, 0x27, 0xfe, - 0x13, 0x2a, 0xe7, 0x85, 0xfb, 0x8a, 0x51, 0x58, 0xc8, 0xe1, 0x85, 0x76, 0x95, 0xdf, 0x90, 0xdb, - 0x2a, 0xfb, 0x3e, 0xc5, 0xf6, 0x27, 0xe0, 0xb6, 0xc8, 0x39, 0x86, 0x71, 0xb4, 0x0b, 0x91, 0x64, - 0xbc, 0x7b, 0x43, 0x2b, 0xbd, 0x5d, 0x2a, 0xad, 0x5e, 0x54, 0xda, 0xc4, 0x09, 0x44, 0xb3, 0x77, - 0x30, 0x9a, 0x17, 0x6e, 0xdb, 0xe8, 0xfd, 0x8d, 0xc1, 0x0b, 0x6f, 0x99, 0xf8, 0xb1, 0x0e, 0xed, - 0x77, 0xc1, 0x0b, 0xe3, 0x72, 0x11, 0xa2, 0x9c, 0xb1, 0x34, 0x22, 0x71, 0xb7, 0xa5, 0x3d, 0x59, - 0x9d, 0x17, 0x6e, 0xc7, 0x30, 0xfc, 0x13, 0xe1, 0x85, 0xcf, 0x57, 0x29, 0x35, 0xbc, 0x27, 0xf1, - 0xa0, 0xa9, 0xd6, 0xc2, 0xfb, 0xbd, 0x0e, 0xde, 0x1a, 0x71, 0x0c, 0x25, 0x3e, 0xbf, 0x52, 0x9b, + 0x50, 0x75, 0x1b, 0xbd, 0xc6, 0xda, 0xd2, 0x83, 0xb7, 0xfc, 0x45, 0x76, 0xf8, 0x43, 0x98, 0x42, + 0x8a, 0x30, 0x7f, 0xca, 0x46, 0x8c, 0x22, 0x4c, 0x25, 0x87, 0x12, 0xc7, 0xdb, 0x8c, 0xa5, 0x9b, + 0x84, 0x4e, 0x87, 0xcd, 0xa3, 0xc2, 0xad, 0x85, 0x15, 0xd5, 0xe0, 0x83, 0x2f, 0x0f, 0xdd, 0xda, + 0x37, 0x87, 0x6e, 0xed, 0xb7, 0x43, 0xd7, 0xfa, 0xe1, 0xfb, 0xf5, 0x95, 0xb2, 0x45, 0x65, 0x7a, + 0xc5, 0x38, 0x62, 0x54, 0x62, 0x2a, 0xbf, 0xfa, 0xf5, 0xbb, 0x7b, 0xaf, 0x55, 0x8e, 0x5d, 0xd2, + 0xa5, 0xf7, 0x79, 0x1d, 0x38, 0xcf, 0xf2, 0x18, 0xca, 0xff, 0x8b, 0x11, 0xcf, 0xae, 0x66, 0xc4, + 0xdd, 0xca, 0x88, 0x7f, 0x6f, 0xd2, 0xfb, 0xb1, 0x01, 0x5e, 0x52, 0x92, 0x26, 0xff, 0x21, 0x91, + 0x93, 0xd1, 0xe3, 0xad, 0x2d, 0xf5, 0x02, 0xf6, 0xeb, 0xa0, 0x15, 0x63, 0xca, 0xb2, 0xfb, 0xc6, + 0x80, 0xe1, 0xf2, 0xbc, 0x70, 0x6f, 0xcf, 0x60, 0x96, 0x0e, 0x3c, 0x93, 0xf7, 0xc2, 0x12, 0x70, + 0x06, 0xed, 0x1b, 0x3f, 0x2e, 0x40, 0xfb, 0x15, 0xb4, 0x6f, 0x0f, 0xc0, 0x2d, 0x49, 0xd0, 0x34, + 0x12, 0x39, 0x44, 0x84, 0x26, 0xdd, 0x46, 0xcf, 0x5a, 0x6b, 0x0e, 0x3b, 0xf3, 0xc2, 0x7d, 0xd1, + 0x3c, 0x70, 0xbe, 0xea, 0x85, 0x4b, 0x2a, 0xdc, 0x31, 0x91, 0x9d, 0x83, 0x3b, 0xf8, 0x20, 0x67, + 0x14, 0x53, 0x19, 0x41, 0x19, 0xe5, 0x9c, 0x20, 0x1c, 0x31, 0x8a, 0xbb, 0x4d, 0xad, 0xfa, 0x48, + 0x39, 0xf6, 0x73, 0xe1, 0xde, 0x31, 0xd6, 0x88, 0x78, 0xea, 0x13, 0x16, 0x64, 0x50, 0x4e, 0xfc, + 0x27, 0x54, 0xce, 0x0b, 0xf7, 0x15, 0xa3, 0xb0, 0x90, 0xc3, 0x0b, 0xed, 0x2a, 0xbf, 0x21, 0xb7, + 0x55, 0xf6, 0x7d, 0x8a, 0xed, 0x4f, 0xc0, 0x6d, 0x91, 0x73, 0x0c, 0xe3, 0x68, 0x17, 0x22, 0xc9, + 0x78, 0xf7, 0x86, 0x56, 0x7a, 0xbb, 0x54, 0x5a, 0xbd, 0xa8, 0xb4, 0x89, 0x13, 0x88, 0x66, 0xef, + 0x60, 0x34, 0x2f, 0xdc, 0xb6, 0xd1, 0xfb, 0x1b, 0x83, 0x17, 0xde, 0x32, 0xf1, 0x63, 0x1d, 0xda, + 0xef, 0x82, 0x17, 0xc6, 0xe5, 0x22, 0x44, 0x39, 0x63, 0x69, 0x44, 0xe2, 0x6e, 0x4b, 0x7b, 0xb2, + 0x3a, 0x2f, 0xdc, 0x8e, 0x61, 0xf8, 0x27, 0xc2, 0x0b, 0x9f, 0xaf, 0x52, 0x6a, 0x78, 0x4f, 0xe2, + 0x41, 0x53, 0xad, 0x85, 0xf7, 0x7b, 0x1d, 0x3c, 0x1c, 0x71, 0x0c, 0x25, 0x3e, 0xbf, 0x52, 0x9b, 0xe4, 0xd3, 0x3d, 0x12, 0x13, 0x39, 0x53, 0x58, 0xb1, 0x41, 0x63, 0x35, 0x5e, 0xc9, 0xd4, 0xa0, 0xaf, 0xbd, 0xec, 0xdf, 0x5a, 0x60, 0x55, 0xbf, 0x54, 0xb9, 0xa7, 0xd1, 0x67, 0x44, 0x4e, 0x22, 0xb4, 0x9b, 0x65, 0x51, 0x4a, 0xe8, 0xb4, 0xbc, 0x80, 0x37, 0x16, 0x5f, 0xc0, 0xe2, 0xc5, 0x1b, @@ -330,8 +330,8 @@ var fileDescriptor_f31b9a6c0dbbdfa3 = []byte{ 0xac, 0xe3, 0x13, 0xc7, 0xfa, 0xe5, 0xc4, 0xb1, 0xbe, 0x3e, 0x75, 0x6a, 0xc7, 0xa7, 0x4e, 0xed, 0xa7, 0x53, 0xa7, 0xf6, 0xf1, 0xfd, 0x84, 0xc8, 0xc9, 0xde, 0xd8, 0x47, 0x2c, 0x0b, 0x4a, 0xc2, 0xf5, 0x14, 0x8e, 0x45, 0x15, 0x04, 0xfb, 0x0f, 0x1e, 0x06, 0x07, 0xe6, 0x3b, 0x27, 0x67, 0x39, - 0x16, 0xe3, 0x96, 0xfe, 0x62, 0xbd, 0xf9, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x76, 0xe6, 0x52, - 0x61, 0x74, 0x07, 0x00, 0x00, + 0x16, 0xe3, 0x96, 0xfe, 0x62, 0xbd, 0xf9, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x82, 0x7a, + 0x76, 0x74, 0x07, 0x00, 0x00, } func (this *ReplaceMigrationRecordsProposal) Equal(that interface{}) bool { diff --git a/x/gamm/types/gov_test.go b/x/gamm/types/gov_test.go index 17d8b105504..997a0795968 100644 --- a/x/gamm/types/gov_test.go +++ b/x/gamm/types/gov_test.go @@ -6,8 +6,8 @@ import ( proto "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" ) func TestUpdateMigrationRecordsProposalMarshalUnmarshal(t *testing.T) { diff --git a/x/gamm/types/key_test.go b/x/gamm/types/key_test.go index f7003661d25..687e3a76fdb 100644 --- a/x/gamm/types/key_test.go +++ b/x/gamm/types/key_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) func TestGetPoolShareDenom(t *testing.T) { diff --git a/x/gamm/types/migration/shared.pb.go b/x/gamm/types/migration/shared.pb.go index 1c912db8893..d0d7f47078e 100644 --- a/x/gamm/types/migration/shared.pb.go +++ b/x/gamm/types/migration/shared.pb.go @@ -139,28 +139,28 @@ func init() { proto.RegisterFile("osmosis/gamm/v1beta1/shared.proto", fileDescri var fileDescriptor_ecfa270aa4b2c075 = []byte{ // 345 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xb1, 0x4e, 0x32, 0x41, - 0x14, 0x85, 0x77, 0xfe, 0x9f, 0x18, 0xb3, 0x26, 0x86, 0x6c, 0x28, 0x90, 0x98, 0x01, 0xb1, 0xa1, - 0x71, 0x27, 0x20, 0x15, 0x25, 0x56, 0x26, 0x9a, 0x18, 0x42, 0x65, 0xb3, 0x99, 0x99, 0x1d, 0x97, - 0x09, 0xb3, 0x73, 0xc9, 0xce, 0x40, 0xe4, 0x0d, 0x2c, 0x7d, 0x01, 0x13, 0x1f, 0x87, 0x92, 0xd2, - 0xca, 0x18, 0x68, 0x7c, 0x0c, 0xc3, 0xce, 0x2e, 0xb1, 0x30, 0x74, 0x7b, 0xf6, 0x7c, 0xf7, 0xe4, - 0xdc, 0x3b, 0xfe, 0x05, 0x98, 0x14, 0x8c, 0x34, 0x24, 0xa1, 0x69, 0x4a, 0x16, 0x5d, 0x26, 0x2c, - 0xed, 0x12, 0x33, 0xa1, 0x99, 0x88, 0xc3, 0x59, 0x06, 0x16, 0x82, 0x5a, 0x81, 0x84, 0x3b, 0x24, - 0x2c, 0x90, 0x46, 0x2d, 0x81, 0x04, 0x72, 0x80, 0xec, 0xbe, 0x1c, 0xdb, 0x38, 0x4b, 0x00, 0x12, - 0x25, 0x48, 0xae, 0xd8, 0xfc, 0x89, 0x50, 0xbd, 0x2c, 0x2d, 0x9e, 0xe7, 0x44, 0x6e, 0xc6, 0x89, - 0xc2, 0xc2, 0x4e, 0x11, 0x46, 0x8d, 0xd8, 0x77, 0xe0, 0x20, 0xb5, 0xf3, 0xdb, 0x6f, 0xc8, 0xaf, - 0xde, 0xcb, 0x24, 0xa3, 0x56, 0x82, 0x1e, 0x09, 0x0e, 0x59, 0x6c, 0x82, 0x17, 0xe4, 0x5f, 0x32, - 0xaa, 0xa8, 0xe6, 0x22, 0x8b, 0x2c, 0x44, 0x1c, 0x34, 0x17, 0xda, 0x66, 0xd4, 0x8a, 0x38, 0x9a, - 0x01, 0xa8, 0x48, 0x49, 0x3d, 0x35, 0x75, 0xd4, 0xfa, 0xdf, 0x39, 0xe9, 0xf5, 0xc3, 0xbf, 0xb6, - 0x08, 0x87, 0x45, 0xc0, 0x18, 0x6e, 0x7e, 0x8d, 0x3f, 0x00, 0xa8, 0x3b, 0xa9, 0xa7, 0xc3, 0xca, - 0xea, 0xb3, 0xe9, 0x8d, 0x9a, 0xec, 0x20, 0x65, 0xda, 0xda, 0xc7, 0x87, 0x83, 0x82, 0x8e, 0x5f, - 0xdd, 0x77, 0xcd, 0xbb, 0xc9, 0xb8, 0x8e, 0x5a, 0xa8, 0x53, 0x19, 0x9d, 0x96, 0xff, 0x77, 0xec, - 0x6d, 0x1c, 0x9c, 0xfb, 0x3e, 0x57, 0x7b, 0xe6, 0x5f, 0xce, 0x1c, 0x73, 0xe5, 0xdc, 0x41, 0xe5, - 0xfb, 0xbd, 0x89, 0x86, 0xe3, 0xd5, 0x06, 0xa3, 0xf5, 0x06, 0xa3, 0xaf, 0x0d, 0x46, 0xaf, 0x5b, - 0xec, 0xad, 0xb7, 0xd8, 0xfb, 0xd8, 0x62, 0xef, 0x71, 0x90, 0x48, 0x3b, 0x99, 0xb3, 0x90, 0x43, - 0x4a, 0x8a, 0x85, 0xaf, 0x14, 0x65, 0xa6, 0x14, 0x64, 0xd1, 0xeb, 0x93, 0x67, 0xf7, 0xd8, 0x76, - 0x39, 0x13, 0x86, 0xa4, 0xe5, 0x5d, 0xd9, 0x51, 0x7e, 0xec, 0xeb, 0x9f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xb9, 0x29, 0xc9, 0x4e, 0x13, 0x02, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xb1, 0x4a, 0x33, 0x41, + 0x14, 0x85, 0x77, 0xfe, 0x3f, 0x88, 0xac, 0x20, 0x61, 0x49, 0x11, 0x83, 0x4c, 0x62, 0x6c, 0xd2, + 0xb8, 0x43, 0xa2, 0x36, 0x29, 0x63, 0x25, 0x28, 0x48, 0x48, 0x65, 0xb3, 0xcc, 0xcc, 0x8e, 0x9b, + 0x21, 0xb3, 0x73, 0xc3, 0xce, 0x24, 0x98, 0x37, 0xb0, 0xf4, 0x05, 0x04, 0x1f, 0x27, 0x65, 0x4a, + 0x2b, 0x91, 0xa4, 0xf1, 0x31, 0x24, 0x3b, 0xbb, 0xc1, 0x42, 0xd2, 0xed, 0xd9, 0xf3, 0xdd, 0xc3, + 0xb9, 0x77, 0xfc, 0x33, 0x30, 0x29, 0x18, 0x69, 0x48, 0x42, 0xd3, 0x94, 0xcc, 0xbb, 0x4c, 0x58, + 0xda, 0x25, 0x66, 0x4c, 0x33, 0x11, 0x87, 0xd3, 0x0c, 0x2c, 0x04, 0xb5, 0x02, 0x09, 0xb7, 0x48, + 0x58, 0x20, 0x8d, 0x5a, 0x02, 0x09, 0xe4, 0x00, 0xd9, 0x7e, 0x39, 0xb6, 0x71, 0x92, 0x00, 0x24, + 0x4a, 0x90, 0x5c, 0xb1, 0xd9, 0x13, 0xa1, 0x7a, 0x51, 0x5a, 0x3c, 0xcf, 0x89, 0xdc, 0x8c, 0x13, + 0x85, 0x85, 0x9d, 0x22, 0x8c, 0x1a, 0xb1, 0xeb, 0xc0, 0x41, 0x6a, 0xe7, 0xb7, 0xdf, 0x90, 0x5f, + 0xbd, 0x97, 0x49, 0x46, 0xad, 0x04, 0x3d, 0x14, 0x1c, 0xb2, 0xd8, 0x04, 0x2f, 0xc8, 0x3f, 0x67, + 0x54, 0x51, 0xcd, 0x45, 0x16, 0x59, 0x88, 0x38, 0x68, 0x2e, 0xb4, 0xcd, 0xa8, 0x15, 0x71, 0x34, + 0x05, 0x50, 0x91, 0x92, 0x7a, 0x62, 0xea, 0xa8, 0xf5, 0xbf, 0x73, 0xd4, 0xbb, 0x0a, 0xff, 0xda, + 0x22, 0x1c, 0x14, 0x01, 0x23, 0xb8, 0xf9, 0x35, 0xfe, 0x00, 0xa0, 0xee, 0xa4, 0x9e, 0x0c, 0x2a, + 0xcb, 0xcf, 0xa6, 0x37, 0x6c, 0xb2, 0xbd, 0x94, 0x69, 0x6b, 0x1f, 0xef, 0x0f, 0x0a, 0x3a, 0x7e, + 0x75, 0xd7, 0x35, 0xef, 0x26, 0xe3, 0x3a, 0x6a, 0xa1, 0x4e, 0x65, 0x78, 0x5c, 0xfe, 0xdf, 0xb2, + 0xb7, 0x71, 0x70, 0xea, 0xfb, 0x5c, 0xed, 0x98, 0x7f, 0x39, 0x73, 0xc8, 0x95, 0x73, 0xfb, 0x95, + 0xef, 0xf7, 0x26, 0x1a, 0x8c, 0x96, 0x6b, 0x8c, 0x56, 0x6b, 0x8c, 0xbe, 0xd6, 0x18, 0xbd, 0x6e, + 0xb0, 0xb7, 0xda, 0x60, 0xef, 0x63, 0x83, 0xbd, 0xc7, 0x7e, 0x22, 0xed, 0x78, 0xc6, 0x42, 0x0e, + 0x29, 0x29, 0x16, 0xbe, 0x50, 0x94, 0x99, 0x52, 0x90, 0x79, 0xef, 0x9a, 0x3c, 0xbb, 0xc7, 0xb6, + 0x8b, 0xa9, 0x30, 0x24, 0x2d, 0xef, 0xca, 0x0e, 0xf2, 0x63, 0x5f, 0xfe, 0x04, 0x00, 0x00, 0xff, + 0xff, 0x13, 0x2c, 0x13, 0xbf, 0x13, 0x02, 0x00, 0x00, } func (this *BalancerToConcentratedPoolLink) Equal(that interface{}) bool { diff --git a/x/gamm/types/msg_swap.go b/x/gamm/types/msg_swap.go index a556462382d..2422cba6ec7 100644 --- a/x/gamm/types/msg_swap.go +++ b/x/gamm/types/msg_swap.go @@ -1,6 +1,6 @@ package types -import poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" +import poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" // SwapMsg defines a simple interface for getting the token denoms on a swap message route. type SwapMsgRoute = poolmanagertypes.SwapMsgRoute diff --git a/x/gamm/types/msgs_test.go b/x/gamm/types/msgs_test.go index d6da84ff59c..289174508b1 100644 --- a/x/gamm/types/msgs_test.go +++ b/x/gamm/types/msgs_test.go @@ -8,12 +8,12 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func TestMsgSwapExactAmountIn(t *testing.T) { diff --git a/x/gamm/types/params.go b/x/gamm/types/params.go index a12c91ccc15..7dcd88d538b 100644 --- a/x/gamm/types/params.go +++ b/x/gamm/types/params.go @@ -3,7 +3,7 @@ package types import ( "fmt" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/gamm/types/pool.go b/x/gamm/types/pool.go index 2e4ec5509fb..a1224cd5292 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" "github.com/osmosis-labs/osmosis/osmomath" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // CFMMPoolI defines an interface for pools representing constant function diff --git a/x/gamm/types/query.pb.go b/x/gamm/types/query.pb.go index e0fbe15ccb1..27ff6852cee 100644 --- a/x/gamm/types/query.pb.go +++ b/x/gamm/types/query.pb.go @@ -15,8 +15,8 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - migration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" - types2 "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + migration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" + types2 "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -1716,133 +1716,133 @@ var fileDescriptor_d9a717df9ca609ef = []byte{ // 2062 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4d, 0x6c, 0x1c, 0x49, 0x15, 0x76, 0x3b, 0x8e, 0xd7, 0x7e, 0x49, 0xfc, 0x53, 0xeb, 0x6c, 0x26, 0xe3, 0x64, 0x26, 0x5b, - 0xec, 0xda, 0xd9, 0xc4, 0xee, 0xb6, 0x1d, 0xaf, 0x76, 0x31, 0xc9, 0x6e, 0x6c, 0xaf, 0x9d, 0xd8, - 0x8a, 0x63, 0x6f, 0x67, 0x25, 0x04, 0x08, 0x5a, 0xed, 0x99, 0xce, 0xb8, 0xd7, 0xd3, 0x5d, 0x93, - 0xe9, 0xea, 0x8d, 0xad, 0x95, 0xb5, 0x12, 0x07, 0x94, 0xe5, 0xb2, 0x48, 0xc0, 0x9e, 0x10, 0x5c, - 0x56, 0x08, 0x71, 0x46, 0xe2, 0xc4, 0x01, 0x71, 0x89, 0x38, 0x45, 0xc0, 0x01, 0x71, 0x18, 0x50, - 0x02, 0x9c, 0xb8, 0xe0, 0x0b, 0x57, 0x54, 0x3f, 0xfd, 0x33, 0x33, 0x3d, 0x3d, 0x3f, 0xab, 0x48, - 0xd9, 0x93, 0x3d, 0x55, 0xef, 0xbd, 0xfa, 0xbe, 0xf7, 0x5e, 0xbd, 0x7e, 0xf5, 0xe0, 0x12, 0xf1, - 0x1c, 0xe2, 0xd9, 0x9e, 0x56, 0x32, 0x1d, 0x47, 0xfb, 0x68, 0x7e, 0xd7, 0xa2, 0xe6, 0xbc, 0xf6, - 0xc0, 0xb7, 0xaa, 0x87, 0x6a, 0xa5, 0x4a, 0x28, 0x41, 0x13, 0x52, 0x42, 0x65, 0x12, 0xaa, 0x94, + 0xec, 0xda, 0xd9, 0xc4, 0xee, 0xb6, 0x1d, 0x47, 0xbb, 0x98, 0x64, 0x37, 0xb6, 0xd7, 0x4e, 0x6c, + 0xc5, 0xb1, 0xb7, 0xb3, 0x12, 0x02, 0x04, 0xad, 0xf6, 0x4c, 0x67, 0xdc, 0xeb, 0xe9, 0xae, 0xc9, + 0x74, 0xf5, 0xc6, 0xd6, 0xca, 0x5a, 0x89, 0x03, 0xca, 0x72, 0x59, 0x24, 0x60, 0x4f, 0x08, 0x2e, + 0x2b, 0x84, 0x38, 0x23, 0x71, 0xe2, 0x80, 0xb8, 0x44, 0x9c, 0x22, 0xe0, 0x80, 0x38, 0x0c, 0x28, + 0x01, 0x4e, 0x5c, 0xf0, 0x85, 0x2b, 0xaa, 0x9f, 0xfe, 0x99, 0x99, 0x9e, 0x9e, 0x9f, 0x55, 0xa4, + 0xdd, 0x93, 0x3d, 0x55, 0xef, 0xbd, 0xfa, 0xbe, 0xf7, 0x5e, 0xbd, 0x7e, 0xf5, 0xe0, 0x12, 0xf1, + 0x1c, 0xe2, 0xd9, 0x9e, 0x56, 0x32, 0x1d, 0x47, 0xfb, 0x70, 0x7e, 0xd7, 0xa2, 0xe6, 0xbc, 0xf6, + 0xd0, 0xb7, 0xaa, 0x87, 0x6a, 0xa5, 0x4a, 0x28, 0x41, 0x13, 0x52, 0x42, 0x65, 0x12, 0xaa, 0x94, 0xc8, 0x4e, 0x94, 0x48, 0x89, 0x70, 0x01, 0x8d, 0xfd, 0x27, 0x64, 0xb3, 0x17, 0x13, 0xad, 0xd1, 0x03, 0xb9, 0x3d, 0x13, 0x6c, 0x57, 0x08, 0x29, 0x3b, 0xa6, 0x6b, 0x96, 0xac, 0x6a, 0x28, 0xe5, - 0x3d, 0x34, 0x2b, 0x46, 0x95, 0xf8, 0xd4, 0x92, 0xd2, 0xb9, 0x02, 0x17, 0xd7, 0x76, 0x4d, 0xcf, + 0x3d, 0x32, 0x2b, 0x46, 0x95, 0xf8, 0xd4, 0x92, 0xd2, 0xb9, 0x02, 0x17, 0xd7, 0x76, 0x4d, 0xcf, 0x0a, 0xa5, 0x0a, 0xc4, 0x76, 0xe5, 0xfe, 0x95, 0xf8, 0x3e, 0x47, 0x1c, 0x4a, 0x55, 0xcc, 0x92, 0xed, 0x9a, 0xd4, 0x26, 0x81, 0xec, 0x85, 0x12, 0x21, 0xa5, 0xb2, 0xa5, 0x99, 0x15, 0x5b, 0x33, - 0x5d, 0x97, 0x50, 0xbe, 0xe9, 0xc9, 0xdd, 0xf3, 0x72, 0x97, 0xff, 0xda, 0xf5, 0xef, 0x6b, 0xa6, + 0x5d, 0x97, 0x50, 0xbe, 0xe9, 0xc9, 0xdd, 0xf3, 0x72, 0x97, 0xff, 0xda, 0xf5, 0x1f, 0x68, 0xa6, 0x7b, 0x18, 0x6c, 0x89, 0x43, 0x0c, 0x41, 0x55, 0xfc, 0x90, 0x5b, 0xaf, 0x26, 0x92, 0xf5, 0xf6, - 0xcc, 0xaa, 0x55, 0x14, 0x22, 0x78, 0x15, 0xc6, 0xde, 0x67, 0xc0, 0x76, 0x08, 0x29, 0xeb, 0xd6, - 0x03, 0xdf, 0xf2, 0x28, 0xba, 0x0a, 0x2f, 0x31, 0xfa, 0x86, 0x5d, 0xcc, 0x28, 0x97, 0x94, 0xcb, + 0xcc, 0xaa, 0x55, 0x14, 0x22, 0x78, 0x15, 0xc6, 0xde, 0x63, 0xc0, 0x76, 0x08, 0x29, 0xeb, 0xd6, + 0x43, 0xdf, 0xf2, 0x28, 0xba, 0x0a, 0x2f, 0x31, 0xfa, 0x86, 0x5d, 0xcc, 0x28, 0x97, 0x94, 0xcb, 0x03, 0x2b, 0xe8, 0xb8, 0x96, 0x1f, 0x39, 0x34, 0x9d, 0xf2, 0x12, 0x96, 0x1b, 0x58, 0x1f, 0x64, - 0xff, 0x6d, 0x14, 0x97, 0xfa, 0x33, 0x0a, 0xbe, 0x03, 0xe3, 0x31, 0x23, 0x5e, 0x85, 0xb8, 0x9e, + 0xff, 0x6d, 0x14, 0x97, 0xfa, 0x33, 0x0a, 0xbe, 0x0b, 0xe3, 0x31, 0x23, 0x5e, 0x85, 0xb8, 0x9e, 0x85, 0xae, 0xc1, 0x00, 0x13, 0xe1, 0x26, 0x4e, 0x2d, 0x4c, 0xa8, 0x82, 0x81, 0x1a, 0x30, 0x50, 0x97, 0xdd, 0xc3, 0x95, 0xe1, 0x3f, 0xfe, 0x66, 0xf6, 0x24, 0xd3, 0xda, 0xd0, 0xb9, 0x30, 0xb7, 0xf6, 0x9d, 0x98, 0x35, 0x2f, 0xc0, 0xb4, 0x0e, 0x10, 0xb9, 0x2c, 0xd3, 0xcf, 0x6d, 0x4e, 0xa9, 0x92, 0x2d, 0xf3, 0xaf, 0x2a, 0x32, 0x42, 0x92, 0x54, 0x77, 0xcc, 0x92, 0x25, 0x75, 0xf5, 0x98, - 0x26, 0xfe, 0x89, 0x02, 0x28, 0x6e, 0x5d, 0x82, 0x7d, 0x13, 0x4e, 0xb2, 0xf3, 0xbd, 0x8c, 0x72, - 0xe9, 0x44, 0x27, 0x68, 0x85, 0x34, 0xba, 0x95, 0x80, 0x6a, 0xba, 0x2d, 0x2a, 0x71, 0x66, 0x1d, - 0xac, 0x2c, 0x4c, 0x70, 0x54, 0x77, 0x7d, 0x27, 0x4e, 0x9b, 0xfb, 0xe3, 0x2e, 0x9c, 0x6d, 0xd8, - 0x93, 0xa0, 0xe7, 0x61, 0xd8, 0xf5, 0x1d, 0x23, 0x00, 0xce, 0x22, 0x35, 0x71, 0x5c, 0xcb, 0x8f, - 0x89, 0x48, 0x85, 0x5b, 0x58, 0x1f, 0x72, 0xa5, 0x2a, 0xb7, 0xb7, 0x2a, 0xcf, 0x62, 0x2b, 0x1f, - 0x1c, 0x56, 0xac, 0x5e, 0xc2, 0x8e, 0x37, 0x25, 0xa8, 0xc8, 0x48, 0x04, 0x8a, 0x0b, 0xd3, 0xc3, - 0x8a, 0xc5, 0xed, 0x0c, 0xc7, 0x41, 0x85, 0x5b, 0x58, 0x1f, 0xaa, 0x48, 0x55, 0xfc, 0x5b, 0x05, - 0x72, 0xdc, 0xd8, 0xaa, 0x59, 0x2e, 0x6c, 0x12, 0xdb, 0x65, 0x46, 0xef, 0xb1, 0x2c, 0xf5, 0x7a, - 0xc1, 0x86, 0xf6, 0x60, 0x98, 0x92, 0x7d, 0xcb, 0xf5, 0x0c, 0x9b, 0x05, 0x85, 0x05, 0xf4, 0x7c, - 0x5d, 0x50, 0x82, 0x70, 0xac, 0x12, 0xdb, 0x5d, 0x99, 0x7b, 0x5c, 0xcb, 0xf7, 0xfd, 0xfa, 0xef, - 0xf9, 0xcb, 0x25, 0x9b, 0xee, 0xf9, 0xbb, 0x6a, 0x81, 0x38, 0xf2, 0x16, 0xc9, 0x3f, 0xb3, 0x5e, - 0x71, 0x5f, 0x63, 0x98, 0x3d, 0xae, 0xe0, 0xe9, 0x43, 0xc2, 0xfa, 0x86, 0x8b, 0xff, 0xab, 0x40, - 0xbe, 0x25, 0x72, 0xe9, 0x90, 0x5d, 0x18, 0xe3, 0x37, 0xce, 0x20, 0x3e, 0x35, 0x4c, 0x87, 0xf8, - 0x2e, 0x95, 0x7e, 0x79, 0x9b, 0x9d, 0xfc, 0xb7, 0x5a, 0xfe, 0xac, 0x38, 0xc7, 0x2b, 0xee, 0xab, - 0x36, 0xd1, 0x1c, 0x93, 0xee, 0xa9, 0x1b, 0x2e, 0x3d, 0xae, 0xe5, 0xcf, 0x09, 0x82, 0x8d, 0xea, - 0x58, 0x1f, 0xe1, 0x4b, 0xdb, 0x3e, 0x5d, 0xe6, 0x0b, 0xe8, 0x43, 0x00, 0xc9, 0x98, 0xf8, 0xf4, - 0x79, 0x50, 0x96, 0x0e, 0xdd, 0xf6, 0x29, 0xfe, 0x54, 0x81, 0xe9, 0x90, 0xf3, 0xda, 0x81, 0x4d, - 0x19, 0x67, 0x2e, 0xb5, 0x5e, 0x25, 0x4e, 0x7d, 0xd8, 0xce, 0x35, 0x84, 0x2d, 0x0c, 0xd1, 0x1a, - 0x8c, 0x0a, 0x56, 0xb6, 0x1b, 0xf8, 0xa4, 0x9f, 0xfb, 0xe4, 0x62, 0xaa, 0x4f, 0xf4, 0x33, 0x5c, - 0x6b, 0xc3, 0x15, 0xbc, 0xf1, 0xe7, 0x0a, 0x5c, 0x6e, 0x8f, 0x45, 0x06, 0xa2, 0xde, 0x49, 0xca, - 0x73, 0x75, 0xd2, 0x1a, 0xbc, 0x12, 0x5e, 0x8f, 0x1d, 0xb3, 0x6a, 0x3a, 0x3d, 0x65, 0x32, 0xbe, - 0x05, 0xe7, 0x9a, 0xcc, 0x48, 0x36, 0x33, 0x30, 0x58, 0xe1, 0x2b, 0x69, 0x05, 0x56, 0x97, 0x32, - 0xf8, 0x7d, 0x79, 0xc3, 0x3e, 0x20, 0xd4, 0x2c, 0x33, 0x6b, 0x77, 0xec, 0x07, 0xbe, 0x5d, 0xb4, - 0xe9, 0x61, 0xcf, 0x45, 0xff, 0x8b, 0x20, 0xf7, 0x93, 0x6c, 0x4a, 0x90, 0x47, 0x30, 0x5c, 0x0e, - 0x16, 0xdb, 0x7b, 0xfc, 0x3d, 0xe6, 0xf1, 0xa8, 0x56, 0x84, 0x9a, 0xb8, 0xbb, 0x28, 0x84, 0x7a, - 0x1c, 0xe6, 0xba, 0x74, 0x21, 0x47, 0xd9, 0x7b, 0x51, 0xc1, 0x3e, 0x64, 0x9a, 0xed, 0x48, 0x9a, - 0xdf, 0x82, 0xd3, 0x94, 0x2d, 0x1b, 0x3c, 0x3b, 0x83, 0x88, 0xa4, 0x30, 0x9d, 0x94, 0x4c, 0x5f, - 0x16, 0x87, 0xc5, 0x95, 0xb1, 0x7e, 0x8a, 0x46, 0x47, 0xe0, 0xdf, 0x29, 0xf0, 0x5a, 0x53, 0x85, - 0xb9, 0x4b, 0xee, 0x3d, 0x34, 0x2b, 0x5f, 0x89, 0x0a, 0xf9, 0x6f, 0x05, 0x5e, 0x6f, 0x83, 0x5f, - 0x3a, 0xf1, 0x93, 0xee, 0xae, 0xe7, 0x9a, 0x74, 0xe1, 0x78, 0xe0, 0xc2, 0x40, 0x15, 0xf7, 0x78, - 0x67, 0xd1, 0x75, 0x00, 0x11, 0x02, 0x59, 0x44, 0x3b, 0x28, 0x47, 0xc3, 0x42, 0x81, 0xdd, 0xf8, - 0xff, 0x28, 0xf2, 0x8b, 0x78, 0xaf, 0x42, 0xe8, 0x4e, 0xd5, 0x2e, 0xf4, 0xf4, 0x5d, 0x45, 0x6b, - 0x30, 0xc6, 0xb8, 0x1a, 0xa6, 0xe7, 0x59, 0xd4, 0x28, 0x5a, 0x2e, 0x71, 0x24, 0x94, 0xc9, 0xe8, - 0x83, 0xd0, 0x28, 0x81, 0xf5, 0x11, 0xb6, 0xb4, 0xcc, 0x56, 0xde, 0x63, 0x0b, 0xe8, 0x36, 0x8c, - 0x3f, 0xf0, 0x09, 0xad, 0xb7, 0x73, 0x82, 0xdb, 0xb9, 0x70, 0x5c, 0xcb, 0x67, 0x84, 0x9d, 0x26, - 0x11, 0xac, 0x8f, 0xf2, 0xb5, 0xc8, 0x12, 0xbb, 0x43, 0x9b, 0x03, 0x43, 0x03, 0x63, 0x27, 0xf5, - 0x53, 0x0f, 0x6d, 0xba, 0xc7, 0x02, 0xb7, 0x6e, 0x59, 0xf8, 0xf7, 0x0a, 0x4c, 0x46, 0x7d, 0xd4, - 0x37, 0x6d, 0xba, 0xb7, 0x6e, 0x97, 0xa9, 0x55, 0x0d, 0x48, 0xdf, 0x80, 0x33, 0x8e, 0xed, 0x1a, - 0xf1, 0xdb, 0xcf, 0x0e, 0xcf, 0x1c, 0xd7, 0xf2, 0x13, 0xe2, 0xf0, 0xba, 0x6d, 0xac, 0x9f, 0x76, - 0x6c, 0x37, 0x2c, 0x20, 0x68, 0x32, 0xde, 0x45, 0x70, 0xfe, 0x51, 0xbf, 0xd0, 0xd0, 0x0b, 0x9e, - 0xe8, 0xb9, 0x17, 0xfc, 0xb9, 0x02, 0x17, 0x92, 0x39, 0xbc, 0x20, 0x5d, 0xa1, 0x2e, 0xbf, 0x22, + 0x26, 0xfe, 0x89, 0x02, 0x28, 0x6e, 0x5d, 0x82, 0xbd, 0x0e, 0x27, 0xd9, 0xf9, 0x5e, 0x46, 0xb9, + 0x74, 0xa2, 0x13, 0xb4, 0x42, 0x1a, 0xdd, 0x4e, 0x40, 0x35, 0xdd, 0x16, 0x95, 0x38, 0xb3, 0x0e, + 0x56, 0x16, 0x26, 0x38, 0xaa, 0x7b, 0xbe, 0x13, 0xa7, 0xcd, 0xfd, 0x71, 0x0f, 0xce, 0x36, 0xec, + 0x49, 0xd0, 0xf3, 0x30, 0xec, 0xfa, 0x8e, 0x11, 0x00, 0x67, 0x91, 0x9a, 0x38, 0xae, 0xe5, 0xc7, + 0x44, 0xa4, 0xc2, 0x2d, 0xac, 0x0f, 0xb9, 0x52, 0x95, 0xdb, 0x5b, 0x95, 0x67, 0xb1, 0x95, 0xf7, + 0x0f, 0x2b, 0x56, 0x2f, 0x61, 0xc7, 0x9b, 0x12, 0x54, 0x64, 0x24, 0x02, 0xc5, 0x85, 0xe9, 0x61, + 0xc5, 0xe2, 0x76, 0x86, 0xe3, 0xa0, 0xc2, 0x2d, 0xac, 0x0f, 0x55, 0xa4, 0x2a, 0xfe, 0xad, 0x02, + 0x39, 0x6e, 0x6c, 0xd5, 0x2c, 0x17, 0x36, 0x89, 0xed, 0x32, 0xa3, 0xf7, 0x59, 0x96, 0x7a, 0xbd, + 0x60, 0x43, 0x7b, 0x30, 0x4c, 0xc9, 0xbe, 0xe5, 0x7a, 0x86, 0xcd, 0x82, 0xc2, 0x02, 0x7a, 0xbe, + 0x2e, 0x28, 0x41, 0x38, 0x56, 0x89, 0xed, 0xae, 0xcc, 0x3d, 0xa9, 0xe5, 0xfb, 0x7e, 0xfd, 0xf7, + 0xfc, 0xe5, 0x92, 0x4d, 0xf7, 0xfc, 0x5d, 0xb5, 0x40, 0x1c, 0x79, 0x8b, 0xe4, 0x9f, 0x59, 0xaf, + 0xb8, 0xaf, 0x31, 0xcc, 0x1e, 0x57, 0xf0, 0xf4, 0x21, 0x61, 0x7d, 0xc3, 0xc5, 0xff, 0x55, 0x20, + 0xdf, 0x12, 0xb9, 0x74, 0xc8, 0x2e, 0x8c, 0xf1, 0x1b, 0x67, 0x10, 0x9f, 0x1a, 0xa6, 0x43, 0x7c, + 0x97, 0x4a, 0xbf, 0xbc, 0xc5, 0x4e, 0xfe, 0x5b, 0x2d, 0x7f, 0x56, 0x9c, 0xe3, 0x15, 0xf7, 0x55, + 0x9b, 0x68, 0x8e, 0x49, 0xf7, 0xd4, 0x0d, 0x97, 0x1e, 0xd7, 0xf2, 0xe7, 0x04, 0xc1, 0x46, 0x75, + 0xac, 0x8f, 0xf0, 0xa5, 0x6d, 0x9f, 0x2e, 0xf3, 0x05, 0xf4, 0x01, 0x80, 0x64, 0x4c, 0x7c, 0xfa, + 0x22, 0x28, 0x4b, 0x87, 0x6e, 0xfb, 0x14, 0x7f, 0xa2, 0xc0, 0x74, 0xc8, 0x79, 0xed, 0xc0, 0xa6, + 0x8c, 0x33, 0x97, 0x5a, 0xaf, 0x12, 0xa7, 0x3e, 0x6c, 0xe7, 0x1a, 0xc2, 0x16, 0x86, 0x68, 0x0d, + 0x46, 0x05, 0x2b, 0xdb, 0x0d, 0x7c, 0xd2, 0xcf, 0x7d, 0x72, 0x31, 0xd5, 0x27, 0xfa, 0x19, 0xae, + 0xb5, 0xe1, 0x0a, 0xde, 0xf8, 0x33, 0x05, 0x2e, 0xb7, 0xc7, 0x22, 0x03, 0x51, 0xef, 0x24, 0xe5, + 0x85, 0x3a, 0x69, 0x0d, 0x5e, 0x09, 0xaf, 0xc7, 0x8e, 0x59, 0x35, 0x9d, 0x9e, 0x32, 0x19, 0xdf, + 0x86, 0x73, 0x4d, 0x66, 0x24, 0x9b, 0x19, 0x18, 0xac, 0xf0, 0x95, 0xb4, 0x02, 0xab, 0x4b, 0x19, + 0xfc, 0x9e, 0xbc, 0x61, 0xef, 0x13, 0x6a, 0x96, 0x99, 0xb5, 0xbb, 0xf6, 0x43, 0xdf, 0x2e, 0xda, + 0xf4, 0xb0, 0xe7, 0xa2, 0xff, 0x79, 0x90, 0xfb, 0x49, 0x36, 0x25, 0xc8, 0x23, 0x18, 0x2e, 0x07, + 0x8b, 0xed, 0x3d, 0xfe, 0x2e, 0xf3, 0x78, 0x54, 0x2b, 0x42, 0x4d, 0xdc, 0x5d, 0x14, 0x42, 0x3d, + 0x0e, 0x73, 0x5d, 0xba, 0x90, 0xa3, 0xec, 0xbd, 0xa8, 0x60, 0x1f, 0x32, 0xcd, 0x76, 0x24, 0xcd, + 0x6f, 0xc1, 0x69, 0xca, 0x96, 0x0d, 0x9e, 0x9d, 0x41, 0x44, 0x52, 0x98, 0x4e, 0x4a, 0xa6, 0x2f, + 0x8b, 0xc3, 0xe2, 0xca, 0x58, 0x3f, 0x45, 0xa3, 0x23, 0xf0, 0xef, 0x14, 0x78, 0xad, 0xa9, 0xc2, + 0xdc, 0x23, 0xf7, 0x1f, 0x99, 0x95, 0xaf, 0x44, 0x85, 0xfc, 0xb7, 0x02, 0xaf, 0xb7, 0xc1, 0x2f, + 0x9d, 0xf8, 0x71, 0x77, 0xd7, 0x73, 0x4d, 0xba, 0x70, 0x3c, 0x70, 0x61, 0xa0, 0x8a, 0x7b, 0xbc, + 0xb3, 0xe8, 0x06, 0x80, 0x08, 0x81, 0x2c, 0xa2, 0x1d, 0x94, 0xa3, 0x61, 0xa1, 0xc0, 0x6e, 0xfc, + 0x7f, 0x14, 0xf9, 0x45, 0xbc, 0x5f, 0x21, 0x74, 0xa7, 0x6a, 0x17, 0x7a, 0xfa, 0xae, 0xa2, 0x35, + 0x18, 0x63, 0x5c, 0x0d, 0xd3, 0xf3, 0x2c, 0x6a, 0x14, 0x2d, 0x97, 0x38, 0x12, 0xca, 0x64, 0xf4, + 0x41, 0x68, 0x94, 0xc0, 0xfa, 0x08, 0x5b, 0x5a, 0x66, 0x2b, 0xef, 0xb2, 0x05, 0x74, 0x07, 0xc6, + 0x1f, 0xfa, 0x84, 0xd6, 0xdb, 0x39, 0xc1, 0xed, 0x5c, 0x38, 0xae, 0xe5, 0x33, 0xc2, 0x4e, 0x93, + 0x08, 0xd6, 0x47, 0xf9, 0x5a, 0x64, 0x89, 0xdd, 0xa1, 0xcd, 0x81, 0xa1, 0x81, 0xb1, 0x93, 0xfa, + 0xa9, 0x47, 0x36, 0xdd, 0x63, 0x81, 0x5b, 0xb7, 0x2c, 0xfc, 0x7b, 0x05, 0x26, 0xa3, 0x3e, 0xea, + 0x9b, 0x36, 0xdd, 0x5b, 0xb7, 0xcb, 0xd4, 0xaa, 0x06, 0xa4, 0x6f, 0xc2, 0x19, 0xc7, 0x76, 0x8d, + 0xf8, 0xed, 0x67, 0x87, 0x67, 0x8e, 0x6b, 0xf9, 0x09, 0x71, 0x78, 0xdd, 0x36, 0xd6, 0x4f, 0x3b, + 0xb6, 0x1b, 0x16, 0x10, 0x34, 0x19, 0xef, 0x22, 0x38, 0xff, 0xa8, 0x5f, 0x68, 0xe8, 0x05, 0x4f, + 0xf4, 0xdc, 0x0b, 0xfe, 0x5c, 0x81, 0x0b, 0xc9, 0x1c, 0xbe, 0x24, 0x5d, 0xa1, 0x2e, 0xbf, 0x22, 0xb1, 0x94, 0x92, 0xc8, 0x16, 0x01, 0xbc, 0x0a, 0xa1, 0x46, 0x85, 0xad, 0x4a, 0xdf, 0x9e, 0x8d, 0x6e, 0x43, 0xb4, 0x87, 0xf5, 0x61, 0x2f, 0xd0, 0xe6, 0xf5, 0xf0, 0x87, 0xfd, 0x70, 0x51, 0x18, - 0x7d, 0x68, 0x56, 0xd6, 0x0e, 0xcc, 0x82, 0xec, 0x21, 0x36, 0xdc, 0x20, 0x74, 0x6f, 0xc0, 0xa0, + 0x7d, 0x64, 0x56, 0xd6, 0x0e, 0xcc, 0x82, 0xec, 0x21, 0x36, 0xdc, 0x20, 0x74, 0x6f, 0xc0, 0xa0, 0x67, 0xb9, 0x45, 0xab, 0x2a, 0xed, 0x8e, 0x1f, 0xd7, 0xf2, 0x67, 0xa4, 0x5d, 0xbe, 0x8e, 0x75, 0x29, 0x10, 0x4f, 0xed, 0xfe, 0xb6, 0xa9, 0xad, 0x82, 0x28, 0x0b, 0xac, 0xe6, 0x88, 0x54, 0x7c, 0xf9, 0xb8, 0x96, 0x1f, 0x8d, 0xdd, 0x5f, 0xc3, 0x76, 0xb1, 0xfe, 0x12, 0xff, 0x77, 0xc3, 0x45, 0xdf, 0x85, 0x41, 0xfe, 0xd8, 0xf2, 0x32, 0x03, 0xdc, 0xfd, 0xaa, 0x1a, 0xbc, 0xf3, 0x62, 0x8f, 0xb3, 0xd0, 0x89, 0x8c, 0x4e, 0xc8, 0x84, 0xa9, 0xad, 0x9c, 0x95, 0x15, 0x42, 0x62, 0x17, 0xb6, - 0xb0, 0x2e, 0x8d, 0x72, 0x67, 0x3c, 0x0a, 0x3a, 0xcf, 0x04, 0x67, 0x44, 0xed, 0x9b, 0xc0, 0xd6, - 0x73, 0xfb, 0xd6, 0xa8, 0x8e, 0xf5, 0x11, 0xbe, 0x14, 0xb6, 0x6f, 0x1c, 0xca, 0x67, 0xfd, 0xc9, - 0x50, 0xb6, 0x7d, 0xfa, 0xbc, 0x03, 0xf3, 0xbd, 0xd0, 0xd1, 0x27, 0xb8, 0xa3, 0xb5, 0x0e, 0x1d, + 0xb0, 0x2e, 0x8d, 0x72, 0x67, 0x3c, 0x0e, 0x3a, 0xcf, 0x04, 0x67, 0x44, 0xed, 0x9b, 0xc0, 0xd6, + 0x73, 0xfb, 0xd6, 0xa8, 0x8e, 0xf5, 0x11, 0xbe, 0x14, 0xb6, 0x6f, 0x1c, 0xca, 0xa7, 0xfd, 0xc9, + 0x50, 0xb6, 0x7d, 0xfa, 0xa2, 0x03, 0xf3, 0xbd, 0xd0, 0xd1, 0x27, 0xb8, 0xa3, 0xb5, 0x0e, 0x1d, 0xcd, 0xa0, 0x75, 0xe0, 0x69, 0xf6, 0x24, 0x08, 0x7d, 0x90, 0x19, 0x68, 0x7c, 0x12, 0x84, 0x5b, 0x58, 0x7e, 0x36, 0xb6, 0x7d, 0xe1, 0x91, 0x1f, 0x04, 0x0d, 0x46, 0x92, 0x47, 0x64, 0x74, 0x0c, - 0x18, 0x0d, 0x32, 0xa7, 0x3e, 0x38, 0x6f, 0xb5, 0x0b, 0xce, 0x2b, 0xf5, 0x79, 0x17, 0xc6, 0xe6, + 0x18, 0x0d, 0x32, 0xa7, 0x3e, 0x38, 0x6f, 0xb6, 0x0b, 0xce, 0x2b, 0xf5, 0x79, 0x17, 0xc6, 0xe6, 0x8c, 0x4c, 0xbf, 0x58, 0x68, 0x2e, 0x40, 0x36, 0xfa, 0xf4, 0x37, 0x36, 0x4e, 0xf8, 0x67, 0x41, - 0x25, 0x6c, 0xdc, 0x7e, 0x21, 0x7a, 0x20, 0x5c, 0x82, 0x2b, 0xe2, 0xfb, 0x4b, 0xdc, 0x82, 0xe5, - 0xd2, 0xaa, 0x49, 0xad, 0x22, 0xaf, 0x56, 0xc5, 0x3b, 0xb6, 0xbb, 0xcf, 0xda, 0xe4, 0xd5, 0xf5, - 0xad, 0xad, 0x20, 0xc5, 0xbe, 0x0e, 0xa7, 0x0b, 0xf7, 0x1d, 0xf1, 0x70, 0x8c, 0x3e, 0x58, 0xe7, - 0xa2, 0x56, 0x25, 0xbe, 0x8b, 0x75, 0x60, 0x3f, 0x85, 0x35, 0x6c, 0xc0, 0xd5, 0x8e, 0x0e, 0x92, - 0x6e, 0x99, 0x83, 0x89, 0x42, 0x4c, 0xb2, 0xfe, 0x44, 0x1d, 0x15, 0x9a, 0xac, 0xe0, 0xe9, 0xa0, - 0x93, 0x58, 0xdf, 0xda, 0x6a, 0x3c, 0x84, 0x1d, 0x11, 0xb4, 0x42, 0xf8, 0x08, 0xa6, 0xda, 0x09, - 0x4a, 0x10, 0xf7, 0x60, 0xdc, 0xb1, 0x4b, 0x55, 0x5e, 0x6d, 0x8d, 0xaa, 0x55, 0x20, 0xd5, 0x62, - 0xd0, 0xbd, 0x4d, 0xa9, 0x49, 0x53, 0x25, 0x75, 0x2b, 0x10, 0xd7, 0x85, 0xb4, 0x3e, 0xe6, 0x34, - 0xac, 0x2c, 0x3c, 0xca, 0xc0, 0x49, 0x7e, 0x3e, 0xfa, 0x04, 0xf8, 0x87, 0xc1, 0x43, 0xd3, 0xc9, - 0xc6, 0x9a, 0xc6, 0x1c, 0xd9, 0xcb, 0xed, 0x05, 0x05, 0x74, 0xfc, 0xb5, 0xef, 0xff, 0xf9, 0x9f, - 0x3f, 0xee, 0xbf, 0x88, 0x26, 0xb5, 0xc4, 0x21, 0x8f, 0xf8, 0x12, 0x7d, 0xa6, 0xc0, 0x50, 0x30, - 0x36, 0x40, 0x57, 0x52, 0x6c, 0x37, 0xcc, 0x1d, 0xb2, 0x57, 0x3b, 0x92, 0x95, 0x50, 0xae, 0x70, - 0x28, 0xaf, 0xa2, 0x7c, 0x32, 0x94, 0x70, 0x10, 0xf1, 0xa8, 0x5f, 0x41, 0x5f, 0x28, 0x30, 0x52, - 0x7f, 0x51, 0xd0, 0x5c, 0xca, 0x59, 0x89, 0x57, 0x2e, 0x3b, 0xdf, 0x85, 0x86, 0xc4, 0x38, 0xcb, - 0x31, 0x4e, 0xa3, 0xd7, 0x93, 0x31, 0x8a, 0x0e, 0x3c, 0xbc, 0x35, 0xe8, 0x97, 0x0a, 0x8c, 0x36, - 0x74, 0x05, 0x68, 0xbe, 0x5d, 0x6c, 0x9a, 0xba, 0xa0, 0xec, 0x42, 0x37, 0x2a, 0x12, 0xe9, 0x0c, - 0x47, 0x3a, 0x85, 0x5e, 0x4b, 0x46, 0x7a, 0x9f, 0x4b, 0xcb, 0x0b, 0xe3, 0xa1, 0x4f, 0x15, 0x18, - 0x60, 0x96, 0xd0, 0x54, 0x9b, 0xa3, 0x02, 0x48, 0xd3, 0x6d, 0xe5, 0x24, 0x8e, 0xb9, 0x74, 0x8f, - 0xf1, 0xe3, 0xb5, 0x8f, 0xe5, 0xb5, 0x3d, 0x62, 0xb1, 0xfd, 0x5c, 0x81, 0xa1, 0x60, 0x1e, 0x94, - 0x9a, 0x6d, 0x0d, 0x93, 0xa7, 0xd4, 0x6c, 0x6b, 0x1c, 0x30, 0xe1, 0x79, 0x8e, 0xeb, 0x2a, 0x7a, - 0xa3, 0x35, 0x2e, 0xde, 0x36, 0x46, 0xd8, 0xd0, 0x4f, 0x15, 0xc8, 0xb4, 0x7a, 0x7f, 0xa0, 0xa5, - 0x94, 0xc3, 0xdb, 0x3c, 0xba, 0xb2, 0xdf, 0xe8, 0x49, 0x57, 0x12, 0xe9, 0x43, 0x7f, 0x50, 0x00, - 0x35, 0x4f, 0x8e, 0xd0, 0x62, 0x87, 0x56, 0xeb, 0xb1, 0xbc, 0xd9, 0xa5, 0x96, 0x44, 0x71, 0x93, - 0xbb, 0x73, 0x09, 0xbd, 0xdd, 0x51, 0x98, 0xb5, 0x0f, 0x89, 0xed, 0x1a, 0x7c, 0x10, 0x6e, 0xb1, - 0x2f, 0xb2, 0x61, 0xbb, 0xe8, 0x5f, 0x0a, 0x4c, 0xa6, 0xcc, 0x5f, 0xd0, 0x8d, 0x36, 0xc0, 0xd2, - 0x67, 0x48, 0xd9, 0x77, 0x7a, 0x55, 0x97, 0x04, 0x6f, 0x71, 0x82, 0xcb, 0xe8, 0xdd, 0xce, 0x08, + 0x25, 0x6c, 0xdc, 0xfe, 0x52, 0xf4, 0x40, 0xb8, 0x04, 0x57, 0xc4, 0xf7, 0x97, 0xb8, 0x05, 0xcb, + 0xa5, 0x55, 0x93, 0x5a, 0x45, 0x5e, 0xad, 0x8a, 0x77, 0x6d, 0x77, 0x9f, 0xb5, 0xc9, 0xab, 0xeb, + 0x5b, 0x5b, 0x41, 0x8a, 0x7d, 0x1d, 0x4e, 0x17, 0x1e, 0x38, 0xe2, 0xe1, 0x18, 0x7d, 0xb0, 0xce, + 0x45, 0xad, 0x4a, 0x7c, 0x17, 0xeb, 0xc0, 0x7e, 0x0a, 0x6b, 0xd8, 0x80, 0xab, 0x1d, 0x1d, 0x24, + 0xdd, 0x32, 0x07, 0x13, 0x85, 0x98, 0x64, 0xfd, 0x89, 0x3a, 0x2a, 0x34, 0x59, 0xc1, 0xd3, 0x41, + 0x27, 0xb1, 0xbe, 0xb5, 0xd5, 0x78, 0x08, 0x3b, 0x22, 0x68, 0x85, 0xf0, 0x11, 0x4c, 0xb5, 0x13, + 0x94, 0x20, 0xee, 0xc3, 0xb8, 0x63, 0x97, 0xaa, 0xbc, 0xda, 0x1a, 0x55, 0xab, 0x40, 0xaa, 0xc5, + 0xa0, 0x7b, 0x9b, 0x52, 0x93, 0xa6, 0x4a, 0xea, 0x56, 0x20, 0xae, 0x0b, 0x69, 0x7d, 0xcc, 0x69, + 0x58, 0x59, 0x78, 0x9c, 0x81, 0x93, 0xfc, 0x7c, 0xf4, 0x31, 0xf0, 0x0f, 0x83, 0x87, 0xa6, 0x93, + 0x8d, 0x35, 0x8d, 0x39, 0xb2, 0x97, 0xdb, 0x0b, 0x0a, 0xe8, 0xf8, 0x6b, 0xdf, 0xff, 0xf3, 0x3f, + 0x7f, 0xdc, 0x7f, 0x11, 0x4d, 0x6a, 0x89, 0x43, 0x1e, 0xf1, 0x25, 0xfa, 0x54, 0x81, 0xa1, 0x60, + 0x6c, 0x80, 0xae, 0xa4, 0xd8, 0x6e, 0x98, 0x3b, 0x64, 0xaf, 0x76, 0x24, 0x2b, 0xa1, 0x5c, 0xe1, + 0x50, 0x5e, 0x45, 0xf9, 0x64, 0x28, 0xe1, 0x20, 0xe2, 0x71, 0xbf, 0x82, 0x3e, 0x57, 0x60, 0xa4, + 0xfe, 0xa2, 0xa0, 0xb9, 0x94, 0xb3, 0x12, 0xaf, 0x5c, 0x76, 0xbe, 0x0b, 0x0d, 0x89, 0x71, 0x96, + 0x63, 0x9c, 0x46, 0xaf, 0x27, 0x63, 0x14, 0x1d, 0x78, 0x78, 0x6b, 0xd0, 0x2f, 0x15, 0x18, 0x6d, + 0xe8, 0x0a, 0xd0, 0x7c, 0xbb, 0xd8, 0x34, 0x75, 0x41, 0xd9, 0x85, 0x6e, 0x54, 0x24, 0xd2, 0x19, + 0x8e, 0x74, 0x0a, 0xbd, 0x96, 0x8c, 0xf4, 0x01, 0x97, 0x96, 0x17, 0xc6, 0x43, 0x9f, 0x28, 0x30, + 0xc0, 0x2c, 0xa1, 0xa9, 0x36, 0x47, 0x05, 0x90, 0xa6, 0xdb, 0xca, 0x49, 0x1c, 0x73, 0xe9, 0x1e, + 0xe3, 0xc7, 0x6b, 0x1f, 0xc9, 0x6b, 0x7b, 0xc4, 0x62, 0xfb, 0x99, 0x02, 0x43, 0xc1, 0x3c, 0x28, + 0x35, 0xdb, 0x1a, 0x26, 0x4f, 0xa9, 0xd9, 0xd6, 0x38, 0x60, 0xc2, 0xf3, 0x1c, 0xd7, 0x55, 0xf4, + 0x46, 0x6b, 0x5c, 0xbc, 0x6d, 0x8c, 0xb0, 0xa1, 0x9f, 0x2a, 0x90, 0x69, 0xf5, 0xfe, 0x40, 0x4b, + 0x29, 0x87, 0xb7, 0x79, 0x74, 0x65, 0xbf, 0xd1, 0x93, 0xae, 0x24, 0xd2, 0x87, 0xfe, 0xa0, 0x00, + 0x6a, 0x9e, 0x1c, 0xa1, 0xc5, 0x0e, 0xad, 0xd6, 0x63, 0xb9, 0xde, 0xa5, 0x96, 0x44, 0x71, 0x8b, + 0xbb, 0x73, 0x09, 0xbd, 0xd5, 0x51, 0x98, 0xb5, 0x0f, 0x88, 0xed, 0x1a, 0x7c, 0x10, 0x6e, 0xb1, + 0x2f, 0xb2, 0x61, 0xbb, 0xe8, 0x5f, 0x0a, 0x4c, 0xa6, 0xcc, 0x5f, 0xd0, 0xcd, 0x36, 0xc0, 0xd2, + 0x67, 0x48, 0xd9, 0xb7, 0x7b, 0x55, 0x97, 0x04, 0x6f, 0x73, 0x82, 0xcb, 0xe8, 0x9d, 0xce, 0x08, 0x5a, 0x07, 0x36, 0x15, 0x04, 0xc5, 0x80, 0x4a, 0xf4, 0x05, 0x8c, 0xe7, 0x2f, 0x14, 0x80, 0x68, 0x10, 0x83, 0x66, 0xda, 0x24, 0x6d, 0xdd, 0xd8, 0x27, 0x3b, 0xdb, 0xa1, 0xb4, 0x04, 0xbd, 0xc8, - 0x41, 0xab, 0x68, 0xa6, 0x33, 0xd0, 0x62, 0xca, 0x83, 0x1e, 0x2b, 0x80, 0x9a, 0xa7, 0x31, 0xa9, - 0xf9, 0xd4, 0x72, 0x20, 0x94, 0x9a, 0x4f, 0xad, 0x47, 0x3e, 0x78, 0x8d, 0x23, 0xbf, 0x8e, 0x96, + 0x41, 0xab, 0x68, 0xa6, 0x33, 0xd0, 0x62, 0xca, 0x83, 0x9e, 0x28, 0x80, 0x9a, 0xa7, 0x31, 0xa9, + 0xf9, 0xd4, 0x72, 0x20, 0x94, 0x9a, 0x4f, 0xad, 0x47, 0x3e, 0x78, 0x8d, 0x23, 0xbf, 0x81, 0x96, 0x3a, 0x43, 0x2e, 0x0a, 0x2f, 0xff, 0x19, 0x56, 0x5f, 0x56, 0x4b, 0x7e, 0xa5, 0xc0, 0xa9, 0xd8, 0xa8, 0x05, 0xcd, 0xb6, 0x43, 0x53, 0x9f, 0x34, 0x6a, 0xa7, 0xe2, 0x12, 0xf5, 0x12, 0x47, 0xbd, 0x88, 0x16, 0xba, 0x41, 0x2d, 0x1e, 0xff, 0x2c, 0x2f, 0x86, 0xc3, 0x17, 0x1a, 0x4a, 0xab, 0x65, - 0x8d, 0xa3, 0x81, 0xec, 0x4c, 0x67, 0xc2, 0x12, 0xe4, 0x5b, 0x5d, 0x26, 0x05, 0x53, 0xe6, 0x1f, - 0xdd, 0x27, 0x0a, 0x9c, 0x5f, 0xf3, 0xa8, 0xed, 0x98, 0xd4, 0x6a, 0x7a, 0xe9, 0xa0, 0x6b, 0x69, - 0x20, 0x5a, 0x3c, 0x12, 0xb3, 0x8b, 0xdd, 0x29, 0x49, 0x06, 0xb7, 0x39, 0x83, 0x77, 0xd1, 0x8d, + 0x8d, 0xa3, 0x81, 0xec, 0x4c, 0x67, 0xc2, 0x12, 0xe4, 0x9b, 0x5d, 0x26, 0x05, 0x53, 0xe6, 0x1f, + 0xdd, 0xa7, 0x0a, 0x9c, 0x5f, 0xf3, 0xa8, 0xed, 0x98, 0xd4, 0x6a, 0x7a, 0xe9, 0xa0, 0x6b, 0x69, + 0x20, 0x5a, 0x3c, 0x12, 0xb3, 0x8b, 0xdd, 0x29, 0x49, 0x06, 0x77, 0x38, 0x83, 0x77, 0xd0, 0xcd, 0x64, 0x06, 0xb1, 0x5b, 0x28, 0xd1, 0x6a, 0xb1, 0x52, 0x13, 0xde, 0x44, 0x46, 0xe9, 0x2f, 0x0a, 0x64, 0x5b, 0x50, 0xda, 0xf6, 0x29, 0xea, 0x02, 0x5e, 0xf4, 0xc0, 0x4a, 0x4d, 0xf9, 0xd6, 0x8f, - 0x10, 0xbc, 0xc1, 0x59, 0xdd, 0x44, 0xef, 0x7c, 0x09, 0x56, 0xc4, 0xa7, 0x8c, 0xd6, 0xff, 0x14, - 0xc8, 0xa5, 0x37, 0xd0, 0xe8, 0x66, 0x5a, 0x3d, 0xec, 0xa4, 0xc9, 0xcf, 0x2e, 0x7f, 0x09, 0x0b, - 0x92, 0xf2, 0x0e, 0xa7, 0xbc, 0x89, 0x6e, 0x27, 0x53, 0x4e, 0xea, 0xec, 0x8d, 0xb2, 0xed, 0xee, - 0x1b, 0xf7, 0xab, 0xc4, 0x31, 0xd8, 0xab, 0x41, 0xfb, 0x38, 0xfe, 0x94, 0x38, 0x42, 0x7f, 0x52, - 0xe0, 0x7c, 0xcb, 0x86, 0x1d, 0xa5, 0x7e, 0x68, 0xdb, 0xbc, 0x07, 0xb2, 0xd7, 0x7b, 0x53, 0xee, - 0xac, 0x34, 0x70, 0x16, 0xcd, 0x7c, 0x19, 0x59, 0x6f, 0x65, 0xf3, 0xf1, 0xd3, 0x9c, 0xf2, 0xe4, - 0x69, 0x4e, 0xf9, 0xc7, 0xd3, 0x9c, 0xf2, 0xa3, 0x67, 0xb9, 0xbe, 0x27, 0xcf, 0x72, 0x7d, 0x7f, - 0x7d, 0x96, 0xeb, 0xfb, 0xf6, 0x5c, 0xec, 0x2d, 0x27, 0xed, 0xce, 0x96, 0xcd, 0x5d, 0x2f, 0x3c, - 0xe4, 0xa3, 0x85, 0x45, 0xed, 0x40, 0x1c, 0xc5, 0x5f, 0x76, 0xbb, 0x83, 0x7c, 0xea, 0x74, 0xed, - 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa8, 0x06, 0xf7, 0x61, 0x10, 0x1f, 0x00, 0x00, + 0x10, 0xbc, 0xc1, 0x59, 0xdd, 0x42, 0x6f, 0x7f, 0x01, 0x56, 0xc4, 0xa7, 0x8c, 0xd6, 0xff, 0x14, + 0xc8, 0xa5, 0x37, 0xd0, 0xe8, 0x56, 0x5a, 0x3d, 0xec, 0xa4, 0xc9, 0xcf, 0x2e, 0x7f, 0x01, 0x0b, + 0x92, 0xf2, 0x0e, 0xa7, 0xbc, 0x89, 0xee, 0x24, 0x53, 0x4e, 0xea, 0xec, 0x8d, 0xb2, 0xed, 0xee, + 0x1b, 0x0f, 0xaa, 0xc4, 0x31, 0xd8, 0xab, 0x41, 0xfb, 0x28, 0xfe, 0x94, 0x38, 0x42, 0x7f, 0x52, + 0xe0, 0x7c, 0xcb, 0x86, 0x1d, 0xa5, 0x7e, 0x68, 0xdb, 0xbc, 0x07, 0xb2, 0x37, 0x7a, 0x53, 0xee, + 0xac, 0x34, 0x70, 0x16, 0xcd, 0x7c, 0x19, 0x59, 0x6f, 0x65, 0xf3, 0xc9, 0xb3, 0x9c, 0xf2, 0xf4, + 0x59, 0x4e, 0xf9, 0xc7, 0xb3, 0x9c, 0xf2, 0xa3, 0xe7, 0xb9, 0xbe, 0xa7, 0xcf, 0x73, 0x7d, 0x7f, + 0x7d, 0x9e, 0xeb, 0xfb, 0xf6, 0x5c, 0xec, 0x2d, 0x27, 0xed, 0xce, 0x96, 0xcd, 0x5d, 0x2f, 0x3c, + 0xe4, 0xc3, 0x85, 0xeb, 0xda, 0x81, 0x38, 0x8a, 0xbf, 0xec, 0x76, 0x07, 0xf9, 0xd4, 0xe9, 0xda, + 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x68, 0x62, 0xdf, 0x76, 0x10, 0x1f, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gamm/types/route.go b/x/gamm/types/route.go index d50050b6591..261e4e2a163 100644 --- a/x/gamm/types/route.go +++ b/x/gamm/types/route.go @@ -3,7 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type SwapAmountInRoutes []poolmanagertypes.SwapAmountInRoute diff --git a/x/gamm/types/tx.pb.go b/x/gamm/types/tx.pb.go index 47009f63db6..800d7ff3804 100644 --- a/x/gamm/types/tx.pb.go +++ b/x/gamm/types/tx.pb.go @@ -12,7 +12,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types1 "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + types1 "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -867,7 +867,7 @@ var fileDescriptor_cfc8fd3ac7df3247 = []byte{ // 1208 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x6f, 0xdb, 0x46, 0x10, 0x35, 0x25, 0xc5, 0x71, 0xd6, 0xf5, 0x87, 0x18, 0x7f, 0xc8, 0x74, 0x22, 0xd9, 0xdb, 0x22, - 0x71, 0xe2, 0x88, 0x4c, 0x9c, 0xa2, 0x09, 0xdc, 0x02, 0x45, 0xd5, 0xe6, 0xa0, 0xa0, 0x82, 0x02, + 0x71, 0xe2, 0x88, 0x4c, 0x1c, 0xb4, 0x09, 0xdc, 0x02, 0x45, 0xd5, 0xe6, 0xa0, 0xa0, 0x82, 0x02, 0xe6, 0x12, 0xf4, 0x22, 0x50, 0x16, 0x21, 0x33, 0x31, 0x77, 0x05, 0xed, 0xd2, 0x51, 0x4e, 0x2d, 0x82, 0xa6, 0x05, 0x7a, 0xea, 0x4f, 0x29, 0xda, 0x53, 0xff, 0x81, 0xdb, 0x53, 0x8e, 0x45, 0x0f, 0x6a, 0x6b, 0x1f, 0x7a, 0x17, 0x50, 0xa0, 0xc7, 0x62, 0xc9, 0x25, 0x45, 0x52, 0xa4, 0x29, 0xa9, @@ -940,7 +940,7 @@ var fileDescriptor_cfc8fd3ac7df3247 = []byte{ 0x99, 0xdf, 0xce, 0xf2, 0x33, 0x5f, 0xdc, 0x6d, 0x1a, 0xf4, 0xd0, 0xaa, 0xcb, 0x07, 0xd8, 0x54, 0x78, 0xec, 0xe2, 0x91, 0x56, 0x27, 0xee, 0x0f, 0xe5, 0x78, 0xef, 0x7d, 0xa5, 0xe3, 0xa8, 0x14, 0x7d, 0xd5, 0xd2, 0x49, 0x7d, 0xd6, 0xfe, 0x52, 0x78, 0xff, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x20, 0x0f, 0xdf, 0x1b, 0xd7, 0x14, 0x00, 0x00, + 0xe0, 0x6b, 0xf7, 0x0c, 0xd7, 0x14, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gamm/v2types/query.pb.go b/x/gamm/v2types/query.pb.go index c9264798789..2ed4dfe920f 100644 --- a/x/gamm/v2types/query.pb.go +++ b/x/gamm/v2types/query.pb.go @@ -13,7 +13,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - _ "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + _ "github.com/osmosis-labs/osmosis/v25/x/gamm/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -153,37 +153,37 @@ func init() { func init() { proto.RegisterFile("osmosis/gamm/v2/query.proto", fileDescriptor_49ff000e88fc374c) } var fileDescriptor_49ff000e88fc374c = []byte{ - // 467 bytes of a gzipped FileDescriptorProto + // 468 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x41, 0x6f, 0xd3, 0x30, 0x14, 0xc7, 0xeb, 0x02, 0x43, 0xf5, 0x61, 0x63, 0x16, 0x83, 0xd2, 0x8d, 0x74, 0xca, 0x81, 0x0d, - 0x10, 0xb1, 0x16, 0x76, 0xda, 0x8d, 0x0a, 0x24, 0x90, 0x38, 0x40, 0xb8, 0x71, 0x89, 0x9c, 0xd6, - 0x04, 0x4b, 0x4d, 0x9e, 0x5b, 0x3b, 0xd5, 0x2a, 0xc4, 0x85, 0x13, 0xc7, 0x49, 0xdc, 0xf8, 0x44, - 0x1c, 0x27, 0x71, 0x81, 0x4b, 0x85, 0x5a, 0x3e, 0x41, 0x3f, 0x01, 0xb2, 0x9d, 0x74, 0x34, 0x20, - 0xed, 0x16, 0xbf, 0xdf, 0xdf, 0xff, 0xff, 0x7b, 0xce, 0xc3, 0xbb, 0xa0, 0x32, 0x50, 0x42, 0xd1, - 0x94, 0x65, 0x19, 0x9d, 0x84, 0x74, 0x54, 0xf0, 0xf1, 0x34, 0x90, 0x63, 0xd0, 0x40, 0xb6, 0x4a, - 0x18, 0x18, 0x18, 0x4c, 0xc2, 0xce, 0xcd, 0x14, 0x52, 0xb0, 0x8c, 0x9a, 0x2f, 0x27, 0xeb, 0xdc, - 0x5d, 0xf7, 0x38, 0x4a, 0xb8, 0x66, 0x47, 0x54, 0x9f, 0x96, 0xd8, 0xeb, 0x5b, 0x4e, 0x13, 0xa6, - 0xf8, 0x8a, 0xf6, 0x41, 0xe4, 0x25, 0x7f, 0xf0, 0x37, 0xb7, 0xf1, 0x2b, 0x95, 0x64, 0xa9, 0xc8, - 0x99, 0x16, 0x50, 0x69, 0xf7, 0x52, 0x80, 0x74, 0xc8, 0x29, 0x93, 0x82, 0xb2, 0x3c, 0x07, 0x6d, - 0xa1, 0x2a, 0xe9, 0x9d, 0x92, 0xda, 0x53, 0x52, 0xbc, 0xa3, 0x2c, 0x9f, 0x56, 0xc8, 0x85, 0xc4, - 0xae, 0x79, 0x77, 0x70, 0xc8, 0xff, 0x89, 0xf0, 0xce, 0x6b, 0x13, 0xfb, 0x46, 0x82, 0x7e, 0x35, - 0x16, 0x7d, 0x1e, 0xf1, 0x51, 0xc1, 0x95, 0x26, 0x0f, 0xf1, 0x75, 0x09, 0x30, 0x8c, 0xc5, 0xa0, - 0x8d, 0xf6, 0xd1, 0xe1, 0xd5, 0x1e, 0x59, 0xce, 0xba, 0x9b, 0x53, 0x96, 0x0d, 0x4f, 0xfc, 0x12, - 0xf8, 0xd1, 0x86, 0xf9, 0x7a, 0x31, 0x20, 0xcf, 0xf0, 0x0d, 0x33, 0x41, 0xcc, 0x94, 0xe2, 0x3a, - 0x1e, 0xf0, 0x1c, 0xb2, 0x76, 0x73, 0x1f, 0x1d, 0xb6, 0x7a, 0xbb, 0xcb, 0x59, 0xf7, 0xb6, 0xbb, - 0x55, 0x57, 0xf8, 0xd1, 0xa6, 0x29, 0x3d, 0x31, 0x95, 0xa7, 0xa6, 0x40, 0x9e, 0xe3, 0xed, 0x51, - 0x01, 0x7a, 0xdd, 0xe7, 0x8a, 0xf5, 0xd9, 0x5b, 0xce, 0xba, 0x6d, 0xe7, 0xf3, 0x8f, 0xc4, 0x8f, - 0xb6, 0x6c, 0xed, 0xc2, 0xe9, 0xa4, 0xd9, 0x46, 0x7e, 0x84, 0x6f, 0xd5, 0x47, 0x53, 0x12, 0x72, - 0xc5, 0xc9, 0x31, 0xc6, 0x4a, 0x82, 0x8e, 0xa5, 0xa9, 0xda, 0xf1, 0x5a, 0xbd, 0x9d, 0xe5, 0xac, - 0xbb, 0xed, 0x02, 0x2e, 0x98, 0x1f, 0xb5, 0x54, 0x75, 0xdb, 0x78, 0x86, 0x5f, 0x11, 0xbe, 0x66, - 0x4d, 0xc9, 0x19, 0xc2, 0xad, 0x95, 0x33, 0xb9, 0x17, 0xd4, 0xd6, 0x25, 0xf8, 0xef, 0xab, 0x76, - 0x0e, 0x2e, 0xd5, 0xb9, 0x16, 0xfd, 0xf0, 0xd3, 0xf7, 0xdf, 0x5f, 0x9a, 0xf7, 0xc9, 0x01, 0xad, - 0x2f, 0xa9, 0x79, 0x72, 0x45, 0x3f, 0x94, 0xff, 0xe0, 0x23, 0xb5, 0x8d, 0xaa, 0xcf, 0x4d, 0xd4, - 0x7b, 0xf9, 0x6d, 0xee, 0xa1, 0xf3, 0xb9, 0x87, 0x7e, 0xcd, 0x3d, 0x74, 0xb6, 0xf0, 0x1a, 0xe7, - 0x0b, 0xaf, 0xf1, 0x63, 0xe1, 0x35, 0xde, 0x86, 0xa9, 0xd0, 0xef, 0x8b, 0x24, 0xe8, 0x43, 0x56, - 0xf9, 0x3d, 0x1a, 0xb2, 0x44, 0xad, 0xcc, 0x27, 0xe1, 0x31, 0x3d, 0xad, 0x22, 0xf4, 0x54, 0x72, - 0x95, 0x6c, 0xd8, 0x0d, 0x79, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, 0x09, 0x49, 0xde, 0xac, 0x26, - 0x03, 0x00, 0x00, + 0x10, 0xb1, 0x16, 0xe0, 0xb2, 0x1b, 0x15, 0x48, 0x20, 0x71, 0x80, 0x70, 0xe3, 0x12, 0x39, 0xad, + 0x09, 0x96, 0x9a, 0x3c, 0xb7, 0x76, 0xaa, 0x55, 0x88, 0x0b, 0x27, 0x8e, 0x93, 0xb8, 0xf1, 0x89, + 0x38, 0x4e, 0xe2, 0x02, 0x97, 0x0a, 0xb5, 0x7c, 0x82, 0x7e, 0x02, 0x64, 0x3b, 0xe9, 0x68, 0x40, + 0xda, 0x2d, 0x7e, 0xbf, 0xbf, 0xff, 0xff, 0xf7, 0x9c, 0x87, 0x77, 0x41, 0x65, 0xa0, 0x84, 0xa2, + 0x29, 0xcb, 0x32, 0x3a, 0x09, 0xe9, 0xa8, 0xe0, 0xe3, 0x69, 0x20, 0xc7, 0xa0, 0x81, 0x6c, 0x95, + 0x30, 0x30, 0x30, 0x98, 0x84, 0x9d, 0xeb, 0x29, 0xa4, 0x60, 0x19, 0x35, 0x5f, 0x4e, 0xd6, 0xb9, + 0xbd, 0xee, 0x71, 0x94, 0x70, 0xcd, 0x8e, 0xa8, 0x3e, 0x29, 0xb1, 0xd7, 0xb7, 0x9c, 0x26, 0x4c, + 0xf1, 0x15, 0xed, 0x83, 0xc8, 0x4b, 0x7e, 0xef, 0x6f, 0x6e, 0xe3, 0x57, 0x2a, 0xc9, 0x52, 0x91, + 0x33, 0x2d, 0xa0, 0xd2, 0xee, 0xa5, 0x00, 0xe9, 0x90, 0x53, 0x26, 0x05, 0x65, 0x79, 0x0e, 0xda, + 0x42, 0x55, 0xd2, 0x5b, 0x25, 0xb5, 0xa7, 0xa4, 0x78, 0x47, 0x59, 0x3e, 0xad, 0x90, 0x0b, 0x89, + 0x5d, 0xf3, 0xee, 0xe0, 0x90, 0xff, 0x13, 0xe1, 0x9d, 0xd7, 0x26, 0xf6, 0x8d, 0x04, 0xfd, 0x6a, + 0x2c, 0xfa, 0x3c, 0xe2, 0xa3, 0x82, 0x2b, 0x4d, 0xee, 0xe3, 0xab, 0x12, 0x60, 0x18, 0x8b, 0x41, + 0x1b, 0xed, 0xa3, 0xc3, 0xcb, 0x3d, 0xb2, 0x9c, 0x75, 0x37, 0xa7, 0x2c, 0x1b, 0x1e, 0xfb, 0x25, + 0xf0, 0xa3, 0x0d, 0xf3, 0xf5, 0x62, 0x40, 0x9e, 0xe1, 0x6b, 0x66, 0x82, 0x98, 0x29, 0xc5, 0x75, + 0x3c, 0xe0, 0x39, 0x64, 0xed, 0xe6, 0x3e, 0x3a, 0x6c, 0xf5, 0x76, 0x97, 0xb3, 0xee, 0x4d, 0x77, + 0xab, 0xae, 0xf0, 0xa3, 0x4d, 0x53, 0x7a, 0x62, 0x2a, 0x4f, 0x4d, 0x81, 0x3c, 0xc7, 0xdb, 0xa3, + 0x02, 0xf4, 0xba, 0xcf, 0x25, 0xeb, 0xb3, 0xb7, 0x9c, 0x75, 0xdb, 0xce, 0xe7, 0x1f, 0x89, 0x1f, + 0x6d, 0xd9, 0xda, 0xb9, 0xd3, 0x71, 0xb3, 0x8d, 0xfc, 0x08, 0xdf, 0xa8, 0x8f, 0xa6, 0x24, 0xe4, + 0x8a, 0x93, 0x47, 0x18, 0x2b, 0x09, 0x3a, 0x96, 0xa6, 0x6a, 0xc7, 0x6b, 0xf5, 0x76, 0x96, 0xb3, + 0xee, 0xb6, 0x0b, 0x38, 0x67, 0x7e, 0xd4, 0x52, 0xd5, 0x6d, 0xe3, 0x19, 0x7e, 0x45, 0xf8, 0x8a, + 0x35, 0x25, 0xa7, 0x08, 0xb7, 0x56, 0xce, 0xe4, 0x4e, 0x50, 0x5b, 0x97, 0xe0, 0xbf, 0xaf, 0xda, + 0x39, 0xb8, 0x50, 0xe7, 0x5a, 0xf4, 0xc3, 0x4f, 0xdf, 0x7f, 0x7f, 0x69, 0xde, 0x25, 0x07, 0xb4, + 0xbe, 0xa4, 0xe6, 0xc9, 0x15, 0xfd, 0x50, 0xfe, 0x83, 0x8f, 0xd4, 0x36, 0xaa, 0x3e, 0x37, 0x51, + 0xef, 0xe5, 0xb7, 0xb9, 0x87, 0xce, 0xe6, 0x1e, 0xfa, 0x35, 0xf7, 0xd0, 0xe9, 0xc2, 0x6b, 0x9c, + 0x2d, 0xbc, 0xc6, 0x8f, 0x85, 0xd7, 0x78, 0x1b, 0xa6, 0x42, 0xbf, 0x2f, 0x92, 0xa0, 0x0f, 0x59, + 0xe5, 0xf7, 0x60, 0xc8, 0x12, 0xb5, 0x32, 0x9f, 0x84, 0x8f, 0xe9, 0x49, 0x15, 0xa1, 0xa7, 0x92, + 0xab, 0x64, 0xc3, 0x6e, 0xc8, 0xc3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2e, 0x2c, 0xfb, 0x2d, + 0x26, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc-hooks/types/genesis.pb.go b/x/ibc-hooks/types/genesis.pb.go index d8628028867..ed2323acb67 100644 --- a/x/ibc-hooks/types/genesis.pb.go +++ b/x/ibc-hooks/types/genesis.pb.go @@ -87,8 +87,8 @@ var fileDescriptor_03d36a9d42c8f2ad = []byte{ 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, 0x32, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x9a, 0xa5, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, - 0x97, 0x19, 0x99, 0xe8, 0x57, 0x80, 0x9c, 0xa7, 0x0b, 0x71, 0x5f, 0x49, 0x65, 0x41, 0x6a, 0x71, - 0x12, 0x1b, 0xd8, 0x7d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa5, 0xf3, 0x5a, 0xb0, 0x23, + 0x97, 0x19, 0x99, 0xea, 0x57, 0x80, 0x9c, 0xa7, 0x0b, 0x71, 0x5f, 0x49, 0x65, 0x41, 0x6a, 0x71, + 0x12, 0x1b, 0xd8, 0x7d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe4, 0xe8, 0xd6, 0xde, 0x23, 0x01, 0x00, 0x00, } diff --git a/x/ibc-hooks/types/params.pb.go b/x/ibc-hooks/types/params.pb.go index 935d993b4a6..781a6662376 100644 --- a/x/ibc-hooks/types/params.pb.go +++ b/x/ibc-hooks/types/params.pb.go @@ -90,9 +90,9 @@ var fileDescriptor_970ea72aec489f5a = []byte{ 0x04, 0x49, 0x3a, 0x26, 0x67, 0x3b, 0xc3, 0xa4, 0x9c, 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, 0x34, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, - 0x1f, 0xea, 0x71, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xc8, 0x44, 0xbf, 0x02, + 0x1f, 0xea, 0x71, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x18, 0x47, 0xbf, 0xcc, 0xc8, 0x54, 0xbf, 0x02, 0x14, 0x54, 0xba, 0x90, 0xb0, 0x2a, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x7b, 0xc4, 0x18, - 0x10, 0x00, 0x00, 0xff, 0xff, 0x3a, 0x60, 0xa3, 0xf2, 0x4c, 0x01, 0x00, 0x00, + 0x10, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x7b, 0x2f, 0x9c, 0x4c, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc-hooks/types/tx.pb.go b/x/ibc-hooks/types/tx.pb.go index f8e1819dd38..fcce996f3dc 100644 --- a/x/ibc-hooks/types/tx.pb.go +++ b/x/ibc-hooks/types/tx.pb.go @@ -151,27 +151,27 @@ var fileDescriptor_eb5a795bb7f479a3 = []byte{ // 364 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x4f, 0x4f, 0xc2, 0x30, 0x18, 0xc6, 0xa9, 0x18, 0x88, 0x4d, 0x40, 0x6d, 0xd4, 0x20, 0x87, 0x8d, 0xf4, 0x22, 0x46, 0xd9, - 0x12, 0xd4, 0x8b, 0x37, 0x46, 0x3c, 0x78, 0x20, 0x26, 0x35, 0xf1, 0x60, 0x62, 0xc8, 0x56, 0x9b, - 0xb1, 0xec, 0x4f, 0xe7, 0x5a, 0x0c, 0x7c, 0x04, 0x6f, 0x7e, 0x11, 0xbf, 0x87, 0x47, 0x8e, 0x9e, - 0x88, 0x81, 0x6f, 0xc0, 0x27, 0x30, 0x6c, 0x5d, 0x02, 0xbb, 0x78, 0xdb, 0x9e, 0xe7, 0xf7, 0xb6, - 0xcf, 0xfb, 0xf6, 0x85, 0xa7, 0x5c, 0x84, 0x5c, 0x78, 0xc2, 0xf4, 0x1c, 0x3a, 0xe2, 0xdc, 0x17, - 0xa6, 0x9c, 0x18, 0x71, 0xc2, 0x25, 0x47, 0x07, 0xca, 0x32, 0x72, 0xab, 0x79, 0xe4, 0x72, 0x97, - 0xa7, 0xa6, 0xb9, 0xfe, 0xca, 0x38, 0xfc, 0x05, 0x60, 0x6d, 0x20, 0xdc, 0xbb, 0xd0, 0x93, 0xf7, - 0x56, 0xbf, 0x47, 0x7d, 0x74, 0x0e, 0x2b, 0x82, 0x45, 0xaf, 0x2c, 0x69, 0x80, 0x16, 0x68, 0xef, - 0x59, 0x87, 0xab, 0xb9, 0x5e, 0x9b, 0xda, 0x61, 0x70, 0x8b, 0x33, 0x1d, 0x13, 0x05, 0xa0, 0x3e, - 0xdc, 0x8f, 0x6d, 0xea, 0x33, 0x39, 0x14, 0xec, 0x6d, 0xcc, 0x22, 0xca, 0x1a, 0x3b, 0x2d, 0xd0, - 0xde, 0xb5, 0x9a, 0xab, 0xb9, 0x7e, 0x92, 0xd5, 0x14, 0x00, 0x4c, 0xea, 0x99, 0xf2, 0xa8, 0x04, - 0x74, 0x09, 0xab, 0x74, 0x64, 0x47, 0x11, 0x0b, 0x1a, 0xe5, 0xf4, 0x42, 0xb4, 0x9a, 0xeb, 0xf5, - 0xac, 0x58, 0x19, 0x98, 0xe4, 0x08, 0xfe, 0x00, 0xf0, 0x78, 0x2b, 0x2f, 0x61, 0x22, 0xe6, 0x91, - 0x60, 0xeb, 0x30, 0x94, 0x47, 0x32, 0xb1, 0xa9, 0x1c, 0x26, 0x4c, 0x8c, 0x03, 0xa9, 0x1a, 0xd8, - 0x08, 0x53, 0x00, 0x30, 0xa9, 0xe7, 0x0a, 0x49, 0x05, 0x74, 0x01, 0xab, 0x9e, 0x43, 0x87, 0x36, - 0xf5, 0xd3, 0x4e, 0xb6, 0xc2, 0x28, 0x03, 0x93, 0x8a, 0xe7, 0xd0, 0x1e, 0xf5, 0xbb, 0x2f, 0xb0, - 0x3c, 0x10, 0x2e, 0x7a, 0x82, 0x70, 0x63, 0x7c, 0xba, 0x51, 0x9c, 0xbc, 0xb1, 0x95, 0xb7, 0x79, - 0xf6, 0x0f, 0x90, 0x37, 0x64, 0x3d, 0x7c, 0x2f, 0x34, 0x30, 0x5b, 0x68, 0xe0, 0x77, 0xa1, 0x81, - 0xcf, 0xa5, 0x56, 0x9a, 0x2d, 0xb5, 0xd2, 0xcf, 0x52, 0x2b, 0x3d, 0xdf, 0xb8, 0x9e, 0x1c, 0x8d, - 0x1d, 0x83, 0xf2, 0xd0, 0x54, 0x87, 0x75, 0x02, 0xdb, 0x11, 0xf9, 0x8f, 0xf9, 0xde, 0xbd, 0x36, - 0x27, 0xeb, 0xad, 0xe8, 0xa8, 0xb5, 0x98, 0xc6, 0x4c, 0x38, 0x95, 0xf4, 0xc9, 0xaf, 0xfe, 0x02, - 0x00, 0x00, 0xff, 0xff, 0x99, 0xee, 0xf7, 0x53, 0x37, 0x02, 0x00, 0x00, + 0x12, 0x0c, 0x17, 0x6f, 0x8c, 0x78, 0xf0, 0x40, 0x4c, 0x6a, 0xe2, 0xc1, 0xc4, 0x90, 0xad, 0x36, + 0x63, 0xd9, 0x9f, 0xce, 0xb5, 0x18, 0xf8, 0x08, 0xde, 0xfc, 0x22, 0x7e, 0x0f, 0x8f, 0x1c, 0x3d, + 0x11, 0x03, 0xdf, 0x80, 0x4f, 0x60, 0xd8, 0xba, 0x04, 0x76, 0xf1, 0xb6, 0x3d, 0xcf, 0xef, 0x6d, + 0x9f, 0xf7, 0xed, 0x0b, 0xcf, 0xb9, 0x08, 0xb9, 0xf0, 0x84, 0xe9, 0x39, 0x74, 0xcc, 0xb9, 0x2f, + 0x4c, 0x39, 0x35, 0xe2, 0x84, 0x4b, 0x8e, 0x8e, 0x94, 0x65, 0xe4, 0x56, 0xf3, 0xc4, 0xe5, 0x2e, + 0x4f, 0x4d, 0x73, 0xf3, 0x95, 0x71, 0xf8, 0x0b, 0xc0, 0xda, 0x50, 0xb8, 0x77, 0xa1, 0x27, 0xef, + 0xad, 0x41, 0x9f, 0xfa, 0xe8, 0x12, 0x56, 0x04, 0x8b, 0x5e, 0x59, 0xd2, 0x00, 0x2d, 0xd0, 0x3e, + 0xb0, 0x8e, 0xd7, 0x0b, 0xbd, 0x36, 0xb3, 0xc3, 0xe0, 0x16, 0x67, 0x3a, 0x26, 0x0a, 0x40, 0x03, + 0x78, 0x18, 0xdb, 0xd4, 0x67, 0x72, 0x24, 0xd8, 0xdb, 0x84, 0x45, 0x94, 0x35, 0xf6, 0x5a, 0xa0, + 0xbd, 0x6f, 0x35, 0xd7, 0x0b, 0xfd, 0x2c, 0xab, 0x29, 0x00, 0x98, 0xd4, 0x33, 0xe5, 0x51, 0x09, + 0xe8, 0x1a, 0x56, 0xe9, 0xd8, 0x8e, 0x22, 0x16, 0x34, 0xca, 0xe9, 0x85, 0x68, 0xbd, 0xd0, 0xeb, + 0x59, 0xb1, 0x32, 0x30, 0xc9, 0x11, 0xfc, 0x01, 0xe0, 0xe9, 0x4e, 0x5e, 0xc2, 0x44, 0xcc, 0x23, + 0xc1, 0x36, 0x61, 0x28, 0x8f, 0x64, 0x62, 0x53, 0x39, 0x4a, 0x98, 0x98, 0x04, 0x52, 0x35, 0xb0, + 0x15, 0xa6, 0x00, 0x60, 0x52, 0xcf, 0x15, 0x92, 0x0a, 0xe8, 0x0a, 0x56, 0x3d, 0x87, 0x8e, 0x6c, + 0xea, 0xa7, 0x9d, 0xec, 0x84, 0x51, 0x06, 0x26, 0x15, 0xcf, 0xa1, 0x7d, 0xea, 0x77, 0x5f, 0x60, + 0x79, 0x28, 0x5c, 0xf4, 0x04, 0xe1, 0xd6, 0xf8, 0x74, 0xa3, 0x38, 0x79, 0x63, 0x27, 0x6f, 0xf3, + 0xe2, 0x1f, 0x20, 0x6f, 0xc8, 0x7a, 0xf8, 0x5e, 0x6a, 0x60, 0xbe, 0xd4, 0xc0, 0xef, 0x52, 0x03, + 0x9f, 0x2b, 0xad, 0x34, 0x5f, 0x69, 0xa5, 0x9f, 0x95, 0x56, 0x7a, 0xee, 0xb9, 0x9e, 0x1c, 0x4f, + 0x1c, 0x83, 0xf2, 0xd0, 0x54, 0x87, 0x75, 0x02, 0xdb, 0x11, 0xf9, 0x8f, 0xf9, 0xde, 0xed, 0x99, + 0xd3, 0xcd, 0x56, 0x74, 0xd4, 0x5a, 0xcc, 0x62, 0x26, 0x9c, 0x4a, 0xfa, 0xe4, 0x37, 0x7f, 0x01, + 0x00, 0x00, 0xff, 0xff, 0xd8, 0xf5, 0x7b, 0x3d, 0x37, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc-rate-limit/client/cli/query.go b/x/ibc-rate-limit/client/cli/query.go index ba9ec359175..9eee9dedbe7 100644 --- a/x/ibc-rate-limit/client/cli/query.go +++ b/x/ibc-rate-limit/client/cli/query.go @@ -4,8 +4,8 @@ import ( "github.com/spf13/cobra" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" ) // GetQueryCmd returns the cli query commands for this module. diff --git a/x/ibc-rate-limit/client/grpc/grpc_query.go b/x/ibc-rate-limit/client/grpc/grpc_query.go index c44439388af..476725ce756 100644 --- a/x/ibc-rate-limit/client/grpc/grpc_query.go +++ b/x/ibc-rate-limit/client/grpc/grpc_query.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc/status" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/client" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/client" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/client/queryproto" ) type Querier struct { diff --git a/x/ibc-rate-limit/client/query_proto_wrap.go b/x/ibc-rate-limit/client/query_proto_wrap.go index dd79e547ec2..ddd70bc1ec3 100644 --- a/x/ibc-rate-limit/client/query_proto_wrap.go +++ b/x/ibc-rate-limit/client/query_proto_wrap.go @@ -3,8 +3,8 @@ package client import ( sdk "github.com/cosmos/cosmos-sdk/types" - ibcratelimit "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/client/queryproto" + ibcratelimit "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/client/queryproto" ) // This file should evolve to being code gen'd, off of `proto/twap/v1beta/query.yml` diff --git a/x/ibc-rate-limit/client/queryproto/query.pb.go b/x/ibc-rate-limit/client/queryproto/query.pb.go index edc1a3fc846..624941d73c5 100644 --- a/x/ibc-rate-limit/client/queryproto/query.pb.go +++ b/x/ibc-rate-limit/client/queryproto/query.pb.go @@ -10,7 +10,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" + types "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -127,24 +127,24 @@ var fileDescriptor_6904fea69f32464e = []byte{ // 323 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xcf, 0x4a, 0x2b, 0x31, 0x18, 0xc5, 0x27, 0x97, 0x6b, 0x17, 0x23, 0x2a, 0x0c, 0x2e, 0xa4, 0x94, 0x28, 0x45, 0xa4, 0xfe, - 0x69, 0x42, 0xab, 0x4f, 0xd0, 0x85, 0x6b, 0x2d, 0xae, 0x5c, 0x99, 0x0c, 0x21, 0x06, 0x66, 0xf2, - 0x4d, 0x27, 0x69, 0xd1, 0xad, 0x4f, 0x20, 0x74, 0xed, 0xfb, 0x74, 0x59, 0x70, 0xe3, 0x4a, 0xa4, - 0xf5, 0x41, 0x64, 0x92, 0xb4, 0x14, 0x91, 0xd2, 0xd5, 0x4c, 0x92, 0xdf, 0x39, 0xdf, 0xc9, 0x49, - 0xdc, 0x02, 0x93, 0x83, 0x51, 0x86, 0x2a, 0x9e, 0x96, 0xcc, 0x8a, 0x4c, 0xe5, 0xca, 0xd2, 0x51, - 0x87, 0x0b, 0xcb, 0x3a, 0x74, 0x30, 0x14, 0xe5, 0x33, 0x29, 0x4a, 0xb0, 0x90, 0x34, 0x02, 0x49, - 0x56, 0x49, 0x12, 0xc8, 0xfa, 0xbe, 0x04, 0x09, 0x0e, 0xa4, 0xd5, 0x9f, 0xd7, 0xd4, 0x1b, 0x12, - 0x40, 0x66, 0x82, 0xb2, 0x42, 0x51, 0xa6, 0x35, 0x58, 0x66, 0x15, 0x68, 0x13, 0x4e, 0xcf, 0x52, - 0x67, 0x49, 0x39, 0x33, 0xc2, 0x8f, 0x5a, 0x0e, 0x2e, 0x98, 0x54, 0xda, 0xc1, 0x81, 0x3d, 0x5d, - 0x9b, 0xb3, 0x60, 0x25, 0xcb, 0x83, 0x6d, 0x73, 0x2f, 0xde, 0xb9, 0x71, 0xeb, 0xbe, 0x18, 0x0c, - 0x85, 0xb1, 0xcd, 0xbb, 0x78, 0x77, 0xb1, 0x61, 0x0a, 0xd0, 0x46, 0x24, 0xbd, 0xb8, 0xe6, 0x25, - 0x07, 0xe8, 0x08, 0xb5, 0xb6, 0xbb, 0xc7, 0x64, 0xdd, 0xe5, 0x88, 0x57, 0xf7, 0xfe, 0x4f, 0x3e, - 0x0f, 0xa3, 0x7e, 0x50, 0x76, 0xdf, 0x50, 0xbc, 0x75, 0x5b, 0x85, 0x4e, 0xc6, 0x28, 0xae, 0x79, - 0x24, 0x39, 0xdf, 0xc4, 0x28, 0xe4, 0xaa, 0x5f, 0x6c, 0x06, 0xfb, 0xcc, 0x4d, 0xf2, 0xf2, 0xfe, - 0x3d, 0xfe, 0xd7, 0x4a, 0x4e, 0xe8, 0x4a, 0x15, 0xed, 0x4a, 0xd6, 0xfe, 0xab, 0x8c, 0xde, 0xc3, - 0x64, 0x86, 0xd1, 0x74, 0x86, 0xd1, 0xd7, 0x0c, 0xa3, 0xd7, 0x39, 0x8e, 0xa6, 0x73, 0x1c, 0x7d, - 0xcc, 0x71, 0x74, 0x7f, 0x2d, 0x95, 0x7d, 0x1c, 0x72, 0x92, 0x42, 0xbe, 0xf0, 0x6a, 0x67, 0x8c, - 0x9b, 0xa5, 0xf1, 0xa8, 0x7b, 0x45, 0x9f, 0x7e, 0xdb, 0xa7, 0x99, 0x12, 0xda, 0xfa, 0x77, 0x72, - 0x45, 0xf3, 0x9a, 0xfb, 0x5c, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0xfb, 0x69, 0x3c, 0x47, 0x44, + 0x69, 0x42, 0x2b, 0xbe, 0x40, 0x17, 0xae, 0xb5, 0xb8, 0x72, 0x65, 0x32, 0x84, 0x18, 0x98, 0xc9, + 0x37, 0x9d, 0xa4, 0x45, 0xb7, 0x3e, 0x81, 0xd0, 0xb5, 0xef, 0xd3, 0x65, 0xc1, 0x8d, 0x2b, 0x91, + 0xd6, 0x07, 0x91, 0x49, 0xd2, 0x52, 0x44, 0x4a, 0x57, 0x33, 0x49, 0x7e, 0xe7, 0x7c, 0x27, 0x27, + 0x71, 0x0b, 0x4c, 0x0e, 0x46, 0x19, 0xaa, 0x78, 0x5a, 0x32, 0x2b, 0x32, 0x95, 0x2b, 0x4b, 0x47, + 0x1d, 0x2e, 0x2c, 0xeb, 0xd0, 0xc1, 0x50, 0x94, 0xcf, 0xa4, 0x28, 0xc1, 0x42, 0xd2, 0x08, 0x24, + 0x59, 0x25, 0x49, 0x20, 0xeb, 0xfb, 0x12, 0x24, 0x38, 0x90, 0x56, 0x7f, 0x5e, 0x53, 0x6f, 0x48, + 0x00, 0x99, 0x09, 0xca, 0x0a, 0x45, 0x99, 0xd6, 0x60, 0x99, 0x55, 0xa0, 0x4d, 0x38, 0x3d, 0x4b, + 0x9d, 0x25, 0xe5, 0xcc, 0x08, 0x3f, 0x6a, 0x39, 0xb8, 0x60, 0x52, 0x69, 0x07, 0x07, 0xf6, 0x74, + 0x6d, 0xce, 0x82, 0x95, 0x2c, 0x0f, 0xb6, 0xcd, 0xbd, 0x78, 0xe7, 0xc6, 0xad, 0xfb, 0x62, 0x30, + 0x14, 0xc6, 0x36, 0xef, 0xe2, 0xdd, 0xc5, 0x86, 0x29, 0x40, 0x1b, 0x91, 0xf4, 0xe2, 0x9a, 0x97, + 0x1c, 0xa0, 0x23, 0xd4, 0xda, 0xee, 0x1e, 0x93, 0x75, 0x97, 0x23, 0x5e, 0xdd, 0xfb, 0x3f, 0xf9, + 0x3c, 0x8c, 0xfa, 0x41, 0xd9, 0x7d, 0x43, 0xf1, 0xd6, 0x6d, 0x15, 0x3a, 0x19, 0xa3, 0xb8, 0xe6, + 0x91, 0xe4, 0x7c, 0x13, 0xa3, 0x90, 0xab, 0x7e, 0xb1, 0x19, 0xec, 0x33, 0x37, 0xc9, 0xcb, 0xfb, + 0xf7, 0xf8, 0x5f, 0x2b, 0x39, 0xa1, 0x2b, 0x55, 0xb4, 0x2b, 0x59, 0xfb, 0xaf, 0x32, 0x7a, 0x0f, + 0x93, 0x19, 0x46, 0xd3, 0x19, 0x46, 0x5f, 0x33, 0x8c, 0x5e, 0xe7, 0x38, 0x9a, 0xce, 0x71, 0xf4, + 0x31, 0xc7, 0xd1, 0xfd, 0xb5, 0x54, 0xf6, 0x71, 0xc8, 0x49, 0x0a, 0xf9, 0xc2, 0xab, 0x9d, 0x31, + 0x6e, 0x96, 0xc6, 0xa3, 0xee, 0x15, 0x7d, 0xfa, 0x6d, 0x9f, 0x66, 0x4a, 0x68, 0xeb, 0xdf, 0xc9, + 0x15, 0xcd, 0x6b, 0xee, 0x73, 0xf9, 0x13, 0x00, 0x00, 0xff, 0xff, 0x99, 0x51, 0x14, 0x6d, 0x44, 0x02, 0x00, 0x00, } diff --git a/x/ibc-rate-limit/genesis.go b/x/ibc-rate-limit/genesis.go index 209afa5d9a4..aa5bfdf7a5c 100644 --- a/x/ibc-rate-limit/genesis.go +++ b/x/ibc-rate-limit/genesis.go @@ -3,7 +3,7 @@ package ibc_rate_limit import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" ) // InitGenesis initializes the x/ibc-rate-limit module's state from a provided genesis diff --git a/x/ibc-rate-limit/genesis_test.go b/x/ibc-rate-limit/genesis_test.go index 7e91f1a1ce5..46485b78941 100644 --- a/x/ibc-rate-limit/genesis_test.go +++ b/x/ibc-rate-limit/genesis_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" ) type GenesisTestSuite struct { diff --git a/x/ibc-rate-limit/ibc_middleware_test.go b/x/ibc-rate-limit/ibc_middleware_test.go index 9ce9035ee5c..ffdfc86f1a0 100644 --- a/x/ibc-rate-limit/ibc_middleware_test.go +++ b/x/ibc-rate-limit/ibc_middleware_test.go @@ -17,11 +17,11 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - txfeetypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + txfeetypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/tests/osmosisibctesting" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/tests/osmosisibctesting" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" ) type MiddlewareTestSuite struct { diff --git a/x/ibc-rate-limit/ibc_module.go b/x/ibc-rate-limit/ibc_module.go index 94e8918fb5e..2a3cdb0c36d 100644 --- a/x/ibc-rate-limit/ibc_module.go +++ b/x/ibc-rate-limit/ibc_module.go @@ -17,7 +17,7 @@ import ( porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" ) type IBCModule struct { diff --git a/x/ibc-rate-limit/ibcratelimitmodule/module.go b/x/ibc-rate-limit/ibcratelimitmodule/module.go index 0795b52b8af..b465000c53e 100644 --- a/x/ibc-rate-limit/ibcratelimitmodule/module.go +++ b/x/ibc-rate-limit/ibcratelimitmodule/module.go @@ -16,12 +16,12 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" - ibcratelimit "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit" - ibcratelimitclient "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/client" - ibcratelimitcli "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/client/grpc" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" + ibcratelimit "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit" + ibcratelimitclient "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/client" + ibcratelimitcli "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/client/grpc" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" ) var ( diff --git a/x/ibc-rate-limit/ics4_wrapper.go b/x/ibc-rate-limit/ics4_wrapper.go index c6d0967b1b9..0c4fd0dd2d5 100644 --- a/x/ibc-rate-limit/ics4_wrapper.go +++ b/x/ibc-rate-limit/ics4_wrapper.go @@ -16,7 +16,7 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" ) var ( diff --git a/x/ibc-rate-limit/rate_limit.go b/x/ibc-rate-limit/rate_limit.go index 9e156ff7c17..32b35235947 100644 --- a/x/ibc-rate-limit/rate_limit.go +++ b/x/ibc-rate-limit/rate_limit.go @@ -10,7 +10,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/osmosis-labs/osmosis/v24/x/ibc-rate-limit/types" + "github.com/osmosis-labs/osmosis/v25/x/ibc-rate-limit/types" ) var ( diff --git a/x/ibc-rate-limit/types/genesis.pb.go b/x/ibc-rate-limit/types/genesis.pb.go index 6d4df3e5fa4..a23a7808dbb 100644 --- a/x/ibc-rate-limit/types/genesis.pb.go +++ b/x/ibc-rate-limit/types/genesis.pb.go @@ -94,9 +94,9 @@ var fileDescriptor_37b7c83ed1422177 = []byte{ 0xa7, 0x90, 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, 0xb2, 0x4a, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x9a, 0xab, 0x9b, 0x93, 0x98, 0x54, 0x0c, - 0xe3, 0xe8, 0x97, 0x19, 0x99, 0xe8, 0x57, 0x80, 0x9c, 0xad, 0x0b, 0xb2, 0x4b, 0x17, 0xe2, 0xf0, + 0xe3, 0xe8, 0x97, 0x19, 0x99, 0xea, 0x57, 0x80, 0x9c, 0xad, 0x0b, 0xb2, 0x4b, 0x17, 0xe2, 0xf0, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x83, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, - 0xc4, 0x87, 0x7d, 0x90, 0x73, 0x01, 0x00, 0x00, + 0x6e, 0x82, 0xa7, 0x61, 0x73, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc-rate-limit/types/params.pb.go b/x/ibc-rate-limit/types/params.pb.go index ef2c51a71a4..25b68e1441d 100644 --- a/x/ibc-rate-limit/types/params.pb.go +++ b/x/ibc-rate-limit/types/params.pb.go @@ -89,9 +89,9 @@ var fileDescriptor_4b7974c8f0f9446a = []byte{ 0xc8, 0x11, 0x22, 0xe2, 0x14, 0x72, 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, 0x56, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x50, 0xa7, 0xea, 0xe6, - 0x24, 0x26, 0x15, 0xc3, 0x38, 0xfa, 0x65, 0x46, 0x26, 0xfa, 0x15, 0x20, 0x8f, 0xea, 0x82, 0x9c, + 0x24, 0x26, 0x15, 0xc3, 0x38, 0xfa, 0x65, 0x46, 0xa6, 0xfa, 0x15, 0x20, 0x8f, 0xea, 0x82, 0x9c, 0xaf, 0x0b, 0xf1, 0x6a, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0xb9, 0xc6, 0x80, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x58, 0x32, 0x8a, 0x84, 0x0f, 0x01, 0x00, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xf2, 0x37, 0x50, 0x75, 0x0f, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/client/cli/cli_test.go b/x/incentives/client/cli/cli_test.go index eca71f4aefe..c314e7e5b2c 100644 --- a/x/incentives/client/cli/cli_test.go +++ b/x/incentives/client/cli/cli_test.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" ) func TestGetCmdGauges(t *testing.T) { diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go index bf65a43d851..b1f4a5fbc49 100644 --- a/x/incentives/client/cli/query.go +++ b/x/incentives/client/cli/query.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/incentives/client/cli/query_test.go b/x/incentives/client/cli/query_test.go index 5756b4001fe..c8577064aeb 100644 --- a/x/incentives/client/cli/query_test.go +++ b/x/incentives/client/cli/query_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/client/cli/tx.go b/x/incentives/client/cli/tx.go index 2b661c1d78e..bda84f54f91 100644 --- a/x/incentives/client/cli/tx.go +++ b/x/incentives/client/cli/tx.go @@ -14,8 +14,8 @@ import ( govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/incentives/client/proposal_handler.go b/x/incentives/client/proposal_handler.go index 8d01a846d1b..f911fda9369 100644 --- a/x/incentives/client/proposal_handler.go +++ b/x/incentives/client/proposal_handler.go @@ -1,7 +1,7 @@ package client import ( - "github.com/osmosis-labs/osmosis/v24/x/incentives/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/incentives/client/cli" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" ) diff --git a/x/incentives/keeper/bench_test.go b/x/incentives/keeper/bench_test.go index 250dae49a59..b4d416d4c90 100644 --- a/x/incentives/keeper/bench_test.go +++ b/x/incentives/keeper/bench_test.go @@ -9,9 +9,9 @@ import ( "github.com/cometbft/cometbft/crypto/secp256k1" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" diff --git a/x/incentives/keeper/distribute.go b/x/incentives/keeper/distribute.go index ca213d01fb1..8c3cb5ebe77 100644 --- a/x/incentives/keeper/distribute.go +++ b/x/incentives/keeper/distribute.go @@ -14,9 +14,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/coinutil" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" sdkmath "cosmossdk.io/math" ) diff --git a/x/incentives/keeper/distribute_test.go b/x/incentives/keeper/distribute_test.go index eccb1661841..a753dfe969d 100644 --- a/x/incentives/keeper/distribute_test.go +++ b/x/incentives/keeper/distribute_test.go @@ -10,13 +10,13 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/coinutil" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - incentivetypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - poolincentivetypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + incentivetypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + poolincentivetypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var _ = suite.TestingSuite(nil) diff --git a/x/incentives/keeper/export_test.go b/x/incentives/keeper/export_test.go index 28c9bf98c94..a3bd2513c3b 100644 --- a/x/incentives/keeper/export_test.go +++ b/x/incentives/keeper/export_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) var ByGroupQueryCondition = byGroupQueryCondition diff --git a/x/incentives/keeper/gauge.go b/x/incentives/keeper/gauge.go index 06892762675..665be337ff1 100644 --- a/x/incentives/keeper/gauge.go +++ b/x/incentives/keeper/gauge.go @@ -16,10 +16,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/x/incentives/keeper/gauge_test.go b/x/incentives/keeper/gauge_test.go index 78cc4c594c6..8fd9c96de0f 100644 --- a/x/incentives/keeper/gauge_test.go +++ b/x/incentives/keeper/gauge_test.go @@ -9,10 +9,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - incentiveskeeper "github.com/osmosis-labs/osmosis/v24/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + incentiveskeeper "github.com/osmosis-labs/osmosis/v25/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) var _ = suite.TestingSuite(nil) diff --git a/x/incentives/keeper/genesis.go b/x/incentives/keeper/genesis.go index 12efbcba349..e4644f3ce6a 100644 --- a/x/incentives/keeper/genesis.go +++ b/x/incentives/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" ) // InitGenesis initializes the incentives module's state from a provided genesis state. diff --git a/x/incentives/keeper/genesis_test.go b/x/incentives/keeper/genesis_test.go index 290eeb6a413..19558707ec4 100644 --- a/x/incentives/keeper/genesis_test.go +++ b/x/incentives/keeper/genesis_test.go @@ -11,12 +11,12 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - osmoapp "github.com/osmosis-labs/osmosis/v24/app" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" + osmoapp "github.com/osmosis-labs/osmosis/v25/app" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) var ( diff --git a/x/incentives/keeper/gov.go b/x/incentives/keeper/gov.go index 74eb48fed16..0ad2e9855a9 100644 --- a/x/incentives/keeper/gov.go +++ b/x/incentives/keeper/gov.go @@ -7,7 +7,7 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" ) func (k Keeper) HandleCreateGaugeProposal(ctx sdk.Context, p *types.CreateGroupsProposal) error { diff --git a/x/incentives/keeper/group.go b/x/incentives/keeper/group.go index d34176114b1..21d15d265d1 100644 --- a/x/incentives/keeper/group.go +++ b/x/incentives/keeper/group.go @@ -9,8 +9,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) var emptyCoins = sdk.NewCoins() diff --git a/x/incentives/keeper/group_test.go b/x/incentives/keeper/group_test.go index 6146c7057e7..eaf2b0f6a73 100644 --- a/x/incentives/keeper/group_test.go +++ b/x/incentives/keeper/group_test.go @@ -8,11 +8,11 @@ import ( distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - incentiveskeeper "github.com/osmosis-labs/osmosis/v24/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - poolincentivetypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + incentiveskeeper "github.com/osmosis-labs/osmosis/v25/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + poolincentivetypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type createGroupTestCase struct { diff --git a/x/incentives/keeper/grpc_query.go b/x/incentives/keeper/grpc_query.go index adda4aa2217..dbdec07acbc 100644 --- a/x/incentives/keeper/grpc_query.go +++ b/x/incentives/keeper/grpc_query.go @@ -14,8 +14,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) var _ types.QueryServer = Querier{} diff --git a/x/incentives/keeper/grpc_query_test.go b/x/incentives/keeper/grpc_query_test.go index 2ec6dc5b6dc..df6f67aa928 100644 --- a/x/incentives/keeper/grpc_query_test.go +++ b/x/incentives/keeper/grpc_query_test.go @@ -9,9 +9,9 @@ import ( query "github.com/cosmos/cosmos-sdk/types/query" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - pooltypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + pooltypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) var _ = suite.TestingSuite(nil) diff --git a/x/incentives/keeper/hooks.go b/x/incentives/keeper/hooks.go index afc24108253..a5d1097b361 100644 --- a/x/incentives/keeper/hooks.go +++ b/x/incentives/keeper/hooks.go @@ -3,8 +3,8 @@ package keeper import ( "fmt" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/keeper/hooks_test.go b/x/incentives/keeper/hooks_test.go index 46371de3c0c..e2317973eb8 100644 --- a/x/incentives/keeper/hooks_test.go +++ b/x/incentives/keeper/hooks_test.go @@ -10,9 +10,9 @@ import ( "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/coinutil" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" ) var ( diff --git a/x/incentives/keeper/iterator.go b/x/incentives/keeper/iterator.go index 98ce262bc0a..ba18713831a 100644 --- a/x/incentives/keeper/iterator.go +++ b/x/incentives/keeper/iterator.go @@ -3,8 +3,8 @@ package keeper import ( "time" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/keeper/iterator_test.go b/x/incentives/keeper/iterator_test.go index c3272d594ea..401fa934edb 100644 --- a/x/incentives/keeper/iterator_test.go +++ b/x/incentives/keeper/iterator_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/x/incentives/keeper" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) // This test validates that the FilterLocksByMinDuration function diff --git a/x/incentives/keeper/keeper.go b/x/incentives/keeper/keeper.go index f3a7e964eed..223e961fe1d 100644 --- a/x/incentives/keeper/keeper.go +++ b/x/incentives/keeper/keeper.go @@ -7,7 +7,7 @@ import ( "github.com/cometbft/cometbft/libs/log" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/keeper/keeper_test.go b/x/incentives/keeper/keeper_test.go index 73cb5eea6ec..4ea99a865d7 100644 --- a/x/incentives/keeper/keeper_test.go +++ b/x/incentives/keeper/keeper_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - incentivetypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + incentivetypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" ) type KeeperTestSuite struct { diff --git a/x/incentives/keeper/msg_server.go b/x/incentives/keeper/msg_server.go index 9e5acf2da8b..3190148dc42 100644 --- a/x/incentives/keeper/msg_server.go +++ b/x/incentives/keeper/msg_server.go @@ -4,7 +4,7 @@ import ( "context" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/keeper/msg_server_test.go b/x/incentives/keeper/msg_server_test.go index 91c118eabe0..d684864e70e 100644 --- a/x/incentives/keeper/msg_server_test.go +++ b/x/incentives/keeper/msg_server_test.go @@ -9,10 +9,10 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/osmosis-labs/osmosis/osmomath" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/params.go b/x/incentives/keeper/params.go index 5e0efa8b12c..74690ad86a1 100644 --- a/x/incentives/keeper/params.go +++ b/x/incentives/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/store.go b/x/incentives/keeper/store.go index db4c5a0c8d5..4b8a82800b1 100644 --- a/x/incentives/keeper/store.go +++ b/x/incentives/keeper/store.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/keeper/store_test.go b/x/incentives/keeper/store_test.go index 8446beca0b7..e2c2b483d3c 100644 --- a/x/incentives/keeper/store_test.go +++ b/x/incentives/keeper/store_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) var _ = suite.TestingSuite(nil) diff --git a/x/incentives/keeper/suite_test.go b/x/incentives/keeper/suite_test.go index 3458ce29c33..9184245ca33 100644 --- a/x/incentives/keeper/suite_test.go +++ b/x/incentives/keeper/suite_test.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/utils.go b/x/incentives/keeper/utils.go index 4d562bce01d..123e999d25f 100644 --- a/x/incentives/keeper/utils.go +++ b/x/incentives/keeper/utils.go @@ -3,7 +3,7 @@ package keeper import ( "time" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/utils_test.go b/x/incentives/keeper/utils_test.go index 5e9f4196d35..351f15a1531 100644 --- a/x/incentives/keeper/utils_test.go +++ b/x/incentives/keeper/utils_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/module.go b/x/incentives/module.go index 02c03894c24..c265bda3d9e 100644 --- a/x/incentives/module.go +++ b/x/incentives/module.go @@ -25,11 +25,11 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - osmosimtypes "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - "github.com/osmosis-labs/osmosis/v24/x/incentives/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/v24/x/incentives/simulation" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + osmosimtypes "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/x/incentives/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v25/x/incentives/simulation" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" ) var ( diff --git a/x/incentives/simulation/genesis.go b/x/incentives/simulation/genesis.go index 999a95f96c5..38cde6d25c3 100644 --- a/x/incentives/simulation/genesis.go +++ b/x/incentives/simulation/genesis.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" ) // Simulation parameter constants. diff --git a/x/incentives/simulation/operations.go b/x/incentives/simulation/operations.go index a58ab9ed605..137b41fe25d 100644 --- a/x/incentives/simulation/operations.go +++ b/x/incentives/simulation/operations.go @@ -5,13 +5,13 @@ import ( "time" "github.com/osmosis-labs/osmosis/osmomath" - osmosimtypes "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" + osmosimtypes "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" "github.com/cosmos/cosmos-sdk/baseapp" - "github.com/osmosis-labs/osmosis/v24/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/types/errors.go b/x/incentives/types/errors.go index 69743f3accf..cc4ab905465 100644 --- a/x/incentives/types/errors.go +++ b/x/incentives/types/errors.go @@ -4,7 +4,7 @@ import ( fmt "fmt" "github.com/osmosis-labs/osmosis/osmomath" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) var ( diff --git a/x/incentives/types/expected_keepers.go b/x/incentives/types/expected_keepers.go index 9a2c428008d..02963acd401 100644 --- a/x/incentives/types/expected_keepers.go +++ b/x/incentives/types/expected_keepers.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/x/incentives/types/gauge.go b/x/incentives/types/gauge.go index 3afe483e5ad..f465bbe2bc8 100644 --- a/x/incentives/types/gauge.go +++ b/x/incentives/types/gauge.go @@ -4,7 +4,7 @@ import ( time "time" "github.com/osmosis-labs/osmosis/osmomath" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/types/gauge.pb.go b/x/incentives/types/gauge.pb.go index e6931dc2f36..dd61a65ff8a 100644 --- a/x/incentives/types/gauge.pb.go +++ b/x/incentives/types/gauge.pb.go @@ -10,7 +10,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - types "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + types "github.com/osmosis-labs/osmosis/v25/x/lockup/types" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" @@ -206,7 +206,7 @@ var fileDescriptor_c0304e2bb0159901 = []byte{ // 545 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6e, 0xd3, 0x30, 0x1c, 0xc7, 0x9b, 0xad, 0x1d, 0xc3, 0xed, 0x10, 0xb5, 0x86, 0x94, 0x56, 0x22, 0x2d, 0x45, 0x48, - 0xbd, 0xcc, 0x66, 0x05, 0x71, 0xe0, 0xd8, 0x81, 0xd0, 0x24, 0x24, 0x4a, 0xb5, 0x03, 0xe2, 0x12, + 0xbd, 0xcc, 0x66, 0x45, 0x70, 0xe0, 0xd8, 0x81, 0xd0, 0x24, 0x24, 0x4a, 0xb5, 0x03, 0xe2, 0x12, 0x39, 0x89, 0x9b, 0x59, 0x4d, 0xf2, 0x8b, 0x62, 0xa7, 0x5a, 0xdf, 0x80, 0xe3, 0xc4, 0x89, 0x67, 0xe0, 0x49, 0x76, 0xdc, 0x91, 0xd3, 0x86, 0xda, 0x37, 0xe0, 0x09, 0x50, 0xec, 0x44, 0xad, 0xca, 0x95, 0x93, 0xe3, 0xdf, 0xf7, 0xf7, 0xef, 0xfb, 0x91, 0x83, 0x1c, 0x90, 0x31, 0x48, 0x21, 0xa9, @@ -237,7 +237,7 @@ var fileDescriptor_c0304e2bb0159901 = []byte{ 0xed, 0x0e, 0x1d, 0x4f, 0x6e, 0x56, 0x8e, 0x75, 0xbb, 0x72, 0xac, 0xdf, 0x2b, 0xc7, 0xba, 0x5e, 0x3b, 0xb5, 0xdb, 0xb5, 0x53, 0xfb, 0xb5, 0x76, 0x6a, 0x5f, 0xdf, 0x6c, 0x19, 0x2c, 0xdf, 0xdb, 0x49, 0xc4, 0x3c, 0x59, 0x5d, 0xe8, 0x62, 0xf4, 0x9a, 0x5e, 0x6d, 0xff, 0x9d, 0xda, 0xb4, 0x77, - 0xa0, 0xd7, 0x7b, 0xf5, 0x37, 0x00, 0x00, 0xff, 0xff, 0x67, 0xae, 0xb1, 0x1e, 0xc0, 0x03, 0x00, + 0xa0, 0xd7, 0x7b, 0xf5, 0x37, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x53, 0x04, 0x1f, 0xc0, 0x03, 0x00, 0x00, } diff --git a/x/incentives/types/genesis.pb.go b/x/incentives/types/genesis.pb.go index 2b34c49c55a..de5b1ecb990 100644 --- a/x/incentives/types/genesis.pb.go +++ b/x/incentives/types/genesis.pb.go @@ -130,30 +130,30 @@ func init() { proto.RegisterFile("osmosis/incentives/genesis.proto", fileDescrip var fileDescriptor_a288ccc95d977d2d = []byte{ // 379 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xc1, 0x4e, 0xbb, 0x40, - 0x10, 0xc6, 0xe1, 0xdf, 0xfe, 0x39, 0x40, 0x3d, 0xb8, 0xf1, 0x40, 0x7b, 0x00, 0x42, 0x62, 0xd2, - 0x8b, 0x6c, 0x52, 0x8d, 0x1a, 0x8f, 0xc4, 0xa4, 0xf1, 0xd6, 0xd4, 0x9b, 0x17, 0xb2, 0xb4, 0x2b, - 0x12, 0x81, 0x25, 0xcc, 0xd2, 0xd8, 0xb7, 0x30, 0xf1, 0xe2, 0x23, 0xf5, 0xd8, 0xa3, 0xa7, 0x6a, - 0xda, 0x37, 0xf0, 0x09, 0x0c, 0x0b, 0xab, 0x26, 0x6d, 0x1a, 0x6f, 0x0c, 0xf3, 0x9b, 0x6f, 0xe6, - 0xfb, 0x56, 0x77, 0x18, 0xa4, 0x0c, 0x62, 0xc0, 0x71, 0x36, 0xa1, 0x19, 0x8f, 0x67, 0x14, 0x70, - 0x44, 0x33, 0x0a, 0x31, 0x78, 0x79, 0xc1, 0x38, 0x43, 0xa8, 0x21, 0xbc, 0x1f, 0xa2, 0x77, 0x14, - 0xb1, 0x88, 0x89, 0x36, 0xae, 0xbe, 0x6a, 0xb2, 0x67, 0x45, 0x8c, 0x45, 0x09, 0xc5, 0xa2, 0x0a, - 0xcb, 0x7b, 0x3c, 0x2d, 0x0b, 0xc2, 0x63, 0x96, 0x35, 0x7d, 0x7b, 0xc7, 0xae, 0x9c, 0x14, 0x24, - 0x05, 0x29, 0xb0, 0xeb, 0x18, 0x52, 0x46, 0x74, 0x5f, 0xbf, 0x60, 0x65, 0x5e, 0xf7, 0xdd, 0x97, - 0x96, 0xde, 0x19, 0xd6, 0xc7, 0xdf, 0x72, 0xc2, 0x29, 0xba, 0xd4, 0xb5, 0x7a, 0x81, 0xa9, 0x3a, - 0x6a, 0xdf, 0x18, 0xf4, 0xbc, 0x6d, 0x33, 0xde, 0x48, 0x10, 0x7e, 0x7b, 0xb1, 0xb2, 0x95, 0x71, - 0xc3, 0xa3, 0x0b, 0x5d, 0x13, 0x9b, 0xc1, 0xfc, 0xe7, 0xb4, 0xfa, 0xc6, 0xa0, 0xbb, 0x6b, 0x72, - 0x58, 0x11, 0x72, 0xb0, 0xc6, 0x11, 0xd3, 0x51, 0xc2, 0x26, 0x8f, 0x24, 0x4c, 0x68, 0x20, 0xfd, - 0x83, 0xd9, 0x6a, 0x44, 0xea, 0x84, 0x3c, 0x99, 0x90, 0x77, 0xdd, 0x10, 0xfe, 0x71, 0x25, 0xf2, - 0xb9, 0xb2, 0xbb, 0x73, 0x92, 0x26, 0x57, 0xee, 0xb6, 0x84, 0xfb, 0xfa, 0x6e, 0xab, 0xe3, 0x43, - 0xd9, 0x90, 0x83, 0x80, 0x5c, 0xfd, 0x20, 0x21, 0xc0, 0x03, 0xb1, 0x3f, 0x88, 0xa7, 0x66, 0xdb, - 0x51, 0xfb, 0xed, 0xb1, 0x51, 0xfd, 0x14, 0x07, 0xde, 0x4c, 0x91, 0xaf, 0x77, 0x44, 0x4e, 0x41, - 0xe3, 0xe9, 0xff, 0xdf, 0x3c, 0x19, 0x62, 0x68, 0x58, 0x1b, 0xab, 0x12, 0xa9, 0x4a, 0x30, 0xb5, - 0x3d, 0xd3, 0x15, 0xf1, 0x9d, 0x88, 0xc0, 0xfd, 0xd1, 0x62, 0x6d, 0xa9, 0xcb, 0xb5, 0xa5, 0x7e, - 0xac, 0x2d, 0xf5, 0x79, 0x63, 0x29, 0xcb, 0x8d, 0xa5, 0xbc, 0x6d, 0x2c, 0xe5, 0xee, 0x3c, 0x8a, - 0xf9, 0x43, 0x19, 0x7a, 0x13, 0x96, 0xe2, 0x46, 0xec, 0x24, 0x21, 0x21, 0xc8, 0x02, 0xcf, 0x06, - 0x67, 0xf8, 0xe9, 0xf7, 0x6b, 0xf3, 0x79, 0x4e, 0x21, 0xd4, 0x44, 0x7e, 0xa7, 0x5f, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x2b, 0x83, 0x81, 0xc4, 0xbd, 0x02, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xcf, 0x4e, 0xb3, 0x40, + 0x14, 0xc5, 0xe1, 0x6b, 0x3f, 0x16, 0x50, 0x17, 0x4e, 0x5c, 0xd0, 0x2e, 0x80, 0x90, 0x98, 0x74, + 0x23, 0x93, 0xd4, 0xf8, 0x27, 0x2e, 0x89, 0x49, 0xe3, 0xae, 0xa9, 0x3b, 0x37, 0x64, 0x68, 0x47, + 0x24, 0x02, 0x43, 0xb8, 0x43, 0x63, 0xdf, 0xc2, 0xc4, 0x8d, 0x8f, 0xd4, 0x65, 0x97, 0xae, 0xaa, + 0x69, 0xdf, 0xc0, 0x27, 0x30, 0x0c, 0x8c, 0x9a, 0xb4, 0x69, 0xdc, 0x71, 0xb9, 0xbf, 0x7b, 0xee, + 0x3d, 0x67, 0x74, 0x87, 0x41, 0xca, 0x20, 0x06, 0x1c, 0x67, 0x13, 0x9a, 0xf1, 0x78, 0x46, 0x01, + 0x47, 0x34, 0xa3, 0x10, 0x83, 0x97, 0x17, 0x8c, 0x33, 0x84, 0x1a, 0xc2, 0xfb, 0x21, 0x7a, 0x47, + 0x11, 0x8b, 0x98, 0x68, 0xe3, 0xea, 0xab, 0x26, 0x7b, 0x56, 0xc4, 0x58, 0x94, 0x50, 0x2c, 0xaa, + 0xb0, 0xbc, 0xc7, 0xd3, 0xb2, 0x20, 0x3c, 0x66, 0x59, 0xd3, 0xb7, 0x77, 0xec, 0xca, 0x49, 0x41, + 0x52, 0x90, 0x02, 0xbb, 0x8e, 0x21, 0x65, 0x44, 0xf7, 0xf5, 0x0b, 0x56, 0xe6, 0x75, 0xdf, 0x7d, + 0x69, 0xe9, 0x9d, 0x61, 0x7d, 0xfc, 0x2d, 0x27, 0x9c, 0xa2, 0x4b, 0x5d, 0xab, 0x17, 0x98, 0xaa, + 0xa3, 0xf6, 0x8d, 0x41, 0xcf, 0xdb, 0x36, 0xe3, 0x8d, 0x04, 0xe1, 0xb7, 0x17, 0x2b, 0x5b, 0x19, + 0x37, 0x3c, 0xba, 0xd0, 0x35, 0xb1, 0x19, 0xcc, 0x7f, 0x4e, 0xab, 0x6f, 0x0c, 0xba, 0xbb, 0x26, + 0x87, 0x15, 0x21, 0x07, 0x6b, 0x1c, 0x31, 0x1d, 0x25, 0x6c, 0xf2, 0x48, 0xc2, 0x84, 0x06, 0xd2, + 0x3f, 0x98, 0xad, 0x46, 0xa4, 0x4e, 0xc8, 0x93, 0x09, 0x79, 0xd7, 0x0d, 0xe1, 0x1f, 0x57, 0x22, + 0x9f, 0x2b, 0xbb, 0x3b, 0x27, 0x69, 0x72, 0xe5, 0x6e, 0x4b, 0xb8, 0xaf, 0xef, 0xb6, 0x3a, 0x3e, + 0x94, 0x0d, 0x39, 0x08, 0xc8, 0xd5, 0x0f, 0x12, 0x02, 0x3c, 0x10, 0xfb, 0x83, 0x78, 0x6a, 0xb6, + 0x1d, 0xb5, 0xdf, 0x1e, 0x1b, 0xd5, 0x4f, 0x71, 0xe0, 0xcd, 0x14, 0xf9, 0x7a, 0x47, 0xe4, 0x14, + 0x34, 0x9e, 0xfe, 0xff, 0xcd, 0x93, 0x21, 0x86, 0x86, 0xb5, 0xb1, 0x2a, 0x91, 0xaa, 0x04, 0x53, + 0xdb, 0x33, 0x5d, 0x11, 0xdf, 0x89, 0x08, 0xdc, 0x1f, 0x2d, 0xd6, 0x96, 0xba, 0x5c, 0x5b, 0xea, + 0xc7, 0xda, 0x52, 0x9f, 0x37, 0x96, 0xb2, 0xdc, 0x58, 0xca, 0xdb, 0xc6, 0x52, 0xee, 0xce, 0xa3, + 0x98, 0x3f, 0x94, 0xa1, 0x37, 0x61, 0x29, 0x6e, 0xc4, 0x4e, 0x12, 0x12, 0x82, 0x2c, 0xf0, 0x6c, + 0x70, 0x86, 0x9f, 0x7e, 0xbf, 0x36, 0x9f, 0xe7, 0x14, 0x42, 0x4d, 0xe4, 0x77, 0xfa, 0x15, 0x00, + 0x00, 0xff, 0xff, 0x36, 0x7e, 0x34, 0xc5, 0xbd, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/gov.pb.go b/x/incentives/types/gov.pb.go index a6c087ac83b..320ccccedfd 100644 --- a/x/incentives/types/gov.pb.go +++ b/x/incentives/types/gov.pb.go @@ -89,9 +89,9 @@ var fileDescriptor_6ba11ff6685af82a = []byte{ 0xfc, 0xbc, 0x92, 0xd4, 0xbc, 0x12, 0xa7, 0x80, 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, 0x32, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x3a, - 0x40, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, 0x33, 0x32, 0xd1, 0xaf, 0x40, 0x0e, 0x9c, + 0x40, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, 0x33, 0x32, 0xd5, 0xaf, 0x40, 0x0e, 0x9c, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0xe8, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, - 0x8b, 0x69, 0xbd, 0x0f, 0xa2, 0x01, 0x00, 0x00, + 0x96, 0x94, 0x08, 0x0e, 0xa2, 0x01, 0x00, 0x00, } func (m *CreateGroupsProposal) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/gov_test.go b/x/incentives/types/gov_test.go index 27359714419..cf3b0a01c62 100644 --- a/x/incentives/types/gov_test.go +++ b/x/incentives/types/gov_test.go @@ -6,7 +6,7 @@ import ( proto "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" ) var ( diff --git a/x/incentives/types/group.pb.go b/x/incentives/types/group.pb.go index fb2a310d164..ea5d2bf180a 100644 --- a/x/incentives/types/group.pb.go +++ b/x/incentives/types/group.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - _ "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + _ "github.com/osmosis-labs/osmosis/v25/x/lockup/types" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" @@ -333,7 +333,7 @@ var fileDescriptor_90cab10cb3a674f3 = []byte{ // 613 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xcf, 0x6e, 0xd3, 0x40, 0x10, 0xc6, 0xed, 0x36, 0xa5, 0x65, 0x93, 0xe6, 0x8f, 0x03, 0x52, 0x12, 0x09, 0x3b, 0x32, 0x54, - 0x44, 0x48, 0x78, 0xd5, 0x50, 0x38, 0xf4, 0x18, 0x90, 0xa2, 0x70, 0x40, 0x95, 0x91, 0x88, 0x04, + 0x44, 0x48, 0x78, 0xd5, 0x40, 0x39, 0xf4, 0x18, 0x90, 0xa2, 0x70, 0x40, 0x95, 0x91, 0x88, 0x04, 0x87, 0x68, 0x6d, 0x6f, 0x9c, 0x55, 0x6d, 0xaf, 0xe5, 0x5d, 0x07, 0x72, 0xe2, 0xca, 0x91, 0x47, 0x40, 0xe2, 0x45, 0x38, 0xf6, 0xd8, 0x23, 0xaa, 0x44, 0x84, 0x92, 0x0b, 0xe7, 0x3e, 0x01, 0xf2, 0xda, 0x26, 0x4d, 0x1b, 0x01, 0x27, 0x7b, 0x76, 0xbe, 0x6f, 0x76, 0x7e, 0xa3, 0x59, 0xa0, 0x52, @@ -345,31 +345,31 @@ var fileDescriptor_90cab10cb3a674f3 = []byte{ 0xd0, 0xcc, 0x5b, 0xf5, 0xa8, 0x7d, 0x1a, 0x87, 0xe2, 0x93, 0x5b, 0x37, 0x51, 0xa0, 0xd8, 0xc5, 0x69, 0x5e, 0xff, 0x26, 0x83, 0xda, 0x20, 0xe0, 0x38, 0x0a, 0x90, 0xd7, 0x4f, 0xce, 0x07, 0xc1, 0x98, 0x2a, 0x43, 0x50, 0xe2, 0x94, 0x23, 0x6f, 0xf4, 0x1e, 0x13, 0x77, 0xc2, 0x1b, 0x72, 0x5b, - 0xee, 0xdc, 0xee, 0x1d, 0x9d, 0xcd, 0x35, 0xe9, 0x62, 0xae, 0xdd, 0x4d, 0xdb, 0x61, 0xce, 0xa9, - 0x41, 0x28, 0xf4, 0x11, 0x9f, 0x18, 0x83, 0x80, 0x5f, 0xce, 0xb5, 0xfa, 0x0c, 0xf9, 0xde, 0xb1, - 0x7e, 0xd5, 0xaa, 0x9b, 0x45, 0x11, 0x0e, 0x45, 0xa4, 0x98, 0x60, 0x5f, 0xdc, 0x3e, 0x8a, 0xb0, - 0x4d, 0x23, 0x87, 0x35, 0xb6, 0xda, 0xdb, 0x9d, 0x62, 0xf7, 0xa1, 0x71, 0x73, 0x98, 0xc6, 0x5a, - 0x5b, 0xa6, 0xd0, 0xf7, 0x0a, 0x49, 0x0b, 0x66, 0xc9, 0x5d, 0x1d, 0x31, 0xfd, 0x87, 0x0c, 0xea, - 0x1b, 0xb4, 0x8a, 0x01, 0xf6, 0xd2, 0xbb, 0x88, 0x23, 0x00, 0x0a, 0xbd, 0xfa, 0xe5, 0x5c, 0xab, - 0xa4, 0x3d, 0xe6, 0x19, 0xdd, 0xdc, 0x15, 0xbf, 0x03, 0x47, 0x79, 0x01, 0xca, 0x76, 0x1c, 0x45, - 0x38, 0xe0, 0x39, 0xf6, 0x96, 0xc0, 0xbe, 0xf7, 0x57, 0x6c, 0x73, 0x3f, 0x33, 0x65, 0x84, 0x2f, - 0x41, 0xcd, 0x8e, 0xfd, 0xd8, 0x43, 0x09, 0x44, 0x5e, 0x68, 0xfb, 0x7f, 0x0a, 0x55, 0x57, 0xbe, - 0xb4, 0xd6, 0x71, 0xe1, 0xd7, 0x17, 0x4d, 0xd6, 0x2f, 0x64, 0xb0, 0xd3, 0x4f, 0x16, 0x4f, 0x79, - 0x00, 0xca, 0x62, 0x03, 0x47, 0xeb, 0x5c, 0x66, 0x49, 0x9c, 0xf6, 0x33, 0x8e, 0x77, 0xa0, 0x4e, - 0xb2, 0x71, 0xe4, 0xc2, 0x60, 0x4c, 0x05, 0x4c, 0xb1, 0x7b, 0xf0, 0xcf, 0x49, 0x27, 0x0b, 0x90, - 0xcd, 0xb9, 0x46, 0x6e, 0x6c, 0xc6, 0x2b, 0x50, 0x65, 0xa1, 0x47, 0x38, 0x27, 0x81, 0x3b, 0x0a, - 0xa9, 0x47, 0xec, 0x99, 0xa0, 0x2b, 0x77, 0xef, 0x6f, 0xaa, 0xfc, 0x3a, 0xd7, 0x9e, 0x08, 0xa9, - 0x59, 0x61, 0xeb, 0x07, 0x7a, 0x07, 0x14, 0x9f, 0x47, 0x18, 0x71, 0x9c, 0x12, 0x36, 0xc1, 0x5e, - 0x48, 0xa9, 0x37, 0x22, 0x0e, 0x6b, 0xc8, 0xed, 0xed, 0x4e, 0xc1, 0xdc, 0x4d, 0xe2, 0x81, 0xc3, - 0xf4, 0x8f, 0xa0, 0x22, 0x34, 0x6c, 0x48, 0xf8, 0x44, 0x34, 0xa4, 0x3c, 0x05, 0x3b, 0x82, 0x5c, + 0xee, 0xdc, 0xee, 0x3d, 0x3d, 0x9b, 0x6b, 0xd2, 0xc5, 0x5c, 0xbb, 0x9b, 0xb6, 0xc3, 0x9c, 0x53, + 0x83, 0x50, 0xe8, 0x23, 0x3e, 0x31, 0x06, 0x01, 0xbf, 0x9c, 0x6b, 0xf5, 0x19, 0xf2, 0xbd, 0x63, + 0xfd, 0xaa, 0x55, 0x37, 0x8b, 0x22, 0x1c, 0x8a, 0x48, 0x31, 0xc1, 0xbe, 0xb8, 0x7d, 0x14, 0x61, + 0x9b, 0x46, 0x0e, 0x6b, 0x6c, 0xb5, 0xb7, 0x3b, 0xc5, 0xee, 0x43, 0xe3, 0xe6, 0x30, 0x8d, 0xb5, + 0xb6, 0x4c, 0xa1, 0xef, 0x15, 0x92, 0x16, 0xcc, 0x92, 0xbb, 0x3a, 0x62, 0xfa, 0x0f, 0x19, 0xd4, + 0x37, 0x68, 0x15, 0x03, 0xec, 0xa5, 0x77, 0x11, 0x47, 0x00, 0x14, 0x7a, 0xf5, 0xcb, 0xb9, 0x56, + 0x49, 0x7b, 0xcc, 0x33, 0xba, 0xb9, 0x2b, 0x7e, 0x07, 0x8e, 0xf2, 0x02, 0x94, 0xed, 0x38, 0x8a, + 0x70, 0xc0, 0x73, 0xec, 0x2d, 0x81, 0x7d, 0xef, 0xaf, 0xd8, 0xe6, 0x7e, 0x66, 0xca, 0x08, 0x5f, + 0x82, 0x9a, 0x1d, 0xfb, 0xb1, 0x87, 0x12, 0x88, 0xbc, 0xd0, 0xf6, 0xff, 0x14, 0xaa, 0xae, 0x7c, + 0x69, 0xad, 0xe3, 0xc2, 0xaf, 0x2f, 0x9a, 0xac, 0x5f, 0xc8, 0x60, 0xa7, 0x9f, 0x2c, 0x9e, 0xf2, + 0x00, 0x94, 0xc5, 0x06, 0x8e, 0xd6, 0xb9, 0xcc, 0x92, 0x38, 0xed, 0x67, 0x1c, 0xef, 0x40, 0x9d, + 0x64, 0xe3, 0xc8, 0x85, 0xc1, 0x98, 0x0a, 0x98, 0x62, 0xf7, 0xe0, 0x9f, 0x93, 0x4e, 0x16, 0x20, + 0x9b, 0x73, 0x8d, 0xdc, 0xd8, 0x8c, 0x57, 0xa0, 0xca, 0x42, 0x8f, 0x70, 0x4e, 0x02, 0x77, 0x14, + 0x52, 0x8f, 0xd8, 0x33, 0x41, 0x57, 0xee, 0xde, 0xdf, 0x54, 0xf9, 0x75, 0xae, 0x3d, 0x11, 0x52, + 0xb3, 0xc2, 0xd6, 0x0f, 0xf4, 0x0e, 0x28, 0x3e, 0x8f, 0x30, 0xe2, 0x38, 0x25, 0x6c, 0x82, 0xbd, + 0x90, 0x52, 0x6f, 0x44, 0x1c, 0xd6, 0x90, 0xdb, 0xdb, 0x9d, 0x82, 0xb9, 0x9b, 0xc4, 0x03, 0x87, + 0xe9, 0x1f, 0x41, 0x45, 0x68, 0xd8, 0x90, 0xf0, 0x89, 0x68, 0x48, 0x39, 0x02, 0x3b, 0x82, 0x5c, 0x8c, 0xa1, 0xd8, 0x6d, 0x6e, 0xea, 0x40, 0x78, 0x32, 0x9e, 0x54, 0x2d, 0x6c, 0x89, 0x3f, 0x1b, 0xc9, 0x66, 0x5b, 0x22, 0xf8, 0x63, 0x4b, 0x82, 0x47, 0x07, 0xa0, 0x72, 0x0d, 0x47, 0x29, 0x81, 0xbd, 0xde, 0xec, 0x0d, 0xf5, 0x62, 0x1f, 0x57, 0xa5, 0x56, 0xe1, 0xd3, 0x57, 0x55, 0xea, 0x9d, 0x9c, 0x2d, 0x54, 0xf9, 0x7c, 0xa1, 0xca, 0x3f, 0x17, 0xaa, 0xfc, 0x79, 0xa9, 0x4a, 0xe7, 0x4b, 0x55, 0xfa, 0xbe, 0x54, 0xa5, 0xb7, 0xcf, 0x5c, 0xc2, 0x27, 0xb1, 0x65, 0xd8, 0xd4, 0x87, 0xd9, 0x95, 0x8f, 0x3d, 0x64, 0xb1, 0x3c, 0x80, 0xd3, 0xee, 0x11, 0xfc, 0x70, 0xf5, 0xa5, 0xf2, 0x59, - 0x88, 0x99, 0x75, 0x4b, 0x3c, 0xd5, 0x27, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x95, 0x5b, - 0xb5, 0x92, 0x04, 0x00, 0x00, + 0x88, 0x99, 0x75, 0x4b, 0x3c, 0xd5, 0x27, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x31, 0x68, 0xee, + 0xb4, 0x92, 0x04, 0x00, 0x00, } func (this *InternalGaugeRecord) Equal(that interface{}) bool { diff --git a/x/incentives/types/msgs.go b/x/incentives/types/msgs.go index d27e8d6a071..79de9c59f77 100644 --- a/x/incentives/types/msgs.go +++ b/x/incentives/types/msgs.go @@ -6,7 +6,7 @@ import ( "time" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/types/msgs_test.go b/x/incentives/types/msgs_test.go index 51a6abbdb49..585280291b9 100644 --- a/x/incentives/types/msgs_test.go +++ b/x/incentives/types/msgs_test.go @@ -10,13 +10,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) // TestMsgCreateGauge tests if valid/invalid create gauge messages are properly validated/invalidated diff --git a/x/incentives/types/params.go b/x/incentives/types/params.go index 3976f4653b1..d542854e7b5 100644 --- a/x/incentives/types/params.go +++ b/x/incentives/types/params.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmoutils" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/incentives/types/params.pb.go b/x/incentives/types/params.pb.go index d6d85916dae..e700e0947c1 100644 --- a/x/incentives/types/params.pb.go +++ b/x/incentives/types/params.pb.go @@ -140,7 +140,7 @@ var fileDescriptor_1cc8b460d089f845 = []byte{ // 475 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xdd, 0x8a, 0xd3, 0x40, 0x18, 0x6d, 0x6c, 0x5d, 0xd8, 0x08, 0x2a, 0x61, 0x59, 0x63, 0xd1, 0xa4, 0x06, 0x84, 0x7a, 0xb1, - 0x19, 0x77, 0x15, 0x2f, 0xbc, 0x4c, 0xd7, 0x05, 0xef, 0x96, 0x80, 0x2e, 0x88, 0x10, 0xf2, 0xf3, + 0x19, 0x77, 0x45, 0x2f, 0xbc, 0x4c, 0xd7, 0x05, 0xef, 0x96, 0x80, 0x2e, 0x88, 0x10, 0xf2, 0xf3, 0x25, 0xfd, 0x30, 0xc9, 0x17, 0x66, 0x26, 0xd5, 0xbe, 0x85, 0xe0, 0x8d, 0xcf, 0xe0, 0x93, 0xec, 0xe5, 0x5e, 0x7a, 0xd5, 0x95, 0xf6, 0x0d, 0xfa, 0x04, 0x92, 0x49, 0xa2, 0x45, 0xd4, 0xab, 0x64, 0xce, 0x39, 0xdf, 0x9c, 0x39, 0x73, 0x46, 0xb7, 0x49, 0x14, 0x24, 0x50, 0x30, 0x2c, 0x63, 0x28, @@ -167,7 +167,7 @@ var fileDescriptor_1cc8b460d089f845 = []byte{ 0x76, 0xb5, 0xb6, 0xb4, 0x1f, 0x6b, 0x4b, 0xfb, 0xbc, 0xb1, 0x06, 0x57, 0x1b, 0x6b, 0xf0, 0x7d, 0x63, 0x0d, 0xde, 0xbd, 0xd8, 0x29, 0xa3, 0x7b, 0xa4, 0x47, 0x79, 0x18, 0x89, 0x7e, 0xc1, 0x16, 0x27, 0xcf, 0xd9, 0xa7, 0xdd, 0x87, 0xad, 0x0a, 0x8a, 0xf6, 0x54, 0xec, 0x67, 0x3f, 0x03, 0x00, - 0x00, 0xff, 0xff, 0x59, 0xd8, 0xf8, 0x4e, 0xfb, 0x02, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x44, 0x25, 0x4d, 0x4f, 0xfb, 0x02, 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 5ea3590d9f4..45f6587b964 100644 --- a/x/incentives/types/query.pb.go +++ b/x/incentives/types/query.pb.go @@ -14,7 +14,7 @@ import ( grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - _ "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + _ "github.com/osmosis-labs/osmosis/v25/x/lockup/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -1413,7 +1413,7 @@ func init() { func init() { proto.RegisterFile("osmosis/incentives/query.proto", fileDescriptor_8124258a89427f98) } var fileDescriptor_8124258a89427f98 = []byte{ - // 1485 bytes of a gzipped FileDescriptorProto + // 1484 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x97, 0xcd, 0x6f, 0xd4, 0xc6, 0x1b, 0xc7, 0x33, 0x79, 0x01, 0xf2, 0x24, 0xbf, 0x40, 0x26, 0xbc, 0x24, 0x1b, 0xd8, 0xcd, 0x6f, 0x0a, 0x61, 0x81, 0xc6, 0x66, 0x13, 0x02, 0x14, 0xda, 0xaa, 0x2c, 0xa1, 0x14, 0x09, 0x04, 0xac, @@ -1505,8 +1505,8 @@ var fileDescriptor_8124258a89427f98 = []byte{ 0x91, 0x94, 0x8b, 0x71, 0x5d, 0x46, 0xd7, 0x1b, 0xc5, 0x1b, 0x8f, 0x9e, 0x66, 0xd1, 0xe3, 0xa7, 0x59, 0xf4, 0xd7, 0xd3, 0x2c, 0xfa, 0xf2, 0x59, 0xb6, 0xef, 0xf1, 0xb3, 0x6c, 0xdf, 0x1f, 0xcf, 0xb2, 0x7d, 0x1f, 0x9f, 0x0e, 0x7d, 0xec, 0xc9, 0x92, 0x73, 0x55, 0xbd, 0xec, 0xb4, 0xea, 0xdf, - 0x9d, 0x3f, 0xa5, 0xde, 0x0b, 0x53, 0xf0, 0x0f, 0xc0, 0xf2, 0x0e, 0xfe, 0x2d, 0xb6, 0xf0, 0x6f, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xaf, 0xe3, 0x6a, 0x1e, 0x57, 0x16, 0x00, 0x00, + 0x9d, 0x5f, 0x54, 0xef, 0x85, 0x29, 0xf8, 0x07, 0x60, 0x79, 0x07, 0xff, 0x16, 0x5b, 0xf8, 0x37, + 0x00, 0x00, 0xff, 0xff, 0xb2, 0x1e, 0xdf, 0x1f, 0x57, 0x16, 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 1cdfff0af78..b001a891980 100644 --- a/x/incentives/types/tx.pb.go +++ b/x/incentives/types/tx.pb.go @@ -13,7 +13,7 @@ import ( grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - types "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + types "github.com/osmosis-labs/osmosis/v25/x/lockup/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -418,7 +418,7 @@ var fileDescriptor_8ea120e22291556e = []byte{ // 721 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x95, 0xcd, 0x4e, 0xdb, 0x4a, 0x14, 0xc7, 0xe3, 0x24, 0x10, 0x98, 0xc0, 0x15, 0x58, 0xdc, 0x8b, 0xc9, 0xbd, 0x72, 0x82, 0x75, - 0x55, 0xa5, 0x48, 0x99, 0x29, 0xa1, 0xea, 0x82, 0x5d, 0x83, 0xaa, 0x2a, 0x0b, 0x54, 0x6a, 0x21, + 0x55, 0xa5, 0x48, 0x99, 0x29, 0x41, 0xed, 0x82, 0x5d, 0x83, 0xaa, 0x2a, 0x0b, 0x54, 0x6a, 0x21, 0x55, 0x42, 0xaa, 0xa2, 0x49, 0x66, 0x6a, 0x46, 0xc4, 0x1e, 0xcb, 0x33, 0x0e, 0xf0, 0x0a, 0x95, 0x2a, 0xf1, 0x06, 0xdd, 0x77, 0xd5, 0xc7, 0x60, 0x89, 0xba, 0xea, 0x0a, 0x2a, 0x58, 0x74, 0xcf, 0x13, 0x54, 0x33, 0xb6, 0xf3, 0xa1, 0x92, 0x66, 0xd3, 0x6e, 0xe2, 0xcc, 0xf9, 0xca, 0x39, 0xe7, @@ -460,7 +460,7 @@ var fileDescriptor_8ea120e22291556e = []byte{ 0xbc, 0xd6, 0xc1, 0xe5, 0xad, 0x6d, 0x5c, 0xdd, 0xda, 0xc6, 0xb7, 0x5b, 0xdb, 0xb8, 0xb8, 0xb3, 0x73, 0x57, 0x77, 0x76, 0xee, 0xeb, 0x9d, 0x9d, 0x3b, 0x7a, 0x36, 0xa6, 0x9d, 0xb4, 0x5e, 0xa3, 0x8f, 0xbb, 0x22, 0x3b, 0xa0, 0x41, 0xf3, 0x29, 0x3a, 0x9b, 0x78, 0xbd, 0x28, 0x3d, 0x75, 0xe7, - 0xf5, 0xd5, 0xb3, 0xf3, 0x23, 0x00, 0x00, 0xff, 0xff, 0x99, 0x85, 0x16, 0x72, 0x81, 0x06, 0x00, + 0xf5, 0xd5, 0xb3, 0xf3, 0x23, 0x00, 0x00, 0xff, 0xff, 0x84, 0x78, 0xa3, 0x73, 0x81, 0x06, 0x00, 0x00, } diff --git a/x/lockup/abci.go b/x/lockup/abci.go index 9c5bf044492..fed430414da 100644 --- a/x/lockup/abci.go +++ b/x/lockup/abci.go @@ -3,7 +3,7 @@ package lockup import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/client/cli/cli_test.go b/x/lockup/client/cli/cli_test.go index 325395b4ec4..c8e35f0bd80 100644 --- a/x/lockup/client/cli/cli_test.go +++ b/x/lockup/client/cli/cli_test.go @@ -8,7 +8,7 @@ import ( "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) var testAddresses = osmoutils.CreateRandomAccounts(3) diff --git a/x/lockup/client/cli/query.go b/x/lockup/client/cli/query.go index b4923f174dc..07459a256da 100644 --- a/x/lockup/client/cli/query.go +++ b/x/lockup/client/cli/query.go @@ -17,7 +17,7 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/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 5f73ff935d6..e397a7c9173 100644 --- a/x/lockup/client/cli/tx.go +++ b/x/lockup/client/cli/tx.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/pflag" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) // GetTxCmd returns the transaction commands for this module. diff --git a/x/lockup/keeper/admin_keeper.go b/x/lockup/keeper/admin_keeper.go index 79e8ad7c5f9..c0241949923 100644 --- a/x/lockup/keeper/admin_keeper.go +++ b/x/lockup/keeper/admin_keeper.go @@ -3,7 +3,7 @@ package keeper import ( "github.com/cosmos/gogoproto/proto" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/admin_keeper_test.go b/x/lockup/keeper/admin_keeper_test.go index 19abd762d35..6ce180e82dd 100644 --- a/x/lockup/keeper/admin_keeper_test.go +++ b/x/lockup/keeper/admin_keeper_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "time" - "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/bench_test.go b/x/lockup/keeper/bench_test.go index 2d12c459f27..fe19e727d27 100644 --- a/x/lockup/keeper/bench_test.go +++ b/x/lockup/keeper/bench_test.go @@ -10,8 +10,8 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/app" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/x/lockup/keeper/export_test.go b/x/lockup/keeper/export_test.go index fbcc18fff62..d3e608de8b8 100644 --- a/x/lockup/keeper/export_test.go +++ b/x/lockup/keeper/export_test.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/genesis.go b/x/lockup/keeper/genesis.go index a15ab560f84..58ec1781ac9 100644 --- a/x/lockup/keeper/genesis.go +++ b/x/lockup/keeper/genesis.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/genesis_test.go b/x/lockup/keeper/genesis_test.go index 2750b8dfbef..4e021179208 100644 --- a/x/lockup/keeper/genesis_test.go +++ b/x/lockup/keeper/genesis_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - osmoapp "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/x/lockup" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + osmoapp "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/x/lockup" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/bank/testutil" diff --git a/x/lockup/keeper/grpc_query.go b/x/lockup/keeper/grpc_query.go index c7915bdf4a0..2568dabd0b1 100644 --- a/x/lockup/keeper/grpc_query.go +++ b/x/lockup/keeper/grpc_query.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) var _ types.QueryServer = Querier{} diff --git a/x/lockup/keeper/grpc_query_test.go b/x/lockup/keeper/grpc_query_test.go index 2b5d9de582b..dde772afb89 100644 --- a/x/lockup/keeper/grpc_query_test.go +++ b/x/lockup/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) func (s *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 0569bbcce6f..79f2bd4c109 100644 --- a/x/lockup/keeper/invariants.go +++ b/x/lockup/keeper/invariants.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) // RegisterInvariants registers all governance invariants. diff --git a/x/lockup/keeper/iterator.go b/x/lockup/keeper/iterator.go index 42ba99e4569..97b5559e511 100644 --- a/x/lockup/keeper/iterator.go +++ b/x/lockup/keeper/iterator.go @@ -5,7 +5,7 @@ import ( db "github.com/cometbft/cometbft-db" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/keeper.go b/x/lockup/keeper/keeper.go index a7f99510499..c90212feed3 100644 --- a/x/lockup/keeper/keeper.go +++ b/x/lockup/keeper/keeper.go @@ -5,7 +5,7 @@ import ( "github.com/cometbft/cometbft/libs/log" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/keeper_test.go b/x/lockup/keeper/keeper_test.go index 78f17cafa82..091d12e66e1 100644 --- a/x/lockup/keeper/keeper_test.go +++ b/x/lockup/keeper/keeper_test.go @@ -7,9 +7,9 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper" ) type KeeperTestSuite struct { diff --git a/x/lockup/keeper/lock.go b/x/lockup/keeper/lock.go index 5e1db4ef86e..76d5841b34d 100644 --- a/x/lockup/keeper/lock.go +++ b/x/lockup/keeper/lock.go @@ -15,8 +15,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/sumtree" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) // WithdrawAllMaturedLocks withdraws every lock that's in the process of unlocking, and has finished unlocking by diff --git a/x/lockup/keeper/lock_refs.go b/x/lockup/keeper/lock_refs.go index 746973159de..3ad8936a64e 100644 --- a/x/lockup/keeper/lock_refs.go +++ b/x/lockup/keeper/lock_refs.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/lock_test.go b/x/lockup/keeper/lock_test.go index d784f3c836c..c6f7b43e681 100644 --- a/x/lockup/keeper/lock_test.go +++ b/x/lockup/keeper/lock_test.go @@ -8,10 +8,10 @@ import ( errorsmod "cosmossdk.io/errors" "github.com/osmosis-labs/osmosis/osmomath" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/migration.go b/x/lockup/keeper/migration.go index c92701fcd5e..84454740509 100644 --- a/x/lockup/keeper/migration.go +++ b/x/lockup/keeper/migration.go @@ -4,7 +4,7 @@ import ( "strconv" "time" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/migration_test.go b/x/lockup/keeper/migration_test.go index 682b0a3ae8a..cbc2f0f7fe1 100644 --- a/x/lockup/keeper/migration_test.go +++ b/x/lockup/keeper/migration_test.go @@ -5,7 +5,7 @@ import ( "math/rand" "time" - "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/msg_server.go b/x/lockup/keeper/msg_server.go index e39406e3ff0..293fa558ee6 100644 --- a/x/lockup/keeper/msg_server.go +++ b/x/lockup/keeper/msg_server.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/msg_server_test.go b/x/lockup/keeper/msg_server_test.go index c66e115fa1b..cdd51d00d39 100644 --- a/x/lockup/keeper/msg_server_test.go +++ b/x/lockup/keeper/msg_server_test.go @@ -4,9 +4,9 @@ import ( "time" "github.com/osmosis-labs/osmosis/osmomath" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/bank/testutil" diff --git a/x/lockup/keeper/store.go b/x/lockup/keeper/store.go index 8f57bdf05be..4f6d3e90423 100644 --- a/x/lockup/keeper/store.go +++ b/x/lockup/keeper/store.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/synthetic_lock.go b/x/lockup/keeper/synthetic_lock.go index 8254ac5b41f..0d36849891a 100644 --- a/x/lockup/keeper/synthetic_lock.go +++ b/x/lockup/keeper/synthetic_lock.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) // A synthetic lock object is a lock object used for the superfluid module. diff --git a/x/lockup/keeper/synthetic_lock_test.go b/x/lockup/keeper/synthetic_lock_test.go index 7e8035b183f..ceb701ca430 100644 --- a/x/lockup/keeper/synthetic_lock_test.go +++ b/x/lockup/keeper/synthetic_lock_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "time" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/utils.go b/x/lockup/keeper/utils.go index 0a1a6d094f9..9d920a7201a 100644 --- a/x/lockup/keeper/utils.go +++ b/x/lockup/keeper/utils.go @@ -4,7 +4,7 @@ import ( "bytes" "time" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/utils_test.go b/x/lockup/keeper/utils_test.go index b095ec762ed..1f8cae08477 100644 --- a/x/lockup/keeper/utils_test.go +++ b/x/lockup/keeper/utils_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/module.go b/x/lockup/module.go index 0417a3890cd..1718dd58df1 100644 --- a/x/lockup/module.go +++ b/x/lockup/module.go @@ -27,12 +27,12 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - "github.com/osmosis-labs/osmosis/v24/x/lockup/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/x/lockup/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper" - simulation "github.com/osmosis-labs/osmosis/v24/x/lockup/simulation" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + simulation "github.com/osmosis-labs/osmosis/v25/x/lockup/simulation" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) var ( diff --git a/x/lockup/simulation/operations.go b/x/lockup/simulation/operations.go index be106803a28..6303df6dc14 100644 --- a/x/lockup/simulation/operations.go +++ b/x/lockup/simulation/operations.go @@ -7,9 +7,9 @@ import ( legacysimulationtype "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/types/genesis.pb.go b/x/lockup/types/genesis.pb.go index b3c703cdc18..0658abea751 100644 --- a/x/lockup/types/genesis.pb.go +++ b/x/lockup/types/genesis.pb.go @@ -116,9 +116,9 @@ var fileDescriptor_648db7c6ebb608b0 = []byte{ 0x1b, 0x04, 0x55, 0xe5, 0xe4, 0x73, 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, 0x46, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x50, 0x33, 0x74, 0x73, - 0x12, 0x93, 0x8a, 0x61, 0x1c, 0xfd, 0x32, 0x23, 0x13, 0xfd, 0x0a, 0x58, 0xe8, 0x95, 0x54, 0x16, - 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x43, 0xcf, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xd4, 0xf4, - 0xbe, 0xbb, 0x01, 0x00, 0x00, + 0x12, 0x93, 0x8a, 0x61, 0x1c, 0xfd, 0x32, 0x23, 0x53, 0xfd, 0x0a, 0x58, 0xe8, 0x95, 0x54, 0x16, + 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x43, 0xcf, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xe4, 0xb1, 0xd1, + 0x3f, 0xbb, 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 29ec7bc0757..f82f97406cd 100644 --- a/x/lockup/types/lock.pb.go +++ b/x/lockup/types/lock.pb.go @@ -338,45 +338,45 @@ var fileDescriptor_7e9d7527a237b489 = []byte{ // 658 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x3f, 0x6f, 0xd3, 0x40, 0x1c, 0x8d, 0xf3, 0xa7, 0x7f, 0xae, 0x34, 0xb5, 0x4e, 0x45, 0xa4, 0x01, 0xec, 0xc8, 0x03, 0x8a, - 0x50, 0x6b, 0xd3, 0xc0, 0xc4, 0x86, 0x1b, 0x84, 0x8a, 0x2a, 0x04, 0xa6, 0x62, 0xe8, 0x62, 0x39, - 0xbe, 0x23, 0x3d, 0x35, 0xf6, 0x99, 0x3b, 0xbb, 0xc5, 0xdf, 0x80, 0xb1, 0x23, 0x48, 0x6c, 0x6c, - 0x7c, 0x0b, 0xb6, 0x8e, 0x1d, 0x99, 0x52, 0xd4, 0x6e, 0x8c, 0xfd, 0x04, 0xe8, 0xee, 0xec, 0x34, - 0x2d, 0xaa, 0xd4, 0x01, 0x26, 0xfb, 0xee, 0xfd, 0x7e, 0xef, 0x7e, 0x7e, 0xef, 0x9d, 0xc1, 0x0a, - 0xe5, 0x11, 0xe5, 0x84, 0x3b, 0x23, 0x1a, 0xee, 0x65, 0x89, 0x7c, 0xd8, 0x09, 0xa3, 0x29, 0x85, - 0xcd, 0x02, 0xb2, 0x15, 0xd4, 0x5e, 0x1e, 0xd2, 0x21, 0x95, 0x90, 0x23, 0xde, 0x54, 0x55, 0xdb, - 0x18, 0x52, 0x3a, 0x1c, 0x61, 0x47, 0xae, 0x06, 0xd9, 0x7b, 0x07, 0x65, 0x2c, 0x48, 0x09, 0x8d, - 0x0b, 0xdc, 0xbc, 0x8a, 0xa7, 0x24, 0xc2, 0x3c, 0x0d, 0xa2, 0xa4, 0x24, 0x08, 0xe5, 0x39, 0xce, - 0x20, 0xe0, 0xd8, 0xd9, 0x5f, 0x1f, 0xe0, 0x34, 0x58, 0x77, 0x42, 0x4a, 0x0a, 0x02, 0xeb, 0x47, - 0x0d, 0x80, 0xd7, 0x98, 0x11, 0x8a, 0xb6, 0x68, 0xb8, 0x07, 0x9b, 0xa0, 0xba, 0xd9, 0x6f, 0x69, - 0x1d, 0xad, 0x5b, 0xf7, 0xaa, 0x9b, 0x7d, 0xf8, 0x00, 0x34, 0xe8, 0x41, 0x8c, 0x59, 0xab, 0xda, - 0xd1, 0xba, 0xf3, 0xae, 0x7e, 0x3e, 0x36, 0x6f, 0xe5, 0x41, 0x34, 0x7a, 0x6a, 0xc9, 0x6d, 0xcb, - 0x53, 0x30, 0xdc, 0x05, 0x73, 0xe5, 0x64, 0xad, 0x5a, 0x47, 0xeb, 0x2e, 0xf4, 0x56, 0x6c, 0x35, - 0x9a, 0x5d, 0x8e, 0x66, 0xf7, 0x8b, 0x02, 0x77, 0xfd, 0x68, 0x6c, 0x56, 0x7e, 0x8f, 0x4d, 0x58, - 0xb6, 0xac, 0xd2, 0x88, 0xa4, 0x38, 0x4a, 0xd2, 0xfc, 0x7c, 0x6c, 0x2e, 0x29, 0xfe, 0x12, 0xb3, - 0x3e, 0x9f, 0x98, 0x9a, 0x37, 0x61, 0x87, 0x1e, 0x98, 0xc3, 0x31, 0xf2, 0xc5, 0x77, 0xb6, 0xea, - 0xf2, 0xa4, 0xf6, 0x5f, 0x27, 0x6d, 0x97, 0x22, 0xb8, 0x77, 0xc5, 0x51, 0x17, 0xa4, 0x65, 0xa7, - 0x75, 0x28, 0x48, 0x67, 0x71, 0x8c, 0x44, 0x29, 0x0c, 0x40, 0x43, 0x48, 0xc2, 0x5b, 0x8d, 0x4e, - 0x4d, 0x8e, 0xae, 0x44, 0xb3, 0x85, 0x68, 0x76, 0x21, 0x9a, 0xbd, 0x41, 0x49, 0xec, 0x3e, 0x12, - 0x7c, 0xdf, 0x4f, 0xcc, 0xee, 0x90, 0xa4, 0xbb, 0xd9, 0xc0, 0x0e, 0x69, 0xe4, 0x14, 0x0a, 0xab, - 0xc7, 0x1a, 0x47, 0x7b, 0x4e, 0x9a, 0x27, 0x98, 0xcb, 0x06, 0xee, 0x29, 0x66, 0xb8, 0x03, 0xee, - 0x30, 0x7c, 0x10, 0x30, 0xe4, 0x33, 0x1c, 0x62, 0xb2, 0x8f, 0x99, 0x1f, 0x20, 0xc4, 0x30, 0xe7, - 0xad, 0x19, 0x29, 0xad, 0x75, 0x3e, 0x36, 0x0d, 0x35, 0xe5, 0x35, 0x85, 0x96, 0x77, 0x5b, 0x21, - 0x5e, 0x01, 0x3c, 0x2b, 0xf6, 0xbf, 0x54, 0x41, 0xf3, 0x4d, 0x86, 0x59, 0xbe, 0x41, 0x63, 0x44, - 0xa4, 0x4a, 0xcf, 0xc1, 0x92, 0xc8, 0x95, 0xff, 0x41, 0x6c, 0xfb, 0x62, 0x1e, 0x69, 0x6a, 0xb3, - 0x77, 0xdf, 0xbe, 0x9c, 0x3b, 0x5b, 0xd8, 0x2e, 0x9b, 0xb7, 0xf3, 0x04, 0x7b, 0x8b, 0xa3, 0xe9, - 0x25, 0x5c, 0x06, 0x0d, 0x84, 0x63, 0x1a, 0x29, 0xfb, 0x3d, 0xb5, 0x10, 0x16, 0xdc, 0xdc, 0xec, - 0x2b, 0x0e, 0x5c, 0x67, 0xeb, 0x3b, 0x30, 0x3f, 0x89, 0xee, 0x0d, 0x7c, 0xbd, 0x57, 0xb0, 0xea, - 0x8a, 0x75, 0xd2, 0xaa, 0x8c, 0xbd, 0xa0, 0xb2, 0xbe, 0x56, 0xc1, 0xe2, 0xdb, 0x3c, 0x4e, 0x77, - 0x71, 0x4a, 0x42, 0x19, 0xf1, 0x55, 0x00, 0xb3, 0x18, 0x61, 0x36, 0xca, 0x49, 0x3c, 0xf4, 0xa5, - 0x4a, 0x04, 0x15, 0x91, 0xd7, 0x2f, 0x10, 0x51, 0xbb, 0x89, 0xa0, 0x09, 0x16, 0xb8, 0x68, 0xf7, - 0xa7, 0x75, 0x00, 0x72, 0xab, 0x5f, 0x8a, 0x31, 0xc9, 0x63, 0xed, 0x1f, 0xe5, 0x71, 0xfa, 0x36, - 0xd5, 0xff, 0xe7, 0x6d, 0x7a, 0xf8, 0x12, 0x2c, 0x5e, 0x0a, 0x00, 0x6c, 0x02, 0xe0, 0xe6, 0x25, - 0xb7, 0x5e, 0x81, 0x00, 0xcc, 0xb8, 0xb9, 0x18, 0x4a, 0xd7, 0xc4, 0xfb, 0x2b, 0x2a, 0xca, 0xf5, - 0x2a, 0x5c, 0x00, 0xb3, 0x6e, 0xfe, 0x82, 0xd1, 0x2c, 0xd1, 0x6b, 0xed, 0xfa, 0xa7, 0x6f, 0x46, - 0xc5, 0xdd, 0x3a, 0x3a, 0x35, 0xb4, 0xe3, 0x53, 0x43, 0xfb, 0x75, 0x6a, 0x68, 0x87, 0x67, 0x46, - 0xe5, 0xf8, 0xcc, 0xa8, 0xfc, 0x3c, 0x33, 0x2a, 0x3b, 0xbd, 0xa9, 0xdb, 0x52, 0xc4, 0x6f, 0x6d, - 0x14, 0x0c, 0x78, 0xb9, 0x70, 0xf6, 0x7b, 0x4f, 0x9c, 0x8f, 0xe5, 0x4f, 0x52, 0xde, 0x9e, 0xc1, - 0x8c, 0xfc, 0xd2, 0xc7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb2, 0x98, 0x73, 0xdc, 0x43, 0x05, + 0x50, 0x6b, 0xd3, 0x20, 0x16, 0x36, 0xdc, 0x20, 0x54, 0x54, 0x21, 0x30, 0x15, 0x43, 0x17, 0xcb, + 0xf1, 0x1d, 0xe9, 0xa9, 0xb1, 0xcf, 0xdc, 0xd9, 0x2d, 0xfe, 0x06, 0x8c, 0x1d, 0x41, 0x62, 0x63, + 0xe3, 0x5b, 0xb0, 0x75, 0xec, 0xc8, 0x94, 0xa2, 0x76, 0x63, 0xec, 0x27, 0x40, 0x77, 0x67, 0xa7, + 0x69, 0x51, 0xa5, 0x0e, 0x30, 0xd9, 0x77, 0xef, 0xf7, 0x7b, 0xf7, 0xf3, 0x7b, 0xef, 0x0c, 0x56, + 0x28, 0x8f, 0x28, 0x27, 0xdc, 0x19, 0xd1, 0x70, 0x2f, 0x4b, 0xe4, 0xc3, 0x4e, 0x18, 0x4d, 0x29, + 0x6c, 0x16, 0x90, 0xad, 0xa0, 0xf6, 0xf2, 0x90, 0x0e, 0xa9, 0x84, 0x1c, 0xf1, 0xa6, 0xaa, 0xda, + 0xc6, 0x90, 0xd2, 0xe1, 0x08, 0x3b, 0x72, 0x35, 0xc8, 0xde, 0x3b, 0x28, 0x63, 0x41, 0x4a, 0x68, + 0x5c, 0xe0, 0xe6, 0x55, 0x3c, 0x25, 0x11, 0xe6, 0x69, 0x10, 0x25, 0x25, 0x41, 0x28, 0xcf, 0x71, + 0x06, 0x01, 0xc7, 0xce, 0xfe, 0xfa, 0x00, 0xa7, 0xc1, 0xba, 0x13, 0x52, 0x52, 0x10, 0x58, 0x3f, + 0x6a, 0x00, 0xbc, 0xc6, 0x8c, 0x50, 0xb4, 0x45, 0xc3, 0x3d, 0xd8, 0x04, 0xd5, 0xcd, 0x7e, 0x4b, + 0xeb, 0x68, 0xdd, 0xba, 0x57, 0xdd, 0xec, 0xc3, 0x07, 0xa0, 0x41, 0x0f, 0x62, 0xcc, 0x5a, 0xd5, + 0x8e, 0xd6, 0x9d, 0x77, 0xf5, 0xf3, 0xb1, 0x79, 0x2b, 0x0f, 0xa2, 0xd1, 0x53, 0x4b, 0x6e, 0x5b, + 0x9e, 0x82, 0xe1, 0x2e, 0x98, 0x2b, 0x27, 0x6b, 0xd5, 0x3a, 0x5a, 0x77, 0xa1, 0xb7, 0x62, 0xab, + 0xd1, 0xec, 0x72, 0x34, 0xbb, 0x5f, 0x14, 0xb8, 0xeb, 0x47, 0x63, 0xb3, 0xf2, 0x7b, 0x6c, 0xc2, + 0xb2, 0x65, 0x95, 0x46, 0x24, 0xc5, 0x51, 0x92, 0xe6, 0xe7, 0x63, 0x73, 0x49, 0xf1, 0x97, 0x98, + 0xf5, 0xf9, 0xc4, 0xd4, 0xbc, 0x09, 0x3b, 0xf4, 0xc0, 0x1c, 0x8e, 0x91, 0x2f, 0xbe, 0xb3, 0x55, + 0x97, 0x27, 0xb5, 0xff, 0x3a, 0x69, 0xbb, 0x14, 0xc1, 0xbd, 0x2b, 0x8e, 0xba, 0x20, 0x2d, 0x3b, + 0xad, 0x43, 0x41, 0x3a, 0x8b, 0x63, 0x24, 0x4a, 0x61, 0x00, 0x1a, 0x42, 0x12, 0xde, 0x6a, 0x74, + 0x6a, 0x72, 0x74, 0x25, 0x9a, 0x2d, 0x44, 0xb3, 0x0b, 0xd1, 0xec, 0x0d, 0x4a, 0x62, 0xf7, 0x91, + 0xe0, 0xfb, 0x7e, 0x62, 0x76, 0x87, 0x24, 0xdd, 0xcd, 0x06, 0x76, 0x48, 0x23, 0xa7, 0x50, 0x58, + 0x3d, 0xd6, 0x38, 0xda, 0x73, 0xd2, 0x3c, 0xc1, 0x5c, 0x36, 0x70, 0x4f, 0x31, 0xc3, 0x1d, 0x70, + 0x87, 0xe1, 0x83, 0x80, 0x21, 0x9f, 0xe1, 0x10, 0x93, 0x7d, 0xcc, 0xfc, 0x00, 0x21, 0x86, 0x39, + 0x6f, 0xcd, 0x48, 0x69, 0xad, 0xf3, 0xb1, 0x69, 0xa8, 0x29, 0xaf, 0x29, 0xb4, 0xbc, 0xdb, 0x0a, + 0xf1, 0x0a, 0xe0, 0x59, 0xb1, 0xff, 0xa5, 0x0a, 0x9a, 0x6f, 0x32, 0xcc, 0xf2, 0x0d, 0x1a, 0x23, + 0x22, 0x55, 0x7a, 0x0e, 0x96, 0x44, 0xae, 0xfc, 0x0f, 0x62, 0xdb, 0x17, 0xf3, 0x48, 0x53, 0x9b, + 0xbd, 0xfb, 0xf6, 0xe5, 0xdc, 0xd9, 0xc2, 0x76, 0xd9, 0xbc, 0x9d, 0x27, 0xd8, 0x5b, 0x1c, 0x4d, + 0x2f, 0xe1, 0x32, 0x68, 0x20, 0x1c, 0xd3, 0x48, 0xd9, 0xef, 0xa9, 0x85, 0xb0, 0xe0, 0xe6, 0x66, + 0x5f, 0x71, 0xe0, 0x3a, 0x5b, 0xdf, 0x81, 0xf9, 0x49, 0x74, 0x6f, 0xe0, 0xeb, 0xbd, 0x82, 0x55, + 0x57, 0xac, 0x93, 0x56, 0x65, 0xec, 0x05, 0x95, 0xf5, 0xb5, 0x0a, 0x16, 0xdf, 0xe6, 0x71, 0xba, + 0x8b, 0x53, 0x12, 0xca, 0x88, 0xaf, 0x02, 0x98, 0xc5, 0x08, 0xb3, 0x51, 0x4e, 0xe2, 0xa1, 0x2f, + 0x55, 0x22, 0xa8, 0x88, 0xbc, 0x7e, 0x81, 0x88, 0xda, 0x4d, 0x04, 0x4d, 0xb0, 0xc0, 0x45, 0xbb, + 0x3f, 0xad, 0x03, 0x90, 0x5b, 0xfd, 0x52, 0x8c, 0x49, 0x1e, 0x6b, 0xff, 0x28, 0x8f, 0xd3, 0xb7, + 0xa9, 0xfe, 0x3f, 0x6f, 0xd3, 0xc3, 0x97, 0x60, 0xf1, 0x52, 0x00, 0x60, 0x13, 0x00, 0x37, 0x2f, + 0xb9, 0xf5, 0x0a, 0x04, 0x60, 0xc6, 0xcd, 0xc5, 0x50, 0xba, 0x26, 0xde, 0x5f, 0x51, 0x51, 0xae, + 0x57, 0xe1, 0x02, 0x98, 0x75, 0xf3, 0x17, 0x8c, 0x66, 0x89, 0x5e, 0x6b, 0xd7, 0x3f, 0x7d, 0x33, + 0x2a, 0xee, 0xd6, 0xd1, 0xa9, 0xa1, 0x1d, 0x9f, 0x1a, 0xda, 0xaf, 0x53, 0x43, 0x3b, 0x3c, 0x33, + 0x2a, 0xc7, 0x67, 0x46, 0xe5, 0xe7, 0x99, 0x51, 0xd9, 0xe9, 0x4d, 0xdd, 0x96, 0x22, 0x7e, 0x6b, + 0xa3, 0x60, 0xc0, 0xcb, 0x85, 0xb3, 0xdf, 0x7b, 0xe2, 0x7c, 0x2c, 0x7f, 0x92, 0xf2, 0xf6, 0x0c, + 0x66, 0xe4, 0x97, 0x3e, 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0x95, 0xfd, 0x56, 0x5d, 0x43, 0x05, 0x00, 0x00, } diff --git a/x/lockup/types/msgs_test.go b/x/lockup/types/msgs_test.go index bc08a13f83c..27458233dca 100644 --- a/x/lockup/types/msgs_test.go +++ b/x/lockup/types/msgs_test.go @@ -9,12 +9,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/lockup/types" "github.com/cometbft/cometbft/crypto/ed25519" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" ) func TestMsgLockTokens(t *testing.T) { diff --git a/x/lockup/types/params.pb.go b/x/lockup/types/params.pb.go index 651804bcc7f..a1b2b7541e0 100644 --- a/x/lockup/types/params.pb.go +++ b/x/lockup/types/params.pb.go @@ -86,9 +86,9 @@ var fileDescriptor_4595e58f5e17053c = []byte{ 0x49, 0x47, 0x98, 0x59, 0x4e, 0x3e, 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, 0x94, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0xf5, 0x82, 0x6e, - 0x4e, 0x62, 0x52, 0x31, 0x8c, 0xa3, 0x5f, 0x66, 0x64, 0xa2, 0x5f, 0x01, 0xf3, 0x72, 0x49, 0x65, - 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x33, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, 0x08, - 0xfb, 0xed, 0x11, 0x01, 0x00, 0x00, + 0x4e, 0x62, 0x52, 0x31, 0x8c, 0xa3, 0x5f, 0x66, 0x64, 0xaa, 0x5f, 0x01, 0xf3, 0x72, 0x49, 0x65, + 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x33, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5f, 0x6d, + 0xde, 0x6c, 0x11, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/lockup/types/query.pb.go b/x/lockup/types/query.pb.go index f541034de71..e9d03ce0b3e 100644 --- a/x/lockup/types/query.pb.go +++ b/x/lockup/types/query.pb.go @@ -1914,112 +1914,113 @@ func init() { func init() { proto.RegisterFile("osmosis/lockup/query.proto", fileDescriptor_e906fda01cffd91a) } var fileDescriptor_e906fda01cffd91a = []byte{ - // 1679 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcf, 0x6f, 0x14, 0x55, - 0x1c, 0xef, 0x2b, 0xb4, 0xca, 0x17, 0x5b, 0xf0, 0x51, 0xb0, 0x9d, 0x96, 0xdd, 0xf2, 0x80, 0x52, - 0xb5, 0x9d, 0xa1, 0xa5, 0x29, 0x88, 0xfc, 0x5c, 0x4a, 0x4d, 0xb1, 0x22, 0x2c, 0xa8, 0xf1, 0x57, - 0x36, 0xb3, 0xbb, 0x8f, 0x65, 0xd2, 0xdd, 0x99, 0x65, 0x67, 0xb6, 0xb0, 0x12, 0x24, 0x82, 0x07, - 0x0f, 0x1e, 0x30, 0x5e, 0x8c, 0x07, 0xa3, 0xde, 0xd4, 0xc4, 0x78, 0xf1, 0x40, 0xbc, 0x2b, 0xf1, - 0x60, 0x48, 0xbc, 0x18, 0x0f, 0xc5, 0x50, 0xff, 0x02, 0x4e, 0x26, 0x5e, 0xcc, 0xbc, 0xf7, 0x66, - 0xbb, 0xf3, 0x73, 0x67, 0xbb, 0xd2, 0xf4, 0xd4, 0xce, 0x7c, 0x7f, 0x7d, 0x3e, 0xdf, 0xf7, 0xf3, - 0x33, 0x0b, 0x92, 0x61, 0x96, 0x0c, 0x53, 0x33, 0x95, 0xa2, 0x91, 0x5b, 0xa8, 0x96, 0x95, 0x2b, - 0x55, 0x5a, 0xa9, 0xc9, 0xe5, 0x8a, 0x61, 0x19, 0xb8, 0x57, 0xd8, 0x64, 0x6e, 0x93, 0xfa, 0x0a, - 0x46, 0xc1, 0x60, 0x26, 0xc5, 0xfe, 0x8f, 0x7b, 0x49, 0x89, 0x1c, 0x73, 0x53, 0xb2, 0xaa, 0x49, - 0x95, 0xc5, 0x89, 0x2c, 0xb5, 0xd4, 0x09, 0x25, 0x67, 0x68, 0xba, 0xb0, 0x0f, 0x15, 0x0c, 0xa3, - 0x50, 0xa4, 0x8a, 0x5a, 0xd6, 0x14, 0x55, 0xd7, 0x0d, 0x4b, 0xb5, 0x34, 0x43, 0x37, 0x85, 0x35, - 0x29, 0xac, 0xec, 0x29, 0x5b, 0xbd, 0xa4, 0x58, 0x5a, 0x89, 0x9a, 0x96, 0x5a, 0x2a, 0x3b, 0xe9, - 0xbd, 0x0e, 0xf9, 0x6a, 0x85, 0x65, 0x10, 0xf6, 0x01, 0x0f, 0x01, 0xfb, 0x8f, 0x30, 0x0d, 0x7a, - 0x4c, 0x65, 0xb5, 0xa2, 0x96, 0x44, 0x61, 0xb2, 0x03, 0xfa, 0x5e, 0x31, 0xf2, 0xd5, 0x22, 0x4d, - 0xa9, 0x45, 0x55, 0xcf, 0xd1, 0x34, 0xbd, 0x52, 0xa5, 0xa6, 0x45, 0xde, 0x83, 0xed, 0x9e, 0xf7, - 0x66, 0xd9, 0xd0, 0x4d, 0x8a, 0x55, 0xe8, 0xb2, 0x59, 0x99, 0xfd, 0x68, 0x78, 0xc3, 0xe8, 0xe6, - 0xc9, 0x01, 0x99, 0xf3, 0x96, 0x6d, 0xde, 0xb2, 0xe0, 0x2d, 0x9f, 0x32, 0x34, 0x3d, 0xb5, 0xff, - 0xde, 0x52, 0xb2, 0xe3, 0xdb, 0x07, 0xc9, 0xd1, 0x82, 0x66, 0x5d, 0xae, 0x66, 0xe5, 0x9c, 0x51, - 0x52, 0x44, 0x93, 0xf8, 0x9f, 0x71, 0x33, 0xbf, 0xa0, 0x58, 0xb5, 0x32, 0x35, 0x59, 0x80, 0x99, - 0xe6, 0x99, 0xc9, 0x20, 0x0c, 0xf0, 0xda, 0xf3, 0x46, 0x6e, 0x81, 0xe6, 0x4f, 0x96, 0x8c, 0xaa, - 0x6e, 0x39, 0xc0, 0x6e, 0x82, 0x14, 0x64, 0x5c, 0x3b, 0x74, 0x2f, 0xc1, 0xce, 0x93, 0xb9, 0x9c, - 0x5d, 0xf5, 0x35, 0xdd, 0xee, 0xa8, 0x9a, 0x2d, 0x52, 0xee, 0xc0, 0x11, 0xe2, 0x11, 0xe8, 0x32, - 0xae, 0xea, 0xb4, 0xd2, 0x8f, 0x86, 0xd1, 0xe8, 0xa6, 0xd4, 0xd6, 0x47, 0x4b, 0xc9, 0xa7, 0x6a, - 0x6a, 0xa9, 0x78, 0x98, 0xb0, 0xd7, 0x24, 0xcd, 0xcd, 0xe4, 0x36, 0x82, 0x44, 0x58, 0xa6, 0xb5, - 0xa3, 0x33, 0x0b, 0x43, 0x2e, 0x10, 0x9a, 0x5e, 0x58, 0x15, 0x9b, 0x5b, 0xc8, 0xd3, 0x97, 0x95, - 0x44, 0x6b, 0x47, 0xe6, 0x14, 0x0c, 0x08, 0x0c, 0x7c, 0x76, 0xac, 0x8a, 0xc9, 0x4d, 0x90, 0x82, - 0x92, 0xac, 0x1d, 0x8b, 0x2f, 0x50, 0x7d, 0x4c, 0x38, 0x82, 0x73, 0xaa, 0x69, 0x5d, 0xd4, 0x4a, - 0xb4, 0x45, 0x26, 0xf8, 0x75, 0xd8, 0x54, 0xdf, 0x47, 0xfa, 0x3b, 0x87, 0xd1, 0xe8, 0xe6, 0x49, - 0x49, 0xe6, 0x1b, 0x89, 0xec, 0x6c, 0x24, 0xf2, 0x45, 0xc7, 0x23, 0x35, 0x64, 0x03, 0x7e, 0xb4, - 0x94, 0xdc, 0xca, 0x73, 0xd5, 0x43, 0xc9, 0x9d, 0x07, 0x49, 0x94, 0x5e, 0x49, 0x45, 0xde, 0xa8, - 0x0f, 0xb5, 0x17, 0x9f, 0x68, 0xd2, 0x34, 0x74, 0xd9, 0x53, 0xc0, 0x69, 0x92, 0x24, 0xbb, 0xb7, - 0x50, 0xf9, 0x1c, 0xad, 0x68, 0x46, 0xde, 0x0e, 0x4e, 0x6d, 0xb4, 0x8b, 0xa6, 0xb9, 0x3b, 0xf9, - 0x1e, 0xc1, 0x58, 0x60, 0xe6, 0xb3, 0xc6, 0xca, 0xac, 0x7a, 0x55, 0x2f, 0xd6, 0xd6, 0x4b, 0x27, - 0x0a, 0x30, 0x1e, 0x13, 0x6f, 0x9b, 0x9d, 0xf9, 0x1a, 0xc1, 0xb0, 0x6b, 0x79, 0xd1, 0x7c, 0x8a, - 0x5e, 0x32, 0x2a, 0x74, 0x3d, 0xcd, 0x8b, 0xb7, 0x61, 0x57, 0x04, 0xc6, 0x36, 0x3b, 0x70, 0x17, - 0xd5, 0xb3, 0xbb, 0x7b, 0x3d, 0x43, 0x75, 0xa3, 0xb4, 0x4e, 0x5a, 0x80, 0xfb, 0xa0, 0x2b, 0x6f, - 0xe3, 0xe9, 0xdf, 0x60, 0xd7, 0x4f, 0xf3, 0x07, 0xf2, 0x0e, 0x90, 0x28, 0xe8, 0x6d, 0x76, 0xe6, - 0x7d, 0xc0, 0x3c, 0xad, 0xab, 0x13, 0x75, 0x24, 0xa8, 0x01, 0x09, 0x4e, 0xc3, 0x93, 0xce, 0xcd, - 0x41, 0xd0, 0x1e, 0xf0, 0xd1, 0x9e, 0x11, 0x0e, 0xa9, 0x41, 0xc1, 0x7a, 0x0b, 0x67, 0xed, 0x04, - 0x92, 0xcf, 0x6c, 0xd2, 0xf5, 0x3c, 0xe4, 0x5d, 0xd8, 0xe6, 0xaa, 0x2f, 0xe8, 0xcc, 0x42, 0xb7, - 0xca, 0x4e, 0x67, 0x31, 0x16, 0xb2, 0x9d, 0xed, 0xcf, 0xa5, 0xe4, 0x76, 0xbe, 0xfb, 0x99, 0xf9, - 0x05, 0x59, 0x33, 0x94, 0x92, 0x6a, 0x5d, 0x96, 0xe7, 0x74, 0xeb, 0xd1, 0x52, 0xb2, 0x87, 0x97, - 0xe1, 0x41, 0x24, 0x2d, 0xa2, 0xc9, 0x28, 0xf4, 0xf0, 0xf4, 0x0e, 0xb3, 0x67, 0xe0, 0x09, 0x9b, - 0x78, 0x46, 0xcb, 0xb3, 0xcc, 0x1b, 0xd3, 0xdd, 0xf6, 0xe3, 0x5c, 0x9e, 0x9c, 0x80, 0x5e, 0xc7, - 0x53, 0x60, 0x90, 0x61, 0xa3, 0x6d, 0x63, 0x7e, 0x91, 0x1d, 0x4d, 0x33, 0x3f, 0x32, 0x05, 0x03, - 0xec, 0x89, 0x5e, 0x55, 0x2b, 0xf9, 0x34, 0xcd, 0x51, 0x6d, 0x91, 0x56, 0x9a, 0xd6, 0x3d, 0x0d, - 0x52, 0x50, 0x94, 0xc0, 0xb0, 0x0f, 0xb6, 0x54, 0x98, 0x25, 0x53, 0x11, 0x26, 0x31, 0x24, 0xbd, - 0x15, 0x57, 0x00, 0xd9, 0x06, 0x4f, 0x9f, 0xa5, 0xd7, 0xd8, 0x14, 0x99, 0x9b, 0x71, 0xee, 0x3b, - 0xe3, 0x80, 0x1b, 0x5f, 0x8a, 0x9c, 0x11, 0x2d, 0xd8, 0x75, 0xa1, 0xa6, 0x5b, 0x97, 0xa9, 0xa5, - 0xe5, 0xe6, 0x19, 0x49, 0x33, 0x55, 0xe3, 0xff, 0xd4, 0x73, 0x86, 0x46, 0x1f, 0xee, 0xec, 0x47, - 0x64, 0x11, 0x48, 0x54, 0x06, 0x01, 0x60, 0x1e, 0xb6, 0x98, 0x8e, 0x57, 0xa6, 0x71, 0xd6, 0xee, - 0xf4, 0xf6, 0xd8, 0x95, 0x4c, 0x4c, 0xdc, 0x5e, 0xb3, 0xf1, 0xa5, 0xc9, 0xea, 0xbe, 0x08, 0xc3, - 0x9e, 0xba, 0xf1, 0x81, 0x13, 0xc3, 0x47, 0x3b, 0x00, 0xf3, 0x19, 0xe8, 0x75, 0x63, 0x16, 0xd3, - 0x22, 0x16, 0xe4, 0x1e, 0x17, 0x64, 0xf2, 0x25, 0xf2, 0x2c, 0xe9, 0x79, 0x43, 0x2f, 0xd0, 0x8a, - 0xb3, 0x74, 0x5a, 0xdd, 0x8e, 0x1e, 0xcf, 0xb2, 0xdc, 0x1d, 0x89, 0xb0, 0xcd, 0x5d, 0xe7, 0x73, - 0xef, 0x2d, 0x65, 0x3d, 0x71, 0xf7, 0xde, 0x50, 0xfe, 0x37, 0xd6, 0x3f, 0x20, 0x98, 0x8c, 0xe8, - 0x6a, 0xbb, 0xf7, 0x94, 0xc7, 0xd1, 0x8b, 0x12, 0x1c, 0x68, 0x09, 0x71, 0x9b, 0x1d, 0xfa, 0x09, - 0xc1, 0xbe, 0x88, 0x7a, 0xab, 0x3a, 0xad, 0x1f, 0x43, 0x5b, 0x42, 0x4e, 0xea, 0x2c, 0x8c, 0x36, - 0x07, 0xdf, 0x66, 0x87, 0xfa, 0x00, 0x9f, 0xaf, 0xd2, 0x4a, 0xed, 0x1c, 0x13, 0xe2, 0xce, 0x46, - 0xff, 0x32, 0x6c, 0x73, 0xbd, 0x15, 0x45, 0xa6, 0xa0, 0x9b, 0x0b, 0x76, 0xb1, 0x59, 0xed, 0xf0, - 0x55, 0x61, 0x56, 0x51, 0x41, 0xf8, 0x4e, 0xfe, 0x3b, 0x04, 0x5d, 0x2c, 0x1b, 0xfe, 0x18, 0x41, - 0x8f, 0x4b, 0xc9, 0xe3, 0x3d, 0xde, 0x0c, 0x41, 0x1f, 0x00, 0xa4, 0xbd, 0x4d, 0xbc, 0x38, 0x3c, - 0x22, 0xdf, 0xfa, 0xfd, 0xef, 0x4f, 0x3b, 0x47, 0xf1, 0x88, 0xe2, 0xf9, 0xca, 0xe0, 0x7c, 0x02, - 0x29, 0xb1, 0xb0, 0x4c, 0x56, 0x14, 0xff, 0x0a, 0x01, 0xf6, 0xeb, 0x77, 0xfc, 0x6c, 0x70, 0xb5, - 0x80, 0x0f, 0x00, 0xd2, 0x73, 0x71, 0x5c, 0x05, 0xba, 0x29, 0x86, 0x4e, 0xc6, 0x63, 0x4d, 0xd0, - 0xf1, 0xcb, 0x6a, 0x86, 0x5f, 0x38, 0xf0, 0x5d, 0x04, 0x3b, 0x82, 0x85, 0x39, 0x1e, 0xf7, 0x16, - 0x8f, 0xfc, 0x14, 0x20, 0xc9, 0x71, 0xdd, 0x05, 0xde, 0x13, 0x0c, 0xef, 0x61, 0x7c, 0x28, 0x0c, - 0xaf, 0xca, 0xe3, 0x33, 0xd5, 0x7a, 0x82, 0x0c, 0xd3, 0x8c, 0xca, 0x75, 0xb6, 0x50, 0x6e, 0xe0, - 0x1f, 0x11, 0x6c, 0x0f, 0x94, 0xe1, 0x78, 0x2c, 0x12, 0x8b, 0x47, 0xf6, 0x4b, 0xe3, 0x31, 0xbd, - 0x05, 0xf0, 0xe3, 0x0c, 0xf8, 0x0b, 0xf8, 0x60, 0x3c, 0xe0, 0x9a, 0x5e, 0xf0, 0xe0, 0xfe, 0x06, - 0x01, 0xf6, 0xab, 0x6e, 0xff, 0xbc, 0x08, 0x95, 0xf7, 0xfe, 0x79, 0x11, 0x2e, 0xe2, 0xc9, 0x11, - 0x06, 0x77, 0x1a, 0x4f, 0x35, 0x83, 0x2b, 0x26, 0x46, 0x68, 0x8f, 0xdd, 0xd7, 0xf9, 0xd0, 0x1e, - 0x07, 0xca, 0xf8, 0xd0, 0x1e, 0x07, 0x8b, 0xea, 0xf8, 0x3d, 0x16, 0xa0, 0xcb, 0xaa, 0x69, 0xd9, - 0xc2, 0xa4, 0x8e, 0xfb, 0x1f, 0x04, 0x7b, 0x63, 0xa9, 0x55, 0x7c, 0x24, 0x16, 0xb2, 0x90, 0xc3, - 0x4e, 0x3a, 0xba, 0xca, 0x68, 0xc1, 0x33, 0xcd, 0x78, 0xce, 0xe3, 0x33, 0x2d, 0xf2, 0xcc, 0xe8, - 0x46, 0xe3, 0xfc, 0x32, 0xf4, 0x62, 0xad, 0x4e, 0xfd, 0x67, 0x54, 0xff, 0x32, 0xe4, 0x97, 0xa6, - 0x78, 0x7f, 0xe4, 0x64, 0x0f, 0x50, 0xda, 0xd2, 0x44, 0x0b, 0x11, 0x82, 0xd6, 0x0c, 0xa3, 0x75, - 0x0c, 0x1f, 0x89, 0xb7, 0x44, 0x68, 0x3e, 0x93, 0x65, 0x49, 0x32, 0xae, 0x31, 0xfc, 0x15, 0x79, - 0xbe, 0x4e, 0xb9, 0xa4, 0x24, 0x9e, 0x88, 0xd5, 0xfa, 0xc6, 0x33, 0x58, 0x9a, 0x6c, 0x25, 0x44, - 0x70, 0x39, 0xcd, 0xb8, 0x1c, 0xc7, 0x47, 0x5b, 0x1d, 0x22, 0x76, 0xc8, 0xd6, 0xc9, 0x7c, 0x88, - 0x60, 0x73, 0x83, 0x72, 0xc4, 0xc4, 0x0b, 0xc5, 0x2f, 0x6b, 0xa5, 0xdd, 0x91, 0x3e, 0x02, 0xdf, - 0x18, 0xc3, 0x37, 0x82, 0xf7, 0x84, 0xe1, 0x13, 0xb8, 0xb8, 0x26, 0xbe, 0x8d, 0x00, 0x78, 0x96, - 0x54, 0x6d, 0x6e, 0x06, 0xef, 0x0c, 0xae, 0xe0, 0x00, 0x48, 0x84, 0x99, 0x45, 0xed, 0x69, 0x56, - 0x7b, 0x3f, 0x96, 0x9b, 0xd4, 0xce, 0xd6, 0x32, 0x5a, 0x5e, 0xb9, 0x2e, 0xf4, 0xcc, 0x0d, 0xfc, - 0x1d, 0xe2, 0x32, 0xde, 0xad, 0x22, 0xfd, 0x3b, 0x60, 0xa8, 0x3e, 0xf5, 0xef, 0x80, 0xe1, 0xa2, - 0x94, 0x1c, 0x63, 0x28, 0x0f, 0xe1, 0xe9, 0x28, 0x94, 0x19, 0x8f, 0x6e, 0x6d, 0x40, 0xfb, 0x01, - 0x02, 0x58, 0xd1, 0xa5, 0x78, 0x97, 0xb7, 0xb4, 0x4f, 0xc8, 0x4a, 0x24, 0xca, 0x25, 0xee, 0xb8, - 0xe9, 0xf4, 0x1a, 0x9f, 0x54, 0x19, 0x2d, 0x8f, 0x7f, 0x43, 0x20, 0x85, 0x4b, 0x55, 0xff, 0x5a, - 0x68, 0x2a, 0x8c, 0xfd, 0x6b, 0xa1, 0xb9, 0x12, 0x26, 0x73, 0x0c, 0xf3, 0x09, 0x7c, 0x2c, 0x0c, - 0xb3, 0x5b, 0x73, 0x56, 0xcb, 0xa6, 0x3d, 0xf4, 0x82, 0xc3, 0x4a, 0x47, 0x3f, 0xea, 0x44, 0xf8, - 0x17, 0x04, 0x03, 0xa1, 0x32, 0xd6, 0xbf, 0x4b, 0x35, 0x93, 0xcb, 0xd2, 0x44, 0x0b, 0x11, 0x71, - 0x57, 0xb6, 0x97, 0x4d, 0x20, 0x19, 0x7b, 0x68, 0x06, 0x23, 0xee, 0xd1, 0x38, 0x7a, 0xd3, 0x09, - 0xd4, 0xd2, 0xd2, 0x81, 0x96, 0x62, 0x04, 0x9f, 0xd9, 0x66, 0xa3, 0xe3, 0xd9, 0xa9, 0x8a, 0x2c, - 0x4d, 0xc6, 0x51, 0x09, 0xe1, 0x67, 0x7e, 0x9d, 0x4a, 0xf4, 0x99, 0xef, 0x25, 0x31, 0x1e, 0xd3, - 0x7b, 0x95, 0x67, 0xbe, 0x0f, 0xf7, 0x27, 0x9d, 0xf0, 0x7c, 0x0b, 0xea, 0x0f, 0xa7, 0x5a, 0x68, - 0x72, 0xd8, 0xf9, 0x7f, 0xaa, 0xad, 0x1c, 0x82, 0xf9, 0x9b, 0x8c, 0xf9, 0x05, 0x7c, 0x7e, 0x75, - 0x03, 0x17, 0x75, 0x19, 0x58, 0x5e, 0xf9, 0x96, 0x1e, 0x2a, 0xf2, 0xf0, 0xc1, 0x16, 0x48, 0xb8, - 0x0e, 0xa8, 0x43, 0xad, 0x07, 0x0a, 0xca, 0xf3, 0x8c, 0xf2, 0x2c, 0x9e, 0x59, 0x25, 0x65, 0xf7, - 0xe1, 0x5a, 0x83, 0x6e, 0x2e, 0x0d, 0xfd, 0xc7, 0xaa, 0x5f, 0x7d, 0xfa, 0x8f, 0xd5, 0x00, 0x2d, - 0x4a, 0x46, 0x18, 0xc0, 0x61, 0x9c, 0x08, 0x03, 0xc8, 0xd5, 0x67, 0x6a, 0xfe, 0xde, 0xc3, 0x04, - 0xba, 0xff, 0x30, 0x81, 0xfe, 0x7a, 0x98, 0x40, 0x77, 0x96, 0x13, 0x1d, 0xf7, 0x97, 0x13, 0x1d, - 0x7f, 0x2c, 0x27, 0x3a, 0xde, 0x9a, 0x6c, 0xf8, 0x2d, 0x4c, 0xe4, 0x18, 0x2f, 0xaa, 0x59, 0xb3, - 0x9e, 0x70, 0x71, 0x72, 0x4a, 0xb9, 0xe6, 0xa4, 0x65, 0xbf, 0x8d, 0x65, 0xbb, 0x99, 0xc4, 0x3f, - 0xf0, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdd, 0x5f, 0x39, 0x93, 0xa4, 0x1f, 0x00, 0x00, + // 1681 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcd, 0x6f, 0x14, 0xe5, + 0x1f, 0xef, 0x53, 0x68, 0x7f, 0x3f, 0xbe, 0xd8, 0x82, 0x0f, 0x05, 0xdb, 0x69, 0xd9, 0x2d, 0x0f, + 0x50, 0xaa, 0xb6, 0x33, 0xb4, 0xd4, 0x82, 0xc8, 0xeb, 0x52, 0x6a, 0x8a, 0x15, 0x61, 0x41, 0x8d, + 0x6f, 0xd9, 0xcc, 0xee, 0x3e, 0x2c, 0x93, 0xee, 0xce, 0x2c, 0x3b, 0xb3, 0x85, 0x95, 0x20, 0x11, + 0x3c, 0x78, 0xf0, 0x80, 0xf1, 0x62, 0x3c, 0x18, 0xf5, 0xa6, 0x26, 0xc6, 0x8b, 0x07, 0xe2, 0x5d, + 0x89, 0x07, 0x43, 0xe2, 0xc5, 0x78, 0x28, 0x86, 0xfa, 0x17, 0x70, 0x32, 0xf1, 0x62, 0xe6, 0x79, + 0x9e, 0xd9, 0xee, 0xbc, 0xee, 0x6c, 0x57, 0x9a, 0x9e, 0xda, 0x99, 0xef, 0xdb, 0xe7, 0xf3, 0x7d, + 0x5e, 0x3f, 0xb3, 0x20, 0x19, 0x66, 0xc9, 0x30, 0x35, 0x53, 0x29, 0x1a, 0xb9, 0x85, 0x6a, 0x59, + 0xb9, 0x52, 0xa5, 0x95, 0x9a, 0x5c, 0xae, 0x18, 0x96, 0x81, 0x7b, 0x85, 0x4d, 0xe6, 0x36, 0xa9, + 0xaf, 0x60, 0x14, 0x0c, 0x66, 0x52, 0xec, 0xff, 0xb8, 0x97, 0x94, 0xc8, 0x31, 0x37, 0x25, 0xab, + 0x9a, 0x54, 0x59, 0x9c, 0xc8, 0x52, 0x4b, 0x9d, 0x50, 0x72, 0x86, 0xa6, 0x0b, 0xfb, 0x50, 0xc1, + 0x30, 0x0a, 0x45, 0xaa, 0xa8, 0x65, 0x4d, 0x51, 0x75, 0xdd, 0xb0, 0x54, 0x4b, 0x33, 0x74, 0x53, + 0x58, 0x93, 0xc2, 0xca, 0x9e, 0xb2, 0xd5, 0x4b, 0x8a, 0xa5, 0x95, 0xa8, 0x69, 0xa9, 0xa5, 0xb2, + 0x93, 0xde, 0xeb, 0x90, 0xaf, 0x56, 0x58, 0x06, 0x61, 0x1f, 0xf0, 0x10, 0xb0, 0xff, 0x08, 0xd3, + 0xa0, 0xc7, 0x54, 0x56, 0x2b, 0x6a, 0x49, 0x14, 0x26, 0x3b, 0xa0, 0xef, 0x65, 0x23, 0x5f, 0x2d, + 0xd2, 0x94, 0x5a, 0x54, 0xf5, 0x1c, 0x4d, 0xd3, 0x2b, 0x55, 0x6a, 0x5a, 0xe4, 0x5d, 0xd8, 0xee, + 0x79, 0x6f, 0x96, 0x0d, 0xdd, 0xa4, 0x58, 0x85, 0x2e, 0x9b, 0x95, 0xd9, 0x8f, 0x86, 0x37, 0x8c, + 0x6e, 0x9e, 0x1c, 0x90, 0x39, 0x6f, 0xd9, 0xe6, 0x2d, 0x0b, 0xde, 0xf2, 0x29, 0x43, 0xd3, 0x53, + 0xfb, 0xef, 0x2d, 0x25, 0x3b, 0xbe, 0x79, 0x90, 0x1c, 0x2d, 0x68, 0xd6, 0xe5, 0x6a, 0x56, 0xce, + 0x19, 0x25, 0x45, 0x34, 0x89, 0xff, 0x19, 0x37, 0xf3, 0x0b, 0x8a, 0x55, 0x2b, 0x53, 0x93, 0x05, + 0x98, 0x69, 0x9e, 0x99, 0x0c, 0xc2, 0x00, 0xaf, 0x3d, 0x6f, 0xe4, 0x16, 0x68, 0xfe, 0x64, 0xc9, + 0xa8, 0xea, 0x96, 0x03, 0xec, 0x26, 0x48, 0x41, 0xc6, 0xb5, 0x43, 0xf7, 0x22, 0xec, 0x3c, 0x99, + 0xcb, 0xd9, 0x55, 0x5f, 0xd5, 0xed, 0x8e, 0xaa, 0xd9, 0x22, 0xe5, 0x0e, 0x1c, 0x21, 0x1e, 0x81, + 0x2e, 0xe3, 0xaa, 0x4e, 0x2b, 0xfd, 0x68, 0x18, 0x8d, 0x6e, 0x4a, 0x6d, 0x7d, 0xb4, 0x94, 0x7c, + 0xa2, 0xa6, 0x96, 0x8a, 0x87, 0x09, 0x7b, 0x4d, 0xd2, 0xdc, 0x4c, 0x6e, 0x23, 0x48, 0x84, 0x65, + 0x5a, 0x3b, 0x3a, 0xb3, 0x30, 0xe4, 0x02, 0xa1, 0xe9, 0x85, 0x55, 0xb1, 0xb9, 0x85, 0x3c, 0x7d, + 0x59, 0x49, 0xb4, 0x76, 0x64, 0x4e, 0xc1, 0x80, 0xc0, 0xc0, 0x67, 0xc7, 0xaa, 0x98, 0xdc, 0x04, + 0x29, 0x28, 0xc9, 0xda, 0xb1, 0xf8, 0x1c, 0xd5, 0xc7, 0x84, 0x23, 0x38, 0xa7, 0x9a, 0xd6, 0x45, + 0xad, 0x44, 0x5b, 0x64, 0x82, 0x5f, 0x83, 0x4d, 0xf5, 0x7d, 0xa4, 0xbf, 0x73, 0x18, 0x8d, 0x6e, + 0x9e, 0x94, 0x64, 0xbe, 0x91, 0xc8, 0xce, 0x46, 0x22, 0x5f, 0x74, 0x3c, 0x52, 0x43, 0x36, 0xe0, + 0x47, 0x4b, 0xc9, 0xad, 0x3c, 0x57, 0x3d, 0x94, 0xdc, 0x79, 0x90, 0x44, 0xe9, 0x95, 0x54, 0xe4, + 0xf5, 0xfa, 0x50, 0x7b, 0xf1, 0x89, 0x26, 0x4d, 0x43, 0x97, 0x3d, 0x05, 0x9c, 0x26, 0x49, 0xb2, + 0x7b, 0x0b, 0x95, 0xcf, 0xd1, 0x8a, 0x66, 0xe4, 0xed, 0xe0, 0xd4, 0x46, 0xbb, 0x68, 0x9a, 0xbb, + 0x93, 0xef, 0x10, 0x8c, 0x05, 0x66, 0x3e, 0x6b, 0xac, 0xcc, 0xaa, 0x57, 0xf4, 0x62, 0x6d, 0xbd, + 0x74, 0xa2, 0x00, 0xe3, 0x31, 0xf1, 0xb6, 0xd9, 0x99, 0xaf, 0x10, 0x0c, 0xbb, 0x96, 0x17, 0xcd, + 0xa7, 0xe8, 0x25, 0xa3, 0x42, 0xd7, 0xd3, 0xbc, 0x78, 0x0b, 0x76, 0x45, 0x60, 0x6c, 0xb3, 0x03, + 0x77, 0x51, 0x3d, 0xbb, 0xbb, 0xd7, 0x33, 0x54, 0x37, 0x4a, 0xeb, 0xa4, 0x05, 0xb8, 0x0f, 0xba, + 0xf2, 0x36, 0x9e, 0xfe, 0x0d, 0x76, 0xfd, 0x34, 0x7f, 0x20, 0x6f, 0x03, 0x89, 0x82, 0xde, 0x66, + 0x67, 0xde, 0x03, 0xcc, 0xd3, 0xba, 0x3a, 0x51, 0x47, 0x82, 0x1a, 0x90, 0xe0, 0x34, 0xfc, 0xdf, + 0xb9, 0x39, 0x08, 0xda, 0x03, 0x3e, 0xda, 0x33, 0xc2, 0x21, 0x35, 0x28, 0x58, 0x6f, 0xe1, 0xac, + 0x9d, 0x40, 0xf2, 0xa9, 0x4d, 0xba, 0x9e, 0x87, 0xbc, 0x03, 0xdb, 0x5c, 0xf5, 0x05, 0x9d, 0x59, + 0xe8, 0x56, 0xd9, 0xe9, 0x2c, 0xc6, 0x42, 0xb6, 0xb3, 0xfd, 0xb1, 0x94, 0xdc, 0xce, 0x77, 0x3f, + 0x33, 0xbf, 0x20, 0x6b, 0x86, 0x52, 0x52, 0xad, 0xcb, 0xf2, 0x9c, 0x6e, 0x3d, 0x5a, 0x4a, 0xf6, + 0xf0, 0x32, 0x3c, 0x88, 0xa4, 0x45, 0x34, 0x19, 0x85, 0x1e, 0x9e, 0xde, 0x61, 0xf6, 0x14, 0xfc, + 0xcf, 0x26, 0x9e, 0xd1, 0xf2, 0x2c, 0xf3, 0xc6, 0x74, 0xb7, 0xfd, 0x38, 0x97, 0x27, 0x27, 0xa0, + 0xd7, 0xf1, 0x14, 0x18, 0x64, 0xd8, 0x68, 0xdb, 0x98, 0x5f, 0x64, 0x47, 0xd3, 0xcc, 0x8f, 0x4c, + 0xc1, 0x00, 0x7b, 0xa2, 0x57, 0xd5, 0x4a, 0x3e, 0x4d, 0x73, 0x54, 0x5b, 0xa4, 0x95, 0xa6, 0x75, + 0x4f, 0x83, 0x14, 0x14, 0x25, 0x30, 0xec, 0x83, 0x2d, 0x15, 0x66, 0xc9, 0x54, 0x84, 0x49, 0x0c, + 0x49, 0x6f, 0xc5, 0x15, 0x40, 0xb6, 0xc1, 0x93, 0x67, 0xe9, 0x35, 0x36, 0x45, 0xe6, 0x66, 0x9c, + 0xfb, 0xce, 0x38, 0xe0, 0xc6, 0x97, 0x22, 0x67, 0x44, 0x0b, 0x76, 0x5d, 0xa8, 0xe9, 0xd6, 0x65, + 0x6a, 0x69, 0xb9, 0x79, 0x46, 0xd2, 0x4c, 0xd5, 0xf8, 0x3f, 0xf5, 0x9c, 0xa1, 0xd1, 0x87, 0x3b, + 0xfb, 0x11, 0x59, 0x04, 0x12, 0x95, 0x41, 0x00, 0x98, 0x87, 0x2d, 0xa6, 0xe3, 0x95, 0x69, 0x9c, + 0xb5, 0x3b, 0xbd, 0x3d, 0x76, 0x25, 0x13, 0x13, 0xb7, 0xd7, 0x6c, 0x7c, 0x69, 0xb2, 0xba, 0x2f, + 0xc0, 0xb0, 0xa7, 0x6e, 0x7c, 0xe0, 0xc4, 0xf0, 0xd1, 0x0e, 0xc0, 0x7c, 0x06, 0x7a, 0xdd, 0x98, + 0xc5, 0xb4, 0x88, 0x05, 0xb9, 0xc7, 0x05, 0x99, 0x7c, 0x81, 0x3c, 0x4b, 0x7a, 0xde, 0xd0, 0x0b, + 0xb4, 0xe2, 0x2c, 0x9d, 0x56, 0xb7, 0xa3, 0xc7, 0xb3, 0x2c, 0x77, 0x47, 0x22, 0x6c, 0x73, 0xd7, + 0xf9, 0xcc, 0x7b, 0x4b, 0x59, 0x4f, 0xdc, 0xbd, 0x37, 0x94, 0xff, 0x8c, 0xf5, 0xf7, 0x08, 0x26, + 0x23, 0xba, 0xda, 0xee, 0x3d, 0xe5, 0x71, 0xf4, 0xa2, 0x04, 0x07, 0x5a, 0x42, 0xdc, 0x66, 0x87, + 0x7e, 0x44, 0xb0, 0x2f, 0xa2, 0xde, 0xaa, 0x4e, 0xeb, 0xc7, 0xd0, 0x96, 0x90, 0x93, 0x3a, 0x0b, + 0xa3, 0xcd, 0xc1, 0xb7, 0xd9, 0xa1, 0x3e, 0xc0, 0xe7, 0xab, 0xb4, 0x52, 0x3b, 0xc7, 0x84, 0xb8, + 0xb3, 0xd1, 0xbf, 0x04, 0xdb, 0x5c, 0x6f, 0x45, 0x91, 0x29, 0xe8, 0xe6, 0x82, 0x5d, 0x6c, 0x56, + 0x3b, 0x7c, 0x55, 0x98, 0x55, 0x54, 0x10, 0xbe, 0x93, 0xff, 0x0c, 0x41, 0x17, 0xcb, 0x86, 0x3f, + 0x42, 0xd0, 0xe3, 0x52, 0xf2, 0x78, 0x8f, 0x37, 0x43, 0xd0, 0x07, 0x00, 0x69, 0x6f, 0x13, 0x2f, + 0x0e, 0x8f, 0xc8, 0xb7, 0x7e, 0xfb, 0xeb, 0x93, 0xce, 0x51, 0x3c, 0xa2, 0x78, 0xbe, 0x32, 0x38, + 0x9f, 0x40, 0x4a, 0x2c, 0x2c, 0x93, 0x15, 0xc5, 0xbf, 0x44, 0x80, 0xfd, 0xfa, 0x1d, 0x3f, 0x1d, + 0x5c, 0x2d, 0xe0, 0x03, 0x80, 0xf4, 0x4c, 0x1c, 0x57, 0x81, 0x6e, 0x8a, 0xa1, 0x93, 0xf1, 0x58, + 0x13, 0x74, 0xfc, 0xb2, 0x9a, 0xe1, 0x17, 0x0e, 0x7c, 0x17, 0xc1, 0x8e, 0x60, 0x61, 0x8e, 0xc7, + 0xbd, 0xc5, 0x23, 0x3f, 0x05, 0x48, 0x72, 0x5c, 0x77, 0x81, 0xf7, 0x04, 0xc3, 0x7b, 0x18, 0x1f, + 0x0a, 0xc3, 0xab, 0xf2, 0xf8, 0x4c, 0xb5, 0x9e, 0x20, 0xc3, 0x34, 0xa3, 0x72, 0x9d, 0x2d, 0x94, + 0x1b, 0xf8, 0x07, 0x04, 0xdb, 0x03, 0x65, 0x38, 0x1e, 0x8b, 0xc4, 0xe2, 0x91, 0xfd, 0xd2, 0x78, + 0x4c, 0x6f, 0x01, 0xfc, 0x38, 0x03, 0xfe, 0x3c, 0x3e, 0x18, 0x0f, 0xb8, 0xa6, 0x17, 0x3c, 0xb8, + 0xbf, 0x46, 0x80, 0xfd, 0xaa, 0xdb, 0x3f, 0x2f, 0x42, 0xe5, 0xbd, 0x7f, 0x5e, 0x84, 0x8b, 0x78, + 0x72, 0x84, 0xc1, 0x9d, 0xc6, 0x53, 0xcd, 0xe0, 0x8a, 0x89, 0x11, 0xda, 0x63, 0xf7, 0x75, 0x3e, + 0xb4, 0xc7, 0x81, 0x32, 0x3e, 0xb4, 0xc7, 0xc1, 0xa2, 0x3a, 0x7e, 0x8f, 0x05, 0xe8, 0xb2, 0x6a, + 0x5a, 0xb6, 0x30, 0xa9, 0xe3, 0xfe, 0x1b, 0xc1, 0xde, 0x58, 0x6a, 0x15, 0x1f, 0x89, 0x85, 0x2c, + 0xe4, 0xb0, 0x93, 0x8e, 0xae, 0x32, 0x5a, 0xf0, 0x4c, 0x33, 0x9e, 0xf3, 0xf8, 0x4c, 0x8b, 0x3c, + 0x33, 0xba, 0xd1, 0x38, 0xbf, 0x0c, 0xbd, 0x58, 0xab, 0x53, 0xff, 0x09, 0xd5, 0xbf, 0x0c, 0xf9, + 0xa5, 0x29, 0xde, 0x1f, 0x39, 0xd9, 0x03, 0x94, 0xb6, 0x34, 0xd1, 0x42, 0x84, 0xa0, 0x35, 0xc3, + 0x68, 0x1d, 0xc3, 0x47, 0xe2, 0x2d, 0x11, 0x9a, 0xcf, 0x64, 0x59, 0x92, 0x8c, 0x6b, 0x0c, 0x7f, + 0x41, 0x9e, 0xaf, 0x53, 0x2e, 0x29, 0x89, 0x27, 0x62, 0xb5, 0xbe, 0xf1, 0x0c, 0x96, 0x26, 0x5b, + 0x09, 0x11, 0x5c, 0x4e, 0x33, 0x2e, 0xc7, 0xf1, 0xd1, 0x56, 0x87, 0x88, 0x1d, 0xb2, 0x75, 0x32, + 0x1f, 0x20, 0xd8, 0xdc, 0xa0, 0x1c, 0x31, 0xf1, 0x42, 0xf1, 0xcb, 0x5a, 0x69, 0x77, 0xa4, 0x8f, + 0xc0, 0x37, 0xc6, 0xf0, 0x8d, 0xe0, 0x3d, 0x61, 0xf8, 0x04, 0x2e, 0xae, 0x89, 0x6f, 0x23, 0x00, + 0x9e, 0x25, 0x55, 0x9b, 0x9b, 0xc1, 0x3b, 0x83, 0x2b, 0x38, 0x00, 0x12, 0x61, 0x66, 0x51, 0x7b, + 0x9a, 0xd5, 0xde, 0x8f, 0xe5, 0x26, 0xb5, 0xb3, 0xb5, 0x8c, 0x96, 0x57, 0xae, 0x0b, 0x3d, 0x73, + 0x03, 0x7f, 0x8b, 0xb8, 0x8c, 0x77, 0xab, 0x48, 0xff, 0x0e, 0x18, 0xaa, 0x4f, 0xfd, 0x3b, 0x60, + 0xb8, 0x28, 0x25, 0xc7, 0x18, 0xca, 0x43, 0x78, 0x3a, 0x0a, 0x65, 0xc6, 0xa3, 0x5b, 0x1b, 0xd0, + 0xbe, 0x8f, 0x00, 0x56, 0x74, 0x29, 0xde, 0xe5, 0x2d, 0xed, 0x13, 0xb2, 0x12, 0x89, 0x72, 0x89, + 0x3b, 0x6e, 0x3a, 0xbd, 0xc6, 0x27, 0x55, 0x46, 0xcb, 0xe3, 0x5f, 0x11, 0x48, 0xe1, 0x52, 0xd5, + 0xbf, 0x16, 0x9a, 0x0a, 0x63, 0xff, 0x5a, 0x68, 0xae, 0x84, 0xc9, 0x1c, 0xc3, 0x7c, 0x02, 0x1f, + 0x0b, 0xc3, 0xec, 0xd6, 0x9c, 0xd5, 0xb2, 0x69, 0x0f, 0xbd, 0xe0, 0xb0, 0xd2, 0xd1, 0x0f, 0x3b, + 0x11, 0xfe, 0x19, 0xc1, 0x40, 0xa8, 0x8c, 0xf5, 0xef, 0x52, 0xcd, 0xe4, 0xb2, 0x34, 0xd1, 0x42, + 0x44, 0xdc, 0x95, 0xed, 0x65, 0x13, 0x48, 0xc6, 0x1e, 0x9a, 0xc1, 0x88, 0x7b, 0x34, 0x8e, 0xde, + 0x74, 0x02, 0xb5, 0xb4, 0x74, 0xa0, 0xa5, 0x18, 0xc1, 0x67, 0xb6, 0xd9, 0xe8, 0x78, 0x76, 0xaa, + 0x22, 0x4b, 0x93, 0x71, 0x54, 0x42, 0xf8, 0x99, 0x5f, 0xa7, 0x12, 0x7d, 0xe6, 0x7b, 0x49, 0x8c, + 0xc7, 0xf4, 0x5e, 0xe5, 0x99, 0xef, 0xc3, 0xfd, 0x71, 0x27, 0x3c, 0xdb, 0x82, 0xfa, 0xc3, 0xa9, + 0x16, 0x9a, 0x1c, 0x76, 0xfe, 0x9f, 0x6a, 0x2b, 0x87, 0x60, 0xfe, 0x06, 0x63, 0x7e, 0x01, 0x9f, + 0x5f, 0xdd, 0xc0, 0x45, 0x5d, 0x06, 0x96, 0x57, 0xbe, 0xa5, 0x87, 0x8a, 0x3c, 0x7c, 0xb0, 0x05, + 0x12, 0xae, 0x03, 0xea, 0x50, 0xeb, 0x81, 0x82, 0xf2, 0x3c, 0xa3, 0x3c, 0x8b, 0x67, 0x56, 0x49, + 0xd9, 0x7d, 0xb8, 0xd6, 0xa0, 0x9b, 0x4b, 0x43, 0xff, 0xb1, 0xea, 0x57, 0x9f, 0xfe, 0x63, 0x35, + 0x40, 0x8b, 0x92, 0x11, 0x06, 0x70, 0x18, 0x27, 0xc2, 0x00, 0x72, 0xf5, 0x99, 0x9a, 0xbf, 0xf7, + 0x30, 0x81, 0xee, 0x3f, 0x4c, 0xa0, 0x3f, 0x1f, 0x26, 0xd0, 0x9d, 0xe5, 0x44, 0xc7, 0xfd, 0xe5, + 0x44, 0xc7, 0xef, 0xcb, 0x89, 0x8e, 0x37, 0x27, 0x1b, 0x7e, 0x0b, 0x13, 0x39, 0xc6, 0x8b, 0x6a, + 0xd6, 0xac, 0x27, 0x5c, 0x9c, 0x7c, 0x4e, 0xb9, 0xe6, 0xa4, 0x65, 0xbf, 0x8d, 0x65, 0xbb, 0x99, + 0xc4, 0x3f, 0xf0, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfa, 0x3a, 0x1c, 0x12, 0xa4, 0x1f, 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 9b0acdd5033..88d122a7551 100644 --- a/x/lockup/types/tx.pb.go +++ b/x/lockup/types/tx.pb.go @@ -677,59 +677,59 @@ func init() { func init() { proto.RegisterFile("osmosis/lockup/tx.proto", fileDescriptor_bcdad5af0d24735f) } var fileDescriptor_bcdad5af0d24735f = []byte{ - // 827 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4d, 0x4f, 0xe3, 0x46, - 0x18, 0x8e, 0x13, 0x3e, 0x07, 0x9a, 0x14, 0x8b, 0x42, 0x70, 0xa9, 0x0d, 0x6e, 0x4b, 0x52, 0x8a, - 0xed, 0x12, 0x38, 0xe5, 0x52, 0x11, 0x68, 0x25, 0x24, 0x22, 0x55, 0x2e, 0x48, 0x55, 0x0f, 0x45, - 0x8e, 0x33, 0x18, 0x2b, 0x89, 0x27, 0xf2, 0xd8, 0x7c, 0x48, 0xfd, 0x05, 0x3d, 0xf5, 0xb8, 0x7f, - 0x60, 0x2f, 0x7b, 0xda, 0x9f, 0xc1, 0x91, 0xd5, 0xae, 0x56, 0x7b, 0x58, 0x85, 0x15, 0x1c, 0x56, - 0xda, 0x23, 0xbf, 0x60, 0x35, 0x33, 0xb6, 0xe5, 0x38, 0x21, 0xc9, 0xae, 0xb4, 0xab, 0xbd, 0xc4, - 0x9e, 0x79, 0x9f, 0xf7, 0x99, 0xf7, 0x79, 0xf2, 0xce, 0x9b, 0x80, 0x45, 0x84, 0x5b, 0x08, 0xdb, - 0x58, 0x6b, 0x22, 0xb3, 0xe1, 0xb7, 0x35, 0xef, 0x42, 0x6d, 0xbb, 0xc8, 0x43, 0x7c, 0x36, 0x08, - 0xa8, 0x2c, 0x20, 0xcc, 0x5b, 0xc8, 0x42, 0x34, 0xa4, 0x91, 0x37, 0x86, 0x12, 0xe6, 0x8c, 0x96, - 0xed, 0x20, 0x8d, 0x7e, 0x06, 0x5b, 0xa2, 0x85, 0x90, 0xd5, 0x84, 0x1a, 0x5d, 0xd5, 0xfc, 0x13, - 0xad, 0xee, 0xbb, 0x86, 0x67, 0x23, 0x27, 0x8c, 0x9b, 0x94, 0x59, 0xab, 0x19, 0x18, 0x6a, 0x67, - 0x9b, 0x35, 0xe8, 0x19, 0x9b, 0x9a, 0x89, 0xec, 0x30, 0xbe, 0x94, 0xa8, 0x88, 0x3c, 0x58, 0x48, - 0x7e, 0x9c, 0x06, 0x5f, 0x55, 0xb1, 0x75, 0x80, 0xcc, 0xc6, 0x21, 0x6a, 0x40, 0x07, 0xf3, 0x6b, - 0x60, 0x1c, 0x9d, 0x3b, 0xd0, 0xcd, 0x73, 0x2b, 0x5c, 0x71, 0xba, 0xf2, 0xf5, 0x7d, 0x47, 0x9a, - 0xbd, 0x34, 0x5a, 0xcd, 0xb2, 0x4c, 0xb7, 0x65, 0x9d, 0x85, 0xf9, 0x53, 0x30, 0x15, 0x96, 0x91, - 0x4f, 0xaf, 0x70, 0xc5, 0x99, 0xd2, 0x92, 0xca, 0xea, 0x54, 0xc3, 0x3a, 0xd5, 0xbd, 0x00, 0x50, - 0xd9, 0xbc, 0xea, 0x48, 0xa9, 0x77, 0x1d, 0x89, 0x0f, 0x53, 0x36, 0x50, 0xcb, 0xf6, 0x60, 0xab, - 0xed, 0x5d, 0xde, 0x77, 0xa4, 0x1c, 0xe3, 0x0f, 0x63, 0xf2, 0xa3, 0x1b, 0x89, 0xd3, 0x23, 0x76, - 0xde, 0x00, 0xe3, 0x44, 0x0c, 0xce, 0x67, 0x56, 0x32, 0xf4, 0x18, 0x26, 0x57, 0x25, 0x72, 0xd5, - 0x40, 0xae, 0xba, 0x8b, 0x6c, 0xa7, 0xf2, 0x0b, 0x39, 0xe6, 0xc9, 0x8d, 0x54, 0xb4, 0x6c, 0xef, - 0xd4, 0xaf, 0xa9, 0x26, 0x6a, 0x69, 0x81, 0x37, 0xec, 0xa1, 0xe0, 0x7a, 0x43, 0xf3, 0x2e, 0xdb, - 0x10, 0xd3, 0x04, 0xac, 0x33, 0xe6, 0xb2, 0xf4, 0xdf, 0xdb, 0xa7, 0xeb, 0x42, 0x1f, 0x9b, 0x14, - 0x8f, 0xba, 0x22, 0x17, 0xc0, 0x37, 0x5d, 0x36, 0xe9, 0x10, 0xb7, 0x91, 0x83, 0x21, 0x9f, 0x05, - 0xe9, 0xfd, 0x3d, 0xea, 0xd5, 0x98, 0x9e, 0xde, 0xdf, 0x93, 0x2d, 0x30, 0x5f, 0xc5, 0x56, 0x05, - 0x5a, 0xb6, 0x73, 0xe4, 0x10, 0x06, 0xdb, 0xb1, 0x76, 0x9a, 0xcd, 0x51, 0x6d, 0x2d, 0x17, 0x48, - 0x25, 0x72, 0xa2, 0x92, 0x1a, 0xa1, 0x53, 0x7c, 0x27, 0x5e, 0xd1, 0x21, 0x58, 0xee, 0x77, 0x50, - 0x54, 0xd8, 0x36, 0x98, 0x64, 0x09, 0x38, 0xcf, 0x51, 0xdf, 0x04, 0xb5, 0xbb, 0xff, 0xd4, 0x3f, - 0xa0, 0x6b, 0xa3, 0x3a, 0xd1, 0xa4, 0x87, 0x50, 0xf9, 0x35, 0x07, 0xe6, 0x7a, 0x68, 0x47, 0xee, - 0x09, 0x66, 0x46, 0x3a, 0x34, 0xe3, 0x73, 0x7c, 0x73, 0x1b, 0xc4, 0xaf, 0xc2, 0x20, 0xbf, 0xda, - 0x54, 0xa6, 0x42, 0xde, 0xe5, 0x63, 0xb0, 0xd4, 0xa3, 0x2e, 0x72, 0x2c, 0x0f, 0x26, 0xb1, 0x6f, - 0x9a, 0x10, 0x63, 0xaa, 0x73, 0x4a, 0x0f, 0x97, 0x7c, 0x11, 0xe4, 0xfc, 0x10, 0x4e, 0xfc, 0x8a, - 0x44, 0x26, 0xb7, 0xe5, 0x97, 0x1c, 0xc8, 0x55, 0xb1, 0xf5, 0xdb, 0x85, 0x07, 0x1d, 0x6a, 0xad, - 0xdf, 0xfe, 0x68, 0xf7, 0xe2, 0x37, 0x2c, 0xf3, 0x29, 0x6f, 0x58, 0x79, 0x95, 0x98, 0xb8, 0x9c, - 0x30, 0x11, 0x52, 0x0d, 0x0a, 0x5b, 0xc9, 0x5b, 0x60, 0x31, 0xa1, 0x6b, 0xb8, 0x6f, 0xf2, 0x0b, - 0x0e, 0x64, 0xab, 0xd8, 0xfa, 0x1d, 0xb9, 0x26, 0x64, 0x7e, 0x7f, 0xc9, 0xad, 0xd4, 0xf7, 0xea, - 0x9d, 0x90, 0xda, 0x13, 0x57, 0xaf, 0x04, 0x16, 0xba, 0x55, 0x8d, 0x60, 0xc5, 0x73, 0x0e, 0x7c, - 0x5b, 0xc5, 0xd6, 0x9f, 0xd0, 0xd3, 0xe1, 0xb9, 0xe1, 0xd6, 0x75, 0x68, 0x42, 0xfb, 0x0c, 0xba, - 0x3b, 0xf5, 0xba, 0x4b, 0x5a, 0x6c, 0x54, 0x5f, 0x16, 0xc0, 0x44, 0x33, 0xde, 0x81, 0xc1, 0x8a, - 0xdf, 0x05, 0x39, 0x97, 0x12, 0x1f, 0xbb, 0x01, 0x33, 0xed, 0x99, 0xe9, 0x8a, 0x70, 0xdf, 0x91, - 0x16, 0x18, 0x53, 0x02, 0x20, 0xeb, 0x59, 0xb7, 0xab, 0x96, 0xb2, 0x46, 0x1c, 0x58, 0x4f, 0x38, - 0x80, 0xa1, 0xa7, 0x30, 0x9c, 0x12, 0x66, 0x2a, 0x06, 0xab, 0x5a, 0xfe, 0x15, 0x7c, 0x3f, 0x40, - 0xd4, 0x70, 0x5b, 0x4a, 0xcf, 0xc6, 0x40, 0xa6, 0x8a, 0x2d, 0x5e, 0x07, 0x20, 0xf6, 0x1b, 0xf4, - 0x5d, 0x72, 0x54, 0x75, 0xcd, 0x5e, 0xe1, 0xc7, 0x81, 0xe1, 0xe8, 0x54, 0x0b, 0xcc, 0xf5, 0xce, - 0xe1, 0x1f, 0xfa, 0xe4, 0xf6, 0xa0, 0x84, 0x8d, 0x51, 0x50, 0xd1, 0x41, 0xff, 0x80, 0x6c, 0x62, - 0x60, 0xae, 0x0e, 0xcd, 0x17, 0x7e, 0x1a, 0x0a, 0x89, 0xf8, 0xff, 0x02, 0xb3, 0x5d, 0x03, 0x45, - 0xea, 0x93, 0x1a, 0x07, 0x08, 0x85, 0x21, 0x80, 0x88, 0xf9, 0x08, 0xcc, 0xc4, 0x2f, 0xa7, 0xd8, - 0x27, 0x2f, 0x16, 0x17, 0xd6, 0x06, 0xc7, 0x23, 0xda, 0x7f, 0x41, 0xfe, 0xc1, 0x46, 0xff, 0xb9, - 0x0f, 0xc7, 0x43, 0x60, 0x61, 0xeb, 0x03, 0xc0, 0xe1, 0xe9, 0x95, 0x83, 0xab, 0x5b, 0x91, 0xbb, - 0xbe, 0x15, 0xb9, 0x37, 0xb7, 0x22, 0xf7, 0xff, 0x9d, 0x98, 0xba, 0xbe, 0x13, 0x53, 0xaf, 0xee, - 0xc4, 0xd4, 0xdf, 0xa5, 0xd8, 0x48, 0x08, 0x88, 0x95, 0xa6, 0x51, 0xc3, 0xe1, 0x42, 0x3b, 0x2b, - 0x6d, 0x6b, 0x17, 0xd1, 0x1f, 0x37, 0x32, 0x22, 0x6a, 0x13, 0x74, 0xd6, 0x6e, 0xbd, 0x0f, 0x00, - 0x00, 0xff, 0xff, 0x97, 0x9f, 0x8d, 0x88, 0xd7, 0x09, 0x00, 0x00, + // 828 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcb, 0x6e, 0xdb, 0x46, + 0x14, 0x15, 0x25, 0x3f, 0xc7, 0xae, 0x54, 0x13, 0xae, 0x2d, 0xb3, 0x2e, 0x69, 0xb3, 0xad, 0xa5, + 0xba, 0x26, 0x59, 0xcb, 0xed, 0x46, 0x9b, 0xc2, 0xb2, 0x5b, 0xc0, 0x80, 0x05, 0x14, 0xac, 0x0d, + 0x14, 0x5d, 0xd4, 0xa0, 0xa8, 0x31, 0x4d, 0x48, 0xe2, 0x08, 0x1c, 0xd2, 0x0f, 0xa0, 0x5f, 0x90, + 0x55, 0x96, 0xf9, 0x81, 0x6c, 0xb2, 0xca, 0x67, 0x78, 0xe9, 0x20, 0x41, 0x90, 0x45, 0x20, 0x07, + 0xf6, 0x22, 0x40, 0x96, 0xfe, 0x82, 0x60, 0x66, 0x48, 0x82, 0xa2, 0x64, 0x49, 0x09, 0x90, 0x20, + 0x1b, 0x91, 0x33, 0xf7, 0xdc, 0x33, 0xf7, 0x1c, 0xdd, 0xb9, 0x12, 0x58, 0x44, 0xb8, 0x85, 0xb0, + 0x8d, 0xb5, 0x26, 0x32, 0x1b, 0x7e, 0x5b, 0xf3, 0xce, 0xd5, 0xb6, 0x8b, 0x3c, 0xc4, 0x67, 0x83, + 0x80, 0xca, 0x02, 0xc2, 0xbc, 0x85, 0x2c, 0x44, 0x43, 0x1a, 0x79, 0x63, 0x28, 0x61, 0xce, 0x68, + 0xd9, 0x0e, 0xd2, 0xe8, 0x67, 0xb0, 0x25, 0x5a, 0x08, 0x59, 0x4d, 0xa8, 0xd1, 0x55, 0xcd, 0x3f, + 0xd6, 0xea, 0xbe, 0x6b, 0x78, 0x36, 0x72, 0xc2, 0xb8, 0x49, 0x99, 0xb5, 0x9a, 0x81, 0xa1, 0x76, + 0xba, 0x59, 0x83, 0x9e, 0xb1, 0xa9, 0x99, 0xc8, 0x0e, 0xe3, 0x4b, 0x89, 0x8a, 0xc8, 0x83, 0x85, + 0xe4, 0xc7, 0x69, 0xf0, 0x55, 0x15, 0x5b, 0xfb, 0xc8, 0x6c, 0x1c, 0xa0, 0x06, 0x74, 0x30, 0xbf, + 0x06, 0xc6, 0xd1, 0x99, 0x03, 0xdd, 0x3c, 0xb7, 0xc2, 0x15, 0xa7, 0x2b, 0x5f, 0xdf, 0x75, 0xa4, + 0xd9, 0x0b, 0xa3, 0xd5, 0x2c, 0xcb, 0x74, 0x5b, 0xd6, 0x59, 0x98, 0x3f, 0x01, 0x53, 0x61, 0x19, + 0xf9, 0xf4, 0x0a, 0x57, 0x9c, 0x29, 0x2d, 0xa9, 0xac, 0x4e, 0x35, 0xac, 0x53, 0xdd, 0x0d, 0x00, + 0x95, 0xcd, 0xcb, 0x8e, 0x94, 0x7a, 0xd7, 0x91, 0xf8, 0x30, 0x65, 0x03, 0xb5, 0x6c, 0x0f, 0xb6, + 0xda, 0xde, 0xc5, 0x5d, 0x47, 0xca, 0x31, 0xfe, 0x30, 0x26, 0x3f, 0xba, 0x96, 0x38, 0x3d, 0x62, + 0xe7, 0x0d, 0x30, 0x4e, 0xc4, 0xe0, 0x7c, 0x66, 0x25, 0x43, 0x8f, 0x61, 0x72, 0x55, 0x22, 0x57, + 0x0d, 0xe4, 0xaa, 0x3b, 0xc8, 0x76, 0x2a, 0xbf, 0x90, 0x63, 0x9e, 0x5c, 0x4b, 0x45, 0xcb, 0xf6, + 0x4e, 0xfc, 0x9a, 0x6a, 0xa2, 0x96, 0x16, 0x78, 0xc3, 0x1e, 0x0a, 0xae, 0x37, 0x34, 0xef, 0xa2, + 0x0d, 0x31, 0x4d, 0xc0, 0x3a, 0x63, 0x2e, 0x4b, 0x0f, 0xde, 0x3e, 0x5d, 0x17, 0xfa, 0xd8, 0xa4, + 0x78, 0xd4, 0x15, 0xb9, 0x00, 0xbe, 0xe9, 0xb2, 0x49, 0x87, 0xb8, 0x8d, 0x1c, 0x0c, 0xf9, 0x2c, + 0x48, 0xef, 0xed, 0x52, 0xaf, 0xc6, 0xf4, 0xf4, 0xde, 0xae, 0x6c, 0x81, 0xf9, 0x2a, 0xb6, 0x2a, + 0xd0, 0xb2, 0x9d, 0x43, 0x87, 0x30, 0xd8, 0x8e, 0xb5, 0xdd, 0x6c, 0x8e, 0x6a, 0x6b, 0xb9, 0x40, + 0x2a, 0x91, 0x13, 0x95, 0xd4, 0x08, 0x9d, 0xe2, 0x3b, 0xf1, 0x8a, 0x0e, 0xc0, 0x72, 0xbf, 0x83, + 0xa2, 0xc2, 0x7e, 0x05, 0x93, 0x2c, 0x01, 0xe7, 0x39, 0xea, 0x9b, 0xa0, 0x76, 0xf7, 0x9f, 0xfa, + 0x17, 0x74, 0x6d, 0x54, 0x27, 0x9a, 0xf4, 0x10, 0x2a, 0xbf, 0xe6, 0xc0, 0x5c, 0x0f, 0xed, 0xc8, + 0x3d, 0xc1, 0xcc, 0x48, 0x87, 0x66, 0x7c, 0x8e, 0x6f, 0x6e, 0x83, 0xf8, 0x55, 0x18, 0xe4, 0x57, + 0x9b, 0xca, 0x54, 0xc8, 0xbb, 0x7c, 0x04, 0x96, 0x7a, 0xd4, 0x45, 0x8e, 0xe5, 0xc1, 0x24, 0xf6, + 0x4d, 0x13, 0x62, 0x4c, 0x75, 0x4e, 0xe9, 0xe1, 0x92, 0x2f, 0x82, 0x9c, 0x1f, 0xc2, 0x89, 0x5f, + 0x91, 0xc8, 0xe4, 0xb6, 0xfc, 0x92, 0x03, 0xb9, 0x2a, 0xb6, 0xfe, 0x38, 0xf7, 0xa0, 0x43, 0xad, + 0xf5, 0xdb, 0x1f, 0xed, 0x5e, 0xfc, 0x86, 0x65, 0x3e, 0xe5, 0x0d, 0x2b, 0xaf, 0x12, 0x13, 0x97, + 0x13, 0x26, 0x42, 0xaa, 0x41, 0x61, 0x2b, 0x79, 0x0b, 0x2c, 0x26, 0x74, 0x0d, 0xf7, 0x4d, 0x7e, + 0xc1, 0x81, 0x6c, 0x15, 0x5b, 0x7f, 0x22, 0xd7, 0x84, 0xcc, 0xef, 0x2f, 0xb9, 0x95, 0xfa, 0x5e, + 0xbd, 0x63, 0x52, 0x7b, 0xe2, 0xea, 0x95, 0xc0, 0x42, 0xb7, 0xaa, 0x11, 0xac, 0x78, 0xce, 0x81, + 0x6f, 0xab, 0xd8, 0xfa, 0x1b, 0x7a, 0x3a, 0x3c, 0x33, 0xdc, 0xba, 0x0e, 0x4d, 0x68, 0x9f, 0x42, + 0x77, 0xbb, 0x5e, 0x77, 0x49, 0x8b, 0x8d, 0xea, 0xcb, 0x02, 0x98, 0x68, 0xc6, 0x3b, 0x30, 0x58, + 0xf1, 0x3b, 0x20, 0xe7, 0x52, 0xe2, 0x23, 0x37, 0x60, 0xa6, 0x3d, 0x33, 0x5d, 0x11, 0xee, 0x3a, + 0xd2, 0x02, 0x63, 0x4a, 0x00, 0x64, 0x3d, 0xeb, 0x76, 0xd5, 0x52, 0xd6, 0x88, 0x03, 0xeb, 0x09, + 0x07, 0x30, 0xf4, 0x14, 0x86, 0x53, 0xc2, 0x4c, 0xc5, 0x60, 0x55, 0xcb, 0xbf, 0x83, 0xef, 0x07, + 0x88, 0x1a, 0x6e, 0x4b, 0xe9, 0xd9, 0x18, 0xc8, 0x54, 0xb1, 0xc5, 0xeb, 0x00, 0xc4, 0x7e, 0x83, + 0xbe, 0x4b, 0x8e, 0xaa, 0xae, 0xd9, 0x2b, 0xfc, 0x38, 0x30, 0x1c, 0x9d, 0x6a, 0x81, 0xb9, 0xde, + 0x39, 0xfc, 0x43, 0x9f, 0xdc, 0x1e, 0x94, 0xb0, 0x31, 0x0a, 0x2a, 0x3a, 0xe8, 0x3f, 0x90, 0x4d, + 0x0c, 0xcc, 0xd5, 0xa1, 0xf9, 0xc2, 0x4f, 0x43, 0x21, 0x11, 0xff, 0x3f, 0x60, 0xb6, 0x6b, 0xa0, + 0x48, 0x7d, 0x52, 0xe3, 0x00, 0xa1, 0x30, 0x04, 0x10, 0x31, 0x1f, 0x82, 0x99, 0xf8, 0xe5, 0x14, + 0xfb, 0xe4, 0xc5, 0xe2, 0xc2, 0xda, 0xe0, 0x78, 0x44, 0xfb, 0x3f, 0xc8, 0xdf, 0xdb, 0xe8, 0x3f, + 0xf7, 0xe1, 0xb8, 0x0f, 0x2c, 0x6c, 0x7d, 0x00, 0x38, 0x3c, 0xbd, 0xb2, 0x7f, 0x79, 0x23, 0x72, + 0x57, 0x37, 0x22, 0xf7, 0xe6, 0x46, 0xe4, 0x1e, 0xde, 0x8a, 0xa9, 0xab, 0x5b, 0x31, 0xf5, 0xea, + 0x56, 0x4c, 0xfd, 0x5b, 0x8a, 0x8d, 0x84, 0x80, 0x58, 0x69, 0x1a, 0x35, 0x1c, 0x2e, 0xb4, 0xd3, + 0xd2, 0x6f, 0xda, 0x79, 0xf4, 0xc7, 0x8d, 0x8c, 0x88, 0xda, 0x04, 0x9d, 0xb5, 0x5b, 0xef, 0x03, + 0x00, 0x00, 0xff, 0xff, 0xb0, 0xfa, 0xa8, 0x09, 0xd7, 0x09, 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 03b357ee9a6..4b9ca280745 100644 --- a/x/mint/client/cli/cli_test.go +++ b/x/mint/client/cli/cli_test.go @@ -8,8 +8,8 @@ import ( tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/x/mint/client/cli" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/x/mint/client/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" diff --git a/x/mint/client/cli/query.go b/x/mint/client/cli/query.go index 4c807f97f76..f15bf72057d 100644 --- a/x/mint/client/cli/query.go +++ b/x/mint/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/mint/keeper/export_test.go b/x/mint/keeper/export_test.go index 11381c33104..6d2719255e8 100644 --- a/x/mint/keeper/export_test.go +++ b/x/mint/keeper/export_test.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" ) type ( diff --git a/x/mint/keeper/genesis.go b/x/mint/keeper/genesis.go index d1aaa869d08..95dea8afdfb 100644 --- a/x/mint/keeper/genesis.go +++ b/x/mint/keeper/genesis.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" ) const developerVestingAmount = 225_000_000_000_000 diff --git a/x/mint/keeper/genesis_test.go b/x/mint/keeper/genesis_test.go index 21c803bf5df..9b5dac39571 100644 --- a/x/mint/keeper/genesis_test.go +++ b/x/mint/keeper/genesis_test.go @@ -6,8 +6,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/x/mint/keeper" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/keeper" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" ) var customGenesis = types.NewGenesisState( diff --git a/x/mint/keeper/grpc_query.go b/x/mint/keeper/grpc_query.go index 16fdeff978c..90c075fb668 100644 --- a/x/mint/keeper/grpc_query.go +++ b/x/mint/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" ) var _ types.QueryServer = Querier{} diff --git a/x/mint/keeper/grpc_query_test.go b/x/mint/keeper/grpc_query_test.go index 3fb2dcb8a03..48b1371d45b 100644 --- a/x/mint/keeper/grpc_query_test.go +++ b/x/mint/keeper/grpc_query_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "context" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" ) func (s *KeeperTestSuite) TestGRPCParams() { diff --git a/x/mint/keeper/hooks.go b/x/mint/keeper/hooks.go index 671158fef65..60f9f689847 100644 --- a/x/mint/keeper/hooks.go +++ b/x/mint/keeper/hooks.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" "github.com/cosmos/cosmos-sdk/telemetry" diff --git a/x/mint/keeper/hooks_test.go b/x/mint/keeper/hooks_test.go index 836fefc953c..3a34ba62f74 100644 --- a/x/mint/keeper/hooks_test.go +++ b/x/mint/keeper/hooks_test.go @@ -8,9 +8,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - osmoapp "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/x/mint/keeper" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + osmoapp "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/x/mint/keeper" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index 75ceb6a67c1..29f8ef3a3f4 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -9,8 +9,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/mint/keeper/keeper_test.go b/x/mint/keeper/keeper_test.go index 07ddb503349..4741ec9bf0b 100644 --- a/x/mint/keeper/keeper_test.go +++ b/x/mint/keeper/keeper_test.go @@ -16,10 +16,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/mint/keeper" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/mint/keeper" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) type KeeperTestSuite struct { diff --git a/x/mint/module.go b/x/mint/module.go index af5b4a93694..bb3a76cb87f 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -25,10 +25,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/v24/x/mint/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/mint/keeper" - "github.com/osmosis-labs/osmosis/v24/x/mint/simulation" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/mint/keeper" + "github.com/osmosis-labs/osmosis/v25/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" ) var ( diff --git a/x/mint/simulation/decoder.go b/x/mint/simulation/decoder.go index 238d1486b8e..d4d503febf3 100644 --- a/x/mint/simulation/decoder.go +++ b/x/mint/simulation/decoder.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" diff --git a/x/mint/simulation/decoder_test.go b/x/mint/simulation/decoder_test.go index 8e72a7dfeba..a134ede70e2 100644 --- a/x/mint/simulation/decoder_test.go +++ b/x/mint/simulation/decoder_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - simapp "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/x/mint/simulation" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + simapp "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" "github.com/cosmos/cosmos-sdk/types/kv" ) diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go index 8e5dba03129..048b9bc95aa 100644 --- a/x/mint/simulation/genesis.go +++ b/x/mint/simulation/genesis.go @@ -6,7 +6,7 @@ import ( "math/rand" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/x/mint/simulation/genesis_test.go b/x/mint/simulation/genesis_test.go index 765b742cbc0..f4261f26ad9 100644 --- a/x/mint/simulation/genesis_test.go +++ b/x/mint/simulation/genesis_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/mint/simulation" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/mint/types/genesis.pb.go b/x/mint/types/genesis.pb.go index c17ad464f88..1e7c4d7818b 100644 --- a/x/mint/types/genesis.pb.go +++ b/x/mint/types/genesis.pb.go @@ -113,9 +113,9 @@ var fileDescriptor_12e6a5511ad3feeb = []byte{ 0xa2, 0x70, 0x99, 0x60, 0x88, 0x84, 0x2b, 0x48, 0xdc, 0xc9, 0xeb, 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, 0x0c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, - 0xf5, 0xa1, 0x6e, 0xd5, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x8c, 0x4c, 0xf4, 0x2b, + 0xf5, 0xa1, 0x6e, 0xd5, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x8c, 0x4c, 0xf5, 0x2b, 0x20, 0xa1, 0x57, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x0e, 0x37, 0x63, 0x40, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x71, 0x49, 0x27, 0xf3, 0xaa, 0x01, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xb1, 0x2d, 0x0f, 0xe4, 0xaa, 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 1843919ba25..e54e0873ee6 100644 --- a/x/mint/types/mint.pb.go +++ b/x/mint/types/mint.pb.go @@ -277,56 +277,56 @@ func init() { func init() { proto.RegisterFile("osmosis/mint/v1beta1/mint.proto", fileDescriptor_ccb38f8335e0f45b) } var fileDescriptor_ccb38f8335e0f45b = []byte{ - // 774 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcd, 0x4f, 0x1b, 0x47, - 0x1c, 0xf5, 0xd6, 0xd4, 0x94, 0x41, 0x60, 0xba, 0xa2, 0x78, 0x0b, 0xaa, 0x17, 0x56, 0x20, 0xb9, - 0x52, 0xf1, 0x96, 0x8f, 0x5e, 0x50, 0x3f, 0x54, 0xcb, 0x45, 0xa2, 0xa2, 0xaa, 0x35, 0x39, 0x44, - 0xca, 0x65, 0xb5, 0xde, 0x1d, 0xaf, 0x47, 0x78, 0x77, 0x56, 0x33, 0x63, 0x13, 0xdf, 0x72, 0x8f, - 0x22, 0xe5, 0x98, 0x63, 0x72, 0xc8, 0xff, 0xc2, 0x91, 0x63, 0x94, 0x83, 0x15, 0xc1, 0x29, 0x57, - 0xff, 0x05, 0xd1, 0x7c, 0xac, 0x0d, 0x0b, 0x96, 0xac, 0xdc, 0x76, 0xde, 0xef, 0xcd, 0x7b, 0x3f, - 0xff, 0x66, 0xde, 0x18, 0xd8, 0x84, 0xc5, 0x84, 0x61, 0xe6, 0xc6, 0x38, 0xe1, 0xee, 0xe0, 0xa0, - 0x8d, 0xb8, 0x7f, 0x20, 0x17, 0xf5, 0x94, 0x12, 0x4e, 0xcc, 0x75, 0x4d, 0xa8, 0x4b, 0x4c, 0x13, - 0x36, 0xd7, 0x23, 0x12, 0x11, 0x49, 0x70, 0xc5, 0x97, 0xe2, 0x6e, 0xda, 0x11, 0x21, 0x51, 0x0f, - 0xb9, 0x72, 0xd5, 0xee, 0x77, 0x5c, 0x8e, 0x63, 0xc4, 0xb8, 0x1f, 0xa7, 0x9a, 0xf0, 0x63, 0x9e, - 0xe0, 0x27, 0x43, 0x5d, 0xaa, 0xe6, 0x4b, 0x61, 0x9f, 0xfa, 0x1c, 0x93, 0x44, 0xd5, 0x1d, 0x06, - 0x4a, 0xff, 0xe1, 0x84, 0x23, 0x6a, 0x62, 0xb0, 0x86, 0x52, 0x12, 0x74, 0xbd, 0x94, 0x92, 0x01, - 0x66, 0x98, 0x24, 0xcc, 0x32, 0xb6, 0x8d, 0xda, 0x52, 0xe3, 0xcf, 0xab, 0x91, 0x5d, 0xf8, 0x38, - 0xb2, 0xb7, 0x02, 0xd9, 0x34, 0x0b, 0x2f, 0xea, 0x98, 0xb8, 0xb1, 0xcf, 0xbb, 0xf5, 0x73, 0x14, - 0xf9, 0xc1, 0xb0, 0x89, 0x82, 0xf1, 0xc8, 0xae, 0x0c, 0xfd, 0xb8, 0x77, 0xe2, 0xe4, 0x45, 0x1c, - 0x58, 0x96, 0x50, 0x6b, 0x8a, 0xbc, 0x32, 0x40, 0xf9, 0x29, 0xc2, 0x51, 0x97, 0xa3, 0xf0, 0xef, - 0x30, 0xa4, 0x88, 0x31, 0xf3, 0x17, 0xb0, 0xe8, 0xab, 0x4f, 0xed, 0x6a, 0x8e, 0x47, 0xf6, 0xaa, - 0x92, 0xd4, 0x05, 0x07, 0x66, 0x14, 0xf3, 0x1c, 0x94, 0x2e, 0xa5, 0x80, 0xf5, 0x8d, 0x24, 0x1f, - 0xcf, 0xd7, 0xe2, 0x8a, 0xd2, 0x53, 0x5b, 0x1d, 0xa8, 0x35, 0x9c, 0xf7, 0x45, 0x50, 0x69, 0x62, - 0xc6, 0x29, 0x6e, 0xf7, 0xc5, 0x6c, 0x5a, 0x94, 0xa4, 0x84, 0x8a, 0x2f, 0x66, 0xfe, 0x0f, 0x16, - 0x19, 0xf7, 0x2f, 0x70, 0x12, 0xe9, 0xbe, 0x7e, 0x9b, 0xcf, 0x4a, 0xb7, 0xae, 0xf7, 0x3a, 0x30, - 0x53, 0x31, 0x3b, 0xa0, 0x9c, 0x12, 0xd2, 0xf3, 0x70, 0x12, 0xa0, 0x84, 0xe3, 0x01, 0x62, 0xfa, - 0x37, 0xfc, 0x31, 0x9f, 0xf0, 0x86, 0x12, 0xce, 0x69, 0x38, 0x70, 0x55, 0x20, 0x67, 0x13, 0xc0, - 0xec, 0x81, 0xef, 0x43, 0x34, 0x40, 0x3d, 0x92, 0x22, 0xea, 0x51, 0x74, 0xe9, 0xd3, 0x90, 0x59, - 0x45, 0xe9, 0xf4, 0xd7, 0x7c, 0x4e, 0x96, 0x72, 0x7a, 0xa0, 0xe2, 0xc0, 0xb5, 0x09, 0x06, 0x15, - 0x64, 0x06, 0x60, 0x35, 0x20, 0x71, 0xdc, 0x4f, 0x30, 0x1f, 0x7a, 0xa2, 0x13, 0x6b, 0x41, 0x5a, - 0xfd, 0x3e, 0x9f, 0xd5, 0x0f, 0xca, 0xea, 0xbe, 0x84, 0x03, 0x57, 0x26, 0x40, 0x4b, 0xac, 0x3f, - 0x97, 0x40, 0xa9, 0xe5, 0x53, 0x3f, 0x66, 0xe6, 0x4f, 0x00, 0x88, 0xe4, 0x78, 0x21, 0x4a, 0x48, - 0xac, 0x4e, 0x06, 0x2e, 0x09, 0xa4, 0x29, 0x00, 0xf3, 0x85, 0x01, 0xac, 0x08, 0x25, 0x88, 0x61, - 0xe6, 0x3d, 0xb8, 0xd5, 0x6a, 0xdc, 0xa7, 0xf3, 0x75, 0x66, 0xab, 0xce, 0x66, 0x89, 0x39, 0x70, - 0x43, 0x97, 0xfe, 0xb9, 0x7f, 0xc9, 0xcd, 0xd3, 0x2c, 0x4f, 0x38, 0x14, 0x47, 0xd2, 0xc1, 0x88, - 0xea, 0xf1, 0x6f, 0xe5, 0xc3, 0x32, 0x65, 0x64, 0x61, 0x39, 0x9b, 0x20, 0x66, 0x1b, 0x6c, 0x52, - 0x14, 0xf6, 0x03, 0x71, 0x1d, 0xbd, 0x14, 0x51, 0x4c, 0x42, 0x0f, 0x27, 0xaa, 0x11, 0x26, 0xa7, - 0x5c, 0x6c, 0xec, 0x8d, 0x47, 0xf6, 0x8e, 0x52, 0x9c, 0xcd, 0x75, 0x60, 0x65, 0x52, 0x6c, 0xc9, - 0xda, 0x59, 0x22, 0x9b, 0x66, 0x22, 0xfb, 0xd3, 0x7d, 0x1d, 0x3f, 0xe0, 0x84, 0x5a, 0xdf, 0x7e, - 0x45, 0xf6, 0xf3, 0x22, 0x0e, 0x2c, 0x4f, 0xa0, 0x53, 0x89, 0x98, 0x09, 0xb0, 0xc2, 0x3b, 0x51, - 0x13, 0xa3, 0xcc, 0xb2, 0x66, 0x95, 0xb6, 0x8d, 0xda, 0xf2, 0xe1, 0x7e, 0xfd, 0xb1, 0xb7, 0xb1, - 0x3e, 0x23, 0xa0, 0x8d, 0x05, 0xd1, 0x21, 0xac, 0x84, 0x33, 0xf2, 0xfb, 0xce, 0x00, 0xbb, 0x97, - 0xfa, 0xad, 0xf1, 0x1e, 0x5c, 0x65, 0x8f, 0xa2, 0x00, 0xe1, 0x01, 0xa2, 0xcc, 0x5a, 0xdc, 0x2e, - 0xd6, 0x96, 0x0f, 0xf7, 0x1e, 0x37, 0xcf, 0xbd, 0x56, 0x8d, 0x9f, 0x85, 0xe9, 0x74, 0xe8, 0xb3, - 0x75, 0x1d, 0xb8, 0x93, 0xb9, 0x37, 0x73, 0x99, 0x81, 0x99, 0xb5, 0xf9, 0xd2, 0x00, 0x35, 0x61, - 0x87, 0x93, 0x68, 0x22, 0x70, 0x6f, 0x48, 0x8c, 0xfb, 0x94, 0xab, 0x63, 0xb4, 0xbe, 0x93, 0x27, - 0x7e, 0x34, 0x1e, 0xd9, 0xae, 0x32, 0x9f, 0x77, 0xa7, 0x03, 0x77, 0x35, 0x55, 0x37, 0x70, 0x77, - 0xa2, 0x4f, 0x04, 0x4f, 0xde, 0x86, 0x93, 0x85, 0x37, 0x6f, 0xed, 0x42, 0xe3, 0xdf, 0xab, 0x9b, - 0xaa, 0x71, 0x7d, 0x53, 0x35, 0x3e, 0xdd, 0x54, 0x8d, 0xd7, 0xb7, 0xd5, 0xc2, 0xf5, 0x6d, 0xb5, - 0xf0, 0xe1, 0xb6, 0x5a, 0x78, 0xf6, 0x6b, 0x84, 0x79, 0xb7, 0xdf, 0xae, 0x07, 0x24, 0x76, 0xf5, - 0xb0, 0xf6, 0x7b, 0x7e, 0x9b, 0x65, 0x0b, 0x77, 0x70, 0x78, 0xec, 0x3e, 0x57, 0xff, 0x7c, 0x7c, - 0x98, 0x22, 0xd6, 0x2e, 0xc9, 0xff, 0x9a, 0xa3, 0x2f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd1, 0x72, - 0xc3, 0x16, 0x16, 0x07, 0x00, 0x00, + // 773 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x4f, 0x1b, 0x47, + 0x18, 0xf5, 0xd6, 0xd4, 0x94, 0x41, 0x60, 0xba, 0xa2, 0x78, 0x0b, 0xaa, 0x17, 0x56, 0x20, 0xb9, + 0x52, 0xf1, 0x16, 0x28, 0x17, 0xd4, 0x1f, 0xaa, 0xe5, 0x22, 0x51, 0x51, 0xd5, 0x9a, 0x1c, 0x22, + 0xe5, 0xb2, 0x5a, 0xef, 0x8e, 0xd7, 0x23, 0xbc, 0x3b, 0xab, 0x99, 0xb1, 0x89, 0x6f, 0xb9, 0x47, + 0x91, 0x72, 0xcc, 0x31, 0x39, 0xe4, 0x7f, 0xe1, 0xc8, 0x31, 0xca, 0xc1, 0x8a, 0xe0, 0x94, 0xab, + 0xff, 0x82, 0x68, 0x7e, 0xac, 0x0d, 0x0b, 0x96, 0xac, 0xdc, 0x76, 0xde, 0xf7, 0xe6, 0xbd, 0xcf, + 0xdf, 0xcc, 0x1b, 0x03, 0x9b, 0xb0, 0x98, 0x30, 0xcc, 0xdc, 0x18, 0x27, 0xdc, 0x1d, 0x1c, 0xb4, + 0x11, 0xf7, 0x0f, 0xe4, 0xa2, 0x9e, 0x52, 0xc2, 0x89, 0xb9, 0xae, 0x09, 0x75, 0x89, 0x69, 0xc2, + 0xe6, 0x7a, 0x44, 0x22, 0x22, 0x09, 0xae, 0xf8, 0x52, 0xdc, 0x4d, 0x3b, 0x22, 0x24, 0xea, 0x21, + 0x57, 0xae, 0xda, 0xfd, 0x8e, 0xcb, 0x71, 0x8c, 0x18, 0xf7, 0xe3, 0x54, 0x13, 0x7e, 0xcc, 0x13, + 0xfc, 0x64, 0xa8, 0x4b, 0xd5, 0x7c, 0x29, 0xec, 0x53, 0x9f, 0x63, 0x92, 0xa8, 0xba, 0xc3, 0x40, + 0xe9, 0x3f, 0x9c, 0x70, 0x44, 0x4d, 0x0c, 0xd6, 0x50, 0x4a, 0x82, 0xae, 0x97, 0x52, 0x32, 0xc0, + 0x0c, 0x93, 0x84, 0x59, 0xc6, 0xb6, 0x51, 0x5b, 0x6a, 0xfc, 0x79, 0x35, 0xb2, 0x0b, 0x1f, 0x47, + 0xf6, 0x56, 0x20, 0x9b, 0x66, 0xe1, 0x45, 0x1d, 0x13, 0x37, 0xf6, 0x79, 0xb7, 0x7e, 0x8e, 0x22, + 0x3f, 0x18, 0x36, 0x51, 0x30, 0x1e, 0xd9, 0x95, 0xa1, 0x1f, 0xf7, 0x4e, 0x9c, 0xbc, 0x88, 0x03, + 0xcb, 0x12, 0x6a, 0x4d, 0x91, 0x57, 0x06, 0x28, 0x3f, 0x45, 0x38, 0xea, 0x72, 0x14, 0xfe, 0x1d, + 0x86, 0x14, 0x31, 0x66, 0xfe, 0x02, 0x16, 0x7d, 0xf5, 0xa9, 0x5d, 0xcd, 0xf1, 0xc8, 0x5e, 0x55, + 0x92, 0xba, 0xe0, 0xc0, 0x8c, 0x62, 0x9e, 0x83, 0xd2, 0xa5, 0x14, 0xb0, 0xbe, 0x91, 0xe4, 0xdf, + 0xe6, 0x6b, 0x71, 0x45, 0xe9, 0xa9, 0xad, 0x0e, 0xd4, 0x1a, 0xce, 0xfb, 0x22, 0xa8, 0x34, 0x31, + 0xe3, 0x14, 0xb7, 0xfb, 0x62, 0x36, 0x2d, 0x4a, 0x52, 0x42, 0xc5, 0x17, 0x33, 0xff, 0x07, 0x8b, + 0x8c, 0xfb, 0x17, 0x38, 0x89, 0x74, 0x5f, 0xc7, 0xf3, 0x59, 0xe9, 0xd6, 0xf5, 0x5e, 0x07, 0x66, + 0x2a, 0x66, 0x07, 0x94, 0x53, 0x42, 0x7a, 0x1e, 0x4e, 0x02, 0x94, 0x70, 0x3c, 0x40, 0x4c, 0xff, + 0x86, 0x3f, 0xe6, 0x13, 0xde, 0x50, 0xc2, 0x39, 0x0d, 0x07, 0xae, 0x0a, 0xe4, 0x6c, 0x02, 0x98, + 0x3d, 0xf0, 0x7d, 0x88, 0x06, 0xa8, 0x47, 0x52, 0x44, 0x3d, 0x8a, 0x2e, 0x7d, 0x1a, 0x32, 0xab, + 0x28, 0x9d, 0xfe, 0x9a, 0xcf, 0xc9, 0x52, 0x4e, 0x0f, 0x54, 0x1c, 0xb8, 0x36, 0xc1, 0xa0, 0x82, + 0xcc, 0x00, 0xac, 0x06, 0x24, 0x8e, 0xfb, 0x09, 0xe6, 0x43, 0x4f, 0x74, 0x62, 0x2d, 0x48, 0xab, + 0xdf, 0xe7, 0xb3, 0xfa, 0x41, 0x59, 0xdd, 0x97, 0x70, 0xe0, 0xca, 0x04, 0x68, 0x89, 0xf5, 0xe7, + 0x12, 0x28, 0xb5, 0x7c, 0xea, 0xc7, 0xcc, 0xfc, 0x09, 0x00, 0x91, 0x1c, 0x2f, 0x44, 0x09, 0x89, + 0xd5, 0xc9, 0xc0, 0x25, 0x81, 0x34, 0x05, 0x60, 0xbe, 0x30, 0x80, 0x15, 0xa1, 0x04, 0x31, 0xcc, + 0xbc, 0x07, 0xb7, 0x5a, 0x8d, 0xfb, 0x74, 0xbe, 0xce, 0x6c, 0xd5, 0xd9, 0x2c, 0x31, 0x07, 0x6e, + 0xe8, 0xd2, 0x3f, 0xf7, 0x2f, 0xb9, 0x79, 0x9a, 0xe5, 0x09, 0x87, 0xe2, 0x48, 0x3a, 0x18, 0x51, + 0x3d, 0xfe, 0xad, 0x7c, 0x58, 0xa6, 0x8c, 0x2c, 0x2c, 0x67, 0x13, 0xc4, 0x6c, 0x83, 0x4d, 0x8a, + 0xc2, 0x7e, 0x20, 0xae, 0xa3, 0x97, 0x22, 0x8a, 0x49, 0xe8, 0xe1, 0x44, 0x35, 0xc2, 0xe4, 0x94, + 0x8b, 0x8d, 0xbd, 0xf1, 0xc8, 0xde, 0x51, 0x8a, 0xb3, 0xb9, 0x0e, 0xac, 0x4c, 0x8a, 0x2d, 0x59, + 0x3b, 0x4b, 0x64, 0xd3, 0x4c, 0x64, 0x7f, 0xba, 0xaf, 0xe3, 0x07, 0x9c, 0x50, 0xeb, 0xdb, 0xaf, + 0xc8, 0x7e, 0x5e, 0xc4, 0x81, 0xe5, 0x09, 0x74, 0x2a, 0x11, 0x33, 0x01, 0x56, 0x78, 0x27, 0x6a, + 0x62, 0x94, 0x59, 0xd6, 0xac, 0xd2, 0xb6, 0x51, 0x5b, 0x3e, 0xdc, 0xaf, 0x3f, 0xf6, 0x36, 0xd6, + 0x67, 0x04, 0xb4, 0xb1, 0x20, 0x3a, 0x84, 0x95, 0x70, 0x46, 0x7e, 0xdf, 0x19, 0x60, 0xf7, 0x52, + 0xbf, 0x35, 0xde, 0x83, 0xab, 0xec, 0x51, 0x14, 0x20, 0x3c, 0x40, 0x94, 0x59, 0x8b, 0xdb, 0xc5, + 0xda, 0xf2, 0xe1, 0xde, 0xe3, 0xe6, 0xb9, 0xd7, 0xaa, 0xf1, 0xb3, 0x30, 0x9d, 0x0e, 0x7d, 0xb6, + 0xae, 0x03, 0x77, 0x32, 0xf7, 0x66, 0x2e, 0x33, 0x30, 0xb3, 0x36, 0x5f, 0x1a, 0xa0, 0x26, 0xec, + 0x70, 0x12, 0x4d, 0x04, 0xee, 0x0d, 0x89, 0x71, 0x9f, 0x72, 0x75, 0x8c, 0xd6, 0x77, 0xf2, 0xc4, + 0x8f, 0xc6, 0x23, 0xdb, 0x55, 0xe6, 0xf3, 0xee, 0x74, 0xe0, 0xae, 0xa6, 0xea, 0x06, 0xee, 0x4e, + 0xf4, 0x89, 0xe0, 0xc9, 0xdb, 0x70, 0xb2, 0xf0, 0xe6, 0xad, 0x5d, 0x68, 0xfc, 0x7b, 0x75, 0x53, + 0x35, 0xae, 0x6f, 0xaa, 0xc6, 0xa7, 0x9b, 0xaa, 0xf1, 0xfa, 0xb6, 0x5a, 0xb8, 0xbe, 0xad, 0x16, + 0x3e, 0xdc, 0x56, 0x0b, 0xcf, 0x7e, 0x8d, 0x30, 0xef, 0xf6, 0xdb, 0xf5, 0x80, 0xc4, 0xae, 0x1e, + 0xd6, 0x7e, 0xcf, 0x6f, 0xb3, 0x6c, 0xe1, 0x0e, 0x0e, 0x8f, 0xdd, 0xe7, 0xea, 0x9f, 0x8f, 0x0f, + 0x53, 0xc4, 0xda, 0x25, 0xf9, 0x5f, 0x73, 0xf4, 0x25, 0x00, 0x00, 0xff, 0xff, 0x11, 0x16, 0xeb, + 0x01, 0x16, 0x07, 0x00, 0x00, } func (m *Minter) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/minter_test.go b/x/mint/types/minter_test.go index 81e6422955b..38e79717bd7 100644 --- a/x/mint/types/minter_test.go +++ b/x/mint/types/minter_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" diff --git a/x/mint/types/params_test.go b/x/mint/types/params_test.go index 191dabf730d..19324582cf7 100644 --- a/x/mint/types/params_test.go +++ b/x/mint/types/params_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/mint/types" ) // TestGetInflationProportion sanity checks that inflation diff --git a/x/mint/types/query.pb.go b/x/mint/types/query.pb.go index 8f58a60fcdd..f640d9bffcc 100644 --- a/x/mint/types/query.pb.go +++ b/x/mint/types/query.pb.go @@ -204,29 +204,29 @@ var fileDescriptor_cd2f42111e753fbb = []byte{ // 399 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x4a, 0xe3, 0x40, 0x1c, 0xc6, 0x93, 0xb2, 0xdb, 0xc3, 0xec, 0x42, 0x97, 0xd9, 0x1e, 0x96, 0x34, 0x9b, 0x96, 0xec, - 0xb2, 0x74, 0x0f, 0x3b, 0xb3, 0x8d, 0x9e, 0x3c, 0x16, 0xbd, 0x88, 0x48, 0xdb, 0xa3, 0x17, 0x99, - 0xc4, 0x21, 0x0d, 0x36, 0xf9, 0xa7, 0x99, 0x69, 0xb1, 0x57, 0x7d, 0x01, 0xc1, 0x97, 0xf0, 0x11, - 0x7c, 0x84, 0x1e, 0x0b, 0x5e, 0xc4, 0x43, 0x91, 0xd6, 0x07, 0x91, 0x4c, 0xd2, 0x42, 0x6b, 0x10, - 0xbd, 0x85, 0xf9, 0x7f, 0xff, 0xef, 0xfb, 0xcd, 0x97, 0x41, 0x0d, 0x10, 0x21, 0x88, 0x40, 0xd0, - 0x30, 0x88, 0x24, 0x1d, 0xb7, 0x5c, 0x2e, 0x59, 0x8b, 0x0e, 0x47, 0x3c, 0x99, 0x90, 0x38, 0x01, - 0x09, 0xb8, 0x9a, 0x2b, 0x48, 0xaa, 0x20, 0xb9, 0xc2, 0xa8, 0xfa, 0xe0, 0x83, 0x12, 0xd0, 0xf4, - 0x2b, 0xd3, 0x1a, 0xa6, 0x0f, 0xe0, 0x0f, 0x38, 0x65, 0x71, 0x40, 0x59, 0x14, 0x81, 0x64, 0x32, - 0x80, 0x48, 0xe4, 0xd3, 0x7a, 0x61, 0x96, 0xb2, 0x55, 0x02, 0xbb, 0x8a, 0x70, 0x37, 0x4d, 0xee, - 0xb0, 0x84, 0x85, 0xa2, 0xc7, 0x87, 0x23, 0x2e, 0xa4, 0xdd, 0x45, 0xdf, 0x37, 0x4e, 0x45, 0x0c, - 0x91, 0xe0, 0x78, 0x0f, 0x95, 0x63, 0x75, 0xf2, 0x43, 0x6f, 0xe8, 0xcd, 0x2f, 0x8e, 0x49, 0x8a, - 0x40, 0x49, 0xb6, 0xd5, 0xfe, 0x34, 0x9d, 0xd7, 0xb5, 0x5e, 0xbe, 0x61, 0xff, 0x44, 0x35, 0x65, - 0x79, 0x10, 0x83, 0xd7, 0xef, 0x24, 0x30, 0x0e, 0x44, 0xca, 0xb9, 0x4a, 0x8c, 0x90, 0x59, 0x3c, - 0xce, 0xa3, 0x8f, 0xd1, 0x37, 0x9e, 0x8e, 0x4e, 0xe3, 0xf5, 0x4c, 0x41, 0x7c, 0x6d, 0xff, 0x4a, - 0x63, 0x1e, 0xe7, 0xf5, 0x9a, 0xa7, 0x60, 0xc4, 0xd9, 0x39, 0x09, 0x80, 0x86, 0x4c, 0xf6, 0xc9, - 0x11, 0xf7, 0x99, 0x37, 0xd9, 0xe7, 0x5e, 0xaf, 0xc2, 0x37, 0x7d, 0x9d, 0xbb, 0x12, 0xfa, 0xac, - 0x02, 0xf1, 0x95, 0x8e, 0xca, 0x19, 0x31, 0x6e, 0x16, 0xdf, 0xe7, 0x75, 0x41, 0xc6, 0xdf, 0x77, - 0x28, 0x33, 0x72, 0xfb, 0xf7, 0xe5, 0xfd, 0xf3, 0x4d, 0xc9, 0xc2, 0x26, 0x2d, 0xfc, 0x17, 0x59, - 0x3d, 0xf8, 0x56, 0x47, 0x95, 0xad, 0xbb, 0xe3, 0xd6, 0x1b, 0x21, 0xc5, 0x35, 0x1a, 0xce, 0x47, - 0x56, 0x72, 0x40, 0xa2, 0x00, 0x9b, 0xf8, 0x4f, 0x31, 0xe0, 0x76, 0xed, 0xed, 0xc3, 0xe9, 0xc2, - 0xd2, 0x67, 0x0b, 0x4b, 0x7f, 0x5a, 0x58, 0xfa, 0xf5, 0xd2, 0xd2, 0x66, 0x4b, 0x4b, 0x7b, 0x58, - 0x5a, 0xda, 0xc9, 0x7f, 0x3f, 0x90, 0xfd, 0x91, 0x4b, 0x3c, 0x08, 0x57, 0x5e, 0xff, 0x06, 0xcc, - 0x15, 0x6b, 0xe3, 0xb1, 0xb3, 0x4b, 0x2f, 0x32, 0x7b, 0x39, 0x89, 0xb9, 0x70, 0xcb, 0xea, 0x15, - 0xee, 0xbc, 0x04, 0x00, 0x00, 0xff, 0xff, 0xca, 0xc7, 0x5f, 0x51, 0x14, 0x03, 0x00, 0x00, + 0xb2, 0x74, 0x0f, 0x3b, 0xb3, 0x8d, 0x78, 0xf1, 0x58, 0xf4, 0x22, 0x22, 0x6d, 0x8f, 0x5e, 0x64, + 0x12, 0x87, 0x34, 0xd8, 0xe4, 0x9f, 0x66, 0xa6, 0xc5, 0x5e, 0xf5, 0x05, 0x04, 0x5f, 0xc2, 0x47, + 0xf0, 0x11, 0x7a, 0x2c, 0x78, 0x11, 0x0f, 0x45, 0x5a, 0x1f, 0x44, 0x32, 0x49, 0x0b, 0xad, 0x41, + 0xf4, 0x16, 0xe6, 0xff, 0xfd, 0xbf, 0xef, 0x37, 0x5f, 0x06, 0x35, 0x40, 0x84, 0x20, 0x02, 0x41, + 0xc3, 0x20, 0x92, 0x74, 0xdc, 0x72, 0xb9, 0x64, 0x2d, 0x3a, 0x1c, 0xf1, 0x64, 0x42, 0xe2, 0x04, + 0x24, 0xe0, 0x6a, 0xae, 0x20, 0xa9, 0x82, 0xe4, 0x0a, 0xa3, 0xea, 0x83, 0x0f, 0x4a, 0x40, 0xd3, + 0xaf, 0x4c, 0x6b, 0x98, 0x3e, 0x80, 0x3f, 0xe0, 0x94, 0xc5, 0x01, 0x65, 0x51, 0x04, 0x92, 0xc9, + 0x00, 0x22, 0x91, 0x4f, 0xeb, 0x85, 0x59, 0xca, 0x56, 0x09, 0xec, 0x2a, 0xc2, 0xdd, 0x34, 0xb9, + 0xc3, 0x12, 0x16, 0x8a, 0x1e, 0x1f, 0x8e, 0xb8, 0x90, 0x76, 0x17, 0x7d, 0xdf, 0x38, 0x15, 0x31, + 0x44, 0x82, 0xe3, 0x3d, 0x54, 0x8e, 0xd5, 0xc9, 0x0f, 0xbd, 0xa1, 0x37, 0xbf, 0x38, 0x26, 0x29, + 0x02, 0x25, 0xd9, 0x56, 0xfb, 0xd3, 0x74, 0x5e, 0xd7, 0x7a, 0xf9, 0x86, 0xfd, 0x13, 0xd5, 0x94, + 0xe5, 0x41, 0x0c, 0x5e, 0xbf, 0x93, 0xc0, 0x38, 0x10, 0x29, 0xe7, 0x2a, 0x31, 0x42, 0x66, 0xf1, + 0x38, 0x8f, 0x3e, 0x46, 0xdf, 0x78, 0x3a, 0x3a, 0x8d, 0xd7, 0x33, 0x05, 0xf1, 0xb5, 0xfd, 0x2b, + 0x8d, 0x79, 0x9c, 0xd7, 0x6b, 0x9e, 0x82, 0x11, 0x67, 0xe7, 0x24, 0x00, 0x1a, 0x32, 0xd9, 0x27, + 0x47, 0xdc, 0x67, 0xde, 0x64, 0x9f, 0x7b, 0xbd, 0x0a, 0xdf, 0xf4, 0x75, 0xee, 0x4a, 0xe8, 0xb3, + 0x0a, 0xc4, 0x57, 0x3a, 0x2a, 0x67, 0xc4, 0xb8, 0x59, 0x7c, 0x9f, 0xd7, 0x05, 0x19, 0x7f, 0xdf, + 0xa1, 0xcc, 0xc8, 0xed, 0xdf, 0x97, 0xf7, 0xcf, 0x37, 0x25, 0x0b, 0x9b, 0xb4, 0xf0, 0x5f, 0x64, + 0xf5, 0xe0, 0x5b, 0x1d, 0x55, 0xb6, 0xee, 0x8e, 0x5b, 0x6f, 0x84, 0x14, 0xd7, 0x68, 0x38, 0x1f, + 0x59, 0xc9, 0x01, 0x89, 0x02, 0x6c, 0xe2, 0x3f, 0xc5, 0x80, 0xdb, 0xb5, 0xb7, 0x0f, 0xa7, 0x0b, + 0x4b, 0x9f, 0x2d, 0x2c, 0xfd, 0x69, 0x61, 0xe9, 0xd7, 0x4b, 0x4b, 0x9b, 0x2d, 0x2d, 0xed, 0x61, + 0x69, 0x69, 0x27, 0xff, 0xfd, 0x40, 0xf6, 0x47, 0x2e, 0xf1, 0x20, 0x5c, 0x79, 0xfd, 0x1b, 0x30, + 0x57, 0xac, 0x8d, 0xc7, 0xce, 0x2e, 0xbd, 0xc8, 0xec, 0xe5, 0x24, 0xe6, 0xc2, 0x2d, 0xab, 0x57, + 0xb8, 0xf3, 0x12, 0x00, 0x00, 0xff, 0xff, 0x0a, 0xa3, 0x77, 0x46, 0x14, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/pool-incentives/client/cli/query.go b/x/pool-incentives/client/cli/query.go index 9310d4723fd..2ef058f9706 100644 --- a/x/pool-incentives/client/cli/query.go +++ b/x/pool-incentives/client/cli/query.go @@ -4,7 +4,7 @@ import ( "github.com/spf13/cobra" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) // GetQueryCmd returns the cli query commands for this module. diff --git a/x/pool-incentives/client/cli/query_test.go b/x/pool-incentives/client/cli/query_test.go index b1d3fb8dd54..25f1d7bcb1c 100644 --- a/x/pool-incentives/client/cli/query_test.go +++ b/x/pool-incentives/client/cli/query_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) type QueryTestSuite struct { diff --git a/x/pool-incentives/client/cli/tx.go b/x/pool-incentives/client/cli/tx.go index 1695859b496..d9b22cb85aa 100644 --- a/x/pool-incentives/client/cli/tx.go +++ b/x/pool-incentives/client/cli/tx.go @@ -12,7 +12,7 @@ import ( "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) func NewCmdSubmitUpdatePoolIncentivesProposal() *cobra.Command { diff --git a/x/pool-incentives/client/proposal_handler.go b/x/pool-incentives/client/proposal_handler.go index 605cb1a14a2..19a79cc16f5 100644 --- a/x/pool-incentives/client/proposal_handler.go +++ b/x/pool-incentives/client/proposal_handler.go @@ -1,7 +1,7 @@ package client import ( - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/client/cli" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" ) diff --git a/x/pool-incentives/handler.go b/x/pool-incentives/handler.go index ed539c53600..06e77f48851 100644 --- a/x/pool-incentives/handler.go +++ b/x/pool-incentives/handler.go @@ -7,8 +7,8 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/keeper" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/keeper" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) // NewPoolIncentivesProposalHandler is a handler for governance proposals on new pool incentives. diff --git a/x/pool-incentives/keeper/distr.go b/x/pool-incentives/keeper/distr.go index 539f46d42bc..0a4dbb3a968 100644 --- a/x/pool-incentives/keeper/distr.go +++ b/x/pool-incentives/keeper/distr.go @@ -8,7 +8,7 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/pool-incentives/keeper/distr_test.go b/x/pool-incentives/keeper/distr_test.go index 2f725416d85..175dfbf449a 100644 --- a/x/pool-incentives/keeper/distr_test.go +++ b/x/pool-incentives/keeper/distr_test.go @@ -5,8 +5,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/coinutil" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/pool-incentives/keeper/genesis.go b/x/pool-incentives/keeper/genesis.go index 069fd9e281d..f3f6cad540e 100644 --- a/x/pool-incentives/keeper/genesis.go +++ b/x/pool-incentives/keeper/genesis.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func (k Keeper) InitGenesis(ctx sdk.Context, genState *types.GenesisState) { diff --git a/x/pool-incentives/keeper/genesis_test.go b/x/pool-incentives/keeper/genesis_test.go index 6ad4051bbd0..ddbef09a012 100644 --- a/x/pool-incentives/keeper/genesis_test.go +++ b/x/pool-incentives/keeper/genesis_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - simapp "github.com/osmosis-labs/osmosis/v24/app" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - pool_incentives "github.com/osmosis-labs/osmosis/v24/x/pool-incentives" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + simapp "github.com/osmosis-labs/osmosis/v25/app" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + pool_incentives "github.com/osmosis-labs/osmosis/v25/x/pool-incentives" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) var ( diff --git a/x/pool-incentives/keeper/gov.go b/x/pool-incentives/keeper/gov.go index 9f39a37bdde..0173e77066a 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/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/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 a9657161a83..08301ad3a73 100644 --- a/x/pool-incentives/keeper/grpc_query.go +++ b/x/pool-incentives/keeper/grpc_query.go @@ -10,10 +10,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - incentivetypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + incentivetypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var _ types.QueryServer = Querier{} diff --git a/x/pool-incentives/keeper/grpc_query_test.go b/x/pool-incentives/keeper/grpc_query_test.go index 867bf1a9fb8..97c617d9cf6 100644 --- a/x/pool-incentives/keeper/grpc_query_test.go +++ b/x/pool-incentives/keeper/grpc_query_test.go @@ -8,10 +8,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) var ( diff --git a/x/pool-incentives/keeper/hooks.go b/x/pool-incentives/keeper/hooks.go index e7fa5bc4d9b..ed29a5d3336 100644 --- a/x/pool-incentives/keeper/hooks.go +++ b/x/pool-incentives/keeper/hooks.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" ) type Hooks struct { diff --git a/x/pool-incentives/keeper/keeper.go b/x/pool-incentives/keeper/keeper.go index 05765da1121..f24b9efd252 100644 --- a/x/pool-incentives/keeper/keeper.go +++ b/x/pool-incentives/keeper/keeper.go @@ -9,10 +9,10 @@ import ( "github.com/cometbft/cometbft/libs/log" "github.com/osmosis-labs/osmosis/osmoutils" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" @@ -20,7 +20,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type Keeper struct { diff --git a/x/pool-incentives/keeper/keeper_test.go b/x/pool-incentives/keeper/keeper_test.go index 78b9d09eeb0..f1fa2919470 100644 --- a/x/pool-incentives/keeper/keeper_test.go +++ b/x/pool-incentives/keeper/keeper_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type KeeperTestSuite struct { diff --git a/x/pool-incentives/keeper/params.go b/x/pool-incentives/keeper/params.go index 1f5f32aaff4..d6af1108606 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/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/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 98098943bf7..16fb4eea6f1 100644 --- a/x/pool-incentives/module.go +++ b/x/pool-incentives/module.go @@ -27,9 +27,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/gov/simulation" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/keeper" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/keeper" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) var ( diff --git a/x/pool-incentives/types/errors.go b/x/pool-incentives/types/errors.go index 37d7a16950e..29e3d2662d1 100644 --- a/x/pool-incentives/types/errors.go +++ b/x/pool-incentives/types/errors.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" errorsmod "cosmossdk.io/errors" ) diff --git a/x/pool-incentives/types/expected_keepers.go b/x/pool-incentives/types/expected_keepers.go index f78c9b2e308..bab9b9569ad 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" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/x/pool-incentives/types/genesis.pb.go b/x/pool-incentives/types/genesis.pb.go index 92a279119d7..d7e1d56f72f 100644 --- a/x/pool-incentives/types/genesis.pb.go +++ b/x/pool-incentives/types/genesis.pb.go @@ -123,7 +123,7 @@ var fileDescriptor_4400dc3495d1d6ad = []byte{ // 468 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x4d, 0x6b, 0x13, 0x41, 0x1c, 0xc6, 0x33, 0xf6, 0x05, 0xdc, 0x7a, 0xe9, 0x22, 0x98, 0x54, 0x98, 0x2d, 0x2b, 0x96, 0x2a, - 0x76, 0x96, 0x46, 0x41, 0x50, 0x10, 0x8c, 0x81, 0x52, 0x10, 0x29, 0xab, 0x5e, 0xbc, 0x2c, 0xb3, + 0x76, 0x96, 0x46, 0x44, 0x50, 0x10, 0x8c, 0x81, 0x52, 0x10, 0x29, 0xab, 0x5e, 0xbc, 0x2c, 0xb3, 0x9b, 0xc9, 0x3a, 0x74, 0x32, 0xff, 0xb0, 0x33, 0x09, 0xe6, 0x3b, 0x78, 0xf0, 0xe8, 0xc5, 0xcf, 0xe2, 0x35, 0xc7, 0x1e, 0x3d, 0x45, 0x49, 0xbe, 0x41, 0x3f, 0x81, 0xec, 0xbc, 0xc4, 0x88, 0xd2, 0xf4, 0xb6, 0xcb, 0x3c, 0x2f, 0xbf, 0x19, 0x9e, 0xe0, 0x11, 0xa8, 0x01, 0x28, 0xae, 0x92, 0x21, @@ -149,7 +149,7 @@ var fileDescriptor_4400dc3495d1d6ad = []byte{ 0x8c, 0x2e, 0xe6, 0x18, 0xfd, 0x9a, 0x63, 0xf4, 0x65, 0x81, 0x1b, 0x17, 0x0b, 0xdc, 0xf8, 0xb1, 0xc0, 0x8d, 0x0f, 0xcf, 0x4b, 0xae, 0x3f, 0x8e, 0x72, 0x52, 0xc0, 0xc0, 0x8f, 0xfc, 0x48, 0xd0, 0x5c, 0x2d, 0x17, 0x3f, 0x6e, 0x3f, 0x49, 0x3e, 0x99, 0xdd, 0x1f, 0xad, 0x0c, 0x5f, 0x4f, 0x86, - 0x4c, 0xe5, 0xdb, 0x66, 0x6a, 0x8f, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x14, 0xb4, 0x29, 0x0d, + 0x4c, 0xe5, 0xdb, 0x66, 0x6a, 0x8f, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x24, 0xdb, 0x3b, 0xa3, 0x03, 0x00, 0x00, } diff --git a/x/pool-incentives/types/genesis_test.go b/x/pool-incentives/types/genesis_test.go index 46f503218ce..0c81d79f483 100644 --- a/x/pool-incentives/types/genesis_test.go +++ b/x/pool-incentives/types/genesis_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) func TestGenesisStateMarshalUnmarshal(t *testing.T) { diff --git a/x/pool-incentives/types/gov.pb.go b/x/pool-incentives/types/gov.pb.go index 77191abb926..a1b58f1f799 100644 --- a/x/pool-incentives/types/gov.pb.go +++ b/x/pool-incentives/types/gov.pb.go @@ -146,9 +146,9 @@ var fileDescriptor_766e5732ae87681c = []byte{ 0xc0, 0xfc, 0x8e, 0xcf, 0x67, 0x4e, 0xa1, 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, 0x9d, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x0b, 0x4b, 0x4d, 0xba, - 0x39, 0x89, 0x49, 0xc5, 0xf0, 0xa4, 0x55, 0x66, 0x64, 0xa2, 0x5f, 0x01, 0x4e, 0x60, 0xba, 0x48, + 0x39, 0x89, 0x49, 0xc5, 0xf0, 0xa4, 0x55, 0x66, 0x64, 0xaa, 0x5f, 0x01, 0x4e, 0x60, 0xba, 0x48, 0x29, 0xac, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x9c, 0xaa, 0x8c, 0x01, 0x01, 0x00, 0x00, - 0xff, 0xff, 0x90, 0x68, 0x77, 0x31, 0x16, 0x03, 0x00, 0x00, + 0xff, 0xff, 0x63, 0xf8, 0x85, 0x07, 0x16, 0x03, 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 47584528c52..96c0c27d151 100644 --- a/x/pool-incentives/types/gov_test.go +++ b/x/pool-incentives/types/gov_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) func TestUpdatePoolIncentivesProposalMarshalUnmarshal(t *testing.T) { diff --git a/x/pool-incentives/types/incentives.pb.go b/x/pool-incentives/types/incentives.pb.go index a0374a1650d..3f3f1a8c2be 100644 --- a/x/pool-incentives/types/incentives.pb.go +++ b/x/pool-incentives/types/incentives.pb.go @@ -375,7 +375,7 @@ var fileDescriptor_71a21c85a9e39348 = []byte{ // 600 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xc1, 0x6e, 0xd3, 0x4c, 0x10, 0xce, 0xb6, 0x51, 0xda, 0xae, 0xfb, 0xff, 0x80, 0x4b, 0xd5, 0xb4, 0x08, 0xbb, 0x5a, 0x09, - 0xa9, 0x52, 0xd5, 0xb5, 0x5a, 0xca, 0x25, 0x9c, 0x08, 0x91, 0x50, 0x00, 0xa1, 0xca, 0xa2, 0xaa, + 0xa9, 0x52, 0xd5, 0xb5, 0x5a, 0xe8, 0x25, 0x9c, 0x08, 0x91, 0x50, 0x00, 0xa1, 0xca, 0xa2, 0xaa, 0xc4, 0x25, 0x5a, 0xc7, 0x5b, 0xc7, 0xaa, 0xed, 0x89, 0xbc, 0x9b, 0x94, 0xf0, 0x04, 0x1c, 0x39, 0xf6, 0xd8, 0x57, 0xe0, 0xcc, 0x0b, 0xf4, 0xd8, 0x23, 0xe2, 0x60, 0x50, 0x72, 0xe1, 0x9c, 0x27, 0x40, 0x5e, 0xdb, 0x8d, 0x01, 0x11, 0x71, 0xe0, 0xb6, 0xb3, 0x33, 0xdf, 0x7c, 0xdf, 0xb7, 0xb3, @@ -391,12 +391,12 @@ var fileDescriptor_71a21c85a9e39348 = []byte{ 0x3b, 0xd8, 0xa4, 0x99, 0x44, 0x5a, 0x48, 0xa4, 0x05, 0xb6, 0xf9, 0xe0, 0x2a, 0x31, 0x2b, 0xd3, 0xc4, 0xdc, 0xcc, 0x04, 0xfc, 0xde, 0x82, 0x5c, 0x7c, 0x35, 0x91, 0x7d, 0x27, 0xf8, 0x95, 0x94, 0x7c, 0x44, 0x78, 0xa5, 0xe5, 0x0b, 0x19, 0x2b, 0xfa, 0x13, 0xbc, 0x2a, 0x41, 0xb2, 0xa0, 0x73, - 0xce, 0x7d, 0xaf, 0x27, 0x73, 0x6b, 0x87, 0x69, 0xf7, 0x2f, 0x89, 0xb9, 0xde, 0x55, 0x2f, 0x2b, - 0xdc, 0x33, 0xea, 0x83, 0x15, 0x32, 0xd9, 0xa3, 0xed, 0x48, 0xce, 0x7c, 0x97, 0xa1, 0xc4, 0xd6, - 0x54, 0x78, 0xa2, 0x22, 0xfd, 0x05, 0x5e, 0x8a, 0x79, 0x17, 0x62, 0x57, 0xd4, 0x17, 0x94, 0x99, - 0x5d, 0x3a, 0x7f, 0x4a, 0x54, 0x89, 0xb2, 0x15, 0xa6, 0x59, 0x4d, 0x05, 0xd8, 0x45, 0x07, 0xf2, - 0x0e, 0x6b, 0xa5, 0xac, 0x4e, 0xf1, 0xb2, 0xc7, 0x06, 0x1e, 0xef, 0xf8, 0xae, 0x12, 0x5c, 0x6d, - 0xae, 0x4d, 0x13, 0xf3, 0x56, 0xa6, 0xa9, 0xc8, 0x10, 0x7b, 0x49, 0x1d, 0xdb, 0xae, 0xfe, 0x08, + 0xce, 0x7d, 0xaf, 0x27, 0x73, 0x6b, 0x8f, 0xd2, 0xee, 0x5f, 0x12, 0x73, 0xbd, 0xab, 0x5e, 0x56, + 0xb8, 0x67, 0xd4, 0x07, 0x2b, 0x64, 0xb2, 0x47, 0xdb, 0x91, 0x9c, 0xf9, 0x2e, 0x43, 0x89, 0xad, + 0xa9, 0xf0, 0x44, 0x45, 0xfa, 0x0b, 0xbc, 0x14, 0xf3, 0x2e, 0xc4, 0xae, 0xa8, 0x2f, 0x28, 0x33, + 0xbb, 0x74, 0xfe, 0x94, 0xa8, 0x12, 0x65, 0x2b, 0x4c, 0xb3, 0x9a, 0x0a, 0xb0, 0x8b, 0x0e, 0xe4, + 0x1d, 0xd6, 0x4a, 0x59, 0x9d, 0xe2, 0x65, 0x8f, 0x0d, 0x3c, 0xde, 0xf1, 0x5d, 0x25, 0xb8, 0xda, + 0x5c, 0x9b, 0x26, 0xe6, 0xad, 0x4c, 0x53, 0x91, 0x21, 0xf6, 0x92, 0x3a, 0xb6, 0x5d, 0xfd, 0x10, 0xd7, 0x72, 0x7b, 0x0b, 0xca, 0xde, 0xfd, 0xb9, 0xf6, 0xec, 0xbc, 0xb8, 0x51, 0xfd, 0x7e, 0x69, 0x22, 0xf2, 0x09, 0x61, 0xed, 0x08, 0x20, 0x78, 0x0d, 0xcf, 0xd2, 0x76, 0xfa, 0x2e, 0x5e, 0x4a, 0x0d, 0xcc, 0xb8, 0xf5, 0x69, 0x62, 0xfe, 0x9f, 0x71, 0xe7, 0x09, 0x62, 0xd7, 0xd2, 0x53, 0xdb, @@ -410,7 +410,7 @@ var fileDescriptor_71a21c85a9e39348 = []byte{ 0x95, 0xcf, 0x13, 0xa3, 0xf2, 0xe6, 0xb1, 0xe7, 0xcb, 0xde, 0xc0, 0xa1, 0x5d, 0x08, 0x8b, 0xdd, 0xb2, 0x17, 0x30, 0x47, 0xdc, 0x2c, 0x9a, 0xe1, 0xc1, 0xa1, 0xf5, 0x56, 0xad, 0x9b, 0xbd, 0xd2, 0xbe, 0x91, 0xa3, 0x3e, 0x17, 0x4e, 0x4d, 0xbd, 0xfd, 0xc3, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, - 0xf8, 0x8c, 0xd1, 0xdb, 0x96, 0x04, 0x00, 0x00, + 0x0b, 0x1c, 0x23, 0xed, 0x96, 0x04, 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 3a848989aa5..731f619f4d6 100644 --- a/x/pool-incentives/types/incentives_test.go +++ b/x/pool-incentives/types/incentives_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) func TestParamsMarshalUnmarshal(t *testing.T) { diff --git a/x/pool-incentives/types/query.pb.go b/x/pool-incentives/types/query.pb.go index fbf60c490b0..0624dcc0097 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/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - types "github.com/osmosis-labs/osmosis/v24/x/incentives/types" + types "github.com/osmosis-labs/osmosis/v25/x/incentives/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -671,7 +671,7 @@ var fileDescriptor_c9aea78c6f643155 = []byte{ // 924 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x41, 0x6f, 0x1b, 0x45, 0x14, 0xce, 0x34, 0x21, 0x4d, 0x26, 0x12, 0xd4, 0x93, 0x40, 0x9c, 0x15, 0xac, 0xc3, 0xd0, 0x42, - 0x4a, 0x95, 0x5d, 0x6a, 0xa7, 0x3d, 0xb4, 0x01, 0x24, 0x37, 0x08, 0x45, 0xe2, 0x10, 0x56, 0x42, + 0x4a, 0x95, 0x5d, 0x6a, 0x37, 0x3d, 0xb4, 0x01, 0x24, 0x37, 0x08, 0x45, 0xe2, 0x10, 0x56, 0x42, 0x48, 0x70, 0xb0, 0xd6, 0xde, 0xc9, 0x66, 0xc4, 0x7a, 0xc7, 0xf5, 0xac, 0x43, 0x03, 0xea, 0xa5, 0x12, 0x77, 0x10, 0x17, 0xce, 0x88, 0x9e, 0x39, 0xf1, 0x0f, 0x38, 0xf4, 0x46, 0x25, 0x2e, 0x5c, 0x30, 0x28, 0xe1, 0xc0, 0xd9, 0xbf, 0x00, 0xed, 0xec, 0x9b, 0xad, 0xbd, 0x6b, 0x7b, 0xed, 0x72, @@ -711,14 +711,14 @@ var fileDescriptor_c9aea78c6f643155 = []byte{ 0xd1, 0xfc, 0xe0, 0x41, 0xc4, 0xba, 0xa1, 0x1b, 0xa4, 0x97, 0x51, 0x99, 0xc8, 0xd0, 0x86, 0x5f, 0x9d, 0x9e, 0x06, 0x9a, 0x6a, 0x78, 0xc9, 0x73, 0x23, 0x37, 0x5d, 0x2d, 0x2d, 0x62, 0x48, 0x80, 0xaa, 0x80, 0x1d, 0x57, 0xc9, 0xd5, 0xc7, 0xab, 0xf8, 0x05, 0x85, 0x4e, 0x7e, 0x41, 0x78, 0x45, - 0x1b, 0x24, 0xd9, 0x9b, 0xd3, 0x4f, 0x15, 0x53, 0xe3, 0xd6, 0x73, 0xb9, 0x30, 0xdd, 0x7f, 0xf4, - 0xfb, 0x3f, 0xdf, 0x5f, 0xba, 0x4d, 0xf6, 0x46, 0xbe, 0x3b, 0xbb, 0x63, 0x3e, 0x3c, 0x6a, 0xc2, - 0xbb, 0xdc, 0x93, 0xf6, 0xd7, 0xb0, 0x93, 0x0f, 0xc9, 0xcf, 0x08, 0xaf, 0xa6, 0x56, 0x42, 0x66, - 0xa3, 0x90, 0xb5, 0x36, 0xe3, 0xf6, 0xbc, 0x65, 0x40, 0xbd, 0xa6, 0xa8, 0xef, 0x92, 0x1b, 0x85, - 0xd4, 0x9f, 0x99, 0x1a, 0xf9, 0x11, 0xe1, 0xe5, 0xc4, 0x6e, 0x48, 0x75, 0xa6, 0xbe, 0x23, 0x8e, - 0x67, 0xd4, 0xe6, 0xaa, 0x01, 0xa2, 0xb6, 0x22, 0x7a, 0x9d, 0xbc, 0x55, 0x48, 0x34, 0xb1, 0x3e, - 0xf2, 0x1b, 0xc2, 0xa5, 0x9c, 0xa9, 0x91, 0x77, 0x67, 0xea, 0x3d, 0xc9, 0x2e, 0x8d, 0xf7, 0x9e, - 0xb7, 0x1c, 0x54, 0xdc, 0x55, 0x2a, 0x6e, 0x91, 0x5a, 0xa1, 0x8a, 0xbc, 0x5f, 0x2a, 0x45, 0x39, + 0x1b, 0x24, 0xb9, 0x35, 0xa7, 0x9f, 0x2a, 0xa6, 0xc6, 0xde, 0x73, 0xb9, 0x30, 0xdd, 0x7f, 0xf4, + 0xfb, 0x3f, 0xdf, 0x5f, 0xba, 0x4d, 0x6e, 0x8d, 0x7c, 0x77, 0x76, 0xc7, 0x7c, 0x78, 0xd4, 0x84, + 0x77, 0xb9, 0x27, 0xed, 0xaf, 0x61, 0x27, 0x1f, 0x92, 0x9f, 0x11, 0x5e, 0x4d, 0xad, 0x84, 0xcc, + 0x46, 0x21, 0x6b, 0x6d, 0xc6, 0xed, 0x79, 0xcb, 0x80, 0x7a, 0x4d, 0x51, 0xdf, 0x25, 0x37, 0x0a, + 0xa9, 0x3f, 0x33, 0x35, 0xf2, 0x23, 0xc2, 0xcb, 0x89, 0xdd, 0x90, 0xea, 0x4c, 0x7d, 0x47, 0x1c, + 0xcf, 0xa8, 0xcd, 0x55, 0x03, 0x44, 0x6d, 0x45, 0xf4, 0x3a, 0x79, 0xab, 0x90, 0x68, 0x62, 0x7d, + 0xe4, 0x37, 0x84, 0x4b, 0x39, 0x53, 0x23, 0xef, 0xce, 0xd4, 0x7b, 0x92, 0x5d, 0x1a, 0xef, 0x3d, + 0x6f, 0x39, 0xa8, 0xb8, 0xab, 0x54, 0xec, 0x91, 0x5a, 0xa1, 0x8a, 0xbc, 0x5f, 0x2a, 0x45, 0x39, 0x47, 0x98, 0x51, 0xd1, 0x24, 0x2f, 0x9d, 0x51, 0xd1, 0x44, 0x23, 0x9a, 0x43, 0x51, 0xde, 0x54, 0xc8, 0xbf, 0x08, 0x6f, 0x4e, 0x70, 0x05, 0x72, 0x6f, 0x26, 0x62, 0xd3, 0xad, 0xc7, 0x38, 0xf8, 0x7f, 0x20, 0xa0, 0xb1, 0xae, 0x34, 0xee, 0x93, 0x3b, 0x85, 0x1a, 0x19, 0x20, 0x0d, 0xfd, 0x71, @@ -726,7 +726,7 @@ var fileDescriptor_c9aea78c6f643155 = []byte{ 0xdf, 0x5e, 0x98, 0x0b, 0x4f, 0x2f, 0xcc, 0x85, 0x3f, 0x2e, 0xcc, 0x85, 0xcf, 0xee, 0xfa, 0x3c, 0x3a, 0xe9, 0x35, 0xad, 0x96, 0x68, 0x6b, 0xfc, 0xdd, 0xc0, 0x6d, 0xca, 0xb4, 0xd9, 0x69, 0x75, 0xcf, 0x7e, 0x90, 0x6b, 0x19, 0x9d, 0x75, 0x98, 0x6c, 0x2e, 0xab, 0xaf, 0x54, 0xed, 0xbf, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x02, 0x8c, 0x1a, 0x69, 0xb2, 0x0b, 0x00, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xf1, 0x1c, 0xe8, 0x5f, 0xb2, 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 a0c77995556..775c7213515 100644 --- a/x/pool-incentives/types/query_test.go +++ b/x/pool-incentives/types/query_test.go @@ -7,7 +7,7 @@ import ( proto "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) func TestQueryGaugeIdsResponseMarshalUnmarshal(t *testing.T) { diff --git a/x/pool-incentives/types/record_test.go b/x/pool-incentives/types/record_test.go index 0cf5831d1a0..d8eca3fe7cf 100644 --- a/x/pool-incentives/types/record_test.go +++ b/x/pool-incentives/types/record_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" ) // TestDistrRecord is a test on the weights of distribution gauges. diff --git a/x/pool-incentives/types/shared.pb.go b/x/pool-incentives/types/shared.pb.go index 3184945c65d..8a8f125770b 100644 --- a/x/pool-incentives/types/shared.pb.go +++ b/x/pool-incentives/types/shared.pb.go @@ -147,25 +147,25 @@ var fileDescriptor_6f34a66641e7136a = []byte{ // 338 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x91, 0x31, 0x4b, 0x3b, 0x31, 0x18, 0xc6, 0x2f, 0xff, 0x7f, 0x11, 0x89, 0x20, 0xe5, 0x70, 0x28, 0x45, 0xd2, 0x52, 0x97, 0x82, - 0xf4, 0x42, 0xab, 0x93, 0x82, 0x43, 0x9d, 0x04, 0x05, 0x29, 0xba, 0xb8, 0x1c, 0x49, 0x2e, 0x5e, - 0x43, 0xd3, 0xbc, 0xe5, 0x92, 0x16, 0xfd, 0x16, 0xe2, 0x27, 0x70, 0xf3, 0xab, 0x74, 0xec, 0xe8, - 0x24, 0xd2, 0x2e, 0x7e, 0x0c, 0x69, 0x7a, 0x2d, 0x75, 0x39, 0xb7, 0xbb, 0xbc, 0xbf, 0xe7, 0xc9, - 0x93, 0xe7, 0xc5, 0xc7, 0x60, 0x87, 0x60, 0x95, 0xa5, 0x23, 0x00, 0xad, 0x8c, 0x90, 0xc6, 0xa9, - 0x89, 0xb4, 0x74, 0xd2, 0xe6, 0xd2, 0xb1, 0x36, 0xb5, 0x7d, 0x96, 0xc9, 0x24, 0x1a, 0x65, 0xe0, - 0x20, 0x24, 0x39, 0x1c, 0xfd, 0x86, 0xa3, 0x1c, 0xae, 0x1e, 0xa4, 0x90, 0x82, 0x47, 0xe9, 0xf2, - 0x6b, 0xa5, 0xaa, 0x92, 0x14, 0x20, 0xd5, 0x92, 0xfa, 0x3f, 0x3e, 0x7e, 0xa4, 0xc9, 0x38, 0x63, - 0x4e, 0x81, 0xc9, 0xe7, 0xf4, 0x8f, 0x08, 0x5b, 0x17, 0x79, 0x41, 0xe3, 0x1d, 0xe1, 0xf2, 0x8d, - 0x4a, 0x57, 0x26, 0x3d, 0x29, 0x20, 0x4b, 0x6c, 0xf8, 0x8a, 0xf0, 0x11, 0x67, 0x9a, 0x19, 0x21, - 0xb3, 0xd8, 0x41, 0x2c, 0xc0, 0xcb, 0x32, 0xe6, 0x64, 0x12, 0x2f, 0x9d, 0x63, 0xad, 0xcc, 0xc0, - 0x56, 0x50, 0xfd, 0x7f, 0x73, 0xaf, 0x73, 0x11, 0x15, 0x3f, 0x25, 0xea, 0xe6, 0x56, 0x77, 0x70, - 0xb9, 0x65, 0x74, 0x0b, 0xa0, 0xaf, 0x95, 0x19, 0x74, 0x4b, 0xd3, 0xcf, 0x5a, 0xd0, 0xab, 0xf1, - 0x42, 0xca, 0x36, 0x0c, 0x26, 0xc5, 0x46, 0x61, 0x13, 0x97, 0x37, 0xa9, 0x7d, 0x4a, 0x95, 0x54, - 0x50, 0x1d, 0x35, 0x4b, 0xbd, 0xfd, 0xf5, 0xf9, 0x92, 0xbd, 0x4a, 0xc2, 0x43, 0x8c, 0x85, 0xde, - 0x30, 0xff, 0x3c, 0xb3, 0x2b, 0xf4, 0x6a, 0x7a, 0x56, 0xfa, 0x7e, 0xab, 0xa1, 0xee, 0xfd, 0x74, - 0x4e, 0xd0, 0x6c, 0x4e, 0xd0, 0xd7, 0x9c, 0xa0, 0x97, 0x05, 0x09, 0x66, 0x0b, 0x12, 0x7c, 0x2c, - 0x48, 0xf0, 0x70, 0x9e, 0x2a, 0xd7, 0x1f, 0xf3, 0x48, 0xc0, 0x70, 0xdd, 0x77, 0x4b, 0x33, 0x6e, - 0x37, 0xe5, 0x4f, 0x3a, 0xa7, 0xf4, 0xc9, 0xaf, 0xa0, 0xb5, 0xb5, 0x03, 0xf7, 0x3c, 0x92, 0x96, - 0xef, 0xf8, 0xde, 0x4f, 0x7e, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x2c, 0xf5, 0xbc, 0x2d, 0x02, + 0xf4, 0x42, 0x2b, 0x2e, 0x0a, 0x0e, 0x75, 0x12, 0x14, 0xa4, 0xe8, 0xe2, 0x72, 0x24, 0xb9, 0x78, + 0x0d, 0x4d, 0xf3, 0x96, 0x4b, 0x5a, 0xf4, 0x5b, 0x88, 0x9f, 0xc0, 0xcd, 0xaf, 0xd2, 0xb1, 0xa3, + 0x93, 0x48, 0xbb, 0xf8, 0x31, 0xa4, 0xe9, 0xb5, 0xd4, 0xe5, 0xdc, 0xee, 0xf2, 0xfe, 0x9e, 0x27, + 0x4f, 0x9e, 0x17, 0x1f, 0x83, 0x1d, 0x82, 0x55, 0x96, 0x8e, 0x00, 0xb4, 0x32, 0x42, 0x1a, 0xa7, + 0x26, 0xd2, 0xd2, 0x49, 0x9b, 0x4b, 0xc7, 0xda, 0xd4, 0xf6, 0x59, 0x26, 0x93, 0x68, 0x94, 0x81, + 0x83, 0x90, 0xe4, 0x70, 0xf4, 0x1b, 0x8e, 0x72, 0xb8, 0x7a, 0x90, 0x42, 0x0a, 0x1e, 0xa5, 0xcb, + 0xaf, 0x95, 0xaa, 0x4a, 0x52, 0x80, 0x54, 0x4b, 0xea, 0xff, 0xf8, 0xf8, 0x91, 0x26, 0xe3, 0x8c, + 0x39, 0x05, 0x26, 0x9f, 0xd3, 0x3f, 0x22, 0x6c, 0x5d, 0xe4, 0x05, 0x8d, 0x77, 0x84, 0xcb, 0x37, + 0x2a, 0x5d, 0x99, 0xf4, 0xa4, 0x80, 0x2c, 0xb1, 0xe1, 0x2b, 0xc2, 0x47, 0x9c, 0x69, 0x66, 0x84, + 0xcc, 0x62, 0x07, 0xb1, 0x00, 0x2f, 0xcb, 0x98, 0x93, 0x49, 0xbc, 0x74, 0x8e, 0xb5, 0x32, 0x03, + 0x5b, 0x41, 0xf5, 0xff, 0xcd, 0xbd, 0xce, 0x45, 0x54, 0xfc, 0x94, 0xa8, 0x9b, 0x5b, 0xdd, 0xc1, + 0xe5, 0x96, 0xd1, 0x2d, 0x80, 0xbe, 0x56, 0x66, 0xd0, 0x2d, 0x4d, 0x3f, 0x6b, 0x41, 0xaf, 0xc6, + 0x0b, 0x29, 0xdb, 0x30, 0x98, 0x14, 0x1b, 0x85, 0x4d, 0x5c, 0xde, 0xa4, 0xf6, 0x29, 0x55, 0x52, + 0x41, 0x75, 0xd4, 0x2c, 0xf5, 0xf6, 0xd7, 0xe7, 0x4b, 0xf6, 0x2a, 0x09, 0x0f, 0x31, 0x16, 0x7a, + 0xc3, 0xfc, 0xf3, 0xcc, 0xae, 0xd0, 0xab, 0xe9, 0x59, 0xe9, 0xfb, 0xad, 0x86, 0xba, 0xf7, 0xd3, + 0x39, 0x41, 0xb3, 0x39, 0x41, 0x5f, 0x73, 0x82, 0x5e, 0x16, 0x24, 0x98, 0x2d, 0x48, 0xf0, 0xb1, + 0x20, 0xc1, 0xc3, 0x79, 0xaa, 0x5c, 0x7f, 0xcc, 0x23, 0x01, 0xc3, 0x75, 0xdf, 0x2d, 0xcd, 0xb8, + 0xdd, 0x94, 0x3f, 0xe9, 0x9c, 0xd2, 0x27, 0xbf, 0x82, 0xd6, 0xd6, 0x0e, 0xdc, 0xf3, 0x48, 0x5a, + 0xbe, 0xe3, 0x7b, 0x3f, 0xf9, 0x09, 0x00, 0x00, 0xff, 0xff, 0x0a, 0xbc, 0x07, 0x8a, 0x2d, 0x02, 0x00, 0x00, } diff --git a/x/poolmanager/client/cli/cli_test.go b/x/poolmanager/client/cli/cli_test.go index 9bec9a4d90d..e58ddb6ad48 100644 --- a/x/poolmanager/client/cli/cli_test.go +++ b/x/poolmanager/client/cli/cli_test.go @@ -10,11 +10,11 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryproto" - poolmanagertestutil "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/testutil" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryproto" + poolmanagertestutil "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/testutil" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/hd" diff --git a/x/poolmanager/client/cli/common.go b/x/poolmanager/client/cli/common.go index f03438b84ce..78c62d77143 100644 --- a/x/poolmanager/client/cli/common.go +++ b/x/poolmanager/client/cli/common.go @@ -7,7 +7,7 @@ import ( flag "github.com/spf13/pflag" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func swapAmountInRoutes(fs *flag.FlagSet) ([]types.SwapAmountInRoute, error) { diff --git a/x/poolmanager/client/cli/flags.go b/x/poolmanager/client/cli/flags.go index 065be006beb..8a0ccca695a 100644 --- a/x/poolmanager/client/cli/flags.go +++ b/x/poolmanager/client/cli/flags.go @@ -3,7 +3,7 @@ package cli import ( flag "github.com/spf13/pflag" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) const ( diff --git a/x/poolmanager/client/cli/query.go b/x/poolmanager/client/cli/query.go index 703517dd251..83f749ecc0b 100644 --- a/x/poolmanager/client/cli/query.go +++ b/x/poolmanager/client/cli/query.go @@ -8,8 +8,8 @@ import ( flag "github.com/spf13/pflag" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var customRouterFlagOverride = map[string]string{ diff --git a/x/poolmanager/client/cli/query_test.go b/x/poolmanager/client/cli/query_test.go index 61621993f0c..3d3b06145b4 100644 --- a/x/poolmanager/client/cli/query_test.go +++ b/x/poolmanager/client/cli/query_test.go @@ -4,13 +4,13 @@ import ( gocontext "context" "testing" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + poolmanagerqueryproto "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryproto" ) type QueryTestSuite struct { diff --git a/x/poolmanager/client/cli/tx.go b/x/poolmanager/client/cli/tx.go index 721206865e5..1aee6f6d79c 100644 --- a/x/poolmanager/client/cli/tx.go +++ b/x/poolmanager/client/cli/tx.go @@ -25,9 +25,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func NewTxCmd() *cobra.Command { diff --git a/x/poolmanager/client/cli/tx_test.go b/x/poolmanager/client/cli/tx_test.go index 8ca07d2c0df..05bdc20a8f0 100644 --- a/x/poolmanager/client/cli/tx_test.go +++ b/x/poolmanager/client/cli/tx_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/cli" ) func TestParseCoinsNoSort(t *testing.T) { diff --git a/x/poolmanager/client/grpc/grpc_query.go b/x/poolmanager/client/grpc/grpc_query.go index 8fc350ded33..d65f97e91c7 100644 --- a/x/poolmanager/client/grpc/grpc_query.go +++ b/x/poolmanager/client/grpc/grpc_query.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc/status" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryproto" ) type Querier struct { diff --git a/x/poolmanager/client/grpcv2/grpc_query.go b/x/poolmanager/client/grpcv2/grpc_query.go index 993711a2fc2..d7a117b303a 100644 --- a/x/poolmanager/client/grpcv2/grpc_query.go +++ b/x/poolmanager/client/grpcv2/grpc_query.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc/status" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryprotov2" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryprotov2" ) type Querier struct { diff --git a/x/poolmanager/client/proposal_handler.go b/x/poolmanager/client/proposal_handler.go index b51bc32ed27..ecd197258b1 100644 --- a/x/poolmanager/client/proposal_handler.go +++ b/x/poolmanager/client/proposal_handler.go @@ -1,7 +1,7 @@ package client import ( - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/cli" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" ) diff --git a/x/poolmanager/client/query_proto_wrap.go b/x/poolmanager/client/query_proto_wrap.go index 01c506e7825..49d6a4d6fdc 100644 --- a/x/poolmanager/client/query_proto_wrap.go +++ b/x/poolmanager/client/query_proto_wrap.go @@ -7,10 +7,10 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryprotov2" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryprotov2" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // This file should evolve to being code gen'd, off of `proto/poolmanager/v1beta/query.yml` diff --git a/x/poolmanager/client/queryproto/query.pb.go b/x/poolmanager/client/queryproto/query.pb.go index 5250d3e6f75..3223db5acc6 100644 --- a/x/poolmanager/client/queryproto/query.pb.go +++ b/x/poolmanager/client/queryproto/query.pb.go @@ -15,7 +15,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + types "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -1567,135 +1567,135 @@ func init() { } var fileDescriptor_6256a4106f701b7d = []byte{ - // 2039 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcd, 0x73, 0x1b, 0x49, - 0x15, 0xcf, 0xc8, 0x1f, 0x6b, 0x3d, 0xc7, 0xb6, 0xd2, 0x89, 0x13, 0x5b, 0x09, 0x96, 0xb7, 0xb3, - 0x64, 0xbd, 0x71, 0x34, 0x8a, 0x3f, 0x42, 0x42, 0x60, 0x37, 0x48, 0xb6, 0xb3, 0x11, 0x04, 0xe2, - 0x9d, 0x78, 0x3f, 0x58, 0x08, 0x53, 0x63, 0xab, 0xa3, 0x0c, 0xd1, 0xcc, 0x28, 0x9a, 0x1e, 0xc7, - 0x2a, 0x6a, 0x2f, 0x54, 0x51, 0xcb, 0x89, 0x5a, 0xe0, 0x90, 0x03, 0x07, 0x8a, 0x03, 0x17, 0x3e, - 0x8a, 0x0b, 0x17, 0xee, 0x1c, 0x52, 0x54, 0x41, 0xa5, 0x0a, 0x0e, 0x14, 0x07, 0x41, 0x25, 0x1c, - 0xa8, 0x82, 0xe2, 0x20, 0xfe, 0x01, 0xaa, 0x3f, 0x66, 0x24, 0x8d, 0xa5, 0xd1, 0x48, 0xce, 0x61, - 0x4f, 0x91, 0xbb, 0xdf, 0x7b, 0xfd, 0xfb, 0xbd, 0x7e, 0xbf, 0xee, 0x7e, 0x13, 0x78, 0xdd, 0x71, - 0x2d, 0xc7, 0x35, 0xdd, 0x5c, 0xd5, 0x71, 0x2a, 0x96, 0x61, 0x1b, 0x65, 0x52, 0xcb, 0xed, 0xaf, - 0xec, 0x12, 0x6a, 0xac, 0xe4, 0x1e, 0x79, 0xa4, 0x56, 0x57, 0xab, 0x35, 0x87, 0x3a, 0xe8, 0xac, - 0x34, 0x54, 0xdb, 0x0c, 0x55, 0x69, 0x98, 0x3e, 0x55, 0x76, 0xca, 0x0e, 0xb7, 0xcb, 0xb1, 0x5f, - 0xc2, 0x25, 0xfd, 0x46, 0x54, 0xec, 0x32, 0xb1, 0x09, 0x0f, 0xc7, 0x4d, 0x5f, 0x8b, 0x32, 0xa5, - 0x07, 0xd2, 0xea, 0x52, 0x94, 0x95, 0xfb, 0xd8, 0xa8, 0xea, 0x35, 0xc7, 0xa3, 0x44, 0x5a, 0x2f, - 0xec, 0x71, 0xf3, 0xdc, 0xae, 0xe1, 0x92, 0xc0, 0x6a, 0xcf, 0x31, 0x6d, 0x39, 0x7f, 0xb1, 0x7d, - 0x9e, 0x53, 0x0d, 0xac, 0xaa, 0x46, 0xd9, 0xb4, 0x0d, 0x6a, 0x3a, 0xbe, 0xed, 0xb9, 0xb2, 0xe3, - 0x94, 0x2b, 0x24, 0x67, 0x54, 0xcd, 0x9c, 0x61, 0xdb, 0x0e, 0xe5, 0x93, 0x3e, 0xfa, 0x79, 0x39, - 0xcb, 0xff, 0xda, 0xf5, 0xee, 0xe7, 0x0c, 0xbb, 0xee, 0x4f, 0x89, 0x45, 0x74, 0x91, 0x1c, 0xf1, - 0x87, 0x9c, 0xca, 0x84, 0xbd, 0xa8, 0x69, 0x11, 0x97, 0x1a, 0x56, 0x55, 0x18, 0xe0, 0x19, 0x98, - 0xda, 0x36, 0x6a, 0x86, 0xe5, 0x6a, 0xe4, 0x91, 0x47, 0x5c, 0x8a, 0xef, 0xc2, 0xb4, 0x3f, 0xe0, - 0x56, 0x1d, 0xdb, 0x25, 0x28, 0x0f, 0xe3, 0x55, 0x3e, 0x32, 0xa7, 0x2c, 0x2a, 0x4b, 0x93, 0xab, - 0xe7, 0xd5, 0x88, 0x6d, 0x52, 0x85, 0x73, 0x61, 0xf4, 0x69, 0x23, 0x73, 0x4c, 0x93, 0x8e, 0xf8, - 0xbf, 0x0a, 0x2c, 0x6e, 0xb9, 0xd4, 0xb4, 0x0c, 0x4a, 0xee, 0x3e, 0x36, 0xaa, 0x5b, 0x07, 0xc6, - 0x1e, 0xcd, 0x5b, 0x8e, 0x67, 0xd3, 0xa2, 0x2d, 0x57, 0x46, 0x59, 0x78, 0x85, 0x05, 0xd4, 0xcd, - 0xd2, 0x5c, 0x62, 0x51, 0x59, 0x1a, 0x2d, 0x9c, 0x6a, 0x36, 0x32, 0xd3, 0x75, 0xc3, 0xaa, 0x5c, - 0xc7, 0x72, 0x02, 0xcf, 0x29, 0xda, 0x38, 0xfb, 0x5d, 0x2c, 0x21, 0x15, 0x26, 0xa8, 0xf3, 0x90, - 0xd8, 0xba, 0x69, 0xcf, 0x8d, 0x2c, 0x2a, 0x4b, 0xc9, 0xc2, 0xc9, 0x66, 0x23, 0x33, 0x23, 0xec, - 0xfd, 0x19, 0xac, 0xbd, 0xc2, 0x7f, 0x16, 0x6d, 0x74, 0x0f, 0xc6, 0xf9, 0xce, 0xb9, 0x73, 0xa3, - 0x8b, 0x23, 0x4b, 0x93, 0xab, 0x6a, 0x24, 0x0d, 0x86, 0x32, 0x00, 0xc8, 0xdc, 0x0a, 0xb3, 0x8c, - 0x51, 0xb3, 0x91, 0x99, 0x12, 0x2b, 0x88, 0x58, 0x58, 0x93, 0x41, 0xbf, 0x3c, 0x3a, 0xa1, 0xa4, - 0x12, 0xda, 0xb8, 0x4b, 0xec, 0x12, 0xa9, 0xe1, 0x5f, 0x25, 0x60, 0xb5, 0x27, 0xe1, 0xf7, 0x4d, - 0xfa, 0x60, 0xbb, 0x66, 0x5a, 0x26, 0x35, 0xf7, 0xc9, 0x4e, 0xbd, 0x4a, 0xdc, 0x2e, 0x29, 0x50, - 0x06, 0x4c, 0x41, 0x22, 0x46, 0x0a, 0x6e, 0xc0, 0xb4, 0x40, 0xab, 0xfb, 0xab, 0x8c, 0x2c, 0x8e, - 0x2c, 0x8d, 0x16, 0xe6, 0x9b, 0x8d, 0xcc, 0x6c, 0x3b, 0x2d, 0x7f, 0x1e, 0x6b, 0xc7, 0xc5, 0xc0, - 0xb6, 0x58, 0xf0, 0x3d, 0x38, 0x2d, 0x0d, 0x44, 0x74, 0xc7, 0xa3, 0x7a, 0x89, 0xd8, 0x8e, 0xc5, - 0x73, 0x9a, 0x2c, 0xbc, 0xda, 0x6c, 0x64, 0x3e, 0xd3, 0x11, 0x28, 0x64, 0x87, 0xb5, 0x93, 0x62, - 0x62, 0x87, 0x8d, 0xdf, 0xf1, 0xe8, 0x26, 0x1f, 0xfd, 0xa3, 0x02, 0x17, 0x83, 0x74, 0x99, 0x76, - 0xb9, 0x42, 0xd8, 0x82, 0x3d, 0x2b, 0x65, 0x39, 0x9c, 0x26, 0x74, 0x38, 0x4d, 0x43, 0x27, 0xa9, - 0x00, 0x33, 0x61, 0x72, 0xa2, 0xbc, 0xd2, 0xcd, 0x46, 0xe6, 0x74, 0xbb, 0x5b, 0x1b, 0xab, 0x29, - 0xda, 0xc1, 0xe7, 0x63, 0x05, 0x5e, 0x8d, 0xa8, 0x77, 0x29, 0xac, 0x5d, 0x48, 0xb5, 0x02, 0x19, - 0x7c, 0x96, 0xf3, 0x49, 0x16, 0xae, 0xb1, 0x5a, 0xfb, 0x5b, 0x23, 0x33, 0x2b, 0xc4, 0xec, 0x96, - 0x1e, 0xaa, 0xa6, 0x93, 0xb3, 0x0c, 0xfa, 0x40, 0x2d, 0xda, 0xb4, 0xd9, 0xc8, 0x9c, 0x09, 0xe3, - 0x10, 0xee, 0x58, 0x9b, 0xf6, 0x81, 0x88, 0xd5, 0xf0, 0xff, 0x7a, 0x23, 0xb9, 0xe3, 0xd1, 0x21, - 0xa5, 0xf7, 0xad, 0x40, 0x4a, 0x23, 0x5c, 0x4a, 0xb9, 0x98, 0x52, 0x62, 0x2b, 0xc6, 0xd0, 0x12, - 0x5a, 0x81, 0x64, 0xc0, 0x6c, 0x6e, 0x94, 0x67, 0x84, 0x01, 0x4a, 0x85, 0x48, 0x63, 0x6d, 0xc2, - 0x67, 0x1b, 0x92, 0xdf, 0xaf, 0x13, 0xb0, 0xd6, 0x9b, 0xf5, 0x4b, 0xd3, 0xdf, 0x61, 0x3d, 0x25, - 0x06, 0xd3, 0xd3, 0x5d, 0x98, 0xed, 0xd0, 0x89, 0x69, 0x07, 0x15, 0xc7, 0xe4, 0xb4, 0xd8, 0x6c, - 0x64, 0xce, 0x75, 0x91, 0x93, 0x6f, 0x86, 0x35, 0xd4, 0xa6, 0xa6, 0xa2, 0xcd, 0x8b, 0x6f, 0x88, - 0xec, 0xe1, 0x3f, 0x29, 0xb0, 0xdc, 0x57, 0x7f, 0x6d, 0xf5, 0x32, 0x90, 0x00, 0x6f, 0xc0, 0x74, - 0x88, 0x9d, 0x90, 0x61, 0x5b, 0x96, 0xc2, 0xb4, 0x8e, 0xd3, 0x9e, 0x84, 0x46, 0x62, 0x11, 0xfa, - 0x9e, 0x02, 0x38, 0xaa, 0xec, 0xa5, 0x02, 0x75, 0x5f, 0xeb, 0xa6, 0xdd, 0x29, 0xc0, 0xab, 0xfd, - 0x04, 0x78, 0x3a, 0x04, 0xdc, 0xd7, 0xdf, 0x94, 0x44, 0x2e, 0xe5, 0x77, 0x02, 0x66, 0xbe, 0xe6, - 0x59, 0x2c, 0x99, 0xc1, 0x05, 0xbb, 0x05, 0xa9, 0xd6, 0x90, 0xc4, 0xb1, 0x02, 0x49, 0xdb, 0xb3, - 0x78, 0x95, 0xb8, 0x6d, 0x95, 0x27, 0x19, 0x06, 0x53, 0x58, 0x9b, 0xb0, 0xa5, 0x2b, 0xbe, 0x0e, - 0x93, 0xec, 0xc7, 0x30, 0x3b, 0x82, 0x37, 0xe0, 0xb8, 0xf0, 0x95, 0xcb, 0xaf, 0xc1, 0x28, 0x9b, - 0x91, 0xf7, 0xfb, 0x29, 0x55, 0x3c, 0x1a, 0x54, 0xff, 0xd1, 0xa0, 0xe6, 0xed, 0x7a, 0x21, 0xf9, - 0x87, 0xdf, 0x66, 0xc7, 0x78, 0xd9, 0x6a, 0xdc, 0x98, 0x51, 0xcb, 0x57, 0x2a, 0x1d, 0xd4, 0x8a, - 0x90, 0x6a, 0x0d, 0xc9, 0xd8, 0x57, 0x60, 0xcc, 0xa7, 0x35, 0x12, 0x27, 0xb8, 0xb0, 0xc6, 0x79, - 0x38, 0x73, 0xdb, 0x74, 0x29, 0x8f, 0x55, 0xa8, 0xf3, 0x3a, 0xf0, 0xa9, 0x5e, 0x80, 0x31, 0x51, - 0x46, 0x62, 0xab, 0x52, 0xcd, 0x46, 0xe6, 0xb8, 0x20, 0x2a, 0xab, 0x47, 0x4c, 0xe3, 0x77, 0x60, - 0xee, 0x70, 0x88, 0xa3, 0xa1, 0x7a, 0xa6, 0x40, 0xea, 0x6e, 0xd5, 0xa1, 0xdb, 0x35, 0x73, 0x8f, - 0x0c, 0x25, 0x86, 0x2d, 0x48, 0xb1, 0xb7, 0xa0, 0x6e, 0xb8, 0x2e, 0xa1, 0x1d, 0x72, 0x38, 0xdb, - 0x3a, 0xd6, 0xc3, 0x16, 0x58, 0x9b, 0x66, 0x43, 0x79, 0x36, 0x22, 0x24, 0x71, 0x0b, 0x4e, 0x3c, - 0xf2, 0x1c, 0xda, 0x19, 0x47, 0x48, 0xe3, 0x5c, 0xb3, 0x91, 0x99, 0x13, 0x71, 0x0e, 0x99, 0x60, - 0x6d, 0x86, 0x8f, 0xb5, 0x22, 0xe1, 0x22, 0x9c, 0x68, 0x63, 0x24, 0xd3, 0xb3, 0x0e, 0xe0, 0x56, - 0x1d, 0xaa, 0x57, 0xd9, 0xa8, 0xcc, 0xf3, 0x6c, 0xb3, 0x91, 0x39, 0x21, 0xe2, 0xb6, 0xe6, 0xb0, - 0x96, 0x74, 0x7d, 0x6f, 0x7c, 0x0b, 0xe6, 0x77, 0x1c, 0x6a, 0xf0, 0x02, 0xb8, 0x6d, 0x3e, 0xf2, - 0xcc, 0x92, 0x49, 0xeb, 0x43, 0x15, 0xe8, 0x4f, 0x14, 0x48, 0x77, 0x0b, 0x25, 0xe1, 0x7d, 0x04, - 0xc9, 0x8a, 0x3f, 0x28, 0x77, 0x70, 0x5e, 0x95, 0xef, 0x5e, 0x96, 0xa8, 0xe0, 0xea, 0xd9, 0x70, - 0x4c, 0xbb, 0xb0, 0x29, 0x2f, 0x1b, 0xa9, 0xa6, 0xc0, 0x13, 0xff, 0xe2, 0xef, 0x99, 0xa5, 0xb2, - 0x49, 0x1f, 0x78, 0xbb, 0xea, 0x9e, 0x63, 0xc9, 0x87, 0xb3, 0xfc, 0x27, 0xeb, 0x96, 0x1e, 0xe6, - 0x28, 0xbb, 0x1b, 0x78, 0x10, 0x57, 0x6b, 0xad, 0x88, 0xcf, 0xc0, 0x2c, 0x07, 0x17, 0xe6, 0x88, - 0x9f, 0x28, 0x70, 0x3a, 0x3c, 0xf3, 0xe9, 0x80, 0xec, 0x6f, 0xcd, 0x7b, 0x4e, 0xc5, 0xb3, 0xc8, - 0x4d, 0xa7, 0x36, 0xf4, 0xd9, 0xf1, 0x23, 0x7f, 0x6b, 0x42, 0xa1, 0x24, 0x4f, 0x0a, 0xe3, 0xfb, - 0x7c, 0xa2, 0x3f, 0xc9, 0x7c, 0xe7, 0x23, 0x40, 0xb8, 0x0d, 0xc6, 0x50, 0xae, 0x85, 0xf7, 0x21, - 0xbd, 0x53, 0x33, 0x4a, 0xa6, 0x5d, 0xde, 0x36, 0xcc, 0xda, 0x8e, 0xf1, 0x90, 0xd4, 0x6e, 0x92, - 0x76, 0x81, 0xf2, 0xea, 0xd7, 0x2f, 0xcb, 0x52, 0x6e, 0xe3, 0x27, 0x27, 0xb0, 0x36, 0xce, 0x7f, - 0x5d, 0x6e, 0x19, 0xaf, 0x48, 0x5d, 0x1e, 0x32, 0x5e, 0xf1, 0x8d, 0x57, 0xf0, 0xb7, 0xe1, 0x6c, - 0xd7, 0x75, 0x65, 0x32, 0xbe, 0x02, 0x49, 0xca, 0xc6, 0xf4, 0xfb, 0xc4, 0x57, 0x91, 0x2a, 0x2f, - 0x96, 0x0b, 0x31, 0x38, 0x6e, 0x92, 0x3d, 0x6d, 0x82, 0xca, 0xa0, 0xf8, 0x2f, 0x09, 0xb8, 0xe0, - 0x5f, 0x69, 0x6c, 0x51, 0x52, 0x30, 0x5c, 0x52, 0xba, 0x63, 0x73, 0xed, 0x15, 0xad, 0xaa, 0xb1, - 0x17, 0x5c, 0xcf, 0x5f, 0x84, 0xe4, 0xfd, 0x9a, 0x63, 0xe9, 0xac, 0x11, 0x95, 0x87, 0x7a, 0xc4, - 0x3e, 0x88, 0x56, 0x6d, 0x82, 0x79, 0xb0, 0xbf, 0x11, 0x86, 0x29, 0xea, 0x70, 0xdf, 0xf6, 0xf3, - 0x49, 0x9b, 0xa4, 0x0e, 0x9b, 0x16, 0xe7, 0xcf, 0x99, 0x56, 0xc9, 0xb0, 0x53, 0x67, 0x34, 0x38, - 0xdf, 0x3e, 0x80, 0x94, 0x65, 0x1c, 0x88, 0xc3, 0x41, 0x37, 0x39, 0x2a, 0xf9, 0x06, 0x19, 0x94, - 0xf9, 0xb4, 0x65, 0x1c, 0xb4, 0x71, 0x43, 0xef, 0xc2, 0x34, 0x39, 0xa0, 0xa4, 0x66, 0x1b, 0x15, - 0x79, 0x2e, 0x8d, 0x0d, 0x15, 0x77, 0xca, 0x8f, 0x22, 0x0e, 0xad, 0x5f, 0x2a, 0xf0, 0x7a, 0xdf, - 0xb4, 0xca, 0xfd, 0x7c, 0x0b, 0xc0, 0xb4, 0xab, 0x1e, 0x1d, 0x28, 0xb1, 0x49, 0xee, 0xc2, 0x33, - 0xfb, 0x25, 0x98, 0x74, 0x3c, 0x1a, 0x04, 0x48, 0xc4, 0x0b, 0x00, 0xc2, 0x87, 0x8d, 0xac, 0x7e, - 0x7c, 0x0e, 0xc6, 0xde, 0xf1, 0x48, 0xad, 0x8e, 0x7e, 0xa0, 0xc0, 0xb8, 0xe8, 0xb5, 0xd1, 0xc5, - 0x18, 0x0d, 0xb9, 0x2c, 0x8d, 0xf4, 0x72, 0x2c, 0x5b, 0xc1, 0x17, 0x2f, 0x7f, 0xf7, 0xcf, 0xff, - 0xfc, 0x71, 0xe2, 0xb3, 0xe8, 0x7c, 0x2e, 0xea, 0xa3, 0x88, 0x44, 0xf1, 0x2f, 0x05, 0xe6, 0x7b, - 0xf6, 0x3c, 0xe8, 0xcd, 0xc8, 0x75, 0xfb, 0x7d, 0x1b, 0x48, 0xbf, 0x35, 0xac, 0xbb, 0x64, 0x72, - 0x9b, 0x33, 0xb9, 0x89, 0x36, 0x23, 0x99, 0x7c, 0x47, 0xd6, 0xf4, 0x47, 0x39, 0x22, 0x23, 0x8a, - 0x2f, 0x3e, 0x84, 0xc5, 0x94, 0x4f, 0x3c, 0xdd, 0xb4, 0xd1, 0xcf, 0x12, 0x6d, 0xcf, 0xe5, 0xfe, - 0xdd, 0x3d, 0xba, 0x33, 0x1c, 0xfa, 0x9e, 0x7d, 0xca, 0x91, 0xd3, 0x61, 0xf0, 0x74, 0x7c, 0x03, - 0x7d, 0xfd, 0x65, 0xa4, 0x43, 0x7f, 0x6c, 0xd2, 0x07, 0x4c, 0x92, 0x02, 0xa8, 0xce, 0xa5, 0x86, - 0xbe, 0x9f, 0x80, 0xf3, 0x31, 0x5a, 0x7a, 0xf4, 0x76, 0x3c, 0x2a, 0x7d, 0x3f, 0x0a, 0x1c, 0x39, - 0x27, 0x1f, 0xf0, 0x9c, 0x68, 0x68, 0x7b, 0xe0, 0x9c, 0x70, 0x6c, 0xa2, 0xc5, 0xeb, 0x5a, 0x2e, - 0xff, 0x51, 0x20, 0xdd, 0xbb, 0x19, 0x41, 0x43, 0x01, 0x6f, 0x35, 0x63, 0xe9, 0x1b, 0x43, 0xfb, - 0x4b, 0xe6, 0x5f, 0xe5, 0xcc, 0xdf, 0x46, 0x5b, 0x47, 0xaf, 0x06, 0xc7, 0xa3, 0xe8, 0xe7, 0x09, - 0xb8, 0x34, 0x48, 0xf3, 0x8d, 0xb6, 0x87, 0x24, 0xd0, 0x5b, 0x1f, 0x47, 0x4e, 0xc9, 0x2e, 0x4f, - 0xc9, 0x37, 0xd1, 0x87, 0x2f, 0x25, 0x25, 0xdd, 0x15, 0xf2, 0x49, 0x02, 0x5e, 0x8b, 0xd3, 0x74, - 0xa3, 0x5b, 0x47, 0x93, 0xc8, 0xcb, 0x2c, 0x95, 0x7b, 0x3c, 0x2f, 0xef, 0xa3, 0x77, 0x07, 0xcc, - 0x0b, 0xcb, 0x42, 0x1f, 0xa1, 0xb0, 0xd2, 0x79, 0xa2, 0xc0, 0x84, 0xdf, 0x1c, 0xa3, 0x4b, 0x91, - 0x60, 0x43, 0x6d, 0x75, 0x3a, 0x1b, 0xd3, 0x5a, 0x12, 0x51, 0x39, 0x91, 0x25, 0x74, 0x21, 0x92, - 0x48, 0xd0, 0x79, 0xa3, 0x1f, 0x2a, 0x30, 0xca, 0x22, 0xa0, 0xa5, 0xe8, 0x0b, 0xb4, 0xf5, 0xac, - 0x4e, 0xbf, 0x11, 0xc3, 0x52, 0xa2, 0x59, 0xe7, 0x68, 0x54, 0x74, 0x29, 0x12, 0x0d, 0x47, 0xd2, - 0x4a, 0x2e, 0xcf, 0x96, 0xdf, 0x6f, 0xf7, 0xc9, 0x56, 0xa8, 0x53, 0xef, 0x93, 0xad, 0x70, 0x13, - 0x1f, 0x33, 0x5b, 0x46, 0xa5, 0x92, 0x15, 0xd9, 0xfa, 0x9d, 0x02, 0xa9, 0x70, 0xef, 0x8d, 0xd6, - 0x23, 0xd7, 0xec, 0xd1, 0xed, 0xa7, 0xaf, 0x0c, 0xe8, 0x25, 0x11, 0x5f, 0xe3, 0x88, 0x57, 0xd1, - 0xe5, 0x48, 0xc4, 0x15, 0xd3, 0xa5, 0x02, 0x72, 0x76, 0xb7, 0x9e, 0xe5, 0xaf, 0x5d, 0xf4, 0x53, - 0x05, 0x92, 0x41, 0x47, 0x8c, 0xa2, 0x13, 0x15, 0xfe, 0x16, 0x90, 0x56, 0xe3, 0x9a, 0x4b, 0x98, - 0x6b, 0x1c, 0x66, 0x16, 0x2d, 0x77, 0x85, 0x19, 0xda, 0xf0, 0x1c, 0x7f, 0xf6, 0xba, 0xe8, 0x99, - 0x02, 0xe8, 0x70, 0x77, 0x8c, 0x3e, 0x17, 0xb9, 0x76, 0xcf, 0xce, 0x3c, 0x7d, 0x75, 0x60, 0x3f, - 0x09, 0xbe, 0xc8, 0xc1, 0x6f, 0xa0, 0xfc, 0x20, 0x55, 0x9b, 0xa3, 0x2c, 0xa0, 0x38, 0x04, 0x82, - 0xfe, 0x14, 0xfd, 0x46, 0x81, 0xe9, 0xce, 0xce, 0x19, 0xad, 0xf6, 0x87, 0x75, 0x88, 0xca, 0xda, - 0x40, 0x3e, 0x03, 0x89, 0x4f, 0xc0, 0x6e, 0x21, 0x7e, 0xea, 0x6f, 0x42, 0x47, 0x1f, 0x1c, 0x67, - 0x13, 0xba, 0xf5, 0xe0, 0x71, 0x36, 0xa1, 0x6b, 0xc3, 0x8d, 0xf3, 0x1c, 0xfd, 0x17, 0xd0, 0xe7, - 0x87, 0xd8, 0x04, 0xd1, 0x3d, 0xa3, 0xdf, 0x2b, 0x70, 0xb2, 0x4b, 0x1b, 0x8b, 0xfa, 0x60, 0xea, - 0xd9, 0x70, 0xa7, 0xaf, 0x0d, 0xee, 0x28, 0xd9, 0x5c, 0xe7, 0x6c, 0xd6, 0xd1, 0x6a, 0xf4, 0x5e, - 0x88, 0x08, 0x7a, 0xd5, 0x30, 0x6b, 0x3a, 0x6f, 0x90, 0xef, 0x13, 0x82, 0xfe, 0xad, 0x40, 0xa6, - 0x4f, 0x27, 0x87, 0x36, 0x62, 0x5d, 0x80, 0xd1, 0xed, 0x75, 0x7a, 0xf3, 0x68, 0x41, 0x24, 0xd5, - 0x37, 0x39, 0xd5, 0xab, 0xe8, 0xca, 0xa0, 0x57, 0x29, 0xe5, 0x81, 0xef, 0x3d, 0x7d, 0xbe, 0xa0, - 0x3c, 0x7b, 0xbe, 0xa0, 0xfc, 0xe3, 0xf9, 0x82, 0xf2, 0xc9, 0x8b, 0x85, 0x63, 0xcf, 0x5e, 0x2c, - 0x1c, 0xfb, 0xeb, 0x8b, 0x85, 0x63, 0x1f, 0x6e, 0xb4, 0x35, 0xc2, 0x32, 0x74, 0xb6, 0x62, 0xec, - 0xba, 0xc1, 0x3a, 0xfb, 0xab, 0xeb, 0xb9, 0x83, 0x8e, 0xd5, 0xf6, 0x2a, 0x26, 0xb1, 0xa9, 0xf8, - 0x0f, 0x6a, 0xf1, 0x09, 0x74, 0x9c, 0xff, 0xb3, 0xf6, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8b, - 0x62, 0xcc, 0x4f, 0xbc, 0x1f, 0x00, 0x00, + // 2041 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcf, 0x73, 0x1b, 0x49, + 0xf5, 0xcf, 0xc8, 0x3f, 0xd6, 0x7a, 0x8e, 0x65, 0xa5, 0x13, 0x27, 0xb6, 0x92, 0xaf, 0xe5, 0xed, + 0xec, 0x37, 0xeb, 0x8d, 0xa3, 0x51, 0x6c, 0x27, 0x24, 0x04, 0x76, 0x83, 0x64, 0x3b, 0x1b, 0x41, + 0x20, 0xde, 0x89, 0xf7, 0x07, 0x0b, 0x61, 0x6a, 0x6c, 0x75, 0x94, 0x21, 0x9a, 0x19, 0x45, 0xd3, + 0xe3, 0x58, 0x45, 0xed, 0x85, 0x2a, 0x6a, 0x39, 0x51, 0x0b, 0x1c, 0xf6, 0xc0, 0x81, 0xe2, 0xc0, + 0x85, 0x1f, 0xc5, 0x85, 0x0b, 0x77, 0x0e, 0x29, 0xaa, 0xa0, 0x52, 0x05, 0x07, 0x8a, 0x83, 0xa0, + 0x12, 0x0e, 0x54, 0x41, 0x71, 0x10, 0xff, 0x00, 0xd5, 0x3f, 0x66, 0x24, 0x8d, 0xa5, 0xd1, 0x48, + 0xce, 0x81, 0x53, 0xe4, 0xee, 0xf7, 0x5e, 0x7f, 0x3e, 0xaf, 0xdf, 0xa7, 0xbb, 0xdf, 0x04, 0x5e, + 0x77, 0x5c, 0xcb, 0x71, 0x4d, 0x37, 0x5f, 0x73, 0x9c, 0xaa, 0x65, 0xd8, 0x46, 0x85, 0xd4, 0xf3, + 0xfb, 0xab, 0xbb, 0x84, 0x1a, 0xab, 0xf9, 0xc7, 0x1e, 0xa9, 0x37, 0xd4, 0x5a, 0xdd, 0xa1, 0x0e, + 0x3a, 0x2b, 0x0d, 0xd5, 0x0e, 0x43, 0x55, 0x1a, 0x66, 0x4e, 0x55, 0x9c, 0x8a, 0xc3, 0xed, 0xf2, + 0xec, 0x97, 0x70, 0xc9, 0xbc, 0x11, 0x15, 0xbb, 0x42, 0x6c, 0xc2, 0xc3, 0x71, 0xd3, 0xd7, 0xa2, + 0x4c, 0xe9, 0x81, 0xb4, 0xba, 0x14, 0x65, 0xe5, 0x3e, 0x31, 0x6a, 0x7a, 0xdd, 0xf1, 0x28, 0x91, + 0xd6, 0x8b, 0x7b, 0xdc, 0x3c, 0xbf, 0x6b, 0xb8, 0x24, 0xb0, 0xda, 0x73, 0x4c, 0x5b, 0xce, 0x5f, + 0xec, 0x9c, 0xe7, 0x54, 0x03, 0xab, 0x9a, 0x51, 0x31, 0x6d, 0x83, 0x9a, 0x8e, 0x6f, 0x7b, 0xae, + 0xe2, 0x38, 0x95, 0x2a, 0xc9, 0x1b, 0x35, 0x33, 0x6f, 0xd8, 0xb6, 0x43, 0xf9, 0xa4, 0x8f, 0x7e, + 0x41, 0xce, 0xf2, 0xbf, 0x76, 0xbd, 0x07, 0x79, 0xc3, 0x6e, 0xf8, 0x53, 0x62, 0x11, 0x5d, 0x24, + 0x47, 0xfc, 0x21, 0xa7, 0xb2, 0x61, 0x2f, 0x6a, 0x5a, 0xc4, 0xa5, 0x86, 0x55, 0x13, 0x06, 0x78, + 0x16, 0x66, 0xb6, 0x8d, 0xba, 0x61, 0xb9, 0x1a, 0x79, 0xec, 0x11, 0x97, 0xe2, 0x7b, 0x90, 0xf2, + 0x07, 0xdc, 0x9a, 0x63, 0xbb, 0x04, 0x15, 0x60, 0xb2, 0xc6, 0x47, 0xe6, 0x95, 0x25, 0x65, 0x79, + 0x7a, 0xed, 0xbc, 0x1a, 0xb1, 0x4d, 0xaa, 0x70, 0x2e, 0x8e, 0x3f, 0x6d, 0x66, 0x8f, 0x69, 0xd2, + 0x11, 0xff, 0x5b, 0x81, 0xa5, 0x2d, 0x97, 0x9a, 0x96, 0x41, 0xc9, 0xbd, 0x27, 0x46, 0x6d, 0xeb, + 0xc0, 0xd8, 0xa3, 0x05, 0xcb, 0xf1, 0x6c, 0x5a, 0xb2, 0xe5, 0xca, 0x28, 0x07, 0xaf, 0xb0, 0x80, + 0xba, 0x59, 0x9e, 0x4f, 0x2c, 0x29, 0xcb, 0xe3, 0xc5, 0x53, 0xad, 0x66, 0x36, 0xd5, 0x30, 0xac, + 0xea, 0x0d, 0x2c, 0x27, 0xf0, 0xbc, 0xa2, 0x4d, 0xb2, 0xdf, 0xa5, 0x32, 0x52, 0x61, 0x8a, 0x3a, + 0x8f, 0x88, 0xad, 0x9b, 0xf6, 0xfc, 0xd8, 0x92, 0xb2, 0x9c, 0x2c, 0x9e, 0x6c, 0x35, 0xb3, 0xb3, + 0xc2, 0xde, 0x9f, 0xc1, 0xda, 0x2b, 0xfc, 0x67, 0xc9, 0x46, 0xf7, 0x61, 0x92, 0xef, 0x9c, 0x3b, + 0x3f, 0xbe, 0x34, 0xb6, 0x3c, 0xbd, 0xa6, 0x46, 0xd2, 0x60, 0x28, 0x03, 0x80, 0xcc, 0xad, 0x38, + 0xc7, 0x18, 0xb5, 0x9a, 0xd9, 0x19, 0xb1, 0x82, 0x88, 0x85, 0x35, 0x19, 0xf4, 0x8b, 0xe3, 0x53, + 0x4a, 0x3a, 0xa1, 0x4d, 0xba, 0xc4, 0x2e, 0x93, 0x3a, 0xfe, 0x45, 0x02, 0xd6, 0xfa, 0x12, 0x7e, + 0xdf, 0xa4, 0x0f, 0xb7, 0xeb, 0xa6, 0x65, 0x52, 0x73, 0x9f, 0xec, 0x34, 0x6a, 0xc4, 0xed, 0x91, + 0x02, 0x65, 0xc8, 0x14, 0x24, 0x62, 0xa4, 0xe0, 0x26, 0xa4, 0x04, 0x5a, 0xdd, 0x5f, 0x65, 0x6c, + 0x69, 0x6c, 0x79, 0xbc, 0xb8, 0xd0, 0x6a, 0x66, 0xe7, 0x3a, 0x69, 0xf9, 0xf3, 0x58, 0x3b, 0x2e, + 0x06, 0xb6, 0xc5, 0x82, 0xef, 0xc1, 0x69, 0x69, 0x20, 0xa2, 0x3b, 0x1e, 0xd5, 0xcb, 0xc4, 0x76, + 0x2c, 0x9e, 0xd3, 0x64, 0xf1, 0xd5, 0x56, 0x33, 0xfb, 0x7f, 0x5d, 0x81, 0x42, 0x76, 0x58, 0x3b, + 0x29, 0x26, 0x76, 0xd8, 0xf8, 0x5d, 0x8f, 0x6e, 0xf2, 0xd1, 0xdf, 0x2b, 0x70, 0x31, 0x48, 0x97, + 0x69, 0x57, 0xaa, 0x84, 0x2d, 0xd8, 0xb7, 0x52, 0x56, 0xc2, 0x69, 0x42, 0x87, 0xd3, 0x34, 0x72, + 0x92, 0x8a, 0x30, 0x1b, 0x26, 0x27, 0xca, 0x2b, 0xd3, 0x6a, 0x66, 0x4f, 0x77, 0xba, 0x75, 0xb0, + 0x9a, 0xa1, 0x5d, 0x7c, 0x3e, 0x56, 0xe0, 0xd5, 0x88, 0x7a, 0x97, 0xc2, 0xda, 0x85, 0x74, 0x3b, + 0x90, 0xc1, 0x67, 0x39, 0x9f, 0x64, 0xf1, 0x3a, 0xab, 0xb5, 0xbf, 0x34, 0xb3, 0x73, 0x42, 0xcc, + 0x6e, 0xf9, 0x91, 0x6a, 0x3a, 0x79, 0xcb, 0xa0, 0x0f, 0xd5, 0x92, 0x4d, 0x5b, 0xcd, 0xec, 0x99, + 0x30, 0x0e, 0xe1, 0x8e, 0xb5, 0x94, 0x0f, 0x44, 0xac, 0x86, 0xff, 0xd3, 0x1f, 0xc9, 0x5d, 0x8f, + 0x8e, 0x28, 0xbd, 0x6f, 0x04, 0x52, 0x1a, 0xe3, 0x52, 0xca, 0xc7, 0x94, 0x12, 0x5b, 0x31, 0x86, + 0x96, 0xd0, 0x2a, 0x24, 0x03, 0x66, 0xf3, 0xe3, 0x3c, 0x23, 0x0c, 0x50, 0x3a, 0x44, 0x1a, 0x6b, + 0x53, 0x3e, 0xdb, 0x90, 0xfc, 0x7e, 0x99, 0x80, 0xf5, 0xfe, 0xac, 0x5f, 0x9a, 0xfe, 0x0e, 0xeb, + 0x29, 0x31, 0x9c, 0x9e, 0xee, 0xc1, 0x5c, 0x97, 0x4e, 0x4c, 0x3b, 0xa8, 0x38, 0x26, 0xa7, 0xa5, + 0x56, 0x33, 0x7b, 0xae, 0x87, 0x9c, 0x7c, 0x33, 0xac, 0xa1, 0x0e, 0x35, 0x95, 0x6c, 0x5e, 0x7c, + 0x23, 0x64, 0x0f, 0xff, 0x41, 0x81, 0x95, 0x81, 0xfa, 0xeb, 0xa8, 0x97, 0xa1, 0x04, 0x78, 0x13, + 0x52, 0x21, 0x76, 0x42, 0x86, 0x1d, 0x59, 0x0a, 0xd3, 0x3a, 0x4e, 0xfb, 0x12, 0x1a, 0x8b, 0x45, + 0xe8, 0x3b, 0x0a, 0xe0, 0xa8, 0xb2, 0x97, 0x0a, 0xd4, 0x7d, 0xad, 0x9b, 0x76, 0xb7, 0x00, 0xaf, + 0x0d, 0x12, 0xe0, 0xe9, 0x10, 0x70, 0x5f, 0x7f, 0x33, 0x12, 0xb9, 0x94, 0xdf, 0x09, 0x98, 0xfd, + 0x8a, 0x67, 0xb1, 0x64, 0x06, 0x17, 0xec, 0x16, 0xa4, 0xdb, 0x43, 0x12, 0xc7, 0x2a, 0x24, 0x6d, + 0xcf, 0xe2, 0x55, 0xe2, 0x76, 0x54, 0x9e, 0x64, 0x18, 0x4c, 0x61, 0x6d, 0xca, 0x96, 0xae, 0xf8, + 0x06, 0x4c, 0xb3, 0x1f, 0xa3, 0xec, 0x08, 0xde, 0x80, 0xe3, 0xc2, 0x57, 0x2e, 0xbf, 0x0e, 0xe3, + 0x6c, 0x46, 0xde, 0xef, 0xa7, 0x54, 0xf1, 0x68, 0x50, 0xfd, 0x47, 0x83, 0x5a, 0xb0, 0x1b, 0xc5, + 0xe4, 0xef, 0x7e, 0x9d, 0x9b, 0xe0, 0x65, 0xab, 0x71, 0x63, 0x46, 0xad, 0x50, 0xad, 0x76, 0x51, + 0x2b, 0x41, 0xba, 0x3d, 0x24, 0x63, 0x5f, 0x85, 0x09, 0x9f, 0xd6, 0x58, 0x9c, 0xe0, 0xc2, 0x1a, + 0x17, 0xe0, 0xcc, 0x1d, 0xd3, 0xa5, 0x3c, 0x56, 0xb1, 0xc1, 0xeb, 0xc0, 0xa7, 0x7a, 0x01, 0x26, + 0x44, 0x19, 0x89, 0xad, 0x4a, 0xb7, 0x9a, 0xd9, 0xe3, 0x82, 0xa8, 0xac, 0x1e, 0x31, 0x8d, 0xdf, + 0x81, 0xf9, 0xc3, 0x21, 0x8e, 0x86, 0xea, 0x99, 0x02, 0xe9, 0x7b, 0x35, 0x87, 0x6e, 0xd7, 0xcd, + 0x3d, 0x32, 0x92, 0x18, 0xb6, 0x20, 0xcd, 0xde, 0x82, 0xba, 0xe1, 0xba, 0x84, 0x76, 0xc9, 0xe1, + 0x6c, 0xfb, 0x58, 0x0f, 0x5b, 0x60, 0x2d, 0xc5, 0x86, 0x0a, 0x6c, 0x44, 0x48, 0xe2, 0x36, 0x9c, + 0x78, 0xec, 0x39, 0xb4, 0x3b, 0x8e, 0x90, 0xc6, 0xb9, 0x56, 0x33, 0x3b, 0x2f, 0xe2, 0x1c, 0x32, + 0xc1, 0xda, 0x2c, 0x1f, 0x6b, 0x47, 0xc2, 0x25, 0x38, 0xd1, 0xc1, 0x48, 0xa6, 0xe7, 0x0a, 0x80, + 0x5b, 0x73, 0xa8, 0x5e, 0x63, 0xa3, 0x32, 0xcf, 0x73, 0xad, 0x66, 0xf6, 0x84, 0x88, 0xdb, 0x9e, + 0xc3, 0x5a, 0xd2, 0xf5, 0xbd, 0xf1, 0x6d, 0x58, 0xd8, 0x71, 0xa8, 0xc1, 0x0b, 0xe0, 0x8e, 0xf9, + 0xd8, 0x33, 0xcb, 0x26, 0x6d, 0x8c, 0x54, 0xa0, 0x3f, 0x52, 0x20, 0xd3, 0x2b, 0x94, 0x84, 0xf7, + 0x11, 0x24, 0xab, 0xfe, 0xa0, 0xdc, 0xc1, 0x05, 0x55, 0xbe, 0x7b, 0x59, 0xa2, 0x82, 0xab, 0x67, + 0xc3, 0x31, 0xed, 0xe2, 0xa6, 0xbc, 0x6c, 0xa4, 0x9a, 0x02, 0x4f, 0xfc, 0xb3, 0xbf, 0x66, 0x97, + 0x2b, 0x26, 0x7d, 0xe8, 0xed, 0xaa, 0x7b, 0x8e, 0x25, 0x1f, 0xce, 0xf2, 0x9f, 0x9c, 0x5b, 0x7e, + 0x94, 0xa7, 0xec, 0x6e, 0xe0, 0x41, 0x5c, 0xad, 0xbd, 0x22, 0x3e, 0x03, 0x73, 0x1c, 0x5c, 0x98, + 0x23, 0xfe, 0x54, 0x81, 0xd3, 0xe1, 0x99, 0xff, 0x0d, 0xc8, 0xfe, 0xd6, 0xbc, 0xe7, 0x54, 0x3d, + 0x8b, 0xdc, 0x72, 0xea, 0x23, 0x9f, 0x1d, 0x3f, 0xf0, 0xb7, 0x26, 0x14, 0x4a, 0xf2, 0xa4, 0x30, + 0xb9, 0xcf, 0x27, 0x06, 0x93, 0x2c, 0x74, 0x3f, 0x02, 0x84, 0xdb, 0x70, 0x0c, 0xe5, 0x5a, 0x78, + 0x1f, 0x32, 0x3b, 0x75, 0xa3, 0x6c, 0xda, 0x95, 0x6d, 0xc3, 0xac, 0xef, 0x18, 0x8f, 0x48, 0xfd, + 0x16, 0xe9, 0x14, 0x28, 0xaf, 0x7e, 0xfd, 0xb2, 0x2c, 0xe5, 0x0e, 0x7e, 0x72, 0x02, 0x6b, 0x93, + 0xfc, 0xd7, 0xe5, 0xb6, 0xf1, 0xaa, 0xd4, 0xe5, 0x21, 0xe3, 0x55, 0xdf, 0x78, 0x15, 0x7f, 0x13, + 0xce, 0xf6, 0x5c, 0x57, 0x26, 0xe3, 0x4b, 0x90, 0xa4, 0x6c, 0x4c, 0x7f, 0x40, 0x7c, 0x15, 0xa9, + 0xf2, 0x62, 0xb9, 0x10, 0x83, 0xe3, 0x26, 0xd9, 0xd3, 0xa6, 0xa8, 0x0c, 0x8a, 0xff, 0x94, 0x80, + 0x0b, 0xfe, 0x95, 0xc6, 0x16, 0x25, 0x45, 0xc3, 0x25, 0xe5, 0xbb, 0x36, 0xd7, 0x5e, 0xc9, 0xaa, + 0x19, 0x7b, 0xc1, 0xf5, 0xfc, 0x79, 0x48, 0x3e, 0xa8, 0x3b, 0x96, 0xce, 0x1a, 0x51, 0x79, 0xa8, + 0x47, 0xec, 0x83, 0x68, 0xd5, 0xa6, 0x98, 0x07, 0xfb, 0x1b, 0x61, 0x98, 0xa1, 0x0e, 0xf7, 0xed, + 0x3c, 0x9f, 0xb4, 0x69, 0xea, 0xb0, 0x69, 0x71, 0xfe, 0x9c, 0x69, 0x97, 0x0c, 0x3b, 0x75, 0xc6, + 0x83, 0xf3, 0xed, 0x03, 0x48, 0x5b, 0xc6, 0x81, 0x38, 0x1c, 0x74, 0x93, 0xa3, 0x92, 0x6f, 0x90, + 0x61, 0x99, 0xa7, 0x2c, 0xe3, 0xa0, 0x83, 0x1b, 0x7a, 0x17, 0x52, 0xe4, 0x80, 0x92, 0xba, 0x6d, + 0x54, 0xe5, 0xb9, 0x34, 0x31, 0x52, 0xdc, 0x19, 0x3f, 0x8a, 0x38, 0xb4, 0x7e, 0xae, 0xc0, 0xeb, + 0x03, 0xd3, 0x2a, 0xf7, 0xf3, 0x2d, 0x00, 0xd3, 0xae, 0x79, 0x74, 0xa8, 0xc4, 0x26, 0xb9, 0x0b, + 0xcf, 0xec, 0x17, 0x60, 0xda, 0xf1, 0x68, 0x10, 0x20, 0x11, 0x2f, 0x00, 0x08, 0x1f, 0x36, 0xb2, + 0xf6, 0xf1, 0x39, 0x98, 0x78, 0xc7, 0x23, 0xf5, 0x06, 0xfa, 0x9e, 0x02, 0x93, 0xa2, 0xd7, 0x46, + 0x17, 0x63, 0x34, 0xe4, 0xb2, 0x34, 0x32, 0x2b, 0xb1, 0x6c, 0x05, 0x5f, 0xbc, 0xf2, 0xed, 0x3f, + 0xfe, 0xfd, 0x87, 0x89, 0xff, 0x47, 0xe7, 0xf3, 0x51, 0x1f, 0x45, 0x24, 0x8a, 0x7f, 0x28, 0xb0, + 0xd0, 0xb7, 0xe7, 0x41, 0x6f, 0x46, 0xae, 0x3b, 0xe8, 0xdb, 0x40, 0xe6, 0xad, 0x51, 0xdd, 0x25, + 0x93, 0x3b, 0x9c, 0xc9, 0x2d, 0xb4, 0x19, 0xc9, 0xe4, 0x5b, 0xb2, 0xa6, 0x3f, 0xca, 0x13, 0x19, + 0x51, 0x7c, 0xf1, 0x21, 0x2c, 0xa6, 0x7c, 0xe2, 0xe9, 0xa6, 0x8d, 0x7e, 0x92, 0xe8, 0x78, 0x2e, + 0x0f, 0xee, 0xee, 0xd1, 0xdd, 0xd1, 0xd0, 0xf7, 0xed, 0x53, 0x8e, 0x9c, 0x0e, 0x83, 0xa7, 0xe3, + 0x6b, 0xe8, 0xab, 0x2f, 0x23, 0x1d, 0xfa, 0x13, 0x93, 0x3e, 0x64, 0x92, 0x14, 0x40, 0x75, 0x2e, + 0x35, 0xf4, 0xdd, 0x04, 0x9c, 0x8f, 0xd1, 0xd2, 0xa3, 0xb7, 0xe3, 0x51, 0x19, 0xf8, 0x51, 0xe0, + 0xc8, 0x39, 0xf9, 0x80, 0xe7, 0x44, 0x43, 0xdb, 0x43, 0xe7, 0x84, 0x63, 0x13, 0x2d, 0x5e, 0xcf, + 0x72, 0xf9, 0x97, 0x02, 0x99, 0xfe, 0xcd, 0x08, 0x1a, 0x09, 0x78, 0xbb, 0x19, 0xcb, 0xdc, 0x1c, + 0xd9, 0x5f, 0x32, 0xff, 0x32, 0x67, 0xfe, 0x36, 0xda, 0x3a, 0x7a, 0x35, 0x38, 0x1e, 0x45, 0x3f, + 0x4d, 0xc0, 0xa5, 0x61, 0x9a, 0x6f, 0xb4, 0x3d, 0x22, 0x81, 0xfe, 0xfa, 0x38, 0x72, 0x4a, 0x76, + 0x79, 0x4a, 0xbe, 0x8e, 0x3e, 0x7c, 0x29, 0x29, 0xe9, 0xad, 0x90, 0x4f, 0x12, 0xf0, 0x5a, 0x9c, + 0xa6, 0x1b, 0xdd, 0x3e, 0x9a, 0x44, 0x5e, 0x66, 0xa9, 0xdc, 0xe7, 0x79, 0x79, 0x1f, 0xbd, 0x3b, + 0x64, 0x5e, 0x58, 0x16, 0x06, 0x08, 0x85, 0x95, 0xce, 0xa7, 0x0a, 0x4c, 0xf9, 0xcd, 0x31, 0xba, + 0x14, 0x09, 0x36, 0xd4, 0x56, 0x67, 0x72, 0x31, 0xad, 0x25, 0x11, 0x95, 0x13, 0x59, 0x46, 0x17, + 0x22, 0x89, 0x04, 0x9d, 0x37, 0xfa, 0xbe, 0x02, 0xe3, 0x2c, 0x02, 0x5a, 0x8e, 0xbe, 0x40, 0xdb, + 0xcf, 0xea, 0xcc, 0x1b, 0x31, 0x2c, 0x25, 0x9a, 0x2b, 0x1c, 0x8d, 0x8a, 0x2e, 0x45, 0xa2, 0xe1, + 0x48, 0xda, 0xc9, 0xe5, 0xd9, 0xf2, 0xfb, 0xed, 0x01, 0xd9, 0x0a, 0x75, 0xea, 0x03, 0xb2, 0x15, + 0x6e, 0xe2, 0x63, 0x66, 0xcb, 0xa8, 0x56, 0x73, 0x22, 0x5b, 0xbf, 0x51, 0x20, 0x1d, 0xee, 0xbd, + 0xd1, 0x95, 0xc8, 0x35, 0xfb, 0x74, 0xfb, 0x99, 0xab, 0x43, 0x7a, 0x49, 0xc4, 0xd7, 0x39, 0xe2, + 0x35, 0x74, 0x39, 0x12, 0x71, 0xd5, 0x74, 0xa9, 0x80, 0x9c, 0xdb, 0x6d, 0xe4, 0xf8, 0x6b, 0x17, + 0xfd, 0x58, 0x81, 0x64, 0xd0, 0x11, 0xa3, 0xe8, 0x44, 0x85, 0xbf, 0x05, 0x64, 0xd4, 0xb8, 0xe6, + 0x12, 0xe6, 0x3a, 0x87, 0x99, 0x43, 0x2b, 0x3d, 0x61, 0x86, 0x36, 0x3c, 0xcf, 0x9f, 0xbd, 0x2e, + 0x7a, 0xa6, 0x00, 0x3a, 0xdc, 0x1d, 0xa3, 0xcf, 0x44, 0xae, 0xdd, 0xb7, 0x33, 0xcf, 0x5c, 0x1b, + 0xda, 0x4f, 0x82, 0x2f, 0x71, 0xf0, 0x1b, 0xa8, 0x30, 0x4c, 0xd5, 0xe6, 0x29, 0x0b, 0x28, 0x0e, + 0x81, 0xa0, 0x3f, 0x45, 0xbf, 0x52, 0x20, 0xd5, 0xdd, 0x39, 0xa3, 0xb5, 0xc1, 0xb0, 0x0e, 0x51, + 0x59, 0x1f, 0xca, 0x67, 0x28, 0xf1, 0x09, 0xd8, 0x6d, 0xc4, 0x4f, 0xfd, 0x4d, 0xe8, 0xea, 0x83, + 0xe3, 0x6c, 0x42, 0xaf, 0x1e, 0x3c, 0xce, 0x26, 0xf4, 0x6c, 0xb8, 0x71, 0x81, 0xa3, 0xff, 0x1c, + 0xfa, 0xec, 0x08, 0x9b, 0x20, 0xba, 0x67, 0xf4, 0x5b, 0x05, 0x4e, 0xf6, 0x68, 0x63, 0xd1, 0x00, + 0x4c, 0x7d, 0x1b, 0xee, 0xcc, 0xf5, 0xe1, 0x1d, 0x25, 0x9b, 0x1b, 0x9c, 0xcd, 0x15, 0xb4, 0x16, + 0xbd, 0x17, 0x22, 0x82, 0x5e, 0x33, 0xcc, 0xba, 0xce, 0x1b, 0xe4, 0x07, 0x84, 0xa0, 0x7f, 0x2a, + 0x90, 0x1d, 0xd0, 0xc9, 0xa1, 0x8d, 0x58, 0x17, 0x60, 0x74, 0x7b, 0x9d, 0xd9, 0x3c, 0x5a, 0x10, + 0x49, 0xf5, 0x4d, 0x4e, 0xf5, 0x1a, 0xba, 0x3a, 0xec, 0x55, 0x4a, 0x79, 0xe0, 0xfb, 0x4f, 0x9f, + 0x2f, 0x2a, 0xcf, 0x9e, 0x2f, 0x2a, 0x7f, 0x7b, 0xbe, 0xa8, 0x7c, 0xf2, 0x62, 0xf1, 0xd8, 0xb3, + 0x17, 0x8b, 0xc7, 0xfe, 0xfc, 0x62, 0xf1, 0xd8, 0x87, 0x1b, 0x1d, 0x8d, 0xb0, 0x0c, 0x9d, 0xab, + 0x1a, 0xbb, 0x6e, 0xb0, 0xce, 0xfe, 0xda, 0xd5, 0xfc, 0x41, 0xd7, 0x6a, 0x7b, 0x55, 0x93, 0xd8, + 0x54, 0xfc, 0x07, 0xb5, 0xf8, 0x04, 0x3a, 0xc9, 0xff, 0x59, 0xff, 0x6f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x2a, 0xf2, 0xdb, 0xa7, 0xbc, 0x1f, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/poolmanager/client/queryprotov2/query.pb.go b/x/poolmanager/client/queryprotov2/query.pb.go index ad987105138..87ab01b297a 100644 --- a/x/poolmanager/client/queryprotov2/query.pb.go +++ b/x/poolmanager/client/queryprotov2/query.pb.go @@ -148,7 +148,7 @@ var fileDescriptor_eb2850debe8fb398 = []byte{ // 472 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xc1, 0x8a, 0xd4, 0x4c, 0x10, 0x9e, 0xde, 0xff, 0x77, 0x65, 0x5a, 0x58, 0x77, 0x82, 0xe8, 0x38, 0x2e, 0xc9, 0xd2, 0xa7, - 0x11, 0x31, 0x2d, 0x51, 0x3c, 0x78, 0x33, 0xec, 0x82, 0x82, 0x07, 0x8d, 0xe0, 0xc1, 0x4b, 0xe8, + 0x11, 0x31, 0x2d, 0x11, 0x3d, 0x78, 0x33, 0xec, 0x82, 0x82, 0x07, 0x8d, 0xe0, 0xc1, 0x4b, 0xe8, 0x64, 0xda, 0x6c, 0x63, 0x92, 0xca, 0x4c, 0x77, 0x06, 0x07, 0x11, 0xc4, 0x27, 0x10, 0xbc, 0x79, 0xf6, 0x61, 0xf6, 0x38, 0xe0, 0x45, 0x3c, 0x04, 0x99, 0xf1, 0x09, 0xe6, 0x09, 0xa4, 0xbb, 0x33, 0xee, 0xee, 0xa8, 0xe8, 0x29, 0x55, 0xf5, 0x7d, 0xfd, 0x55, 0x55, 0xea, 0xc3, 0x04, 0x64, 0x01, @@ -175,7 +175,7 @@ var fileDescriptor_eb2850debe8fb398 = []byte{ 0x5f, 0xb8, 0xe8, 0xdb, 0xc2, 0x45, 0xef, 0x97, 0x6e, 0x67, 0xbe, 0x74, 0x3b, 0x5f, 0x96, 0x6e, 0xe7, 0xf9, 0xe1, 0xdf, 0xfe, 0xc8, 0x34, 0xb8, 0x43, 0x5f, 0x9d, 0x69, 0x93, 0xe6, 0x82, 0x97, 0xca, 0xfa, 0xdf, 0x78, 0x6b, 0x1a, 0x24, 0xdb, 0x26, 0xb8, 0xfd, 0x23, 0x00, 0x00, 0xff, 0xff, - 0xa3, 0x26, 0x81, 0x22, 0x2d, 0x03, 0x00, 0x00, + 0x58, 0xd0, 0x92, 0x65, 0x2d, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/poolmanager/client/testutil/test_helpers.go b/x/poolmanager/client/testutil/test_helpers.go index 49586a6175a..1b5dc5fd462 100644 --- a/x/poolmanager/client/testutil/test_helpers.go +++ b/x/poolmanager/client/testutil/test_helpers.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app" - poolmanagercli "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/cli" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app" + poolmanagercli "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/cli" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/poolmanager/create_pool.go b/x/poolmanager/create_pool.go index 08e0d42a25e..4f6a2db547b 100644 --- a/x/poolmanager/create_pool.go +++ b/x/poolmanager/create_pool.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // validateCreatedPool checks that the pool was created with the correct pool ID and address. diff --git a/x/poolmanager/create_pool_test.go b/x/poolmanager/create_pool_test.go index 0b9f8bf5fa7..c4c5f7c8161 100644 --- a/x/poolmanager/create_pool_test.go +++ b/x/poolmanager/create_pool_test.go @@ -7,13 +7,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - clmodel "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - cwmodel "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - stableswap "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + clmodel "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + cwmodel "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + stableswap "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func (s *KeeperTestSuite) TestPoolCreationFee() { diff --git a/x/poolmanager/events/emit.go b/x/poolmanager/events/emit.go index a75ec35153a..c2e511fa0df 100644 --- a/x/poolmanager/events/emit.go +++ b/x/poolmanager/events/emit.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) // Emit swap event. Note that we emit these at the layer of each pool module rather than the poolmanager module diff --git a/x/poolmanager/events/emit_test.go b/x/poolmanager/events/emit_test.go index 30959cd1034..8f23e30860e 100644 --- a/x/poolmanager/events/emit_test.go +++ b/x/poolmanager/events/emit_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/events" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/events" ) type PoolManagerEventsTestSuite struct { diff --git a/x/poolmanager/export_test.go b/x/poolmanager/export_test.go index 55bd239f8ad..e695a3e4865 100644 --- a/x/poolmanager/export_test.go +++ b/x/poolmanager/export_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var IntMaxValue = intMaxValue diff --git a/x/poolmanager/gov.go b/x/poolmanager/gov.go index e970f6fde95..2e0dd249578 100644 --- a/x/poolmanager/gov.go +++ b/x/poolmanager/gov.go @@ -7,7 +7,7 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func (k Keeper) HandleDenomPairTakerFeeProposal(ctx sdk.Context, p *types.DenomPairTakerFeeProposal) error { diff --git a/x/poolmanager/keeper.go b/x/poolmanager/keeper.go index a9cf81537fd..8442384cf26 100644 --- a/x/poolmanager/keeper.go +++ b/x/poolmanager/keeper.go @@ -7,7 +7,7 @@ import ( gogotypes "github.com/cosmos/gogoproto/types" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/poolmanager/keeper_test.go b/x/poolmanager/keeper_test.go index 5c6c7e8f3a2..b2a4ba36bb2 100644 --- a/x/poolmanager/keeper_test.go +++ b/x/poolmanager/keeper_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type KeeperTestSuite struct { diff --git a/x/poolmanager/module/module.go b/x/poolmanager/module/module.go index a05376ce157..ddf0c6509cd 100644 --- a/x/poolmanager/module/module.go +++ b/x/poolmanager/module/module.go @@ -14,16 +14,16 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - gammsimulation "github.com/osmosis-labs/osmosis/v24/x/gamm/simulation" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager" - pmclient "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/grpc" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/grpcv2" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryprotov2" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + gammsimulation "github.com/osmosis-labs/osmosis/v25/x/gamm/simulation" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager" + pmclient "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/grpc" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/grpcv2" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryprotov2" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var ( diff --git a/x/poolmanager/msg_server.go b/x/poolmanager/msg_server.go index a46def32241..80887ccde07 100644 --- a/x/poolmanager/msg_server.go +++ b/x/poolmanager/msg_server.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) type msgServer struct { diff --git a/x/poolmanager/msg_server_test.go b/x/poolmanager/msg_server_test.go index 47885c49b9e..0f685591702 100644 --- a/x/poolmanager/msg_server_test.go +++ b/x/poolmanager/msg_server_test.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - poolmanagerKeeper "github.com/osmosis-labs/osmosis/v24/x/poolmanager" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagerKeeper "github.com/osmosis-labs/osmosis/v25/x/poolmanager" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var ( diff --git a/x/poolmanager/protorev.go b/x/poolmanager/protorev.go index 4ab683e277b..77c01f23610 100644 --- a/x/poolmanager/protorev.go +++ b/x/poolmanager/protorev.go @@ -6,7 +6,7 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // GetTakerFeeTrackerForStakers returns the taker fee for stakers tracker for all denoms that has been diff --git a/x/poolmanager/router.go b/x/poolmanager/router.go index 1dcd00a1e14..4d10f83bc37 100644 --- a/x/poolmanager/router.go +++ b/x/poolmanager/router.go @@ -13,9 +13,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var ( diff --git a/x/poolmanager/router_test.go b/x/poolmanager/router_test.go index e63cc70a05a..aed6c8279dd 100644 --- a/x/poolmanager/router_test.go +++ b/x/poolmanager/router_test.go @@ -12,20 +12,20 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/tests/mocks" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - cwpool "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool" - cwmodel "github.com/osmosis-labs/osmosis/v24/x/cosmwasmpool/model" - gamm "github.com/osmosis-labs/osmosis/v24/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - poolincentivestypes "github.com/osmosis-labs/osmosis/v24/x/pool-incentives/types" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/tests/mocks" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + cwpool "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool" + cwmodel "github.com/osmosis-labs/osmosis/v25/x/cosmwasmpool/model" + gamm "github.com/osmosis-labs/osmosis/v25/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + poolincentivestypes "github.com/osmosis-labs/osmosis/v25/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) type poolSetup struct { diff --git a/x/poolmanager/taker_fee.go b/x/poolmanager/taker_fee.go index 534ab10a2a2..205ba5a7c2b 100644 --- a/x/poolmanager/taker_fee.go +++ b/x/poolmanager/taker_fee.go @@ -8,8 +8,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) func (k Keeper) GetDefaultTakerFee(ctx sdk.Context) sdk.Dec { diff --git a/x/poolmanager/taker_fee_test.go b/x/poolmanager/taker_fee_test.go index acdd6752304..cf5238a4d23 100644 --- a/x/poolmanager/taker_fee_test.go +++ b/x/poolmanager/taker_fee_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) // validates that the pool manager keeper can charge taker fees correctly. diff --git a/x/poolmanager/types/genesis.pb.go b/x/poolmanager/types/genesis.pb.go index d157d422573..c529b7cb230 100644 --- a/x/poolmanager/types/genesis.pb.go +++ b/x/poolmanager/types/genesis.pb.go @@ -470,7 +470,7 @@ var fileDescriptor_aa099d9fbdf68b35 = []byte{ // 1082 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4d, 0x6f, 0xdc, 0xc4, 0x1b, 0x8f, 0xb3, 0xe9, 0xfe, 0x95, 0x49, 0xfe, 0x49, 0x3a, 0x90, 0xc6, 0x4d, 0xca, 0x7a, 0xe5, - 0x56, 0x62, 0x11, 0x8a, 0x97, 0x06, 0x54, 0x24, 0xa0, 0x87, 0x6c, 0xa2, 0x20, 0x50, 0x69, 0x53, + 0x56, 0x62, 0x11, 0x8a, 0x97, 0x06, 0x51, 0x24, 0xa0, 0x87, 0x6c, 0xa2, 0x20, 0x50, 0x69, 0x53, 0x27, 0x02, 0xa9, 0x1c, 0x46, 0xb3, 0xf6, 0x13, 0xaf, 0xb5, 0xb6, 0x67, 0x99, 0x19, 0xe7, 0x85, 0xaf, 0xc0, 0x05, 0xa9, 0x57, 0xce, 0x1c, 0xb8, 0x21, 0xf1, 0x21, 0x7a, 0xec, 0x11, 0x71, 0xd8, 0xa2, 0xe4, 0xcc, 0x65, 0x3f, 0x01, 0xf2, 0xcc, 0xec, 0x6b, 0x93, 0x6d, 0x80, 0xd3, 0xae, 0x9f, @@ -535,7 +535,7 @@ var fileDescriptor_aa099d9fbdf68b35 = []byte{ 0x3c, 0xaf, 0x58, 0x3f, 0x5e, 0x54, 0x66, 0x5e, 0x5e, 0x54, 0x66, 0x7e, 0xbf, 0xa8, 0xcc, 0x3c, 0xfb, 0x78, 0x84, 0xcf, 0x1c, 0x57, 0x9b, 0x09, 0x6d, 0x8a, 0xfe, 0x43, 0xfd, 0x78, 0xeb, 0xa3, 0xfa, 0xe9, 0xd8, 0xf7, 0x97, 0x7a, 0x49, 0xb3, 0xac, 0xbe, 0xbd, 0x3e, 0xfc, 0x3b, 0x00, 0x00, - 0xff, 0xff, 0x6a, 0xf7, 0x09, 0x5d, 0xa7, 0x0a, 0x00, 0x00, + 0xff, 0xff, 0x4e, 0x2e, 0x0e, 0x3e, 0xa7, 0x0a, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/poolmanager/types/gov.pb.go b/x/poolmanager/types/gov.pb.go index 5733ded6afb..5ee7bda7b07 100644 --- a/x/poolmanager/types/gov.pb.go +++ b/x/poolmanager/types/gov.pb.go @@ -89,8 +89,8 @@ var fileDescriptor_c95b3c1cda2a8632 = []byte{ 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, 0x3c, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0x6a, 0xad, 0x6e, 0x4e, 0x62, 0x52, 0x31, 0x8c, 0xa3, - 0x5f, 0x66, 0x64, 0xa2, 0x5f, 0x81, 0x12, 0x48, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, - 0x00, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x79, 0xa9, 0xdc, 0x0b, 0xa2, 0x01, 0x00, 0x00, + 0x5f, 0x66, 0x64, 0xaa, 0x5f, 0x81, 0x12, 0x48, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, + 0x00, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x70, 0xdb, 0x68, 0xa2, 0x01, 0x00, 0x00, } func (m *DenomPairTakerFeeProposal) Marshal() (dAtA []byte, err error) { diff --git a/x/poolmanager/types/gov_test.go b/x/poolmanager/types/gov_test.go index 197e0a5d6e9..fb858fbb7c4 100644 --- a/x/poolmanager/types/gov_test.go +++ b/x/poolmanager/types/gov_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func TestDenomPairTakerFeeProposalMarshalUnmarshal(t *testing.T) { diff --git a/x/poolmanager/types/keys_test.go b/x/poolmanager/types/keys_test.go index ff3a0b625de..e6e863fdf50 100644 --- a/x/poolmanager/types/keys_test.go +++ b/x/poolmanager/types/keys_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) func TestFormatDenomTradePairKey(t *testing.T) { diff --git a/x/poolmanager/types/module_route.pb.go b/x/poolmanager/types/module_route.pb.go index 6330c48610b..9d683e7bb45 100644 --- a/x/poolmanager/types/module_route.pb.go +++ b/x/poolmanager/types/module_route.pb.go @@ -132,7 +132,7 @@ var fileDescriptor_96bfcc7b6d387cee = []byte{ // 319 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xc1, 0x4a, 0x02, 0x41, 0x1c, 0xc6, 0x77, 0x4c, 0xcc, 0x26, 0x91, 0x65, 0x89, 0x10, 0x83, 0x51, 0x84, 0x40, 0x82, 0x66, - 0xd0, 0x82, 0xa0, 0xe3, 0x7a, 0xea, 0x50, 0x94, 0x05, 0x41, 0x17, 0x99, 0x75, 0x87, 0x4d, 0x98, + 0xd0, 0x88, 0xa0, 0xe3, 0x7a, 0xea, 0x50, 0x94, 0x05, 0x41, 0x17, 0x99, 0x75, 0x87, 0x4d, 0x98, 0xd9, 0xff, 0xb2, 0x33, 0x5a, 0x5e, 0x3b, 0x75, 0xec, 0x1d, 0x7a, 0x19, 0x8f, 0x1e, 0x3b, 0x49, 0xb8, 0x6f, 0xd0, 0x13, 0xc4, 0x6c, 0x2b, 0xd4, 0xa5, 0xdb, 0x37, 0xcc, 0xef, 0xfb, 0xc1, 0xff, 0xc3, 0x14, 0xb4, 0x02, 0x3d, 0xd1, 0x2c, 0x01, 0x90, 0x8a, 0xc7, 0x3c, 0x12, 0x29, 0x9b, 0xf5, @@ -149,7 +149,7 @@ var fileDescriptor_96bfcc7b6d387cee = []byte{ 0x09, 0x5a, 0xae, 0x09, 0xfa, 0x5c, 0x13, 0xf4, 0x96, 0x11, 0x67, 0x99, 0x11, 0xe7, 0x23, 0x23, 0xce, 0xc3, 0x59, 0x34, 0x31, 0x8f, 0xd3, 0x80, 0x8e, 0x41, 0xb1, 0xe2, 0xaa, 0x63, 0xc9, 0x03, 0xbd, 0x79, 0xb0, 0x59, 0xff, 0x94, 0x3d, 0xff, 0xd9, 0xdb, 0x2e, 0xa1, 0x83, 0x4a, 0x3e, 0xd7, - 0xc9, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xae, 0xdb, 0xdd, 0xbb, 0x93, 0x01, 0x00, 0x00, + 0xc9, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x02, 0xda, 0xd8, 0x93, 0x01, 0x00, 0x00, } func (m *ModuleRoute) Marshal() (dAtA []byte, err error) { diff --git a/x/poolmanager/types/msgs_test.go b/x/poolmanager/types/msgs_test.go index 2cfc7707b2e..6dcda8decaf 100644 --- a/x/poolmanager/types/msgs_test.go +++ b/x/poolmanager/types/msgs_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var ( diff --git a/x/poolmanager/types/params.go b/x/poolmanager/types/params.go index 202b66435f0..7ae87a3d5aa 100644 --- a/x/poolmanager/types/params.go +++ b/x/poolmanager/types/params.go @@ -5,7 +5,7 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/poolmanager/types/swap_route.pb.go b/x/poolmanager/types/swap_route.pb.go index 532ef35318e..6c539f97807 100644 --- a/x/poolmanager/types/swap_route.pb.go +++ b/x/poolmanager/types/swap_route.pb.go @@ -233,7 +233,7 @@ var fileDescriptor_cddd97a9a05492a8 = []byte{ // 443 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xcb, 0xaa, 0xd3, 0x40, 0x1c, 0xc6, 0x33, 0x5e, 0x8e, 0x38, 0x1e, 0xab, 0x86, 0x73, 0xa9, 0x47, 0x48, 0x4a, 0x56, 0x05, - 0x75, 0x86, 0x56, 0xa1, 0xe2, 0x46, 0x0c, 0x6e, 0xb2, 0x2a, 0xa6, 0xbb, 0xba, 0x08, 0x93, 0x26, + 0x75, 0x86, 0x56, 0xa4, 0xe2, 0x46, 0x0c, 0x6e, 0xb2, 0x2a, 0xa6, 0xbb, 0xba, 0x08, 0x93, 0x26, 0xa4, 0xa1, 0xc9, 0x4c, 0xe8, 0x4c, 0x5a, 0xbb, 0x15, 0x1f, 0xc0, 0xc7, 0xea, 0xb2, 0x1b, 0x41, 0xba, 0x08, 0xd2, 0xbe, 0x41, 0x9e, 0x40, 0x72, 0xb3, 0x49, 0x85, 0x2a, 0xee, 0xe6, 0xf2, 0xff, 0xe6, 0xff, 0xfb, 0xbe, 0x99, 0x81, 0x2f, 0x18, 0x0f, 0x19, 0xf7, 0x39, 0x8e, 0x18, 0x0b, 0x42, @@ -258,7 +258,7 @@ var fileDescriptor_cddd97a9a05492a8 = []byte{ 0x01, 0xdf, 0xf6, 0x8a, 0xb4, 0xd9, 0x2b, 0xd2, 0x8f, 0xbd, 0x22, 0x8d, 0x07, 0x9e, 0x2f, 0xa6, 0xb1, 0x8d, 0x26, 0x2c, 0xc4, 0xa5, 0xab, 0x97, 0x01, 0xb1, 0x79, 0x35, 0xc1, 0x8b, 0xfe, 0x6b, 0xfc, 0xb9, 0xf1, 0xb3, 0xc4, 0x2a, 0x72, 0xb9, 0x7d, 0x96, 0x7f, 0x8d, 0x57, 0xbf, 0x02, 0x00, - 0x00, 0xff, 0xff, 0xcb, 0x03, 0x1a, 0x12, 0x7d, 0x03, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xef, 0xda, 0x1d, 0x71, 0x7d, 0x03, 0x00, 0x00, } func (m *SwapAmountInRoute) Marshal() (dAtA []byte, err error) { diff --git a/x/poolmanager/types/tracked_volume.pb.go b/x/poolmanager/types/tracked_volume.pb.go index a5484a8a746..380d455e788 100644 --- a/x/poolmanager/types/tracked_volume.pb.go +++ b/x/poolmanager/types/tracked_volume.pb.go @@ -93,8 +93,8 @@ var fileDescriptor_0a2e3e91de3baf1a = []byte{ 0x52, 0x8b, 0xc1, 0x1a, 0x8a, 0x83, 0xa0, 0x46, 0x3b, 0x05, 0x9e, 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, 0x39, 0x92, 0x59, 0x50, 0xdf, 0xea, 0xe6, 0x24, 0x26, 0x15, 0xc3, - 0x38, 0xfa, 0x65, 0x46, 0x26, 0xfa, 0x15, 0x28, 0x41, 0x06, 0xb6, 0x20, 0x89, 0x0d, 0xec, 0x1f, - 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x58, 0x0e, 0x65, 0xae, 0x56, 0x01, 0x00, 0x00, + 0x38, 0xfa, 0x65, 0x46, 0xa6, 0xfa, 0x15, 0x28, 0x41, 0x06, 0xb6, 0x20, 0x89, 0x0d, 0xec, 0x1f, + 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7c, 0xd7, 0x62, 0xcd, 0x56, 0x01, 0x00, 0x00, } func (m *TrackedVolume) Marshal() (dAtA []byte, err error) { diff --git a/x/poolmanager/types/tx.pb.go b/x/poolmanager/types/tx.pb.go index 18770a7a53e..8fb398c016d 100644 --- a/x/poolmanager/types/tx.pb.go +++ b/x/poolmanager/types/tx.pb.go @@ -605,66 +605,66 @@ var fileDescriptor_acd130b4825d67dc = []byte{ // 991 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x97, 0x4d, 0x6f, 0x1b, 0x45, 0x18, 0xc7, 0x33, 0x4e, 0x48, 0x93, 0x29, 0x6d, 0xe3, 0xc5, 0x21, 0xae, 0x53, 0xec, 0x68, 0x5b, - 0x81, 0x83, 0xd8, 0x5d, 0xec, 0x46, 0x2a, 0x38, 0x91, 0x10, 0x6e, 0x40, 0x8a, 0x54, 0xcb, 0xed, - 0xd2, 0x13, 0x97, 0xd5, 0xd8, 0x19, 0xdc, 0x25, 0xd9, 0x1d, 0xcb, 0x33, 0xdb, 0x3a, 0x37, 0x40, - 0x3d, 0x45, 0x1c, 0xf8, 0x06, 0x48, 0x7c, 0x02, 0xbe, 0x01, 0xd7, 0x1e, 0x7b, 0x44, 0x1c, 0x2c, - 0x94, 0x20, 0x71, 0xcf, 0x09, 0x09, 0x04, 0x68, 0x5e, 0x76, 0x6d, 0xaf, 0x37, 0x7e, 0x69, 0xd4, - 0x5c, 0x22, 0xef, 0xec, 0xf3, 0xfa, 0x7f, 0x7e, 0xfb, 0x68, 0x02, 0xef, 0x10, 0xea, 0x11, 0xea, - 0x52, 0xab, 0x4d, 0xc8, 0xa1, 0x87, 0x7c, 0xd4, 0xc2, 0x1d, 0xeb, 0x69, 0xa9, 0x81, 0x19, 0x2a, - 0x59, 0xac, 0x6b, 0xb6, 0x3b, 0x84, 0x11, 0x6d, 0x5d, 0x59, 0x99, 0x03, 0x56, 0xa6, 0xb2, 0xca, - 0x65, 0x5a, 0xa4, 0x45, 0x84, 0x9d, 0xc5, 0x7f, 0x49, 0x97, 0x5c, 0x1a, 0x79, 0xae, 0x4f, 0x2c, - 0xf1, 0x57, 0x1d, 0xe5, 0x9b, 0x22, 0x8c, 0xd5, 0x40, 0x14, 0x47, 0x39, 0x9a, 0xc4, 0xf5, 0xd5, - 0xfb, 0x0f, 0xc6, 0xd5, 0x42, 0x9f, 0xa1, 0xb6, 0xd3, 0x21, 0x01, 0xc3, 0xd2, 0x5a, 0xff, 0x27, - 0x05, 0x33, 0x35, 0xda, 0xfa, 0xe2, 0x19, 0x6a, 0x7f, 0xd6, 0x45, 0x4d, 0xf6, 0xa9, 0x47, 0x02, - 0x9f, 0xed, 0xf9, 0xda, 0x26, 0x5c, 0xa4, 0xd8, 0xdf, 0xc7, 0x9d, 0x2c, 0xd8, 0x00, 0xc5, 0xe5, - 0x6a, 0xfa, 0xac, 0x57, 0xb8, 0x76, 0x84, 0xbc, 0xc3, 0x8a, 0x2e, 0xcf, 0x75, 0x5b, 0x19, 0x68, - 0x0f, 0xe0, 0xa2, 0x08, 0x49, 0xb3, 0xa9, 0x8d, 0xf9, 0xe2, 0xd5, 0xb2, 0x69, 0x8e, 0x69, 0xd4, - 0xe4, 0xa9, 0xc2, 0x2c, 0x36, 0x77, 0xab, 0x2e, 0xbc, 0xe8, 0x15, 0xe6, 0x6c, 0x15, 0x43, 0xab, - 0xc1, 0x25, 0x46, 0x0e, 0xb0, 0xef, 0xb8, 0x7e, 0x76, 0x7e, 0x03, 0x14, 0xaf, 0x96, 0x6f, 0x9a, - 0xb2, 0x65, 0x93, 0xb7, 0x1c, 0xc5, 0xb9, 0x4f, 0x5c, 0xbf, 0xba, 0xc6, 0x5d, 0xcf, 0x7a, 0x85, - 0x1b, 0xb2, 0xb2, 0xd0, 0x51, 0xb7, 0xaf, 0x88, 0x9f, 0x7b, 0xbe, 0xe6, 0xc1, 0x8c, 0x3c, 0x25, - 0x01, 0x73, 0x3c, 0xd7, 0x77, 0x90, 0xc8, 0x9d, 0x5d, 0x10, 0x5d, 0xed, 0x70, 0xff, 0xdf, 0x7a, - 0x85, 0x55, 0x99, 0x81, 0xee, 0x1f, 0x98, 0x2e, 0xb1, 0x3c, 0xc4, 0x9e, 0x98, 0x7b, 0x3e, 0x3b, - 0xeb, 0x15, 0xd6, 0x07, 0x03, 0x0f, 0x87, 0xd0, 0xed, 0xb4, 0x38, 0xae, 0x07, 0xac, 0xe6, 0xfa, - 0xb2, 0xa5, 0x8a, 0x71, 0xfc, 0xe7, 0xcf, 0xef, 0x17, 0x93, 0x46, 0xc0, 0xa5, 0x37, 0x30, 0xd7, - 0xd8, 0x90, 0xfe, 0x86, 0xeb, 0xeb, 0xdf, 0x01, 0x78, 0x2b, 0x49, 0x7e, 0x1b, 0xd3, 0x36, 0xf1, - 0x29, 0xd6, 0x1a, 0x70, 0xa5, 0x9f, 0x5b, 0x95, 0x2e, 0x07, 0xf2, 0xd1, 0xa4, 0xd2, 0xd7, 0xe2, - 0xa5, 0x87, 0x65, 0x5f, 0x0f, 0xcb, 0x96, 0xd9, 0xf4, 0xbf, 0x52, 0x30, 0xcf, 0x8b, 0x68, 0x1f, - 0xba, 0x4c, 0x4c, 0xe4, 0x42, 0x34, 0x3c, 0x8a, 0xd1, 0x70, 0x77, 0x6a, 0x1a, 0xfa, 0x05, 0xc4, - 0x90, 0xf8, 0x04, 0x5e, 0x0f, 0x27, 0xeb, 0xec, 0x63, 0x9f, 0x78, 0x02, 0x8c, 0xe5, 0xea, 0xcd, - 0xb3, 0x5e, 0x61, 0x75, 0x78, 0xf2, 0xf2, 0xbd, 0x6e, 0xbf, 0xa9, 0xe6, 0xbf, 0xcb, 0x1f, 0x2f, - 0x1b, 0x82, 0x22, 0x87, 0xe0, 0x76, 0x22, 0x04, 0xbc, 0xc5, 0x81, 0xf9, 0x7f, 0x0f, 0xe0, 0xbb, - 0xe3, 0xa5, 0xbf, 0x54, 0x12, 0xfe, 0x4b, 0xc1, 0xd5, 0x51, 0x1c, 0xeb, 0x01, 0x9b, 0x05, 0x80, - 0x5a, 0x0c, 0x00, 0x6b, 0x4a, 0x00, 0xea, 0x41, 0xe2, 0xf0, 0xbf, 0x86, 0x6f, 0x45, 0xc3, 0xf5, - 0x50, 0x37, 0x6c, 0x5d, 0x12, 0xb0, 0x3d, 0xa9, 0xf5, 0x5c, 0x0c, 0x8f, 0x7e, 0x04, 0xdd, 0x5e, - 0x51, 0x8c, 0xd4, 0x50, 0x57, 0x56, 0xa0, 0x3d, 0x84, 0xcb, 0x91, 0x48, 0x02, 0x8e, 0xb1, 0xcb, - 0x27, 0xab, 0x96, 0xcf, 0x4a, 0x4c, 0x5e, 0xdd, 0x5e, 0x0a, 0x75, 0xad, 0x98, 0x1c, 0x85, 0xcd, - 0xe9, 0xf6, 0x01, 0x77, 0xfd, 0x06, 0xc0, 0x77, 0x12, 0x27, 0x10, 0x71, 0xe0, 0xc0, 0x1b, 0x51, - 0x37, 0x43, 0x18, 0xdc, 0x9b, 0xa4, 0xc5, 0xdb, 0x31, 0x2d, 0x42, 0x1d, 0xae, 0x29, 0x1d, 0x14, - 0x04, 0x7f, 0xa7, 0x60, 0x61, 0x1c, 0x93, 0x33, 0xe2, 0x60, 0xc7, 0x70, 0xd8, 0x9a, 0x1e, 0x87, - 0x73, 0x17, 0x42, 0x35, 0xd4, 0x80, 0xc3, 0x3c, 0xb8, 0x11, 0x72, 0xf1, 0x36, 0x23, 0x83, 0xb0, - 0xcd, 0x7a, 0xc0, 0xe4, 0x4e, 0x38, 0x87, 0xab, 0x85, 0xd7, 0xc0, 0x55, 0x65, 0x93, 0x53, 0x70, - 0x67, 0xe2, 0x42, 0xe0, 0x00, 0x1c, 0x03, 0xf8, 0xde, 0x04, 0xf5, 0x2f, 0x0f, 0x85, 0x7f, 0x01, - 0x5c, 0xe3, 0xc5, 0x60, 0xa9, 0xd9, 0x43, 0xe4, 0x76, 0x1e, 0xa3, 0x03, 0xdc, 0xf9, 0x1c, 0xe3, - 0x59, 0x10, 0x78, 0x0e, 0x60, 0x46, 0x0c, 0xc1, 0x69, 0x23, 0xb7, 0xe3, 0x30, 0x1e, 0xc2, 0xf9, - 0x0a, 0xe3, 0xa9, 0xee, 0x0b, 0x23, 0x99, 0xab, 0xb7, 0xd5, 0x77, 0xa7, 0xd6, 0x72, 0x52, 0x64, - 0xdd, 0x4e, 0xef, 0xc7, 0xfd, 0x2a, 0x25, 0x3e, 0x85, 0xc4, 0xeb, 0x11, 0xc5, 0xcc, 0x10, 0xf6, - 0x06, 0x0f, 0x63, 0x88, 0x30, 0x06, 0x0f, 0xb3, 0x2d, 0x3f, 0x85, 0x84, 0xfe, 0xa3, 0x21, 0x64, - 0xe1, 0x15, 0x1a, 0x34, 0x9b, 0x98, 0x52, 0x21, 0xc4, 0x92, 0x1d, 0x3e, 0xea, 0xbf, 0x00, 0x98, - 0x4e, 0xd4, 0x4d, 0xa4, 0xfa, 0x70, 0x54, 0x37, 0x79, 0xae, 0xdb, 0xca, 0x20, 0x32, 0x2d, 0x65, - 0x53, 0x89, 0xa6, 0xa5, 0xd0, 0xb4, 0xa4, 0x3d, 0x86, 0xcb, 0x7d, 0x59, 0xe7, 0x87, 0x20, 0x58, - 0x1f, 0x85, 0xe0, 0x01, 0x6e, 0xa1, 0xe6, 0xd1, 0x2e, 0x6e, 0x0e, 0x6c, 0xaf, 0xbe, 0x74, 0x4b, - 0x4c, 0xd5, 0x5a, 0xfe, 0xe3, 0x0d, 0x38, 0x5f, 0xa3, 0x2d, 0xed, 0x5b, 0x00, 0xd3, 0xa3, 0x97, - 0x82, 0xd2, 0xd8, 0xb9, 0x25, 0x5d, 0x6b, 0x72, 0x1f, 0xcf, 0xec, 0x12, 0xe9, 0xfc, 0x1c, 0x40, - 0x2d, 0x61, 0x13, 0x95, 0x67, 0x8c, 0x58, 0x0f, 0x58, 0xae, 0x32, 0xbb, 0x4f, 0x54, 0xc6, 0x8f, - 0x00, 0xae, 0x8f, 0xbb, 0x29, 0x6d, 0x4f, 0x8c, 0x7d, 0xbe, 0x73, 0xee, 0xfe, 0x05, 0x9c, 0xa3, - 0x0a, 0x7f, 0x02, 0xf0, 0xd6, 0xd8, 0xe5, 0xbd, 0xf3, 0xca, 0x59, 0xb8, 0x78, 0xbb, 0x17, 0xf1, - 0x8e, 0x8a, 0x3c, 0x06, 0x30, 0x93, 0xb8, 0x56, 0xb6, 0x26, 0x86, 0x4f, 0xf0, 0xca, 0xed, 0xbc, - 0x8a, 0x57, 0x58, 0x4c, 0xf5, 0xd1, 0x8b, 0x93, 0x3c, 0x78, 0x79, 0x92, 0x07, 0xbf, 0x9f, 0xe4, - 0xc1, 0x0f, 0xa7, 0xf9, 0xb9, 0x97, 0xa7, 0xf9, 0xb9, 0x5f, 0x4f, 0xf3, 0x73, 0x5f, 0xde, 0x6b, - 0xb9, 0xec, 0x49, 0xd0, 0x30, 0x9b, 0xc4, 0xb3, 0x54, 0x06, 0xe3, 0x10, 0x35, 0x68, 0xf8, 0x60, - 0x3d, 0x2d, 0x6f, 0x59, 0xdd, 0xa1, 0x5d, 0xc2, 0x8e, 0xda, 0x98, 0x36, 0x16, 0xc5, 0xbf, 0x57, - 0x77, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x0f, 0xc5, 0x57, 0x49, 0x1a, 0x0e, 0x00, 0x00, + 0x81, 0x83, 0xd8, 0x5d, 0xec, 0x16, 0x15, 0x9c, 0x48, 0x08, 0x37, 0x20, 0x45, 0xaa, 0xe5, 0x76, + 0xe9, 0x89, 0xcb, 0x6a, 0xec, 0x0c, 0xee, 0x92, 0xec, 0x8e, 0xe5, 0x99, 0x6d, 0x9d, 0x1b, 0xa0, + 0x9e, 0x22, 0x0e, 0x7c, 0x03, 0x24, 0x3e, 0x01, 0xdf, 0x80, 0x6b, 0x8f, 0x3d, 0x22, 0x0e, 0x16, + 0x4a, 0x90, 0xb8, 0xe7, 0x84, 0x04, 0x02, 0x34, 0x2f, 0xbb, 0xb6, 0xd7, 0x1b, 0xbf, 0x24, 0x22, + 0x97, 0xc8, 0x3b, 0xfb, 0xbc, 0xfe, 0x9f, 0xdf, 0x3e, 0x9a, 0xc0, 0x3b, 0x84, 0x7a, 0x84, 0xba, + 0xd4, 0x6a, 0x13, 0x72, 0xe0, 0x21, 0x1f, 0xb5, 0x70, 0xc7, 0x7a, 0x56, 0x6a, 0x60, 0x86, 0x4a, + 0x16, 0xeb, 0x9a, 0xed, 0x0e, 0x61, 0x44, 0x5b, 0x57, 0x56, 0xe6, 0x80, 0x95, 0xa9, 0xac, 0x72, + 0x99, 0x16, 0x69, 0x11, 0x61, 0x67, 0xf1, 0x5f, 0xd2, 0x25, 0x97, 0x46, 0x9e, 0xeb, 0x13, 0x4b, + 0xfc, 0x55, 0x47, 0xf9, 0xa6, 0x08, 0x63, 0x35, 0x10, 0xc5, 0x51, 0x8e, 0x26, 0x71, 0x7d, 0xf5, + 0xfe, 0xbd, 0x71, 0xb5, 0xd0, 0xe7, 0xa8, 0xed, 0x74, 0x48, 0xc0, 0xb0, 0xb4, 0xd6, 0xff, 0x4e, + 0xc1, 0x4c, 0x8d, 0xb6, 0x3e, 0x7f, 0x8e, 0xda, 0x9f, 0x76, 0x51, 0x93, 0x7d, 0xe2, 0x91, 0xc0, + 0x67, 0xbb, 0xbe, 0xb6, 0x09, 0x17, 0x29, 0xf6, 0xf7, 0x70, 0x27, 0x0b, 0x36, 0x40, 0x71, 0xb9, + 0x9a, 0x3e, 0xed, 0x15, 0xae, 0x1d, 0x22, 0xef, 0xa0, 0xa2, 0xcb, 0x73, 0xdd, 0x56, 0x06, 0xda, + 0x43, 0xb8, 0x28, 0x42, 0xd2, 0x6c, 0x6a, 0x63, 0xbe, 0x78, 0xb5, 0x6c, 0x9a, 0x63, 0x1a, 0x35, + 0x79, 0xaa, 0x30, 0x8b, 0xcd, 0xdd, 0xaa, 0x0b, 0x2f, 0x7b, 0x85, 0x39, 0x5b, 0xc5, 0xd0, 0x6a, + 0x70, 0x89, 0x91, 0x7d, 0xec, 0x3b, 0xae, 0x9f, 0x9d, 0xdf, 0x00, 0xc5, 0xab, 0xe5, 0x9b, 0xa6, + 0x6c, 0xd9, 0xe4, 0x2d, 0x47, 0x71, 0x1e, 0x10, 0xd7, 0xaf, 0xae, 0x71, 0xd7, 0xd3, 0x5e, 0xe1, + 0x86, 0xac, 0x2c, 0x74, 0xd4, 0xed, 0x2b, 0xe2, 0xe7, 0xae, 0xaf, 0x79, 0x30, 0x23, 0x4f, 0x49, + 0xc0, 0x1c, 0xcf, 0xf5, 0x1d, 0x24, 0x72, 0x67, 0x17, 0x44, 0x57, 0xdb, 0xdc, 0xff, 0xd7, 0x5e, + 0x61, 0x55, 0x66, 0xa0, 0x7b, 0xfb, 0xa6, 0x4b, 0x2c, 0x0f, 0xb1, 0xa7, 0xe6, 0xae, 0xcf, 0x4e, + 0x7b, 0x85, 0xf5, 0xc1, 0xc0, 0xc3, 0x21, 0x74, 0x3b, 0x2d, 0x8e, 0xeb, 0x01, 0xab, 0xb9, 0xbe, + 0x6c, 0xa9, 0x62, 0x1c, 0xfd, 0xf1, 0xd3, 0xbb, 0xc5, 0xa4, 0x11, 0x70, 0xe9, 0x0d, 0xcc, 0x35, + 0x36, 0xa4, 0xbf, 0xe1, 0xfa, 0xfa, 0xb7, 0x00, 0xde, 0x4a, 0x92, 0xdf, 0xc6, 0xb4, 0x4d, 0x7c, + 0x8a, 0xb5, 0x06, 0x5c, 0xe9, 0xe7, 0x56, 0xa5, 0xcb, 0x81, 0x7c, 0x38, 0xa9, 0xf4, 0xb5, 0x78, + 0xe9, 0x61, 0xd9, 0xd7, 0xc3, 0xb2, 0x65, 0x36, 0xfd, 0xcf, 0x14, 0xcc, 0xf3, 0x22, 0xda, 0x07, + 0x2e, 0x13, 0x13, 0xb9, 0x10, 0x0d, 0x8f, 0x63, 0x34, 0xdc, 0x9d, 0x9a, 0x86, 0x7e, 0x01, 0x31, + 0x24, 0x3e, 0x86, 0xd7, 0xc3, 0xc9, 0x3a, 0x7b, 0xd8, 0x27, 0x9e, 0x00, 0x63, 0xb9, 0x7a, 0xf3, + 0xb4, 0x57, 0x58, 0x1d, 0x9e, 0xbc, 0x7c, 0xaf, 0xdb, 0xaf, 0xab, 0xf9, 0xef, 0xf0, 0xc7, 0xcb, + 0x86, 0xa0, 0xc8, 0x21, 0xb8, 0x9d, 0x08, 0x01, 0x6f, 0x71, 0x60, 0xfe, 0xdf, 0x01, 0xf8, 0xf6, + 0x78, 0xe9, 0x2f, 0x95, 0x84, 0x7f, 0x53, 0x70, 0x75, 0x14, 0xc7, 0x7a, 0xc0, 0x66, 0x01, 0xa0, + 0x16, 0x03, 0xc0, 0x9a, 0x12, 0x80, 0x7a, 0x90, 0x38, 0xfc, 0xaf, 0xe0, 0x1b, 0xd1, 0x70, 0x3d, + 0xd4, 0x0d, 0x5b, 0x97, 0x04, 0x6c, 0x4d, 0x6a, 0x3d, 0x17, 0xc3, 0xa3, 0x1f, 0x41, 0xb7, 0x57, + 0x14, 0x23, 0x35, 0xd4, 0x95, 0x15, 0x68, 0x8f, 0xe0, 0x72, 0x24, 0x92, 0x80, 0x63, 0xec, 0xf2, + 0xc9, 0xaa, 0xe5, 0xb3, 0x12, 0x93, 0x57, 0xb7, 0x97, 0x42, 0x5d, 0x2b, 0x26, 0x47, 0x61, 0x73, + 0xba, 0x7d, 0xc0, 0x5d, 0xbf, 0x06, 0xf0, 0xad, 0xc4, 0x09, 0x44, 0x1c, 0x38, 0xf0, 0x46, 0xd4, + 0xcd, 0x10, 0x06, 0xf7, 0x27, 0x69, 0xf1, 0x66, 0x4c, 0x8b, 0x50, 0x87, 0x6b, 0x4a, 0x07, 0x05, + 0xc1, 0x5f, 0x29, 0x58, 0x18, 0xc7, 0xe4, 0x8c, 0x38, 0xd8, 0x31, 0x1c, 0xee, 0x4d, 0x8f, 0xc3, + 0x99, 0x0b, 0xa1, 0x1a, 0x6a, 0xc0, 0x61, 0x1e, 0xdc, 0x08, 0xb9, 0x78, 0x9b, 0x91, 0x41, 0xd8, + 0x66, 0x3d, 0x60, 0x72, 0x27, 0x9c, 0xc1, 0xd5, 0xc2, 0xff, 0xc0, 0x55, 0x65, 0x93, 0x53, 0x70, + 0x67, 0xe2, 0x42, 0xe0, 0x00, 0x1c, 0x01, 0xf8, 0xce, 0x04, 0xf5, 0x2f, 0x0f, 0x85, 0x7f, 0x00, + 0x5c, 0xe3, 0xc5, 0x60, 0xa9, 0xd9, 0x23, 0xe4, 0x76, 0x9e, 0xa0, 0x7d, 0xdc, 0xf9, 0x0c, 0xe3, + 0x59, 0x10, 0x78, 0x01, 0x60, 0x46, 0x0c, 0xc1, 0x69, 0x23, 0xb7, 0xe3, 0x30, 0x1e, 0xc2, 0xf9, + 0x12, 0xe3, 0xa9, 0xee, 0x0b, 0x23, 0x99, 0xab, 0xb7, 0xd5, 0x77, 0xa7, 0xd6, 0x72, 0x52, 0x64, + 0xdd, 0x4e, 0xef, 0xc5, 0xfd, 0x2a, 0x25, 0x3e, 0x85, 0xc4, 0xeb, 0x11, 0xc5, 0xcc, 0x10, 0xf6, + 0x06, 0x0f, 0x63, 0x88, 0x30, 0x06, 0x0f, 0xb3, 0x25, 0x3f, 0x85, 0x84, 0xfe, 0xa3, 0x21, 0x64, + 0xe1, 0x15, 0x1a, 0x34, 0x9b, 0x98, 0x52, 0x21, 0xc4, 0x92, 0x1d, 0x3e, 0xea, 0x3f, 0x03, 0x98, + 0x4e, 0xd4, 0x4d, 0xa4, 0x7a, 0x7f, 0x54, 0x37, 0x79, 0xae, 0xdb, 0xca, 0x20, 0x32, 0x2d, 0x65, + 0x53, 0x89, 0xa6, 0xa5, 0xd0, 0xb4, 0xa4, 0x3d, 0x81, 0xcb, 0x7d, 0x59, 0xe7, 0x87, 0x20, 0x58, + 0x1f, 0x85, 0xe0, 0x21, 0x6e, 0xa1, 0xe6, 0xe1, 0x0e, 0x6e, 0x0e, 0x6c, 0xaf, 0xbe, 0x74, 0x4b, + 0x4c, 0xd5, 0x5a, 0xfe, 0xfd, 0x35, 0x38, 0x5f, 0xa3, 0x2d, 0xed, 0x1b, 0x00, 0xd3, 0xa3, 0x97, + 0x82, 0xd2, 0xd8, 0xb9, 0x25, 0x5d, 0x6b, 0x72, 0x1f, 0xcd, 0xec, 0x12, 0xe9, 0xfc, 0x02, 0x40, + 0x2d, 0x61, 0x13, 0x95, 0x67, 0x8c, 0x58, 0x0f, 0x58, 0xae, 0x32, 0xbb, 0x4f, 0x54, 0xc6, 0x0f, + 0x00, 0xae, 0x8f, 0xbb, 0x29, 0x6d, 0x4d, 0x8c, 0x7d, 0xb6, 0x73, 0xee, 0xc1, 0x05, 0x9c, 0xa3, + 0x0a, 0x7f, 0x04, 0xf0, 0xd6, 0xd8, 0xe5, 0xbd, 0x7d, 0xee, 0x2c, 0x5c, 0xbc, 0x9d, 0x8b, 0x78, + 0x47, 0x45, 0x1e, 0x01, 0x98, 0x49, 0x5c, 0x2b, 0xf7, 0x26, 0x86, 0x4f, 0xf0, 0xca, 0x6d, 0x9f, + 0xc7, 0x2b, 0x2c, 0xa6, 0xfa, 0xf8, 0xe5, 0x71, 0x1e, 0xbc, 0x3a, 0xce, 0x83, 0xdf, 0x8e, 0xf3, + 0xe0, 0xfb, 0x93, 0xfc, 0xdc, 0xab, 0x93, 0xfc, 0xdc, 0x2f, 0x27, 0xf9, 0xb9, 0x2f, 0xee, 0xb7, + 0x5c, 0xf6, 0x34, 0x68, 0x98, 0x4d, 0xe2, 0x59, 0x2a, 0x83, 0x71, 0x80, 0x1a, 0x34, 0x7c, 0xb0, + 0x9e, 0x95, 0x3f, 0xb0, 0xba, 0x43, 0xbb, 0x84, 0x1d, 0xb6, 0x31, 0x6d, 0x2c, 0x8a, 0x7f, 0xaf, + 0xee, 0xfe, 0x17, 0x00, 0x00, 0xff, 0xff, 0x2b, 0x1c, 0x50, 0x2a, 0x1a, 0x0e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/protorev/client/cli/query.go b/x/protorev/client/cli/query.go index c9bb0709e44..ffccc6a4ba2 100644 --- a/x/protorev/client/cli/query.go +++ b/x/protorev/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // NewCmdQuery returns the cli query commands for this module diff --git a/x/protorev/client/cli/tx.go b/x/protorev/client/cli/tx.go index 2b2cb7512a0..5da02e115ea 100644 --- a/x/protorev/client/cli/tx.go +++ b/x/protorev/client/cli/tx.go @@ -15,7 +15,7 @@ import ( govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/protorev/client/cli/utils.go b/x/protorev/client/cli/utils.go index f8ff9a8942f..1d81bcee426 100644 --- a/x/protorev/client/cli/utils.go +++ b/x/protorev/client/cli/utils.go @@ -11,7 +11,7 @@ import ( flag "github.com/spf13/pflag" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // ------------ types/functions to handle a SetHotRoutes CLI TX ------------ // diff --git a/x/protorev/keeper/developer_fees.go b/x/protorev/keeper/developer_fees.go index 6db3d7d66e7..dc111e37bb5 100644 --- a/x/protorev/keeper/developer_fees.go +++ b/x/protorev/keeper/developer_fees.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // DistributeProfit sends the developer fee from the module account to the developer account diff --git a/x/protorev/keeper/developer_fees_test.go b/x/protorev/keeper/developer_fees_test.go index 949767685bd..5196aadd405 100644 --- a/x/protorev/keeper/developer_fees_test.go +++ b/x/protorev/keeper/developer_fees_test.go @@ -6,8 +6,8 @@ import ( distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) var ( diff --git a/x/protorev/keeper/emit.go b/x/protorev/keeper/emit.go index 427cf75b71b..e787173e883 100644 --- a/x/protorev/keeper/emit.go +++ b/x/protorev/keeper/emit.go @@ -10,7 +10,7 @@ import ( "github.com/cometbft/cometbft/crypto/tmhash" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // EmitBackrunEvent updates and emits a backrunEvent diff --git a/x/protorev/keeper/emit_test.go b/x/protorev/keeper/emit_test.go index 1fab61d96f0..ef11875dedb 100644 --- a/x/protorev/keeper/emit_test.go +++ b/x/protorev/keeper/emit_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/protorev/keeper" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/keeper" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) func (s *KeeperTestSuite) TestBackRunEvent() { diff --git a/x/protorev/keeper/epoch_hook.go b/x/protorev/keeper/epoch_hook.go index a3131721365..1ae03fc2632 100644 --- a/x/protorev/keeper/epoch_hook.go +++ b/x/protorev/keeper/epoch_hook.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/x/protorev/keeper/epoch_hook_test.go b/x/protorev/keeper/epoch_hook_test.go index 7be7cc3df4f..cd5420d3224 100644 --- a/x/protorev/keeper/epoch_hook_test.go +++ b/x/protorev/keeper/epoch_hook_test.go @@ -9,9 +9,9 @@ import ( distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/protorev/keeper" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/protorev/keeper" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // BenchmarkEpochHook benchmarks the epoch hook. In particular, it benchmarks the UpdatePools function. diff --git a/x/protorev/keeper/genesis.go b/x/protorev/keeper/genesis.go index 300dcd1d7c8..74ed35cfc23 100644 --- a/x/protorev/keeper/genesis.go +++ b/x/protorev/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // InitGenesis initializes the module's state from a provided genesis state. diff --git a/x/protorev/keeper/grpc_query.go b/x/protorev/keeper/grpc_query.go index 4c08523766e..05900b57355 100644 --- a/x/protorev/keeper/grpc_query.go +++ b/x/protorev/keeper/grpc_query.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) var _ types.QueryServer = Querier{} diff --git a/x/protorev/keeper/grpc_query_test.go b/x/protorev/keeper/grpc_query_test.go index d246bb4cca7..9ded80a877a 100644 --- a/x/protorev/keeper/grpc_query_test.go +++ b/x/protorev/keeper/grpc_query_test.go @@ -4,10 +4,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // TestParams tests the query for params diff --git a/x/protorev/keeper/hooks.go b/x/protorev/keeper/hooks.go index cd93a985f62..9768c83c8b8 100644 --- a/x/protorev/keeper/hooks.go +++ b/x/protorev/keeper/hooks.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) type Hooks struct { diff --git a/x/protorev/keeper/hooks_test.go b/x/protorev/keeper/hooks_test.go index fddac9076dd..9ba6920a269 100644 --- a/x/protorev/keeper/hooks_test.go +++ b/x/protorev/keeper/hooks_test.go @@ -3,10 +3,10 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // Tests the hook implementation that is called after swapping diff --git a/x/protorev/keeper/keeper.go b/x/protorev/keeper/keeper.go index e90505f9f6d..8c50ea28822 100644 --- a/x/protorev/keeper/keeper.go +++ b/x/protorev/keeper/keeper.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) type ( diff --git a/x/protorev/keeper/keeper_test.go b/x/protorev/keeper/keeper_test.go index d1fae074e1e..ad629e637a5 100644 --- a/x/protorev/keeper/keeper_test.go +++ b/x/protorev/keeper/keeper_test.go @@ -10,15 +10,15 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/protorev" - protorevkeeper "github.com/osmosis-labs/osmosis/v24/x/protorev/keeper" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/protorev" + protorevkeeper "github.com/osmosis-labs/osmosis/v25/x/protorev/keeper" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" - osmosisapp "github.com/osmosis-labs/osmosis/v24/app" + osmosisapp "github.com/osmosis-labs/osmosis/v25/app" ) type KeeperTestSuite struct { diff --git a/x/protorev/keeper/msg_server.go b/x/protorev/keeper/msg_server.go index 8cebf9566c5..b1496dd0e32 100644 --- a/x/protorev/keeper/msg_server.go +++ b/x/protorev/keeper/msg_server.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) type MsgServer struct { diff --git a/x/protorev/keeper/msg_server_test.go b/x/protorev/keeper/msg_server_test.go index dde9976fee6..95c64a75098 100644 --- a/x/protorev/keeper/msg_server_test.go +++ b/x/protorev/keeper/msg_server_test.go @@ -4,9 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/protorev/keeper" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/protorev/keeper" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // TestMsgSetHotRoutes tests the MsgSetHotRoutes message. diff --git a/x/protorev/keeper/params.go b/x/protorev/keeper/params.go index 1d566d2d939..0a93179b5c1 100644 --- a/x/protorev/keeper/params.go +++ b/x/protorev/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // GetParams get all parameters as types.Params diff --git a/x/protorev/keeper/posthandler_test.go b/x/protorev/keeper/posthandler_test.go index efeee3c1537..1379e8b905a 100644 --- a/x/protorev/keeper/posthandler_test.go +++ b/x/protorev/keeper/posthandler_test.go @@ -13,10 +13,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/bank/testutil" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/keeper" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/keeper" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // BenchmarkBalancerSwapHighestLiquidityArb benchmarks a balancer swap that creates a single three hop arbitrage diff --git a/x/protorev/keeper/proposal_test.go b/x/protorev/keeper/proposal_test.go index ecd84f53026..b0d3e82e2f3 100644 --- a/x/protorev/keeper/proposal_test.go +++ b/x/protorev/keeper/proposal_test.go @@ -1,9 +1,9 @@ package keeper_test import ( - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/protorev" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/protorev" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // TestSetProtoRevAdminAccount tests that the admin account can be set through a proposal diff --git a/x/protorev/keeper/protorev.go b/x/protorev/keeper/protorev.go index 57de3ae204a..8a50bcf0646 100644 --- a/x/protorev/keeper/protorev.go +++ b/x/protorev/keeper/protorev.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" "github.com/cosmos/cosmos-sdk/store/prefix" diff --git a/x/protorev/keeper/protorev_test.go b/x/protorev/keeper/protorev_test.go index 7823461f2d6..f47f775c696 100644 --- a/x/protorev/keeper/protorev_test.go +++ b/x/protorev/keeper/protorev_test.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // TestGetTokenPairArbRoutes tests the GetTokenPairArbRoutes function. diff --git a/x/protorev/keeper/rebalance.go b/x/protorev/keeper/rebalance.go index 35b35d10bc1..528ca2ee628 100644 --- a/x/protorev/keeper/rebalance.go +++ b/x/protorev/keeper/rebalance.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) var zeroInt = osmomath.ZeroInt() diff --git a/x/protorev/keeper/rebalance_test.go b/x/protorev/keeper/rebalance_test.go index a366f49af36..7463d0c00ba 100644 --- a/x/protorev/keeper/rebalance_test.go +++ b/x/protorev/keeper/rebalance_test.go @@ -6,12 +6,12 @@ import ( distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/stableswap" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/keeper" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/keeper" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/stableswap" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/keeper" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/keeper" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // Mainnet Arb Route - 2 Asset, Same Weights (Block: 5905150) diff --git a/x/protorev/keeper/routes.go b/x/protorev/keeper/routes.go index 0c37c32c584..81b47321a15 100644 --- a/x/protorev/keeper/routes.go +++ b/x/protorev/keeper/routes.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) type RouteMetaData struct { diff --git a/x/protorev/keeper/routes_test.go b/x/protorev/keeper/routes_test.go index b9ab8dda618..225623636ce 100644 --- a/x/protorev/keeper/routes_test.go +++ b/x/protorev/keeper/routes_test.go @@ -2,8 +2,8 @@ package keeper_test import ( "github.com/osmosis-labs/osmosis/osmomath" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) type TestRoute struct { diff --git a/x/protorev/keeper/statistics.go b/x/protorev/keeper/statistics.go index ebe14ad6b0f..f2a8a08a401 100644 --- a/x/protorev/keeper/statistics.go +++ b/x/protorev/keeper/statistics.go @@ -11,8 +11,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // ----------------------- Statistics Stores ----------------------- // diff --git a/x/protorev/keeper/statistics_test.go b/x/protorev/keeper/statistics_test.go index 893aedf59f1..935e97bc078 100644 --- a/x/protorev/keeper/statistics_test.go +++ b/x/protorev/keeper/statistics_test.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) // TestGetNumberOfTrades tests GetNumberOfTrades and IncrementNumberOfTrades diff --git a/x/protorev/module.go b/x/protorev/module.go index 0d621faca9d..0a9fdd4de07 100644 --- a/x/protorev/module.go +++ b/x/protorev/module.go @@ -16,9 +16,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/v24/x/protorev/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/protorev/keeper" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/protorev/keeper" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) var ( diff --git a/x/protorev/proposal_handler.go b/x/protorev/proposal_handler.go index b12a49ca467..d788202f2e4 100644 --- a/x/protorev/proposal_handler.go +++ b/x/protorev/proposal_handler.go @@ -7,8 +7,8 @@ import ( errorsmod "cosmossdk.io/errors" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v24/x/protorev/keeper" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/keeper" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) func NewProtoRevProposalHandler(k keeper.Keeper) govtypesv1.Handler { diff --git a/x/protorev/types/expected_keepers.go b/x/protorev/types/expected_keepers.go index 2bf623fd1ce..77f945ab3d3 100644 --- a/x/protorev/types/expected_keepers.go +++ b/x/protorev/types/expected_keepers.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/x/protorev/types/genesis.pb.go b/x/protorev/types/genesis.pb.go index 4df6046fcf8..9eaf8b970fe 100644 --- a/x/protorev/types/genesis.pb.go +++ b/x/protorev/types/genesis.pb.go @@ -194,51 +194,51 @@ var fileDescriptor_3c77fc2da5752af2 = []byte{ // 744 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x4d, 0x6f, 0xdb, 0x36, 0x18, 0xb6, 0x16, 0xe7, 0x8b, 0x4e, 0x8c, 0x84, 0x9b, 0x03, 0xd9, 0x58, 0x64, 0x4d, 0xcb, 0x36, - 0x63, 0x58, 0x24, 0x24, 0xcb, 0x69, 0x87, 0x01, 0x51, 0x86, 0xec, 0x0b, 0x0b, 0x0c, 0xc5, 0xbb, - 0xb4, 0x40, 0x59, 0x4a, 0xa6, 0x1d, 0x21, 0x92, 0x28, 0x88, 0xb4, 0x6b, 0xff, 0x80, 0xde, 0xfb, - 0x63, 0xfa, 0x23, 0x72, 0x0c, 0x7a, 0xea, 0xc9, 0x28, 0x92, 0x7f, 0xe0, 0x43, 0xcf, 0x85, 0x48, - 0xda, 0x69, 0x1c, 0x0b, 0xbd, 0x99, 0xef, 0xfb, 0x7c, 0xbc, 0x8f, 0xf9, 0x52, 0xe0, 0x47, 0xca, - 0x62, 0xca, 0x42, 0xe6, 0xa4, 0x19, 0xe5, 0x34, 0x23, 0x43, 0x67, 0x78, 0xe4, 0x13, 0x8e, 0x8f, - 0x9c, 0x3e, 0x49, 0x08, 0x0b, 0x99, 0x2d, 0x1a, 0x50, 0x57, 0x38, 0x7b, 0x86, 0xb3, 0x15, 0xae, - 0xf1, 0x4d, 0x9f, 0xf6, 0xa9, 0xa8, 0x3a, 0xf9, 0x2f, 0x09, 0x68, 0xfc, 0x54, 0xa8, 0x3b, 0x17, - 0x90, 0xc0, 0x1f, 0x8a, 0x81, 0x38, 0xc3, 0xb1, 0x32, 0x6c, 0xd4, 0x03, 0x81, 0x43, 0xd2, 0x48, - 0x1e, 0x54, 0xcb, 0x90, 0x27, 0xc7, 0xc7, 0x8c, 0xcc, 0xc9, 0x01, 0x0d, 0x13, 0xd9, 0xb7, 0x3e, - 0x6e, 0x82, 0xad, 0x3f, 0x65, 0x98, 0x4b, 0x8e, 0x39, 0x81, 0xbf, 0x83, 0x35, 0xa9, 0xad, 0x6b, - 0xa6, 0xd6, 0xaa, 0x1c, 0x9b, 0x76, 0x51, 0x38, 0xbb, 0x2d, 0x70, 0x6e, 0xf9, 0x66, 0xd2, 0x2c, - 0x79, 0x8a, 0x05, 0x5f, 0x6b, 0xa0, 0xc6, 0xe9, 0x35, 0x49, 0x50, 0x8a, 0xc3, 0x0c, 0xe1, 0xcc, - 0x47, 0x19, 0x1d, 0x70, 0xc2, 0xf4, 0xaf, 0xcc, 0x95, 0x56, 0xe5, 0xf8, 0x97, 0x62, 0xbd, 0x4e, - 0x4e, 0x6b, 0xe3, 0x30, 0x3b, 0xcd, 0x7c, 0x4f, 0x70, 0xdc, 0x83, 0x5c, 0x7b, 0x3a, 0x69, 0x7e, - 0x3b, 0xc6, 0x71, 0xf4, 0x9b, 0xb5, 0x54, 0xd8, 0xf2, 0x20, 0x7f, 0xc2, 0x84, 0x2f, 0x41, 0x25, - 0xcf, 0x8c, 0xba, 0x24, 0xa1, 0x31, 0xd3, 0x57, 0x84, 0xf9, 0xf7, 0xc5, 0xe6, 0x2e, 0x66, 0xe4, - 0x8f, 0x1c, 0xeb, 0x36, 0x94, 0x27, 0x94, 0x9e, 0x9f, 0xa9, 0x58, 0x1e, 0xf0, 0x67, 0x30, 0x06, - 0x11, 0xa8, 0x77, 0xf1, 0x98, 0x21, 0x16, 0x26, 0x01, 0x41, 0x31, 0xed, 0x0e, 0x22, 0x82, 0xd4, - 0x62, 0xe8, 0xab, 0xa6, 0xd6, 0x2a, 0xbb, 0x07, 0xd3, 0x49, 0xd3, 0x94, 0x32, 0x85, 0x50, 0xcb, - 0xdb, 0xcb, 0x7b, 0x97, 0x79, 0xeb, 0x3f, 0xd1, 0x51, 0xf7, 0x01, 0x11, 0xa8, 0x76, 0xc9, 0x90, - 0x44, 0x34, 0x25, 0x19, 0xea, 0x11, 0xc2, 0xf4, 0x35, 0x91, 0xa2, 0x6e, 0xab, 0x2b, 0xce, 0x87, - 0x99, 0x07, 0x38, 0xa3, 0x61, 0xe2, 0xee, 0xab, 0xd9, 0x6b, 0xca, 0xf4, 0x11, 0xdd, 0xf2, 0xb6, - 0xe7, 0x85, 0x73, 0x42, 0x18, 0xbc, 0x00, 0x5f, 0x47, 0x98, 0x13, 0xc6, 0x91, 0x1f, 0xd1, 0xe0, - 0x1a, 0x5d, 0x91, 0xb0, 0x7f, 0xc5, 0xf5, 0x75, 0x31, 0xbb, 0x31, 0x9d, 0x34, 0x1b, 0x52, 0x66, - 0x09, 0xc8, 0xf2, 0x76, 0x65, 0xd5, 0xcd, 0x8b, 0x7f, 0x89, 0x1a, 0x7c, 0x0e, 0x76, 0x1f, 0x1c, - 0x71, 0xb7, 0x9b, 0x11, 0xc6, 0xf4, 0x0d, 0x53, 0x6b, 0x6d, 0xba, 0xf6, 0x74, 0xd2, 0xd4, 0x17, - 0x87, 0x52, 0x10, 0xeb, 0xdd, 0xdb, 0xc3, 0xaa, 0x8a, 0x74, 0x2a, 0x4b, 0xde, 0xce, 0x1c, 0xa5, - 0x2a, 0xf0, 0x05, 0xa8, 0xc7, 0x78, 0x84, 0x52, 0x4a, 0x23, 0x94, 0xd2, 0x30, 0xe1, 0x0c, 0xe5, - 0x1a, 0x62, 0x28, 0x7d, 0x73, 0xf1, 0xef, 0x2e, 0x84, 0x5a, 0x5e, 0x2d, 0xc6, 0xa3, 0x36, 0xa5, - 0x51, 0x5b, 0x74, 0xda, 0x24, 0x13, 0x11, 0xe0, 0xff, 0x60, 0x6f, 0x19, 0x89, 0x8f, 0x74, 0x20, - 0xc4, 0xbf, 0x9b, 0x4e, 0x9a, 0xfb, 0xc5, 0xe2, 0x7c, 0x64, 0x79, 0x70, 0x51, 0xb9, 0x33, 0x82, - 0x97, 0xa0, 0x26, 0x50, 0x28, 0xa0, 0x83, 0x84, 0xa3, 0x1e, 0x9d, 0x8d, 0x5c, 0x11, 0xaa, 0xe6, - 0xc3, 0x72, 0x2f, 0x85, 0x59, 0x1e, 0x14, 0xf5, 0xb3, 0xbc, 0x7c, 0x4e, 0xd5, 0xac, 0xff, 0x82, - 0xf5, 0x34, 0xa3, 0xbd, 0x90, 0x33, 0x7d, 0xeb, 0x4b, 0x2b, 0xb1, 0xa7, 0x56, 0xa2, 0xaa, 0x5c, - 0x24, 0xcf, 0xf2, 0x66, 0x0a, 0x70, 0x00, 0x76, 0xc3, 0xa4, 0x47, 0x91, 0x3f, 0x96, 0xa1, 0xf8, - 0x38, 0x25, 0xfa, 0xb6, 0x78, 0xfc, 0xad, 0xe2, 0xf7, 0xf2, 0x77, 0xd2, 0xa3, 0xee, 0x38, 0x4f, - 0xdb, 0x19, 0xa7, 0xc4, 0x35, 0x95, 0x8b, 0xba, 0xe3, 0x27, 0x82, 0x96, 0x57, 0x0d, 0x1f, 0x31, - 0xe0, 0x2b, 0x00, 0x83, 0x71, 0x10, 0x85, 0x81, 0x78, 0xca, 0x3c, 0xc3, 0xc1, 0x35, 0xc9, 0xf4, - 0xaa, 0xf0, 0xfd, 0xb9, 0xd8, 0xf7, 0x4c, 0x70, 0x4e, 0x33, 0xbf, 0x23, 0x19, 0xee, 0xfe, 0x74, - 0xd2, 0xac, 0x4b, 0xd7, 0xa7, 0x7a, 0x96, 0xb7, 0x13, 0x2c, 0x10, 0xfe, 0x29, 0x6f, 0x94, 0x77, - 0x56, 0xdd, 0x8b, 0x9b, 0x3b, 0x43, 0xbb, 0xbd, 0x33, 0xb4, 0x0f, 0x77, 0x86, 0xf6, 0xe6, 0xde, - 0x28, 0xdd, 0xde, 0x1b, 0xa5, 0xf7, 0xf7, 0x46, 0xe9, 0xd9, 0x49, 0x3f, 0xe4, 0x57, 0x03, 0xdf, - 0x0e, 0x68, 0xec, 0xa8, 0x31, 0x0e, 0x23, 0xec, 0xb3, 0xd9, 0xc1, 0x19, 0x1e, 0x9f, 0x38, 0xa3, - 0x87, 0x4f, 0x72, 0x1e, 0x8f, 0xf9, 0x6b, 0xe2, 0xfc, 0xeb, 0xa7, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x99, 0x0e, 0xb7, 0x83, 0x34, 0x06, 0x00, 0x00, + 0x63, 0x58, 0x24, 0x24, 0xdb, 0x2e, 0x3b, 0x0c, 0x88, 0x32, 0x64, 0x5f, 0x68, 0x60, 0x28, 0xee, + 0xa5, 0x05, 0xca, 0x52, 0x32, 0xed, 0x08, 0x91, 0x44, 0x41, 0xa4, 0x5d, 0xfb, 0x07, 0xf4, 0xde, + 0x1f, 0xd3, 0x1f, 0x91, 0x63, 0xd0, 0x53, 0x4f, 0x46, 0x91, 0xfc, 0x03, 0x1f, 0x7a, 0x2e, 0x44, + 0xd2, 0x4e, 0xe3, 0x58, 0xe8, 0xcd, 0x7c, 0xdf, 0xe7, 0xe3, 0x7d, 0xcc, 0x97, 0x02, 0x3f, 0x52, + 0x16, 0x53, 0x16, 0x32, 0x27, 0xcd, 0x28, 0xa7, 0x19, 0x19, 0x3a, 0xc3, 0x23, 0x9f, 0x70, 0x7c, + 0xe4, 0xf4, 0x49, 0x42, 0x58, 0xc8, 0x6c, 0xd1, 0x80, 0xba, 0xc2, 0xd9, 0x33, 0x9c, 0xad, 0x70, + 0x8d, 0x6f, 0xfa, 0xb4, 0x4f, 0x45, 0xd5, 0xc9, 0x7f, 0x49, 0x40, 0xe3, 0xa7, 0x42, 0xdd, 0xb9, + 0x80, 0x04, 0xfe, 0x50, 0x0c, 0xc4, 0x19, 0x8e, 0x95, 0x61, 0xa3, 0x1e, 0x08, 0x1c, 0x92, 0x46, + 0xf2, 0xa0, 0x5a, 0x86, 0x3c, 0x39, 0x3e, 0x66, 0x64, 0x4e, 0x0e, 0x68, 0x98, 0xc8, 0xbe, 0xf5, + 0x71, 0x13, 0x6c, 0xfd, 0x2d, 0xc3, 0x5c, 0x70, 0xcc, 0x09, 0xfc, 0x13, 0xac, 0x49, 0x6d, 0x5d, + 0x33, 0xb5, 0x56, 0xe5, 0xd8, 0xb4, 0x8b, 0xc2, 0xd9, 0x6d, 0x81, 0x73, 0xcb, 0xd7, 0x93, 0x66, + 0xc9, 0x53, 0x2c, 0xf8, 0x5a, 0x03, 0x35, 0x4e, 0xaf, 0x48, 0x82, 0x52, 0x1c, 0x66, 0x08, 0x67, + 0x3e, 0xca, 0xe8, 0x80, 0x13, 0xa6, 0x7f, 0x65, 0xae, 0xb4, 0x2a, 0xc7, 0xbf, 0x14, 0xeb, 0x75, + 0x72, 0x5a, 0x1b, 0x87, 0xd9, 0x49, 0xe6, 0x7b, 0x82, 0xe3, 0x1e, 0xe4, 0xda, 0xd3, 0x49, 0xf3, + 0xdb, 0x31, 0x8e, 0xa3, 0x3f, 0xac, 0xa5, 0xc2, 0x96, 0x07, 0xf9, 0x23, 0x26, 0x7c, 0x09, 0x2a, + 0x79, 0x66, 0xd4, 0x25, 0x09, 0x8d, 0x99, 0xbe, 0x22, 0xcc, 0xbf, 0x2f, 0x36, 0x77, 0x31, 0x23, + 0x7f, 0xe5, 0x58, 0xb7, 0xa1, 0x3c, 0xa1, 0xf4, 0xfc, 0x4c, 0xc5, 0xf2, 0x80, 0x3f, 0x83, 0x31, + 0x88, 0x40, 0xbd, 0x8b, 0xc7, 0x0c, 0xb1, 0x30, 0x09, 0x08, 0x8a, 0x69, 0x77, 0x10, 0x11, 0xa4, + 0x16, 0x43, 0x5f, 0x35, 0xb5, 0x56, 0xd9, 0x3d, 0x98, 0x4e, 0x9a, 0xa6, 0x94, 0x29, 0x84, 0x5a, + 0xde, 0x5e, 0xde, 0xbb, 0xc8, 0x5b, 0x4f, 0x44, 0x47, 0xdd, 0x07, 0x44, 0xa0, 0xda, 0x25, 0x43, + 0x12, 0xd1, 0x94, 0x64, 0xa8, 0x47, 0x08, 0xd3, 0xd7, 0x44, 0x8a, 0xba, 0xad, 0xae, 0x38, 0x1f, + 0x66, 0x1e, 0xe0, 0x94, 0x86, 0x89, 0xbb, 0xaf, 0x66, 0xaf, 0x29, 0xd3, 0x07, 0x74, 0xcb, 0xdb, + 0x9e, 0x17, 0xce, 0x08, 0x61, 0xf0, 0x1c, 0x7c, 0x1d, 0x61, 0x4e, 0x18, 0x47, 0x7e, 0x44, 0x83, + 0x2b, 0x74, 0x49, 0xc2, 0xfe, 0x25, 0xd7, 0xd7, 0xc5, 0xec, 0xc6, 0x74, 0xd2, 0x6c, 0x48, 0x99, + 0x25, 0x20, 0xcb, 0xdb, 0x95, 0x55, 0x37, 0x2f, 0xfe, 0x23, 0x6a, 0xf0, 0x39, 0xd8, 0xbd, 0x77, + 0xc4, 0xdd, 0x6e, 0x46, 0x18, 0xd3, 0x37, 0x4c, 0xad, 0xb5, 0xe9, 0xda, 0xd3, 0x49, 0x53, 0x5f, + 0x1c, 0x4a, 0x41, 0xac, 0x77, 0x6f, 0x0f, 0xab, 0x2a, 0xd2, 0x89, 0x2c, 0x79, 0x3b, 0x73, 0x94, + 0xaa, 0xc0, 0x17, 0xa0, 0x1e, 0xe3, 0x11, 0x4a, 0x29, 0x8d, 0x50, 0x4a, 0xc3, 0x84, 0x33, 0x94, + 0x6b, 0x88, 0xa1, 0xf4, 0xcd, 0xc5, 0xbf, 0xbb, 0x10, 0x6a, 0x79, 0xb5, 0x18, 0x8f, 0xda, 0x94, + 0x46, 0x6d, 0xd1, 0x69, 0x93, 0x4c, 0x44, 0x80, 0x4f, 0xc1, 0xde, 0x32, 0x12, 0x1f, 0xe9, 0x40, + 0x88, 0x7f, 0x37, 0x9d, 0x34, 0xf7, 0x8b, 0xc5, 0xf9, 0xc8, 0xf2, 0xe0, 0xa2, 0x72, 0x67, 0x04, + 0x2f, 0x40, 0x4d, 0xa0, 0x50, 0x40, 0x07, 0x09, 0x47, 0x3d, 0x3a, 0x1b, 0xb9, 0x22, 0x54, 0xcd, + 0xfb, 0xe5, 0x5e, 0x0a, 0xb3, 0x3c, 0x28, 0xea, 0xa7, 0x79, 0xf9, 0x8c, 0xaa, 0x59, 0xff, 0x07, + 0xeb, 0x69, 0x46, 0x7b, 0x21, 0x67, 0xfa, 0xd6, 0x97, 0x56, 0x62, 0x4f, 0xad, 0x44, 0x55, 0xb9, + 0x48, 0x9e, 0xe5, 0xcd, 0x14, 0xe0, 0x00, 0xec, 0x86, 0x49, 0x8f, 0x22, 0x7f, 0x2c, 0x43, 0xf1, + 0x71, 0x4a, 0xf4, 0x6d, 0xf1, 0xf8, 0x5b, 0xc5, 0xef, 0xe5, 0xdf, 0xa4, 0x47, 0xdd, 0x71, 0x9e, + 0xb6, 0x33, 0x4e, 0x89, 0x6b, 0x2a, 0x17, 0x75, 0xc7, 0x8f, 0x04, 0x2d, 0xaf, 0x1a, 0x3e, 0x60, + 0xc0, 0x57, 0x00, 0x06, 0xe3, 0x20, 0x0a, 0x03, 0xf1, 0x94, 0x79, 0x86, 0x83, 0x2b, 0x92, 0xe9, + 0x55, 0xe1, 0xfb, 0x73, 0xb1, 0xef, 0xa9, 0xe0, 0x9c, 0x64, 0x7e, 0x47, 0x32, 0xdc, 0xfd, 0xe9, + 0xa4, 0x59, 0x97, 0xae, 0x8f, 0xf5, 0x2c, 0x6f, 0x27, 0x58, 0x20, 0xfc, 0x57, 0xde, 0x28, 0xef, + 0xac, 0xba, 0xe7, 0xd7, 0xb7, 0x86, 0x76, 0x73, 0x6b, 0x68, 0x1f, 0x6e, 0x0d, 0xed, 0xcd, 0x9d, + 0x51, 0xba, 0xb9, 0x33, 0x4a, 0xef, 0xef, 0x8c, 0xd2, 0xb3, 0xdf, 0xfa, 0x21, 0xbf, 0x1c, 0xf8, + 0x76, 0x40, 0x63, 0x47, 0x8d, 0x71, 0x18, 0x61, 0x9f, 0xcd, 0x0e, 0xce, 0xf0, 0xf8, 0x77, 0x67, + 0x74, 0xff, 0x49, 0xce, 0xe3, 0x31, 0x7f, 0x4d, 0x9c, 0x7f, 0xfd, 0x14, 0x00, 0x00, 0xff, 0xff, + 0x0e, 0xa8, 0xaa, 0x64, 0x34, 0x06, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/protorev/types/genesis_test.go b/x/protorev/types/genesis_test.go index fc49b3d8c8a..36d33ac4df6 100644 --- a/x/protorev/types/genesis_test.go +++ b/x/protorev/types/genesis_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) func TestGenesisStateValidate(t *testing.T) { diff --git a/x/protorev/types/gov.pb.go b/x/protorev/types/gov.pb.go index 6fe911c401c..9e38af42c13 100644 --- a/x/protorev/types/gov.pb.go +++ b/x/protorev/types/gov.pb.go @@ -136,9 +136,9 @@ var fileDescriptor_e1f85ff7f3eaf8bb = []byte{ 0x23, 0xea, 0x58, 0x3c, 0x82, 0xcd, 0xa5, 0x4e, 0x7e, 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, 0x92, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, - 0x35, 0x4d, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, 0x33, 0x32, 0xd1, 0xaf, 0x40, 0x44, + 0x35, 0x4d, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, 0x33, 0x32, 0xd5, 0xaf, 0x40, 0x44, 0x79, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0x98, 0x6f, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, - 0xbf, 0x13, 0x0d, 0xeb, 0x95, 0x02, 0x00, 0x00, + 0x28, 0xb5, 0x10, 0x0c, 0x95, 0x02, 0x00, 0x00, } func (this *SetProtoRevEnabledProposal) Equal(that interface{}) bool { diff --git a/x/protorev/types/gov_test.go b/x/protorev/types/gov_test.go index 6bfcd8169e0..debf9f7411b 100644 --- a/x/protorev/types/gov_test.go +++ b/x/protorev/types/gov_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) type GovTestSuite struct { diff --git a/x/protorev/types/msg_test.go b/x/protorev/types/msg_test.go index 20dff5fed40..752ec5ce6d1 100644 --- a/x/protorev/types/msg_test.go +++ b/x/protorev/types/msg_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/protorev/types" ) func TestMsgSetHotRoutes(t *testing.T) { diff --git a/x/protorev/types/params.pb.go b/x/protorev/types/params.pb.go index a932fa4f7de..13643e1b338 100644 --- a/x/protorev/types/params.pb.go +++ b/x/protorev/types/params.pb.go @@ -101,9 +101,9 @@ var fileDescriptor_72168e5a5a65ae7e = []byte{ 0x88, 0x5a, 0xb0, 0xb0, 0x52, 0x10, 0x44, 0xda, 0xc9, 0xef, 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, 0x4c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, - 0xa1, 0xfe, 0xd1, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x8c, 0x4c, 0xf4, 0x2b, 0x10, + 0xa1, 0xfe, 0xd1, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x8c, 0x4c, 0xf5, 0x2b, 0x10, 0x21, 0x51, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xe6, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, - 0xff, 0xcb, 0xeb, 0xa1, 0x8e, 0x2a, 0x01, 0x00, 0x00, + 0xff, 0x5c, 0x4d, 0xbc, 0x69, 0x2a, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/protorev/types/protorev.pb.go b/x/protorev/types/protorev.pb.go index 6115505a9a3..7417ff2e846 100644 --- a/x/protorev/types/protorev.pb.go +++ b/x/protorev/types/protorev.pb.go @@ -10,8 +10,8 @@ import ( types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types1 "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - _ "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + types1 "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + _ "github.com/osmosis-labs/osmosis/v25/x/txfees/types" io "io" math "math" math_bits "math/bits" @@ -899,78 +899,78 @@ var fileDescriptor_1e9f2391fd9fec01 = []byte{ // 1180 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6f, 0x1b, 0x45, 0x14, 0xce, 0xc6, 0x6e, 0x1a, 0x8f, 0x5b, 0xdb, 0x9d, 0xa6, 0xad, 0xe3, 0x82, 0x37, 0x4c, 0x2b, - 0x70, 0x91, 0x6a, 0x2b, 0xa1, 0x07, 0x54, 0x54, 0xa4, 0x6c, 0x50, 0x45, 0x41, 0xb4, 0xd5, 0xc4, + 0x70, 0x91, 0x6a, 0x2b, 0x01, 0x24, 0x54, 0x54, 0xa4, 0x6c, 0x50, 0x45, 0x41, 0xb4, 0xd5, 0xc4, 0x52, 0x05, 0x97, 0x65, 0x76, 0x3d, 0x76, 0x56, 0xf6, 0xee, 0x58, 0x3b, 0xe3, 0x34, 0x29, 0x52, 0x2f, 0x1c, 0xb9, 0x70, 0xe1, 0xc6, 0x81, 0x1b, 0x5c, 0xf8, 0x1b, 0xb8, 0xf6, 0xd8, 0x63, 0xc5, 0x61, 0x85, 0xda, 0x0b, 0xe2, 0xe8, 0xbf, 0x00, 0xcd, 0x8f, 0x5d, 0x3b, 0x9b, 0xba, 0x69, 0x24, - 0xc4, 0x6d, 0xf7, 0xbd, 0xef, 0xfb, 0xde, 0x7b, 0xdf, 0xcc, 0xce, 0x0e, 0xf8, 0x80, 0xf1, 0x90, + 0xc4, 0x6d, 0xf7, 0xbd, 0xef, 0xfb, 0xde, 0x7b, 0xdf, 0xcc, 0xce, 0x0e, 0x78, 0x8f, 0xf1, 0x90, 0xf1, 0x80, 0x77, 0xc6, 0x31, 0x13, 0x2c, 0xa6, 0xfb, 0x9d, 0xfd, 0x4d, 0x8f, 0x0a, 0xb2, 0x99, 0x05, 0xda, 0xea, 0x01, 0xd6, 0x0d, 0xb0, 0x9d, 0xc5, 0x0d, 0xb0, 0xb1, 0xee, 0xab, 0x94, 0xab, 0x12, 0x1d, 0xfd, 0xa2, 0x51, 0x8d, 0xb5, 0x01, 0x1b, 0x30, 0x1d, 0x97, 0x4f, 0x26, 0xda, 0xd4, 0x98, 0x8e, 0x47, 0x38, 0xcd, 0xca, 0xf9, 0x2c, 0x88, 0x4c, 0xfe, 0x46, 0xd6, 0x13, 0x63, 0xa3, 0x90, 0x44, 0x64, 0x40, 0xe3, 0x0c, 0x37, 0xa0, 0x11, 0xcd, 0xda, 0x68, 0x5c, 0x4f, 0xa1, 0xe2, - 0xa0, 0x4f, 0x29, 0x7f, 0x3d, 0x0a, 0xbd, 0xb0, 0x00, 0xec, 0xb2, 0x21, 0x8d, 0x1e, 0x92, 0x20, + 0xa0, 0x4f, 0x29, 0x7f, 0x35, 0x0a, 0x3d, 0xb7, 0x00, 0xec, 0xb2, 0x21, 0x8d, 0x1e, 0x90, 0x20, 0xde, 0x8e, 0x3d, 0xcc, 0x26, 0x82, 0x72, 0xf8, 0x35, 0x00, 0x24, 0xf6, 0xdc, 0x58, 0xbd, 0xd5, - 0xad, 0x8d, 0x42, 0xab, 0xbc, 0x65, 0xb7, 0x17, 0xcd, 0xd9, 0x56, 0x2c, 0x67, 0xfd, 0x59, 0x62, - 0x2f, 0x4d, 0x13, 0xfb, 0xc2, 0x21, 0x09, 0x47, 0xb7, 0xd1, 0x4c, 0x00, 0xe1, 0x12, 0xc9, 0xa4, + 0xad, 0x8d, 0x42, 0xab, 0xbc, 0x65, 0xb7, 0x17, 0xcd, 0xd9, 0x56, 0x2c, 0x67, 0xfd, 0x69, 0x62, + 0x2f, 0x4d, 0x13, 0xfb, 0xc2, 0x21, 0x09, 0x47, 0xb7, 0xd0, 0x4c, 0x00, 0xe1, 0x12, 0xc9, 0xa4, 0xdb, 0x60, 0x55, 0xc8, 0x82, 0x6e, 0x10, 0xd5, 0x97, 0x37, 0xac, 0x56, 0xc9, 0xb9, 0x38, 0x4d, - 0xec, 0xaa, 0xe6, 0xa4, 0x19, 0x84, 0xcf, 0xaa, 0xc7, 0x7b, 0x11, 0xdc, 0x04, 0x25, 0x1d, 0x65, + 0xec, 0xaa, 0xe6, 0xa4, 0x19, 0x84, 0xcf, 0xaa, 0xc7, 0xbb, 0x11, 0xdc, 0x04, 0x25, 0x1d, 0x65, 0x13, 0x51, 0x2f, 0x28, 0xc2, 0xda, 0x34, 0xb1, 0x6b, 0xf3, 0x04, 0x36, 0x11, 0x08, 0x6b, 0xd9, - 0x07, 0x13, 0x71, 0xbb, 0xf8, 0xf7, 0x2f, 0xb6, 0x85, 0x7e, 0xb7, 0xc0, 0x19, 0x55, 0x13, 0xde, - 0x07, 0x2b, 0x22, 0x26, 0xbd, 0xb7, 0x99, 0xa4, 0x2b, 0x71, 0xce, 0x25, 0x33, 0xc9, 0x79, 0x53, - 0x44, 0x91, 0x11, 0x36, 0x2a, 0xf0, 0x3e, 0x28, 0x71, 0x41, 0xc7, 0x2e, 0x0f, 0x9e, 0x50, 0x33, + 0xfb, 0x13, 0x71, 0xab, 0xf8, 0xf7, 0x2f, 0xb6, 0x85, 0x7e, 0xb7, 0xc0, 0x19, 0x55, 0x13, 0xde, + 0x03, 0x2b, 0x22, 0x26, 0xbd, 0x37, 0x99, 0xa4, 0x2b, 0x71, 0xce, 0x25, 0x33, 0xc9, 0x79, 0x53, + 0x44, 0x91, 0x11, 0x36, 0x2a, 0xf0, 0x1e, 0x28, 0x71, 0x41, 0xc7, 0x2e, 0x0f, 0x1e, 0x53, 0x33, 0xc3, 0xa6, 0x64, 0xfc, 0x99, 0xd8, 0x97, 0xf4, 0x02, 0xf2, 0xde, 0xb0, 0x1d, 0xb0, 0x4e, 0x48, - 0xc4, 0x5e, 0xfb, 0x5e, 0x24, 0x66, 0xfd, 0x66, 0x3c, 0x84, 0x57, 0xe5, 0xf3, 0x6e, 0xf0, 0x84, + 0xc4, 0x5e, 0xfb, 0x6e, 0x24, 0x66, 0xfd, 0x66, 0x3c, 0x84, 0x57, 0xe5, 0xf3, 0x6e, 0xf0, 0x98, 0x9a, 0x7e, 0x7f, 0xb2, 0xc0, 0x19, 0x55, 0x1e, 0x5e, 0x03, 0x45, 0xb9, 0xbe, 0x75, 0x6b, 0xc3, 0x6a, 0x15, 0x9d, 0xea, 0x34, 0xb1, 0xcb, 0x9a, 0x2d, 0xa3, 0x08, 0xab, 0xe4, 0xff, 0xe7, 0xe3, 0x3f, 0x16, 0xa8, 0x2a, 0x1f, 0x77, 0x05, 0x11, 0x01, 0x17, 0x81, 0xcf, 0xe1, 0x97, 0xe0, 0xec, 0x38, 0x66, 0xfd, 0x40, 0xa4, 0x96, 0xae, 0xb7, 0xcd, 0xee, 0x96, 0x3b, 0x37, 0x73, 0x73, 0x87, 0x05, 0x91, 0x73, 0xd9, 0x98, 0x59, 0x31, 0x33, 0x68, 0x1e, 0xc2, 0xa9, 0x02, 0xf4, 0x40, 0x2d, 0x9a, 0x84, 0x1e, 0x8d, 0x5d, 0xd6, 0x77, 0xcd, 0x42, 0xe9, 0x89, 0x3e, 0x3e, 0xc9, 0xd5, 0x2b, - 0x5a, 0x33, 0x4f, 0x47, 0xb8, 0xa2, 0x43, 0x0f, 0xfa, 0x5d, 0xbd, 0x64, 0xef, 0x83, 0x33, 0x6a, + 0x5a, 0x33, 0x4f, 0x47, 0xb8, 0xa2, 0x43, 0xf7, 0xfb, 0x5d, 0xbd, 0x64, 0xef, 0x82, 0x33, 0x6a, 0x2f, 0xd6, 0x0b, 0x1b, 0x85, 0x56, 0xd1, 0xa9, 0x4d, 0x13, 0xfb, 0x9c, 0xe6, 0xaa, 0x30, 0xc2, - 0x3a, 0x8d, 0x7e, 0x5d, 0x06, 0xe5, 0x87, 0x8c, 0x8d, 0x1e, 0xd1, 0x60, 0xb0, 0x27, 0x38, 0xbc, - 0x03, 0xce, 0x73, 0x41, 0xbc, 0x11, 0x75, 0x1f, 0xab, 0x88, 0x59, 0x93, 0xfa, 0x34, 0xb1, 0xd7, + 0x3a, 0x8d, 0x7e, 0x5d, 0x06, 0xe5, 0x07, 0x8c, 0x8d, 0x1e, 0xd2, 0x60, 0xb0, 0x27, 0x38, 0xbc, + 0x0d, 0xce, 0x73, 0x41, 0xbc, 0x11, 0x75, 0x1f, 0xa9, 0x88, 0x59, 0x93, 0xfa, 0x34, 0xb1, 0xd7, 0xd2, 0x15, 0x9d, 0x4b, 0x23, 0x7c, 0x4e, 0xbf, 0x6b, 0x3e, 0xdc, 0x01, 0x55, 0x8f, 0x8c, 0x48, 0xe4, 0xd3, 0x38, 0x15, 0x58, 0x56, 0x02, 0x8d, 0x69, 0x62, 0x5f, 0xd6, 0x02, 0x39, 0x00, 0xc2, - 0x95, 0x34, 0x62, 0x44, 0x1e, 0x80, 0x8b, 0x3e, 0x8b, 0x7c, 0x1a, 0x89, 0x98, 0x08, 0xda, 0x4b, - 0x85, 0x0a, 0x4a, 0xa8, 0x39, 0x4d, 0xec, 0x86, 0x16, 0x7a, 0x0d, 0x08, 0x61, 0x38, 0x1f, 0x9d, - 0x75, 0x25, 0x0d, 0x7d, 0x4c, 0x78, 0x98, 0x8a, 0x15, 0xf3, 0x5d, 0xe5, 0x00, 0x08, 0x57, 0xd2, - 0x88, 0x16, 0x41, 0x3f, 0x17, 0x40, 0xe5, 0x5e, 0xd4, 0x67, 0xce, 0xa1, 0xf4, 0xab, 0x7b, 0x38, - 0xa6, 0xf0, 0x11, 0x58, 0xd1, 0xd3, 0x2b, 0x97, 0xca, 0x5b, 0xad, 0xc5, 0xdf, 0xd9, 0xae, 0xc2, + 0x95, 0x34, 0x62, 0x44, 0xee, 0x83, 0x8b, 0x3e, 0x8b, 0x7c, 0x1a, 0x89, 0x98, 0x08, 0xda, 0x4b, + 0x85, 0x0a, 0x4a, 0xa8, 0x39, 0x4d, 0xec, 0x86, 0x16, 0x7a, 0x05, 0x08, 0x61, 0x38, 0x1f, 0x9d, + 0x75, 0x25, 0x0d, 0x7d, 0x44, 0x78, 0x98, 0x8a, 0x15, 0xf3, 0x5d, 0xe5, 0x00, 0x08, 0x57, 0xd2, + 0x88, 0x16, 0x41, 0x3f, 0x17, 0x40, 0xe5, 0x6e, 0xd4, 0x67, 0xce, 0xa1, 0xf4, 0xab, 0x7b, 0x38, + 0xa6, 0xf0, 0x21, 0x58, 0xd1, 0xd3, 0x2b, 0x97, 0xca, 0x5b, 0xad, 0xc5, 0xdf, 0xd9, 0xae, 0xc2, 0x49, 0xa6, 0xd2, 0xc8, 0x7d, 0x70, 0x5a, 0x05, 0x61, 0x23, 0x07, 0x5d, 0xb0, 0x9a, 0x7a, 0xa2, - 0xfc, 0x2b, 0x6f, 0x7d, 0xb8, 0x58, 0xda, 0x31, 0xc8, 0x4c, 0xfc, 0x8a, 0x11, 0xaf, 0x1e, 0xf5, + 0xfc, 0x2b, 0x6f, 0xbd, 0xbf, 0x58, 0xda, 0x31, 0xc8, 0x4c, 0xfc, 0x8a, 0x11, 0xaf, 0x1e, 0xf5, 0x1b, 0xe1, 0x4c, 0x14, 0x32, 0x70, 0x6e, 0xde, 0x27, 0xe5, 0x6d, 0x79, 0xab, 0xbd, 0xb8, 0xc8, 0xce, 0x1c, 0x3a, 0x2b, 0x74, 0xd5, 0x14, 0xba, 0x78, 0x7c, 0x3d, 0x10, 0x3e, 0x52, 0x40, 0x4e, - 0x94, 0xfa, 0xa9, 0xbc, 0x7f, 0xe3, 0x44, 0x3b, 0x06, 0xb9, 0x68, 0xa2, 0x54, 0x09, 0xe1, 0x4c, + 0x94, 0xfa, 0xa9, 0xbc, 0x7f, 0xed, 0x44, 0x3b, 0x06, 0xb9, 0x68, 0xa2, 0x54, 0x09, 0xe1, 0x4c, 0x14, 0x7d, 0x02, 0x2a, 0x47, 0x3d, 0x86, 0x37, 0xc0, 0xca, 0x91, 0x3d, 0x7c, 0x61, 0xe6, 0x77, - 0xba, 0xc6, 0x06, 0x80, 0xee, 0x80, 0x5a, 0xde, 0xc5, 0xd3, 0xd0, 0x7f, 0xb0, 0xc0, 0xda, 0xeb, + 0xba, 0xc6, 0x06, 0x80, 0x6e, 0x83, 0x5a, 0xde, 0xc5, 0xd3, 0xd0, 0x7f, 0xb0, 0xc0, 0xda, 0xab, 0x0c, 0x3a, 0x85, 0x06, 0xfc, 0x1c, 0x5c, 0x08, 0xc9, 0x81, 0x2b, 0x02, 0x7f, 0xc8, 0x5d, 0x3f, - 0x66, 0x9c, 0xd3, 0x9e, 0xf9, 0x76, 0xde, 0x99, 0x26, 0x76, 0x5d, 0xb3, 0x8e, 0x41, 0x10, 0xae, + 0x66, 0x9c, 0xd3, 0x9e, 0xf9, 0x76, 0xde, 0x9a, 0x26, 0x76, 0x5d, 0xb3, 0x8e, 0x41, 0x10, 0xae, 0x86, 0xe4, 0xa0, 0x2b, 0x43, 0x3b, 0x26, 0x22, 0x40, 0x2d, 0x6f, 0x20, 0xfc, 0x16, 0x94, 0x75, 0x1d, 0x37, 0x24, 0xe3, 0xf4, 0x0c, 0xbb, 0xb6, 0x78, 0x05, 0xf4, 0x9e, 0xff, 0x8a, 0x8c, 0x9d, - 0x86, 0xb1, 0x1e, 0xce, 0xb7, 0xad, 0x54, 0x10, 0x06, 0x8f, 0x53, 0x18, 0x47, 0x4f, 0x41, 0x29, - 0x23, 0x9d, 0x66, 0xee, 0xbb, 0xa0, 0xe6, 0x33, 0xe9, 0x9b, 0x2f, 0x5c, 0xd2, 0xeb, 0xc5, 0x94, + 0x86, 0xb1, 0x1e, 0xce, 0xb7, 0xad, 0x54, 0x10, 0x06, 0x8f, 0x52, 0x18, 0x47, 0x4f, 0x40, 0x29, + 0x23, 0x9d, 0x66, 0xee, 0x3b, 0xa0, 0xe6, 0x33, 0xe9, 0x9b, 0x2f, 0x5c, 0xd2, 0xeb, 0xc5, 0x94, 0xa7, 0x87, 0xe1, 0xd5, 0xd9, 0x79, 0x97, 0x47, 0x20, 0x5c, 0x4d, 0x43, 0xdb, 0x26, 0xf2, 0xbd, 0x05, 0x4a, 0x0e, 0xe1, 0xf4, 0x33, 0x1a, 0xb1, 0x50, 0x1e, 0x7f, 0x3d, 0xf9, 0xa0, 0xea, 0x97, 0xe6, 0x8f, 0x3f, 0x15, 0x46, 0x58, 0xa7, 0xff, 0xeb, 0x3f, 0x1b, 0x8a, 0x00, 0xc8, 0x9a, 0xe0, - 0xd2, 0x75, 0xf9, 0x7b, 0x70, 0x55, 0xad, 0xb7, 0x70, 0x3d, 0xa3, 0xe6, 0x5d, 0x9f, 0x53, 0x41, - 0x18, 0x78, 0x59, 0x05, 0xf4, 0xdb, 0x32, 0x80, 0xdb, 0xa3, 0xd1, 0x43, 0xa9, 0xe4, 0xb3, 0x11, - 0xa6, 0xfb, 0x34, 0x9a, 0x50, 0xf8, 0x14, 0x40, 0x41, 0x86, 0x34, 0x76, 0xe5, 0x4d, 0x48, 0xfe, + 0xd2, 0x75, 0xf9, 0x7b, 0x70, 0x55, 0xad, 0x37, 0x70, 0x3d, 0xa3, 0xe6, 0x5d, 0x9f, 0x53, 0x41, + 0x18, 0x78, 0x59, 0x05, 0xf4, 0xdb, 0x32, 0x80, 0xdb, 0xa3, 0xd1, 0x03, 0xa9, 0xe4, 0xb3, 0x11, + 0xa6, 0xfb, 0x34, 0x9a, 0x50, 0xf8, 0x04, 0x40, 0x41, 0x86, 0x34, 0x76, 0xe5, 0x4d, 0x48, 0xfe, 0x23, 0xfc, 0x21, 0x8d, 0xcd, 0x21, 0x75, 0x73, 0x56, 0x7f, 0x76, 0xa7, 0x9a, 0xdd, 0x07, 0x24, - 0xed, 0x2e, 0xa5, 0xbc, 0xab, 0x49, 0xce, 0x7b, 0xa6, 0x93, 0x75, 0xf3, 0xdf, 0x3c, 0x26, 0x8b, + 0xed, 0x0e, 0xa5, 0xbc, 0xab, 0x49, 0xce, 0x3b, 0xa6, 0x93, 0x75, 0xf3, 0xdf, 0x3c, 0x26, 0x8b, 0x70, 0x4d, 0xe4, 0x48, 0xf0, 0x3b, 0x00, 0xfd, 0x43, 0x7f, 0x14, 0xf8, 0xae, 0xbc, 0x14, 0xa5, 0xf5, 0x0b, 0x27, 0x7e, 0xf7, 0x8a, 0xb3, 0x1d, 0x7b, 0x0b, 0x8a, 0x1f, 0xd7, 0x44, 0xb8, 0xe6, 0xe7, 0x48, 0x5f, 0x14, 0x57, 0x97, 0x6b, 0x05, 0x5c, 0x15, 0x07, 0x47, 0xdb, 0xfc, 0xc3, 0x02, 0xb5, 0x7c, 0x01, 0xf8, 0x29, 0x00, 0x33, 0xd1, 0x93, 0x7f, 0xed, 0x45, 0xd9, 0x0f, 0x2e, 0x65, - 0x25, 0xe1, 0x10, 0xbc, 0xbb, 0xa7, 0xbf, 0x08, 0xe2, 0xfb, 0x6c, 0x12, 0x89, 0x20, 0x1a, 0xb8, + 0x25, 0xe1, 0x10, 0xbc, 0xbd, 0xa7, 0xbf, 0x08, 0xe2, 0xfb, 0x6c, 0x12, 0x89, 0x20, 0x1a, 0xb8, 0x5c, 0x90, 0x58, 0x70, 0xb7, 0x1f, 0xb3, 0x50, 0xed, 0xa9, 0x82, 0xd3, 0x9a, 0x26, 0xf6, 0x75, - 0x3d, 0xc3, 0x1b, 0xe1, 0x08, 0x37, 0x74, 0x7e, 0x3b, 0x4b, 0xef, 0xaa, 0xec, 0xdd, 0x98, 0x85, - 0xce, 0xfd, 0x67, 0x2f, 0x9b, 0xd6, 0xf3, 0x97, 0x4d, 0xeb, 0xaf, 0x97, 0x4d, 0xeb, 0xc7, 0x57, - 0xcd, 0xa5, 0xe7, 0xaf, 0x9a, 0x4b, 0x2f, 0x5e, 0x35, 0x97, 0xbe, 0xb9, 0x35, 0x08, 0xc4, 0xde, - 0xc4, 0x6b, 0xfb, 0x2c, 0xec, 0x18, 0x77, 0x6f, 0x8e, 0x88, 0xc7, 0xd3, 0x97, 0xce, 0xfe, 0xd6, - 0xad, 0xce, 0xc1, 0xec, 0x62, 0x2f, 0x0e, 0xc7, 0x94, 0x7b, 0x2b, 0xea, 0xfd, 0xa3, 0x7f, 0x03, - 0x00, 0x00, 0xff, 0xff, 0xdb, 0xeb, 0x15, 0xdf, 0xf9, 0x0b, 0x00, 0x00, + 0x3d, 0xc3, 0x6b, 0xe1, 0x08, 0x37, 0x74, 0x7e, 0x3b, 0x4b, 0xef, 0xaa, 0xec, 0x9d, 0x98, 0x85, + 0xce, 0xbd, 0xa7, 0x2f, 0x9a, 0xd6, 0xb3, 0x17, 0x4d, 0xeb, 0xaf, 0x17, 0x4d, 0xeb, 0xc7, 0x97, + 0xcd, 0xa5, 0x67, 0x2f, 0x9b, 0x4b, 0xcf, 0x5f, 0x36, 0x97, 0xbe, 0xf9, 0x70, 0x10, 0x88, 0xbd, + 0x89, 0xd7, 0xf6, 0x59, 0xd8, 0x31, 0xee, 0xde, 0x1c, 0x11, 0x8f, 0xa7, 0x2f, 0x9d, 0xfd, 0xad, + 0x8f, 0x3a, 0x07, 0xb3, 0x8b, 0xbd, 0x38, 0x1c, 0x53, 0xee, 0xad, 0xa8, 0xf7, 0x0f, 0xfe, 0x0d, + 0x00, 0x00, 0xff, 0xff, 0x4c, 0x4d, 0x08, 0x38, 0xf9, 0x0b, 0x00, 0x00, } func (this *TokenPairArbRoutes) Equal(that interface{}) bool { diff --git a/x/protorev/types/query.pb.go b/x/protorev/types/query.pb.go index f9efd3e489e..db5355f3d7d 100644 --- a/x/protorev/types/query.pb.go +++ b/x/protorev/types/query.pb.go @@ -1509,108 +1509,108 @@ func init() { } var fileDescriptor_f5e7ac9973cce389 = []byte{ - // 1606 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xdd, 0x6f, 0xdb, 0xd4, - 0x1b, 0xae, 0xf7, 0xd1, 0xfe, 0x76, 0xf6, 0xf1, 0x5b, 0x0f, 0x6d, 0x97, 0xba, 0x5d, 0x92, 0x9e, - 0xb6, 0xeb, 0xd7, 0x9a, 0xb0, 0x0f, 0x60, 0x7c, 0x0c, 0xa8, 0x57, 0x98, 0xaa, 0x89, 0x35, 0x98, - 0x72, 0x03, 0x12, 0xc1, 0x49, 0xdc, 0xce, 0x9a, 0xe3, 0xe3, 0xd9, 0x4e, 0xd5, 0xdc, 0x32, 0x09, - 0x84, 0x84, 0xc4, 0xd7, 0x1f, 0x00, 0xd7, 0x88, 0x7f, 0x80, 0x4b, 0xb8, 0x9a, 0xe0, 0x66, 0x08, - 0x09, 0xa1, 0x81, 0x22, 0xb4, 0x71, 0xc1, 0x75, 0xfe, 0x00, 0x84, 0x7c, 0xce, 0xeb, 0xc4, 0xf1, - 0xb1, 0xd3, 0xb8, 0x95, 0xb8, 0x4b, 0x7c, 0xde, 0xf7, 0x79, 0x9f, 0xe7, 0x7c, 0x3e, 0x2f, 0x9a, - 0xa3, 0x6e, 0x9d, 0xba, 0x86, 0x5b, 0xb4, 0x1d, 0xea, 0x51, 0x47, 0xdf, 0x2d, 0xee, 0x5e, 0xaa, - 0xe8, 0x9e, 0x76, 0xa9, 0x78, 0xaf, 0xa1, 0x3b, 0xcd, 0x02, 0xfb, 0x8c, 0x33, 0x10, 0x55, 0x08, - 0xa2, 0x0a, 0x10, 0x25, 0x8f, 0xed, 0xd0, 0x1d, 0xca, 0xbe, 0x16, 0xfd, 0x5f, 0x3c, 0x40, 0x9e, - 0xde, 0xa1, 0x74, 0xc7, 0xd4, 0x8b, 0x9a, 0x6d, 0x14, 0x35, 0xcb, 0xa2, 0x9e, 0xe6, 0x19, 0xd4, - 0x82, 0x74, 0x79, 0xb9, 0xca, 0xe0, 0x8a, 0x15, 0xcd, 0xd5, 0x79, 0x99, 0x4e, 0x51, 0x5b, 0xdb, - 0x31, 0x2c, 0x16, 0x0c, 0xb1, 0xf3, 0x89, 0xfc, 0x6c, 0xcd, 0xd1, 0xea, 0x01, 0xe4, 0x42, 0x72, - 0x58, 0xc0, 0x98, 0x07, 0x66, 0xc3, 0xb5, 0x83, 0x98, 0x2a, 0x35, 0xa0, 0x1e, 0x19, 0x43, 0xf8, - 0x4d, 0x9f, 0x51, 0x89, 0xa1, 0xab, 0xfa, 0xbd, 0x86, 0xee, 0x7a, 0x64, 0x1b, 0x3d, 0xd5, 0xf3, - 0xd5, 0xb5, 0xa9, 0xe5, 0xea, 0x78, 0x13, 0x0d, 0x73, 0x16, 0x19, 0x29, 0x2f, 0x2d, 0x9e, 0xbc, - 0x9c, 0x2f, 0x24, 0xcd, 0x53, 0x81, 0x67, 0x2a, 0xe3, 0x0f, 0x5a, 0xb9, 0xa1, 0x76, 0x2b, 0x77, - 0xba, 0xa9, 0xd5, 0xcd, 0x17, 0x08, 0xcf, 0x26, 0x2a, 0xc0, 0x90, 0x05, 0x34, 0xcf, 0xea, 0xdc, - 0xd4, 0xbd, 0x92, 0x8f, 0xa0, 0xea, 0xbb, 0xb7, 0x1b, 0xf5, 0x8a, 0xee, 0x6c, 0x6e, 0x6f, 0x39, - 0x5a, 0x4d, 0xef, 0x10, 0xfa, 0x44, 0x42, 0x17, 0xf6, 0x8b, 0x04, 0x92, 0x15, 0x74, 0xd6, 0x62, - 0x23, 0x65, 0xba, 0x5d, 0xf6, 0xd8, 0x18, 0xa3, 0x7b, 0x42, 0xb9, 0xe6, 0x93, 0x79, 0xd4, 0xca, - 0x8d, 0xf3, 0x39, 0x71, 0x6b, 0x77, 0x0b, 0x06, 0x2d, 0xd6, 0x35, 0xef, 0x4e, 0x61, 0xc3, 0xf2, - 0xda, 0xad, 0xdc, 0x39, 0xce, 0x32, 0x9a, 0x4e, 0xd4, 0x33, 0x56, 0x4f, 0x2d, 0xb2, 0x29, 0xf2, - 0x2e, 0x39, 0x74, 0xdb, 0xf0, 0x5c, 0xa5, 0xb9, 0xae, 0x5b, 0xb4, 0x0e, 0xbc, 0xf1, 0x05, 0x74, - 0xbc, 0xe6, 0xff, 0x07, 0x06, 0x67, 0xdb, 0xad, 0xdc, 0x29, 0x5e, 0x84, 0x7d, 0x26, 0x2a, 0x1f, - 0x26, 0x96, 0x28, 0x2f, 0x0a, 0x08, 0xf2, 0xd6, 0xd1, 0xb0, 0xcd, 0x46, 0x60, 0x0d, 0x26, 0x0b, - 0x5c, 0x4d, 0xc1, 0x5f, 0xe1, 0xce, 0xf4, 0xdf, 0xa0, 0x86, 0xa5, 0x8c, 0x86, 0x26, 0x9e, 0xa5, - 0xf8, 0x13, 0xcf, 0x7f, 0xcc, 0xa2, 0x99, 0x68, 0xbd, 0x35, 0xd3, 0x84, 0x92, 0xc1, 0xa4, 0xdf, - 0x43, 0xa4, 0x5f, 0x10, 0x10, 0xba, 0x85, 0x46, 0x38, 0xa8, 0x3f, 0xcd, 0x47, 0xfb, 0x33, 0x9a, - 0x80, 0xed, 0x70, 0x26, 0xcc, 0xca, 0x25, 0xea, 0x48, 0xe7, 0x17, 0x5a, 0x8c, 0x96, 0x7c, 0xcb, - 0x3f, 0x4c, 0xae, 0x67, 0x54, 0x5d, 0xa5, 0xa9, 0xd2, 0x86, 0xa7, 0x87, 0xe6, 0xd6, 0xf1, 0xff, - 0xb3, 0xb2, 0xc7, 0xc2, 0x73, 0xcb, 0x3e, 0x13, 0x95, 0x0f, 0x93, 0xcf, 0x25, 0xb4, 0x34, 0x00, - 0x28, 0xc8, 0xa9, 0x21, 0xe4, 0x76, 0x06, 0x61, 0x8e, 0x97, 0x92, 0xf7, 0x39, 0x4b, 0x0e, 0xa1, - 0x4d, 0x82, 0xc2, 0x51, 0xce, 0xa4, 0x0b, 0x45, 0xd4, 0x10, 0x2e, 0x59, 0x11, 0x29, 0xad, 0x99, - 0x66, 0x04, 0x2c, 0x58, 0x87, 0x2f, 0x24, 0xb4, 0x3c, 0x48, 0x74, 0x82, 0x82, 0xa3, 0xff, 0x95, - 0x82, 0x2d, 0x7a, 0x57, 0xb7, 0x4a, 0x9a, 0xe1, 0xac, 0x39, 0x15, 0x86, 0xda, 0x51, 0xf0, 0x71, - 0x8c, 0x82, 0xb8, 0x68, 0x50, 0xf0, 0x2e, 0x1a, 0x66, 0x4b, 0x17, 0xb0, 0xbf, 0x98, 0xcc, 0x5e, - 0x44, 0x89, 0xde, 0x39, 0x1c, 0x89, 0xa8, 0x00, 0x49, 0xe6, 0xd1, 0xac, 0x30, 0x99, 0xb5, 0xba, - 0x61, 0xad, 0x55, 0xab, 0xb4, 0x61, 0x79, 0x01, 0x65, 0x1d, 0xcd, 0xf5, 0x0f, 0x03, 0xae, 0xd7, - 0xd1, 0x69, 0xcd, 0xff, 0x5e, 0xd6, 0xf8, 0x00, 0x9c, 0xf4, 0x4c, 0xbb, 0x95, 0x1b, 0xe3, 0x04, - 0x7a, 0x86, 0x89, 0x7a, 0x4a, 0x0b, 0xc1, 0x90, 0x25, 0xb4, 0x10, 0x2d, 0xb3, 0xae, 0xef, 0xea, - 0x26, 0xb5, 0x75, 0x27, 0xc2, 0xa8, 0x21, 0x9e, 0x0d, 0x31, 0x14, 0x58, 0x6d, 0xa0, 0xd1, 0x5a, - 0x30, 0x16, 0x61, 0x36, 0xdd, 0x6e, 0xe5, 0x32, 0xc1, 0x1d, 0x14, 0x09, 0x21, 0xea, 0xd9, 0x5a, - 0x04, 0x32, 0xee, 0x8e, 0xde, 0xb0, 0xb6, 0xa9, 0xd2, 0x2c, 0x51, 0x6a, 0x6e, 0x35, 0xed, 0xe0, - 0x3c, 0x92, 0xaf, 0x62, 0xee, 0xe8, 0x68, 0x24, 0xd0, 0x6b, 0xa0, 0x51, 0xc3, 0xda, 0xa6, 0xe5, - 0x4a, 0xb3, 0x6c, 0x53, 0x6a, 0x96, 0xbd, 0xa6, 0xad, 0xc3, 0x59, 0x5b, 0x4c, 0x5e, 0xeb, 0x5e, - 0x30, 0x25, 0x0f, 0xeb, 0x0c, 0x62, 0x04, 0x40, 0xa2, 0x9e, 0x31, 0x7a, 0x32, 0x48, 0x01, 0x5d, - 0x8c, 0x12, 0x7c, 0x43, 0xdb, 0xf3, 0x87, 0x4b, 0xd4, 0xb0, 0x3c, 0xb7, 0xa4, 0x3b, 0x8a, 0x49, - 0xab, 0x77, 0x03, 0x45, 0x9f, 0x4a, 0x68, 0x75, 0xc0, 0x04, 0x10, 0xf6, 0x1e, 0x9a, 0xac, 0x6b, - 0x7b, 0x9c, 0x83, 0xcd, 0x42, 0xca, 0xfe, 0xf4, 0x56, 0xfc, 0x20, 0x26, 0xf0, 0x98, 0x32, 0xd7, - 0x6e, 0xe5, 0xf2, 0x9c, 0x72, 0x62, 0x28, 0x51, 0xc7, 0xeb, 0x71, 0x75, 0xe2, 0x4e, 0x5d, 0x94, - 0xd0, 0xd6, 0x5e, 0x40, 0xff, 0x7e, 0xcc, 0xa9, 0x8b, 0x8b, 0x06, 0xee, 0x6f, 0xa3, 0x89, 0x38, - 0x42, 0xde, 0x1e, 0x10, 0x9f, 0x69, 0xb7, 0x72, 0xe7, 0x93, 0x89, 0x7b, 0x7b, 0x44, 0xc5, 0x75, - 0x01, 0x3e, 0xee, 0xa9, 0x51, 0x34, 0x57, 0x67, 0xaf, 0x5a, 0xe7, 0x82, 0xf8, 0x50, 0x12, 0xdf, - 0x9a, 0x70, 0x14, 0x50, 0x7c, 0x1f, 0x9d, 0xf4, 0x1f, 0x95, 0x32, 0x7b, 0x34, 0x83, 0xdb, 0x61, - 0x36, 0x79, 0xc7, 0x74, 0x20, 0x14, 0x19, 0x36, 0x0b, 0xe6, 0x02, 0x42, 0x28, 0x44, 0x45, 0x95, - 0x4e, 0x25, 0x92, 0x47, 0xd9, 0x28, 0x8f, 0xd7, 0x2c, 0xad, 0x62, 0xea, 0xb5, 0x80, 0xea, 0x26, - 0xca, 0x25, 0x46, 0x00, 0xcd, 0x8b, 0x68, 0x44, 0xe7, 0x9f, 0xd8, 0xd4, 0xfd, 0x4f, 0xc1, 0xdd, - 0x37, 0x0f, 0x06, 0x88, 0x1a, 0x84, 0xf8, 0xde, 0x66, 0x4a, 0x78, 0xfc, 0x29, 0x35, 0x83, 0x77, - 0xee, 0x2a, 0x42, 0x5d, 0xba, 0x70, 0x88, 0xc7, 0xbb, 0x17, 0x74, 0x77, 0x8c, 0xa8, 0x27, 0x3a, - 0x4a, 0xf0, 0x73, 0xe8, 0x24, 0xf5, 0xee, 0xe8, 0x0e, 0xa4, 0x1d, 0x61, 0x69, 0x13, 0xdd, 0x19, - 0x08, 0x0d, 0x12, 0x15, 0xb1, 0x7f, 0x2c, 0x91, 0xdc, 0x42, 0xd3, 0xf1, 0x6c, 0x40, 0xdc, 0x0a, - 0x1a, 0x61, 0x4b, 0x6f, 0xd4, 0x60, 0x5f, 0x84, 0xc4, 0xc1, 0x80, 0xef, 0x33, 0x28, 0x35, 0x37, - 0x6a, 0xe1, 0xc5, 0xe7, 0xd6, 0xc1, 0xa3, 0x55, 0x1f, 0x6b, 0x57, 0xb7, 0x1a, 0x9d, 0x8b, 0xe3, - 0x9b, 0xd0, 0xe2, 0xc7, 0x45, 0x41, 0xe1, 0xfb, 0x12, 0x1a, 0xd3, 0x4c, 0xb3, 0x6c, 0xc3, 0x78, - 0xd9, 0xe1, 0x01, 0x70, 0x71, 0xf4, 0x79, 0x24, 0x44, 0x50, 0x65, 0x16, 0xf6, 0xc3, 0x14, 0xdc, - 0xd1, 0x31, 0xb8, 0x44, 0xc5, 0x9a, 0x90, 0x78, 0xf9, 0x9f, 0x0c, 0x3a, 0xce, 0xc8, 0xe2, 0x8f, - 0x24, 0x34, 0xcc, 0x6d, 0x2e, 0xee, 0x53, 0x5b, 0x74, 0xd7, 0xf2, 0xea, 0x80, 0xd1, 0x5c, 0x37, - 0xc9, 0x7f, 0xf0, 0xcb, 0x5f, 0x5f, 0x1e, 0x91, 0x71, 0xa6, 0x28, 0x98, 0x7e, 0x6e, 0xa3, 0xf1, - 0x8f, 0x12, 0x9a, 0x4c, 0x34, 0xc6, 0xf8, 0x95, 0x7d, 0xca, 0xed, 0x67, 0xbe, 0xe5, 0x57, 0x0f, - 0x0e, 0x00, 0x12, 0x96, 0x99, 0x84, 0x39, 0x4c, 0x44, 0x09, 0x51, 0xb3, 0x1d, 0x15, 0xd3, 0x6b, - 0x83, 0xd3, 0x88, 0x89, 0x75, 0xe4, 0x69, 0xc4, 0xc4, 0x3b, 0xf0, 0x7e, 0x62, 0xc0, 0xc6, 0xfa, - 0xcf, 0x10, 0x3b, 0x59, 0xf8, 0x3b, 0x09, 0x8d, 0xc7, 0xda, 0x67, 0xfc, 0xe2, 0xe0, 0x3c, 0x04, - 0x67, 0x2e, 0xbf, 0x74, 0xb0, 0x64, 0x10, 0x30, 0xcf, 0x04, 0xe4, 0xf0, 0x79, 0x51, 0x00, 0x9c, - 0x03, 0xc6, 0xf0, 0x57, 0x09, 0x4d, 0xf7, 0xb3, 0xcc, 0x58, 0x19, 0x9c, 0x45, 0x92, 0x89, 0x97, - 0x6f, 0x1c, 0x0a, 0x03, 0x04, 0xad, 0x32, 0x41, 0x0b, 0x78, 0x5e, 0x14, 0xd4, 0x75, 0xac, 0xfe, - 0xa2, 0x30, 0x0b, 0x88, 0x1f, 0x49, 0xe8, 0x7c, 0x5f, 0x2b, 0x8d, 0x6f, 0xa4, 0x9a, 0xdf, 0x78, - 0xdb, 0x2e, 0xaf, 0x1f, 0x0e, 0x04, 0xb4, 0x15, 0x98, 0xb6, 0x45, 0x7c, 0x21, 0x7e, 0xb1, 0x98, - 0xa2, 0x72, 0x57, 0x25, 0xfe, 0xbd, 0x57, 0x9c, 0xe8, 0x8f, 0xd3, 0x88, 0x4b, 0x74, 0xf4, 0x69, - 0xc4, 0x25, 0x1b, 0x7d, 0x52, 0x64, 0xe2, 0x96, 0xf0, 0x82, 0x28, 0xce, 0xf3, 0xb3, 0xca, 0xb6, - 0x66, 0x38, 0x65, 0xcd, 0xa9, 0x70, 0x9d, 0x2e, 0xfe, 0x5e, 0x42, 0xe7, 0x12, 0x1c, 0x39, 0xbe, - 0x9e, 0x62, 0xbe, 0x45, 0xc3, 0x2f, 0xbf, 0x7c, 0xd0, 0x74, 0xd0, 0xb2, 0xc0, 0xb4, 0xcc, 0xe0, - 0x5c, 0xcc, 0x42, 0x85, 0x3b, 0x00, 0xfc, 0xb3, 0x84, 0xa6, 0xfa, 0x78, 0x78, 0xbc, 0x36, 0x38, - 0x91, 0x84, 0x56, 0x41, 0x56, 0x0e, 0x03, 0x01, 0x7a, 0x56, 0x98, 0x9e, 0x79, 0x3c, 0x2b, 0xea, - 0x11, 0xfa, 0x06, 0xfc, 0x53, 0xef, 0xa5, 0xdd, 0xeb, 0xd4, 0xd3, 0x5c, 0xda, 0xb1, 0xad, 0x45, - 0x9a, 0x4b, 0x3b, 0xbe, 0xe3, 0xe8, 0xa7, 0x46, 0x68, 0x1c, 0xf0, 0x1f, 0xbd, 0x67, 0x48, 0xf4, - 0xcc, 0x69, 0xce, 0x50, 0xa2, 0x3f, 0x4f, 0x73, 0x86, 0x92, 0x6d, 0x3b, 0x79, 0x9a, 0x29, 0x5b, - 0xc6, 0x8b, 0xa2, 0xb2, 0x78, 0x9b, 0x8e, 0xff, 0x96, 0x50, 0x7e, 0xbf, 0x8e, 0x06, 0xbf, 0x7e, - 0x70, 0x72, 0xe1, 0x1e, 0x4a, 0xbe, 0x79, 0x68, 0x1c, 0xd0, 0x79, 0x85, 0xe9, 0x5c, 0xc5, 0x2b, - 0x83, 0xe9, 0x64, 0x7d, 0x54, 0xf4, 0xfd, 0xed, 0xb6, 0x14, 0x69, 0xde, 0x5f, 0xa1, 0x5d, 0x49, - 0xf3, 0xfe, 0x8a, 0x5d, 0x4c, 0xbf, 0xf7, 0x37, 0xd4, 0x97, 0xe0, 0x6f, 0x25, 0x84, 0xc5, 0x26, - 0x03, 0x5f, 0x1b, 0xbc, 0x76, 0x6f, 0xe7, 0x22, 0x3f, 0x7f, 0x80, 0x4c, 0xa0, 0x3c, 0xc3, 0x28, - 0x4f, 0xe1, 0x49, 0x91, 0x32, 0xb4, 0x31, 0xf8, 0x6b, 0x09, 0xfd, 0x3f, 0xd2, 0x33, 0xe0, 0x67, - 0x52, 0x98, 0xad, 0x6e, 0xc7, 0x23, 0x3f, 0x9b, 0x36, 0x0d, 0x58, 0x66, 0x19, 0xcb, 0x0c, 0x9e, - 0x88, 0x71, 0x66, 0x3e, 0x9d, 0x1f, 0xf8, 0x6e, 0x10, 0xdb, 0x81, 0x41, 0x76, 0x43, 0x62, 0xff, - 0x32, 0xc8, 0x6e, 0x48, 0x6e, 0x6b, 0xf6, 0x7b, 0xe0, 0xa3, 0x5d, 0x89, 0x72, 0xfb, 0xc1, 0xe3, - 0xac, 0xf4, 0xf0, 0x71, 0x56, 0xfa, 0xf3, 0x71, 0x56, 0xfa, 0xec, 0x49, 0x76, 0xe8, 0xe1, 0x93, - 0xec, 0xd0, 0x6f, 0x4f, 0xb2, 0x43, 0xef, 0x5c, 0xdd, 0x31, 0xbc, 0x3b, 0x8d, 0x4a, 0xa1, 0x4a, - 0xeb, 0x01, 0xd6, 0xaa, 0xa9, 0x55, 0xdc, 0x0e, 0xf0, 0xee, 0xe5, 0xab, 0xc5, 0xbd, 0xd0, 0x13, - 0xdb, 0xb4, 0x75, 0xb7, 0x32, 0xcc, 0xfe, 0x5f, 0xf9, 0x37, 0x00, 0x00, 0xff, 0xff, 0xf5, 0xe3, - 0x38, 0x97, 0x1a, 0x19, 0x00, 0x00, + // 1607 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4b, 0x6f, 0x1b, 0x55, + 0x1b, 0xce, 0xf4, 0x92, 0x7c, 0x3d, 0xbd, 0x7c, 0xcd, 0xf9, 0x92, 0xd4, 0x99, 0xa4, 0xb6, 0x73, + 0x92, 0x34, 0xb7, 0xc6, 0xfe, 0x7a, 0x83, 0x72, 0x29, 0x90, 0x69, 0xa0, 0x8a, 0x2a, 0x1a, 0x33, + 0x84, 0x0d, 0x48, 0x98, 0xb1, 0x3d, 0x49, 0x47, 0x1d, 0xcf, 0x99, 0xce, 0x8c, 0xa3, 0x78, 0x4b, + 0x25, 0x10, 0x12, 0x12, 0xb7, 0x1f, 0x00, 0x6b, 0xc4, 0x1f, 0x60, 0x09, 0xab, 0x0a, 0x36, 0x45, + 0x48, 0x08, 0x15, 0x64, 0xa1, 0x96, 0x05, 0x6b, 0xff, 0x00, 0x84, 0xe6, 0x9c, 0x77, 0xec, 0xf1, + 0x9c, 0x19, 0xc7, 0x93, 0x48, 0xec, 0xec, 0x39, 0xef, 0xfb, 0xbc, 0xcf, 0x73, 0xae, 0xcf, 0x8b, + 0xe6, 0xa8, 0x5b, 0xa7, 0xae, 0xe1, 0x16, 0x6d, 0x87, 0x7a, 0xd4, 0xd1, 0x77, 0x8b, 0xbb, 0x97, + 0x2a, 0xba, 0xa7, 0x5d, 0x2a, 0xde, 0x6f, 0xe8, 0x4e, 0xb3, 0xc0, 0x3e, 0xe3, 0x0c, 0x44, 0x15, + 0x82, 0xa8, 0x02, 0x44, 0xc9, 0x63, 0x3b, 0x74, 0x87, 0xb2, 0xaf, 0x45, 0xff, 0x17, 0x0f, 0x90, + 0xa7, 0x77, 0x28, 0xdd, 0x31, 0xf5, 0xa2, 0x66, 0x1b, 0x45, 0xcd, 0xb2, 0xa8, 0xa7, 0x79, 0x06, + 0xb5, 0x20, 0x5d, 0x5e, 0xae, 0x32, 0xb8, 0x62, 0x45, 0x73, 0x75, 0x5e, 0xa6, 0x53, 0xd4, 0xd6, + 0x76, 0x0c, 0x8b, 0x05, 0x43, 0xec, 0x7c, 0x22, 0x3f, 0x5b, 0x73, 0xb4, 0x7a, 0x00, 0xb9, 0x90, + 0x1c, 0x16, 0x30, 0xe6, 0x81, 0xd9, 0x70, 0xed, 0x20, 0xa6, 0x4a, 0x0d, 0xa8, 0x47, 0xc6, 0x10, + 0x7e, 0xc3, 0x67, 0x54, 0x62, 0xe8, 0xaa, 0x7e, 0xbf, 0xa1, 0xbb, 0x1e, 0xd9, 0x46, 0xff, 0xeb, + 0xf9, 0xea, 0xda, 0xd4, 0x72, 0x75, 0xbc, 0x89, 0x86, 0x39, 0x8b, 0x8c, 0x94, 0x97, 0x16, 0x4f, + 0x5e, 0xce, 0x17, 0x92, 0xe6, 0xa9, 0xc0, 0x33, 0x95, 0xf1, 0x87, 0xad, 0xdc, 0x50, 0xbb, 0x95, + 0x3b, 0xdd, 0xd4, 0xea, 0xe6, 0xf3, 0x84, 0x67, 0x13, 0x15, 0x60, 0xc8, 0x02, 0x9a, 0x67, 0x75, + 0x6e, 0xe9, 0x5e, 0xc9, 0x47, 0x50, 0xf5, 0xdd, 0x3b, 0x8d, 0x7a, 0x45, 0x77, 0x36, 0xb7, 0xb7, + 0x1c, 0xad, 0xa6, 0x77, 0x08, 0x7d, 0x2c, 0xa1, 0x0b, 0xfb, 0x45, 0x02, 0xc9, 0x0a, 0x3a, 0x6b, + 0xb1, 0x91, 0x32, 0xdd, 0x2e, 0x7b, 0x6c, 0x8c, 0xd1, 0x3d, 0xa1, 0x5c, 0xf7, 0xc9, 0x3c, 0x6e, + 0xe5, 0xc6, 0xf9, 0x9c, 0xb8, 0xb5, 0x7b, 0x05, 0x83, 0x16, 0xeb, 0x9a, 0x77, 0xb7, 0xb0, 0x61, + 0x79, 0xed, 0x56, 0xee, 0x1c, 0x67, 0x19, 0x4d, 0x27, 0xea, 0x19, 0xab, 0xa7, 0x16, 0xd9, 0x14, + 0x79, 0x97, 0x1c, 0xba, 0x6d, 0x78, 0xae, 0xd2, 0x5c, 0xd7, 0x2d, 0x5a, 0x07, 0xde, 0xf8, 0x02, + 0x3a, 0x5e, 0xf3, 0xff, 0x03, 0x83, 0xb3, 0xed, 0x56, 0xee, 0x14, 0x2f, 0xc2, 0x3e, 0x13, 0x95, + 0x0f, 0x13, 0x4b, 0x94, 0x17, 0x05, 0x04, 0x79, 0xeb, 0x68, 0xd8, 0x66, 0x23, 0xb0, 0x06, 0x93, + 0x05, 0xae, 0xa6, 0xe0, 0xaf, 0x70, 0x67, 0xfa, 0x6f, 0x52, 0xc3, 0x52, 0x46, 0x43, 0x13, 0xcf, + 0x52, 0xfc, 0x89, 0xe7, 0x3f, 0x66, 0xd1, 0x4c, 0xb4, 0xde, 0x9a, 0x69, 0x42, 0xc9, 0x60, 0xd2, + 0xef, 0x23, 0xd2, 0x2f, 0x08, 0x08, 0xdd, 0x46, 0x23, 0x1c, 0xd4, 0x9f, 0xe6, 0xa3, 0xfd, 0x19, + 0x4d, 0xc0, 0x76, 0x38, 0x13, 0x66, 0xe5, 0x12, 0x75, 0xa4, 0xf3, 0x0b, 0x2d, 0x46, 0x4b, 0xbe, + 0xe9, 0x1f, 0x26, 0xd7, 0x33, 0xaa, 0xae, 0xd2, 0x54, 0x69, 0xc3, 0xd3, 0x43, 0x73, 0xeb, 0xf8, + 0xff, 0x59, 0xd9, 0x63, 0xe1, 0xb9, 0x65, 0x9f, 0x89, 0xca, 0x87, 0xc9, 0x67, 0x12, 0x5a, 0x1a, + 0x00, 0x14, 0xe4, 0xd4, 0x10, 0x72, 0x3b, 0x83, 0x30, 0xc7, 0x4b, 0xc9, 0xfb, 0x9c, 0x25, 0x87, + 0xd0, 0x26, 0x41, 0xe1, 0x28, 0x67, 0xd2, 0x85, 0x22, 0x6a, 0x08, 0x97, 0xac, 0x88, 0x94, 0xd6, + 0x4c, 0x33, 0x02, 0x16, 0xac, 0xc3, 0xe7, 0x12, 0x5a, 0x1e, 0x24, 0x3a, 0x41, 0xc1, 0xd1, 0x7f, + 0x4b, 0xc1, 0x16, 0xbd, 0xa7, 0x5b, 0x25, 0xcd, 0x70, 0xd6, 0x9c, 0x0a, 0x43, 0xed, 0x28, 0xf8, + 0x28, 0x46, 0x41, 0x5c, 0x34, 0x28, 0x78, 0x07, 0x0d, 0xb3, 0xa5, 0x0b, 0xd8, 0x5f, 0x4c, 0x66, + 0x2f, 0xa2, 0x44, 0xef, 0x1c, 0x8e, 0x44, 0x54, 0x80, 0x24, 0xf3, 0x68, 0x56, 0x98, 0xcc, 0x5a, + 0xdd, 0xb0, 0xd6, 0xaa, 0x55, 0xda, 0xb0, 0xbc, 0x80, 0xb2, 0x8e, 0xe6, 0xfa, 0x87, 0x01, 0xd7, + 0x1b, 0xe8, 0xb4, 0xe6, 0x7f, 0x2f, 0x6b, 0x7c, 0x00, 0x4e, 0x7a, 0xa6, 0xdd, 0xca, 0x8d, 0x71, + 0x02, 0x3d, 0xc3, 0x44, 0x3d, 0xa5, 0x85, 0x60, 0xc8, 0x12, 0x5a, 0x88, 0x96, 0x59, 0xd7, 0x77, + 0x75, 0x93, 0xda, 0xba, 0x13, 0x61, 0xd4, 0x10, 0xcf, 0x86, 0x18, 0x0a, 0xac, 0x36, 0xd0, 0x68, + 0x2d, 0x18, 0x8b, 0x30, 0x9b, 0x6e, 0xb7, 0x72, 0x99, 0xe0, 0x0e, 0x8a, 0x84, 0x10, 0xf5, 0x6c, + 0x2d, 0x02, 0x19, 0x77, 0x47, 0x6f, 0x58, 0xdb, 0x54, 0x69, 0x96, 0x28, 0x35, 0xb7, 0x9a, 0x76, + 0x70, 0x1e, 0xc9, 0x97, 0x31, 0x77, 0x74, 0x34, 0x12, 0xe8, 0x35, 0xd0, 0xa8, 0x61, 0x6d, 0xd3, + 0x72, 0xa5, 0x59, 0xb6, 0x29, 0x35, 0xcb, 0x5e, 0xd3, 0xd6, 0xe1, 0xac, 0x2d, 0x26, 0xaf, 0x75, + 0x2f, 0x98, 0x92, 0x87, 0x75, 0x06, 0x31, 0x02, 0x20, 0x51, 0xcf, 0x18, 0x3d, 0x19, 0xa4, 0x80, + 0x2e, 0x46, 0x09, 0xbe, 0xae, 0xed, 0xf9, 0xc3, 0x25, 0x6a, 0x58, 0x9e, 0x5b, 0xd2, 0x1d, 0xc5, + 0xa4, 0xd5, 0x7b, 0x81, 0xa2, 0x4f, 0x24, 0xb4, 0x3a, 0x60, 0x02, 0x08, 0x7b, 0x17, 0x4d, 0xd6, + 0xb5, 0x3d, 0xce, 0xc1, 0x66, 0x21, 0x65, 0x7f, 0x7a, 0x2b, 0x7e, 0x10, 0x13, 0x78, 0x4c, 0x99, + 0x6b, 0xb7, 0x72, 0x79, 0x4e, 0x39, 0x31, 0x94, 0xa8, 0xe3, 0xf5, 0xb8, 0x3a, 0x71, 0xa7, 0x2e, + 0x4a, 0x68, 0x6b, 0x2f, 0xa0, 0xff, 0x20, 0xe6, 0xd4, 0xc5, 0x45, 0x03, 0xf7, 0xb7, 0xd0, 0x44, + 0x1c, 0x21, 0x6f, 0x0f, 0x88, 0xcf, 0xb4, 0x5b, 0xb9, 0xf3, 0xc9, 0xc4, 0xbd, 0x3d, 0xa2, 0xe2, + 0xba, 0x00, 0x1f, 0xf7, 0xd4, 0x28, 0x9a, 0xab, 0xb3, 0x57, 0xad, 0x73, 0x41, 0x7c, 0x20, 0x89, + 0x6f, 0x4d, 0x38, 0x0a, 0x28, 0xbe, 0x87, 0x4e, 0xfa, 0x8f, 0x4a, 0x99, 0x3d, 0x9a, 0xc1, 0xed, + 0x30, 0x9b, 0xbc, 0x63, 0x3a, 0x10, 0x8a, 0x0c, 0x9b, 0x05, 0x73, 0x01, 0x21, 0x14, 0xa2, 0xa2, + 0x4a, 0xa7, 0x12, 0xc9, 0xa3, 0x6c, 0x94, 0xc7, 0xab, 0x96, 0x56, 0x31, 0xf5, 0x5a, 0x40, 0x75, + 0x13, 0xe5, 0x12, 0x23, 0x80, 0xe6, 0x45, 0x34, 0xa2, 0xf3, 0x4f, 0x6c, 0xea, 0xfe, 0xa3, 0xe0, + 0xee, 0x9b, 0x07, 0x03, 0x44, 0x0d, 0x42, 0x7c, 0x6f, 0x33, 0x25, 0x3c, 0xfe, 0x94, 0x9a, 0xc1, + 0x3b, 0x77, 0x15, 0xa1, 0x2e, 0x5d, 0x38, 0xc4, 0xe3, 0xdd, 0x0b, 0xba, 0x3b, 0x46, 0xd4, 0x13, + 0x1d, 0x25, 0xf8, 0x59, 0x74, 0x92, 0x7a, 0x77, 0x75, 0x07, 0xd2, 0x8e, 0xb0, 0xb4, 0x89, 0xee, + 0x0c, 0x84, 0x06, 0x89, 0x8a, 0xd8, 0x3f, 0x96, 0x48, 0x6e, 0xa3, 0xe9, 0x78, 0x36, 0x20, 0x6e, + 0x05, 0x8d, 0xb0, 0xa5, 0x37, 0x6a, 0xb0, 0x2f, 0x42, 0xe2, 0x60, 0xc0, 0xf7, 0x19, 0x94, 0x9a, + 0x1b, 0xb5, 0xf0, 0xe2, 0x73, 0xeb, 0xe0, 0xd1, 0xaa, 0x8f, 0xb5, 0xab, 0x5b, 0x8d, 0xce, 0xc5, + 0xf1, 0x75, 0x68, 0xf1, 0xe3, 0xa2, 0xa0, 0xf0, 0x03, 0x09, 0x8d, 0x69, 0xa6, 0x59, 0xb6, 0x61, + 0xbc, 0xec, 0xf0, 0x00, 0xb8, 0x38, 0xfa, 0x3c, 0x12, 0x22, 0xa8, 0x32, 0x0b, 0xfb, 0x61, 0x0a, + 0xee, 0xe8, 0x18, 0x5c, 0xa2, 0x62, 0x4d, 0x48, 0xbc, 0xfc, 0x77, 0x06, 0x1d, 0x67, 0x64, 0xf1, + 0x87, 0x12, 0x1a, 0xe6, 0x36, 0x17, 0xf7, 0xa9, 0x2d, 0xba, 0x6b, 0x79, 0x75, 0xc0, 0x68, 0xae, + 0x9b, 0xe4, 0xdf, 0xff, 0xf9, 0xcf, 0x2f, 0x8e, 0xc8, 0x38, 0x53, 0x14, 0x4c, 0x3f, 0xb7, 0xd1, + 0xf8, 0x07, 0x09, 0x4d, 0x26, 0x1a, 0x63, 0xfc, 0xf2, 0x3e, 0xe5, 0xf6, 0x33, 0xdf, 0xf2, 0x2b, + 0x07, 0x07, 0x00, 0x09, 0xcb, 0x4c, 0xc2, 0x1c, 0x26, 0xa2, 0x84, 0xa8, 0xd9, 0x8e, 0x8a, 0xe9, + 0xb5, 0xc1, 0x69, 0xc4, 0xc4, 0x3a, 0xf2, 0x34, 0x62, 0xe2, 0x1d, 0x78, 0x3f, 0x31, 0x60, 0x63, + 0xfd, 0x67, 0x88, 0x9d, 0x2c, 0xfc, 0xad, 0x84, 0xc6, 0x63, 0xed, 0x33, 0x7e, 0x61, 0x70, 0x1e, + 0x82, 0x33, 0x97, 0x5f, 0x3c, 0x58, 0x32, 0x08, 0x98, 0x67, 0x02, 0x72, 0xf8, 0xbc, 0x28, 0x00, + 0xce, 0x01, 0x63, 0xf8, 0x8b, 0x84, 0xa6, 0xfb, 0x59, 0x66, 0xac, 0x0c, 0xce, 0x22, 0xc9, 0xc4, + 0xcb, 0x37, 0x0f, 0x85, 0x01, 0x82, 0x56, 0x99, 0xa0, 0x05, 0x3c, 0x2f, 0x0a, 0xea, 0x3a, 0x56, + 0x7f, 0x51, 0x98, 0x05, 0xc4, 0x8f, 0x25, 0x74, 0xbe, 0xaf, 0x95, 0xc6, 0x37, 0x53, 0xcd, 0x6f, + 0xbc, 0x6d, 0x97, 0xd7, 0x0f, 0x07, 0x02, 0xda, 0x0a, 0x4c, 0xdb, 0x22, 0xbe, 0x10, 0xbf, 0x58, + 0x4c, 0x51, 0xb9, 0xab, 0x12, 0xff, 0xd6, 0x2b, 0x4e, 0xf4, 0xc7, 0x69, 0xc4, 0x25, 0x3a, 0xfa, + 0x34, 0xe2, 0x92, 0x8d, 0x3e, 0x29, 0x32, 0x71, 0x4b, 0x78, 0x41, 0x14, 0xe7, 0xf9, 0x59, 0x65, + 0x5b, 0x33, 0x9c, 0xb2, 0xe6, 0x54, 0xb8, 0x4e, 0x17, 0x7f, 0x27, 0xa1, 0x73, 0x09, 0x8e, 0x1c, + 0xdf, 0x48, 0x31, 0xdf, 0xa2, 0xe1, 0x97, 0x5f, 0x3a, 0x68, 0x3a, 0x68, 0x59, 0x60, 0x5a, 0x66, + 0x70, 0x2e, 0x66, 0xa1, 0xc2, 0x1d, 0x00, 0xfe, 0x49, 0x42, 0x53, 0x7d, 0x3c, 0x3c, 0x5e, 0x1b, + 0x9c, 0x48, 0x42, 0xab, 0x20, 0x2b, 0x87, 0x81, 0x00, 0x3d, 0x2b, 0x4c, 0xcf, 0x3c, 0x9e, 0x15, + 0xf5, 0x08, 0x7d, 0x03, 0xfe, 0xb1, 0xf7, 0xd2, 0xee, 0x75, 0xea, 0x69, 0x2e, 0xed, 0xd8, 0xd6, + 0x22, 0xcd, 0xa5, 0x1d, 0xdf, 0x71, 0xf4, 0x53, 0x23, 0x34, 0x0e, 0xf8, 0xf7, 0xde, 0x33, 0x24, + 0x7a, 0xe6, 0x34, 0x67, 0x28, 0xd1, 0x9f, 0xa7, 0x39, 0x43, 0xc9, 0xb6, 0x9d, 0xfc, 0x9f, 0x29, + 0x5b, 0xc6, 0x8b, 0xa2, 0xb2, 0x78, 0x9b, 0x8e, 0xff, 0x92, 0x50, 0x7e, 0xbf, 0x8e, 0x06, 0xbf, + 0x76, 0x70, 0x72, 0xe1, 0x1e, 0x4a, 0xbe, 0x75, 0x68, 0x1c, 0xd0, 0x79, 0x85, 0xe9, 0x5c, 0xc5, + 0x2b, 0x83, 0xe9, 0x64, 0x7d, 0x54, 0xf4, 0xfd, 0xed, 0xb6, 0x14, 0x69, 0xde, 0x5f, 0xa1, 0x5d, + 0x49, 0xf3, 0xfe, 0x8a, 0x5d, 0x4c, 0xbf, 0xf7, 0x37, 0xd4, 0x97, 0xe0, 0x6f, 0x24, 0x84, 0xc5, + 0x26, 0x03, 0x5f, 0x1f, 0xbc, 0x76, 0x6f, 0xe7, 0x22, 0x3f, 0x77, 0x80, 0x4c, 0xa0, 0x3c, 0xc3, + 0x28, 0x4f, 0xe1, 0x49, 0x91, 0x32, 0xb4, 0x31, 0xf8, 0x2b, 0x09, 0xfd, 0x37, 0xd2, 0x33, 0xe0, + 0x6b, 0x29, 0xcc, 0x56, 0xb7, 0xe3, 0x91, 0x9f, 0x49, 0x9b, 0x06, 0x2c, 0xb3, 0x8c, 0x65, 0x06, + 0x4f, 0xc4, 0x38, 0x33, 0x9f, 0xce, 0xf7, 0x7c, 0x37, 0x88, 0xed, 0xc0, 0x20, 0xbb, 0x21, 0xb1, + 0x7f, 0x19, 0x64, 0x37, 0x24, 0xb7, 0x35, 0xfb, 0x3d, 0xf0, 0xd1, 0xae, 0x44, 0xb9, 0xf3, 0xf0, + 0x49, 0x56, 0x7a, 0xf4, 0x24, 0x2b, 0xfd, 0xf1, 0x24, 0x2b, 0x7d, 0xfa, 0x34, 0x3b, 0xf4, 0xe8, + 0x69, 0x76, 0xe8, 0xd7, 0xa7, 0xd9, 0xa1, 0xb7, 0xaf, 0xee, 0x18, 0xde, 0xdd, 0x46, 0xa5, 0x50, + 0xa5, 0xf5, 0x00, 0x6b, 0xd5, 0xd4, 0x2a, 0x6e, 0x07, 0x78, 0xf7, 0xf2, 0xb5, 0xe2, 0x5e, 0xe8, + 0x89, 0x6d, 0xda, 0xba, 0x5b, 0x19, 0x66, 0xff, 0xaf, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0x62, + 0x45, 0x25, 0x70, 0x1a, 0x19, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/protorev/types/tx.pb.go b/x/protorev/types/tx.pb.go index ab951b0dfdd..6db11aed3ec 100644 --- a/x/protorev/types/tx.pb.go +++ b/x/protorev/types/tx.pb.go @@ -609,63 +609,63 @@ func init() { func init() { proto.RegisterFile("osmosis/protorev/v1beta1/tx.proto", fileDescriptor_2783dce032fc6954) } var fileDescriptor_2783dce032fc6954 = []byte{ - // 889 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcf, 0x6f, 0xdc, 0x44, + // 888 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x41, 0x6f, 0xdc, 0x44, 0x18, 0xcd, 0xa4, 0x80, 0xe8, 0xa4, 0x40, 0xd7, 0xa4, 0xad, 0xd7, 0x6c, 0xbd, 0xce, 0x84, 0xaa, - 0x9b, 0xaa, 0xb5, 0xc9, 0x12, 0x7e, 0xc8, 0x12, 0x48, 0xb1, 0x7a, 0xa0, 0x87, 0xa0, 0xc8, 0x0d, - 0x42, 0xe2, 0x80, 0xb1, 0x77, 0x27, 0x8e, 0xd5, 0xb5, 0xc7, 0xf2, 0x4c, 0xa2, 0xdd, 0x2b, 0x47, - 0x4e, 0x48, 0x48, 0x1c, 0xf8, 0x17, 0xe0, 0x80, 0x10, 0x57, 0xee, 0xe1, 0x56, 0xd1, 0x03, 0xbd, - 0xb0, 0x42, 0x09, 0x12, 0x57, 0xb4, 0x7f, 0x01, 0xf2, 0x8c, 0xd7, 0x1b, 0xaf, 0x6d, 0x92, 0xb0, - 0x97, 0xd5, 0xfa, 0x9b, 0xf7, 0xbd, 0xef, 0xbd, 0x67, 0xfb, 0x33, 0x5c, 0x23, 0x34, 0x24, 0x34, - 0xa0, 0x46, 0x9c, 0x10, 0x46, 0x12, 0x7c, 0x64, 0x1c, 0x6d, 0x7a, 0x98, 0xb9, 0x9b, 0x06, 0x1b, - 0xea, 0xbc, 0x26, 0xc9, 0x19, 0x44, 0x9f, 0x42, 0xf4, 0x0c, 0xa2, 0xac, 0xfa, 0xc4, 0x27, 0xbc, - 0x6a, 0xa4, 0xff, 0x04, 0x40, 0x69, 0xb8, 0x61, 0x10, 0x11, 0x83, 0xff, 0x66, 0xa5, 0x96, 0x4f, - 0x88, 0x3f, 0xc0, 0x86, 0x1b, 0x07, 0x86, 0x1b, 0x45, 0x84, 0xb9, 0x2c, 0x20, 0x51, 0xc6, 0xa8, - 0xdc, 0xad, 0xd5, 0x90, 0x4f, 0x14, 0xc0, 0x66, 0x8f, 0x23, 0x1d, 0x31, 0x52, 0x5c, 0x88, 0x23, - 0xf4, 0x3b, 0x80, 0xaf, 0xed, 0x50, 0xff, 0x31, 0x66, 0x1f, 0x11, 0x66, 0x93, 0x43, 0x86, 0xa9, - 0xf4, 0x21, 0x7c, 0xd1, 0xed, 0x87, 0x41, 0x24, 0x03, 0x0d, 0x74, 0xae, 0x5a, 0x9d, 0xc9, 0xb8, - 0x7d, 0x6d, 0xe4, 0x86, 0x03, 0x13, 0xf1, 0x32, 0xfa, 0xed, 0xe7, 0x07, 0xab, 0x19, 0xc9, 0x76, - 0xbf, 0x9f, 0x60, 0x4a, 0x1f, 0xb3, 0x24, 0x88, 0x7c, 0x5b, 0xb4, 0x49, 0xfb, 0x10, 0x1e, 0x10, - 0xe6, 0x24, 0x9c, 0x4d, 0x5e, 0xd6, 0xae, 0x74, 0x56, 0xba, 0xf7, 0xf5, 0xba, 0x34, 0xf4, 0x3d, - 0xf2, 0x04, 0x47, 0xbb, 0x6e, 0x90, 0x6c, 0x27, 0x9e, 0x50, 0x60, 0x35, 0x8f, 0xc7, 0xed, 0xa5, - 0xc9, 0xb8, 0xdd, 0x10, 0x63, 0x67, 0x6c, 0xc8, 0xbe, 0x7a, 0x30, 0xd5, 0x69, 0xb6, 0xbe, 0xfa, - 0xfb, 0xc7, 0x7b, 0xb7, 0xa6, 0x21, 0xcc, 0xb9, 0x40, 0x4d, 0x78, 0x6b, 0xae, 0x64, 0x63, 0x1a, - 0x93, 0x88, 0x62, 0x74, 0x0c, 0xe0, 0x4d, 0x71, 0xf6, 0x10, 0x1f, 0xe1, 0x01, 0x89, 0x71, 0xb2, - 0xdd, 0xeb, 0x91, 0xc3, 0x88, 0x2d, 0xec, 0xfd, 0x11, 0x6c, 0xf4, 0xa7, 0x9c, 0x8e, 0x2b, 0x48, - 0xe5, 0x65, 0xce, 0xd5, 0x9a, 0x8c, 0xdb, 0xb2, 0xe0, 0x2a, 0x41, 0x90, 0x7d, 0xbd, 0x3f, 0x27, - 0xc5, 0x5c, 0x4f, 0xed, 0xa9, 0x45, 0x7b, 0xf3, 0x7a, 0x91, 0x06, 0xd5, 0xea, 0x93, 0xdc, 0xec, - 0x3f, 0x00, 0xae, 0x0a, 0xc8, 0xa3, 0x68, 0x9f, 0x58, 0xa3, 0x5d, 0x42, 0x06, 0x7b, 0xa3, 0x18, - 0x2f, 0x6c, 0xf5, 0x10, 0x36, 0x82, 0x68, 0x9f, 0x38, 0xde, 0xc8, 0x89, 0x09, 0x19, 0x38, 0x6c, - 0x14, 0x63, 0x6e, 0x75, 0xa5, 0xdb, 0xa9, 0xbf, 0xdb, 0x45, 0x11, 0x96, 0x96, 0xdd, 0xe9, 0x2c, - 0x98, 0x12, 0x21, 0xb2, 0x5f, 0x0d, 0x0a, 0x1d, 0xe6, 0x5a, 0x1a, 0x4b, 0xab, 0x18, 0x4b, 0x91, - 0x14, 0xa9, 0xb0, 0x55, 0x55, 0xcf, 0x23, 0x79, 0x0e, 0xa0, 0x2c, 0x00, 0x3b, 0xee, 0x30, 0x3d, - 0xdd, 0x25, 0x41, 0xc4, 0xe8, 0x2e, 0x4e, 0xf6, 0x86, 0x0b, 0xc7, 0xf2, 0x09, 0xbc, 0x19, 0xba, - 0x43, 0xe1, 0x20, 0xe6, 0xbc, 0x4e, 0x7a, 0xa3, 0xd9, 0x90, 0x67, 0xf3, 0x82, 0xb5, 0x36, 0x19, - 0xb7, 0x6f, 0x0b, 0xc2, 0x6a, 0x1c, 0xb2, 0xa5, 0xb0, 0x24, 0xcb, 0xbc, 0x93, 0xda, 0xd6, 0x8a, - 0xb6, 0xcb, 0xea, 0x11, 0x82, 0x5a, 0xdd, 0x59, 0x6e, 0xff, 0x0f, 0x00, 0xdf, 0xa8, 0x06, 0x59, - 0x03, 0xd2, 0x7b, 0xb2, 0x70, 0x02, 0x9f, 0xc3, 0x66, 0x95, 0x33, 0x2f, 0x25, 0xcf, 0x42, 0x78, - 0x73, 0x32, 0x6e, 0x6b, 0xf5, 0x21, 0x70, 0x28, 0xb2, 0x6f, 0x84, 0x55, 0xfa, 0x4c, 0x35, 0x8d, - 0xa2, 0x59, 0x8c, 0x22, 0x85, 0x7d, 0x8a, 0x03, 0xff, 0x80, 0x51, 0x74, 0x07, 0xae, 0xff, 0x87, - 0xbd, 0x3c, 0x86, 0x67, 0x00, 0x5e, 0x17, 0x38, 0xcb, 0xa5, 0xf8, 0x21, 0x8e, 0x48, 0xb8, 0xf8, - 0xee, 0xfb, 0x02, 0xae, 0x78, 0x2e, 0xc5, 0x4e, 0x9f, 0xd3, 0x65, 0xcb, 0x6f, 0xbd, 0xfe, 0x75, - 0xc8, 0x47, 0x5b, 0x4a, 0xf6, 0x26, 0x48, 0x62, 0xdc, 0x19, 0x16, 0x64, 0x43, 0x2f, 0x57, 0x68, - 0xde, 0x4e, 0xdd, 0xcb, 0x45, 0xf7, 0x33, 0x03, 0x48, 0x99, 0x3e, 0xda, 0xb3, 0xda, 0xd4, 0x71, - 0xf7, 0xfb, 0x97, 0xe1, 0x95, 0x1d, 0xea, 0x4b, 0xdf, 0x02, 0x78, 0xad, 0xb0, 0xf1, 0x37, 0xea, - 0x05, 0xce, 0xed, 0x50, 0x65, 0xf3, 0xc2, 0xd0, 0x3c, 0xe8, 0xce, 0x97, 0xcf, 0xfe, 0xfa, 0x66, - 0x19, 0x21, 0xcd, 0x28, 0x7d, 0xb0, 0x28, 0x66, 0xce, 0x6c, 0xbb, 0x4b, 0x3f, 0x01, 0xf8, 0x7a, - 0xd5, 0x56, 0x7e, 0xeb, 0xbc, 0xa1, 0xf3, 0x1d, 0xca, 0xfb, 0x97, 0xed, 0xc8, 0xd5, 0x1a, 0x5c, - 0xed, 0x06, 0xba, 0x5b, 0xad, 0xb6, 0xb4, 0xba, 0xa5, 0x5f, 0x00, 0xbc, 0x51, 0xbd, 0x4a, 0xba, - 0xe7, 0x89, 0x28, 0xf7, 0x28, 0xe6, 0xe5, 0x7b, 0x72, 0xe9, 0x5b, 0x5c, 0xba, 0x8e, 0xee, 0x57, - 0x4b, 0xaf, 0x5e, 0x37, 0xd2, 0xaf, 0x00, 0xca, 0xb5, 0xbb, 0xe0, 0x9d, 0xcb, 0xca, 0xe1, 0x6d, - 0xca, 0x07, 0xff, 0xab, 0x2d, 0x37, 0xf2, 0x1e, 0x37, 0xb2, 0x89, 0x8c, 0x8b, 0x1b, 0xe1, 0x2b, - 0x43, 0xfa, 0x01, 0xc0, 0x46, 0xf9, 0x4b, 0xa7, 0x9f, 0xa7, 0xa6, 0x88, 0x57, 0xde, 0xbd, 0x1c, - 0xfe, 0xa2, 0x8f, 0x4e, 0xe9, 0xe3, 0x26, 0x7d, 0x07, 0xe0, 0x2b, 0xc5, 0xfd, 0x73, 0xef, 0xbc, - 0xd1, 0x33, 0xac, 0xd2, 0xbd, 0x38, 0x36, 0x97, 0xb8, 0xc1, 0x25, 0xae, 0xa3, 0xb5, 0x6a, 0x89, - 0x67, 0xb6, 0x8e, 0xf5, 0xf1, 0xf1, 0x89, 0x0a, 0x9e, 0x9e, 0xa8, 0xe0, 0xcf, 0x13, 0x15, 0x7c, - 0x7d, 0xaa, 0x2e, 0x3d, 0x3d, 0x55, 0x97, 0x9e, 0x9f, 0xaa, 0x4b, 0x9f, 0x6d, 0xf9, 0x01, 0x3b, - 0x38, 0xf4, 0xf4, 0x1e, 0x09, 0xa7, 0x34, 0x0f, 0x06, 0xae, 0x47, 0x73, 0xce, 0xa3, 0xee, 0x96, - 0x31, 0x9c, 0x31, 0xa7, 0x5e, 0xa9, 0xf7, 0x12, 0xbf, 0x7e, 0xfb, 0xdf, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x59, 0xe2, 0xb0, 0xa1, 0x3b, 0x0b, 0x00, 0x00, + 0x9b, 0xaa, 0xb5, 0xc9, 0xd2, 0x02, 0xb2, 0x04, 0x52, 0xac, 0x1e, 0xe8, 0x21, 0x28, 0x72, 0x83, + 0x90, 0x38, 0x60, 0xec, 0xdd, 0x89, 0x63, 0x75, 0xed, 0xb1, 0x3c, 0x93, 0x68, 0xf7, 0xca, 0x91, + 0x13, 0x12, 0x12, 0x07, 0xfe, 0x02, 0x1c, 0x10, 0xe2, 0xca, 0x3d, 0xdc, 0x2a, 0x7a, 0xa0, 0x17, + 0x56, 0x28, 0x41, 0xe2, 0x8a, 0xf6, 0x17, 0x20, 0xcf, 0x78, 0xbd, 0xf1, 0xda, 0x26, 0x49, 0xf7, + 0xb2, 0x5a, 0x7f, 0xf3, 0xbe, 0xf7, 0xbd, 0xf7, 0x6c, 0x7f, 0x86, 0x6b, 0x84, 0x86, 0x84, 0x06, + 0xd4, 0x88, 0x13, 0xc2, 0x48, 0x82, 0x0f, 0x8d, 0xc3, 0x4d, 0x0f, 0x33, 0x77, 0xd3, 0x60, 0x43, + 0x9d, 0xd7, 0x24, 0x39, 0x83, 0xe8, 0x53, 0x88, 0x9e, 0x41, 0x94, 0x55, 0x9f, 0xf8, 0x84, 0x57, + 0x8d, 0xf4, 0x9f, 0x00, 0x28, 0x0d, 0x37, 0x0c, 0x22, 0x62, 0xf0, 0xdf, 0xac, 0xd4, 0xf2, 0x09, + 0xf1, 0x07, 0xd8, 0x70, 0xe3, 0xc0, 0x70, 0xa3, 0x88, 0x30, 0x97, 0x05, 0x24, 0xca, 0x18, 0x95, + 0xdb, 0xb5, 0x1a, 0xf2, 0x89, 0x02, 0xd8, 0xec, 0x71, 0xa4, 0x23, 0x46, 0x8a, 0x0b, 0x71, 0x84, + 0xfe, 0x00, 0xf0, 0x8d, 0x6d, 0xea, 0x3f, 0xc6, 0xec, 0x63, 0xc2, 0x6c, 0x72, 0xc0, 0x30, 0x95, + 0x3e, 0x82, 0x2f, 0xbb, 0xfd, 0x30, 0x88, 0x64, 0xa0, 0x81, 0xce, 0x65, 0xab, 0x33, 0x19, 0xb7, + 0xaf, 0x8c, 0xdc, 0x70, 0x60, 0x22, 0x5e, 0x46, 0xbf, 0xff, 0x72, 0x6f, 0x35, 0x23, 0xd9, 0xea, + 0xf7, 0x13, 0x4c, 0xe9, 0x63, 0x96, 0x04, 0x91, 0x6f, 0x8b, 0x36, 0x69, 0x0f, 0xc2, 0x7d, 0xc2, + 0x9c, 0x84, 0xb3, 0xc9, 0xcb, 0xda, 0xa5, 0xce, 0x4a, 0xf7, 0xae, 0x5e, 0x97, 0x86, 0xbe, 0x4b, + 0x9e, 0xe0, 0x68, 0xc7, 0x0d, 0x92, 0xad, 0xc4, 0x13, 0x0a, 0xac, 0xe6, 0xd1, 0xb8, 0xbd, 0x34, + 0x19, 0xb7, 0x1b, 0x62, 0xec, 0x8c, 0x0d, 0xd9, 0x97, 0xf7, 0xa7, 0x3a, 0xcd, 0xd6, 0xd7, 0xff, + 0xfc, 0x74, 0xe7, 0xc6, 0x34, 0x84, 0x39, 0x17, 0xa8, 0x09, 0x6f, 0xcc, 0x95, 0x6c, 0x4c, 0x63, + 0x12, 0x51, 0x8c, 0x8e, 0x00, 0xbc, 0x2e, 0xce, 0x1e, 0xe2, 0x43, 0x3c, 0x20, 0x31, 0x4e, 0xb6, + 0x7a, 0x3d, 0x72, 0x10, 0xb1, 0x85, 0xbd, 0x3f, 0x82, 0x8d, 0xfe, 0x94, 0xd3, 0x71, 0x05, 0xa9, + 0xbc, 0xcc, 0xb9, 0x5a, 0x93, 0x71, 0x5b, 0x16, 0x5c, 0x25, 0x08, 0xb2, 0xaf, 0xf6, 0xe7, 0xa4, + 0x98, 0xeb, 0xa9, 0x3d, 0xb5, 0x68, 0x6f, 0x5e, 0x2f, 0xd2, 0xa0, 0x5a, 0x7d, 0x92, 0x9b, 0xfd, + 0x17, 0xc0, 0x55, 0x01, 0x79, 0x14, 0xed, 0x11, 0x6b, 0xb4, 0x43, 0xc8, 0x60, 0x77, 0x14, 0xe3, + 0x85, 0xad, 0x1e, 0xc0, 0x46, 0x10, 0xed, 0x11, 0xc7, 0x1b, 0x39, 0x31, 0x21, 0x03, 0x87, 0x8d, + 0x62, 0xcc, 0xad, 0xae, 0x74, 0x3b, 0xf5, 0x77, 0xbb, 0x28, 0xc2, 0xd2, 0xb2, 0x3b, 0x9d, 0x05, + 0x53, 0x22, 0x44, 0xf6, 0xeb, 0x41, 0xa1, 0xc3, 0x5c, 0x4b, 0x63, 0x69, 0x15, 0x63, 0x29, 0x92, + 0x22, 0x15, 0xb6, 0xaa, 0xea, 0x79, 0x24, 0xcf, 0x01, 0x94, 0x05, 0x60, 0xdb, 0x1d, 0xa6, 0xa7, + 0x3b, 0x24, 0x88, 0x18, 0xdd, 0xc1, 0xc9, 0xee, 0x70, 0xe1, 0x58, 0x3e, 0x85, 0xd7, 0x43, 0x77, + 0x28, 0x1c, 0xc4, 0x9c, 0xd7, 0x49, 0x6f, 0x34, 0x1b, 0xf2, 0x6c, 0x5e, 0xb2, 0xd6, 0x26, 0xe3, + 0xf6, 0x4d, 0x41, 0x58, 0x8d, 0x43, 0xb6, 0x14, 0x96, 0x64, 0x99, 0xb7, 0x52, 0xdb, 0x5a, 0xd1, + 0x76, 0x59, 0x3d, 0x42, 0x50, 0xab, 0x3b, 0xcb, 0xed, 0xff, 0x09, 0xe0, 0x5b, 0xd5, 0x20, 0x6b, + 0x40, 0x7a, 0x4f, 0x16, 0x4e, 0xe0, 0x0b, 0xd8, 0xac, 0x72, 0xe6, 0xa5, 0xe4, 0x59, 0x08, 0x6f, + 0x4f, 0xc6, 0x6d, 0xad, 0x3e, 0x04, 0x0e, 0x45, 0xf6, 0xb5, 0xb0, 0x4a, 0x9f, 0xa9, 0xa6, 0x51, + 0x34, 0x8b, 0x51, 0xa4, 0xb0, 0xcf, 0x70, 0xe0, 0xef, 0x33, 0x8a, 0x6e, 0xc1, 0xf5, 0xff, 0xb1, + 0x97, 0xc7, 0xf0, 0x0c, 0xc0, 0xab, 0x02, 0x67, 0xb9, 0x14, 0x3f, 0xc4, 0x11, 0x09, 0x17, 0xdf, + 0x7d, 0x5f, 0xc2, 0x15, 0xcf, 0xa5, 0xd8, 0xe9, 0x73, 0xba, 0x6c, 0xf9, 0xad, 0xd7, 0xbf, 0x0e, + 0xf9, 0x68, 0x4b, 0xc9, 0xde, 0x04, 0x49, 0x8c, 0x3b, 0xc5, 0x82, 0x6c, 0xe8, 0xe5, 0x0a, 0xcd, + 0x9b, 0xa9, 0x7b, 0xb9, 0xe8, 0x7e, 0x66, 0x00, 0x29, 0xd3, 0x47, 0x7b, 0x56, 0x9b, 0x3a, 0xee, + 0xfe, 0xf0, 0x2a, 0xbc, 0xb4, 0x4d, 0x7d, 0xe9, 0x3b, 0x00, 0xaf, 0x14, 0x36, 0xfe, 0x46, 0xbd, + 0xc0, 0xb9, 0x1d, 0xaa, 0x6c, 0x9e, 0x1b, 0x9a, 0x07, 0xdd, 0xf9, 0xea, 0xd9, 0xdf, 0xdf, 0x2e, + 0x23, 0xa4, 0x19, 0xa5, 0x0f, 0x16, 0xc5, 0xcc, 0x99, 0x6d, 0x77, 0xe9, 0x67, 0x00, 0xdf, 0xac, + 0xda, 0xca, 0xef, 0x9c, 0x35, 0x74, 0xbe, 0x43, 0xf9, 0xe0, 0xa2, 0x1d, 0xb9, 0x5a, 0x83, 0xab, + 0xdd, 0x40, 0xb7, 0xab, 0xd5, 0x96, 0x56, 0xb7, 0xf4, 0x2b, 0x80, 0xd7, 0xaa, 0x57, 0x49, 0xf7, + 0x2c, 0x11, 0xe5, 0x1e, 0xc5, 0xbc, 0x78, 0x4f, 0x2e, 0xfd, 0x3e, 0x97, 0xae, 0xa3, 0xbb, 0xd5, + 0xd2, 0xab, 0xd7, 0x8d, 0xf4, 0x1b, 0x80, 0x72, 0xed, 0x2e, 0x78, 0x70, 0x51, 0x39, 0xbc, 0x4d, + 0xf9, 0xf0, 0x85, 0xda, 0x72, 0x23, 0xef, 0x73, 0x23, 0x9b, 0xc8, 0x38, 0xbf, 0x11, 0xbe, 0x32, + 0xa4, 0x1f, 0x01, 0x6c, 0x94, 0xbf, 0x74, 0xfa, 0x59, 0x6a, 0x8a, 0x78, 0xe5, 0xbd, 0x8b, 0xe1, + 0xcf, 0xfb, 0xe8, 0x94, 0x3e, 0x6e, 0xd2, 0xf7, 0x00, 0xbe, 0x56, 0xdc, 0x3f, 0x77, 0xce, 0x1a, + 0x3d, 0xc3, 0x2a, 0xdd, 0xf3, 0x63, 0x73, 0x89, 0x1b, 0x5c, 0xe2, 0x3a, 0x5a, 0xab, 0x96, 0x78, + 0x6a, 0xeb, 0x58, 0x9f, 0x1c, 0x1d, 0xab, 0xe0, 0xe9, 0xb1, 0x0a, 0xfe, 0x3a, 0x56, 0xc1, 0x37, + 0x27, 0xea, 0xd2, 0xd3, 0x13, 0x75, 0xe9, 0xf9, 0x89, 0xba, 0xf4, 0xf9, 0x7d, 0x3f, 0x60, 0xfb, + 0x07, 0x9e, 0xde, 0x23, 0xe1, 0x94, 0xe6, 0xde, 0xc0, 0xf5, 0x68, 0xce, 0x79, 0xd8, 0x7d, 0x60, + 0x0c, 0x67, 0xcc, 0xa9, 0x57, 0xea, 0xbd, 0xc2, 0xaf, 0xdf, 0xfd, 0x2f, 0x00, 0x00, 0xff, 0xff, + 0xce, 0x44, 0xad, 0x46, 0x3b, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/smart-account/ante/ante.go b/x/smart-account/ante/ante.go index 3f8895ffc1a..78f6aa7210b 100644 --- a/x/smart-account/ante/ante.go +++ b/x/smart-account/ante/ante.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - txfeeskeeper "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper" + txfeeskeeper "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper" errorsmod "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/telemetry" @@ -15,9 +15,9 @@ import ( authante "github.com/cosmos/cosmos-sdk/x/auth/ante" authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" - smartaccountkeeper "github.com/osmosis-labs/osmosis/v24/x/smart-account/keeper" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" + smartaccountkeeper "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) // AuthenticatorDecorator is responsible for processing authentication logic diff --git a/x/smart-account/ante/ante_test.go b/x/smart-account/ante/ante_test.go index 6a4467c1dec..fb5fb70e05f 100644 --- a/x/smart-account/ante/ante_test.go +++ b/x/smart-account/ante/ante_test.go @@ -8,12 +8,12 @@ import ( "time" "github.com/cosmos/cosmos-sdk/x/bank/testutil" - txfeeskeeper "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper" + txfeeskeeper "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper" "github.com/cosmos/cosmos-sdk/codec/types" authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" - smartaccounttypes "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + smartaccounttypes "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/client" @@ -28,10 +28,10 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/ante" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/testutils" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/ante" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/testutils" ) type AuthenticatorAnteSuite struct { diff --git a/x/smart-account/ante/circuit_breaker.go b/x/smart-account/ante/circuit_breaker.go index f260afcb095..cbef91f9b25 100644 --- a/x/smart-account/ante/circuit_breaker.go +++ b/x/smart-account/ante/circuit_breaker.go @@ -5,8 +5,8 @@ import ( authante "github.com/cosmos/cosmos-sdk/x/auth/ante" - smartaccountkeeper "github.com/osmosis-labs/osmosis/v24/x/smart-account/keeper" - smartaccounttypes "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + smartaccountkeeper "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper" + smartaccounttypes "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) // CircuitBreakerDecorator routes transactions through appropriate ante handlers based on diff --git a/x/smart-account/ante/circuit_breaker_test.go b/x/smart-account/ante/circuit_breaker_test.go index 7e3e8878d2f..2a6e61a998c 100644 --- a/x/smart-account/ante/circuit_breaker_test.go +++ b/x/smart-account/ante/circuit_breaker_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/ante" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/ante" ) // AuthenticatorCircuitBreakerAnteSuite is a test suite for the authenticator and CircuitBreaker AnteDecorator. diff --git a/x/smart-account/ante/pubkey_test.go b/x/smart-account/ante/pubkey_test.go index 9d568170725..c3431e5ca57 100644 --- a/x/smart-account/ante/pubkey_test.go +++ b/x/smart-account/ante/pubkey_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/ante" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/ante" ) // AutherticatorSetPubKeyAnteSuite is a test suite for the authenticator and SetPubKey AnteDecorator. diff --git a/x/smart-account/authenticator/base_test.go b/x/smart-account/authenticator/base_test.go index 78266d98b20..497bb3fc203 100644 --- a/x/smart-account/authenticator/base_test.go +++ b/x/smart-account/authenticator/base_test.go @@ -15,12 +15,12 @@ import ( authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" - smartaccounttypes "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + smartaccounttypes "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/app/params" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/app/params" ) type BaseAuthenticatorSuite struct { diff --git a/x/smart-account/authenticator/composition_test.go b/x/smart-account/authenticator/composition_test.go index f1e65e08abf..291bb4856b2 100644 --- a/x/smart-account/authenticator/composition_test.go +++ b/x/smart-account/authenticator/composition_test.go @@ -13,9 +13,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/testutils" - smartaccounttypes "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/testutils" + smartaccounttypes "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) type AggregatedAuthenticatorsTest struct { diff --git a/x/smart-account/authenticator/cosmwasm.go b/x/smart-account/authenticator/cosmwasm.go index 56a5e231dcb..124f4b946ff 100644 --- a/x/smart-account/authenticator/cosmwasm.go +++ b/x/smart-account/authenticator/cosmwasm.go @@ -4,7 +4,7 @@ import ( "encoding/json" authante "github.com/cosmos/cosmos-sdk/x/auth/ante" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" errorsmod "cosmossdk.io/errors" "github.com/CosmWasm/wasmd/x/wasm/keeper" diff --git a/x/smart-account/authenticator/cosmwasm_test.go b/x/smart-account/authenticator/cosmwasm_test.go index b33da589f8c..c4c3a19f431 100644 --- a/x/smart-account/authenticator/cosmwasm_test.go +++ b/x/smart-account/authenticator/cosmwasm_test.go @@ -20,11 +20,11 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/app/params" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app/params" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" ) type CosmwasmAuthenticatorTest struct { diff --git a/x/smart-account/authenticator/manager_test.go b/x/smart-account/authenticator/manager_test.go index 57d0ea96a7c..1d8d7f2a179 100644 --- a/x/smart-account/authenticator/manager_test.go +++ b/x/smart-account/authenticator/manager_test.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" ) // Mock Authenticator for testing purposes diff --git a/x/smart-account/authenticator/message_filter.go b/x/smart-account/authenticator/message_filter.go index 81e517cf467..8912e14f973 100644 --- a/x/smart-account/authenticator/message_filter.go +++ b/x/smart-account/authenticator/message_filter.go @@ -10,7 +10,7 @@ import ( codec "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" ) var _ Authenticator = &MessageFilter{} diff --git a/x/smart-account/authenticator/message_filter_test.go b/x/smart-account/authenticator/message_filter_test.go index 17f8e531786..cce7c4d6182 100644 --- a/x/smart-account/authenticator/message_filter_test.go +++ b/x/smart-account/authenticator/message_filter_test.go @@ -8,11 +8,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" bank "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/app/params" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/app/params" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" "github.com/stretchr/testify/suite" ) diff --git a/x/smart-account/authenticator/signature_authenticator_test.go b/x/smart-account/authenticator/signature_authenticator_test.go index 24545d5cc24..358c372fb59 100644 --- a/x/smart-account/authenticator/signature_authenticator_test.go +++ b/x/smart-account/authenticator/signature_authenticator_test.go @@ -15,8 +15,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" ) type SigVerifyAuthenticationSuite struct { diff --git a/x/smart-account/authenticator/spend_limits_test.go b/x/smart-account/authenticator/spend_limits_test.go index d26ce0ba6ff..3b475bd7a49 100644 --- a/x/smart-account/authenticator/spend_limits_test.go +++ b/x/smart-account/authenticator/spend_limits_test.go @@ -3,7 +3,7 @@ package authenticator_test import ( "encoding/json" "fmt" - txfeeskeeper "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper" + txfeeskeeper "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper" "os" "testing" "time" @@ -15,19 +15,19 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/ante" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/post" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/testutils" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/ante" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/post" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/testutils" ) type SpendLimitAuthenticatorTest struct { diff --git a/x/smart-account/client/cli/query.go b/x/smart-account/client/cli/query.go index ed6bdb7d447..8e29e0e8ace 100644 --- a/x/smart-account/client/cli/query.go +++ b/x/smart-account/client/cli/query.go @@ -4,7 +4,7 @@ import ( "github.com/spf13/cobra" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/smart-account/client/cli/tx.go b/x/smart-account/client/cli/tx.go index af3250ba548..ac43833298c 100644 --- a/x/smart-account/client/cli/tx.go +++ b/x/smart-account/client/cli/tx.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) func NewTxCmd() *cobra.Command { diff --git a/x/smart-account/genesis.go b/x/smart-account/genesis.go index d4ef3fb68a4..e1a5522573f 100644 --- a/x/smart-account/genesis.go +++ b/x/smart-account/genesis.go @@ -3,8 +3,8 @@ package authenticator import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/keeper" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) // InitGenesis initializes the module's state from a provided genesis state. diff --git a/x/smart-account/integration_test.go b/x/smart-account/integration_test.go index c201c950343..a116b09b9f1 100644 --- a/x/smart-account/integration_test.go +++ b/x/smart-account/integration_test.go @@ -4,15 +4,15 @@ import ( "encoding/json" "fmt" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/testutils" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/testutils" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "testing" - "github.com/osmosis-labs/osmosis/v24/app" - smartaccounttypes "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/app" + smartaccounttypes "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/tests/osmosisibctesting" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/tests/osmosisibctesting" ) type AuthenticatorSuite struct { diff --git a/x/smart-account/keeper/genesis.go b/x/smart-account/keeper/genesis.go index 85021443347..79d0289eb4d 100644 --- a/x/smart-account/keeper/genesis.go +++ b/x/smart-account/keeper/genesis.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) // GetAllAuthenticatorData is used in genesis export to export all the authenticator for all accounts diff --git a/x/smart-account/keeper/genesis_test.go b/x/smart-account/keeper/genesis_test.go index 5b3028e1caf..c9e5e8dacdd 100644 --- a/x/smart-account/keeper/genesis_test.go +++ b/x/smart-account/keeper/genesis_test.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" ) func (s *KeeperTestSuite) TestKeeper_AddAuthenticatorWithId() { diff --git a/x/smart-account/keeper/keeper.go b/x/smart-account/keeper/keeper.go index 09ceeac3c96..23dd0b35d4a 100644 --- a/x/smart-account/keeper/keeper.go +++ b/x/smart-account/keeper/keeper.go @@ -18,8 +18,8 @@ import ( "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) func (k Keeper) Logger(ctx sdk.Context) log.Logger { diff --git a/x/smart-account/keeper/keeper_test.go b/x/smart-account/keeper/keeper_test.go index da340f16b2c..9404d5de60c 100644 --- a/x/smart-account/keeper/keeper_test.go +++ b/x/smart-account/keeper/keeper_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/testutils" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/testutils" ) type KeeperTestSuite struct { diff --git a/x/smart-account/keeper/msg_server.go b/x/smart-account/keeper/msg_server.go index fb4bbab4c29..6197186681d 100644 --- a/x/smart-account/keeper/msg_server.go +++ b/x/smart-account/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) type msgServer struct { diff --git a/x/smart-account/keeper/msg_server_test.go b/x/smart-account/keeper/msg_server_test.go index 1b047aa323d..96d5e7e0bb3 100644 --- a/x/smart-account/keeper/msg_server_test.go +++ b/x/smart-account/keeper/msg_server_test.go @@ -6,9 +6,9 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/keeper" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) func (s *KeeperTestSuite) TestMsgServer_AddAuthenticator() { diff --git a/x/smart-account/keeper/params.go b/x/smart-account/keeper/params.go index 922c3dcad38..68febf4c857 100644 --- a/x/smart-account/keeper/params.go +++ b/x/smart-account/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) // GetParams get all parameters as types.Params diff --git a/x/smart-account/keeper/query.go b/x/smart-account/keeper/query.go index d1c0293a16c..b7705115d26 100644 --- a/x/smart-account/keeper/query.go +++ b/x/smart-account/keeper/query.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/smart-account/keeper/query_params.go b/x/smart-account/keeper/query_params.go index e171092192b..a89aab7710c 100644 --- a/x/smart-account/keeper/query_params.go +++ b/x/smart-account/keeper/query_params.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) func (k Keeper) Params(goCtx context.Context, req *types.QueryParamsRequest) (*types.QueryParamsResponse, error) { diff --git a/x/smart-account/module.go b/x/smart-account/module.go index ab86fb02fcc..9c0b8c27105 100644 --- a/x/smart-account/module.go +++ b/x/smart-account/module.go @@ -10,9 +10,9 @@ import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/keeper" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/smart-account/post/post.go b/x/smart-account/post/post.go index f68b47f8398..f34814da826 100644 --- a/x/smart-account/post/post.go +++ b/x/smart-account/post/post.go @@ -12,10 +12,10 @@ import ( authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" - smartaccountante "github.com/osmosis-labs/osmosis/v24/x/smart-account/ante" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" - smartaccountkeeper "github.com/osmosis-labs/osmosis/v24/x/smart-account/keeper" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + smartaccountante "github.com/osmosis-labs/osmosis/v25/x/smart-account/ante" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" + smartaccountkeeper "github.com/osmosis-labs/osmosis/v25/x/smart-account/keeper" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) // AuthenticatorPostDecorator handles post-transaction tasks for smart accounts. diff --git a/x/smart-account/post/post_test.go b/x/smart-account/post/post_test.go index 7cd7eee0996..b92d3dce39d 100644 --- a/x/smart-account/post/post_test.go +++ b/x/smart-account/post/post_test.go @@ -20,11 +20,11 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/post" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/testutils" - smartaccounttypes "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/post" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/testutils" + smartaccounttypes "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" "github.com/stretchr/testify/suite" ) diff --git a/x/smart-account/testutils/generic_authenticator.go b/x/smart-account/testutils/generic_authenticator.go index 99bad1f73d1..3bf140d98b1 100644 --- a/x/smart-account/testutils/generic_authenticator.go +++ b/x/smart-account/testutils/generic_authenticator.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" ) var ( diff --git a/x/smart-account/testutils/max_value_authenticator.go b/x/smart-account/testutils/max_value_authenticator.go index 3fecc27481d..c5d4e5aab18 100644 --- a/x/smart-account/testutils/max_value_authenticator.go +++ b/x/smart-account/testutils/max_value_authenticator.go @@ -12,7 +12,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" ) // This is a very naive implementation of an authenticator that tracks sends and blocks if the total amount sent is greater than 3_000 diff --git a/x/smart-account/testutils/spy_authenticator.go b/x/smart-account/testutils/spy_authenticator.go index a3584e273bf..183874796f7 100644 --- a/x/smart-account/testutils/spy_authenticator.go +++ b/x/smart-account/testutils/spy_authenticator.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" ) var _ authenticator.Authenticator = &SpyAuthenticator{} diff --git a/x/smart-account/testutils/stateful_authenticator.go b/x/smart-account/testutils/stateful_authenticator.go index 2786e5dffa4..1d9eda5a285 100644 --- a/x/smart-account/testutils/stateful_authenticator.go +++ b/x/smart-account/testutils/stateful_authenticator.go @@ -8,7 +8,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/authenticator" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/authenticator" ) var _ authenticator.Authenticator = &StatefulAuthenticator{} diff --git a/x/smart-account/types/genesis.pb.go b/x/smart-account/types/genesis.pb.go index 00d50ec2e7b..ab0ba25f95b 100644 --- a/x/smart-account/types/genesis.pb.go +++ b/x/smart-account/types/genesis.pb.go @@ -159,26 +159,26 @@ var fileDescriptor_678d63c22c684b43 = []byte{ // 341 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x41, 0x4b, 0x02, 0x41, 0x14, 0xc7, 0x77, 0x54, 0x8c, 0xc6, 0x08, 0xdc, 0x0a, 0x16, 0x89, 0x4d, 0xa4, 0x83, 0x05, 0xee, - 0xe0, 0xd6, 0xa5, 0xa3, 0x12, 0x44, 0xb7, 0xd0, 0x5b, 0x17, 0x7b, 0xbb, 0x33, 0xac, 0x0b, 0xee, - 0x8e, 0xec, 0x3c, 0xc5, 0x3e, 0x45, 0x7d, 0x2c, 0x8f, 0x1e, 0x3b, 0x45, 0xe8, 0xb5, 0x0f, 0x11, - 0xee, 0x8e, 0xe0, 0x1a, 0x58, 0xb7, 0x79, 0xcc, 0xef, 0xbd, 0xff, 0xfb, 0xbf, 0x3f, 0xbd, 0x96, - 0x2a, 0x92, 0x2a, 0x54, 0x4c, 0x45, 0x90, 0x20, 0xf8, 0xbe, 0x9c, 0xc4, 0xc8, 0xa6, 0x6d, 0x4f, - 0x20, 0xb4, 0x59, 0x20, 0x62, 0xa1, 0x42, 0xe5, 0x8c, 0x13, 0x89, 0xd2, 0x3c, 0xd7, 0xac, 0xb3, - 0xcd, 0x3a, 0x9a, 0xad, 0x9d, 0x06, 0x32, 0x90, 0x29, 0xc8, 0xd6, 0xaf, 0xac, 0xa7, 0x76, 0xb5, - 0x77, 0xfe, 0x18, 0x12, 0x88, 0xd4, 0xbf, 0xd0, 0x48, 0x72, 0x31, 0xd2, 0x68, 0xe3, 0x8d, 0xd0, - 0x6a, 0x67, 0x82, 0x43, 0x11, 0x63, 0xe8, 0x03, 0xca, 0xe4, 0x1e, 0x10, 0x4c, 0x8b, 0x1e, 0x00, - 0xe7, 0x89, 0x50, 0xca, 0x22, 0x75, 0xd2, 0x3c, 0xec, 0x6d, 0x4a, 0xf3, 0x85, 0x1e, 0xc3, 0x36, - 0xae, 0xac, 0x42, 0xbd, 0xd8, 0xac, 0xb8, 0xae, 0xb3, 0xcf, 0x92, 0xd3, 0xc9, 0xea, 0x9c, 0x52, - 0xb7, 0x34, 0xff, 0xbc, 0x30, 0x7a, 0x3b, 0xf3, 0x1a, 0xdf, 0x84, 0x1e, 0x3d, 0x64, 0xd7, 0xea, - 0x23, 0xa0, 0x30, 0xbb, 0xb4, 0x9c, 0xb9, 0x4b, 0x77, 0xa9, 0xb8, 0x97, 0xfb, 0xa5, 0x9e, 0x52, - 0x56, 0x0f, 0xd7, 0x9d, 0xa6, 0x4b, 0xcf, 0x62, 0x31, 0xc3, 0x41, 0x4e, 0x6b, 0x10, 0x72, 0xab, - 0x50, 0x27, 0xcd, 0x52, 0xef, 0x64, 0xfd, 0x99, 0x5b, 0xee, 0x91, 0x9b, 0x9c, 0x9a, 0x79, 0x9c, - 0x03, 0x82, 0x55, 0x4c, 0xed, 0xb2, 0x3f, 0xec, 0xee, 0x5e, 0x54, 0xaf, 0x53, 0x85, 0x5f, 0x1f, - 0xfd, 0xf9, 0xd2, 0x26, 0x8b, 0xa5, 0x4d, 0xbe, 0x96, 0x36, 0x79, 0x5f, 0xd9, 0xc6, 0x62, 0x65, - 0x1b, 0x1f, 0x2b, 0xdb, 0x78, 0xbe, 0x0b, 0x42, 0x1c, 0x4e, 0x3c, 0xc7, 0x97, 0x11, 0xd3, 0x6a, - 0xad, 0x11, 0x78, 0x6a, 0x53, 0xb0, 0xa9, 0x7b, 0xcb, 0x66, 0x59, 0xc6, 0xad, 0x4d, 0xc8, 0xf8, - 0x3a, 0x16, 0xca, 0x2b, 0xa7, 0xe1, 0xde, 0xfc, 0x04, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x67, 0x15, - 0xea, 0x94, 0x02, 0x00, 0x00, + 0xe0, 0x46, 0x87, 0x8e, 0x4a, 0x10, 0xdd, 0x42, 0x6f, 0x5d, 0xec, 0xed, 0xce, 0xb0, 0x2e, 0xb8, + 0x3b, 0xb2, 0xf3, 0x14, 0xfb, 0x14, 0xf5, 0xb1, 0x3c, 0x7a, 0xec, 0x14, 0xa1, 0xd7, 0x3e, 0x44, + 0xb8, 0x3b, 0x82, 0x6b, 0x60, 0xdd, 0xe6, 0x31, 0xbf, 0xf7, 0xfe, 0xef, 0xff, 0xfe, 0xf4, 0x5a, + 0xaa, 0x48, 0xaa, 0x50, 0x31, 0x15, 0x41, 0x82, 0xe0, 0xfb, 0x72, 0x12, 0x23, 0x9b, 0xb6, 0x3d, + 0x81, 0xd0, 0x66, 0x81, 0x88, 0x85, 0x0a, 0x95, 0x33, 0x4e, 0x24, 0x4a, 0xf3, 0x5c, 0xb3, 0xce, + 0x36, 0xeb, 0x68, 0xb6, 0x76, 0x1a, 0xc8, 0x40, 0xa6, 0x20, 0x5b, 0xbf, 0xb2, 0x9e, 0xda, 0xd5, + 0xde, 0xf9, 0x63, 0x48, 0x20, 0x52, 0xff, 0x42, 0x23, 0xc9, 0xc5, 0x48, 0xa3, 0x8d, 0x37, 0x42, + 0xab, 0x9d, 0x09, 0x0e, 0x45, 0x8c, 0xa1, 0x0f, 0x28, 0x93, 0x7b, 0x40, 0x30, 0x2d, 0x7a, 0x00, + 0x9c, 0x27, 0x42, 0x29, 0x8b, 0xd4, 0x49, 0xf3, 0xb0, 0xb7, 0x29, 0xcd, 0x17, 0x7a, 0x0c, 0xdb, + 0xb8, 0xb2, 0x0a, 0xf5, 0x62, 0xb3, 0xe2, 0xba, 0xce, 0x3e, 0x4b, 0x4e, 0x27, 0xab, 0x73, 0x4a, + 0xdd, 0xd2, 0xfc, 0xf3, 0xc2, 0xe8, 0xed, 0xcc, 0x6b, 0x7c, 0x13, 0x7a, 0xf4, 0x90, 0x5d, 0xab, + 0x8f, 0x80, 0xc2, 0xec, 0xd2, 0x72, 0xe6, 0x2e, 0xdd, 0xa5, 0xe2, 0x5e, 0xee, 0x97, 0x7a, 0x4a, + 0x59, 0x3d, 0x5c, 0x77, 0x9a, 0x2e, 0x3d, 0x8b, 0xc5, 0x0c, 0x07, 0x39, 0xad, 0x41, 0xc8, 0xad, + 0x42, 0x9d, 0x34, 0x4b, 0xbd, 0x93, 0xf5, 0x67, 0x6e, 0xb9, 0x47, 0x6e, 0x72, 0x6a, 0xe6, 0x71, + 0x0e, 0x08, 0x56, 0x31, 0xb5, 0xcb, 0xfe, 0xb0, 0xbb, 0x7b, 0x51, 0xbd, 0x4e, 0x15, 0x7e, 0x7d, + 0xf4, 0xe7, 0x4b, 0x9b, 0x2c, 0x96, 0x36, 0xf9, 0x5a, 0xda, 0xe4, 0x7d, 0x65, 0x1b, 0x8b, 0x95, + 0x6d, 0x7c, 0xac, 0x6c, 0xe3, 0xf9, 0x2e, 0x08, 0x71, 0x38, 0xf1, 0x1c, 0x5f, 0x46, 0x4c, 0xab, + 0xb5, 0x46, 0xe0, 0xa9, 0x4d, 0xc1, 0xa6, 0xee, 0x2d, 0x9b, 0x65, 0x19, 0xb7, 0x36, 0x21, 0xe3, + 0xeb, 0x58, 0x28, 0xaf, 0x9c, 0x86, 0x7b, 0xf3, 0x13, 0x00, 0x00, 0xff, 0xff, 0x8a, 0x8f, 0xf2, + 0xe4, 0x94, 0x02, 0x00, 0x00, } func (m *AuthenticatorData) Marshal() (dAtA []byte, err error) { diff --git a/x/smart-account/types/genesis_test.go b/x/smart-account/types/genesis_test.go index b1a941ab968..a7235b64bf3 100644 --- a/x/smart-account/types/genesis_test.go +++ b/x/smart-account/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/x/smart-account/types" + "github.com/osmosis-labs/osmosis/v25/x/smart-account/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/smart-account/types/models.pb.go b/x/smart-account/types/models.pb.go index a6e6d660261..e502140c9a5 100644 --- a/x/smart-account/types/models.pb.go +++ b/x/smart-account/types/models.pb.go @@ -114,9 +114,9 @@ var fileDescriptor_e6c4440607a75fe8 = []byte{ 0x15, 0x18, 0x35, 0x78, 0x82, 0xa0, 0x3c, 0xa7, 0xe0, 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, 0xb2, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, - 0x3a, 0x4b, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, 0x33, 0x32, 0xd1, 0xaf, 0x80, 0x78, + 0x3a, 0x4b, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xc6, 0xd1, 0x2f, 0x33, 0x32, 0xd5, 0xaf, 0x80, 0x78, 0x4a, 0x17, 0xe6, 0x2b, 0x90, 0x5d, 0xc5, 0x49, 0x6c, 0x60, 0xdf, 0x18, 0x03, 0x02, 0x00, 0x00, - 0xff, 0xff, 0xea, 0xeb, 0x84, 0xd9, 0xfa, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x3b, 0x03, 0x63, 0xd7, 0xfa, 0x00, 0x00, 0x00, } func (m *AccountAuthenticator) Marshal() (dAtA []byte, err error) { diff --git a/x/smart-account/types/params.pb.go b/x/smart-account/types/params.pb.go index 07d8ebb4ad2..013896272f3 100644 --- a/x/smart-account/types/params.pb.go +++ b/x/smart-account/types/params.pb.go @@ -104,25 +104,25 @@ var fileDescriptor_f2a36e3b8e84dacf = []byte{ // 325 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xb1, 0x4e, 0x02, 0x31, 0x18, 0xc7, 0x39, 0x30, 0x44, 0x6f, 0x24, 0x24, 0x82, 0x9a, 0x42, 0x3a, 0x18, 0x1c, 0xb8, 0x06, - 0x75, 0xd1, 0x8d, 0x73, 0x70, 0x35, 0x10, 0x07, 0x5d, 0x9a, 0xef, 0x6a, 0x3d, 0x1a, 0xaf, 0x57, - 0xd2, 0xf6, 0x08, 0xbc, 0x85, 0xef, 0xe2, 0x4b, 0x38, 0x32, 0x3a, 0x11, 0x03, 0x6f, 0xc0, 0x13, - 0x18, 0xee, 0x4a, 0xc4, 0x41, 0xb6, 0xf6, 0xfb, 0xfd, 0xda, 0xef, 0xfb, 0xf2, 0xf7, 0x2f, 0x94, - 0x91, 0xca, 0x08, 0x43, 0x8c, 0x04, 0x6d, 0x81, 0x31, 0x95, 0xa5, 0x96, 0x4c, 0x7a, 0x11, 0xb7, - 0xd0, 0x23, 0x63, 0xd0, 0x20, 0x4d, 0x30, 0xd6, 0xca, 0xaa, 0xda, 0x99, 0x53, 0x83, 0x5d, 0x35, - 0x70, 0xea, 0x49, 0x3d, 0x56, 0xb1, 0xca, 0x45, 0xb2, 0x39, 0x15, 0x6f, 0xf0, 0x47, 0xd9, 0xaf, - 0x3e, 0xe4, 0x9f, 0xd4, 0x5e, 0xfd, 0x53, 0x09, 0x53, 0x21, 0x33, 0x49, 0xb3, 0x14, 0x32, 0x3b, - 0xe2, 0xa9, 0x15, 0x0c, 0x2c, 0x7f, 0xa1, 0x31, 0x98, 0x86, 0xd7, 0xf6, 0x3a, 0x07, 0xe1, 0xf9, - 0x7a, 0xd1, 0xc2, 0x33, 0x90, 0xc9, 0x2d, 0xde, 0x23, 0xe3, 0x41, 0xd3, 0xd1, 0xc7, 0xbf, 0xf0, - 0x1e, 0x4c, 0xed, 0xc9, 0x3f, 0x16, 0x86, 0xe6, 0x33, 0x52, 0x37, 0x24, 0x05, 0x66, 0xc5, 0x84, - 0x37, 0xca, 0x6d, 0xaf, 0x73, 0x18, 0xe2, 0xf5, 0xa2, 0x85, 0x8a, 0x1e, 0xff, 0x88, 0x78, 0x50, - 0x17, 0x66, 0xb8, 0x01, 0xfd, 0xa2, 0xde, 0xcf, 0xcb, 0x9b, 0x15, 0x98, 0xd0, 0x2c, 0x13, 0x96, - 0x46, 0x9a, 0xc3, 0x1b, 0xd7, 0x94, 0xa9, 0xd4, 0x6a, 0x95, 0x24, 0x5c, 0x9b, 0x46, 0xa5, 0x5d, - 0xe9, 0x1c, 0xed, 0xae, 0xb0, 0x47, 0xc6, 0x83, 0xa6, 0xa3, 0x61, 0x01, 0xef, 0x7e, 0x59, 0x38, - 0xfc, 0x5c, 0x22, 0x6f, 0xbe, 0x44, 0xde, 0xf7, 0x12, 0x79, 0xef, 0x2b, 0x54, 0x9a, 0xaf, 0x50, - 0xe9, 0x6b, 0x85, 0x4a, 0xcf, 0x37, 0xb1, 0xb0, 0xa3, 0x2c, 0x0a, 0x98, 0x92, 0xc4, 0xc5, 0xd1, - 0x4d, 0x20, 0x32, 0xdb, 0x0b, 0x99, 0x5c, 0x5e, 0x93, 0x69, 0x11, 0x66, 0x77, 0x9b, 0xa6, 0x9d, - 0x8d, 0xb9, 0x89, 0xaa, 0x79, 0x22, 0x57, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x47, 0x73, 0x90, - 0x88, 0xf2, 0x01, 0x00, 0x00, + 0x8d, 0x83, 0x6e, 0x9c, 0x83, 0xab, 0x81, 0x38, 0xe8, 0xd2, 0x7c, 0x57, 0xeb, 0xd1, 0x78, 0xbd, + 0x92, 0xb6, 0x47, 0xe0, 0x2d, 0x7c, 0x17, 0x5f, 0xc2, 0x91, 0xd1, 0x89, 0x18, 0x78, 0x03, 0x9e, + 0xc0, 0x70, 0x57, 0x22, 0x0e, 0xb2, 0xb5, 0xdf, 0xef, 0xd7, 0x7e, 0xdf, 0x97, 0xbf, 0x7f, 0xa1, + 0x8c, 0x54, 0x46, 0x18, 0x62, 0x24, 0x68, 0x0b, 0x8c, 0xa9, 0x2c, 0xb5, 0x64, 0xd2, 0x8b, 0xb8, + 0x85, 0x1e, 0x19, 0x83, 0x06, 0x69, 0x82, 0xb1, 0x56, 0x56, 0xd5, 0xce, 0x9c, 0x1a, 0xec, 0xaa, + 0x81, 0x53, 0x4f, 0xea, 0xb1, 0x8a, 0x55, 0x2e, 0x92, 0xcd, 0xa9, 0x78, 0x83, 0x3f, 0xca, 0x7e, + 0xf5, 0x21, 0xff, 0xa4, 0xf6, 0xea, 0x9f, 0x4a, 0x98, 0x0a, 0x99, 0x49, 0x9a, 0xa5, 0x90, 0xd9, + 0x11, 0x4f, 0xad, 0x60, 0x60, 0xf9, 0x0b, 0x8d, 0xc1, 0x34, 0xbc, 0xb6, 0xd7, 0x39, 0x08, 0xcf, + 0xd7, 0x8b, 0x16, 0x9e, 0x81, 0x4c, 0x6e, 0xf1, 0x1e, 0x19, 0x0f, 0x9a, 0x8e, 0x3e, 0xfe, 0x85, + 0xf7, 0x60, 0x6a, 0x4f, 0xfe, 0xb1, 0x30, 0x34, 0x9f, 0x91, 0xba, 0x21, 0x29, 0x30, 0x2b, 0x26, + 0xbc, 0x51, 0x6e, 0x7b, 0x9d, 0xc3, 0x10, 0xaf, 0x17, 0x2d, 0x54, 0xf4, 0xf8, 0x47, 0xc4, 0x83, + 0xba, 0x30, 0xc3, 0x0d, 0xe8, 0x17, 0xf5, 0x7e, 0x5e, 0xde, 0xac, 0xc0, 0x84, 0x66, 0x99, 0xb0, + 0x34, 0xd2, 0x1c, 0xde, 0xb8, 0xa6, 0x4c, 0xa5, 0x56, 0xab, 0x24, 0xe1, 0xda, 0x34, 0x2a, 0xed, + 0x4a, 0xe7, 0x68, 0x77, 0x85, 0x3d, 0x32, 0x1e, 0x34, 0x1d, 0x0d, 0x0b, 0x78, 0xf7, 0xcb, 0xc2, + 0xe1, 0xe7, 0x12, 0x79, 0xf3, 0x25, 0xf2, 0xbe, 0x97, 0xc8, 0x7b, 0x5f, 0xa1, 0xd2, 0x7c, 0x85, + 0x4a, 0x5f, 0x2b, 0x54, 0x7a, 0xbe, 0x89, 0x85, 0x1d, 0x65, 0x51, 0xc0, 0x94, 0x24, 0x2e, 0x8e, + 0x6e, 0x02, 0x91, 0xd9, 0x5e, 0xc8, 0xe4, 0xf2, 0x9a, 0x4c, 0x8b, 0x30, 0xbb, 0xdb, 0x34, 0xed, + 0x6c, 0xcc, 0x4d, 0x54, 0xcd, 0x13, 0xb9, 0xfa, 0x09, 0x00, 0x00, 0xff, 0xff, 0x96, 0x9b, 0x77, + 0x86, 0xf2, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/smart-account/types/query.pb.go b/x/smart-account/types/query.pb.go index bff97868e15..14091bdb2e8 100644 --- a/x/smart-account/types/query.pb.go +++ b/x/smart-account/types/query.pb.go @@ -318,7 +318,7 @@ var fileDescriptor_aab2e1fc442f3cc3 = []byte{ // 519 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x41, 0x6f, 0xd3, 0x30, 0x14, 0xae, 0x47, 0x29, 0xc2, 0x3b, 0x30, 0x4c, 0x07, 0xa1, 0xaa, 0x42, 0x15, 0xed, 0xd0, 0x21, - 0x2d, 0x5e, 0xc3, 0x18, 0xe2, 0xc6, 0x7a, 0x01, 0x6e, 0x10, 0x4e, 0x70, 0x60, 0x72, 0x52, 0x2b, + 0x2d, 0x5e, 0x03, 0x1b, 0xe2, 0xc6, 0x7a, 0x01, 0x6e, 0x10, 0x4e, 0x70, 0x60, 0x72, 0x52, 0x2b, 0xb3, 0xd4, 0xc4, 0x59, 0xec, 0x4c, 0x4c, 0xd3, 0x2e, 0x20, 0x71, 0x46, 0xda, 0xbf, 0xe0, 0x37, 0xf0, 0x03, 0x26, 0x71, 0x99, 0xc4, 0x85, 0x13, 0x42, 0x2d, 0x3f, 0x04, 0xcd, 0x76, 0x0b, 0x69, 0x43, 0x58, 0x77, 0xab, 0x5f, 0xbf, 0xef, 0x7d, 0xdf, 0xf7, 0xde, 0x53, 0x60, 0x97, 0x8b, 0x98, @@ -330,25 +330,25 @@ var fileDescriptor_aab2e1fc442f3cc3 = []byte{ 0x5e, 0xe9, 0x33, 0x25, 0x19, 0x89, 0xc5, 0x85, 0xa0, 0x31, 0x1f, 0xd0, 0xa1, 0x81, 0x3a, 0x4d, 0x88, 0x5e, 0x9e, 0xeb, 0xbe, 0x50, 0x7c, 0x9f, 0xee, 0xe7, 0x54, 0x48, 0xe7, 0x35, 0xbc, 0x55, 0xa8, 0x8a, 0x94, 0x27, 0x82, 0xa2, 0x3e, 0x6c, 0x68, 0x1d, 0x0b, 0x74, 0x40, 0x77, 0xd9, 0x5b, - 0x73, 0xab, 0x26, 0xe2, 0x6a, 0x76, 0xbf, 0x7e, 0xfa, 0xe3, 0x5e, 0xcd, 0x37, 0x4c, 0x67, 0x0b, - 0x5a, 0x4f, 0xa9, 0xdc, 0xc9, 0xe5, 0x1e, 0x4d, 0x24, 0x0b, 0x89, 0xe4, 0xd9, 0x44, 0x16, 0x59, - 0xf0, 0x9a, 0xe9, 0xa1, 0x04, 0xae, 0xfb, 0x93, 0xa7, 0xf3, 0x11, 0xc0, 0xbb, 0x25, 0x34, 0xe3, - 0x8b, 0xc1, 0xdb, 0x06, 0xb8, 0x4b, 0x0a, 0x08, 0x0b, 0x74, 0xae, 0x74, 0x97, 0x3d, 0xaf, 0xda, - 0xe7, 0x8e, 0x7e, 0x17, 0x9a, 0xfb, 0xab, 0xa4, 0xa4, 0x2a, 0x9c, 0xb7, 0xf0, 0xce, 0xac, 0x8f, - 0xff, 0xba, 0x47, 0xeb, 0x70, 0xa5, 0xe0, 0x6b, 0x97, 0x0d, 0xac, 0xa5, 0x0e, 0xe8, 0xd6, 0xfd, - 0x1b, 0x85, 0xfa, 0xf3, 0x81, 0xf3, 0x01, 0xcc, 0xcf, 0x67, 0x9a, 0x33, 0x82, 0xab, 0xa5, 0x39, - 0xcd, 0x3a, 0x2e, 0x13, 0xb3, 0x59, 0x16, 0xd3, 0xfb, 0x5c, 0x87, 0x57, 0xd5, 0x01, 0xa0, 0x13, - 0x00, 0x1b, 0x7a, 0x8f, 0x68, 0xb3, 0xba, 0xfd, 0xfc, 0x19, 0xb5, 0x7a, 0x0b, 0x30, 0x74, 0x44, - 0x67, 0xed, 0xfd, 0xb7, 0x5f, 0x27, 0x4b, 0x36, 0x6a, 0xe3, 0xd2, 0x1b, 0xd6, 0x47, 0x84, 0xbe, - 0x02, 0xb8, 0x32, 0x3b, 0x25, 0xf4, 0xb0, 0x5a, 0xed, 0x1f, 0x6b, 0x6b, 0x6d, 0x2f, 0x4a, 0x33, + 0x73, 0xab, 0x26, 0xe2, 0x6a, 0x76, 0xbf, 0x7e, 0xfa, 0xe3, 0x5e, 0xcd, 0x37, 0x4c, 0xe7, 0x21, + 0xb4, 0x9e, 0x52, 0xb9, 0x93, 0xcb, 0x3d, 0x9a, 0x48, 0x16, 0x12, 0xc9, 0xb3, 0x89, 0x2c, 0xb2, + 0xe0, 0x35, 0xd3, 0x43, 0x09, 0x5c, 0xf7, 0x27, 0x4f, 0xe7, 0x23, 0x80, 0x77, 0x4b, 0x68, 0xc6, + 0x17, 0x83, 0xb7, 0x0d, 0x70, 0x97, 0x14, 0x10, 0x16, 0xe8, 0x5c, 0xe9, 0x2e, 0x7b, 0x5e, 0xb5, + 0xcf, 0x1d, 0xfd, 0x2e, 0x34, 0xf7, 0x57, 0x49, 0x49, 0x55, 0x38, 0x6f, 0xe1, 0x9d, 0x59, 0x1f, + 0xff, 0x75, 0x8f, 0xd6, 0xe1, 0x4a, 0xc1, 0xd7, 0x2e, 0x1b, 0x58, 0x4b, 0x1d, 0xd0, 0xad, 0xfb, + 0x37, 0x0a, 0xf5, 0xe7, 0x03, 0xe7, 0x03, 0x98, 0x9f, 0xcf, 0x34, 0x67, 0x04, 0x57, 0x4b, 0x73, + 0x9a, 0x75, 0x5c, 0x26, 0x66, 0xb3, 0x2c, 0xa6, 0xf7, 0xb9, 0x0e, 0xaf, 0xaa, 0x03, 0x40, 0x27, + 0x00, 0x36, 0xf4, 0x1e, 0xd1, 0x66, 0x75, 0xfb, 0xf9, 0x33, 0x6a, 0xf5, 0x16, 0x60, 0xe8, 0x88, + 0xce, 0xda, 0xfb, 0x6f, 0xbf, 0x4e, 0x96, 0x6c, 0xd4, 0xc6, 0xa5, 0x37, 0xac, 0x8f, 0x08, 0x7d, + 0x05, 0x70, 0x65, 0x76, 0x4a, 0x68, 0xab, 0x5a, 0xed, 0x1f, 0x6b, 0x6b, 0x6d, 0x2f, 0x4a, 0x33, 0x4e, 0x9f, 0x29, 0xa7, 0x7d, 0xf4, 0xa4, 0xdc, 0x69, 0x61, 0x41, 0xf8, 0xc8, 0x94, 0x8f, 0xf1, 0xd1, 0xec, 0x25, 0x1c, 0xa3, 0x2f, 0x00, 0xde, 0x9c, 0x3b, 0x6e, 0xb4, 0xa0, 0xaf, 0xe9, 0xd0, 0x1f, 0x2d, 0xcc, 0x33, 0x81, 0xb6, 0x55, 0xa0, 0x4d, 0xe4, 0x5e, 0x20, 0x90, 0xf8, 0x93, 0xa8, 0xff, 0xea, 0x74, 0x64, 0x83, 0xb3, 0x91, 0x0d, 0x7e, 0x8e, 0x6c, 0xf0, 0x69, 0x6c, 0xd7, 0xce, 0xc6, 0x76, 0xed, 0xfb, 0xd8, 0xae, 0xbd, 0x79, 0x1c, 0x31, 0xb9, 0x97, 0x07, 0x6e, 0xc8, 0xe3, 0x49, 0xcf, 0x8d, 0x21, 0x09, 0xc4, 0x54, 0xe0, 0xc0, 0xdb, 0xc2, 0xef, 0xb4, 0xcc, 0xc6, 0x44, - 0x47, 0x1e, 0xa6, 0x54, 0x04, 0x0d, 0xf5, 0x79, 0x7a, 0xf0, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x9a, - 0x94, 0x72, 0xfa, 0x9e, 0x05, 0x00, 0x00, + 0x47, 0x1e, 0xa6, 0x54, 0x04, 0x0d, 0xf5, 0x79, 0x7a, 0xf0, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x4b, + 0x7c, 0x95, 0xf4, 0x9e, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/smart-account/types/tx.pb.go b/x/smart-account/types/tx.pb.go index ccbd131d3a2..3625354c3b6 100644 --- a/x/smart-account/types/tx.pb.go +++ b/x/smart-account/types/tx.pb.go @@ -387,31 +387,31 @@ var fileDescriptor_e696d15b139ba7e5 = []byte{ // 422 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0xbf, 0x6f, 0xd3, 0x40, 0x14, 0xce, 0x25, 0x51, 0x28, 0x0f, 0x54, 0x81, 0x2b, 0x85, 0x90, 0x22, 0xab, 0xb2, 0x84, 0x94, - 0xa5, 0xb6, 0x52, 0x2a, 0x45, 0x45, 0x0c, 0x04, 0x04, 0x5b, 0x96, 0x0b, 0x2c, 0x2c, 0xe8, 0x72, - 0x7e, 0x72, 0x2d, 0xd5, 0xbe, 0xc8, 0xef, 0xd9, 0x32, 0x4c, 0xac, 0x6c, 0xfd, 0xb3, 0x18, 0x3b, - 0x32, 0xa2, 0xe4, 0x1f, 0x41, 0x39, 0xec, 0xaa, 0xa5, 0x86, 0xfe, 0xd8, 0xee, 0x9d, 0xdf, 0xf7, - 0xc3, 0xf7, 0xe9, 0x83, 0xe7, 0x86, 0x12, 0x43, 0x31, 0x05, 0x94, 0xa8, 0x8c, 0x95, 0xd6, 0x26, - 0x4f, 0x39, 0x28, 0xc6, 0x0b, 0x64, 0x35, 0x0e, 0xb8, 0xf4, 0x97, 0x99, 0x61, 0xe3, 0x3c, 0xab, - 0xd6, 0xfc, 0x8b, 0x6b, 0x7e, 0xb5, 0xe6, 0x7d, 0x84, 0x9d, 0x19, 0x45, 0xd3, 0x30, 0x9c, 0xe6, - 0x7c, 0x8c, 0x29, 0xc7, 0x5a, 0xb1, 0xc9, 0x9c, 0x3e, 0xf4, 0x08, 0xd3, 0x10, 0xb3, 0x81, 0xd8, - 0x13, 0xa3, 0xfb, 0xb2, 0x9a, 0x1c, 0x07, 0xba, 0xfc, 0x65, 0x89, 0x83, 0xb6, 0xbd, 0xb5, 0xe7, - 0xcd, 0x5d, 0xa8, 0x58, 0x0d, 0x3a, 0x7b, 0x62, 0xf4, 0x50, 0xda, 0xb3, 0x37, 0x81, 0xdd, 0x06, - 0x5a, 0x89, 0xb4, 0x34, 0x29, 0xa1, 0x33, 0x80, 0x7b, 0x94, 0x6b, 0x8d, 0x44, 0x96, 0x7f, 0x4b, - 0xd6, 0xa3, 0xf7, 0x1a, 0xfa, 0x33, 0x8a, 0x24, 0x26, 0xa6, 0xc0, 0x9b, 0x59, 0xda, 0x86, 0x76, - 0x1c, 0x5a, 0x43, 0x5d, 0xd9, 0x8e, 0x43, 0xef, 0x25, 0xb8, 0xcd, 0x0c, 0x37, 0x50, 0x7f, 0x0b, - 0x8f, 0x67, 0x14, 0xcd, 0x91, 0xa7, 0x9a, 0xe3, 0x02, 0xe7, 0xac, 0x18, 0xff, 0x29, 0xdc, 0x87, - 0x9e, 0xb2, 0x6b, 0x56, 0x7c, 0x4b, 0x56, 0x93, 0xb7, 0x0b, 0x4f, 0xaf, 0x90, 0xd4, 0xda, 0xde, - 0x7b, 0x78, 0xf0, 0xa1, 0x7c, 0x57, 0x32, 0xa6, 0x14, 0x9b, 0xd4, 0x99, 0xc0, 0x13, 0xc2, 0x13, - 0xd4, 0x8c, 0xe1, 0x67, 0x75, 0xd1, 0xec, 0xc6, 0x5a, 0x67, 0xd4, 0x95, 0xfd, 0xfa, 0xf3, 0xa5, - 0x5f, 0xa1, 0x83, 0xd3, 0x0e, 0x74, 0x66, 0x14, 0x39, 0xdf, 0x04, 0x3c, 0xba, 0x92, 0xde, 0xd8, - 0xff, 0x5f, 0xe6, 0x7e, 0x43, 0x32, 0xc3, 0xa3, 0x5b, 0x43, 0xce, 0x9f, 0xf3, 0xbb, 0x80, 0x9d, - 0xa6, 0xc0, 0x0e, 0xaf, 0xa5, 0x6c, 0x40, 0x0d, 0x5f, 0xdd, 0x05, 0x75, 0xee, 0xe5, 0x2b, 0x6c, - 0xff, 0x95, 0x5e, 0x70, 0x2d, 0xdf, 0x65, 0xc0, 0x70, 0x72, 0x4b, 0x40, 0xad, 0xfd, 0x66, 0xfe, - 0x63, 0xe5, 0x8a, 0xb3, 0x95, 0x2b, 0x7e, 0xad, 0x5c, 0x71, 0xba, 0x76, 0x5b, 0x67, 0x6b, 0xb7, - 0xf5, 0x73, 0xed, 0xb6, 0x3e, 0x1d, 0x45, 0x31, 0x1f, 0xe7, 0x0b, 0x5f, 0x9b, 0x24, 0xa8, 0xc8, - 0xf7, 0x4f, 0xd4, 0x82, 0xea, 0x21, 0x28, 0x0e, 0x0e, 0x83, 0xf2, 0x4f, 0x8f, 0xf7, 0xeb, 0x22, - 0x6f, 0xba, 0x45, 0x8b, 0x9e, 0x2d, 0xf1, 0x8b, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x26, 0x46, - 0x1a, 0xb4, 0xed, 0x03, 0x00, 0x00, + 0xa5, 0xb6, 0x52, 0x40, 0x51, 0x11, 0x03, 0x01, 0xc1, 0x96, 0xe5, 0x02, 0x0b, 0x0b, 0xba, 0x9c, + 0x9f, 0x5c, 0x4b, 0xb5, 0x2f, 0xf2, 0x7b, 0xb6, 0x0c, 0x13, 0x2b, 0x5b, 0xff, 0x2c, 0xc6, 0x8e, + 0x8c, 0x28, 0xf9, 0x47, 0x50, 0x0e, 0xbb, 0x6a, 0xa9, 0xa1, 0x3f, 0xb6, 0x7b, 0xe7, 0xf7, 0xfd, + 0xf0, 0x7d, 0xfa, 0xe0, 0xa9, 0xa1, 0xc4, 0x50, 0x4c, 0x01, 0x25, 0x2a, 0x63, 0xa5, 0xb5, 0xc9, + 0x53, 0x0e, 0x8a, 0xf1, 0x02, 0x59, 0x8d, 0x03, 0x2e, 0xfd, 0x65, 0x66, 0xd8, 0x38, 0x4f, 0xaa, + 0x35, 0xff, 0xfc, 0x9a, 0x5f, 0xad, 0x79, 0x1f, 0x61, 0x67, 0x46, 0xd1, 0x34, 0x0c, 0xa7, 0x39, + 0x1f, 0x61, 0xca, 0xb1, 0x56, 0x6c, 0x32, 0xa7, 0x0f, 0x3d, 0xc2, 0x34, 0xc4, 0x6c, 0x20, 0xf6, + 0xc4, 0xe8, 0xae, 0xac, 0x26, 0xc7, 0x81, 0x2e, 0x7f, 0x59, 0xe2, 0xa0, 0x6d, 0x6f, 0xed, 0x79, + 0x73, 0x17, 0x2a, 0x56, 0x83, 0xce, 0x9e, 0x18, 0xdd, 0x97, 0xf6, 0xec, 0x4d, 0x60, 0xb7, 0x81, + 0x56, 0x22, 0x2d, 0x4d, 0x4a, 0xe8, 0x0c, 0xe0, 0x0e, 0xe5, 0x5a, 0x23, 0x91, 0xe5, 0xdf, 0x92, + 0xf5, 0xe8, 0xbd, 0x86, 0xfe, 0x8c, 0x22, 0x89, 0x89, 0x29, 0xf0, 0x7a, 0x96, 0xb6, 0xa1, 0x1d, + 0x87, 0xd6, 0x50, 0x57, 0xb6, 0xe3, 0xd0, 0x7b, 0x09, 0x6e, 0x33, 0xc3, 0x35, 0xd4, 0xdf, 0xc2, + 0xc3, 0x19, 0x45, 0x73, 0xe4, 0xa9, 0xe6, 0xb8, 0xc0, 0x39, 0x2b, 0xc6, 0x7f, 0x0a, 0xf7, 0xa1, + 0xa7, 0xec, 0x9a, 0x15, 0xdf, 0x92, 0xd5, 0xe4, 0xed, 0xc2, 0xe3, 0x4b, 0x24, 0xb5, 0xb6, 0xf7, + 0x1e, 0xee, 0x7d, 0x28, 0xdf, 0x95, 0x8c, 0x29, 0xc5, 0x26, 0x75, 0x26, 0xf0, 0x88, 0xf0, 0x18, + 0x35, 0x63, 0xf8, 0x59, 0x9d, 0x37, 0xbb, 0xb1, 0xd6, 0x19, 0x75, 0x65, 0xbf, 0xfe, 0x7c, 0xe1, + 0x57, 0xe8, 0xe0, 0xa4, 0x03, 0x9d, 0x19, 0x45, 0xce, 0x37, 0x01, 0x0f, 0x2e, 0xa5, 0x37, 0xf6, + 0xff, 0x97, 0xb9, 0xdf, 0x90, 0xcc, 0xf0, 0xf0, 0xc6, 0x90, 0xb3, 0xe7, 0xfc, 0x2e, 0x60, 0xa7, + 0x29, 0xb0, 0xe7, 0x57, 0x52, 0x36, 0xa0, 0x86, 0xaf, 0x6e, 0x83, 0x3a, 0xf3, 0xf2, 0x15, 0xb6, + 0xff, 0x4a, 0x2f, 0xb8, 0x92, 0xef, 0x22, 0x60, 0x38, 0xb9, 0x21, 0xa0, 0xd6, 0x7e, 0x33, 0xff, + 0xb1, 0x72, 0xc5, 0xe9, 0xca, 0x15, 0xbf, 0x56, 0xae, 0x38, 0x59, 0xbb, 0xad, 0xd3, 0xb5, 0xdb, + 0xfa, 0xb9, 0x76, 0x5b, 0x9f, 0x0e, 0xa3, 0x98, 0x8f, 0xf2, 0x85, 0xaf, 0x4d, 0x12, 0x54, 0xe4, + 0xfb, 0xc7, 0x6a, 0x41, 0xf5, 0x10, 0x14, 0x07, 0x2f, 0x82, 0xf2, 0x4f, 0x8f, 0xf7, 0xeb, 0x22, + 0x6f, 0xba, 0x45, 0x8b, 0x9e, 0x2d, 0xf1, 0xb3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf7, 0xae, + 0xfd, 0xba, 0xed, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/superfluid/abci.go b/x/superfluid/abci.go index 82edb74ac75..2b89971eada 100644 --- a/x/superfluid/abci.go +++ b/x/superfluid/abci.go @@ -1,8 +1,8 @@ package superfluid import ( - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/client/cli/query.go b/x/superfluid/client/cli/query.go index a6f2fa9407e..d1338ee65e5 100644 --- a/x/superfluid/client/cli/query.go +++ b/x/superfluid/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/superfluid/client/cli/query_test.go b/x/superfluid/client/cli/query_test.go index 12a7e4e8eb9..1449add9950 100644 --- a/x/superfluid/client/cli/query_test.go +++ b/x/superfluid/client/cli/query_test.go @@ -12,8 +12,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) type QueryTestSuite struct { diff --git a/x/superfluid/client/cli/tx.go b/x/superfluid/client/cli/tx.go index 45fc087ca65..1fcbfd6d1bb 100644 --- a/x/superfluid/client/cli/tx.go +++ b/x/superfluid/client/cli/tx.go @@ -11,7 +11,7 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" @@ -21,8 +21,8 @@ import ( v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) // GetTxCmd returns the transaction commands for this module. diff --git a/x/superfluid/client/proposal_handler.go b/x/superfluid/client/proposal_handler.go index ba5ee50be8c..290287d221e 100644 --- a/x/superfluid/client/proposal_handler.go +++ b/x/superfluid/client/proposal_handler.go @@ -1,7 +1,7 @@ package client import ( - "github.com/osmosis-labs/osmosis/v24/x/superfluid/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/client/cli" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" ) diff --git a/x/superfluid/keeper/concentrated_liquidity.go b/x/superfluid/keeper/concentrated_liquidity.go index 79332daec22..0a4f4a42dac 100644 --- a/x/superfluid/keeper/concentrated_liquidity.go +++ b/x/superfluid/keeper/concentrated_liquidity.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) // addToConcentratedLiquiditySuperfluidPosition adds the specified amounts of tokens to an existing superfluid staked diff --git a/x/superfluid/keeper/concentrated_liquidity_test.go b/x/superfluid/keeper/concentrated_liquidity_test.go index 846e6a7e912..82a81e8794a 100644 --- a/x/superfluid/keeper/concentrated_liquidity_test.go +++ b/x/superfluid/keeper/concentrated_liquidity_test.go @@ -9,10 +9,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func (s *KeeperTestSuite) TestAddToConcentratedLiquiditySuperfluidPosition() { diff --git a/x/superfluid/keeper/edge_case_test.go b/x/superfluid/keeper/edge_case_test.go index 3f37da3e404..435f95c933f 100644 --- a/x/superfluid/keeper/edge_case_test.go +++ b/x/superfluid/keeper/edge_case_test.go @@ -8,7 +8,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) func (s *KeeperTestSuite) TestSuperfluidDelegatedValidatorJailed() { diff --git a/x/superfluid/keeper/epoch.go b/x/superfluid/keeper/epoch.go index fda0dc47fec..312ce365d92 100644 --- a/x/superfluid/keeper/epoch.go +++ b/x/superfluid/keeper/epoch.go @@ -9,13 +9,13 @@ import ( distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types" "github.com/osmosis-labs/osmosis/osmoutils" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func (k Keeper) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, _ int64) error { diff --git a/x/superfluid/keeper/epoch_test.go b/x/superfluid/keeper/epoch_test.go index 940b880649a..fe8b205378f 100644 --- a/x/superfluid/keeper/epoch_test.go +++ b/x/superfluid/keeper/epoch_test.go @@ -8,13 +8,13 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func (s *KeeperTestSuite) TestUpdateOsmoEquivalentMultipliers() { diff --git a/x/superfluid/keeper/export_test.go b/x/superfluid/keeper/export_test.go index 58addb1a4af..ca287b9f699 100644 --- a/x/superfluid/keeper/export_test.go +++ b/x/superfluid/keeper/export_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - types "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + types "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) var ( diff --git a/x/superfluid/keeper/genesis.go b/x/superfluid/keeper/genesis.go index 4f54f3947a2..9ccd893ff2e 100644 --- a/x/superfluid/keeper/genesis.go +++ b/x/superfluid/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/superfluid/keeper/genesis_test.go b/x/superfluid/keeper/genesis_test.go index 218f1565be1..10201f027da 100644 --- a/x/superfluid/keeper/genesis_test.go +++ b/x/superfluid/keeper/genesis_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - simapp "github.com/osmosis-labs/osmosis/v24/app" - "github.com/osmosis-labs/osmosis/v24/x/superfluid" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + simapp "github.com/osmosis-labs/osmosis/v25/app" + "github.com/osmosis-labs/osmosis/v25/x/superfluid" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) var now = time.Now().UTC() diff --git a/x/superfluid/keeper/gov/gov.go b/x/superfluid/keeper/gov/gov.go index 1191e76cb3b..8356a400d75 100644 --- a/x/superfluid/keeper/gov/gov.go +++ b/x/superfluid/keeper/gov/gov.go @@ -6,10 +6,10 @@ import ( "sort" "strings" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper/internal/events" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper/internal/events" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/gov/gov_test.go b/x/superfluid/keeper/gov/gov_test.go index c32eb1d7d1b..548164651a8 100644 --- a/x/superfluid/keeper/gov/gov_test.go +++ b/x/superfluid/keeper/gov/gov_test.go @@ -5,12 +5,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper/gov" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper/gov" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func (s *KeeperTestSuite) createGammPool(denoms []string) uint64 { diff --git a/x/superfluid/keeper/gov/suite_test.go b/x/superfluid/keeper/gov/suite_test.go index 68084e4dfec..dfcb174ea59 100644 --- a/x/superfluid/keeper/gov/suite_test.go +++ b/x/superfluid/keeper/gov/suite_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) type KeeperTestSuite struct { diff --git a/x/superfluid/keeper/grpc_query.go b/x/superfluid/keeper/grpc_query.go index 24066e4aeb9..c9875d44c7d 100644 --- a/x/superfluid/keeper/grpc_query.go +++ b/x/superfluid/keeper/grpc_query.go @@ -16,15 +16,15 @@ import ( "google.golang.org/grpc/status" "github.com/osmosis-labs/osmosis/osmomath" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" "github.com/cosmos/cosmos-sdk/store/prefix" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) var _ types.QueryServer = Querier{} diff --git a/x/superfluid/keeper/grpc_query_test.go b/x/superfluid/keeper/grpc_query_test.go index 217f118cf38..9cf73a86309 100644 --- a/x/superfluid/keeper/grpc_query_test.go +++ b/x/superfluid/keeper/grpc_query_test.go @@ -8,8 +8,8 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func (s *KeeperTestSuite) TestGRPCParams() { diff --git a/x/superfluid/keeper/hooks.go b/x/superfluid/keeper/hooks.go index 8051558fa91..813c3d97ce2 100644 --- a/x/superfluid/keeper/hooks.go +++ b/x/superfluid/keeper/hooks.go @@ -4,8 +4,8 @@ import ( "time" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper/internal/events" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper/internal/events" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/superfluid/keeper/hooks_test.go b/x/superfluid/keeper/hooks_test.go index 11edcd8b50e..47f75944088 100644 --- a/x/superfluid/keeper/hooks_test.go +++ b/x/superfluid/keeper/hooks_test.go @@ -9,10 +9,10 @@ import ( distribution "github.com/cosmos/cosmos-sdk/x/distribution" "github.com/osmosis-labs/osmosis/osmomath" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - lockupkeeper "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + lockupkeeper "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func (s *KeeperTestSuite) TestSuperfluidAfterEpochEnd() { diff --git a/x/superfluid/keeper/intermediary_account.go b/x/superfluid/keeper/intermediary_account.go index c33e7c0353b..63e10de1f85 100644 --- a/x/superfluid/keeper/intermediary_account.go +++ b/x/superfluid/keeper/intermediary_account.go @@ -3,8 +3,8 @@ package keeper import ( "github.com/cosmos/gogoproto/proto" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/superfluid/keeper/intermediary_account_test.go b/x/superfluid/keeper/intermediary_account_test.go index 69433cc8a83..60bfc43af4f 100644 --- a/x/superfluid/keeper/intermediary_account_test.go +++ b/x/superfluid/keeper/intermediary_account_test.go @@ -5,7 +5,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func (s *KeeperTestSuite) TestIntermediaryAccountCreation() { diff --git a/x/superfluid/keeper/internal/events/emit.go b/x/superfluid/keeper/internal/events/emit.go index b6e9d3c39ad..6585aa6b6d0 100644 --- a/x/superfluid/keeper/internal/events/emit.go +++ b/x/superfluid/keeper/internal/events/emit.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func EmitSetSuperfluidAssetEvent(ctx sdk.Context, denom string, assetType types.SuperfluidAssetType) { diff --git a/x/superfluid/keeper/internal/events/emit_test.go b/x/superfluid/keeper/internal/events/emit_test.go index d0663c8009b..d42ba10bacf 100644 --- a/x/superfluid/keeper/internal/events/emit_test.go +++ b/x/superfluid/keeper/internal/events/emit_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper/internal/events" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper/internal/events" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) type SuperfluidEventsTestSuite struct { diff --git a/x/superfluid/keeper/invariants.go b/x/superfluid/keeper/invariants.go index a78a0421a95..f2bc581a312 100644 --- a/x/superfluid/keeper/invariants.go +++ b/x/superfluid/keeper/invariants.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) const totalSuperfluidDelegationInvariantName = "total-superfluid-delegation-invariant-name" diff --git a/x/superfluid/keeper/keeper.go b/x/superfluid/keeper/keeper.go index 2c221be73d4..daf1058a330 100644 --- a/x/superfluid/keeper/keeper.go +++ b/x/superfluid/keeper/keeper.go @@ -5,7 +5,7 @@ import ( "github.com/cometbft/cometbft/libs/log" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/superfluid/keeper/keeper_test.go b/x/superfluid/keeper/keeper_test.go index d4afde04775..e3cee7d5df7 100644 --- a/x/superfluid/keeper/keeper_test.go +++ b/x/superfluid/keeper/keeper_test.go @@ -11,14 +11,14 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - incentivetypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - minttypes "github.com/osmosis-labs/osmosis/v24/x/mint/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + incentivetypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + minttypes "github.com/osmosis-labs/osmosis/v25/x/mint/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/x/superfluid/keeper/migrate.go b/x/superfluid/keeper/migrate.go index 611780f246b..87a98e16dc4 100644 --- a/x/superfluid/keeper/migrate.go +++ b/x/superfluid/keeper/migrate.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) type MigrationType int diff --git a/x/superfluid/keeper/migrate_test.go b/x/superfluid/keeper/migrate_test.go index 1ee001f04e1..41a84776667 100644 --- a/x/superfluid/keeper/migrate_test.go +++ b/x/superfluid/keeper/migrate_test.go @@ -14,14 +14,14 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) var ( diff --git a/x/superfluid/keeper/msg_server.go b/x/superfluid/keeper/msg_server.go index 3d6860f7205..96024337f89 100644 --- a/x/superfluid/keeper/msg_server.go +++ b/x/superfluid/keeper/msg_server.go @@ -8,11 +8,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper/internal/events" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper/internal/events" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) type msgServer struct { diff --git a/x/superfluid/keeper/msg_server_test.go b/x/superfluid/keeper/msg_server_test.go index 170a855e731..767759d386c 100644 --- a/x/superfluid/keeper/msg_server_test.go +++ b/x/superfluid/keeper/msg_server_test.go @@ -7,15 +7,15 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - v8constants "github.com/osmosis-labs/osmosis/v24/app/upgrades/v8/constants" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" - lockupkeeper "github.com/osmosis-labs/osmosis/v24/x/lockup/keeper" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + v8constants "github.com/osmosis-labs/osmosis/v25/app/upgrades/v8/constants" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" + lockupkeeper "github.com/osmosis-labs/osmosis/v25/x/lockup/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) var defaultFunds = sdk.NewCoins(defaultPoolAssets[0].Token, sdk.NewCoin("stake", osmomath.NewInt(5000000000))) diff --git a/x/superfluid/keeper/params.go b/x/superfluid/keeper/params.go index 116f89f2445..5b0fb8fc82d 100644 --- a/x/superfluid/keeper/params.go +++ b/x/superfluid/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/slash.go b/x/superfluid/keeper/slash.go index a46e6c1a5da..ae6bfedc328 100644 --- a/x/superfluid/keeper/slash.go +++ b/x/superfluid/keeper/slash.go @@ -7,9 +7,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/slash_test.go b/x/superfluid/keeper/slash_test.go index 05081d99fe6..fd57fda1347 100644 --- a/x/superfluid/keeper/slash_test.go +++ b/x/superfluid/keeper/slash_test.go @@ -4,11 +4,11 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/accum" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - cl "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + cl "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" diff --git a/x/superfluid/keeper/stake.go b/x/superfluid/keeper/stake.go index ac883638472..8e27de72f48 100644 --- a/x/superfluid/keeper/stake.go +++ b/x/superfluid/keeper/stake.go @@ -8,10 +8,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" - valsettypes "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" + valsettypes "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" diff --git a/x/superfluid/keeper/stake_test.go b/x/superfluid/keeper/stake_test.go index 4f253a9adef..95bc6f49e65 100644 --- a/x/superfluid/keeper/stake_test.go +++ b/x/superfluid/keeper/stake_test.go @@ -7,12 +7,12 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/superfluid/keeper/superfluid_asset.go b/x/superfluid/keeper/superfluid_asset.go index 24522935107..e24d9cb2359 100644 --- a/x/superfluid/keeper/superfluid_asset.go +++ b/x/superfluid/keeper/superfluid_asset.go @@ -3,7 +3,7 @@ package keeper import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/superfluid_asset_store.go b/x/superfluid/keeper/superfluid_asset_store.go index eeffc99b0ad..84157fe15d6 100644 --- a/x/superfluid/keeper/superfluid_asset_store.go +++ b/x/superfluid/keeper/superfluid_asset_store.go @@ -8,7 +8,7 @@ import ( errorsmod "cosmossdk.io/errors" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/superfluid/keeper/superfluid_asset_test.go b/x/superfluid/keeper/superfluid_asset_test.go index b55193528d1..78e50aff376 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 ( "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func (s *KeeperTestSuite) TestSuperfluidAssetSetGetDeleteFlow() { diff --git a/x/superfluid/keeper/synthetic_lock_wrapper.go b/x/superfluid/keeper/synthetic_lock_wrapper.go index 26df020e899..4d3138b0f17 100644 --- a/x/superfluid/keeper/synthetic_lock_wrapper.go +++ b/x/superfluid/keeper/synthetic_lock_wrapper.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/twap_price.go b/x/superfluid/keeper/twap_price.go index eb729f778e1..b4fe4174f61 100644 --- a/x/superfluid/keeper/twap_price.go +++ b/x/superfluid/keeper/twap_price.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/gogoproto/proto" "github.com/osmosis-labs/osmosis/osmomath" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/superfluid/keeper/twap_price_test.go b/x/superfluid/keeper/twap_price_test.go index 77474334a28..a14694a3ebc 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 ( "github.com/osmosis-labs/osmosis/osmomath" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/unpool.go b/x/superfluid/keeper/unpool.go index 04be23d366b..086cc1b2dd1 100644 --- a/x/superfluid/keeper/unpool.go +++ b/x/superfluid/keeper/unpool.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmoutils" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) // Returns a list of newly created lockIDs, or an error. diff --git a/x/superfluid/keeper/unpool_test.go b/x/superfluid/keeper/unpool_test.go index 4eb04eb6f34..797b719c936 100644 --- a/x/superfluid/keeper/unpool_test.go +++ b/x/superfluid/keeper/unpool_test.go @@ -10,11 +10,11 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) var ( diff --git a/x/superfluid/module.go b/x/superfluid/module.go index e29dbd90c29..ae9b2effc17 100644 --- a/x/superfluid/module.go +++ b/x/superfluid/module.go @@ -24,11 +24,11 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - osmosimtypes "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/simulation" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + osmosimtypes "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/simulation" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) var ( diff --git a/x/superfluid/proposal_handler.go b/x/superfluid/proposal_handler.go index cdffaaaa9c5..c1b66f02ee1 100644 --- a/x/superfluid/proposal_handler.go +++ b/x/superfluid/proposal_handler.go @@ -7,9 +7,9 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper/gov" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper/gov" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) func NewSuperfluidProposalHandler(k keeper.Keeper, ek types.EpochKeeper, gk types.GammKeeper) govtypesv1.Handler { diff --git a/x/superfluid/simulation/genesis.go b/x/superfluid/simulation/genesis.go index f2316b296ad..985431dcdf1 100644 --- a/x/superfluid/simulation/genesis.go +++ b/x/superfluid/simulation/genesis.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" "github.com/cosmos/cosmos-sdk/types/module" ) diff --git a/x/superfluid/simulation/operations.go b/x/superfluid/simulation/operations.go index 0e513fdee55..5f8dfa25bc9 100644 --- a/x/superfluid/simulation/operations.go +++ b/x/superfluid/simulation/operations.go @@ -3,13 +3,13 @@ package simulation import ( "math/rand" - osmosimtypes "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" + osmosimtypes "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" "github.com/cosmos/cosmos-sdk/baseapp" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/superfluid/simulation/proposals.go b/x/superfluid/simulation/proposals.go index 39d96b46cc3..03b2f81e9a8 100644 --- a/x/superfluid/simulation/proposals.go +++ b/x/superfluid/simulation/proposals.go @@ -7,9 +7,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" ) const ( diff --git a/x/superfluid/types/errors.go b/x/superfluid/types/errors.go index bce6e1cb121..0fb39bffd0d 100644 --- a/x/superfluid/types/errors.go +++ b/x/superfluid/types/errors.go @@ -7,7 +7,7 @@ import ( errorsmod "cosmossdk.io/errors" "github.com/osmosis-labs/osmosis/osmomath" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) // x/superfluid module errors. diff --git a/x/superfluid/types/expected_keepers.go b/x/superfluid/types/expected_keepers.go index b4ffda53b42..d13001325e3 100644 --- a/x/superfluid/types/expected_keepers.go +++ b/x/superfluid/types/expected_keepers.go @@ -8,12 +8,12 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/model" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - gammmigration "github.com/osmosis-labs/osmosis/v24/x/gamm/types/migration" - incentivestypes "github.com/osmosis-labs/osmosis/v24/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/model" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + gammmigration "github.com/osmosis-labs/osmosis/v25/x/gamm/types/migration" + incentivestypes "github.com/osmosis-labs/osmosis/v25/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/x/superfluid/types/genesis.pb.go b/x/superfluid/types/genesis.pb.go index 077e33dd304..52a19a1ba18 100644 --- a/x/superfluid/types/genesis.pb.go +++ b/x/superfluid/types/genesis.pb.go @@ -113,31 +113,31 @@ func init() { func init() { proto.RegisterFile("osmosis/superfluid/genesis.proto", fileDescriptor_d5256ebb7c83fff3) } var fileDescriptor_d5256ebb7c83fff3 = []byte{ - // 383 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0xc1, 0x4e, 0xf2, 0x40, - 0x10, 0xc7, 0xdb, 0x0f, 0x3e, 0x0e, 0xc5, 0x83, 0x36, 0x98, 0x54, 0x8c, 0x85, 0xc8, 0x85, 0x8b, - 0x6d, 0xac, 0x46, 0xbd, 0x82, 0x31, 0x86, 0x44, 0x23, 0x81, 0xc4, 0x83, 0x97, 0x66, 0x29, 0x6b, - 0xdd, 0xd8, 0x76, 0xeb, 0xce, 0x96, 0xc0, 0x03, 0x78, 0xe7, 0xb1, 0x38, 0x72, 0xf4, 0x64, 0x0c, - 0xbc, 0x88, 0x69, 0xbb, 0x16, 0x94, 0xea, 0x6d, 0xda, 0xf9, 0xfd, 0xe7, 0x37, 0x9b, 0x8c, 0x52, - 0xa7, 0xe0, 0x53, 0x20, 0x60, 0x42, 0x14, 0x62, 0xf6, 0xe8, 0x45, 0x64, 0x68, 0xba, 0x38, 0xc0, - 0x40, 0xc0, 0x08, 0x19, 0xe5, 0x54, 0x55, 0x05, 0x61, 0xac, 0x88, 0x6a, 0xc5, 0xa5, 0x2e, 0x4d, - 0xda, 0x66, 0x5c, 0xa5, 0x64, 0xb5, 0x91, 0x33, 0x6b, 0x55, 0x0a, 0xa8, 0x96, 0x03, 0x85, 0x88, - 0x21, 0x5f, 0xf8, 0x0e, 0xa7, 0x45, 0x65, 0xeb, 0x3a, 0xdd, 0xa0, 0xcf, 0x11, 0xc7, 0xea, 0x85, - 0x52, 0x4a, 0x01, 0x4d, 0xae, 0xcb, 0xcd, 0xb2, 0x55, 0x35, 0x36, 0x37, 0x32, 0xba, 0x09, 0xd1, - 0x2e, 0xce, 0xde, 0x6b, 0x52, 0x4f, 0xf0, 0xea, 0xbd, 0xb2, 0xb3, 0x42, 0x6c, 0x04, 0x80, 0x39, - 0x68, 0xff, 0xea, 0x85, 0x66, 0xd9, 0x6a, 0xe4, 0x0d, 0xe9, 0x67, 0x65, 0x2b, 0x66, 0xc5, 0xb4, - 0x6d, 0xf8, 0xfe, 0x1b, 0xd4, 0xb1, 0xb2, 0x1f, 0xa7, 0x6d, 0xfc, 0x12, 0x91, 0x11, 0xf2, 0x70, - 0xc0, 0x6d, 0x3f, 0xf2, 0x38, 0x09, 0x3d, 0x82, 0x19, 0x68, 0x85, 0xc4, 0x60, 0xe5, 0x19, 0xee, - 0xc0, 0xa7, 0x57, 0x59, 0xea, 0x36, 0x0b, 0xf5, 0xb0, 0x43, 0xd9, 0x50, 0x08, 0xf7, 0xe8, 0x2f, - 0x14, 0xa8, 0x9e, 0xb2, 0x4b, 0x02, 0x8e, 0x99, 0x8f, 0x87, 0x04, 0xb1, 0x89, 0x8d, 0x1c, 0x87, - 0x46, 0x01, 0x07, 0xad, 0x98, 0x38, 0x8f, 0xff, 0x7e, 0x55, 0x67, 0x2d, 0xda, 0x4a, 0x93, 0x42, - 0x59, 0x21, 0x9b, 0x2d, 0x50, 0x5f, 0x65, 0xa5, 0x16, 0x37, 0x7e, 0xd8, 0x6c, 0x87, 0x06, 0x01, - 0x76, 0x38, 0xa1, 0x01, 0x68, 0xff, 0x13, 0xf1, 0x79, 0x9e, 0xf8, 0x86, 0x3a, 0xcf, 0x9d, 0x3c, - 0xe9, 0x65, 0x96, 0x17, 0xfa, 0x83, 0x35, 0xcb, 0x06, 0x03, 0xed, 0xee, 0x6c, 0xa1, 0xcb, 0xf3, - 0x85, 0x2e, 0x7f, 0x2c, 0x74, 0x79, 0xba, 0xd4, 0xa5, 0xf9, 0x52, 0x97, 0xde, 0x96, 0xba, 0xf4, - 0x70, 0xe6, 0x12, 0xfe, 0x14, 0x0d, 0x0c, 0x87, 0xfa, 0xa6, 0xd8, 0xe0, 0xc8, 0x43, 0x03, 0xf8, - 0xfa, 0x30, 0x47, 0xd6, 0xa9, 0x39, 0x5e, 0xbf, 0x35, 0x3e, 0x09, 0x31, 0x0c, 0x4a, 0xc9, 0xad, - 0x9d, 0x7c, 0x06, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xe4, 0xe8, 0x20, 0xff, 0x02, 0x00, 0x00, + // 384 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x4f, 0x4f, 0xf2, 0x40, + 0x10, 0x87, 0xdb, 0x17, 0x5e, 0x0e, 0xc5, 0x83, 0x36, 0x98, 0x54, 0x8c, 0x85, 0xc8, 0x85, 0x8b, + 0x6d, 0xac, 0xf1, 0xcf, 0x15, 0x8c, 0x31, 0x24, 0x1a, 0x09, 0x24, 0x1e, 0xbc, 0x34, 0x4b, 0x59, + 0xeb, 0xc6, 0xb6, 0x5b, 0x77, 0xb6, 0x04, 0x3e, 0x80, 0x77, 0x3e, 0x16, 0x47, 0x8e, 0x9e, 0x8c, + 0x81, 0x2f, 0x62, 0xda, 0xae, 0x05, 0xa5, 0x7a, 0x9b, 0x76, 0x9e, 0xdf, 0x3c, 0xb3, 0xc9, 0x28, + 0x75, 0x0a, 0x3e, 0x05, 0x02, 0x26, 0x44, 0x21, 0x66, 0x8f, 0x5e, 0x44, 0x86, 0xa6, 0x8b, 0x03, + 0x0c, 0x04, 0x8c, 0x90, 0x51, 0x4e, 0x55, 0x55, 0x10, 0xc6, 0x8a, 0xa8, 0x56, 0x5c, 0xea, 0xd2, + 0xa4, 0x6d, 0xc6, 0x55, 0x4a, 0x56, 0x1b, 0x39, 0xb3, 0x56, 0xa5, 0x80, 0x6a, 0x39, 0x50, 0x88, + 0x18, 0xf2, 0x85, 0xef, 0x70, 0x5a, 0x54, 0xb6, 0xae, 0xd3, 0x0d, 0xfa, 0x1c, 0x71, 0xac, 0x5e, + 0x28, 0xa5, 0x14, 0xd0, 0xe4, 0xba, 0xdc, 0x2c, 0x5b, 0x55, 0x63, 0x73, 0x23, 0xa3, 0x9b, 0x10, + 0xed, 0xe2, 0xec, 0xbd, 0x26, 0xf5, 0x04, 0xaf, 0xde, 0x2b, 0x3b, 0x2b, 0xc4, 0x46, 0x00, 0x98, + 0x83, 0xf6, 0xaf, 0x5e, 0x68, 0x96, 0xad, 0x46, 0xde, 0x90, 0x7e, 0x56, 0xb6, 0x62, 0x56, 0x4c, + 0xdb, 0x86, 0xef, 0xbf, 0x41, 0x1d, 0x2b, 0xfb, 0x71, 0xda, 0xc6, 0x2f, 0x11, 0x19, 0x21, 0x0f, + 0x07, 0xdc, 0xf6, 0x23, 0x8f, 0x93, 0xd0, 0x23, 0x98, 0x81, 0x56, 0x48, 0x0c, 0x56, 0x9e, 0xe1, + 0x0e, 0x7c, 0x7a, 0x95, 0xa5, 0x6e, 0xb3, 0x50, 0x0f, 0x3b, 0x94, 0x0d, 0x85, 0x70, 0x8f, 0xfe, + 0x42, 0x81, 0xea, 0x29, 0xbb, 0x24, 0xe0, 0x98, 0xf9, 0x78, 0x48, 0x10, 0x9b, 0xd8, 0xc8, 0x71, + 0x68, 0x14, 0x70, 0xd0, 0x8a, 0x89, 0xf3, 0xf8, 0xef, 0x57, 0x75, 0xd6, 0xa2, 0xad, 0x34, 0x29, + 0x94, 0x15, 0xb2, 0xd9, 0x02, 0xf5, 0x55, 0x56, 0x6a, 0x71, 0xe3, 0x87, 0xcd, 0x76, 0x68, 0x10, + 0x60, 0x87, 0x13, 0x1a, 0x80, 0xf6, 0x3f, 0x11, 0x9f, 0xe7, 0x89, 0x6f, 0xa8, 0xf3, 0xdc, 0xc9, + 0x93, 0x5e, 0x66, 0x79, 0xa1, 0x3f, 0x58, 0xb3, 0x6c, 0x30, 0xd0, 0xee, 0xce, 0x16, 0xba, 0x3c, + 0x5f, 0xe8, 0xf2, 0xc7, 0x42, 0x97, 0xa7, 0x4b, 0x5d, 0x9a, 0x2f, 0x75, 0xe9, 0x6d, 0xa9, 0x4b, + 0x0f, 0x67, 0x2e, 0xe1, 0x4f, 0xd1, 0xc0, 0x70, 0xa8, 0x6f, 0x8a, 0x0d, 0x8e, 0x3c, 0x34, 0x80, + 0xaf, 0x0f, 0x73, 0x64, 0x9d, 0x9a, 0xe3, 0xf5, 0x5b, 0xe3, 0x93, 0x10, 0xc3, 0xa0, 0x94, 0xdc, + 0xda, 0xc9, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x19, 0x5d, 0x21, 0xff, 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 448d1fc1115..faefb708305 100644 --- a/x/superfluid/types/gov.go +++ b/x/superfluid/types/gov.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - cltypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" + cltypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" ) const ( diff --git a/x/superfluid/types/gov.pb.go b/x/superfluid/types/gov.pb.go index 84d73706f98..8e134e9128b 100644 --- a/x/superfluid/types/gov.pb.go +++ b/x/superfluid/types/gov.pb.go @@ -160,7 +160,7 @@ var fileDescriptor_2e37d6a8d0e42294 = []byte{ // 464 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xcf, 0x6e, 0xd3, 0x40, 0x10, 0xc6, 0xbd, 0x24, 0x54, 0x74, 0xc3, 0x01, 0xac, 0x22, 0x42, 0x10, 0x76, 0x68, 0x11, 0x8a, - 0x90, 0x6c, 0xab, 0x05, 0xf5, 0xd0, 0x5b, 0x0b, 0x47, 0x04, 0x95, 0xab, 0x08, 0x89, 0x4b, 0xe4, + 0x90, 0x6c, 0xab, 0x45, 0xf4, 0xd0, 0x5b, 0x0b, 0x47, 0x04, 0x95, 0xab, 0x08, 0x89, 0x4b, 0xe4, 0xc4, 0x43, 0xba, 0x92, 0xed, 0x59, 0x79, 0xc7, 0x2e, 0xbc, 0x01, 0xe2, 0xc4, 0x91, 0x63, 0x1e, 0x81, 0x03, 0x0f, 0x51, 0x71, 0xea, 0x91, 0x03, 0x42, 0x28, 0x39, 0x94, 0x1b, 0xaf, 0x80, 0xbc, 0xde, 0x34, 0x01, 0x55, 0x48, 0xfc, 0xb9, 0x58, 0x3b, 0x33, 0xdf, 0x7e, 0x9f, 0x7f, 0x23, 0x2d, @@ -186,7 +186,7 @@ var fileDescriptor_2e37d6a8d0e42294 = []byte{ 0x99, 0x3a, 0xec, 0xeb, 0xd4, 0x61, 0x6f, 0x67, 0x8e, 0x75, 0x32, 0x73, 0xac, 0x4f, 0x33, 0xc7, 0x7a, 0xbe, 0x3d, 0x16, 0x74, 0x58, 0x0c, 0xfd, 0x11, 0xa6, 0x81, 0x71, 0xf1, 0x92, 0x68, 0xa8, 0xe6, 0x45, 0x50, 0x6e, 0x3d, 0x08, 0x5e, 0x2e, 0xbf, 0x0b, 0x7a, 0x25, 0x41, 0x0d, 0x57, 0xf4, - 0x9b, 0xb8, 0xff, 0x23, 0x00, 0x00, 0xff, 0xff, 0x60, 0x9b, 0x70, 0x42, 0xc0, 0x03, 0x00, 0x00, + 0x9b, 0xb8, 0xff, 0x23, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x66, 0xc5, 0x43, 0xc0, 0x03, 0x00, 0x00, } func (this *SetSuperfluidAssetsProposal) Equal(that interface{}) bool { diff --git a/x/superfluid/types/msg_test.go b/x/superfluid/types/msg_test.go index 2cf9a98d7ee..78194183176 100644 --- a/x/superfluid/types/msg_test.go +++ b/x/superfluid/types/msg_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/superfluid/types" "github.com/cometbft/cometbft/crypto/ed25519" ) diff --git a/x/superfluid/types/params.pb.go b/x/superfluid/types/params.pb.go index 024054b0c45..7a5af031760 100644 --- a/x/superfluid/types/params.pb.go +++ b/x/superfluid/types/params.pb.go @@ -89,9 +89,9 @@ var fileDescriptor_0985261dfaf2a82e = []byte{ 0xa0, 0xcc, 0xe2, 0x6c, 0x37, 0xb0, 0x98, 0x53, 0xc0, 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, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, - 0xfd, 0xaa, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x99, 0xe8, 0x57, 0x20, 0x87, + 0xfd, 0xaa, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x99, 0xea, 0x57, 0x20, 0x87, 0x4f, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x57, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x68, 0xbc, 0xa1, 0xa4, 0x42, 0x01, 0x00, 0x00, + 0xff, 0x75, 0x41, 0x14, 0xa5, 0x42, 0x01, 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 ed48235192c..6c0b689cc5b 100644 --- a/x/superfluid/types/query.pb.go +++ b/x/superfluid/types/query.pb.go @@ -14,7 +14,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types1 "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + types1 "github.com/osmosis-labs/osmosis/v25/x/lockup/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -1903,139 +1903,139 @@ func init() { func init() { proto.RegisterFile("osmosis/superfluid/query.proto", fileDescriptor_e3d9448e4ed3943f) } var fileDescriptor_e3d9448e4ed3943f = []byte{ - // 2098 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0x4f, 0x6c, 0x14, 0xd7, - 0x19, 0x67, 0x6c, 0xc7, 0x86, 0x0f, 0x09, 0xcc, 0x83, 0x60, 0x7b, 0xc0, 0x6b, 0x32, 0x26, 0xd8, - 0x75, 0x60, 0x26, 0x18, 0xb0, 0x1d, 0x52, 0x50, 0x6c, 0x8c, 0x89, 0x5b, 0x08, 0xce, 0x1a, 0x1b, - 0xf5, 0x9f, 0xa6, 0xe3, 0x9d, 0xe7, 0xf5, 0xc8, 0xb3, 0x33, 0xeb, 0x79, 0x33, 0x4e, 0x56, 0x11, - 0xad, 0x94, 0xaa, 0x52, 0xa3, 0x1e, 0xda, 0x2a, 0x87, 0x2a, 0xb7, 0x5e, 0x7a, 0x68, 0x0e, 0xed, - 0xad, 0x55, 0xa5, 0x5e, 0xaa, 0x5e, 0x22, 0x55, 0x95, 0x22, 0x55, 0xaa, 0xaa, 0x1e, 0x48, 0x04, - 0x3d, 0xb6, 0x97, 0x1e, 0xdb, 0x4b, 0x35, 0xef, 0xbd, 0xf9, 0xb3, 0xbb, 0x6f, 0x66, 0x76, 0x17, - 0x02, 0x39, 0xb1, 0x33, 0xef, 0xfb, 0xf7, 0xfb, 0xfe, 0xbd, 0xf9, 0x3e, 0x03, 0x25, 0x97, 0xd4, - 0x5c, 0x62, 0x11, 0x8d, 0x04, 0x75, 0xec, 0x6d, 0xdb, 0x81, 0x65, 0x6a, 0x7b, 0x01, 0xf6, 0x1a, - 0x6a, 0xdd, 0x73, 0x7d, 0x17, 0x21, 0x7e, 0xae, 0x26, 0xe7, 0xf2, 0x89, 0xaa, 0x5b, 0x75, 0xe9, - 0xb1, 0x16, 0xfe, 0x62, 0x94, 0x72, 0xa9, 0x42, 0x49, 0xb5, 0x2d, 0x83, 0x60, 0x6d, 0xff, 0xe2, - 0x16, 0xf6, 0x8d, 0x8b, 0x5a, 0xc5, 0xb5, 0x1c, 0x7e, 0x7e, 0xba, 0xea, 0xba, 0x55, 0x1b, 0x6b, - 0x46, 0xdd, 0xd2, 0x0c, 0xc7, 0x71, 0x7d, 0xc3, 0xb7, 0x5c, 0x87, 0xf0, 0xd3, 0x09, 0x7e, 0x4a, - 0x9f, 0xb6, 0x82, 0x6d, 0xcd, 0xb7, 0x6a, 0x98, 0xf8, 0x46, 0xad, 0x1e, 0x89, 0x6f, 0x25, 0x30, - 0x03, 0x8f, 0x4a, 0xe0, 0xe7, 0x93, 0x02, 0x20, 0xc9, 0xcf, 0x48, 0x8b, 0x80, 0xa8, 0x6e, 0x78, - 0x46, 0x2d, 0x32, 0x63, 0x2c, 0x22, 0xb0, 0xdd, 0xca, 0x6e, 0x50, 0xa7, 0xff, 0xf0, 0xa3, 0x99, - 0x34, 0x3e, 0xea, 0xa2, 0x18, 0x65, 0xdd, 0xa8, 0x5a, 0x4e, 0xda, 0x98, 0xb3, 0x9c, 0x96, 0xf8, - 0xc6, 0xae, 0xe5, 0x54, 0x63, 0x42, 0xfe, 0xcc, 0xa8, 0x94, 0x13, 0x80, 0xde, 0x0e, 0xe5, 0xac, - 0x51, 0x0b, 0xca, 0x78, 0x2f, 0xc0, 0xc4, 0x57, 0xee, 0xc2, 0xf1, 0xa6, 0xb7, 0xa4, 0xee, 0x3a, - 0x04, 0xa3, 0x05, 0x18, 0x64, 0x96, 0x8e, 0x4a, 0x67, 0xa4, 0xe9, 0xc3, 0xb3, 0xb2, 0xda, 0x1e, - 0x19, 0x95, 0xf1, 0x2c, 0x0d, 0x7c, 0xf2, 0x70, 0xe2, 0x40, 0x99, 0xd3, 0x2b, 0xd3, 0x30, 0xbc, - 0x48, 0x08, 0xf6, 0xef, 0x35, 0xea, 0x98, 0x2b, 0x41, 0x27, 0xe0, 0x05, 0x13, 0x3b, 0x6e, 0x8d, - 0x0a, 0x3b, 0x54, 0x66, 0x0f, 0xca, 0xb7, 0xe0, 0x58, 0x8a, 0x92, 0x2b, 0x5e, 0x01, 0x30, 0xc2, - 0x97, 0xba, 0xdf, 0xa8, 0x63, 0x4a, 0x7f, 0x64, 0x76, 0x4a, 0xa4, 0x7c, 0x3d, 0xfe, 0x99, 0x08, - 0x39, 0x64, 0x44, 0x3f, 0x15, 0x04, 0xc3, 0x8b, 0xb6, 0x4d, 0x8f, 0x62, 0xac, 0x9b, 0x70, 0x2c, - 0xf5, 0x8e, 0x2b, 0x5c, 0x84, 0x41, 0xca, 0x15, 0x22, 0xed, 0x9f, 0x3e, 0x3c, 0x3b, 0xd9, 0x81, - 0xb2, 0x08, 0x32, 0x63, 0x54, 0x54, 0x38, 0x49, 0x5f, 0xdf, 0x09, 0x6c, 0xdf, 0xaa, 0xdb, 0x16, - 0xf6, 0xf2, 0x81, 0xff, 0x58, 0x82, 0x91, 0x36, 0x06, 0x6e, 0x4e, 0x1d, 0xe4, 0x50, 0xbf, 0x8e, - 0xf7, 0x02, 0x6b, 0xdf, 0xb0, 0xb1, 0xe3, 0xeb, 0xb5, 0x98, 0x8a, 0x07, 0x63, 0x56, 0x64, 0xe2, - 0x5d, 0x52, 0x73, 0x6f, 0xc6, 0x4c, 0x69, 0xc9, 0x15, 0xd7, 0x33, 0xcb, 0xa3, 0x6e, 0xc6, 0xb9, - 0xf2, 0x81, 0x04, 0x2f, 0x25, 0xf8, 0x56, 0x1d, 0x1f, 0x7b, 0x35, 0x6c, 0x5a, 0x86, 0xd7, 0x58, - 0xac, 0x54, 0xdc, 0xc0, 0xf1, 0x57, 0x9d, 0x6d, 0x57, 0x8c, 0x04, 0x8d, 0xc1, 0xc1, 0x7d, 0xc3, - 0xd6, 0x0d, 0xd3, 0xf4, 0x46, 0xfb, 0xe8, 0xc1, 0xd0, 0xbe, 0x61, 0x2f, 0x9a, 0xa6, 0x17, 0x1e, - 0x55, 0x8d, 0xa0, 0x8a, 0x75, 0xcb, 0x1c, 0xed, 0x3f, 0x23, 0x4d, 0x0f, 0x94, 0x87, 0xe8, 0xf3, - 0xaa, 0x89, 0x46, 0x61, 0x28, 0xe4, 0xc0, 0x84, 0x8c, 0x0e, 0x30, 0x26, 0xfe, 0xa8, 0xec, 0x40, - 0x69, 0xd1, 0xb6, 0x05, 0x36, 0x44, 0x31, 0x0c, 0xf3, 0x23, 0xc9, 0x7f, 0xee, 0x8f, 0x73, 0x2a, - 0x2b, 0x00, 0x35, 0x2c, 0x16, 0x95, 0xf5, 0x13, 0x5e, 0x03, 0xea, 0x9a, 0x51, 0x8d, 0xd2, 0xb0, - 0x9c, 0xe2, 0x54, 0xfe, 0x24, 0xc1, 0x44, 0xa6, 0x2a, 0x1e, 0x8b, 0xfb, 0x70, 0xd0, 0xe0, 0xef, - 0x78, 0x72, 0x5c, 0xc9, 0x4f, 0x8e, 0x0c, 0xe7, 0xf1, 0x74, 0x89, 0x85, 0xa1, 0x5b, 0x4d, 0x20, - 0xfa, 0x28, 0x88, 0xa9, 0x42, 0x10, 0xcc, 0xaa, 0x26, 0x14, 0xd7, 0x61, 0xf2, 0x86, 0xeb, 0x38, - 0xb8, 0xe2, 0x63, 0x91, 0xf2, 0xc8, 0x69, 0x23, 0x30, 0x14, 0xb6, 0x96, 0x30, 0x14, 0x12, 0x0d, - 0xc5, 0x60, 0xf8, 0xb8, 0x6a, 0x2a, 0xef, 0xc0, 0xd9, 0x7c, 0x7e, 0xee, 0x89, 0xbb, 0x30, 0xc4, - 0x8d, 0xe7, 0x2e, 0xef, 0xcd, 0x11, 0xe5, 0x48, 0x8a, 0xb2, 0x02, 0x2a, 0x6d, 0x3b, 0xf7, 0x5c, - 0xdf, 0xb0, 0x97, 0xb1, 0x8d, 0xab, 0x14, 0xd0, 0x52, 0x63, 0xd3, 0xb0, 0x2d, 0xd3, 0xf0, 0x5d, - 0x6f, 0xc5, 0xf5, 0x96, 0xc3, 0x1c, 0xcb, 0x2f, 0xa5, 0x3a, 0x68, 0x1d, 0xcb, 0xe1, 0x58, 0xae, - 0xb5, 0x14, 0xfc, 0x84, 0x08, 0x4a, 0x22, 0x8a, 0xb4, 0x14, 0xfb, 0xe7, 0x12, 0x1c, 0x4e, 0x9d, - 0x36, 0x95, 0x80, 0xd4, 0x5c, 0x02, 0xf7, 0xe0, 0xb0, 0x51, 0x0b, 0xe1, 0xea, 0x64, 0x9b, 0x98, - 0xac, 0x40, 0x96, 0x2e, 0x85, 0xd2, 0xfe, 0xf1, 0x70, 0xe2, 0x45, 0x16, 0x6e, 0x62, 0xee, 0xaa, - 0x96, 0xab, 0xd5, 0x0c, 0x7f, 0x47, 0x5d, 0x75, 0xfc, 0xff, 0x3c, 0x9c, 0x40, 0x0d, 0xa3, 0x66, - 0x5f, 0x55, 0x52, 0x9c, 0x4a, 0x19, 0xd8, 0xd3, 0xfa, 0x36, 0x31, 0xd1, 0x77, 0xe1, 0x68, 0x4b, - 0x87, 0xa0, 0xf5, 0x75, 0x68, 0x69, 0xbe, 0x48, 0xf2, 0x49, 0x26, 0xb9, 0x85, 0x5b, 0x29, 0x1f, - 0x69, 0xee, 0x0d, 0xca, 0x24, 0xbc, 0x44, 0xfd, 0x99, 0xc4, 0x33, 0x05, 0x38, 0x6a, 0xa6, 0x3f, - 0x97, 0x40, 0xc9, 0xa3, 0xe2, 0xde, 0xde, 0x83, 0x63, 0x7e, 0x48, 0xa5, 0x9b, 0xc9, 0x21, 0xf3, - 0xd3, 0xd2, 0x72, 0x91, 0xbd, 0x93, 0xcc, 0x5e, 0xc6, 0x9f, 0x04, 0x27, 0x2d, 0x4a, 0x29, 0x0f, - 0xfb, 0xcd, 0xa1, 0x27, 0xca, 0x87, 0x4d, 0x0d, 0x2d, 0x39, 0x59, 0xac, 0xa5, 0x6b, 0xe2, 0x15, - 0x38, 0xc6, 0xe5, 0xb8, 0x9e, 0x1e, 0xb5, 0x23, 0x16, 0xc0, 0xe1, 0xf8, 0x60, 0x91, 0xbd, 0x0f, - 0x89, 0xf7, 0xa3, 0x84, 0x8a, 0x89, 0x59, 0xc3, 0x1b, 0x8e, 0x0f, 0x22, 0xe2, 0x38, 0x53, 0xfb, - 0xd3, 0x99, 0xfa, 0x81, 0x04, 0x4a, 0x9e, 0x55, 0xdc, 0x5f, 0x15, 0x18, 0x64, 0xb1, 0xe6, 0xd9, - 0x39, 0xd6, 0xd4, 0x16, 0xa2, 0x86, 0x70, 0xc3, 0xb5, 0x9c, 0xa5, 0x57, 0x43, 0xff, 0x7d, 0xfc, - 0xd9, 0xc4, 0x74, 0xd5, 0xf2, 0x77, 0x82, 0x2d, 0xb5, 0xe2, 0xd6, 0x34, 0xfe, 0x25, 0xc0, 0xfe, - 0xb9, 0x40, 0xcc, 0x5d, 0x2d, 0xbc, 0x47, 0x09, 0x65, 0x20, 0x65, 0x2e, 0x5a, 0xd9, 0x84, 0x29, - 0x61, 0xd4, 0x96, 0x1a, 0xcb, 0x11, 0xf2, 0x5e, 0xdc, 0xa4, 0xfc, 0xae, 0x1f, 0xa6, 0x8b, 0x05, - 0x73, 0xa4, 0xef, 0xc2, 0xb8, 0x30, 0xa6, 0xba, 0x47, 0x6f, 0xac, 0xa8, 0x3c, 0xd5, 0xfc, 0x4e, - 0x93, 0x28, 0x61, 0x17, 0x1d, 0xaf, 0xd6, 0x53, 0x24, 0x93, 0x82, 0xa0, 0xef, 0xc3, 0x8b, 0x4d, - 0x39, 0x89, 0x4d, 0x3d, 0xfc, 0x72, 0x0c, 0x23, 0xfa, 0xd4, 0x5d, 0x7e, 0x3c, 0x9d, 0x9e, 0xd8, - 0xa4, 0x2f, 0xd1, 0x4f, 0x24, 0x28, 0x31, 0x0b, 0x52, 0xd7, 0x7c, 0xf8, 0xb5, 0x86, 0x4d, 0x9d, - 0x47, 0xbf, 0x9f, 0xb6, 0xd9, 0x1c, 0x53, 0x34, 0x6e, 0xca, 0x54, 0x87, 0xa6, 0x94, 0x4f, 0x51, - 0x8d, 0x49, 0x99, 0xaf, 0x53, 0x7d, 0x2c, 0xfd, 0x14, 0x07, 0xbe, 0x92, 0xf8, 0x74, 0xc3, 0x31, - 0x9f, 0x5a, 0x4e, 0x24, 0xd5, 0xd0, 0x97, 0xae, 0x86, 0xff, 0xf6, 0xc1, 0x4c, 0x27, 0x0a, 0x9f, - 0x7b, 0xae, 0xfc, 0x40, 0x82, 0x11, 0x16, 0xaa, 0xc0, 0x79, 0x06, 0xe9, 0xc2, 0x12, 0x73, 0x23, - 0x51, 0xc5, 0x12, 0xe6, 0x36, 0x1c, 0x25, 0x0d, 0xc7, 0xdf, 0xc1, 0xbe, 0x55, 0xd1, 0xc3, 0xbb, - 0x9b, 0x8c, 0xf6, 0x53, 0xe5, 0xe3, 0x31, 0x62, 0x36, 0x42, 0xa8, 0xeb, 0x11, 0xd9, 0x6d, 0xb7, - 0xb2, 0xcb, 0x01, 0x1e, 0x21, 0xe9, 0x97, 0x44, 0xd9, 0x83, 0xf3, 0x19, 0x55, 0x1a, 0xdf, 0x9a, - 0x4d, 0x57, 0xaf, 0xb0, 0xfb, 0x49, 0x45, 0xdd, 0xaf, 0x29, 0xde, 0xbf, 0x92, 0xe0, 0x42, 0x87, - 0x3a, 0x9f, 0x77, 0xc8, 0x95, 0x07, 0xb0, 0x70, 0x93, 0xf8, 0x56, 0xcd, 0xf0, 0x71, 0x9b, 0xa0, - 0xa8, 0x60, 0xbe, 0x40, 0x57, 0xfd, 0x41, 0x82, 0xd7, 0x7a, 0xd0, 0xcf, 0xdd, 0x96, 0xd9, 0xdb, - 0xa4, 0x67, 0xd3, 0xdb, 0x94, 0x0d, 0x38, 0x27, 0xfe, 0x22, 0x7b, 0xb2, 0xab, 0xe5, 0xa3, 0x01, - 0x98, 0x2a, 0x94, 0xfb, 0xdc, 0xbb, 0x85, 0x01, 0xc7, 0x9b, 0xd4, 0x31, 0x83, 0x78, 0xa3, 0x98, - 0x89, 0x7c, 0x1f, 0xcd, 0xe5, 0x91, 0xfb, 0xd3, 0x72, 0x18, 0x07, 0xd7, 0x85, 0xcc, 0xb6, 0x93, - 0xec, 0x00, 0xf7, 0x7f, 0x79, 0x2e, 0xaf, 0x81, 0x67, 0x7b, 0x79, 0x8d, 0xc3, 0x29, 0x9a, 0x1a, - 0x1b, 0x4e, 0xdd, 0x75, 0xed, 0xfb, 0x3b, 0x96, 0x8f, 0x6d, 0x8b, 0x44, 0x5f, 0x7a, 0xca, 0x6b, - 0x70, 0x5a, 0x7c, 0xcc, 0x3d, 0x3a, 0x06, 0x07, 0xc3, 0x03, 0xdd, 0xe2, 0x99, 0x31, 0x50, 0x1e, - 0x0a, 0x9f, 0x57, 0x4d, 0xa2, 0x6c, 0xc1, 0xa5, 0x0d, 0x82, 0xbd, 0x1b, 0xae, 0x53, 0xc1, 0x8e, - 0xef, 0x85, 0x4e, 0x48, 0x12, 0x64, 0xcd, 0x25, 0x16, 0xed, 0x61, 0xb1, 0x83, 0x7a, 0xca, 0xec, - 0xdf, 0x4a, 0x70, 0xb9, 0x3b, 0x25, 0xdc, 0xee, 0xef, 0xc1, 0x78, 0xc5, 0xd6, 0xa9, 0xe9, 0x01, - 0xc1, 0x9e, 0x5e, 0xe7, 0xa4, 0x2d, 0x69, 0x3e, 0x27, 0x4a, 0xf3, 0xb4, 0xb2, 0x35, 0xd7, 0xb5, - 0x43, 0x03, 0x22, 0x55, 0x4d, 0xe9, 0x3e, 0x56, 0xb1, 0xc5, 0xe7, 0x44, 0xc1, 0x30, 0xd7, 0x81, - 0xdd, 0xc9, 0xdd, 0xee, 0x54, 0x7b, 0xf2, 0xcf, 0xef, 0x25, 0x98, 0xef, 0x5a, 0xcf, 0x97, 0xc4, - 0x45, 0x2a, 0x9c, 0xa4, 0xa9, 0x57, 0xc6, 0xc4, 0x5f, 0x0f, 0xea, 0x75, 0xbb, 0x91, 0x3f, 0xce, - 0x96, 0x61, 0xa4, 0x8d, 0x9e, 0x43, 0x99, 0x4f, 0x0d, 0x06, 0x05, 0xd5, 0x15, 0x0d, 0xac, 0x94, - 0x7c, 0xf6, 0x6f, 0xe3, 0xf0, 0x02, 0x15, 0x8a, 0x7e, 0x28, 0xc1, 0x20, 0xdb, 0xd9, 0xa1, 0x73, - 0x22, 0xc4, 0xed, 0xeb, 0x41, 0x79, 0xaa, 0x90, 0x8e, 0x99, 0xa7, 0xcc, 0xbc, 0xff, 0xd7, 0x7f, - 0x7e, 0xd8, 0x77, 0x16, 0x29, 0x9a, 0x60, 0xe9, 0x99, 0x6c, 0x2e, 0xa9, 0xf2, 0x1f, 0x49, 0x70, - 0x28, 0x5e, 0xda, 0xa1, 0xb3, 0x22, 0x15, 0xad, 0x2b, 0x44, 0xf9, 0xe5, 0x02, 0x2a, 0x6e, 0x86, - 0x4a, 0xcd, 0x98, 0x46, 0xe7, 0xf2, 0xcc, 0x48, 0x16, 0x8c, 0xcc, 0x94, 0x68, 0x27, 0x98, 0x61, - 0x4a, 0xcb, 0x1a, 0x31, 0xc3, 0x94, 0xd6, 0xc5, 0x62, 0x87, 0xa6, 0xd8, 0xb6, 0xce, 0x16, 0x0b, - 0xe8, 0x17, 0x12, 0x1c, 0x6d, 0xd9, 0x0a, 0xa2, 0x99, 0x4c, 0xd4, 0x6d, 0xbb, 0x46, 0xf9, 0x95, - 0x8e, 0x68, 0xb9, 0x71, 0x97, 0xa9, 0x71, 0x2a, 0x3a, 0x5f, 0xec, 0xa7, 0x64, 0xfd, 0x88, 0xfe, - 0x28, 0xc1, 0x48, 0xc6, 0xd2, 0x0c, 0xcd, 0x66, 0x78, 0x25, 0x67, 0x99, 0x27, 0x5f, 0xea, 0x8a, - 0x87, 0x9b, 0x7e, 0x8d, 0x9a, 0x3e, 0x8f, 0xae, 0x14, 0xf9, 0xd5, 0x4a, 0x49, 0xd1, 0xe3, 0xdd, - 0xdb, 0x67, 0x12, 0x9c, 0xce, 0xdb, 0x79, 0xa1, 0xf9, 0x8c, 0x66, 0x50, 0xb4, 0x65, 0x93, 0x17, - 0xba, 0x67, 0xe4, 0x90, 0x6e, 0x53, 0x48, 0x2b, 0x68, 0x39, 0x0f, 0x52, 0x25, 0x92, 0x24, 0x04, - 0xa6, 0xbd, 0xc7, 0x37, 0x7c, 0x0f, 0xd0, 0x6f, 0xa2, 0xcd, 0x4c, 0xee, 0x3e, 0x0c, 0x2d, 0x65, - 0x96, 0x76, 0xc7, 0x4b, 0x39, 0xf9, 0xc6, 0x13, 0xc9, 0xe0, 0xe8, 0x0f, 0xa0, 0x3f, 0x4b, 0x20, - 0x67, 0xef, 0x92, 0x90, 0x70, 0xd9, 0x58, 0xb8, 0xa1, 0x92, 0xe7, 0xba, 0x65, 0xe3, 0xf6, 0x5c, - 0xa7, 0xd1, 0x58, 0x40, 0x73, 0x45, 0x09, 0x26, 0x5e, 0x49, 0xa1, 0xbf, 0x48, 0x20, 0x67, 0x6f, - 0x7a, 0xd0, 0x95, 0x4e, 0x3f, 0x3b, 0x9b, 0xf6, 0x55, 0x62, 0x34, 0xc5, 0x0b, 0x25, 0xe5, 0x0d, - 0x8a, 0xe6, 0x2a, 0x5a, 0xc8, 0x43, 0x23, 0xfe, 0x5c, 0x66, 0x17, 0x08, 0xfa, 0xb7, 0x04, 0x67, - 0x8a, 0xb6, 0x3a, 0xe8, 0xf5, 0x4e, 0xcd, 0x13, 0x2c, 0x14, 0xe4, 0xaf, 0xf6, 0xc6, 0xcc, 0x11, - 0xbe, 0x45, 0x11, 0xbe, 0x89, 0x56, 0xba, 0x46, 0x48, 0xb4, 0xf7, 0xda, 0xbe, 0x43, 0x1e, 0xa0, - 0xf7, 0xfb, 0xd2, 0x9b, 0xba, 0xac, 0xdd, 0x04, 0xba, 0x96, 0x6f, 0x74, 0xc1, 0x12, 0x45, 0xbe, - 0xde, 0x2b, 0x3b, 0x47, 0xfd, 0x1d, 0x8a, 0xfa, 0x3e, 0xda, 0xe8, 0x10, 0x75, 0x90, 0x16, 0xa8, - 0x6f, 0x35, 0xf4, 0x18, 0xb9, 0xd0, 0x09, 0xff, 0x93, 0xe0, 0xe5, 0x8e, 0x06, 0x76, 0xf4, 0x46, - 0x17, 0xc1, 0x13, 0x0e, 0xcd, 0xf2, 0xe2, 0x13, 0x48, 0xe0, 0xde, 0xb8, 0x43, 0xbd, 0x71, 0x0b, - 0xdd, 0xec, 0x3e, 0x07, 0x42, 0x5f, 0x24, 0x33, 0x3b, 0xfb, 0xbb, 0xd6, 0xaf, 0xfb, 0xe0, 0x62, - 0xd7, 0x33, 0x38, 0xba, 0x2d, 0xc2, 0xd1, 0xeb, 0x2a, 0x41, 0xbe, 0xf3, 0x94, 0xa4, 0x71, 0x0f, - 0x7d, 0x9b, 0x7a, 0x68, 0x13, 0xdd, 0xcb, 0xf3, 0x10, 0xe6, 0xe2, 0xf5, 0xbc, 0x86, 0x20, 0x72, - 0xd8, 0xbf, 0xa2, 0x0e, 0x2e, 0x9c, 0xcc, 0xd1, 0xd5, 0xce, 0xef, 0x89, 0xb6, 0x42, 0x79, 0xbd, - 0x27, 0x5e, 0x8e, 0x7a, 0x83, 0xa2, 0xbe, 0x8b, 0xee, 0xe4, 0xa1, 0x6e, 0xfd, 0x03, 0x45, 0x71, - 0x75, 0x7c, 0x2c, 0xc1, 0xd1, 0x96, 0x71, 0x12, 0x69, 0x99, 0x76, 0x8a, 0xe7, 0x52, 0xf9, 0xd5, - 0xce, 0x19, 0xba, 0xf9, 0x6a, 0x0b, 0x28, 0xb3, 0xfe, 0x4e, 0x6c, 0xd8, 0x47, 0x7d, 0x70, 0xbe, - 0x9b, 0x01, 0x13, 0xdd, 0x12, 0x19, 0xd6, 0xc3, 0x1c, 0x2c, 0xbf, 0xf9, 0xe4, 0x82, 0x38, 0xf2, - 0x4d, 0x8a, 0x7c, 0x0d, 0xbd, 0x95, 0x7b, 0x27, 0xb3, 0x4f, 0xa1, 0xf4, 0x66, 0xc4, 0x8e, 0x47, - 0x3e, 0x71, 0xaf, 0xff, 0x65, 0x1f, 0x68, 0x5d, 0x0e, 0x97, 0xe8, 0x6b, 0x3d, 0xa2, 0x12, 0x4c, - 0xc2, 0xf2, 0xd7, 0x9f, 0x8a, 0x2c, 0xee, 0xa4, 0x6f, 0x50, 0x27, 0xad, 0xa3, 0xb7, 0x3b, 0x71, - 0x52, 0x90, 0x92, 0x50, 0xec, 0xa7, 0x9f, 0x49, 0x00, 0xc9, 0x50, 0x2a, 0x9e, 0x4b, 0xc4, 0x93, - 0xae, 0x78, 0x2e, 0xc9, 0x98, 0x72, 0x3b, 0x1b, 0x23, 0x09, 0xe5, 0x59, 0x5a, 0xfb, 0xe4, 0x51, - 0x49, 0xfa, 0xf4, 0x51, 0x49, 0xfa, 0xfc, 0x51, 0x49, 0xfa, 0xe9, 0xe3, 0xd2, 0x81, 0x4f, 0x1f, - 0x97, 0x0e, 0xfc, 0xfd, 0x71, 0xe9, 0xc0, 0x37, 0xe7, 0x52, 0x6b, 0x25, 0x2e, 0xe7, 0x82, 0x6d, - 0x6c, 0x91, 0x58, 0xe8, 0xfe, 0xec, 0x65, 0xed, 0xdd, 0xb4, 0x68, 0xba, 0x6a, 0xda, 0x1a, 0xa4, - 0xff, 0x53, 0xe6, 0xd2, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xd2, 0x1b, 0xa1, 0xa7, 0x24, - 0x00, 0x00, + // 2099 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0x4d, 0x6c, 0xdc, 0xc6, + 0xf5, 0x17, 0x25, 0x45, 0xb2, 0x9f, 0x01, 0x5b, 0x1e, 0x3b, 0x96, 0x44, 0x5b, 0x2b, 0x87, 0x72, + 0x2c, 0xfd, 0x15, 0x9b, 0x8c, 0xe5, 0x58, 0x52, 0x9c, 0xbf, 0x8d, 0x48, 0x96, 0xe5, 0xa8, 0xb5, + 0x63, 0x65, 0x65, 0xc9, 0xe8, 0x17, 0x58, 0x6a, 0x39, 0x5a, 0x11, 0xe2, 0x92, 0x2b, 0x0e, 0xa9, + 0x64, 0x11, 0xb8, 0x05, 0x52, 0x14, 0x68, 0xd0, 0x43, 0x5b, 0xe4, 0x50, 0xe4, 0xd6, 0x4b, 0x0f, + 0xcd, 0xa1, 0xbd, 0xb5, 0x28, 0xd0, 0x4b, 0xd1, 0x4b, 0x80, 0xa2, 0x40, 0x80, 0x02, 0x45, 0xd1, + 0x83, 0x13, 0xd8, 0x3d, 0xb6, 0x97, 0x1e, 0xdb, 0x4b, 0xc1, 0x99, 0xe1, 0xc7, 0xee, 0x0e, 0xc9, + 0xdd, 0xb5, 0x6b, 0xe7, 0xe4, 0x25, 0xe7, 0x7d, 0xfd, 0xde, 0xd7, 0xf0, 0x3d, 0x19, 0x4a, 0x2e, + 0xa9, 0xb9, 0xc4, 0x22, 0x1a, 0x09, 0xea, 0xd8, 0xdb, 0xb1, 0x03, 0xcb, 0xd4, 0xf6, 0x03, 0xec, + 0x35, 0xd4, 0xba, 0xe7, 0xfa, 0x2e, 0x42, 0xfc, 0x5c, 0x4d, 0xce, 0xe5, 0x93, 0x55, 0xb7, 0xea, + 0xd2, 0x63, 0x2d, 0xfc, 0xc5, 0x28, 0xe5, 0x52, 0x85, 0x92, 0x6a, 0xdb, 0x06, 0xc1, 0xda, 0xc1, + 0xa5, 0x6d, 0xec, 0x1b, 0x97, 0xb4, 0x8a, 0x6b, 0x39, 0xfc, 0xfc, 0x4c, 0xd5, 0x75, 0xab, 0x36, + 0xd6, 0x8c, 0xba, 0xa5, 0x19, 0x8e, 0xe3, 0xfa, 0x86, 0x6f, 0xb9, 0x0e, 0xe1, 0xa7, 0x93, 0xfc, + 0x94, 0x3e, 0x6d, 0x07, 0x3b, 0x9a, 0x6f, 0xd5, 0x30, 0xf1, 0x8d, 0x5a, 0x3d, 0x12, 0xdf, 0x4a, + 0x60, 0x06, 0x1e, 0x95, 0xc0, 0xcf, 0xa7, 0x04, 0x40, 0x92, 0x9f, 0x91, 0x16, 0x01, 0x51, 0xdd, + 0xf0, 0x8c, 0x5a, 0x64, 0xc6, 0x78, 0x44, 0x60, 0xbb, 0x95, 0xbd, 0xa0, 0x4e, 0xff, 0xe1, 0x47, + 0xb3, 0x69, 0x7c, 0xd4, 0x45, 0x31, 0xca, 0xba, 0x51, 0xb5, 0x9c, 0xb4, 0x31, 0xe7, 0x38, 0x2d, + 0xf1, 0x8d, 0x3d, 0xcb, 0xa9, 0xc6, 0x84, 0xfc, 0x99, 0x51, 0x29, 0x27, 0x01, 0xbd, 0x13, 0xca, + 0x59, 0xa7, 0x16, 0x94, 0xf1, 0x7e, 0x80, 0x89, 0xaf, 0xdc, 0x85, 0x13, 0x4d, 0x6f, 0x49, 0xdd, + 0x75, 0x08, 0x46, 0x8b, 0x30, 0xc4, 0x2c, 0x1d, 0x93, 0xce, 0x4a, 0x33, 0x47, 0xe6, 0x64, 0xb5, + 0x3d, 0x32, 0x2a, 0xe3, 0x59, 0x1e, 0xfc, 0xf4, 0xe1, 0x64, 0x5f, 0x99, 0xd3, 0x2b, 0x33, 0x30, + 0xb2, 0x44, 0x08, 0xf6, 0xef, 0x35, 0xea, 0x98, 0x2b, 0x41, 0x27, 0xe1, 0x05, 0x13, 0x3b, 0x6e, + 0x8d, 0x0a, 0x3b, 0x5c, 0x66, 0x0f, 0xca, 0x37, 0xe0, 0x78, 0x8a, 0x92, 0x2b, 0x5e, 0x05, 0x30, + 0xc2, 0x97, 0xba, 0xdf, 0xa8, 0x63, 0x4a, 0x7f, 0x74, 0x6e, 0x5a, 0xa4, 0x7c, 0x23, 0xfe, 0x99, + 0x08, 0x39, 0x6c, 0x44, 0x3f, 0x15, 0x04, 0x23, 0x4b, 0xb6, 0x4d, 0x8f, 0x62, 0xac, 0x5b, 0x70, + 0x3c, 0xf5, 0x8e, 0x2b, 0x5c, 0x82, 0x21, 0xca, 0x15, 0x22, 0x1d, 0x98, 0x39, 0x32, 0x37, 0xd5, + 0x81, 0xb2, 0x08, 0x32, 0x63, 0x54, 0x54, 0x38, 0x45, 0x5f, 0xdf, 0x09, 0x6c, 0xdf, 0xaa, 0xdb, + 0x16, 0xf6, 0xf2, 0x81, 0xff, 0x50, 0x82, 0xd1, 0x36, 0x06, 0x6e, 0x4e, 0x1d, 0xe4, 0x50, 0xbf, + 0x8e, 0xf7, 0x03, 0xeb, 0xc0, 0xb0, 0xb1, 0xe3, 0xeb, 0xb5, 0x98, 0x8a, 0x07, 0x63, 0x4e, 0x64, + 0xe2, 0x5d, 0x52, 0x73, 0x6f, 0xc6, 0x4c, 0x69, 0xc9, 0x15, 0xd7, 0x33, 0xcb, 0x63, 0x6e, 0xc6, + 0xb9, 0xf2, 0xa1, 0x04, 0x2f, 0x25, 0xf8, 0xd6, 0x1c, 0x1f, 0x7b, 0x35, 0x6c, 0x5a, 0x86, 0xd7, + 0x58, 0xaa, 0x54, 0xdc, 0xc0, 0xf1, 0xd7, 0x9c, 0x1d, 0x57, 0x8c, 0x04, 0x8d, 0xc3, 0xa1, 0x03, + 0xc3, 0xd6, 0x0d, 0xd3, 0xf4, 0xc6, 0xfa, 0xe9, 0xc1, 0xf0, 0x81, 0x61, 0x2f, 0x99, 0xa6, 0x17, + 0x1e, 0x55, 0x8d, 0xa0, 0x8a, 0x75, 0xcb, 0x1c, 0x1b, 0x38, 0x2b, 0xcd, 0x0c, 0x96, 0x87, 0xe9, + 0xf3, 0x9a, 0x89, 0xc6, 0x60, 0x38, 0xe4, 0xc0, 0x84, 0x8c, 0x0d, 0x32, 0x26, 0xfe, 0xa8, 0xec, + 0x42, 0x69, 0xc9, 0xb6, 0x05, 0x36, 0x44, 0x31, 0x0c, 0xf3, 0x23, 0xc9, 0x7f, 0xee, 0x8f, 0xf3, + 0x2a, 0x2b, 0x00, 0x35, 0x2c, 0x16, 0x95, 0xf5, 0x13, 0x5e, 0x03, 0xea, 0xba, 0x51, 0x8d, 0xd2, + 0xb0, 0x9c, 0xe2, 0x54, 0xfe, 0x20, 0xc1, 0x64, 0xa6, 0x2a, 0x1e, 0x8b, 0xfb, 0x70, 0xc8, 0xe0, + 0xef, 0x78, 0x72, 0x5c, 0xc9, 0x4f, 0x8e, 0x0c, 0xe7, 0xf1, 0x74, 0x89, 0x85, 0xa1, 0x5b, 0x4d, + 0x20, 0xfa, 0x29, 0x88, 0xe9, 0x42, 0x10, 0xcc, 0xaa, 0x26, 0x14, 0xd7, 0x61, 0xea, 0x86, 0xeb, + 0x38, 0xb8, 0xe2, 0x63, 0x91, 0xf2, 0xc8, 0x69, 0xa3, 0x30, 0x1c, 0xb6, 0x96, 0x30, 0x14, 0x12, + 0x0d, 0xc5, 0x50, 0xf8, 0xb8, 0x66, 0x2a, 0xef, 0xc2, 0xb9, 0x7c, 0x7e, 0xee, 0x89, 0xbb, 0x30, + 0xcc, 0x8d, 0xe7, 0x2e, 0xef, 0xcd, 0x11, 0xe5, 0x48, 0x8a, 0xb2, 0x0a, 0x2a, 0x6d, 0x3b, 0xf7, + 0x5c, 0xdf, 0xb0, 0x57, 0xb0, 0x8d, 0xab, 0x14, 0xd0, 0x72, 0x63, 0xcb, 0xb0, 0x2d, 0xd3, 0xf0, + 0x5d, 0x6f, 0xd5, 0xf5, 0x56, 0xc2, 0x1c, 0xcb, 0x2f, 0xa5, 0x3a, 0x68, 0x1d, 0xcb, 0xe1, 0x58, + 0xae, 0xb5, 0x14, 0xfc, 0xa4, 0x08, 0x4a, 0x22, 0x8a, 0xb4, 0x14, 0xfb, 0x17, 0x12, 0x1c, 0x49, + 0x9d, 0x36, 0x95, 0x80, 0xd4, 0x5c, 0x02, 0xf7, 0xe0, 0x88, 0x51, 0x0b, 0xe1, 0xea, 0x64, 0x87, + 0x98, 0xac, 0x40, 0x96, 0x2f, 0x87, 0xd2, 0xfe, 0xf6, 0x70, 0xf2, 0x45, 0x16, 0x6e, 0x62, 0xee, + 0xa9, 0x96, 0xab, 0xd5, 0x0c, 0x7f, 0x57, 0x5d, 0x73, 0xfc, 0x7f, 0x3d, 0x9c, 0x44, 0x0d, 0xa3, + 0x66, 0x5f, 0x55, 0x52, 0x9c, 0x4a, 0x19, 0xd8, 0xd3, 0xc6, 0x0e, 0x31, 0xd1, 0xb7, 0xe1, 0x58, + 0x4b, 0x87, 0xa0, 0xf5, 0x75, 0x78, 0x79, 0xa1, 0x48, 0xf2, 0x29, 0x26, 0xb9, 0x85, 0x5b, 0x29, + 0x1f, 0x6d, 0xee, 0x0d, 0xca, 0x14, 0xbc, 0x44, 0xfd, 0x99, 0xc4, 0x33, 0x05, 0x38, 0x6a, 0xa6, + 0x3f, 0x95, 0x40, 0xc9, 0xa3, 0xe2, 0xde, 0xde, 0x87, 0xe3, 0x7e, 0x48, 0xa5, 0x9b, 0xc9, 0x21, + 0xf3, 0xd3, 0xf2, 0x4a, 0x91, 0xbd, 0x53, 0xcc, 0x5e, 0xc6, 0x9f, 0x04, 0x27, 0x2d, 0x4a, 0x29, + 0x8f, 0xf8, 0xcd, 0xa1, 0x27, 0xca, 0x47, 0x4d, 0x0d, 0x2d, 0x39, 0x59, 0xaa, 0xa5, 0x6b, 0xe2, + 0x15, 0x38, 0xce, 0xe5, 0xb8, 0x9e, 0x1e, 0xb5, 0x23, 0x16, 0xc0, 0x91, 0xf8, 0x60, 0x89, 0xbd, + 0x0f, 0x89, 0x0f, 0xa2, 0x84, 0x8a, 0x89, 0x59, 0xc3, 0x1b, 0x89, 0x0f, 0x22, 0xe2, 0x38, 0x53, + 0x07, 0xd2, 0x99, 0xfa, 0xa1, 0x04, 0x4a, 0x9e, 0x55, 0xdc, 0x5f, 0x15, 0x18, 0x62, 0xb1, 0xe6, + 0xd9, 0x39, 0xde, 0xd4, 0x16, 0xa2, 0x86, 0x70, 0xc3, 0xb5, 0x9c, 0xe5, 0x57, 0x43, 0xff, 0x7d, + 0xf2, 0xf9, 0xe4, 0x4c, 0xd5, 0xf2, 0x77, 0x83, 0x6d, 0xb5, 0xe2, 0xd6, 0x34, 0xfe, 0x25, 0xc0, + 0xfe, 0xb9, 0x48, 0xcc, 0x3d, 0x2d, 0xbc, 0x47, 0x09, 0x65, 0x20, 0x65, 0x2e, 0x5a, 0xd9, 0x82, + 0x69, 0x61, 0xd4, 0x96, 0x1b, 0x2b, 0x11, 0xf2, 0x5e, 0xdc, 0xa4, 0xfc, 0x66, 0x00, 0x66, 0x8a, + 0x05, 0x73, 0xa4, 0xef, 0xc1, 0x84, 0x30, 0xa6, 0xba, 0x47, 0x6f, 0xac, 0xa8, 0x3c, 0xd5, 0xfc, + 0x4e, 0x93, 0x28, 0x61, 0x17, 0x1d, 0xaf, 0xd6, 0xd3, 0x24, 0x93, 0x82, 0xa0, 0xef, 0xc2, 0x8b, + 0x4d, 0x39, 0x89, 0x4d, 0x3d, 0xfc, 0x72, 0x0c, 0x23, 0xfa, 0xd4, 0x5d, 0x7e, 0x22, 0x9d, 0x9e, + 0xd8, 0xa4, 0x2f, 0xd1, 0x8f, 0x24, 0x28, 0x31, 0x0b, 0x52, 0xd7, 0x7c, 0xf8, 0xb5, 0x86, 0x4d, + 0x9d, 0x47, 0x7f, 0x80, 0xb6, 0xd9, 0x1c, 0x53, 0x34, 0x6e, 0xca, 0x74, 0x87, 0xa6, 0x94, 0x4f, + 0x53, 0x8d, 0x49, 0x99, 0x6f, 0x50, 0x7d, 0x2c, 0xfd, 0x14, 0x07, 0xfe, 0x2f, 0xf1, 0xe9, 0xa6, + 0x63, 0x3e, 0xb5, 0x9c, 0x48, 0xaa, 0xa1, 0x3f, 0x5d, 0x0d, 0xff, 0xee, 0x87, 0xd9, 0x4e, 0x14, + 0x3e, 0xf7, 0x5c, 0xf9, 0x9e, 0x04, 0xa3, 0x2c, 0x54, 0x81, 0xf3, 0x0c, 0xd2, 0x85, 0x25, 0xe6, + 0x66, 0xa2, 0x8a, 0x25, 0xcc, 0x6d, 0x38, 0x46, 0x1a, 0x8e, 0xbf, 0x8b, 0x7d, 0xab, 0xa2, 0x87, + 0x77, 0x37, 0x19, 0x1b, 0xa0, 0xca, 0x27, 0x62, 0xc4, 0x6c, 0x84, 0x50, 0x37, 0x22, 0xb2, 0xdb, + 0x6e, 0x65, 0x8f, 0x03, 0x3c, 0x4a, 0xd2, 0x2f, 0x89, 0xb2, 0x0f, 0x17, 0x32, 0xaa, 0x34, 0xbe, + 0x35, 0x9b, 0xae, 0x5e, 0x61, 0xf7, 0x93, 0x8a, 0xba, 0x5f, 0x53, 0xbc, 0x7f, 0x21, 0xc1, 0xc5, + 0x0e, 0x75, 0x3e, 0xef, 0x90, 0x2b, 0x0f, 0x60, 0xf1, 0x26, 0xf1, 0xad, 0x9a, 0xe1, 0xe3, 0x36, + 0x41, 0x51, 0xc1, 0xfc, 0x0f, 0x5d, 0xf5, 0x3b, 0x09, 0x5e, 0xef, 0x41, 0x3f, 0x77, 0x5b, 0x66, + 0x6f, 0x93, 0x9e, 0x4d, 0x6f, 0x53, 0x36, 0xe1, 0xbc, 0xf8, 0x8b, 0xec, 0xc9, 0xae, 0x96, 0x8f, + 0x07, 0x61, 0xba, 0x50, 0xee, 0x73, 0xef, 0x16, 0x06, 0x9c, 0x68, 0x52, 0xc7, 0x0c, 0xe2, 0x8d, + 0x62, 0x36, 0xf2, 0x7d, 0x34, 0x97, 0x47, 0xee, 0x4f, 0xcb, 0x61, 0x1c, 0x5c, 0x17, 0x32, 0xdb, + 0x4e, 0xb2, 0x03, 0x3c, 0xf0, 0xe5, 0xb9, 0xbc, 0x06, 0x9f, 0xed, 0xe5, 0x35, 0x01, 0xa7, 0x69, + 0x6a, 0x6c, 0x3a, 0x75, 0xd7, 0xb5, 0xef, 0xef, 0x5a, 0x3e, 0xb6, 0x2d, 0x12, 0x7d, 0xe9, 0x29, + 0xaf, 0xc3, 0x19, 0xf1, 0x31, 0xf7, 0xe8, 0x38, 0x1c, 0x0a, 0x0f, 0x74, 0x8b, 0x67, 0xc6, 0x60, + 0x79, 0x38, 0x7c, 0x5e, 0x33, 0x89, 0xb2, 0x0d, 0x97, 0x37, 0x09, 0xf6, 0x6e, 0xb8, 0x4e, 0x05, + 0x3b, 0xbe, 0x17, 0x3a, 0x21, 0x49, 0x90, 0x75, 0x97, 0x58, 0xb4, 0x87, 0xc5, 0x0e, 0xea, 0x29, + 0xb3, 0x7f, 0x2d, 0xc1, 0x6b, 0xdd, 0x29, 0xe1, 0x76, 0x7f, 0x07, 0x26, 0x2a, 0xb6, 0x4e, 0x4d, + 0x0f, 0x08, 0xf6, 0xf4, 0x3a, 0x27, 0x6d, 0x49, 0xf3, 0x79, 0x51, 0x9a, 0xa7, 0x95, 0xad, 0xbb, + 0xae, 0x1d, 0x1a, 0x10, 0xa9, 0x6a, 0x4a, 0xf7, 0xf1, 0x8a, 0x2d, 0x3e, 0x27, 0x0a, 0x86, 0xf9, + 0x0e, 0xec, 0x4e, 0xee, 0x76, 0xa7, 0xda, 0x93, 0x7f, 0x7e, 0x2b, 0xc1, 0x42, 0xd7, 0x7a, 0xbe, + 0x24, 0x2e, 0x52, 0xe1, 0x14, 0x4d, 0xbd, 0x32, 0x26, 0xfe, 0x46, 0x50, 0xaf, 0xdb, 0x8d, 0xfc, + 0x71, 0xb6, 0x0c, 0xa3, 0x6d, 0xf4, 0x1c, 0xca, 0x42, 0x6a, 0x30, 0x28, 0xa8, 0xae, 0x68, 0x60, + 0xa5, 0xe4, 0x73, 0x7f, 0x99, 0x80, 0x17, 0xa8, 0x50, 0xf4, 0x7d, 0x09, 0x86, 0xd8, 0xce, 0x0e, + 0x9d, 0x17, 0x21, 0x6e, 0x5f, 0x0f, 0xca, 0xd3, 0x85, 0x74, 0xcc, 0x3c, 0x65, 0xf6, 0x83, 0x3f, + 0xff, 0xfd, 0xa3, 0xfe, 0x73, 0x48, 0xd1, 0x04, 0x4b, 0xcf, 0x64, 0x73, 0x49, 0x95, 0xff, 0x40, + 0x82, 0xc3, 0xf1, 0xd2, 0x0e, 0x9d, 0x13, 0xa9, 0x68, 0x5d, 0x21, 0xca, 0x2f, 0x17, 0x50, 0x71, + 0x33, 0x54, 0x6a, 0xc6, 0x0c, 0x3a, 0x9f, 0x67, 0x46, 0xb2, 0x60, 0x64, 0xa6, 0x44, 0x3b, 0xc1, + 0x0c, 0x53, 0x5a, 0xd6, 0x88, 0x19, 0xa6, 0xb4, 0x2e, 0x16, 0x3b, 0x34, 0xc5, 0xb6, 0x75, 0xb6, + 0x58, 0x40, 0x3f, 0x93, 0xe0, 0x58, 0xcb, 0x56, 0x10, 0xcd, 0x66, 0xa2, 0x6e, 0xdb, 0x35, 0xca, + 0xaf, 0x74, 0x44, 0xcb, 0x8d, 0x7b, 0x8d, 0x1a, 0xa7, 0xa2, 0x0b, 0xc5, 0x7e, 0x4a, 0xd6, 0x8f, + 0xe8, 0xf7, 0x12, 0x8c, 0x66, 0x2c, 0xcd, 0xd0, 0x5c, 0x86, 0x57, 0x72, 0x96, 0x79, 0xf2, 0xe5, + 0xae, 0x78, 0xb8, 0xe9, 0xd7, 0xa8, 0xe9, 0x0b, 0xe8, 0x4a, 0x91, 0x5f, 0xad, 0x94, 0x14, 0x3d, + 0xde, 0xbd, 0x7d, 0x2e, 0xc1, 0x99, 0xbc, 0x9d, 0x17, 0x5a, 0xc8, 0x68, 0x06, 0x45, 0x5b, 0x36, + 0x79, 0xb1, 0x7b, 0x46, 0x0e, 0xe9, 0x36, 0x85, 0xb4, 0x8a, 0x56, 0xf2, 0x20, 0x55, 0x22, 0x49, + 0x42, 0x60, 0xda, 0xfb, 0x7c, 0xc3, 0xf7, 0x00, 0xfd, 0x2a, 0xda, 0xcc, 0xe4, 0xee, 0xc3, 0xd0, + 0x72, 0x66, 0x69, 0x77, 0xbc, 0x94, 0x93, 0x6f, 0x3c, 0x91, 0x0c, 0x8e, 0xbe, 0x0f, 0xfd, 0x51, + 0x02, 0x39, 0x7b, 0x97, 0x84, 0x84, 0xcb, 0xc6, 0xc2, 0x0d, 0x95, 0x3c, 0xdf, 0x2d, 0x1b, 0xb7, + 0xe7, 0x3a, 0x8d, 0xc6, 0x22, 0x9a, 0x2f, 0x4a, 0x30, 0xf1, 0x4a, 0x0a, 0xfd, 0x49, 0x02, 0x39, + 0x7b, 0xd3, 0x83, 0xae, 0x74, 0xfa, 0xd9, 0xd9, 0xb4, 0xaf, 0x12, 0xa3, 0x29, 0x5e, 0x28, 0x29, + 0x6f, 0x52, 0x34, 0x57, 0xd1, 0x62, 0x1e, 0x1a, 0xf1, 0xe7, 0x32, 0xbb, 0x40, 0xd0, 0x3f, 0x25, + 0x38, 0x5b, 0xb4, 0xd5, 0x41, 0x6f, 0x74, 0x6a, 0x9e, 0x60, 0xa1, 0x20, 0xff, 0x7f, 0x6f, 0xcc, + 0x1c, 0xe1, 0xdb, 0x14, 0xe1, 0x5b, 0x68, 0xb5, 0x6b, 0x84, 0x44, 0x7b, 0xbf, 0xed, 0x3b, 0xe4, + 0x01, 0xfa, 0xa0, 0x3f, 0xbd, 0xa9, 0xcb, 0xda, 0x4d, 0xa0, 0x6b, 0xf9, 0x46, 0x17, 0x2c, 0x51, + 0xe4, 0xeb, 0xbd, 0xb2, 0x73, 0xd4, 0xdf, 0xa2, 0xa8, 0xef, 0xa3, 0xcd, 0x0e, 0x51, 0x07, 0x69, + 0x81, 0xfa, 0x76, 0x43, 0x8f, 0x91, 0x0b, 0x9d, 0xf0, 0x1f, 0x09, 0x5e, 0xee, 0x68, 0x60, 0x47, + 0x6f, 0x76, 0x11, 0x3c, 0xe1, 0xd0, 0x2c, 0x2f, 0x3d, 0x81, 0x04, 0xee, 0x8d, 0x3b, 0xd4, 0x1b, + 0xb7, 0xd0, 0xcd, 0xee, 0x73, 0x20, 0xf4, 0x45, 0x32, 0xb3, 0xb3, 0xbf, 0x6b, 0xfd, 0xb2, 0x1f, + 0x2e, 0x75, 0x3d, 0x83, 0xa3, 0xdb, 0x22, 0x1c, 0xbd, 0xae, 0x12, 0xe4, 0x3b, 0x4f, 0x49, 0x1a, + 0xf7, 0xd0, 0x37, 0xa9, 0x87, 0xb6, 0xd0, 0xbd, 0x3c, 0x0f, 0x61, 0x2e, 0x5e, 0xcf, 0x6b, 0x08, + 0x22, 0x87, 0xfd, 0x23, 0xea, 0xe0, 0xc2, 0xc9, 0x1c, 0x5d, 0xed, 0xfc, 0x9e, 0x68, 0x2b, 0x94, + 0x37, 0x7a, 0xe2, 0xe5, 0xa8, 0x37, 0x29, 0xea, 0xbb, 0xe8, 0x4e, 0x1e, 0xea, 0xd6, 0x3f, 0x50, + 0x14, 0x57, 0xc7, 0x27, 0x12, 0x1c, 0x6b, 0x19, 0x27, 0x91, 0x96, 0x69, 0xa7, 0x78, 0x2e, 0x95, + 0x5f, 0xed, 0x9c, 0xa1, 0x9b, 0xaf, 0xb6, 0x80, 0x32, 0xeb, 0xef, 0xc6, 0x86, 0x7d, 0xdc, 0x0f, + 0x17, 0xba, 0x19, 0x30, 0xd1, 0x2d, 0x91, 0x61, 0x3d, 0xcc, 0xc1, 0xf2, 0x5b, 0x4f, 0x2e, 0x88, + 0x23, 0xdf, 0xa2, 0xc8, 0xd7, 0xd1, 0xdb, 0xb9, 0x77, 0x32, 0xfb, 0x14, 0x4a, 0x6f, 0x46, 0xec, + 0x78, 0xe4, 0x13, 0xf7, 0xfa, 0x9f, 0xf7, 0x83, 0xd6, 0xe5, 0x70, 0x89, 0xbe, 0xd2, 0x23, 0x2a, + 0xc1, 0x24, 0x2c, 0x7f, 0xf5, 0xa9, 0xc8, 0xe2, 0x4e, 0xfa, 0x1a, 0x75, 0xd2, 0x06, 0x7a, 0xa7, + 0x13, 0x27, 0x05, 0x29, 0x09, 0xc5, 0x7e, 0xfa, 0x89, 0x04, 0x90, 0x0c, 0xa5, 0xe2, 0xb9, 0x44, + 0x3c, 0xe9, 0x8a, 0xe7, 0x92, 0x8c, 0x29, 0xb7, 0xb3, 0x31, 0x92, 0x50, 0x9e, 0xe5, 0xf5, 0x4f, + 0x1f, 0x95, 0xa4, 0xcf, 0x1e, 0x95, 0xa4, 0x2f, 0x1e, 0x95, 0xa4, 0x1f, 0x3f, 0x2e, 0xf5, 0x7d, + 0xf6, 0xb8, 0xd4, 0xf7, 0xd7, 0xc7, 0xa5, 0xbe, 0xaf, 0xcf, 0xa7, 0xd6, 0x4a, 0x5c, 0xce, 0x45, + 0xdb, 0xd8, 0x26, 0xb1, 0xd0, 0x83, 0xb9, 0x2b, 0xda, 0x7b, 0x69, 0xd1, 0x74, 0xd5, 0xb4, 0x3d, + 0x44, 0xff, 0xa7, 0xcc, 0xe5, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xde, 0x2f, 0xae, 0xa0, 0xa7, + 0x24, 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 63199fbfee5..701fd1d589b 100644 --- a/x/superfluid/types/superfluid.pb.go +++ b/x/superfluid/types/superfluid.pb.go @@ -9,7 +9,7 @@ import ( types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" - types1 "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + types1 "github.com/osmosis-labs/osmosis/v25/x/lockup/types" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" @@ -497,7 +497,7 @@ var fileDescriptor_79d3c29d82dbb734 = []byte{ // 831 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0xcf, 0x6f, 0x1b, 0x45, 0x14, 0xf6, 0xda, 0x6e, 0xd2, 0x4c, 0xa0, 0xb8, 0xdb, 0xa8, 0x24, 0x41, 0xd9, 0x0d, 0x5b, 0xa4, - 0x5a, 0xad, 0xba, 0xab, 0x04, 0x84, 0x50, 0x6f, 0x4e, 0x0a, 0x92, 0x51, 0x28, 0xd6, 0x9a, 0x0a, + 0x5a, 0xad, 0xba, 0xab, 0x04, 0x81, 0x50, 0x6f, 0x4e, 0x0a, 0x92, 0x51, 0x28, 0xd6, 0x9a, 0x0a, 0xc4, 0x65, 0x35, 0xde, 0x79, 0x5d, 0x8f, 0x3c, 0xbb, 0xb3, 0xdd, 0x99, 0x35, 0xf8, 0xc6, 0x81, 0x43, 0x8f, 0xfc, 0x09, 0x95, 0xb8, 0x71, 0xe5, 0x9f, 0xe8, 0xb1, 0x12, 0x17, 0xc4, 0x21, 0xa0, 0xe4, 0xc2, 0xb9, 0x7f, 0x01, 0x9a, 0xd9, 0x1f, 0xde, 0x34, 0xae, 0x10, 0x17, 0x7a, 0xf2, 0xcc, @@ -546,7 +546,7 @@ var fileDescriptor_79d3c29d82dbb734 = []byte{ 0xb3, 0x8c, 0x17, 0x67, 0x96, 0xf1, 0xd7, 0x99, 0x65, 0xfc, 0x74, 0x6e, 0xb5, 0x5e, 0x9c, 0x5b, 0xad, 0xdf, 0xcf, 0xad, 0xd6, 0xb7, 0x1f, 0x37, 0x14, 0x96, 0xa3, 0xbd, 0xc7, 0xf0, 0x44, 0x54, 0x1b, 0x6f, 0x7e, 0xf8, 0x91, 0xf7, 0x7d, 0xf3, 0x8b, 0xa8, 0x55, 0x4f, 0xd6, 0xf4, 0x77, 0xe6, - 0xc3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xda, 0x45, 0x99, 0xd6, 0x34, 0x07, 0x00, 0x00, + 0xc3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xb8, 0x2c, 0xd7, 0x34, 0x07, 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 6663fedb83e..49c95894446 100644 --- a/x/superfluid/types/tx.pb.go +++ b/x/superfluid/types/tx.pb.go @@ -1168,7 +1168,7 @@ var fileDescriptor_55b645f187d22814 = []byte{ // 1521 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcf, 0x6f, 0x13, 0xc7, 0x1e, 0xcf, 0xda, 0x21, 0x81, 0x09, 0x09, 0xc9, 0x3e, 0x02, 0xc6, 0x80, 0x6d, 0x06, 0x78, 0x84, - 0x1f, 0xde, 0x8d, 0x03, 0x0f, 0xa2, 0xbc, 0xc3, 0x23, 0x8e, 0xf5, 0x2a, 0x97, 0x44, 0x45, 0x4b, + 0x1f, 0xde, 0x8d, 0xc3, 0x03, 0xa2, 0xbc, 0xc3, 0x23, 0x8e, 0xf5, 0x2a, 0x97, 0x44, 0x45, 0x4b, 0x50, 0xa5, 0x5e, 0xdc, 0xb5, 0x67, 0xb2, 0xd9, 0x66, 0x77, 0xc7, 0x78, 0xc6, 0x21, 0x51, 0x4f, 0x6d, 0xa5, 0x56, 0xe2, 0x84, 0x7a, 0x69, 0x2f, 0x55, 0xcf, 0xad, 0xaa, 0x8a, 0x3f, 0xa1, 0x47, 0x8e, 0x1c, 0xab, 0x56, 0x0a, 0x15, 0x1c, 0x7a, 0xcf, 0xa5, 0xd7, 0x6a, 0x76, 0x67, 0xd7, 0xeb, @@ -1253,14 +1253,14 @@ var fileDescriptor_55b645f187d22814 = []byte{ 0xb3, 0xf7, 0x87, 0xe5, 0x0c, 0x10, 0x7e, 0x25, 0x81, 0x73, 0xf1, 0x8f, 0xcd, 0xf9, 0x18, 0xf9, 0xb1, 0x1c, 0xd9, 0xc5, 0xa4, 0x1c, 0x01, 0x92, 0x5f, 0x24, 0x70, 0x2b, 0xd1, 0x4b, 0x6e, 0x25, 0x46, 0x55, 0x12, 0x21, 0xd9, 0x07, 0x47, 0x20, 0x24, 0x30, 0xe1, 0x53, 0x30, 0x1b, 0xfd, 0xca, - 0xb9, 0x15, 0xa3, 0x25, 0x92, 0x3a, 0x7b, 0x27, 0x09, 0x75, 0xa0, 0xfc, 0x77, 0x09, 0xfc, 0x67, + 0xb9, 0x15, 0xa3, 0x25, 0x92, 0x3a, 0xfb, 0x9f, 0x24, 0xd4, 0x81, 0xf2, 0xdf, 0x25, 0x70, 0x67, 0xb8, 0xc7, 0xc7, 0x6a, 0xac, 0xbe, 0x21, 0xa4, 0x65, 0xd7, 0x8f, 0x52, 0x5a, 0x57, 0x76, 0x24, 0xba, 0x0e, 0xc6, 0x65, 0x47, 0x12, 0x21, 0xb1, 0xd9, 0x31, 0xd4, 0x95, 0xc8, 0xcd, 0x8e, 0xa8, 0x81, 0x1d, 0x9f, 0x1d, 0x11, 0xd4, 0x87, 0x64, 0xc7, 0x21, 0xd3, 0xa5, 0xfc, 0xf0, 0xe5, 0x9b, 0x9c, 0xf4, 0xea, 0x4d, 0x4e, 0xfa, 0xe3, 0x4d, 0x4e, 0x7a, 0xfe, 0x36, 0x37, 0xf2, 0xea, 0x6d, 0x6e, 0xe4, 0xd7, 0xb7, 0xb9, 0x91, 0x8f, 0xee, 0x86, 0xa6, 0x9f, 0x90, 0x5c, 0xb4, 0xf4, 0x3a, 0xf5, 0x17, 0xea, 0xf6, 0xc2, 0x1d, 0x75, 0xa7, 0xeb, 0x47, 0x67, 0x3e, 0x11, 0xeb, 0x63, 0xee, - 0xfd, 0xfe, 0xf6, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xec, 0xe3, 0xc8, 0x07, 0x97, 0x16, 0x00, + 0xfd, 0xfe, 0xf6, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x1e, 0x7d, 0x06, 0x97, 0x16, 0x00, 0x00, } diff --git a/x/tokenfactory/client/cli/cli_test.go b/x/tokenfactory/client/cli/cli_test.go index 32faad0d74e..d005fb6dce7 100644 --- a/x/tokenfactory/client/cli/cli_test.go +++ b/x/tokenfactory/client/cli/cli_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) func TestGetCmdDenomAuthorityMetadata(t *testing.T) { diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go index 9470128004d..e9223442c41 100644 --- a/x/tokenfactory/client/cli/query.go +++ b/x/tokenfactory/client/cli/query.go @@ -12,7 +12,7 @@ import ( // sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/tokenfactory/client/cli/query_test.go b/x/tokenfactory/client/cli/query_test.go index 95fbd39c4f4..de38d2e9af7 100644 --- a/x/tokenfactory/client/cli/query_test.go +++ b/x/tokenfactory/client/cli/query_test.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) type QueryTestSuite struct { diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go index 0319817d2b2..65b39e0b985 100644 --- a/x/tokenfactory/client/cli/tx.go +++ b/x/tokenfactory/client/cli/tx.go @@ -8,7 +8,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/tokenfactory/keeper/admins.go b/x/tokenfactory/keeper/admins.go index e9f69f228b1..911af4c4ecd 100644 --- a/x/tokenfactory/keeper/admins.go +++ b/x/tokenfactory/keeper/admins.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/gogoproto/proto" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) // GetAuthorityMetadata returns the authority metadata for a specific denom diff --git a/x/tokenfactory/keeper/admins_test.go b/x/tokenfactory/keeper/admins_test.go index 4b6bfb36150..40f41449b76 100644 --- a/x/tokenfactory/keeper/admins_test.go +++ b/x/tokenfactory/keeper/admins_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) func (s *KeeperTestSuite) TestAdminMsgs() { diff --git a/x/tokenfactory/keeper/bankactions.go b/x/tokenfactory/keeper/bankactions.go index 60742dc5c04..43a77f3cede 100644 --- a/x/tokenfactory/keeper/bankactions.go +++ b/x/tokenfactory/keeper/bankactions.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) func (k Keeper) mintTo(ctx sdk.Context, amount sdk.Coin, mintTo string) error { diff --git a/x/tokenfactory/keeper/before_send.go b/x/tokenfactory/keeper/before_send.go index 68cacd6e390..09c01d088a8 100644 --- a/x/tokenfactory/keeper/before_send.go +++ b/x/tokenfactory/keeper/before_send.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" errorsmod "cosmossdk.io/errors" ) diff --git a/x/tokenfactory/keeper/before_send_test.go b/x/tokenfactory/keeper/before_send_test.go index f465f385dcf..995aea23320 100644 --- a/x/tokenfactory/keeper/before_send_test.go +++ b/x/tokenfactory/keeper/before_send_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" ) diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index 51435df1dcc..13996afcc94 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) // ConvertToBaseToken converts a fee amount in a whitelisted fee token to the base fee token amount diff --git a/x/tokenfactory/keeper/createdenom_test.go b/x/tokenfactory/keeper/createdenom_test.go index 6ef9c1302da..9029660522e 100644 --- a/x/tokenfactory/keeper/createdenom_test.go +++ b/x/tokenfactory/keeper/createdenom_test.go @@ -7,8 +7,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) func (s *KeeperTestSuite) TestMsgCreateDenom() { diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go index 8300d46576e..3bf8bd63891 100644 --- a/x/tokenfactory/keeper/genesis.go +++ b/x/tokenfactory/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) // InitGenesis initializes the tokenfactory module's state from a provided genesis diff --git a/x/tokenfactory/keeper/genesis_test.go b/x/tokenfactory/keeper/genesis_test.go index 28d44ac1dd5..cfedd7e01a0 100644 --- a/x/tokenfactory/keeper/genesis_test.go +++ b/x/tokenfactory/keeper/genesis_test.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) func (s *KeeperTestSuite) TestGenesis() { diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go index 1182e455ce9..5299ee99277 100644 --- a/x/tokenfactory/keeper/grpc_query.go +++ b/x/tokenfactory/keeper/grpc_query.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index b072ea8da29..d8bc7163a7c 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index df4aa4721a7..03ff04bb40a 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -13,9 +13,9 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/keeper" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/keeper" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) type KeeperTestSuite struct { diff --git a/x/tokenfactory/keeper/msg_server.go b/x/tokenfactory/keeper/msg_server.go index 80882c8be01..5f4debd5268 100644 --- a/x/tokenfactory/keeper/msg_server.go +++ b/x/tokenfactory/keeper/msg_server.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) type msgServer struct { diff --git a/x/tokenfactory/keeper/msg_server_test.go b/x/tokenfactory/keeper/msg_server_test.go index 7238818a0a4..7bfb6d01769 100644 --- a/x/tokenfactory/keeper/msg_server_test.go +++ b/x/tokenfactory/keeper/msg_server_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "fmt" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" diff --git a/x/tokenfactory/keeper/params.go b/x/tokenfactory/keeper/params.go index 95efd2538fb..496dbbb36bc 100644 --- a/x/tokenfactory/keeper/params.go +++ b/x/tokenfactory/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go index d41148899ca..068629e96b1 100644 --- a/x/tokenfactory/module.go +++ b/x/tokenfactory/module.go @@ -23,12 +23,12 @@ import ( "github.com/spf13/cobra" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - simulation "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/simulation" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + simulation "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/simulation" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/keeper" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/keeper" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) var ( diff --git a/x/tokenfactory/simulation/sim_msgs.go b/x/tokenfactory/simulation/sim_msgs.go index 853bab08a6f..b7a90875153 100644 --- a/x/tokenfactory/simulation/sim_msgs.go +++ b/x/tokenfactory/simulation/sim_msgs.go @@ -7,9 +7,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/keeper" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/keeper" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/tokenfactory/types/authorityMetadata.pb.go b/x/tokenfactory/types/authorityMetadata.pb.go index 25a1b19c708..ac6ebbaabf4 100644 --- a/x/tokenfactory/types/authorityMetadata.pb.go +++ b/x/tokenfactory/types/authorityMetadata.pb.go @@ -95,8 +95,8 @@ var fileDescriptor_99435de88ae175f7 = []byte{ 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x59, 0xa4, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0x3d, 0xa0, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, - 0x19, 0x99, 0xe8, 0x57, 0xa0, 0x86, 0x44, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x89, - 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x46, 0xbc, 0xc9, 0x99, 0x2e, 0x01, 0x00, 0x00, + 0x19, 0x99, 0xea, 0x57, 0xa0, 0x86, 0x44, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x89, + 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x5f, 0xa9, 0xa5, 0x2e, 0x01, 0x00, 0x00, } func (this *DenomAuthorityMetadata) Equal(that interface{}) bool { diff --git a/x/tokenfactory/types/denoms_test.go b/x/tokenfactory/types/denoms_test.go index 75bdeb9cfd6..abbaf2da9d5 100644 --- a/x/tokenfactory/types/denoms_test.go +++ b/x/tokenfactory/types/denoms_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - appparams "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + appparams "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) func TestDeconstructDenom(t *testing.T) { diff --git a/x/tokenfactory/types/genesis.pb.go b/x/tokenfactory/types/genesis.pb.go index 00434502c95..c8c2d1f3fdf 100644 --- a/x/tokenfactory/types/genesis.pb.go +++ b/x/tokenfactory/types/genesis.pb.go @@ -164,8 +164,8 @@ var fileDescriptor_5749c3f71850298b = []byte{ 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x45, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xd4, 0x55, 0xba, 0x39, 0x89, 0x49, 0xc5, 0x30, 0x8e, 0x7e, 0x99, 0x91, - 0x89, 0x7e, 0x05, 0x6a, 0x8c, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x63, 0xda, 0x18, - 0x10, 0x00, 0x00, 0xff, 0xff, 0x55, 0x9a, 0x38, 0xf0, 0xac, 0x02, 0x00, 0x00, + 0xa9, 0x7e, 0x05, 0x6a, 0x8c, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x63, 0xda, 0x18, + 0x10, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x79, 0x58, 0xcc, 0xac, 0x02, 0x00, 0x00, } func (this *GenesisDenom) Equal(that interface{}) bool { diff --git a/x/tokenfactory/types/genesis_test.go b/x/tokenfactory/types/genesis_test.go index c00456221a3..80b809e2cff 100644 --- a/x/tokenfactory/types/genesis_test.go +++ b/x/tokenfactory/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/tokenfactory/types/msgs_test.go b/x/tokenfactory/types/msgs_test.go index 59ebc944380..cbf97b0068d 100644 --- a/x/tokenfactory/types/msgs_test.go +++ b/x/tokenfactory/types/msgs_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/tokenfactory/types" "github.com/cometbft/cometbft/crypto/ed25519" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" diff --git a/x/tokenfactory/types/params.pb.go b/x/tokenfactory/types/params.pb.go index d33afce05b6..4f76543df22 100644 --- a/x/tokenfactory/types/params.pb.go +++ b/x/tokenfactory/types/params.pb.go @@ -95,30 +95,30 @@ func init() { } var fileDescriptor_cc8299d306f3ff47 = []byte{ - // 355 bytes of a gzipped FileDescriptorProto + // 356 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xb1, 0x6e, 0xea, 0x30, 0x14, 0x86, 0x63, 0xee, 0x15, 0x43, 0xee, 0x72, 0x15, 0x5d, 0xe9, 0x02, 0xaa, 0x1c, 0x9a, 0x09, - 0x06, 0x62, 0x41, 0x19, 0xaa, 0x8e, 0x20, 0xb5, 0x13, 0x52, 0xc5, 0xd8, 0x25, 0x3a, 0x09, 0x26, - 0x44, 0x90, 0x1c, 0x14, 0x1b, 0xd4, 0x3c, 0x42, 0xb7, 0x4e, 0x7d, 0x88, 0x3e, 0x09, 0x23, 0x63, - 0xa7, 0xb4, 0x82, 0x37, 0xe0, 0x09, 0x2a, 0x1c, 0x53, 0x41, 0x5b, 0x75, 0xb2, 0x8f, 0xce, 0xff, - 0x7f, 0xfe, 0x8f, 0x8f, 0xd9, 0x44, 0x11, 0xa3, 0x88, 0x04, 0x93, 0x38, 0xe5, 0xc9, 0x18, 0x02, - 0x89, 0x69, 0xc6, 0x96, 0x6d, 0x9f, 0x4b, 0x68, 0xb3, 0x39, 0xa4, 0x10, 0x0b, 0x77, 0x9e, 0xa2, - 0x44, 0xeb, 0x4c, 0x4b, 0xdd, 0x63, 0xa9, 0xab, 0xa5, 0xb5, 0x7f, 0x21, 0x86, 0xa8, 0x84, 0x6c, - 0x7f, 0x2b, 0x3c, 0xb5, 0xee, 0x8f, 0x78, 0x58, 0xc8, 0x09, 0xa6, 0x91, 0xcc, 0x06, 0x5c, 0xc2, - 0x08, 0x24, 0x68, 0x57, 0x35, 0x50, 0x36, 0xaf, 0xc0, 0x15, 0x85, 0x6e, 0xd1, 0xa2, 0x62, 0x3e, - 0x08, 0xfe, 0xc1, 0x09, 0x30, 0x4a, 0x8a, 0xbe, 0xf3, 0x50, 0x32, 0xcb, 0xb7, 0x2a, 0xb5, 0xf5, - 0x44, 0x4c, 0x6b, 0xc4, 0x13, 0x8c, 0xbd, 0x20, 0xe5, 0x20, 0x23, 0x4c, 0xbc, 0x31, 0xe7, 0x15, - 0x52, 0xff, 0xd5, 0xf8, 0xd3, 0xa9, 0xba, 0x1a, 0xbb, 0x07, 0x1d, 0x86, 0x70, 0xfb, 0x18, 0x25, - 0xbd, 0xc1, 0x2a, 0xb7, 0x8d, 0x5d, 0x6e, 0x57, 0x33, 0x88, 0x67, 0x57, 0xce, 0x57, 0x84, 0xf3, - 0xfc, 0x6a, 0x37, 0xc2, 0x48, 0x4e, 0x16, 0xbe, 0x1b, 0x60, 0xac, 0x03, 0xea, 0xa3, 0x25, 0x46, - 0x53, 0x26, 0xb3, 0x39, 0x17, 0x8a, 0x26, 0x86, 0x7f, 0x15, 0xa0, 0xaf, 0xfd, 0xd7, 0x9c, 0x5b, - 0x63, 0xb3, 0xf6, 0x09, 0x1a, 0x82, 0xf0, 0x02, 0x4c, 0xc4, 0x22, 0xe6, 0x95, 0x52, 0x9d, 0x34, - 0x7e, 0xf7, 0x9a, 0xab, 0xdc, 0x26, 0xbb, 0xdc, 0x3e, 0xff, 0x36, 0xc4, 0x91, 0xde, 0x19, 0xfe, - 0x3f, 0x79, 0xe0, 0x06, 0x44, 0xbf, 0xe8, 0xf4, 0x86, 0xab, 0x0d, 0x25, 0xeb, 0x0d, 0x25, 0x6f, - 0x1b, 0x4a, 0x1e, 0xb7, 0xd4, 0x58, 0x6f, 0xa9, 0xf1, 0xb2, 0xa5, 0xc6, 0xdd, 0xe5, 0x51, 0x7a, - 0xbd, 0xa1, 0xd6, 0x0c, 0x7c, 0x71, 0x28, 0xd8, 0xb2, 0xd3, 0x65, 0xf7, 0xa7, 0x4b, 0x53, 0x33, - 0xf9, 0x65, 0xf5, 0xcd, 0x17, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4f, 0x03, 0xe5, 0xb7, 0x38, - 0x02, 0x00, 0x00, + 0x06, 0x62, 0x41, 0x5b, 0xa9, 0xea, 0x08, 0x52, 0x3b, 0x21, 0x55, 0x8c, 0x5d, 0xa2, 0x93, 0x60, + 0x42, 0x04, 0xc9, 0x41, 0xb1, 0x41, 0xcd, 0x23, 0x74, 0xeb, 0xd4, 0x87, 0xe8, 0x93, 0x30, 0x32, + 0x76, 0x4a, 0x2b, 0x78, 0x03, 0x9e, 0xa0, 0xc2, 0x31, 0x15, 0xb4, 0x55, 0x27, 0xfb, 0xe8, 0xfc, + 0xff, 0xe7, 0xff, 0xf8, 0x98, 0x4d, 0x14, 0x31, 0x8a, 0x48, 0x30, 0x89, 0x13, 0x9e, 0x8c, 0x20, + 0x90, 0x98, 0x66, 0x6c, 0xd1, 0xf6, 0xb9, 0x84, 0x36, 0x9b, 0x41, 0x0a, 0xb1, 0x70, 0x67, 0x29, + 0x4a, 0xb4, 0x4e, 0xb4, 0xd4, 0x3d, 0x94, 0xba, 0x5a, 0x5a, 0xfb, 0x17, 0x62, 0x88, 0x4a, 0xc8, + 0x76, 0xb7, 0xc2, 0x53, 0x3b, 0xff, 0x11, 0x0f, 0x73, 0x39, 0xc6, 0x34, 0x92, 0x59, 0x9f, 0x4b, + 0x18, 0x82, 0x04, 0xed, 0xaa, 0x06, 0xca, 0xe6, 0x15, 0xb8, 0xa2, 0xd0, 0x2d, 0x5a, 0x54, 0xcc, + 0x07, 0xc1, 0x3f, 0x38, 0x01, 0x46, 0x49, 0xd1, 0x77, 0x1e, 0x4a, 0x66, 0xf9, 0x56, 0xa5, 0xb6, + 0x9e, 0x88, 0x69, 0x0d, 0x79, 0x82, 0xb1, 0x17, 0xa4, 0x1c, 0x64, 0x84, 0x89, 0x37, 0xe2, 0xbc, + 0x42, 0xea, 0xbf, 0x1a, 0x7f, 0x3a, 0x55, 0x57, 0x63, 0x77, 0xa0, 0xfd, 0x10, 0x6e, 0x0f, 0xa3, + 0xa4, 0xdb, 0x5f, 0xe6, 0xb6, 0xb1, 0xcd, 0xed, 0x6a, 0x06, 0xf1, 0xf4, 0xca, 0xf9, 0x8a, 0x70, + 0x9e, 0x5f, 0xed, 0x46, 0x18, 0xc9, 0xf1, 0xdc, 0x77, 0x03, 0x8c, 0x75, 0x40, 0x7d, 0xb4, 0xc4, + 0x70, 0xc2, 0x64, 0x36, 0xe3, 0x42, 0xd1, 0xc4, 0xe0, 0xaf, 0x02, 0xf4, 0xb4, 0xff, 0x9a, 0x73, + 0x6b, 0x64, 0xd6, 0x3e, 0x41, 0x43, 0x10, 0x5e, 0x80, 0x89, 0x98, 0xc7, 0xbc, 0x52, 0xaa, 0x93, + 0xc6, 0xef, 0x6e, 0x73, 0x99, 0xdb, 0x64, 0x9b, 0xdb, 0xa7, 0xdf, 0x86, 0x38, 0xd0, 0x3b, 0x83, + 0xff, 0x47, 0x0f, 0xdc, 0x80, 0xe8, 0x15, 0x9d, 0xee, 0x60, 0xb9, 0xa6, 0x64, 0xb5, 0xa6, 0xe4, + 0x6d, 0x4d, 0xc9, 0xe3, 0x86, 0x1a, 0xab, 0x0d, 0x35, 0x5e, 0x36, 0xd4, 0xb8, 0xbb, 0x3c, 0x48, + 0xaf, 0x37, 0xd4, 0x9a, 0x82, 0x2f, 0xf6, 0x05, 0x5b, 0x74, 0x2e, 0xd8, 0xfd, 0xf1, 0xd2, 0xd4, + 0x4c, 0x7e, 0x59, 0x7d, 0xf3, 0xd9, 0x7b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x47, 0xe0, 0x85, 0x8b, + 0x38, 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go index f69d50bbda8..157e5194cdc 100644 --- a/x/tokenfactory/types/query.pb.go +++ b/x/tokenfactory/types/query.pb.go @@ -499,55 +499,55 @@ func init() { } var fileDescriptor_6f22013ad0f72e3f = []byte{ - // 766 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0x4f, 0x4f, 0x13, 0x4f, - 0x18, 0xee, 0xf2, 0xfb, 0x51, 0x65, 0xfc, 0x07, 0x23, 0x0a, 0x2e, 0xd8, 0x85, 0x91, 0x60, 0x31, - 0xd8, 0x95, 0x3f, 0x26, 0x46, 0x24, 0xd0, 0x45, 0xd0, 0x04, 0x49, 0x74, 0x3d, 0x69, 0x62, 0x36, - 0xb3, 0xed, 0x50, 0x1a, 0x76, 0x77, 0xca, 0xce, 0x14, 0x6d, 0x08, 0x17, 0x0f, 0x9e, 0x4d, 0x3c, - 0xfa, 0x1d, 0x3c, 0xf1, 0x21, 0x38, 0x92, 0x70, 0xf1, 0xb4, 0x51, 0x30, 0x26, 0x5e, 0xfb, 0x09, - 0x4c, 0x67, 0xa7, 0x15, 0xda, 0xb2, 0xb4, 0x70, 0xea, 0x66, 0xe6, 0x79, 0x9f, 0xf7, 0x79, 0xde, - 0x77, 0xde, 0x37, 0x05, 0x49, 0xca, 0x5c, 0xca, 0xf2, 0x4c, 0xe7, 0x74, 0x9d, 0x78, 0xab, 0x38, - 0xc3, 0xa9, 0x5f, 0xd2, 0x37, 0x27, 0x6c, 0xc2, 0xf1, 0x84, 0xbe, 0x51, 0x24, 0x7e, 0x29, 0x55, - 0xf0, 0x29, 0xa7, 0x70, 0x50, 0x22, 0x53, 0x47, 0x91, 0x29, 0x89, 0x54, 0x7b, 0x73, 0x34, 0x47, - 0x05, 0x50, 0xaf, 0x7c, 0x85, 0x31, 0xea, 0x60, 0x8e, 0xd2, 0x9c, 0x43, 0x74, 0x5c, 0xc8, 0xeb, - 0xd8, 0xf3, 0x28, 0xc7, 0x3c, 0x4f, 0x3d, 0x26, 0x6f, 0xef, 0x65, 0x04, 0xa5, 0x6e, 0x63, 0x46, - 0xc2, 0x54, 0xb5, 0xc4, 0x05, 0x9c, 0xcb, 0x7b, 0x02, 0x2c, 0xb1, 0xd3, 0x91, 0x3a, 0x71, 0x91, - 0xaf, 0x51, 0x3f, 0xcf, 0x4b, 0x2b, 0x84, 0xe3, 0x2c, 0xe6, 0x58, 0x46, 0x8d, 0x45, 0x46, 0x15, - 0xb0, 0x8f, 0x5d, 0x29, 0x06, 0xf5, 0x02, 0xf8, 0xaa, 0x22, 0xe1, 0xa5, 0x38, 0x34, 0xc9, 0x46, - 0x91, 0x30, 0x8e, 0xde, 0x80, 0xeb, 0xc7, 0x4e, 0x59, 0x81, 0x7a, 0x8c, 0x40, 0x03, 0xc4, 0xc3, - 0xe0, 0x7e, 0x65, 0x48, 0x49, 0x5e, 0x9a, 0x1c, 0x49, 0x45, 0x15, 0x27, 0x15, 0x46, 0x1b, 0xff, - 0xef, 0x06, 0x5a, 0xcc, 0x94, 0x91, 0xe8, 0x05, 0x40, 0x82, 0xfa, 0x29, 0xf1, 0xa8, 0x9b, 0xae, - 0x37, 0x20, 0x05, 0xc0, 0x51, 0xd0, 0x99, 0xad, 0x00, 0x44, 0xa2, 0x2e, 0xa3, 0xbb, 0x1c, 0x68, - 0x97, 0x4b, 0xd8, 0x75, 0x1e, 0x23, 0x71, 0x8c, 0xcc, 0xf0, 0x1a, 0x7d, 0x53, 0xc0, 0x9d, 0x48, - 0x3a, 0xa9, 0xfc, 0x93, 0x02, 0x60, 0xad, 0x5a, 0x96, 0x2b, 0xaf, 0xa5, 0x8d, 0xe9, 0x68, 0x1b, - 0xcd, 0xa9, 0x8d, 0xe1, 0x8a, 0xad, 0x72, 0xa0, 0xdd, 0x0a, 0x75, 0x35, 0xb2, 0x23, 0xb3, 0xa7, - 0xa1, 0x41, 0x68, 0x05, 0xdc, 0xfe, 0xa7, 0x97, 0x2d, 0xf9, 0xd4, 0x5d, 0xf0, 0x09, 0xe6, 0xd4, - 0xaf, 0x3a, 0x1f, 0x07, 0x17, 0x32, 0xe1, 0x89, 0xf4, 0x0e, 0xcb, 0x81, 0x76, 0x35, 0xcc, 0x21, - 0x2f, 0x90, 0x59, 0x85, 0xa0, 0x65, 0x90, 0x38, 0x89, 0x4e, 0x3a, 0x1f, 0x03, 0x71, 0x51, 0xaa, - 0x4a, 0xcf, 0xfe, 0x4b, 0x76, 0x19, 0x3d, 0xe5, 0x40, 0xbb, 0x72, 0xa4, 0x94, 0x0c, 0x99, 0x12, - 0x80, 0x96, 0xc1, 0xb0, 0x20, 0x33, 0xc8, 0x2a, 0xf5, 0xc9, 0x6b, 0xe2, 0x65, 0x9f, 0x53, 0xba, - 0x9e, 0xce, 0x66, 0x7d, 0xc2, 0x58, 0xbb, 0x9d, 0x71, 0x64, 0x9f, 0x4f, 0x20, 0x93, 0xea, 0x96, - 0x40, 0x77, 0x65, 0x1a, 0xde, 0x63, 0xe6, 0x5a, 0x38, 0xbc, 0x93, 0xc4, 0x03, 0xe5, 0x40, 0xeb, - 0x93, 0xb6, 0xeb, 0x10, 0xc8, 0xbc, 0x56, 0x3d, 0x92, 0x7c, 0x68, 0x0c, 0xdc, 0x15, 0xd9, 0xd2, - 0x8e, 0x73, 0x3c, 0x21, 0x93, 0x08, 0x52, 0x7b, 0xdb, 0x3b, 0x0a, 0x48, 0x9e, 0x8e, 0x6d, 0xbb, - 0x7a, 0xf0, 0x1d, 0x50, 0x6d, 0x41, 0x67, 0x31, 0xe2, 0x65, 0xad, 0x35, 0x4a, 0xd7, 0xab, 0x82, - 0x09, 0xeb, 0xef, 0x10, 0xe1, 0x43, 0xe5, 0x40, 0x1b, 0x0c, 0xc3, 0x8f, 0x62, 0x6b, 0x30, 0x64, - 0xf6, 0xd9, 0xcd, 0xea, 0x45, 0xd8, 0xe4, 0xce, 0x45, 0xd0, 0x29, 0x64, 0xc3, 0xaf, 0x0a, 0x88, - 0x87, 0xa3, 0x05, 0x1f, 0x44, 0xbf, 0xdc, 0xc6, 0xc9, 0x56, 0x27, 0xda, 0x88, 0x08, 0x6b, 0x80, - 0xc6, 0x3f, 0xee, 0xff, 0xfa, 0xd2, 0x31, 0x0a, 0x47, 0xf4, 0x16, 0xd6, 0x0a, 0xfc, 0xad, 0x80, - 0x9b, 0xcd, 0x27, 0x06, 0xce, 0xb7, 0x90, 0x3b, 0x72, 0x2d, 0xa8, 0xe9, 0x73, 0x30, 0x48, 0x37, - 0xcf, 0x84, 0x9b, 0x34, 0x9c, 0x8b, 0x76, 0x13, 0x36, 0x55, 0xdf, 0x12, 0xbf, 0xdb, 0x7a, 0xe3, - 0x74, 0xc3, 0x7d, 0x05, 0xf4, 0x34, 0x8c, 0x1d, 0x9c, 0x69, 0x55, 0x61, 0x93, 0xd9, 0x57, 0x9f, - 0x9c, 0x2d, 0x58, 0x3a, 0x5b, 0x10, 0xce, 0x66, 0xe1, 0x4c, 0x2b, 0xce, 0xac, 0x55, 0x9f, 0xba, - 0x96, 0x5c, 0x23, 0xfa, 0x96, 0xfc, 0xd8, 0x86, 0x3f, 0x15, 0x70, 0xa3, 0xe9, 0xc8, 0xc2, 0xb9, - 0x16, 0xc4, 0x45, 0x6d, 0x0e, 0x75, 0xfe, 0xec, 0x04, 0xd2, 0xe1, 0xa2, 0x70, 0x38, 0x07, 0x67, - 0xdb, 0xea, 0x5d, 0xfd, 0x54, 0xc2, 0x3f, 0x0a, 0x18, 0x88, 0x18, 0x7e, 0xb8, 0xd8, 0x82, 0xd0, - 0xd3, 0x17, 0x8d, 0xba, 0x74, 0x5e, 0x1a, 0xe9, 0x7a, 0x46, 0xb8, 0x7e, 0x08, 0xa7, 0xa2, 0x5d, - 0x63, 0xc7, 0xb1, 0xea, 0xad, 0x32, 0xc3, 0xdc, 0x3d, 0x48, 0x28, 0x7b, 0x07, 0x09, 0xe5, 0xc7, - 0x41, 0x42, 0xf9, 0x7c, 0x98, 0x88, 0xed, 0x1d, 0x26, 0x62, 0xdf, 0x0f, 0x13, 0xb1, 0xb7, 0x8f, - 0x72, 0x79, 0xbe, 0x56, 0xb4, 0x53, 0x19, 0xea, 0x56, 0x89, 0xef, 0x3b, 0xd8, 0x66, 0xb5, 0x2c, - 0x9b, 0x93, 0xd3, 0xfa, 0x87, 0xe3, 0xb9, 0x78, 0xa9, 0x40, 0x98, 0x1d, 0x17, 0x7f, 0x1d, 0xa6, - 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x6a, 0xe3, 0x94, 0x45, 0x09, 0x00, 0x00, + // 767 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xcf, 0x4f, 0x13, 0x4d, + 0x18, 0xee, 0xf2, 0x7d, 0xf4, 0xfb, 0x18, 0x7f, 0xc1, 0x88, 0x82, 0x0b, 0x76, 0x61, 0x24, 0x58, + 0x0c, 0x76, 0xe5, 0x57, 0x62, 0x44, 0x02, 0x5d, 0x04, 0x4d, 0x90, 0x44, 0xd7, 0x93, 0x26, 0x66, + 0x33, 0xdb, 0x0e, 0xa5, 0x61, 0x77, 0xa7, 0xec, 0x4c, 0xd1, 0x86, 0x70, 0xf1, 0xe0, 0xd9, 0xc4, + 0xa3, 0xff, 0x83, 0x27, 0xfe, 0x08, 0x8e, 0x24, 0x5c, 0x3c, 0x6d, 0x14, 0x8c, 0x89, 0xd7, 0xfe, + 0x05, 0xa6, 0xb3, 0xd3, 0x0a, 0x6d, 0x59, 0x5a, 0x38, 0x75, 0x33, 0xf3, 0xbc, 0xcf, 0xfb, 0x3c, + 0xef, 0x3b, 0xef, 0x9b, 0x82, 0x24, 0x65, 0x2e, 0x65, 0x79, 0xa6, 0x73, 0xba, 0x41, 0xbc, 0x35, + 0x9c, 0xe1, 0xd4, 0x2f, 0xe9, 0x5b, 0x13, 0x36, 0xe1, 0x78, 0x42, 0xdf, 0x2c, 0x12, 0xbf, 0x94, + 0x2a, 0xf8, 0x94, 0x53, 0x38, 0x28, 0x91, 0xa9, 0xe3, 0xc8, 0x94, 0x44, 0xaa, 0xbd, 0x39, 0x9a, + 0xa3, 0x02, 0xa8, 0x57, 0xbe, 0xc2, 0x18, 0x75, 0x30, 0x47, 0x69, 0xce, 0x21, 0x3a, 0x2e, 0xe4, + 0x75, 0xec, 0x79, 0x94, 0x63, 0x9e, 0xa7, 0x1e, 0x93, 0xb7, 0xf7, 0x32, 0x82, 0x52, 0xb7, 0x31, + 0x23, 0x61, 0xaa, 0x5a, 0xe2, 0x02, 0xce, 0xe5, 0x3d, 0x01, 0x96, 0xd8, 0xe9, 0x48, 0x9d, 0xb8, + 0xc8, 0xd7, 0xa9, 0x9f, 0xe7, 0xa5, 0x55, 0xc2, 0x71, 0x16, 0x73, 0x2c, 0xa3, 0xc6, 0x22, 0xa3, + 0x0a, 0xd8, 0xc7, 0xae, 0x14, 0x83, 0x7a, 0x01, 0x7c, 0x59, 0x91, 0xf0, 0x42, 0x1c, 0x9a, 0x64, + 0xb3, 0x48, 0x18, 0x47, 0xaf, 0xc1, 0xf5, 0x13, 0xa7, 0xac, 0x40, 0x3d, 0x46, 0xa0, 0x01, 0xe2, + 0x61, 0x70, 0xbf, 0x32, 0xa4, 0x24, 0x2f, 0x4d, 0x8e, 0xa4, 0xa2, 0x8a, 0x93, 0x0a, 0xa3, 0x8d, + 0x7f, 0xf7, 0x02, 0x2d, 0x66, 0xca, 0x48, 0xf4, 0x1c, 0x20, 0x41, 0xfd, 0x84, 0x78, 0xd4, 0x4d, + 0xd7, 0x1b, 0x90, 0x02, 0xe0, 0x28, 0xe8, 0xcc, 0x56, 0x00, 0x22, 0x51, 0x97, 0xd1, 0x5d, 0x0e, + 0xb4, 0xcb, 0x25, 0xec, 0x3a, 0x8f, 0x90, 0x38, 0x46, 0x66, 0x78, 0x8d, 0xbe, 0x2a, 0xe0, 0x4e, + 0x24, 0x9d, 0x54, 0xfe, 0x51, 0x01, 0xb0, 0x56, 0x2d, 0xcb, 0x95, 0xd7, 0xd2, 0xc6, 0x74, 0xb4, + 0x8d, 0xe6, 0xd4, 0xc6, 0x70, 0xc5, 0x56, 0x39, 0xd0, 0x6e, 0x85, 0xba, 0x1a, 0xd9, 0x91, 0xd9, + 0xd3, 0xd0, 0x20, 0xb4, 0x0a, 0x6e, 0xff, 0xd5, 0xcb, 0x96, 0x7d, 0xea, 0x2e, 0xfa, 0x04, 0x73, + 0xea, 0x57, 0x9d, 0x8f, 0x83, 0xff, 0x32, 0xe1, 0x89, 0xf4, 0x0e, 0xcb, 0x81, 0x76, 0x35, 0xcc, + 0x21, 0x2f, 0x90, 0x59, 0x85, 0xa0, 0x15, 0x90, 0x38, 0x8d, 0x4e, 0x3a, 0x1f, 0x03, 0x71, 0x51, + 0xaa, 0x4a, 0xcf, 0xfe, 0x49, 0x76, 0x19, 0x3d, 0xe5, 0x40, 0xbb, 0x72, 0xac, 0x94, 0x0c, 0x99, + 0x12, 0x80, 0x56, 0xc0, 0xb0, 0x20, 0x33, 0xc8, 0x1a, 0xf5, 0xc9, 0x2b, 0xe2, 0x65, 0x9f, 0x51, + 0xba, 0x91, 0xce, 0x66, 0x7d, 0xc2, 0x58, 0xbb, 0x9d, 0x71, 0x64, 0x9f, 0x4f, 0x21, 0x93, 0xea, + 0x96, 0x41, 0x77, 0x65, 0x1a, 0xde, 0x61, 0xe6, 0x5a, 0x38, 0xbc, 0x93, 0xc4, 0x03, 0xe5, 0x40, + 0xeb, 0x93, 0xb6, 0xeb, 0x10, 0xc8, 0xbc, 0x56, 0x3d, 0x92, 0x7c, 0x68, 0x0c, 0xdc, 0x15, 0xd9, + 0xd2, 0x8e, 0x73, 0x32, 0x21, 0x93, 0x08, 0x52, 0x7b, 0xdb, 0xbb, 0x0a, 0x48, 0x9e, 0x8d, 0x6d, + 0xbb, 0x7a, 0xf0, 0x2d, 0x50, 0x6d, 0x41, 0x67, 0x31, 0xe2, 0x65, 0xad, 0x75, 0x4a, 0x37, 0xaa, + 0x82, 0x09, 0xeb, 0xef, 0x10, 0xe1, 0x43, 0xe5, 0x40, 0x1b, 0x0c, 0xc3, 0x8f, 0x63, 0x6b, 0x30, + 0x64, 0xf6, 0xd9, 0xcd, 0xea, 0x45, 0xd8, 0xe4, 0xee, 0xff, 0xa0, 0x53, 0xc8, 0x86, 0x5f, 0x14, + 0x10, 0x0f, 0x47, 0x0b, 0x3e, 0x88, 0x7e, 0xb9, 0x8d, 0x93, 0xad, 0x4e, 0xb4, 0x11, 0x11, 0xd6, + 0x00, 0x8d, 0x7f, 0x38, 0xf8, 0xf9, 0xb9, 0x63, 0x14, 0x8e, 0xe8, 0x2d, 0xac, 0x15, 0xf8, 0x4b, + 0x01, 0x37, 0x9b, 0x4f, 0x0c, 0x5c, 0x68, 0x21, 0x77, 0xe4, 0x5a, 0x50, 0xd3, 0x17, 0x60, 0x90, + 0x6e, 0x9e, 0x0a, 0x37, 0x69, 0x38, 0x1f, 0xed, 0x26, 0x6c, 0xaa, 0xbe, 0x2d, 0x7e, 0x77, 0xf4, + 0xc6, 0xe9, 0x86, 0x07, 0x0a, 0xe8, 0x69, 0x18, 0x3b, 0x38, 0xdb, 0xaa, 0xc2, 0x26, 0xb3, 0xaf, + 0x3e, 0x3e, 0x5f, 0xb0, 0x74, 0xb6, 0x28, 0x9c, 0xcd, 0xc1, 0xd9, 0x56, 0x9c, 0x59, 0x6b, 0x3e, + 0x75, 0x2d, 0xb9, 0x46, 0xf4, 0x6d, 0xf9, 0xb1, 0x03, 0x7f, 0x28, 0xe0, 0x46, 0xd3, 0x91, 0x85, + 0xf3, 0x2d, 0x88, 0x8b, 0xda, 0x1c, 0xea, 0xc2, 0xf9, 0x09, 0xa4, 0xc3, 0x25, 0xe1, 0x70, 0x1e, + 0xce, 0xb5, 0xd5, 0xbb, 0xfa, 0xa9, 0x84, 0xbf, 0x15, 0x30, 0x10, 0x31, 0xfc, 0x70, 0xa9, 0x05, + 0xa1, 0x67, 0x2f, 0x1a, 0x75, 0xf9, 0xa2, 0x34, 0xd2, 0xf5, 0xac, 0x70, 0x3d, 0x03, 0xa7, 0xa2, + 0x5d, 0x63, 0xc7, 0xb1, 0xea, 0xad, 0x32, 0xc3, 0xdc, 0x3b, 0x4c, 0x28, 0xfb, 0x87, 0x09, 0xe5, + 0xfb, 0x61, 0x42, 0xf9, 0x74, 0x94, 0x88, 0xed, 0x1f, 0x25, 0x62, 0xdf, 0x8e, 0x12, 0xb1, 0x37, + 0x0f, 0x73, 0x79, 0xbe, 0x5e, 0xb4, 0x53, 0x19, 0xea, 0x56, 0x89, 0xef, 0x3b, 0xd8, 0x66, 0xb5, + 0x2c, 0x5b, 0x93, 0x33, 0xfa, 0xfb, 0x93, 0xb9, 0x78, 0xa9, 0x40, 0x98, 0x1d, 0x17, 0x7f, 0x1d, + 0xa6, 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0x05, 0x89, 0x83, 0xa8, 0x45, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/tokenfactory/types/tx.pb.go b/x/tokenfactory/types/tx.pb.go index a907aadfb63..92b52f49b3e 100644 --- a/x/tokenfactory/types/tx.pb.go +++ b/x/tokenfactory/types/tx.pb.go @@ -760,62 +760,62 @@ var fileDescriptor_283b6c9a90a846b4 = []byte{ // 919 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcf, 0x8f, 0xdb, 0x44, 0x14, 0x5e, 0xb7, 0x65, 0xd9, 0x4e, 0x59, 0x36, 0xf1, 0x2e, 0x6d, 0x6a, 0xb6, 0x76, 0x6b, 0xd4, - 0xa5, 0x94, 0xda, 0x56, 0x42, 0x85, 0x20, 0xb7, 0xa6, 0x50, 0x55, 0x2a, 0xb9, 0xb8, 0x7b, 0x42, - 0x95, 0xa2, 0x71, 0x32, 0xf1, 0x5a, 0xa9, 0x67, 0x16, 0xcf, 0xa4, 0xe9, 0xde, 0x90, 0xb8, 0x71, - 0xe2, 0xc0, 0x1f, 0x01, 0xb7, 0xfe, 0x05, 0x1c, 0x38, 0xf5, 0x58, 0x89, 0x0b, 0x27, 0x0b, 0x6d, - 0x84, 0x7a, 0xe0, 0xe6, 0xbf, 0x00, 0xcd, 0x0f, 0x3b, 0x71, 0x12, 0x36, 0xc9, 0x01, 0xed, 0x65, - 0xb5, 0x9e, 0xf9, 0xbe, 0x37, 0xef, 0xfb, 0xe6, 0xbd, 0x37, 0x01, 0xb7, 0x09, 0x8d, 0x09, 0x8d, - 0xa8, 0xc7, 0xc8, 0x00, 0xe1, 0x3e, 0xec, 0x32, 0x92, 0x9c, 0x78, 0x2f, 0xea, 0x01, 0x62, 0xb0, - 0xee, 0xb1, 0x97, 0xee, 0x71, 0x42, 0x18, 0xd1, 0xf7, 0x15, 0xcc, 0x9d, 0x86, 0xb9, 0x0a, 0x66, - 0xec, 0x85, 0x24, 0x24, 0x02, 0xe8, 0xf1, 0xff, 0x24, 0xc7, 0xa8, 0xc2, 0x38, 0xc2, 0xc4, 0x13, - 0x7f, 0xd5, 0x92, 0xd9, 0x15, 0x71, 0xbc, 0x00, 0x52, 0x54, 0x1c, 0xd2, 0x25, 0x11, 0x9e, 0xdb, - 0xc7, 0x83, 0x62, 0x9f, 0x7f, 0xc8, 0x7d, 0xfb, 0x67, 0x0d, 0xbc, 0xdf, 0xa6, 0xe1, 0xc3, 0x04, - 0x41, 0x86, 0xbe, 0x42, 0x98, 0xc4, 0xfa, 0x27, 0x60, 0x93, 0x22, 0xdc, 0x43, 0x49, 0x4d, 0xbb, - 0xa9, 0xdd, 0xb9, 0xdc, 0xaa, 0x66, 0xa9, 0xb5, 0x7d, 0x02, 0xe3, 0xe7, 0x4d, 0x5b, 0xae, 0xdb, - 0xbe, 0x02, 0xe8, 0x1e, 0xd8, 0xa2, 0xc3, 0xa0, 0xc7, 0x69, 0xb5, 0x0b, 0x02, 0xbc, 0x9b, 0xa5, - 0xd6, 0x8e, 0x02, 0xab, 0x1d, 0xdb, 0x2f, 0x40, 0xcd, 0x83, 0x1f, 0xdf, 0xbe, 0xba, 0x7b, 0x6b, - 0xa1, 0x43, 0x5d, 0x91, 0x82, 0x23, 0x29, 0xcf, 0xc0, 0xd5, 0x72, 0x56, 0x3e, 0xa2, 0xc7, 0x04, - 0x53, 0xa4, 0xb7, 0xc0, 0x0e, 0x46, 0xa3, 0x8e, 0xa0, 0x76, 0xe4, 0xc9, 0x32, 0x4d, 0x23, 0x4b, - 0xad, 0xab, 0xf2, 0xe4, 0x19, 0x80, 0xed, 0x6f, 0x63, 0x34, 0x3a, 0xe4, 0x0b, 0x22, 0x96, 0xfd, - 0xb7, 0x06, 0xde, 0x6d, 0xd3, 0xb0, 0x1d, 0x61, 0xb6, 0x8e, 0xda, 0xc7, 0x60, 0x13, 0xc6, 0x64, - 0x88, 0x99, 0xd0, 0x7a, 0xa5, 0x71, 0xdd, 0x95, 0xe6, 0xba, 0xdc, 0xfc, 0xfc, 0xea, 0xdc, 0x87, - 0x24, 0xc2, 0xad, 0x0f, 0x5e, 0xa7, 0xd6, 0xc6, 0x24, 0x92, 0xa4, 0xd9, 0xbe, 0xe2, 0xeb, 0x5f, - 0x83, 0xed, 0x38, 0xc2, 0xec, 0x90, 0x3c, 0xe8, 0xf5, 0x12, 0x44, 0x69, 0xed, 0xa2, 0x38, 0xdb, - 0x9a, 0x48, 0xe0, 0xdb, 0x1d, 0x46, 0x3a, 0x50, 0x02, 0xec, 0x5f, 0xde, 0xbe, 0xba, 0xab, 0xf9, - 0x65, 0x56, 0xd3, 0xe4, 0x6e, 0x5e, 0x5f, 0xe8, 0x26, 0x07, 0xda, 0x55, 0xb0, 0xa3, 0x64, 0xe6, - 0xf6, 0xd9, 0xff, 0x48, 0xe9, 0xad, 0x61, 0x82, 0xcf, 0x47, 0xfa, 0x13, 0xb0, 0x13, 0x0c, 0x13, - 0xfc, 0x28, 0x21, 0x71, 0x59, 0xfc, 0xad, 0x2c, 0xb5, 0x6a, 0x92, 0xc3, 0x01, 0x9d, 0x7e, 0x42, - 0xe2, 0x19, 0xf9, 0xb3, 0xcc, 0xb3, 0x0c, 0xe0, 0x50, 0x65, 0x00, 0x17, 0x5b, 0x18, 0xf0, 0x9b, - 0x2a, 0xf8, 0x23, 0x88, 0x43, 0xf4, 0xa0, 0x17, 0x47, 0x6b, 0xf9, 0x70, 0x00, 0xde, 0x99, 0xae, - 0xf6, 0x4a, 0x96, 0x5a, 0xef, 0x49, 0xa4, 0xaa, 0x34, 0xb9, 0xad, 0xd7, 0xc1, 0x65, 0x5e, 0x84, - 0x90, 0xc7, 0x57, 0xfa, 0xf6, 0xb2, 0xd4, 0xaa, 0x4c, 0xea, 0x53, 0x6c, 0xd9, 0xfe, 0x16, 0x46, - 0x23, 0x91, 0xc5, 0x99, 0xad, 0x21, 0x92, 0x75, 0x24, 0xa5, 0x26, 0x5b, 0x63, 0x92, 0x7f, 0x21, - 0x6d, 0xac, 0x81, 0xbd, 0x36, 0x0d, 0x9f, 0x22, 0xd6, 0x42, 0x7d, 0x92, 0xa0, 0xa7, 0x08, 0xf7, - 0x1e, 0x13, 0x32, 0xf8, 0x3f, 0x04, 0x3e, 0x01, 0x15, 0x5e, 0x01, 0x23, 0x48, 0x8b, 0x4b, 0x52, - 0x3a, 0x6f, 0x66, 0xa9, 0x75, 0x4d, 0x52, 0x66, 0x11, 0xf9, 0x35, 0xe6, 0xeb, 0xf9, 0x35, 0x7e, - 0xca, 0xa5, 0x1f, 0x2c, 0x94, 0x4e, 0x11, 0x73, 0x02, 0xd4, 0x77, 0x78, 0x7a, 0xce, 0x11, 0x21, - 0x03, 0xdb, 0x04, 0xfb, 0x8b, 0x44, 0x16, 0x2e, 0xfc, 0xae, 0x81, 0x5d, 0x09, 0x10, 0xcd, 0xde, - 0x46, 0x0c, 0xf6, 0x20, 0x83, 0xeb, 0x98, 0xe0, 0x83, 0xad, 0x58, 0xd1, 0x54, 0xbd, 0xdf, 0x98, - 0xd4, 0x3b, 0x1e, 0x14, 0xf5, 0x9e, 0xc7, 0x6e, 0x5d, 0x53, 0x35, 0xaf, 0x26, 0x5f, 0x4e, 0xb6, - 0xfd, 0x22, 0x4e, 0xf3, 0x1e, 0xd7, 0xf8, 0xf1, 0x7f, 0x6a, 0x14, 0xae, 0x3a, 0x05, 0xf1, 0x06, - 0xf8, 0x70, 0x81, 0x86, 0x42, 0xe3, 0x1f, 0x17, 0x40, 0xa5, 0x4d, 0xc3, 0x47, 0x24, 0xe9, 0xa2, - 0xc3, 0x04, 0x62, 0xda, 0x47, 0xc9, 0xf9, 0xb4, 0xb3, 0x0f, 0x76, 0x99, 0x4a, 0x60, 0xbe, 0xa5, - 0x79, 0x29, 0xec, 0x4b, 0x5e, 0x0e, 0x2a, 0xb7, 0xb5, 0xbf, 0x88, 0xac, 0x7f, 0x03, 0xaa, 0xf9, - 0xf2, 0x64, 0x42, 0x5e, 0x12, 0x11, 0xcd, 0x2c, 0xb5, 0x8c, 0x99, 0x88, 0x53, 0x53, 0xd2, 0x9f, - 0x27, 0x36, 0xef, 0x70, 0xe3, 0x3f, 0x5a, 0x68, 0x7c, 0x9f, 0xfb, 0xe7, 0xe4, 0x14, 0xdb, 0x00, - 0xb5, 0x59, 0x53, 0x73, 0xc7, 0x1b, 0xbf, 0x6e, 0x82, 0x8b, 0x6d, 0x1a, 0xea, 0xdf, 0x81, 0x2b, - 0xd3, 0x6f, 0xe5, 0x3d, 0xf7, 0xac, 0x67, 0xdc, 0x2d, 0xbf, 0x61, 0xc6, 0xfd, 0x75, 0xd0, 0xc5, - 0x8b, 0xf7, 0x0c, 0x5c, 0x12, 0x2f, 0xd5, 0xed, 0xa5, 0x6c, 0x0e, 0x33, 0x9c, 0x95, 0x60, 0xd3, - 0xd1, 0xc5, 0x63, 0xb0, 0x3c, 0x3a, 0x87, 0xad, 0x10, 0x7d, 0x7a, 0xda, 0x0a, 0xbb, 0xa6, 0x26, - 0xed, 0x0a, 0x76, 0x4d, 0xd0, 0xab, 0xd8, 0x35, 0x3f, 0x05, 0xf5, 0xef, 0x35, 0x50, 0x99, 0x6b, - 0xfe, 0xfa, 0xd2, 0x50, 0xb3, 0x14, 0xe3, 0xcb, 0xb5, 0x29, 0x45, 0x0a, 0x3f, 0x68, 0xa0, 0x3a, - 0x3f, 0x85, 0x1b, 0xab, 0x04, 0x2c, 0x73, 0x8c, 0xe6, 0xfa, 0x9c, 0x22, 0x8b, 0x11, 0xd8, 0x2e, - 0x0f, 0x08, 0x77, 0x69, 0xb0, 0x12, 0xde, 0xf8, 0x7c, 0x3d, 0x7c, 0x7e, 0x70, 0xcb, 0x7f, 0x7d, - 0x6a, 0x6a, 0x6f, 0x4e, 0x4d, 0xed, 0xaf, 0x53, 0x53, 0xfb, 0x69, 0x6c, 0x6e, 0xbc, 0x19, 0x9b, - 0x1b, 0x7f, 0x8e, 0xcd, 0x8d, 0x6f, 0xbf, 0x08, 0x23, 0x76, 0x34, 0x0c, 0xdc, 0x2e, 0x89, 0x3d, - 0x15, 0xdb, 0x79, 0x0e, 0x03, 0x9a, 0x7f, 0x78, 0x2f, 0x1a, 0xf7, 0xbd, 0x97, 0xe5, 0x26, 0x65, - 0x27, 0xc7, 0x88, 0x06, 0x9b, 0xe2, 0xe7, 0xea, 0x67, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xee, - 0x68, 0x78, 0x97, 0x5e, 0x0b, 0x00, 0x00, + 0xa5, 0x94, 0xda, 0x56, 0xc2, 0x0f, 0x41, 0x6e, 0x4d, 0xa1, 0xaa, 0x54, 0x72, 0x71, 0xf7, 0x84, + 0x2a, 0x45, 0xe3, 0x64, 0xe2, 0xb5, 0x52, 0xcf, 0x2c, 0x9e, 0x49, 0xd3, 0xbd, 0x21, 0x71, 0xe3, + 0xc4, 0x81, 0x3f, 0x02, 0x6e, 0xfd, 0x0b, 0x38, 0x70, 0xea, 0xb1, 0x12, 0x17, 0x4e, 0x16, 0xda, + 0x08, 0xf5, 0xc0, 0xcd, 0x7f, 0x01, 0x9a, 0x1f, 0x76, 0xe2, 0x24, 0x6c, 0x92, 0x03, 0xda, 0xcb, + 0x6a, 0x3d, 0xf3, 0x7d, 0x6f, 0xde, 0xf7, 0xcd, 0x7b, 0x6f, 0x02, 0x6e, 0x13, 0x1a, 0x13, 0x1a, + 0x51, 0x8f, 0x91, 0x01, 0xc2, 0x7d, 0xd8, 0x65, 0x24, 0x39, 0xf1, 0x9e, 0xd7, 0x03, 0xc4, 0x60, + 0xdd, 0x63, 0x2f, 0xdc, 0xe3, 0x84, 0x30, 0xa2, 0xef, 0x2b, 0x98, 0x3b, 0x0d, 0x73, 0x15, 0xcc, + 0xd8, 0x0b, 0x49, 0x48, 0x04, 0xd0, 0xe3, 0xff, 0x49, 0x8e, 0x51, 0x85, 0x71, 0x84, 0x89, 0x27, + 0xfe, 0xaa, 0x25, 0xb3, 0x2b, 0xe2, 0x78, 0x01, 0xa4, 0xa8, 0x38, 0xa4, 0x4b, 0x22, 0x3c, 0xb7, + 0x8f, 0x07, 0xc5, 0x3e, 0xff, 0x90, 0xfb, 0xf6, 0xcf, 0x1a, 0x78, 0xb7, 0x4d, 0xc3, 0x07, 0x09, + 0x82, 0x0c, 0x7d, 0x85, 0x30, 0x89, 0xf5, 0x8f, 0xc0, 0x26, 0x45, 0xb8, 0x87, 0x92, 0x9a, 0x76, + 0x53, 0xbb, 0x73, 0xb9, 0x55, 0xcd, 0x52, 0x6b, 0xfb, 0x04, 0xc6, 0xcf, 0x9a, 0xb6, 0x5c, 0xb7, + 0x7d, 0x05, 0xd0, 0x3d, 0xb0, 0x45, 0x87, 0x41, 0x8f, 0xd3, 0x6a, 0x17, 0x04, 0x78, 0x37, 0x4b, + 0xad, 0x1d, 0x05, 0x56, 0x3b, 0xb6, 0x5f, 0x80, 0x9a, 0x07, 0x3f, 0xbe, 0x79, 0x79, 0xf7, 0xd6, + 0x42, 0x87, 0xba, 0x22, 0x05, 0x47, 0x52, 0x9e, 0x82, 0xab, 0xe5, 0xac, 0x7c, 0x44, 0x8f, 0x09, + 0xa6, 0x48, 0x6f, 0x81, 0x1d, 0x8c, 0x46, 0x1d, 0x41, 0xed, 0xc8, 0x93, 0x65, 0x9a, 0x46, 0x96, + 0x5a, 0x57, 0xe5, 0xc9, 0x33, 0x00, 0xdb, 0xdf, 0xc6, 0x68, 0x74, 0xc8, 0x17, 0x44, 0x2c, 0xfb, + 0x6f, 0x0d, 0xbc, 0xdd, 0xa6, 0x61, 0x3b, 0xc2, 0x6c, 0x1d, 0xb5, 0x8f, 0xc0, 0x26, 0x8c, 0xc9, + 0x10, 0x33, 0xa1, 0xf5, 0x4a, 0xe3, 0xba, 0x2b, 0xcd, 0x75, 0xb9, 0xf9, 0xf9, 0xd5, 0xb9, 0x0f, + 0x48, 0x84, 0x5b, 0xef, 0xbd, 0x4a, 0xad, 0x8d, 0x49, 0x24, 0x49, 0xb3, 0x7d, 0xc5, 0xd7, 0xbf, + 0x06, 0xdb, 0x71, 0x84, 0xd9, 0x21, 0xb9, 0xdf, 0xeb, 0x25, 0x88, 0xd2, 0xda, 0x45, 0x71, 0xb6, + 0x35, 0x91, 0xc0, 0xb7, 0x3b, 0x8c, 0x74, 0xa0, 0x04, 0xd8, 0xbf, 0xbc, 0x79, 0x79, 0x57, 0xf3, + 0xcb, 0xac, 0xa6, 0xc9, 0xdd, 0xbc, 0xbe, 0xd0, 0x4d, 0x0e, 0xb4, 0xab, 0x60, 0x47, 0xc9, 0xcc, + 0xed, 0xb3, 0xff, 0x91, 0xd2, 0x5b, 0xc3, 0x04, 0x9f, 0x8f, 0xf4, 0xc7, 0x60, 0x27, 0x18, 0x26, + 0xf8, 0x61, 0x42, 0xe2, 0xb2, 0xf8, 0x5b, 0x59, 0x6a, 0xd5, 0x24, 0x87, 0x03, 0x3a, 0xfd, 0x84, + 0xc4, 0x33, 0xf2, 0x67, 0x99, 0x67, 0x19, 0xc0, 0xa1, 0xca, 0x00, 0x2e, 0xb6, 0x30, 0xe0, 0x37, + 0x55, 0xf0, 0x47, 0x10, 0x87, 0xe8, 0x7e, 0x2f, 0x8e, 0xd6, 0xf2, 0xe1, 0x00, 0xbc, 0x35, 0x5d, + 0xed, 0x95, 0x2c, 0xb5, 0xde, 0x91, 0x48, 0x55, 0x69, 0x72, 0x5b, 0xaf, 0x83, 0xcb, 0xbc, 0x08, + 0x21, 0x8f, 0xaf, 0xf4, 0xed, 0x65, 0xa9, 0x55, 0x99, 0xd4, 0xa7, 0xd8, 0xb2, 0xfd, 0x2d, 0x8c, + 0x46, 0x22, 0x8b, 0x33, 0x5b, 0x43, 0x24, 0xeb, 0x48, 0x4a, 0x4d, 0xb6, 0xc6, 0x24, 0xff, 0x42, + 0xda, 0x58, 0x03, 0x7b, 0x6d, 0x1a, 0x3e, 0x41, 0xac, 0x85, 0xfa, 0x24, 0x41, 0x4f, 0x10, 0xee, + 0x3d, 0x22, 0x64, 0xf0, 0x7f, 0x08, 0x7c, 0x0c, 0x2a, 0xbc, 0x02, 0x46, 0x90, 0x16, 0x97, 0xa4, + 0x74, 0xde, 0xcc, 0x52, 0xeb, 0x9a, 0xa4, 0xcc, 0x22, 0xf2, 0x6b, 0xcc, 0xd7, 0xf3, 0x6b, 0xfc, + 0x98, 0x4b, 0x3f, 0x58, 0x28, 0x9d, 0x22, 0xe6, 0x04, 0xa8, 0xef, 0xf0, 0xf4, 0x9c, 0x23, 0x42, + 0x06, 0xb6, 0x09, 0xf6, 0x17, 0x89, 0x2c, 0x5c, 0xf8, 0x5d, 0x03, 0xbb, 0x12, 0x20, 0x9a, 0xbd, + 0x8d, 0x18, 0xec, 0x41, 0x06, 0xd7, 0x31, 0xc1, 0x07, 0x5b, 0xb1, 0xa2, 0xa9, 0x7a, 0xbf, 0x31, + 0xa9, 0x77, 0x3c, 0x28, 0xea, 0x3d, 0x8f, 0xdd, 0xba, 0xa6, 0x6a, 0x5e, 0x4d, 0xbe, 0x9c, 0x6c, + 0xfb, 0x45, 0x9c, 0xe6, 0x3d, 0xae, 0xf1, 0xc3, 0xff, 0xd4, 0x28, 0x5c, 0x75, 0x0a, 0xe2, 0x0d, + 0xf0, 0xfe, 0x02, 0x0d, 0x85, 0xc6, 0x3f, 0x2e, 0x80, 0x4a, 0x9b, 0x86, 0x0f, 0x49, 0xd2, 0x45, + 0x87, 0x09, 0xc4, 0xb4, 0x8f, 0x92, 0xf3, 0x69, 0x67, 0x1f, 0xec, 0x32, 0x95, 0xc0, 0x7c, 0x4b, + 0xf3, 0x52, 0xd8, 0x97, 0xbc, 0x1c, 0x54, 0x6e, 0x6b, 0x7f, 0x11, 0x59, 0xff, 0x06, 0x54, 0xf3, + 0xe5, 0xc9, 0x84, 0xbc, 0x24, 0x22, 0x9a, 0x59, 0x6a, 0x19, 0x33, 0x11, 0xa7, 0xa6, 0xa4, 0x3f, + 0x4f, 0x6c, 0xde, 0xe1, 0xc6, 0x7f, 0xb0, 0xd0, 0xf8, 0x3e, 0xf7, 0xcf, 0xc9, 0x29, 0xb6, 0x01, + 0x6a, 0xb3, 0xa6, 0xe6, 0x8e, 0x37, 0x7e, 0xdd, 0x04, 0x17, 0xdb, 0x34, 0xd4, 0xbf, 0x03, 0x57, + 0xa6, 0xdf, 0xca, 0x7b, 0xee, 0x59, 0xcf, 0xb8, 0x5b, 0x7e, 0xc3, 0x8c, 0x4f, 0xd7, 0x41, 0x17, + 0x2f, 0xde, 0x53, 0x70, 0x49, 0xbc, 0x54, 0xb7, 0x97, 0xb2, 0x39, 0xcc, 0x70, 0x56, 0x82, 0x4d, + 0x47, 0x17, 0x8f, 0xc1, 0xf2, 0xe8, 0x1c, 0xb6, 0x42, 0xf4, 0xe9, 0x69, 0x2b, 0xec, 0x9a, 0x9a, + 0xb4, 0x2b, 0xd8, 0x35, 0x41, 0xaf, 0x62, 0xd7, 0xfc, 0x14, 0xd4, 0xbf, 0xd7, 0x40, 0x65, 0xae, + 0xf9, 0xeb, 0x4b, 0x43, 0xcd, 0x52, 0x8c, 0x2f, 0xd7, 0xa6, 0x14, 0x29, 0xfc, 0xa0, 0x81, 0xea, + 0xfc, 0x14, 0x6e, 0xac, 0x12, 0xb0, 0xcc, 0x31, 0x9a, 0xeb, 0x73, 0x8a, 0x2c, 0x46, 0x60, 0xbb, + 0x3c, 0x20, 0xdc, 0xa5, 0xc1, 0x4a, 0x78, 0xe3, 0xf3, 0xf5, 0xf0, 0xf9, 0xc1, 0x2d, 0xff, 0xd5, + 0xa9, 0xa9, 0xbd, 0x3e, 0x35, 0xb5, 0xbf, 0x4e, 0x4d, 0xed, 0xa7, 0xb1, 0xb9, 0xf1, 0x7a, 0x6c, + 0x6e, 0xfc, 0x39, 0x36, 0x37, 0xbe, 0xfd, 0x22, 0x8c, 0xd8, 0xd1, 0x30, 0x70, 0xbb, 0x24, 0xf6, + 0x54, 0x6c, 0xe7, 0x19, 0x0c, 0x68, 0xfe, 0xe1, 0x3d, 0x6f, 0x7c, 0xe6, 0xbd, 0x28, 0x37, 0x29, + 0x3b, 0x39, 0x46, 0x34, 0xd8, 0x14, 0x3f, 0x57, 0x3f, 0xf9, 0x37, 0x00, 0x00, 0xff, 0xff, 0xe6, + 0x8b, 0x18, 0xab, 0x5e, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/twap/api.go b/x/twap/api.go index 4e1c243d240..9cb30f4f573 100644 --- a/x/twap/api.go +++ b/x/twap/api.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) // GetArithmeticTwap returns an arithmetic time weighted average price. diff --git a/x/twap/api_test.go b/x/twap/api_test.go index a594fa1662b..af3b1c833f2 100644 --- a/x/twap/api_test.go +++ b/x/twap/api_test.go @@ -9,10 +9,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - sdkrand "github.com/osmosis-labs/osmosis/v24/simulation/simtypes/random" - "github.com/osmosis-labs/osmosis/v24/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v24/x/twap" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + sdkrand "github.com/osmosis-labs/osmosis/v25/simulation/simtypes/random" + "github.com/osmosis-labs/osmosis/v25/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v25/x/twap" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) var ( diff --git a/x/twap/client/cli/query.go b/x/twap/client/cli/query.go index d66003bb4f8..0412bdf3a8f 100644 --- a/x/twap/client/cli/query.go +++ b/x/twap/client/cli/query.go @@ -11,9 +11,9 @@ import ( "github.com/spf13/cobra" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - poolmanager "github.com/osmosis-labs/osmosis/v24/x/poolmanager/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/twap/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + poolmanager "github.com/osmosis-labs/osmosis/v25/x/poolmanager/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/twap/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) // twapQueryParseArgs represents the outcome diff --git a/x/twap/client/grpc/grpc_query.go b/x/twap/client/grpc/grpc_query.go index 5d074a65c40..fc0d6680a07 100644 --- a/x/twap/client/grpc/grpc_query.go +++ b/x/twap/client/grpc/grpc_query.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc/status" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/twap/client" - "github.com/osmosis-labs/osmosis/v24/x/twap/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/twap/client" + "github.com/osmosis-labs/osmosis/v25/x/twap/client/queryproto" ) type Querier struct { diff --git a/x/twap/client/query_proto_wrap.go b/x/twap/client/query_proto_wrap.go index f0ceac6e67a..89c143f166a 100644 --- a/x/twap/client/query_proto_wrap.go +++ b/x/twap/client/query_proto_wrap.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/twap" - "github.com/osmosis-labs/osmosis/v24/x/twap/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/twap" + "github.com/osmosis-labs/osmosis/v25/x/twap/client/queryproto" ) // This file should evolve to being code gen'd, off of `proto/twap/v1beta/query.yml` diff --git a/x/twap/client/query_proto_wrap_test.go b/x/twap/client/query_proto_wrap_test.go index 1d14f5e8dbe..a96dd28520e 100644 --- a/x/twap/client/query_proto_wrap_test.go +++ b/x/twap/client/query_proto_wrap_test.go @@ -9,9 +9,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/twap/client" - "github.com/osmosis-labs/osmosis/v24/x/twap/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/twap/client" + "github.com/osmosis-labs/osmosis/v25/x/twap/client/queryproto" ) type QueryTestSuite struct { diff --git a/x/twap/client/queryproto/query.pb.go b/x/twap/client/queryproto/query.pb.go index 7f78f19b7c7..2228fe578f9 100644 --- a/x/twap/client/queryproto/query.pb.go +++ b/x/twap/client/queryproto/query.pb.go @@ -15,7 +15,7 @@ import ( grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" - types "github.com/osmosis-labs/osmosis/v24/x/twap/types" + types "github.com/osmosis-labs/osmosis/v25/x/twap/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -574,54 +574,54 @@ var fileDescriptor_141a22dba58615af = []byte{ // 801 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x96, 0x41, 0x4f, 0xe3, 0x46, 0x14, 0xc7, 0x33, 0x29, 0x84, 0x66, 0x10, 0x41, 0x9d, 0x02, 0x05, 0x03, 0x76, 0x64, 0x28, 0x4a, - 0x09, 0xb5, 0x49, 0xda, 0x13, 0xa2, 0x07, 0xa2, 0x4a, 0x55, 0x25, 0x54, 0xb5, 0x16, 0xaa, 0xaa, - 0x5e, 0xa2, 0x89, 0x33, 0x18, 0xab, 0xb1, 0xc7, 0xd8, 0x13, 0x68, 0xa4, 0x1e, 0xda, 0x4a, 0xbd, - 0xa3, 0x56, 0x3d, 0xf4, 0xd0, 0xde, 0x7b, 0xe8, 0xf7, 0xe0, 0xd4, 0x22, 0xf5, 0xb2, 0xda, 0x43, - 0x76, 0x05, 0xfb, 0x09, 0xf8, 0x04, 0x2b, 0xcf, 0x8c, 0xb3, 0x71, 0xd6, 0x62, 0xbd, 0x17, 0x24, - 0xa4, 0x3d, 0xc1, 0xcc, 0xfb, 0xbf, 0xf7, 0xff, 0xcd, 0x9b, 0xf1, 0x4c, 0x60, 0x95, 0x46, 0x1e, - 0x8d, 0xdc, 0xc8, 0x64, 0xe7, 0x38, 0x30, 0xcf, 0x1a, 0x1d, 0xc2, 0x70, 0xc3, 0x3c, 0xed, 0x93, - 0x70, 0x60, 0x04, 0x21, 0x65, 0x14, 0x2d, 0x48, 0x85, 0x11, 0x2b, 0x0c, 0xa9, 0x50, 0x16, 0x1c, - 0xea, 0x50, 0x2e, 0x30, 0xe3, 0xff, 0x84, 0x56, 0xd9, 0xca, 0xac, 0x16, 0x0f, 0xda, 0x21, 0xb1, - 0x69, 0xd8, 0x95, 0x3a, 0x3d, 0x53, 0xe7, 0x10, 0x9f, 0xc4, 0x46, 0x42, 0xa3, 0xda, 0x5c, 0x64, - 0x76, 0x70, 0x44, 0x46, 0x12, 0x9b, 0xba, 0xbe, 0x8c, 0x6f, 0x8f, 0xc7, 0x39, 0xf0, 0x48, 0x15, - 0x60, 0xc7, 0xf5, 0x31, 0x73, 0x69, 0xa2, 0x5d, 0x73, 0x28, 0x75, 0x7a, 0xc4, 0xc4, 0x81, 0x6b, - 0x62, 0xdf, 0xa7, 0x8c, 0x07, 0x13, 0xa7, 0x15, 0x19, 0xe5, 0xa3, 0x4e, 0xff, 0xd8, 0xc4, 0xfe, - 0x20, 0x09, 0x09, 0x93, 0xb6, 0x58, 0xa9, 0x18, 0xc8, 0x90, 0x36, 0x99, 0xc5, 0x5c, 0x8f, 0x44, - 0x0c, 0x7b, 0x81, 0x10, 0xe8, 0x7f, 0x15, 0xe1, 0xe2, 0x41, 0xe8, 0xb2, 0x13, 0x8f, 0x30, 0xd7, - 0x3e, 0x3a, 0xc7, 0x81, 0x45, 0x4e, 0xfb, 0x24, 0x62, 0xe8, 0x3d, 0x38, 0x13, 0x50, 0xda, 0x6b, - 0xbb, 0xdd, 0x65, 0x50, 0x05, 0xb5, 0x29, 0xab, 0x14, 0x0f, 0x3f, 0xef, 0xa2, 0x75, 0x08, 0xe3, - 0xe5, 0xb4, 0x71, 0x14, 0x11, 0xb6, 0x5c, 0xac, 0x82, 0x5a, 0xd9, 0x2a, 0xc7, 0x33, 0x07, 0xf1, - 0x04, 0xd2, 0xe0, 0xec, 0x69, 0x9f, 0xb2, 0x24, 0xfe, 0x16, 0x8f, 0x43, 0x3e, 0x25, 0x04, 0xdf, - 0x40, 0x18, 0x31, 0x1c, 0xb2, 0x76, 0xcc, 0xb2, 0x3c, 0x55, 0x05, 0xb5, 0xd9, 0xa6, 0x62, 0x08, - 0x50, 0x23, 0x01, 0x35, 0x8e, 0x12, 0xd0, 0xd6, 0xfa, 0xe5, 0x50, 0x2b, 0xdc, 0x0e, 0xb5, 0x77, - 0x06, 0xd8, 0xeb, 0xed, 0xe9, 0x2f, 0x72, 0xf5, 0x8b, 0x27, 0x1a, 0xb0, 0xca, 0x7c, 0x22, 0x96, - 0x23, 0x0b, 0xbe, 0x4d, 0xfc, 0xae, 0xa8, 0x3b, 0xfd, 0xca, 0xba, 0xab, 0x97, 0x43, 0x0d, 0xdc, - 0x0e, 0xb5, 0x79, 0x51, 0x37, 0xc9, 0x14, 0x55, 0x67, 0x88, 0xdf, 0x8d, 0xa5, 0xfa, 0x8f, 0x00, - 0x2e, 0x4d, 0x36, 0x28, 0x0a, 0xa8, 0x1f, 0x11, 0x74, 0x0c, 0xe7, 0xf1, 0x28, 0xd2, 0x8e, 0x4f, - 0x09, 0xef, 0x54, 0xb9, 0xf5, 0x49, 0x4c, 0xfc, 0x78, 0xa8, 0xad, 0x8a, 0xbd, 0x88, 0xba, 0xdf, - 0x19, 0x2e, 0x35, 0x3d, 0xcc, 0x4e, 0x8c, 0x43, 0xe2, 0x60, 0x7b, 0xf0, 0x29, 0xb1, 0x6f, 0x87, - 0xda, 0x92, 0x30, 0x9e, 0xa8, 0xa1, 0x5b, 0x15, 0x9c, 0xf2, 0xd3, 0xff, 0x03, 0x50, 0x49, 0x23, - 0x1c, 0xd1, 0x2f, 0xe8, 0xf9, 0xc3, 0xdd, 0x28, 0xfd, 0x17, 0x00, 0x57, 0x33, 0x57, 0x74, 0xcf, - 0x9d, 0xfd, 0xb3, 0x08, 0x17, 0x3e, 0x23, 0xd4, 0x23, 0x2c, 0x7c, 0x73, 0xf8, 0x33, 0x0e, 0xff, - 0x0f, 0x70, 0x71, 0xa2, 0x3d, 0x72, 0x83, 0x6c, 0x58, 0x71, 0x92, 0xc0, 0xf8, 0xfe, 0xec, 0xe7, - 0xdb, 0x9f, 0x45, 0xe1, 0x9a, 0x2e, 0xa1, 0x5b, 0x73, 0xce, 0xb8, 0x99, 0xfe, 0x2f, 0x80, 0x2b, - 0x29, 0xfb, 0x87, 0x7e, 0xec, 0x7f, 0x02, 0x50, 0xc9, 0x5a, 0xd0, 0x7d, 0x36, 0x75, 0x1e, 0xce, - 0x7d, 0x89, 0x43, 0xec, 0x45, 0xb2, 0x8f, 0xfa, 0x21, 0xac, 0x24, 0x13, 0x92, 0x63, 0x0f, 0x96, - 0x02, 0x3e, 0xc3, 0xfd, 0x67, 0x9b, 0x6b, 0x46, 0xd6, 0xeb, 0x6a, 0x88, 0xac, 0xd6, 0x54, 0x4c, - 0x67, 0xc9, 0x8c, 0xe6, 0xaf, 0x25, 0x38, 0xfd, 0x55, 0xfc, 0xce, 0xa1, 0x01, 0x2c, 0x09, 0x05, - 0xda, 0xb8, 0x2b, 0x5f, 0x62, 0x28, 0x9b, 0x77, 0x8b, 0x04, 0x9a, 0xbe, 0xf9, 0xf3, 0xff, 0xcf, - 0x7e, 0x2b, 0xaa, 0x68, 0xcd, 0xcc, 0x7c, 0x9c, 0xa5, 0xe1, 0x1f, 0x00, 0x56, 0xd2, 0xd7, 0x0b, - 0xaa, 0x67, 0x97, 0xcf, 0x7c, 0xfa, 0x94, 0x9d, 0x7c, 0x62, 0xc9, 0xb4, 0xc3, 0x99, 0xb6, 0xd0, - 0x66, 0x36, 0xd3, 0x04, 0xc8, 0x3f, 0x00, 0xbe, 0x9b, 0x71, 0xf5, 0xa1, 0xdd, 0x3c, 0x9e, 0xe3, - 0x1f, 0x80, 0xd2, 0x78, 0x8d, 0x0c, 0x89, 0xda, 0xe0, 0xa8, 0x75, 0xf4, 0x41, 0x1e, 0x54, 0xc1, - 0xf5, 0x3b, 0x80, 0x73, 0xa9, 0x33, 0x8b, 0xb6, 0xb3, 0x7d, 0xb3, 0xee, 0x51, 0xa5, 0x9e, 0x4b, - 0x2b, 0xe9, 0xea, 0x9c, 0xee, 0x7d, 0xb4, 0x91, 0x4d, 0x97, 0xa6, 0xf8, 0x1b, 0x40, 0xf4, 0xf2, - 0xb7, 0x84, 0xcc, 0x1c, 0x86, 0xa9, 0x2e, 0xee, 0xe6, 0x4f, 0x90, 0x98, 0xbb, 0x1c, 0x73, 0x1b, - 0xd5, 0x72, 0x60, 0xf2, 0xcc, 0xd6, 0xd7, 0x97, 0xd7, 0x2a, 0xb8, 0xba, 0x56, 0xc1, 0xd3, 0x6b, - 0x15, 0x5c, 0xdc, 0xa8, 0x85, 0xab, 0x1b, 0xb5, 0xf0, 0xe8, 0x46, 0x2d, 0x7c, 0xbb, 0xef, 0xb8, - 0xec, 0xa4, 0xdf, 0x31, 0x6c, 0xea, 0x25, 0xd5, 0x3e, 0xec, 0xe1, 0x4e, 0x34, 0x2a, 0x7d, 0xd6, - 0xfc, 0xd8, 0xfc, 0x5e, 0x18, 0xd8, 0x3d, 0x97, 0xf8, 0x4c, 0xfc, 0x8a, 0x14, 0xd7, 0x50, 0x89, - 0xff, 0xf9, 0xe8, 0x79, 0x00, 0x00, 0x00, 0xff, 0xff, 0xeb, 0xe0, 0x41, 0x69, 0x20, 0x0b, 0x00, + 0x09, 0xb5, 0x49, 0xaa, 0x5e, 0x10, 0x3d, 0x10, 0x55, 0xaa, 0x2a, 0xa1, 0xaa, 0xb5, 0x50, 0x55, + 0xf5, 0x12, 0x4d, 0x9c, 0xc1, 0x58, 0x8d, 0x3d, 0xc6, 0x9e, 0x40, 0x23, 0xf5, 0xd0, 0x56, 0xea, + 0x1d, 0xb5, 0xea, 0xa1, 0x87, 0xf6, 0xde, 0x43, 0xbf, 0x07, 0xa7, 0x16, 0xa9, 0x97, 0xd5, 0x1e, + 0xb2, 0x2b, 0xd8, 0x4f, 0xc0, 0x27, 0x58, 0x79, 0x66, 0x9c, 0x8d, 0xb3, 0x16, 0xeb, 0xbd, 0x20, + 0x21, 0xed, 0x09, 0x66, 0xde, 0xff, 0xbd, 0xff, 0x6f, 0xde, 0x8c, 0x67, 0x02, 0xab, 0x34, 0xf2, + 0x68, 0xe4, 0x46, 0x26, 0x3b, 0xc7, 0x81, 0x79, 0xd6, 0xe8, 0x10, 0x86, 0x1b, 0xe6, 0x69, 0x9f, + 0x84, 0x03, 0x23, 0x08, 0x29, 0xa3, 0x68, 0x41, 0x2a, 0x8c, 0x58, 0x61, 0x48, 0x85, 0xb2, 0xe0, + 0x50, 0x87, 0x72, 0x81, 0x19, 0xff, 0x27, 0xb4, 0xca, 0x56, 0x66, 0xb5, 0x78, 0xd0, 0x0e, 0x89, + 0x4d, 0xc3, 0xae, 0xd4, 0xe9, 0x99, 0x3a, 0x87, 0xf8, 0x24, 0x36, 0x12, 0x1a, 0xd5, 0xe6, 0x22, + 0xb3, 0x83, 0x23, 0x32, 0x92, 0xd8, 0xd4, 0xf5, 0x65, 0x7c, 0x7b, 0x3c, 0xce, 0x81, 0x47, 0xaa, + 0x00, 0x3b, 0xae, 0x8f, 0x99, 0x4b, 0x13, 0xed, 0x9a, 0x43, 0xa9, 0xd3, 0x23, 0x26, 0x0e, 0x5c, + 0x13, 0xfb, 0x3e, 0x65, 0x3c, 0x98, 0x38, 0xad, 0xc8, 0x28, 0x1f, 0x75, 0xfa, 0xc7, 0x26, 0xf6, + 0x07, 0x49, 0x48, 0x98, 0xb4, 0xc5, 0x4a, 0xc5, 0x40, 0x86, 0xb4, 0xc9, 0x2c, 0xe6, 0x7a, 0x24, + 0x62, 0xd8, 0x0b, 0x84, 0x40, 0xff, 0xab, 0x08, 0x17, 0x0f, 0x42, 0x97, 0x9d, 0x78, 0x84, 0xb9, + 0xf6, 0xd1, 0x39, 0x0e, 0x2c, 0x72, 0xda, 0x27, 0x11, 0x43, 0xef, 0xc1, 0x99, 0x80, 0xd2, 0x5e, + 0xdb, 0xed, 0x2e, 0x83, 0x2a, 0xa8, 0x4d, 0x59, 0xa5, 0x78, 0xf8, 0x79, 0x17, 0xad, 0x43, 0x18, + 0x2f, 0xa7, 0x8d, 0xa3, 0x88, 0xb0, 0xe5, 0x62, 0x15, 0xd4, 0xca, 0x56, 0x39, 0x9e, 0x39, 0x88, + 0x27, 0x90, 0x06, 0x67, 0x4f, 0xfb, 0x94, 0x25, 0xf1, 0xb7, 0x78, 0x1c, 0xf2, 0x29, 0x21, 0xf8, + 0x06, 0xc2, 0x88, 0xe1, 0x90, 0xb5, 0x63, 0x96, 0xe5, 0xa9, 0x2a, 0xa8, 0xcd, 0x36, 0x15, 0x43, + 0x80, 0x1a, 0x09, 0xa8, 0x71, 0x94, 0x80, 0xb6, 0xd6, 0x2f, 0x87, 0x5a, 0xe1, 0x76, 0xa8, 0xbd, + 0x33, 0xc0, 0x5e, 0x6f, 0x4f, 0x7f, 0x91, 0xab, 0x5f, 0x3c, 0xd1, 0x80, 0x55, 0xe6, 0x13, 0xb1, + 0x1c, 0x59, 0xf0, 0x6d, 0xe2, 0x77, 0x45, 0xdd, 0xe9, 0x57, 0xd6, 0x5d, 0xbd, 0x1c, 0x6a, 0xe0, + 0x76, 0xa8, 0xcd, 0x8b, 0xba, 0x49, 0xa6, 0xa8, 0x3a, 0x43, 0xfc, 0x6e, 0x2c, 0xd5, 0x7f, 0x04, + 0x70, 0x69, 0xb2, 0x41, 0x51, 0x40, 0xfd, 0x88, 0xa0, 0x63, 0x38, 0x8f, 0x47, 0x91, 0x76, 0x7c, + 0x4a, 0x78, 0xa7, 0xca, 0xad, 0x4f, 0x62, 0xe2, 0xc7, 0x43, 0x6d, 0x55, 0xec, 0x45, 0xd4, 0xfd, + 0xce, 0x70, 0xa9, 0xe9, 0x61, 0x76, 0x62, 0x1c, 0x12, 0x07, 0xdb, 0x83, 0x4f, 0x89, 0x7d, 0x3b, + 0xd4, 0x96, 0x84, 0xf1, 0x44, 0x0d, 0xdd, 0xaa, 0xe0, 0x94, 0x9f, 0xfe, 0x1f, 0x80, 0x4a, 0x1a, + 0xe1, 0x88, 0x7e, 0x41, 0xcf, 0x1f, 0xee, 0x46, 0xe9, 0xbf, 0x00, 0xb8, 0x9a, 0xb9, 0xa2, 0x7b, + 0xee, 0xec, 0x9f, 0x45, 0xb8, 0xf0, 0x19, 0xa1, 0x1e, 0x61, 0xe1, 0x9b, 0xc3, 0x9f, 0x71, 0xf8, + 0x7f, 0x80, 0x8b, 0x13, 0xed, 0x91, 0x1b, 0x64, 0xc3, 0x8a, 0x93, 0x04, 0xc6, 0xf7, 0x67, 0x3f, + 0xdf, 0xfe, 0x2c, 0x0a, 0xd7, 0x74, 0x09, 0xdd, 0x9a, 0x73, 0xc6, 0xcd, 0xf4, 0x7f, 0x01, 0x5c, + 0x49, 0xd9, 0x3f, 0xf4, 0x63, 0xff, 0x13, 0x80, 0x4a, 0xd6, 0x82, 0xee, 0xb3, 0xa9, 0xf3, 0x70, + 0xee, 0x4b, 0x1c, 0x62, 0x2f, 0x92, 0x7d, 0xd4, 0x0f, 0x61, 0x25, 0x99, 0x90, 0x1c, 0x7b, 0xb0, + 0x14, 0xf0, 0x19, 0xee, 0x3f, 0xdb, 0x5c, 0x33, 0xb2, 0x5e, 0x57, 0x43, 0x64, 0xb5, 0xa6, 0x62, + 0x3a, 0x4b, 0x66, 0x34, 0x7f, 0x2d, 0xc1, 0xe9, 0xaf, 0xe2, 0x77, 0x0e, 0x0d, 0x60, 0x49, 0x28, + 0xd0, 0xc6, 0x5d, 0xf9, 0x12, 0x43, 0xd9, 0xbc, 0x5b, 0x24, 0xd0, 0xf4, 0xcd, 0x9f, 0xff, 0x7f, + 0xf6, 0x5b, 0x51, 0x45, 0x6b, 0x66, 0xe6, 0xe3, 0x2c, 0x0d, 0xff, 0x00, 0xb0, 0x92, 0xbe, 0x5e, + 0x50, 0x3d, 0xbb, 0x7c, 0xe6, 0xd3, 0xa7, 0xec, 0xe4, 0x13, 0x4b, 0xa6, 0x1d, 0xce, 0xb4, 0x85, + 0x36, 0xb3, 0x99, 0x26, 0x40, 0xfe, 0x01, 0xf0, 0xdd, 0x8c, 0xab, 0x0f, 0xed, 0xe6, 0xf1, 0x1c, + 0xff, 0x00, 0x94, 0xc6, 0x6b, 0x64, 0x48, 0xd4, 0x06, 0x47, 0xad, 0xa3, 0x0f, 0xf2, 0xa0, 0x0a, + 0xae, 0xdf, 0x01, 0x9c, 0x4b, 0x9d, 0x59, 0xb4, 0x9d, 0xed, 0x9b, 0x75, 0x8f, 0x2a, 0xf5, 0x5c, + 0x5a, 0x49, 0x57, 0xe7, 0x74, 0xef, 0xa3, 0x8d, 0x6c, 0xba, 0x34, 0xc5, 0xdf, 0x00, 0xa2, 0x97, + 0xbf, 0x25, 0x64, 0xe6, 0x30, 0x4c, 0x75, 0x71, 0x37, 0x7f, 0x82, 0xc4, 0xdc, 0xe5, 0x98, 0xdb, + 0xa8, 0x96, 0x03, 0x93, 0x67, 0xb6, 0xbe, 0xbe, 0xbc, 0x56, 0xc1, 0xd5, 0xb5, 0x0a, 0x9e, 0x5e, + 0xab, 0xe0, 0xe2, 0x46, 0x2d, 0x5c, 0xdd, 0xa8, 0x85, 0x47, 0x37, 0x6a, 0xe1, 0xdb, 0x7d, 0xc7, + 0x65, 0x27, 0xfd, 0x8e, 0x61, 0x53, 0x2f, 0xa9, 0xf6, 0x61, 0x0f, 0x77, 0xa2, 0x51, 0xe9, 0xb3, + 0xe6, 0xc7, 0xe6, 0xf7, 0xc2, 0xc0, 0xee, 0xb9, 0xc4, 0x67, 0xe2, 0x57, 0xa4, 0xb8, 0x86, 0x4a, + 0xfc, 0xcf, 0x47, 0xcf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xdd, 0xb1, 0xc3, 0x4d, 0x20, 0x0b, 0x00, 0x00, } diff --git a/x/twap/export_test.go b/x/twap/export_test.go index 10ee1591a6c..c9f9d6f459e 100644 --- a/x/twap/export_test.go +++ b/x/twap/export_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) type ( diff --git a/x/twap/keeper.go b/x/twap/keeper.go index 85efcbc4866..9203e50ea54 100644 --- a/x/twap/keeper.go +++ b/x/twap/keeper.go @@ -9,7 +9,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/x/twap/keeper_test.go b/x/twap/keeper_test.go index 3e377a255d9..611ec5b8c67 100644 --- a/x/twap/keeper_test.go +++ b/x/twap/keeper_test.go @@ -10,9 +10,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/twap" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/twap" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) // TODO: Consider switching this everywhere diff --git a/x/twap/listeners.go b/x/twap/listeners.go index d28b1f2cbf7..0d4043af267 100644 --- a/x/twap/listeners.go +++ b/x/twap/listeners.go @@ -4,9 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v24/x/concentrated-liquidity/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + concentratedliquiditytypes "github.com/osmosis-labs/osmosis/v25/x/concentrated-liquidity/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" epochtypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/x/twap/listeners_test.go b/x/twap/listeners_test.go index d891da2f90a..c2ab2fb87f1 100644 --- a/x/twap/listeners_test.go +++ b/x/twap/listeners_test.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/twap" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/x/twap" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) var defaultPoolId uint64 = 1 diff --git a/x/twap/logic.go b/x/twap/logic.go index e8575a61e2e..a20615bd6a6 100644 --- a/x/twap/logic.go +++ b/x/twap/logic.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) func newTwapRecord(k types.PoolManagerInterface, ctx sdk.Context, poolId uint64, denom0, denom1 string) (types.TwapRecord, error) { diff --git a/x/twap/logic_test.go b/x/twap/logic_test.go index 326a94570c1..2a1f3e7e1a6 100644 --- a/x/twap/logic_test.go +++ b/x/twap/logic_test.go @@ -11,11 +11,11 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/twap" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" - "github.com/osmosis-labs/osmosis/v24/x/twap/types/twapmock" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/twap" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/x/twap/types/twapmock" ) var ( diff --git a/x/twap/store.go b/x/twap/store.go index db1f18d8273..06ec54f3c5c 100644 --- a/x/twap/store.go +++ b/x/twap/store.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) // NumRecordsToPrunePerBlock is the number of twap records indexed by pool ID to prune per block. diff --git a/x/twap/store_test.go b/x/twap/store_test.go index 871992132b2..3921b85b5bb 100644 --- a/x/twap/store_test.go +++ b/x/twap/store_test.go @@ -8,11 +8,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/twap" + "github.com/osmosis-labs/osmosis/v25/x/twap" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) var ( diff --git a/x/twap/strategy.go b/x/twap/strategy.go index ceeb8ec2994..1799bae9d62 100644 --- a/x/twap/strategy.go +++ b/x/twap/strategy.go @@ -2,9 +2,9 @@ package twap import ( "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) // twapStrategy is an interface for computing TWAPs. diff --git a/x/twap/strategy_test.go b/x/twap/strategy_test.go index 9db7cf7920d..965a09a144a 100644 --- a/x/twap/strategy_test.go +++ b/x/twap/strategy_test.go @@ -5,9 +5,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - "github.com/osmosis-labs/osmosis/v24/x/twap" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/twap" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) type computeTwapTestCase struct { diff --git a/x/twap/twapmodule/module.go b/x/twap/twapmodule/module.go index 7953a585ef9..3e35ef0e8a9 100644 --- a/x/twap/twapmodule/module.go +++ b/x/twap/twapmodule/module.go @@ -15,12 +15,12 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/v24/x/twap" - twapclient "github.com/osmosis-labs/osmosis/v24/x/twap/client" - twapcli "github.com/osmosis-labs/osmosis/v24/x/twap/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/twap/client/grpc" - "github.com/osmosis-labs/osmosis/v24/x/twap/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/x/twap" + twapclient "github.com/osmosis-labs/osmosis/v25/x/twap/client" + twapcli "github.com/osmosis-labs/osmosis/v25/x/twap/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/twap/client/grpc" + "github.com/osmosis-labs/osmosis/v25/x/twap/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) var ( diff --git a/x/twap/types/genesis.pb.go b/x/twap/types/genesis.pb.go index 5857e53382d..e274c3a212a 100644 --- a/x/twap/types/genesis.pb.go +++ b/x/twap/types/genesis.pb.go @@ -148,31 +148,31 @@ func init() { var fileDescriptor_3f4bdf49b69bd63c = []byte{ // 397 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xbf, 0xce, 0xd3, 0x30, - 0x14, 0xc5, 0x63, 0xfe, 0x54, 0x22, 0x1f, 0x53, 0x54, 0x41, 0xbf, 0x0a, 0xa5, 0x21, 0x03, 0xea, - 0x52, 0x9b, 0x96, 0x4e, 0x15, 0x53, 0x05, 0xe2, 0xdf, 0x52, 0x05, 0x26, 0x96, 0xc8, 0x49, 0x6e, - 0x53, 0x8b, 0x26, 0xb6, 0x6c, 0xa7, 0x25, 0x0f, 0x80, 0xc4, 0xc8, 0xc8, 0x13, 0xa1, 0x8e, 0x1d, - 0x99, 0x0a, 0x6a, 0xdf, 0x80, 0x27, 0x40, 0x89, 0x5d, 0x06, 0xd4, 0x6f, 0xcb, 0xd5, 0xef, 0x9c, - 0xa3, 0x93, 0x7b, 0xed, 0x86, 0x5c, 0x15, 0x5c, 0x31, 0x45, 0xf4, 0x96, 0x0a, 0xb2, 0x19, 0x27, - 0xa0, 0xe9, 0x98, 0xe4, 0x50, 0x82, 0x62, 0x0a, 0x0b, 0xc9, 0x35, 0xf7, 0xba, 0x56, 0x83, 0x1b, - 0x0d, 0xb6, 0x9a, 0x7e, 0x37, 0xe7, 0x39, 0x6f, 0x05, 0xa4, 0xf9, 0x32, 0xda, 0xfe, 0x93, 0x8b, - 0x79, 0xcd, 0x10, 0x4b, 0x48, 0xb9, 0xcc, 0xac, 0xee, 0x3a, 0xe7, 0x3c, 0x5f, 0x03, 0x69, 0xa7, - 0xa4, 0x5a, 0x12, 0x5a, 0xd6, 0x67, 0x94, 0xb6, 0x19, 0xb1, 0xc9, 0x36, 0x83, 0x45, 0xfe, 0xff, - 0xae, 0xac, 0x92, 0x54, 0x33, 0x5e, 0x1a, 0x1e, 0xfe, 0x40, 0x6e, 0x67, 0x41, 0x25, 0x2d, 0x94, - 0x37, 0x75, 0x1f, 0x08, 0x59, 0x95, 0x10, 0x83, 0xe0, 0xe9, 0x2a, 0x66, 0x19, 0x94, 0x9a, 0x2d, - 0x19, 0xc8, 0x1e, 0x0a, 0xd0, 0xf0, 0x5e, 0xd4, 0x6d, 0xe9, 0xcb, 0x06, 0xbe, 0xf9, 0xc7, 0xbc, - 0x2f, 0xc8, 0xed, 0x9b, 0x9e, 0xf1, 0x8a, 0x29, 0xcd, 0x65, 0x1d, 0x7f, 0x02, 0x10, 0xb1, 0x00, - 0xc9, 0x78, 0xd6, 0xbb, 0x15, 0xa0, 0xe1, 0xd5, 0xe4, 0x1a, 0x9b, 0x1a, 0xf8, 0x5c, 0x03, 0xbf, - 0xb0, 0x35, 0xe6, 0xa3, 0xdd, 0x61, 0xe0, 0xfc, 0x39, 0x0c, 0x1e, 0xd7, 0xb4, 0x58, 0xcf, 0xc2, - 0x9b, 0xa3, 0xc2, 0xef, 0xbf, 0x06, 0x28, 0x7a, 0x68, 0x04, 0xaf, 0x0d, 0x7f, 0x07, 0x20, 0x16, - 0x86, 0x7e, 0x45, 0xee, 0xfd, 0x57, 0xe6, 0x08, 0xef, 0x35, 0xd5, 0xe0, 0x3d, 0x77, 0xef, 0x36, - 0x4b, 0x54, 0x3d, 0x14, 0xdc, 0x1e, 0x5e, 0x4d, 0x02, 0x7c, 0xe9, 0x26, 0xf8, 0xc3, 0x96, 0x8a, - 0xa8, 0x8d, 0x9c, 0xdf, 0x69, 0x9a, 0x44, 0xc6, 0xe4, 0xcd, 0xdc, 0x8e, 0x68, 0xd7, 0x62, 0xff, - 0xe0, 0xd1, 0x65, 0xbb, 0x59, 0x9d, 0xb5, 0x5a, 0xc7, 0xfc, 0xed, 0xee, 0xe8, 0xa3, 0xfd, 0xd1, - 0x47, 0xbf, 0x8f, 0x3e, 0xfa, 0x76, 0xf2, 0x9d, 0xfd, 0xc9, 0x77, 0x7e, 0x9e, 0x7c, 0xe7, 0xe3, - 0xd3, 0x9c, 0xe9, 0x55, 0x95, 0xe0, 0x94, 0x17, 0xc4, 0xe6, 0x8d, 0xd6, 0x34, 0x51, 0xe7, 0x81, - 0x6c, 0x26, 0x53, 0xf2, 0xd9, 0xbc, 0x04, 0x5d, 0x0b, 0x50, 0x49, 0xa7, 0xdd, 0xd8, 0xb3, 0xbf, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x89, 0xbd, 0xe5, 0x31, 0x76, 0x02, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xbd, 0xee, 0xd3, 0x30, + 0x14, 0xc5, 0x63, 0x3e, 0x2a, 0x91, 0x3f, 0x53, 0x54, 0x41, 0x5b, 0xa1, 0x34, 0x64, 0x40, 0x5d, + 0x6a, 0xd3, 0x02, 0x4b, 0xc5, 0x54, 0x81, 0xf8, 0x5a, 0xaa, 0xc0, 0xc4, 0x12, 0x39, 0xc9, 0x6d, + 0x6a, 0xd1, 0xc4, 0x96, 0xed, 0xb4, 0xe4, 0x01, 0x90, 0x18, 0x19, 0x79, 0x22, 0xd4, 0xb1, 0x23, + 0x53, 0x41, 0xed, 0x1b, 0xf0, 0x04, 0x28, 0xb1, 0xcb, 0x80, 0xfa, 0xdf, 0x72, 0xf5, 0x3b, 0xe7, + 0xe8, 0xe4, 0x5e, 0xbb, 0x21, 0x57, 0x05, 0x57, 0x4c, 0x11, 0xbd, 0xa5, 0x82, 0x6c, 0x26, 0x09, + 0x68, 0x3a, 0x21, 0x39, 0x94, 0xa0, 0x98, 0xc2, 0x42, 0x72, 0xcd, 0xbd, 0xae, 0xd5, 0xe0, 0x46, + 0x83, 0xad, 0x66, 0xd0, 0xcd, 0x79, 0xce, 0x5b, 0x01, 0x69, 0xbe, 0x8c, 0x76, 0xf0, 0xe8, 0x62, + 0x5e, 0x33, 0xc4, 0x12, 0x52, 0x2e, 0x33, 0xab, 0xeb, 0xe7, 0x9c, 0xe7, 0x6b, 0x20, 0xed, 0x94, + 0x54, 0x4b, 0x42, 0xcb, 0xfa, 0x8c, 0xd2, 0x36, 0x23, 0x36, 0xd9, 0x66, 0xb0, 0xc8, 0xff, 0xdf, + 0x95, 0x55, 0x92, 0x6a, 0xc6, 0x4b, 0xc3, 0xc3, 0x1f, 0xc8, 0xed, 0x2c, 0xa8, 0xa4, 0x85, 0xf2, + 0x9e, 0xba, 0xf7, 0x84, 0xac, 0x4a, 0x88, 0x41, 0xf0, 0x74, 0x15, 0xb3, 0x0c, 0x4a, 0xcd, 0x96, + 0x0c, 0x64, 0x0f, 0x05, 0x68, 0x74, 0x27, 0xea, 0xb6, 0xf4, 0x65, 0x03, 0xdf, 0xfc, 0x63, 0xde, + 0x17, 0xe4, 0x0e, 0x4c, 0xcf, 0x78, 0xc5, 0x94, 0xe6, 0xb2, 0x8e, 0x3f, 0x01, 0x88, 0x58, 0x80, + 0x64, 0x3c, 0xeb, 0xdd, 0x08, 0xd0, 0xe8, 0x6a, 0xda, 0xc7, 0xa6, 0x06, 0x3e, 0xd7, 0xc0, 0x2f, + 0x6c, 0x8d, 0xf9, 0x78, 0x77, 0x18, 0x3a, 0x7f, 0x0e, 0xc3, 0x87, 0x35, 0x2d, 0xd6, 0xb3, 0xf0, + 0xfa, 0xa8, 0xf0, 0xfb, 0xaf, 0x21, 0x8a, 0xee, 0x1b, 0xc1, 0x6b, 0xc3, 0xdf, 0x01, 0x88, 0x85, + 0xa1, 0x5f, 0x91, 0x7b, 0xf7, 0x95, 0x39, 0xc2, 0x7b, 0x4d, 0x35, 0x78, 0xcf, 0xdd, 0xdb, 0xcd, + 0x12, 0x55, 0x0f, 0x05, 0x37, 0x47, 0x57, 0xd3, 0x00, 0x5f, 0xba, 0x09, 0xfe, 0xb0, 0xa5, 0x22, + 0x6a, 0x23, 0xe7, 0xb7, 0x9a, 0x26, 0x91, 0x31, 0x79, 0x33, 0xb7, 0x23, 0xda, 0xb5, 0xd8, 0x3f, + 0x78, 0x70, 0xd9, 0x6e, 0x56, 0x67, 0xad, 0xd6, 0x31, 0x7f, 0xbb, 0x3b, 0xfa, 0x68, 0x7f, 0xf4, + 0xd1, 0xef, 0xa3, 0x8f, 0xbe, 0x9d, 0x7c, 0x67, 0x7f, 0xf2, 0x9d, 0x9f, 0x27, 0xdf, 0xf9, 0xf8, + 0x38, 0x67, 0x7a, 0x55, 0x25, 0x38, 0xe5, 0x05, 0xb1, 0x79, 0xe3, 0x35, 0x4d, 0xd4, 0x79, 0x20, + 0x9b, 0xe9, 0x33, 0xf2, 0xd9, 0xbc, 0x04, 0x5d, 0x0b, 0x50, 0x49, 0xa7, 0xdd, 0xd8, 0x93, 0xbf, + 0x01, 0x00, 0x00, 0xff, 0xff, 0x49, 0xd9, 0xcd, 0x26, 0x76, 0x02, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/twap/types/twap_record.pb.go b/x/twap/types/twap_record.pb.go index 1d3ca2952fe..e6e657fcb9e 100644 --- a/x/twap/types/twap_record.pb.go +++ b/x/twap/types/twap_record.pb.go @@ -229,43 +229,43 @@ var fileDescriptor_dbf5c78678e601aa = []byte{ // 622 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4d, 0x4f, 0xdb, 0x40, 0x10, 0x8d, 0x21, 0x0d, 0xb0, 0x09, 0x45, 0xb5, 0x68, 0x6b, 0x05, 0xd5, 0x0e, 0xa9, 0x84, 0xc2, - 0xa1, 0x76, 0x4c, 0x7b, 0xea, 0x8d, 0x88, 0x1e, 0xda, 0xa2, 0x2a, 0x32, 0x9c, 0x7a, 0x59, 0x6d, - 0x9c, 0xc1, 0x59, 0x11, 0x7b, 0x57, 0xde, 0x0d, 0x34, 0xff, 0x82, 0xbf, 0xd4, 0x1b, 0x47, 0x8e, - 0x55, 0x0f, 0x69, 0x05, 0xea, 0xa5, 0x47, 0x7e, 0x41, 0xb5, 0xbb, 0x4e, 0x0a, 0xf4, 0x03, 0xb8, - 0x79, 0x66, 0xdf, 0xbc, 0xf7, 0xc6, 0x3b, 0xb3, 0x68, 0x83, 0x89, 0x94, 0x09, 0x2a, 0x02, 0x79, - 0x4c, 0x78, 0x70, 0x14, 0xf6, 0x40, 0x92, 0x50, 0x07, 0x38, 0x87, 0x98, 0xe5, 0x7d, 0x9f, 0xe7, - 0x4c, 0x32, 0x7b, 0xb5, 0xc0, 0xf9, 0xea, 0xc8, 0x2f, 0x70, 0xf5, 0xd5, 0x84, 0x25, 0x4c, 0x03, - 0x02, 0xf5, 0x65, 0xb0, 0x75, 0x2f, 0x61, 0x2c, 0x19, 0x42, 0xa0, 0xa3, 0xde, 0xe8, 0x20, 0x90, - 0x34, 0x05, 0x21, 0x49, 0xca, 0x0d, 0xa0, 0xf9, 0xb9, 0x82, 0xd0, 0xfe, 0x31, 0xe1, 0x91, 0x56, - 0xb0, 0x9f, 0xa2, 0x05, 0xce, 0xd8, 0x10, 0xd3, 0xbe, 0x63, 0x35, 0xac, 0x56, 0x39, 0xaa, 0xa8, - 0xf0, 0x6d, 0xdf, 0x5e, 0x47, 0x35, 0x22, 0x04, 0xc8, 0x36, 0xee, 0x43, 0xc6, 0x52, 0x67, 0xae, - 0x61, 0xb5, 0x96, 0xa2, 0xaa, 0xc9, 0xed, 0xa8, 0xd4, 0x0c, 0x12, 0x16, 0x90, 0xf9, 0x2b, 0x90, - 0xd0, 0x40, 0xb6, 0x51, 0x65, 0x00, 0x34, 0x19, 0x48, 0xa7, 0xdc, 0xb0, 0x5a, 0xf3, 0x9d, 0xcd, - 0x9f, 0x13, 0x6f, 0xd9, 0x34, 0x87, 0xcd, 0xc1, 0xe5, 0xc4, 0x5b, 0x1d, 0x93, 0x74, 0xf8, 0xba, - 0x79, 0x2d, 0xdd, 0x8c, 0x8a, 0x42, 0xfb, 0x03, 0x2a, 0xab, 0x1e, 0x9c, 0x07, 0x0d, 0xab, 0x55, - 0xdd, 0xaa, 0xfb, 0xa6, 0x41, 0x7f, 0xda, 0xa0, 0xbf, 0x3f, 0x6d, 0xb0, 0xe3, 0x9e, 0x4e, 0xbc, - 0xd2, 0xe5, 0xc4, 0xb3, 0xaf, 0xf1, 0xa9, 0xe2, 0xe6, 0xc9, 0x37, 0xcf, 0x8a, 0x34, 0x8f, 0xdd, - 0x45, 0x36, 0x6f, 0xe3, 0x21, 0x11, 0x12, 0x0b, 0xce, 0x24, 0xe6, 0x39, 0x8d, 0xc1, 0xa9, 0x28, - 0xef, 0x9d, 0xe7, 0x8a, 0xe1, 0xeb, 0xc4, 0x5b, 0x8b, 0xf5, 0x2f, 0x17, 0xfd, 0x43, 0x9f, 0xb2, - 0x20, 0x25, 0x72, 0xe0, 0xef, 0x42, 0x42, 0xe2, 0xf1, 0x0e, 0xc4, 0xd1, 0x0a, 0x6f, 0xef, 0x12, - 0x21, 0xf7, 0x38, 0x93, 0x5d, 0x55, 0xab, 0x19, 0xc3, 0x3f, 0x18, 0x17, 0xee, 0xc3, 0x18, 0x5e, - 0x67, 0x1c, 0x20, 0x97, 0xb7, 0x31, 0xc9, 0xa9, 0x1c, 0xa4, 0x20, 0x69, 0x8c, 0xf5, 0x50, 0x90, - 0x38, 0x1e, 0xa5, 0xa3, 0x21, 0x91, 0x2c, 0x77, 0x16, 0xef, 0xce, 0xbe, 0xc6, 0xdb, 0xdb, 0x33, - 0x26, 0x75, 0xf5, 0xdb, 0xbf, 0x79, 0xb4, 0x52, 0xf8, 0x5f, 0xa5, 0xa5, 0xfb, 0x28, 0x85, 0xff, - 0x56, 0x22, 0xa8, 0x9e, 0x00, 0x4b, 0x41, 0xe6, 0x7f, 0x53, 0x41, 0x77, 0x57, 0x71, 0x66, 0x34, - 0x37, 0x25, 0x0e, 0xd0, 0x8a, 0xbe, 0x05, 0xc8, 0x73, 0x96, 0xeb, 0x8b, 0x77, 0xaa, 0xb7, 0x4e, - 0x4d, 0xb3, 0x98, 0x9a, 0x27, 0x66, 0x6a, 0x6e, 0x10, 0x98, 0xc9, 0x59, 0x56, 0xd9, 0x37, 0x2a, - 0xa9, 0xea, 0x9a, 0x3f, 0x2c, 0x54, 0xeb, 0xe6, 0xa3, 0x8c, 0x66, 0xc9, 0x9e, 0x24, 0x12, 0xec, - 0x67, 0x08, 0x51, 0x81, 0xb9, 0x49, 0xe9, 0x45, 0x5a, 0x8c, 0x96, 0xa8, 0x28, 0x30, 0x76, 0x8c, - 0x1e, 0x6a, 0xda, 0x43, 0xe0, 0xd2, 0xd8, 0x9a, 0xbb, 0xd5, 0xd6, 0x7a, 0x61, 0xeb, 0xf1, 0x15, - 0x5b, 0xb3, 0x7a, 0xe3, 0xaa, 0xa6, 0x92, 0xef, 0x81, 0x4b, 0x55, 0x65, 0x6f, 0xa0, 0xe5, 0x02, - 0x34, 0xc6, 0x02, 0x20, 0xd3, 0xeb, 0x58, 0xeb, 0xcc, 0x39, 0x56, 0x54, 0x35, 0xc0, 0xf1, 0x1e, - 0x40, 0x66, 0x6f, 0xa2, 0x47, 0x66, 0x54, 0x01, 0x32, 0x3c, 0xdd, 0xfd, 0xb2, 0xde, 0x7d, 0xed, - 0x52, 0x81, 0xba, 0xfa, 0x0d, 0xe8, 0xbc, 0x3b, 0x3d, 0x77, 0xad, 0xb3, 0x73, 0xd7, 0xfa, 0x7e, - 0xee, 0x5a, 0x27, 0x17, 0x6e, 0xe9, 0xec, 0xc2, 0x2d, 0x7d, 0xb9, 0x70, 0x4b, 0x1f, 0xdb, 0x09, - 0x95, 0x83, 0x51, 0xcf, 0x8f, 0x59, 0x1a, 0x14, 0xaf, 0xd3, 0x8b, 0x21, 0xe9, 0x89, 0x69, 0x10, - 0x1c, 0x6d, 0xbd, 0x0a, 0x3e, 0x99, 0x87, 0x4d, 0x8e, 0x39, 0x88, 0x5e, 0x45, 0xf7, 0xf8, 0xf2, - 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xca, 0xe8, 0x8b, 0xb4, 0xf5, 0x04, 0x00, 0x00, + 0xa1, 0x76, 0x4c, 0xd5, 0x4b, 0x6f, 0x44, 0xf4, 0xd0, 0x16, 0x55, 0x91, 0xe1, 0xd4, 0xcb, 0x6a, + 0xe3, 0x0c, 0xce, 0x8a, 0xd8, 0xbb, 0xf2, 0x6e, 0xa0, 0xf9, 0x17, 0xfc, 0xa5, 0xde, 0x38, 0x72, + 0xac, 0x7a, 0x48, 0x2b, 0x50, 0x2f, 0x3d, 0xf2, 0x0b, 0xaa, 0xdd, 0x75, 0x52, 0xa0, 0x1f, 0xc0, + 0xcd, 0x33, 0xfb, 0xe6, 0xbd, 0x37, 0xde, 0x99, 0x45, 0x1b, 0x4c, 0xa4, 0x4c, 0x50, 0x11, 0xc8, + 0x63, 0xc2, 0x83, 0xa3, 0xb0, 0x07, 0x92, 0x84, 0x3a, 0xc0, 0x39, 0xc4, 0x2c, 0xef, 0xfb, 0x3c, + 0x67, 0x92, 0xd9, 0xab, 0x05, 0xce, 0x57, 0x47, 0x7e, 0x81, 0xab, 0xaf, 0x26, 0x2c, 0x61, 0x1a, + 0x10, 0xa8, 0x2f, 0x83, 0xad, 0x7b, 0x09, 0x63, 0xc9, 0x10, 0x02, 0x1d, 0xf5, 0x46, 0x07, 0x81, + 0xa4, 0x29, 0x08, 0x49, 0x52, 0x6e, 0x00, 0xcd, 0xcf, 0x15, 0x84, 0xf6, 0x8f, 0x09, 0x8f, 0xb4, + 0x82, 0xfd, 0x14, 0x2d, 0x70, 0xc6, 0x86, 0x98, 0xf6, 0x1d, 0xab, 0x61, 0xb5, 0xca, 0x51, 0x45, + 0x85, 0x6f, 0xfb, 0xf6, 0x3a, 0xaa, 0x11, 0x21, 0x40, 0xb6, 0x71, 0x1f, 0x32, 0x96, 0x3a, 0x73, + 0x0d, 0xab, 0xb5, 0x14, 0x55, 0x4d, 0x6e, 0x47, 0xa5, 0x66, 0x90, 0xb0, 0x80, 0xcc, 0x5f, 0x81, + 0x84, 0x06, 0xb2, 0x8d, 0x2a, 0x03, 0xa0, 0xc9, 0x40, 0x3a, 0xe5, 0x86, 0xd5, 0x9a, 0xef, 0x6c, + 0xfe, 0x9c, 0x78, 0xcb, 0xa6, 0x39, 0x6c, 0x0e, 0x2e, 0x27, 0xde, 0xea, 0x98, 0xa4, 0xc3, 0xd7, + 0xcd, 0x6b, 0xe9, 0x66, 0x54, 0x14, 0xda, 0x1f, 0x50, 0x59, 0xf5, 0xe0, 0x3c, 0x68, 0x58, 0xad, + 0xea, 0x56, 0xdd, 0x37, 0x0d, 0xfa, 0xd3, 0x06, 0xfd, 0xfd, 0x69, 0x83, 0x1d, 0xf7, 0x74, 0xe2, + 0x95, 0x2e, 0x27, 0x9e, 0x7d, 0x8d, 0x4f, 0x15, 0x37, 0x4f, 0xbe, 0x79, 0x56, 0xa4, 0x79, 0xec, + 0x2e, 0xb2, 0x79, 0x1b, 0x0f, 0x89, 0x90, 0x58, 0x70, 0x26, 0x31, 0xcf, 0x69, 0x0c, 0x4e, 0x45, + 0x79, 0xef, 0x3c, 0x57, 0x0c, 0x5f, 0x27, 0xde, 0x5a, 0xac, 0x7f, 0xb9, 0xe8, 0x1f, 0xfa, 0x94, + 0x05, 0x29, 0x91, 0x03, 0x7f, 0x17, 0x12, 0x12, 0x8f, 0x77, 0x20, 0x8e, 0x56, 0x78, 0x7b, 0x97, + 0x08, 0xb9, 0xc7, 0x99, 0xec, 0xaa, 0x5a, 0xcd, 0x18, 0xfe, 0xc1, 0xb8, 0x70, 0x1f, 0xc6, 0xf0, + 0x3a, 0xe3, 0x00, 0xb9, 0xbc, 0x8d, 0x49, 0x4e, 0xe5, 0x20, 0x05, 0x49, 0x63, 0xac, 0x87, 0x82, + 0xc4, 0xf1, 0x28, 0x1d, 0x0d, 0x89, 0x64, 0xb9, 0xb3, 0x78, 0x77, 0xf6, 0x35, 0xde, 0xde, 0x9e, + 0x31, 0xa9, 0xab, 0xdf, 0xfe, 0xcd, 0xa3, 0x95, 0xc2, 0xff, 0x2a, 0x2d, 0xdd, 0x47, 0x29, 0xfc, + 0xb7, 0x12, 0x41, 0xf5, 0x04, 0x58, 0x0a, 0x32, 0xff, 0x9b, 0x0a, 0xba, 0xbb, 0x8a, 0x33, 0xa3, + 0xb9, 0x29, 0x71, 0x80, 0x56, 0xf4, 0x2d, 0x40, 0x9e, 0xb3, 0x5c, 0x5f, 0xbc, 0x53, 0xbd, 0x75, + 0x6a, 0x9a, 0xc5, 0xd4, 0x3c, 0x31, 0x53, 0x73, 0x83, 0xc0, 0x4c, 0xce, 0xb2, 0xca, 0xbe, 0x51, + 0x49, 0x55, 0xd7, 0xfc, 0x61, 0xa1, 0x5a, 0x37, 0x1f, 0x65, 0x34, 0x4b, 0xf6, 0x24, 0x91, 0x60, + 0x3f, 0x43, 0x88, 0x0a, 0xcc, 0x4d, 0x4a, 0x2f, 0xd2, 0x62, 0xb4, 0x44, 0x45, 0x81, 0xb1, 0x63, + 0xf4, 0x50, 0xd3, 0x1e, 0x02, 0x97, 0xc6, 0xd6, 0xdc, 0xad, 0xb6, 0xd6, 0x0b, 0x5b, 0x8f, 0xaf, + 0xd8, 0x9a, 0xd5, 0x1b, 0x57, 0x35, 0x95, 0x7c, 0x0f, 0x5c, 0xaa, 0x2a, 0x7b, 0x03, 0x2d, 0x17, + 0xa0, 0x31, 0x16, 0x00, 0x99, 0x5e, 0xc7, 0x5a, 0x67, 0xce, 0xb1, 0xa2, 0xaa, 0x01, 0x8e, 0xf7, + 0x00, 0x32, 0x7b, 0x13, 0x3d, 0x32, 0xa3, 0x0a, 0x90, 0xe1, 0xe9, 0xee, 0x97, 0xf5, 0xee, 0x6b, + 0x97, 0x0a, 0xd4, 0xd5, 0x6f, 0x40, 0xe7, 0xdd, 0xe9, 0xb9, 0x6b, 0x9d, 0x9d, 0xbb, 0xd6, 0xf7, + 0x73, 0xd7, 0x3a, 0xb9, 0x70, 0x4b, 0x67, 0x17, 0x6e, 0xe9, 0xcb, 0x85, 0x5b, 0xfa, 0xd8, 0x4e, + 0xa8, 0x1c, 0x8c, 0x7a, 0x7e, 0xcc, 0xd2, 0xa0, 0x78, 0x9d, 0x5e, 0x0c, 0x49, 0x4f, 0x4c, 0x83, + 0xe0, 0x68, 0xeb, 0x55, 0xf0, 0xc9, 0x3c, 0x6c, 0x72, 0xcc, 0x41, 0xf4, 0x2a, 0xba, 0xc7, 0x97, + 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x8c, 0xa3, 0xa3, 0xf5, 0x04, 0x00, 0x00, } func (m *TwapRecord) Marshal() (dAtA []byte, err error) { diff --git a/x/twap/types/twapmock/amminterface.go b/x/twap/types/twapmock/amminterface.go index 7ef77f6d560..6c521753da7 100644 --- a/x/twap/types/twapmock/amminterface.go +++ b/x/twap/types/twapmock/amminterface.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/twap/types" + "github.com/osmosis-labs/osmosis/v25/x/twap/types" ) var _ types.PoolManagerInterface = &ProgrammedPoolManagerInterface{} diff --git a/x/twap/types/utils_test.go b/x/twap/types/utils_test.go index 356171fa144..0849ebb31ed 100644 --- a/x/twap/types/utils_test.go +++ b/x/twap/types/utils_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmoutils/osmoassert" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) func TestMaxSpotPriceEquality(t *testing.T) { diff --git a/x/txfees/client/cli/query.go b/x/txfees/client/cli/query.go index 0672102a36a..ebacf2f67e4 100644 --- a/x/txfees/client/cli/query.go +++ b/x/txfees/client/cli/query.go @@ -4,8 +4,8 @@ import ( "github.com/spf13/cobra" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/twap/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/twap/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) // GetQueryCmd returns the cli query commands for this module. diff --git a/x/txfees/client/cli/query_test.go b/x/txfees/client/cli/query_test.go index 84c7377d32b..5f6249c14d5 100644 --- a/x/txfees/client/cli/query_test.go +++ b/x/txfees/client/cli/query_test.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) type QueryTestSuite struct { diff --git a/x/txfees/client/cli/tx.go b/x/txfees/client/cli/tx.go index 465e4e8b173..2c070defedb 100644 --- a/x/txfees/client/cli/tx.go +++ b/x/txfees/client/cli/tx.go @@ -15,7 +15,7 @@ import ( govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) const FlagFeeTokens = "fee-tokens" diff --git a/x/txfees/client/proposal_handler.go b/x/txfees/client/proposal_handler.go index 01afec0742d..327b20dab1e 100644 --- a/x/txfees/client/proposal_handler.go +++ b/x/txfees/client/proposal_handler.go @@ -1,7 +1,7 @@ package client import ( - "github.com/osmosis-labs/osmosis/v24/x/txfees/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/txfees/client/cli" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" ) diff --git a/x/txfees/handler.go b/x/txfees/handler.go index 58b7cfd688d..06f3957d9e0 100644 --- a/x/txfees/handler.go +++ b/x/txfees/handler.go @@ -7,8 +7,8 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) func NewUpdateFeeTokenProposalHandler(k keeper.Keeper) govtypesv1.Handler { diff --git a/x/txfees/keeper/feedecorator.go b/x/txfees/keeper/feedecorator.go index 5c6941f4896..d2b6e192223 100644 --- a/x/txfees/keeper/feedecorator.go +++ b/x/txfees/keeper/feedecorator.go @@ -9,9 +9,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/osmosis-labs/osmosis/osmomath" - mempool1559 "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper/mempool-1559" - "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper/txfee_filters" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + mempool1559 "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper/mempool-1559" + "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper/txfee_filters" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) diff --git a/x/txfees/keeper/feedecorator_test.go b/x/txfees/keeper/feedecorator_test.go index 57be29cc67e..0b8ec762a63 100644 --- a/x/txfees/keeper/feedecorator_test.go +++ b/x/txfees/keeper/feedecorator_test.go @@ -7,7 +7,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) func (s *KeeperTestSuite) TestFeeDecorator() { diff --git a/x/txfees/keeper/feetokens.go b/x/txfees/keeper/feetokens.go index ef749a71acb..e3410011ed5 100644 --- a/x/txfees/keeper/feetokens.go +++ b/x/txfees/keeper/feetokens.go @@ -6,7 +6,7 @@ import ( errorsmod "cosmossdk.io/errors" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/txfees/keeper/feetokens_test.go b/x/txfees/keeper/feetokens_test.go index 1cfed154e66..c57c4cb896f 100644 --- a/x/txfees/keeper/feetokens_test.go +++ b/x/txfees/keeper/feetokens_test.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/txfees/keeper/genesis.go b/x/txfees/keeper/genesis.go index 53293aaeb29..68a5dd18dbb 100644 --- a/x/txfees/keeper/genesis.go +++ b/x/txfees/keeper/genesis.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/txfees/keeper/genesis_test.go b/x/txfees/keeper/genesis_test.go index 569917d9b72..b06ae50cbc3 100644 --- a/x/txfees/keeper/genesis_test.go +++ b/x/txfees/keeper/genesis_test.go @@ -3,7 +3,7 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) var ( diff --git a/x/txfees/keeper/gov.go b/x/txfees/keeper/gov.go index d23b5443a7c..3f00eb2169b 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/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/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 6151ee3a7a4..9a06b3f8277 100644 --- a/x/txfees/keeper/grpc_query.go +++ b/x/txfees/keeper/grpc_query.go @@ -9,8 +9,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - mempool1559 "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper/mempool-1559" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + mempool1559 "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper/mempool-1559" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) var _ types.QueryServer = Querier{} diff --git a/x/txfees/keeper/hooks.go b/x/txfees/keeper/hooks.go index f9b2adbd2fb..7b3f2df217f 100644 --- a/x/txfees/keeper/hooks.go +++ b/x/txfees/keeper/hooks.go @@ -12,7 +12,7 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - txfeestypes "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + txfeestypes "github.com/osmosis-labs/osmosis/v25/x/txfees/types" epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types" ) diff --git a/x/txfees/keeper/hooks_test.go b/x/txfees/keeper/hooks_test.go index 21bf9b26578..3ce817a1ead 100644 --- a/x/txfees/keeper/hooks_test.go +++ b/x/txfees/keeper/hooks_test.go @@ -8,10 +8,10 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/bank/testutil" diff --git a/x/txfees/keeper/keeper.go b/x/txfees/keeper/keeper.go index f06686c47ee..536a09bbd71 100644 --- a/x/txfees/keeper/keeper.go +++ b/x/txfees/keeper/keeper.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/txfees/keeper/keeper_test.go b/x/txfees/keeper/keeper_test.go index 194bbece810..2186c2c2be6 100644 --- a/x/txfees/keeper/keeper_test.go +++ b/x/txfees/keeper/keeper_test.go @@ -9,11 +9,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/osmosis-labs/osmosis/osmomath" - osmosisapp "github.com/osmosis-labs/osmosis/v24/app" + osmosisapp "github.com/osmosis-labs/osmosis/v25/app" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - protorevtypes "github.com/osmosis-labs/osmosis/v24/x/protorev/types" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + protorevtypes "github.com/osmosis-labs/osmosis/v25/x/protorev/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) type KeeperTestSuite struct { diff --git a/x/txfees/keeper/msg_server.go b/x/txfees/keeper/msg_server.go index 28ff05f7e80..46307729d47 100644 --- a/x/txfees/keeper/msg_server.go +++ b/x/txfees/keeper/msg_server.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) type msgServer struct { diff --git a/x/txfees/keeper/txfee_filters/arb_tx.go b/x/txfees/keeper/txfee_filters/arb_tx.go index 025bca07125..2c487e5fb93 100644 --- a/x/txfees/keeper/txfee_filters/arb_tx.go +++ b/x/txfees/keeper/txfee_filters/arb_tx.go @@ -7,8 +7,8 @@ import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/txfees/keeper/txfee_filters/arb_tx_test.go b/x/txfees/keeper/txfee_filters/arb_tx_test.go index 88be1d48c03..80642422566 100644 --- a/x/txfees/keeper/txfee_filters/arb_tx_test.go +++ b/x/txfees/keeper/txfee_filters/arb_tx_test.go @@ -8,10 +8,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - "github.com/osmosis-labs/osmosis/v24/x/gamm/types" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" - "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper/txfee_filters" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + "github.com/osmosis-labs/osmosis/v25/x/gamm/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper/txfee_filters" ) type KeeperTestSuite struct { diff --git a/x/txfees/keeper/txfee_filters/export_test.go b/x/txfees/keeper/txfee_filters/export_test.go index a8ab776adb7..523417dcbc2 100644 --- a/x/txfees/keeper/txfee_filters/export_test.go +++ b/x/txfees/keeper/txfee_filters/export_test.go @@ -3,7 +3,7 @@ package txfee_filters import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammtypes "github.com/osmosis-labs/osmosis/v24/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v25/x/gamm/types" ) func IsArbTxLooseAuthz(msg sdk.Msg, swapInDenom string, lpTypesSeen map[gammtypes.LiquidityChangeType]bool) (string, bool) { diff --git a/x/txfees/module.go b/x/txfees/module.go index 22915ec5798..36d60aab51d 100644 --- a/x/txfees/module.go +++ b/x/txfees/module.go @@ -25,10 +25,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/v24/x/txfees/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper" - mempool1559 "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper/mempool-1559" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper" + mempool1559 "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper/mempool-1559" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) var ( diff --git a/x/txfees/module_test.go b/x/txfees/module_test.go index 0244c46839b..4ff30f6ab11 100644 --- a/x/txfees/module_test.go +++ b/x/txfees/module_test.go @@ -12,10 +12,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - osmosisapp "github.com/osmosis-labs/osmosis/v24/app" + osmosisapp "github.com/osmosis-labs/osmosis/v25/app" - simapp "github.com/osmosis-labs/osmosis/v24/app" - mempool1559 "github.com/osmosis-labs/osmosis/v24/x/txfees/keeper/mempool-1559" + simapp "github.com/osmosis-labs/osmosis/v25/app" + mempool1559 "github.com/osmosis-labs/osmosis/v25/x/txfees/keeper/mempool-1559" ) func TestSetBaseDenomOnInitBlock(t *testing.T) { diff --git a/x/txfees/types/expected_keepers.go b/x/txfees/types/expected_keepers.go index e750b7987dc..8897b577e88 100644 --- a/x/txfees/types/expected_keepers.go +++ b/x/txfees/types/expected_keepers.go @@ -7,7 +7,7 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/osmosis-labs/osmosis/osmomath" - poolmanagertypes "github.com/osmosis-labs/osmosis/v24/x/poolmanager/types" + poolmanagertypes "github.com/osmosis-labs/osmosis/v25/x/poolmanager/types" ) // SpotPriceCalculator defines the contract that must be fulfilled by a spot price calculator diff --git a/x/txfees/types/feetoken.pb.go b/x/txfees/types/feetoken.pb.go index bf830b757df..e133491f455 100644 --- a/x/txfees/types/feetoken.pb.go +++ b/x/txfees/types/feetoken.pb.go @@ -101,9 +101,9 @@ var fileDescriptor_c50689857adfcfe0 = []byte{ 0x28, 0x05, 0x41, 0x55, 0x58, 0xb1, 0xbc, 0x58, 0x20, 0xcf, 0xe8, 0xe4, 0x73, 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, 0x46, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, - 0xf9, 0xb9, 0xfa, 0x50, 0x87, 0xeb, 0xe6, 0x24, 0x26, 0x15, 0xc3, 0x38, 0xfa, 0x65, 0x46, 0x26, + 0xf9, 0xb9, 0xfa, 0x50, 0x87, 0xeb, 0xe6, 0x24, 0x26, 0x15, 0xc3, 0x38, 0xfa, 0x65, 0x46, 0xa6, 0xfa, 0x15, 0x30, 0x2f, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x9d, 0x6e, 0x0c, 0x08, - 0x00, 0x00, 0xff, 0xff, 0x98, 0xbb, 0x7e, 0xb4, 0x11, 0x01, 0x00, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xbf, 0xde, 0x5b, 0x35, 0x11, 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 983bd7ec8c3..dfb6bfbc47f 100644 --- a/x/txfees/types/genesis.pb.go +++ b/x/txfees/types/genesis.pb.go @@ -95,26 +95,27 @@ func init() { } var fileDescriptor_4423c18e3d020b37 = []byte{ - // 304 bytes of a gzipped FileDescriptorProto + // 305 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0xcb, 0x4a, 0xf3, 0x40, 0x18, 0x86, 0x33, 0x7f, 0x43, 0xf9, 0x93, 0x2a, 0x48, 0x10, 0x09, 0x45, 0xc6, 0xe0, 0x01, 0xb2, - 0x71, 0x86, 0x46, 0x97, 0xae, 0x8a, 0x54, 0x10, 0x17, 0x12, 0xbb, 0x72, 0x37, 0x89, 0x5f, 0x63, - 0xa8, 0xc9, 0x84, 0xcc, 0x58, 0xe2, 0x5d, 0x78, 0x53, 0x42, 0x97, 0x5d, 0xba, 0x12, 0x49, 0x6e, - 0x44, 0x92, 0x4c, 0xec, 0xc6, 0xec, 0xe6, 0xf0, 0x7c, 0xcf, 0xbc, 0xf3, 0x9a, 0xa7, 0x5c, 0x24, - 0x5c, 0xc4, 0x82, 0xca, 0x62, 0x01, 0x20, 0xe8, 0x6a, 0x12, 0x80, 0x64, 0x13, 0x1a, 0x41, 0x0a, - 0x22, 0x16, 0x24, 0xcb, 0xb9, 0xe4, 0xd6, 0x81, 0xa2, 0x48, 0x4b, 0x11, 0x45, 0x8d, 0xf7, 0x23, - 0x1e, 0xf1, 0x06, 0xa1, 0xf5, 0xaa, 0xa5, 0xc7, 0x67, 0x3d, 0xce, 0x05, 0x80, 0xe4, 0x4b, 0x48, - 0x15, 0x86, 0xc3, 0x86, 0xa3, 0x01, 0x13, 0xf0, 0xcb, 0x84, 0x3c, 0xee, 0xee, 0x4f, 0x7a, 0x34, - 0x19, 0xcb, 0x59, 0xa2, 0x92, 0x1d, 0x7f, 0x20, 0x73, 0xe7, 0xa6, 0xcd, 0xfa, 0x20, 0x99, 0x04, - 0xeb, 0xd0, 0x34, 0x6a, 0xe1, 0x13, 0xa4, 0x3c, 0xb1, 0x91, 0x83, 0x5c, 0xc3, 0xdf, 0x1e, 0x58, - 0xd7, 0xa6, 0xd1, 0xa5, 0x10, 0xf6, 0x3f, 0x67, 0xe0, 0x8e, 0x3c, 0x87, 0xfc, 0xfd, 0x39, 0x32, - 0x03, 0x98, 0xd7, 0xe0, 0x54, 0x5f, 0x7f, 0x1d, 0x69, 0xfe, 0x76, 0xd0, 0xba, 0x32, 0x87, 0x6d, - 0x08, 0x5b, 0x77, 0x90, 0x3b, 0xf2, 0x70, 0x9f, 0xe2, 0xbe, 0xa1, 0x94, 0x40, 0xcd, 0xdc, 0xea, - 0xff, 0x07, 0x7b, 0xba, 0xbf, 0x2b, 0x8b, 0x19, 0x80, 0x98, 0xe7, 0x2c, 0x5c, 0x42, 0x3e, 0xbd, - 0x5b, 0x97, 0x18, 0x6d, 0x4a, 0x8c, 0xbe, 0x4b, 0x8c, 0xde, 0x2b, 0xac, 0x6d, 0x2a, 0xac, 0x7d, - 0x56, 0x58, 0x7b, 0xf4, 0xa2, 0x58, 0x3e, 0xbf, 0x06, 0x24, 0xe4, 0x09, 0x55, 0xcf, 0x9c, 0xbf, - 0xb0, 0x40, 0x74, 0x1b, 0xba, 0xf2, 0x2e, 0x69, 0xd1, 0x95, 0x24, 0xdf, 0x32, 0x10, 0xc1, 0xb0, - 0x29, 0xe7, 0xe2, 0x27, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x7e, 0x18, 0x10, 0xde, 0x01, 0x00, 0x00, + 0x71, 0x86, 0x46, 0xdc, 0xb9, 0x2a, 0x52, 0x41, 0x5c, 0x48, 0xec, 0xca, 0xdd, 0x24, 0x7e, 0x8d, + 0xa1, 0x26, 0x13, 0x32, 0x63, 0x89, 0x77, 0xe1, 0x4d, 0x09, 0x5d, 0x76, 0xe9, 0x4a, 0x24, 0xb9, + 0x11, 0x49, 0x32, 0xb1, 0x1b, 0xb3, 0x9b, 0xc3, 0xf3, 0x3d, 0xf3, 0xce, 0x6b, 0x9e, 0x72, 0x91, + 0x70, 0x11, 0x0b, 0x2a, 0x8b, 0x05, 0x80, 0xa0, 0xab, 0x49, 0x00, 0x92, 0x4d, 0x68, 0x04, 0x29, + 0x88, 0x58, 0x90, 0x2c, 0xe7, 0x92, 0x5b, 0x07, 0x8a, 0x22, 0x2d, 0x45, 0x14, 0x35, 0xde, 0x8f, + 0x78, 0xc4, 0x1b, 0x84, 0xd6, 0xab, 0x96, 0x1e, 0x9f, 0xf5, 0x38, 0x17, 0x00, 0x92, 0x2f, 0x21, + 0x55, 0x18, 0x0e, 0x1b, 0x8e, 0x06, 0x4c, 0xc0, 0x2f, 0x13, 0xf2, 0xb8, 0xbb, 0x3f, 0xe9, 0xd1, + 0x64, 0x2c, 0x67, 0x89, 0x4a, 0x76, 0xfc, 0x81, 0xcc, 0x9d, 0x9b, 0x36, 0xeb, 0x83, 0x64, 0x12, + 0xac, 0x43, 0xd3, 0xa8, 0x85, 0x4f, 0x90, 0xf2, 0xc4, 0x46, 0x0e, 0x72, 0x0d, 0x7f, 0x7b, 0x60, + 0x5d, 0x9b, 0x46, 0x97, 0x42, 0xd8, 0xff, 0x9c, 0x81, 0x3b, 0xf2, 0x1c, 0xf2, 0xf7, 0xe7, 0xc8, + 0x0c, 0x60, 0x5e, 0x83, 0x53, 0x7d, 0xfd, 0x75, 0xa4, 0xf9, 0xdb, 0x41, 0xeb, 0xca, 0x1c, 0xb6, + 0x21, 0x6c, 0xdd, 0x41, 0xee, 0xc8, 0xc3, 0x7d, 0x8a, 0xfb, 0x86, 0x52, 0x02, 0x35, 0x73, 0xab, + 0xff, 0x1f, 0xec, 0xe9, 0xfe, 0xae, 0x2c, 0x66, 0x00, 0x62, 0x9e, 0xb3, 0x70, 0x09, 0xf9, 0xf4, + 0x6e, 0x5d, 0x62, 0xb4, 0x29, 0x31, 0xfa, 0x2e, 0x31, 0x7a, 0xaf, 0xb0, 0xb6, 0xa9, 0xb0, 0xf6, + 0x59, 0x61, 0xed, 0xd1, 0x8b, 0x62, 0xf9, 0xfc, 0x1a, 0x90, 0x90, 0x27, 0x54, 0x3d, 0x73, 0xfe, + 0xc2, 0x02, 0xd1, 0x6d, 0xe8, 0xca, 0xbb, 0xa4, 0x45, 0x57, 0x92, 0x7c, 0xcb, 0x40, 0x04, 0xc3, + 0xa6, 0x9c, 0x8b, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x1b, 0x3d, 0x91, 0xde, 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 8f46a16e46e..fdf1da7dee2 100644 --- a/x/txfees/types/gov.pb.go +++ b/x/txfees/types/gov.pb.go @@ -96,9 +96,9 @@ var fileDescriptor_2c4a51bafc82863d = []byte{ 0xf9, 0x06, 0x2d, 0x39, 0x58, 0x68, 0x61, 0x0f, 0x0b, 0x27, 0x9f, 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, 0x32, 0x4a, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, - 0xd5, 0x87, 0x1a, 0xa2, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x99, 0xe8, 0x57, + 0xd5, 0x87, 0x1a, 0xa2, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0xe3, 0xe8, 0x97, 0x19, 0x99, 0xea, 0x57, 0xc0, 0x62, 0xa1, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0xf6, 0xc6, 0x80, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x87, 0x0a, 0xb6, 0xb7, 0x22, 0x02, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xa0, 0x6f, 0x93, 0x36, 0x22, 0x02, 0x00, 0x00, } func (this *UpdateFeeTokenProposal) Equal(that interface{}) bool { diff --git a/x/txfees/types/msgs_test.go b/x/txfees/types/msgs_test.go index 7aef0968543..ff3c219ac91 100644 --- a/x/txfees/types/msgs_test.go +++ b/x/txfees/types/msgs_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" - "github.com/osmosis-labs/osmosis/v24/x/txfees/types" + "github.com/osmosis-labs/osmosis/v25/x/txfees/types" ) type extMsg interface { diff --git a/x/txfees/types/params.pb.go b/x/txfees/types/params.pb.go index bf3c4b2a10b..162a1f0db34 100644 --- a/x/txfees/types/params.pb.go +++ b/x/txfees/types/params.pb.go @@ -90,9 +90,9 @@ var fileDescriptor_fcbfbe8e37bb08e6 = []byte{ 0x90, 0x6c, 0x30, 0x44, 0xd2, 0xc9, 0xe7, 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, 0x8c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0xbe, 0xd1, - 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x8c, 0x4c, 0xf4, 0x2b, 0x60, 0xa1, 0x50, 0x52, - 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xf6, 0x8f, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x54, 0x2a, - 0x56, 0x19, 0x24, 0x01, 0x00, 0x00, + 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0x71, 0xf4, 0xcb, 0x8c, 0x4c, 0xf5, 0x2b, 0x60, 0xa1, 0x50, 0x52, + 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0xf6, 0x8f, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x73, 0x4f, + 0x73, 0x98, 0x24, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/txfees/types/query.pb.go b/x/txfees/types/query.pb.go index 9b24508c5e3..0c13700640b 100644 --- a/x/txfees/types/query.pb.go +++ b/x/txfees/types/query.pb.go @@ -466,7 +466,7 @@ var fileDescriptor_6cbc1b48c44dfdd6 = []byte{ // 695 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xc1, 0x4e, 0x13, 0x5d, 0x14, 0xee, 0xf0, 0xff, 0xa0, 0xbd, 0x28, 0xea, 0x8d, 0x40, 0x1d, 0xcc, 0x94, 0xdc, 0xa8, 0x21, - 0x98, 0xce, 0x85, 0x82, 0xc6, 0xb8, 0xb3, 0xa9, 0x18, 0x13, 0x62, 0x60, 0x34, 0x31, 0x61, 0x33, + 0x98, 0xce, 0x85, 0x22, 0xc6, 0xb8, 0xb3, 0xa9, 0x18, 0x13, 0x62, 0x60, 0x34, 0x31, 0x61, 0x33, 0x99, 0x69, 0xcf, 0x94, 0x09, 0x6d, 0xef, 0xd0, 0x7b, 0x4b, 0x68, 0x8c, 0x1b, 0x9f, 0xc0, 0xc4, 0xc4, 0x07, 0x60, 0xe3, 0xce, 0xbd, 0x6f, 0xc0, 0x92, 0xc4, 0x8d, 0x71, 0xd1, 0x18, 0xf0, 0x09, 0x78, 0x02, 0x33, 0x77, 0xee, 0x74, 0x0a, 0x74, 0x68, 0xd9, 0x75, 0xe6, 0x9c, 0xf3, 0x7d, 0xdf, @@ -489,16 +489,16 @@ var fileDescriptor_6cbc1b48c44dfdd6 = []byte{ 0x3e, 0xa3, 0x0d, 0x47, 0x6c, 0x9b, 0xeb, 0x50, 0x73, 0x2a, 0x9d, 0x32, 0x54, 0x92, 0x55, 0x93, 0x71, 0x62, 0x65, 0x79, 0x2c, 0x86, 0xbc, 0x40, 0xb3, 0x89, 0xc6, 0x8d, 0x90, 0xac, 0x7a, 0xd5, 0x3d, 0xd7, 0x50, 0xee, 0x22, 0xc4, 0xd5, 0x77, 0xec, 0x99, 0xa0, 0xe4, 0x70, 0x90, 0x58, 0xb1, - 0x09, 0xde, 0x28, 0x13, 0xf4, 0x15, 0x14, 0xfc, 0x2a, 0x42, 0xae, 0xc3, 0xc1, 0xee, 0xd7, 0x39, - 0x9d, 0xec, 0x9c, 0xd4, 0x88, 0x95, 0x75, 0xe3, 0x69, 0x92, 0x53, 0x78, 0x2f, 0xfd, 0x20, 0x84, - 0x5c, 0x83, 0xf8, 0xb4, 0xa4, 0xae, 0xbe, 0x46, 0x7f, 0x45, 0x51, 0x6d, 0xa2, 0xeb, 0x12, 0xce, - 0x03, 0x50, 0x44, 0x4f, 0x47, 0xfb, 0xfe, 0xb7, 0xfa, 0xb4, 0x78, 0x00, 0xc4, 0xba, 0xe6, 0x46, - 0xd0, 0xc5, 0x1f, 0x13, 0x68, 0x5c, 0xd2, 0xe1, 0xaf, 0x1a, 0xca, 0xf6, 0x2c, 0x8e, 0x0b, 0x69, - 0x36, 0x1e, 0x98, 0x11, 0xdd, 0x1c, 0xb5, 0x3d, 0xda, 0x84, 0x2c, 0x7e, 0xfa, 0xf9, 0xf7, 0xcb, - 0xd8, 0x03, 0x4c, 0x68, 0x7a, 0x38, 0x55, 0x2a, 0xf0, 0x77, 0x0d, 0x4d, 0x9d, 0xb5, 0x2f, 0x2e, - 0x5e, 0x4a, 0x37, 0x30, 0x32, 0xfa, 0xca, 0x95, 0x66, 0x94, 0xce, 0x15, 0xa9, 0xb3, 0x80, 0x1f, - 0xa7, 0xe9, 0x4c, 0x2c, 0x6d, 0xbb, 0x9d, 0xe8, 0xce, 0xf8, 0x9b, 0x86, 0x26, 0xfb, 0x8c, 0x88, - 0xe9, 0x70, 0xe6, 0x33, 0xae, 0xd7, 0x97, 0x46, 0x1f, 0x50, 0x3a, 0x9f, 0x48, 0x9d, 0x14, 0x17, + 0x09, 0xde, 0x28, 0x13, 0xf4, 0x15, 0x14, 0xfc, 0x13, 0x84, 0x5c, 0x87, 0x83, 0xdd, 0xaf, 0x73, + 0x3a, 0xd9, 0x39, 0xa9, 0x11, 0x2b, 0xeb, 0xc6, 0xd3, 0x24, 0xa7, 0xf0, 0x5e, 0xfa, 0x41, 0x08, + 0xb9, 0x06, 0xf1, 0x69, 0x49, 0x5d, 0x7d, 0x8d, 0xfe, 0x8a, 0xa2, 0xda, 0x44, 0xd7, 0x25, 0x9c, + 0x07, 0xa0, 0x88, 0x9e, 0x8e, 0xf6, 0xfd, 0x6f, 0xf5, 0x69, 0xf1, 0x00, 0x88, 0x75, 0xcd, 0x8d, + 0xa0, 0x8b, 0x3f, 0x26, 0xd0, 0xb8, 0xa4, 0xc3, 0x5f, 0x35, 0x94, 0xed, 0x59, 0x1c, 0x17, 0xd2, + 0x6c, 0x3c, 0x30, 0x23, 0xba, 0x39, 0x6a, 0x7b, 0xb4, 0x09, 0x59, 0xfc, 0xf4, 0xf3, 0xef, 0x97, + 0xb1, 0x07, 0x98, 0xd0, 0xf4, 0x70, 0xaa, 0x54, 0xe0, 0xef, 0x1a, 0x9a, 0x3a, 0x6b, 0x5f, 0x5c, + 0xbc, 0x94, 0x6e, 0x60, 0x64, 0xf4, 0x95, 0x2b, 0xcd, 0x28, 0x9d, 0x2b, 0x52, 0x67, 0x01, 0x3f, + 0x4e, 0xd3, 0x99, 0x58, 0xda, 0x76, 0x3b, 0xd1, 0x9d, 0xf1, 0x37, 0x0d, 0x4d, 0xf6, 0x19, 0x11, + 0xd3, 0xe1, 0xcc, 0x67, 0x5c, 0xaf, 0x2f, 0x8d, 0x3e, 0xa0, 0x74, 0xae, 0x4a, 0x9d, 0x14, 0x17, 0xd2, 0x74, 0x4a, 0x65, 0xb6, 0xf2, 0x3b, 0xfd, 0x20, 0x1f, 0x3f, 0xca, 0x9b, 0xf7, 0x1c, 0x3d, 0xe4, 0xe6, 0xe7, 0x23, 0x31, 0xe4, 0xe6, 0x17, 0x82, 0x32, 0xfc, 0xe6, 0x49, 0x54, 0xf0, 0x81, 0x86, 0x6e, 0xbe, 0x02, 0x91, 0x64, 0x00, 0x5f, 0xce, 0x76, 0x21, 0x46, 0x3a, 0x1d, 0xb9, 0x5f, @@ -506,8 +506,8 @@ var fileDescriptor_6cbc1b48c44dfdd6 = []byte{ 0x8a, 0x4a, 0xeb, 0x87, 0xc7, 0x86, 0x76, 0x74, 0x6c, 0x68, 0x7f, 0x8e, 0x0d, 0xed, 0xf3, 0x89, 0x91, 0x39, 0x3a, 0x31, 0x32, 0xbf, 0x4e, 0x8c, 0xcc, 0x56, 0xb1, 0xe6, 0x8b, 0xed, 0xb6, 0x6b, 0x56, 0x58, 0x23, 0x46, 0x2b, 0xd4, 0x1d, 0x97, 0xf7, 0xa0, 0xf7, 0x8a, 0xab, 0x74, 0x3f, 0x26, - 0x10, 0x9d, 0x00, 0xb8, 0x3b, 0x21, 0xff, 0x86, 0x56, 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff, 0x13, - 0x97, 0x61, 0x9d, 0x3f, 0x07, 0x00, 0x00, + 0x10, 0x9d, 0x00, 0xb8, 0x3b, 0x21, 0xff, 0x86, 0x56, 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff, 0x34, + 0xf2, 0x44, 0x1c, 0x3f, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/txfees/types/tx.pb.go b/x/txfees/types/tx.pb.go index 7661781fc7e..2290119a378 100644 --- a/x/txfees/types/tx.pb.go +++ b/x/txfees/types/tx.pb.go @@ -145,9 +145,9 @@ var fileDescriptor_3d23e2aa9435ce2a = []byte{ 0x47, 0x4a, 0x9f, 0x48, 0x85, 0x30, 0x0b, 0x9d, 0x7c, 0x4e, 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, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, - 0x6a, 0xa8, 0x6e, 0x4e, 0x62, 0x52, 0x31, 0x8c, 0xa3, 0x5f, 0x66, 0x64, 0xa2, 0x5f, 0x01, 0x8b, + 0x6a, 0xa8, 0x6e, 0x4e, 0x62, 0x52, 0x31, 0x8c, 0xa3, 0x5f, 0x66, 0x64, 0xaa, 0x5f, 0x01, 0x8b, 0xa2, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0xc4, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, - 0xff, 0x7c, 0x5a, 0x5e, 0x70, 0x23, 0x02, 0x00, 0x00, + 0xff, 0x5b, 0x3f, 0x7b, 0xf1, 0x23, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/valset-pref/client/cli/query.go b/x/valset-pref/client/cli/query.go index c9bc481901c..908f0b958cf 100644 --- a/x/valset-pref/client/cli/query.go +++ b/x/valset-pref/client/cli/query.go @@ -4,8 +4,8 @@ import ( "github.com/spf13/cobra" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" ) // GetQueryCmd returns the cli query commands for this module. diff --git a/x/valset-pref/client/cli/query_test.go b/x/valset-pref/client/cli/query_test.go index cc96b2b786d..34e212ec430 100644 --- a/x/valset-pref/client/cli/query_test.go +++ b/x/valset-pref/client/cli/query_test.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - valPref "github.com/osmosis-labs/osmosis/v24/x/valset-pref" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + valPref "github.com/osmosis-labs/osmosis/v25/x/valset-pref" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" "github.com/osmosis-labs/osmosis/osmomath" ) diff --git a/x/valset-pref/client/cli/tx.go b/x/valset-pref/client/cli/tx.go index 21ff3f8fc3d..ef15ea560ed 100644 --- a/x/valset-pref/client/cli/tx.go +++ b/x/valset-pref/client/cli/tx.go @@ -12,7 +12,7 @@ import ( "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/osmoutils/osmocli" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" ) func GetTxCmd() *cobra.Command { diff --git a/x/valset-pref/client/grpc/grpc_query.go b/x/valset-pref/client/grpc/grpc_query.go index afc6ef5e2a3..f2ef2bd7831 100644 --- a/x/valset-pref/client/grpc/grpc_query.go +++ b/x/valset-pref/client/grpc/grpc_query.go @@ -11,8 +11,8 @@ import ( "google.golang.org/grpc/status" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/client" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/client" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/client/queryproto" ) type Querier struct { diff --git a/x/valset-pref/client/query_proto_wrap.go b/x/valset-pref/client/query_proto_wrap.go index 4b0970f9b42..75133013a14 100644 --- a/x/valset-pref/client/query_proto_wrap.go +++ b/x/valset-pref/client/query_proto_wrap.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - validatorprefkeeper "github.com/osmosis-labs/osmosis/v24/x/valset-pref" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/client/queryproto" + validatorprefkeeper "github.com/osmosis-labs/osmosis/v25/x/valset-pref" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/client/queryproto" ) type Querier struct { diff --git a/x/valset-pref/client/queryproto/query.pb.go b/x/valset-pref/client/queryproto/query.pb.go index bce96424d06..276521ce1d6 100644 --- a/x/valset-pref/client/queryproto/query.pb.go +++ b/x/valset-pref/client/queryproto/query.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - types "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + types "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -120,26 +120,26 @@ var fileDescriptor_6e2d5b0777f607c6 = []byte{ // 343 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0x4f, 0x4b, 0x3a, 0x41, 0x18, 0xde, 0xf9, 0xfd, 0xfa, 0x43, 0xeb, 0x6d, 0xe9, 0xb0, 0x2c, 0x31, 0x8a, 0x07, 0xf1, 0xe2, - 0x0c, 0x5a, 0x37, 0x3b, 0xd9, 0x17, 0x28, 0xa1, 0x82, 0x6e, 0xb3, 0xfa, 0xba, 0x2d, 0xac, 0xfb, - 0xae, 0xf3, 0x8e, 0x52, 0x48, 0x97, 0x3e, 0x41, 0xd0, 0x67, 0x0a, 0xbc, 0x25, 0x74, 0xe9, 0x14, - 0xa5, 0x7d, 0x90, 0xd0, 0x5d, 0x31, 0x21, 0x0d, 0x3a, 0xed, 0xce, 0xcc, 0xf3, 0x67, 0x9e, 0xf7, - 0x19, 0xbb, 0x84, 0xd4, 0x45, 0x0a, 0x49, 0x0e, 0x54, 0x44, 0x60, 0x12, 0x0d, 0x1d, 0x39, 0xa8, - 0xfa, 0x60, 0x54, 0x55, 0xf6, 0xfa, 0xa0, 0x6f, 0x45, 0xa2, 0xd1, 0xa0, 0xe3, 0x65, 0x38, 0xb1, - 0xc4, 0x89, 0x0c, 0xe7, 0xed, 0x07, 0x18, 0xe0, 0x1c, 0x26, 0x67, 0x7f, 0x29, 0xc3, 0x3b, 0x08, - 0x10, 0x83, 0x08, 0xa4, 0x4a, 0x42, 0xa9, 0xe2, 0x18, 0x8d, 0x32, 0x21, 0xc6, 0x94, 0x9d, 0x6e, - 0xf2, 0x25, 0xa3, 0x0c, 0xa4, 0xb8, 0x62, 0xdd, 0xce, 0x9f, 0x13, 0xe8, 0x0b, 0x15, 0x85, 0x6d, - 0x65, 0x50, 0x9f, 0x6a, 0xe8, 0x80, 0x86, 0xb8, 0x05, 0xd4, 0x84, 0x5e, 0x1f, 0xc8, 0x38, 0xae, - 0xbd, 0xab, 0xda, 0x6d, 0x0d, 0x44, 0x2e, 0x2b, 0xb0, 0xf2, 0x5e, 0x73, 0xb1, 0x2c, 0x0e, 0xed, - 0xc2, 0x7a, 0x32, 0x25, 0x18, 0x13, 0x38, 0x97, 0x76, 0x2e, 0x59, 0x6e, 0xbb, 0xac, 0xf0, 0xbf, - 0x9c, 0xab, 0x49, 0xb1, 0x3e, 0xae, 0xf8, 0x41, 0xae, 0xb1, 0x35, 0x7a, 0xcb, 0x5b, 0xcd, 0xef, - 0x4a, 0xb5, 0x67, 0x66, 0x6f, 0x9f, 0xcd, 0x26, 0xe8, 0x3c, 0x31, 0xdb, 0x5d, 0x77, 0x0f, 0xa7, - 0xbe, 0xc9, 0xea, 0x97, 0xe8, 0xde, 0xf1, 0xdf, 0xc8, 0x69, 0xf4, 0xa2, 0xb8, 0x7f, 0xf9, 0x7c, - 0xfc, 0x57, 0x76, 0x4a, 0x72, 0xb5, 0x8c, 0xca, 0x4a, 0x1b, 0xc3, 0x6c, 0x9a, 0x77, 0x0d, 0x35, - 0xfa, 0xe0, 0xd6, 0x68, 0xc2, 0xd9, 0x78, 0xc2, 0xd9, 0xfb, 0x84, 0xb3, 0x87, 0x29, 0xb7, 0xc6, - 0x53, 0x6e, 0xbd, 0x4e, 0xb9, 0x75, 0x75, 0x12, 0x84, 0xe6, 0xba, 0xef, 0x8b, 0x16, 0x76, 0x17, - 0x7a, 0x95, 0x48, 0xf9, 0xb4, 0x14, 0xaf, 0x1d, 0xc9, 0x9b, 0x15, 0x8b, 0x56, 0x14, 0x42, 0x6c, - 0xd2, 0x77, 0x36, 0xaf, 0xdb, 0xdf, 0x99, 0x7f, 0x0e, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x56, - 0x52, 0x66, 0x2e, 0x97, 0x02, 0x00, 0x00, + 0x0c, 0x1a, 0x9d, 0xec, 0x64, 0x5f, 0xa0, 0x84, 0x0a, 0xba, 0xcd, 0xea, 0xeb, 0xb6, 0xb0, 0xee, + 0xbb, 0xce, 0x3b, 0x4a, 0x21, 0x5d, 0xfa, 0x04, 0x41, 0x9f, 0x29, 0xf0, 0x96, 0xd0, 0xa5, 0x53, + 0x94, 0xf6, 0x41, 0x42, 0x77, 0xc5, 0x84, 0x34, 0xe8, 0xb4, 0x3b, 0x33, 0xcf, 0x9f, 0x79, 0xde, + 0x67, 0xec, 0x12, 0x52, 0x17, 0x29, 0x24, 0x39, 0x50, 0x11, 0x81, 0x49, 0x34, 0x74, 0xe4, 0xa0, + 0xea, 0x83, 0x51, 0x55, 0xd9, 0xeb, 0x83, 0xbe, 0x15, 0x89, 0x46, 0x83, 0x8e, 0x97, 0xe1, 0xc4, + 0x12, 0x27, 0x32, 0x9c, 0xb7, 0x1f, 0x60, 0x80, 0x73, 0x98, 0x9c, 0xfd, 0xa5, 0x0c, 0xef, 0x20, + 0x40, 0x0c, 0x22, 0x90, 0x2a, 0x09, 0xa5, 0x8a, 0x63, 0x34, 0xca, 0x84, 0x18, 0x53, 0x76, 0xba, + 0xc9, 0x97, 0x8c, 0x32, 0x90, 0xe2, 0x8a, 0x75, 0x3b, 0x7f, 0x4e, 0xa0, 0x2f, 0x54, 0x14, 0xb6, + 0x95, 0x41, 0x7d, 0xaa, 0xa1, 0x03, 0x1a, 0xe2, 0x16, 0x50, 0x13, 0x7a, 0x7d, 0x20, 0xe3, 0xb8, + 0xf6, 0xae, 0x6a, 0xb7, 0x35, 0x10, 0xb9, 0xac, 0xc0, 0xca, 0x7b, 0xcd, 0xc5, 0xb2, 0x38, 0xb4, + 0x0b, 0xeb, 0xc9, 0x94, 0x60, 0x4c, 0xe0, 0x5c, 0xda, 0xb9, 0x64, 0xb9, 0xed, 0xb2, 0xc2, 0xff, + 0x72, 0xae, 0x26, 0xc5, 0xfa, 0xb8, 0xe2, 0x07, 0xb9, 0xc6, 0xd6, 0xe8, 0x2d, 0x6f, 0x35, 0xbf, + 0x2b, 0xd5, 0x9e, 0x99, 0xbd, 0x7d, 0x36, 0x9b, 0xa0, 0xf3, 0xc4, 0x6c, 0x77, 0xdd, 0x3d, 0x9c, + 0xfa, 0x26, 0xab, 0x5f, 0xa2, 0x7b, 0xc7, 0x7f, 0x23, 0xa7, 0xd1, 0x8b, 0xe2, 0xfe, 0xe5, 0xf3, + 0xf1, 0x5f, 0xd9, 0x29, 0xc9, 0xd5, 0x32, 0x2a, 0x2b, 0x6d, 0x0c, 0xb3, 0x69, 0xde, 0x35, 0xd4, + 0xe8, 0x83, 0x5b, 0xa3, 0x09, 0x67, 0xe3, 0x09, 0x67, 0xef, 0x13, 0xce, 0x1e, 0xa6, 0xdc, 0x1a, + 0x4f, 0xb9, 0xf5, 0x3a, 0xe5, 0xd6, 0xd5, 0x49, 0x10, 0x9a, 0xeb, 0xbe, 0x2f, 0x5a, 0xd8, 0x5d, + 0xe8, 0x55, 0x22, 0xe5, 0xd3, 0x52, 0xbc, 0x76, 0x24, 0x6f, 0x56, 0x2c, 0x5a, 0x51, 0x08, 0xb1, + 0x49, 0xdf, 0xd9, 0xbc, 0x6e, 0x7f, 0x67, 0xfe, 0x39, 0xfc, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xf7, + 0xc2, 0x71, 0xc6, 0x97, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/valset-pref/export_test.go b/x/valset-pref/export_test.go index 64576eaf7a0..3742570cb5b 100644 --- a/x/valset-pref/export_test.go +++ b/x/valset-pref/export_test.go @@ -5,8 +5,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" ) type ( diff --git a/x/valset-pref/keeper.go b/x/valset-pref/keeper.go index f3779a701ea..de5cdd4c4cc 100644 --- a/x/valset-pref/keeper.go +++ b/x/valset-pref/keeper.go @@ -12,7 +12,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/x/valset-pref/keeper_test.go b/x/valset-pref/keeper_test.go index 6c59b7e4a7b..2ba79554437 100644 --- a/x/valset-pref/keeper_test.go +++ b/x/valset-pref/keeper_test.go @@ -12,12 +12,12 @@ import ( "github.com/stretchr/testify/suite" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" - valPref "github.com/osmosis-labs/osmosis/v24/x/valset-pref" + valPref "github.com/osmosis-labs/osmosis/v25/x/valset-pref" ) type KeeperTestSuite struct { diff --git a/x/valset-pref/msg_server.go b/x/valset-pref/msg_server.go index 3d8086474e4..20e450107c8 100644 --- a/x/valset-pref/msg_server.go +++ b/x/valset-pref/msg_server.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" ) type msgServer struct { diff --git a/x/valset-pref/msg_server_test.go b/x/valset-pref/msg_server_test.go index f899ced440d..f2ece5d1f8a 100644 --- a/x/valset-pref/msg_server_test.go +++ b/x/valset-pref/msg_server_test.go @@ -7,9 +7,9 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" - valPref "github.com/osmosis-labs/osmosis/v24/x/valset-pref" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" + valPref "github.com/osmosis-labs/osmosis/v25/x/valset-pref" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" ) func (s *KeeperTestSuite) TestSetValidatorSetPreference() { diff --git a/x/valset-pref/simulation/sim_msgs.go b/x/valset-pref/simulation/sim_msgs.go index 5dab14f0a19..233359a8bc8 100644 --- a/x/valset-pref/simulation/sim_msgs.go +++ b/x/valset-pref/simulation/sim_msgs.go @@ -7,9 +7,9 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - osmosimtypes "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - valsetkeeper "github.com/osmosis-labs/osmosis/v24/x/valset-pref" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + osmosimtypes "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + valsetkeeper "github.com/osmosis-labs/osmosis/v25/x/valset-pref" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" ) func RandomMsgSetValSetPreference(k valsetkeeper.Keeper, sim *osmosimtypes.SimCtx, ctx sdk.Context) (*types.MsgSetValidatorSetPreference, error) { diff --git a/x/valset-pref/types/expected_interfaces.go b/x/valset-pref/types/expected_interfaces.go index 561425a1d6c..c2b2f5d7d4e 100644 --- a/x/valset-pref/types/expected_interfaces.go +++ b/x/valset-pref/types/expected_interfaces.go @@ -7,7 +7,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" ) // StakingInterface expected staking keeper. diff --git a/x/valset-pref/types/msgs_test.go b/x/valset-pref/types/msgs_test.go index 80c29345ace..d4f75d46f39 100644 --- a/x/valset-pref/types/msgs_test.go +++ b/x/valset-pref/types/msgs_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" "github.com/osmosis-labs/osmosis/osmomath" - "github.com/osmosis-labs/osmosis/v24/app/apptesting" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + "github.com/osmosis-labs/osmosis/v25/app/apptesting" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" ) func TestMsgSetValidatorSetPreference(t *testing.T) { diff --git a/x/valset-pref/types/state.pb.go b/x/valset-pref/types/state.pb.go index 0232090f2c3..90b6b217ca9 100644 --- a/x/valset-pref/types/state.pb.go +++ b/x/valset-pref/types/state.pb.go @@ -126,7 +126,7 @@ var fileDescriptor_f1c846861b49d50b = []byte{ // 361 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xcf, 0x4a, 0xeb, 0x40, 0x14, 0xc6, 0x93, 0x5e, 0x28, 0xdc, 0x14, 0x2e, 0x97, 0xdc, 0x0b, 0x2d, 0xa9, 0x24, 0x25, 0x82, - 0x74, 0xd3, 0x19, 0x5a, 0x05, 0x41, 0x57, 0x16, 0xdd, 0x09, 0x4a, 0x45, 0x17, 0x6e, 0xca, 0x49, + 0x74, 0xd3, 0x19, 0x5a, 0x11, 0x41, 0x57, 0x16, 0xdd, 0x09, 0x4a, 0x45, 0x17, 0x6e, 0xca, 0x49, 0x72, 0x9a, 0x06, 0x93, 0x4c, 0x98, 0x19, 0xa3, 0x7d, 0x03, 0x97, 0x6e, 0x7d, 0xa3, 0x2e, 0xbb, 0x14, 0x17, 0x41, 0xdb, 0x37, 0xe8, 0x13, 0x48, 0x93, 0xd0, 0x16, 0xd1, 0xdd, 0xfc, 0xf9, 0x7d, 0x87, 0xef, 0x3b, 0x9f, 0xb6, 0xc7, 0x44, 0xc4, 0x44, 0x20, 0x68, 0x0a, 0xa1, 0x40, 0x99, 0x70, @@ -146,7 +146,7 @@ var fileDescriptor_f1c846861b49d50b = []byte{ 0x4c, 0x65, 0xb6, 0x30, 0x95, 0xd7, 0x85, 0xa9, 0xdc, 0x1e, 0xfa, 0x81, 0x1c, 0xdf, 0x3b, 0xc4, 0x65, 0x11, 0x2d, 0x1d, 0x74, 0x42, 0x70, 0x04, 0x5d, 0x97, 0xda, 0x3b, 0xa0, 0x8f, 0x65, 0xb5, 0x9d, 0xbc, 0x5b, 0x39, 0x49, 0x50, 0x38, 0xd5, 0xbc, 0x84, 0xfd, 0xcf, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x0a, 0xda, 0xf5, 0x2a, 0xfe, 0x01, 0x00, 0x00, + 0xff, 0x2e, 0x03, 0xf2, 0x49, 0xfe, 0x01, 0x00, 0x00, } func (m *ValidatorPreference) Marshal() (dAtA []byte, err error) { diff --git a/x/valset-pref/types/tx.pb.go b/x/valset-pref/types/tx.pb.go index eebabe4208d..276ced4e994 100644 --- a/x/valset-pref/types/tx.pb.go +++ b/x/valset-pref/types/tx.pb.go @@ -701,55 +701,55 @@ func init() { } var fileDescriptor_3fff1326c2fd6b4c = []byte{ - // 754 bytes of a gzipped FileDescriptorProto + // 753 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcb, 0x4f, 0xd4, 0x5c, 0x14, 0x9f, 0x0b, 0x84, 0x7c, 0x5c, 0x36, 0xdf, 0xd7, 0x10, 0x3e, 0x68, 0x74, 0x06, 0xca, 0x53, - 0x12, 0x7a, 0xc3, 0xa0, 0x51, 0x31, 0x26, 0x3a, 0x10, 0x13, 0x63, 0x26, 0xd1, 0x82, 0x98, 0xb8, - 0x30, 0xb9, 0x33, 0x3d, 0x94, 0x86, 0xb6, 0x77, 0xd2, 0x7b, 0x79, 0x2d, 0xdc, 0x1b, 0x17, 0xc6, - 0x9d, 0x89, 0x7f, 0x82, 0x2b, 0x97, 0xae, 0x5c, 0xb3, 0x64, 0xa7, 0x2b, 0x30, 0x90, 0xa8, 0x0b, - 0x57, 0xfc, 0x05, 0xa6, 0x8f, 0x29, 0x35, 0xd3, 0x07, 0x56, 0x34, 0x6e, 0x66, 0xa6, 0x73, 0x5e, - 0xbf, 0xf3, 0x3b, 0x3d, 0xbf, 0x7b, 0xf1, 0x18, 0xe3, 0x36, 0xe3, 0x26, 0x27, 0x5b, 0xd4, 0xe2, - 0x20, 0x5a, 0x2e, 0xac, 0x91, 0xad, 0xb9, 0x06, 0x08, 0x3a, 0x47, 0xc4, 0x8e, 0xda, 0x72, 0x99, - 0x60, 0x92, 0x1c, 0x3a, 0xa9, 0xa7, 0x4e, 0x6a, 0xe8, 0x24, 0x0f, 0x18, 0xcc, 0x60, 0xbe, 0x1b, - 0xf1, 0x7e, 0x05, 0x11, 0xf2, 0x7f, 0xd4, 0x36, 0x1d, 0x46, 0xfc, 0xcf, 0xf0, 0xaf, 0x8a, 0xc1, - 0x98, 0x61, 0x01, 0xf1, 0x9f, 0x1a, 0x9b, 0x6b, 0x44, 0x98, 0x36, 0x70, 0x41, 0xed, 0x56, 0xe8, - 0x50, 0x6e, 0xfa, 0x65, 0x48, 0x83, 0x72, 0x88, 0x30, 0x34, 0x99, 0xe9, 0x84, 0xf6, 0xc9, 0x0c, - 0xa8, 0x5c, 0x50, 0x01, 0x81, 0x9f, 0xf2, 0x0d, 0xe1, 0x0b, 0x75, 0x6e, 0x2c, 0x83, 0x58, 0xa5, - 0x96, 0xa9, 0x53, 0xc1, 0xdc, 0x65, 0x10, 0xf7, 0x5d, 0x58, 0x03, 0x17, 0x9c, 0x26, 0x48, 0x55, - 0xdc, 0xa7, 0x83, 0x05, 0x86, 0x67, 0x19, 0x42, 0x23, 0x68, 0xba, 0xaf, 0x36, 0x70, 0x72, 0x50, - 0xf9, 0x77, 0x97, 0xda, 0xd6, 0x82, 0x12, 0x99, 0x14, 0xed, 0xd4, 0x4d, 0xb2, 0x71, 0x7f, 0x2b, - 0xca, 0xc0, 0x87, 0xba, 0x46, 0xba, 0xa7, 0xfb, 0xab, 0x44, 0x4d, 0x27, 0x46, 0x8d, 0x8a, 0x9f, - 0x56, 0xae, 0xc9, 0x7b, 0x07, 0x95, 0xd2, 0xc9, 0x41, 0x45, 0x0a, 0x4a, 0xc5, 0x32, 0x2a, 0x5a, - 0x3c, 0xff, 0xc2, 0xa5, 0xe7, 0x5f, 0xde, 0xce, 0x8c, 0xb7, 0x1b, 0xce, 0xea, 0x46, 0x99, 0xc4, - 0xe3, 0x59, 0x76, 0x0d, 0x78, 0x8b, 0x39, 0x1c, 0x94, 0x0f, 0x08, 0x0f, 0xd7, 0xb9, 0xb1, 0x14, - 0xb4, 0x04, 0x2b, 0x2c, 0xee, 0x5f, 0x88, 0x93, 0x27, 0xb8, 0xc7, 0x1b, 0xcf, 0x50, 0xd7, 0x08, - 0x9a, 0xee, 0xaf, 0x0e, 0xab, 0xc1, 0xfc, 0x54, 0x6f, 0x7e, 0x11, 0x0b, 0x8b, 0xcc, 0x74, 0x6a, - 0xc4, 0x6b, 0xfb, 0xcd, 0x61, 0x65, 0xca, 0x30, 0xc5, 0xfa, 0x66, 0x43, 0x6d, 0x32, 0x9b, 0x84, - 0xc3, 0x0e, 0xbe, 0x66, 0xb9, 0xbe, 0x41, 0xc4, 0x6e, 0x0b, 0xb8, 0x1f, 0xa0, 0xf9, 0x79, 0x17, - 0x26, 0x3d, 0x12, 0x46, 0x63, 0x24, 0x24, 0x63, 0x57, 0xc6, 0xf0, 0x68, 0xaa, 0x31, 0x6a, 0xff, - 0x10, 0xe1, 0x8b, 0x75, 0x6e, 0x3c, 0x74, 0x42, 0xfc, 0x70, 0xc7, 0x65, 0xf6, 0xb9, 0x51, 0xd0, - 0xfd, 0x9b, 0x28, 0x98, 0xf1, 0x28, 0x98, 0x88, 0x51, 0x90, 0x8e, 0x5f, 0x99, 0xc2, 0x13, 0x99, - 0x0e, 0x11, 0x15, 0x5f, 0x11, 0x9e, 0xea, 0xf0, 0xd4, 0xa0, 0x41, 0x2d, 0xea, 0x34, 0x41, 0xff, - 0xeb, 0xdf, 0x8b, 0x8e, 0xe5, 0x48, 0xe8, 0x64, 0xd5, 0x5f, 0x48, 0x65, 0x0e, 0x93, 0x33, 0x76, - 0x1a, 0xb1, 0xf3, 0x39, 0xd8, 0x13, 0x0d, 0xda, 0x31, 0xbf, 0xcc, 0xc7, 0x1f, 0xd6, 0x8e, 0x8e, - 0xb5, 0x49, 0x6e, 0x25, 0x5c, 0x9b, 0x64, 0x63, 0xc4, 0xc6, 0x53, 0x5f, 0x4b, 0x1f, 0x99, 0x62, - 0x5d, 0x77, 0xe9, 0x76, 0xb8, 0x63, 0x26, 0x73, 0x34, 0xd8, 0xa6, 0xae, 0xce, 0x8b, 0xf0, 0xd1, - 0x39, 0xbf, 0xd4, 0xf4, 0xa1, 0xb8, 0xa5, 0xda, 0x23, 0x98, 0x80, 0xff, 0x8f, 0x49, 0x40, 0x8d, - 0x39, 0x3a, 0xe8, 0x2b, 0x6c, 0x03, 0x9c, 0x42, 0x08, 0xa5, 0x41, 0xdc, 0x6b, 0xb1, 0xe6, 0xc6, - 0xdd, 0x25, 0xff, 0x1d, 0xee, 0xd1, 0xc2, 0x27, 0x65, 0x14, 0x57, 0x52, 0xca, 0xb4, 0x91, 0x54, - 0xdf, 0xff, 0x83, 0xbb, 0xeb, 0xdc, 0x90, 0x5e, 0x21, 0x3c, 0x9c, 0x7e, 0x04, 0x5d, 0xcb, 0x9a, - 0x7e, 0x96, 0x9c, 0xcb, 0xb7, 0x8a, 0x46, 0xb6, 0x11, 0x4a, 0x2f, 0x10, 0x1e, 0x4c, 0x39, 0x05, - 0xae, 0xe4, 0x24, 0x4f, 0x0e, 0x93, 0x6f, 0x16, 0x0a, 0x8b, 0x00, 0xbd, 0x46, 0x58, 0xce, 0xd0, + 0x12, 0x7a, 0xc3, 0x10, 0xa2, 0x62, 0x4c, 0x74, 0x20, 0x26, 0xc6, 0x4c, 0xa2, 0x05, 0x31, 0x71, + 0x61, 0x72, 0x67, 0x7a, 0x28, 0x0d, 0x6d, 0xef, 0xa4, 0xf7, 0xf2, 0x5a, 0xb8, 0x37, 0x2e, 0x8c, + 0x3b, 0x13, 0xff, 0x04, 0x57, 0x2e, 0x5d, 0xb9, 0x66, 0xc9, 0x4e, 0x57, 0x60, 0x20, 0x51, 0x17, + 0xae, 0xf8, 0x0b, 0x4c, 0x1f, 0x53, 0x6a, 0xa6, 0x0f, 0xac, 0x68, 0xdc, 0xcc, 0x4c, 0xe7, 0xbc, + 0x7e, 0xe7, 0x77, 0x7a, 0x7e, 0xf7, 0xe2, 0x31, 0xc6, 0x6d, 0xc6, 0x4d, 0x4e, 0xb6, 0xa9, 0xc5, + 0x41, 0xb4, 0x5c, 0x58, 0x27, 0xdb, 0x73, 0x0d, 0x10, 0x74, 0x8e, 0x88, 0x5d, 0xb5, 0xe5, 0x32, + 0xc1, 0x24, 0x39, 0x74, 0x52, 0xcf, 0x9c, 0xd4, 0xd0, 0x49, 0x1e, 0x30, 0x98, 0xc1, 0x7c, 0x37, + 0xe2, 0xfd, 0x0a, 0x22, 0xe4, 0xff, 0xa8, 0x6d, 0x3a, 0x8c, 0xf8, 0x9f, 0xe1, 0x5f, 0x15, 0x83, + 0x31, 0xc3, 0x02, 0xe2, 0x3f, 0x35, 0xb6, 0xd6, 0x89, 0x30, 0x6d, 0xe0, 0x82, 0xda, 0xad, 0xd0, + 0xa1, 0xdc, 0xf4, 0xcb, 0x90, 0x06, 0xe5, 0x10, 0x61, 0x68, 0x32, 0xd3, 0x09, 0xed, 0x93, 0x19, + 0x50, 0xb9, 0xa0, 0x02, 0x02, 0x3f, 0xe5, 0x1b, 0xc2, 0x97, 0xea, 0xdc, 0x58, 0x01, 0xb1, 0x46, + 0x2d, 0x53, 0xa7, 0x82, 0xb9, 0x2b, 0x20, 0xee, 0xbb, 0xb0, 0x0e, 0x2e, 0x38, 0x4d, 0x90, 0xaa, + 0xb8, 0x4f, 0x07, 0x0b, 0x0c, 0xcf, 0x32, 0x84, 0x46, 0xd0, 0x74, 0x5f, 0x6d, 0xe0, 0xf4, 0xb0, + 0xf2, 0xef, 0x1e, 0xb5, 0xad, 0x45, 0x25, 0x32, 0x29, 0xda, 0x99, 0x9b, 0x64, 0xe3, 0xfe, 0x56, + 0x94, 0x81, 0x0f, 0x75, 0x8d, 0x74, 0x4f, 0xf7, 0x57, 0x89, 0x9a, 0x4e, 0x8c, 0x1a, 0x15, 0x3f, + 0xab, 0x5c, 0x93, 0xf7, 0x0f, 0x2b, 0xa5, 0xd3, 0xc3, 0x8a, 0x14, 0x94, 0x8a, 0x65, 0x54, 0xb4, + 0x78, 0xfe, 0xc5, 0x2b, 0xcf, 0xbf, 0xbc, 0x9d, 0x19, 0x6f, 0x37, 0x9c, 0xd5, 0x8d, 0x32, 0x89, + 0xc7, 0xb3, 0xec, 0x1a, 0xf0, 0x16, 0x73, 0x38, 0x28, 0x1f, 0x10, 0x1e, 0xae, 0x73, 0x63, 0x39, + 0x68, 0x09, 0x56, 0x59, 0xdc, 0xbf, 0x10, 0x27, 0x4f, 0x70, 0x8f, 0x37, 0x9e, 0xa1, 0xae, 0x11, + 0x34, 0xdd, 0x5f, 0x1d, 0x56, 0x83, 0xf9, 0xa9, 0xde, 0xfc, 0x22, 0x16, 0x96, 0x98, 0xe9, 0xd4, + 0x88, 0xd7, 0xf6, 0x9b, 0xa3, 0xca, 0x94, 0x61, 0x8a, 0x8d, 0xad, 0x86, 0xda, 0x64, 0x36, 0x09, + 0x87, 0x1d, 0x7c, 0xcd, 0x72, 0x7d, 0x93, 0x88, 0xbd, 0x16, 0x70, 0x3f, 0x40, 0xf3, 0xf3, 0x2e, + 0x4e, 0x7a, 0x24, 0x8c, 0xc6, 0x48, 0x48, 0xc6, 0xae, 0x8c, 0xe1, 0xd1, 0x54, 0x63, 0xd4, 0xfe, + 0x11, 0xc2, 0x97, 0xeb, 0xdc, 0x78, 0xe8, 0x84, 0xf8, 0xe1, 0x8e, 0xcb, 0xec, 0x0b, 0xa3, 0xa0, + 0xfb, 0x37, 0x51, 0x30, 0xe3, 0x51, 0x30, 0x11, 0xa3, 0x20, 0x1d, 0xbf, 0x32, 0x85, 0x27, 0x32, + 0x1d, 0x22, 0x2a, 0xbe, 0x22, 0x3c, 0xd5, 0xe1, 0xa9, 0x41, 0x83, 0x5a, 0xd4, 0x69, 0x82, 0xfe, + 0xd7, 0xbf, 0x17, 0x1d, 0xcb, 0x91, 0xd0, 0xc9, 0x9a, 0xbf, 0x90, 0xca, 0x1c, 0x26, 0xe7, 0xec, + 0x34, 0x62, 0xe7, 0x73, 0xb0, 0x27, 0x1a, 0xb4, 0x63, 0x7e, 0x99, 0x8f, 0x3f, 0xac, 0x1d, 0x1d, + 0x6b, 0x93, 0xdc, 0x4a, 0xb8, 0x36, 0xc9, 0xc6, 0x88, 0x8d, 0xa7, 0xbe, 0x96, 0x3e, 0x32, 0xc5, + 0x86, 0xee, 0xd2, 0x9d, 0x70, 0xc7, 0x4c, 0xe6, 0x68, 0xb0, 0x43, 0x5d, 0x9d, 0x17, 0xe1, 0xa3, + 0x73, 0x7e, 0xa9, 0xe9, 0x43, 0x71, 0x4b, 0xb5, 0x47, 0x30, 0x01, 0xff, 0x1f, 0x93, 0x80, 0x1a, + 0x73, 0x74, 0xd0, 0x57, 0xd9, 0x26, 0x38, 0x85, 0x10, 0x4a, 0x83, 0xb8, 0xd7, 0x62, 0xcd, 0xcd, + 0xbb, 0xcb, 0xfe, 0x3b, 0xdc, 0xa3, 0x85, 0x4f, 0xca, 0x28, 0xae, 0xa4, 0x94, 0x69, 0x23, 0xa9, + 0xbe, 0xff, 0x07, 0x77, 0xd7, 0xb9, 0x21, 0xbd, 0x42, 0x78, 0x38, 0xfd, 0x08, 0xba, 0x96, 0x35, + 0xfd, 0x2c, 0x39, 0x97, 0x6f, 0x15, 0x8d, 0x6c, 0x23, 0x94, 0x5e, 0x20, 0x3c, 0x98, 0x72, 0x0a, + 0x2c, 0xe4, 0x24, 0x4f, 0x0e, 0x93, 0x6f, 0x16, 0x0a, 0x8b, 0x00, 0xbd, 0x46, 0x58, 0xce, 0xd0, 0xe5, 0xeb, 0x39, 0xd9, 0xd3, 0x43, 0xe5, 0xdb, 0x85, 0x43, 0x23, 0x70, 0xef, 0x10, 0x1e, 0x3f, - 0x93, 0x52, 0x2e, 0xfe, 0x54, 0xad, 0xe4, 0x24, 0xf2, 0xbd, 0x73, 0x48, 0xf2, 0xc3, 0xa0, 0x53, + 0x97, 0x52, 0x2e, 0xfd, 0x54, 0xad, 0xe4, 0x24, 0xf2, 0xbd, 0x0b, 0x48, 0xf2, 0xc3, 0xa0, 0x53, 0x64, 0x2c, 0x6f, 0xd0, 0xc9, 0x61, 0xb9, 0x83, 0xce, 0x16, 0x13, 0x7f, 0x27, 0xd2, 0xa5, 0x24, 0x6f, 0x27, 0x52, 0x23, 0x73, 0x77, 0x22, 0x57, 0x3f, 0xa4, 0x67, 0x08, 0x0f, 0x24, 0xaa, 0xc7, - 0xfc, 0x19, 0x5f, 0xed, 0x78, 0x90, 0x7c, 0xa3, 0x40, 0x50, 0x1b, 0x4a, 0xed, 0xc1, 0xde, 0x51, - 0x19, 0xed, 0x1f, 0x95, 0xd1, 0xa7, 0xa3, 0x32, 0x7a, 0x79, 0x5c, 0x2e, 0xed, 0x1f, 0x97, 0x4b, - 0x1f, 0x8f, 0xcb, 0xa5, 0xc7, 0x57, 0x63, 0xc7, 0x64, 0x58, 0x60, 0xd6, 0xa2, 0x0d, 0x4e, 0xa2, - 0x8b, 0x71, 0xf5, 0x32, 0xd9, 0x09, 0xaf, 0xc7, 0xb3, 0xfe, 0xfd, 0xd8, 0x3f, 0x3b, 0x1b, 0xbd, - 0xfe, 0xc5, 0x78, 0xfe, 0x7b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x2e, 0x98, 0x11, 0xed, 0x0b, - 0x00, 0x00, + 0xfc, 0x39, 0x5f, 0xed, 0x78, 0x90, 0x7c, 0xa3, 0x40, 0x50, 0x1b, 0x4a, 0xed, 0xc1, 0xfe, 0x71, + 0x19, 0x1d, 0x1c, 0x97, 0xd1, 0xa7, 0xe3, 0x32, 0x7a, 0x79, 0x52, 0x2e, 0x1d, 0x9c, 0x94, 0x4b, + 0x1f, 0x4f, 0xca, 0xa5, 0xc7, 0x57, 0x63, 0xc7, 0x64, 0x58, 0x60, 0xd6, 0xa2, 0x0d, 0x4e, 0xa2, + 0x8b, 0x71, 0x75, 0x81, 0xec, 0x86, 0xd7, 0xe3, 0x59, 0xff, 0x7e, 0xec, 0x9f, 0x9d, 0x8d, 0x5e, + 0xff, 0x62, 0x3c, 0xff, 0x3d, 0x00, 0x00, 0xff, 0xff, 0x69, 0xf7, 0x9f, 0x72, 0xed, 0x0b, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/valset-pref/validator_set.go b/x/valset-pref/validator_set.go index 4aeb4a3f8d8..b45944f96f6 100644 --- a/x/valset-pref/validator_set.go +++ b/x/valset-pref/validator_set.go @@ -11,9 +11,9 @@ import ( "github.com/osmosis-labs/osmosis/osmomath" "github.com/osmosis-labs/osmosis/osmoutils" - appParams "github.com/osmosis-labs/osmosis/v24/app/params" - lockuptypes "github.com/osmosis-labs/osmosis/v24/x/lockup/types" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + appParams "github.com/osmosis-labs/osmosis/v25/app/params" + lockuptypes "github.com/osmosis-labs/osmosis/v25/x/lockup/types" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" ) type valSet struct { diff --git a/x/valset-pref/validator_set_test.go b/x/valset-pref/validator_set_test.go index c23c98b82bb..f16fbcaabfd 100644 --- a/x/valset-pref/validator_set_test.go +++ b/x/valset-pref/validator_set_test.go @@ -6,8 +6,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/osmosis-labs/osmosis/osmomath" - valPref "github.com/osmosis-labs/osmosis/v24/x/valset-pref" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + valPref "github.com/osmosis-labs/osmosis/v25/x/valset-pref" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" ) func (s *KeeperTestSuite) TestValidateLockForForceUnlock() { diff --git a/x/valset-pref/valpref-module/module.go b/x/valset-pref/valpref-module/module.go index 7edaf1618de..5a73e545771 100644 --- a/x/valset-pref/valpref-module/module.go +++ b/x/valset-pref/valpref-module/module.go @@ -15,13 +15,13 @@ import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v24/simulation/simtypes" - keeper "github.com/osmosis-labs/osmosis/v24/x/valset-pref" - validatorprefclient "github.com/osmosis-labs/osmosis/v24/x/valset-pref/client" - valsetprefcli "github.com/osmosis-labs/osmosis/v24/x/valset-pref/client/cli" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/client/grpc" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/client/queryproto" - "github.com/osmosis-labs/osmosis/v24/x/valset-pref/types" + "github.com/osmosis-labs/osmosis/v25/simulation/simtypes" + keeper "github.com/osmosis-labs/osmosis/v25/x/valset-pref" + validatorprefclient "github.com/osmosis-labs/osmosis/v25/x/valset-pref/client" + valsetprefcli "github.com/osmosis-labs/osmosis/v25/x/valset-pref/client/cli" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/client/grpc" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/client/queryproto" + "github.com/osmosis-labs/osmosis/v25/x/valset-pref/types" ) var (