apply cherry patch and update tag to v2

app/app.go

@@ -41,23 +41,23 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
-	"github.com/classic-terra/core/app/keepers"
-	terraappparams "github.com/classic-terra/core/app/params"
+	"github.com/classic-terra/core/v2/app/keepers"
+	terraappparams "github.com/classic-terra/core/v2/app/params"
 
 	// upgrades
-	"github.com/classic-terra/core/app/upgrades"
-	v2 "github.com/classic-terra/core/app/upgrades/v2"
-	v3 "github.com/classic-terra/core/app/upgrades/v3"
+	"github.com/classic-terra/core/v2/app/upgrades"
+	v2 "github.com/classic-terra/core/v2/app/upgrades/v2"
+	v3 "github.com/classic-terra/core/v2/app/upgrades/v3"
 
-	customante "github.com/classic-terra/core/custom/auth/ante"
-	customauthrest "github.com/classic-terra/core/custom/auth/client/rest"
-	customauthtx "github.com/classic-terra/core/custom/auth/tx"
-	core "github.com/classic-terra/core/types"
+	customante "github.com/classic-terra/core/v2/custom/auth/ante"
+	customauthrest "github.com/classic-terra/core/v2/custom/auth/client/rest"
+	customauthtx "github.com/classic-terra/core/v2/custom/auth/tx"
+	core "github.com/classic-terra/core/v2/types"
 
-	wasmconfig "github.com/classic-terra/core/x/wasm/config"
+	wasmconfig "github.com/classic-terra/core/v2/x/wasm/config"
 
 	// unnamed import of statik for swagger UI support
-	_ "github.com/classic-terra/core/client/docs/statik"
+	_ "github.com/classic-terra/core/v2/client/docs/statik"
 )
 
 const appName = "TerraApp"
@@ -285,7 +285,7 @@ func (app *TerraApp) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abc
 		panic(err)
 	}
 	if ctx.ChainID() == core.ColumbusChainID {
-		panic("Must use v1.0.x for importing the columbus genesis (https://github.com/classic-terra/core/releases/)")
+		panic("Must use v1.0.x for importing the columbus genesis (https://github.com/classic-terra/core/v2/releases/)")
 	}
 	app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap())
 	return app.mm.InitGenesis(ctx, app.appCodec, genesisState)

app/encoding.go

@@ -4,7 +4,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	"github.com/cosmos/cosmos-sdk/std"
 
-	"github.com/classic-terra/core/app/params"
+	"github.com/classic-terra/core/v2/app/params"
 )
 
 var legacyCodecRegistered = false

app/export.go

@@ -12,7 +12,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/staking"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	oracletypes "github.com/classic-terra/core/x/oracle/types"
+	oracletypes "github.com/classic-terra/core/v2/x/oracle/types"
 )
 
 // ExportAppStateAndValidators exports the state of the application for a genesis

app/keepers/keepers.go

@@ -38,26 +38,26 @@ import (
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	marketkeeper "github.com/classic-terra/core/x/market/keeper"
-	markettypes "github.com/classic-terra/core/x/market/types"
-	oraclekeeper "github.com/classic-terra/core/x/oracle/keeper"
-	oracletypes "github.com/classic-terra/core/x/oracle/types"
-	treasurykeeper "github.com/classic-terra/core/x/treasury/keeper"
-	treasurytypes "github.com/classic-terra/core/x/treasury/types"
-	wasmconfig "github.com/classic-terra/core/x/wasm/config"
-	wasmkeeper "github.com/classic-terra/core/x/wasm/keeper"
-	wasmtypes "github.com/classic-terra/core/x/wasm/types"
-
-	bankwasm "github.com/classic-terra/core/custom/bank/wasm"
-	distrwasm "github.com/classic-terra/core/custom/distribution/wasm"
-	govwasm "github.com/classic-terra/core/custom/gov/wasm"
-	stakingwasm "github.com/classic-terra/core/custom/staking/wasm"
-	marketwasm "github.com/classic-terra/core/x/market/wasm"
-	oraclewasm "github.com/classic-terra/core/x/oracle/wasm"
-	treasurywasm "github.com/classic-terra/core/x/treasury/wasm"
+	marketkeeper "github.com/classic-terra/core/v2/x/market/keeper"
+	markettypes "github.com/classic-terra/core/v2/x/market/types"
+	oraclekeeper "github.com/classic-terra/core/v2/x/oracle/keeper"
+	oracletypes "github.com/classic-terra/core/v2/x/oracle/types"
+	treasurykeeper "github.com/classic-terra/core/v2/x/treasury/keeper"
+	treasurytypes "github.com/classic-terra/core/v2/x/treasury/types"
+	wasmconfig "github.com/classic-terra/core/v2/x/wasm/config"
+	wasmkeeper "github.com/classic-terra/core/v2/x/wasm/keeper"
+	wasmtypes "github.com/classic-terra/core/v2/x/wasm/types"
+
+	bankwasm "github.com/classic-terra/core/v2/custom/bank/wasm"
+	distrwasm "github.com/classic-terra/core/v2/custom/distribution/wasm"
+	govwasm "github.com/classic-terra/core/v2/custom/gov/wasm"
+	stakingwasm "github.com/classic-terra/core/v2/custom/staking/wasm"
+	marketwasm "github.com/classic-terra/core/v2/x/market/wasm"
+	oraclewasm "github.com/classic-terra/core/v2/x/oracle/wasm"
+	treasurywasm "github.com/classic-terra/core/v2/x/treasury/wasm"
 
 	// unnamed import of statik for swagger UI support
-	_ "github.com/classic-terra/core/client/docs/statik"
+	_ "github.com/classic-terra/core/v2/client/docs/statik"
 )
 
 type AppKeepers struct {

app/keepers/keys.go

@@ -20,13 +20,13 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	markettypes "github.com/classic-terra/core/x/market/types"
-	oracletypes "github.com/classic-terra/core/x/oracle/types"
-	treasurytypes "github.com/classic-terra/core/x/treasury/types"
-	wasmtypes "github.com/classic-terra/core/x/wasm/types"
+	markettypes "github.com/classic-terra/core/v2/x/market/types"
+	oracletypes "github.com/classic-terra/core/v2/x/oracle/types"
+	treasurytypes "github.com/classic-terra/core/v2/x/treasury/types"
+	wasmtypes "github.com/classic-terra/core/v2/x/wasm/types"
 
 	// unnamed import of statik for swagger UI support
-	_ "github.com/classic-terra/core/client/docs/statik"
+	_ "github.com/classic-terra/core/v2/client/docs/statik"
 )
 
 func (appKeepers *AppKeepers) GenerateKeys() {

app/keepers/routers.go

@@ -7,8 +7,8 @@ import (
 	ibcclienttypes "github.com/cosmos/ibc-go/modules/core/02-client/types"
 	porttypes "github.com/cosmos/ibc-go/modules/core/05-port/types"
 
-	"github.com/classic-terra/core/x/treasury"
-	treasurytypes "github.com/classic-terra/core/x/treasury/types"
+	"github.com/classic-terra/core/v2/x/treasury"
+	treasurytypes "github.com/classic-terra/core/v2/x/treasury/types"
 	distr "github.com/cosmos/cosmos-sdk/x/distribution"
 	distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"

app/legacy/migrate.go

@@ -26,8 +26,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/genutil/types"
 	staking "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	legacy05 "github.com/classic-terra/core/app/legacy/v05"
-	oracletypes "github.com/classic-terra/core/x/oracle/types"
+	legacy05 "github.com/classic-terra/core/v2/app/legacy/v05"
+	oracletypes "github.com/classic-terra/core/v2/x/oracle/types"
 )
 
 const (

app/legacy/v05/migrate.go

@@ -27,24 +27,24 @@ import (
 	v038staking "github.com/cosmos/cosmos-sdk/x/staking/legacy/v038"
 	v040staking "github.com/cosmos/cosmos-sdk/x/staking/legacy/v040"
 
-	v039authcustom "github.com/classic-terra/core/custom/auth/legacy/v039"
-	v040authcustom "github.com/classic-terra/core/custom/auth/legacy/v040"
-	v036distrcustom "github.com/classic-terra/core/custom/distribution/legacy/v036"
-	v036govcustom "github.com/classic-terra/core/custom/gov/legacy/v036"
-	v043govcustom "github.com/classic-terra/core/custom/gov/legacy/v043"
-	v036paramscustom "github.com/classic-terra/core/custom/params/legacy/v036"
-	v038upgradecustom "github.com/classic-terra/core/custom/upgrade/legacy/v038"
-
-	v043authz "github.com/classic-terra/core/custom/authz/legacy/v043"
-	v04market "github.com/classic-terra/core/x/market/legacy/v04"
-	v05market "github.com/classic-terra/core/x/market/legacy/v05"
-	v04msgauth "github.com/classic-terra/core/x/msgauth/legacy/v04"
-	v04oracle "github.com/classic-terra/core/x/oracle/legacy/v04"
-	v05oracle "github.com/classic-terra/core/x/oracle/legacy/v05"
-	v04treasury "github.com/classic-terra/core/x/treasury/legacy/v04"
-	v05treasury "github.com/classic-terra/core/x/treasury/legacy/v05"
-	v04wasm "github.com/classic-terra/core/x/wasm/legacy/v04"
-	v05wasm "github.com/classic-terra/core/x/wasm/legacy/v05"
+	v039authcustom "github.com/classic-terra/core/v2/custom/auth/legacy/v039"
+	v040authcustom "github.com/classic-terra/core/v2/custom/auth/legacy/v040"
+	v036distrcustom "github.com/classic-terra/core/v2/custom/distribution/legacy/v036"
+	v036govcustom "github.com/classic-terra/core/v2/custom/gov/legacy/v036"
+	v043govcustom "github.com/classic-terra/core/v2/custom/gov/legacy/v043"
+	v036paramscustom "github.com/classic-terra/core/v2/custom/params/legacy/v036"
+	v038upgradecustom "github.com/classic-terra/core/v2/custom/upgrade/legacy/v038"
+
+	v043authz "github.com/classic-terra/core/v2/custom/authz/legacy/v043"
+	v04market "github.com/classic-terra/core/v2/x/market/legacy/v04"
+	v05market "github.com/classic-terra/core/v2/x/market/legacy/v05"
+	v04msgauth "github.com/classic-terra/core/v2/x/msgauth/legacy/v04"
+	v04oracle "github.com/classic-terra/core/v2/x/oracle/legacy/v04"
+	v05oracle "github.com/classic-terra/core/v2/x/oracle/legacy/v05"
+	v04treasury "github.com/classic-terra/core/v2/x/treasury/legacy/v04"
+	v05treasury "github.com/classic-terra/core/v2/x/treasury/legacy/v05"
+	v04wasm "github.com/classic-terra/core/v2/x/wasm/legacy/v04"
+	v05wasm "github.com/classic-terra/core/v2/x/wasm/legacy/v05"
 )
 
 func migrateGenutil(oldGenState v039genutil.GenesisState) *types.GenesisState {

app/modules.go

@@ -42,36 +42,36 @@ import (
 	upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
-	terraappparams "github.com/classic-terra/core/app/params"
+	terraappparams "github.com/classic-terra/core/v2/app/params"
 
-	customauth "github.com/classic-terra/core/custom/auth"
-	customauthsim "github.com/classic-terra/core/custom/auth/simulation"
-	customauthz "github.com/classic-terra/core/custom/authz"
-	custombank "github.com/classic-terra/core/custom/bank"
-	customcrisis "github.com/classic-terra/core/custom/crisis"
-	customdistr "github.com/classic-terra/core/custom/distribution"
-	customevidence "github.com/classic-terra/core/custom/evidence"
-	customfeegrant "github.com/classic-terra/core/custom/feegrant"
-	customgov "github.com/classic-terra/core/custom/gov"
-	custommint "github.com/classic-terra/core/custom/mint"
-	customparams "github.com/classic-terra/core/custom/params"
-	customslashing "github.com/classic-terra/core/custom/slashing"
-	customstaking "github.com/classic-terra/core/custom/staking"
-	customupgrade "github.com/classic-terra/core/custom/upgrade"
+	customauth "github.com/classic-terra/core/v2/custom/auth"
+	customauthsim "github.com/classic-terra/core/v2/custom/auth/simulation"
+	customauthz "github.com/classic-terra/core/v2/custom/authz"
+	custombank "github.com/classic-terra/core/v2/custom/bank"
+	customcrisis "github.com/classic-terra/core/v2/custom/crisis"
+	customdistr "github.com/classic-terra/core/v2/custom/distribution"
+	customevidence "github.com/classic-terra/core/v2/custom/evidence"
+	customfeegrant "github.com/classic-terra/core/v2/custom/feegrant"
+	customgov "github.com/classic-terra/core/v2/custom/gov"
+	custommint "github.com/classic-terra/core/v2/custom/mint"
+	customparams "github.com/classic-terra/core/v2/custom/params"
+	customslashing "github.com/classic-terra/core/v2/custom/slashing"
+	customstaking "github.com/classic-terra/core/v2/custom/staking"
+	customupgrade "github.com/classic-terra/core/v2/custom/upgrade"
 
-	"github.com/classic-terra/core/x/market"
-	markettypes "github.com/classic-terra/core/x/market/types"
-	"github.com/classic-terra/core/x/oracle"
-	oracletypes "github.com/classic-terra/core/x/oracle/types"
-	"github.com/classic-terra/core/x/treasury"
-	treasuryclient "github.com/classic-terra/core/x/treasury/client"
-	treasurytypes "github.com/classic-terra/core/x/treasury/types"
-	"github.com/classic-terra/core/x/vesting"
-	"github.com/classic-terra/core/x/wasm"
-	wasmtypes "github.com/classic-terra/core/x/wasm/types"
+	"github.com/classic-terra/core/v2/x/market"
+	markettypes "github.com/classic-terra/core/v2/x/market/types"
+	"github.com/classic-terra/core/v2/x/oracle"
+	oracletypes "github.com/classic-terra/core/v2/x/oracle/types"
+	"github.com/classic-terra/core/v2/x/treasury"
+	treasuryclient "github.com/classic-terra/core/v2/x/treasury/client"
+	treasurytypes "github.com/classic-terra/core/v2/x/treasury/types"
+	"github.com/classic-terra/core/v2/x/vesting"
+	"github.com/classic-terra/core/v2/x/wasm"
+	wasmtypes "github.com/classic-terra/core/v2/x/wasm/types"
 
 	// unnamed import of statik for swagger UI support
-	_ "github.com/classic-terra/core/client/docs/statik"
+	_ "github.com/classic-terra/core/v2/client/docs/statik"
 )
 
 var (

app/sim_test.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"testing"
 
-	terraapp "github.com/classic-terra/core/app"
-	"github.com/classic-terra/core/app/helpers"
-	wasmconfig "github.com/classic-terra/core/x/wasm/config"
+	terraapp "github.com/classic-terra/core/v2/app"
+	"github.com/classic-terra/core/v2/app/helpers"
+	wasmconfig "github.com/classic-terra/core/v2/x/wasm/config"
 
 	"github.com/stretchr/testify/require"
 	"github.com/tendermint/tendermint/libs/log"

app/upgrades/types.go

@@ -7,7 +7,7 @@ import (
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/classic-terra/core/app/keepers"
+	"github.com/classic-terra/core/v2/app/keepers"
 )
 
 // BaseAppParamManager defines an interrace that BaseApp is expected to fullfil

app/upgrades/v2/constants.go

@@ -1,7 +1,7 @@
 package v2
 
 import (
-	"github.com/classic-terra/core/app/upgrades"
+	"github.com/classic-terra/core/v2/app/upgrades"
 	store "github.com/cosmos/cosmos-sdk/store/types"
 )
 

app/upgrades/v2/upgrades.go

@@ -1,8 +1,8 @@
 package v2
 
 import (
-	"github.com/classic-terra/core/app/keepers"
-	"github.com/classic-terra/core/app/upgrades"
+	"github.com/classic-terra/core/v2/app/keepers"
+	"github.com/classic-terra/core/v2/app/upgrades"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

app/upgrades/v3/constants.go

@@ -1,7 +1,7 @@
 package v3
 
 import (
-	"github.com/classic-terra/core/app/upgrades"
+	"github.com/classic-terra/core/v2/app/upgrades"
 	store "github.com/cosmos/cosmos-sdk/store/types"
 )
 

app/upgrades/v3/upgrades.go

@@ -1,8 +1,8 @@
 package v3
 
 import (
-	"github.com/classic-terra/core/app/keepers"
-	"github.com/classic-terra/core/app/upgrades"
+	"github.com/classic-terra/core/v2/app/keepers"
+	"github.com/classic-terra/core/v2/app/upgrades"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

cmd/terrad/config.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	wasmconfig "github.com/classic-terra/core/x/wasm/config"
+	wasmconfig "github.com/classic-terra/core/v2/x/wasm/config"
 
 	serverconfig "github.com/cosmos/cosmos-sdk/server/config"
 )

cmd/terrad/genaccounts.go

@@ -21,7 +21,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 
-	vestingtypes "github.com/classic-terra/core/x/vesting/types"
+	vestingtypes "github.com/classic-terra/core/v2/x/vesting/types"
 )
 
 const (

cmd/terrad/main.go

@@ -6,7 +6,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/server"
 	svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
 
-	terraapp "github.com/classic-terra/core/app"
+	terraapp "github.com/classic-terra/core/v2/app"
 )
 
 func main() {

cmd/terrad/root.go

@@ -30,12 +30,12 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
 
-	terraapp "github.com/classic-terra/core/app"
-	terralegacy "github.com/classic-terra/core/app/legacy"
-	"github.com/classic-terra/core/app/params"
-	authcustomcli "github.com/classic-terra/core/custom/auth/client/cli"
-	core "github.com/classic-terra/core/types"
-	wasmconfig "github.com/classic-terra/core/x/wasm/config"
+	terraapp "github.com/classic-terra/core/v2/app"
+	terralegacy "github.com/classic-terra/core/v2/app/legacy"
+	"github.com/classic-terra/core/v2/app/params"
+	authcustomcli "github.com/classic-terra/core/v2/custom/auth/client/cli"
+	core "github.com/classic-terra/core/v2/types"
+	wasmconfig "github.com/classic-terra/core/v2/x/wasm/config"
 )
 
 // NewRootCmd creates a new root command for terrad. It is called once in the

cmd/terrad/testnet.go

@@ -36,7 +36,7 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	core "github.com/classic-terra/core/types"
+	core "github.com/classic-terra/core/v2/types"
 )
 
 var (

custom/auth/ante/ante_test.go

@@ -24,9 +24,9 @@ import (
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 
-	terraapp "github.com/classic-terra/core/app"
-	treasurytypes "github.com/classic-terra/core/x/treasury/types"
-	wasmconfig "github.com/classic-terra/core/x/wasm/config"
+	terraapp "github.com/classic-terra/core/v2/app"
+	treasurytypes "github.com/classic-terra/core/v2/x/treasury/types"
+	wasmconfig "github.com/classic-terra/core/v2/x/wasm/config"
 )
 
 // AnteTestSuite is a test suite to be used with ante handler tests.

custom/auth/ante/burntax.go

@@ -1,7 +1,7 @@
 package ante
 
 import (
-	treasury "github.com/classic-terra/core/x/treasury/types"
+	treasury "github.com/classic-terra/core/v2/x/treasury/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	cosmosante "github.com/cosmos/cosmos-sdk/x/auth/ante"