From 3813f1477491131b59a7af9fa7ed0d80c83d2005 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Wed, 3 Apr 2024 03:08:51 +0800 Subject: [PATCH] rename module --- app/ante/ante.go | 6 +-- app/ante/ibc_ante.go | 2 +- app/app.go | 42 +++++++++---------- 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 | 40 +++++++++--------- app/keepers/keys.go | 16 +++---- 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 | 2 +- app/upgrades/v6/upgrade.go | 4 +- app/upgrades/v6_4/constants.go | 4 +- app/upgrades/v6_4/upgrade.go | 6 +-- app/upgrades/v6_4_4/constants.go | 2 +- app/upgrades/v6_4_4/upgrade.go | 4 +- app/upgrades/v6_4_5/constants.go | 2 +- app/upgrades/v6_4_5/upgrade.go | 4 +- app/upgrades/v6_4_6/constants.go | 4 +- app/upgrades/v6_4_6/upgrade.go | 6 +-- app/upgrades/v6_4_7/constants.go | 2 +- app/upgrades/v6_4_7/upgrade.go | 4 +- app/upgrades/v6_4_8/constants.go | 4 +- app/upgrades/v6_4_8/upgrade.go | 6 +-- app/upgrades/v6_4_9/constants.go | 2 +- app/upgrades/v6_4_9/upgrade.go | 4 +- app/upgrades/v6_4_91/constants.go | 2 +- app/upgrades/v6_4_91/upgrade.go | 4 +- app/upgrades/v6_5_0/constants.go | 4 +- app/upgrades/v6_5_0/upgrade.go | 6 +-- 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/centaurid/cmd/genaccounts.go | 2 +- cmd/centaurid/cmd/root.go | 4 +- cmd/centaurid/main.go | 6 +-- custom/bank/bank_test.go | 2 +- custom/bank/keeper/keeper.go | 4 +- custom/bank/module.go | 2 +- custom/ibc-transfer/keeper/keeper.go | 2 +- custom/ibc-transfer/keeper/msg_server.go | 4 +- custom/ibc-transfer/module.go | 4 +- custom/staking/abci.go | 2 +- custom/staking/keeper/keeper.go | 6 +-- custom/staking/module.go | 4 +- go.mod | 2 +- 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/ibctransfermiddleware/client/cli/query.go | 2 +- x/ibctransfermiddleware/client/cli/tx.go | 2 +- x/ibctransfermiddleware/keeper/genesis.go | 2 +- x/ibctransfermiddleware/keeper/grpc_query.go | 2 +- x/ibctransfermiddleware/keeper/keeper.go | 2 +- x/ibctransfermiddleware/keeper/msg_server.go | 2 +- x/ibctransfermiddleware/module.go | 6 +-- 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/stakingmiddleware/client/cli/query.go | 2 +- x/stakingmiddleware/client/cli/tx.go | 2 +- x/stakingmiddleware/keeper/genesis.go | 2 +- x/stakingmiddleware/keeper/grpc_query.go | 2 +- x/stakingmiddleware/keeper/keeper.go | 2 +- x/stakingmiddleware/keeper/msg_server.go | 2 +- x/stakingmiddleware/module.go | 6 +-- 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 +-- 137 files changed, 267 insertions(+), 267 deletions(-) diff --git a/app/ante/ante.go b/app/ante/ante.go index 360fa00fe..8d6a280b0 100644 --- a/app/ante/ante.go +++ b/app/ante/ante.go @@ -4,15 +4,15 @@ import ( ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" + tfmwKeeper "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/keeper" + txBoundaryAnte "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/ante" + txBoundaryKeeper "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/keeper" "github.com/cosmos/cosmos-sdk/codec" servertypes "github.com/cosmos/cosmos-sdk/server/types" sdk "github.com/cosmos/cosmos-sdk/types" ante "github.com/cosmos/cosmos-sdk/x/auth/ante" "github.com/cosmos/cosmos-sdk/x/auth/signing" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - 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 bab820df4..eeb18415a 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/v6/x/transfermiddleware/keeper" + tfmwKeeper "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/keeper" ) type IBCPermissionDecorator struct { diff --git a/app/app.go b/app/app.go index c43f67d11..225b73a01 100644 --- a/app/app.go +++ b/app/app.go @@ -35,8 +35,8 @@ import ( vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" "github.com/cosmos/cosmos-sdk/x/bank" - "github.com/notional-labs/composable/v6/app/keepers" - "github.com/notional-labs/composable/v6/app/upgrades/v6_5_0" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades/v6_5_0" // bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" @@ -74,6 +74,8 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" "github.com/cosmos/cosmos-sdk/x/staking" + customibctransfer "github.com/ComposableFi/composable-cosmos/v6/custom/ibc-transfer" + customstaking "github.com/ComposableFi/composable-cosmos/v6/custom/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/cosmos/cosmos-sdk/x/upgrade" upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" @@ -87,8 +89,6 @@ import ( ibcclientclient "github.com/cosmos/ibc-go/v7/modules/core/02-client/client" ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" - customibctransfer "github.com/notional-labs/composable/v6/custom/ibc-transfer" - customstaking "github.com/notional-labs/composable/v6/custom/staking" "github.com/spf13/cast" icq "github.com/strangelove-ventures/async-icq/v7" icqtypes "github.com/strangelove-ventures/async-icq/v7/types" @@ -99,37 +99,37 @@ 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/v6/custom/bank" + custombankmodule "github.com/ComposableFi/composable-cosmos/v6/custom/bank" - "github.com/notional-labs/composable/v6/app/ante" - "github.com/notional-labs/composable/v6/x/ibctransfermiddleware" - "github.com/notional-labs/composable/v6/x/stakingmiddleware" - transfermiddleware "github.com/notional-labs/composable/v6/x/transfermiddleware" - transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/v6/app/ante" + "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware" + "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware" + transfermiddleware "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware" + transfermiddlewaretypes "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/types" - txBoundary "github.com/notional-labs/composable/v6/x/tx-boundary" - txBoundaryTypes "github.com/notional-labs/composable/v6/x/tx-boundary/types" + txBoundary "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary" + txBoundaryTypes "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/types" - ratelimitmodule "github.com/notional-labs/composable/v6/x/ratelimit" - ratelimitmoduletypes "github.com/notional-labs/composable/v6/x/ratelimit/types" + ratelimitmodule "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit" + ratelimitmoduletypes "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/types" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" - "github.com/notional-labs/composable/v6/x/mint" - minttypes "github.com/notional-labs/composable/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/v6/x/mint" + minttypes "github.com/ComposableFi/composable-cosmos/v6/x/mint/types" ibctestingtypes "github.com/cosmos/ibc-go/v7/testing/types" - ibc_hooks "github.com/notional-labs/composable/v6/x/ibc-hooks" - ibchookstypes "github.com/notional-labs/composable/v6/x/ibc-hooks/types" + ibc_hooks "github.com/ComposableFi/composable-cosmos/v6/x/ibc-hooks" + ibchookstypes "github.com/ComposableFi/composable-cosmos/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/v6/app/upgrades" - ibctransfermiddlewaretypes "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" - stakingmiddlewaretypes "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" + upgrades "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" + ibctransfermiddlewaretypes "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" + stakingmiddlewaretypes "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/types" ) const ( diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index 1646262fa..4b901cf04 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/v6/app" + composable "github.com/ComposableFi/composable-cosmos/v6/app" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/ibctesting/chain.go b/app/ibctesting/chain.go index c2082b7b6..61fca0a12 100644 --- a/app/ibctesting/chain.go +++ b/app/ibctesting/chain.go @@ -8,7 +8,7 @@ import ( "testing" "time" - ratelimitmodulekeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper" + ratelimitmodulekeeper "github.com/ComposableFi/composable-cosmos/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/v6/app" - "github.com/notional-labs/composable/v6/app/ibctesting/simapp" - routerKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" + composable "github.com/ComposableFi/composable-cosmos/v6/app" + "github.com/ComposableFi/composable-cosmos/v6/app/ibctesting/simapp" + routerKeeper "github.com/ComposableFi/composable-cosmos/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 53a0e7165..53eeb5041 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/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/ComposableFi/composable-cosmos/v6/x/mint" + mintkeeper "github.com/ComposableFi/composable-cosmos/v6/x/mint/keeper" + minttypes "github.com/ComposableFi/composable-cosmos/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/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" + simappparams "github.com/ComposableFi/composable-cosmos/v6/app/ibctesting/simapp/params" + simappupgrades "github.com/ComposableFi/composable-cosmos/v6/app/ibctesting/simapp/upgrades" + v6 "github.com/ComposableFi/composable-cosmos/v6/app/ibctesting/simapp/upgrades/v6" + v7 "github.com/ComposableFi/composable-cosmos/v6/app/ibctesting/simapp/upgrades/v7" + transfermiddleware "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware" + transfermiddlewarekeeper "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/keeper" + transfermiddlewaretypes "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/types" ) const appName = "SimApp" diff --git a/app/ibctesting/simapp/encoding.go b/app/ibctesting/simapp/encoding.go index 53ee98f0e..beb60aa45 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/v6/app/ibctesting/simapp/params" + simappparams "github.com/ComposableFi/composable-cosmos/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 32d602b0c..eda7cb04b 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/v6/x/mint/types" + minttypes "github.com/ComposableFi/composable-cosmos/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 ab40fd3aa..8ebfdce97 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -45,8 +45,8 @@ import ( slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" + customstaking "github.com/ComposableFi/composable-cosmos/v6/custom/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - customstaking "github.com/notional-labs/composable/v6/custom/staking/keeper" "github.com/cosmos/cosmos-sdk/x/upgrade" upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" @@ -58,17 +58,17 @@ import ( icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" "github.com/cosmos/ibc-go/v7/modules/apps/transfer" + customibctransferkeeper "github.com/ComposableFi/composable-cosmos/v6/custom/ibc-transfer/keeper" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" ibchost "github.com/cosmos/ibc-go/v7/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" - customibctransferkeeper "github.com/notional-labs/composable/v6/custom/ibc-transfer/keeper" icq "github.com/strangelove-ventures/async-icq/v7" icqkeeper "github.com/strangelove-ventures/async-icq/v7/keeper" icqtypes "github.com/strangelove-ventures/async-icq/v7/types" - custombankkeeper "github.com/notional-labs/composable/v6/custom/bank/keeper" + custombankkeeper "github.com/ComposableFi/composable-cosmos/v6/custom/bank/keeper" router "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward" routerkeeper "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/keeper" @@ -78,22 +78,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/v6/x/transfermiddleware" - transfermiddlewarekeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" - transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types" + transfermiddleware "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware" + transfermiddlewarekeeper "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/keeper" + transfermiddlewaretypes "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/types" - txBoundaryKeeper "github.com/notional-labs/composable/v6/x/tx-boundary/keeper" - txBoundaryTypes "github.com/notional-labs/composable/v6/x/tx-boundary/types" + txBoundaryKeeper "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/keeper" + txBoundaryTypes "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/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" + ratelimitmodule "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit" + ratelimitmodulekeeper "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/keeper" + ratelimitmoduletypes "github.com/ComposableFi/composable-cosmos/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/v6/x/mint/keeper" - minttypes "github.com/notional-labs/composable/v6/x/mint/types" + mintkeeper "github.com/ComposableFi/composable-cosmos/v6/x/mint/keeper" + minttypes "github.com/ComposableFi/composable-cosmos/v6/x/mint/types" "github.com/CosmWasm/wasmd/x/wasm" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" @@ -102,14 +102,14 @@ import ( wasm08Keeper "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/keeper" wasm08types "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/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" - stakingmiddleware "github.com/notional-labs/composable/v6/x/stakingmiddleware/keeper" - stakingmiddlewaretypes "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" + ibc_hooks "github.com/ComposableFi/composable-cosmos/v6/x/ibc-hooks" + ibchookskeeper "github.com/ComposableFi/composable-cosmos/v6/x/ibc-hooks/keeper" + ibchookstypes "github.com/ComposableFi/composable-cosmos/v6/x/ibc-hooks/types" + stakingmiddleware "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/keeper" + stakingmiddlewaretypes "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/types" - ibctransfermiddleware "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/keeper" - ibctransfermiddlewaretypes "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" + ibctransfermiddleware "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/keeper" + ibctransfermiddlewaretypes "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" ) const ( diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 606b8f21d..c9dc3a676 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -29,24 +29,24 @@ import ( routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/packetforward/types" alliancemoduletypes "github.com/terra-money/alliance/x/alliance/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" + ibchookstypes "github.com/ComposableFi/composable-cosmos/v6/x/ibc-hooks/types" + ratelimitmoduletypes "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/types" + transfermiddlewaretypes "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/types" + txBoundaryTypes "github.com/ComposableFi/composable-cosmos/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/v6/x/mint/types" + minttypes "github.com/ComposableFi/composable-cosmos/v6/x/mint/types" "github.com/CosmWasm/wasmd/x/wasm" wasm08types "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" - // customstakingtypes "github.com/notional-labs/composable/v6/custom/staking/types" - stakingmiddleware "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" + // customstakingtypes "github.com/ComposableFi/composable-cosmos/v6/custom/staking/types" + stakingmiddleware "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/types" - ibctransfermiddleware "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" + ibctransfermiddleware "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" ) // GenerateKeys generates new keys (KV Store, Transient store, and memory store). diff --git a/app/test_access.go b/app/test_access.go index a97c63b34..044ffcf29 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/v6/x/ratelimit/keeper" - tfmdKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" + ratelimitkeeper "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/keeper" + tfmdKeeper "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/keeper" ) type TestSupport struct { diff --git a/app/test_helpers.go b/app/test_helpers.go index 97f5df118..926e805d3 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/v6/x/mint/types" + minttypes "github.com/ComposableFi/composable-cosmos/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 4dbd5b88b..e02e52ec8 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/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" + bech32authmigration "github.com/ComposableFi/composable-cosmos/v6/bech32-migration/auth" + bech32govmigration "github.com/ComposableFi/composable-cosmos/v6/bech32-migration/gov" + bech32slashingmigration "github.com/ComposableFi/composable-cosmos/v6/bech32-migration/slashing" + bech32stakingmigration "github.com/ComposableFi/composable-cosmos/v6/bech32-migration/staking" ) func CreateUpgradeHandler( diff --git a/app/upgrades/reward/upgrade.go b/app/upgrades/reward/upgrade.go index 647fb7fb4..a6eaaa64e 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/v6/x/mint/keeper" - tfmwkeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" + mintkeeper "github.com/ComposableFi/composable-cosmos/v6/x/mint/keeper" + tfmwkeeper "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/keeper" ) var listAllowedRelayAddress = []string{ diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 10551b005..c8987e4a4 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/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/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 91e150e0a..adb8956e4 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/v6/app/upgrades" - ibchookstypes "github.com/notional-labs/composable/v6/x/ibc-hooks/types" - ratelimitmoduletypes "github.com/notional-labs/composable/v6/x/ratelimit/types" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" + ibchookstypes "github.com/ComposableFi/composable-cosmos/v6/x/ibc-hooks/types" + ratelimitmoduletypes "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/types" ) const ( diff --git a/app/upgrades/v4/upgrade.go b/app/upgrades/v4/upgrade.go index b26fee2a9..a549fa21e 100644 --- a/app/upgrades/v4/upgrade.go +++ b/app/upgrades/v4/upgrade.go @@ -6,10 +6,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" + tfmdtypes "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/types" "github.com/cosmos/cosmos-sdk/codec" - "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 032f1f01f..36ad61e04 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/v6/app/upgrades" +import "github.com/ComposableFi/composable-cosmos/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 b913f3024..54f66df7b 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/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/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 fec6f73b6..846a4f9a6 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/v6/app/upgrades" +import "github.com/ComposableFi/composable-cosmos/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 fc413b7ae..dd900a7a5 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/v6/app/keepers" - rateLimitKeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + rateLimitKeeper "github.com/ComposableFi/composable-cosmos/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 69946b0cb..ef804970e 100644 --- a/app/upgrades/v5/constants.go +++ b/app/upgrades/v5/constants.go @@ -1,9 +1,9 @@ package v5 import ( + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" + txboundary "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/types" store "github.com/cosmos/cosmos-sdk/store/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 90fc487e2..336d6a549 100644 --- a/app/upgrades/v5/upgrade.go +++ b/app/upgrades/v5/upgrade.go @@ -2,13 +2,13 @@ package v5 import ( "cosmossdk.io/math" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" + "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/types" "github.com/cosmos/cosmos-sdk/codec" 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/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 aa9a6bf30..f8fcec2bf 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/v6/app/upgrades" +import "github.com/ComposableFi/composable-cosmos/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 771d3c696..f3634dfed 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/v6/app/keepers" - rateLimitKeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper" - "github.com/notional-labs/composable/v6/x/ratelimit/types" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + rateLimitKeeper "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/keeper" + "github.com/ComposableFi/composable-cosmos/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 b09071c2d..c2abced88 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/v6/app/upgrades" +import "github.com/ComposableFi/composable-cosmos/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 0b4e95d2e..608b21439 100644 --- a/app/upgrades/v5_2_0/fork.go +++ b/app/upgrades/v5_2_0/fork.go @@ -2,10 +2,10 @@ package v5_2_0 import ( + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" "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/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 06444b580..53d1aa223 100644 --- a/app/upgrades/v6/constants.go +++ b/app/upgrades/v6/constants.go @@ -1,9 +1,9 @@ package v6 import ( + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/x/authz" - "github.com/notional-labs/composable/v6/app/upgrades" ) const ( diff --git a/app/upgrades/v6/upgrade.go b/app/upgrades/v6/upgrade.go index a614235b2..ca2592725 100644 --- a/app/upgrades/v6/upgrade.go +++ b/app/upgrades/v6/upgrade.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/notional-labs/composable/v6/app/keepers" - "github.com/notional-labs/composable/v6/app/upgrades" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v6_4/constants.go b/app/upgrades/v6_4/constants.go index 64aca679c..ddfaa26ec 100644 --- a/app/upgrades/v6_4/constants.go +++ b/app/upgrades/v6_4/constants.go @@ -3,8 +3,8 @@ package v6_4 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/notional-labs/composable/v6/app/upgrades" - customstmiddleware "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" + customstmiddleware "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/types" ) const ( diff --git a/app/upgrades/v6_4/upgrade.go b/app/upgrades/v6_4/upgrade.go index ca18f51f7..d9cc93266 100644 --- a/app/upgrades/v6_4/upgrade.go +++ b/app/upgrades/v6_4/upgrade.go @@ -5,10 +5,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" + customstmiddleware "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/notional-labs/composable/v6/app/keepers" - "github.com/notional-labs/composable/v6/app/upgrades" - customstmiddleware "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v6_4_4/constants.go b/app/upgrades/v6_4_4/constants.go index dac6950a1..0ede633a9 100644 --- a/app/upgrades/v6_4_4/constants.go +++ b/app/upgrades/v6_4_4/constants.go @@ -1,7 +1,7 @@ package v6_4_4 import ( - "github.com/notional-labs/composable/v6/app/upgrades" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" ) const ( diff --git a/app/upgrades/v6_4_4/upgrade.go b/app/upgrades/v6_4_4/upgrade.go index b3273193a..7979643db 100644 --- a/app/upgrades/v6_4_4/upgrade.go +++ b/app/upgrades/v6_4_4/upgrade.go @@ -5,9 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" "github.com/cosmos/cosmos-sdk/codec" - "github.com/notional-labs/composable/v6/app/keepers" - "github.com/notional-labs/composable/v6/app/upgrades" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v6_4_5/constants.go b/app/upgrades/v6_4_5/constants.go index 55b602bb3..22bc48aa1 100644 --- a/app/upgrades/v6_4_5/constants.go +++ b/app/upgrades/v6_4_5/constants.go @@ -1,7 +1,7 @@ package v6_4_5 import ( - "github.com/notional-labs/composable/v6/app/upgrades" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" ) const ( diff --git a/app/upgrades/v6_4_5/upgrade.go b/app/upgrades/v6_4_5/upgrade.go index 72dbebe02..2f9bf4837 100644 --- a/app/upgrades/v6_4_5/upgrade.go +++ b/app/upgrades/v6_4_5/upgrade.go @@ -5,9 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" "github.com/cosmos/cosmos-sdk/codec" - "github.com/notional-labs/composable/v6/app/keepers" - "github.com/notional-labs/composable/v6/app/upgrades" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v6_4_6/constants.go b/app/upgrades/v6_4_6/constants.go index cbb8a3658..d87e37ed8 100644 --- a/app/upgrades/v6_4_6/constants.go +++ b/app/upgrades/v6_4_6/constants.go @@ -3,8 +3,8 @@ package v6_4_6 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/notional-labs/composable/v6/app/upgrades" - ibctransfermiddleware "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" + ibctransfermiddleware "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" ) const ( diff --git a/app/upgrades/v6_4_6/upgrade.go b/app/upgrades/v6_4_6/upgrade.go index 183e63e80..17c6f03cf 100644 --- a/app/upgrades/v6_4_6/upgrade.go +++ b/app/upgrades/v6_4_6/upgrade.go @@ -5,10 +5,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" + ibctransfermiddleware "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/notional-labs/composable/v6/app/keepers" - "github.com/notional-labs/composable/v6/app/upgrades" - ibctransfermiddleware "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v6_4_7/constants.go b/app/upgrades/v6_4_7/constants.go index 549c1e41e..f0b75d218 100644 --- a/app/upgrades/v6_4_7/constants.go +++ b/app/upgrades/v6_4_7/constants.go @@ -3,7 +3,7 @@ package v6_4_7 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/notional-labs/composable/v6/app/upgrades" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" ) const ( diff --git a/app/upgrades/v6_4_7/upgrade.go b/app/upgrades/v6_4_7/upgrade.go index 682c58a62..cc5439ba0 100644 --- a/app/upgrades/v6_4_7/upgrade.go +++ b/app/upgrades/v6_4_7/upgrade.go @@ -5,9 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" "github.com/cosmos/cosmos-sdk/codec" - "github.com/notional-labs/composable/v6/app/keepers" - "github.com/notional-labs/composable/v6/app/upgrades" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v6_4_8/constants.go b/app/upgrades/v6_4_8/constants.go index bb164f5ca..2f5d4a204 100644 --- a/app/upgrades/v6_4_8/constants.go +++ b/app/upgrades/v6_4_8/constants.go @@ -1,9 +1,9 @@ package v6_4_8 import ( + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" + ibctransfermiddleware "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/notional-labs/composable/v6/app/upgrades" - ibctransfermiddleware "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" ) const ( diff --git a/app/upgrades/v6_4_8/upgrade.go b/app/upgrades/v6_4_8/upgrade.go index 58fe2a14d..d056c7fde 100644 --- a/app/upgrades/v6_4_8/upgrade.go +++ b/app/upgrades/v6_4_8/upgrade.go @@ -5,10 +5,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" + ibctransfermiddleware "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/notional-labs/composable/v6/app/keepers" - "github.com/notional-labs/composable/v6/app/upgrades" - ibctransfermiddleware "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v6_4_9/constants.go b/app/upgrades/v6_4_9/constants.go index 4572af53f..6f484597c 100644 --- a/app/upgrades/v6_4_9/constants.go +++ b/app/upgrades/v6_4_9/constants.go @@ -1,8 +1,8 @@ package v6_4_9 import ( + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/notional-labs/composable/v6/app/upgrades" ) const ( diff --git a/app/upgrades/v6_4_9/upgrade.go b/app/upgrades/v6_4_9/upgrade.go index 70b06b6a6..b91de5540 100644 --- a/app/upgrades/v6_4_9/upgrade.go +++ b/app/upgrades/v6_4_9/upgrade.go @@ -5,9 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" "github.com/cosmos/cosmos-sdk/codec" - "github.com/notional-labs/composable/v6/app/keepers" - "github.com/notional-labs/composable/v6/app/upgrades" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v6_4_91/constants.go b/app/upgrades/v6_4_91/constants.go index 83a2fb7f7..11a1d214e 100644 --- a/app/upgrades/v6_4_91/constants.go +++ b/app/upgrades/v6_4_91/constants.go @@ -1,8 +1,8 @@ package v6_4_91 import ( + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/notional-labs/composable/v6/app/upgrades" ) const ( diff --git a/app/upgrades/v6_4_91/upgrade.go b/app/upgrades/v6_4_91/upgrade.go index a1888ea62..27de9a570 100644 --- a/app/upgrades/v6_4_91/upgrade.go +++ b/app/upgrades/v6_4_91/upgrade.go @@ -5,9 +5,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" "github.com/cosmos/cosmos-sdk/codec" - "github.com/notional-labs/composable/v6/app/keepers" - "github.com/notional-labs/composable/v6/app/upgrades" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v6_5_0/constants.go b/app/upgrades/v6_5_0/constants.go index cfbba664c..ea035b1c5 100644 --- a/app/upgrades/v6_5_0/constants.go +++ b/app/upgrades/v6_5_0/constants.go @@ -1,9 +1,9 @@ package v6_5_0 import ( + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" + ibctransfermiddleware "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/notional-labs/composable/v6/app/upgrades" - ibctransfermiddleware "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" ) const ( diff --git a/app/upgrades/v6_5_0/upgrade.go b/app/upgrades/v6_5_0/upgrade.go index 18cf2ad54..b6936de40 100644 --- a/app/upgrades/v6_5_0/upgrade.go +++ b/app/upgrades/v6_5_0/upgrade.go @@ -5,10 +5,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "github.com/ComposableFi/composable-cosmos/v6/app/keepers" + "github.com/ComposableFi/composable-cosmos/v6/app/upgrades" + ibctransfermiddleware "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/notional-labs/composable/v6/app/keepers" - "github.com/notional-labs/composable/v6/app/upgrades" - ibctransfermiddleware "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" ) func CreateUpgradeHandler( diff --git a/bech32-migration/auth/auth.go b/bech32-migration/auth/auth.go index 1bb3f829f..4a93b7664 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/v6/bech32-migration/utils" + "github.com/ComposableFi/composable-cosmos/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 f141d1c0b..440bbb5f1 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/v6/bech32-migration/utils" + "github.com/ComposableFi/composable-cosmos/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 cde06383e..e7cc3784c 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/v6/bech32-migration/utils" + "github.com/ComposableFi/composable-cosmos/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 3af0f74ab..dc3b28226 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/v6/bech32-migration/utils" + "github.com/ComposableFi/composable-cosmos/v6/bech32-migration/utils" ) func MigrateAddressBech32(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) { diff --git a/cmd/centaurid/cmd/genaccounts.go b/cmd/centaurid/cmd/genaccounts.go index df42303d7..f213420b0 100644 --- a/cmd/centaurid/cmd/genaccounts.go +++ b/cmd/centaurid/cmd/genaccounts.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/notional-labs/composable/v6/bech32-migration/utils" + "github.com/ComposableFi/composable-cosmos/v6/bech32-migration/utils" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/cmd/centaurid/cmd/root.go b/cmd/centaurid/cmd/root.go index 007663989..8bf969ec7 100644 --- a/cmd/centaurid/cmd/root.go +++ b/cmd/centaurid/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/v6/app" - // "github.com/notional-labs/composable/v6/app/params" + "github.com/ComposableFi/composable-cosmos/v6/app" + // "github.com/ComposableFi/composable-cosmos/v6/app/params" // this line is used by starport scaffolding # stargate/root/import ) diff --git a/cmd/centaurid/main.go b/cmd/centaurid/main.go index bad5e27a4..48c457322 100644 --- a/cmd/centaurid/main.go +++ b/cmd/centaurid/main.go @@ -5,9 +5,9 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/notional-labs/composable/v6/app" - cmd "github.com/notional-labs/composable/v6/cmd/centaurid/cmd" - cmdcfg "github.com/notional-labs/composable/v6/cmd/centaurid/config" + "github.com/ComposableFi/composable-cosmos/v6/app" + cmd "github.com/ComposableFi/composable-cosmos/v6/cmd/centaurid/cmd" + cmdcfg "github.com/ComposableFi/composable-cosmos/v6/cmd/centaurid/config" ) func main() { diff --git a/custom/bank/bank_test.go b/custom/bank/bank_test.go index ffbaa63f2..084eb2e5c 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/v6/app/ibctesting" + customibctesting "github.com/ComposableFi/composable-cosmos/v6/app/ibctesting" ) type CustomBankTestSuite struct { diff --git a/custom/bank/keeper/keeper.go b/custom/bank/keeper/keeper.go index 5422ac308..0a3282b75 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/v6/custom/bank/types" + banktypes "github.com/ComposableFi/composable-cosmos/v6/custom/bank/types" - transfermiddlewarekeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" + transfermiddlewarekeeper "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/keeper" alliancekeeper "github.com/terra-money/alliance/x/alliance/keeper" ) diff --git a/custom/bank/module.go b/custom/bank/module.go index 3d88d9612..71299f068 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/v6/custom/bank/keeper" + custombankkeeper "github.com/ComposableFi/composable-cosmos/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/custom/ibc-transfer/keeper/keeper.go b/custom/ibc-transfer/keeper/keeper.go index cc4bc6773..1c5b57827 100644 --- a/custom/ibc-transfer/keeper/keeper.go +++ b/custom/ibc-transfer/keeper/keeper.go @@ -4,12 +4,12 @@ import ( "github.com/cosmos/cosmos-sdk/codec" ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" + ibctransfermiddleware "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/keeper" storetypes "github.com/cosmos/cosmos-sdk/store/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" - ibctransfermiddleware "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/keeper" ) type Keeper struct { diff --git a/custom/ibc-transfer/keeper/msg_server.go b/custom/ibc-transfer/keeper/msg_server.go index 4826edfc8..13ef760cf 100644 --- a/custom/ibc-transfer/keeper/msg_server.go +++ b/custom/ibc-transfer/keeper/msg_server.go @@ -5,10 +5,10 @@ import ( "fmt" "time" + custombankkeeper "github.com/ComposableFi/composable-cosmos/v6/custom/bank/keeper" + ibctransfermiddlewaretypes "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - custombankkeeper "github.com/notional-labs/composable/v6/custom/bank/keeper" - ibctransfermiddlewaretypes "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" ) type msgServer struct { diff --git a/custom/ibc-transfer/module.go b/custom/ibc-transfer/module.go index dd34f0716..c94c090e2 100644 --- a/custom/ibc-transfer/module.go +++ b/custom/ibc-transfer/module.go @@ -6,11 +6,11 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/module" + custombankkeeper "github.com/ComposableFi/composable-cosmos/v6/custom/bank/keeper" + customibctransferkeeper "github.com/ComposableFi/composable-cosmos/v6/custom/ibc-transfer/keeper" ibctransfermodule "github.com/cosmos/ibc-go/v7/modules/apps/transfer" ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - custombankkeeper "github.com/notional-labs/composable/v6/custom/bank/keeper" - customibctransferkeeper "github.com/notional-labs/composable/v6/custom/ibc-transfer/keeper" ) // AppModule wraps around the bank module and the bank keeper to return the right total supply diff --git a/custom/staking/abci.go b/custom/staking/abci.go index 915dafca0..8b5123164 100644 --- a/custom/staking/abci.go +++ b/custom/staking/abci.go @@ -11,7 +11,7 @@ import ( // "github.com/cosmos/cosmos-sdk/x/staking/keeper" "github.com/cosmos/cosmos-sdk/x/staking/types" - customstakingkeeper "github.com/notional-labs/composable/v6/custom/staking/keeper" + customstakingkeeper "github.com/ComposableFi/composable-cosmos/v6/custom/staking/keeper" ) // Called every block, update validator set diff --git a/custom/staking/keeper/keeper.go b/custom/staking/keeper/keeper.go index 4f9fde1fd..d1227e93a 100644 --- a/custom/staking/keeper/keeper.go +++ b/custom/staking/keeper/keeper.go @@ -7,14 +7,14 @@ import ( abcicometbft "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/codec" + mintkeeper "github.com/ComposableFi/composable-cosmos/v6/x/mint/keeper" + minttypes "github.com/ComposableFi/composable-cosmos/v6/x/mint/types" + stakingmiddleware "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/keeper" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" distkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" "github.com/cosmos/cosmos-sdk/x/staking/types" - mintkeeper "github.com/notional-labs/composable/v6/x/mint/keeper" - minttypes "github.com/notional-labs/composable/v6/x/mint/types" - stakingmiddleware "github.com/notional-labs/composable/v6/x/stakingmiddleware/keeper" ) type Keeper struct { diff --git a/custom/staking/module.go b/custom/staking/module.go index 44a306f73..fa7b109fc 100644 --- a/custom/staking/module.go +++ b/custom/staking/module.go @@ -11,9 +11,9 @@ import ( stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - // custombankkeeper "github.com/notional-labs/composable/v6/custom/bank/keeper" + // custombankkeeper "github.com/ComposableFi/composable-cosmos/v6/custom/bank/keeper" + customstakingkeeper "github.com/ComposableFi/composable-cosmos/v6/custom/staking/keeper" sdk "github.com/cosmos/cosmos-sdk/types" - customstakingkeeper "github.com/notional-labs/composable/v6/custom/staking/keeper" ) // AppModule wraps around the bank module and the bank keeper to return the right total supply diff --git a/go.mod b/go.mod index 959c4fae2..28e5c73c5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/notional-labs/composable/v6 +module github.com/ComposableFi/composable-cosmos/v6 go 1.20 diff --git a/x/ibc-hooks/client/cli/query.go b/x/ibc-hooks/client/cli/query.go index 7b8cc8baa..4b8774a9e 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/v6/x/ibc-hooks/keeper" + "github.com/ComposableFi/composable-cosmos/v6/x/ibc-hooks/keeper" - "github.com/notional-labs/composable/v6/x/ibc-hooks/types" + "github.com/ComposableFi/composable-cosmos/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 2462a130f..3eb63687b 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/v6/x/ibc-hooks/types" + "github.com/ComposableFi/composable-cosmos/v6/x/ibc-hooks/types" ) type ( diff --git a/x/ibc-hooks/module.go b/x/ibc-hooks/module.go index 779f67846..b2f04db10 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/v6/x/ibc-hooks/client/cli" - "github.com/notional-labs/composable/v6/x/ibc-hooks/types" + "github.com/ComposableFi/composable-cosmos/v6/x/ibc-hooks/client/cli" + "github.com/ComposableFi/composable-cosmos/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 338ed6603..ffa954f82 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/v6/app/ibctesting" - ibchookskeeper "github.com/notional-labs/composable/v6/x/ibc-hooks/keeper" + customibctesting "github.com/ComposableFi/composable-cosmos/v6/app/ibctesting" + ibchookskeeper "github.com/ComposableFi/composable-cosmos/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 bc239f02c..7ae197262 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/v6/x/ibc-hooks/keeper" - "github.com/notional-labs/composable/v6/x/ibc-hooks/types" + "github.com/ComposableFi/composable-cosmos/v6/x/ibc-hooks/keeper" + "github.com/ComposableFi/composable-cosmos/v6/x/ibc-hooks/types" errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/ibctransfermiddleware/client/cli/query.go b/x/ibctransfermiddleware/client/cli/query.go index 7edb40544..b067851cb 100644 --- a/x/ibctransfermiddleware/client/cli/query.go +++ b/x/ibctransfermiddleware/client/cli/query.go @@ -3,9 +3,9 @@ package cli import ( "github.com/spf13/cobra" + "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" ) // GetQueryCmd returns the cli query commands for the staking middleware module. diff --git a/x/ibctransfermiddleware/client/cli/tx.go b/x/ibctransfermiddleware/client/cli/tx.go index 1d212ff83..9185734c9 100644 --- a/x/ibctransfermiddleware/client/cli/tx.go +++ b/x/ibctransfermiddleware/client/cli/tx.go @@ -4,11 +4,11 @@ import ( "fmt" "strconv" + "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" "github.com/cosmos/cosmos-sdk/version" - "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" "github.com/spf13/cobra" ) diff --git a/x/ibctransfermiddleware/keeper/genesis.go b/x/ibctransfermiddleware/keeper/genesis.go index 82b22a6f9..617ba9807 100644 --- a/x/ibctransfermiddleware/keeper/genesis.go +++ b/x/ibctransfermiddleware/keeper/genesis.go @@ -1,8 +1,8 @@ package keeper import ( + "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" ) // InitGenesis new stake middleware genesis diff --git a/x/ibctransfermiddleware/keeper/grpc_query.go b/x/ibctransfermiddleware/keeper/grpc_query.go index b95c1d2f6..81d53f8ca 100644 --- a/x/ibctransfermiddleware/keeper/grpc_query.go +++ b/x/ibctransfermiddleware/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/ibctransfermiddleware/keeper/keeper.go b/x/ibctransfermiddleware/keeper/keeper.go index a43bdb4b9..b0066b544 100644 --- a/x/ibctransfermiddleware/keeper/keeper.go +++ b/x/ibctransfermiddleware/keeper/keeper.go @@ -1,8 +1,8 @@ package keeper import ( + "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" "github.com/cometbft/cometbft/libs/log" - "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" diff --git a/x/ibctransfermiddleware/keeper/msg_server.go b/x/ibctransfermiddleware/keeper/msg_server.go index f3fc4daa3..88f5e1aff 100644 --- a/x/ibctransfermiddleware/keeper/msg_server.go +++ b/x/ibctransfermiddleware/keeper/msg_server.go @@ -4,9 +4,9 @@ import ( "context" errorsmod "cosmossdk.io/errors" + "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/ibctransfermiddleware/module.go b/x/ibctransfermiddleware/module.go index 1f46d6364..6351d721f 100644 --- a/x/ibctransfermiddleware/module.go +++ b/x/ibctransfermiddleware/module.go @@ -16,9 +16,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/client/cli" - "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/keeper" - "github.com/notional-labs/composable/v6/x/ibctransfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/client/cli" + "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/keeper" + "github.com/ComposableFi/composable-cosmos/v6/x/ibctransfermiddleware/types" ) var ( diff --git a/x/mint/abci.go b/x/mint/abci.go index 42964667d..da934dd1c 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/v6/x/mint/keeper" - "github.com/notional-labs/composable/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/v6/x/mint/keeper" + "github.com/ComposableFi/composable-cosmos/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 b04d2d120..65df5c939 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/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/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 3fb5b9dc7..ab3ed061a 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/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/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 570ebecb3..40a4117e6 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/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/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 88c1131c5..02a3c9db4 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/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/v6/x/mint/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index 70ff6ddf3..986eaa433 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/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/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 05f73dbe6..9435c1c02 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/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/v6/x/mint/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/mint/module.go b/x/mint/module.go index 5205a408d..a15f85c0d 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/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" + "github.com/ComposableFi/composable-cosmos/v6/x/mint/client/cli" + "github.com/ComposableFi/composable-cosmos/v6/x/mint/keeper" + "github.com/ComposableFi/composable-cosmos/v6/x/mint/simulation" + "github.com/ComposableFi/composable-cosmos/v6/x/mint/types" ) var ( diff --git a/x/mint/simulation/decoder.go b/x/mint/simulation/decoder.go index c8128bcfc..fa4c4e967 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/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/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 36a0f4708..747dad1f2 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/v6/x/mint/simulation" - composableminttypes "github.com/notional-labs/composable/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/v6/x/mint/simulation" + composableminttypes "github.com/ComposableFi/composable-cosmos/v6/x/mint/types" ) func TestDecodeStore(t *testing.T) { diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go index f63d39818..aea26eff6 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/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/v6/x/mint/types" ) // Simulation parameter constants diff --git a/x/mint/simulation/genesis_test.go b/x/mint/simulation/genesis_test.go index 57700280a..32a890149 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/v6/x/mint/simulation" - "github.com/notional-labs/composable/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/v6/x/mint/simulation" + "github.com/ComposableFi/composable-cosmos/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 dc28440e5..1312354f1 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/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/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 69aca951a..d0e237456 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/v6/x/mint/simulation" - "github.com/notional-labs/composable/v6/x/mint/types" + "github.com/ComposableFi/composable-cosmos/v6/x/mint/simulation" + "github.com/ComposableFi/composable-cosmos/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 968b20a08..285e025f4 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/v6/x/ratelimit/types" + "github.com/ComposableFi/composable-cosmos/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 227ae30af..f5672a455 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/v6/x/ratelimit/types" + "github.com/ComposableFi/composable-cosmos/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 f22829935..e9a91f621 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/v6/x/ratelimit/keeper" + "github.com/ComposableFi/composable-cosmos/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 a3789e223..811b7266e 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/v6/x/ratelimit/types" + "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/types" ) // BeginBlocker of epochs module. diff --git a/x/ratelimit/keeper/epoch.go b/x/ratelimit/keeper/epoch.go index 0039c067a..5d983debb 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/v6/x/ratelimit/types" + "github.com/ComposableFi/composable-cosmos/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 0b64c87ff..8d0260682 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/v6/x/ratelimit/types" + "github.com/ComposableFi/composable-cosmos/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 2aee780d2..a04a48698 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/v6/x/ratelimit/types" + "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/ratelimit/keeper/keeper.go b/x/ratelimit/keeper/keeper.go index 243241ca4..641773c0d 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/v6/x/ratelimit/types" - tfmwkeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" + "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/types" + tfmwkeeper "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/keeper" ) type Keeper struct { diff --git a/x/ratelimit/keeper/msg_server.go b/x/ratelimit/keeper/msg_server.go index c2f91c744..3e8588904 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/v6/x/ratelimit/types" + "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/ratelimit/keeper/packet.go b/x/ratelimit/keeper/packet.go index 85e8510ab..9e5663cb3 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/v6/x/ratelimit/types" + "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/types" ) type RateLimitedPacketInfo struct { diff --git a/x/ratelimit/keeper/rate_limit.go b/x/ratelimit/keeper/rate_limit.go index 8ef5514d8..c0ed38bd1 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/v6/x/ratelimit/types" + "github.com/ComposableFi/composable-cosmos/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 70a96f533..a4b039b76 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/v6/x/ratelimit/client/cli" - "github.com/notional-labs/composable/v6/x/ratelimit/keeper" - "github.com/notional-labs/composable/v6/x/ratelimit/types" + "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/client/cli" + "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/keeper" + "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/types" ) var ( diff --git a/x/ratelimit/relay_test.go b/x/ratelimit/relay_test.go index 1e2b090ce..e2f0d2903 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/v6/app/ibctesting" - ratelimittypes "github.com/notional-labs/composable/v6/x/ratelimit/types" + customibctesting "github.com/ComposableFi/composable-cosmos/v6/app/ibctesting" + ratelimittypes "github.com/ComposableFi/composable-cosmos/v6/x/ratelimit/types" ) type RateLimitTestSuite struct { diff --git a/x/stakingmiddleware/client/cli/query.go b/x/stakingmiddleware/client/cli/query.go index 45449d249..6c27b8bc0 100644 --- a/x/stakingmiddleware/client/cli/query.go +++ b/x/stakingmiddleware/client/cli/query.go @@ -3,9 +3,9 @@ package cli import ( "github.com/spf13/cobra" + "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" ) // GetQueryCmd returns the cli query commands for the staking middleware module. diff --git a/x/stakingmiddleware/client/cli/tx.go b/x/stakingmiddleware/client/cli/tx.go index 04b162b50..daefa19ef 100644 --- a/x/stakingmiddleware/client/cli/tx.go +++ b/x/stakingmiddleware/client/cli/tx.go @@ -1,8 +1,8 @@ package cli import ( + "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/types" "github.com/cosmos/cosmos-sdk/client" - "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" "github.com/spf13/cobra" ) diff --git a/x/stakingmiddleware/keeper/genesis.go b/x/stakingmiddleware/keeper/genesis.go index c50d10dcf..aa055fe4b 100644 --- a/x/stakingmiddleware/keeper/genesis.go +++ b/x/stakingmiddleware/keeper/genesis.go @@ -1,8 +1,8 @@ package keeper import ( + "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" ) // InitGenesis new stake middleware genesis diff --git a/x/stakingmiddleware/keeper/grpc_query.go b/x/stakingmiddleware/keeper/grpc_query.go index d7002472e..6c32045a0 100644 --- a/x/stakingmiddleware/keeper/grpc_query.go +++ b/x/stakingmiddleware/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" + "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/stakingmiddleware/keeper/keeper.go b/x/stakingmiddleware/keeper/keeper.go index 4580cb017..10d6c3804 100644 --- a/x/stakingmiddleware/keeper/keeper.go +++ b/x/stakingmiddleware/keeper/keeper.go @@ -3,8 +3,8 @@ package keeper import ( "fmt" + "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/types" "github.com/cometbft/cometbft/libs/log" - "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" diff --git a/x/stakingmiddleware/keeper/msg_server.go b/x/stakingmiddleware/keeper/msg_server.go index 95de74ad9..6c1f558db 100644 --- a/x/stakingmiddleware/keeper/msg_server.go +++ b/x/stakingmiddleware/keeper/msg_server.go @@ -4,9 +4,9 @@ import ( "context" errorsmod "cosmossdk.io/errors" + "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/types" sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/stakingmiddleware/module.go b/x/stakingmiddleware/module.go index 4c656f6ce..196d2e53a 100644 --- a/x/stakingmiddleware/module.go +++ b/x/stakingmiddleware/module.go @@ -16,9 +16,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/notional-labs/composable/v6/x/stakingmiddleware/client/cli" - "github.com/notional-labs/composable/v6/x/stakingmiddleware/keeper" - "github.com/notional-labs/composable/v6/x/stakingmiddleware/types" + "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/client/cli" + "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/keeper" + "github.com/ComposableFi/composable-cosmos/v6/x/stakingmiddleware/types" ) var ( diff --git a/x/transfermiddleware/client/cli/query.go b/x/transfermiddleware/client/cli/query.go index 85d03f921..0aae80757 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/v6/x/transfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/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 2bcccaec1..3996f1e0e 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/v6/x/transfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/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 bbf739a8c..358d7316a 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/v6/app/ibctesting" + customibctesting "github.com/ComposableFi/composable-cosmos/v6/app/ibctesting" ) // NOTE: This is the address of the gov authority on the chain that is being tested. diff --git a/x/transfermiddleware/ibc_middleware.go b/x/transfermiddleware/ibc_middleware.go index 4be08ca44..d7ade0fef 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/v6/x/transfermiddleware/keeper" + "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/keeper" ) var _ porttypes.Middleware = &IBCMiddleware{} diff --git a/x/transfermiddleware/keeper/abci.go b/x/transfermiddleware/keeper/abci.go index a3f0479d8..e196923a9 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/v6/x/transfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/types" ) // BeginBlocker of epochs module. diff --git a/x/transfermiddleware/keeper/genesis.go b/x/transfermiddleware/keeper/genesis.go index 6a4615b7e..0d355d86d 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/v6/x/transfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/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 ca352b56c..5841d0b8d 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/v6/app/helpers" - "github.com/notional-labs/composable/v6/x/transfermiddleware/types" + helpers "github.com/ComposableFi/composable-cosmos/v6/app/helpers" + "github.com/ComposableFi/composable-cosmos/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 dbf461a9b..5428ec2d0 100644 --- a/x/transfermiddleware/keeper/grpc_query.go +++ b/x/transfermiddleware/keeper/grpc_query.go @@ -3,11 +3,11 @@ package keeper import ( "context" + "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" sdkquery "github.com/cosmos/cosmos-sdk/types/query" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/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 14dd2e898..fc436d8d5 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/v6/x/transfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/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 4988afd09..4213a5ae9 100644 --- a/x/transfermiddleware/keeper/keeper.go +++ b/x/transfermiddleware/keeper/keeper.go @@ -15,7 +15,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/v6/x/transfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/types" ) type Keeper struct { diff --git a/x/transfermiddleware/keeper/msg_server.go b/x/transfermiddleware/keeper/msg_server.go index 9e303e4d7..7ea79b2d0 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/v6/x/transfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/transfermiddleware/keeper/params.go b/x/transfermiddleware/keeper/params.go index b3905bf87..8d96e05cd 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/v6/x/transfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/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 35cf2ed90..4d826ef0d 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/v6/x/transfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/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 1f64a2b79..69e5eace3 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/v6/x/transfermiddleware/client/cli" - "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" - "github.com/notional-labs/composable/v6/x/transfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/client/cli" + "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/keeper" + "github.com/ComposableFi/composable-cosmos/v6/x/transfermiddleware/types" ) var ( diff --git a/x/transfermiddleware/pfm_test.go b/x/transfermiddleware/pfm_test.go index ce9eb675d..06860792d 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/v6/app/ibctesting" + customibctesting "github.com/ComposableFi/composable-cosmos/v6/app/ibctesting" ) type PacketMetadata struct { diff --git a/x/transfermiddleware/relay_test.go b/x/transfermiddleware/relay_test.go index fdb27f02f..db814324e 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/v6/app/ibctesting" + customibctesting "github.com/ComposableFi/composable-cosmos/v6/app/ibctesting" ) // TODO: use testsuite here. diff --git a/x/transfermiddleware/types/info_test.go b/x/transfermiddleware/types/info_test.go index a0018cbe7..d347acceb 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/v6/x/transfermiddleware/types" + "github.com/ComposableFi/composable-cosmos/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 3388f0b18..0e10099ef 100644 --- a/x/tx-boundary/ante/antetest/ante_test.go +++ b/x/tx-boundary/ante/antetest/ante_test.go @@ -3,14 +3,14 @@ package antetest import ( "testing" + txboundaryAnte "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/ante" + "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/types" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/testutil/testdata" 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/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 f66a64acf..82428ae03 100644 --- a/x/tx-boundary/ante/antetest/ante_test_setup.go +++ b/x/tx-boundary/ante/antetest/ante_test_setup.go @@ -4,6 +4,8 @@ import ( "time" "cosmossdk.io/math" + "github.com/ComposableFi/composable-cosmos/v6/app" + "github.com/ComposableFi/composable-cosmos/v6/app/helpers" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/client" @@ -17,8 +19,6 @@ 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/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 52bdb1be9..521734789 100644 --- a/x/tx-boundary/ante/decorate.go +++ b/x/tx-boundary/ante/decorate.go @@ -7,9 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" + txBoundaryKeeper "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/keeper" "github.com/cosmos/cosmos-sdk/x/authz" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - 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 5723a78da..df4bb938b 100644 --- a/x/tx-boundary/client/cli/query.go +++ b/x/tx-boundary/client/cli/query.go @@ -5,9 +5,9 @@ import ( "github.com/spf13/cobra" + "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "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 68f93b11e..55c3c6365 100644 --- a/x/tx-boundary/client/cli/tx.go +++ b/x/tx-boundary/client/cli/tx.go @@ -3,10 +3,10 @@ package cli import ( "strconv" + "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/types" "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/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 04d89ebe0..2c0846e68 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/v6/x/tx-boundary/types" + "github.com/ComposableFi/composable-cosmos/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 3bd29b7ee..ebdff80c3 100644 --- a/x/tx-boundary/keeper/grpc_query.go +++ b/x/tx-boundary/keeper/grpc_query.go @@ -3,8 +3,8 @@ package keeper import ( "context" + "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/types" sdk "github.com/cosmos/cosmos-sdk/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 145c62807..97bb5f342 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/v6/x/tx-boundary/types" + "github.com/ComposableFi/composable-cosmos/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 660ee6303..521eb7a34 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/v6/app" - "github.com/notional-labs/composable/v6/app/helpers" - "github.com/notional-labs/composable/v6/x/tx-boundary/types" + "github.com/ComposableFi/composable-cosmos/v6/app" + "github.com/ComposableFi/composable-cosmos/v6/app/helpers" + "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/types" ) type KeeperTestSuite struct { diff --git a/x/tx-boundary/module.go b/x/tx-boundary/module.go index 1229f262c..89a313f15 100644 --- a/x/tx-boundary/module.go +++ b/x/tx-boundary/module.go @@ -9,15 +9,15 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" + "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/client/cli" + "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/keeper" + "github.com/ComposableFi/composable-cosmos/v6/x/tx-boundary/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" 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/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 (