From e7d672f98df59c01c739a27d3c7dc420dc428757 Mon Sep 17 00:00:00 2001 From: Xiangan He Date: Thu, 7 Jul 2022 18:07:47 -0400 Subject: [PATCH 1/2] Update import paths from v9 to v10 on v10.x --- CHANGELOG.md | 2 +- app/ante.go | 8 ++++---- networks/osmosis-1/upgrades/v9/guide.md | 4 ++-- osmoutils/partialord/internal/dag/dag_test.go | 2 +- osmoutils/partialord/partialord.go | 2 +- osmoutils/partialord/partialord_test.go | 2 +- proto/osmosis/epochs/genesis.proto | 2 +- proto/osmosis/epochs/query.proto | 2 +- .../gamm/pool-models/balancer/balancerPool.proto | 2 +- proto/osmosis/gamm/pool-models/balancer/tx.proto | 2 +- .../gamm/pool-models/stableswap/stableswap_pool.proto | 2 +- proto/osmosis/gamm/pool-models/stableswap/tx.proto | 2 +- proto/osmosis/gamm/v1beta1/genesis.proto | 2 +- proto/osmosis/gamm/v1beta1/query.proto | 2 +- proto/osmosis/gamm/v1beta1/tx.proto | 2 +- proto/osmosis/incentives/gauge.proto | 2 +- proto/osmosis/incentives/genesis.proto | 2 +- proto/osmosis/incentives/params.proto | 2 +- proto/osmosis/incentives/query.proto | 2 +- proto/osmosis/incentives/tx.proto | 2 +- proto/osmosis/lockup/genesis.proto | 2 +- proto/osmosis/lockup/lock.proto | 2 +- proto/osmosis/lockup/query.proto | 2 +- proto/osmosis/lockup/tx.proto | 2 +- proto/osmosis/mint/v1beta1/genesis.proto | 2 +- proto/osmosis/mint/v1beta1/mint.proto | 2 +- proto/osmosis/mint/v1beta1/query.proto | 2 +- proto/osmosis/pool-incentives/v1beta1/genesis.proto | 2 +- proto/osmosis/pool-incentives/v1beta1/gov.proto | 2 +- proto/osmosis/pool-incentives/v1beta1/incentives.proto | 2 +- proto/osmosis/pool-incentives/v1beta1/query.proto | 2 +- proto/osmosis/store/v1beta1/tree.proto | 2 +- proto/osmosis/superfluid/genesis.proto | 2 +- proto/osmosis/superfluid/gov.proto | 2 +- proto/osmosis/superfluid/params.proto | 2 +- proto/osmosis/superfluid/query.proto | 2 +- proto/osmosis/superfluid/superfluid.proto | 2 +- proto/osmosis/superfluid/tx.proto | 2 +- .../tokenfactory/v1beta1/authorityMetadata.proto | 2 +- proto/osmosis/tokenfactory/v1beta1/genesis.proto | 2 +- proto/osmosis/tokenfactory/v1beta1/params.proto | 2 +- proto/osmosis/tokenfactory/v1beta1/query.proto | 2 +- proto/osmosis/tokenfactory/v1beta1/tx.proto | 2 +- proto/osmosis/txfees/v1beta1/feetoken.proto | 2 +- proto/osmosis/txfees/v1beta1/genesis.proto | 2 +- proto/osmosis/txfees/v1beta1/gov.proto | 2 +- proto/osmosis/txfees/v1beta1/query.proto | 2 +- store/legacy/v101/tree.go | 2 +- store/tree_test.go | 2 +- x/epochs/abci.go | 4 ++-- x/epochs/abci_test.go | 6 +++--- x/epochs/client/cli/cli_test.go | 6 +++--- x/epochs/client/cli/query.go | 2 +- x/epochs/client/cli/tx.go | 2 +- x/epochs/genesis.go | 4 ++-- x/epochs/genesis_test.go | 6 +++--- x/epochs/handler.go | 4 ++-- x/epochs/keeper/epoch_test.go | 2 +- x/epochs/module.go | 10 +++++----- x/epochs/types/hooks.go | 2 +- x/epochs/types/hooks_test.go | 4 ++-- 61 files changed, 79 insertions(+), 79 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b76be176369..c22b46e48b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -84,7 +84,7 @@ Integrators will have to update their messages and queries to adapt, please see * [#1535](https://github.com/osmosis-labs/osmosis/pull/1535) Upgrade to [IBC v3](https://github.com/cosmos/ibc-go/releases/tag/v3.0.0) * [#1564](https://github.com/osmosis-labs/osmosis/pull/1564) Enable Interchain account host module - * See [here](https://github.com/osmosis-labs/osmosis/blob/main/app/upgrades/v9/upgrades.go#L49-L71) for the supported messages + * See [here](https://github.com/osmosis-labs/osmosis/blob/main/app/upgrades/v10/upgrades.go#L49-L71) for the supported messages #### Txfees diff --git a/app/ante.go b/app/ante.go index 9dd271437c5..cb3d70fa381 100644 --- a/app/ante.go +++ b/app/ante.go @@ -11,11 +11,11 @@ import ( ante "github.com/cosmos/cosmos-sdk/x/auth/ante" "github.com/cosmos/cosmos-sdk/x/auth/signing" - osmoante "github.com/osmosis-labs/osmosis/v9/ante" - v9 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v9" + osmoante "github.com/osmosis-labs/osmosis/v10/ante" + v9 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v9" - txfeeskeeper "github.com/osmosis-labs/osmosis/v9/x/txfees/keeper" - txfeestypes "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + txfeeskeeper "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper" + txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) // Link to default ante handler used by cosmos sdk: diff --git a/networks/osmosis-1/upgrades/v9/guide.md b/networks/osmosis-1/upgrades/v9/guide.md index 1a58ba73eea..0cc23b95272 100644 --- a/networks/osmosis-1/upgrades/v9/guide.md +++ b/networks/osmosis-1/upgrades/v9/guide.md @@ -121,12 +121,12 @@ source ~/.profile Now, create the required folder, make the build, and copy the daemon over to that folder ```{.sh} -mkdir -p ~/.osmosisd/cosmovisor/upgrades/v9/bin +mkdir -p ~/.osmosisd/cosmovisor/upgrades/v10/bin cd $HOME/osmosis git pull git checkout v9.0.0 make build -cp build/osmosisd ~/.osmosisd/cosmovisor/upgrades/v9/bin +cp build/osmosisd ~/.osmosisd/cosmovisor/upgrades/v10/bin ``` Now, at the upgrade height, Cosmovisor will upgrade to the v9 binary diff --git a/osmoutils/partialord/internal/dag/dag_test.go b/osmoutils/partialord/internal/dag/dag_test.go index 3ead75cda7b..e7ae94769be 100644 --- a/osmoutils/partialord/internal/dag/dag_test.go +++ b/osmoutils/partialord/internal/dag/dag_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v9/osmoutils/partialord/internal/dag" + "github.com/osmosis-labs/osmosis/v10/osmoutils/partialord/internal/dag" ) type edge struct { diff --git a/osmoutils/partialord/partialord.go b/osmoutils/partialord/partialord.go index 6703543f389..0323ad65e2e 100644 --- a/osmoutils/partialord/partialord.go +++ b/osmoutils/partialord/partialord.go @@ -3,7 +3,7 @@ package partialord import ( "sort" - "github.com/osmosis-labs/osmosis/v9/osmoutils/partialord/internal/dag" + "github.com/osmosis-labs/osmosis/v10/osmoutils/partialord/internal/dag" ) type PartialOrdering struct { diff --git a/osmoutils/partialord/partialord_test.go b/osmoutils/partialord/partialord_test.go index fac21f72801..82227c5bb62 100644 --- a/osmoutils/partialord/partialord_test.go +++ b/osmoutils/partialord/partialord_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v9/osmoutils/partialord" + "github.com/osmosis-labs/osmosis/v10/osmoutils/partialord" ) func TestAPI(t *testing.T) { diff --git a/proto/osmosis/epochs/genesis.proto b/proto/osmosis/epochs/genesis.proto index fa848a613f5..c3e310a7df3 100644 --- a/proto/osmosis/epochs/genesis.proto +++ b/proto/osmosis/epochs/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/epochs/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/epochs/types"; // EpochInfo is a struct that describes the data going into // a timer defined by the x/epochs module. diff --git a/proto/osmosis/epochs/query.proto b/proto/osmosis/epochs/query.proto index 8119bb609a5..6047dd482d8 100644 --- a/proto/osmosis/epochs/query.proto +++ b/proto/osmosis/epochs/query.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "osmosis/epochs/genesis.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/epochs/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/epochs/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto b/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto index 0406960025e..e248cb3ef63 100644 --- a/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto +++ b/proto/osmosis/gamm/pool-models/balancer/balancerPool.proto @@ -10,7 +10,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/v9/x/gamm/pool-models/balancer"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer"; // Parameters for changing the weights in a balancer pool smoothly from // a start weight and end weight over a period of time. diff --git a/proto/osmosis/gamm/pool-models/balancer/tx.proto b/proto/osmosis/gamm/pool-models/balancer/tx.proto index 4a6a34c8e74..e37cfc9e971 100644 --- a/proto/osmosis/gamm/pool-models/balancer/tx.proto +++ b/proto/osmosis/gamm/pool-models/balancer/tx.proto @@ -4,7 +4,7 @@ package osmosis.gamm.poolmodels.balancer.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/gamm/pool-models/balancer/balancerPool.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer"; service Msg { rpc CreateBalancerPool(MsgCreateBalancerPool) diff --git a/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto b/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto index 828b58fcd31..64285aeca52 100644 --- a/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto +++ b/proto/osmosis/gamm/pool-models/stableswap/stableswap_pool.proto @@ -10,7 +10,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/v9/x/gamm/pool-models/stableswap"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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/pool-models/stableswap/tx.proto b/proto/osmosis/gamm/pool-models/stableswap/tx.proto index b173cba7d4b..e11b5782c12 100644 --- a/proto/osmosis/gamm/pool-models/stableswap/tx.proto +++ b/proto/osmosis/gamm/pool-models/stableswap/tx.proto @@ -5,7 +5,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; import "osmosis/gamm/pool-models/stableswap/stableswap_pool.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/stableswap"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/stableswap"; service Msg { rpc CreateStableswapPool(MsgCreateStableswapPool) diff --git a/proto/osmosis/gamm/v1beta1/genesis.proto b/proto/osmosis/gamm/v1beta1/genesis.proto index 1a2a8d7bb03..bece17a3d6e 100644 --- a/proto/osmosis/gamm/v1beta1/genesis.proto +++ b/proto/osmosis/gamm/v1beta1/genesis.proto @@ -15,7 +15,7 @@ message Params { ]; } -option go_package = "github.com/osmosis-labs/osmosis/v9/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/gamm/types"; // GenesisState defines the gamm module's genesis state. message GenesisState { diff --git a/proto/osmosis/gamm/v1beta1/query.proto b/proto/osmosis/gamm/v1beta1/query.proto index c101ec16bab..439f44904c7 100644 --- a/proto/osmosis/gamm/v1beta1/query.proto +++ b/proto/osmosis/gamm/v1beta1/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/v9/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/gamm/types"; service Query { rpc Pools(QueryPoolsRequest) returns (QueryPoolsResponse) { diff --git a/proto/osmosis/gamm/v1beta1/tx.proto b/proto/osmosis/gamm/v1beta1/tx.proto index f0f9c0da97f..76aa0cf094a 100644 --- a/proto/osmosis/gamm/v1beta1/tx.proto +++ b/proto/osmosis/gamm/v1beta1/tx.proto @@ -4,7 +4,7 @@ package osmosis.gamm.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/gamm/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/gamm/types"; service Msg { rpc JoinPool(MsgJoinPool) returns (MsgJoinPoolResponse); diff --git a/proto/osmosis/incentives/gauge.proto b/proto/osmosis/incentives/gauge.proto index 8011d489c57..4aacee21470 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/v9/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/incentives/types"; message Gauge { // unique ID of a Gauge diff --git a/proto/osmosis/incentives/genesis.proto b/proto/osmosis/incentives/genesis.proto index 9ede8b65191..0f059b714c2 100644 --- a/proto/osmosis/incentives/genesis.proto +++ b/proto/osmosis/incentives/genesis.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "osmosis/incentives/params.proto"; import "osmosis/incentives/gauge.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/incentives/types"; // GenesisState defines the incentives module's genesis state. message GenesisState { diff --git a/proto/osmosis/incentives/params.proto b/proto/osmosis/incentives/params.proto index f66df110666..71063c13c34 100644 --- a/proto/osmosis/incentives/params.proto +++ b/proto/osmosis/incentives/params.proto @@ -3,7 +3,7 @@ package osmosis.incentives; import "gogoproto/gogo.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 aa983947127..c55099ad341 100644 --- a/proto/osmosis/incentives/query.proto +++ b/proto/osmosis/incentives/query.proto @@ -9,7 +9,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 e6304a75015..1d5aa56cd34 100644 --- a/proto/osmosis/incentives/tx.proto +++ b/proto/osmosis/incentives/tx.proto @@ -7,7 +7,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 f440ddfd1f7..14e462960a3 100644 --- a/proto/osmosis/lockup/genesis.proto +++ b/proto/osmosis/lockup/genesis.proto @@ -4,7 +4,7 @@ package osmosis.lockup; import "gogoproto/gogo.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 1de0381b950..c78af4598ae 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/v9/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/lockup/types"; // PeriodLock is a single unit of lock by period. It's a record of locked coin // at a specific time. It stores owner, duration, unlock time and the amount of diff --git a/proto/osmosis/lockup/query.proto b/proto/osmosis/lockup/query.proto index 5ebe8266a42..8bf53b272a1 100644 --- a/proto/osmosis/lockup/query.proto +++ b/proto/osmosis/lockup/query.proto @@ -8,7 +8,7 @@ import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 5c83c645084..fa31444128d 100644 --- a/proto/osmosis/lockup/tx.proto +++ b/proto/osmosis/lockup/tx.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/lockup/lock.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/lockup/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 f5dadb0c4bb..8a4dd8fe286 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/v9/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 933210f7f38..2f33028b0a3 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/v9/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 28e3d6fa089..6812437ccf8 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/v9/x/mint/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/mint/types"; // Query provides defines the gRPC querier service. service Query { diff --git a/proto/osmosis/pool-incentives/v1beta1/genesis.proto b/proto/osmosis/pool-incentives/v1beta1/genesis.proto index c828ce02a74..0c1c6f27830 100644 --- a/proto/osmosis/pool-incentives/v1beta1/genesis.proto +++ b/proto/osmosis/pool-incentives/v1beta1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; import "osmosis/pool-incentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types"; // GenesisState defines the pool incentives module's genesis state. message GenesisState { diff --git a/proto/osmosis/pool-incentives/v1beta1/gov.proto b/proto/osmosis/pool-incentives/v1beta1/gov.proto index 4a17882525c..cd35c68fab9 100644 --- a/proto/osmosis/pool-incentives/v1beta1/gov.proto +++ b/proto/osmosis/pool-incentives/v1beta1/gov.proto @@ -4,7 +4,7 @@ package osmosis.poolincentives.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/pool-incentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types"; // ReplacePoolIncentivesProposal is a gov Content type for updating the pool // incentives. If a ReplacePoolIncentivesProposal passes, the proposal’s records diff --git a/proto/osmosis/pool-incentives/v1beta1/incentives.proto b/proto/osmosis/pool-incentives/v1beta1/incentives.proto index 3ac1f36e5f5..22676871c5d 100644 --- a/proto/osmosis/pool-incentives/v1beta1/incentives.proto +++ b/proto/osmosis/pool-incentives/v1beta1/incentives.proto @@ -4,7 +4,7 @@ package osmosis.poolincentives.v1beta1; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types"; message Params { option (gogoproto.goproto_stringer) = false; diff --git a/proto/osmosis/pool-incentives/v1beta1/query.proto b/proto/osmosis/pool-incentives/v1beta1/query.proto index b7c7e007391..52e8e1f575e 100644 --- a/proto/osmosis/pool-incentives/v1beta1/query.proto +++ b/proto/osmosis/pool-incentives/v1beta1/query.proto @@ -7,7 +7,7 @@ import "google/protobuf/duration.proto"; import "osmosis/incentives/gauge.proto"; import "osmosis/pool-incentives/v1beta1/incentives.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types"; service Query { // GaugeIds takes the pool id and returns the matching gauge ids and durations diff --git a/proto/osmosis/store/v1beta1/tree.proto b/proto/osmosis/store/v1beta1/tree.proto index 83cfd8ee050..0f1d8a406a6 100644 --- a/proto/osmosis/store/v1beta1/tree.proto +++ b/proto/osmosis/store/v1beta1/tree.proto @@ -4,7 +4,7 @@ package osmosis.store.v1beta1; import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/store"; +option go_package = "github.com/osmosis-labs/osmosis/v10/store"; message Node { repeated Child children = 1; } diff --git a/proto/osmosis/superfluid/genesis.proto b/proto/osmosis/superfluid/genesis.proto index ed47ac5eaa5..50fafd1f3d3 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/v9/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/superfluid/types"; // GenesisState defines the module's genesis state. message GenesisState { diff --git a/proto/osmosis/superfluid/gov.proto b/proto/osmosis/superfluid/gov.proto index 6f9e13b3cd6..a8c669fbc75 100644 --- a/proto/osmosis/superfluid/gov.proto +++ b/proto/osmosis/superfluid/gov.proto @@ -4,7 +4,7 @@ package osmosis.superfluid.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/superfluid/superfluid.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/superfluid/types"; // SetSuperfluidAssetsProposal is a gov Content type to update the superfluid // assets diff --git a/proto/osmosis/superfluid/params.proto b/proto/osmosis/superfluid/params.proto index 30a4edef60c..5b611982586 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/v9/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 4e0baba7d17..bffe9a0cd07 100644 --- a/proto/osmosis/superfluid/query.proto +++ b/proto/osmosis/superfluid/query.proto @@ -11,7 +11,7 @@ import "osmosis/superfluid/params.proto"; import "osmosis/lockup/lock.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 805daa678ac..91b2ffaea67 100644 --- a/proto/osmosis/superfluid/superfluid.proto +++ b/proto/osmosis/superfluid/superfluid.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/superfluid/types"; enum SuperfluidAssetType { option (gogoproto.goproto_enum_prefix) = false; diff --git a/proto/osmosis/superfluid/tx.proto b/proto/osmosis/superfluid/tx.proto index 6a6d66d358f..b029c7cd6b9 100644 --- a/proto/osmosis/superfluid/tx.proto +++ b/proto/osmosis/superfluid/tx.proto @@ -6,7 +6,7 @@ import "google/protobuf/duration.proto"; import "cosmos/base/v1beta1/coin.proto"; import "osmosis/superfluid/superfluid.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/superfluid/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/superfluid/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto b/proto/osmosis/tokenfactory/v1beta1/authorityMetadata.proto index b36b1da62ca..3a870380878 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/v9/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 59a0f048387..9a58a3aebc9 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/v9/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 0723f38e06f..4bc2f279f4c 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/v9/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types"; // Params holds parameters for the tokenfactory module message Params { diff --git a/proto/osmosis/tokenfactory/v1beta1/query.proto b/proto/osmosis/tokenfactory/v1beta1/query.proto index dd2ff14b9d6..b6425539641 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/v9/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 bb57f9ede04..44782e02ee2 100644 --- a/proto/osmosis/tokenfactory/v1beta1/tx.proto +++ b/proto/osmosis/tokenfactory/v1beta1/tx.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/v9/x/tokenfactory/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/osmosis/txfees/v1beta1/feetoken.proto b/proto/osmosis/txfees/v1beta1/feetoken.proto index ec6a5e9e38f..22e91ce35dc 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/v9/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 4c54baf7443..31bdd233a63 100644 --- a/proto/osmosis/txfees/v1beta1/genesis.proto +++ b/proto/osmosis/txfees/v1beta1/genesis.proto @@ -4,7 +4,7 @@ package osmosis.txfees.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/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 742117ba7bf..15f904bc571 100644 --- a/proto/osmosis/txfees/v1beta1/gov.proto +++ b/proto/osmosis/txfees/v1beta1/gov.proto @@ -4,7 +4,7 @@ package osmosis.txfees.v1beta1; import "gogoproto/gogo.proto"; import "osmosis/txfees/v1beta1/feetoken.proto"; -option go_package = "github.com/osmosis-labs/osmosis/v9/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/txfees/types"; // UpdateFeeTokenProposal is a gov Content type for adding a new whitelisted fee // token. It must specify a denom along with gamm pool ID to use as a spot price diff --git a/proto/osmosis/txfees/v1beta1/query.proto b/proto/osmosis/txfees/v1beta1/query.proto index fdee3682bbc..38ab374a9c8 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/v9/x/txfees/types"; +option go_package = "github.com/osmosis-labs/osmosis/v10/x/txfees/types"; service Query { // FeeTokens returns a list of all the whitelisted fee tokens and their diff --git a/store/legacy/v101/tree.go b/store/legacy/v101/tree.go index 25a9802abd0..b15148c8a4e 100644 --- a/store/legacy/v101/tree.go +++ b/store/legacy/v101/tree.go @@ -10,7 +10,7 @@ import ( stypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/store" + "github.com/osmosis-labs/osmosis/v10/store" ) type Child struct { diff --git a/store/tree_test.go b/store/tree_test.go index 26c3ffb3e67..319abf780b7 100644 --- a/store/tree_test.go +++ b/store/tree_test.go @@ -15,7 +15,7 @@ import ( iavlstore "github.com/cosmos/cosmos-sdk/store/iavl" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/store" + "github.com/osmosis-labs/osmosis/v10/store" ) type TreeTestSuite struct { diff --git a/x/epochs/abci.go b/x/epochs/abci.go index e87c5d2a098..5c494d5fe1d 100644 --- a/x/epochs/abci.go +++ b/x/epochs/abci.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/osmosis-labs/osmosis/v9/x/epochs/keeper" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/keeper" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/epochs/abci_test.go b/x/epochs/abci_test.go index f321f6b4404..b614ef3ea67 100644 --- a/x/epochs/abci_test.go +++ b/x/epochs/abci_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/epochs" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + simapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/epochs" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/epochs/client/cli/cli_test.go b/x/epochs/client/cli/cli_test.go index f58805bcefe..a187eed9351 100644 --- a/x/epochs/client/cli/cli_test.go +++ b/x/epochs/client/cli/cli_test.go @@ -4,9 +4,9 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/epochs/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/epochs/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" diff --git a/x/epochs/client/cli/query.go b/x/epochs/client/cli/query.go index 24fb3488e2e..139cb724f43 100644 --- a/x/epochs/client/cli/query.go +++ b/x/epochs/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/epochs/client/cli/tx.go b/x/epochs/client/cli/tx.go index 3a972350fbb..eae8573010a 100644 --- a/x/epochs/client/cli/tx.go +++ b/x/epochs/client/cli/tx.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" // "github.com/cosmos/cosmos-sdk/client/flags". - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) // GetTxCmd returns the transaction commands for this module. diff --git a/x/epochs/genesis.go b/x/epochs/genesis.go index 957348477e0..7eada50d5d3 100644 --- a/x/epochs/genesis.go +++ b/x/epochs/genesis.go @@ -3,8 +3,8 @@ package epochs import ( "time" - "github.com/osmosis-labs/osmosis/v9/x/epochs/keeper" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/keeper" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/epochs/genesis_test.go b/x/epochs/genesis_test.go index abc7f195e7f..384108f87b5 100644 --- a/x/epochs/genesis_test.go +++ b/x/epochs/genesis_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/epochs" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + simapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/epochs" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) func TestEpochsExportGenesis(t *testing.T) { diff --git a/x/epochs/handler.go b/x/epochs/handler.go index 385251d2ce8..b8d1a72e8dc 100644 --- a/x/epochs/handler.go +++ b/x/epochs/handler.go @@ -3,8 +3,8 @@ package epochs import ( "fmt" - "github.com/osmosis-labs/osmosis/v9/x/epochs/keeper" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/keeper" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/epochs/keeper/epoch_test.go b/x/epochs/keeper/epoch_test.go index be69962b955..2cb8286f299 100644 --- a/x/epochs/keeper/epoch_test.go +++ b/x/epochs/keeper/epoch_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "time" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) func (suite *KeeperTestSuite) TestEpochLifeCycle() { diff --git a/x/epochs/module.go b/x/epochs/module.go index c9d372e2065..68ec867888b 100644 --- a/x/epochs/module.go +++ b/x/epochs/module.go @@ -18,11 +18,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/v9/x/epochs/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/epochs/keeper" - "github.com/osmosis-labs/osmosis/v9/x/epochs/simulation" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - "github.com/osmosis-labs/osmosis/v9/x/mint/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/epochs/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/epochs/keeper" + "github.com/osmosis-labs/osmosis/v10/x/epochs/simulation" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/client/rest" ) var ( diff --git a/x/epochs/types/hooks.go b/x/epochs/types/hooks.go index 486f56fc5a2..b3d3adcf204 100644 --- a/x/epochs/types/hooks.go +++ b/x/epochs/types/hooks.go @@ -3,7 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/osmoutils" + "github.com/osmosis-labs/osmosis/v10/osmoutils" ) type EpochHooks interface { diff --git a/x/epochs/types/hooks_test.go b/x/epochs/types/hooks_test.go index ef7fd85c053..78394b8745c 100644 --- a/x/epochs/types/hooks_test.go +++ b/x/epochs/types/hooks_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v9/app/apptesting" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) type KeeperTestSuite struct { From a6c8bb9b050a0811e769923ebde87a6d02f07db3 Mon Sep 17 00:00:00 2001 From: Xiangan He Date: Thu, 7 Jul 2022 19:41:17 -0400 Subject: [PATCH 2/2] Update import paths from v9 to v10 on v10.x --- app/app.go | 24 +++++----- app/apptesting/gamm.go | 4 +- app/apptesting/test_suite.go | 10 ++-- app/config.go | 2 +- app/encoding.go | 2 +- app/keepers/keepers.go | 46 +++++++++---------- app/keepers/modules.go | 24 +++++----- app/modules.go | 42 ++++++++--------- 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/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 | 6 +-- 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 | 4 +- app/wasm/message_plugin.go | 10 ++-- app/wasm/queries.go | 6 +-- app/wasm/query_plugin.go | 2 +- app/wasm/test/custom_msg_test.go | 6 +-- app/wasm/test/custom_query_test.go | 8 ++-- app/wasm/test/helpers_test.go | 2 +- app/wasm/test/messages_test.go | 6 +-- app/wasm/test/queries_test.go | 4 +- app/wasm/test/store_run_test.go | 2 +- app/wasm/wasm.go | 4 +- .../cmd/balances_from_state_export.go | 8 ++-- cmd/osmosisd/cmd/genesis.go | 10 ++-- cmd/osmosisd/cmd/root.go | 4 +- cmd/osmosisd/cmd/testnetify/cmd.go | 2 +- cmd/osmosisd/cmd/testnetify/find_replace.go | 2 +- .../cmd/testnetify/state_export_to_testnet.go | 2 +- cmd/osmosisd/main.go | 6 +-- go.mod | 2 +- simapp/genesis.go | 2 +- simapp/sim_test.go | 2 +- simapp/state.go | 2 +- store/legacy/v101/tree_test.go | 4 +- tests/e2e/e2e_setup_test.go | 6 +-- tests/e2e/e2e_test.go | 2 +- tests/e2e/e2e_util_test.go | 6 +-- tests/e2e/initialization/chain/main.go | 2 +- tests/e2e/initialization/config.go | 16 +++---- 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/util/codec.go | 4 +- x/epochs/keeper/epoch.go | 2 +- x/epochs/keeper/grpc_query.go | 2 +- x/epochs/keeper/grpc_query_test.go | 2 +- x/epochs/keeper/keeper.go | 2 +- x/epochs/keeper/keeper_test.go | 4 +- x/epochs/simulation/genesis.go | 2 +- x/gamm/client/cli/cli_test.go | 12 ++--- x/gamm/client/cli/query.go | 4 +- x/gamm/client/cli/tx.go | 4 +- x/gamm/client/testutil/test_helpers.go | 2 +- x/gamm/genesis.go | 4 +- x/gamm/genesis_test.go | 8 ++-- x/gamm/handler.go | 6 +-- x/gamm/keeper/gas_test.go | 6 +-- x/gamm/keeper/grpc_query.go | 4 +- x/gamm/keeper/grpc_query_test.go | 2 +- x/gamm/keeper/invariants.go | 2 +- x/gamm/keeper/keeper.go | 2 +- x/gamm/keeper/keeper_test.go | 8 ++-- x/gamm/keeper/marshal_bench_test.go | 8 ++-- x/gamm/keeper/msg_server.go | 4 +- x/gamm/keeper/multihop.go | 2 +- x/gamm/keeper/multihop_test.go | 2 +- x/gamm/keeper/params.go | 2 +- x/gamm/keeper/pool.go | 6 +-- x/gamm/keeper/pool_service.go | 2 +- x/gamm/keeper/pool_service_test.go | 6 +-- x/gamm/keeper/pool_test.go | 2 +- x/gamm/keeper/share.go | 2 +- x/gamm/keeper/swap.go | 2 +- x/gamm/keeper/swap_test.go | 2 +- x/gamm/keeper/total_liquidity.go | 2 +- x/gamm/module.go | 10 ++-- x/gamm/pool-models/balancer/amm.go | 6 +-- .../pool-models/balancer/amm_joinpool_test.go | 6 +-- x/gamm/pool-models/balancer/amm_test.go | 6 +-- x/gamm/pool-models/balancer/balancer_pool.go | 2 +- x/gamm/pool-models/balancer/codec.go | 2 +- x/gamm/pool-models/balancer/msgs.go | 2 +- x/gamm/pool-models/balancer/msgs_test.go | 4 +- x/gamm/pool-models/balancer/pool_asset.go | 2 +- x/gamm/pool-models/balancer/suite_test.go | 6 +-- x/gamm/pool-models/balancer/util_test.go | 4 +- x/gamm/pool-models/internal/cfmm_common/lp.go | 4 +- .../internal/cfmm_common/lp_test.go | 8 ++-- x/gamm/pool-models/stableswap/amm.go | 4 +- x/gamm/pool-models/stableswap/codec.go | 2 +- x/gamm/pool-models/stableswap/msgs.go | 2 +- x/gamm/pool-models/stableswap/msgs_test.go | 4 +- x/gamm/pool-models/stableswap/params.go | 2 +- x/gamm/pool-models/stableswap/pool.go | 4 +- .../pool-models/stableswap/stableswap_pool.go | 2 +- x/gamm/simulation/operations.go | 8 ++-- x/gamm/types/msgs_test.go | 2 +- x/gamm/types/params.go | 2 +- x/incentives/client/cli/cli_test.go | 6 +-- x/incentives/client/cli/query.go | 2 +- x/incentives/client/cli/tx.go | 4 +- x/incentives/genesis.go | 4 +- x/incentives/genesis_test.go | 8 ++-- x/incentives/handler.go | 4 +- x/incentives/keeper/bench_test.go | 6 +-- x/incentives/keeper/distribute.go | 4 +- x/incentives/keeper/distribute_test.go | 4 +- x/incentives/keeper/export_test.go | 2 +- x/incentives/keeper/gauge.go | 6 +-- x/incentives/keeper/gauge_test.go | 4 +- x/incentives/keeper/grpc_query.go | 4 +- x/incentives/keeper/grpc_query_test.go | 7 +-- x/incentives/keeper/hooks.go | 6 +-- x/incentives/keeper/iterator.go | 4 +- x/incentives/keeper/keeper.go | 2 +- x/incentives/keeper/keeper_test.go | 4 +- x/incentives/keeper/msg_server.go | 4 +- x/incentives/keeper/params.go | 2 +- x/incentives/keeper/store.go | 2 +- x/incentives/keeper/suite_test.go | 4 +- x/incentives/keeper/utils.go | 2 +- x/incentives/keeper/utils_test.go | 2 +- x/incentives/module.go | 10 ++-- x/incentives/simulation/genesis.go | 2 +- x/incentives/simulation/operations.go | 8 ++-- x/incentives/types/expected_keepers.go | 4 +- x/incentives/types/gauge.go | 2 +- x/incentives/types/gauge.pb.go | 2 +- x/incentives/types/msgs.go | 2 +- x/incentives/types/msgs_test.go | 2 +- x/incentives/types/params.go | 2 +- x/incentives/types/query.pb.go | 2 +- x/incentives/types/tx.pb.go | 2 +- x/lockup/abci.go | 2 +- x/lockup/client/cli/cli_test.go | 10 ++-- x/lockup/client/cli/query.go | 2 +- x/lockup/client/cli/tx.go | 2 +- x/lockup/client/rest/query.go | 2 +- x/lockup/client/rest/tx.go | 2 +- x/lockup/client/testutil/test_helpers.go | 2 +- x/lockup/genesis.go | 4 +- x/lockup/genesis_test.go | 6 +-- x/lockup/handler.go | 4 +- x/lockup/keeper/admin_keeper.go | 2 +- x/lockup/keeper/admin_keeper_test.go | 4 +- x/lockup/keeper/bench_test.go | 4 +- x/lockup/keeper/export_test.go | 2 +- x/lockup/keeper/grpc_query.go | 2 +- x/lockup/keeper/grpc_query_test.go | 2 +- x/lockup/keeper/invariants.go | 2 +- x/lockup/keeper/iterator.go | 2 +- x/lockup/keeper/keeper.go | 2 +- x/lockup/keeper/keeper_test.go | 6 +-- x/lockup/keeper/lock.go | 4 +- x/lockup/keeper/lock_refs.go | 2 +- x/lockup/keeper/lock_test.go | 2 +- x/lockup/keeper/migration.go | 2 +- x/lockup/keeper/migration_test.go | 2 +- x/lockup/keeper/msg_server.go | 4 +- x/lockup/keeper/msg_server_test.go | 4 +- x/lockup/keeper/store.go | 2 +- x/lockup/keeper/synthetic_lock.go | 2 +- x/lockup/keeper/synthetic_lock_test.go | 2 +- x/lockup/keeper/utils.go | 2 +- x/lockup/keeper/utils_test.go | 2 +- x/lockup/module.go | 10 ++-- x/lockup/simulation/operations.go | 6 +-- x/mint/client/cli/cli_test.go | 4 +- x/mint/client/cli/query.go | 2 +- x/mint/client/rest/grpc_query_test.go | 4 +- x/mint/client/rest/query.go | 2 +- x/mint/genesis.go | 4 +- x/mint/genesis_test.go | 4 +- x/mint/keeper/grpc_query.go | 2 +- x/mint/keeper/grpc_query_test.go | 4 +- x/mint/keeper/hooks.go | 4 +- x/mint/keeper/hooks_test.go | 6 +-- x/mint/keeper/integration_test.go | 4 +- x/mint/keeper/keeper.go | 4 +- x/mint/keeper/keeper_test.go | 8 ++-- x/mint/module.go | 10 ++-- x/mint/module_test.go | 4 +- x/mint/simulation/decoder.go | 2 +- x/mint/simulation/decoder_test.go | 6 +-- x/mint/simulation/genesis.go | 2 +- x/mint/simulation/genesis_test.go | 4 +- x/mint/simulation/params_test.go | 2 +- x/mint/types/expected_keepers.go | 2 +- x/mint/types/params.go | 2 +- x/pool-incentives/client/cli/cli_test.go | 6 +-- x/pool-incentives/client/cli/query.go | 2 +- x/pool-incentives/client/cli/tx.go | 4 +- x/pool-incentives/client/proposal_handler.go | 4 +- x/pool-incentives/client/rest/tx.go | 2 +- x/pool-incentives/genesis.go | 4 +- x/pool-incentives/genesis_test.go | 6 +-- x/pool-incentives/handler.go | 4 +- x/pool-incentives/keeper/distr.go | 2 +- x/pool-incentives/keeper/distr_test.go | 4 +- x/pool-incentives/keeper/gov.go | 2 +- x/pool-incentives/keeper/grpc_query.go | 4 +- x/pool-incentives/keeper/grpc_query_test.go | 6 +-- x/pool-incentives/keeper/hooks.go | 2 +- x/pool-incentives/keeper/keeper.go | 8 ++-- x/pool-incentives/keeper/keeper_test.go | 6 +-- x/pool-incentives/keeper/params.go | 2 +- x/pool-incentives/module.go | 6 +-- x/pool-incentives/types/expected_keepers.go | 8 ++-- x/pool-incentives/types/genesis_test.go | 2 +- x/pool-incentives/types/gov_test.go | 2 +- x/pool-incentives/types/incentives_test.go | 2 +- x/pool-incentives/types/query.pb.go | 2 +- x/pool-incentives/types/query_test.go | 2 +- x/pool-incentives/types/record_test.go | 2 +- x/superfluid/abci.go | 4 +- x/superfluid/client/cli/query.go | 2 +- x/superfluid/client/cli/tx.go | 2 +- x/superfluid/client/proposal_handler.go | 4 +- x/superfluid/genesis.go | 4 +- x/superfluid/genesis_test.go | 6 +-- x/superfluid/handler.go | 4 +- x/superfluid/keeper/distribution_test.go | 4 +- x/superfluid/keeper/edge_case_test.go | 2 +- x/superfluid/keeper/epoch.go | 10 ++-- x/superfluid/keeper/gov/gov.go | 4 +- x/superfluid/keeper/gov/gov_test.go | 8 ++-- x/superfluid/keeper/gov/suite_test.go | 4 +- x/superfluid/keeper/grpc_query.go | 6 +-- x/superfluid/keeper/grpc_query_test.go | 2 +- x/superfluid/keeper/hooks.go | 4 +- x/superfluid/keeper/intermediary_account.go | 4 +- .../keeper/intermediary_account_test.go | 2 +- x/superfluid/keeper/invariants.go | 2 +- x/superfluid/keeper/keeper.go | 2 +- x/superfluid/keeper/keeper_test.go | 14 +++--- x/superfluid/keeper/msg_server.go | 8 ++-- x/superfluid/keeper/msg_server_test.go | 8 ++-- x/superfluid/keeper/params.go | 2 +- x/superfluid/keeper/slash.go | 4 +- x/superfluid/keeper/slash_test.go | 4 +- x/superfluid/keeper/stake.go | 6 +-- x/superfluid/keeper/stake_test.go | 8 ++-- x/superfluid/keeper/superfluid_asset.go | 4 +- 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 | 8 ++-- 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/expected_keepers.go | 8 ++-- x/superfluid/types/gov.go | 2 +- x/superfluid/types/query.pb.go | 2 +- x/tokenfactory/client/cli/query.go | 2 +- x/tokenfactory/client/cli/tx.go | 2 +- x/tokenfactory/keeper/admins.go | 2 +- x/tokenfactory/keeper/admins_test.go | 4 +- x/tokenfactory/keeper/bankactions.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 | 6 +-- x/tokenfactory/keeper/grpc_query.go | 2 +- x/tokenfactory/keeper/keeper.go | 2 +- x/tokenfactory/keeper/keeper_test.go | 4 +- x/tokenfactory/keeper/msg_server.go | 2 +- x/tokenfactory/keeper/params.go | 2 +- x/tokenfactory/module.go | 6 +-- x/tokenfactory/types/denoms_test.go | 4 +- x/tokenfactory/types/genesis_test.go | 2 +- x/tokenfactory/types/params.go | 2 +- x/txfees/client/cli/query.go | 2 +- x/txfees/client/cli/tx.go | 2 +- x/txfees/genesis.go | 4 +- x/txfees/handler.go | 4 +- x/txfees/keeper/feedecorator.go | 4 +- x/txfees/keeper/feedecorator_test.go | 4 +- x/txfees/keeper/feetokens.go | 2 +- x/txfees/keeper/feetokens_test.go | 2 +- x/txfees/keeper/gov.go | 2 +- x/txfees/keeper/grpc_query.go | 2 +- x/txfees/keeper/hooks.go | 6 +-- x/txfees/keeper/hooks_test.go | 4 +- x/txfees/keeper/keeper.go | 2 +- x/txfees/keeper/keeper_test.go | 6 +-- x/txfees/keeper/txfee_filters/arb_tx.go | 2 +- x/txfees/module.go | 6 +-- x/txfees/module_test.go | 2 +- x/txfees/types/expected_keepers.go | 2 +- 319 files changed, 678 insertions(+), 677 deletions(-) diff --git a/app/app.go b/app/app.go index 4e94d2431e7..a967e3bc036 100644 --- a/app/app.go +++ b/app/app.go @@ -40,18 +40,18 @@ import ( paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v9/app/keepers" - appparams "github.com/osmosis-labs/osmosis/v9/app/params" - "github.com/osmosis-labs/osmosis/v9/app/upgrades" - v10 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v10" - v3 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v3" - v4 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v4" - v5 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v5" - v6 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v6" - v7 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v7" - v8 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v8" - v9 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v9" - _ "github.com/osmosis-labs/osmosis/v9/client/docs/statik" + "github.com/osmosis-labs/osmosis/v10/app/keepers" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" + v10 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v10" + v3 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v3" + v4 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v4" + v5 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v5" + v6 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v6" + v7 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v7" + v8 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v8" + v9 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v9" + _ "github.com/osmosis-labs/osmosis/v10/client/docs/statik" ) const appName = "OsmosisApp" diff --git a/app/apptesting/gamm.go b/app/apptesting/gamm.go index e8477f0f76a..df7132f147c 100644 --- a/app/apptesting/gamm.go +++ b/app/apptesting/gamm.go @@ -3,8 +3,8 @@ package apptesting import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var DefaultAcctFunds sdk.Coins = sdk.NewCoins( diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go index 993dbd3f323..02ae0c090bb 100644 --- a/app/apptesting/test_suite.go +++ b/app/apptesting/test_suite.go @@ -20,11 +20,11 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - lockupkeeper "github.com/osmosis-labs/osmosis/v9/x/lockup/keeper" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + lockupkeeper "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) type KeeperTestHelper struct { diff --git a/app/config.go b/app/config.go index 2279961e862..bb2898a76b4 100644 --- a/app/config.go +++ b/app/config.go @@ -6,7 +6,7 @@ import ( dbm "github.com/tendermint/tm-db" - "github.com/osmosis-labs/osmosis/v9/app/params" + "github.com/osmosis-labs/osmosis/v10/app/params" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/crypto/hd" diff --git a/app/encoding.go b/app/encoding.go index a634acb420f..b2178eb0ebb 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -1,7 +1,7 @@ package app import ( - "github.com/osmosis-labs/osmosis/v9/app/params" + "github.com/osmosis-labs/osmosis/v10/app/params" "github.com/cosmos/cosmos-sdk/std" ) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 3eca80b162c..1ee5809f1e1 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -51,29 +51,29 @@ import ( bech32ibctypes "github.com/osmosis-labs/bech32-ibc/x/bech32ibc/types" bech32ics20keeper "github.com/osmosis-labs/bech32-ibc/x/bech32ics20/keeper" - owasm "github.com/osmosis-labs/osmosis/v9/app/wasm" - _ "github.com/osmosis-labs/osmosis/v9/client/docs/statik" - epochskeeper "github.com/osmosis-labs/osmosis/v9/x/epochs/keeper" - epochstypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - gammkeeper "github.com/osmosis-labs/osmosis/v9/x/gamm/keeper" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - incentiveskeeper "github.com/osmosis-labs/osmosis/v9/x/incentives/keeper" - incentivestypes "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockupkeeper "github.com/osmosis-labs/osmosis/v9/x/lockup/keeper" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - mintkeeper "github.com/osmosis-labs/osmosis/v9/x/mint/keeper" - minttypes "github.com/osmosis-labs/osmosis/v9/x/mint/types" - poolincentives "github.com/osmosis-labs/osmosis/v9/x/pool-incentives" - poolincentiveskeeper "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/keeper" - poolincentivestypes "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid" - superfluidkeeper "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" - superfluidtypes "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" - tokenfactorykeeper "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/keeper" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" - "github.com/osmosis-labs/osmosis/v9/x/txfees" - txfeeskeeper "github.com/osmosis-labs/osmosis/v9/x/txfees/keeper" - txfeestypes "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + owasm "github.com/osmosis-labs/osmosis/v10/app/wasm" + _ "github.com/osmosis-labs/osmosis/v10/client/docs/statik" + epochskeeper "github.com/osmosis-labs/osmosis/v10/x/epochs/keeper" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + incentiveskeeper "github.com/osmosis-labs/osmosis/v10/x/incentives/keeper" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockupkeeper "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + mintkeeper "github.com/osmosis-labs/osmosis/v10/x/mint/keeper" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + poolincentives "github.com/osmosis-labs/osmosis/v10/x/pool-incentives" + poolincentiveskeeper "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/keeper" + poolincentivestypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid" + superfluidkeeper "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" + tokenfactorykeeper "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/keeper" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees" + txfeeskeeper "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper" + txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) type AppKeepers struct { diff --git a/app/keepers/modules.go b/app/keepers/modules.go index b4b2fcbd71a..ba83fa1733b 100644 --- a/app/keepers/modules.go +++ b/app/keepers/modules.go @@ -27,18 +27,18 @@ import ( "github.com/cosmos/cosmos-sdk/x/upgrade" upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" - _ "github.com/osmosis-labs/osmosis/v9/client/docs/statik" - "github.com/osmosis-labs/osmosis/v9/x/epochs" - "github.com/osmosis-labs/osmosis/v9/x/gamm" - "github.com/osmosis-labs/osmosis/v9/x/incentives" - "github.com/osmosis-labs/osmosis/v9/x/lockup" - "github.com/osmosis-labs/osmosis/v9/x/mint" - poolincentives "github.com/osmosis-labs/osmosis/v9/x/pool-incentives" - poolincentivesclient "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/client" - superfluid "github.com/osmosis-labs/osmosis/v9/x/superfluid" - superfluidclient "github.com/osmosis-labs/osmosis/v9/x/superfluid/client" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory" - "github.com/osmosis-labs/osmosis/v9/x/txfees" + _ "github.com/osmosis-labs/osmosis/v10/client/docs/statik" + "github.com/osmosis-labs/osmosis/v10/x/epochs" + "github.com/osmosis-labs/osmosis/v10/x/gamm" + "github.com/osmosis-labs/osmosis/v10/x/incentives" + "github.com/osmosis-labs/osmosis/v10/x/lockup" + "github.com/osmosis-labs/osmosis/v10/x/mint" + poolincentives "github.com/osmosis-labs/osmosis/v10/x/pool-incentives" + poolincentivesclient "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/client" + superfluid "github.com/osmosis-labs/osmosis/v10/x/superfluid" + superfluidclient "github.com/osmosis-labs/osmosis/v10/x/superfluid/client" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory" + "github.com/osmosis-labs/osmosis/v10/x/txfees" ) // AppModuleBasics returns ModuleBasics for the module BasicManager. diff --git a/app/modules.go b/app/modules.go index c8f0bf6e7fd..5de2ff635e9 100644 --- a/app/modules.go +++ b/app/modules.go @@ -43,27 +43,27 @@ import ( "github.com/cosmos/cosmos-sdk/x/upgrade" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - appparams "github.com/osmosis-labs/osmosis/v9/app/params" - _ "github.com/osmosis-labs/osmosis/v9/client/docs/statik" - "github.com/osmosis-labs/osmosis/v9/osmoutils/partialord" - "github.com/osmosis-labs/osmosis/v9/x/epochs" - epochstypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - "github.com/osmosis-labs/osmosis/v9/x/incentives" - incentivestypes "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - "github.com/osmosis-labs/osmosis/v9/x/lockup" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/mint" - minttypes "github.com/osmosis-labs/osmosis/v9/x/mint/types" - poolincentives "github.com/osmosis-labs/osmosis/v9/x/pool-incentives" - poolincentivestypes "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" - superfluid "github.com/osmosis-labs/osmosis/v9/x/superfluid" - superfluidtypes "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" - "github.com/osmosis-labs/osmosis/v9/x/txfees" - txfeestypes "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" + _ "github.com/osmosis-labs/osmosis/v10/client/docs/statik" + "github.com/osmosis-labs/osmosis/v10/osmoutils/partialord" + "github.com/osmosis-labs/osmosis/v10/x/epochs" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/mint" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + poolincentives "github.com/osmosis-labs/osmosis/v10/x/pool-incentives" + poolincentivestypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" + superfluid "github.com/osmosis-labs/osmosis/v10/x/superfluid" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees" + txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) // moduleAccountPermissions defines module account permissions diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 9cb8a40de25..b962cd0c905 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/osmosis-labs/osmosis/v9/app/keepers" + "github.com/osmosis-labs/osmosis/v10/app/keepers" ) // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal diff --git a/app/upgrades/v10/constants.go b/app/upgrades/v10/constants.go index 76656f00a7f..db6c9ff5f02 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/v9/app/upgrades" + "github.com/osmosis-labs/osmosis/v10/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 bd1626cb278..d7f2b409739 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/v9/app/keepers" + "github.com/osmosis-labs/osmosis/v10/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 dcec98c24c8..d5ced00644c 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/v9/app/apptesting" - v10 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v10" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + v10 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v10" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v3/constants.go b/app/upgrades/v3/constants.go index c5c1cc60c0f..f206b506cb1 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/v9/app/upgrades" +import "github.com/osmosis-labs/osmosis/v10/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 fa89f77d3d0..ce23aab4de1 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/v9/app/keepers" + "github.com/osmosis-labs/osmosis/v10/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 a83f6c3e5d2..2557e2f6f2b 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/v9/app/upgrades" + "github.com/osmosis-labs/osmosis/v10/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 a73ce921a2d..8c685c86476 100644 --- a/app/upgrades/v4/upgrade_test.go +++ b/app/upgrades/v4/upgrade_test.go @@ -11,8 +11,8 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/v9/app" - v4 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v4" + "github.com/osmosis-labs/osmosis/v10/app" + v4 "github.com/osmosis-labs/osmosis/v10/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 91ce252f3b0..b79399f7e4f 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/v9/app/keepers" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/app/keepers" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // 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 5d81089c22d..661f22ad5a2 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/v9/app/upgrades" + "github.com/osmosis-labs/osmosis/v10/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 025f048da61..814b4250a4d 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/v9/app/keepers" - "github.com/osmosis-labs/osmosis/v9/x/txfees" - txfeestypes "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/app/keepers" + "github.com/osmosis-labs/osmosis/v10/x/txfees" + txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v5/whitelist_feetokens.go b/app/upgrades/v5/whitelist_feetokens.go index 478c86c0535..28ad342e24b 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/v9/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v10/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 1d192551a05..e1d05d1df80 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/v9/app/upgrades" +import "github.com/osmosis-labs/osmosis/v10/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 59cad8284d2..1bdaa11d759 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/v9/app/keepers" + "github.com/osmosis-labs/osmosis/v10/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 fa9b3fef81e..2e2b94785a0 100644 --- a/app/upgrades/v7/constants.go +++ b/app/upgrades/v7/constants.go @@ -3,8 +3,8 @@ package v7 import ( "github.com/CosmWasm/wasmd/x/wasm" - "github.com/osmosis-labs/osmosis/v9/app/upgrades" - superfluidtypes "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/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 245fc556adf..c5c4fb7e6f6 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/v9/app/keepers" - lockupkeeper "github.com/osmosis-labs/osmosis/v9/x/lockup/keeper" - mintkeeper "github.com/osmosis-labs/osmosis/v9/x/mint/keeper" - superfluidtypes "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/app/keepers" + lockupkeeper "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + mintkeeper "github.com/osmosis-labs/osmosis/v10/x/mint/keeper" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v8/constants.go b/app/upgrades/v8/constants.go index abb874ef70c..933e1c496b3 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/v9/app/upgrades" - v8constants "github.com/osmosis-labs/osmosis/v9/app/upgrades/v8/constants" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" + v8constants "github.com/osmosis-labs/osmosis/v10/app/upgrades/v8/constants" ) const ( diff --git a/app/upgrades/v8/forks.go b/app/upgrades/v8/forks.go index 97b31d5a860..3ddc37ef71f 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/v9/app/keepers" + "github.com/osmosis-labs/osmosis/v10/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 e3770393875..71e511ab09b 100644 --- a/app/upgrades/v8/incentive_props.go +++ b/app/upgrades/v8/incentive_props.go @@ -3,9 +3,9 @@ package v8 import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/osmoutils" - poolincentiveskeeper "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/keeper" - poolincentivestypes "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + poolincentiveskeeper "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/keeper" + poolincentivestypes "github.com/osmosis-labs/osmosis/v10/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 58a47add671..9b68fc85771 100644 --- a/app/upgrades/v8/msg_filter_ante.go +++ b/app/upgrades/v8/msg_filter_ante.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - superfluidtypes "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/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 03248138921..202cb029893 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/v9/app" - v8 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v8" - superfluidtypes "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/app" + v8 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v8" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func noOpAnteDecorator() sdk.AnteHandler { diff --git a/app/upgrades/v8/unpool_whitelist.go b/app/upgrades/v8/unpool_whitelist.go index 8789b2b19a5..9131715f77c 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/v9/x/gamm/keeper" - superfluidkeeper "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + superfluidkeeper "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" ) const ustDenom = "ibc/BE1BB42D4BE3C30D50B68D7C41DB4DFCE9678E8EF8C539F6E6A9345048894FCC" diff --git a/app/upgrades/v9/constants.go b/app/upgrades/v9/constants.go index 0cfbd454110..32d78d07b3e 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/v9/app/upgrades" + "github.com/osmosis-labs/osmosis/v10/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" icahosttypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v10/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 1c01b8fa559..a6ff7f34aee 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/v3/modules/core/04-channel/types" - "github.com/osmosis-labs/osmosis/v9/app" - v8 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v8" - v9 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v9" + "github.com/osmosis-labs/osmosis/v10/app" + v8 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v8" + v9 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v9" ) func noOpAnteDecorator() sdk.AnteHandler { diff --git a/app/upgrades/v9/prop214.go b/app/upgrades/v9/prop214.go index aba46edb286..08f6fe8e258 100644 --- a/app/upgrades/v9/prop214.go +++ b/app/upgrades/v9/prop214.go @@ -3,8 +3,8 @@ package v9 import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammkeeper "github.com/osmosis-labs/osmosis/v9/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v10/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 94eadaa27c3..299128a2977 100644 --- a/app/upgrades/v9/prop214_test.go +++ b/app/upgrades/v9/prop214_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v9/app/apptesting" - v9 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v9" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + v9 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v9" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go index 9b071b71d9a..06cde303b0d 100644 --- a/app/upgrades/v9/upgrades.go +++ b/app/upgrades/v9/upgrades.go @@ -10,14 +10,14 @@ 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/v9/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ica "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts" icacontrollertypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/types" icahosttypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types" - "github.com/osmosis-labs/osmosis/v9/app/keepers" + "github.com/osmosis-labs/osmosis/v10/app/keepers" ) const preUpgradeAppVersion = 8 diff --git a/app/wasm/message_plugin.go b/app/wasm/message_plugin.go index d8960d4476e..1f173c081f4 100644 --- a/app/wasm/message_plugin.go +++ b/app/wasm/message_plugin.go @@ -9,12 +9,12 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - wasmbindings "github.com/osmosis-labs/osmosis/v9/app/wasm/bindings" - gammkeeper "github.com/osmosis-labs/osmosis/v9/x/gamm/keeper" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + wasmbindings "github.com/osmosis-labs/osmosis/v10/app/wasm/bindings" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" - tokenfactorykeeper "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/keeper" - tokenfactorytypes "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + tokenfactorykeeper "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/keeper" + tokenfactorytypes "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func CustomMessageDecorator(gammKeeper *gammkeeper.Keeper, bank *bankkeeper.BaseKeeper, tokenFactory *tokenfactorykeeper.Keeper) func(wasmkeeper.Messenger) wasmkeeper.Messenger { diff --git a/app/wasm/queries.go b/app/wasm/queries.go index acdb990b67b..a7a5b3905d2 100644 --- a/app/wasm/queries.go +++ b/app/wasm/queries.go @@ -5,9 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - wasmbindings "github.com/osmosis-labs/osmosis/v9/app/wasm/bindings" - gammkeeper "github.com/osmosis-labs/osmosis/v9/x/gamm/keeper" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + wasmbindings "github.com/osmosis-labs/osmosis/v10/app/wasm/bindings" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) type QueryPlugin struct { diff --git a/app/wasm/query_plugin.go b/app/wasm/query_plugin.go index 6e0b3a66ba4..40133d4f1f4 100644 --- a/app/wasm/query_plugin.go +++ b/app/wasm/query_plugin.go @@ -8,7 +8,7 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - bindings "github.com/osmosis-labs/osmosis/v9/app/wasm/bindings" + bindings "github.com/osmosis-labs/osmosis/v10/app/wasm/bindings" ) func CustomQuerier(osmoKeeper *QueryPlugin) func(ctx sdk.Context, request json.RawMessage) ([]byte, error) { diff --git a/app/wasm/test/custom_msg_test.go b/app/wasm/test/custom_msg_test.go index 24767ba2f67..ef485969389 100644 --- a/app/wasm/test/custom_msg_test.go +++ b/app/wasm/test/custom_msg_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" "github.com/stretchr/testify/require" @@ -13,8 +13,8 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/app" - wasmbindings "github.com/osmosis-labs/osmosis/v9/app/wasm/bindings" + "github.com/osmosis-labs/osmosis/v10/app" + wasmbindings "github.com/osmosis-labs/osmosis/v10/app/wasm/bindings" ) func TestCreateDenomMsg(t *testing.T) { diff --git a/app/wasm/test/custom_query_test.go b/app/wasm/test/custom_query_test.go index a2233e1033c..45dd67d1ea2 100644 --- a/app/wasm/test/custom_query_test.go +++ b/app/wasm/test/custom_query_test.go @@ -15,10 +15,10 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/app/wasm" - wasmbindings "github.com/osmosis-labs/osmosis/v9/app/wasm/bindings" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/app/wasm" + wasmbindings "github.com/osmosis-labs/osmosis/v10/app/wasm/bindings" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" ) // we must pay this many uosmo for every pool we create diff --git a/app/wasm/test/helpers_test.go b/app/wasm/test/helpers_test.go index 13c476c2f3d..b5c3c96d713 100644 --- a/app/wasm/test/helpers_test.go +++ b/app/wasm/test/helpers_test.go @@ -13,7 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/app" + "github.com/osmosis-labs/osmosis/v10/app" ) func CreateTestInput() (*app.OsmosisApp, sdk.Context) { diff --git a/app/wasm/test/messages_test.go b/app/wasm/test/messages_test.go index 6fc9546da9c..e9feae5942c 100644 --- a/app/wasm/test/messages_test.go +++ b/app/wasm/test/messages_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/app/wasm" - wasmbindings "github.com/osmosis-labs/osmosis/v9/app/wasm/bindings" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/app/wasm" + wasmbindings "github.com/osmosis-labs/osmosis/v10/app/wasm/bindings" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/app/wasm/test/queries_test.go b/app/wasm/test/queries_test.go index 1b34da64723..6bda39b685c 100644 --- a/app/wasm/test/queries_test.go +++ b/app/wasm/test/queries_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/app/wasm" - wasmbindings "github.com/osmosis-labs/osmosis/v9/app/wasm/bindings" + "github.com/osmosis-labs/osmosis/v10/app/wasm" + wasmbindings "github.com/osmosis-labs/osmosis/v10/app/wasm/bindings" ) func TestFullDenom(t *testing.T) { diff --git a/app/wasm/test/store_run_test.go b/app/wasm/test/store_run_test.go index 23c625a4d93..8d5a26e27bd 100644 --- a/app/wasm/test/store_run_test.go +++ b/app/wasm/test/store_run_test.go @@ -13,7 +13,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/app" + "github.com/osmosis-labs/osmosis/v10/app" ) func TestNoStorageWithoutProposal(t *testing.T) { diff --git a/app/wasm/wasm.go b/app/wasm/wasm.go index 25742d67949..1f72a513bab 100644 --- a/app/wasm/wasm.go +++ b/app/wasm/wasm.go @@ -3,12 +3,12 @@ package wasm import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - tokenfactorykeeper "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/keeper" + tokenfactorykeeper "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/keeper" "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - gammkeeper "github.com/osmosis-labs/osmosis/v9/x/gamm/keeper" + gammkeeper "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" ) func RegisterCustomPlugins( diff --git a/cmd/osmosisd/cmd/balances_from_state_export.go b/cmd/osmosisd/cmd/balances_from_state_export.go index 59c870d438f..643d1ef5356 100644 --- a/cmd/osmosisd/cmd/balances_from_state_export.go +++ b/cmd/osmosisd/cmd/balances_from_state_export.go @@ -10,10 +10,10 @@ import ( tmjson "github.com/tendermint/tendermint/libs/json" tmtypes "github.com/tendermint/tendermint/types" - appparams "github.com/osmosis-labs/osmosis/v9/app/params" - "github.com/osmosis-labs/osmosis/v9/osmoutils" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/server" diff --git a/cmd/osmosisd/cmd/genesis.go b/cmd/osmosisd/cmd/genesis.go index b3917787dbe..37043630489 100644 --- a/cmd/osmosisd/cmd/genesis.go +++ b/cmd/osmosisd/cmd/genesis.go @@ -25,12 +25,12 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - appParams "github.com/osmosis-labs/osmosis/v9/app/params" + appParams "github.com/osmosis-labs/osmosis/v10/app/params" - epochstypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - incentivestypes "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - minttypes "github.com/osmosis-labs/osmosis/v9/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) //nolint:ineffassign diff --git a/cmd/osmosisd/cmd/root.go b/cmd/osmosisd/cmd/root.go index e639be74d75..62a6ff7f247 100644 --- a/cmd/osmosisd/cmd/root.go +++ b/cmd/osmosisd/cmd/root.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/osmosis-labs/osmosis/v9/app/params" + "github.com/osmosis-labs/osmosis/v10/app/params" "github.com/spf13/cast" "github.com/spf13/cobra" @@ -40,7 +40,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - osmosis "github.com/osmosis-labs/osmosis/v9/app" + osmosis "github.com/osmosis-labs/osmosis/v10/app" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/cmd/osmosisd/cmd/testnetify/cmd.go b/cmd/osmosisd/cmd/testnetify/cmd.go index de5925d3cae..87e1e3eb3e0 100644 --- a/cmd/osmosisd/cmd/testnetify/cmd.go +++ b/cmd/osmosisd/cmd/testnetify/cmd.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v9/app" + "github.com/osmosis-labs/osmosis/v10/app" ) // get cmd to convert any bech32 address to an osmo prefix. diff --git a/cmd/osmosisd/cmd/testnetify/find_replace.go b/cmd/osmosisd/cmd/testnetify/find_replace.go index a476e150294..e3c9e5eb27f 100644 --- a/cmd/osmosisd/cmd/testnetify/find_replace.go +++ b/cmd/osmosisd/cmd/testnetify/find_replace.go @@ -3,7 +3,7 @@ package testnetify import ( "bytes" - "github.com/osmosis-labs/osmosis/v9/app" + "github.com/osmosis-labs/osmosis/v10/app" ) func replaceConsAddrHex(genesis app.GenesisState, fromAddr string, replaceAddr string) { diff --git a/cmd/osmosisd/cmd/testnetify/state_export_to_testnet.go b/cmd/osmosisd/cmd/testnetify/state_export_to_testnet.go index 82fb798ba06..3a76a40be4a 100644 --- a/cmd/osmosisd/cmd/testnetify/state_export_to_testnet.go +++ b/cmd/osmosisd/cmd/testnetify/state_export_to_testnet.go @@ -3,7 +3,7 @@ package testnetify import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v9/app" + "github.com/osmosis-labs/osmosis/v10/app" ) var ( diff --git a/cmd/osmosisd/main.go b/cmd/osmosisd/main.go index d3304b83d16..5eb17ba3dba 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/v9/app" - "github.com/osmosis-labs/osmosis/v9/app/params" - "github.com/osmosis-labs/osmosis/v9/cmd/osmosisd/cmd" + osmosis "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/app/params" + "github.com/osmosis-labs/osmosis/v10/cmd/osmosisd/cmd" ) func main() { diff --git a/go.mod b/go.mod index f453da72f40..9426298e899 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/osmosis-labs/osmosis/v9 +module github.com/osmosis-labs/osmosis/v10 go 1.18 diff --git a/simapp/genesis.go b/simapp/genesis.go index c3db19cb3d5..75901133a77 100644 --- a/simapp/genesis.go +++ b/simapp/genesis.go @@ -8,7 +8,7 @@ import ( tmjson "github.com/tendermint/tendermint/libs/json" tmtypes "github.com/tendermint/tendermint/types" - "github.com/osmosis-labs/osmosis/v9/app" + "github.com/osmosis-labs/osmosis/v10/app" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" diff --git a/simapp/sim_test.go b/simapp/sim_test.go index 844d8580948..61c9e832c01 100644 --- a/simapp/sim_test.go +++ b/simapp/sim_test.go @@ -11,7 +11,7 @@ import ( "github.com/tendermint/tendermint/libs/log" dbm "github.com/tendermint/tm-db" - "github.com/osmosis-labs/osmosis/v9/app" + "github.com/osmosis-labs/osmosis/v10/app" "github.com/cosmos/cosmos-sdk/baseapp" sdkSimapp "github.com/cosmos/cosmos-sdk/simapp" diff --git a/simapp/state.go b/simapp/state.go index 558b511fdda..0d4267df3cd 100644 --- a/simapp/state.go +++ b/simapp/state.go @@ -7,7 +7,7 @@ import ( "math/rand" "time" - "github.com/osmosis-labs/osmosis/v9/app" + "github.com/osmosis-labs/osmosis/v10/app" "github.com/cosmos/cosmos-sdk/codec" sdksimapp "github.com/cosmos/cosmos-sdk/simapp" diff --git a/store/legacy/v101/tree_test.go b/store/legacy/v101/tree_test.go index a5ae86940b5..5b9b884ab31 100644 --- a/store/legacy/v101/tree_test.go +++ b/store/legacy/v101/tree_test.go @@ -18,8 +18,8 @@ import ( iavlstore "github.com/cosmos/cosmos-sdk/store/iavl" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/store" - v101 "github.com/osmosis-labs/osmosis/v9/store/legacy/v101" + "github.com/osmosis-labs/osmosis/v10/store" + v101 "github.com/osmosis-labs/osmosis/v10/store/legacy/v101" ) func setupStore() sdk.KVStore { diff --git a/tests/e2e/e2e_setup_test.go b/tests/e2e/e2e_setup_test.go index 7f999fe801c..4d64a646c71 100644 --- a/tests/e2e/e2e_setup_test.go +++ b/tests/e2e/e2e_setup_test.go @@ -20,9 +20,9 @@ import ( rpchttp "github.com/tendermint/tendermint/rpc/client/http" - dockerconfig "github.com/osmosis-labs/osmosis/v9/tests/e2e/docker" - "github.com/osmosis-labs/osmosis/v9/tests/e2e/initialization" - "github.com/osmosis-labs/osmosis/v9/tests/e2e/util" + dockerconfig "github.com/osmosis-labs/osmosis/v10/tests/e2e/docker" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/util" ) type status struct { diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index b824ddf29c0..4e9b7ae013a 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/osmosis-labs/osmosis/v9/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" ) func (s *IntegrationTestSuite) TestIBCTokenTransfer() { diff --git a/tests/e2e/e2e_util_test.go b/tests/e2e/e2e_util_test.go index f7995f3fa7d..6d9f34dc5e6 100644 --- a/tests/e2e/e2e_util_test.go +++ b/tests/e2e/e2e_util_test.go @@ -18,10 +18,10 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ory/dockertest/v3/docker" - superfluidtypes "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + superfluidtypes "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" - "github.com/osmosis-labs/osmosis/v9/tests/e2e/initialization" - "github.com/osmosis-labs/osmosis/v9/tests/e2e/util" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/util" ) func (s *IntegrationTestSuite) ExecTx(chainId string, validatorIndex int, command []string, success string) (bytes.Buffer, bytes.Buffer, error) { diff --git a/tests/e2e/initialization/chain/main.go b/tests/e2e/initialization/chain/main.go index 399e48a3b0c..586cb9fddcc 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/v9/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" ) func main() { diff --git a/tests/e2e/initialization/config.go b/tests/e2e/initialization/config.go index fdad7a84ffd..b32fb0dea6f 100644 --- a/tests/e2e/initialization/config.go +++ b/tests/e2e/initialization/config.go @@ -18,14 +18,14 @@ import ( "github.com/gogo/protobuf/proto" tmjson "github.com/tendermint/tendermint/libs/json" - epochtypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - minttypes "github.com/osmosis-labs/osmosis/v9/x/mint/types" - poolitypes "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" - txfeestypes "github.com/osmosis-labs/osmosis/v9/x/txfees/types" - - "github.com/osmosis-labs/osmosis/v9/tests/e2e/util" + epochtypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + poolitypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" + txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types" + + "github.com/osmosis-labs/osmosis/v10/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 4abf629e7c5..427dbdad3a5 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/v9/tests/e2e/util" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/util" ) func InitChain(id, dataDir string, nodeConfigs []*NodeConfig, votingPeriod time.Duration, forkHeight int) (*Chain, error) { diff --git a/tests/e2e/initialization/init_test.go b/tests/e2e/initialization/init_test.go index 04fb6177972..e4a8f55d093 100644 --- a/tests/e2e/initialization/init_test.go +++ b/tests/e2e/initialization/init_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v9/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" ) const forkHeight = 10 diff --git a/tests/e2e/initialization/node.go b/tests/e2e/initialization/node.go index 9002f1349bc..4641ae87607 100644 --- a/tests/e2e/initialization/node.go +++ b/tests/e2e/initialization/node.go @@ -30,8 +30,8 @@ import ( "github.com/tendermint/tendermint/privval" tmtypes "github.com/tendermint/tendermint/types" - osmosisApp "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/tests/e2e/util" + osmosisApp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/util" ) type internalNode struct { diff --git a/tests/e2e/initialization/node/main.go b/tests/e2e/initialization/node/main.go index 63df0a3a41b..14ea881783b 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/v9/tests/e2e/initialization" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/initialization" ) func main() { diff --git a/tests/e2e/initialization/util.go b/tests/e2e/initialization/util.go index 03246b29249..9a2db5045aa 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/v9/tests/e2e/util" + "github.com/osmosis-labs/osmosis/v10/tests/e2e/util" ) func decodeTx(txBytes []byte) (*sdktx.Tx, error) { diff --git a/tests/e2e/util/codec.go b/tests/e2e/util/codec.go index 8adafc91feb..91bfb5d5dcd 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/v9/app" - "github.com/osmosis-labs/osmosis/v9/app/params" + osmosisApp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/app/params" ) var ( diff --git a/x/epochs/keeper/epoch.go b/x/epochs/keeper/epoch.go index a5509d6edcf..60e0245d265 100644 --- a/x/epochs/keeper/epoch.go +++ b/x/epochs/keeper/epoch.go @@ -5,7 +5,7 @@ import ( "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/epochs/keeper/grpc_query.go b/x/epochs/keeper/grpc_query.go index e7e1d58cc68..66734c4f17e 100644 --- a/x/epochs/keeper/grpc_query.go +++ b/x/epochs/keeper/grpc_query.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) var _ types.QueryServer = Querier{} diff --git a/x/epochs/keeper/grpc_query_test.go b/x/epochs/keeper/grpc_query_test.go index 0db6f331eb2..06e9db44015 100644 --- a/x/epochs/keeper/grpc_query_test.go +++ b/x/epochs/keeper/grpc_query_test.go @@ -4,7 +4,7 @@ import ( gocontext "context" "time" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) func (suite *KeeperTestSuite) TestQueryEpochInfos() { diff --git a/x/epochs/keeper/keeper.go b/x/epochs/keeper/keeper.go index c90490c4fad..a6a2240b404 100644 --- a/x/epochs/keeper/keeper.go +++ b/x/epochs/keeper/keeper.go @@ -5,7 +5,7 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/epochs/keeper/keeper_test.go b/x/epochs/keeper/keeper_test.go index 12b0000e299..2a392316be2 100644 --- a/x/epochs/keeper/keeper_test.go +++ b/x/epochs/keeper/keeper_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v9/app/apptesting" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) type KeeperTestSuite struct { diff --git a/x/epochs/simulation/genesis.go b/x/epochs/simulation/genesis.go index 8cca8435db0..7219bd3934f 100644 --- a/x/epochs/simulation/genesis.go +++ b/x/epochs/simulation/genesis.go @@ -7,7 +7,7 @@ import ( "fmt" "time" - "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/epochs/types" "github.com/cosmos/cosmos-sdk/types/module" ) diff --git a/x/gamm/client/cli/cli_test.go b/x/gamm/client/cli/cli_test.go index b0744b78948..532db9bc5c2 100644 --- a/x/gamm/client/cli/cli_test.go +++ b/x/gamm/client/cli/cli_test.go @@ -7,12 +7,12 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/osmoutils" - "github.com/osmosis-labs/osmosis/v9/x/gamm/client/cli" - gammtestutil "github.com/osmosis-labs/osmosis/v9/x/gamm/client/testutil" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/gamm/client/cli" + gammtestutil "github.com/osmosis-labs/osmosis/v10/x/gamm/client/testutil" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/hd" diff --git a/x/gamm/client/cli/query.go b/x/gamm/client/cli/query.go index 23df1addc3e..061577dc8a8 100644 --- a/x/gamm/client/cli/query.go +++ b/x/gamm/client/cli/query.go @@ -12,8 +12,8 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // GetQueryCmd returns the cli query commands for this module. diff --git a/x/gamm/client/cli/tx.go b/x/gamm/client/cli/tx.go index 64b4f81813a..506c092fcca 100644 --- a/x/gamm/client/cli/tx.go +++ b/x/gamm/client/cli/tx.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" flag "github.com/spf13/pflag" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/gamm/client/testutil/test_helpers.go b/x/gamm/client/testutil/test_helpers.go index 2265df0c6c9..ce6f8bc2f84 100644 --- a/x/gamm/client/testutil/test_helpers.go +++ b/x/gamm/client/testutil/test_helpers.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - gammcli "github.com/osmosis-labs/osmosis/v9/x/gamm/client/cli" + gammcli "github.com/osmosis-labs/osmosis/v10/x/gamm/client/cli" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/gamm/genesis.go b/x/gamm/genesis.go index 39870878a85..638b0454aeb 100644 --- a/x/gamm/genesis.go +++ b/x/gamm/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/v9/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/gamm/genesis_test.go b/x/gamm/genesis_test.go index c8bccc35d88..6d0c8decf7c 100644 --- a/x/gamm/genesis_test.go +++ b/x/gamm/genesis_test.go @@ -11,10 +11,10 @@ import ( "github.com/tendermint/tendermint/crypto/ed25519" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - osmoapp "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/gamm" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + osmoapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/gamm" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func TestGammInitGenesis(t *testing.T) { diff --git a/x/gamm/handler.go b/x/gamm/handler.go index 9d5a9b4ed68..33cf03131d1 100644 --- a/x/gamm/handler.go +++ b/x/gamm/handler.go @@ -1,9 +1,9 @@ package gamm import ( - "github.com/osmosis-labs/osmosis/v9/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/gamm/keeper/gas_test.go b/x/gamm/keeper/gas_test.go index dfd39b75848..ee9af05cacd 100644 --- a/x/gamm/keeper/gas_test.go +++ b/x/gamm/keeper/gas_test.go @@ -4,9 +4,9 @@ import ( "fmt" "strconv" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - balancertypes "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + balancertypes "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/gamm/keeper/grpc_query.go b/x/gamm/keeper/grpc_query.go index 2b2651e1d37..85826ea78a5 100644 --- a/x/gamm/keeper/grpc_query.go +++ b/x/gamm/keeper/grpc_query.go @@ -14,8 +14,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var sdkIntMaxValue = sdk.NewInt(0) diff --git a/x/gamm/keeper/grpc_query_test.go b/x/gamm/keeper/grpc_query_test.go index 876ae19ce95..5dfa6aa1e97 100644 --- a/x/gamm/keeper/grpc_query_test.go +++ b/x/gamm/keeper/grpc_query_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func (suite *KeeperTestSuite) TestQueryPool() { diff --git a/x/gamm/keeper/invariants.go b/x/gamm/keeper/invariants.go index f6b1569484e..e25639a0321 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/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/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 5c52cc09b8c..ffc4d389255 100644 --- a/x/gamm/keeper/keeper.go +++ b/x/gamm/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "fmt" "strconv" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/gamm/keeper/keeper_test.go b/x/gamm/keeper/keeper_test.go index 908d772d792..6f5b26a25db 100644 --- a/x/gamm/keeper/keeper_test.go +++ b/x/gamm/keeper/keeper_test.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/app/apptesting" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - balancertypes "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + balancertypes "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) type KeeperTestSuite struct { diff --git a/x/gamm/keeper/marshal_bench_test.go b/x/gamm/keeper/marshal_bench_test.go index b587a681412..132c6ddd550 100644 --- a/x/gamm/keeper/marshal_bench_test.go +++ b/x/gamm/keeper/marshal_bench_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - balancertypes "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + balancertypes "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" diff --git a/x/gamm/keeper/msg_server.go b/x/gamm/keeper/msg_server.go index 45f9d6fb026..01168683208 100644 --- a/x/gamm/keeper/msg_server.go +++ b/x/gamm/keeper/msg_server.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) type msgServer struct { diff --git a/x/gamm/keeper/multihop.go b/x/gamm/keeper/multihop.go index 61746bd6d89..aa03a1a6db9 100644 --- a/x/gamm/keeper/multihop.go +++ b/x/gamm/keeper/multihop.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // MultihopSwapExactAmountIn defines the input denom and input amount for the first pool, diff --git a/x/gamm/keeper/multihop_test.go b/x/gamm/keeper/multihop_test.go index 20a7c0d80e9..97bbfc5166a 100644 --- a/x/gamm/keeper/multihop_test.go +++ b/x/gamm/keeper/multihop_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func (suite *KeeperTestSuite) TestBalancerPoolSimpleMultihopSwapExactAmountIn() { diff --git a/x/gamm/keeper/params.go b/x/gamm/keeper/params.go index 10de5a01c63..8f70415b757 100644 --- a/x/gamm/keeper/params.go +++ b/x/gamm/keeper/params.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/gamm/keeper/pool.go b/x/gamm/keeper/pool.go index 1e9e2be5984..ce7077d803c 100644 --- a/x/gamm/keeper/pool.go +++ b/x/gamm/keeper/pool.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/stableswap" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/stableswap" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func (k Keeper) MarshalPool(pool types.PoolI) ([]byte, error) { diff --git a/x/gamm/keeper/pool_service.go b/x/gamm/keeper/pool_service.go index 608d1c1e90b..c8ce23cf244 100644 --- a/x/gamm/keeper/pool_service.go +++ b/x/gamm/keeper/pool_service.go @@ -8,7 +8,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/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 70fa0d2e4a4..bf869075e46 100644 --- a/x/gamm/keeper/pool_service_test.go +++ b/x/gamm/keeper/pool_service_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - balancertypes "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + balancertypes "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var ( diff --git a/x/gamm/keeper/pool_test.go b/x/gamm/keeper/pool_test.go index 3232fd9a7cc..fa4e7e02047 100644 --- a/x/gamm/keeper/pool_test.go +++ b/x/gamm/keeper/pool_test.go @@ -7,7 +7,7 @@ package keeper_test // "github.com/cosmos/cosmos-sdk/simapp" // sdk "github.com/cosmos/cosmos-sdk/types" -// "github.com/osmosis-labs/osmosis/v9/x/gamm/types" +// "github.com/osmosis-labs/osmosis/v10/x/gamm/types" // ) // func (suite *KeeperTestSuite) TestCleanupPool() { diff --git a/x/gamm/keeper/share.go b/x/gamm/keeper/share.go index 1f21720f741..1b6826e81d5 100644 --- a/x/gamm/keeper/share.go +++ b/x/gamm/keeper/share.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func (k Keeper) applyJoinPoolStateChange(ctx sdk.Context, pool types.PoolI, joiner sdk.AccAddress, numShares sdk.Int, joinCoins sdk.Coins) error { diff --git a/x/gamm/keeper/swap.go b/x/gamm/keeper/swap.go index 5dd061f6001..79c239623c8 100644 --- a/x/gamm/keeper/swap.go +++ b/x/gamm/keeper/swap.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // SwapExactAmountIn attempts to swap one asset, tokenIn, for another asset diff --git a/x/gamm/keeper/swap_test.go b/x/gamm/keeper/swap_test.go index 30c2d3b6ecd..f209c9fa4d8 100644 --- a/x/gamm/keeper/swap_test.go +++ b/x/gamm/keeper/swap_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" ) func (suite *KeeperTestSuite) TestBalancerPoolSimpleSwapExactAmountIn() { diff --git a/x/gamm/keeper/total_liquidity.go b/x/gamm/keeper/total_liquidity.go index c7864e450e0..9688d98e598 100644 --- a/x/gamm/keeper/total_liquidity.go +++ b/x/gamm/keeper/total_liquidity.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func (k Keeper) GetTotalLiquidity(ctx sdk.Context) sdk.Coins { diff --git a/x/gamm/module.go b/x/gamm/module.go index e0a9b551dde..d9c5bf6f8e9 100644 --- a/x/gamm/module.go +++ b/x/gamm/module.go @@ -19,11 +19,11 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/simulation" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/simulation" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var ( diff --git a/x/gamm/pool-models/balancer/amm.go b/x/gamm/pool-models/balancer/amm.go index 6847d19391e..91c3d0413c2 100644 --- a/x/gamm/pool-models/balancer/amm.go +++ b/x/gamm/pool-models/balancer/amm.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v9/osmomath" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/internal/cfmm_common" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/osmomath" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/internal/cfmm_common" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) const ( diff --git a/x/gamm/pool-models/balancer/amm_joinpool_test.go b/x/gamm/pool-models/balancer/amm_joinpool_test.go index ca0c5126942..f3dbbe51914 100644 --- a/x/gamm/pool-models/balancer/amm_joinpool_test.go +++ b/x/gamm/pool-models/balancer/amm_joinpool_test.go @@ -11,9 +11,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v9/osmoutils" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) const ( diff --git a/x/gamm/pool-models/balancer/amm_test.go b/x/gamm/pool-models/balancer/amm_test.go index 326ce81a5de..43a7eecbead 100644 --- a/x/gamm/pool-models/balancer/amm_test.go +++ b/x/gamm/pool-models/balancer/amm_test.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v9/osmoutils" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // This test sets up 2 asset pools, and then checks the spot price on them. diff --git a/x/gamm/pool-models/balancer/balancer_pool.go b/x/gamm/pool-models/balancer/balancer_pool.go index 5060b9888e1..b9e9b75d625 100644 --- a/x/gamm/pool-models/balancer/balancer_pool.go +++ b/x/gamm/pool-models/balancer/balancer_pool.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) const ( diff --git a/x/gamm/pool-models/balancer/codec.go b/x/gamm/pool-models/balancer/codec.go index a13a837c59b..06f6a4c3c08 100644 --- a/x/gamm/pool-models/balancer/codec.go +++ b/x/gamm/pool-models/balancer/codec.go @@ -1,7 +1,7 @@ package balancer import ( - types "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + types "github.com/osmosis-labs/osmosis/v10/x/gamm/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/gamm/pool-models/balancer/msgs.go b/x/gamm/pool-models/balancer/msgs.go index a5ba83d0831..0466ce626c0 100644 --- a/x/gamm/pool-models/balancer/msgs.go +++ b/x/gamm/pool-models/balancer/msgs.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) const ( diff --git a/x/gamm/pool-models/balancer/msgs_test.go b/x/gamm/pool-models/balancer/msgs_test.go index 0a3ae76da3f..420ce37ae63 100644 --- a/x/gamm/pool-models/balancer/msgs_test.go +++ b/x/gamm/pool-models/balancer/msgs_test.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" - appParams "github.com/osmosis-labs/osmosis/v9/app/params" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + appParams "github.com/osmosis-labs/osmosis/v10/app/params" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func TestMsgCreateBalancerPool(t *testing.T) { diff --git a/x/gamm/pool-models/balancer/pool_asset.go b/x/gamm/pool-models/balancer/pool_asset.go index ad3593dadf5..2c430dccb8c 100644 --- a/x/gamm/pool-models/balancer/pool_asset.go +++ b/x/gamm/pool-models/balancer/pool_asset.go @@ -7,7 +7,7 @@ import ( "gopkg.in/yaml.v2" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/gamm/pool-models/balancer/suite_test.go b/x/gamm/pool-models/balancer/suite_test.go index fbd1abc78b2..cbad8d90a13 100644 --- a/x/gamm/pool-models/balancer/suite_test.go +++ b/x/gamm/pool-models/balancer/suite_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v9/app/apptesting" - v10 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v10" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + v10 "github.com/osmosis-labs/osmosis/v10/app/upgrades/v10" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) type KeeperTestSuite struct { diff --git a/x/gamm/pool-models/balancer/util_test.go b/x/gamm/pool-models/balancer/util_test.go index 69d0657e56a..5b34bc07af0 100644 --- a/x/gamm/pool-models/balancer/util_test.go +++ b/x/gamm/pool-models/balancer/util_test.go @@ -11,8 +11,8 @@ import ( tmtypes "github.com/tendermint/tendermint/proto/tendermint/types" dbm "github.com/tendermint/tm-db" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func createTestPool(t *testing.T, swapFee, exitFee sdk.Dec, poolAssets ...balancer.PoolAsset) types.PoolI { diff --git a/x/gamm/pool-models/internal/cfmm_common/lp.go b/x/gamm/pool-models/internal/cfmm_common/lp.go index 84413c47749..626ded92504 100644 --- a/x/gamm/pool-models/internal/cfmm_common/lp.go +++ b/x/gamm/pool-models/internal/cfmm_common/lp.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v9/osmoutils" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) const errMsgFormatSharesLargerThanMax = "%s resulted shares is larger than the max amount of %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 d8ff0eb52fa..419b50e2eb3 100644 --- a/x/gamm/pool-models/internal/cfmm_common/lp_test.go +++ b/x/gamm/pool-models/internal/cfmm_common/lp_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/internal/cfmm_common" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/stableswap" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/internal/cfmm_common" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/stableswap" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/gamm/pool-models/stableswap/amm.go b/x/gamm/pool-models/stableswap/amm.go index 9e8c5d18e1e..e5b1461841a 100644 --- a/x/gamm/pool-models/stableswap/amm.go +++ b/x/gamm/pool-models/stableswap/amm.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/internal/cfmm_common" - types "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/internal/cfmm_common" + types "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var ( diff --git a/x/gamm/pool-models/stableswap/codec.go b/x/gamm/pool-models/stableswap/codec.go index 4a72a9b35e6..2d1a01f57d8 100644 --- a/x/gamm/pool-models/stableswap/codec.go +++ b/x/gamm/pool-models/stableswap/codec.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" - types "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + types "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) // RegisterLegacyAminoCodec registers the necessary x/gamm interfaces and concrete types diff --git a/x/gamm/pool-models/stableswap/msgs.go b/x/gamm/pool-models/stableswap/msgs.go index a3d8dcbbd70..69ad50f787e 100644 --- a/x/gamm/pool-models/stableswap/msgs.go +++ b/x/gamm/pool-models/stableswap/msgs.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) const ( diff --git a/x/gamm/pool-models/stableswap/msgs_test.go b/x/gamm/pool-models/stableswap/msgs_test.go index dca83834b03..301aa5ffa50 100644 --- a/x/gamm/pool-models/stableswap/msgs_test.go +++ b/x/gamm/pool-models/stableswap/msgs_test.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" - appParams "github.com/osmosis-labs/osmosis/v9/app/params" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + appParams "github.com/osmosis-labs/osmosis/v10/app/params" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func TestMsgCreateStableswapPool(t *testing.T) { diff --git a/x/gamm/pool-models/stableswap/params.go b/x/gamm/pool-models/stableswap/params.go index 640ff980a6c..6d5289c028e 100644 --- a/x/gamm/pool-models/stableswap/params.go +++ b/x/gamm/pool-models/stableswap/params.go @@ -3,7 +3,7 @@ package stableswap import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) func (params PoolParams) Validate() error { diff --git a/x/gamm/pool-models/stableswap/pool.go b/x/gamm/pool-models/stableswap/pool.go index a3e3485c362..bc299c41731 100644 --- a/x/gamm/pool-models/stableswap/pool.go +++ b/x/gamm/pool-models/stableswap/pool.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/internal/cfmm_common" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/internal/cfmm_common" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var _ types.PoolI = &Pool{} diff --git a/x/gamm/pool-models/stableswap/stableswap_pool.go b/x/gamm/pool-models/stableswap/stableswap_pool.go index c31159916eb..8877ec05f69 100644 --- a/x/gamm/pool-models/stableswap/stableswap_pool.go +++ b/x/gamm/pool-models/stableswap/stableswap_pool.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) var _ types.PoolI = &Pool{} diff --git a/x/gamm/simulation/operations.go b/x/gamm/simulation/operations.go index 51020ea7b9e..742bd584703 100644 --- a/x/gamm/simulation/operations.go +++ b/x/gamm/simulation/operations.go @@ -5,13 +5,13 @@ import ( "math/rand" "time" - osmo_simulation "github.com/osmosis-labs/osmosis/v9/x/simulation" + osmo_simulation "github.com/osmosis-labs/osmosis/v10/x/simulation" "github.com/cosmos/cosmos-sdk/baseapp" - "github.com/osmosis-labs/osmosis/v9/x/gamm/keeper" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/keeper" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + "github.com/osmosis-labs/osmosis/v10/x/gamm/types" "github.com/cosmos/cosmos-sdk/codec" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" diff --git a/x/gamm/types/msgs_test.go b/x/gamm/types/msgs_test.go index 64adc21fbe8..3cfee6629dc 100644 --- a/x/gamm/types/msgs_test.go +++ b/x/gamm/types/msgs_test.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" - appParams "github.com/osmosis-labs/osmosis/v9/app/params" + appParams "github.com/osmosis-labs/osmosis/v10/app/params" ) func TestMsgSwapExactAmountIn(t *testing.T) { diff --git a/x/gamm/types/params.go b/x/gamm/types/params.go index df20d4eb749..db3d72166b3 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/v9/app/params" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/incentives/client/cli/cli_test.go b/x/incentives/client/cli/cli_test.go index 2a6ececc7f5..eef0381c989 100644 --- a/x/incentives/client/cli/cli_test.go +++ b/x/incentives/client/cli/cli_test.go @@ -6,9 +6,9 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/incentives/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/incentives/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go index 232c511ced7..601ce67b770 100644 --- a/x/incentives/client/cli/query.go +++ b/x/incentives/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/incentives/client/cli/tx.go b/x/incentives/client/cli/tx.go index b0b2e15d426..705fbea884d 100644 --- a/x/incentives/client/cli/tx.go +++ b/x/incentives/client/cli/tx.go @@ -8,8 +8,8 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/incentives/genesis.go b/x/incentives/genesis.go index e95f6071a41..1fd281eae03 100644 --- a/x/incentives/genesis.go +++ b/x/incentives/genesis.go @@ -1,8 +1,8 @@ package incentives import ( - "github.com/osmosis-labs/osmosis/v9/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/genesis_test.go b/x/incentives/genesis_test.go index d2f22611d11..15b0b6e6f27 100644 --- a/x/incentives/genesis_test.go +++ b/x/incentives/genesis_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - osmoapp "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/incentives" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + osmoapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/incentives" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/handler.go b/x/incentives/handler.go index c62bea1a3ca..27cb5d05dea 100644 --- a/x/incentives/handler.go +++ b/x/incentives/handler.go @@ -3,8 +3,8 @@ package incentives import ( "fmt" - "github.com/osmosis-labs/osmosis/v9/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/incentives/keeper/bench_test.go b/x/incentives/keeper/bench_test.go index b01d9d99633..74e92171bd5 100644 --- a/x/incentives/keeper/bench_test.go +++ b/x/incentives/keeper/bench_test.go @@ -9,9 +9,9 @@ import ( "github.com/tendermint/tendermint/crypto/secp256k1" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/keeper/distribute.go b/x/incentives/keeper/distribute.go index 83f5e771667..150f04a639b 100644 --- a/x/incentives/keeper/distribute.go +++ b/x/incentives/keeper/distribute.go @@ -6,8 +6,8 @@ import ( db "github.com/tendermint/tm-db" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/distribute_test.go b/x/incentives/keeper/distribute_test.go index d1ae8f87884..7459ceb5533 100644 --- a/x/incentives/keeper/distribute_test.go +++ b/x/incentives/keeper/distribute_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "time" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/export_test.go b/x/incentives/keeper/export_test.go index 05ff2ce32ef..a547a6f404c 100644 --- a/x/incentives/keeper/export_test.go +++ b/x/incentives/keeper/export_test.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" ) func (k Keeper) AddGaugeRefByKey(ctx sdk.Context, key []byte, guageID uint64) error { diff --git a/x/incentives/keeper/gauge.go b/x/incentives/keeper/gauge.go index dbf8e14dca0..1dccbba58af 100644 --- a/x/incentives/keeper/gauge.go +++ b/x/incentives/keeper/gauge.go @@ -9,9 +9,9 @@ import ( "github.com/gogo/protobuf/proto" db "github.com/tendermint/tm-db" - epochtypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + epochtypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/gauge_test.go b/x/incentives/keeper/gauge_test.go index 5d59a028f00..f5abed4d155 100644 --- a/x/incentives/keeper/gauge_test.go +++ b/x/incentives/keeper/gauge_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "time" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/grpc_query.go b/x/incentives/keeper/grpc_query.go index 28397d6a3a2..16926253ba3 100644 --- a/x/incentives/keeper/grpc_query.go +++ b/x/incentives/keeper/grpc_query.go @@ -12,8 +12,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/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 d4a7b13b3f6..0a27ba5fa69 100644 --- a/x/incentives/keeper/grpc_query_test.go +++ b/x/incentives/keeper/grpc_query_test.go @@ -7,9 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" query "github.com/cosmos/cosmos-sdk/types/query" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - pooltypes "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + pooltypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) func (suite *KeeperTestSuite) TestGRPCGaugeByID() { diff --git a/x/incentives/keeper/hooks.go b/x/incentives/keeper/hooks.go index ca3e23ed8b5..19d3c0c4559 100644 --- a/x/incentives/keeper/hooks.go +++ b/x/incentives/keeper/hooks.go @@ -1,9 +1,9 @@ package keeper import ( - epochstypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/iterator.go b/x/incentives/keeper/iterator.go index c29b3d0a205..dfa2af40341 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/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/keeper/keeper.go b/x/incentives/keeper/keeper.go index 02c8d18b429..69936dbef2e 100644 --- a/x/incentives/keeper/keeper.go +++ b/x/incentives/keeper/keeper.go @@ -6,7 +6,7 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/incentives/keeper/keeper_test.go b/x/incentives/keeper/keeper_test.go index 307eb454ba6..42fc9505b42 100644 --- a/x/incentives/keeper/keeper_test.go +++ b/x/incentives/keeper/keeper_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v9/app/apptesting" - "github.com/osmosis-labs/osmosis/v9/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/incentives/keeper" ) type KeeperTestSuite struct { diff --git a/x/incentives/keeper/msg_server.go b/x/incentives/keeper/msg_server.go index c33cc2cb23c..d79330cfbfb 100644 --- a/x/incentives/keeper/msg_server.go +++ b/x/incentives/keeper/msg_server.go @@ -3,8 +3,8 @@ package keeper import ( "context" - "github.com/osmosis-labs/osmosis/v9/x/gamm/utils" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/utils" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/incentives/keeper/params.go b/x/incentives/keeper/params.go index 328bbebadbf..ab464a9401a 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/v9/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/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 317b89905c9..e159b257b2e 100644 --- a/x/incentives/keeper/store.go +++ b/x/incentives/keeper/store.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/keeper/suite_test.go b/x/incentives/keeper/suite_test.go index a6eab0f5696..96c793b0d51 100644 --- a/x/incentives/keeper/suite_test.go +++ b/x/incentives/keeper/suite_test.go @@ -5,8 +5,8 @@ import ( "math/rand" "time" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/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 62f8d86f318..aa87ee2073e 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/v9/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/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 fd9faa8eb40..c16d968231a 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/v9/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/module.go b/x/incentives/module.go index c34913b6b32..189c763b573 100644 --- a/x/incentives/module.go +++ b/x/incentives/module.go @@ -19,11 +19,11 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v9/x/incentives/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/v9/x/incentives/simulation" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - "github.com/osmosis-labs/osmosis/v9/x/mint/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/incentives/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v10/x/incentives/simulation" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/client/rest" ) var ( diff --git a/x/incentives/simulation/genesis.go b/x/incentives/simulation/genesis.go index f0ac9106eda..069ca34ccdc 100644 --- a/x/incentives/simulation/genesis.go +++ b/x/incentives/simulation/genesis.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" ) // Simulation parameter constants. diff --git a/x/incentives/simulation/operations.go b/x/incentives/simulation/operations.go index c7cece3924d..ae50d573944 100644 --- a/x/incentives/simulation/operations.go +++ b/x/incentives/simulation/operations.go @@ -4,13 +4,13 @@ import ( "math/rand" "time" - osmo_simulation "github.com/osmosis-labs/osmosis/v9/x/simulation" + osmo_simulation "github.com/osmosis-labs/osmosis/v10/x/simulation" "github.com/cosmos/cosmos-sdk/baseapp" - "github.com/osmosis-labs/osmosis/v9/x/incentives/keeper" - "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/incentives/keeper" + "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/codec" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" diff --git a/x/incentives/types/expected_keepers.go b/x/incentives/types/expected_keepers.go index 5fb4b546f0b..088536d13e9 100644 --- a/x/incentives/types/expected_keepers.go +++ b/x/incentives/types/expected_keepers.go @@ -3,8 +3,8 @@ package types import ( time "time" - epochstypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/types/gauge.go b/x/incentives/types/gauge.go index 982e07d5502..642100e0289 100644 --- a/x/incentives/types/gauge.go +++ b/x/incentives/types/gauge.go @@ -3,7 +3,7 @@ package types import ( time "time" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/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 ed3562cd624..c1dd8de490f 100644 --- a/x/incentives/types/gauge.pb.go +++ b/x/incentives/types/gauge.pb.go @@ -10,7 +10,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - types "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + types "github.com/osmosis-labs/osmosis/v10/x/lockup/types" _ "google.golang.org/protobuf/types/known/durationpb" _ "google.golang.org/protobuf/types/known/timestamppb" io "io" diff --git a/x/incentives/types/msgs.go b/x/incentives/types/msgs.go index c6f6e37896b..b2a4aac99e8 100644 --- a/x/incentives/types/msgs.go +++ b/x/incentives/types/msgs.go @@ -4,7 +4,7 @@ import ( "errors" "time" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/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 4532575aa37..dfcd2cfe0a6 100644 --- a/x/incentives/types/msgs_test.go +++ b/x/incentives/types/msgs_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/crypto/ed25519" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/incentives/types/params.go b/x/incentives/types/params.go index 548528e781d..5ea0539e9be 100644 --- a/x/incentives/types/params.go +++ b/x/incentives/types/params.go @@ -1,7 +1,7 @@ package types import ( - epochtypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + epochtypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ) diff --git a/x/incentives/types/query.pb.go b/x/incentives/types/query.pb.go index 525eab96d60..d6811d573d0 100644 --- a/x/incentives/types/query.pb.go +++ b/x/incentives/types/query.pb.go @@ -13,7 +13,7 @@ import ( grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - _ "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + _ "github.com/osmosis-labs/osmosis/v10/x/lockup/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/x/incentives/types/tx.pb.go b/x/incentives/types/tx.pb.go index 6a13950f0c4..9485dce0536 100644 --- a/x/incentives/types/tx.pb.go +++ b/x/incentives/types/tx.pb.go @@ -12,7 +12,7 @@ import ( grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - types "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + types "github.com/osmosis-labs/osmosis/v10/x/lockup/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/x/lockup/abci.go b/x/lockup/abci.go index c7a3eb4f317..d70b6d0e6ed 100644 --- a/x/lockup/abci.go +++ b/x/lockup/abci.go @@ -3,7 +3,7 @@ package lockup import ( abci "github.com/tendermint/tendermint/abci/types" - "github.com/osmosis-labs/osmosis/v9/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/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 a2efaf180f2..06ef8156ece 100644 --- a/x/lockup/client/cli/cli_test.go +++ b/x/lockup/client/cli/cli_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/suite" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/osmoutils" - "github.com/osmosis-labs/osmosis/v9/x/lockup/client/cli" - lockuptestutil "github.com/osmosis-labs/osmosis/v9/x/lockup/client/testutil" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/lockup/client/cli" + lockuptestutil "github.com/osmosis-labs/osmosis/v10/x/lockup/client/testutil" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/hd" diff --git a/x/lockup/client/cli/query.go b/x/lockup/client/cli/query.go index 0c9ea578cd1..a4aef50ed3c 100644 --- a/x/lockup/client/cli/query.go +++ b/x/lockup/client/cli/query.go @@ -16,7 +16,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/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 693f9b152c5..691d3955b40 100644 --- a/x/lockup/client/cli/tx.go +++ b/x/lockup/client/cli/tx.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/lockup/client/rest/query.go b/x/lockup/client/rest/query.go index a8cb1300bd6..d67352e8f05 100644 --- a/x/lockup/client/rest/query.go +++ b/x/lockup/client/rest/query.go @@ -8,7 +8,7 @@ import ( "github.com/gorilla/mux" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/client/rest/tx.go b/x/lockup/client/rest/tx.go index fbefabd7013..d2b4327a8ef 100644 --- a/x/lockup/client/rest/tx.go +++ b/x/lockup/client/rest/tx.go @@ -6,7 +6,7 @@ import ( "github.com/gorilla/mux" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/tx" diff --git a/x/lockup/client/testutil/test_helpers.go b/x/lockup/client/testutil/test_helpers.go index 25abf484f99..80f573316f6 100644 --- a/x/lockup/client/testutil/test_helpers.go +++ b/x/lockup/client/testutil/test_helpers.go @@ -3,7 +3,7 @@ package testutil import ( "fmt" - lockupcli "github.com/osmosis-labs/osmosis/v9/x/lockup/client/cli" + lockupcli "github.com/osmosis-labs/osmosis/v10/x/lockup/client/cli" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/lockup/genesis.go b/x/lockup/genesis.go index 091da0aa60c..a2ac061c042 100644 --- a/x/lockup/genesis.go +++ b/x/lockup/genesis.go @@ -1,8 +1,8 @@ package lockup import ( - "github.com/osmosis-labs/osmosis/v9/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/genesis_test.go b/x/lockup/genesis_test.go index cc5111838f8..8370c5725f0 100644 --- a/x/lockup/genesis_test.go +++ b/x/lockup/genesis_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - osmoapp "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/lockup" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + osmoapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/lockup" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/handler.go b/x/lockup/handler.go index 059e9db7497..eb8a089ecd3 100644 --- a/x/lockup/handler.go +++ b/x/lockup/handler.go @@ -3,8 +3,8 @@ package lockup import ( "fmt" - "github.com/osmosis-labs/osmosis/v9/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/lockup/keeper/admin_keeper.go b/x/lockup/keeper/admin_keeper.go index 6d2b0b7256c..74f3e1e6730 100644 --- a/x/lockup/keeper/admin_keeper.go +++ b/x/lockup/keeper/admin_keeper.go @@ -3,7 +3,7 @@ package keeper import ( "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/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 b6dfc846587..c10826881e8 100644 --- a/x/lockup/keeper/admin_keeper_test.go +++ b/x/lockup/keeper/admin_keeper_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "time" - "github.com/osmosis-labs/osmosis/v9/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/bench_test.go b/x/lockup/keeper/bench_test.go index 823f15c0137..1391f846538 100644 --- a/x/lockup/keeper/bench_test.go +++ b/x/lockup/keeper/bench_test.go @@ -9,8 +9,8 @@ import ( "github.com/tendermint/tendermint/crypto/secp256k1" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/v9/app" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/app" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/export_test.go b/x/lockup/keeper/export_test.go index 33bb251fc4d..bbb648e6a19 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/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/grpc_query.go b/x/lockup/keeper/grpc_query.go index ff18873e7c8..a90508be3ad 100644 --- a/x/lockup/keeper/grpc_query.go +++ b/x/lockup/keeper/grpc_query.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/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 53c2fb7f413..a0aeb1ecf04 100644 --- a/x/lockup/keeper/grpc_query_test.go +++ b/x/lockup/keeper/grpc_query_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) func (suite *KeeperTestSuite) LockTokens(addr sdk.AccAddress, coins sdk.Coins, duration time.Duration) { diff --git a/x/lockup/keeper/invariants.go b/x/lockup/keeper/invariants.go index 39223569bcf..b573f0e086b 100644 --- a/x/lockup/keeper/invariants.go +++ b/x/lockup/keeper/invariants.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) // RegisterInvariants registers all governance invariants. diff --git a/x/lockup/keeper/iterator.go b/x/lockup/keeper/iterator.go index 9ef09805a6e..7e622b1ffc8 100644 --- a/x/lockup/keeper/iterator.go +++ b/x/lockup/keeper/iterator.go @@ -5,7 +5,7 @@ import ( db "github.com/tendermint/tm-db" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/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 19b3e0760a5..57785528c80 100644 --- a/x/lockup/keeper/keeper.go +++ b/x/lockup/keeper/keeper.go @@ -5,7 +5,7 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/keeper_test.go b/x/lockup/keeper/keeper_test.go index 1e49d50780a..1775e98d712 100644 --- a/x/lockup/keeper/keeper_test.go +++ b/x/lockup/keeper/keeper_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/app/apptesting" - "github.com/osmosis-labs/osmosis/v9/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" ) type KeeperTestSuite struct { diff --git a/x/lockup/keeper/lock.go b/x/lockup/keeper/lock.go index 343194e27f1..0bb30edf581 100644 --- a/x/lockup/keeper/lock.go +++ b/x/lockup/keeper/lock.go @@ -10,8 +10,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v9/store" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/store" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) // TODO: Reorganize functions in this file diff --git a/x/lockup/keeper/lock_refs.go b/x/lockup/keeper/lock_refs.go index 29942bb4509..f8012936a98 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/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/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 189325c425a..26bdc5bc397 100644 --- a/x/lockup/keeper/lock_test.go +++ b/x/lockup/keeper/lock_test.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/migration.go b/x/lockup/keeper/migration.go index 92528b7ae57..c07276475d8 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/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/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 ba6dbeda0ba..af329e9ae62 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/v9/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/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 a254e84800e..c52bbb43c42 100644 --- a/x/lockup/keeper/msg_server.go +++ b/x/lockup/keeper/msg_server.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/osmosis-labs/osmosis/v9/x/gamm/utils" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/utils" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/lockup/keeper/msg_server_test.go b/x/lockup/keeper/msg_server_test.go index 622ceae5b5e..7536a7b49b0 100644 --- a/x/lockup/keeper/msg_server_test.go +++ b/x/lockup/keeper/msg_server_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "time" - "github.com/osmosis-labs/osmosis/v9/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/store.go b/x/lockup/keeper/store.go index 8df8225e4fd..ea0dbcb0a62 100644 --- a/x/lockup/keeper/store.go +++ b/x/lockup/keeper/store.go @@ -7,7 +7,7 @@ import ( "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/lockup/keeper/synthetic_lock.go b/x/lockup/keeper/synthetic_lock.go index 379279f3890..401b47be3a8 100644 --- a/x/lockup/keeper/synthetic_lock.go +++ b/x/lockup/keeper/synthetic_lock.go @@ -6,7 +6,7 @@ import ( "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/keeper/synthetic_lock_test.go b/x/lockup/keeper/synthetic_lock_test.go index a9079f7265d..2f57927ad22 100644 --- a/x/lockup/keeper/synthetic_lock_test.go +++ b/x/lockup/keeper/synthetic_lock_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "time" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/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 9c69f0d826e..c152b70617f 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/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/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 1bf7783cb8c..1a1d9a4fc76 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/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/lockup/module.go b/x/lockup/module.go index 8c1569f22ad..6973889de8f 100644 --- a/x/lockup/module.go +++ b/x/lockup/module.go @@ -19,11 +19,11 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v9/x/lockup/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/lockup/client/rest" - "github.com/osmosis-labs/osmosis/v9/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/v9/x/lockup/simulation" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/lockup/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/x/lockup/simulation" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) var ( diff --git a/x/lockup/simulation/operations.go b/x/lockup/simulation/operations.go index 5d6b6ee883f..3a2c854e711 100644 --- a/x/lockup/simulation/operations.go +++ b/x/lockup/simulation/operations.go @@ -4,12 +4,12 @@ import ( "math/rand" "time" - osmo_simulation "github.com/osmosis-labs/osmosis/v9/x/simulation" + osmo_simulation "github.com/osmosis-labs/osmosis/v10/x/simulation" "github.com/cosmos/cosmos-sdk/baseapp" - "github.com/osmosis-labs/osmosis/v9/x/lockup/keeper" - "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + "github.com/osmosis-labs/osmosis/v10/x/lockup/types" "github.com/cosmos/cosmos-sdk/codec" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" diff --git a/x/mint/client/cli/cli_test.go b/x/mint/client/cli/cli_test.go index b9a6bf9945a..44b01915669 100644 --- a/x/mint/client/cli/cli_test.go +++ b/x/mint/client/cli/cli_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/suite" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/mint/client/cli" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/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 9015e7679fa..368faff7cc4 100644 --- a/x/mint/client/cli/query.go +++ b/x/mint/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/mint/client/rest/grpc_query_test.go b/x/mint/client/rest/grpc_query_test.go index 09a44c8cb3c..8b7034c7d9d 100644 --- a/x/mint/client/rest/grpc_query_test.go +++ b/x/mint/client/rest/grpc_query_test.go @@ -14,8 +14,8 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v9/app" - minttypes "github.com/osmosis-labs/osmosis/v9/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/app" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" "github.com/cosmos/cosmos-sdk/testutil/network" ) diff --git a/x/mint/client/rest/query.go b/x/mint/client/rest/query.go index 454b751041a..6d52375f8a4 100644 --- a/x/mint/client/rest/query.go +++ b/x/mint/client/rest/query.go @@ -6,7 +6,7 @@ import ( "github.com/gorilla/mux" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/types/rest" diff --git a/x/mint/genesis.go b/x/mint/genesis.go index 4f8ee3d09af..d0e991945d2 100644 --- a/x/mint/genesis.go +++ b/x/mint/genesis.go @@ -1,8 +1,8 @@ package mint import ( - "github.com/osmosis-labs/osmosis/v9/x/mint/keeper" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/keeper" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/mint/genesis_test.go b/x/mint/genesis_test.go index f71f1885c04..5066c6b572b 100644 --- a/x/mint/genesis_test.go +++ b/x/mint/genesis_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" + simapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/mint/keeper/grpc_query.go b/x/mint/keeper/grpc_query.go index 02976399e2e..00991239fa0 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/v9/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/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 9b6e4a72b01..3c8e9b25ee6 100644 --- a/x/mint/keeper/grpc_query_test.go +++ b/x/mint/keeper/grpc_query_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v9/app/apptesting" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" ) type MintTestSuite struct { diff --git a/x/mint/keeper/hooks.go b/x/mint/keeper/hooks.go index 95e808dda69..42b50e2202d 100644 --- a/x/mint/keeper/hooks.go +++ b/x/mint/keeper/hooks.go @@ -3,8 +3,8 @@ package keeper import ( "fmt" - epochstypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/mint/keeper/hooks_test.go b/x/mint/keeper/hooks_test.go index 47f9b4d7cc2..2f1fc3b631a 100644 --- a/x/mint/keeper/hooks_test.go +++ b/x/mint/keeper/hooks_test.go @@ -8,9 +8,9 @@ import ( abci "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - osmoapp "github.com/osmosis-labs/osmosis/v9/app" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" + osmoapp "github.com/osmosis-labs/osmosis/v10/app" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" "github.com/cosmos/cosmos-sdk/simapp" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/mint/keeper/integration_test.go b/x/mint/keeper/integration_test.go index 4c0a61e94a3..bd191dcdba5 100644 --- a/x/mint/keeper/integration_test.go +++ b/x/mint/keeper/integration_test.go @@ -3,8 +3,8 @@ package keeper_test import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" + simapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/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 d8d1ce6d3d2..b02f7c0212c 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -3,8 +3,8 @@ package keeper import ( "github.com/tendermint/tendermint/libs/log" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/mint/keeper/keeper_test.go b/x/mint/keeper/keeper_test.go index 6e21d60cc48..d79e6a4e647 100644 --- a/x/mint/keeper/keeper_test.go +++ b/x/mint/keeper/keeper_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/suite" abci "github.com/tendermint/tendermint/abci/types" - "github.com/osmosis-labs/osmosis/v9/app/apptesting" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" - poolincentivestypes "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" + poolincentivestypes "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) type KeeperTestSuite struct { diff --git a/x/mint/module.go b/x/mint/module.go index 55a06fef997..2fbd428c591 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -18,11 +18,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/v9/x/mint/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/mint/client/rest" - "github.com/osmosis-labs/osmosis/v9/x/mint/keeper" - "github.com/osmosis-labs/osmosis/v9/x/mint/simulation" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/mint/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/mint/keeper" + "github.com/osmosis-labs/osmosis/v10/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" ) var ( diff --git a/x/mint/module_test.go b/x/mint/module_test.go index b0c901b71de..0cfafc3034d 100644 --- a/x/mint/module_test.go +++ b/x/mint/module_test.go @@ -7,8 +7,8 @@ import ( abcitypes "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" + simapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) diff --git a/x/mint/simulation/decoder.go b/x/mint/simulation/decoder.go index 4f7c628a195..81a136f4ccd 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/v9/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/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 7424f2ff912..e10979f35ba 100644 --- a/x/mint/simulation/decoder_test.go +++ b/x/mint/simulation/decoder_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - simapp "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/mint/simulation" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" + simapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go index d07532ac37d..6dcd1ee89c7 100644 --- a/x/mint/simulation/genesis.go +++ b/x/mint/simulation/genesis.go @@ -6,7 +6,7 @@ import ( "encoding/json" "fmt" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/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 d49b6982870..544003aabc3 100644 --- a/x/mint/simulation/genesis_test.go +++ b/x/mint/simulation/genesis_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v9/x/mint/simulation" - "github.com/osmosis-labs/osmosis/v9/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v10/x/mint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/mint/simulation/params_test.go b/x/mint/simulation/params_test.go index 86a146687ac..590dfa6638e 100644 --- a/x/mint/simulation/params_test.go +++ b/x/mint/simulation/params_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v9/x/mint/simulation" + "github.com/osmosis-labs/osmosis/v10/x/mint/simulation" ) func TestParamChanges(t *testing.T) { diff --git a/x/mint/types/expected_keepers.go b/x/mint/types/expected_keepers.go index 1877b01f2ee..c2eb08ffb6e 100644 --- a/x/mint/types/expected_keepers.go +++ b/x/mint/types/expected_keepers.go @@ -1,7 +1,7 @@ package types // noalias import ( - epochstypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/x/mint/types/params.go b/x/mint/types/params.go index eae22b653e1..3a03aed3641 100644 --- a/x/mint/types/params.go +++ b/x/mint/types/params.go @@ -7,7 +7,7 @@ import ( yaml "gopkg.in/yaml.v2" - epochtypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + epochtypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/pool-incentives/client/cli/cli_test.go b/x/pool-incentives/client/cli/cli_test.go index 8c1f300eb4b..4de704adcf2 100644 --- a/x/pool-incentives/client/cli/cli_test.go +++ b/x/pool-incentives/client/cli/cli_test.go @@ -4,9 +4,9 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" diff --git a/x/pool-incentives/client/cli/query.go b/x/pool-incentives/client/cli/query.go index 479878835ef..e4418f13e89 100644 --- a/x/pool-incentives/client/cli/query.go +++ b/x/pool-incentives/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/pool-incentives/client/cli/tx.go b/x/pool-incentives/client/cli/tx.go index d1b2e5cc634..f3ea1a7f3d2 100644 --- a/x/pool-incentives/client/cli/tx.go +++ b/x/pool-incentives/client/cli/tx.go @@ -12,8 +12,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/client/cli" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/v9/osmoutils" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) func NewTxCmd() *cobra.Command { diff --git a/x/pool-incentives/client/proposal_handler.go b/x/pool-incentives/client/proposal_handler.go index f6a9c12f7ee..6f90c30e2d9 100644 --- a/x/pool-incentives/client/proposal_handler.go +++ b/x/pool-incentives/client/proposal_handler.go @@ -1,8 +1,8 @@ package client import ( - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/client/rest" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" ) diff --git a/x/pool-incentives/client/rest/tx.go b/x/pool-incentives/client/rest/tx.go index f6119ff98bf..8dc1b95d3d4 100644 --- a/x/pool-incentives/client/rest/tx.go +++ b/x/pool-incentives/client/rest/tx.go @@ -10,7 +10,7 @@ import ( govrest "github.com/cosmos/cosmos-sdk/x/gov/client/rest" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) type UpdatePoolIncentivesRequest struct { diff --git a/x/pool-incentives/genesis.go b/x/pool-incentives/genesis.go index 89449355b5c..8b733ae0da8 100644 --- a/x/pool-incentives/genesis.go +++ b/x/pool-incentives/genesis.go @@ -3,8 +3,8 @@ package pool_incentives import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/keeper" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/keeper" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState *types.GenesisState) { diff --git a/x/pool-incentives/genesis_test.go b/x/pool-incentives/genesis_test.go index 885aef4cbb4..40330b6e0f7 100644 --- a/x/pool-incentives/genesis_test.go +++ b/x/pool-incentives/genesis_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/v9/app" - pool_incentives "github.com/osmosis-labs/osmosis/v9/x/pool-incentives" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + simapp "github.com/osmosis-labs/osmosis/v10/app" + pool_incentives "github.com/osmosis-labs/osmosis/v10/x/pool-incentives" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/pool-incentives/handler.go b/x/pool-incentives/handler.go index 4e201186ac3..9b12bf7efcd 100644 --- a/x/pool-incentives/handler.go +++ b/x/pool-incentives/handler.go @@ -5,8 +5,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/keeper" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/keeper" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) func NewPoolIncentivesProposalHandler(k keeper.Keeper) govtypes.Handler { diff --git a/x/pool-incentives/keeper/distr.go b/x/pool-incentives/keeper/distr.go index e3b3fc53e56..df92523eab1 100644 --- a/x/pool-incentives/keeper/distr.go +++ b/x/pool-incentives/keeper/distr.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/pool-incentives/keeper/distr_test.go b/x/pool-incentives/keeper/distr_test.go index 09fe624e9d3..f3f3b56cf8f 100644 --- a/x/pool-incentives/keeper/distr_test.go +++ b/x/pool-incentives/keeper/distr_test.go @@ -3,8 +3,8 @@ package keeper_test import ( abci "github.com/tendermint/tendermint/abci/types" - minttypes "github.com/osmosis-labs/osmosis/v9/x/mint/types" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/x/pool-incentives/keeper/gov.go b/x/pool-incentives/keeper/gov.go index 3ef896e6715..a3bdb911212 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/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/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 79fb450244f..ff4b6c94023 100644 --- a/x/pool-incentives/keeper/grpc_query.go +++ b/x/pool-incentives/keeper/grpc_query.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - incentivetypes "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + incentivetypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/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 c6dfa3dbee1..db0b0a3cbac 100644 --- a/x/pool-incentives/keeper/grpc_query_test.go +++ b/x/pool-incentives/keeper/grpc_query_test.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) var ( diff --git a/x/pool-incentives/keeper/hooks.go b/x/pool-incentives/keeper/hooks.go index bf2e0547b5f..a2a858d217c 100644 --- a/x/pool-incentives/keeper/hooks.go +++ b/x/pool-incentives/keeper/hooks.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" ) type Hooks struct { diff --git a/x/pool-incentives/keeper/keeper.go b/x/pool-incentives/keeper/keeper.go index 4ecedc2f27f..9643e820750 100644 --- a/x/pool-incentives/keeper/keeper.go +++ b/x/pool-incentives/keeper/keeper.go @@ -6,10 +6,10 @@ import ( "github.com/tendermint/tendermint/libs/log" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/pool-incentives/keeper/keeper_test.go b/x/pool-incentives/keeper/keeper_test.go index 2e7f046bef1..6804e6dc5e3 100644 --- a/x/pool-incentives/keeper/keeper_test.go +++ b/x/pool-incentives/keeper/keeper_test.go @@ -5,9 +5,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v9/app/apptesting" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) type KeeperTestSuite struct { diff --git a/x/pool-incentives/keeper/params.go b/x/pool-incentives/keeper/params.go index 67b35543088..6cab081375f 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/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/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 1c254ece368..25a4bbfbb91 100644 --- a/x/pool-incentives/module.go +++ b/x/pool-incentives/module.go @@ -19,9 +19,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/gov/simulation" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/keeper" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/keeper" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) var ( diff --git a/x/pool-incentives/types/expected_keepers.go b/x/pool-incentives/types/expected_keepers.go index c5d013404b8..4779461a719 100644 --- a/x/pool-incentives/types/expected_keepers.go +++ b/x/pool-incentives/types/expected_keepers.go @@ -7,10 +7,10 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - types "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + types "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) type AccountKeeper interface { diff --git a/x/pool-incentives/types/genesis_test.go b/x/pool-incentives/types/genesis_test.go index 409fae8b6da..70570843c16 100644 --- a/x/pool-incentives/types/genesis_test.go +++ b/x/pool-incentives/types/genesis_test.go @@ -7,7 +7,7 @@ import ( proto "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/pool-incentives/types/gov_test.go b/x/pool-incentives/types/gov_test.go index cf7559c454f..2f9e5c95f70 100644 --- a/x/pool-incentives/types/gov_test.go +++ b/x/pool-incentives/types/gov_test.go @@ -6,7 +6,7 @@ import ( proto "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/pool-incentives/types/incentives_test.go b/x/pool-incentives/types/incentives_test.go index a96a7a8eb3a..8f9361d0971 100644 --- a/x/pool-incentives/types/incentives_test.go +++ b/x/pool-incentives/types/incentives_test.go @@ -7,7 +7,7 @@ import ( proto "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/pool-incentives/types/query.pb.go b/x/pool-incentives/types/query.pb.go index abbf8fc8b62..4d84e2d2239 100644 --- a/x/pool-incentives/types/query.pb.go +++ b/x/pool-incentives/types/query.pb.go @@ -10,7 +10,7 @@ import ( grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - types "github.com/osmosis-labs/osmosis/v9/x/incentives/types" + types "github.com/osmosis-labs/osmosis/v10/x/incentives/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/x/pool-incentives/types/query_test.go b/x/pool-incentives/types/query_test.go index 5a55b726fe6..daab9ee5135 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/gogo/protobuf/proto" "github.com/stretchr/testify/require" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/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 f02567bccba..bc1af2c5615 100644 --- a/x/pool-incentives/types/record_test.go +++ b/x/pool-incentives/types/record_test.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/pool-incentives/types" + "github.com/osmosis-labs/osmosis/v10/x/pool-incentives/types" ) func TestDistrRecord(t *testing.T) { diff --git a/x/superfluid/abci.go b/x/superfluid/abci.go index ba291c0422c..c58f7857d9d 100644 --- a/x/superfluid/abci.go +++ b/x/superfluid/abci.go @@ -3,8 +3,8 @@ package superfluid import ( abci "github.com/tendermint/tendermint/abci/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/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 7902d8be70b..243134d801c 100644 --- a/x/superfluid/client/cli/query.go +++ b/x/superfluid/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/superfluid/client/cli/tx.go b/x/superfluid/client/cli/tx.go index 4d9814480d1..2169cae1dcb 100644 --- a/x/superfluid/client/cli/tx.go +++ b/x/superfluid/client/cli/tx.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/superfluid/client/proposal_handler.go b/x/superfluid/client/proposal_handler.go index c48245e5380..4100f550391 100644 --- a/x/superfluid/client/proposal_handler.go +++ b/x/superfluid/client/proposal_handler.go @@ -1,8 +1,8 @@ package client import ( - "github.com/osmosis-labs/osmosis/v9/x/superfluid/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/client/rest" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" ) diff --git a/x/superfluid/genesis.go b/x/superfluid/genesis.go index c457ffa5735..550961aafb3 100644 --- a/x/superfluid/genesis.go +++ b/x/superfluid/genesis.go @@ -1,8 +1,8 @@ package superfluid import ( - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/genesis_test.go b/x/superfluid/genesis_test.go index ada3beb0193..71058137eb0 100644 --- a/x/superfluid/genesis_test.go +++ b/x/superfluid/genesis_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/superfluid" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + simapp "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/superfluid" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/handler.go b/x/superfluid/handler.go index bc5903cd10b..faaeeafacd0 100644 --- a/x/superfluid/handler.go +++ b/x/superfluid/handler.go @@ -3,8 +3,8 @@ package superfluid import ( "fmt" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/superfluid/keeper/distribution_test.go b/x/superfluid/keeper/distribution_test.go index 2ea54d024f6..d17c954c0bc 100644 --- a/x/superfluid/keeper/distribution_test.go +++ b/x/superfluid/keeper/distribution_test.go @@ -1,8 +1,8 @@ package keeper_test import ( - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/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/edge_case_test.go b/x/superfluid/keeper/edge_case_test.go index 99588014910..567f48447c0 100644 --- a/x/superfluid/keeper/edge_case_test.go +++ b/x/superfluid/keeper/edge_case_test.go @@ -7,7 +7,7 @@ import ( evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) func (suite *KeeperTestSuite) TestSuperfluidDelegatedValidatorJailed() { diff --git a/x/superfluid/keeper/epoch.go b/x/superfluid/keeper/epoch.go index 9b632587bd0..48829d070f1 100644 --- a/x/superfluid/keeper/epoch.go +++ b/x/superfluid/keeper/epoch.go @@ -5,11 +5,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/osmoutils" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func (k Keeper) AfterEpochEnd(ctx sdk.Context, epochIdentifier string, _ int64) { diff --git a/x/superfluid/keeper/gov/gov.go b/x/superfluid/keeper/gov/gov.go index e2471d36ffd..1799e6197f2 100644 --- a/x/superfluid/keeper/gov/gov.go +++ b/x/superfluid/keeper/gov/gov.go @@ -3,8 +3,8 @@ package gov import ( "fmt" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/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 941066ef1d3..38022941ea1 100644 --- a/x/superfluid/keeper/gov/gov_test.go +++ b/x/superfluid/keeper/gov/gov_test.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - minttypes "github.com/osmosis-labs/osmosis/v9/x/mint/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper/gov" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper/gov" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func (suite *KeeperTestSuite) createGammPool(denoms []string) uint64 { diff --git a/x/superfluid/keeper/gov/suite_test.go b/x/superfluid/keeper/gov/suite_test.go index f536f8f3ef0..efd571759f2 100644 --- a/x/superfluid/keeper/gov/suite_test.go +++ b/x/superfluid/keeper/gov/suite_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/app" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/app" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" ) type KeeperTestSuite struct { diff --git a/x/superfluid/keeper/grpc_query.go b/x/superfluid/keeper/grpc_query.go index b1983f08368..f7e8768ee81 100644 --- a/x/superfluid/keeper/grpc_query.go +++ b/x/superfluid/keeper/grpc_query.go @@ -11,9 +11,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - appparams "github.com/osmosis-labs/osmosis/v9/app/params" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/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 91e3c064dd1..564cba47df0 100644 --- a/x/superfluid/keeper/grpc_query_test.go +++ b/x/superfluid/keeper/grpc_query_test.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func (suite *KeeperTestSuite) TestGRPCParams() { diff --git a/x/superfluid/keeper/hooks.go b/x/superfluid/keeper/hooks.go index 77b76f799ae..7310854aab0 100644 --- a/x/superfluid/keeper/hooks.go +++ b/x/superfluid/keeper/hooks.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - epochstypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/intermediary_account.go b/x/superfluid/keeper/intermediary_account.go index 42d8490c21c..61ceabcb06b 100644 --- a/x/superfluid/keeper/intermediary_account.go +++ b/x/superfluid/keeper/intermediary_account.go @@ -3,8 +3,8 @@ package keeper import ( "github.com/gogo/protobuf/proto" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/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 be4bc5ff912..f55908cef6a 100644 --- a/x/superfluid/keeper/intermediary_account_test.go +++ b/x/superfluid/keeper/intermediary_account_test.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func (suite *KeeperTestSuite) TestIntermediaryAccountCreation() { diff --git a/x/superfluid/keeper/invariants.go b/x/superfluid/keeper/invariants.go index 4aa966a88e4..c4ffa289729 100644 --- a/x/superfluid/keeper/invariants.go +++ b/x/superfluid/keeper/invariants.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/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 e1bc10185e5..a54027fd148 100644 --- a/x/superfluid/keeper/keeper.go +++ b/x/superfluid/keeper/keeper.go @@ -5,7 +5,7 @@ import ( "github.com/tendermint/tendermint/libs/log" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/superfluid/keeper/keeper_test.go b/x/superfluid/keeper/keeper_test.go index d32490b2743..eb60bbbabe4 100644 --- a/x/superfluid/keeper/keeper_test.go +++ b/x/superfluid/keeper/keeper_test.go @@ -10,13 +10,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v9/app/apptesting" - epochtypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - minttypes "github.com/osmosis-labs/osmosis/v9/x/mint/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + epochtypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) type KeeperTestSuite struct { diff --git a/x/superfluid/keeper/msg_server.go b/x/superfluid/keeper/msg_server.go index 6ecaf9135b8..b1ee5eac84b 100644 --- a/x/superfluid/keeper/msg_server.go +++ b/x/superfluid/keeper/msg_server.go @@ -9,11 +9,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - v8constants "github.com/osmosis-labs/osmosis/v9/app/upgrades/v8/constants" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + v8constants "github.com/osmosis-labs/osmosis/v10/app/upgrades/v8/constants" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/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 3ebd48be5b8..bdfbfa4ba92 100644 --- a/x/superfluid/keeper/msg_server_test.go +++ b/x/superfluid/keeper/msg_server_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - lockupkeeper "github.com/osmosis-labs/osmosis/v9/x/lockup/keeper" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + lockupkeeper "github.com/osmosis-labs/osmosis/v10/x/lockup/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func (suite *KeeperTestSuite) TestMsgSuperfluidDelegate() { diff --git a/x/superfluid/keeper/params.go b/x/superfluid/keeper/params.go index 06608efab70..f53ef272d4c 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/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/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 329356a77e7..a8490348a0c 100644 --- a/x/superfluid/keeper/slash.go +++ b/x/superfluid/keeper/slash.go @@ -3,8 +3,8 @@ package keeper import ( "time" - "github.com/osmosis-labs/osmosis/v9/osmoutils" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + lockuptypes "github.com/osmosis-labs/osmosis/v10/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 7f6df109876..e6d266f97e2 100644 --- a/x/superfluid/keeper/slash_test.go +++ b/x/superfluid/keeper/slash_test.go @@ -1,8 +1,8 @@ package keeper_test import ( - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/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 13c68990bab..eb571227810 100644 --- a/x/superfluid/keeper/stake.go +++ b/x/superfluid/keeper/stake.go @@ -3,9 +3,9 @@ package keeper import ( "fmt" - "github.com/osmosis-labs/osmosis/v9/osmoutils" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/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 3cbbbb0b224..d8456710991 100644 --- a/x/superfluid/keeper/stake_test.go +++ b/x/superfluid/keeper/stake_test.go @@ -6,10 +6,10 @@ import ( abci "github.com/tendermint/tendermint/abci/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - minttypes "github.com/osmosis-labs/osmosis/v9/x/mint/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + minttypes "github.com/osmosis-labs/osmosis/v10/x/mint/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" diff --git a/x/superfluid/keeper/superfluid_asset.go b/x/superfluid/keeper/superfluid_asset.go index ee53d9734c9..de2b6afce86 100644 --- a/x/superfluid/keeper/superfluid_asset.go +++ b/x/superfluid/keeper/superfluid_asset.go @@ -1,8 +1,8 @@ package keeper import ( - "github.com/osmosis-labs/osmosis/v9/osmoutils" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + "github.com/osmosis-labs/osmosis/v10/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 c14fb98501a..660649dc42f 100644 --- a/x/superfluid/keeper/superfluid_asset_store.go +++ b/x/superfluid/keeper/superfluid_asset_store.go @@ -5,7 +5,7 @@ package keeper import ( "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/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 b7cf4c091d3..2abd131f1bc 100644 --- a/x/superfluid/keeper/superfluid_asset_test.go +++ b/x/superfluid/keeper/superfluid_asset_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/superfluid/keeper/synthetic_lock_wrapper.go b/x/superfluid/keeper/synthetic_lock_wrapper.go index 9fb37f2917d..b67dce964fd 100644 --- a/x/superfluid/keeper/synthetic_lock_wrapper.go +++ b/x/superfluid/keeper/synthetic_lock_wrapper.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/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 10e4711fac8..940a81ad5cd 100644 --- a/x/superfluid/keeper/twap_price.go +++ b/x/superfluid/keeper/twap_price.go @@ -3,8 +3,8 @@ package keeper import ( "github.com/gogo/protobuf/proto" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/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 cbba98701cb..6111341b3dd 100644 --- a/x/superfluid/keeper/twap_price_test.go +++ b/x/superfluid/keeper/twap_price_test.go @@ -1,8 +1,8 @@ package keeper_test import ( - epochstypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + "github.com/osmosis-labs/osmosis/v10/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 923573ab6e6..68a5cdb2522 100644 --- a/x/superfluid/keeper/unpool.go +++ b/x/superfluid/keeper/unpool.go @@ -5,10 +5,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/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 2e2826752c2..3bac1e7e4a6 100644 --- a/x/superfluid/keeper/unpool_test.go +++ b/x/superfluid/keeper/unpool_test.go @@ -8,10 +8,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/gamm/pool-models/balancer" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) var ( diff --git a/x/superfluid/module.go b/x/superfluid/module.go index 379d524524b..4bd7c408941 100644 --- a/x/superfluid/module.go +++ b/x/superfluid/module.go @@ -19,11 +19,11 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/osmosis-labs/osmosis/v9/x/mint/client/rest" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/simulation" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/mint/client/rest" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/simulation" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) var ( diff --git a/x/superfluid/proposal_handler.go b/x/superfluid/proposal_handler.go index d11fc4a27be..1aa75470e3d 100644 --- a/x/superfluid/proposal_handler.go +++ b/x/superfluid/proposal_handler.go @@ -5,9 +5,9 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper/gov" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper/gov" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) func NewSuperfluidProposalHandler(k keeper.Keeper, ek types.EpochKeeper) govtypes.Handler { diff --git a/x/superfluid/simulation/genesis.go b/x/superfluid/simulation/genesis.go index 2bcbf96eb1c..c0ae52e0c6c 100644 --- a/x/superfluid/simulation/genesis.go +++ b/x/superfluid/simulation/genesis.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/x/superfluid/simulation/operations.go b/x/superfluid/simulation/operations.go index 997f41ccc2e..17b55c9749b 100644 --- a/x/superfluid/simulation/operations.go +++ b/x/superfluid/simulation/operations.go @@ -3,13 +3,13 @@ package simulation import ( "math/rand" - osmo_simulation "github.com/osmosis-labs/osmosis/v9/x/simulation" + osmo_simulation "github.com/osmosis-labs/osmosis/v10/x/simulation" "github.com/cosmos/cosmos-sdk/baseapp" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" "github.com/cosmos/cosmos-sdk/codec" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" diff --git a/x/superfluid/simulation/proposals.go b/x/superfluid/simulation/proposals.go index b5c0479669c..fc11740a3dd 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/v9/x/gamm/types" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/keeper" - "github.com/osmosis-labs/osmosis/v9/x/superfluid/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/keeper" + "github.com/osmosis-labs/osmosis/v10/x/superfluid/types" ) const ( diff --git a/x/superfluid/types/expected_keepers.go b/x/superfluid/types/expected_keepers.go index 2f4bd4fe2e9..5f919d5a295 100644 --- a/x/superfluid/types/expected_keepers.go +++ b/x/superfluid/types/expected_keepers.go @@ -7,10 +7,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - epochstypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - incentivestypes "github.com/osmosis-labs/osmosis/v9/x/incentives/types" - lockuptypes "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + incentivestypes "github.com/osmosis-labs/osmosis/v10/x/incentives/types" + lockuptypes "github.com/osmosis-labs/osmosis/v10/x/lockup/types" ) // LockupKeeper defines the expected interface needed to retrieve locks. diff --git a/x/superfluid/types/gov.go b/x/superfluid/types/gov.go index 7732827138c..3f7ae19b68e 100644 --- a/x/superfluid/types/gov.go +++ b/x/superfluid/types/gov.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ) diff --git a/x/superfluid/types/query.pb.go b/x/superfluid/types/query.pb.go index 352c2cfce30..ca71feac4e6 100644 --- a/x/superfluid/types/query.pb.go +++ b/x/superfluid/types/query.pb.go @@ -12,7 +12,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" - types1 "github.com/osmosis-labs/osmosis/v9/x/lockup/types" + types1 "github.com/osmosis-labs/osmosis/v10/x/lockup/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go index f245eff2de4..470b0bf5d3b 100644 --- a/x/tokenfactory/client/cli/query.go +++ b/x/tokenfactory/client/cli/query.go @@ -13,7 +13,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go index 80c8f37bf5a..c649af4bbbb 100644 --- a/x/tokenfactory/client/cli/tx.go +++ b/x/tokenfactory/client/cli/tx.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" // "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/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 6da90f859e8..48ec2814a06 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/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/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 dc36560727d..d6060db5110 100644 --- a/x/tokenfactory/keeper/admins_test.go +++ b/x/tokenfactory/keeper/admins_test.go @@ -3,8 +3,8 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/keeper" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/keeper" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestAdminMsgs() { diff --git a/x/tokenfactory/keeper/bankactions.go b/x/tokenfactory/keeper/bankactions.go index ddb9d350e9c..c005defee0f 100644 --- a/x/tokenfactory/keeper/bankactions.go +++ b/x/tokenfactory/keeper/bankactions.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func (k Keeper) mintTo(ctx sdk.Context, amount sdk.Coin, mintTo string) error { diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index 426b6e02aa0..427ad21eb9b 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/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/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 659b9bc52a2..bc5c21bbce3 100644 --- a/x/tokenfactory/keeper/createdenom_test.go +++ b/x/tokenfactory/keeper/createdenom_test.go @@ -3,8 +3,8 @@ package keeper_test import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/keeper" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/keeper" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestMsgCreateDenom() { diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go index 7c2fe0435be..b3f2b263f64 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/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/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 e6dafd85e27..7900fe76adc 100644 --- a/x/tokenfactory/keeper/genesis_test.go +++ b/x/tokenfactory/keeper/genesis_test.go @@ -6,10 +6,10 @@ import ( "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/v9/app" - appparams "github.com/osmosis-labs/osmosis/v9/app/params" + simapp "github.com/osmosis-labs/osmosis/v10/app" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func TestGenesis(t *testing.T) { diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go index eeedc2eba42..f2efef6465f 100644 --- a/x/tokenfactory/keeper/grpc_query.go +++ b/x/tokenfactory/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index 93e13d2e973..f5eb0d9f38e 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/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 4f3a1d985ce..d71951c75bc 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/osmosis-labs/osmosis/v9/app/apptesting" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) type KeeperTestSuite struct { diff --git a/x/tokenfactory/keeper/msg_server.go b/x/tokenfactory/keeper/msg_server.go index fe0f2cf9df3..9403654f828 100644 --- a/x/tokenfactory/keeper/msg_server.go +++ b/x/tokenfactory/keeper/msg_server.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) type msgServer struct { diff --git a/x/tokenfactory/keeper/params.go b/x/tokenfactory/keeper/params.go index 4ac57c2f89d..472d6cf91c2 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/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go index edabd23e0b4..2719bd41602 100644 --- a/x/tokenfactory/module.go +++ b/x/tokenfactory/module.go @@ -19,9 +19,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/keeper" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/keeper" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) var ( diff --git a/x/tokenfactory/types/denoms_test.go b/x/tokenfactory/types/denoms_test.go index 67e6ecbfb50..cf7c817d371 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/v9/app/params" - "github.com/osmosis-labs/osmosis/v9/x/tokenfactory/types" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func TestDecomposeDenoms(t *testing.T) { diff --git a/x/tokenfactory/types/genesis_test.go b/x/tokenfactory/types/genesis_test.go index aa877508789..e14dd592763 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/v9/x/tokenfactory/types" + "github.com/osmosis-labs/osmosis/v10/x/tokenfactory/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/tokenfactory/types/params.go b/x/tokenfactory/types/params.go index 83b391ae780..9c42c5fd823 100644 --- a/x/tokenfactory/types/params.go +++ b/x/tokenfactory/types/params.go @@ -3,7 +3,7 @@ package types import ( "fmt" - appparams "github.com/osmosis-labs/osmosis/v9/app/params" + appparams "github.com/osmosis-labs/osmosis/v10/app/params" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/txfees/client/cli/query.go b/x/txfees/client/cli/query.go index 482f60d2340..c6b61e119a9 100644 --- a/x/txfees/client/cli/query.go +++ b/x/txfees/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/txfees/client/cli/tx.go b/x/txfees/client/cli/tx.go index 1d97e9e3d8b..641ae9d98ae 100644 --- a/x/txfees/client/cli/tx.go +++ b/x/txfees/client/cli/tx.go @@ -13,7 +13,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/gov/client/cli" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) func NewTxCmd() *cobra.Command { diff --git a/x/txfees/genesis.go b/x/txfees/genesis.go index 2e4f8766616..1fd52ccee10 100644 --- a/x/txfees/genesis.go +++ b/x/txfees/genesis.go @@ -1,8 +1,8 @@ package txfees import ( - "github.com/osmosis-labs/osmosis/v9/x/txfees/keeper" - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/txfees/handler.go b/x/txfees/handler.go index 101842a661e..4ea5e538877 100644 --- a/x/txfees/handler.go +++ b/x/txfees/handler.go @@ -5,8 +5,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/osmosis-labs/osmosis/v9/x/txfees/keeper" - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) func NewUpdateFeeTokenProposalHandler(k keeper.Keeper) govtypes.Handler { diff --git a/x/txfees/keeper/feedecorator.go b/x/txfees/keeper/feedecorator.go index 605ef45b05a..e63a23cd8e7 100644 --- a/x/txfees/keeper/feedecorator.go +++ b/x/txfees/keeper/feedecorator.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/osmosis-labs/osmosis/v9/x/txfees/keeper/txfee_filters" - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper/txfee_filters" + "github.com/osmosis-labs/osmosis/v10/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 328f62bf52a..5e009b8f414 100644 --- a/x/txfees/keeper/feedecorator_test.go +++ b/x/txfees/keeper/feedecorator_test.go @@ -9,8 +9,8 @@ import ( authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" - "github.com/osmosis-labs/osmosis/v9/x/txfees/keeper" - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) func (suite *KeeperTestSuite) TestFeeDecorator() { diff --git a/x/txfees/keeper/feetokens.go b/x/txfees/keeper/feetokens.go index 2f77579d31f..9e199321464 100644 --- a/x/txfees/keeper/feetokens.go +++ b/x/txfees/keeper/feetokens.go @@ -3,7 +3,7 @@ package keeper import ( "github.com/gogo/protobuf/proto" - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/txfees/keeper/feetokens_test.go b/x/txfees/keeper/feetokens_test.go index 2546c434ff6..dd9cbcd28b8 100644 --- a/x/txfees/keeper/feetokens_test.go +++ b/x/txfees/keeper/feetokens_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/txfees/keeper/gov.go b/x/txfees/keeper/gov.go index 0704e7b32d5..38dcd27cc07 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/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/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 372d35c12b1..9a6626591c3 100644 --- a/x/txfees/keeper/grpc_query.go +++ b/x/txfees/keeper/grpc_query.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) var _ types.QueryServer = Querier{} diff --git a/x/txfees/keeper/hooks.go b/x/txfees/keeper/hooks.go index 0db2c8ed1c5..33721062fc9 100644 --- a/x/txfees/keeper/hooks.go +++ b/x/txfees/keeper/hooks.go @@ -3,9 +3,9 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/osmoutils" - epochstypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" - txfeestypes "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/osmoutils" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" + txfeestypes "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) func (k Keeper) BeforeEpochStart(ctx sdk.Context, epochIdentifier string, epochNumber int64) {} diff --git a/x/txfees/keeper/hooks_test.go b/x/txfees/keeper/hooks_test.go index e9a6e99b80f..c762b61c8b6 100644 --- a/x/txfees/keeper/hooks_test.go +++ b/x/txfees/keeper/hooks_test.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) var defaultPooledAssetAmount = int64(500) diff --git a/x/txfees/keeper/keeper.go b/x/txfees/keeper/keeper.go index 99dbf3c5f7f..54a14d51897 100644 --- a/x/txfees/keeper/keeper.go +++ b/x/txfees/keeper/keeper.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) type Keeper struct { diff --git a/x/txfees/keeper/keeper_test.go b/x/txfees/keeper/keeper_test.go index f080ed49d47..72acced6e3f 100644 --- a/x/txfees/keeper/keeper_test.go +++ b/x/txfees/keeper/keeper_test.go @@ -8,10 +8,10 @@ import ( "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" - osmosisapp "github.com/osmosis-labs/osmosis/v9/app" + osmosisapp "github.com/osmosis-labs/osmosis/v10/app" - "github.com/osmosis-labs/osmosis/v9/app/apptesting" - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/app/apptesting" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) type KeeperTestSuite struct { diff --git a/x/txfees/keeper/txfee_filters/arb_tx.go b/x/txfees/keeper/txfee_filters/arb_tx.go index bf871d12a93..800bfb62e62 100644 --- a/x/txfees/keeper/txfee_filters/arb_tx.go +++ b/x/txfees/keeper/txfee_filters/arb_tx.go @@ -1,7 +1,7 @@ package txfee_filters import ( - gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types" + gammtypes "github.com/osmosis-labs/osmosis/v10/x/gamm/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/txfees/module.go b/x/txfees/module.go index 33d70a89f7f..213e08535b6 100644 --- a/x/txfees/module.go +++ b/x/txfees/module.go @@ -18,9 +18,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/osmosis-labs/osmosis/v9/x/txfees/client/cli" - "github.com/osmosis-labs/osmosis/v9/x/txfees/keeper" - "github.com/osmosis-labs/osmosis/v9/x/txfees/types" + "github.com/osmosis-labs/osmosis/v10/x/txfees/client/cli" + "github.com/osmosis-labs/osmosis/v10/x/txfees/keeper" + "github.com/osmosis-labs/osmosis/v10/x/txfees/types" ) var ( diff --git a/x/txfees/module_test.go b/x/txfees/module_test.go index 3931f45f8e4..e1e2a880060 100644 --- a/x/txfees/module_test.go +++ b/x/txfees/module_test.go @@ -7,7 +7,7 @@ import ( abcitypes "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - simapp "github.com/osmosis-labs/osmosis/v9/app" + simapp "github.com/osmosis-labs/osmosis/v10/app" ) func TestSetBaseDenomOnInitBlock(t *testing.T) { diff --git a/x/txfees/types/expected_keepers.go b/x/txfees/types/expected_keepers.go index 261459848d8..9e2ae585cd8 100644 --- a/x/txfees/types/expected_keepers.go +++ b/x/txfees/types/expected_keepers.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - epochstypes "github.com/osmosis-labs/osmosis/v9/x/epochs/types" + epochstypes "github.com/osmosis-labs/osmosis/v10/x/epochs/types" ) // SpotPriceCalculator defines the contract that must be fulfilled by a spot price calculator