Skip to content

Commit

Permalink
import CometBFT, bump: wasm, ibc-go (#228)
Browse files Browse the repository at this point in the history
* import CometBFT, bump: wasm, ibc-go

* fix fantoken and merkledrop tests

* fix merkledrop test

* fix ante_handler_test

---------

Co-authored-by: simi <[email protected]>
Co-authored-by: angelorc <[email protected]>
  • Loading branch information
3 people authored Mar 7, 2024
1 parent 26dc994 commit 456826d
Show file tree
Hide file tree
Showing 15 changed files with 650 additions and 296 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ Ref: https://keepachangelog.com/en/1.0.0/

# Changelog

## [v0.15.0] - 2024-03-06
- Updated Cosmos-sdk to v0.45.16 for improved stability and security
- Upgraded ibc-go to v4.4.2 for enhanced interoperability between different blockchain networks
- Replaced Tendermint with CometBFT
- Upgraded Cosmwasm to v0.33.0 for advanced smart contract functionality
- Replaced strangelove-ventures/packet-forward-middleware with cosmos/ibc-apps/middleware/packet-forward-middleware

## [v0.14.0] - 2023-02-07
- fix(authz): Add Binary Codec support to MinValCommissionDecorator
- fix(authz): Add MinValCommissionDecorator test
Expand Down
4 changes: 2 additions & 2 deletions app/ante_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/authz"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
ibcante "github.com/cosmos/ibc-go/v3/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
ibcante "github.com/cosmos/ibc-go/v4/modules/core/ante"
ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
)

// HandlerOptions extend the SDK's AnteHandler options by requiring the IBC
Expand Down
12 changes: 6 additions & 6 deletions app/ante_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func TestCreateAndEditValidatorAnteHandler(t *testing.T) {

header := tmproto.Header{Height: app.LastBlockHeight() + 1}
txGen := simapp.MakeEncodingConfig().TxConfig
_, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{createValidatorMsg}, "", []uint64{9}, []uint64{0}, true, true, priv1)
_, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{createValidatorMsg}, "", []uint64{8}, []uint64{0}, true, true, priv1)
require.NoError(t, err)
simapp.CheckBalance(t, app, addr1, sdk.Coins{genCoin.Sub(bondCoin)})

Expand All @@ -126,7 +126,7 @@ func TestCreateAndEditValidatorAnteHandler(t *testing.T) {
editValidatorMsg := types.NewMsgEditValidator(sdk.ValAddress(addr1), description, nil, nil)

header = tmproto.Header{Height: app.LastBlockHeight() + 1}
_, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{editValidatorMsg}, "", []uint64{9}, []uint64{1}, true, true, priv1)
_, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{editValidatorMsg}, "", []uint64{8}, []uint64{1}, true, true, priv1)
require.NoError(t, err)

validator = checkValidator(t, app, sdk.ValAddress(addr1), true)
Expand All @@ -138,7 +138,7 @@ func TestCreateAndEditValidatorAnteHandler(t *testing.T) {
editValidatorMsg = types.NewMsgEditValidator(sdk.ValAddress(addr1), description, &zeroDec, nil)

header = tmproto.Header{Height: app.LastBlockHeight() + 1}
_, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{editValidatorMsg}, "", []uint64{9}, []uint64{1}, false, false, priv1)
_, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{editValidatorMsg}, "", []uint64{8}, []uint64{1}, false, false, priv1)
require.Error(t, err)
require.EqualError(t, err, "commission can't be lower than 5%: unauthorized")
}
Expand Down Expand Up @@ -197,7 +197,7 @@ func TestMinCommissionAuthzAnteHandler(t *testing.T) {
txGen := encoding.TxConfig

_, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{msg1, msg2}, "",
[]uint64{9}, []uint64{0}, true, true, priv1)
[]uint64{8}, []uint64{0}, true, true, priv1)
require.NoError(t, err)

// create 2 authorization
Expand Down Expand Up @@ -228,7 +228,7 @@ func TestMinCommissionAuthzAnteHandler(t *testing.T) {

// wrapped tx
execMsg = authz.NewMsgExec(addr2, []sdk.Msg{createValidatorMsg})
_, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{&execMsg}, "", []uint64{10}, []uint64{0}, true, true, priv2)
_, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{&execMsg}, "", []uint64{9}, []uint64{0}, true, true, priv2)
require.NoError(t, err)
validator := checkValidator(t, app, sdk.ValAddress(addr1), true)
require.Equal(t, description, validator.Description)
Expand Down Expand Up @@ -259,7 +259,7 @@ func TestMinCommissionAuthzAnteHandler(t *testing.T) {

// wrapped tx
execMsg = authz.NewMsgExec(addr2, []sdk.Msg{editValidatorMsg})
_, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{&execMsg}, "", []uint64{10}, []uint64{1}, false, true, priv2)
_, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{&execMsg}, "", []uint64{9}, []uint64{1}, false, true, priv2)
require.NoError(t, err)

validator = checkValidator(t, app, sdk.ValAddress(addr1), true)
Expand Down
109 changes: 67 additions & 42 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"
v013 "github.com/bitsongofficial/go-bitsong/app/upgrades/v013"
v014 "github.com/bitsongofficial/go-bitsong/app/upgrades/v014"
v015 "github.com/bitsongofficial/go-bitsong/app/upgrades/v015"
"strings"

v010 "github.com/bitsongofficial/go-bitsong/app/upgrades/v010"
Expand Down Expand Up @@ -32,13 +33,13 @@ import (
feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
paramsclient "github.com/cosmos/cosmos-sdk/x/params/client"
upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
ibcclientclient "github.com/cosmos/ibc-go/v3/modules/core/02-client/client"
ibcclienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
packetforward "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward"
packetforwardkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/keeper"
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types"
ibcclientclient "github.com/cosmos/ibc-go/v4/modules/core/02-client/client"
ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
"github.com/gorilla/mux"
"github.com/rakyll/statik/fs"
"github.com/strangelove-ventures/packet-forward-middleware/v2/router"
routerkeeper "github.com/strangelove-ventures/packet-forward-middleware/v2/router/keeper"
routertypes "github.com/strangelove-ventures/packet-forward-middleware/v2/router/types"

"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec/types"
Expand Down Expand Up @@ -112,14 +113,15 @@ import (
"github.com/cosmos/cosmos-sdk/x/upgrade"
upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
"github.com/cosmos/ibc-go/v3/modules/apps/transfer"
ibctransferkeeper "github.com/cosmos/ibc-go/v3/modules/apps/transfer/keeper"
ibctransfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"
ibc "github.com/cosmos/ibc-go/v3/modules/core"
ibcclient "github.com/cosmos/ibc-go/v3/modules/core/02-client"
porttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types"
ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host"
ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
ibcfeekeeper "github.com/cosmos/ibc-go/v4/modules/apps/29-fee/keeper"
"github.com/cosmos/ibc-go/v4/modules/apps/transfer"
ibctransferkeeper "github.com/cosmos/ibc-go/v4/modules/apps/transfer/keeper"
ibctransfertypes "github.com/cosmos/ibc-go/v4/modules/apps/transfer/types"
ibc "github.com/cosmos/ibc-go/v4/modules/core"
ibcclient "github.com/cosmos/ibc-go/v4/modules/core/02-client"
porttypes "github.com/cosmos/ibc-go/v4/modules/core/05-port/types"
ibchost "github.com/cosmos/ibc-go/v4/modules/core/24-host"
ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"

tmjson "github.com/tendermint/tendermint/libs/json"

Expand Down Expand Up @@ -211,7 +213,7 @@ var (
evidence.AppModuleBasic{},
transfer.AppModuleBasic{},
vesting.AppModuleBasic{},
router.AppModuleBasic{},
packetforward.AppModuleBasic{},
fantoken.AppModuleBasic{},
merkledrop.AppModuleBasic{},
wasm.AppModuleBasic{},
Expand Down Expand Up @@ -264,23 +266,24 @@ type BitsongApp struct {
memKeys map[string]*sdk.MemoryStoreKey

// keepers
AccountKeeper authkeeper.AccountKeeper
BankKeeper bankkeeper.Keeper
CapabilityKeeper *capabilitykeeper.Keeper
StakingKeeper stakingkeeper.Keeper
SlashingKeeper slashingkeeper.Keeper
MintKeeper mintkeeper.Keeper
DistrKeeper distrkeeper.Keeper
GovKeeper govkeeper.Keeper
CrisisKeeper crisiskeeper.Keeper
UpgradeKeeper upgradekeeper.Keeper
ParamsKeeper paramskeeper.Keeper
IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
EvidenceKeeper evidencekeeper.Keeper
TransferKeeper ibctransferkeeper.Keeper
FeeGrantKeeper feegrantkeeper.Keeper
AuthzKeeper authzkeeper.Keeper
RouterKeeper routerkeeper.Keeper
AccountKeeper authkeeper.AccountKeeper
BankKeeper bankkeeper.Keeper
CapabilityKeeper *capabilitykeeper.Keeper
StakingKeeper stakingkeeper.Keeper
SlashingKeeper slashingkeeper.Keeper
MintKeeper mintkeeper.Keeper
DistrKeeper distrkeeper.Keeper
GovKeeper govkeeper.Keeper
CrisisKeeper crisiskeeper.Keeper
UpgradeKeeper upgradekeeper.Keeper
ParamsKeeper paramskeeper.Keeper
IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
IBCFeeKeeper ibcfeekeeper.Keeper
EvidenceKeeper evidencekeeper.Keeper
TransferKeeper ibctransferkeeper.Keeper
FeeGrantKeeper feegrantkeeper.Keeper
AuthzKeeper authzkeeper.Keeper
PacketForwardKeeper *packetforwardkeeper.Keeper

// make scoped keepers public for test purposes
ScopedIBCKeeper capabilitykeeper.ScopedKeeper
Expand Down Expand Up @@ -321,7 +324,7 @@ func NewBitsongApp(
minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey,
govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey,
evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey, wasm.StoreKey,
feegrant.StoreKey, authzkeeper.StoreKey, routertypes.StoreKey, fantokentypes.StoreKey, merkledroptypes.StoreKey,
feegrant.StoreKey, authzkeeper.StoreKey, packetforwardtypes.StoreKey, fantokentypes.StoreKey, merkledroptypes.StoreKey,
)
tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
Expand Down Expand Up @@ -447,7 +450,7 @@ func NewBitsongApp(

// The last arguments can contain custom message handlers, and custom query handlers,
// if we want to allow any custom callbacks
supportedFeatures := "iterator,staking,stargate,cosmwasm_1_1"
supportedFeatures := "iterator,staking,stargate,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3,bitsong"
wasmOpts := GetWasmOpts(appOpts)
app.wasmKeeper = wasm.NewKeeper(
appCodec,
Expand All @@ -458,6 +461,7 @@ func NewBitsongApp(
app.StakingKeeper,
app.DistrKeeper,
app.IBCKeeper.ChannelKeeper,
app.IBCKeeper.ChannelKeeper,
&app.IBCKeeper.PortKeeper,
scopedWasmKeeper,
app.TransferKeeper,
Expand All @@ -477,7 +481,7 @@ func NewBitsongApp(
// Create static IBC router, add transfer route, then set and seal it
ibcRouter := porttypes.NewRouter()
ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferIBCModule)
ibcRouter.AddRoute(wasm.ModuleName, wasm.NewIBCHandler(app.wasmKeeper, app.IBCKeeper.ChannelKeeper))
ibcRouter.AddRoute(wasm.ModuleName, wasm.NewIBCHandler(app.wasmKeeper, app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper))
app.IBCKeeper.SetRouter(ibcRouter)

app.GovKeeper = govkeeper.NewKeeper(
Expand All @@ -490,11 +494,19 @@ func NewBitsongApp(
govRouter,
)

app.RouterKeeper = routerkeeper.NewKeeper(
appCodec, keys[routertypes.StoreKey], app.GetSubspace(routertypes.ModuleName), app.TransferKeeper, app.DistrKeeper,
app.PacketForwardKeeper = packetforwardkeeper.NewKeeper(
appCodec,
keys[packetforwardtypes.StoreKey],
app.GetSubspace(packetforwardtypes.ModuleName),
app.TransferKeeper,
app.IBCKeeper.ChannelKeeper,
app.DistrKeeper,
app.BankKeeper,
// The ICS4Wrapper is replaced by the IBCFeeKeeper instead of the channel so that sending can be overridden by the middleware
&app.IBCFeeKeeper,
)

routerModule := router.NewAppModule(app.RouterKeeper, transferIBCModule)
routerModule := packetforward.NewAppModule(app.PacketForwardKeeper)

// Create evidence Keeper for to register the IBC light client misbehaviour evidence route
evidenceKeeper := evidencekeeper.NewKeeper(
Expand Down Expand Up @@ -542,15 +554,15 @@ func NewBitsongApp(
// NOTE: staking module is required if HistoricalEntries param > 0
app.mm.SetOrderBeginBlockers(
upgradetypes.ModuleName, capabilitytypes.ModuleName, crisistypes.ModuleName, govtypes.ModuleName,
stakingtypes.ModuleName, ibctransfertypes.ModuleName, ibchost.ModuleName, routertypes.ModuleName,
stakingtypes.ModuleName, ibctransfertypes.ModuleName, ibchost.ModuleName, packetforwardtypes.ModuleName,
authtypes.ModuleName, banktypes.ModuleName, distrtypes.ModuleName, slashingtypes.ModuleName,
minttypes.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName, wasm.ModuleName,
feegrant.ModuleName, paramstypes.ModuleName, vestingtypes.ModuleName, fantokentypes.ModuleName, merkledroptypes.ModuleName,
)

app.mm.SetOrderEndBlockers(
crisistypes.ModuleName, govtypes.ModuleName, stakingtypes.ModuleName, ibctransfertypes.ModuleName, ibchost.ModuleName,
routertypes.ModuleName, feegrant.ModuleName, authz.ModuleName, capabilitytypes.ModuleName, authtypes.ModuleName,
packetforwardtypes.ModuleName, feegrant.ModuleName, authz.ModuleName, capabilitytypes.ModuleName, authtypes.ModuleName,
banktypes.ModuleName, distrtypes.ModuleName, slashingtypes.ModuleName, minttypes.ModuleName, genutiltypes.ModuleName, wasm.ModuleName,
evidencetypes.ModuleName, paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, fantokentypes.ModuleName, merkledroptypes.ModuleName,
)
Expand Down Expand Up @@ -578,7 +590,7 @@ func NewBitsongApp(
authz.ModuleName,
authtypes.ModuleName,
genutiltypes.ModuleName,
routertypes.ModuleName,
packetforwardtypes.ModuleName,
paramstypes.ModuleName,
upgradetypes.ModuleName,
vestingtypes.ModuleName,
Expand Down Expand Up @@ -818,7 +830,7 @@ func (app *BitsongApp) setupUpgradeStoreLoaders() {
// v10 Upgrade
if upgradeInfo.Name == v010.UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
storeUpgrades := store.StoreUpgrades{
Added: []string{authz.ModuleName, feegrant.ModuleName, routertypes.ModuleName},
Added: []string{authz.ModuleName, feegrant.ModuleName, packetforwardtypes.ModuleName},
}

// configure store loader that checks if version == upgradeHeight and applies store upgrades
Expand Down Expand Up @@ -853,6 +865,14 @@ func (app *BitsongApp) setupUpgradeStoreLoaders() {
app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
}

// v15 Upgrade
if upgradeInfo.Name == v015.UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
storeUpgrades := store.StoreUpgrades{}

// configure store loader that checks if version == upgradeHeight and applies store upgrades
app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades))
}

}

func (app *BitsongApp) setupUpgradeHandlers() {
Expand All @@ -875,6 +895,11 @@ func (app *BitsongApp) setupUpgradeHandlers() {
v014.UpgradeName,
v014.CreateUpgradeHandler(app.mm, app.configurator),
)

app.UpgradeKeeper.SetUpgradeHandler(
v015.UpgradeName,
v015.CreateUpgradeHandler(app.mm, app.configurator),
)
}

// RegisterSwaggerAPI registers swagger route with API Server
Expand Down Expand Up @@ -903,7 +928,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino
paramsKeeper.Subspace(ibctransfertypes.ModuleName)
paramsKeeper.Subspace(ibchost.ModuleName)
paramsKeeper.Subspace(wasm.ModuleName)
paramsKeeper.Subspace(routertypes.ModuleName).WithKeyTable(routertypes.ParamKeyTable())
paramsKeeper.Subspace(packetforwardtypes.ModuleName).WithKeyTable(packetforwardtypes.ParamKeyTable())
paramsKeeper.Subspace(fantokentypes.ModuleName)
paramsKeeper.Subspace(merkledroptypes.ModuleName)

Expand Down
6 changes: 3 additions & 3 deletions app/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ func DefaultConfig() network.Config {
NumValidators: 1,
BondDenom: sdk.DefaultBondDenom,
MinGasPrices: fmt.Sprintf("0.000006%s", sdk.DefaultBondDenom),
AccountTokens: sdk.TokensFromConsensusPower(1000, sdk.DefaultPowerReduction),
StakingTokens: sdk.TokensFromConsensusPower(500, sdk.DefaultPowerReduction),
BondedTokens: sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction),
AccountTokens: sdk.TokensFromConsensusPower(100000, sdk.DefaultPowerReduction),
StakingTokens: sdk.TokensFromConsensusPower(50000, sdk.DefaultPowerReduction),
BondedTokens: sdk.TokensFromConsensusPower(10000, sdk.DefaultPowerReduction),
PruningStrategy: storetypes.PruningOptionNothing,
CleanupDir: true,
SigningAlgo: string(hd.Secp256k1Type),
Expand Down
8 changes: 4 additions & 4 deletions app/upgrades/v010/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
ibcconnectiontypes "github.com/cosmos/ibc-go/v3/modules/core/03-connection/types"
ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"
routertypes "github.com/strangelove-ventures/packet-forward-middleware/v2/router/types"
ibcconnectiontypes "github.com/cosmos/ibc-go/v4/modules/core/03-connection/types"
ibckeeper "github.com/cosmos/ibc-go/v4/modules/core/keeper"
packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v4/packetforward/types"
)

func CreateUpgradeHandler(mm *module.Manager, configurator module.Configurator,
Expand All @@ -31,7 +31,7 @@ func CreateUpgradeHandler(mm *module.Manager, configurator module.Configurator,
// delete new modules from the map, for _new_ modules as to not skip InitGenesis
delete(fromVM, authz.ModuleName)
delete(fromVM, feegrant.ModuleName)
delete(fromVM, routertypes.ModuleName)
delete(fromVM, packetforwardtypes.ModuleName)

// make fromVM[authtypes.ModuleName] = 2 to skip the first RunMigrations for auth (because from version 2 to migration version 2 will not migrate)
fromVM[authtypes.ModuleName] = 2
Expand Down
5 changes: 5 additions & 0 deletions app/upgrades/v015/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package v015

const (
UpgradeName = "v015"
)
13 changes: 13 additions & 0 deletions app/upgrades/v015/upgrades.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package v015

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
)

func CreateUpgradeHandler(mm *module.Manager, configurator module.Configurator) upgradetypes.UpgradeHandler {
return func(ctx sdk.Context, _plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
return mm.RunMigrations(ctx, configurator, vm)
}
}
6 changes: 3 additions & 3 deletions cmd/bitsongd/cmd/init_from_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
"github.com/cosmos/go-bip39"
ibcclienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
ibcchanneltypes "github.com/cosmos/ibc-go/v3/modules/core/04-channel/types"
ibctypes "github.com/cosmos/ibc-go/v3/modules/core/types"
ibcclienttypes "github.com/cosmos/ibc-go/v4/modules/core/02-client/types"
ibcchanneltypes "github.com/cosmos/ibc-go/v4/modules/core/04-channel/types"
ibctypes "github.com/cosmos/ibc-go/v4/modules/core/types"
"github.com/spf13/cobra"
tmcfg "github.com/tendermint/tendermint/config"
tmcrypto "github.com/tendermint/tendermint/crypto"
Expand Down
Loading

0 comments on commit 456826d

Please sign in to comment.