diff --git a/app.go b/app.go index d1430ecf3305..c1a257f88490 100644 --- a/app.go +++ b/app.go @@ -25,6 +25,11 @@ import ( nftkeeper "cosmossdk.io/x/nft/keeper" nftmodule "cosmossdk.io/x/nft/module" + "cosmossdk.io/x/upgrade" + upgradeclient "cosmossdk.io/x/upgrade/client" + upgradekeeper "cosmossdk.io/x/upgrade/keeper" + upgradetypes "cosmossdk.io/x/upgrade/types" + storetypes "cosmossdk.io/store/types" "cosmossdk.io/x/feegrant" feegrantkeeper "cosmossdk.io/x/feegrant/keeper" @@ -99,10 +104,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/cosmos/cosmos-sdk/x/upgrade" - upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" - upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) const appName = "SimApp" diff --git a/app_config.go b/app_config.go index 8f6478622e7f..b6c88458e766 100644 --- a/app_config.go +++ b/app_config.go @@ -27,10 +27,12 @@ import ( vestingmodulev1 "cosmossdk.io/api/cosmos/vesting/module/v1" "cosmossdk.io/core/appconfig" evidencetypes "cosmossdk.io/x/evidence/types" + "cosmossdk.io/x/nft" + upgradetypes "cosmossdk.io/x/upgrade/types" "google.golang.org/protobuf/types/known/durationpb" "cosmossdk.io/x/feegrant" - "cosmossdk.io/x/nft" + "github.com/cosmos/cosmos-sdk/runtime" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" @@ -47,7 +49,6 @@ import ( paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) var ( diff --git a/app_test.go b/app_test.go index 55b8ccbe8aa5..be6f4bc8defc 100644 --- a/app_test.go +++ b/app_test.go @@ -7,6 +7,7 @@ import ( "testing" "cosmossdk.io/x/evidence" + "cosmossdk.io/x/upgrade" dbm "github.com/cosmos/cosmos-db" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" @@ -35,7 +36,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/params" "github.com/cosmos/cosmos-sdk/x/slashing" "github.com/cosmos/cosmos-sdk/x/staking" - "github.com/cosmos/cosmos-sdk/x/upgrade" ) func TestSimAppExportAndBlockedAddrs(t *testing.T) { diff --git a/app_v2.go b/app_v2.go index fda738165681..9924011ad7c5 100644 --- a/app_v2.go +++ b/app_v2.go @@ -21,6 +21,9 @@ import ( storetypes "cosmossdk.io/store/types" feegrantkeeper "cosmossdk.io/x/feegrant/keeper" feegrantmodule "cosmossdk.io/x/feegrant/module" + "cosmossdk.io/x/upgrade" + upgradeclient "cosmossdk.io/x/upgrade/client" + upgradekeeper "cosmossdk.io/x/upgrade/keeper" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" @@ -68,9 +71,6 @@ import ( slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" "github.com/cosmos/cosmos-sdk/x/staking" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/cosmos/cosmos-sdk/x/upgrade" - upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" - upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" ) var ( diff --git a/go.mod b/go.mod index be99e47db491..77f9d222abc7 100644 --- a/go.mod +++ b/go.mod @@ -8,12 +8,13 @@ require ( cosmossdk.io/core v0.5.0 cosmossdk.io/depinject v1.0.0-alpha.3 cosmossdk.io/math v1.0.0-beta.4 - cosmossdk.io/store v0.1.0 + cosmossdk.io/store v0.0.0-20230126202154-be9bd7a8c1b4 cosmossdk.io/tools/confix v0.0.0-20230120150717-4f6f6c00021f cosmossdk.io/tools/rosetta v0.2.0 cosmossdk.io/x/evidence v0.1.0 cosmossdk.io/x/feegrant v0.0.0-20230117113717-50e7c4a4ceff cosmossdk.io/x/nft v0.0.0-20230113085233-fae3332d62fc + cosmossdk.io/x/upgrade v0.0.0-20230127052425-54c8e1568335 github.com/cosmos/cosmos-db v0.0.0-20230119180254-161cf3632b7c // this version is not used as it is always replaced by the latest cosmos-sdk version github.com/cosmos/cosmos-sdk v0.47.0-rc1 @@ -189,12 +190,11 @@ require ( replace ( cosmossdk.io/x/evidence => ../x/evidence cosmossdk.io/x/feegrant => ../x/feegrant - // TODO tag all extracted modules after SDK refactor cosmossdk.io/x/nft => ../x/nft + cosmossdk.io/x/upgrade => ../x/upgrade ) replace ( - cosmossdk.io/store => ../store // use cosmos fork of keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // Simapp always use the latest version of the cosmos-sdk diff --git a/go.sum b/go.sum index 9309c9d8594f..f300fae54bda 100644 --- a/go.sum +++ b/go.sum @@ -60,6 +60,8 @@ cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= cosmossdk.io/math v1.0.0-beta.4 h1:JtKedVLGzA0vv84xjYmZ75RKG35Kf2WwcFu8IjRkIIw= cosmossdk.io/math v1.0.0-beta.4/go.mod h1:An0MllWJY6PxibUpnwGk8jOm+a/qIxlKmL5Zyp9NnaM= +cosmossdk.io/store v0.0.0-20230126202154-be9bd7a8c1b4 h1:m7oRquCtYL8OuLWogjMzTVDIxeu5toJz6sSUU01Canw= +cosmossdk.io/store v0.0.0-20230126202154-be9bd7a8c1b4/go.mod h1:NFKdO50vvtoZBnJXlWRstqq5dxhku7sRKc/5tLsFerI= cosmossdk.io/tools/confix v0.0.0-20230120150717-4f6f6c00021f h1:LMXqH69KBG/R8w18sooHtoUZ0+5hcc99m6OjBiooDAo= cosmossdk.io/tools/confix v0.0.0-20230120150717-4f6f6c00021f/go.mod h1:/apC5+JHM2A72kUY3z+55FWdIn/2ai2mTAYtSBDY4Lo= cosmossdk.io/tools/rosetta v0.2.0 h1:Ae499UiZ9yPNCXvjOBO/R9I1pksCJfxoqWauEZgA/gs= diff --git a/upgrades.go b/upgrades.go index e466c2a8f5ae..9d3525976f3b 100644 --- a/upgrades.go +++ b/upgrades.go @@ -2,12 +2,12 @@ package simapp import ( storetypes "cosmossdk.io/store/types" + upgradetypes "cosmossdk.io/x/upgrade/types" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) // UpgradeName defines the on-chain upgrade name for the sample SimApp upgrade