From 5d72ab1fe58896681180ce6cd318a6fa8a494a64 Mon Sep 17 00:00:00 2001 From: GnaD13 Date: Thu, 12 Oct 2023 11:35:57 +0700 Subject: [PATCH] v6 --- app/ante/ante.go | 6 ++-- app/ante/ibc_ante.go | 2 +- app/app.go | 34 +++++++++---------- app/helpers/test_helpers.go | 2 +- app/ibctesting/chain.go | 8 ++--- app/ibctesting/simapp/app.go | 20 +++++------ app/ibctesting/simapp/encoding.go | 2 +- app/ibctesting/simapp/sim_test.go | 2 +- app/keepers/keepers.go | 28 +++++++-------- app/keepers/keys.go | 10 +++--- app/test_access.go | 4 +-- app/test_helpers.go | 2 +- app/upgrades/centauri/upgrade.go | 8 ++--- app/upgrades/reward/upgrade.go | 4 +-- app/upgrades/types.go | 2 +- app/upgrades/v4/constants.go | 6 ++-- app/upgrades/v4/upgrade.go | 6 ++-- app/upgrades/v4_5/constants.go | 2 +- app/upgrades/v4_5/fork.go | 2 +- app/upgrades/v4_5_1/constants.go | 2 +- app/upgrades/v4_5_1/fork.go | 4 +-- app/upgrades/v5/constants.go | 4 +-- app/upgrades/v5/upgrade.go | 6 ++-- app/upgrades/v5_1_0/constants.go | 2 +- app/upgrades/v5_1_0/fork.go | 6 ++-- app/upgrades/v5_2_0/constants.go | 2 +- app/upgrades/v5_2_0/fork.go | 2 +- app/upgrades/v6/constants.go | 9 +++-- app/upgrades/v6/upgrade.go | 14 ++++---- bech32-migration/auth/auth.go | 2 +- bech32-migration/gov/gov.go | 2 +- bech32-migration/slashing/slashing.go | 2 +- bech32-migration/staking/staking.go | 2 +- cmd/composabled/cmd/genaccounts.go | 2 +- cmd/composabled/cmd/root.go | 4 +-- cmd/composabled/main.go | 6 ++-- custom/bank/bank_test.go | 2 +- custom/bank/keeper/keeper.go | 4 +-- custom/bank/module.go | 2 +- go.mod | 4 +-- x/ibc-hooks/client/cli/query.go | 4 +-- x/ibc-hooks/keeper/keeper.go | 2 +- x/ibc-hooks/module.go | 4 +-- x/ibc-hooks/relay_test.go | 4 +-- x/ibc-hooks/wasm_hook.go | 4 +-- x/mint/abci.go | 4 +-- x/mint/client/cli/query.go | 2 +- x/mint/client/cli/tx.go | 2 +- x/mint/keeper/genesis.go | 2 +- x/mint/keeper/grpc_query.go | 2 +- x/mint/keeper/keeper.go | 2 +- x/mint/keeper/msg_server.go | 2 +- x/mint/module.go | 8 ++--- x/mint/simulation/decoder.go | 2 +- x/mint/simulation/decoder_test.go | 4 +-- x/mint/simulation/genesis.go | 2 +- x/mint/simulation/genesis_test.go | 4 +-- x/mint/simulation/proposals.go | 2 +- x/mint/simulation/proposals_test.go | 4 +-- x/ratelimit/client/cli/query.go | 2 +- x/ratelimit/client/cli/tx.go | 2 +- x/ratelimit/ibc_middleware.go | 2 +- x/ratelimit/keeper/abci.go | 2 +- x/ratelimit/keeper/epoch.go | 2 +- x/ratelimit/keeper/genesis.go | 2 +- x/ratelimit/keeper/grpc_query.go | 2 +- x/ratelimit/keeper/keeper.go | 4 +-- x/ratelimit/keeper/msg_server.go | 2 +- x/ratelimit/keeper/packet.go | 2 +- x/ratelimit/keeper/rate_limit.go | 2 +- x/ratelimit/module.go | 6 ++-- x/ratelimit/relay_test.go | 4 +-- x/transfermiddleware/client/cli/query.go | 2 +- x/transfermiddleware/client/cli/tx.go | 2 +- x/transfermiddleware/ibc_ante_test.go | 2 +- x/transfermiddleware/ibc_middleware.go | 2 +- x/transfermiddleware/keeper/abci.go | 2 +- x/transfermiddleware/keeper/genesis.go | 2 +- x/transfermiddleware/keeper/genesis_test.go | 4 +-- x/transfermiddleware/keeper/grpc_query.go | 2 +- x/transfermiddleware/keeper/ics4wrapper.go | 2 +- x/transfermiddleware/keeper/keeper.go | 2 +- x/transfermiddleware/keeper/msg_server.go | 2 +- x/transfermiddleware/keeper/params.go | 2 +- x/transfermiddleware/keeper/relay.go | 2 +- x/transfermiddleware/module.go | 6 ++-- x/transfermiddleware/pfm_test.go | 2 +- x/transfermiddleware/relay_test.go | 2 +- x/transfermiddleware/types/info_test.go | 2 +- x/tx-boundary/ante/antetest/ante_test.go | 4 +-- .../ante/antetest/ante_test_setup.go | 4 +-- x/tx-boundary/ante/decorate.go | 2 +- x/tx-boundary/client/cli/query.go | 2 +- x/tx-boundary/client/cli/tx.go | 2 +- x/tx-boundary/keeper/genensis.go | 2 +- x/tx-boundary/keeper/grpc_query.go | 2 +- x/tx-boundary/keeper/keeper.go | 2 +- x/tx-boundary/keeper/keeper_test.go | 6 ++-- x/tx-boundary/module.go | 6 ++-- 99 files changed, 201 insertions(+), 198 deletions(-) diff --git a/app/ante/ante.go b/app/ante/ante.go index 58d2c6a..706db39 100644 --- a/app/ante/ante.go +++ b/app/ante/ante.go @@ -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/composable/v5/x/transfermiddleware/keeper" - txBoundaryAnte "github.com/notional-labs/composable/v5/x/tx-boundary/ante" - txBoundaryKeeper "github.com/notional-labs/composable/v5/x/tx-boundary/keeper" + tfmwKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" + txBoundaryAnte "github.com/notional-labs/composable/v6/x/tx-boundary/ante" + txBoundaryKeeper "github.com/notional-labs/composable/v6/x/tx-boundary/keeper" ) // Link to default ante handler used by cosmos sdk: diff --git a/app/ante/ibc_ante.go b/app/ante/ibc_ante.go index f889c13..bab820d 100644 --- a/app/ante/ibc_ante.go +++ b/app/ante/ibc_ante.go @@ -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/composable/v5/x/transfermiddleware/keeper" + tfmwKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" ) type IBCPermissionDecorator struct { diff --git a/app/app.go b/app/app.go index bc7f007..dee6e96 100644 --- a/app/app.go +++ b/app/app.go @@ -33,10 +33,10 @@ import ( vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" "github.com/cosmos/cosmos-sdk/x/bank" - "github.com/notional-labs/composable/v5/app/keepers" - v4 "github.com/notional-labs/composable/v5/app/upgrades/v4" - v5 "github.com/notional-labs/composable/v5/app/upgrades/v5" - v6 "github.com/notional-labs/composable/v5/app/upgrades/v6" + "github.com/notional-labs/composable/v6/app/keepers" + v4 "github.com/notional-labs/composable/v6/app/upgrades/v4" + v5 "github.com/notional-labs/composable/v6/app/upgrades/v5" + v6 "github.com/notional-labs/composable/v6/app/upgrades/v6" // bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" @@ -96,33 +96,33 @@ import ( alliancemoduleclient "github.com/terra-money/alliance/x/alliance/client" alliancemoduletypes "github.com/terra-money/alliance/x/alliance/types" - custombankmodule "github.com/notional-labs/composable/v5/custom/bank" + custombankmodule "github.com/notional-labs/composable/v6/custom/bank" - "github.com/notional-labs/composable/v5/app/ante" - transfermiddleware "github.com/notional-labs/composable/v5/x/transfermiddleware" - transfermiddlewaretypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/app/ante" + transfermiddleware "github.com/notional-labs/composable/v6/x/transfermiddleware" + transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types" - txBoundary "github.com/notional-labs/composable/v5/x/tx-boundary" - txBoundaryTypes "github.com/notional-labs/composable/v5/x/tx-boundary/types" + txBoundary "github.com/notional-labs/composable/v6/x/tx-boundary" + txBoundaryTypes "github.com/notional-labs/composable/v6/x/tx-boundary/types" - ratelimitmodule "github.com/notional-labs/composable/v5/x/ratelimit" - ratelimitmoduletypes "github.com/notional-labs/composable/v5/x/ratelimit/types" + ratelimitmodule "github.com/notional-labs/composable/v6/x/ratelimit" + ratelimitmoduletypes "github.com/notional-labs/composable/v6/x/ratelimit/types" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" - "github.com/notional-labs/composable/v5/x/mint" - minttypes "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint" + minttypes "github.com/notional-labs/composable/v6/x/mint/types" ibctestingtypes "github.com/cosmos/ibc-go/v7/testing/types" - ibc_hooks "github.com/notional-labs/composable/v5/x/ibc-hooks" - ibchookstypes "github.com/notional-labs/composable/v5/x/ibc-hooks/types" + ibc_hooks "github.com/notional-labs/composable/v6/x/ibc-hooks" + ibchookstypes "github.com/notional-labs/composable/v6/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" - upgrades "github.com/notional-labs/composable/v5/app/upgrades" + upgrades "github.com/notional-labs/composable/v6/app/upgrades" ) const ( diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index c65c1ae..1646262 100644 --- a/app/helpers/test_helpers.go +++ b/app/helpers/test_helpers.go @@ -27,7 +27,7 @@ import ( "github.com/cosmos/ibc-go/v7/testing/mock" "github.com/stretchr/testify/require" - composable "github.com/notional-labs/composable/v5/app" + composable "github.com/notional-labs/composable/v6/app" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/ibctesting/chain.go b/app/ibctesting/chain.go index 85e0dde..c2082b7 100644 --- a/app/ibctesting/chain.go +++ b/app/ibctesting/chain.go @@ -8,7 +8,7 @@ import ( "testing" "time" - ratelimitmodulekeeper "github.com/notional-labs/composable/v5/x/ratelimit/keeper" + ratelimitmodulekeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper" "cosmossdk.io/errors" abci "github.com/cometbft/cometbft/abci/types" @@ -54,9 +54,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - composable "github.com/notional-labs/composable/v5/app" - "github.com/notional-labs/composable/v5/app/ibctesting/simapp" - routerKeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" + composable "github.com/notional-labs/composable/v6/app" + "github.com/notional-labs/composable/v6/app/ibctesting/simapp" + routerKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" ) // TestChain is a testing struct that wraps a simapp with the last TM Header, the current ABCI diff --git a/app/ibctesting/simapp/app.go b/app/ibctesting/simapp/app.go index 14a31dc..53a0e71 100644 --- a/app/ibctesting/simapp/app.go +++ b/app/ibctesting/simapp/app.go @@ -90,9 +90,9 @@ import ( "github.com/gorilla/mux" // TODO: mint module not complete yet, - "github.com/notional-labs/composable/v5/x/mint" - mintkeeper "github.com/notional-labs/composable/v5/x/mint/keeper" - minttypes "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint" + mintkeeper "github.com/notional-labs/composable/v6/x/mint/keeper" + minttypes "github.com/notional-labs/composable/v6/x/mint/types" "github.com/rakyll/statik/fs" "github.com/spf13/cast" @@ -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/composable/v5/app/ibctesting/simapp/params" - simappupgrades "github.com/notional-labs/composable/v5/app/ibctesting/simapp/upgrades" - v6 "github.com/notional-labs/composable/v5/app/ibctesting/simapp/upgrades/v6" - v7 "github.com/notional-labs/composable/v5/app/ibctesting/simapp/upgrades/v7" - transfermiddleware "github.com/notional-labs/composable/v5/x/transfermiddleware" - transfermiddlewarekeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" - transfermiddlewaretypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + simappparams "github.com/notional-labs/composable/v6/app/ibctesting/simapp/params" + simappupgrades "github.com/notional-labs/composable/v6/app/ibctesting/simapp/upgrades" + v6 "github.com/notional-labs/composable/v6/app/ibctesting/simapp/upgrades/v6" + v7 "github.com/notional-labs/composable/v6/app/ibctesting/simapp/upgrades/v7" + transfermiddleware "github.com/notional-labs/composable/v6/x/transfermiddleware" + transfermiddlewarekeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" + transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) const appName = "SimApp" diff --git a/app/ibctesting/simapp/encoding.go b/app/ibctesting/simapp/encoding.go index e0a0b47..53ee98f 100644 --- a/app/ibctesting/simapp/encoding.go +++ b/app/ibctesting/simapp/encoding.go @@ -3,7 +3,7 @@ package simapp import ( "github.com/cosmos/cosmos-sdk/std" - simappparams "github.com/notional-labs/composable/v5/app/ibctesting/simapp/params" + simappparams "github.com/notional-labs/composable/v6/app/ibctesting/simapp/params" ) // MakeTestEncodingConfig creates an EncodingConfig for testing. This function diff --git a/app/ibctesting/simapp/sim_test.go b/app/ibctesting/simapp/sim_test.go index b6b9f4f..32d602b 100644 --- a/app/ibctesting/simapp/sim_test.go +++ b/app/ibctesting/simapp/sim_test.go @@ -30,7 +30,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/require" - minttypes "github.com/notional-labs/composable/v5/x/mint/types" + minttypes "github.com/notional-labs/composable/v6/x/mint/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index afd9562..e6f37df 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -67,7 +67,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/composable/v5/custom/bank/keeper" + custombankkeeper "github.com/notional-labs/composable/v6/custom/bank/keeper" "github.com/strangelove-ventures/packet-forward-middleware/v7/router" routerkeeper "github.com/strangelove-ventures/packet-forward-middleware/v7/router/keeper" @@ -77,22 +77,22 @@ import ( alliancemodulekeeper "github.com/terra-money/alliance/x/alliance/keeper" alliancemoduletypes "github.com/terra-money/alliance/x/alliance/types" - transfermiddleware "github.com/notional-labs/composable/v5/x/transfermiddleware" - transfermiddlewarekeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" - transfermiddlewaretypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + transfermiddleware "github.com/notional-labs/composable/v6/x/transfermiddleware" + transfermiddlewarekeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" + transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types" - txBoundaryKeeper "github.com/notional-labs/composable/v5/x/tx-boundary/keeper" - txBoundaryTypes "github.com/notional-labs/composable/v5/x/tx-boundary/types" + txBoundaryKeeper "github.com/notional-labs/composable/v6/x/tx-boundary/keeper" + txBoundaryTypes "github.com/notional-labs/composable/v6/x/tx-boundary/types" - ratelimitmodule "github.com/notional-labs/composable/v5/x/ratelimit" - ratelimitmodulekeeper "github.com/notional-labs/composable/v5/x/ratelimit/keeper" - ratelimitmoduletypes "github.com/notional-labs/composable/v5/x/ratelimit/types" + ratelimitmodule "github.com/notional-labs/composable/v6/x/ratelimit" + ratelimitmodulekeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper" + ratelimitmoduletypes "github.com/notional-labs/composable/v6/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/composable/v5/x/mint/keeper" - minttypes "github.com/notional-labs/composable/v5/x/mint/types" + mintkeeper "github.com/notional-labs/composable/v6/x/mint/keeper" + minttypes "github.com/notional-labs/composable/v6/x/mint/types" "github.com/CosmWasm/wasmd/x/wasm" servertypes "github.com/cosmos/cosmos-sdk/server/types" @@ -100,9 +100,9 @@ import ( 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/composable/v5/x/ibc-hooks" - ibchookskeeper "github.com/notional-labs/composable/v5/x/ibc-hooks/keeper" - ibchookstypes "github.com/notional-labs/composable/v5/x/ibc-hooks/types" + ibc_hooks "github.com/notional-labs/composable/v6/x/ibc-hooks" + ibchookskeeper "github.com/notional-labs/composable/v6/x/ibc-hooks/keeper" + ibchookstypes "github.com/notional-labs/composable/v6/x/ibc-hooks/types" ) const ( diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 226b83d..b37aa2f 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -29,16 +29,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/composable/v5/x/ibc-hooks/types" - ratelimitmoduletypes "github.com/notional-labs/composable/v5/x/ratelimit/types" - transfermiddlewaretypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types" - txBoundaryTypes "github.com/notional-labs/composable/v5/x/tx-boundary/types" + ibchookstypes "github.com/notional-labs/composable/v6/x/ibc-hooks/types" + ratelimitmoduletypes "github.com/notional-labs/composable/v6/x/ratelimit/types" + transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types" + txBoundaryTypes "github.com/notional-labs/composable/v6/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/composable/v5/x/mint/types" + minttypes "github.com/notional-labs/composable/v6/x/mint/types" "github.com/CosmWasm/wasmd/x/wasm" wasm08types "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" diff --git a/app/test_access.go b/app/test_access.go index 6ab4dea..78a65b7 100644 --- a/app/test_access.go +++ b/app/test_access.go @@ -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/composable/v5/x/ratelimit/keeper" - tfmdKeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" + ratelimitkeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper" + tfmdKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" ) type TestSupport struct { diff --git a/app/test_helpers.go b/app/test_helpers.go index 5b95e90..97f5df1 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -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/composable/v5/x/mint/types" + minttypes "github.com/notional-labs/composable/v6/x/mint/types" "github.com/CosmWasm/wasmd/x/wasm" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" diff --git a/app/upgrades/centauri/upgrade.go b/app/upgrades/centauri/upgrade.go index 0870c67..4dbd5b8 100644 --- a/app/upgrades/centauri/upgrade.go +++ b/app/upgrades/centauri/upgrade.go @@ -16,10 +16,10 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" - bech32authmigration "github.com/notional-labs/composable/v5/bech32-migration/auth" - bech32govmigration "github.com/notional-labs/composable/v5/bech32-migration/gov" - bech32slashingmigration "github.com/notional-labs/composable/v5/bech32-migration/slashing" - bech32stakingmigration "github.com/notional-labs/composable/v5/bech32-migration/staking" + bech32authmigration "github.com/notional-labs/composable/v6/bech32-migration/auth" + bech32govmigration "github.com/notional-labs/composable/v6/bech32-migration/gov" + bech32slashingmigration "github.com/notional-labs/composable/v6/bech32-migration/slashing" + bech32stakingmigration "github.com/notional-labs/composable/v6/bech32-migration/staking" ) func CreateUpgradeHandler( diff --git a/app/upgrades/reward/upgrade.go b/app/upgrades/reward/upgrade.go index 95b69a8..647fb7f 100644 --- a/app/upgrades/reward/upgrade.go +++ b/app/upgrades/reward/upgrade.go @@ -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/composable/v5/x/mint/keeper" - tfmwkeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" + mintkeeper "github.com/notional-labs/composable/v6/x/mint/keeper" + tfmwkeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" ) var listAllowedRelayAddress = []string{ diff --git a/app/upgrades/types.go b/app/upgrades/types.go index d797572..10551b0 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/notional-labs/composable/v5/app/keepers" + "github.com/notional-labs/composable/v6/app/keepers" ) // BaseAppParamManager defines an interrace that BaseApp is expected to fullfil diff --git a/app/upgrades/v4/constants.go b/app/upgrades/v4/constants.go index f7b1d9b..91e150e 100644 --- a/app/upgrades/v4/constants.go +++ b/app/upgrades/v4/constants.go @@ -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/composable/v5/app/upgrades" - ibchookstypes "github.com/notional-labs/composable/v5/x/ibc-hooks/types" - ratelimitmoduletypes "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/app/upgrades" + ibchookstypes "github.com/notional-labs/composable/v6/x/ibc-hooks/types" + ratelimitmoduletypes "github.com/notional-labs/composable/v6/x/ratelimit/types" ) const ( diff --git a/app/upgrades/v4/upgrade.go b/app/upgrades/v4/upgrade.go index 9a2e1a8..b26fee2 100644 --- a/app/upgrades/v4/upgrade.go +++ b/app/upgrades/v4/upgrade.go @@ -7,9 +7,9 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/notional-labs/composable/v5/app/keepers" - "github.com/notional-labs/composable/v5/app/upgrades" - tfmdtypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/app/keepers" + "github.com/notional-labs/composable/v6/app/upgrades" + tfmdtypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v4_5/constants.go b/app/upgrades/v4_5/constants.go index 9654128..032f1f0 100644 --- a/app/upgrades/v4_5/constants.go +++ b/app/upgrades/v4_5/constants.go @@ -1,6 +1,6 @@ package v45 -import "github.com/notional-labs/composable/v5/app/upgrades" +import "github.com/notional-labs/composable/v6/app/upgrades" const ( // UpgradeName defines the on-chain upgrade name for the composable upgrade. diff --git a/app/upgrades/v4_5/fork.go b/app/upgrades/v4_5/fork.go index 270c4ce..b913f30 100644 --- a/app/upgrades/v4_5/fork.go +++ b/app/upgrades/v4_5/fork.go @@ -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/composable/v5/app/keepers" + "github.com/notional-labs/composable/v6/app/keepers" ) func RunForkLogic(ctx sdk.Context, appKeepers *keepers.AppKeepers) { diff --git a/app/upgrades/v4_5_1/constants.go b/app/upgrades/v4_5_1/constants.go index d6033e0..fec6f73 100644 --- a/app/upgrades/v4_5_1/constants.go +++ b/app/upgrades/v4_5_1/constants.go @@ -1,6 +1,6 @@ package v4_5_1 -import "github.com/notional-labs/composable/v5/app/upgrades" +import "github.com/notional-labs/composable/v6/app/upgrades" const ( // UpgradeName defines the on-chain upgrade name for the Composable v5 upgrade. diff --git a/app/upgrades/v4_5_1/fork.go b/app/upgrades/v4_5_1/fork.go index aead97f..fc413b7 100644 --- a/app/upgrades/v4_5_1/fork.go +++ b/app/upgrades/v4_5_1/fork.go @@ -3,8 +3,8 @@ package v4_5_1 import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/app/keepers" - rateLimitKeeper "github.com/notional-labs/composable/v5/x/ratelimit/keeper" + "github.com/notional-labs/composable/v6/app/keepers" + rateLimitKeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper" ) func RunForkLogic(ctx sdk.Context, keepers *keepers.AppKeepers) { diff --git a/app/upgrades/v5/constants.go b/app/upgrades/v5/constants.go index 5211ff8..69946b0 100644 --- a/app/upgrades/v5/constants.go +++ b/app/upgrades/v5/constants.go @@ -2,8 +2,8 @@ package v5 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/notional-labs/composable/v5/app/upgrades" - txboundary "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/app/upgrades" + txboundary "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) const ( diff --git a/app/upgrades/v5/upgrade.go b/app/upgrades/v5/upgrade.go index 314f821..90fc487 100644 --- a/app/upgrades/v5/upgrade.go +++ b/app/upgrades/v5/upgrade.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/notional-labs/composable/v5/app/keepers" - "github.com/notional-labs/composable/v5/app/upgrades" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/app/keepers" + "github.com/notional-labs/composable/v6/app/upgrades" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) const ( diff --git a/app/upgrades/v5_1_0/constants.go b/app/upgrades/v5_1_0/constants.go index 8e7cd6c..aa9a6bf 100644 --- a/app/upgrades/v5_1_0/constants.go +++ b/app/upgrades/v5_1_0/constants.go @@ -1,6 +1,6 @@ package v5_1_0 -import "github.com/notional-labs/composable/v5/app/upgrades" +import "github.com/notional-labs/composable/v6/app/upgrades" const ( // UpgradeName defines the on-chain upgrade name for the Composable v5 upgrade. diff --git a/app/upgrades/v5_1_0/fork.go b/app/upgrades/v5_1_0/fork.go index 92bf250..771d3c6 100644 --- a/app/upgrades/v5_1_0/fork.go +++ b/app/upgrades/v5_1_0/fork.go @@ -4,9 +4,9 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/app/keepers" - rateLimitKeeper "github.com/notional-labs/composable/v5/x/ratelimit/keeper" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/app/keepers" + rateLimitKeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) const uosmo = "ibc/47BD209179859CDE4A2806763D7189B6E6FE13A17880FE2B42DE1E6C1E329E23" diff --git a/app/upgrades/v5_2_0/constants.go b/app/upgrades/v5_2_0/constants.go index 47dba88..b09071c 100644 --- a/app/upgrades/v5_2_0/constants.go +++ b/app/upgrades/v5_2_0/constants.go @@ -1,6 +1,6 @@ package v5_2_0 -import "github.com/notional-labs/composable/v5/app/upgrades" +import "github.com/notional-labs/composable/v6/app/upgrades" const ( // UpgradeName defines the on-chain upgrade name for the Composable v5 upgrade. diff --git a/app/upgrades/v5_2_0/fork.go b/app/upgrades/v5_2_0/fork.go index e591a6f..0b4e95d 100644 --- a/app/upgrades/v5_2_0/fork.go +++ b/app/upgrades/v5_2_0/fork.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/notional-labs/composable/v5/app/keepers" + "github.com/notional-labs/composable/v6/app/keepers" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/app/upgrades/v6/constants.go b/app/upgrades/v6/constants.go index 9027a7f..06444b5 100644 --- a/app/upgrades/v6/constants.go +++ b/app/upgrades/v6/constants.go @@ -2,16 +2,19 @@ package v6 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/notional-labs/composable/v5/app/upgrades" + "github.com/cosmos/cosmos-sdk/x/authz" + "github.com/notional-labs/composable/v6/app/upgrades" ) const ( // UpgradeName defines the on-chain upgrade name for the composable upgrade. - UpgradeName = "composable" + UpgradeName = "v6" ) var Upgrade = upgrades.Upgrade{ UpgradeName: UpgradeName, CreateUpgradeHandler: CreateUpgradeHandler, - StoreUpgrades: store.StoreUpgrades{}, + StoreUpgrades: store.StoreUpgrades{ + Added: []string{authz.ModuleName}, + }, } diff --git a/app/upgrades/v6/upgrade.go b/app/upgrades/v6/upgrade.go index 476ee67..9dff54a 100644 --- a/app/upgrades/v6/upgrade.go +++ b/app/upgrades/v6/upgrade.go @@ -7,20 +7,20 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/notional-labs/composable/v5/app/keepers" - "github.com/notional-labs/composable/v5/app/upgrades" + "github.com/notional-labs/composable/v6/app/keepers" + "github.com/notional-labs/composable/v6/app/upgrades" - bech32authmigration "github.com/notional-labs/composable/v5/bech32-migration/auth" - bech32govmigration "github.com/notional-labs/composable/v5/bech32-migration/gov" - bech32slashingmigration "github.com/notional-labs/composable/v5/bech32-migration/slashing" - bech32stakingmigration "github.com/notional-labs/composable/v5/bech32-migration/staking" + bech32authmigration "github.com/notional-labs/composable/v6/bech32-migration/auth" + bech32govmigration "github.com/notional-labs/composable/v6/bech32-migration/gov" + bech32slashingmigration "github.com/notional-labs/composable/v6/bech32-migration/slashing" + bech32stakingmigration "github.com/notional-labs/composable/v6/bech32-migration/staking" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/notional-labs/composable/v5/bech32-migration/utils" + "github.com/notional-labs/composable/v6/bech32-migration/utils" ) func CreateUpgradeHandler( diff --git a/bech32-migration/auth/auth.go b/bech32-migration/auth/auth.go index cb1ceb4..1bb3f82 100644 --- a/bech32-migration/auth/auth.go +++ b/bech32-migration/auth/auth.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/types" vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - "github.com/notional-labs/composable/v5/bech32-migration/utils" + "github.com/notional-labs/composable/v6/bech32-migration/utils" ) func MigrateAddressBech32(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) { diff --git a/bech32-migration/gov/gov.go b/bech32-migration/gov/gov.go index 782cc6c..f141d1c 100644 --- a/bech32-migration/gov/gov.go +++ b/bech32-migration/gov/gov.go @@ -9,7 +9,7 @@ import ( v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/notional-labs/composable/v5/bech32-migration/utils" + "github.com/notional-labs/composable/v6/bech32-migration/utils" ) func MigrateAddressBech32(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) { diff --git a/bech32-migration/slashing/slashing.go b/bech32-migration/slashing/slashing.go index 638bc66..cde0638 100644 --- a/bech32-migration/slashing/slashing.go +++ b/bech32-migration/slashing/slashing.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/slashing/types" - "github.com/notional-labs/composable/v5/bech32-migration/utils" + "github.com/notional-labs/composable/v6/bech32-migration/utils" ) func MigrateAddressBech32(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) { diff --git a/bech32-migration/staking/staking.go b/bech32-migration/staking/staking.go index 9a3ce9d..3af0f74 100644 --- a/bech32-migration/staking/staking.go +++ b/bech32-migration/staking/staking.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/notional-labs/composable/v5/bech32-migration/utils" + "github.com/notional-labs/composable/v6/bech32-migration/utils" ) func MigrateAddressBech32(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) { diff --git a/cmd/composabled/cmd/genaccounts.go b/cmd/composabled/cmd/genaccounts.go index c86769c..02ccb6f 100644 --- a/cmd/composabled/cmd/genaccounts.go +++ b/cmd/composabled/cmd/genaccounts.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/bech32-migration/utils" + "github.com/notional-labs/composable/v6/bech32-migration/utils" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/cmd/composabled/cmd/root.go b/cmd/composabled/cmd/root.go index bf02cc6..0076639 100644 --- a/cmd/composabled/cmd/root.go +++ b/cmd/composabled/cmd/root.go @@ -33,8 +33,8 @@ import ( genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - "github.com/notional-labs/composable/v5/app" - // "github.com/notional-labs/composable/v5/app/params" + "github.com/notional-labs/composable/v6/app" + // "github.com/notional-labs/composable/v6/app/params" // this line is used by starport scaffolding # stargate/root/import ) diff --git a/cmd/composabled/main.go b/cmd/composabled/main.go index b7983fa..c453eaf 100644 --- a/cmd/composabled/main.go +++ b/cmd/composabled/main.go @@ -5,9 +5,9 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/notional-labs/composable/v5/app" - cmd "github.com/notional-labs/composable/v5/cmd/composabled/cmd" - cmdcfg "github.com/notional-labs/composable/v5/cmd/composabled/config" + "github.com/notional-labs/composable/v6/app" + cmd "github.com/notional-labs/composable/v6/cmd/composabled/cmd" + cmdcfg "github.com/notional-labs/composable/v6/cmd/composabled/config" ) func main() { diff --git a/custom/bank/bank_test.go b/custom/bank/bank_test.go index f1655a4..ffbaa63 100644 --- a/custom/bank/bank_test.go +++ b/custom/bank/bank_test.go @@ -9,7 +9,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/stretchr/testify/suite" - customibctesting "github.com/notional-labs/composable/v5/app/ibctesting" + customibctesting "github.com/notional-labs/composable/v6/app/ibctesting" ) type CustomBankTestSuite struct { diff --git a/custom/bank/keeper/keeper.go b/custom/bank/keeper/keeper.go index bbc6c64..a7c312c 100644 --- a/custom/bank/keeper/keeper.go +++ b/custom/bank/keeper/keeper.go @@ -13,9 +13,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - banktypes "github.com/notional-labs/composable/v5/custom/bank/types" + banktypes "github.com/notional-labs/composable/v6/custom/bank/types" - transfermiddlewarekeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" + transfermiddlewarekeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" alliancekeeper "github.com/terra-money/alliance/x/alliance/keeper" alliancetypes "github.com/terra-money/alliance/x/alliance/types" diff --git a/custom/bank/module.go b/custom/bank/module.go index e9d5fe0..3d88d96 100644 --- a/custom/bank/module.go +++ b/custom/bank/module.go @@ -10,7 +10,7 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" "github.com/cosmos/cosmos-sdk/x/bank/types" - custombankkeeper "github.com/notional-labs/composable/v5/custom/bank/keeper" + custombankkeeper "github.com/notional-labs/composable/v6/custom/bank/keeper" ) // AppModule wraps around the bank module and the bank keeper to return the right total supply ignoring bonded tokens diff --git a/go.mod b/go.mod index 11ac1bf..bd3d154 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/notional-labs/composable/v5 +module github.com/notional-labs/composable/v6 go 1.19 @@ -322,7 +322,7 @@ replace ( // ibc-go with wasm client github.com/cosmos/ibc-go/v7 => github.com/notional-labs/ibc-go/v7 v7.2.1-0.20231010040541-6cf43006971f - github.com/strangelove-ventures/packet-forward-middleware/v7 => github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20230925110328-59a07f1412ec + github.com/strangelove-ventures/packet-forward-middleware/v7 => github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20230921184903-f09128a3ed26 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/terra-money/alliance => github.com/notional-labs/alliance v1.0.1-0.20230523105704-66dba9499c01 diff --git a/x/ibc-hooks/client/cli/query.go b/x/ibc-hooks/client/cli/query.go index d6d2399..7b8cc8b 100644 --- a/x/ibc-hooks/client/cli/query.go +++ b/x/ibc-hooks/client/cli/query.go @@ -9,9 +9,9 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/ibc-hooks/keeper" + "github.com/notional-labs/composable/v6/x/ibc-hooks/keeper" - "github.com/notional-labs/composable/v5/x/ibc-hooks/types" + "github.com/notional-labs/composable/v6/x/ibc-hooks/types" ) func indexRunCmd(cmd *cobra.Command, _ []string) error { diff --git a/x/ibc-hooks/keeper/keeper.go b/x/ibc-hooks/keeper/keeper.go index 610d413..2462a13 100644 --- a/x/ibc-hooks/keeper/keeper.go +++ b/x/ibc-hooks/keeper/keeper.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" - "github.com/notional-labs/composable/v5/x/ibc-hooks/types" + "github.com/notional-labs/composable/v6/x/ibc-hooks/types" ) type ( diff --git a/x/ibc-hooks/module.go b/x/ibc-hooks/module.go index 686e41c..779f678 100644 --- a/x/ibc-hooks/module.go +++ b/x/ibc-hooks/module.go @@ -10,8 +10,8 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/ibc-hooks/client/cli" - "github.com/notional-labs/composable/v5/x/ibc-hooks/types" + "github.com/notional-labs/composable/v6/x/ibc-hooks/client/cli" + "github.com/notional-labs/composable/v6/x/ibc-hooks/types" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/ibc-hooks/relay_test.go b/x/ibc-hooks/relay_test.go index 940e223..338ed66 100644 --- a/x/ibc-hooks/relay_test.go +++ b/x/ibc-hooks/relay_test.go @@ -10,8 +10,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/stretchr/testify/suite" - customibctesting "github.com/notional-labs/composable/v5/app/ibctesting" - ibchookskeeper "github.com/notional-labs/composable/v5/x/ibc-hooks/keeper" + customibctesting "github.com/notional-labs/composable/v6/app/ibctesting" + ibchookskeeper "github.com/notional-labs/composable/v6/x/ibc-hooks/keeper" ) // TODO: use testsuite here. diff --git a/x/ibc-hooks/wasm_hook.go b/x/ibc-hooks/wasm_hook.go index d0f8e55..bc239f0 100644 --- a/x/ibc-hooks/wasm_hook.go +++ b/x/ibc-hooks/wasm_hook.go @@ -11,8 +11,8 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/notional-labs/composable/v5/x/ibc-hooks/keeper" - "github.com/notional-labs/composable/v5/x/ibc-hooks/types" + "github.com/notional-labs/composable/v6/x/ibc-hooks/keeper" + "github.com/notional-labs/composable/v6/x/ibc-hooks/types" errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/mint/abci.go b/x/mint/abci.go index aaf997f..c24f807 100644 --- a/x/mint/abci.go +++ b/x/mint/abci.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/mint/keeper" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/keeper" + "github.com/notional-labs/composable/v6/x/mint/types" ) // BeginBlocker mints new tokens for the previous block. diff --git a/x/mint/client/cli/query.go b/x/mint/client/cli/query.go index 7dc45b3..b04d2d1 100644 --- a/x/mint/client/cli/query.go +++ b/x/mint/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // GetQueryCmd returns the cli query commands for the minting module. diff --git a/x/mint/client/cli/tx.go b/x/mint/client/cli/tx.go index c432823..3fb5b9d 100644 --- a/x/mint/client/cli/tx.go +++ b/x/mint/client/cli/tx.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // GetTxCmd returns the tx commands for mint diff --git a/x/mint/keeper/genesis.go b/x/mint/keeper/genesis.go index ef75f17..570ebec 100644 --- a/x/mint/keeper/genesis.go +++ b/x/mint/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // InitGenesis new mint genesis diff --git a/x/mint/keeper/grpc_query.go b/x/mint/keeper/grpc_query.go index a529c76..88c1131 100644 --- a/x/mint/keeper/grpc_query.go +++ b/x/mint/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index 861ff1c..70ff6dd 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -10,7 +10,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // Keeper of the mint store diff --git a/x/mint/keeper/msg_server.go b/x/mint/keeper/msg_server.go index 8df1a73..4feafae 100644 --- a/x/mint/keeper/msg_server.go +++ b/x/mint/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/mint/module.go b/x/mint/module.go index b96e38e..5205a40 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -16,10 +16,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/notional-labs/composable/v5/x/mint/client/cli" - "github.com/notional-labs/composable/v5/x/mint/keeper" - "github.com/notional-labs/composable/v5/x/mint/simulation" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/client/cli" + "github.com/notional-labs/composable/v6/x/mint/keeper" + "github.com/notional-labs/composable/v6/x/mint/simulation" + "github.com/notional-labs/composable/v6/x/mint/types" ) var ( diff --git a/x/mint/simulation/decoder.go b/x/mint/simulation/decoder.go index 2bceab3..c8128bc 100644 --- a/x/mint/simulation/decoder.go +++ b/x/mint/simulation/decoder.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/mint/simulation/decoder_test.go b/x/mint/simulation/decoder_test.go index 116d9b6..36a0f47 100644 --- a/x/mint/simulation/decoder_test.go +++ b/x/mint/simulation/decoder_test.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/kv" "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/notional-labs/composable/v5/x/mint/simulation" - composableminttypes "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/simulation" + composableminttypes "github.com/notional-labs/composable/v6/x/mint/types" ) func TestDecodeStore(t *testing.T) { diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go index eadedce..f63d398 100644 --- a/x/mint/simulation/genesis.go +++ b/x/mint/simulation/genesis.go @@ -9,7 +9,7 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // Simulation parameter constants diff --git a/x/mint/simulation/genesis_test.go b/x/mint/simulation/genesis_test.go index f25e7d2..5770028 100644 --- a/x/mint/simulation/genesis_test.go +++ b/x/mint/simulation/genesis_test.go @@ -14,8 +14,8 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/mint" - "github.com/notional-labs/composable/v5/x/mint/simulation" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/simulation" + "github.com/notional-labs/composable/v6/x/mint/types" ) // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState. diff --git a/x/mint/simulation/proposals.go b/x/mint/simulation/proposals.go index 77fc5b8..dc28440 100644 --- a/x/mint/simulation/proposals.go +++ b/x/mint/simulation/proposals.go @@ -8,7 +8,7 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // Simulation operation weights constants diff --git a/x/mint/simulation/proposals_test.go b/x/mint/simulation/proposals_test.go index 761f158..69aca95 100644 --- a/x/mint/simulation/proposals_test.go +++ b/x/mint/simulation/proposals_test.go @@ -11,8 +11,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/address" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/notional-labs/composable/v5/x/mint/simulation" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/simulation" + "github.com/notional-labs/composable/v6/x/mint/types" ) func TestProposalMsgs(t *testing.T) { diff --git a/x/ratelimit/client/cli/query.go b/x/ratelimit/client/cli/query.go index d9c54a3..968b20a 100644 --- a/x/ratelimit/client/cli/query.go +++ b/x/ratelimit/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) // GetQueryCmd returns the cli query commands for this module. diff --git a/x/ratelimit/client/cli/tx.go b/x/ratelimit/client/cli/tx.go index e7dac91..227ae30 100644 --- a/x/ratelimit/client/cli/tx.go +++ b/x/ratelimit/client/cli/tx.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) // GetTxCmd returns the tx commands for router diff --git a/x/ratelimit/ibc_middleware.go b/x/ratelimit/ibc_middleware.go index 0a8c388..f228299 100644 --- a/x/ratelimit/ibc_middleware.go +++ b/x/ratelimit/ibc_middleware.go @@ -3,7 +3,7 @@ package ratelimit import ( "fmt" - "github.com/notional-labs/composable/v5/x/ratelimit/keeper" + "github.com/notional-labs/composable/v6/x/ratelimit/keeper" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/ratelimit/keeper/abci.go b/x/ratelimit/keeper/abci.go index f607d64..a3789e2 100644 --- a/x/ratelimit/keeper/abci.go +++ b/x/ratelimit/keeper/abci.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) // BeginBlocker of epochs module. diff --git a/x/ratelimit/keeper/epoch.go b/x/ratelimit/keeper/epoch.go index 05309f1..0039c06 100644 --- a/x/ratelimit/keeper/epoch.go +++ b/x/ratelimit/keeper/epoch.go @@ -6,7 +6,7 @@ import ( "github.com/gogo/protobuf/proto" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/ratelimit/keeper/genesis.go b/x/ratelimit/keeper/genesis.go index 2646ebf..0b64c87 100644 --- a/x/ratelimit/keeper/genesis.go +++ b/x/ratelimit/keeper/genesis.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { diff --git a/x/ratelimit/keeper/grpc_query.go b/x/ratelimit/keeper/grpc_query.go index e991b92..2aee780 100644 --- a/x/ratelimit/keeper/grpc_query.go +++ b/x/ratelimit/keeper/grpc_query.go @@ -8,7 +8,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibctmtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/ratelimit/keeper/keeper.go b/x/ratelimit/keeper/keeper.go index f039f59..243241c 100644 --- a/x/ratelimit/keeper/keeper.go +++ b/x/ratelimit/keeper/keeper.go @@ -10,8 +10,8 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" - "github.com/notional-labs/composable/v5/x/ratelimit/types" - tfmwkeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" + "github.com/notional-labs/composable/v6/x/ratelimit/types" + tfmwkeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" ) type Keeper struct { diff --git a/x/ratelimit/keeper/msg_server.go b/x/ratelimit/keeper/msg_server.go index 6d73a04..c2f91c7 100644 --- a/x/ratelimit/keeper/msg_server.go +++ b/x/ratelimit/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/ratelimit/keeper/packet.go b/x/ratelimit/keeper/packet.go index 1be8a84..85e8510 100644 --- a/x/ratelimit/keeper/packet.go +++ b/x/ratelimit/keeper/packet.go @@ -14,7 +14,7 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) type RateLimitedPacketInfo struct { diff --git a/x/ratelimit/keeper/rate_limit.go b/x/ratelimit/keeper/rate_limit.go index 9897052..8ef5514 100644 --- a/x/ratelimit/keeper/rate_limit.go +++ b/x/ratelimit/keeper/rate_limit.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) // Get the rate limit byte key built from the denom and channelID diff --git a/x/ratelimit/module.go b/x/ratelimit/module.go index 6af708f..70a96f5 100644 --- a/x/ratelimit/module.go +++ b/x/ratelimit/module.go @@ -16,9 +16,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/ratelimit/client/cli" - "github.com/notional-labs/composable/v5/x/ratelimit/keeper" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/client/cli" + "github.com/notional-labs/composable/v6/x/ratelimit/keeper" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) var ( diff --git a/x/ratelimit/relay_test.go b/x/ratelimit/relay_test.go index 4d44dfe..1e2b090 100644 --- a/x/ratelimit/relay_test.go +++ b/x/ratelimit/relay_test.go @@ -8,8 +8,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/stretchr/testify/suite" - customibctesting "github.com/notional-labs/composable/v5/app/ibctesting" - ratelimittypes "github.com/notional-labs/composable/v5/x/ratelimit/types" + customibctesting "github.com/notional-labs/composable/v6/app/ibctesting" + ratelimittypes "github.com/notional-labs/composable/v6/x/ratelimit/types" ) type RateLimitTestSuite struct { diff --git a/x/transfermiddleware/client/cli/query.go b/x/transfermiddleware/client/cli/query.go index 6e93f6a..702c0bc 100644 --- a/x/transfermiddleware/client/cli/query.go +++ b/x/transfermiddleware/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) // GetQueryCmd returns the query commands for router diff --git a/x/transfermiddleware/client/cli/tx.go b/x/transfermiddleware/client/cli/tx.go index f666596..2bcccae 100644 --- a/x/transfermiddleware/client/cli/tx.go +++ b/x/transfermiddleware/client/cli/tx.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) // GetTxCmd returns the tx commands for router diff --git a/x/transfermiddleware/ibc_ante_test.go b/x/transfermiddleware/ibc_ante_test.go index 1783db0..67fac83 100644 --- a/x/transfermiddleware/ibc_ante_test.go +++ b/x/transfermiddleware/ibc_ante_test.go @@ -12,7 +12,7 @@ import ( wasmtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" "github.com/stretchr/testify/suite" - customibctesting "github.com/notional-labs/composable/v5/app/ibctesting" + customibctesting "github.com/notional-labs/composable/v6/app/ibctesting" ) var govAuthorityAddress = "composable10556m38z4x6pqalr9rl5ytf3cff8q46nnngqs2" // convert from: centauri10556m38z4x6pqalr9rl5ytf3cff8q46nk85k9m diff --git a/x/transfermiddleware/ibc_middleware.go b/x/transfermiddleware/ibc_middleware.go index 0bd932e..4be08ca 100644 --- a/x/transfermiddleware/ibc_middleware.go +++ b/x/transfermiddleware/ibc_middleware.go @@ -11,7 +11,7 @@ import ( porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" + "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" ) var _ porttypes.Middleware = &IBCMiddleware{} diff --git a/x/transfermiddleware/keeper/abci.go b/x/transfermiddleware/keeper/abci.go index 7322aa2..a3f0479 100644 --- a/x/transfermiddleware/keeper/abci.go +++ b/x/transfermiddleware/keeper/abci.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) // BeginBlocker of epochs module. diff --git a/x/transfermiddleware/keeper/genesis.go b/x/transfermiddleware/keeper/genesis.go index 0584b80..6a4615b 100644 --- a/x/transfermiddleware/keeper/genesis.go +++ b/x/transfermiddleware/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) // TODO: add init genesis logic diff --git a/x/transfermiddleware/keeper/genesis_test.go b/x/transfermiddleware/keeper/genesis_test.go index ccfdc0f..ca352b5 100644 --- a/x/transfermiddleware/keeper/genesis_test.go +++ b/x/transfermiddleware/keeper/genesis_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - helpers "github.com/notional-labs/composable/v5/app/helpers" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + helpers "github.com/notional-labs/composable/v6/app/helpers" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func TestTFMInitGenesis(t *testing.T) { diff --git a/x/transfermiddleware/keeper/grpc_query.go b/x/transfermiddleware/keeper/grpc_query.go index 19a69c1..1ce8544 100644 --- a/x/transfermiddleware/keeper/grpc_query.go +++ b/x/transfermiddleware/keeper/grpc_query.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func (k Keeper) ParaTokenInfo(c context.Context, req *types.QueryParaTokenInfoRequest) (*types.QueryParaTokenInfoResponse, error) { diff --git a/x/transfermiddleware/keeper/ics4wrapper.go b/x/transfermiddleware/keeper/ics4wrapper.go index c6fc75c..14dd2e8 100644 --- a/x/transfermiddleware/keeper/ics4wrapper.go +++ b/x/transfermiddleware/keeper/ics4wrapper.go @@ -12,7 +12,7 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func (keeper Keeper) hasParachainIBCTokenInfo(ctx sdk.Context, nativeDenom string) bool { diff --git a/x/transfermiddleware/keeper/keeper.go b/x/transfermiddleware/keeper/keeper.go index 78a0515..a154677 100644 --- a/x/transfermiddleware/keeper/keeper.go +++ b/x/transfermiddleware/keeper/keeper.go @@ -14,7 +14,7 @@ import ( porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) type Keeper struct { diff --git a/x/transfermiddleware/keeper/msg_server.go b/x/transfermiddleware/keeper/msg_server.go index 986fbf5..9e303e4 100644 --- a/x/transfermiddleware/keeper/msg_server.go +++ b/x/transfermiddleware/keeper/msg_server.go @@ -9,7 +9,7 @@ import ( "cosmossdk.io/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/transfermiddleware/keeper/params.go b/x/transfermiddleware/keeper/params.go index 7c0538b..b3905bf 100644 --- a/x/transfermiddleware/keeper/params.go +++ b/x/transfermiddleware/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { diff --git a/x/transfermiddleware/keeper/relay.go b/x/transfermiddleware/keeper/relay.go index 27f1832..35cf2ed 100644 --- a/x/transfermiddleware/keeper/relay.go +++ b/x/transfermiddleware/keeper/relay.go @@ -6,7 +6,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func (k Keeper) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, data transfertypes.FungibleTokenPacketData) error { diff --git a/x/transfermiddleware/module.go b/x/transfermiddleware/module.go index 16a92a5..1f64a2b 100644 --- a/x/transfermiddleware/module.go +++ b/x/transfermiddleware/module.go @@ -16,9 +16,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/transfermiddleware/client/cli" - "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/client/cli" + "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) var ( diff --git a/x/transfermiddleware/pfm_test.go b/x/transfermiddleware/pfm_test.go index f8bf27b..ce9eb67 100644 --- a/x/transfermiddleware/pfm_test.go +++ b/x/transfermiddleware/pfm_test.go @@ -13,7 +13,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/stretchr/testify/suite" - customibctesting "github.com/notional-labs/composable/v5/app/ibctesting" + customibctesting "github.com/notional-labs/composable/v6/app/ibctesting" ) type PacketMetadata struct { diff --git a/x/transfermiddleware/relay_test.go b/x/transfermiddleware/relay_test.go index 87abaf2..fdb27f0 100644 --- a/x/transfermiddleware/relay_test.go +++ b/x/transfermiddleware/relay_test.go @@ -10,7 +10,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/stretchr/testify/suite" - customibctesting "github.com/notional-labs/composable/v5/app/ibctesting" + customibctesting "github.com/notional-labs/composable/v6/app/ibctesting" ) // TODO: use testsuite here. diff --git a/x/transfermiddleware/types/info_test.go b/x/transfermiddleware/types/info_test.go index 078fec2..a0018cb 100644 --- a/x/transfermiddleware/types/info_test.go +++ b/x/transfermiddleware/types/info_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func TestValidateBasic(t *testing.T) { diff --git a/x/tx-boundary/ante/antetest/ante_test.go b/x/tx-boundary/ante/antetest/ante_test.go index 1f8b2af..3388f0b 100644 --- a/x/tx-boundary/ante/antetest/ante_test.go +++ b/x/tx-boundary/ante/antetest/ante_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/authz" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - txboundaryAnte "github.com/notional-labs/composable/v5/x/tx-boundary/ante" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + txboundaryAnte "github.com/notional-labs/composable/v6/x/tx-boundary/ante" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" ) diff --git a/x/tx-boundary/ante/antetest/ante_test_setup.go b/x/tx-boundary/ante/antetest/ante_test_setup.go index 3c300a6..f66a64a 100644 --- a/x/tx-boundary/ante/antetest/ante_test_setup.go +++ b/x/tx-boundary/ante/antetest/ante_test_setup.go @@ -17,8 +17,8 @@ import ( xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/cosmos/ibc-go/v7/testing/mock" - "github.com/notional-labs/composable/v5/app" - "github.com/notional-labs/composable/v5/app/helpers" + "github.com/notional-labs/composable/v6/app" + "github.com/notional-labs/composable/v6/app/helpers" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" ) diff --git a/x/tx-boundary/ante/decorate.go b/x/tx-boundary/ante/decorate.go index 4dac2f0..52bdb1b 100644 --- a/x/tx-boundary/ante/decorate.go +++ b/x/tx-boundary/ante/decorate.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - txBoundaryKeeper "github.com/notional-labs/composable/v5/x/tx-boundary/keeper" + txBoundaryKeeper "github.com/notional-labs/composable/v6/x/tx-boundary/keeper" ) type StakingPermissionDecorator struct { diff --git a/x/tx-boundary/client/cli/query.go b/x/tx-boundary/client/cli/query.go index 99f8e80..5723a78 100644 --- a/x/tx-boundary/client/cli/query.go +++ b/x/tx-boundary/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) // GetQueryCmd returns the cli query commands for the tx-boundary module. diff --git a/x/tx-boundary/client/cli/tx.go b/x/tx-boundary/client/cli/tx.go index 8a703ab..68f93b1 100644 --- a/x/tx-boundary/client/cli/tx.go +++ b/x/tx-boundary/client/cli/tx.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" "github.com/spf13/cobra" ) diff --git a/x/tx-boundary/keeper/genensis.go b/x/tx-boundary/keeper/genensis.go index 7111aad..04d89eb 100644 --- a/x/tx-boundary/keeper/genensis.go +++ b/x/tx-boundary/keeper/genensis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/tx-boundary/keeper/grpc_query.go b/x/tx-boundary/keeper/grpc_query.go index 530e879..3bd29b7 100644 --- a/x/tx-boundary/keeper/grpc_query.go +++ b/x/tx-boundary/keeper/grpc_query.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/tx-boundary/keeper/keeper.go b/x/tx-boundary/keeper/keeper.go index ca3e0a7..145c628 100644 --- a/x/tx-boundary/keeper/keeper.go +++ b/x/tx-boundary/keeper/keeper.go @@ -9,7 +9,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) // Keeper struct diff --git a/x/tx-boundary/keeper/keeper_test.go b/x/tx-boundary/keeper/keeper_test.go index 504f947..660ee63 100644 --- a/x/tx-boundary/keeper/keeper_test.go +++ b/x/tx-boundary/keeper/keeper_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/notional-labs/composable/v5/app" - "github.com/notional-labs/composable/v5/app/helpers" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/app" + "github.com/notional-labs/composable/v6/app/helpers" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) type KeeperTestSuite struct { diff --git a/x/tx-boundary/module.go b/x/tx-boundary/module.go index c98eaf0..1229f26 100644 --- a/x/tx-boundary/module.go +++ b/x/tx-boundary/module.go @@ -15,9 +15,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/notional-labs/composable/v5/x/tx-boundary/client/cli" - "github.com/notional-labs/composable/v5/x/tx-boundary/keeper" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/x/tx-boundary/client/cli" + "github.com/notional-labs/composable/v6/x/tx-boundary/keeper" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) var (