Skip to content

Commit

Permalink
chore: upgrade package paths to v9 (#1537)
Browse files Browse the repository at this point in the history
  • Loading branch information
@p0mvn
p0mvn authored May 18, 2022
1 parent 7bff4c9 commit efccac8
Show file tree
Hide file tree
Showing 409 changed files with 1,942 additions and 1,840 deletions.
8 changes: 4 additions & 4 deletions app/ante.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/v7/ante"
osmoante "github.com/osmosis-labs/osmosis/v9/ante"

v8 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v8"
txfeeskeeper "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types"
v8 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v8"
txfeeskeeper "github.com/osmosis-labs/osmosis/v9/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v9/x/txfees/types"
)

// Link to default ante handler used by cosmos sdk:
Expand Down
22 changes: 11 additions & 11 deletions app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ import (
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/osmosis-labs/osmosis/v7/app/keepers"
appparams "github.com/osmosis-labs/osmosis/v7/app/params"
"github.com/osmosis-labs/osmosis/v7/app/upgrades"
v3 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v3"
v4 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v4"
v5 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v5"
v6 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v6"
v7 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v7"
v8 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v8"
v9 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v9"
_ "github.com/osmosis-labs/osmosis/v7/client/docs/statik"
"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"
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"
)

const appName = "OsmosisApp"
Expand Down
4 changes: 2 additions & 2 deletions app/apptesting/gamm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package apptesting
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer"
gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types"
"github.com/osmosis-labs/osmosis/v9/x/gamm/pool-models/balancer"
gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types"
)

var DefaultAcctFunds sdk.Coins = sdk.NewCoins(
Expand Down
10 changes: 5 additions & 5 deletions app/apptesting/test_suite.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import (
"github.com/tendermint/tendermint/crypto/ed25519"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"

"github.com/osmosis-labs/osmosis/v7/app"
"github.com/osmosis-labs/osmosis/v7/x/gamm/pool-models/balancer"
gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types"
lockupkeeper "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/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"
)

type KeeperTestHelper struct {
Expand Down
3 changes: 2 additions & 1 deletion app/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"fmt"
"time"

"github.com/osmosis-labs/osmosis/v7/app/params"
dbm "github.com/tendermint/tm-db"

"github.com/osmosis-labs/osmosis/v9/app/params"

"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/crypto/hd"
"github.com/cosmos/cosmos-sdk/crypto/keyring"
Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package app

import (
"github.com/osmosis-labs/osmosis/v7/app/params"
"github.com/osmosis-labs/osmosis/v9/app/params"

"github.com/cosmos/cosmos-sdk/std"
)
Expand Down
46 changes: 23 additions & 23 deletions app/keepers/keepers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,29 +47,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/v7/app/wasm"
_ "github.com/osmosis-labs/osmosis/v7/client/docs/statik"
epochskeeper "github.com/osmosis-labs/osmosis/v7/x/epochs/keeper"
epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types"
gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper"
gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types"
incentiveskeeper "github.com/osmosis-labs/osmosis/v7/x/incentives/keeper"
incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types"
lockupkeeper "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper"
lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types"
mintkeeper "github.com/osmosis-labs/osmosis/v7/x/mint/keeper"
minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types"
poolincentives "github.com/osmosis-labs/osmosis/v7/x/pool-incentives"
poolincentiveskeeper "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/keeper"
poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types"
"github.com/osmosis-labs/osmosis/v7/x/superfluid"
superfluidkeeper "github.com/osmosis-labs/osmosis/v7/x/superfluid/keeper"
superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"
tokenfactorykeeper "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/keeper"
tokenfactorytypes "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types"
"github.com/osmosis-labs/osmosis/v7/x/txfees"
txfeeskeeper "github.com/osmosis-labs/osmosis/v7/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/types"
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"
)

type AppKeepers struct {
Expand Down
24 changes: 12 additions & 12 deletions app/keepers/modules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/v7/client/docs/statik"
"github.com/osmosis-labs/osmosis/v7/x/epochs"
"github.com/osmosis-labs/osmosis/v7/x/gamm"
"github.com/osmosis-labs/osmosis/v7/x/incentives"
"github.com/osmosis-labs/osmosis/v7/x/lockup"
"github.com/osmosis-labs/osmosis/v7/x/mint"
poolincentives "github.com/osmosis-labs/osmosis/v7/x/pool-incentives"
poolincentivesclient "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/client"
superfluid "github.com/osmosis-labs/osmosis/v7/x/superfluid"
superfluidclient "github.com/osmosis-labs/osmosis/v7/x/superfluid/client"
"github.com/osmosis-labs/osmosis/v7/x/tokenfactory"
"github.com/osmosis-labs/osmosis/v7/x/txfees"
_ "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"
)

// AppModuleBasics returns ModuleBasics for the module BasicManager.
Expand Down
42 changes: 21 additions & 21 deletions app/modules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,27 @@ import (
"github.com/cosmos/cosmos-sdk/x/upgrade"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

appparams "github.com/osmosis-labs/osmosis/v7/app/params"
_ "github.com/osmosis-labs/osmosis/v7/client/docs/statik"
"github.com/osmosis-labs/osmosis/v7/osmoutils/partialord"
"github.com/osmosis-labs/osmosis/v7/x/epochs"
epochstypes "github.com/osmosis-labs/osmosis/v7/x/epochs/types"
"github.com/osmosis-labs/osmosis/v7/x/gamm"
gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types"
"github.com/osmosis-labs/osmosis/v7/x/incentives"
incentivestypes "github.com/osmosis-labs/osmosis/v7/x/incentives/types"
"github.com/osmosis-labs/osmosis/v7/x/lockup"
lockuptypes "github.com/osmosis-labs/osmosis/v7/x/lockup/types"
"github.com/osmosis-labs/osmosis/v7/x/mint"
minttypes "github.com/osmosis-labs/osmosis/v7/x/mint/types"
poolincentives "github.com/osmosis-labs/osmosis/v7/x/pool-incentives"
poolincentivestypes "github.com/osmosis-labs/osmosis/v7/x/pool-incentives/types"
superfluid "github.com/osmosis-labs/osmosis/v7/x/superfluid"
superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"
"github.com/osmosis-labs/osmosis/v7/x/tokenfactory"
tokenfactorytypes "github.com/osmosis-labs/osmosis/v7/x/tokenfactory/types"
"github.com/osmosis-labs/osmosis/v7/x/txfees"
txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/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"
)

// moduleAccountPermissions defines module account permissions
Expand Down
2 changes: 1 addition & 1 deletion app/params/config.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package params

import (
"github.com/osmosis-labs/osmosis/v7/v043_temp/address"
"github.com/osmosis-labs/osmosis/v9/v043_temp/address"

sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/v7/app/keepers"
"github.com/osmosis-labs/osmosis/v9/app/keepers"
)

// Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v3/constants.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package v3

import "github.com/osmosis-labs/osmosis/v7/app/upgrades"
import "github.com/osmosis-labs/osmosis/v9/app/upgrades"

const (
// UpgradeName defines the on-chain upgrade name for the Osmosis v3 upgrade.
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v3/forks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/v7/app/keepers"
"github.com/osmosis-labs/osmosis/v9/app/keepers"
)

// RunForkLogic executes height-gated on-chain fork logic for the Osmosis v3
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v4/constants.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v4

import (
"github.com/osmosis-labs/osmosis/v7/app/upgrades"
"github.com/osmosis-labs/osmosis/v9/app/upgrades"

store "github.com/cosmos/cosmos-sdk/store/types"
)
Expand Down
5 changes: 3 additions & 2 deletions app/upgrades/v4/upgrade_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ import (
"testing"
"time"

"github.com/osmosis-labs/osmosis/v7/app"
v4 "github.com/osmosis-labs/osmosis/v7/app/upgrades/v4"
"github.com/stretchr/testify/suite"
abci "github.com/tendermint/tendermint/abci/types"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"

"github.com/osmosis-labs/osmosis/v9/app"
v4 "github.com/osmosis-labs/osmosis/v9/app/upgrades/v4"

sdk "github.com/cosmos/cosmos-sdk/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
)
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v4/upgrades.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/v7/app/keepers"
gammtypes "github.com/osmosis-labs/osmosis/v7/x/gamm/types"
"github.com/osmosis-labs/osmosis/v9/app/keepers"
gammtypes "github.com/osmosis-labs/osmosis/v9/x/gamm/types"
)

// CreateUpgradeHandler returns an x/upgrade handler for the Osmosis v4 on-chain
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v5/constants.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v5

import (
"github.com/osmosis-labs/osmosis/v7/app/upgrades"
"github.com/osmosis-labs/osmosis/v9/app/upgrades"

store "github.com/cosmos/cosmos-sdk/store/types"
)
Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/v5/upgrades.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/v7/app/keepers"
"github.com/osmosis-labs/osmosis/v7/x/txfees"
txfeestypes "github.com/osmosis-labs/osmosis/v7/x/txfees/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"
)

func CreateUpgradeHandler(
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v5/whitelist_feetokens.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

sdk "github.com/cosmos/cosmos-sdk/types"

gammkeeper "github.com/osmosis-labs/osmosis/v7/x/gamm/keeper"
"github.com/osmosis-labs/osmosis/v7/x/txfees/types"
gammkeeper "github.com/osmosis-labs/osmosis/v9/x/gamm/keeper"
"github.com/osmosis-labs/osmosis/v9/x/txfees/types"
)

// Every asset with a liquid osmo pairing pool on Osmosis, as of 12/01/21
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v6/constants.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package v6

import "github.com/osmosis-labs/osmosis/v7/app/upgrades"
import "github.com/osmosis-labs/osmosis/v9/app/upgrades"

const (
// UpgradeName defines the on-chain upgrade name for the Osmosis v6 upgrade.
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v6/forks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v6
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/osmosis-labs/osmosis/v7/app/keepers"
"github.com/osmosis-labs/osmosis/v9/app/keepers"
)

// RunForkLogic executes height-gated on-chain fork logic for the Osmosis v6
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v7/constants.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v7
import (
"github.com/CosmWasm/wasmd/x/wasm"

"github.com/osmosis-labs/osmosis/v7/app/upgrades"
superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/types"
"github.com/osmosis-labs/osmosis/v9/app/upgrades"
superfluidtypes "github.com/osmosis-labs/osmosis/v9/x/superfluid/types"

store "github.com/cosmos/cosmos-sdk/store/types"
)
Expand Down
8 changes: 4 additions & 4 deletions app/upgrades/v7/upgrades.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/v7/app/keepers"
lockupkeeper "github.com/osmosis-labs/osmosis/v7/x/lockup/keeper"
mintkeeper "github.com/osmosis-labs/osmosis/v7/x/mint/keeper"
superfluidtypes "github.com/osmosis-labs/osmosis/v7/x/superfluid/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"
)

func CreateUpgradeHandler(
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v8/constants.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package v8

import (
"github.com/osmosis-labs/osmosis/v7/app/upgrades"
v8constants "github.com/osmosis-labs/osmosis/v7/app/upgrades/v8/constants"
"github.com/osmosis-labs/osmosis/v9/app/upgrades"
v8constants "github.com/osmosis-labs/osmosis/v9/app/upgrades/v8/constants"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v8/forks.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v8
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/osmosis-labs/osmosis/v7/app/keepers"
"github.com/osmosis-labs/osmosis/v9/app/keepers"
)

// RunForkLogic executes height-gated on-chain fork logic for the Osmosis v8
Expand Down
Loading

0 comments on commit efccac8

Please sign in to comment.