Skip to content

Commit

Permalink
Change core version to v3
Browse files Browse the repository at this point in the history
  • Loading branch information
phamminh0811 committed Apr 19, 2024
1 parent 5754c27 commit 7d7b117
Show file tree
Hide file tree
Showing 240 changed files with 515 additions and 516 deletions.
32 changes: 16 additions & 16 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,28 @@ import (
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/classic-terra/core/v2/app/keepers"
terraappparams "github.com/classic-terra/core/v2/app/params"
"github.com/classic-terra/core/v3/app/keepers"
terraappparams "github.com/classic-terra/core/v3/app/params"

// upgrades
"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"
v4 "github.com/classic-terra/core/v2/app/upgrades/v4"
v5 "github.com/classic-terra/core/v2/app/upgrades/v5"
v6 "github.com/classic-terra/core/v2/app/upgrades/v6"
v6_1 "github.com/classic-terra/core/v2/app/upgrades/v6_1"
v7 "github.com/classic-terra/core/v2/app/upgrades/v7"
v8 "github.com/classic-terra/core/v2/app/upgrades/v8"

customante "github.com/classic-terra/core/v2/custom/auth/ante"
custompost "github.com/classic-terra/core/v2/custom/auth/post"
customauthtx "github.com/classic-terra/core/v2/custom/auth/tx"
"github.com/classic-terra/core/v3/app/upgrades"
v2 "github.com/classic-terra/core/v3/app/upgrades/v2"
v3 "github.com/classic-terra/core/v3/app/upgrades/v3"
v4 "github.com/classic-terra/core/v3/app/upgrades/v4"
v5 "github.com/classic-terra/core/v3/app/upgrades/v5"
v6 "github.com/classic-terra/core/v3/app/upgrades/v6"
v6_1 "github.com/classic-terra/core/v3/app/upgrades/v6_1"
v7 "github.com/classic-terra/core/v3/app/upgrades/v7"
v8 "github.com/classic-terra/core/v3/app/upgrades/v8"

customante "github.com/classic-terra/core/v3/custom/auth/ante"
custompost "github.com/classic-terra/core/v3/custom/auth/post"
customauthtx "github.com/classic-terra/core/v3/custom/auth/tx"

"github.com/CosmWasm/wasmd/x/wasm"

// unnamed import of statik for swagger UI support
_ "github.com/classic-terra/core/v2/client/docs/statik"
_ "github.com/classic-terra/core/v3/client/docs/statik"
)

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

"github.com/classic-terra/core/v2/app/params"
"github.com/classic-terra/core/v3/app/params"
)

var legacyCodecRegistered = false
Expand Down
2 changes: 1 addition & 1 deletion app/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v2/x/oracle/types"
oracletypes "github.com/classic-terra/core/v3/x/oracle/types"
)

// ExportAppStateAndValidators exports the state of the application for a genesis
Expand Down
22 changes: 11 additions & 11 deletions app/keepers/keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ import (
"github.com/CosmWasm/wasmd/x/wasm"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
customwasmkeeper "github.com/classic-terra/core/v2/custom/wasm/keeper"
terrawasm "github.com/classic-terra/core/v2/wasmbinding"

dyncommkeeper "github.com/classic-terra/core/v2/x/dyncomm/keeper"
dyncommtypes "github.com/classic-terra/core/v2/x/dyncomm/types"
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"
customwasmkeeper "github.com/classic-terra/core/v3/custom/wasm/keeper"
terrawasm "github.com/classic-terra/core/v3/wasmbinding"

dyncommkeeper "github.com/classic-terra/core/v3/x/dyncomm/keeper"
dyncommtypes "github.com/classic-terra/core/v3/x/dyncomm/types"
marketkeeper "github.com/classic-terra/core/v3/x/market/keeper"
markettypes "github.com/classic-terra/core/v3/x/market/types"
oraclekeeper "github.com/classic-terra/core/v3/x/oracle/keeper"
oracletypes "github.com/classic-terra/core/v3/x/oracle/types"
treasurykeeper "github.com/classic-terra/core/v3/x/treasury/keeper"
treasurytypes "github.com/classic-terra/core/v3/x/treasury/types"
)

type AppKeepers struct {
Expand Down
4 changes: 2 additions & 2 deletions app/keepers/routers.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"
porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"

"github.com/classic-terra/core/v2/x/treasury"
treasurytypes "github.com/classic-terra/core/v2/x/treasury/types"
"github.com/classic-terra/core/v3/x/treasury"
treasurytypes "github.com/classic-terra/core/v3/x/treasury/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
"github.com/cosmos/cosmos-sdk/x/params"
Expand Down
4 changes: 2 additions & 2 deletions app/legacy/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/spf13/cobra"

ibcxfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
"github.com/cosmos/ibc-go/v7/modules/core/exported"
ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
ibccoretypes "github.com/cosmos/ibc-go/v7/modules/core/types"

"github.com/cosmos/cosmos-sdk/client"
Expand All @@ -26,7 +26,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/genutil/types"
staking "github.com/cosmos/cosmos-sdk/x/staking/types"

oracletypes "github.com/classic-terra/core/v2/x/oracle/types"
oracletypes "github.com/classic-terra/core/v3/x/oracle/types"
)

const (
Expand Down
56 changes: 28 additions & 28 deletions app/modules.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,32 @@ package app
import (
"github.com/CosmWasm/wasmd/x/wasm"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
terraappparams "github.com/classic-terra/core/v2/app/params"
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"
customwasm "github.com/classic-terra/core/v2/custom/wasm"
"github.com/classic-terra/core/v2/x/dyncomm"
dyncommtypes "github.com/classic-terra/core/v2/x/dyncomm/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"
terraappparams "github.com/classic-terra/core/v3/app/params"
customauth "github.com/classic-terra/core/v3/custom/auth"
customauthsim "github.com/classic-terra/core/v3/custom/auth/simulation"
customauthz "github.com/classic-terra/core/v3/custom/authz"
custombank "github.com/classic-terra/core/v3/custom/bank"
customcrisis "github.com/classic-terra/core/v3/custom/crisis"
customdistr "github.com/classic-terra/core/v3/custom/distribution"
customevidence "github.com/classic-terra/core/v3/custom/evidence"
customfeegrant "github.com/classic-terra/core/v3/custom/feegrant"
customgov "github.com/classic-terra/core/v3/custom/gov"
custommint "github.com/classic-terra/core/v3/custom/mint"
customparams "github.com/classic-terra/core/v3/custom/params"
customslashing "github.com/classic-terra/core/v3/custom/slashing"
customstaking "github.com/classic-terra/core/v3/custom/staking"
customupgrade "github.com/classic-terra/core/v3/custom/upgrade"
customwasm "github.com/classic-terra/core/v3/custom/wasm"
"github.com/classic-terra/core/v3/x/dyncomm"
dyncommtypes "github.com/classic-terra/core/v3/x/dyncomm/types"
"github.com/classic-terra/core/v3/x/market"
markettypes "github.com/classic-terra/core/v3/x/market/types"
"github.com/classic-terra/core/v3/x/oracle"
oracletypes "github.com/classic-terra/core/v3/x/oracle/types"
"github.com/classic-terra/core/v3/x/treasury"
treasuryclient "github.com/classic-terra/core/v3/x/treasury/client"
treasurytypes "github.com/classic-terra/core/v3/x/treasury/types"
"github.com/classic-terra/core/v3/x/vesting"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/x/auth"
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
Expand Down Expand Up @@ -74,12 +74,12 @@ import (
transfer "github.com/cosmos/ibc-go/v7/modules/apps/transfer"
ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
ibc "github.com/cosmos/ibc-go/v7/modules/core"
ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
ibcclientclient "github.com/cosmos/ibc-go/v7/modules/core/02-client/client"
ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"

// unnamed import of statik for swagger UI support
_ "github.com/classic-terra/core/v2/client/docs/statik"
_ "github.com/classic-terra/core/v3/client/docs/statik"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions app/sim_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/CosmWasm/wasmd/x/wasm"
wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
terraapp "github.com/classic-terra/core/v2/app"
helpers "github.com/classic-terra/core/v2/app/testing"
terraapp "github.com/classic-terra/core/v3/app"
helpers "github.com/classic-terra/core/v3/app/testing"

dbm "github.com/cometbft/cometbft-db"
"github.com/cometbft/cometbft/libs/log"
Expand Down
12 changes: 6 additions & 6 deletions app/testing/test_suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (

"github.com/CosmWasm/wasmd/x/wasm"
wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/classic-terra/core/v2/app"
appparams "github.com/classic-terra/core/v2/app/params"
dyncommtypes "github.com/classic-terra/core/v2/x/dyncomm/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"
"github.com/classic-terra/core/v3/app"
appparams "github.com/classic-terra/core/v3/app/params"
dyncommtypes "github.com/classic-terra/core/v3/x/dyncomm/types"
markettypes "github.com/classic-terra/core/v3/x/market/types"
oracletypes "github.com/classic-terra/core/v3/x/oracle/types"
treasurytypes "github.com/classic-terra/core/v3/x/treasury/types"
dbm "github.com/cometbft/cometbft-db"
abci "github.com/cometbft/cometbft/abci/types"
"github.com/cometbft/cometbft/libs/log"
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/forks/constants.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package forks

import (
"github.com/classic-terra/core/v2/app/upgrades"
"github.com/classic-terra/core/v2/types/fork"
"github.com/classic-terra/core/v3/app/upgrades"
"github.com/classic-terra/core/v3/types/fork"
)

var DisableSwapFork = upgrades.Fork{
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/forks/forks.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package forks
import (
"fmt"

"github.com/classic-terra/core/v2/app/keepers"
core "github.com/classic-terra/core/v2/types"
"github.com/classic-terra/core/v3/app/keepers"
core "github.com/classic-terra/core/v3/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/classic-terra/core/v2/app/keepers"
"github.com/classic-terra/core/v3/app/keepers"
)

// BaseAppParamManager defines an interrace that BaseApp is expected to fullfil
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v2/constants.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v2

import (
"github.com/classic-terra/core/v2/app/upgrades"
"github.com/classic-terra/core/v3/app/upgrades"
store "github.com/cosmos/cosmos-sdk/store/types"
)

Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v2/upgrades.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package v2

import (
"github.com/classic-terra/core/v2/app/keepers"
"github.com/classic-terra/core/v2/app/upgrades"
"github.com/classic-terra/core/v3/app/keepers"
"github.com/classic-terra/core/v3/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"
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v3/constants.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v3

import (
"github.com/classic-terra/core/v2/app/upgrades"
"github.com/classic-terra/core/v3/app/upgrades"
store "github.com/cosmos/cosmos-sdk/store/types"
)

Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v3/upgrades.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package v3

import (
"github.com/classic-terra/core/v2/app/keepers"
"github.com/classic-terra/core/v2/app/upgrades"
"github.com/classic-terra/core/v3/app/keepers"
"github.com/classic-terra/core/v3/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"
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v4/constants.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v4

import (
"github.com/classic-terra/core/v2/app/upgrades"
"github.com/classic-terra/core/v3/app/upgrades"
store "github.com/cosmos/cosmos-sdk/store/types"
icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
)
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v4/upgrades.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package v4

import (
"github.com/classic-terra/core/v2/app/keepers"
"github.com/classic-terra/core/v2/app/upgrades"
"github.com/classic-terra/core/v3/app/keepers"
"github.com/classic-terra/core/v3/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"
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v5/constants.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v5

import (
"github.com/classic-terra/core/v2/app/upgrades"
"github.com/classic-terra/core/v3/app/upgrades"
store "github.com/cosmos/cosmos-sdk/store/types"

icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v5/upgrades.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package v5

import (
"github.com/classic-terra/core/v2/app/keepers"
"github.com/classic-terra/core/v2/app/upgrades"
"github.com/classic-terra/core/v3/app/keepers"
"github.com/classic-terra/core/v3/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"
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v6/constants.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package v6

import (
"github.com/classic-terra/core/v2/app/upgrades"
dyncommtypes "github.com/classic-terra/core/v2/x/dyncomm/types"
"github.com/classic-terra/core/v3/app/upgrades"
dyncommtypes "github.com/classic-terra/core/v3/x/dyncomm/types"
store "github.com/cosmos/cosmos-sdk/store/types"
)

Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v6/upgrades.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package v6

import (
"github.com/classic-terra/core/v2/app/keepers"
"github.com/classic-terra/core/v2/app/upgrades"
"github.com/classic-terra/core/v3/app/keepers"
"github.com/classic-terra/core/v3/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"
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v6_1/constants.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v61

import (
"github.com/classic-terra/core/v2/app/upgrades"
"github.com/classic-terra/core/v3/app/upgrades"
store "github.com/cosmos/cosmos-sdk/store/types"
)

Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v6_1/upgrades.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package v61

import (
"github.com/classic-terra/core/v2/app/keepers"
"github.com/classic-terra/core/v2/app/upgrades"
"github.com/classic-terra/core/v3/app/keepers"
"github.com/classic-terra/core/v3/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"
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v7/constants.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package v7

import (
"github.com/classic-terra/core/v2/app/upgrades"
ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types"
"github.com/classic-terra/core/v3/app/upgrades"
store "github.com/cosmos/cosmos-sdk/store/types"
ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types"
)

const UpgradeName = "v7"
Expand Down
Loading

0 comments on commit 7d7b117

Please sign in to comment.