diff --git a/app/ante/ante.go b/app/ante/ante.go index 58d2c6a5f..706db3921 100644 --- a/app/ante/ante.go +++ b/app/ante/ante.go @@ -10,9 +10,9 @@ import ( ante "github.com/cosmos/cosmos-sdk/x/auth/ante" "github.com/cosmos/cosmos-sdk/x/auth/signing" - tfmwKeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" - txBoundaryAnte "github.com/notional-labs/composable/v5/x/tx-boundary/ante" - txBoundaryKeeper "github.com/notional-labs/composable/v5/x/tx-boundary/keeper" + tfmwKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" + txBoundaryAnte "github.com/notional-labs/composable/v6/x/tx-boundary/ante" + txBoundaryKeeper "github.com/notional-labs/composable/v6/x/tx-boundary/keeper" ) // Link to default ante handler used by cosmos sdk: diff --git a/app/ante/ibc_ante.go b/app/ante/ibc_ante.go index f889c13fb..bab820df4 100644 --- a/app/ante/ibc_ante.go +++ b/app/ante/ibc_ante.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - tfmwKeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" + tfmwKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" ) type IBCPermissionDecorator struct { diff --git a/app/app.go b/app/app.go index 95730547e..dee6e96c3 100644 --- a/app/app.go +++ b/app/app.go @@ -10,6 +10,7 @@ import ( nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node" authante "github.com/cosmos/cosmos-sdk/x/auth/ante" authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation" + "github.com/cosmos/cosmos-sdk/x/authz" "github.com/cosmos/cosmos-sdk/x/consensus" tendermint "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" wasm08 "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm" @@ -32,12 +33,14 @@ import ( vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" "github.com/cosmos/cosmos-sdk/x/bank" - "github.com/notional-labs/composable/v5/app/keepers" - "github.com/notional-labs/composable/v5/app/upgrades/composable" - v4 "github.com/notional-labs/composable/v5/app/upgrades/v4" - v5 "github.com/notional-labs/composable/v5/app/upgrades/v5" + "github.com/notional-labs/composable/v6/app/keepers" + v4 "github.com/notional-labs/composable/v6/app/upgrades/v4" + v5 "github.com/notional-labs/composable/v6/app/upgrades/v5" + v6 "github.com/notional-labs/composable/v6/app/upgrades/v6" // bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + + authzmodule "github.com/cosmos/cosmos-sdk/x/authz/module" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/capability" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" @@ -93,33 +96,33 @@ import ( alliancemoduleclient "github.com/terra-money/alliance/x/alliance/client" alliancemoduletypes "github.com/terra-money/alliance/x/alliance/types" - custombankmodule "github.com/notional-labs/composable/v5/custom/bank" + custombankmodule "github.com/notional-labs/composable/v6/custom/bank" - "github.com/notional-labs/composable/v5/app/ante" - transfermiddleware "github.com/notional-labs/composable/v5/x/transfermiddleware" - transfermiddlewaretypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/app/ante" + transfermiddleware "github.com/notional-labs/composable/v6/x/transfermiddleware" + transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types" - txBoundary "github.com/notional-labs/composable/v5/x/tx-boundary" - txBoundaryTypes "github.com/notional-labs/composable/v5/x/tx-boundary/types" + txBoundary "github.com/notional-labs/composable/v6/x/tx-boundary" + txBoundaryTypes "github.com/notional-labs/composable/v6/x/tx-boundary/types" - ratelimitmodule "github.com/notional-labs/composable/v5/x/ratelimit" - ratelimitmoduletypes "github.com/notional-labs/composable/v5/x/ratelimit/types" + ratelimitmodule "github.com/notional-labs/composable/v6/x/ratelimit" + ratelimitmoduletypes "github.com/notional-labs/composable/v6/x/ratelimit/types" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" - "github.com/notional-labs/composable/v5/x/mint" - minttypes "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint" + minttypes "github.com/notional-labs/composable/v6/x/mint/types" ibctestingtypes "github.com/cosmos/ibc-go/v7/testing/types" - ibc_hooks "github.com/notional-labs/composable/v5/x/ibc-hooks" - ibchookstypes "github.com/notional-labs/composable/v5/x/ibc-hooks/types" + ibc_hooks "github.com/notional-labs/composable/v6/x/ibc-hooks" + ibchookstypes "github.com/notional-labs/composable/v6/x/ibc-hooks/types" "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - upgrades "github.com/notional-labs/composable/v5/app/upgrades" + upgrades "github.com/notional-labs/composable/v6/app/upgrades" ) const ( @@ -137,7 +140,7 @@ var ( // https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34 EnableSpecificProposals = "" - Upgrades = []upgrades.Upgrade{v4.Upgrade, v5.Upgrade, composable.Upgrade} + Upgrades = []upgrades.Upgrade{v4.Upgrade, v5.Upgrade, v6.Upgrade} Forks = []upgrades.Fork{} ) @@ -197,6 +200,7 @@ var ( params.AppModuleBasic{}, crisis.AppModuleBasic{}, slashing.AppModuleBasic{}, + authzmodule.AppModuleBasic{}, feegrantmodule.AppModuleBasic{}, groupmodule.AppModuleBasic{}, ibc.AppModuleBasic{}, @@ -359,6 +363,7 @@ func NewComposableApp( slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(slashingtypes.ModuleName)), distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, app.GetSubspace(distrtypes.ModuleName)), staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), + authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), upgrade.NewAppModule(app.UpgradeKeeper), evidence.NewAppModule(app.EvidenceKeeper), ibc.NewAppModule(app.IBCKeeper), @@ -404,6 +409,7 @@ func NewComposableApp( govtypes.ModuleName, crisistypes.ModuleName, genutiltypes.ModuleName, + authz.ModuleName, feegrant.ModuleName, group.ModuleName, paramstypes.ModuleName, @@ -428,6 +434,7 @@ func NewComposableApp( vestingtypes.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, + authz.ModuleName, feegrant.ModuleName, group.ModuleName, paramstypes.ModuleName, @@ -466,6 +473,7 @@ func NewComposableApp( ibchost.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, + authz.ModuleName, paramstypes.ModuleName, upgradetypes.ModuleName, ibctransfertypes.ModuleName, diff --git a/app/helpers/test_helpers.go b/app/helpers/test_helpers.go index c65c1ae20..1646262fa 100644 --- a/app/helpers/test_helpers.go +++ b/app/helpers/test_helpers.go @@ -27,7 +27,7 @@ import ( "github.com/cosmos/ibc-go/v7/testing/mock" "github.com/stretchr/testify/require" - composable "github.com/notional-labs/composable/v5/app" + composable "github.com/notional-labs/composable/v6/app" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/ibctesting/chain.go b/app/ibctesting/chain.go index 85e0ddebd..c2082b7b6 100644 --- a/app/ibctesting/chain.go +++ b/app/ibctesting/chain.go @@ -8,7 +8,7 @@ import ( "testing" "time" - ratelimitmodulekeeper "github.com/notional-labs/composable/v5/x/ratelimit/keeper" + ratelimitmodulekeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper" "cosmossdk.io/errors" abci "github.com/cometbft/cometbft/abci/types" @@ -54,9 +54,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - composable "github.com/notional-labs/composable/v5/app" - "github.com/notional-labs/composable/v5/app/ibctesting/simapp" - routerKeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" + composable "github.com/notional-labs/composable/v6/app" + "github.com/notional-labs/composable/v6/app/ibctesting/simapp" + routerKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" ) // TestChain is a testing struct that wraps a simapp with the last TM Header, the current ABCI diff --git a/app/ibctesting/simapp/app.go b/app/ibctesting/simapp/app.go index 14a31dc26..53a0e7165 100644 --- a/app/ibctesting/simapp/app.go +++ b/app/ibctesting/simapp/app.go @@ -90,9 +90,9 @@ import ( "github.com/gorilla/mux" // TODO: mint module not complete yet, - "github.com/notional-labs/composable/v5/x/mint" - mintkeeper "github.com/notional-labs/composable/v5/x/mint/keeper" - minttypes "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint" + mintkeeper "github.com/notional-labs/composable/v6/x/mint/keeper" + minttypes "github.com/notional-labs/composable/v6/x/mint/types" "github.com/rakyll/statik/fs" "github.com/spf13/cast" @@ -124,13 +124,13 @@ import ( ibcmock "github.com/cosmos/ibc-go/v7/testing/mock" ibctestingtypes "github.com/cosmos/ibc-go/v7/testing/types" - simappparams "github.com/notional-labs/composable/v5/app/ibctesting/simapp/params" - simappupgrades "github.com/notional-labs/composable/v5/app/ibctesting/simapp/upgrades" - v6 "github.com/notional-labs/composable/v5/app/ibctesting/simapp/upgrades/v6" - v7 "github.com/notional-labs/composable/v5/app/ibctesting/simapp/upgrades/v7" - transfermiddleware "github.com/notional-labs/composable/v5/x/transfermiddleware" - transfermiddlewarekeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" - transfermiddlewaretypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + simappparams "github.com/notional-labs/composable/v6/app/ibctesting/simapp/params" + simappupgrades "github.com/notional-labs/composable/v6/app/ibctesting/simapp/upgrades" + v6 "github.com/notional-labs/composable/v6/app/ibctesting/simapp/upgrades/v6" + v7 "github.com/notional-labs/composable/v6/app/ibctesting/simapp/upgrades/v7" + transfermiddleware "github.com/notional-labs/composable/v6/x/transfermiddleware" + transfermiddlewarekeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" + transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) const appName = "SimApp" diff --git a/app/ibctesting/simapp/encoding.go b/app/ibctesting/simapp/encoding.go index e0a0b4796..53ee98f0e 100644 --- a/app/ibctesting/simapp/encoding.go +++ b/app/ibctesting/simapp/encoding.go @@ -3,7 +3,7 @@ package simapp import ( "github.com/cosmos/cosmos-sdk/std" - simappparams "github.com/notional-labs/composable/v5/app/ibctesting/simapp/params" + simappparams "github.com/notional-labs/composable/v6/app/ibctesting/simapp/params" ) // MakeTestEncodingConfig creates an EncodingConfig for testing. This function diff --git a/app/ibctesting/simapp/sim_test.go b/app/ibctesting/simapp/sim_test.go index b6b9f4f06..32d602b0c 100644 --- a/app/ibctesting/simapp/sim_test.go +++ b/app/ibctesting/simapp/sim_test.go @@ -30,7 +30,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/require" - minttypes "github.com/notional-labs/composable/v5/x/mint/types" + minttypes "github.com/notional-labs/composable/v6/x/mint/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index e93f53b18..e6f37df98 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -52,6 +52,7 @@ import ( upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper" icahost "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host" icahostkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/keeper" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" @@ -66,7 +67,7 @@ import ( icqkeeper "github.com/strangelove-ventures/async-icq/v7/keeper" icqtypes "github.com/strangelove-ventures/async-icq/v7/types" - custombankkeeper "github.com/notional-labs/composable/v5/custom/bank/keeper" + custombankkeeper "github.com/notional-labs/composable/v6/custom/bank/keeper" "github.com/strangelove-ventures/packet-forward-middleware/v7/router" routerkeeper "github.com/strangelove-ventures/packet-forward-middleware/v7/router/keeper" @@ -76,22 +77,22 @@ import ( alliancemodulekeeper "github.com/terra-money/alliance/x/alliance/keeper" alliancemoduletypes "github.com/terra-money/alliance/x/alliance/types" - transfermiddleware "github.com/notional-labs/composable/v5/x/transfermiddleware" - transfermiddlewarekeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" - transfermiddlewaretypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + transfermiddleware "github.com/notional-labs/composable/v6/x/transfermiddleware" + transfermiddlewarekeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" + transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types" - txBoundaryKeeper "github.com/notional-labs/composable/v5/x/tx-boundary/keeper" - txBoundaryTypes "github.com/notional-labs/composable/v5/x/tx-boundary/types" + txBoundaryKeeper "github.com/notional-labs/composable/v6/x/tx-boundary/keeper" + txBoundaryTypes "github.com/notional-labs/composable/v6/x/tx-boundary/types" - ratelimitmodule "github.com/notional-labs/composable/v5/x/ratelimit" - ratelimitmodulekeeper "github.com/notional-labs/composable/v5/x/ratelimit/keeper" - ratelimitmoduletypes "github.com/notional-labs/composable/v5/x/ratelimit/types" + ratelimitmodule "github.com/notional-labs/composable/v6/x/ratelimit" + ratelimitmodulekeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper" + ratelimitmoduletypes "github.com/notional-labs/composable/v6/x/ratelimit/types" consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" - mintkeeper "github.com/notional-labs/composable/v5/x/mint/keeper" - minttypes "github.com/notional-labs/composable/v5/x/mint/types" + mintkeeper "github.com/notional-labs/composable/v6/x/mint/keeper" + minttypes "github.com/notional-labs/composable/v6/x/mint/types" "github.com/CosmWasm/wasmd/x/wasm" servertypes "github.com/cosmos/cosmos-sdk/server/types" @@ -99,9 +100,9 @@ import ( wasm08Keeper "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/keeper" wasmtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" - ibc_hooks "github.com/notional-labs/composable/v5/x/ibc-hooks" - ibchookskeeper "github.com/notional-labs/composable/v5/x/ibc-hooks/keeper" - ibchookstypes "github.com/notional-labs/composable/v5/x/ibc-hooks/types" + ibc_hooks "github.com/notional-labs/composable/v6/x/ibc-hooks" + ibchookskeeper "github.com/notional-labs/composable/v6/x/ibc-hooks/keeper" + ibchookstypes "github.com/notional-labs/composable/v6/x/ibc-hooks/types" ) const ( @@ -133,6 +134,7 @@ type AppKeepers struct { ICQKeeper icqkeeper.Keeper ICAHostKeeper icahostkeeper.Keeper FeeGrantKeeper feegrantkeeper.Keeper + AuthzKeeper authzkeeper.Keeper GroupKeeper groupkeeper.Keeper Wasm08Keeper wasm08Keeper.Keeper // TODO: use this name ? WasmKeeper wasm.Keeper @@ -175,6 +177,14 @@ func (appKeepers *AppKeepers) InitNormalKeepers( appKeepers.BankKeeper = custombankkeeper.NewBaseKeeper( appCodec, appKeepers.keys[banktypes.StoreKey], appKeepers.AccountKeeper, appKeepers.BlacklistedModuleAccountAddrs(maccPerms), &appKeepers.TransferMiddlewareKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) + + appKeepers.AuthzKeeper = authzkeeper.NewKeeper( + appKeepers.keys[authzkeeper.StoreKey], + appCodec, + bApp.MsgServiceRouter(), + appKeepers.AccountKeeper, + ) + appKeepers.StakingKeeper = stakingkeeper.NewKeeper( appCodec, appKeepers.keys[stakingtypes.StoreKey], appKeepers.AccountKeeper, appKeepers.BankKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) @@ -236,7 +246,7 @@ func (appKeepers *AppKeepers) InitNormalKeepers( appCodec, appKeepers.keys[ibchost.StoreKey], appKeepers.GetSubspace(ibchost.ModuleName), appKeepers.StakingKeeper, appKeepers.UpgradeKeeper, appKeepers.ScopedIBCKeeper, ) - appKeepers.Wasm08Keeper = wasm08Keeper.NewKeeper(appCodec, appKeepers.keys[wasmtypes.StoreKey], authorityAddress, homePath) + appKeepers.Wasm08Keeper = wasm08Keeper.NewKeeper(appCodec, appKeepers.keys[wasmtypes.StoreKey], authorityAddress, homePath, &appKeepers.IBCKeeper.ClientKeeper) // ICA Host keeper appKeepers.ICAHostKeeper = icahostkeeper.NewKeeper( diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 3235cc6de..b37aa2f86 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -3,8 +3,10 @@ package keepers import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper" // bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" @@ -27,16 +29,16 @@ import ( routertypes "github.com/strangelove-ventures/packet-forward-middleware/v7/router/types" alliancemoduletypes "github.com/terra-money/alliance/x/alliance/types" - ibchookstypes "github.com/notional-labs/composable/v5/x/ibc-hooks/types" - ratelimitmoduletypes "github.com/notional-labs/composable/v5/x/ratelimit/types" - transfermiddlewaretypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types" - txBoundaryTypes "github.com/notional-labs/composable/v5/x/tx-boundary/types" + ibchookstypes "github.com/notional-labs/composable/v6/x/ibc-hooks/types" + ratelimitmoduletypes "github.com/notional-labs/composable/v6/x/ratelimit/types" + transfermiddlewaretypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types" + txBoundaryTypes "github.com/notional-labs/composable/v6/x/tx-boundary/types" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" - minttypes "github.com/notional-labs/composable/v5/x/mint/types" + minttypes "github.com/notional-labs/composable/v6/x/mint/types" "github.com/CosmWasm/wasmd/x/wasm" wasm08types "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" @@ -51,6 +53,7 @@ func (appKeepers *AppKeepers) GenerateKeys() { govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey, evidencetypes.StoreKey, ibctransfertypes.StoreKey, icqtypes.StoreKey, capabilitytypes.StoreKey, consensusparamtypes.StoreKey, wasm08types.StoreKey, crisistypes.StoreKey, routertypes.StoreKey, transfermiddlewaretypes.StoreKey, group.StoreKey, minttypes.StoreKey, alliancemoduletypes.StoreKey, wasm.StoreKey, ibchookstypes.StoreKey, icahosttypes.StoreKey, ratelimitmoduletypes.StoreKey, txBoundaryTypes.StoreKey, + authzkeeper.StoreKey, ) // Define transient store keys diff --git a/app/test_access.go b/app/test_access.go index 6ab4deac9..78a65b7d2 100644 --- a/app/test_access.go +++ b/app/test_access.go @@ -16,8 +16,8 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" wasm08 "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/keeper" - ratelimitkeeper "github.com/notional-labs/composable/v5/x/ratelimit/keeper" - tfmdKeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" + ratelimitkeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper" + tfmdKeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" ) type TestSupport struct { diff --git a/app/test_helpers.go b/app/test_helpers.go index 5b95e90ef..97f5df118 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -36,7 +36,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - minttypes "github.com/notional-labs/composable/v5/x/mint/types" + minttypes "github.com/notional-labs/composable/v6/x/mint/types" "github.com/CosmWasm/wasmd/x/wasm" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" diff --git a/app/upgrades/centauri/upgrade.go b/app/upgrades/centauri/upgrade.go index 0870c679e..4dbd5b88b 100644 --- a/app/upgrades/centauri/upgrade.go +++ b/app/upgrades/centauri/upgrade.go @@ -16,10 +16,10 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" - bech32authmigration "github.com/notional-labs/composable/v5/bech32-migration/auth" - bech32govmigration "github.com/notional-labs/composable/v5/bech32-migration/gov" - bech32slashingmigration "github.com/notional-labs/composable/v5/bech32-migration/slashing" - bech32stakingmigration "github.com/notional-labs/composable/v5/bech32-migration/staking" + bech32authmigration "github.com/notional-labs/composable/v6/bech32-migration/auth" + bech32govmigration "github.com/notional-labs/composable/v6/bech32-migration/gov" + bech32slashingmigration "github.com/notional-labs/composable/v6/bech32-migration/slashing" + bech32stakingmigration "github.com/notional-labs/composable/v6/bech32-migration/staking" ) func CreateUpgradeHandler( diff --git a/app/upgrades/composable/upgrade.go b/app/upgrades/composable/upgrade.go deleted file mode 100644 index 004700fff..000000000 --- a/app/upgrades/composable/upgrade.go +++ /dev/null @@ -1,56 +0,0 @@ -package composable - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - - "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/types/module" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - - "github.com/notional-labs/composable/v5/app/keepers" - "github.com/notional-labs/composable/v5/app/upgrades" - - bech32authmigration "github.com/notional-labs/composable/v5/bech32-migration/auth" - bech32govmigration "github.com/notional-labs/composable/v5/bech32-migration/gov" - bech32slashingmigration "github.com/notional-labs/composable/v5/bech32-migration/slashing" - bech32stakingmigration "github.com/notional-labs/composable/v5/bech32-migration/staking" - - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - - "github.com/notional-labs/composable/v5/bech32-migration/utils" -) - -func CreateUpgradeHandler( - mm *module.Manager, - configurator module.Configurator, - _ upgrades.BaseAppParamManager, - cdc codec.Codec, - keepers *keepers.AppKeepers, -) upgradetypes.UpgradeHandler { - return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { - // Migration prefix - ctx.Logger().Info("First step: Migrate addresses stored in bech32 form to use new prefix") - keys := keepers.GetKVStoreKey() - bech32stakingmigration.MigrateAddressBech32(ctx, keys[stakingtypes.StoreKey], cdc) - bech32slashingmigration.MigrateAddressBech32(ctx, keys[slashingtypes.StoreKey], cdc) - bech32govmigration.MigrateAddressBech32(ctx, keys[govtypes.StoreKey], cdc) - bech32authmigration.MigrateAddressBech32(ctx, keys[authtypes.StoreKey], cdc) - - // allowed relayer address - tfmdk := keepers.TransferMiddlewareKeeper - tfmdk.IterateAllowRlyAddress(ctx, func(rlyAddress string) bool { - // Delete old address - tfmdk.DeleteAllowRlyAddress(ctx, rlyAddress) - - // add new address - newRlyAddress := utils.ConvertAccAddr(rlyAddress) - tfmdk.SetAllowRlyAddress(ctx, newRlyAddress) - return false - }) - - return mm.RunMigrations(ctx, configurator, vm) - } -} diff --git a/app/upgrades/reward/upgrade.go b/app/upgrades/reward/upgrade.go index 95b69a853..647fb7fb4 100644 --- a/app/upgrades/reward/upgrade.go +++ b/app/upgrades/reward/upgrade.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - mintkeeper "github.com/notional-labs/composable/v5/x/mint/keeper" - tfmwkeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" + mintkeeper "github.com/notional-labs/composable/v6/x/mint/keeper" + tfmwkeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" ) var listAllowedRelayAddress = []string{ diff --git a/app/upgrades/types.go b/app/upgrades/types.go index d7975726e..10551b005 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/notional-labs/composable/v5/app/keepers" + "github.com/notional-labs/composable/v6/app/keepers" ) // BaseAppParamManager defines an interrace that BaseApp is expected to fullfil diff --git a/app/upgrades/v4/constants.go b/app/upgrades/v4/constants.go index f7b1d9b58..91e150e0a 100644 --- a/app/upgrades/v4/constants.go +++ b/app/upgrades/v4/constants.go @@ -5,9 +5,9 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" - "github.com/notional-labs/composable/v5/app/upgrades" - ibchookstypes "github.com/notional-labs/composable/v5/x/ibc-hooks/types" - ratelimitmoduletypes "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/app/upgrades" + ibchookstypes "github.com/notional-labs/composable/v6/x/ibc-hooks/types" + ratelimitmoduletypes "github.com/notional-labs/composable/v6/x/ratelimit/types" ) const ( diff --git a/app/upgrades/v4/upgrade.go b/app/upgrades/v4/upgrade.go index 9a2e1a887..b26fee2a9 100644 --- a/app/upgrades/v4/upgrade.go +++ b/app/upgrades/v4/upgrade.go @@ -7,9 +7,9 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/notional-labs/composable/v5/app/keepers" - "github.com/notional-labs/composable/v5/app/upgrades" - tfmdtypes "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/app/keepers" + "github.com/notional-labs/composable/v6/app/upgrades" + tfmdtypes "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v4_5/constants.go b/app/upgrades/v4_5/constants.go index 96541284e..032f1f01f 100644 --- a/app/upgrades/v4_5/constants.go +++ b/app/upgrades/v4_5/constants.go @@ -1,6 +1,6 @@ package v45 -import "github.com/notional-labs/composable/v5/app/upgrades" +import "github.com/notional-labs/composable/v6/app/upgrades" const ( // UpgradeName defines the on-chain upgrade name for the composable upgrade. diff --git a/app/upgrades/v4_5/fork.go b/app/upgrades/v4_5/fork.go index 270c4cea1..b913f3024 100644 --- a/app/upgrades/v4_5/fork.go +++ b/app/upgrades/v4_5/fork.go @@ -12,7 +12,7 @@ import ( icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - "github.com/notional-labs/composable/v5/app/keepers" + "github.com/notional-labs/composable/v6/app/keepers" ) func RunForkLogic(ctx sdk.Context, appKeepers *keepers.AppKeepers) { diff --git a/app/upgrades/v4_5_1/constants.go b/app/upgrades/v4_5_1/constants.go index d6033e057..fec6f73b6 100644 --- a/app/upgrades/v4_5_1/constants.go +++ b/app/upgrades/v4_5_1/constants.go @@ -1,6 +1,6 @@ package v4_5_1 -import "github.com/notional-labs/composable/v5/app/upgrades" +import "github.com/notional-labs/composable/v6/app/upgrades" const ( // UpgradeName defines the on-chain upgrade name for the Composable v5 upgrade. diff --git a/app/upgrades/v4_5_1/fork.go b/app/upgrades/v4_5_1/fork.go index aead97f12..fc413b7ae 100644 --- a/app/upgrades/v4_5_1/fork.go +++ b/app/upgrades/v4_5_1/fork.go @@ -3,8 +3,8 @@ package v4_5_1 import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/app/keepers" - rateLimitKeeper "github.com/notional-labs/composable/v5/x/ratelimit/keeper" + "github.com/notional-labs/composable/v6/app/keepers" + rateLimitKeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper" ) func RunForkLogic(ctx sdk.Context, keepers *keepers.AppKeepers) { diff --git a/app/upgrades/v5/constants.go b/app/upgrades/v5/constants.go index 5211ff836..69946b0cb 100644 --- a/app/upgrades/v5/constants.go +++ b/app/upgrades/v5/constants.go @@ -2,8 +2,8 @@ package v5 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/notional-labs/composable/v5/app/upgrades" - txboundary "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/app/upgrades" + txboundary "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) const ( diff --git a/app/upgrades/v5/upgrade.go b/app/upgrades/v5/upgrade.go index 314f82120..90fc487e2 100644 --- a/app/upgrades/v5/upgrade.go +++ b/app/upgrades/v5/upgrade.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/notional-labs/composable/v5/app/keepers" - "github.com/notional-labs/composable/v5/app/upgrades" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/app/keepers" + "github.com/notional-labs/composable/v6/app/upgrades" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) const ( diff --git a/app/upgrades/v5_1_0/constants.go b/app/upgrades/v5_1_0/constants.go index 8e7cd6cb4..aa9a6bf30 100644 --- a/app/upgrades/v5_1_0/constants.go +++ b/app/upgrades/v5_1_0/constants.go @@ -1,6 +1,6 @@ package v5_1_0 -import "github.com/notional-labs/composable/v5/app/upgrades" +import "github.com/notional-labs/composable/v6/app/upgrades" const ( // UpgradeName defines the on-chain upgrade name for the Composable v5 upgrade. diff --git a/app/upgrades/v5_1_0/fork.go b/app/upgrades/v5_1_0/fork.go index 92bf25088..771d3c696 100644 --- a/app/upgrades/v5_1_0/fork.go +++ b/app/upgrades/v5_1_0/fork.go @@ -4,9 +4,9 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/app/keepers" - rateLimitKeeper "github.com/notional-labs/composable/v5/x/ratelimit/keeper" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/app/keepers" + rateLimitKeeper "github.com/notional-labs/composable/v6/x/ratelimit/keeper" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) const uosmo = "ibc/47BD209179859CDE4A2806763D7189B6E6FE13A17880FE2B42DE1E6C1E329E23" diff --git a/app/upgrades/v5_2_0/constants.go b/app/upgrades/v5_2_0/constants.go index 47dba8831..b09071c2d 100644 --- a/app/upgrades/v5_2_0/constants.go +++ b/app/upgrades/v5_2_0/constants.go @@ -1,6 +1,6 @@ package v5_2_0 -import "github.com/notional-labs/composable/v5/app/upgrades" +import "github.com/notional-labs/composable/v6/app/upgrades" const ( // UpgradeName defines the on-chain upgrade name for the Composable v5 upgrade. diff --git a/app/upgrades/v5_2_0/fork.go b/app/upgrades/v5_2_0/fork.go index e591a6fe3..0b4e95d2e 100644 --- a/app/upgrades/v5_2_0/fork.go +++ b/app/upgrades/v5_2_0/fork.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/notional-labs/composable/v5/app/keepers" + "github.com/notional-labs/composable/v6/app/keepers" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" diff --git a/app/upgrades/composable/constants.go b/app/upgrades/v6/constants.go similarity index 56% rename from app/upgrades/composable/constants.go rename to app/upgrades/v6/constants.go index f9a8accc8..06444b580 100644 --- a/app/upgrades/composable/constants.go +++ b/app/upgrades/v6/constants.go @@ -1,17 +1,20 @@ -package composable +package v6 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/notional-labs/composable/v5/app/upgrades" + "github.com/cosmos/cosmos-sdk/x/authz" + "github.com/notional-labs/composable/v6/app/upgrades" ) const ( // UpgradeName defines the on-chain upgrade name for the composable upgrade. - UpgradeName = "composable" + UpgradeName = "v6" ) var Upgrade = upgrades.Upgrade{ UpgradeName: UpgradeName, CreateUpgradeHandler: CreateUpgradeHandler, - StoreUpgrades: store.StoreUpgrades{}, + StoreUpgrades: store.StoreUpgrades{ + Added: []string{authz.ModuleName}, + }, } diff --git a/app/upgrades/v6/upgrade.go b/app/upgrades/v6/upgrade.go new file mode 100644 index 000000000..3c3d046fe --- /dev/null +++ b/app/upgrades/v6/upgrade.go @@ -0,0 +1,190 @@ +package v6 + +import ( + "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/cosmos/cosmos-sdk/codec" + "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" + + bech32authmigration "github.com/notional-labs/composable/v6/bech32-migration/auth" + bech32govmigration "github.com/notional-labs/composable/v6/bech32-migration/gov" + bech32slashingmigration "github.com/notional-labs/composable/v6/bech32-migration/slashing" + bech32stakingmigration "github.com/notional-labs/composable/v6/bech32-migration/staking" + + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + + "github.com/notional-labs/composable/v6/x/ratelimit/types" + + "github.com/notional-labs/composable/v6/bech32-migration/utils" +) + +const ( + // https://github.com/cosmos/chain-registry/blob/master/composable/assetlist.json + uatom = "ibc/EF48E6B1A1A19F47ECAEA62F5670C37C0580E86A9E88498B7E393EB6F49F33C0" + dot = "ibc/3CC19CEC7E5A3E90E78A5A9ECC5A0E2F8F826A375CF1E096F4515CF09DA3E366" + ksm = "ibc/EE9046745AEC0E8302CB7ED9D5AD67F528FB3B7AE044B247FB0FB293DBDA35E9" + usdt = "ibc/F3EC9F834E57DF704FA3AEAF14E8391C2E58397FE56960AD70E67562990D8265" +) + +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, + _ upgrades.BaseAppParamManager, + cdc codec.Codec, + keepers *keepers.AppKeepers, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, plan upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + // Migration prefix + ctx.Logger().Info("First step: Migrate addresses stored in bech32 form to use new prefix") + keys := keepers.GetKVStoreKey() + bech32stakingmigration.MigrateAddressBech32(ctx, keys[stakingtypes.StoreKey], cdc) + bech32slashingmigration.MigrateAddressBech32(ctx, keys[slashingtypes.StoreKey], cdc) + bech32govmigration.MigrateAddressBech32(ctx, keys[govtypes.StoreKey], cdc) + bech32authmigration.MigrateAddressBech32(ctx, keys[authtypes.StoreKey], cdc) + + // allowed relayer address + tfmdk := keepers.TransferMiddlewareKeeper + tfmdk.IterateAllowRlyAddress(ctx, func(rlyAddress string) bool { + // Delete old address + tfmdk.DeleteAllowRlyAddress(ctx, rlyAddress) + + // add new address + newRlyAddress := utils.ConvertAccAddr(rlyAddress) + tfmdk.SetAllowRlyAddress(ctx, newRlyAddress) + return false + }) + + // update rate limit to 50k + rlKeeper := keepers.RatelimitKeeper + // add uatom + uatomRateLimit, found := rlKeeper.GetRateLimit(ctx, uatom, "channel-2") + if !found { + channelValue := rlKeeper.GetChannelValue(ctx, uatom) + // Create and store the rate limit object + path := types.Path{ + Denom: uatom, + ChannelID: "channel-2", + } + quota := types.Quota{ + MaxPercentSend: sdk.NewInt(30), + MaxPercentRecv: sdk.NewInt(30), + DurationHours: 24, + } + flow := types.Flow{ + Inflow: math.ZeroInt(), + Outflow: math.ZeroInt(), + ChannelValue: channelValue, + } + uatomRateLimit = types.RateLimit{ + Path: &path, + Quota: "a, + Flow: &flow, + MinRateLimitAmount: sdk.NewInt(1282_000_000 * 5), // 1282_000_000 * 5 + } + rlKeeper.SetRateLimit(ctx, uatomRateLimit) + } else { + uatomRateLimit.MinRateLimitAmount = sdk.NewInt(1282_000_000 * 5) + rlKeeper.SetRateLimit(ctx, uatomRateLimit) + } + // add dot + dotRateLimit, found := rlKeeper.GetRateLimit(ctx, dot, "channel-2") + if !found { + channelValue := rlKeeper.GetChannelValue(ctx, dot) + // Create and store the rate limit object + path := types.Path{ + Denom: dot, + ChannelID: "channel-2", + } + quota := types.Quota{ + MaxPercentSend: sdk.NewInt(30), + MaxPercentRecv: sdk.NewInt(30), + DurationHours: 24, + } + flow := types.Flow{ + Inflow: math.ZeroInt(), + Outflow: math.ZeroInt(), + ChannelValue: channelValue, + } + dotRateLimit = types.RateLimit{ + Path: &path, + Quota: "a, + Flow: &flow, + MinRateLimitAmount: sdk.NewInt(22_670_000_000_000 * 5), // 22_670_000_000_000 * 5 + } + rlKeeper.SetRateLimit(ctx, dotRateLimit) + } else { + dotRateLimit.MinRateLimitAmount = sdk.NewInt(22_670_000_000_000 * 5) + rlKeeper.SetRateLimit(ctx, dotRateLimit) + } + // add ksm + ksmRateLimit, found := rlKeeper.GetRateLimit(ctx, ksm, "channel-2") + if !found { + channelValue := rlKeeper.GetChannelValue(ctx, ksm) + // Create and store the rate limit object + path := types.Path{ + Denom: ksm, + ChannelID: "channel-2", + } + quota := types.Quota{ + MaxPercentSend: sdk.NewInt(30), + MaxPercentRecv: sdk.NewInt(30), + DurationHours: 24, + } + flow := types.Flow{ + Inflow: math.ZeroInt(), + Outflow: math.ZeroInt(), + ChannelValue: channelValue, + } + ksmRateLimit = types.RateLimit{ + Path: &path, + Quota: "a, + Flow: &flow, + MinRateLimitAmount: sdk.NewInt(510_000_000_000_000 * 5), // 510_000_000_000_000*5 + } + rlKeeper.SetRateLimit(ctx, ksmRateLimit) + } else { + ksmRateLimit.MinRateLimitAmount = sdk.NewInt(510_000_000_000_000 * 5) + rlKeeper.SetRateLimit(ctx, ksmRateLimit) + } + // add usdt + usdtRateLimit, found := rlKeeper.GetRateLimit(ctx, usdt, "channel-2") + if !found { + channelValue := rlKeeper.GetChannelValue(ctx, usdt) + // Create and store the rate limit object + path := types.Path{ + Denom: usdt, + ChannelID: "channel-2", + } + quota := types.Quota{ + MaxPercentSend: sdk.NewInt(30), + MaxPercentRecv: sdk.NewInt(30), + DurationHours: 24, + } + flow := types.Flow{ + Inflow: math.ZeroInt(), + Outflow: math.ZeroInt(), + ChannelValue: channelValue, + } + usdtRateLimit = types.RateLimit{ + Path: &path, + Quota: "a, + Flow: &flow, + MinRateLimitAmount: sdk.NewInt(10_000_000_000 * 5), // 10_000_000_000 * 5 + } + rlKeeper.SetRateLimit(ctx, usdtRateLimit) + } else { + usdtRateLimit.MinRateLimitAmount = sdk.NewInt(10_000_000_000 * 5) + rlKeeper.SetRateLimit(ctx, usdtRateLimit) + } + + return mm.RunMigrations(ctx, configurator, vm) + } +} diff --git a/bech32-migration/auth/auth.go b/bech32-migration/auth/auth.go index cb1ceb48f..1bb3f829f 100644 --- a/bech32-migration/auth/auth.go +++ b/bech32-migration/auth/auth.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/types" vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - "github.com/notional-labs/composable/v5/bech32-migration/utils" + "github.com/notional-labs/composable/v6/bech32-migration/utils" ) func MigrateAddressBech32(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) { diff --git a/bech32-migration/gov/gov.go b/bech32-migration/gov/gov.go index 782cc6c3b..f141d1c0b 100644 --- a/bech32-migration/gov/gov.go +++ b/bech32-migration/gov/gov.go @@ -9,7 +9,7 @@ import ( v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/notional-labs/composable/v5/bech32-migration/utils" + "github.com/notional-labs/composable/v6/bech32-migration/utils" ) func MigrateAddressBech32(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) { diff --git a/bech32-migration/slashing/slashing.go b/bech32-migration/slashing/slashing.go index 638bc66d1..cde06383e 100644 --- a/bech32-migration/slashing/slashing.go +++ b/bech32-migration/slashing/slashing.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/slashing/types" - "github.com/notional-labs/composable/v5/bech32-migration/utils" + "github.com/notional-labs/composable/v6/bech32-migration/utils" ) func MigrateAddressBech32(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) { diff --git a/bech32-migration/staking/staking.go b/bech32-migration/staking/staking.go index 9a3ce9db4..3af0f74ab 100644 --- a/bech32-migration/staking/staking.go +++ b/bech32-migration/staking/staking.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/notional-labs/composable/v5/bech32-migration/utils" + "github.com/notional-labs/composable/v6/bech32-migration/utils" ) func MigrateAddressBech32(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) { diff --git a/cmd/composabled/cmd/genaccounts.go b/cmd/composabled/cmd/genaccounts.go index c86769cd7..02ccb6f6f 100644 --- a/cmd/composabled/cmd/genaccounts.go +++ b/cmd/composabled/cmd/genaccounts.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/bech32-migration/utils" + "github.com/notional-labs/composable/v6/bech32-migration/utils" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/cmd/composabled/cmd/root.go b/cmd/composabled/cmd/root.go index bf02cc68f..007663989 100644 --- a/cmd/composabled/cmd/root.go +++ b/cmd/composabled/cmd/root.go @@ -33,8 +33,8 @@ import ( genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" - "github.com/notional-labs/composable/v5/app" - // "github.com/notional-labs/composable/v5/app/params" + "github.com/notional-labs/composable/v6/app" + // "github.com/notional-labs/composable/v6/app/params" // this line is used by starport scaffolding # stargate/root/import ) diff --git a/cmd/composabled/main.go b/cmd/composabled/main.go index b7983fac2..c453eaf19 100644 --- a/cmd/composabled/main.go +++ b/cmd/composabled/main.go @@ -5,9 +5,9 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/notional-labs/composable/v5/app" - cmd "github.com/notional-labs/composable/v5/cmd/composabled/cmd" - cmdcfg "github.com/notional-labs/composable/v5/cmd/composabled/config" + "github.com/notional-labs/composable/v6/app" + cmd "github.com/notional-labs/composable/v6/cmd/composabled/cmd" + cmdcfg "github.com/notional-labs/composable/v6/cmd/composabled/config" ) func main() { diff --git a/custom/bank/bank_test.go b/custom/bank/bank_test.go index f1655a4ac..ffbaa63f2 100644 --- a/custom/bank/bank_test.go +++ b/custom/bank/bank_test.go @@ -9,7 +9,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/stretchr/testify/suite" - customibctesting "github.com/notional-labs/composable/v5/app/ibctesting" + customibctesting "github.com/notional-labs/composable/v6/app/ibctesting" ) type CustomBankTestSuite struct { diff --git a/custom/bank/keeper/keeper.go b/custom/bank/keeper/keeper.go index bbc6c64cf..a7c312c6d 100644 --- a/custom/bank/keeper/keeper.go +++ b/custom/bank/keeper/keeper.go @@ -13,9 +13,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - banktypes "github.com/notional-labs/composable/v5/custom/bank/types" + banktypes "github.com/notional-labs/composable/v6/custom/bank/types" - transfermiddlewarekeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" + transfermiddlewarekeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" alliancekeeper "github.com/terra-money/alliance/x/alliance/keeper" alliancetypes "github.com/terra-money/alliance/x/alliance/types" diff --git a/custom/bank/module.go b/custom/bank/module.go index e9d5fe02c..3d88d9612 100644 --- a/custom/bank/module.go +++ b/custom/bank/module.go @@ -10,7 +10,7 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" "github.com/cosmos/cosmos-sdk/x/bank/types" - custombankkeeper "github.com/notional-labs/composable/v5/custom/bank/keeper" + custombankkeeper "github.com/notional-labs/composable/v6/custom/bank/keeper" ) // AppModule wraps around the bank module and the bank keeper to return the right total supply ignoring bonded tokens diff --git a/go.mod b/go.mod index b09805db1..8a1a771f3 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/notional-labs/composable/v5 +module github.com/notional-labs/composable/v6 go 1.19 @@ -7,7 +7,7 @@ require ( cosmossdk.io/simapp v0.0.0-20230608160436-666c345ad23d github.com/CosmWasm/wasmd v0.40.1 github.com/client9/misspell v0.3.4 - github.com/cometbft/cometbft v0.37.1 + github.com/cometbft/cometbft v0.37.2 github.com/cometbft/cometbft-db v0.8.0 github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/cosmos/cosmos-sdk v0.47.3 @@ -22,10 +22,10 @@ require ( github.com/spf13/cobra v1.7.0 github.com/strangelove-ventures/async-icq/v7 v7.0.0-20230413165143-a3b65ccdc897 github.com/strangelove-ventures/packet-forward-middleware/v7 v7.0.0-20230412224111-136e94e98861 - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 github.com/terra-money/alliance v0.1.1-0.20230419080242-b29b0ec11186 golang.org/x/tools v0.6.0 - google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 google.golang.org/grpc v1.55.0 gotest.tools/v3 v3.4.0 mvdan.cc/gofumpt v0.4.0 @@ -82,6 +82,7 @@ require ( github.com/golangci/misspell v0.3.5 // indirect github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect + github.com/google/s2a-go v0.1.3 // indirect github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect github.com/gostaticanalysis/analysisutil v0.7.1 // indirect github.com/gostaticanalysis/comment v1.4.2 // indirect @@ -165,9 +166,9 @@ require ( require ( cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/compute v1.18.0 // indirect + cloud.google.com/go/compute v1.19.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.12.0 // indirect + cloud.google.com/go/iam v0.13.0 // indirect cloud.google.com/go/storage v1.29.0 // indirect cosmossdk.io/log v1.1.0 // indirect github.com/CosmWasm/wasmvm v1.2.4 // indirect; indirect // safe because we're using permissioned cosmwasm @@ -176,14 +177,14 @@ require ( github.com/chzyer/readline v1.5.1 // indirect github.com/cockroachdb/apd/v2 v2.0.2 // indirect github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect - github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab // indirect + github.com/cosmos/ics23/go v0.10.0 // indirect github.com/docker/distribution v2.8.2+incompatible // indirect github.com/go-playground/locales v0.14.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.3.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.7.0 // indirect + github.com/googleapis/gax-go/v2 v2.8.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-getter v1.7.1 // indirect github.com/hashicorp/go-safetemp v1.0.0 // indirect @@ -197,12 +198,11 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/rs/zerolog v1.29.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/ugorji/go/codec v1.2.7 // indirect github.com/ulikunitz/xz v0.5.11 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/oauth2 v0.6.0 // indirect + golang.org/x/oauth2 v0.7.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.110.0 // indirect + google.golang.org/api v0.122.0 // indirect google.golang.org/appengine v1.6.7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect ) @@ -278,7 +278,7 @@ require ( github.com/minio/highwayhash v1.0.2 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mtibben/percent v0.2.1 // indirect - github.com/pelletier/go-toml/v2 v2.0.7 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -290,9 +290,9 @@ require ( github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rs/cors v1.8.3 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect - github.com/spf13/afero v1.9.3 // indirect + github.com/spf13/afero v1.9.5 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/spf13/viper v1.15.0 + github.com/spf13/viper v1.16.0 github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect @@ -300,11 +300,11 @@ require ( github.com/zondax/hid v0.9.1 // indirect github.com/zondax/ledger-go v0.14.1 // indirect go.etcd.io/bbolt v1.3.7 // indirect - golang.org/x/crypto v0.7.0 // indirect + golang.org/x/crypto v0.9.0 // indirect golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect - golang.org/x/net v0.9.0 // indirect - golang.org/x/sys v0.7.0 // indirect - golang.org/x/term v0.7.0 // indirect + golang.org/x/net v0.10.0 // indirect + golang.org/x/sys v0.8.0 // indirect + golang.org/x/term v0.8.0 // indirect golang.org/x/text v0.9.0 // indirect google.golang.org/protobuf v1.30.0 gopkg.in/ini.v1 v1.67.0 // indirect @@ -320,9 +320,9 @@ replace ( // lock wasmvm so we do not break the grandpa contract github.com/CosmWasm/wasmvm => github.com/CosmWasm/wasmvm v1.2.1 // ibc-go with wasm client - github.com/cosmos/ibc-go/v7 => github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724144435-2b77d4a1ce70 + github.com/cosmos/ibc-go/v7 => github.com/notional-labs/ibc-go/v7 v7.2.1-0.20231010040541-6cf43006971f - github.com/strangelove-ventures/packet-forward-middleware/v7 => github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20230925110328-59a07f1412ec + github.com/strangelove-ventures/packet-forward-middleware/v7 => github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20231012044505-6ccaddcd4038 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 github.com/terra-money/alliance => github.com/notional-labs/alliance v1.0.1-0.20230523105704-66dba9499c01 diff --git a/go.sum b/go.sum index 2b6dd05f7..1b63eb9e0 100644 --- a/go.sum +++ b/go.sum @@ -72,8 +72,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.18.0 h1:FEigFqoDbys2cvFkZ9Fjq4gnHBP55anJ0yQyau2f9oY= -cloud.google.com/go/compute v1.18.0/go.mod h1:1X7yHxec2Ga+Ss6jPyjxRxpu2uu7PLgsOVXvgU0yacs= +cloud.google.com/go/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ= +cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -113,8 +113,8 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v0.12.0 h1:DRtTY29b75ciH6Ov1PHb4/iat2CLCvrOm40Q0a6DFpE= -cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY= +cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= +cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= @@ -351,8 +351,8 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA= github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c= -github.com/cometbft/cometbft v0.37.1 h1:KLxkQTK2hICXYq21U2hn1W5hOVYUdQgDQ1uB+90xPIg= -github.com/cometbft/cometbft v0.37.1/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= +github.com/cometbft/cometbft v0.37.2 h1:XB0yyHGT0lwmJlFmM4+rsRnczPlHoAKFX6K8Zgc2/Jc= +github.com/cometbft/cometbft v0.37.2/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs= github.com/cometbft/cometbft-db v0.8.0 h1:vUMDaH3ApkX8m0KZvOFFy9b5DZHBAjsnEuo9AKVZpjo= github.com/cometbft/cometbft-db v0.8.0/go.mod h1:6ASCP4pfhmrCBpfk01/9E1SI29nD3HfVHrY4PG8x5c0= github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= @@ -380,8 +380,8 @@ github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoK github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab h1:I9ialKTQo7248V827Bba4OuKPmk+FPzmTVHsLXaIJWw= -github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab/go.mod h1:2CwqasX5dSD7Hbp/9b6lhK6BwoBDCBldx7gPKRukR60= +github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= +github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76/go.mod h1:0mkLWIoZuQ7uBoospo5Q9zIpqq6rYCPJDSUdeCJvPM8= github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= @@ -477,8 +477,8 @@ github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlya github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= -github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= github.com/go-critic/go-critic v0.6.5 h1:fDaR/5GWURljXwF8Eh31T2GZNz9X4jeboS912mWF8Uo= github.com/go-critic/go-critic v0.6.5/go.mod h1:ezfP/Lh7MA6dBNn4c6ab5ALv3sKnZVLx37tr00uuaOY= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -503,8 +503,8 @@ github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= +github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= -github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= @@ -535,7 +535,6 @@ github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -663,6 +662,8 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/s2a-go v0.1.3 h1:FAgZmpLl/SXurPEZyCMPBIiiYeTbqfjlbdnCNTAkbGE= +github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -681,8 +682,8 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= -github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ= -github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8= +github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK67vJZc= +github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -965,10 +966,10 @@ github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= github.com/notional-labs/alliance v1.0.1-0.20230523105704-66dba9499c01 h1:koCsoc1NGpU8TntXwM/s7Z/whsKNDVPiLim35HLBAzA= github.com/notional-labs/alliance v1.0.1-0.20230523105704-66dba9499c01/go.mod h1:GFQ8TsXDMTpu7kif0Dwddz6rxazy0ZJQHfN38ZmAodI= -github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724144435-2b77d4a1ce70 h1:oZTUDZzUBp8D2h3uZfPQmZGVksrROqubHDASvFB/+u0= -github.com/notional-labs/ibc-go/v7 v7.0.1-wasm-client.0.20230724144435-2b77d4a1ce70/go.mod h1:ISHo/Qitjtvj2svGmttaZv03zVXmS+uqvUyF9kFqlI0= -github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20230925110328-59a07f1412ec h1:WGvAaJ7QffvPrX9529lX1qTB7IiHC5i+3/0Ed3drico= -github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20230925110328-59a07f1412ec/go.mod h1:Cf4EbaAH9U5sZGxMKsRTN6SVnXy9MjW6oauwkwFVtpU= +github.com/notional-labs/ibc-go/v7 v7.2.1-0.20231010040541-6cf43006971f h1:Uw35VHCdLTsQf8B4UGTjHCR6HqcYFF6dwPW8uJzS0f4= +github.com/notional-labs/ibc-go/v7 v7.2.1-0.20231010040541-6cf43006971f/go.mod h1:hjcl3RPLSDf0LSXrFyk2iTQCCFs5pfLbJb8h/5gJ2Vg= +github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20231012044505-6ccaddcd4038 h1:JFoqbR/ZEtEKlsorh2qrd9DEeSuzxKQk/VjzMNGxdLA= +github.com/notional-labs/packet-forward-middleware/v7 v7.0.0-20231012044505-6ccaddcd4038/go.mod h1:jCmuJN+6ecz4g1zuVtJKom6p4+xCm2xK+VHyS2RpdXU= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= @@ -1012,8 +1013,8 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= -github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= +github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU= @@ -1150,8 +1151,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= -github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= +github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= @@ -1167,8 +1168,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= -github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= +github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= +github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0= github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc= @@ -1194,8 +1195,9 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= @@ -1222,12 +1224,11 @@ github.com/tomarrell/wrapcheck/v2 v2.7.0/go.mod h1:ao7l5p0aOlUNJKI0qVwB4Yjlqutd0 github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw= github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= +github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= -github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= -github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= @@ -1303,9 +1304,10 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1402,6 +1404,7 @@ golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1414,8 +1417,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM= -golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1441,8 +1444,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= -golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= +golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= +golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1565,13 +1568,13 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= -golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.7.0 h1:BEvjmm5fURWqcfbSKTdpkDXYBrUS1c0m8agp14W48vQ= -golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= +golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1581,6 +1584,7 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= @@ -1739,8 +1743,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.110.0 h1:l+rh0KYUooe9JGbGVx71tbFo4SMbMTXK3I3ia2QSEeU= -google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= +google.golang.org/api v0.122.0 h1:zDobeejm3E7pEG1mNHvdxvjs5XJoCMzyNH+CmwL94Es= +google.golang.org/api v0.122.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZOyms= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1858,8 +1862,8 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= -google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= diff --git a/x/ibc-hooks/client/cli/query.go b/x/ibc-hooks/client/cli/query.go index d6d2399bb..7b8cc8baa 100644 --- a/x/ibc-hooks/client/cli/query.go +++ b/x/ibc-hooks/client/cli/query.go @@ -9,9 +9,9 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/ibc-hooks/keeper" + "github.com/notional-labs/composable/v6/x/ibc-hooks/keeper" - "github.com/notional-labs/composable/v5/x/ibc-hooks/types" + "github.com/notional-labs/composable/v6/x/ibc-hooks/types" ) func indexRunCmd(cmd *cobra.Command, _ []string) error { diff --git a/x/ibc-hooks/keeper/keeper.go b/x/ibc-hooks/keeper/keeper.go index 610d41361..2462a130f 100644 --- a/x/ibc-hooks/keeper/keeper.go +++ b/x/ibc-hooks/keeper/keeper.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" - "github.com/notional-labs/composable/v5/x/ibc-hooks/types" + "github.com/notional-labs/composable/v6/x/ibc-hooks/types" ) type ( diff --git a/x/ibc-hooks/module.go b/x/ibc-hooks/module.go index 686e41cd9..779f67846 100644 --- a/x/ibc-hooks/module.go +++ b/x/ibc-hooks/module.go @@ -10,8 +10,8 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/ibc-hooks/client/cli" - "github.com/notional-labs/composable/v5/x/ibc-hooks/types" + "github.com/notional-labs/composable/v6/x/ibc-hooks/client/cli" + "github.com/notional-labs/composable/v6/x/ibc-hooks/types" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/ibc-hooks/relay_test.go b/x/ibc-hooks/relay_test.go index 940e22377..338ed6603 100644 --- a/x/ibc-hooks/relay_test.go +++ b/x/ibc-hooks/relay_test.go @@ -10,8 +10,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/stretchr/testify/suite" - customibctesting "github.com/notional-labs/composable/v5/app/ibctesting" - ibchookskeeper "github.com/notional-labs/composable/v5/x/ibc-hooks/keeper" + customibctesting "github.com/notional-labs/composable/v6/app/ibctesting" + ibchookskeeper "github.com/notional-labs/composable/v6/x/ibc-hooks/keeper" ) // TODO: use testsuite here. diff --git a/x/ibc-hooks/wasm_hook.go b/x/ibc-hooks/wasm_hook.go index d0f8e5539..bc239f02c 100644 --- a/x/ibc-hooks/wasm_hook.go +++ b/x/ibc-hooks/wasm_hook.go @@ -11,8 +11,8 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/notional-labs/composable/v5/x/ibc-hooks/keeper" - "github.com/notional-labs/composable/v5/x/ibc-hooks/types" + "github.com/notional-labs/composable/v6/x/ibc-hooks/keeper" + "github.com/notional-labs/composable/v6/x/ibc-hooks/types" errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/mint/abci.go b/x/mint/abci.go index aaf997f05..c24f80747 100644 --- a/x/mint/abci.go +++ b/x/mint/abci.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/mint/keeper" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/keeper" + "github.com/notional-labs/composable/v6/x/mint/types" ) // BeginBlocker mints new tokens for the previous block. diff --git a/x/mint/client/cli/query.go b/x/mint/client/cli/query.go index 7dc45b357..b04d2d120 100644 --- a/x/mint/client/cli/query.go +++ b/x/mint/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // GetQueryCmd returns the cli query commands for the minting module. diff --git a/x/mint/client/cli/tx.go b/x/mint/client/cli/tx.go index c43282314..3fb5b9dc7 100644 --- a/x/mint/client/cli/tx.go +++ b/x/mint/client/cli/tx.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // GetTxCmd returns the tx commands for mint diff --git a/x/mint/keeper/genesis.go b/x/mint/keeper/genesis.go index ef75f172f..570ebecb3 100644 --- a/x/mint/keeper/genesis.go +++ b/x/mint/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // InitGenesis new mint genesis diff --git a/x/mint/keeper/grpc_query.go b/x/mint/keeper/grpc_query.go index a529c76bb..88c1131c5 100644 --- a/x/mint/keeper/grpc_query.go +++ b/x/mint/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index 861ff1c95..70ff6ddf3 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -10,7 +10,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // Keeper of the mint store diff --git a/x/mint/keeper/msg_server.go b/x/mint/keeper/msg_server.go index 8df1a730f..4feafae33 100644 --- a/x/mint/keeper/msg_server.go +++ b/x/mint/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/mint/module.go b/x/mint/module.go index b96e38e28..5205a408d 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -16,10 +16,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/notional-labs/composable/v5/x/mint/client/cli" - "github.com/notional-labs/composable/v5/x/mint/keeper" - "github.com/notional-labs/composable/v5/x/mint/simulation" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/client/cli" + "github.com/notional-labs/composable/v6/x/mint/keeper" + "github.com/notional-labs/composable/v6/x/mint/simulation" + "github.com/notional-labs/composable/v6/x/mint/types" ) var ( diff --git a/x/mint/simulation/decoder.go b/x/mint/simulation/decoder.go index 2bceab372..c8128bcfc 100644 --- a/x/mint/simulation/decoder.go +++ b/x/mint/simulation/decoder.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/mint/simulation/decoder_test.go b/x/mint/simulation/decoder_test.go index 116d9b694..36a0f4708 100644 --- a/x/mint/simulation/decoder_test.go +++ b/x/mint/simulation/decoder_test.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/kv" "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/notional-labs/composable/v5/x/mint/simulation" - composableminttypes "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/simulation" + composableminttypes "github.com/notional-labs/composable/v6/x/mint/types" ) func TestDecodeStore(t *testing.T) { diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go index eadedce53..f63d39818 100644 --- a/x/mint/simulation/genesis.go +++ b/x/mint/simulation/genesis.go @@ -9,7 +9,7 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // Simulation parameter constants diff --git a/x/mint/simulation/genesis_test.go b/x/mint/simulation/genesis_test.go index f25e7d2d5..57700280a 100644 --- a/x/mint/simulation/genesis_test.go +++ b/x/mint/simulation/genesis_test.go @@ -14,8 +14,8 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/mint" - "github.com/notional-labs/composable/v5/x/mint/simulation" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/simulation" + "github.com/notional-labs/composable/v6/x/mint/types" ) // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState. diff --git a/x/mint/simulation/proposals.go b/x/mint/simulation/proposals.go index 77fc5b846..dc28440e5 100644 --- a/x/mint/simulation/proposals.go +++ b/x/mint/simulation/proposals.go @@ -8,7 +8,7 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/types" ) // Simulation operation weights constants diff --git a/x/mint/simulation/proposals_test.go b/x/mint/simulation/proposals_test.go index 761f1588f..69aca951a 100644 --- a/x/mint/simulation/proposals_test.go +++ b/x/mint/simulation/proposals_test.go @@ -11,8 +11,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/address" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/notional-labs/composable/v5/x/mint/simulation" - "github.com/notional-labs/composable/v5/x/mint/types" + "github.com/notional-labs/composable/v6/x/mint/simulation" + "github.com/notional-labs/composable/v6/x/mint/types" ) func TestProposalMsgs(t *testing.T) { diff --git a/x/ratelimit/client/cli/query.go b/x/ratelimit/client/cli/query.go index d9c54a391..968b20a08 100644 --- a/x/ratelimit/client/cli/query.go +++ b/x/ratelimit/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) // GetQueryCmd returns the cli query commands for this module. diff --git a/x/ratelimit/client/cli/tx.go b/x/ratelimit/client/cli/tx.go index e7dac91b9..227ae30af 100644 --- a/x/ratelimit/client/cli/tx.go +++ b/x/ratelimit/client/cli/tx.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) // GetTxCmd returns the tx commands for router diff --git a/x/ratelimit/ibc_middleware.go b/x/ratelimit/ibc_middleware.go index 0a8c3888d..f22829935 100644 --- a/x/ratelimit/ibc_middleware.go +++ b/x/ratelimit/ibc_middleware.go @@ -3,7 +3,7 @@ package ratelimit import ( "fmt" - "github.com/notional-labs/composable/v5/x/ratelimit/keeper" + "github.com/notional-labs/composable/v6/x/ratelimit/keeper" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/ratelimit/keeper/abci.go b/x/ratelimit/keeper/abci.go index f607d64d5..a3789e223 100644 --- a/x/ratelimit/keeper/abci.go +++ b/x/ratelimit/keeper/abci.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) // BeginBlocker of epochs module. diff --git a/x/ratelimit/keeper/epoch.go b/x/ratelimit/keeper/epoch.go index 05309f183..0039c067a 100644 --- a/x/ratelimit/keeper/epoch.go +++ b/x/ratelimit/keeper/epoch.go @@ -6,7 +6,7 @@ import ( "github.com/gogo/protobuf/proto" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/ratelimit/keeper/genesis.go b/x/ratelimit/keeper/genesis.go index 2646ebf7d..0b64c87ff 100644 --- a/x/ratelimit/keeper/genesis.go +++ b/x/ratelimit/keeper/genesis.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) { diff --git a/x/ratelimit/keeper/grpc_query.go b/x/ratelimit/keeper/grpc_query.go index e991b9264..2aee780d2 100644 --- a/x/ratelimit/keeper/grpc_query.go +++ b/x/ratelimit/keeper/grpc_query.go @@ -8,7 +8,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibctmtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/ratelimit/keeper/keeper.go b/x/ratelimit/keeper/keeper.go index f039f5915..243241ca4 100644 --- a/x/ratelimit/keeper/keeper.go +++ b/x/ratelimit/keeper/keeper.go @@ -10,8 +10,8 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" - "github.com/notional-labs/composable/v5/x/ratelimit/types" - tfmwkeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" + "github.com/notional-labs/composable/v6/x/ratelimit/types" + tfmwkeeper "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" ) type Keeper struct { diff --git a/x/ratelimit/keeper/msg_server.go b/x/ratelimit/keeper/msg_server.go index 6d73a0486..c2f91c744 100644 --- a/x/ratelimit/keeper/msg_server.go +++ b/x/ratelimit/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/ratelimit/keeper/packet.go b/x/ratelimit/keeper/packet.go index 1be8a843e..85e8510ab 100644 --- a/x/ratelimit/keeper/packet.go +++ b/x/ratelimit/keeper/packet.go @@ -14,7 +14,7 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) type RateLimitedPacketInfo struct { diff --git a/x/ratelimit/keeper/rate_limit.go b/x/ratelimit/keeper/rate_limit.go index 9897052cd..8ef5514d8 100644 --- a/x/ratelimit/keeper/rate_limit.go +++ b/x/ratelimit/keeper/rate_limit.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) // Get the rate limit byte key built from the denom and channelID diff --git a/x/ratelimit/module.go b/x/ratelimit/module.go index 6af708f3e..70a96f533 100644 --- a/x/ratelimit/module.go +++ b/x/ratelimit/module.go @@ -16,9 +16,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/ratelimit/client/cli" - "github.com/notional-labs/composable/v5/x/ratelimit/keeper" - "github.com/notional-labs/composable/v5/x/ratelimit/types" + "github.com/notional-labs/composable/v6/x/ratelimit/client/cli" + "github.com/notional-labs/composable/v6/x/ratelimit/keeper" + "github.com/notional-labs/composable/v6/x/ratelimit/types" ) var ( diff --git a/x/ratelimit/relay_test.go b/x/ratelimit/relay_test.go index 4d44dfe17..1e2b090ce 100644 --- a/x/ratelimit/relay_test.go +++ b/x/ratelimit/relay_test.go @@ -8,8 +8,8 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/stretchr/testify/suite" - customibctesting "github.com/notional-labs/composable/v5/app/ibctesting" - ratelimittypes "github.com/notional-labs/composable/v5/x/ratelimit/types" + customibctesting "github.com/notional-labs/composable/v6/app/ibctesting" + ratelimittypes "github.com/notional-labs/composable/v6/x/ratelimit/types" ) type RateLimitTestSuite struct { diff --git a/x/transfermiddleware/client/cli/query.go b/x/transfermiddleware/client/cli/query.go index 6e93f6a81..702c0bc8f 100644 --- a/x/transfermiddleware/client/cli/query.go +++ b/x/transfermiddleware/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) // GetQueryCmd returns the query commands for router diff --git a/x/transfermiddleware/client/cli/tx.go b/x/transfermiddleware/client/cli/tx.go index f66659659..2bcccaec1 100644 --- a/x/transfermiddleware/client/cli/tx.go +++ b/x/transfermiddleware/client/cli/tx.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) // GetTxCmd returns the tx commands for router diff --git a/x/transfermiddleware/ibc_ante_test.go b/x/transfermiddleware/ibc_ante_test.go index 1783db02c..67fac835f 100644 --- a/x/transfermiddleware/ibc_ante_test.go +++ b/x/transfermiddleware/ibc_ante_test.go @@ -12,7 +12,7 @@ import ( wasmtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/08-wasm/types" "github.com/stretchr/testify/suite" - customibctesting "github.com/notional-labs/composable/v5/app/ibctesting" + customibctesting "github.com/notional-labs/composable/v6/app/ibctesting" ) var govAuthorityAddress = "composable10556m38z4x6pqalr9rl5ytf3cff8q46nnngqs2" // convert from: centauri10556m38z4x6pqalr9rl5ytf3cff8q46nk85k9m diff --git a/x/transfermiddleware/ibc_middleware.go b/x/transfermiddleware/ibc_middleware.go index 0bd932ea4..4be08ca44 100644 --- a/x/transfermiddleware/ibc_middleware.go +++ b/x/transfermiddleware/ibc_middleware.go @@ -11,7 +11,7 @@ import ( porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" + "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" ) var _ porttypes.Middleware = &IBCMiddleware{} diff --git a/x/transfermiddleware/keeper/abci.go b/x/transfermiddleware/keeper/abci.go index 7322aa28d..a3f0479d8 100644 --- a/x/transfermiddleware/keeper/abci.go +++ b/x/transfermiddleware/keeper/abci.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) // BeginBlocker of epochs module. diff --git a/x/transfermiddleware/keeper/genesis.go b/x/transfermiddleware/keeper/genesis.go index 0584b804b..6a4615b7e 100644 --- a/x/transfermiddleware/keeper/genesis.go +++ b/x/transfermiddleware/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) // TODO: add init genesis logic diff --git a/x/transfermiddleware/keeper/genesis_test.go b/x/transfermiddleware/keeper/genesis_test.go index ccfdc0f57..ca352b56c 100644 --- a/x/transfermiddleware/keeper/genesis_test.go +++ b/x/transfermiddleware/keeper/genesis_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - helpers "github.com/notional-labs/composable/v5/app/helpers" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + helpers "github.com/notional-labs/composable/v6/app/helpers" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func TestTFMInitGenesis(t *testing.T) { diff --git a/x/transfermiddleware/keeper/grpc_query.go b/x/transfermiddleware/keeper/grpc_query.go index 19a69c1b9..1ce8544d0 100644 --- a/x/transfermiddleware/keeper/grpc_query.go +++ b/x/transfermiddleware/keeper/grpc_query.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func (k Keeper) ParaTokenInfo(c context.Context, req *types.QueryParaTokenInfoRequest) (*types.QueryParaTokenInfoResponse, error) { diff --git a/x/transfermiddleware/keeper/ics4wrapper.go b/x/transfermiddleware/keeper/ics4wrapper.go index c6fc75cc4..14dd2e898 100644 --- a/x/transfermiddleware/keeper/ics4wrapper.go +++ b/x/transfermiddleware/keeper/ics4wrapper.go @@ -12,7 +12,7 @@ import ( channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func (keeper Keeper) hasParachainIBCTokenInfo(ctx sdk.Context, nativeDenom string) bool { diff --git a/x/transfermiddleware/keeper/keeper.go b/x/transfermiddleware/keeper/keeper.go index 78a051502..a154677d4 100644 --- a/x/transfermiddleware/keeper/keeper.go +++ b/x/transfermiddleware/keeper/keeper.go @@ -14,7 +14,7 @@ import ( porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) type Keeper struct { diff --git a/x/transfermiddleware/keeper/msg_server.go b/x/transfermiddleware/keeper/msg_server.go index 986fbf5f7..9e303e4d7 100644 --- a/x/transfermiddleware/keeper/msg_server.go +++ b/x/transfermiddleware/keeper/msg_server.go @@ -9,7 +9,7 @@ import ( "cosmossdk.io/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/transfermiddleware/keeper/params.go b/x/transfermiddleware/keeper/params.go index 7c0538b7f..b3905bf87 100644 --- a/x/transfermiddleware/keeper/params.go +++ b/x/transfermiddleware/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { diff --git a/x/transfermiddleware/keeper/relay.go b/x/transfermiddleware/keeper/relay.go index 27f1832e4..35cf2ed90 100644 --- a/x/transfermiddleware/keeper/relay.go +++ b/x/transfermiddleware/keeper/relay.go @@ -6,7 +6,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func (k Keeper) OnRecvPacket(ctx sdk.Context, packet channeltypes.Packet, data transfertypes.FungibleTokenPacketData) error { diff --git a/x/transfermiddleware/module.go b/x/transfermiddleware/module.go index 16a92a584..1f64a2b79 100644 --- a/x/transfermiddleware/module.go +++ b/x/transfermiddleware/module.go @@ -16,9 +16,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/notional-labs/composable/v5/x/transfermiddleware/client/cli" - "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/client/cli" + "github.com/notional-labs/composable/v6/x/transfermiddleware/keeper" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) var ( diff --git a/x/transfermiddleware/pfm_test.go b/x/transfermiddleware/pfm_test.go index f8bf27b81..ce9eb675d 100644 --- a/x/transfermiddleware/pfm_test.go +++ b/x/transfermiddleware/pfm_test.go @@ -13,7 +13,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/stretchr/testify/suite" - customibctesting "github.com/notional-labs/composable/v5/app/ibctesting" + customibctesting "github.com/notional-labs/composable/v6/app/ibctesting" ) type PacketMetadata struct { diff --git a/x/transfermiddleware/relay_test.go b/x/transfermiddleware/relay_test.go index 87abaf2dd..fdb27f02f 100644 --- a/x/transfermiddleware/relay_test.go +++ b/x/transfermiddleware/relay_test.go @@ -10,7 +10,7 @@ import ( clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/stretchr/testify/suite" - customibctesting "github.com/notional-labs/composable/v5/app/ibctesting" + customibctesting "github.com/notional-labs/composable/v6/app/ibctesting" ) // TODO: use testsuite here. diff --git a/x/transfermiddleware/types/info_test.go b/x/transfermiddleware/types/info_test.go index 078fec2ac..a0018cbe7 100644 --- a/x/transfermiddleware/types/info_test.go +++ b/x/transfermiddleware/types/info_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/notional-labs/composable/v5/x/transfermiddleware/types" + "github.com/notional-labs/composable/v6/x/transfermiddleware/types" ) func TestValidateBasic(t *testing.T) { diff --git a/x/tx-boundary/ante/antetest/ante_test.go b/x/tx-boundary/ante/antetest/ante_test.go index 1f8b2af45..3388f0b18 100644 --- a/x/tx-boundary/ante/antetest/ante_test.go +++ b/x/tx-boundary/ante/antetest/ante_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/authz" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - txboundaryAnte "github.com/notional-labs/composable/v5/x/tx-boundary/ante" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + txboundaryAnte "github.com/notional-labs/composable/v6/x/tx-boundary/ante" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" ) diff --git a/x/tx-boundary/ante/antetest/ante_test_setup.go b/x/tx-boundary/ante/antetest/ante_test_setup.go index 3c300a645..f66a64acf 100644 --- a/x/tx-boundary/ante/antetest/ante_test_setup.go +++ b/x/tx-boundary/ante/antetest/ante_test_setup.go @@ -17,8 +17,8 @@ import ( xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/cosmos/ibc-go/v7/testing/mock" - "github.com/notional-labs/composable/v5/app" - "github.com/notional-labs/composable/v5/app/helpers" + "github.com/notional-labs/composable/v6/app" + "github.com/notional-labs/composable/v6/app/helpers" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" ) diff --git a/x/tx-boundary/ante/decorate.go b/x/tx-boundary/ante/decorate.go index 4dac2f05d..52bdb1be9 100644 --- a/x/tx-boundary/ante/decorate.go +++ b/x/tx-boundary/ante/decorate.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/authz" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - txBoundaryKeeper "github.com/notional-labs/composable/v5/x/tx-boundary/keeper" + txBoundaryKeeper "github.com/notional-labs/composable/v6/x/tx-boundary/keeper" ) type StakingPermissionDecorator struct { diff --git a/x/tx-boundary/client/cli/query.go b/x/tx-boundary/client/cli/query.go index 99f8e8093..5723a78da 100644 --- a/x/tx-boundary/client/cli/query.go +++ b/x/tx-boundary/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) // GetQueryCmd returns the cli query commands for the tx-boundary module. diff --git a/x/tx-boundary/client/cli/tx.go b/x/tx-boundary/client/cli/tx.go index 8a703ab1c..68f93b11e 100644 --- a/x/tx-boundary/client/cli/tx.go +++ b/x/tx-boundary/client/cli/tx.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" "github.com/spf13/cobra" ) diff --git a/x/tx-boundary/keeper/genensis.go b/x/tx-boundary/keeper/genensis.go index 7111aad3d..04d89ebe0 100644 --- a/x/tx-boundary/keeper/genensis.go +++ b/x/tx-boundary/keeper/genensis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) // InitGenesis initializes the capability module's state from a provided genesis diff --git a/x/tx-boundary/keeper/grpc_query.go b/x/tx-boundary/keeper/grpc_query.go index 530e8796e..3bd29b7ee 100644 --- a/x/tx-boundary/keeper/grpc_query.go +++ b/x/tx-boundary/keeper/grpc_query.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/tx-boundary/keeper/keeper.go b/x/tx-boundary/keeper/keeper.go index ca3e0a7a6..145c62807 100644 --- a/x/tx-boundary/keeper/keeper.go +++ b/x/tx-boundary/keeper/keeper.go @@ -9,7 +9,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) // Keeper struct diff --git a/x/tx-boundary/keeper/keeper_test.go b/x/tx-boundary/keeper/keeper_test.go index 504f9474f..660ee6303 100644 --- a/x/tx-boundary/keeper/keeper_test.go +++ b/x/tx-boundary/keeper/keeper_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - "github.com/notional-labs/composable/v5/app" - "github.com/notional-labs/composable/v5/app/helpers" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/app" + "github.com/notional-labs/composable/v6/app/helpers" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) type KeeperTestSuite struct { diff --git a/x/tx-boundary/module.go b/x/tx-boundary/module.go index c98eaf0f5..1229f262c 100644 --- a/x/tx-boundary/module.go +++ b/x/tx-boundary/module.go @@ -15,9 +15,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/notional-labs/composable/v5/x/tx-boundary/client/cli" - "github.com/notional-labs/composable/v5/x/tx-boundary/keeper" - "github.com/notional-labs/composable/v5/x/tx-boundary/types" + "github.com/notional-labs/composable/v6/x/tx-boundary/client/cli" + "github.com/notional-labs/composable/v6/x/tx-boundary/keeper" + "github.com/notional-labs/composable/v6/x/tx-boundary/types" ) var (