From bd8712fcabd9ab0cb35f01196fc3bf5ef33670ca Mon Sep 17 00:00:00 2001 From: C H Date: Thu, 17 Oct 2024 18:35:54 +0800 Subject: [PATCH 1/4] Bump to v5 --- app/ante.go | 8 ++-- app/app.go | 23 +++++----- app/apptesting/test_suite.go | 4 +- app/encoding.go | 2 +- app/keepers/keepers.go | 46 +++++++++---------- app/keepers/keys.go | 18 ++++---- app/modules.go | 42 ++++++++--------- app/test_helpers.go | 4 +- app/upgrades/types.go | 2 +- app/upgrades/v2/constants.go | 2 +- app/upgrades/v2/upgrades.go | 2 +- app/upgrades/v3/constants.go | 2 +- app/upgrades/v3/upgrades.go | 2 +- app/upgrades/v4/constants.go | 8 ++-- app/upgrades/v4/upgrades.go | 20 ++++---- cmd/cyber/cmd/root.go | 4 +- cmd/cyber/main.go | 4 +- cmd/iavltool/main.go | 2 +- go.mod | 2 +- plugins/types/custom_querier.go | 24 +++++----- plugins/types/dispatch_msg.go | 20 ++++---- plugins/types/stargate_queries.go | 2 +- plugins/types/types.go | 14 +++--- plugins/wasm.go | 48 ++++++++++---------- utils/context.go | 6 +-- x/bandwidth/abci.go | 4 +- x/bandwidth/client/cli/query.go | 2 +- x/bandwidth/keeper/accounts.go | 2 +- x/bandwidth/keeper/blocks.go | 2 +- x/bandwidth/keeper/genesis.go | 2 +- x/bandwidth/keeper/grpc_query.go | 2 +- x/bandwidth/keeper/keeper.go | 4 +- x/bandwidth/keeper/migrator.go | 4 +- x/bandwidth/keeper/msg_server.go | 2 +- x/bandwidth/keeper/snapshotter.go | 2 +- x/bandwidth/migrations/v2/migrate.go | 4 +- x/bandwidth/module.go | 8 ++-- x/bandwidth/wasm/interface.go | 4 +- x/clock/abci.go | 6 +-- x/clock/abci_test.go | 6 +-- x/clock/client/cli/query.go | 2 +- x/clock/client/cli/tx.go | 2 +- x/clock/genesis.go | 4 +- x/clock/genesis_test.go | 6 +-- x/clock/keeper/clock.go | 4 +- x/clock/keeper/keeper.go | 2 +- x/clock/keeper/keeper_test.go | 6 +-- x/clock/keeper/msg_server.go | 2 +- x/clock/keeper/msg_server_test.go | 2 +- x/clock/keeper/querier.go | 4 +- x/clock/keeper/querier_test.go | 2 +- x/clock/module.go | 6 +-- x/clock/types/msgs.go | 2 +- x/clock/types/params_test.go | 2 +- x/cyberbank/abci.go | 4 +- x/cyberbank/keeper/keeper.go | 2 +- x/cyberbank/keeper/proxy.go | 4 +- x/cyberbank/keeper/snapshotter.go | 2 +- x/cyberbank/module.go | 4 +- x/dmn/abci.go | 4 +- x/dmn/client/cli/query.go | 2 +- x/dmn/keeper/genesis.go | 2 +- x/dmn/keeper/grpc_query.go | 4 +- x/dmn/keeper/keeper.go | 6 +-- x/dmn/keeper/migrator.go | 4 +- x/dmn/keeper/msg_server.go | 4 +- x/dmn/migrations/v2/migrate.go | 4 +- x/dmn/module.go | 8 ++-- x/dmn/types/msgs.go | 4 +- x/dmn/wasm/interface.go | 4 +- x/graph/abci.go | 4 +- x/graph/client/cli/query.go | 2 +- x/graph/client/cli/tx.go | 2 +- x/graph/keeper/genesis.go | 2 +- x/graph/keeper/graph.go | 4 +- x/graph/keeper/grpc_query.go | 2 +- x/graph/keeper/index.go | 6 +-- x/graph/keeper/msg_server.go | 10 ++-- x/graph/keeper/neudeg.go | 2 +- x/graph/keeper/particles.go | 4 +- x/graph/keeper/snapshotter.go | 2 +- x/graph/module.go | 10 ++-- x/graph/types/compact_link.go | 2 +- x/graph/types/cyberlinks.go | 2 +- x/graph/wasm/interface.go | 8 ++-- x/grid/client/cli/query.go | 2 +- x/grid/client/cli/tx.go | 2 +- x/grid/keeper/genesis.go | 2 +- x/grid/keeper/grpc_query.go | 2 +- x/grid/keeper/keeper.go | 6 +-- x/grid/keeper/migrator.go | 4 +- x/grid/keeper/msg_server.go | 2 +- x/grid/migrations/v2/migrate.go | 4 +- x/grid/module.go | 8 ++-- x/grid/types/msgs.go | 2 +- x/grid/wasm/interface.go | 4 +- x/liquidity/abci.go | 4 +- x/liquidity/client/cli/query.go | 2 +- x/liquidity/client/cli/tx.go | 2 +- x/liquidity/genesis.go | 4 +- x/liquidity/handler.go | 4 +- x/liquidity/keeper/batch.go | 2 +- x/liquidity/keeper/genesis.go | 2 +- x/liquidity/keeper/grpc_query.go | 2 +- x/liquidity/keeper/invariants.go | 2 +- x/liquidity/keeper/keeper.go | 2 +- x/liquidity/keeper/liquidity_pool.go | 2 +- x/liquidity/keeper/migrator.go | 4 +- x/liquidity/keeper/msg_server.go | 2 +- x/liquidity/keeper/store.go | 2 +- x/liquidity/keeper/swap.go | 2 +- x/liquidity/migrations/v3/migrate.go | 4 +- x/liquidity/module.go | 8 ++-- x/liquidity/types/codec_test.go | 36 +++++++++++++++ x/liquidity/wasm/liquidity.go | 4 +- x/rank/abci.go | 2 +- x/rank/client/cli/query.go | 4 +- x/rank/keeper/calculate.go | 2 +- x/rank/keeper/calculate_cpu.go | 4 +- x/rank/keeper/calculate_gpu.go | 4 +- x/rank/keeper/calculate_gpu_nop.go | 2 +- x/rank/keeper/genesis.go | 2 +- x/rank/keeper/grpc_query.go | 6 +-- x/rank/keeper/keeper.go | 8 ++-- x/rank/keeper/migrator.go | 4 +- x/rank/keeper/msg_server.go | 2 +- x/rank/keeper/snapshotter.go | 2 +- x/rank/migrations/v2/migrate.go | 4 +- x/rank/module.go | 8 ++-- x/rank/types/context.go | 2 +- x/rank/types/expected_keepers.go | 2 +- x/rank/types/index.go | 2 +- x/rank/types/index_types.go | 2 +- x/rank/types/rank.go | 4 +- x/rank/wasm/interface.go | 4 +- x/resources/client/cli/query.go | 4 +- x/resources/client/cli/tx.go | 4 +- x/resources/keeper/genesis.go | 2 +- x/resources/keeper/grpc_query.go | 4 +- x/resources/keeper/keeper.go | 6 +-- x/resources/keeper/migrator.go | 4 +- x/resources/keeper/msg_server.go | 4 +- x/resources/migrations/v2/migrate.go | 4 +- x/resources/module.go | 8 ++-- x/resources/types/msgs.go | 2 +- x/resources/types/params.go | 2 +- x/resources/wasm/interface.go | 4 +- x/staking/msg_server.go | 4 +- x/tokenfactory/client/cli/query.go | 2 +- x/tokenfactory/client/cli/tx.go | 2 +- x/tokenfactory/keeper/admins.go | 2 +- x/tokenfactory/keeper/admins_test.go | 2 +- x/tokenfactory/keeper/bankactions.go | 2 +- x/tokenfactory/keeper/createdenom.go | 2 +- x/tokenfactory/keeper/createdenom_test.go | 4 +- x/tokenfactory/keeper/genesis.go | 2 +- x/tokenfactory/keeper/genesis_test.go | 2 +- x/tokenfactory/keeper/grpc_query.go | 2 +- x/tokenfactory/keeper/keeper.go | 2 +- x/tokenfactory/keeper/keeper_test.go | 4 +- x/tokenfactory/keeper/migrator.go | 4 +- x/tokenfactory/keeper/msg_server.go | 2 +- x/tokenfactory/keeper/msg_server_test.go | 2 +- x/tokenfactory/keeper/params.go | 2 +- x/tokenfactory/migrations/v2/migrate.go | 4 +- x/tokenfactory/migrations/v2/migrate_test.go | 8 ++-- x/tokenfactory/module.go | 8 ++-- x/tokenfactory/types/denoms_test.go | 2 +- x/tokenfactory/types/genesis_test.go | 2 +- x/tokenfactory/types/msgs_test.go | 4 +- x/tokenfactory/wasm/custom_msg_test.go | 6 +-- x/tokenfactory/wasm/custom_query_test.go | 4 +- x/tokenfactory/wasm/helpers_test.go | 2 +- x/tokenfactory/wasm/message_plugin.go | 8 ++-- x/tokenfactory/wasm/queries.go | 4 +- x/tokenfactory/wasm/query_plugin.go | 4 +- x/tokenfactory/wasm/validate_msg_test.go | 6 +-- x/tokenfactory/wasm/validate_queries_test.go | 2 +- 178 files changed, 462 insertions(+), 425 deletions(-) create mode 100644 x/liquidity/types/codec_test.go diff --git a/app/ante.go b/app/ante.go index 38007ba6..6c8ac510 100644 --- a/app/ante.go +++ b/app/ante.go @@ -15,18 +15,18 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/ante" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" // antefee "github.com/cosmos/cosmos-sdk/x/auth/ante/fee" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - ctypes "github.com/cybercongress/go-cyber/v4/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" - bandwidthkeeper "github.com/cybercongress/go-cyber/v4/x/bandwidth/keeper" - bandwidthtypes "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" + bandwidthkeeper "github.com/cybercongress/go-cyber/v5/x/bandwidth/keeper" + bandwidthtypes "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" ) // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC diff --git a/app/app.go b/app/app.go index cf571ded..2d447bdd 100644 --- a/app/app.go +++ b/app/app.go @@ -3,11 +3,12 @@ package app import ( "fmt" "github.com/cosmos/cosmos-sdk/server" - "github.com/cybercongress/go-cyber/v4/client/docs" - bandwidthkeeper "github.com/cybercongress/go-cyber/v4/x/bandwidth/keeper" - cyberbankkeeper "github.com/cybercongress/go-cyber/v4/x/cyberbank/keeper" - graphkeeper "github.com/cybercongress/go-cyber/v4/x/graph/keeper" - rankkeeper "github.com/cybercongress/go-cyber/v4/x/rank/keeper" + v5 "github.com/cybercongress/go-cyber/v5/app/upgrades/v5" + "github.com/cybercongress/go-cyber/v5/client/docs" + bandwidthkeeper "github.com/cybercongress/go-cyber/v5/x/bandwidth/keeper" + cyberbankkeeper "github.com/cybercongress/go-cyber/v5/x/cyberbank/keeper" + graphkeeper "github.com/cybercongress/go-cyber/v5/x/graph/keeper" + rankkeeper "github.com/cybercongress/go-cyber/v5/x/rank/keeper" "io" "os" "time" @@ -18,15 +19,15 @@ import ( "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/x/auth/posthandler" - v2 "github.com/cybercongress/go-cyber/v4/app/upgrades/v2" - v3 "github.com/cybercongress/go-cyber/v4/app/upgrades/v3" - v4 "github.com/cybercongress/go-cyber/v4/app/upgrades/v4" + v2 "github.com/cybercongress/go-cyber/v5/app/upgrades/v2" + v3 "github.com/cybercongress/go-cyber/v5/app/upgrades/v3" + v4 "github.com/cybercongress/go-cyber/v5/app/upgrades/v4" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" ibcclientclient "github.com/cosmos/ibc-go/v7/modules/core/02-client/client" - "github.com/cybercongress/go-cyber/v4/app/keepers" - "github.com/cybercongress/go-cyber/v4/app/upgrades" + "github.com/cybercongress/go-cyber/v5/app/keepers" + "github.com/cybercongress/go-cyber/v5/app/upgrades" dbm "github.com/cometbft/cometbft-db" "github.com/cosmos/cosmos-sdk/client" @@ -65,7 +66,7 @@ import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/cybercongress/go-cyber/v4/utils" + "github.com/cybercongress/go-cyber/v5/utils" runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services" ) diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go index 85354030..7def0ece 100644 --- a/app/apptesting/test_suite.go +++ b/app/apptesting/test_suite.go @@ -35,8 +35,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cybercongress/go-cyber/v4/app" - appparams "github.com/cybercongress/go-cyber/v4/app/params" + "github.com/cybercongress/go-cyber/v5/app" + appparams "github.com/cybercongress/go-cyber/v5/app/params" ) type KeeperTestHelper struct { diff --git a/app/encoding.go b/app/encoding.go index c97728e8..0c129be4 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -4,7 +4,7 @@ import ( simappparams "cosmossdk.io/simapp/params" "github.com/cosmos/cosmos-sdk/std" - "github.com/cybercongress/go-cyber/v4/app/params" + "github.com/cybercongress/go-cyber/v5/app/params" ) func MakeEncodingConfig() simappparams.EncodingConfig { diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 67d13027..a2bf87c4 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -16,9 +16,9 @@ import ( icahost "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" - clocktypes "github.com/cybercongress/go-cyber/v4/x/clock/types" - tokenfactorykeeper "github.com/cybercongress/go-cyber/v4/x/tokenfactory/keeper" - tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + clocktypes "github.com/cybercongress/go-cyber/v5/x/clock/types" + tokenfactorykeeper "github.com/cybercongress/go-cyber/v5/x/tokenfactory/keeper" + tokenfactorytypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" "os" "path/filepath" @@ -77,32 +77,32 @@ import ( "github.com/spf13/cast" - liquiditykeeper "github.com/cybercongress/go-cyber/v4/x/liquidity/keeper" - liquiditytypes "github.com/cybercongress/go-cyber/v4/x/liquidity/types" - - wasmplugins "github.com/cybercongress/go-cyber/v4/plugins" - "github.com/cybercongress/go-cyber/v4/x/bandwidth" - bandwidthkeeper "github.com/cybercongress/go-cyber/v4/x/bandwidth/keeper" - bandwidthtypes "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" - cyberbankkeeper "github.com/cybercongress/go-cyber/v4/x/cyberbank/keeper" - dmnkeeper "github.com/cybercongress/go-cyber/v4/x/dmn/keeper" - dmntypes "github.com/cybercongress/go-cyber/v4/x/dmn/types" - graphkeeper "github.com/cybercongress/go-cyber/v4/x/graph/keeper" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" - gridkeeper "github.com/cybercongress/go-cyber/v4/x/grid/keeper" - gridtypes "github.com/cybercongress/go-cyber/v4/x/grid/types" - "github.com/cybercongress/go-cyber/v4/x/rank" - rankkeeper "github.com/cybercongress/go-cyber/v4/x/rank/keeper" - ranktypes "github.com/cybercongress/go-cyber/v4/x/rank/types" - resourceskeeper "github.com/cybercongress/go-cyber/v4/x/resources/keeper" - resourcestypes "github.com/cybercongress/go-cyber/v4/x/resources/types" + liquiditykeeper "github.com/cybercongress/go-cyber/v5/x/liquidity/keeper" + liquiditytypes "github.com/cybercongress/go-cyber/v5/x/liquidity/types" + + wasmplugins "github.com/cybercongress/go-cyber/v5/plugins" + "github.com/cybercongress/go-cyber/v5/x/bandwidth" + bandwidthkeeper "github.com/cybercongress/go-cyber/v5/x/bandwidth/keeper" + bandwidthtypes "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" + cyberbankkeeper "github.com/cybercongress/go-cyber/v5/x/cyberbank/keeper" + dmnkeeper "github.com/cybercongress/go-cyber/v5/x/dmn/keeper" + dmntypes "github.com/cybercongress/go-cyber/v5/x/dmn/types" + graphkeeper "github.com/cybercongress/go-cyber/v5/x/graph/keeper" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" + gridkeeper "github.com/cybercongress/go-cyber/v5/x/grid/keeper" + gridtypes "github.com/cybercongress/go-cyber/v5/x/grid/types" + "github.com/cybercongress/go-cyber/v5/x/rank" + rankkeeper "github.com/cybercongress/go-cyber/v5/x/rank/keeper" + ranktypes "github.com/cybercongress/go-cyber/v5/x/rank/types" + resourceskeeper "github.com/cybercongress/go-cyber/v5/x/resources/keeper" + resourcestypes "github.com/cybercongress/go-cyber/v5/x/resources/types" consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" govv1beta "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - clockkeeper "github.com/cybercongress/go-cyber/v4/x/clock/keeper" + clockkeeper "github.com/cybercongress/go-cyber/v5/x/clock/keeper" "github.com/cometbft/cometbft/libs/log" icacontrollerkeeper "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/keeper" diff --git a/app/keepers/keys.go b/app/keepers/keys.go index ee60a724..43769a06 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -28,17 +28,17 @@ import ( ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - clocktypes "github.com/cybercongress/go-cyber/v4/x/clock/types" - tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + clocktypes "github.com/cybercongress/go-cyber/v5/x/clock/types" + tokenfactorytypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" - liquiditytypes "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + liquiditytypes "github.com/cybercongress/go-cyber/v5/x/liquidity/types" - bandwidthtypes "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" - dmntypes "github.com/cybercongress/go-cyber/v4/x/dmn/types" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" - gridtypes "github.com/cybercongress/go-cyber/v4/x/grid/types" - ranktypes "github.com/cybercongress/go-cyber/v4/x/rank/types" - resourcestypes "github.com/cybercongress/go-cyber/v4/x/resources/types" + bandwidthtypes "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" + dmntypes "github.com/cybercongress/go-cyber/v5/x/dmn/types" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" + gridtypes "github.com/cybercongress/go-cyber/v5/x/grid/types" + ranktypes "github.com/cybercongress/go-cyber/v5/x/rank/types" + resourcestypes "github.com/cybercongress/go-cyber/v5/x/resources/types" ) func (appKeepers *AppKeepers) GenerateKeys() { diff --git a/app/modules.go b/app/modules.go index c1f4568a..533bd9b5 100644 --- a/app/modules.go +++ b/app/modules.go @@ -54,32 +54,32 @@ import ( ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine" ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - "github.com/cybercongress/go-cyber/v4/x/clock" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory" - tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/clock" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory" + tokenfactorytypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" - "github.com/cybercongress/go-cyber/v4/x/liquidity" - liquiditytypes "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity" + liquiditytypes "github.com/cybercongress/go-cyber/v5/x/liquidity/types" - "github.com/cybercongress/go-cyber/v4/x/bandwidth" - bandwidthtypes "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" - "github.com/cybercongress/go-cyber/v4/x/cyberbank" - cyberbanktypes "github.com/cybercongress/go-cyber/v4/x/cyberbank/types" - "github.com/cybercongress/go-cyber/v4/x/dmn" - dmntypes "github.com/cybercongress/go-cyber/v4/x/dmn/types" - "github.com/cybercongress/go-cyber/v4/x/graph" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" - grid "github.com/cybercongress/go-cyber/v4/x/grid" - gridtypes "github.com/cybercongress/go-cyber/v4/x/grid/types" - "github.com/cybercongress/go-cyber/v4/x/rank" - ranktypes "github.com/cybercongress/go-cyber/v4/x/rank/types" - "github.com/cybercongress/go-cyber/v4/x/resources" - resourcestypes "github.com/cybercongress/go-cyber/v4/x/resources/types" - stakingwrap "github.com/cybercongress/go-cyber/v4/x/staking" + "github.com/cybercongress/go-cyber/v5/x/bandwidth" + bandwidthtypes "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" + "github.com/cybercongress/go-cyber/v5/x/cyberbank" + cyberbanktypes "github.com/cybercongress/go-cyber/v5/x/cyberbank/types" + "github.com/cybercongress/go-cyber/v5/x/dmn" + dmntypes "github.com/cybercongress/go-cyber/v5/x/dmn/types" + "github.com/cybercongress/go-cyber/v5/x/graph" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" + grid "github.com/cybercongress/go-cyber/v5/x/grid" + gridtypes "github.com/cybercongress/go-cyber/v5/x/grid/types" + "github.com/cybercongress/go-cyber/v5/x/rank" + ranktypes "github.com/cybercongress/go-cyber/v5/x/rank/types" + "github.com/cybercongress/go-cyber/v5/x/resources" + resourcestypes "github.com/cybercongress/go-cyber/v5/x/resources/types" + stakingwrap "github.com/cybercongress/go-cyber/v5/x/staking" authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" - clocktypes "github.com/cybercongress/go-cyber/v4/x/clock/types" + clocktypes "github.com/cybercongress/go-cyber/v5/x/clock/types" icq "github.com/cosmos/ibc-apps/modules/async-icq/v7" icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types" diff --git a/app/test_helpers.go b/app/test_helpers.go index 235bc8ac..0dba901d 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -32,8 +32,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - apphelpers "github.com/cybercongress/go-cyber/v4/app/helpers" - appparams "github.com/cybercongress/go-cyber/v4/app/params" + apphelpers "github.com/cybercongress/go-cyber/v5/app/helpers" + appparams "github.com/cybercongress/go-cyber/v5/app/params" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 587ac623..4c9467a6 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cybercongress/go-cyber/v4/app/keepers" + "github.com/cybercongress/go-cyber/v5/app/keepers" ) // BaseAppParamManager defines an interrace that BaseApp is expected to fullfil diff --git a/app/upgrades/v2/constants.go b/app/upgrades/v2/constants.go index 63e2cd20..79675aa2 100644 --- a/app/upgrades/v2/constants.go +++ b/app/upgrades/v2/constants.go @@ -3,7 +3,7 @@ package v2 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/cybercongress/go-cyber/v4/app/upgrades" + "github.com/cybercongress/go-cyber/v5/app/upgrades" ) const UpgradeName = "cyberfrey" diff --git a/app/upgrades/v2/upgrades.go b/app/upgrades/v2/upgrades.go index 1d5b2ffa..2b1448e8 100644 --- a/app/upgrades/v2/upgrades.go +++ b/app/upgrades/v2/upgrades.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/cybercongress/go-cyber/v4/app/keepers" + "github.com/cybercongress/go-cyber/v5/app/keepers" ) func CreateV2UpgradeHandler( diff --git a/app/upgrades/v3/constants.go b/app/upgrades/v3/constants.go index 085d07fd..48e8a751 100644 --- a/app/upgrades/v3/constants.go +++ b/app/upgrades/v3/constants.go @@ -4,7 +4,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" - "github.com/cybercongress/go-cyber/v4/app/upgrades" + "github.com/cybercongress/go-cyber/v5/app/upgrades" ) const UpgradeName = "v3" diff --git a/app/upgrades/v3/upgrades.go b/app/upgrades/v3/upgrades.go index 31d70758..a8acef3d 100644 --- a/app/upgrades/v3/upgrades.go +++ b/app/upgrades/v3/upgrades.go @@ -9,7 +9,7 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" - "github.com/cybercongress/go-cyber/v4/app/keepers" + "github.com/cybercongress/go-cyber/v5/app/keepers" ) func CreateV3UpgradeHandler( diff --git a/app/upgrades/v4/constants.go b/app/upgrades/v4/constants.go index 2f1bf36a..1eb7cace 100644 --- a/app/upgrades/v4/constants.go +++ b/app/upgrades/v4/constants.go @@ -10,12 +10,12 @@ import ( ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types" icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" - clocktypes "github.com/cybercongress/go-cyber/v4/x/clock/types" - tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + clocktypes "github.com/cybercongress/go-cyber/v5/x/clock/types" + tokenfactorytypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" - resourcestypes "github.com/cybercongress/go-cyber/v4/x/resources/types" + resourcestypes "github.com/cybercongress/go-cyber/v5/x/resources/types" - "github.com/cybercongress/go-cyber/v4/app/upgrades" + "github.com/cybercongress/go-cyber/v5/app/upgrades" ) const UpgradeName = "v4" diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index 771fb343..b16c3c61 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -7,12 +7,12 @@ import ( icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" "github.com/cosmos/ibc-go/v7/modules/core/exported" - generaltypes "github.com/cybercongress/go-cyber/v4/types" - clocktypes "github.com/cybercongress/go-cyber/v4/x/clock/types" - tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + generaltypes "github.com/cybercongress/go-cyber/v5/types" + clocktypes "github.com/cybercongress/go-cyber/v5/x/clock/types" + tokenfactorytypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" "time" - liquiditytypes "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + liquiditytypes "github.com/cybercongress/go-cyber/v5/x/liquidity/types" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/cosmos/cosmos-sdk/baseapp" @@ -28,17 +28,17 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - bandwidthtypes "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" - dmntypes "github.com/cybercongress/go-cyber/v4/x/dmn/types" - gridtypes "github.com/cybercongress/go-cyber/v4/x/grid/types" - ranktypes "github.com/cybercongress/go-cyber/v4/x/rank/types" - resourcestypes "github.com/cybercongress/go-cyber/v4/x/resources/types" + bandwidthtypes "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" + dmntypes "github.com/cybercongress/go-cyber/v5/x/dmn/types" + gridtypes "github.com/cybercongress/go-cyber/v5/x/grid/types" + ranktypes "github.com/cybercongress/go-cyber/v5/x/rank/types" + resourcestypes "github.com/cybercongress/go-cyber/v5/x/resources/types" 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/cybercongress/go-cyber/v4/app/keepers" + "github.com/cybercongress/go-cyber/v5/app/keepers" ) const NewDenomCreationGasConsume uint64 = 2_000_000 diff --git a/cmd/cyber/cmd/root.go b/cmd/cyber/cmd/root.go index a349338c..35ad8131 100644 --- a/cmd/cyber/cmd/root.go +++ b/cmd/cyber/cmd/root.go @@ -14,12 +14,12 @@ import ( "github.com/cosmos/cosmos-sdk/client/pruning" "github.com/prometheus/client_golang/prometheus" - "github.com/cybercongress/go-cyber/v4/app" + "github.com/cybercongress/go-cyber/v5/app" "github.com/CosmWasm/wasmd/x/wasm" "github.com/cosmos/cosmos-sdk/x/crisis" - "github.com/cybercongress/go-cyber/v4/x/rank" + "github.com/cybercongress/go-cyber/v5/x/rank" dbm "github.com/cometbft/cometbft-db" tmcli "github.com/cometbft/cometbft/libs/cli" diff --git a/cmd/cyber/main.go b/cmd/cyber/main.go index 646c36ff..be5a67c9 100644 --- a/cmd/cyber/main.go +++ b/cmd/cyber/main.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/cybercongress/go-cyber/v4/app" - "github.com/cybercongress/go-cyber/v4/cmd/cyber/cmd" + "github.com/cybercongress/go-cyber/v5/app" + "github.com/cybercongress/go-cyber/v5/cmd/cyber/cmd" ) func main() { diff --git a/cmd/iavltool/main.go b/cmd/iavltool/main.go index 225e13c6..971f934a 100644 --- a/cmd/iavltool/main.go +++ b/cmd/iavltool/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/cybercongress/go-cyber/v4/cmd/iavltool/cmd" + "github.com/cybercongress/go-cyber/v5/cmd/iavltool/cmd" ) func main() { diff --git a/go.mod b/go.mod index 962aa092..d9d11067 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/cybercongress/go-cyber/v4 +module github.com/cybercongress/go-cyber/v5 go 1.22.2 diff --git a/plugins/types/custom_querier.go b/plugins/types/custom_querier.go index 51691bc9..4ecd8239 100644 --- a/plugins/types/custom_querier.go +++ b/plugins/types/custom_querier.go @@ -7,18 +7,18 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - bandwidthkeeper "github.com/cybercongress/go-cyber/v4/x/bandwidth/keeper" - bandwidthtypes "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" - dmnkeeper "github.com/cybercongress/go-cyber/v4/x/dmn/keeper" - dmntypes "github.com/cybercongress/go-cyber/v4/x/dmn/types" - graphkeeper "github.com/cybercongress/go-cyber/v4/x/graph/keeper" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" - gridkeeper "github.com/cybercongress/go-cyber/v4/x/grid/keeper" - gridtypes "github.com/cybercongress/go-cyber/v4/x/grid/types" - rankkeeper "github.com/cybercongress/go-cyber/v4/x/rank/keeper" - ranktypes "github.com/cybercongress/go-cyber/v4/x/rank/types" - tokenfactorykeeper "github.com/cybercongress/go-cyber/v4/x/tokenfactory/keeper" - tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + bandwidthkeeper "github.com/cybercongress/go-cyber/v5/x/bandwidth/keeper" + bandwidthtypes "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" + dmnkeeper "github.com/cybercongress/go-cyber/v5/x/dmn/keeper" + dmntypes "github.com/cybercongress/go-cyber/v5/x/dmn/types" + graphkeeper "github.com/cybercongress/go-cyber/v5/x/graph/keeper" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" + gridkeeper "github.com/cybercongress/go-cyber/v5/x/grid/keeper" + gridtypes "github.com/cybercongress/go-cyber/v5/x/grid/types" + rankkeeper "github.com/cybercongress/go-cyber/v5/x/rank/keeper" + ranktypes "github.com/cybercongress/go-cyber/v5/x/rank/types" + tokenfactorykeeper "github.com/cybercongress/go-cyber/v5/x/tokenfactory/keeper" + tokenfactorytypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) type ModuleQuerier interface { diff --git a/plugins/types/dispatch_msg.go b/plugins/types/dispatch_msg.go index ad765e8e..56bb0cb6 100644 --- a/plugins/types/dispatch_msg.go +++ b/plugins/types/dispatch_msg.go @@ -4,16 +4,16 @@ import ( "encoding/json" "errors" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - dmnkeeper "github.com/cybercongress/go-cyber/v4/x/dmn/keeper" - dmntypes "github.com/cybercongress/go-cyber/v4/x/dmn/types" - graphkeeper "github.com/cybercongress/go-cyber/v4/x/graph/keeper" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" - gridkeeper "github.com/cybercongress/go-cyber/v4/x/grid/keeper" - gridtypes "github.com/cybercongress/go-cyber/v4/x/grid/types" - resourceskeeper "github.com/cybercongress/go-cyber/v4/x/resources/keeper" - resourcestypes "github.com/cybercongress/go-cyber/v4/x/resources/types" - tokenfactorykeeper "github.com/cybercongress/go-cyber/v4/x/tokenfactory/keeper" - tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + dmnkeeper "github.com/cybercongress/go-cyber/v5/x/dmn/keeper" + dmntypes "github.com/cybercongress/go-cyber/v5/x/dmn/types" + graphkeeper "github.com/cybercongress/go-cyber/v5/x/graph/keeper" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" + gridkeeper "github.com/cybercongress/go-cyber/v5/x/grid/keeper" + gridtypes "github.com/cybercongress/go-cyber/v5/x/grid/types" + resourceskeeper "github.com/cybercongress/go-cyber/v5/x/resources/keeper" + resourcestypes "github.com/cybercongress/go-cyber/v5/x/resources/types" + tokenfactorykeeper "github.com/cybercongress/go-cyber/v5/x/tokenfactory/keeper" + tokenfactorytypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" errorsmod "cosmossdk.io/errors" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" diff --git a/plugins/types/stargate_queries.go b/plugins/types/stargate_queries.go index d5b33172..34ad869b 100644 --- a/plugins/types/stargate_queries.go +++ b/plugins/types/stargate_queries.go @@ -11,7 +11,7 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + tokenfactorytypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" "sync" ) diff --git a/plugins/types/types.go b/plugins/types/types.go index aaa0aee0..67cf5e35 100644 --- a/plugins/types/types.go +++ b/plugins/types/types.go @@ -1,13 +1,13 @@ package types import ( - bandwidthtypes "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" - dmntypes "github.com/cybercongress/go-cyber/v4/x/dmn/types" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" - gridtypes "github.com/cybercongress/go-cyber/v4/x/grid/types" - ranktypes "github.com/cybercongress/go-cyber/v4/x/rank/types" - resourcestypes "github.com/cybercongress/go-cyber/v4/x/resources/types" - tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/wasm/types" + bandwidthtypes "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" + dmntypes "github.com/cybercongress/go-cyber/v5/x/dmn/types" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" + gridtypes "github.com/cybercongress/go-cyber/v5/x/grid/types" + ranktypes "github.com/cybercongress/go-cyber/v5/x/rank/types" + resourcestypes "github.com/cybercongress/go-cyber/v5/x/resources/types" + tokenfactorytypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/wasm/types" ) type CyberQuery struct { diff --git a/plugins/wasm.go b/plugins/wasm.go index ca85fa34..3064209e 100644 --- a/plugins/wasm.go +++ b/plugins/wasm.go @@ -7,32 +7,32 @@ import ( "github.com/cosmos/cosmos-sdk/codec" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - bandwidthtypes "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" - dmntypes "github.com/cybercongress/go-cyber/v4/x/dmn/types" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" - gridtypes "github.com/cybercongress/go-cyber/v4/x/grid/types" - ranktypes "github.com/cybercongress/go-cyber/v4/x/rank/types" - resourcestypes "github.com/cybercongress/go-cyber/v4/x/resources/types" - tokenfactorykeeper "github.com/cybercongress/go-cyber/v4/x/tokenfactory/keeper" - tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + bandwidthtypes "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" + dmntypes "github.com/cybercongress/go-cyber/v5/x/dmn/types" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" + gridtypes "github.com/cybercongress/go-cyber/v5/x/grid/types" + ranktypes "github.com/cybercongress/go-cyber/v5/x/rank/types" + resourcestypes "github.com/cybercongress/go-cyber/v5/x/resources/types" + tokenfactorykeeper "github.com/cybercongress/go-cyber/v5/x/tokenfactory/keeper" + tokenfactorytypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" - "github.com/cybercongress/go-cyber/v4/plugins/types" - cyberbankkeeper "github.com/cybercongress/go-cyber/v4/x/cyberbank/keeper" - dmnwasm "github.com/cybercongress/go-cyber/v4/x/dmn/wasm" - resourceskeeper "github.com/cybercongress/go-cyber/v4/x/resources/keeper" + "github.com/cybercongress/go-cyber/v5/plugins/types" + cyberbankkeeper "github.com/cybercongress/go-cyber/v5/x/cyberbank/keeper" + dmnwasm "github.com/cybercongress/go-cyber/v5/x/dmn/wasm" + resourceskeeper "github.com/cybercongress/go-cyber/v5/x/resources/keeper" - pluginstypes "github.com/cybercongress/go-cyber/v4/plugins/types" - bandwidthkeeper "github.com/cybercongress/go-cyber/v4/x/bandwidth/keeper" - bandwidthwasm "github.com/cybercongress/go-cyber/v4/x/bandwidth/wasm" - dmnkeeper "github.com/cybercongress/go-cyber/v4/x/dmn/keeper" - graphkeeper "github.com/cybercongress/go-cyber/v4/x/graph/keeper" - graphwasm "github.com/cybercongress/go-cyber/v4/x/graph/wasm" - gridkeeper "github.com/cybercongress/go-cyber/v4/x/grid/keeper" - gridwasm "github.com/cybercongress/go-cyber/v4/x/grid/wasm" - rankkeeper "github.com/cybercongress/go-cyber/v4/x/rank/keeper" - rankwasm "github.com/cybercongress/go-cyber/v4/x/rank/wasm" - resourceswasm "github.com/cybercongress/go-cyber/v4/x/resources/wasm" - tokenfactorywasm "github.com/cybercongress/go-cyber/v4/x/tokenfactory/wasm" + pluginstypes "github.com/cybercongress/go-cyber/v5/plugins/types" + bandwidthkeeper "github.com/cybercongress/go-cyber/v5/x/bandwidth/keeper" + bandwidthwasm "github.com/cybercongress/go-cyber/v5/x/bandwidth/wasm" + dmnkeeper "github.com/cybercongress/go-cyber/v5/x/dmn/keeper" + graphkeeper "github.com/cybercongress/go-cyber/v5/x/graph/keeper" + graphwasm "github.com/cybercongress/go-cyber/v5/x/graph/wasm" + gridkeeper "github.com/cybercongress/go-cyber/v5/x/grid/keeper" + gridwasm "github.com/cybercongress/go-cyber/v5/x/grid/wasm" + rankkeeper "github.com/cybercongress/go-cyber/v5/x/rank/keeper" + rankwasm "github.com/cybercongress/go-cyber/v5/x/rank/wasm" + resourceswasm "github.com/cybercongress/go-cyber/v5/x/resources/wasm" + tokenfactorywasm "github.com/cybercongress/go-cyber/v5/x/tokenfactory/wasm" ) func RegisterCustomPlugins( diff --git a/utils/context.go b/utils/context.go index 26277ba3..fafd4822 100644 --- a/utils/context.go +++ b/utils/context.go @@ -15,9 +15,9 @@ import ( icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" - clocktypes "github.com/cybercongress/go-cyber/v4/x/clock/types" - resourcestypes "github.com/cybercongress/go-cyber/v4/x/resources/types" - tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + clocktypes "github.com/cybercongress/go-cyber/v5/x/clock/types" + resourcestypes "github.com/cybercongress/go-cyber/v5/x/resources/types" + tokenfactorytypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) func NewContextWithMSVersion(db db.DB, version int64, keys map[string]*storetypes.KVStoreKey) (sdk.Context, error) { diff --git a/x/bandwidth/abci.go b/x/bandwidth/abci.go index d0806ad7..4119d2ab 100644 --- a/x/bandwidth/abci.go +++ b/x/bandwidth/abci.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/keeper" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/keeper" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" ) var accountsToUpdate = make([]sdk.AccAddress, 0) diff --git a/x/bandwidth/client/cli/query.go b/x/bandwidth/client/cli/query.go index 61542e98..8f4b2784 100644 --- a/x/bandwidth/client/cli/query.go +++ b/x/bandwidth/client/cli/query.go @@ -10,7 +10,7 @@ import ( // sdk "github.com/cosmos/cosmos-sdk/types" "github.com/spf13/cobra" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/bandwidth/keeper/accounts.go b/x/bandwidth/keeper/accounts.go index 4aba7c1f..780c075c 100644 --- a/x/bandwidth/keeper/accounts.go +++ b/x/bandwidth/keeper/accounts.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" ) func (bm BandwidthMeter) SetAccountBandwidth(ctx sdk.Context, ab types.NeuronBandwidth) { diff --git a/x/bandwidth/keeper/blocks.go b/x/bandwidth/keeper/blocks.go index 3ea38f10..b2e6014c 100644 --- a/x/bandwidth/keeper/blocks.go +++ b/x/bandwidth/keeper/blocks.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" ) func (bm BandwidthMeter) SetBlockBandwidth(ctx sdk.Context, blockNumber uint64, value uint64) { diff --git a/x/bandwidth/keeper/genesis.go b/x/bandwidth/keeper/genesis.go index e07824b1..c3f32c5c 100644 --- a/x/bandwidth/keeper/genesis.go +++ b/x/bandwidth/keeper/genesis.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" ) func InitGenesis(ctx sdk.Context, bm *BandwidthMeter, ak authkeeper.AccountKeeper, data types.GenesisState) { diff --git a/x/bandwidth/keeper/grpc_query.go b/x/bandwidth/keeper/grpc_query.go index 987ccabe..434f799c 100644 --- a/x/bandwidth/keeper/grpc_query.go +++ b/x/bandwidth/keeper/grpc_query.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" ) var _ types.QueryServer = &BandwidthMeter{} diff --git a/x/bandwidth/keeper/keeper.go b/x/bandwidth/keeper/keeper.go index 9fe5ca09..2ec65770 100644 --- a/x/bandwidth/keeper/keeper.go +++ b/x/bandwidth/keeper/keeper.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" - gtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" + gtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" ) type BandwidthMeter struct { diff --git a/x/bandwidth/keeper/migrator.go b/x/bandwidth/keeper/migrator.go index 98b64fad..65176593 100644 --- a/x/bandwidth/keeper/migrator.go +++ b/x/bandwidth/keeper/migrator.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/exported" - v2 "github.com/cybercongress/go-cyber/v4/x/bandwidth/migrations/v2" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/exported" + v2 "github.com/cybercongress/go-cyber/v5/x/bandwidth/migrations/v2" ) // Migrator is a struct for handling in-place state migrations. diff --git a/x/bandwidth/keeper/msg_server.go b/x/bandwidth/keeper/msg_server.go index 9825f437..d83dbd9c 100644 --- a/x/bandwidth/keeper/msg_server.go +++ b/x/bandwidth/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" ) type msgServer struct { diff --git a/x/bandwidth/keeper/snapshotter.go b/x/bandwidth/keeper/snapshotter.go index 8916aabf..4fe70ede 100644 --- a/x/bandwidth/keeper/snapshotter.go +++ b/x/bandwidth/keeper/snapshotter.go @@ -5,7 +5,7 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" snapshot "github.com/cosmos/cosmos-sdk/snapshots/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" ) var _ snapshot.ExtensionSnapshotter = &BandwidthSnapshotter{} diff --git a/x/bandwidth/migrations/v2/migrate.go b/x/bandwidth/migrations/v2/migrate.go index 7c0e3810..6a528c0e 100644 --- a/x/bandwidth/migrations/v2/migrate.go +++ b/x/bandwidth/migrations/v2/migrate.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/exported" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/exported" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" ) func Migrate( diff --git a/x/bandwidth/module.go b/x/bandwidth/module.go index b0057e7d..4a7ab7fc 100644 --- a/x/bandwidth/module.go +++ b/x/bandwidth/module.go @@ -13,10 +13,10 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/client/cli" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/exported" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/keeper" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/client/cli" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/exported" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/keeper" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/bandwidth/wasm/interface.go b/x/bandwidth/wasm/interface.go index 0769cb00..187eaf78 100644 --- a/x/bandwidth/wasm/interface.go +++ b/x/bandwidth/wasm/interface.go @@ -5,11 +5,11 @@ import ( errorsmod "cosmossdk.io/errors" - pluginstypes "github.com/cybercongress/go-cyber/v4/plugins/types" + pluginstypes "github.com/cybercongress/go-cyber/v5/plugins/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/bandwidth/keeper" + "github.com/cybercongress/go-cyber/v5/x/bandwidth/keeper" ) type Querier struct { diff --git a/x/clock/abci.go b/x/clock/abci.go index 8ceacece..0c3c400c 100644 --- a/x/clock/abci.go +++ b/x/clock/abci.go @@ -2,7 +2,7 @@ package clock import ( abci "github.com/cometbft/cometbft/abci/types" - "github.com/cybercongress/go-cyber/v4/app/helpers" + "github.com/cybercongress/go-cyber/v5/app/helpers" "time" "github.com/cometbft/cometbft/libs/log" @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/clock/keeper" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + "github.com/cybercongress/go-cyber/v5/x/clock/keeper" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) var endBlockSudoMessage = []byte(types.EndBlockSudoMessage) diff --git a/x/clock/abci_test.go b/x/clock/abci_test.go index 39e93e73..3ec303e9 100644 --- a/x/clock/abci_test.go +++ b/x/clock/abci_test.go @@ -17,9 +17,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/cybercongress/go-cyber/v4/app" - clock "github.com/cybercongress/go-cyber/v4/x/clock" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + "github.com/cybercongress/go-cyber/v5/app" + clock "github.com/cybercongress/go-cyber/v5/x/clock" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) type EndBlockerTestSuite struct { diff --git a/x/clock/client/cli/query.go b/x/clock/client/cli/query.go index 8d74196e..803337b1 100644 --- a/x/clock/client/cli/query.go +++ b/x/clock/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/clock/client/cli/tx.go b/x/clock/client/cli/tx.go index ba039349..b4491b9e 100644 --- a/x/clock/client/cli/tx.go +++ b/x/clock/client/cli/tx.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) // NewTxCmd returns a root CLI command handler for certain modules/Clock diff --git a/x/clock/genesis.go b/x/clock/genesis.go index 660ea677..d81c1339 100644 --- a/x/clock/genesis.go +++ b/x/clock/genesis.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/clock/keeper" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + "github.com/cybercongress/go-cyber/v5/x/clock/keeper" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) // NewGenesisState - Create a new genesis state diff --git a/x/clock/genesis_test.go b/x/clock/genesis_test.go index ffca7543..5252d5dd 100644 --- a/x/clock/genesis_test.go +++ b/x/clock/genesis_test.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/app" - clock "github.com/cybercongress/go-cyber/v4/x/clock" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + "github.com/cybercongress/go-cyber/v5/app" + clock "github.com/cybercongress/go-cyber/v5/x/clock" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) type GenesisTestSuite struct { diff --git a/x/clock/keeper/clock.go b/x/clock/keeper/clock.go index 7b690ff1..24796fbc 100644 --- a/x/clock/keeper/clock.go +++ b/x/clock/keeper/clock.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - globalerrors "github.com/cybercongress/go-cyber/v4/app/helpers" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + globalerrors "github.com/cybercongress/go-cyber/v5/app/helpers" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) // Store Keys for clock contracts (both jailed and unjailed) diff --git a/x/clock/keeper/keeper.go b/x/clock/keeper/keeper.go index 380cf9e5..270577d3 100644 --- a/x/clock/keeper/keeper.go +++ b/x/clock/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/cybercongress/go-cyber/v4/x/clock/types" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) // Keeper of the clock store diff --git a/x/clock/keeper/keeper_test.go b/x/clock/keeper/keeper_test.go index a84f85c9..bc2f97c7 100644 --- a/x/clock/keeper/keeper_test.go +++ b/x/clock/keeper/keeper_test.go @@ -18,9 +18,9 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/cybercongress/go-cyber/v4/app" - "github.com/cybercongress/go-cyber/v4/x/clock/keeper" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + "github.com/cybercongress/go-cyber/v5/app" + "github.com/cybercongress/go-cyber/v5/x/clock/keeper" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) type IntegrationTestSuite struct { diff --git a/x/clock/keeper/msg_server.go b/x/clock/keeper/msg_server.go index 8ff4ff38..2de10e6b 100644 --- a/x/clock/keeper/msg_server.go +++ b/x/clock/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) var _ types.MsgServer = &msgServer{} diff --git a/x/clock/keeper/msg_server_test.go b/x/clock/keeper/msg_server_test.go index 882ea68b..3666821b 100644 --- a/x/clock/keeper/msg_server_test.go +++ b/x/clock/keeper/msg_server_test.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) // Test register clock contract. diff --git a/x/clock/keeper/querier.go b/x/clock/keeper/querier.go index c90c7cc3..a9a45989 100644 --- a/x/clock/keeper/querier.go +++ b/x/clock/keeper/querier.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - globalerrors "github.com/cybercongress/go-cyber/v4/app/helpers" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + globalerrors "github.com/cybercongress/go-cyber/v5/app/helpers" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) var _ types.QueryServer = &Querier{} diff --git a/x/clock/keeper/querier_test.go b/x/clock/keeper/querier_test.go index fffdc890..c573ccad 100644 --- a/x/clock/keeper/querier_test.go +++ b/x/clock/keeper/querier_test.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) // Query Clock Params diff --git a/x/clock/module.go b/x/clock/module.go index 7151da79..3e6dc93e 100644 --- a/x/clock/module.go +++ b/x/clock/module.go @@ -18,9 +18,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cybercongress/go-cyber/v4/x/clock/client/cli" - "github.com/cybercongress/go-cyber/v4/x/clock/keeper" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + "github.com/cybercongress/go-cyber/v5/x/clock/client/cli" + "github.com/cybercongress/go-cyber/v5/x/clock/keeper" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) const ( diff --git a/x/clock/types/msgs.go b/x/clock/types/msgs.go index 4871459c..73228749 100644 --- a/x/clock/types/msgs.go +++ b/x/clock/types/msgs.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - globalerrors "github.com/cybercongress/go-cyber/v4/app/helpers" + globalerrors "github.com/cybercongress/go-cyber/v5/app/helpers" ) const ( diff --git a/x/clock/types/params_test.go b/x/clock/types/params_test.go index fea75df7..a0d3f3af 100644 --- a/x/clock/types/params_test.go +++ b/x/clock/types/params_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cybercongress/go-cyber/v4/x/clock/types" + "github.com/cybercongress/go-cyber/v5/x/clock/types" ) func TestParamsValidate(t *testing.T) { diff --git a/x/cyberbank/abci.go b/x/cyberbank/abci.go index 8768d67d..63cf8291 100644 --- a/x/cyberbank/abci.go +++ b/x/cyberbank/abci.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/cyberbank/keeper" - "github.com/cybercongress/go-cyber/v4/x/cyberbank/types" + "github.com/cybercongress/go-cyber/v5/x/cyberbank/keeper" + "github.com/cybercongress/go-cyber/v5/x/cyberbank/types" ) func EndBlocker(ctx sdk.Context, k *keeper.IndexedKeeper) { diff --git a/x/cyberbank/keeper/keeper.go b/x/cyberbank/keeper/keeper.go index 6930af55..11c8c9fa 100644 --- a/x/cyberbank/keeper/keeper.go +++ b/x/cyberbank/keeper/keeper.go @@ -13,7 +13,7 @@ import ( "github.com/cometbft/cometbft/libs/log" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/cybercongress/go-cyber/v4/x/cyberbank/types" + "github.com/cybercongress/go-cyber/v5/x/cyberbank/types" ) type IndexedKeeper struct { diff --git a/x/cyberbank/keeper/proxy.go b/x/cyberbank/keeper/proxy.go index 819d2e67..c9857d1a 100644 --- a/x/cyberbank/keeper/proxy.go +++ b/x/cyberbank/keeper/proxy.go @@ -10,8 +10,8 @@ import ( bank "github.com/cosmos/cosmos-sdk/x/bank/keeper" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - ctypes "github.com/cybercongress/go-cyber/v4/types" - "github.com/cybercongress/go-cyber/v4/x/cyberbank/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" + "github.com/cybercongress/go-cyber/v5/x/cyberbank/types" ) var _ bank.Keeper = (*Proxy)(nil) diff --git a/x/cyberbank/keeper/snapshotter.go b/x/cyberbank/keeper/snapshotter.go index f878f37e..63470be6 100644 --- a/x/cyberbank/keeper/snapshotter.go +++ b/x/cyberbank/keeper/snapshotter.go @@ -5,7 +5,7 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" snapshot "github.com/cosmos/cosmos-sdk/snapshots/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/cyberbank/types" + "github.com/cybercongress/go-cyber/v5/x/cyberbank/types" ) var _ snapshot.ExtensionSnapshotter = &CyberbankSnapshotter{} diff --git a/x/cyberbank/module.go b/x/cyberbank/module.go index 1153f2bd..56a0e8ae 100644 --- a/x/cyberbank/module.go +++ b/x/cyberbank/module.go @@ -15,8 +15,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cybercongress/go-cyber/v4/x/cyberbank/keeper" - "github.com/cybercongress/go-cyber/v4/x/cyberbank/types" + "github.com/cybercongress/go-cyber/v5/x/cyberbank/keeper" + "github.com/cybercongress/go-cyber/v5/x/cyberbank/types" ) var ( diff --git a/x/dmn/abci.go b/x/dmn/abci.go index 1f88f251..5deb8e5e 100644 --- a/x/dmn/abci.go +++ b/x/dmn/abci.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/dmn/keeper" - "github.com/cybercongress/go-cyber/v4/x/dmn/types" + "github.com/cybercongress/go-cyber/v5/x/dmn/keeper" + "github.com/cybercongress/go-cyber/v5/x/dmn/types" ) func BeginBlock(ctx sdk.Context, k keeper.Keeper) { diff --git a/x/dmn/client/cli/query.go b/x/dmn/client/cli/query.go index a2502cea..f12e71b6 100644 --- a/x/dmn/client/cli/query.go +++ b/x/dmn/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" - "github.com/cybercongress/go-cyber/v4/x/dmn/types" + "github.com/cybercongress/go-cyber/v5/x/dmn/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/dmn/keeper/genesis.go b/x/dmn/keeper/genesis.go index 0b74e443..27b50588 100644 --- a/x/dmn/keeper/genesis.go +++ b/x/dmn/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/dmn/types" + "github.com/cybercongress/go-cyber/v5/x/dmn/types" ) func InitGenesis(ctx sdk.Context, k Keeper, data types.GenesisState) { diff --git a/x/dmn/keeper/grpc_query.go b/x/dmn/keeper/grpc_query.go index cf97e19c..25dbb4dc 100644 --- a/x/dmn/keeper/grpc_query.go +++ b/x/dmn/keeper/grpc_query.go @@ -3,13 +3,13 @@ package keeper import ( "context" - ctypes "github.com/cybercongress/go-cyber/v4/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" sdk "github.com/cosmos/cosmos-sdk/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/cybercongress/go-cyber/v4/x/dmn/types" + "github.com/cybercongress/go-cyber/v5/x/dmn/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/dmn/keeper/keeper.go b/x/dmn/keeper/keeper.go index 7ef1b596..f9215ed8 100644 --- a/x/dmn/keeper/keeper.go +++ b/x/dmn/keeper/keeper.go @@ -17,10 +17,10 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - ctypes "github.com/cybercongress/go-cyber/v4/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" - "github.com/cybercongress/go-cyber/v4/x/dmn/types" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/dmn/types" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" ) // Keeper of the power store diff --git a/x/dmn/keeper/migrator.go b/x/dmn/keeper/migrator.go index 59ecfa70..bded86a6 100644 --- a/x/dmn/keeper/migrator.go +++ b/x/dmn/keeper/migrator.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/dmn/exported" - v2 "github.com/cybercongress/go-cyber/v4/x/dmn/migrations/v2" + "github.com/cybercongress/go-cyber/v5/x/dmn/exported" + v2 "github.com/cybercongress/go-cyber/v5/x/dmn/migrations/v2" ) // Migrator is a struct for handling in-place state migrations. diff --git a/x/dmn/keeper/msg_server.go b/x/dmn/keeper/msg_server.go index ec6f60ec..b04a8156 100644 --- a/x/dmn/keeper/msg_server.go +++ b/x/dmn/keeper/msg_server.go @@ -8,8 +8,8 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/dmn/types" - graph "github.com/cybercongress/go-cyber/v4/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/dmn/types" + graph "github.com/cybercongress/go-cyber/v5/x/graph/types" ) type msgServer struct { diff --git a/x/dmn/migrations/v2/migrate.go b/x/dmn/migrations/v2/migrate.go index a03c0ba4..f172cb43 100644 --- a/x/dmn/migrations/v2/migrate.go +++ b/x/dmn/migrations/v2/migrate.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/dmn/exported" - "github.com/cybercongress/go-cyber/v4/x/dmn/types" + "github.com/cybercongress/go-cyber/v5/x/dmn/exported" + "github.com/cybercongress/go-cyber/v5/x/dmn/types" ) func Migrate( diff --git a/x/dmn/module.go b/x/dmn/module.go index d3cc9921..983a474f 100644 --- a/x/dmn/module.go +++ b/x/dmn/module.go @@ -16,10 +16,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cybercongress/go-cyber/v4/x/dmn/client/cli" - "github.com/cybercongress/go-cyber/v4/x/dmn/exported" - "github.com/cybercongress/go-cyber/v4/x/dmn/keeper" - "github.com/cybercongress/go-cyber/v4/x/dmn/types" + "github.com/cybercongress/go-cyber/v5/x/dmn/client/cli" + "github.com/cybercongress/go-cyber/v5/x/dmn/exported" + "github.com/cybercongress/go-cyber/v5/x/dmn/keeper" + "github.com/cybercongress/go-cyber/v5/x/dmn/types" ) var ( diff --git a/x/dmn/types/msgs.go b/x/dmn/types/msgs.go index 583c61a6..969751ee 100644 --- a/x/dmn/types/msgs.go +++ b/x/dmn/types/msgs.go @@ -8,8 +8,8 @@ import ( // sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cybercongress/go-cyber/v4/types" - graph "github.com/cybercongress/go-cyber/v4/x/graph/types" + "github.com/cybercongress/go-cyber/v5/types" + graph "github.com/cybercongress/go-cyber/v5/x/graph/types" ) const ( diff --git a/x/dmn/wasm/interface.go b/x/dmn/wasm/interface.go index 70871c6b..ae9a39ce 100644 --- a/x/dmn/wasm/interface.go +++ b/x/dmn/wasm/interface.go @@ -7,11 +7,11 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - pluginstypes "github.com/cybercongress/go-cyber/v4/plugins/types" + pluginstypes "github.com/cybercongress/go-cyber/v5/plugins/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/dmn/keeper" + "github.com/cybercongress/go-cyber/v5/x/dmn/keeper" ) type Messenger struct { diff --git a/x/graph/abci.go b/x/graph/abci.go index 990f1f6f..2567d21b 100644 --- a/x/graph/abci.go +++ b/x/graph/abci.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/graph/keeper" - "github.com/cybercongress/go-cyber/v4/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/graph/keeper" + "github.com/cybercongress/go-cyber/v5/x/graph/types" ) func EndBlocker(ctx sdk.Context, gk *keeper.GraphKeeper, ik *keeper.IndexKeeper) { diff --git a/x/graph/client/cli/query.go b/x/graph/client/cli/query.go index cddcc978..a5043045 100644 --- a/x/graph/client/cli/query.go +++ b/x/graph/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/cybercongress/go-cyber/v4/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/graph/types" ) // GetQueryCmd returns diff --git a/x/graph/client/cli/tx.go b/x/graph/client/cli/tx.go index 25d88440..3ed76313 100644 --- a/x/graph/client/cli/tx.go +++ b/x/graph/client/cli/tx.go @@ -12,7 +12,7 @@ import ( "github.com/ipfs/go-cid" "github.com/spf13/cobra" - "github.com/cybercongress/go-cyber/v4/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/graph/types" ) func NewTxCmd() *cobra.Command { diff --git a/x/graph/keeper/genesis.go b/x/graph/keeper/genesis.go index 556a89a9..fbba7599 100644 --- a/x/graph/keeper/genesis.go +++ b/x/graph/keeper/genesis.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/utils" + "github.com/cybercongress/go-cyber/v5/utils" ) const ( diff --git a/x/graph/keeper/graph.go b/x/graph/keeper/graph.go index 6932c680..9bcf7fbc 100644 --- a/x/graph/keeper/graph.go +++ b/x/graph/keeper/graph.go @@ -12,8 +12,8 @@ import ( "github.com/cometbft/cometbft/libs/log" - ctypes "github.com/cybercongress/go-cyber/v4/types" - "github.com/cybercongress/go-cyber/v4/x/graph/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" + "github.com/cybercongress/go-cyber/v5/x/graph/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/graph/keeper/grpc_query.go b/x/graph/keeper/grpc_query.go index 9e218ca8..59b6bc41 100644 --- a/x/graph/keeper/grpc_query.go +++ b/x/graph/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/graph/types" ) var _ types.QueryServer = GraphKeeper{} diff --git a/x/graph/keeper/index.go b/x/graph/keeper/index.go index 133cf446..e95a3d27 100644 --- a/x/graph/keeper/index.go +++ b/x/graph/keeper/index.go @@ -6,9 +6,9 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" - ctypes "github.com/cybercongress/go-cyber/v4/types" - "github.com/cybercongress/go-cyber/v4/utils" - "github.com/cybercongress/go-cyber/v4/x/graph/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" + "github.com/cybercongress/go-cyber/v5/utils" + "github.com/cybercongress/go-cyber/v5/x/graph/types" tmos "github.com/cometbft/cometbft/libs/os" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/graph/keeper/msg_server.go b/x/graph/keeper/msg_server.go index 36bb095c..da4b3cd7 100644 --- a/x/graph/keeper/msg_server.go +++ b/x/graph/keeper/msg_server.go @@ -8,13 +8,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - ctypes "github.com/cybercongress/go-cyber/v4/types" - bandwidthkeeper "github.com/cybercongress/go-cyber/v4/x/bandwidth/keeper" - bandwidthtypes "github.com/cybercongress/go-cyber/v4/x/bandwidth/types" - cyberbankkeeper "github.com/cybercongress/go-cyber/v4/x/cyberbank/keeper" + ctypes "github.com/cybercongress/go-cyber/v5/types" + bandwidthkeeper "github.com/cybercongress/go-cyber/v5/x/bandwidth/keeper" + bandwidthtypes "github.com/cybercongress/go-cyber/v5/x/bandwidth/types" + cyberbankkeeper "github.com/cybercongress/go-cyber/v5/x/cyberbank/keeper" // sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cybercongress/go-cyber/v4/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/graph/types" ) type msgServer struct { diff --git a/x/graph/keeper/neudeg.go b/x/graph/keeper/neudeg.go index d5508529..a9ee542e 100644 --- a/x/graph/keeper/neudeg.go +++ b/x/graph/keeper/neudeg.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/graph/types" ) // In order to calculate the flow of amperes through cyberlinks created by given agents than need to compute neurons out-degree diff --git a/x/graph/keeper/particles.go b/x/graph/keeper/particles.go index d9f52ab0..20d84208 100644 --- a/x/graph/keeper/particles.go +++ b/x/graph/keeper/particles.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" - "github.com/cybercongress/go-cyber/v4/utils" - "github.com/cybercongress/go-cyber/v4/x/graph/types" + "github.com/cybercongress/go-cyber/v5/utils" + "github.com/cybercongress/go-cyber/v5/x/graph/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/graph/keeper/snapshotter.go b/x/graph/keeper/snapshotter.go index 6056ce87..2099c87a 100644 --- a/x/graph/keeper/snapshotter.go +++ b/x/graph/keeper/snapshotter.go @@ -5,7 +5,7 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" snapshot "github.com/cosmos/cosmos-sdk/snapshots/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/graph/types" ) var _ snapshot.ExtensionSnapshotter = &GraphSnapshotter{} diff --git a/x/graph/module.go b/x/graph/module.go index 9ba28298..e0d281a9 100644 --- a/x/graph/module.go +++ b/x/graph/module.go @@ -11,16 +11,16 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/grpc-ecosystem/grpc-gateway/runtime" - bandwidthkeeper "github.com/cybercongress/go-cyber/v4/x/bandwidth/keeper" + bandwidthkeeper "github.com/cybercongress/go-cyber/v5/x/bandwidth/keeper" "github.com/cosmos/cosmos-sdk/codec" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" "github.com/spf13/cobra" - cyberbankkeeper "github.com/cybercongress/go-cyber/v4/x/cyberbank/keeper" - "github.com/cybercongress/go-cyber/v4/x/graph/client/cli" - "github.com/cybercongress/go-cyber/v4/x/graph/keeper" - "github.com/cybercongress/go-cyber/v4/x/graph/types" + cyberbankkeeper "github.com/cybercongress/go-cyber/v5/x/cyberbank/keeper" + "github.com/cybercongress/go-cyber/v5/x/graph/client/cli" + "github.com/cybercongress/go-cyber/v5/x/graph/keeper" + "github.com/cybercongress/go-cyber/v5/x/graph/types" ) var ( diff --git a/x/graph/types/compact_link.go b/x/graph/types/compact_link.go index 04c703f7..011f33d6 100644 --- a/x/graph/types/compact_link.go +++ b/x/graph/types/compact_link.go @@ -3,7 +3,7 @@ package types import ( "encoding/binary" - "github.com/cybercongress/go-cyber/v4/types" + "github.com/cybercongress/go-cyber/v5/types" ) type CompactLink struct { diff --git a/x/graph/types/cyberlinks.go b/x/graph/types/cyberlinks.go index d1ab7d84..8e9ce72a 100644 --- a/x/graph/types/cyberlinks.go +++ b/x/graph/types/cyberlinks.go @@ -1,6 +1,6 @@ package types -import "github.com/cybercongress/go-cyber/v4/types" +import "github.com/cybercongress/go-cyber/v5/types" // map of map, where first key is cid, second key is account.String() // second map is used as set for fast contains check diff --git a/x/graph/wasm/interface.go b/x/graph/wasm/interface.go index 2df4696b..8663e677 100644 --- a/x/graph/wasm/interface.go +++ b/x/graph/wasm/interface.go @@ -8,13 +8,13 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - pluginstypes "github.com/cybercongress/go-cyber/v4/plugins/types" - bandwidthkeeper "github.com/cybercongress/go-cyber/v4/x/bandwidth/keeper" - cyberbankkeeper "github.com/cybercongress/go-cyber/v4/x/cyberbank/keeper" + pluginstypes "github.com/cybercongress/go-cyber/v5/plugins/types" + bandwidthkeeper "github.com/cybercongress/go-cyber/v5/x/bandwidth/keeper" + cyberbankkeeper "github.com/cybercongress/go-cyber/v5/x/cyberbank/keeper" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/graph/keeper" + "github.com/cybercongress/go-cyber/v5/x/graph/keeper" ) type Messenger struct { diff --git a/x/grid/client/cli/query.go b/x/grid/client/cli/query.go index 85e0f990..75a628a7 100644 --- a/x/grid/client/cli/query.go +++ b/x/grid/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cybercongress/go-cyber/v4/x/grid/types" + "github.com/cybercongress/go-cyber/v5/x/grid/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/grid/client/cli/tx.go b/x/grid/client/cli/tx.go index 8a263341..9d221b29 100644 --- a/x/grid/client/cli/tx.go +++ b/x/grid/client/cli/tx.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cybercongress/go-cyber/v4/x/grid/types" + "github.com/cybercongress/go-cyber/v5/x/grid/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/grid/keeper/genesis.go b/x/grid/keeper/genesis.go index e670f213..de8112ef 100644 --- a/x/grid/keeper/genesis.go +++ b/x/grid/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/grid/types" + "github.com/cybercongress/go-cyber/v5/x/grid/types" ) func InitGenesis(ctx sdk.Context, k Keeper, data types.GenesisState) { diff --git a/x/grid/keeper/grpc_query.go b/x/grid/keeper/grpc_query.go index 47f4516a..1c1844e6 100644 --- a/x/grid/keeper/grpc_query.go +++ b/x/grid/keeper/grpc_query.go @@ -9,7 +9,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/cybercongress/go-cyber/v4/x/grid/types" + "github.com/cybercongress/go-cyber/v5/x/grid/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/grid/keeper/keeper.go b/x/grid/keeper/keeper.go index bc53c4cf..87be1348 100644 --- a/x/grid/keeper/keeper.go +++ b/x/grid/keeper/keeper.go @@ -7,13 +7,13 @@ import ( "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/telemetry" - ctypes "github.com/cybercongress/go-cyber/v4/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/grid/exported" - "github.com/cybercongress/go-cyber/v4/x/grid/types" + "github.com/cybercongress/go-cyber/v5/x/grid/exported" + "github.com/cybercongress/go-cyber/v5/x/grid/types" ) var _ = exported.EnergyKeeper(nil) diff --git a/x/grid/keeper/migrator.go b/x/grid/keeper/migrator.go index 9a45e7eb..399b4adc 100644 --- a/x/grid/keeper/migrator.go +++ b/x/grid/keeper/migrator.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/grid/exported" - v2 "github.com/cybercongress/go-cyber/v4/x/grid/migrations/v2" + "github.com/cybercongress/go-cyber/v5/x/grid/exported" + v2 "github.com/cybercongress/go-cyber/v5/x/grid/migrations/v2" ) // Migrator is a struct for handling in-place state migrations. diff --git a/x/grid/keeper/msg_server.go b/x/grid/keeper/msg_server.go index 32c30634..f566c9d6 100644 --- a/x/grid/keeper/msg_server.go +++ b/x/grid/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/grid/types" + "github.com/cybercongress/go-cyber/v5/x/grid/types" ) type msgServer struct { diff --git a/x/grid/migrations/v2/migrate.go b/x/grid/migrations/v2/migrate.go index 34a86223..fa9d2ebe 100644 --- a/x/grid/migrations/v2/migrate.go +++ b/x/grid/migrations/v2/migrate.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/grid/exported" - "github.com/cybercongress/go-cyber/v4/x/grid/types" + "github.com/cybercongress/go-cyber/v5/x/grid/exported" + "github.com/cybercongress/go-cyber/v5/x/grid/types" ) func Migrate( diff --git a/x/grid/module.go b/x/grid/module.go index 26a00727..fa47fb3f 100644 --- a/x/grid/module.go +++ b/x/grid/module.go @@ -16,10 +16,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cybercongress/go-cyber/v4/x/grid/client/cli" - "github.com/cybercongress/go-cyber/v4/x/grid/exported" - "github.com/cybercongress/go-cyber/v4/x/grid/keeper" - "github.com/cybercongress/go-cyber/v4/x/grid/types" + "github.com/cybercongress/go-cyber/v5/x/grid/client/cli" + "github.com/cybercongress/go-cyber/v5/x/grid/exported" + "github.com/cybercongress/go-cyber/v5/x/grid/keeper" + "github.com/cybercongress/go-cyber/v5/x/grid/types" ) var ( diff --git a/x/grid/types/msgs.go b/x/grid/types/msgs.go index 238f7e42..a5071228 100644 --- a/x/grid/types/msgs.go +++ b/x/grid/types/msgs.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - ctypes "github.com/cybercongress/go-cyber/v4/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" ) const ( diff --git a/x/grid/wasm/interface.go b/x/grid/wasm/interface.go index a23f4e68..62043edb 100644 --- a/x/grid/wasm/interface.go +++ b/x/grid/wasm/interface.go @@ -7,11 +7,11 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - pluginstypes "github.com/cybercongress/go-cyber/v4/plugins/types" + pluginstypes "github.com/cybercongress/go-cyber/v5/plugins/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/grid/keeper" + "github.com/cybercongress/go-cyber/v5/x/grid/keeper" ) type Messenger struct { diff --git a/x/liquidity/abci.go b/x/liquidity/abci.go index abff8712..ce211c14 100644 --- a/x/liquidity/abci.go +++ b/x/liquidity/abci.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/liquidity/keeper" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/keeper" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) // In the Begin blocker of the liquidity module, diff --git a/x/liquidity/client/cli/query.go b/x/liquidity/client/cli/query.go index e33004ba..05a702ae 100644 --- a/x/liquidity/client/cli/query.go +++ b/x/liquidity/client/cli/query.go @@ -14,7 +14,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/liquidity/client/cli/tx.go b/x/liquidity/client/cli/tx.go index e81cbedb..09922e97 100644 --- a/x/liquidity/client/cli/tx.go +++ b/x/liquidity/client/cli/tx.go @@ -15,7 +15,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) // GetTxCmd returns a root CLI command handler for all x/liquidity transaction commands. diff --git a/x/liquidity/genesis.go b/x/liquidity/genesis.go index 508a2558..3cd5b61f 100644 --- a/x/liquidity/genesis.go +++ b/x/liquidity/genesis.go @@ -3,8 +3,8 @@ package liquidity import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/liquidity/keeper" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/keeper" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) // InitGenesis new liquidity genesis diff --git a/x/liquidity/handler.go b/x/liquidity/handler.go index 1e5836cd..f6944200 100644 --- a/x/liquidity/handler.go +++ b/x/liquidity/handler.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cybercongress/go-cyber/v4/x/liquidity/keeper" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/keeper" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) // NewHandler returns a handler for all "liquidity" type messages. diff --git a/x/liquidity/keeper/batch.go b/x/liquidity/keeper/batch.go index 0032be94..e684441e 100644 --- a/x/liquidity/keeper/batch.go +++ b/x/liquidity/keeper/batch.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) // DeleteAndInitPoolBatches resets batch msg states that were previously executed diff --git a/x/liquidity/keeper/genesis.go b/x/liquidity/keeper/genesis.go index d5186b29..e1e3de9b 100644 --- a/x/liquidity/keeper/genesis.go +++ b/x/liquidity/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) // InitGenesis initializes the liquidity module's state from a given genesis state. diff --git a/x/liquidity/keeper/grpc_query.go b/x/liquidity/keeper/grpc_query.go index f42a234d..8d6f2a15 100644 --- a/x/liquidity/keeper/grpc_query.go +++ b/x/liquidity/keeper/grpc_query.go @@ -12,7 +12,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) // Querier is used as Keeper will have duplicate methods if used directly, and gRPC names take precedence over keeper. diff --git a/x/liquidity/keeper/invariants.go b/x/liquidity/keeper/invariants.go index e8adda79..55d8c6c0 100644 --- a/x/liquidity/keeper/invariants.go +++ b/x/liquidity/keeper/invariants.go @@ -6,7 +6,7 @@ import ( "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) // RegisterInvariants registers all liquidity invariants. diff --git a/x/liquidity/keeper/keeper.go b/x/liquidity/keeper/keeper.go index 602cf156..7defbd63 100644 --- a/x/liquidity/keeper/keeper.go +++ b/x/liquidity/keeper/keeper.go @@ -8,7 +8,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) // Keeper of the liquidity store diff --git a/x/liquidity/keeper/liquidity_pool.go b/x/liquidity/keeper/liquidity_pool.go index faddafcb..9c2efc71 100644 --- a/x/liquidity/keeper/liquidity_pool.go +++ b/x/liquidity/keeper/liquidity_pool.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) func (k Keeper) ValidateMsgCreatePool(ctx sdk.Context, msg *types.MsgCreatePool) error { diff --git a/x/liquidity/keeper/migrator.go b/x/liquidity/keeper/migrator.go index b6ca5dc6..5d01bb31 100644 --- a/x/liquidity/keeper/migrator.go +++ b/x/liquidity/keeper/migrator.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/liquidity/exported" - v3 "github.com/cybercongress/go-cyber/v4/x/liquidity/migrations/v3" + "github.com/cybercongress/go-cyber/v5/x/liquidity/exported" + v3 "github.com/cybercongress/go-cyber/v5/x/liquidity/migrations/v3" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/liquidity/keeper/msg_server.go b/x/liquidity/keeper/msg_server.go index 1df4202a..6394c74e 100644 --- a/x/liquidity/keeper/msg_server.go +++ b/x/liquidity/keeper/msg_server.go @@ -12,7 +12,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) type msgServer struct { diff --git a/x/liquidity/keeper/store.go b/x/liquidity/keeper/store.go index 4213283f..f7b6ae11 100644 --- a/x/liquidity/keeper/store.go +++ b/x/liquidity/keeper/store.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" gogotypes "github.com/cosmos/gogoproto/types" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) // GetPool reads from kvstore and returns a specific pool diff --git a/x/liquidity/keeper/swap.go b/x/liquidity/keeper/swap.go index ca6f74fe..cf988a9a 100644 --- a/x/liquidity/keeper/swap.go +++ b/x/liquidity/keeper/swap.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) // Execute Swap of the pool batch, Collect swap messages in batch for transact the same price for each batch and run them on endblock. diff --git a/x/liquidity/migrations/v3/migrate.go b/x/liquidity/migrations/v3/migrate.go index 872cd605..d6961c60 100644 --- a/x/liquidity/migrations/v3/migrate.go +++ b/x/liquidity/migrations/v3/migrate.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/liquidity/exported" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/exported" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) func Migrate( diff --git a/x/liquidity/module.go b/x/liquidity/module.go index cf0f38c1..384e0aef 100644 --- a/x/liquidity/module.go +++ b/x/liquidity/module.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" - "github.com/cybercongress/go-cyber/v4/x/liquidity/exported" + "github.com/cybercongress/go-cyber/v5/x/liquidity/exported" abci "github.com/cometbft/cometbft/abci/types" sdkclient "github.com/cosmos/cosmos-sdk/client" @@ -16,9 +16,9 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - "github.com/cybercongress/go-cyber/v4/x/liquidity/client/cli" - "github.com/cybercongress/go-cyber/v4/x/liquidity/keeper" - "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + "github.com/cybercongress/go-cyber/v5/x/liquidity/client/cli" + "github.com/cybercongress/go-cyber/v5/x/liquidity/keeper" + "github.com/cybercongress/go-cyber/v5/x/liquidity/types" ) var ( diff --git a/x/liquidity/types/codec_test.go b/x/liquidity/types/codec_test.go new file mode 100644 index 00000000..f86de43e --- /dev/null +++ b/x/liquidity/types/codec_test.go @@ -0,0 +1,36 @@ +package types + +import ( + "testing" + + "github.com/stretchr/testify/suite" + + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +type CodecTestSuite struct { + suite.Suite +} + +func TestCodecSuite(t *testing.T) { + suite.Run(t, new(CodecTestSuite)) +} + +func (suite *CodecTestSuite) TestRegisterInterfaces() { + registry := codectypes.NewInterfaceRegistry() + registry.RegisterInterface(sdk.MsgInterfaceProtoName, (*sdk.Msg)(nil)) + RegisterInterfaces(registry) + + impls := registry.ListImplementations(sdk.MsgInterfaceProtoName) + suite.Require().Equal(8, len(impls)) + //suite.Require().ElementsMatch([]string{ + // "/osmosis.tokenfactory.v1beta1.MsgCreateDenom", + // "/osmosis.tokenfactory.v1beta1.MsgMint", + // "/osmosis.tokenfactory.v1beta1.MsgBurn", + // "/osmosis.tokenfactory.v1beta1.MsgChangeAdmin", + // "/osmosis.tokenfactory.v1beta1.MsgSetDenomMetadata", + // "/osmosis.tokenfactory.v1beta1.MsgForceTransfer", + // "/osmosis.tokenfactory.v1beta1.MsgUpdateParams", + //}, impls) +} diff --git a/x/liquidity/wasm/liquidity.go b/x/liquidity/wasm/liquidity.go index 041f536d..a619e87d 100644 --- a/x/liquidity/wasm/liquidity.go +++ b/x/liquidity/wasm/liquidity.go @@ -6,13 +6,13 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmvmtypes "github.com/CosmWasm/wasmvm/types" - liquiditytypes "github.com/cybercongress/go-cyber/v4/x/liquidity/types" + liquiditytypes "github.com/cybercongress/go-cyber/v5/x/liquidity/types" "github.com/CosmWasm/wasmd/x/wasm" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cybercongress/go-cyber/v4/x/liquidity/keeper" + "github.com/cybercongress/go-cyber/v5/x/liquidity/keeper" ) // TODO refactor to the new query and message handler or remove diff --git a/x/rank/abci.go b/x/rank/abci.go index 7ec14865..203195b4 100644 --- a/x/rank/abci.go +++ b/x/rank/abci.go @@ -3,7 +3,7 @@ package rank import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/rank/keeper" + "github.com/cybercongress/go-cyber/v5/x/rank/keeper" ) func EndBlocker(ctx sdk.Context, k *keeper.StateKeeper) { diff --git a/x/rank/client/cli/query.go b/x/rank/client/cli/query.go index c53d3456..62ace672 100644 --- a/x/rank/client/cli/query.go +++ b/x/rank/client/cli/query.go @@ -10,9 +10,9 @@ import ( "github.com/ipfs/go-cid" "github.com/spf13/cobra" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" - "github.com/cybercongress/go-cyber/v4/x/rank/types" + "github.com/cybercongress/go-cyber/v5/x/rank/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/rank/keeper/calculate.go b/x/rank/keeper/calculate.go index a85e598b..7d2608a9 100644 --- a/x/rank/keeper/calculate.go +++ b/x/rank/keeper/calculate.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" - "github.com/cybercongress/go-cyber/v4/x/rank/types" + "github.com/cybercongress/go-cyber/v5/x/rank/types" "github.com/cometbft/cometbft/libs/log" ) diff --git a/x/rank/keeper/calculate_cpu.go b/x/rank/keeper/calculate_cpu.go index 70689ee9..3a50a769 100755 --- a/x/rank/keeper/calculate_cpu.go +++ b/x/rank/keeper/calculate_cpu.go @@ -3,8 +3,8 @@ package keeper import ( "math" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" - "github.com/cybercongress/go-cyber/v4/x/rank/types" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/rank/types" ) func calculateRankCPU(ctx *types.CalculationContext) types.EMState { diff --git a/x/rank/keeper/calculate_gpu.go b/x/rank/keeper/calculate_gpu.go index 0ddcaee2..10c76233 100755 --- a/x/rank/keeper/calculate_gpu.go +++ b/x/rank/keeper/calculate_gpu.go @@ -8,8 +8,8 @@ import ( "github.com/cometbft/cometbft/libs/log" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" - "github.com/cybercongress/go-cyber/v4/x/rank/types" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/rank/types" ) /* diff --git a/x/rank/keeper/calculate_gpu_nop.go b/x/rank/keeper/calculate_gpu_nop.go index 9e9f0ff5..af297e96 100644 --- a/x/rank/keeper/calculate_gpu_nop.go +++ b/x/rank/keeper/calculate_gpu_nop.go @@ -4,7 +4,7 @@ package keeper import ( - "github.com/cybercongress/go-cyber/v4/x/rank/types" + "github.com/cybercongress/go-cyber/v5/x/rank/types" "github.com/cometbft/cometbft/libs/log" ) diff --git a/x/rank/keeper/genesis.go b/x/rank/keeper/genesis.go index d4919487..87e43648 100644 --- a/x/rank/keeper/genesis.go +++ b/x/rank/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/rank/types" + "github.com/cybercongress/go-cyber/v5/x/rank/types" ) func InitGenesis(ctx sdk.Context, sk StateKeeper, data types.GenesisState) { diff --git a/x/rank/keeper/grpc_query.go b/x/rank/keeper/grpc_query.go index 907a0444..3b8eaaa5 100644 --- a/x/rank/keeper/grpc_query.go +++ b/x/rank/keeper/grpc_query.go @@ -11,9 +11,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" - "github.com/cybercongress/go-cyber/v4/x/rank/types" - querytypes "github.com/cybercongress/go-cyber/v4/x/rank/types" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/rank/types" + querytypes "github.com/cybercongress/go-cyber/v5/x/rank/types" ) var _ types.QueryServer = &StateKeeper{} diff --git a/x/rank/keeper/keeper.go b/x/rank/keeper/keeper.go index ea7b6e69..3a148fce 100644 --- a/x/rank/keeper/keeper.go +++ b/x/rank/keeper/keeper.go @@ -14,10 +14,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/keeper" - "github.com/cybercongress/go-cyber/v4/merkle" - graphkeeper "github.com/cybercongress/go-cyber/v4/x/graph/keeper" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" - "github.com/cybercongress/go-cyber/v4/x/rank/types" + "github.com/cybercongress/go-cyber/v5/merkle" + graphkeeper "github.com/cybercongress/go-cyber/v5/x/graph/keeper" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" + "github.com/cybercongress/go-cyber/v5/x/rank/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/rank/keeper/migrator.go b/x/rank/keeper/migrator.go index feeb2c3d..8f121b9e 100644 --- a/x/rank/keeper/migrator.go +++ b/x/rank/keeper/migrator.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/rank/exported" - v2 "github.com/cybercongress/go-cyber/v4/x/rank/migrations/v2" + "github.com/cybercongress/go-cyber/v5/x/rank/exported" + v2 "github.com/cybercongress/go-cyber/v5/x/rank/migrations/v2" ) // Migrator is a struct for handling in-place state migrations. diff --git a/x/rank/keeper/msg_server.go b/x/rank/keeper/msg_server.go index a179f093..3c861ba0 100644 --- a/x/rank/keeper/msg_server.go +++ b/x/rank/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/rank/types" + "github.com/cybercongress/go-cyber/v5/x/rank/types" ) type msgServer struct { diff --git a/x/rank/keeper/snapshotter.go b/x/rank/keeper/snapshotter.go index ce07ebd2..88e6e682 100644 --- a/x/rank/keeper/snapshotter.go +++ b/x/rank/keeper/snapshotter.go @@ -5,7 +5,7 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" snapshot "github.com/cosmos/cosmos-sdk/snapshots/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/rank/types" + "github.com/cybercongress/go-cyber/v5/x/rank/types" ) var _ snapshot.ExtensionSnapshotter = &RankSnapshotter{} diff --git a/x/rank/migrations/v2/migrate.go b/x/rank/migrations/v2/migrate.go index 8e71d5dd..2c06b657 100644 --- a/x/rank/migrations/v2/migrate.go +++ b/x/rank/migrations/v2/migrate.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/rank/exported" - "github.com/cybercongress/go-cyber/v4/x/rank/types" + "github.com/cybercongress/go-cyber/v5/x/rank/exported" + "github.com/cybercongress/go-cyber/v5/x/rank/types" ) func Migrate( diff --git a/x/rank/module.go b/x/rank/module.go index fecc6238..441fa431 100644 --- a/x/rank/module.go +++ b/x/rank/module.go @@ -15,10 +15,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/spf13/cobra" - "github.com/cybercongress/go-cyber/v4/x/rank/client/cli" - "github.com/cybercongress/go-cyber/v4/x/rank/exported" - "github.com/cybercongress/go-cyber/v4/x/rank/keeper" - "github.com/cybercongress/go-cyber/v4/x/rank/types" + "github.com/cybercongress/go-cyber/v5/x/rank/client/cli" + "github.com/cybercongress/go-cyber/v5/x/rank/exported" + "github.com/cybercongress/go-cyber/v5/x/rank/keeper" + "github.com/cybercongress/go-cyber/v5/x/rank/types" ) var ( diff --git a/x/rank/types/context.go b/x/rank/types/context.go index 154bc9a5..39ae1325 100644 --- a/x/rank/types/context.go +++ b/x/rank/types/context.go @@ -3,7 +3,7 @@ package types import ( "sort" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" ) type CalculationContext struct { diff --git a/x/rank/types/expected_keepers.go b/x/rank/types/expected_keepers.go index 747d1fb3..c209b3e3 100644 --- a/x/rank/types/expected_keepers.go +++ b/x/rank/types/expected_keepers.go @@ -3,7 +3,7 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" ) type StakeKeeper interface { diff --git a/x/rank/types/index.go b/x/rank/types/index.go index 19624bdb..a7239fdb 100644 --- a/x/rank/types/index.go +++ b/x/rank/types/index.go @@ -7,7 +7,7 @@ import ( "github.com/cometbft/cometbft/libs/log" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" ) type BaseSearchIndex struct { diff --git a/x/rank/types/index_types.go b/x/rank/types/index_types.go index cea430da..768b9116 100644 --- a/x/rank/types/index_types.go +++ b/x/rank/types/index_types.go @@ -3,7 +3,7 @@ package types import ( "errors" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" ) type RankedCidNumber struct { diff --git a/x/rank/types/rank.go b/x/rank/types/rank.go index 328eb00e..9fa53605 100644 --- a/x/rank/types/rank.go +++ b/x/rank/types/rank.go @@ -6,8 +6,8 @@ import ( "sort" "time" - "github.com/cybercongress/go-cyber/v4/merkle" - graphtypes "github.com/cybercongress/go-cyber/v4/x/graph/types" + "github.com/cybercongress/go-cyber/v5/merkle" + graphtypes "github.com/cybercongress/go-cyber/v5/x/graph/types" "github.com/cometbft/cometbft/libs/log" ) diff --git a/x/rank/wasm/interface.go b/x/rank/wasm/interface.go index 7ab0a87a..f65cf771 100644 --- a/x/rank/wasm/interface.go +++ b/x/rank/wasm/interface.go @@ -7,9 +7,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/rank/keeper" + "github.com/cybercongress/go-cyber/v5/x/rank/keeper" - pluginstypes "github.com/cybercongress/go-cyber/v4/plugins/types" + pluginstypes "github.com/cybercongress/go-cyber/v5/plugins/types" ) type Querier struct { diff --git a/x/resources/client/cli/query.go b/x/resources/client/cli/query.go index f3b58256..4d8b21c5 100644 --- a/x/resources/client/cli/query.go +++ b/x/resources/client/cli/query.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/spf13/cobra" - ctypes "github.com/cybercongress/go-cyber/v4/types" - "github.com/cybercongress/go-cyber/v4/x/resources/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" + "github.com/cybercongress/go-cyber/v5/x/resources/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/resources/client/cli/tx.go b/x/resources/client/cli/tx.go index 360d48f4..cd8b0b0a 100644 --- a/x/resources/client/cli/tx.go +++ b/x/resources/client/cli/tx.go @@ -13,8 +13,8 @@ import ( "github.com/cosmos/cosmos-sdk/client" - ctypes "github.com/cybercongress/go-cyber/v4/types" - "github.com/cybercongress/go-cyber/v4/x/resources/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" + "github.com/cybercongress/go-cyber/v5/x/resources/types" ) func NewTxCmd() *cobra.Command { diff --git a/x/resources/keeper/genesis.go b/x/resources/keeper/genesis.go index 6562839d..8e61d06a 100644 --- a/x/resources/keeper/genesis.go +++ b/x/resources/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/resources/types" + "github.com/cybercongress/go-cyber/v5/x/resources/types" ) func InitGenesis(ctx sdk.Context, k Keeper, data types.GenesisState) { diff --git a/x/resources/keeper/grpc_query.go b/x/resources/keeper/grpc_query.go index 2aa2198b..31ebbc0c 100644 --- a/x/resources/keeper/grpc_query.go +++ b/x/resources/keeper/grpc_query.go @@ -9,9 +9,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - ctypes "github.com/cybercongress/go-cyber/v4/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" - "github.com/cybercongress/go-cyber/v4/x/resources/types" + "github.com/cybercongress/go-cyber/v5/x/resources/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/resources/keeper/keeper.go b/x/resources/keeper/keeper.go index 2572817a..f9ed2e83 100644 --- a/x/resources/keeper/keeper.go +++ b/x/resources/keeper/keeper.go @@ -15,9 +15,9 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - ctypes "github.com/cybercongress/go-cyber/v4/types" - bandwithkeeper "github.com/cybercongress/go-cyber/v4/x/bandwidth/keeper" - "github.com/cybercongress/go-cyber/v4/x/resources/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" + bandwithkeeper "github.com/cybercongress/go-cyber/v5/x/bandwidth/keeper" + "github.com/cybercongress/go-cyber/v5/x/resources/types" ) type Keeper struct { diff --git a/x/resources/keeper/migrator.go b/x/resources/keeper/migrator.go index fcb1e15c..3f4c93f5 100644 --- a/x/resources/keeper/migrator.go +++ b/x/resources/keeper/migrator.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/resources/exported" - v2 "github.com/cybercongress/go-cyber/v4/x/resources/migrations/v2" + "github.com/cybercongress/go-cyber/v5/x/resources/exported" + v2 "github.com/cybercongress/go-cyber/v5/x/resources/migrations/v2" ) // Migrator is a struct for handling in-place state migrations. diff --git a/x/resources/keeper/msg_server.go b/x/resources/keeper/msg_server.go index 902defc5..bcae1e50 100644 --- a/x/resources/keeper/msg_server.go +++ b/x/resources/keeper/msg_server.go @@ -10,11 +10,11 @@ import ( "github.com/armon/go-metrics" "github.com/cosmos/cosmos-sdk/telemetry" - ctypes "github.com/cybercongress/go-cyber/v4/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/resources/types" + "github.com/cybercongress/go-cyber/v5/x/resources/types" ) type msgServer struct { diff --git a/x/resources/migrations/v2/migrate.go b/x/resources/migrations/v2/migrate.go index 42f85f90..9e0226a4 100644 --- a/x/resources/migrations/v2/migrate.go +++ b/x/resources/migrations/v2/migrate.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/resources/exported" - "github.com/cybercongress/go-cyber/v4/x/resources/types" + "github.com/cybercongress/go-cyber/v5/x/resources/exported" + "github.com/cybercongress/go-cyber/v5/x/resources/types" ) func Migrate( diff --git a/x/resources/module.go b/x/resources/module.go index a3bdc943..571fa2c4 100644 --- a/x/resources/module.go +++ b/x/resources/module.go @@ -15,10 +15,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" "github.com/spf13/cobra" - "github.com/cybercongress/go-cyber/v4/x/resources/client/cli" - "github.com/cybercongress/go-cyber/v4/x/resources/exported" - "github.com/cybercongress/go-cyber/v4/x/resources/keeper" - "github.com/cybercongress/go-cyber/v4/x/resources/types" + "github.com/cybercongress/go-cyber/v5/x/resources/client/cli" + "github.com/cybercongress/go-cyber/v5/x/resources/exported" + "github.com/cybercongress/go-cyber/v5/x/resources/keeper" + "github.com/cybercongress/go-cyber/v5/x/resources/types" ) var ( diff --git a/x/resources/types/msgs.go b/x/resources/types/msgs.go index 75b8adea..d67b164c 100644 --- a/x/resources/types/msgs.go +++ b/x/resources/types/msgs.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - ctypes "github.com/cybercongress/go-cyber/v4/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" ) const ( diff --git a/x/resources/types/params.go b/x/resources/types/params.go index 9165833a..7c316c10 100644 --- a/x/resources/types/params.go +++ b/x/resources/types/params.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - ctypes "github.com/cybercongress/go-cyber/v4/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" ) const ( diff --git a/x/resources/wasm/interface.go b/x/resources/wasm/interface.go index cf488be3..a9f82115 100644 --- a/x/resources/wasm/interface.go +++ b/x/resources/wasm/interface.go @@ -7,8 +7,8 @@ import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - pluginstypes "github.com/cybercongress/go-cyber/v4/plugins/types" - "github.com/cybercongress/go-cyber/v4/x/resources/keeper" + pluginstypes "github.com/cybercongress/go-cyber/v5/plugins/types" + "github.com/cybercongress/go-cyber/v5/x/resources/keeper" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/staking/msg_server.go b/x/staking/msg_server.go index bb735d4d..3cdc03cf 100644 --- a/x/staking/msg_server.go +++ b/x/staking/msg_server.go @@ -18,8 +18,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking/types" "google.golang.org/grpc/status" - ctypes "github.com/cybercongress/go-cyber/v4/types" - resourcestypes "github.com/cybercongress/go-cyber/v4/x/resources/types" + ctypes "github.com/cybercongress/go-cyber/v5/types" + resourcestypes "github.com/cybercongress/go-cyber/v5/x/resources/types" ) type msgServer struct { diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go index 3ed8d03e..fc0ac273 100644 --- a/x/tokenfactory/client/cli/query.go +++ b/x/tokenfactory/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go index fc48e398..d2852f3b 100644 --- a/x/tokenfactory/client/cli/tx.go +++ b/x/tokenfactory/client/cli/tx.go @@ -13,7 +13,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/tokenfactory/keeper/admins.go b/x/tokenfactory/keeper/admins.go index 293c502c..47ac2203 100644 --- a/x/tokenfactory/keeper/admins.go +++ b/x/tokenfactory/keeper/admins.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) // GetAuthorityMetadata returns the authority metadata for a specific denom diff --git a/x/tokenfactory/keeper/admins_test.go b/x/tokenfactory/keeper/admins_test.go index 2ebd668f..7578e0f6 100644 --- a/x/tokenfactory/keeper/admins_test.go +++ b/x/tokenfactory/keeper/admins_test.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestAdminMsgs() { diff --git a/x/tokenfactory/keeper/bankactions.go b/x/tokenfactory/keeper/bankactions.go index 89232f15..1896201f 100644 --- a/x/tokenfactory/keeper/bankactions.go +++ b/x/tokenfactory/keeper/bankactions.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) func (k Keeper) mintTo(ctx sdk.Context, amount sdk.Coin, mintTo string) error { diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index 131ab201..eb2a60ca 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) // ConvertToBaseToken converts a fee amount in a whitelisted fee token to the base fee token amount diff --git a/x/tokenfactory/keeper/createdenom_test.go b/x/tokenfactory/keeper/createdenom_test.go index 65ce06d5..563082ce 100644 --- a/x/tokenfactory/keeper/createdenom_test.go +++ b/x/tokenfactory/keeper/createdenom_test.go @@ -4,8 +4,8 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cybercongress/go-cyber/v4/app/apptesting" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/app/apptesting" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestMsgCreateDenom() { diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go index 93469352..bafec1fc 100644 --- a/x/tokenfactory/keeper/genesis.go +++ b/x/tokenfactory/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) // InitGenesis initializes the tokenfactory module's state from a provided genesis diff --git a/x/tokenfactory/keeper/genesis_test.go b/x/tokenfactory/keeper/genesis_test.go index 69526c2d..5cc8bdba 100644 --- a/x/tokenfactory/keeper/genesis_test.go +++ b/x/tokenfactory/keeper/genesis_test.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestGenesis() { diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go index a1c2084d..70b5f728 100644 --- a/x/tokenfactory/keeper/grpc_query.go +++ b/x/tokenfactory/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index c9816901..eb897336 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) type ( diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index a400df32..d0a44138 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -4,8 +4,8 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cybercongress/go-cyber/v4/app/apptesting" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/app/apptesting" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" "github.com/stretchr/testify/suite" ) diff --git a/x/tokenfactory/keeper/migrator.go b/x/tokenfactory/keeper/migrator.go index 591c6873..8fcea2c8 100644 --- a/x/tokenfactory/keeper/migrator.go +++ b/x/tokenfactory/keeper/migrator.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/exported" - v2 "github.com/cybercongress/go-cyber/v4/x/tokenfactory/migrations/v2" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/exported" + v2 "github.com/cybercongress/go-cyber/v5/x/tokenfactory/migrations/v2" ) // Migrator is a struct for handling in-place state migrations. diff --git a/x/tokenfactory/keeper/msg_server.go b/x/tokenfactory/keeper/msg_server.go index 005efded..c5e9d879 100644 --- a/x/tokenfactory/keeper/msg_server.go +++ b/x/tokenfactory/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) type msgServer struct { diff --git a/x/tokenfactory/keeper/msg_server_test.go b/x/tokenfactory/keeper/msg_server_test.go index f9a66abf..4033d4d7 100644 --- a/x/tokenfactory/keeper/msg_server_test.go +++ b/x/tokenfactory/keeper/msg_server_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) // TestMintDenomMsg tests TypeMsgMint message is emitted on a successful mint diff --git a/x/tokenfactory/keeper/params.go b/x/tokenfactory/keeper/params.go index cf5ddd21..8150c25f 100644 --- a/x/tokenfactory/keeper/params.go +++ b/x/tokenfactory/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) // GetParams returns the total set params. diff --git a/x/tokenfactory/migrations/v2/migrate.go b/x/tokenfactory/migrations/v2/migrate.go index 5b4c07e0..916730fa 100644 --- a/x/tokenfactory/migrations/v2/migrate.go +++ b/x/tokenfactory/migrations/v2/migrate.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/exported" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/exported" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) const ModuleName = "tokenfactory" diff --git a/x/tokenfactory/migrations/v2/migrate_test.go b/x/tokenfactory/migrations/v2/migrate_test.go index 184ed309..9ae0cab2 100644 --- a/x/tokenfactory/migrations/v2/migrate_test.go +++ b/x/tokenfactory/migrations/v2/migrate_test.go @@ -9,10 +9,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/exported" - v2 "github.com/cybercongress/go-cyber/v4/x/tokenfactory/migrations/v2" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/exported" + v2 "github.com/cybercongress/go-cyber/v5/x/tokenfactory/migrations/v2" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) type mockSubspace struct { diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go index 77878e7d..2f8c5d1d 100644 --- a/x/tokenfactory/module.go +++ b/x/tokenfactory/module.go @@ -24,10 +24,10 @@ import ( cdctypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/client/cli" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/exported" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/keeper" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/client/cli" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/exported" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/keeper" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) var ( diff --git a/x/tokenfactory/types/denoms_test.go b/x/tokenfactory/types/denoms_test.go index d102a604..759dc0e5 100644 --- a/x/tokenfactory/types/denoms_test.go +++ b/x/tokenfactory/types/denoms_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) func TestDeconstructDenom(t *testing.T) { diff --git a/x/tokenfactory/types/genesis_test.go b/x/tokenfactory/types/genesis_test.go index 234c9a2e..f76d5700 100644 --- a/x/tokenfactory/types/genesis_test.go +++ b/x/tokenfactory/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/tokenfactory/types/msgs_test.go b/x/tokenfactory/types/msgs_test.go index 34ae26af..01697f10 100644 --- a/x/tokenfactory/types/msgs_test.go +++ b/x/tokenfactory/types/msgs_test.go @@ -11,8 +11,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/testhelpers" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/testhelpers" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" ) // Test authz serialize and de-serializes for tokenfactory msg. diff --git a/x/tokenfactory/wasm/custom_msg_test.go b/x/tokenfactory/wasm/custom_msg_test.go index 638c4363..f6f64f84 100644 --- a/x/tokenfactory/wasm/custom_msg_test.go +++ b/x/tokenfactory/wasm/custom_msg_test.go @@ -11,9 +11,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/app" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" - bindings "github.com/cybercongress/go-cyber/v4/x/tokenfactory/wasm/types" + "github.com/cybercongress/go-cyber/v5/app" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" + bindings "github.com/cybercongress/go-cyber/v5/x/tokenfactory/wasm/types" ) func TestCreateDenomMsg(t *testing.T) { diff --git a/x/tokenfactory/wasm/custom_query_test.go b/x/tokenfactory/wasm/custom_query_test.go index 64c309ba..74da91f6 100644 --- a/x/tokenfactory/wasm/custom_query_test.go +++ b/x/tokenfactory/wasm/custom_query_test.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/app" - bindings "github.com/cybercongress/go-cyber/v4/x/tokenfactory/wasm/types" + "github.com/cybercongress/go-cyber/v5/app" + bindings "github.com/cybercongress/go-cyber/v5/x/tokenfactory/wasm/types" ) func TestQueryFullDenom(t *testing.T) { diff --git a/x/tokenfactory/wasm/helpers_test.go b/x/tokenfactory/wasm/helpers_test.go index 9a49e31c..2e1d93ef 100644 --- a/x/tokenfactory/wasm/helpers_test.go +++ b/x/tokenfactory/wasm/helpers_test.go @@ -15,7 +15,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktestutil "github.com/cosmos/cosmos-sdk/x/bank/testutil" - "github.com/cybercongress/go-cyber/v4/app" + "github.com/cybercongress/go-cyber/v5/app" ) func CreateTestInput(t *testing.T) (*app.App, sdk.Context) { diff --git a/x/tokenfactory/wasm/message_plugin.go b/x/tokenfactory/wasm/message_plugin.go index a9be699d..0b7f9fc6 100644 --- a/x/tokenfactory/wasm/message_plugin.go +++ b/x/tokenfactory/wasm/message_plugin.go @@ -2,7 +2,7 @@ package wasm import ( wasmvmtypes "github.com/CosmWasm/wasmvm/types" - pluginstypes "github.com/cybercongress/go-cyber/v4/plugins/types" + pluginstypes "github.com/cybercongress/go-cyber/v5/plugins/types" errorsmod "cosmossdk.io/errors" @@ -10,9 +10,9 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - tokenfactorykeeper "github.com/cybercongress/go-cyber/v4/x/tokenfactory/keeper" - tokenfactorytypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" - bindingstypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/wasm/types" + tokenfactorykeeper "github.com/cybercongress/go-cyber/v5/x/tokenfactory/keeper" + tokenfactorytypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" + bindingstypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/wasm/types" ) type Messenger struct { diff --git a/x/tokenfactory/wasm/queries.go b/x/tokenfactory/wasm/queries.go index b2c38d22..735ef2e7 100644 --- a/x/tokenfactory/wasm/queries.go +++ b/x/tokenfactory/wasm/queries.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - tokenfactorykeeper "github.com/cybercongress/go-cyber/v4/x/tokenfactory/keeper" - bindingstypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/wasm/types" + tokenfactorykeeper "github.com/cybercongress/go-cyber/v5/x/tokenfactory/keeper" + bindingstypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/wasm/types" ) type Querier struct { diff --git a/x/tokenfactory/wasm/query_plugin.go b/x/tokenfactory/wasm/query_plugin.go index 1192160d..f588237c 100644 --- a/x/tokenfactory/wasm/query_plugin.go +++ b/x/tokenfactory/wasm/query_plugin.go @@ -3,7 +3,7 @@ package wasm import ( "encoding/json" "fmt" - pluginstypes "github.com/cybercongress/go-cyber/v4/plugins/types" + pluginstypes "github.com/cybercongress/go-cyber/v5/plugins/types" wasmvmtypes "github.com/CosmWasm/wasmvm/types" @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - bindingstypes "github.com/cybercongress/go-cyber/v4/x/tokenfactory/wasm/types" + bindingstypes "github.com/cybercongress/go-cyber/v5/x/tokenfactory/wasm/types" ) // CustomQuerier dispatches custom CosmWasm wasm queries. diff --git a/x/tokenfactory/wasm/validate_msg_test.go b/x/tokenfactory/wasm/validate_msg_test.go index 93762faa..779018fb 100644 --- a/x/tokenfactory/wasm/validate_msg_test.go +++ b/x/tokenfactory/wasm/validate_msg_test.go @@ -2,15 +2,15 @@ package wasm_test import ( "fmt" - bindings "github.com/cybercongress/go-cyber/v4/x/tokenfactory/wasm/types" + bindings "github.com/cybercongress/go-cyber/v5/x/tokenfactory/wasm/types" "testing" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cybercongress/go-cyber/v4/x/tokenfactory/types" - wasmbinding "github.com/cybercongress/go-cyber/v4/x/tokenfactory/wasm" + "github.com/cybercongress/go-cyber/v5/x/tokenfactory/types" + wasmbinding "github.com/cybercongress/go-cyber/v5/x/tokenfactory/wasm" ) func TestCreateDenom(t *testing.T) { diff --git a/x/tokenfactory/wasm/validate_queries_test.go b/x/tokenfactory/wasm/validate_queries_test.go index 13d1e299..2c67008d 100644 --- a/x/tokenfactory/wasm/validate_queries_test.go +++ b/x/tokenfactory/wasm/validate_queries_test.go @@ -3,7 +3,7 @@ package wasm_test import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - wasmbinding "github.com/cybercongress/go-cyber/v4/x/tokenfactory/wasm" + wasmbinding "github.com/cybercongress/go-cyber/v5/x/tokenfactory/wasm" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "testing" From 4af6701aa3fb44ad83bacc12f5bac83d9c560547 Mon Sep 17 00:00:00 2001 From: C H Date: Thu, 17 Oct 2024 18:37:14 +0800 Subject: [PATCH 2/4] Added fork logic and v5 fork --- app/app.go | 2 ++ app/forks.go | 15 +++++++++++++++ app/upgrades/types.go | 15 +++++++++++++++ app/upgrades/v5/constants.go | 17 +++++++++++++++++ app/upgrades/v5/forks.go | 31 +++++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 app/forks.go create mode 100644 app/upgrades/v5/constants.go create mode 100644 app/upgrades/v5/forks.go diff --git a/app/app.go b/app/app.go index 2d447bdd..d87c4780 100644 --- a/app/app.go +++ b/app/app.go @@ -82,6 +82,7 @@ var ( Bech32Prefix = "bostrom" Upgrades = []upgrades.Upgrade{v2.Upgrade, v3.Upgrade, v4.Upgrade} + Forks = []upgrades.Fork{v5.Fork} ) // These constants are derived from the above variables. @@ -339,6 +340,7 @@ func (app *App) Name() string { // BeginBlocker application updates every begin block func (app *App) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock { + BeginBlockForks(ctx, app) return app.ModuleManager.BeginBlock(ctx, req) } diff --git a/app/forks.go b/app/forks.go new file mode 100644 index 00000000..26d770c9 --- /dev/null +++ b/app/forks.go @@ -0,0 +1,15 @@ +package app + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// BeginBlockForks is intended to be ran in a chain upgrade. +func BeginBlockForks(ctx sdk.Context, app *App) { + for _, fork := range Forks { + if ctx.BlockHeight() == fork.UpgradeHeight { + fork.BeginForkLogic(ctx, &app.AppKeepers) + return + } + } +} diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 4c9467a6..a7d6c74c 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -35,3 +35,18 @@ type Upgrade struct { // Store upgrades, should be used for any new modules introduced, new modules deleted, or store names renamed. StoreUpgrades store.StoreUpgrades } + +// Fork defines a struct containing the requisite fields for a non-software upgrade proposal +// Hard Fork at a given height to implement. +// There is one time code that can be added for the start of the Fork, in `BeginForkLogic`. +// Any other change in the code should be height-gated, if the goal is to have old and new binaries +// to be compatible prior to the upgrade height. +type Fork struct { + // Upgrade version name, for the upgrade handler, e.g. `v7` + UpgradeName string + // height the upgrade occurs at + UpgradeHeight int64 + + // Function that runs some custom state transition code at the beginning of a fork. + BeginForkLogic func(ctx sdk.Context, keepers *keepers.AppKeepers) +} diff --git a/app/upgrades/v5/constants.go b/app/upgrades/v5/constants.go new file mode 100644 index 00000000..53695025 --- /dev/null +++ b/app/upgrades/v5/constants.go @@ -0,0 +1,17 @@ +package v5 + +import ( + "github.com/cybercongress/go-cyber/v5/app/upgrades" +) + +const ( + UpgradeName = "v5" + + UpgradeHeight = 15_700_799 +) + +var Fork = upgrades.Fork{ + UpgradeName: UpgradeName, + UpgradeHeight: UpgradeHeight, + BeginForkLogic: RunForkLogic, +} diff --git a/app/upgrades/v5/forks.go b/app/upgrades/v5/forks.go new file mode 100644 index 00000000..7fb2ffa7 --- /dev/null +++ b/app/upgrades/v5/forks.go @@ -0,0 +1,31 @@ +package v5 + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cybercongress/go-cyber/v5/app/keepers" +) + +func RunForkLogic(ctx sdk.Context, keepers *keepers.AppKeepers) { + logger := ctx.Logger().With("upgrade", UpgradeName) + + logger.Info("Applying emergency hard fork for v5.") + + liquidityParams := keepers.LiquidityKeeper.GetParams(ctx) + liquidityParams.CircuitBreakerEnabled = true + err := keepers.LiquidityKeeper.SetParams(ctx, liquidityParams) + if err != nil { + panic(err) + } + logger.Info("set liquidity circuit breaker enabled, disable dex") + + keepers.BankKeeper.SetSendEnabled(ctx, "millivolt", false) + keepers.BankKeeper.SetSendEnabled(ctx, "milliampere", false) + + logger.Info("set bank send disabled for millivolt and amperes") + + //transferParams := keepers.TransferKeeper.GetParams(ctx) + //transferParams.SendEnabled = false + //keepers.TransferKeeper.SetParams(ctx, transferParams) + // + //logger.Info("set ibc send disabled for all tokens") +} From 6db73aa2ea8ddcc410214a3cf8ca0cbbb29c4dee Mon Sep 17 00:00:00 2001 From: C H Date: Sun, 20 Oct 2024 07:43:18 +0400 Subject: [PATCH 3/4] Fixed halving calculation for volts --- x/resources/keeper/keeper.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/x/resources/keeper/keeper.go b/x/resources/keeper/keeper.go index f9ed2e83..f84ab57a 100644 --- a/x/resources/keeper/keeper.go +++ b/x/resources/keeper/keeper.go @@ -335,11 +335,10 @@ func (k Keeper) CalculateInvestmint(ctx sdk.Context, amt sdk.Coin, resource stri case ctypes.VOLT: cycles := sdk.NewDec(int64(length)).QuoInt64(int64(params.BaseInvestmintPeriodVolt)) base := sdk.NewDec(amt.Amount.Int64()).QuoInt64(params.BaseInvestmintAmountVolt.Amount.Int64()) - - // TODO double check when third halving will be applied? - // NOTE out of parametrization custom code is applied here in order to shift the FIRST HALVING 6M BLOCKS LATER but keep base halving parameter same + + // NOTE out of parametrization, custom code is applied here in order to shift the HALVINGS START 6M BLOCKS LATER but keep base halving parameter same if ctx.BlockHeight() > 15000000 { - halving = sdk.NewDecWithPrec(int64(math.Pow(0.5, float64((ctx.BlockHeight()-600000)/int64(params.HalvingPeriodVoltBlocks)))*10000), 4) + halving = sdk.NewDecWithPrec(int64(math.Pow(0.5, float64((ctx.BlockHeight()-6000000)/int64(params.HalvingPeriodVoltBlocks)))*10000), 4) } else { halving = sdk.OneDec() } From fe9a35f8ad83420c8b79bc00af0fe536ce03ca74 Mon Sep 17 00:00:00 2001 From: C H Date: Sun, 20 Oct 2024 11:02:30 +0400 Subject: [PATCH 4/4] Finished hardfork scope --- app/upgrades/v5/constants.go | 2 +- app/upgrades/v5/forks.go | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/app/upgrades/v5/constants.go b/app/upgrades/v5/constants.go index 53695025..67ae1bc3 100644 --- a/app/upgrades/v5/constants.go +++ b/app/upgrades/v5/constants.go @@ -7,7 +7,7 @@ import ( const ( UpgradeName = "v5" - UpgradeHeight = 15_700_799 + UpgradeHeight = 15_700_842 ) var Fork = upgrades.Fork{ diff --git a/app/upgrades/v5/forks.go b/app/upgrades/v5/forks.go index 7fb2ffa7..f93f0df6 100644 --- a/app/upgrades/v5/forks.go +++ b/app/upgrades/v5/forks.go @@ -8,7 +8,7 @@ import ( func RunForkLogic(ctx sdk.Context, keepers *keepers.AppKeepers) { logger := ctx.Logger().With("upgrade", UpgradeName) - logger.Info("Applying emergency hard fork for v5.") + logger.Info("Applying emergency hard fork for v5") liquidityParams := keepers.LiquidityKeeper.GetParams(ctx) liquidityParams.CircuitBreakerEnabled = true @@ -22,10 +22,4 @@ func RunForkLogic(ctx sdk.Context, keepers *keepers.AppKeepers) { keepers.BankKeeper.SetSendEnabled(ctx, "milliampere", false) logger.Info("set bank send disabled for millivolt and amperes") - - //transferParams := keepers.TransferKeeper.GetParams(ctx) - //transferParams.SendEnabled = false - //keepers.TransferKeeper.SetParams(ctx, transferParams) - // - //logger.Info("set ibc send disabled for all tokens") }