Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dang/upgrade v6 #253

Merged
merged 6 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/ante/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
ante "github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/auth/signing"

tfmwKeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper"
txBoundaryAnte "github.com/notional-labs/composable/v5/x/tx-boundary/ante"
txBoundaryKeeper "github.com/notional-labs/composable/v5/x/tx-boundary/keeper"
tfmwKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper"
txBoundaryAnte "github.com/notional-labs/composable/v6/x/tx-boundary/ante"
txBoundaryKeeper "github.com/notional-labs/composable/v6/x/tx-boundary/keeper"
)

// Link to default ante handler used by cosmos sdk:
Expand Down
2 changes: 1 addition & 1 deletion app/ante/ibc_ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/authz"
clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"

tfmwKeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper"
tfmwKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper"
)

type IBCPermissionDecorator struct {
Expand Down
44 changes: 26 additions & 18 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node"
authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation"
"github.com/cosmos/cosmos-sdk/x/authz"
"github.com/cosmos/cosmos-sdk/x/consensus"
tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
wasm08 "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm"
Expand All @@ -32,12 +33,14 @@ import (
vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
"github.com/cosmos/cosmos-sdk/x/bank"

"github.com/notional-labs/composable/v5/app/keepers"
"github.com/notional-labs/composable/v5/app/upgrades/composable"
v4 "github.com/notional-labs/composable/v5/app/upgrades/v4"
v5 "github.com/notional-labs/composable/v5/app/upgrades/v5"
"github.com/notional-labs/composable/v6/app/keepers"
v4 "github.com/notional-labs/composable/v6/app/upgrades/v4"
v5 "github.com/notional-labs/composable/v6/app/upgrades/v5"
v6 "github.com/notional-labs/composable/v6/app/upgrades/v6"

// bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"

authzmodule "github.com/cosmos/cosmos-sdk/x/authz/module"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
"github.com/cosmos/cosmos-sdk/x/capability"
capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
Expand Down Expand Up @@ -93,33 +96,33 @@ import (
alliancemoduleclient "github.com/terra-money/alliance/x/alliance/client"
alliancemoduletypes "github.com/terra-money/alliance/x/alliance/types"

custombankmodule "github.com/notional-labs/composable/v5/custom/bank"
custombankmodule "github.com/notional-labs/composable/v6/custom/bank"

"github.com/notional-labs/composable/v5/app/ante"
transfermiddleware "github.com/notional-labs/composable/v5/x/transfermiddleware"
transfermiddlewaretypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types"
"github.com/notional-labs/composable/v6/app/ante"
transfermiddleware "github.com/notional-labs/composable/v6/x/transfermiddleware"
transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types"

txBoundary "github.com/notional-labs/composable/v5/x/tx-boundary"
txBoundaryTypes "github.com/notional-labs/composable/v5/x/tx-boundary/types"
txBoundary "github.com/notional-labs/composable/v6/x/tx-boundary"
txBoundaryTypes "github.com/notional-labs/composable/v6/x/tx-boundary/types"

ratelimitmodule "github.com/notional-labs/composable/v5/x/ratelimit"
ratelimitmoduletypes "github.com/notional-labs/composable/v5/x/ratelimit/types"
ratelimitmodule "github.com/notional-labs/composable/v6/x/ratelimit"
ratelimitmoduletypes "github.com/notional-labs/composable/v6/x/ratelimit/types"

consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"

"github.com/notional-labs/composable/v5/x/mint"
minttypes "github.com/notional-labs/composable/v5/x/mint/types"
"github.com/notional-labs/composable/v6/x/mint"
minttypes "github.com/notional-labs/composable/v6/x/mint/types"

ibctestingtypes "github.com/cosmos/ibc-go/v7/testing/types"

ibc_hooks "github.com/notional-labs/composable/v5/x/ibc-hooks"
ibchookstypes "github.com/notional-labs/composable/v5/x/ibc-hooks/types"
ibc_hooks "github.com/notional-labs/composable/v6/x/ibc-hooks"
ibchookstypes "github.com/notional-labs/composable/v6/x/ibc-hooks/types"

"github.com/CosmWasm/wasmd/x/wasm"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"

upgrades "github.com/notional-labs/composable/v5/app/upgrades"
upgrades "github.com/notional-labs/composable/v6/app/upgrades"
)

const (
Expand All @@ -137,7 +140,7 @@ var (
// https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34
EnableSpecificProposals = ""

Upgrades = []upgrades.Upgrade{v4.Upgrade, v5.Upgrade, composable.Upgrade}
Upgrades = []upgrades.Upgrade{v4.Upgrade, v5.Upgrade, v6.Upgrade}
Forks = []upgrades.Fork{}
)

Expand Down Expand Up @@ -197,6 +200,7 @@ var (
params.AppModuleBasic{},
crisis.AppModuleBasic{},
slashing.AppModuleBasic{},
authzmodule.AppModuleBasic{},
feegrantmodule.AppModuleBasic{},
groupmodule.AppModuleBasic{},
ibc.AppModuleBasic{},
Expand Down Expand Up @@ -359,6 +363,7 @@ func NewComposableApp(
slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(slashingtypes.ModuleName)),
distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)),
staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)),
authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
upgrade.NewAppModule(app.UpgradeKeeper),
evidence.NewAppModule(app.EvidenceKeeper),
ibc.NewAppModule(app.IBCKeeper),
Expand Down Expand Up @@ -404,6 +409,7 @@ func NewComposableApp(
govtypes.ModuleName,
crisistypes.ModuleName,
genutiltypes.ModuleName,
authz.ModuleName,
feegrant.ModuleName,
group.ModuleName,
paramstypes.ModuleName,
Expand All @@ -428,6 +434,7 @@ func NewComposableApp(
vestingtypes.ModuleName,
genutiltypes.ModuleName,
evidencetypes.ModuleName,
authz.ModuleName,
feegrant.ModuleName,
group.ModuleName,
paramstypes.ModuleName,
Expand Down Expand Up @@ -466,6 +473,7 @@ func NewComposableApp(
ibchost.ModuleName,
genutiltypes.ModuleName,
evidencetypes.ModuleName,
authz.ModuleName,
paramstypes.ModuleName,
upgradetypes.ModuleName,
ibctransfertypes.ModuleName,
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/cosmos/ibc-go/v7/testing/mock"
"github.com/stretchr/testify/require"

composable "github.com/notional-labs/composable/v5/app"
composable "github.com/notional-labs/composable/v6/app"
)

// SimAppChainID hardcoded chainID for simulation
Expand Down
8 changes: 4 additions & 4 deletions app/ibctesting/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

ratelimitmodulekeeper "github.com/notional-labs/composable/v5/x/ratelimit/keeper"
ratelimitmodulekeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper"

"cosmossdk.io/errors"
abci "github.com/cometbft/cometbft/abci/types"
Expand Down Expand Up @@ -54,9 +54,9 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"

composable "github.com/notional-labs/composable/v5/app"
"github.com/notional-labs/composable/v5/app/ibctesting/simapp"
routerKeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper"
composable "github.com/notional-labs/composable/v6/app"
"github.com/notional-labs/composable/v6/app/ibctesting/simapp"
routerKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper"
)

// TestChain is a testing struct that wraps a simapp with the last TM Header, the current ABCI
Expand Down
20 changes: 10 additions & 10 deletions app/ibctesting/simapp/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ import (
"github.com/gorilla/mux"

// TODO: mint module not complete yet,
"github.com/notional-labs/composable/v5/x/mint"
mintkeeper "github.com/notional-labs/composable/v5/x/mint/keeper"
minttypes "github.com/notional-labs/composable/v5/x/mint/types"
"github.com/notional-labs/composable/v6/x/mint"
mintkeeper "github.com/notional-labs/composable/v6/x/mint/keeper"
minttypes "github.com/notional-labs/composable/v6/x/mint/types"

"github.com/rakyll/statik/fs"
"github.com/spf13/cast"
Expand Down Expand Up @@ -124,13 +124,13 @@ import (
ibcmock "github.com/cosmos/ibc-go/v7/testing/mock"
ibctestingtypes "github.com/cosmos/ibc-go/v7/testing/types"

simappparams "github.com/notional-labs/composable/v5/app/ibctesting/simapp/params"
simappupgrades "github.com/notional-labs/composable/v5/app/ibctesting/simapp/upgrades"
v6 "github.com/notional-labs/composable/v5/app/ibctesting/simapp/upgrades/v6"
v7 "github.com/notional-labs/composable/v5/app/ibctesting/simapp/upgrades/v7"
transfermiddleware "github.com/notional-labs/composable/v5/x/transfermiddleware"
transfermiddlewarekeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper"
transfermiddlewaretypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types"
simappparams "github.com/notional-labs/composable/v6/app/ibctesting/simapp/params"
simappupgrades "github.com/notional-labs/composable/v6/app/ibctesting/simapp/upgrades"
v6 "github.com/notional-labs/composable/v6/app/ibctesting/simapp/upgrades/v6"
v7 "github.com/notional-labs/composable/v6/app/ibctesting/simapp/upgrades/v7"
transfermiddleware "github.com/notional-labs/composable/v6/x/transfermiddleware"
transfermiddlewarekeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper"
transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types"
)

const appName = "SimApp"
Expand Down
2 changes: 1 addition & 1 deletion app/ibctesting/simapp/encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package simapp
import (
"github.com/cosmos/cosmos-sdk/std"

simappparams "github.com/notional-labs/composable/v5/app/ibctesting/simapp/params"
simappparams "github.com/notional-labs/composable/v6/app/ibctesting/simapp/params"
)

// MakeTestEncodingConfig creates an EncodingConfig for testing. This function
Expand Down
2 changes: 1 addition & 1 deletion app/ibctesting/simapp/sim_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
"github.com/stretchr/testify/require"

minttypes "github.com/notional-labs/composable/v5/x/mint/types"
minttypes "github.com/notional-labs/composable/v6/x/mint/types"

ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
Expand Down
40 changes: 25 additions & 15 deletions app/keepers/keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import (
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
icahost "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host"
icahostkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/keeper"
icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
Expand All @@ -66,7 +67,7 @@ import (
icqkeeper "github.com/strangelove-ventures/async-icq/v7/keeper"
icqtypes "github.com/strangelove-ventures/async-icq/v7/types"

custombankkeeper "github.com/notional-labs/composable/v5/custom/bank/keeper"
custombankkeeper "github.com/notional-labs/composable/v6/custom/bank/keeper"

"github.com/strangelove-ventures/packet-forward-middleware/v7/router"
routerkeeper "github.com/strangelove-ventures/packet-forward-middleware/v7/router/keeper"
Expand All @@ -76,32 +77,32 @@ import (
alliancemodulekeeper "github.com/terra-money/alliance/x/alliance/keeper"
alliancemoduletypes "github.com/terra-money/alliance/x/alliance/types"

transfermiddleware "github.com/notional-labs/composable/v5/x/transfermiddleware"
transfermiddlewarekeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper"
transfermiddlewaretypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types"
transfermiddleware "github.com/notional-labs/composable/v6/x/transfermiddleware"
transfermiddlewarekeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper"
transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types"

txBoundaryKeeper "github.com/notional-labs/composable/v5/x/tx-boundary/keeper"
txBoundaryTypes "github.com/notional-labs/composable/v5/x/tx-boundary/types"
txBoundaryKeeper "github.com/notional-labs/composable/v6/x/tx-boundary/keeper"
txBoundaryTypes "github.com/notional-labs/composable/v6/x/tx-boundary/types"

ratelimitmodule "github.com/notional-labs/composable/v5/x/ratelimit"
ratelimitmodulekeeper "github.com/notional-labs/composable/v5/x/ratelimit/keeper"
ratelimitmoduletypes "github.com/notional-labs/composable/v5/x/ratelimit/types"
ratelimitmodule "github.com/notional-labs/composable/v6/x/ratelimit"
ratelimitmodulekeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper"
ratelimitmoduletypes "github.com/notional-labs/composable/v6/x/ratelimit/types"

consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper"
consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"

mintkeeper "github.com/notional-labs/composable/v5/x/mint/keeper"
minttypes "github.com/notional-labs/composable/v5/x/mint/types"
mintkeeper "github.com/notional-labs/composable/v6/x/mint/keeper"
minttypes "github.com/notional-labs/composable/v6/x/mint/types"

"github.com/CosmWasm/wasmd/x/wasm"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
wasm08Keeper "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/keeper"
wasmtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types"

ibc_hooks "github.com/notional-labs/composable/v5/x/ibc-hooks"
ibchookskeeper "github.com/notional-labs/composable/v5/x/ibc-hooks/keeper"
ibchookstypes "github.com/notional-labs/composable/v5/x/ibc-hooks/types"
ibc_hooks "github.com/notional-labs/composable/v6/x/ibc-hooks"
ibchookskeeper "github.com/notional-labs/composable/v6/x/ibc-hooks/keeper"
ibchookstypes "github.com/notional-labs/composable/v6/x/ibc-hooks/types"
)

const (
Expand Down Expand Up @@ -133,6 +134,7 @@ type AppKeepers struct {
ICQKeeper icqkeeper.Keeper
ICAHostKeeper icahostkeeper.Keeper
FeeGrantKeeper feegrantkeeper.Keeper
AuthzKeeper authzkeeper.Keeper
GroupKeeper groupkeeper.Keeper
Wasm08Keeper wasm08Keeper.Keeper // TODO: use this name ?
WasmKeeper wasm.Keeper
Expand Down Expand Up @@ -175,6 +177,14 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
appKeepers.BankKeeper = custombankkeeper.NewBaseKeeper(
appCodec, appKeepers.keys[banktypes.StoreKey], appKeepers.AccountKeeper, appKeepers.BlacklistedModuleAccountAddrs(maccPerms), &appKeepers.TransferMiddlewareKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(),
)

appKeepers.AuthzKeeper = authzkeeper.NewKeeper(
appKeepers.keys[authzkeeper.StoreKey],
appCodec,
bApp.MsgServiceRouter(),
appKeepers.AccountKeeper,
)

appKeepers.StakingKeeper = stakingkeeper.NewKeeper(
appCodec, appKeepers.keys[stakingtypes.StoreKey], appKeepers.AccountKeeper, appKeepers.BankKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(),
)
Expand Down Expand Up @@ -236,7 +246,7 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
appCodec, appKeepers.keys[ibchost.StoreKey], appKeepers.GetSubspace(ibchost.ModuleName), appKeepers.StakingKeeper, appKeepers.UpgradeKeeper, appKeepers.ScopedIBCKeeper,
)

appKeepers.Wasm08Keeper = wasm08Keeper.NewKeeper(appCodec, appKeepers.keys[wasmtypes.StoreKey], authorityAddress, homePath)
appKeepers.Wasm08Keeper = wasm08Keeper.NewKeeper(appCodec, appKeepers.keys[wasmtypes.StoreKey], authorityAddress, homePath, &appKeepers.IBCKeeper.ClientKeeper)

// ICA Host keeper
appKeepers.ICAHostKeeper = icahostkeeper.NewKeeper(
Expand Down
13 changes: 8 additions & 5 deletions app/keepers/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ package keepers
import (
sdk "github.com/cosmos/cosmos-sdk/types"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"

// bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"

banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
Expand All @@ -27,16 +29,16 @@ import (
routertypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types"
alliancemoduletypes "github.com/terra-money/alliance/x/alliance/types"

ibchookstypes "github.com/notional-labs/composable/v5/x/ibc-hooks/types"
ratelimitmoduletypes "github.com/notional-labs/composable/v5/x/ratelimit/types"
transfermiddlewaretypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types"
txBoundaryTypes "github.com/notional-labs/composable/v5/x/tx-boundary/types"
ibchookstypes "github.com/notional-labs/composable/v6/x/ibc-hooks/types"
ratelimitmoduletypes "github.com/notional-labs/composable/v6/x/ratelimit/types"
transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types"
txBoundaryTypes "github.com/notional-labs/composable/v6/x/tx-boundary/types"

consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types"

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

minttypes "github.com/notional-labs/composable/v5/x/mint/types"
minttypes "github.com/notional-labs/composable/v6/x/mint/types"

"github.com/CosmWasm/wasmd/x/wasm"
wasm08types "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types"
Expand All @@ -51,6 +53,7 @@ func (appKeepers *AppKeepers) GenerateKeys() {
govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey,
evidencetypes.StoreKey, ibctransfertypes.StoreKey, icqtypes.StoreKey, capabilitytypes.StoreKey, consensusparamtypes.StoreKey, wasm08types.StoreKey,
crisistypes.StoreKey, routertypes.StoreKey, transfermiddlewaretypes.StoreKey, group.StoreKey, minttypes.StoreKey, alliancemoduletypes.StoreKey, wasm.StoreKey, ibchookstypes.StoreKey, icahosttypes.StoreKey, ratelimitmoduletypes.StoreKey, txBoundaryTypes.StoreKey,
authzkeeper.StoreKey,
)

// Define transient store keys
Expand Down
4 changes: 2 additions & 2 deletions app/test_access.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
wasm08 "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/keeper"

ratelimitkeeper "github.com/notional-labs/composable/v5/x/ratelimit/keeper"
tfmdKeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper"
ratelimitkeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper"
tfmdKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper"
)

type TestSupport struct {
Expand Down
2 changes: 1 addition & 1 deletion app/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"

minttypes "github.com/notional-labs/composable/v5/x/mint/types"
minttypes "github.com/notional-labs/composable/v6/x/mint/types"

"github.com/CosmWasm/wasmd/x/wasm"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
Expand Down
8 changes: 4 additions & 4 deletions app/upgrades/centauri/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (

govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"

bech32authmigration "github.com/notional-labs/composable/v5/bech32-migration/auth"
bech32govmigration "github.com/notional-labs/composable/v5/bech32-migration/gov"
bech32slashingmigration "github.com/notional-labs/composable/v5/bech32-migration/slashing"
bech32stakingmigration "github.com/notional-labs/composable/v5/bech32-migration/staking"
bech32authmigration "github.com/notional-labs/composable/v6/bech32-migration/auth"
bech32govmigration "github.com/notional-labs/composable/v6/bech32-migration/gov"
bech32slashingmigration "github.com/notional-labs/composable/v6/bech32-migration/slashing"
bech32stakingmigration "github.com/notional-labs/composable/v6/bech32-migration/staking"
)

func CreateUpgradeHandler(
Expand Down
Loading
Loading