Skip to content

Commit

Permalink
Merge pull request ComposableFi#231 from notional-labs/dang/v5
Browse files Browse the repository at this point in the history
change package v5
  • Loading branch information
vuong177 authored Aug 29, 2023
2 parents 9e4455d + 7a0609d commit 0f0a555
Show file tree
Hide file tree
Showing 94 changed files with 190 additions and 190 deletions.
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/centauri/v4/x/transfermiddleware/keeper"
txBoundaryAnte "github.com/notional-labs/centauri/v4/x/tx-boundary/ante"
txBoundaryKeeper "github.com/notional-labs/centauri/v4/x/tx-boundary/keeper"
tfmwKeeper "github.com/notional-labs/centauri/v5/x/transfermiddleware/keeper"
txBoundaryAnte "github.com/notional-labs/centauri/v5/x/tx-boundary/ante"
txBoundaryKeeper "github.com/notional-labs/centauri/v5/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/centauri/v4/x/transfermiddleware/keeper"
tfmwKeeper "github.com/notional-labs/centauri/v5/x/transfermiddleware/keeper"
)

type IBCPermissionDecorator struct {
Expand Down
36 changes: 18 additions & 18 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import (
vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
"github.com/cosmos/cosmos-sdk/x/bank"

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

// bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
Expand Down Expand Up @@ -92,36 +92,36 @@ import (
alliancemoduleclient "github.com/terra-money/alliance/x/alliance/client"
alliancemoduletypes "github.com/terra-money/alliance/x/alliance/types"

custombankmodule "github.com/notional-labs/centauri/v4/custom/bank"
custombankmodule "github.com/notional-labs/centauri/v5/custom/bank"

"github.com/notional-labs/centauri/v4/app/ante"
transfermiddleware "github.com/notional-labs/centauri/v4/x/transfermiddleware"
transfermiddlewaretypes "github.com/notional-labs/centauri/v4/x/transfermiddleware/types"
"github.com/notional-labs/centauri/v5/app/ante"
transfermiddleware "github.com/notional-labs/centauri/v5/x/transfermiddleware"
transfermiddlewaretypes "github.com/notional-labs/centauri/v5/x/transfermiddleware/types"

txBoundary "github.com/notional-labs/centauri/v4/x/tx-boundary"
txBoundaryTypes "github.com/notional-labs/centauri/v4/x/tx-boundary/types"
txBoundary "github.com/notional-labs/centauri/v5/x/tx-boundary"
txBoundaryTypes "github.com/notional-labs/centauri/v5/x/tx-boundary/types"

ratelimitmodule "github.com/notional-labs/centauri/v4/x/ratelimit"
ratelimitmoduletypes "github.com/notional-labs/centauri/v4/x/ratelimit/types"
ratelimitmodule "github.com/notional-labs/centauri/v5/x/ratelimit"
ratelimitmoduletypes "github.com/notional-labs/centauri/v5/x/ratelimit/types"

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

"github.com/notional-labs/centauri/v4/x/mint"
minttypes "github.com/notional-labs/centauri/v4/x/mint/types"
"github.com/notional-labs/centauri/v5/x/mint"
minttypes "github.com/notional-labs/centauri/v5/x/mint/types"

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

ibc_hooks "github.com/notional-labs/centauri/v4/x/ibc-hooks"
ibchookstypes "github.com/notional-labs/centauri/v4/x/ibc-hooks/types"
ibc_hooks "github.com/notional-labs/centauri/v5/x/ibc-hooks"
ibchookstypes "github.com/notional-labs/centauri/v5/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"

v4_5 "github.com/notional-labs/centauri/v4/app/upgrades/v4_5"
v4_5_1 "github.com/notional-labs/centauri/v4/app/upgrades/v4_5_1"
v4_5 "github.com/notional-labs/centauri/v5/app/upgrades/v4_5"
v4_5_1 "github.com/notional-labs/centauri/v5/app/upgrades/v4_5_1"

upgrades "github.com/notional-labs/centauri/v4/app/upgrades"
upgrades "github.com/notional-labs/centauri/v5/app/upgrades"
)

const (
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"

centauri "github.com/notional-labs/centauri/v4/app"
centauri "github.com/notional-labs/centauri/v5/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/centauri/v4/x/ratelimit/keeper"
ratelimitmodulekeeper "github.com/notional-labs/centauri/v5/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"

centauri "github.com/notional-labs/centauri/v4/app"
"github.com/notional-labs/centauri/v4/app/ibctesting/simapp"
routerKeeper "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper"
centauri "github.com/notional-labs/centauri/v5/app"
"github.com/notional-labs/centauri/v5/app/ibctesting/simapp"
routerKeeper "github.com/notional-labs/centauri/v5/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/centauri/v4/x/mint"
mintkeeper "github.com/notional-labs/centauri/v4/x/mint/keeper"
minttypes "github.com/notional-labs/centauri/v4/x/mint/types"
"github.com/notional-labs/centauri/v5/x/mint"
mintkeeper "github.com/notional-labs/centauri/v5/x/mint/keeper"
minttypes "github.com/notional-labs/centauri/v5/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/centauri/v4/app/ibctesting/simapp/params"
simappupgrades "github.com/notional-labs/centauri/v4/app/ibctesting/simapp/upgrades"
v6 "github.com/notional-labs/centauri/v4/app/ibctesting/simapp/upgrades/v6"
v7 "github.com/notional-labs/centauri/v4/app/ibctesting/simapp/upgrades/v7"
transfermiddleware "github.com/notional-labs/centauri/v4/x/transfermiddleware"
transfermiddlewarekeeper "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper"
transfermiddlewaretypes "github.com/notional-labs/centauri/v4/x/transfermiddleware/types"
simappparams "github.com/notional-labs/centauri/v5/app/ibctesting/simapp/params"
simappupgrades "github.com/notional-labs/centauri/v5/app/ibctesting/simapp/upgrades"
v6 "github.com/notional-labs/centauri/v5/app/ibctesting/simapp/upgrades/v6"
v7 "github.com/notional-labs/centauri/v5/app/ibctesting/simapp/upgrades/v7"
transfermiddleware "github.com/notional-labs/centauri/v5/x/transfermiddleware"
transfermiddlewarekeeper "github.com/notional-labs/centauri/v5/x/transfermiddleware/keeper"
transfermiddlewaretypes "github.com/notional-labs/centauri/v5/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/centauri/v4/app/ibctesting/simapp/params"
simappparams "github.com/notional-labs/centauri/v5/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/centauri/v4/x/mint/types"
minttypes "github.com/notional-labs/centauri/v5/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
28 changes: 14 additions & 14 deletions app/keepers/keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,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/centauri/v4/custom/bank/keeper"
custombankkeeper "github.com/notional-labs/centauri/v5/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 +76,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/centauri/v4/x/transfermiddleware"
transfermiddlewarekeeper "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper"
transfermiddlewaretypes "github.com/notional-labs/centauri/v4/x/transfermiddleware/types"
transfermiddleware "github.com/notional-labs/centauri/v5/x/transfermiddleware"
transfermiddlewarekeeper "github.com/notional-labs/centauri/v5/x/transfermiddleware/keeper"
transfermiddlewaretypes "github.com/notional-labs/centauri/v5/x/transfermiddleware/types"

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

ratelimitmodule "github.com/notional-labs/centauri/v4/x/ratelimit"
ratelimitmodulekeeper "github.com/notional-labs/centauri/v4/x/ratelimit/keeper"
ratelimitmoduletypes "github.com/notional-labs/centauri/v4/x/ratelimit/types"
ratelimitmodule "github.com/notional-labs/centauri/v5/x/ratelimit"
ratelimitmodulekeeper "github.com/notional-labs/centauri/v5/x/ratelimit/keeper"
ratelimitmoduletypes "github.com/notional-labs/centauri/v5/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/centauri/v4/x/mint/keeper"
minttypes "github.com/notional-labs/centauri/v4/x/mint/types"
mintkeeper "github.com/notional-labs/centauri/v5/x/mint/keeper"
minttypes "github.com/notional-labs/centauri/v5/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/centauri/v4/x/ibc-hooks"
ibchookskeeper "github.com/notional-labs/centauri/v4/x/ibc-hooks/keeper"
ibchookstypes "github.com/notional-labs/centauri/v4/x/ibc-hooks/types"
ibc_hooks "github.com/notional-labs/centauri/v5/x/ibc-hooks"
ibchookskeeper "github.com/notional-labs/centauri/v5/x/ibc-hooks/keeper"
ibchookstypes "github.com/notional-labs/centauri/v5/x/ibc-hooks/types"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions app/keepers/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,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/centauri/v4/x/ibc-hooks/types"
ratelimitmoduletypes "github.com/notional-labs/centauri/v4/x/ratelimit/types"
transfermiddlewaretypes "github.com/notional-labs/centauri/v4/x/transfermiddleware/types"
txBoundaryTypes "github.com/notional-labs/centauri/v4/x/tx-boundary/types"
ibchookstypes "github.com/notional-labs/centauri/v5/x/ibc-hooks/types"
ratelimitmoduletypes "github.com/notional-labs/centauri/v5/x/ratelimit/types"
transfermiddlewaretypes "github.com/notional-labs/centauri/v5/x/transfermiddleware/types"
txBoundaryTypes "github.com/notional-labs/centauri/v5/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/centauri/v4/x/mint/types"
minttypes "github.com/notional-labs/centauri/v5/x/mint/types"

"github.com/CosmWasm/wasmd/x/wasm"
wasm08types "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types"
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/centauri/v4/x/ratelimit/keeper"
tfmdKeeper "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper"
ratelimitkeeper "github.com/notional-labs/centauri/v5/x/ratelimit/keeper"
tfmdKeeper "github.com/notional-labs/centauri/v5/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/centauri/v4/x/mint/types"
minttypes "github.com/notional-labs/centauri/v5/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/centauri/v4/bech32-migration/auth"
bech32govmigration "github.com/notional-labs/centauri/v4/bech32-migration/gov"
bech32slashingmigration "github.com/notional-labs/centauri/v4/bech32-migration/slashing"
bech32stakingmigration "github.com/notional-labs/centauri/v4/bech32-migration/staking"
bech32authmigration "github.com/notional-labs/centauri/v5/bech32-migration/auth"
bech32govmigration "github.com/notional-labs/centauri/v5/bech32-migration/gov"
bech32slashingmigration "github.com/notional-labs/centauri/v5/bech32-migration/slashing"
bech32stakingmigration "github.com/notional-labs/centauri/v5/bech32-migration/staking"
)

func CreateUpgradeHandler(
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/reward/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

mintkeeper "github.com/notional-labs/centauri/v4/x/mint/keeper"
tfmwkeeper "github.com/notional-labs/centauri/v4/x/transfermiddleware/keeper"
mintkeeper "github.com/notional-labs/centauri/v5/x/mint/keeper"
tfmwkeeper "github.com/notional-labs/centauri/v5/x/transfermiddleware/keeper"
)

var listAllowedRelayAddress = []string{
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/notional-labs/centauri/v4/app/keepers"
"github.com/notional-labs/centauri/v5/app/keepers"
)

// BaseAppParamManager defines an interrace that BaseApp is expected to fullfil
Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/v4/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
store "github.com/cosmos/cosmos-sdk/store/types"
icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"

"github.com/notional-labs/centauri/v4/app/upgrades"
ibchookstypes "github.com/notional-labs/centauri/v4/x/ibc-hooks/types"
ratelimitmoduletypes "github.com/notional-labs/centauri/v4/x/ratelimit/types"
"github.com/notional-labs/centauri/v5/app/upgrades"
ibchookstypes "github.com/notional-labs/centauri/v5/x/ibc-hooks/types"
ratelimitmoduletypes "github.com/notional-labs/centauri/v5/x/ratelimit/types"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions app/upgrades/v4/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"github.com/cosmos/cosmos-sdk/types/module"
upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"

"github.com/notional-labs/centauri/v4/app/keepers"
"github.com/notional-labs/centauri/v4/app/upgrades"
tfmdtypes "github.com/notional-labs/centauri/v4/x/transfermiddleware/types"
"github.com/notional-labs/centauri/v5/app/keepers"
"github.com/notional-labs/centauri/v5/app/upgrades"
tfmdtypes "github.com/notional-labs/centauri/v5/x/transfermiddleware/types"
)

func CreateUpgradeHandler(
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v4_5/constants.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package v45

import "github.com/notional-labs/centauri/v4/app/upgrades"
import "github.com/notional-labs/centauri/v5/app/upgrades"

const (
// UpgradeName defines the on-chain upgrade name for the Centauri upgrade.
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v4_5/fork.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"

"github.com/notional-labs/centauri/v4/app/keepers"
"github.com/notional-labs/centauri/v5/app/keepers"
)

func RunForkLogic(ctx sdk.Context, appKeepers *keepers.AppKeepers) {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v4_5_1/constants.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package v4_5_1

import "github.com/notional-labs/centauri/v4/app/upgrades"
import "github.com/notional-labs/centauri/v5/app/upgrades"

const (
// UpgradeName defines the on-chain upgrade name for the Composable v5 upgrade.
Expand Down
4 changes: 2 additions & 2 deletions app/upgrades/v4_5_1/fork.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package v4_5_1
import (
sdk "github.com/cosmos/cosmos-sdk/types"

"github.com/notional-labs/centauri/v4/app/keepers"
rateLimitKeeper "github.com/notional-labs/centauri/v4/x/ratelimit/keeper"
"github.com/notional-labs/centauri/v5/app/keepers"
rateLimitKeeper "github.com/notional-labs/centauri/v5/x/ratelimit/keeper"
)

func RunForkLogic(ctx sdk.Context, keepers *keepers.AppKeepers) {
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v5/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package v5

import (
store "github.com/cosmos/cosmos-sdk/store/types"
"github.com/notional-labs/centauri/v4/app/upgrades"
"github.com/notional-labs/centauri/v5/app/upgrades"
)

const (
Expand Down
Loading

0 comments on commit 0f0a555

Please sign in to comment.