From d3c42839ca7ca0f0f5ded9efde5896ecc794cb72 Mon Sep 17 00:00:00 2001 From: dimiandre Date: Mon, 23 Sep 2024 12:21:40 +0200 Subject: [PATCH 1/6] v25 upgrade handler and package name --- app/ante.go | 14 ++--- app/app.go | 52 ++++++++++--------- app/apptesting/test_suite.go | 4 +- app/decorators/change_rate_decorator_test.go | 6 +-- app/encoding.go | 2 +- app/keepers/keepers.go | 38 +++++++------- app/keepers/keys.go | 16 +++--- app/modules.go | 30 +++++------ app/test_helpers.go | 4 +- .../testnet/v18.0.0-alpha.2/constants.go | 2 +- .../testnet/v18.0.0-alpha.2/upgrade_test.go | 4 +- .../testnet/v18.0.0-alpha.3/constants.go | 2 +- .../testnet/v18.0.0-alpha.3/upgrade_test.go | 4 +- .../testnet/v18.0.0-alpha.4/constants.go | 2 +- .../testnet/v18.0.0-alpha.4/upgrade_test.go | 4 +- .../testnet/v19.0.0-alpha.3/constants.go | 6 +-- .../testnet/v19.0.0-alpha.3/upgrade_test.go | 4 +- .../testnet/v21.0.0-alpha.1/constants.go | 4 +- .../testnet/v21.0.0-alpha.1/upgrade_test.go | 4 +- .../testnet/v22.0.0-alpha.1/constants.go | 4 +- .../testnet/v22.0.0-alpha.1/upgrade_test.go | 4 +- .../testnet/v23.0.0-alpha.1/constants.go | 4 +- .../testnet/v23.0.0-alpha.1/upgrade_test.go | 4 +- app/upgrades/types.go | 2 +- app/upgrades/v10/constants.go | 2 +- app/upgrades/v10/upgrades.go | 2 +- app/upgrades/v11/constants.go | 2 +- app/upgrades/v11/upgrades.go | 2 +- app/upgrades/v12/constants.go | 2 +- app/upgrades/v12/upgrades.go | 2 +- app/upgrades/v13/constants.go | 6 +-- app/upgrades/v13/upgrades.go | 9 ++-- app/upgrades/v14/constants.go | 4 +- app/upgrades/v14/upgrades.go | 6 +-- app/upgrades/v15/constants.go | 2 +- app/upgrades/v15/upgrades.go | 4 +- app/upgrades/v16/constants.go | 4 +- app/upgrades/v16/upgrades.go | 14 ++--- app/upgrades/v17/constants.go | 6 +-- app/upgrades/v17/upgrades.go | 8 +-- app/upgrades/v18/constants.go | 6 +-- app/upgrades/v18/upgrade_test.go | 4 +- app/upgrades/v18/upgrades.go | 8 +-- app/upgrades/v19/constants.go | 2 +- app/upgrades/v19/mainnet_account.go | 2 +- app/upgrades/v19/upgrade_test.go | 6 +-- app/upgrades/v19/upgrades.go | 8 +-- app/upgrades/v21/constants.go | 2 +- app/upgrades/v21/upgrade_test.go | 4 +- app/upgrades/v21/upgrades.go | 4 +- app/upgrades/v22/constants.go | 2 +- app/upgrades/v22/upgrade_test.go | 4 +- app/upgrades/v22/upgrades.go | 4 +- app/upgrades/v23/constants.go | 2 +- app/upgrades/v23/upgrade_test.go | 4 +- app/upgrades/v23/upgrades.go | 4 +- app/upgrades/v23/vesting.go | 2 +- app/upgrades/v24/constants.go | 2 +- app/upgrades/v24/upgrade_test.go | 4 +- app/upgrades/v24/upgrades.go | 4 +- app/upgrades/v25/constants.go | 16 ++++++ app/upgrades/v25/upgrade_test.go | 39 ++++++++++++++ app/upgrades/v25/upgrades.go | 35 +++++++++++++ cmd/junod/cmd/balances_from_state_export.go | 4 +- cmd/junod/cmd/root.go | 4 +- cmd/junod/main.go | 4 +- docker/setup_junod.sh | 2 +- go.mod | 2 +- interchaintest/go.mod | 4 +- interchaintest/helpers/tokenfactory.go | 2 +- interchaintest/module_clock_test.go | 2 +- interchaintest/module_globalfee_test.go | 2 +- interchaintest/setup.go | 10 ++-- x/burn/burner.go | 2 +- 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/cw-hooks/client/cli/query.go | 2 +- x/cw-hooks/client/cli/tx.go | 2 +- x/cw-hooks/genesis.go | 4 +- x/cw-hooks/keeper/contracts.go | 2 +- x/cw-hooks/keeper/gov_hooks.go | 2 +- x/cw-hooks/keeper/keeper.go | 2 +- x/cw-hooks/keeper/keeper_test.go | 6 +-- x/cw-hooks/keeper/msg_server.go | 2 +- x/cw-hooks/keeper/msg_server_test.go | 2 +- x/cw-hooks/keeper/params.go | 2 +- x/cw-hooks/keeper/querier.go | 2 +- x/cw-hooks/keeper/querier_test.go | 2 +- x/cw-hooks/keeper/staking_hooks.go | 2 +- x/cw-hooks/module.go | 6 +-- x/drip/client/cli/query.go | 2 +- x/drip/client/cli/tx.go | 2 +- x/drip/genesis.go | 4 +- x/drip/genesis_test.go | 6 +-- x/drip/keeper/grpc_query.go | 2 +- x/drip/keeper/grpc_query_test.go | 2 +- x/drip/keeper/keeper.go | 2 +- x/drip/keeper/keeper_test.go | 6 +-- x/drip/keeper/msg_server.go | 2 +- x/drip/keeper/msg_server_test.go | 2 +- x/drip/keeper/params.go | 2 +- x/drip/module.go | 6 +-- x/feepay/ante/deduct_fee.go | 6 +-- x/feepay/ante/fee_route.go | 6 +-- x/feepay/client/cli/query.go | 2 +- x/feepay/client/cli/tx.go | 2 +- x/feepay/genesis.go | 4 +- x/feepay/genesis_test.go | 6 +-- x/feepay/helpers/fee_pay_tx_validator.go | 2 +- x/feepay/keeper/feepay.go | 4 +- x/feepay/keeper/keeper.go | 4 +- x/feepay/keeper/keeper_test.go | 6 +-- x/feepay/keeper/msg_server.go | 4 +- x/feepay/keeper/msg_server_test.go | 2 +- x/feepay/keeper/params.go | 2 +- x/feepay/keeper/querier.go | 4 +- x/feepay/keeper/querier_test.go | 4 +- x/feepay/module.go | 6 +-- x/feeshare/ante/ante.go | 2 +- x/feeshare/ante/ante_test.go | 8 +-- x/feeshare/ante/expected_keepers.go | 2 +- x/feeshare/client/cli/query.go | 2 +- x/feeshare/client/cli/tx.go | 2 +- x/feeshare/genesis.go | 4 +- x/feeshare/genesis_test.go | 6 +-- x/feeshare/integration_test.go | 4 +- x/feeshare/keeper/feeshare.go | 2 +- x/feeshare/keeper/grpc_query.go | 2 +- x/feeshare/keeper/grpc_query_test.go | 4 +- x/feeshare/keeper/keeper.go | 2 +- x/feeshare/keeper/keeper_test.go | 6 +-- x/feeshare/keeper/migrator.go | 4 +- x/feeshare/keeper/msg_server.go | 2 +- x/feeshare/keeper/msg_server_test.go | 2 +- x/feeshare/keeper/params.go | 2 +- x/feeshare/migrations/v2/migrate.go | 4 +- x/feeshare/migrations/v2/migrate_test.go | 8 +-- x/feeshare/module.go | 8 +-- x/globalfee/alias.go | 2 +- x/globalfee/ante/fee.go | 2 +- x/globalfee/client/cli/query.go | 2 +- x/globalfee/genesis_test.go | 6 +-- x/globalfee/keeper/keeper.go | 2 +- x/globalfee/keeper/migrator.go | 2 +- x/globalfee/keeper/msg_server.go | 2 +- x/globalfee/migrations/v2/migrate.go | 2 +- x/globalfee/migrations/v2/migrator_test.go | 6 +-- x/globalfee/module.go | 6 +-- x/globalfee/querier.go | 4 +- x/globalfee/querier_test.go | 4 +- x/mint/abci.go | 4 +- x/mint/client/cli/query.go | 2 +- x/mint/client/testutil/suite.go | 4 +- x/mint/genesis.go | 4 +- x/mint/keeper/grpc_query.go | 2 +- x/mint/keeper/grpc_query_test.go | 4 +- x/mint/keeper/keeper.go | 2 +- x/mint/keeper/migrator.go | 4 +- x/mint/keeper/msg_server.go | 2 +- x/mint/keeper/querier.go | 2 +- x/mint/keeper/querier_test.go | 4 +- x/mint/migrations/v2/migrate.go | 2 +- x/mint/migrations/v3/migrate.go | 2 +- x/mint/migrations/v3/migrator_test.go | 8 +-- x/mint/module.go | 8 +-- x/mint/module_test.go | 2 +- x/mint/simulation/decoder.go | 2 +- x/mint/simulation/decoder_test.go | 6 +-- x/mint/simulation/genesis.go | 2 +- x/mint/simulation/genesis_test.go | 4 +- x/tokenfactory/bindings/custom_msg_test.go | 6 +-- x/tokenfactory/bindings/custom_query_test.go | 4 +- x/tokenfactory/bindings/helpers_test.go | 2 +- x/tokenfactory/bindings/message_plugin.go | 6 +-- x/tokenfactory/bindings/queries.go | 4 +- x/tokenfactory/bindings/query_plugin.go | 2 +- x/tokenfactory/bindings/validate_msg_test.go | 6 +-- .../bindings/validate_queries_test.go | 2 +- x/tokenfactory/bindings/wasm.go | 2 +- 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 | 6 +-- 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 | 10 ++-- x/tokenfactory/simulation/genesis.go | 4 +- x/tokenfactory/simulation/operations.go | 4 +- x/tokenfactory/types/denoms_test.go | 2 +- x/tokenfactory/types/genesis_test.go | 2 +- x/tokenfactory/types/msgs_test.go | 4 +- 217 files changed, 546 insertions(+), 451 deletions(-) create mode 100644 app/upgrades/v25/constants.go create mode 100644 app/upgrades/v25/upgrade_test.go create mode 100644 app/upgrades/v25/upgrades.go diff --git a/app/ante.go b/app/ante.go index fd44afb98..8303b1e1e 100644 --- a/app/ante.go +++ b/app/ante.go @@ -20,13 +20,13 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - decorators "github.com/CosmosContracts/juno/v24/app/decorators" - feepayante "github.com/CosmosContracts/juno/v24/x/feepay/ante" - feepaykeeper "github.com/CosmosContracts/juno/v24/x/feepay/keeper" - feeshareante "github.com/CosmosContracts/juno/v24/x/feeshare/ante" - feesharekeeper "github.com/CosmosContracts/juno/v24/x/feeshare/keeper" - globalfeeante "github.com/CosmosContracts/juno/v24/x/globalfee/ante" - globalfeekeeper "github.com/CosmosContracts/juno/v24/x/globalfee/keeper" + decorators "github.com/CosmosContracts/juno/v25/app/decorators" + feepayante "github.com/CosmosContracts/juno/v25/x/feepay/ante" + feepaykeeper "github.com/CosmosContracts/juno/v25/x/feepay/keeper" + feeshareante "github.com/CosmosContracts/juno/v25/x/feeshare/ante" + feesharekeeper "github.com/CosmosContracts/juno/v25/x/feeshare/keeper" + globalfeeante "github.com/CosmosContracts/juno/v25/x/globalfee/ante" + globalfeekeeper "github.com/CosmosContracts/juno/v25/x/globalfee/keeper" ) // Lower back to 1 mil after https://github.com/cosmos/relayer/issues/1255 diff --git a/app/app.go b/app/app.go index fa2d97910..40ad493ea 100644 --- a/app/app.go +++ b/app/app.go @@ -64,31 +64,32 @@ import ( upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/openapiconsole" - upgrades "github.com/CosmosContracts/juno/v24/app/upgrades" - testnetV18alpha2 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v18.0.0-alpha.2" - testnetV18alpha3 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v18.0.0-alpha.3" - testnetV18alpha4 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v18.0.0-alpha.4" - testnetV19alpha3 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v19.0.0-alpha.3" - testnetV21alpha1 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v21.0.0-alpha.1" - testnetV22alpha1 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v22.0.0-alpha.1" - testnetV23alpha1 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v23.0.0-alpha.1" - v10 "github.com/CosmosContracts/juno/v24/app/upgrades/v10" - v11 "github.com/CosmosContracts/juno/v24/app/upgrades/v11" - v12 "github.com/CosmosContracts/juno/v24/app/upgrades/v12" - v13 "github.com/CosmosContracts/juno/v24/app/upgrades/v13" - v14 "github.com/CosmosContracts/juno/v24/app/upgrades/v14" - v15 "github.com/CosmosContracts/juno/v24/app/upgrades/v15" - v16 "github.com/CosmosContracts/juno/v24/app/upgrades/v16" - v17 "github.com/CosmosContracts/juno/v24/app/upgrades/v17" - v18 "github.com/CosmosContracts/juno/v24/app/upgrades/v18" - v19 "github.com/CosmosContracts/juno/v24/app/upgrades/v19" - v21 "github.com/CosmosContracts/juno/v24/app/upgrades/v21" - v22 "github.com/CosmosContracts/juno/v24/app/upgrades/v22" - v23 "github.com/CosmosContracts/juno/v24/app/upgrades/v23" - v24 "github.com/CosmosContracts/juno/v24/app/upgrades/v24" - "github.com/CosmosContracts/juno/v24/docs" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/openapiconsole" + upgrades "github.com/CosmosContracts/juno/v25/app/upgrades" + testnetV18alpha2 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v18.0.0-alpha.2" + testnetV18alpha3 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v18.0.0-alpha.3" + testnetV18alpha4 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v18.0.0-alpha.4" + testnetV19alpha3 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v19.0.0-alpha.3" + testnetV21alpha1 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v21.0.0-alpha.1" + testnetV22alpha1 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v22.0.0-alpha.1" + testnetV23alpha1 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v23.0.0-alpha.1" + v10 "github.com/CosmosContracts/juno/v25/app/upgrades/v10" + v11 "github.com/CosmosContracts/juno/v25/app/upgrades/v11" + v12 "github.com/CosmosContracts/juno/v25/app/upgrades/v12" + v13 "github.com/CosmosContracts/juno/v25/app/upgrades/v13" + v14 "github.com/CosmosContracts/juno/v25/app/upgrades/v14" + v15 "github.com/CosmosContracts/juno/v25/app/upgrades/v15" + v16 "github.com/CosmosContracts/juno/v25/app/upgrades/v16" + v17 "github.com/CosmosContracts/juno/v25/app/upgrades/v17" + v18 "github.com/CosmosContracts/juno/v25/app/upgrades/v18" + v19 "github.com/CosmosContracts/juno/v25/app/upgrades/v19" + v21 "github.com/CosmosContracts/juno/v25/app/upgrades/v21" + v22 "github.com/CosmosContracts/juno/v25/app/upgrades/v22" + v23 "github.com/CosmosContracts/juno/v25/app/upgrades/v23" + v24 "github.com/CosmosContracts/juno/v25/app/upgrades/v24" + v25 "github.com/CosmosContracts/juno/v25/app/upgrades/v25" + "github.com/CosmosContracts/juno/v25/docs" ) const ( @@ -133,6 +134,7 @@ var ( v22.Upgrade, v23.Upgrade, v24.Upgrade, + v25.Upgrade, } ) diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go index cb47520fa..ebd0b68e3 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/CosmosContracts/juno/v24/app" - appparams "github.com/CosmosContracts/juno/v24/app/params" + "github.com/CosmosContracts/juno/v25/app" + appparams "github.com/CosmosContracts/juno/v25/app/params" ) type KeeperTestHelper struct { diff --git a/app/decorators/change_rate_decorator_test.go b/app/decorators/change_rate_decorator_test.go index 5c61a0aa8..ec6714753 100644 --- a/app/decorators/change_rate_decorator_test.go +++ b/app/decorators/change_rate_decorator_test.go @@ -19,9 +19,9 @@ import ( stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmosContracts/juno/v24/app" - decorators "github.com/CosmosContracts/juno/v24/app/decorators" - appparams "github.com/CosmosContracts/juno/v24/app/params" + "github.com/CosmosContracts/juno/v25/app" + decorators "github.com/CosmosContracts/juno/v25/app/decorators" + appparams "github.com/CosmosContracts/juno/v25/app/params" ) // Define an empty ante handle diff --git a/app/encoding.go b/app/encoding.go index a5d7269ed..74b5ce433 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -3,7 +3,7 @@ package app import ( "github.com/cosmos/cosmos-sdk/std" - "github.com/CosmosContracts/juno/v24/app/params" + "github.com/CosmosContracts/juno/v25/app/params" ) // MakeEncodingConfig creates an EncodingConfig for testing diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index c5d5365e3..214d53543 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -89,25 +89,25 @@ import ( upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - junoburn "github.com/CosmosContracts/juno/v24/x/burn" - clockkeeper "github.com/CosmosContracts/juno/v24/x/clock/keeper" - clocktypes "github.com/CosmosContracts/juno/v24/x/clock/types" - cwhookskeeper "github.com/CosmosContracts/juno/v24/x/cw-hooks/keeper" - cwhookstypes "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" - dripkeeper "github.com/CosmosContracts/juno/v24/x/drip/keeper" - driptypes "github.com/CosmosContracts/juno/v24/x/drip/types" - feepaykeeper "github.com/CosmosContracts/juno/v24/x/feepay/keeper" - feepaytypes "github.com/CosmosContracts/juno/v24/x/feepay/types" - feesharekeeper "github.com/CosmosContracts/juno/v24/x/feeshare/keeper" - feesharetypes "github.com/CosmosContracts/juno/v24/x/feeshare/types" - "github.com/CosmosContracts/juno/v24/x/globalfee" - globalfeekeeper "github.com/CosmosContracts/juno/v24/x/globalfee/keeper" - globalfeetypes "github.com/CosmosContracts/juno/v24/x/globalfee/types" - mintkeeper "github.com/CosmosContracts/juno/v24/x/mint/keeper" - minttypes "github.com/CosmosContracts/juno/v24/x/mint/types" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/bindings" - tokenfactorykeeper "github.com/CosmosContracts/juno/v24/x/tokenfactory/keeper" - tokenfactorytypes "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + junoburn "github.com/CosmosContracts/juno/v25/x/burn" + clockkeeper "github.com/CosmosContracts/juno/v25/x/clock/keeper" + clocktypes "github.com/CosmosContracts/juno/v25/x/clock/types" + cwhookskeeper "github.com/CosmosContracts/juno/v25/x/cw-hooks/keeper" + cwhookstypes "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" + dripkeeper "github.com/CosmosContracts/juno/v25/x/drip/keeper" + driptypes "github.com/CosmosContracts/juno/v25/x/drip/types" + feepaykeeper "github.com/CosmosContracts/juno/v25/x/feepay/keeper" + feepaytypes "github.com/CosmosContracts/juno/v25/x/feepay/types" + feesharekeeper "github.com/CosmosContracts/juno/v25/x/feeshare/keeper" + feesharetypes "github.com/CosmosContracts/juno/v25/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/x/globalfee" + globalfeekeeper "github.com/CosmosContracts/juno/v25/x/globalfee/keeper" + globalfeetypes "github.com/CosmosContracts/juno/v25/x/globalfee/types" + mintkeeper "github.com/CosmosContracts/juno/v25/x/mint/keeper" + minttypes "github.com/CosmosContracts/juno/v25/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/bindings" + tokenfactorykeeper "github.com/CosmosContracts/juno/v25/x/tokenfactory/keeper" + tokenfactorytypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) var ( diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 6bf2640b0..bbf743c34 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -32,14 +32,14 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - clocktypes "github.com/CosmosContracts/juno/v24/x/clock/types" - cwhookstypes "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" - driptypes "github.com/CosmosContracts/juno/v24/x/drip/types" - feepaytypes "github.com/CosmosContracts/juno/v24/x/feepay/types" - feesharetypes "github.com/CosmosContracts/juno/v24/x/feeshare/types" - globalfeetypes "github.com/CosmosContracts/juno/v24/x/globalfee/types" - minttypes "github.com/CosmosContracts/juno/v24/x/mint/types" - tokenfactorytypes "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + clocktypes "github.com/CosmosContracts/juno/v25/x/clock/types" + cwhookstypes "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" + driptypes "github.com/CosmosContracts/juno/v25/x/drip/types" + feepaytypes "github.com/CosmosContracts/juno/v25/x/feepay/types" + feesharetypes "github.com/CosmosContracts/juno/v25/x/feeshare/types" + globalfeetypes "github.com/CosmosContracts/juno/v25/x/globalfee/types" + minttypes "github.com/CosmosContracts/juno/v25/x/mint/types" + tokenfactorytypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) func (appKeepers *AppKeepers) GenerateKeys() { diff --git a/app/modules.go b/app/modules.go index 6a80732f6..96e798844 100644 --- a/app/modules.go +++ b/app/modules.go @@ -61,21 +61,21 @@ import ( "github.com/cosmos/cosmos-sdk/x/upgrade" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - encparams "github.com/CosmosContracts/juno/v24/app/params" - "github.com/CosmosContracts/juno/v24/x/clock" - clocktypes "github.com/CosmosContracts/juno/v24/x/clock/types" - cwhooks "github.com/CosmosContracts/juno/v24/x/cw-hooks" - "github.com/CosmosContracts/juno/v24/x/drip" - driptypes "github.com/CosmosContracts/juno/v24/x/drip/types" - feepay "github.com/CosmosContracts/juno/v24/x/feepay" - feepaytypes "github.com/CosmosContracts/juno/v24/x/feepay/types" - feeshare "github.com/CosmosContracts/juno/v24/x/feeshare" - feesharetypes "github.com/CosmosContracts/juno/v24/x/feeshare/types" - "github.com/CosmosContracts/juno/v24/x/globalfee" - "github.com/CosmosContracts/juno/v24/x/mint" - minttypes "github.com/CosmosContracts/juno/v24/x/mint/types" - "github.com/CosmosContracts/juno/v24/x/tokenfactory" - tokenfactorytypes "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + encparams "github.com/CosmosContracts/juno/v25/app/params" + "github.com/CosmosContracts/juno/v25/x/clock" + clocktypes "github.com/CosmosContracts/juno/v25/x/clock/types" + cwhooks "github.com/CosmosContracts/juno/v25/x/cw-hooks" + "github.com/CosmosContracts/juno/v25/x/drip" + driptypes "github.com/CosmosContracts/juno/v25/x/drip/types" + feepay "github.com/CosmosContracts/juno/v25/x/feepay" + feepaytypes "github.com/CosmosContracts/juno/v25/x/feepay/types" + feeshare "github.com/CosmosContracts/juno/v25/x/feeshare" + feesharetypes "github.com/CosmosContracts/juno/v25/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/x/globalfee" + "github.com/CosmosContracts/juno/v25/x/mint" + minttypes "github.com/CosmosContracts/juno/v25/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/tokenfactory" + tokenfactorytypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) // ModuleBasics defines the module BasicManager is in charge of setting up basic, diff --git a/app/test_helpers.go b/app/test_helpers.go index 622b95641..eb8e9bb40 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/CosmosContracts/juno/v24/app/helpers" - appparams "github.com/CosmosContracts/juno/v24/app/params" + apphelpers "github.com/CosmosContracts/juno/v25/app/helpers" + appparams "github.com/CosmosContracts/juno/v25/app/params" ) // SimAppChainID hardcoded chainID for simulation diff --git a/app/upgrades/testnet/v18.0.0-alpha.2/constants.go b/app/upgrades/testnet/v18.0.0-alpha.2/constants.go index bcdcbb61c..61665e084 100644 --- a/app/upgrades/testnet/v18.0.0-alpha.2/constants.go +++ b/app/upgrades/testnet/v18.0.0-alpha.2/constants.go @@ -3,7 +3,7 @@ package v18 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/testnet/v18.0.0-alpha.2/upgrade_test.go b/app/upgrades/testnet/v18.0.0-alpha.2/upgrade_test.go index 74b0e2388..de176e60c 100644 --- a/app/upgrades/testnet/v18.0.0-alpha.2/upgrade_test.go +++ b/app/upgrades/testnet/v18.0.0-alpha.2/upgrade_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v24/app/apptesting" - v18alpha2 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v18.0.0-alpha.2" + "github.com/CosmosContracts/juno/v25/app/apptesting" + v18alpha2 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v18.0.0-alpha.2" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/testnet/v18.0.0-alpha.3/constants.go b/app/upgrades/testnet/v18.0.0-alpha.3/constants.go index a622f08bc..d6307c2a8 100644 --- a/app/upgrades/testnet/v18.0.0-alpha.3/constants.go +++ b/app/upgrades/testnet/v18.0.0-alpha.3/constants.go @@ -3,7 +3,7 @@ package v18 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/testnet/v18.0.0-alpha.3/upgrade_test.go b/app/upgrades/testnet/v18.0.0-alpha.3/upgrade_test.go index 8162f7bb5..04b38dcfa 100644 --- a/app/upgrades/testnet/v18.0.0-alpha.3/upgrade_test.go +++ b/app/upgrades/testnet/v18.0.0-alpha.3/upgrade_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v24/app/apptesting" - v18alpha3 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v18.0.0-alpha.3" + "github.com/CosmosContracts/juno/v25/app/apptesting" + v18alpha3 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v18.0.0-alpha.3" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/testnet/v18.0.0-alpha.4/constants.go b/app/upgrades/testnet/v18.0.0-alpha.4/constants.go index e7d71b366..b7a9dd140 100644 --- a/app/upgrades/testnet/v18.0.0-alpha.4/constants.go +++ b/app/upgrades/testnet/v18.0.0-alpha.4/constants.go @@ -3,7 +3,7 @@ package v18 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/testnet/v18.0.0-alpha.4/upgrade_test.go b/app/upgrades/testnet/v18.0.0-alpha.4/upgrade_test.go index f448032e5..8cf89f0ae 100644 --- a/app/upgrades/testnet/v18.0.0-alpha.4/upgrade_test.go +++ b/app/upgrades/testnet/v18.0.0-alpha.4/upgrade_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v24/app/apptesting" - v1800alpha4 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v18.0.0-alpha.4" + "github.com/CosmosContracts/juno/v25/app/apptesting" + v1800alpha4 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v18.0.0-alpha.4" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/testnet/v19.0.0-alpha.3/constants.go b/app/upgrades/testnet/v19.0.0-alpha.3/constants.go index eae2affb7..6e725c1de 100644 --- a/app/upgrades/testnet/v19.0.0-alpha.3/constants.go +++ b/app/upgrades/testnet/v19.0.0-alpha.3/constants.go @@ -8,9 +8,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" - clocktypes "github.com/CosmosContracts/juno/v24/x/clock/types" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" + clocktypes "github.com/CosmosContracts/juno/v25/x/clock/types" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/testnet/v19.0.0-alpha.3/upgrade_test.go b/app/upgrades/testnet/v19.0.0-alpha.3/upgrade_test.go index 31a23d809..296cc7a8b 100644 --- a/app/upgrades/testnet/v19.0.0-alpha.3/upgrade_test.go +++ b/app/upgrades/testnet/v19.0.0-alpha.3/upgrade_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v24/app/apptesting" - v19alpha3 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v19.0.0-alpha.3" + "github.com/CosmosContracts/juno/v25/app/apptesting" + v19alpha3 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v19.0.0-alpha.3" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/testnet/v21.0.0-alpha.1/constants.go b/app/upgrades/testnet/v21.0.0-alpha.1/constants.go index 1993003ab..3e879b4b5 100644 --- a/app/upgrades/testnet/v21.0.0-alpha.1/constants.go +++ b/app/upgrades/testnet/v21.0.0-alpha.1/constants.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/testnet/v21.0.0-alpha.1/upgrade_test.go b/app/upgrades/testnet/v21.0.0-alpha.1/upgrade_test.go index 8d0ebab91..9799d81a0 100644 --- a/app/upgrades/testnet/v21.0.0-alpha.1/upgrade_test.go +++ b/app/upgrades/testnet/v21.0.0-alpha.1/upgrade_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v24/app/apptesting" - v19alpha3 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v19.0.0-alpha.3" + "github.com/CosmosContracts/juno/v25/app/apptesting" + v19alpha3 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v19.0.0-alpha.3" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/testnet/v22.0.0-alpha.1/constants.go b/app/upgrades/testnet/v22.0.0-alpha.1/constants.go index dcb064314..71a6f0d89 100644 --- a/app/upgrades/testnet/v22.0.0-alpha.1/constants.go +++ b/app/upgrades/testnet/v22.0.0-alpha.1/constants.go @@ -8,8 +8,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/testnet/v22.0.0-alpha.1/upgrade_test.go b/app/upgrades/testnet/v22.0.0-alpha.1/upgrade_test.go index 202055db3..9a4295cc7 100644 --- a/app/upgrades/testnet/v22.0.0-alpha.1/upgrade_test.go +++ b/app/upgrades/testnet/v22.0.0-alpha.1/upgrade_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v24/app/apptesting" - v22alpha1 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v22.0.0-alpha.1" + "github.com/CosmosContracts/juno/v25/app/apptesting" + v22alpha1 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v22.0.0-alpha.1" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/testnet/v23.0.0-alpha.1/constants.go b/app/upgrades/testnet/v23.0.0-alpha.1/constants.go index 852920978..721ffc086 100644 --- a/app/upgrades/testnet/v23.0.0-alpha.1/constants.go +++ b/app/upgrades/testnet/v23.0.0-alpha.1/constants.go @@ -10,8 +10,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/testnet/v23.0.0-alpha.1/upgrade_test.go b/app/upgrades/testnet/v23.0.0-alpha.1/upgrade_test.go index 8441413af..eab9a8843 100644 --- a/app/upgrades/testnet/v23.0.0-alpha.1/upgrade_test.go +++ b/app/upgrades/testnet/v23.0.0-alpha.1/upgrade_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v24/app/apptesting" - v23alpha1 "github.com/CosmosContracts/juno/v24/app/upgrades/testnet/v22.0.0-alpha.1" + "github.com/CosmosContracts/juno/v25/app/apptesting" + v23alpha1 "github.com/CosmosContracts/juno/v25/app/upgrades/testnet/v22.0.0-alpha.1" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/types.go b/app/upgrades/types.go index a6142f8f5..0aa12426c 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" + "github.com/CosmosContracts/juno/v25/app/keepers" ) // BaseAppParamManager defines an interrace that BaseApp is expected to fulfil diff --git a/app/upgrades/v10/constants.go b/app/upgrades/v10/constants.go index 42e407833..11294fc69 100644 --- a/app/upgrades/v10/constants.go +++ b/app/upgrades/v10/constants.go @@ -6,7 +6,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the Juno v10 upgrade. diff --git a/app/upgrades/v10/upgrades.go b/app/upgrades/v10/upgrades.go index ef277eddd..6d9844d84 100644 --- a/app/upgrades/v10/upgrades.go +++ b/app/upgrades/v10/upgrades.go @@ -15,7 +15,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" + "github.com/CosmosContracts/juno/v25/app/keepers" ) // CreateV10UpgradeHandler makes an upgrade handler for v10 of Juno diff --git a/app/upgrades/v11/constants.go b/app/upgrades/v11/constants.go index e6578aed7..f2f93d799 100644 --- a/app/upgrades/v11/constants.go +++ b/app/upgrades/v11/constants.go @@ -6,7 +6,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the Juno v11 upgrade. diff --git a/app/upgrades/v11/upgrades.go b/app/upgrades/v11/upgrades.go index 3fe4382a3..884c1cb0a 100644 --- a/app/upgrades/v11/upgrades.go +++ b/app/upgrades/v11/upgrades.go @@ -15,7 +15,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" + "github.com/CosmosContracts/juno/v25/app/keepers" ) // CreateV11UpgradeHandler makes an upgrade handler for v11 of Juno diff --git a/app/upgrades/v12/constants.go b/app/upgrades/v12/constants.go index 87aca7cb0..6eaf2e3e4 100644 --- a/app/upgrades/v12/constants.go +++ b/app/upgrades/v12/constants.go @@ -3,7 +3,7 @@ package v12 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) const UpgradeName = "v12" diff --git a/app/upgrades/v12/upgrades.go b/app/upgrades/v12/upgrades.go index 8a8dc3c7c..cf22669b8 100644 --- a/app/upgrades/v12/upgrades.go +++ b/app/upgrades/v12/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/CosmosContracts/juno/v24/app/keepers" + "github.com/CosmosContracts/juno/v25/app/keepers" ) func CreateV12UpgradeHandler( diff --git a/app/upgrades/v13/constants.go b/app/upgrades/v13/constants.go index ca2f54731..b62d301d6 100644 --- a/app/upgrades/v13/constants.go +++ b/app/upgrades/v13/constants.go @@ -8,9 +8,9 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" - feesharetypes "github.com/CosmosContracts/juno/v24/x/feeshare/types" - tokenfactorytypes "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/app/upgrades" + feesharetypes "github.com/CosmosContracts/juno/v25/x/feeshare/types" + tokenfactorytypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v13/upgrades.go b/app/upgrades/v13/upgrades.go index 9027c56fc..12fe9f780 100644 --- a/app/upgrades/v13/upgrades.go +++ b/app/upgrades/v13/upgrades.go @@ -13,11 +13,12 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" + // types - feesharetypes "github.com/CosmosContracts/juno/v24/x/feeshare/types" - tokenfactorytypes "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + feesharetypes "github.com/CosmosContracts/juno/v25/x/feeshare/types" + tokenfactorytypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) func CreateV13UpgradeHandler( diff --git a/app/upgrades/v14/constants.go b/app/upgrades/v14/constants.go index a9ab19700..208f18623 100644 --- a/app/upgrades/v14/constants.go +++ b/app/upgrades/v14/constants.go @@ -5,8 +5,8 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" - "github.com/CosmosContracts/juno/v24/x/globalfee" + "github.com/CosmosContracts/juno/v25/app/upgrades" + "github.com/CosmosContracts/juno/v25/x/globalfee" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v14/upgrades.go b/app/upgrades/v14/upgrades.go index fa8087f6c..bfdb8a6a9 100644 --- a/app/upgrades/v14/upgrades.go +++ b/app/upgrades/v14/upgrades.go @@ -7,9 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" - globalfeetypes "github.com/CosmosContracts/juno/v24/x/globalfee/types" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" + globalfeetypes "github.com/CosmosContracts/juno/v25/x/globalfee/types" ) func CreateV14UpgradeHandler( diff --git a/app/upgrades/v15/constants.go b/app/upgrades/v15/constants.go index b0b4d34ef..eac911ee4 100644 --- a/app/upgrades/v15/constants.go +++ b/app/upgrades/v15/constants.go @@ -3,7 +3,7 @@ package v15 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v15/upgrades.go b/app/upgrades/v15/upgrades.go index 3c5f4a912..42aa9f61e 100644 --- a/app/upgrades/v15/upgrades.go +++ b/app/upgrades/v15/upgrades.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - tokenfactorytypes "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/app/keepers" + tokenfactorytypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) // We now charge 2 million gas * gas price to create a denom. diff --git a/app/upgrades/v16/constants.go b/app/upgrades/v16/constants.go index 507309b4b..c50f14edb 100644 --- a/app/upgrades/v16/constants.go +++ b/app/upgrades/v16/constants.go @@ -10,8 +10,8 @@ import ( crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" "github.com/cosmos/cosmos-sdk/x/nft" - "github.com/CosmosContracts/juno/v24/app/upgrades" - globalfeettypes "github.com/CosmosContracts/juno/v24/x/globalfee/types" + "github.com/CosmosContracts/juno/v25/app/upgrades" + globalfeettypes "github.com/CosmosContracts/juno/v25/x/globalfee/types" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v16/upgrades.go b/app/upgrades/v16/upgrades.go index 749cc99b8..60beb445a 100644 --- a/app/upgrades/v16/upgrades.go +++ b/app/upgrades/v16/upgrades.go @@ -18,6 +18,7 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + // SDK v47 modules authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" @@ -30,13 +31,14 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" + // Juno modules - feesharetypes "github.com/CosmosContracts/juno/v24/x/feeshare/types" - globalfeetypes "github.com/CosmosContracts/juno/v24/x/globalfee/types" - minttypes "github.com/CosmosContracts/juno/v24/x/mint/types" - tokenfactorytypes "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + feesharetypes "github.com/CosmosContracts/juno/v25/x/feeshare/types" + globalfeetypes "github.com/CosmosContracts/juno/v25/x/globalfee/types" + minttypes "github.com/CosmosContracts/juno/v25/x/mint/types" + tokenfactorytypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) func CreateV16UpgradeHandler( diff --git a/app/upgrades/v17/constants.go b/app/upgrades/v17/constants.go index bebab6fe4..4c38fed43 100644 --- a/app/upgrades/v17/constants.go +++ b/app/upgrades/v17/constants.go @@ -3,9 +3,9 @@ package v17 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" - clocktypes "github.com/CosmosContracts/juno/v24/x/clock/types" - driptypes "github.com/CosmosContracts/juno/v24/x/drip/types" + "github.com/CosmosContracts/juno/v25/app/upgrades" + clocktypes "github.com/CosmosContracts/juno/v25/x/clock/types" + driptypes "github.com/CosmosContracts/juno/v25/x/drip/types" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v17/upgrades.go b/app/upgrades/v17/upgrades.go index 6cd944fb5..3095af98e 100644 --- a/app/upgrades/v17/upgrades.go +++ b/app/upgrades/v17/upgrades.go @@ -14,10 +14,10 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" - clocktypes "github.com/CosmosContracts/juno/v24/x/clock/types" - driptypes "github.com/CosmosContracts/juno/v24/x/drip/types" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" + clocktypes "github.com/CosmosContracts/juno/v25/x/clock/types" + driptypes "github.com/CosmosContracts/juno/v25/x/drip/types" ) // Verify the following with: diff --git a/app/upgrades/v18/constants.go b/app/upgrades/v18/constants.go index 9114673d6..46e93a2d5 100644 --- a/app/upgrades/v18/constants.go +++ b/app/upgrades/v18/constants.go @@ -3,9 +3,9 @@ package v18 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" - cwhooks "github.com/CosmosContracts/juno/v24/x/cw-hooks" - feepaytypes "github.com/CosmosContracts/juno/v24/x/feepay/types" + "github.com/CosmosContracts/juno/v25/app/upgrades" + cwhooks "github.com/CosmosContracts/juno/v25/x/cw-hooks" + feepaytypes "github.com/CosmosContracts/juno/v25/x/feepay/types" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v18/upgrade_test.go b/app/upgrades/v18/upgrade_test.go index bd486db87..fa84b9c50 100644 --- a/app/upgrades/v18/upgrade_test.go +++ b/app/upgrades/v18/upgrade_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v24/app/apptesting" - v18 "github.com/CosmosContracts/juno/v24/app/upgrades/v18" + "github.com/CosmosContracts/juno/v25/app/apptesting" + v18 "github.com/CosmosContracts/juno/v25/app/upgrades/v18" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v18/upgrades.go b/app/upgrades/v18/upgrades.go index 96fbf979c..ec1393b9b 100644 --- a/app/upgrades/v18/upgrades.go +++ b/app/upgrades/v18/upgrades.go @@ -7,10 +7,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" - cwhookstypes "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" - feepaytypes "github.com/CosmosContracts/juno/v24/x/feepay/types" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" + cwhookstypes "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" + feepaytypes "github.com/CosmosContracts/juno/v25/x/feepay/types" ) func CreateV18UpgradeHandler( diff --git a/app/upgrades/v19/constants.go b/app/upgrades/v19/constants.go index 19325659c..46522c4bb 100644 --- a/app/upgrades/v19/constants.go +++ b/app/upgrades/v19/constants.go @@ -5,7 +5,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) const ( diff --git a/app/upgrades/v19/mainnet_account.go b/app/upgrades/v19/mainnet_account.go index 9773f7288..8aadf65c9 100644 --- a/app/upgrades/v19/mainnet_account.go +++ b/app/upgrades/v19/mainnet_account.go @@ -9,7 +9,7 @@ import ( vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" banktestutil "github.com/cosmos/cosmos-sdk/x/bank/testutil" - "github.com/CosmosContracts/juno/v24/app/keepers" + "github.com/CosmosContracts/juno/v25/app/keepers" ) const ( diff --git a/app/upgrades/v19/upgrade_test.go b/app/upgrades/v19/upgrade_test.go index c5776fbf5..110e2ce79 100644 --- a/app/upgrades/v19/upgrade_test.go +++ b/app/upgrades/v19/upgrade_test.go @@ -11,9 +11,9 @@ import ( vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmosContracts/juno/v24/app/apptesting" - decorators "github.com/CosmosContracts/juno/v24/app/decorators" - v19 "github.com/CosmosContracts/juno/v24/app/upgrades/v19" + "github.com/CosmosContracts/juno/v25/app/apptesting" + decorators "github.com/CosmosContracts/juno/v25/app/decorators" + v19 "github.com/CosmosContracts/juno/v25/app/upgrades/v19" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v19/upgrades.go b/app/upgrades/v19/upgrades.go index 8e412b76a..8e85052f2 100644 --- a/app/upgrades/v19/upgrades.go +++ b/app/upgrades/v19/upgrades.go @@ -13,10 +13,10 @@ import ( vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - decorators "github.com/CosmosContracts/juno/v24/app/decorators" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" - clocktypes "github.com/CosmosContracts/juno/v24/x/clock/types" + decorators "github.com/CosmosContracts/juno/v25/app/decorators" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" + clocktypes "github.com/CosmosContracts/juno/v25/x/clock/types" ) func CreateV19UpgradeHandler( diff --git a/app/upgrades/v21/constants.go b/app/upgrades/v21/constants.go index 85029c9a7..6776f7ca5 100644 --- a/app/upgrades/v21/constants.go +++ b/app/upgrades/v21/constants.go @@ -3,7 +3,7 @@ package v21 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v21/upgrade_test.go b/app/upgrades/v21/upgrade_test.go index 9368e1429..5df8759b5 100644 --- a/app/upgrades/v21/upgrade_test.go +++ b/app/upgrades/v21/upgrade_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v24/app/apptesting" - v21 "github.com/CosmosContracts/juno/v24/app/upgrades/v21" + "github.com/CosmosContracts/juno/v25/app/apptesting" + v21 "github.com/CosmosContracts/juno/v25/app/upgrades/v21" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v21/upgrades.go b/app/upgrades/v21/upgrades.go index bb93c9be1..cff5ad865 100644 --- a/app/upgrades/v21/upgrades.go +++ b/app/upgrades/v21/upgrades.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) func CreateV21UpgradeHandler( diff --git a/app/upgrades/v22/constants.go b/app/upgrades/v22/constants.go index e6026d1dd..8d9abc06b 100644 --- a/app/upgrades/v22/constants.go +++ b/app/upgrades/v22/constants.go @@ -3,7 +3,7 @@ package v22 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v22/upgrade_test.go b/app/upgrades/v22/upgrade_test.go index 77cd0a06d..0b70f0592 100644 --- a/app/upgrades/v22/upgrade_test.go +++ b/app/upgrades/v22/upgrade_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v24/app/apptesting" - v21 "github.com/CosmosContracts/juno/v24/app/upgrades/v21" + "github.com/CosmosContracts/juno/v25/app/apptesting" + v21 "github.com/CosmosContracts/juno/v25/app/upgrades/v21" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v22/upgrades.go b/app/upgrades/v22/upgrades.go index 92f908f60..42c3a22fb 100644 --- a/app/upgrades/v22/upgrades.go +++ b/app/upgrades/v22/upgrades.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) func CreateV22UpgradeHandler( diff --git a/app/upgrades/v23/constants.go b/app/upgrades/v23/constants.go index 675262461..b57c4bb44 100644 --- a/app/upgrades/v23/constants.go +++ b/app/upgrades/v23/constants.go @@ -3,7 +3,7 @@ package v23 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v23/upgrade_test.go b/app/upgrades/v23/upgrade_test.go index e2286762c..e378d1238 100644 --- a/app/upgrades/v23/upgrade_test.go +++ b/app/upgrades/v23/upgrade_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v24/app/apptesting" - v23 "github.com/CosmosContracts/juno/v24/app/upgrades/v23" + "github.com/CosmosContracts/juno/v25/app/apptesting" + v23 "github.com/CosmosContracts/juno/v25/app/upgrades/v23" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v23/upgrades.go b/app/upgrades/v23/upgrades.go index b44b2392c..1e78bd53a 100644 --- a/app/upgrades/v23/upgrades.go +++ b/app/upgrades/v23/upgrades.go @@ -11,8 +11,8 @@ import ( paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) type IndividualAccount struct { diff --git a/app/upgrades/v23/vesting.go b/app/upgrades/v23/vesting.go index f2b3d8019..4a012399f 100644 --- a/app/upgrades/v23/vesting.go +++ b/app/upgrades/v23/vesting.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authvestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" - "github.com/CosmosContracts/juno/v24/app/keepers" + "github.com/CosmosContracts/juno/v25/app/keepers" ) // Stops a vesting account and returns all tokens back to the community pool diff --git a/app/upgrades/v24/constants.go b/app/upgrades/v24/constants.go index e53a26a51..9b1fcd567 100644 --- a/app/upgrades/v24/constants.go +++ b/app/upgrades/v24/constants.go @@ -3,7 +3,7 @@ package v24 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v24/upgrade_test.go b/app/upgrades/v24/upgrade_test.go index fe649158b..80c88e9dd 100644 --- a/app/upgrades/v24/upgrade_test.go +++ b/app/upgrades/v24/upgrade_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v24/app/apptesting" - v24 "github.com/CosmosContracts/juno/v24/app/upgrades/v24" + "github.com/CosmosContracts/juno/v25/app/apptesting" + v24 "github.com/CosmosContracts/juno/v25/app/upgrades/v24" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v24/upgrades.go b/app/upgrades/v24/upgrades.go index 7e8817f4b..d56b85327 100644 --- a/app/upgrades/v24/upgrades.go +++ b/app/upgrades/v24/upgrades.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v24/app/keepers" - "github.com/CosmosContracts/juno/v24/app/upgrades" + "github.com/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" ) func CreateV24UpgradeHandler( diff --git a/app/upgrades/v25/constants.go b/app/upgrades/v25/constants.go new file mode 100644 index 000000000..8b6a359ab --- /dev/null +++ b/app/upgrades/v25/constants.go @@ -0,0 +1,16 @@ +package v25 + +import ( + store "github.com/cosmos/cosmos-sdk/store/types" + + "github.com/CosmosContracts/juno/v25/app/upgrades" +) + +// UpgradeName defines the on-chain upgrade name for the upgrade. +const UpgradeName = "v25" + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateV25UpgradeHandler, + StoreUpgrades: store.StoreUpgrades{}, +} diff --git a/app/upgrades/v25/upgrade_test.go b/app/upgrades/v25/upgrade_test.go new file mode 100644 index 000000000..4e513f0ce --- /dev/null +++ b/app/upgrades/v25/upgrade_test.go @@ -0,0 +1,39 @@ +package v25_test + +import ( + "testing" + + "github.com/stretchr/testify/suite" + + "github.com/CosmosContracts/juno/v25/app/apptesting" + v25 "github.com/CosmosContracts/juno/v25/app/upgrades/v24" +) + +type UpgradeTestSuite struct { + apptesting.KeeperTestHelper +} + +func (s *UpgradeTestSuite) SetupTest() { + s.Setup() +} + +func TestKeeperTestSuite(t *testing.T) { + suite.Run(t, new(UpgradeTestSuite)) +} + +// Ensures the test does not error out. +func (s *UpgradeTestSuite) TestUpgrade() { + s.Setup() + preUpgradeChecks(s) + + upgradeHeight := int64(5) + s.ConfirmUpgradeSucceeded(v25.UpgradeName, upgradeHeight) + + postUpgradeChecks(s) +} + +func preUpgradeChecks(_ *UpgradeTestSuite) { +} + +func postUpgradeChecks(_ *UpgradeTestSuite) { +} diff --git a/app/upgrades/v25/upgrades.go b/app/upgrades/v25/upgrades.go new file mode 100644 index 000000000..67bfe9109 --- /dev/null +++ b/app/upgrades/v25/upgrades.go @@ -0,0 +1,35 @@ +package v25 + +import ( + "fmt" + + 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/CosmosContracts/juno/v25/app/keepers" + "github.com/CosmosContracts/juno/v25/app/upgrades" +) + +func CreateV25UpgradeHandler( + mm *module.Manager, + cfg module.Configurator, + _ *keepers.AppKeepers, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + logger := ctx.Logger().With("upgrade", UpgradeName) + + nativeDenom := upgrades.GetChainsDenomToken(ctx.ChainID()) + logger.Info(fmt.Sprintf("With native denom %s", nativeDenom)) + + // Run migrations + logger.Info(fmt.Sprintf("pre migrate version map: %v", vm)) + versionMap, err := mm.RunMigrations(ctx, cfg, vm) + if err != nil { + return nil, err + } + logger.Info(fmt.Sprintf("post migrate version map: %v", versionMap)) + + return versionMap, err + } +} diff --git a/cmd/junod/cmd/balances_from_state_export.go b/cmd/junod/cmd/balances_from_state_export.go index 1d6f4689d..630567c15 100644 --- a/cmd/junod/cmd/balances_from_state_export.go +++ b/cmd/junod/cmd/balances_from_state_export.go @@ -1,7 +1,7 @@ package cmd // modified from osmosis -// https://github.com/CosmosContracts/juno/v24/blob/main/cmd/osmosisd/cmd/balances_from_state_export.go +// https://github.com/CosmosContracts/juno/v25/blob/main/cmd/osmosisd/cmd/balances_from_state_export.go import ( "encoding/csv" @@ -24,7 +24,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - appparams "github.com/CosmosContracts/juno/v24/app/params" + appparams "github.com/CosmosContracts/juno/v25/app/params" ) const ( diff --git a/cmd/junod/cmd/root.go b/cmd/junod/cmd/root.go index 94c6841f3..3c50621ee 100644 --- a/cmd/junod/cmd/root.go +++ b/cmd/junod/cmd/root.go @@ -37,8 +37,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - "github.com/CosmosContracts/juno/v24/app" - "github.com/CosmosContracts/juno/v24/app/params" + "github.com/CosmosContracts/juno/v25/app" + "github.com/CosmosContracts/juno/v25/app/params" ) // NewRootCmd creates a new root command for junod. It is called once in the diff --git a/cmd/junod/main.go b/cmd/junod/main.go index 8345cd27a..a0eb64c2d 100644 --- a/cmd/junod/main.go +++ b/cmd/junod/main.go @@ -7,8 +7,8 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/CosmosContracts/juno/v24/app" - "github.com/CosmosContracts/juno/v24/cmd/junod/cmd" + "github.com/CosmosContracts/juno/v25/app" + "github.com/CosmosContracts/juno/v25/cmd/junod/cmd" ) func main() { diff --git a/docker/setup_junod.sh b/docker/setup_junod.sh index 1b6569883..e2628d497 100755 --- a/docker/setup_junod.sh +++ b/docker/setup_junod.sh @@ -57,7 +57,7 @@ if ! junod keys show validator $KEYRING; then # (optionally) add a few more genesis accounts for addr in "$@"; do echo $addr - junod genesis add-genesis-account "$addr" "1000000000$STAKE,1000000000$FEE" + junod genesis add-genesis-account "$addr" "1000000000$STAKE,1000000000$FEE,5000000000uusd" done # submit a genesis validator tx diff --git a/go.mod b/go.mod index 3322c29e8..51469e245 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/CosmosContracts/juno/v24 +module github.com/CosmosContracts/juno/v25 go 1.22.2 diff --git a/interchaintest/go.mod b/interchaintest/go.mod index d92157607..1e1188b88 100644 --- a/interchaintest/go.mod +++ b/interchaintest/go.mod @@ -4,7 +4,7 @@ go 1.22.2 replace ( // For this nested module, you always want to replace the parent reference with the current worktree. - github.com/CosmosContracts/juno/v24 v24.0.0-00010101000000-000000000000 => ../ + github.com/CosmosContracts/juno/v25 v24.0.0-00010101000000-000000000000 => ../ github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/misko9/go-substrate-rpc-client/v4 => github.com/faddat/go-substrate-rpc-client/v4 v4.0.1-0.20240402155230-48db8c110afe @@ -15,7 +15,7 @@ replace ( require ( cosmossdk.io/math v1.3.0 github.com/CosmWasm/wasmd v0.46.0 - github.com/CosmosContracts/juno/v24 v24.0.0-00010101000000-000000000000 + github.com/CosmosContracts/juno/v25 v24.0.0-00010101000000-000000000000 github.com/cosmos/cosmos-sdk v0.47.12 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-go/v7 v7.6.0 diff --git a/interchaintest/helpers/tokenfactory.go b/interchaintest/helpers/tokenfactory.go index 5c1af4928..efcb2be0a 100644 --- a/interchaintest/helpers/tokenfactory.go +++ b/interchaintest/helpers/tokenfactory.go @@ -15,7 +15,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keyring" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - tokenfactorytypes "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + tokenfactorytypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) func debugOutput(t *testing.T, stdout string) { diff --git a/interchaintest/module_clock_test.go b/interchaintest/module_clock_test.go index 8e5610635..cc24463e1 100644 --- a/interchaintest/module_clock_test.go +++ b/interchaintest/module_clock_test.go @@ -7,7 +7,7 @@ import ( "testing" sdkmath "cosmossdk.io/math" - clocktypes "github.com/CosmosContracts/juno/v24/x/clock/types" + clocktypes "github.com/CosmosContracts/juno/v25/x/clock/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" cosmosproto "github.com/cosmos/gogoproto/proto" "github.com/strangelove-ventures/interchaintest/v7" diff --git a/interchaintest/module_globalfee_test.go b/interchaintest/module_globalfee_test.go index ef0ae24ab..d5eee1e94 100644 --- a/interchaintest/module_globalfee_test.go +++ b/interchaintest/module_globalfee_test.go @@ -8,7 +8,7 @@ import ( sdkmath "cosmossdk.io/math" helpers "github.com/CosmosContracts/juno/tests/interchaintest/helpers" - globalfeetypes "github.com/CosmosContracts/juno/v24/x/globalfee/types" + globalfeetypes "github.com/CosmosContracts/juno/v25/x/globalfee/types" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" cosmosproto "github.com/cosmos/gogoproto/proto" diff --git a/interchaintest/setup.go b/interchaintest/setup.go index eee911da5..a379b2be2 100644 --- a/interchaintest/setup.go +++ b/interchaintest/setup.go @@ -19,11 +19,11 @@ import ( testutil "github.com/cosmos/cosmos-sdk/types/module/testutil" ibclocalhost "github.com/cosmos/ibc-go/v7/modules/light-clients/09-localhost" - clocktypes "github.com/CosmosContracts/juno/v24/x/clock/types" - feepaytypes "github.com/CosmosContracts/juno/v24/x/feepay/types" - feesharetypes "github.com/CosmosContracts/juno/v24/x/feeshare/types" - globalfeetypes "github.com/CosmosContracts/juno/v24/x/globalfee/types" - tokenfactorytypes "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + clocktypes "github.com/CosmosContracts/juno/v25/x/clock/types" + feepaytypes "github.com/CosmosContracts/juno/v25/x/feepay/types" + feesharetypes "github.com/CosmosContracts/juno/v25/x/feeshare/types" + globalfeetypes "github.com/CosmosContracts/juno/v25/x/globalfee/types" + tokenfactorytypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) var ( diff --git a/x/burn/burner.go b/x/burn/burner.go index bbf81368e..cbbd338e1 100644 --- a/x/burn/burner.go +++ b/x/burn/burner.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - mintkeeper "github.com/CosmosContracts/juno/v24/x/mint/keeper" + mintkeeper "github.com/CosmosContracts/juno/v25/x/mint/keeper" ) // used to override Wasmd's NewBurnCoinMessageHandler diff --git a/x/clock/abci.go b/x/clock/abci.go index 93a6472f2..5ab9be714 100644 --- a/x/clock/abci.go +++ b/x/clock/abci.go @@ -8,9 +8,9 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - helpers "github.com/CosmosContracts/juno/v24/app/helpers" - "github.com/CosmosContracts/juno/v24/x/clock/keeper" - "github.com/CosmosContracts/juno/v24/x/clock/types" + helpers "github.com/CosmosContracts/juno/v25/app/helpers" + "github.com/CosmosContracts/juno/v25/x/clock/keeper" + "github.com/CosmosContracts/juno/v25/x/clock/types" ) var endBlockSudoMessage = []byte(types.EndBlockSudoMessage) diff --git a/x/clock/abci_test.go b/x/clock/abci_test.go index 2836cf249..3a5f2821b 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/CosmosContracts/juno/v24/app" - clock "github.com/CosmosContracts/juno/v24/x/clock" - "github.com/CosmosContracts/juno/v24/x/clock/types" + "github.com/CosmosContracts/juno/v25/app" + clock "github.com/CosmosContracts/juno/v25/x/clock" + "github.com/CosmosContracts/juno/v25/x/clock/types" ) type EndBlockerTestSuite struct { diff --git a/x/clock/client/cli/query.go b/x/clock/client/cli/query.go index 4f5aae627..55683c377 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/CosmosContracts/juno/v24/x/clock/types" + "github.com/CosmosContracts/juno/v25/x/clock/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/clock/client/cli/tx.go b/x/clock/client/cli/tx.go index fa392a6fb..d7f1b5cad 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/CosmosContracts/juno/v24/x/clock/types" + "github.com/CosmosContracts/juno/v25/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 ce916c37a..9d656fc15 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/CosmosContracts/juno/v24/x/clock/keeper" - "github.com/CosmosContracts/juno/v24/x/clock/types" + "github.com/CosmosContracts/juno/v25/x/clock/keeper" + "github.com/CosmosContracts/juno/v25/x/clock/types" ) // NewGenesisState - Create a new genesis state diff --git a/x/clock/genesis_test.go b/x/clock/genesis_test.go index 2eefc2d23..fceeefb13 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/CosmosContracts/juno/v24/app" - clock "github.com/CosmosContracts/juno/v24/x/clock" - "github.com/CosmosContracts/juno/v24/x/clock/types" + "github.com/CosmosContracts/juno/v25/app" + clock "github.com/CosmosContracts/juno/v25/x/clock" + "github.com/CosmosContracts/juno/v25/x/clock/types" ) type GenesisTestSuite struct { diff --git a/x/clock/keeper/clock.go b/x/clock/keeper/clock.go index e7dbead79..fe2e96d79 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/CosmosContracts/juno/v24/app/helpers" - "github.com/CosmosContracts/juno/v24/x/clock/types" + globalerrors "github.com/CosmosContracts/juno/v25/app/helpers" + "github.com/CosmosContracts/juno/v25/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 6b3a3e427..0fda109fd 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/CosmosContracts/juno/v24/x/clock/types" + "github.com/CosmosContracts/juno/v25/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 ee3c8e557..5d5fb3961 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/CosmosContracts/juno/v24/app" - "github.com/CosmosContracts/juno/v24/x/clock/keeper" - "github.com/CosmosContracts/juno/v24/x/clock/types" + "github.com/CosmosContracts/juno/v25/app" + "github.com/CosmosContracts/juno/v25/x/clock/keeper" + "github.com/CosmosContracts/juno/v25/x/clock/types" ) type IntegrationTestSuite struct { diff --git a/x/clock/keeper/msg_server.go b/x/clock/keeper/msg_server.go index 30e766f61..4fb051a68 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/CosmosContracts/juno/v24/x/clock/types" + "github.com/CosmosContracts/juno/v25/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 d2cca1755..103d46567 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/CosmosContracts/juno/v24/x/clock/types" + "github.com/CosmosContracts/juno/v25/x/clock/types" ) // Test register clock contract. diff --git a/x/clock/keeper/querier.go b/x/clock/keeper/querier.go index ab630a3c4..7fe1e0a67 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/CosmosContracts/juno/v24/app/helpers" - "github.com/CosmosContracts/juno/v24/x/clock/types" + globalerrors "github.com/CosmosContracts/juno/v25/app/helpers" + "github.com/CosmosContracts/juno/v25/x/clock/types" ) var _ types.QueryServer = &Querier{} diff --git a/x/clock/keeper/querier_test.go b/x/clock/keeper/querier_test.go index e42415eb6..f91d22ef8 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/CosmosContracts/juno/v24/x/clock/types" + "github.com/CosmosContracts/juno/v25/x/clock/types" ) // Query Clock Params diff --git a/x/clock/module.go b/x/clock/module.go index 110a43ada..2db3dc56c 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/CosmosContracts/juno/v24/x/clock/client/cli" - "github.com/CosmosContracts/juno/v24/x/clock/keeper" - "github.com/CosmosContracts/juno/v24/x/clock/types" + "github.com/CosmosContracts/juno/v25/x/clock/client/cli" + "github.com/CosmosContracts/juno/v25/x/clock/keeper" + "github.com/CosmosContracts/juno/v25/x/clock/types" ) const ( diff --git a/x/clock/types/msgs.go b/x/clock/types/msgs.go index ac4992750..b99daa293 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/CosmosContracts/juno/v24/app/helpers" + globalerrors "github.com/CosmosContracts/juno/v25/app/helpers" ) const ( diff --git a/x/clock/types/params_test.go b/x/clock/types/params_test.go index 7ad4c9b8b..ef0b4d355 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/CosmosContracts/juno/v24/x/clock/types" + "github.com/CosmosContracts/juno/v25/x/clock/types" ) func TestParamsValidate(t *testing.T) { diff --git a/x/cw-hooks/client/cli/query.go b/x/cw-hooks/client/cli/query.go index 1252a92b4..46f5edc29 100644 --- a/x/cw-hooks/client/cli/query.go +++ b/x/cw-hooks/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/cw-hooks/client/cli/tx.go b/x/cw-hooks/client/cli/tx.go index 25b4711db..459178251 100644 --- a/x/cw-hooks/client/cli/tx.go +++ b/x/cw-hooks/client/cli/tx.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" ) // NewTxCmd returns a root CLI command handler for modules diff --git a/x/cw-hooks/genesis.go b/x/cw-hooks/genesis.go index 9a0e4c7e4..bf87909e6 100644 --- a/x/cw-hooks/genesis.go +++ b/x/cw-hooks/genesis.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/keeper" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/keeper" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" ) // NewGenesisState - Create a new genesis state diff --git a/x/cw-hooks/keeper/contracts.go b/x/cw-hooks/keeper/contracts.go index 03077680b..1caeb7c11 100644 --- a/x/cw-hooks/keeper/contracts.go +++ b/x/cw-hooks/keeper/contracts.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - helpers "github.com/CosmosContracts/juno/v24/app/helpers" + helpers "github.com/CosmosContracts/juno/v25/app/helpers" ) func (k Keeper) SetContract(ctx sdk.Context, keyPrefix []byte, contractAddr sdk.AccAddress) { diff --git a/x/cw-hooks/keeper/gov_hooks.go b/x/cw-hooks/keeper/gov_hooks.go index 6904f6e15..3cb10bd78 100644 --- a/x/cw-hooks/keeper/gov_hooks.go +++ b/x/cw-hooks/keeper/gov_hooks.go @@ -9,7 +9,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" v1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" ) type GovHooks struct { diff --git a/x/cw-hooks/keeper/keeper.go b/x/cw-hooks/keeper/keeper.go index 8e3d131a6..b88e3a78b 100644 --- a/x/cw-hooks/keeper/keeper.go +++ b/x/cw-hooks/keeper/keeper.go @@ -14,7 +14,7 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" ) type Keeper struct { diff --git a/x/cw-hooks/keeper/keeper_test.go b/x/cw-hooks/keeper/keeper_test.go index e8ee13828..688d2f995 100644 --- a/x/cw-hooks/keeper/keeper_test.go +++ b/x/cw-hooks/keeper/keeper_test.go @@ -19,9 +19,9 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/CosmosContracts/juno/v24/app" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/keeper" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" + "github.com/CosmosContracts/juno/v25/app" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/keeper" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" ) var _ = embed.FS{} diff --git a/x/cw-hooks/keeper/msg_server.go b/x/cw-hooks/keeper/msg_server.go index 739d441bc..8c7dbdbd1 100644 --- a/x/cw-hooks/keeper/msg_server.go +++ b/x/cw-hooks/keeper/msg_server.go @@ -9,7 +9,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" ) var _ types.MsgServer = &msgServer{} diff --git a/x/cw-hooks/keeper/msg_server_test.go b/x/cw-hooks/keeper/msg_server_test.go index 4d93864a5..5a4947ffa 100644 --- a/x/cw-hooks/keeper/msg_server_test.go +++ b/x/cw-hooks/keeper/msg_server_test.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" ) func (s *IntegrationTestSuite) TestRegisterContracts() { diff --git a/x/cw-hooks/keeper/params.go b/x/cw-hooks/keeper/params.go index 5fa5a43e6..4fe81c566 100644 --- a/x/cw-hooks/keeper/params.go +++ b/x/cw-hooks/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" ) // SetParams sets the x/cw-hooks module parameters. diff --git a/x/cw-hooks/keeper/querier.go b/x/cw-hooks/keeper/querier.go index 2c4edcf39..28e031a7d 100644 --- a/x/cw-hooks/keeper/querier.go +++ b/x/cw-hooks/keeper/querier.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" ) var _ types.QueryServer = &Querier{} diff --git a/x/cw-hooks/keeper/querier_test.go b/x/cw-hooks/keeper/querier_test.go index a3f910f4b..fe022fbf9 100644 --- a/x/cw-hooks/keeper/querier_test.go +++ b/x/cw-hooks/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/CosmosContracts/juno/v24/x/cw-hooks/types" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" ) func (s *IntegrationTestSuite) TestContracts() { diff --git a/x/cw-hooks/keeper/staking_hooks.go b/x/cw-hooks/keeper/staking_hooks.go index 14dc753aa..52e1069f4 100644 --- a/x/cw-hooks/keeper/staking_hooks.go +++ b/x/cw-hooks/keeper/staking_hooks.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" ) // skipUntilHeight allows us to skip gentxs. diff --git a/x/cw-hooks/module.go b/x/cw-hooks/module.go index 73c4d76ed..a35cd07d1 100644 --- a/x/cw-hooks/module.go +++ b/x/cw-hooks/module.go @@ -18,9 +18,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/client/cli" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/keeper" - "github.com/CosmosContracts/juno/v24/x/cw-hooks/types" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/client/cli" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/keeper" + "github.com/CosmosContracts/juno/v25/x/cw-hooks/types" ) const ( diff --git a/x/drip/client/cli/query.go b/x/drip/client/cli/query.go index c95f8b53e..541ac89de 100644 --- a/x/drip/client/cli/query.go +++ b/x/drip/client/cli/query.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/CosmosContracts/juno/v24/x/drip/types" + "github.com/CosmosContracts/juno/v25/x/drip/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/drip/client/cli/tx.go b/x/drip/client/cli/tx.go index 28709f18f..78aedf7a7 100644 --- a/x/drip/client/cli/tx.go +++ b/x/drip/client/cli/tx.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/drip/types" + "github.com/CosmosContracts/juno/v25/x/drip/types" ) // NewTxCmd returns a root CLI command handler for certain modules transaction commands. diff --git a/x/drip/genesis.go b/x/drip/genesis.go index 93d17de83..16adf5f90 100644 --- a/x/drip/genesis.go +++ b/x/drip/genesis.go @@ -3,8 +3,8 @@ package drip import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/drip/keeper" - "github.com/CosmosContracts/juno/v24/x/drip/types" + "github.com/CosmosContracts/juno/v25/x/drip/keeper" + "github.com/CosmosContracts/juno/v25/x/drip/types" ) // InitGenesis import module genesis diff --git a/x/drip/genesis_test.go b/x/drip/genesis_test.go index 1038cfc7e..1d9228f91 100644 --- a/x/drip/genesis_test.go +++ b/x/drip/genesis_test.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/app" - drip "github.com/CosmosContracts/juno/v24/x/drip" - "github.com/CosmosContracts/juno/v24/x/drip/types" + "github.com/CosmosContracts/juno/v25/app" + drip "github.com/CosmosContracts/juno/v25/x/drip" + "github.com/CosmosContracts/juno/v25/x/drip/types" ) type GenesisTestSuite struct { diff --git a/x/drip/keeper/grpc_query.go b/x/drip/keeper/grpc_query.go index 622b1cf68..731033971 100644 --- a/x/drip/keeper/grpc_query.go +++ b/x/drip/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/drip/types" + "github.com/CosmosContracts/juno/v25/x/drip/types" ) var _ types.QueryServer = Querier{} diff --git a/x/drip/keeper/grpc_query_test.go b/x/drip/keeper/grpc_query_test.go index c7b4e8ce1..2d88a9e42 100644 --- a/x/drip/keeper/grpc_query_test.go +++ b/x/drip/keeper/grpc_query_test.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/drip/types" + "github.com/CosmosContracts/juno/v25/x/drip/types" ) func (s *IntegrationTestSuite) TestDripQueryParams() { diff --git a/x/drip/keeper/keeper.go b/x/drip/keeper/keeper.go index c1aa0468e..13e784fd4 100644 --- a/x/drip/keeper/keeper.go +++ b/x/drip/keeper/keeper.go @@ -5,7 +5,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - driptypes "github.com/CosmosContracts/juno/v24/x/drip/types" + driptypes "github.com/CosmosContracts/juno/v25/x/drip/types" ) // Keeper of this module maintains distributing tokens to all stakers. diff --git a/x/drip/keeper/keeper_test.go b/x/drip/keeper/keeper_test.go index b7bb14671..7aff858cf 100644 --- a/x/drip/keeper/keeper_test.go +++ b/x/drip/keeper/keeper_test.go @@ -12,9 +12,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/CosmosContracts/juno/v24/app" - "github.com/CosmosContracts/juno/v24/x/drip/keeper" - "github.com/CosmosContracts/juno/v24/x/drip/types" + "github.com/CosmosContracts/juno/v25/app" + "github.com/CosmosContracts/juno/v25/x/drip/keeper" + "github.com/CosmosContracts/juno/v25/x/drip/types" ) type IntegrationTestSuite struct { diff --git a/x/drip/keeper/msg_server.go b/x/drip/keeper/msg_server.go index 5e36d42a8..07d32e777 100644 --- a/x/drip/keeper/msg_server.go +++ b/x/drip/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/CosmosContracts/juno/v24/x/drip/types" + "github.com/CosmosContracts/juno/v25/x/drip/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/drip/keeper/msg_server_test.go b/x/drip/keeper/msg_server_test.go index 94b473e19..63868c9d9 100644 --- a/x/drip/keeper/msg_server_test.go +++ b/x/drip/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/CosmosContracts/juno/v24/x/drip/types" + "github.com/CosmosContracts/juno/v25/x/drip/types" ) func (s *IntegrationTestSuite) TestDripDistributeTokensMsgs() { diff --git a/x/drip/keeper/params.go b/x/drip/keeper/params.go index ea0b376fc..2e0956af6 100644 --- a/x/drip/keeper/params.go +++ b/x/drip/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/drip/types" + "github.com/CosmosContracts/juno/v25/x/drip/types" ) // GetParams returns the current x/drip module parameters. diff --git a/x/drip/module.go b/x/drip/module.go index 13608668a..9d9fb377d 100644 --- a/x/drip/module.go +++ b/x/drip/module.go @@ -19,9 +19,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - "github.com/CosmosContracts/juno/v24/x/drip/client/cli" - "github.com/CosmosContracts/juno/v24/x/drip/keeper" - "github.com/CosmosContracts/juno/v24/x/drip/types" + "github.com/CosmosContracts/juno/v25/x/drip/client/cli" + "github.com/CosmosContracts/juno/v25/x/drip/keeper" + "github.com/CosmosContracts/juno/v25/x/drip/types" ) // type check to ensure the interface is properly implemented diff --git a/x/feepay/ante/deduct_fee.go b/x/feepay/ante/deduct_fee.go index 236539356..990e64f2a 100644 --- a/x/feepay/ante/deduct_fee.go +++ b/x/feepay/ante/deduct_fee.go @@ -15,9 +15,9 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - feepaykeeper "github.com/CosmosContracts/juno/v24/x/feepay/keeper" - feepaytypes "github.com/CosmosContracts/juno/v24/x/feepay/types" - globalfeekeeper "github.com/CosmosContracts/juno/v24/x/globalfee/keeper" + feepaykeeper "github.com/CosmosContracts/juno/v25/x/feepay/keeper" + feepaytypes "github.com/CosmosContracts/juno/v25/x/feepay/types" + globalfeekeeper "github.com/CosmosContracts/juno/v25/x/globalfee/keeper" ) // DeductFeeDecorator deducts fees from the first signer of the tx diff --git a/x/feepay/ante/fee_route.go b/x/feepay/ante/fee_route.go index e3bcb1346..17b97da37 100644 --- a/x/feepay/ante/fee_route.go +++ b/x/feepay/ante/fee_route.go @@ -6,9 +6,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - feepayhelpers "github.com/CosmosContracts/juno/v24/x/feepay/helpers" - feepaykeeper "github.com/CosmosContracts/juno/v24/x/feepay/keeper" - globalfeeante "github.com/CosmosContracts/juno/v24/x/globalfee/ante" + feepayhelpers "github.com/CosmosContracts/juno/v25/x/feepay/helpers" + feepaykeeper "github.com/CosmosContracts/juno/v25/x/feepay/keeper" + globalfeeante "github.com/CosmosContracts/juno/v25/x/globalfee/ante" ) // MsgIsFeePayTx defines an AnteHandler decorator that only checks and saves if a diff --git a/x/feepay/client/cli/query.go b/x/feepay/client/cli/query.go index 492e2a810..042465512 100644 --- a/x/feepay/client/cli/query.go +++ b/x/feepay/client/cli/query.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/CosmosContracts/juno/v24/x/feepay/types" + "github.com/CosmosContracts/juno/v25/x/feepay/types" ) // NewQueryCmd returns the cli query commands for this module diff --git a/x/feepay/client/cli/tx.go b/x/feepay/client/cli/tx.go index 700bd763b..191b4d095 100644 --- a/x/feepay/client/cli/tx.go +++ b/x/feepay/client/cli/tx.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/feepay/types" + "github.com/CosmosContracts/juno/v25/x/feepay/types" ) // NewTxCmd returns a root CLI command handler for certain modules/FeeShare diff --git a/x/feepay/genesis.go b/x/feepay/genesis.go index d660d2c70..e288e430f 100644 --- a/x/feepay/genesis.go +++ b/x/feepay/genesis.go @@ -3,8 +3,8 @@ package feepay import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/feepay/keeper" - "github.com/CosmosContracts/juno/v24/x/feepay/types" + "github.com/CosmosContracts/juno/v25/x/feepay/keeper" + "github.com/CosmosContracts/juno/v25/x/feepay/types" ) // InitGenesis import module genesis diff --git a/x/feepay/genesis_test.go b/x/feepay/genesis_test.go index 40a4096df..5b3641f8b 100644 --- a/x/feepay/genesis_test.go +++ b/x/feepay/genesis_test.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/app" - "github.com/CosmosContracts/juno/v24/x/feepay" - "github.com/CosmosContracts/juno/v24/x/feepay/types" + "github.com/CosmosContracts/juno/v25/app" + "github.com/CosmosContracts/juno/v25/x/feepay" + "github.com/CosmosContracts/juno/v25/x/feepay/types" ) type GenesisTestSuite struct { diff --git a/x/feepay/helpers/fee_pay_tx_validator.go b/x/feepay/helpers/fee_pay_tx_validator.go index e8a9f7100..6fb783a6a 100644 --- a/x/feepay/helpers/fee_pay_tx_validator.go +++ b/x/feepay/helpers/fee_pay_tx_validator.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - feepaykeeper "github.com/CosmosContracts/juno/v24/x/feepay/keeper" + feepaykeeper "github.com/CosmosContracts/juno/v25/x/feepay/keeper" ) // Check if a transaction should be processed as a FeePay transaction. diff --git a/x/feepay/keeper/feepay.go b/x/feepay/keeper/feepay.go index b800039c3..abab43ed8 100644 --- a/x/feepay/keeper/feepay.go +++ b/x/feepay/keeper/feepay.go @@ -9,8 +9,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - globalerrors "github.com/CosmosContracts/juno/v24/app/helpers" - "github.com/CosmosContracts/juno/v24/x/feepay/types" + globalerrors "github.com/CosmosContracts/juno/v25/app/helpers" + "github.com/CosmosContracts/juno/v25/x/feepay/types" ) // Check if a contract is registered as a fee pay contract diff --git a/x/feepay/keeper/keeper.go b/x/feepay/keeper/keeper.go index c18a485d3..44b7bccf7 100644 --- a/x/feepay/keeper/keeper.go +++ b/x/feepay/keeper/keeper.go @@ -12,8 +12,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - feepaytypes "github.com/CosmosContracts/juno/v24/x/feepay/types" - feesharetypes "github.com/CosmosContracts/juno/v24/x/feeshare/types" + feepaytypes "github.com/CosmosContracts/juno/v25/x/feepay/types" + feesharetypes "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) var ( diff --git a/x/feepay/keeper/keeper_test.go b/x/feepay/keeper/keeper_test.go index be2c95e23..1d2a5f9c0 100644 --- a/x/feepay/keeper/keeper_test.go +++ b/x/feepay/keeper/keeper_test.go @@ -19,9 +19,9 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/CosmosContracts/juno/v24/app" - "github.com/CosmosContracts/juno/v24/x/feepay/keeper" - "github.com/CosmosContracts/juno/v24/x/feepay/types" + "github.com/CosmosContracts/juno/v25/app" + "github.com/CosmosContracts/juno/v25/x/feepay/keeper" + "github.com/CosmosContracts/juno/v25/x/feepay/types" ) type IntegrationTestSuite struct { diff --git a/x/feepay/keeper/msg_server.go b/x/feepay/keeper/msg_server.go index 514ba8902..b237d2264 100644 --- a/x/feepay/keeper/msg_server.go +++ b/x/feepay/keeper/msg_server.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - globalerrors "github.com/CosmosContracts/juno/v24/app/helpers" - "github.com/CosmosContracts/juno/v24/x/feepay/types" + globalerrors "github.com/CosmosContracts/juno/v25/app/helpers" + "github.com/CosmosContracts/juno/v25/x/feepay/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/feepay/keeper/msg_server_test.go b/x/feepay/keeper/msg_server_test.go index f79d7b1ec..08763abcd 100644 --- a/x/feepay/keeper/msg_server_test.go +++ b/x/feepay/keeper/msg_server_test.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" // govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/CosmosContracts/juno/v24/x/feepay/types" + "github.com/CosmosContracts/juno/v25/x/feepay/types" ) func (s *IntegrationTestSuite) TestRegisterFeePayContract() { diff --git a/x/feepay/keeper/params.go b/x/feepay/keeper/params.go index 600b11c10..9a32682ca 100644 --- a/x/feepay/keeper/params.go +++ b/x/feepay/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/feepay/types" + "github.com/CosmosContracts/juno/v25/x/feepay/types" ) // Get the parameters for the fee pay module. diff --git a/x/feepay/keeper/querier.go b/x/feepay/keeper/querier.go index f7d709705..a0527ace7 100644 --- a/x/feepay/keeper/querier.go +++ b/x/feepay/keeper/querier.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - globalerrors "github.com/CosmosContracts/juno/v24/app/helpers" - "github.com/CosmosContracts/juno/v24/x/feepay/types" + globalerrors "github.com/CosmosContracts/juno/v25/app/helpers" + "github.com/CosmosContracts/juno/v25/x/feepay/types" ) var _ types.QueryServer = Querier{} diff --git a/x/feepay/keeper/querier_test.go b/x/feepay/keeper/querier_test.go index 2250970e0..5e4367d73 100644 --- a/x/feepay/keeper/querier_test.go +++ b/x/feepay/keeper/querier_test.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/CosmosContracts/juno/v24/testutil/nullify" - "github.com/CosmosContracts/juno/v24/x/feepay/types" + "github.com/CosmosContracts/juno/v25/testutil/nullify" + "github.com/CosmosContracts/juno/v25/x/feepay/types" ) func (s *IntegrationTestSuite) TestQueryContract() { diff --git a/x/feepay/module.go b/x/feepay/module.go index cadb182a5..110234f9b 100644 --- a/x/feepay/module.go +++ b/x/feepay/module.go @@ -19,9 +19,9 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - "github.com/CosmosContracts/juno/v24/x/feepay/client/cli" - "github.com/CosmosContracts/juno/v24/x/feepay/keeper" - "github.com/CosmosContracts/juno/v24/x/feepay/types" + "github.com/CosmosContracts/juno/v25/x/feepay/client/cli" + "github.com/CosmosContracts/juno/v25/x/feepay/keeper" + "github.com/CosmosContracts/juno/v25/x/feepay/types" ) // type check to ensure the interface is properly implemented diff --git a/x/feeshare/ante/ante.go b/x/feeshare/ante/ante.go index 14a4ebf4e..3d3c50fea 100644 --- a/x/feeshare/ante/ante.go +++ b/x/feeshare/ante/ante.go @@ -12,7 +12,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/authz" - feeshare "github.com/CosmosContracts/juno/v24/x/feeshare/types" + feeshare "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) // FeeSharePayoutDecorator Run his after we already deduct the fee from the account with diff --git a/x/feeshare/ante/ante_test.go b/x/feeshare/ante/ante_test.go index 59fbb5f7b..bda9f2f46 100644 --- a/x/feeshare/ante/ante_test.go +++ b/x/feeshare/ante/ante_test.go @@ -17,10 +17,10 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/CosmosContracts/juno/v24/app" - ante "github.com/CosmosContracts/juno/v24/x/feeshare/ante" - feesharekeeper "github.com/CosmosContracts/juno/v24/x/feeshare/keeper" - feesharetypes "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/app" + ante "github.com/CosmosContracts/juno/v25/x/feeshare/ante" + feesharekeeper "github.com/CosmosContracts/juno/v25/x/feeshare/keeper" + feesharetypes "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) // Define an empty ante handle diff --git a/x/feeshare/ante/expected_keepers.go b/x/feeshare/ante/expected_keepers.go index 84d80e439..b5f126bfc 100644 --- a/x/feeshare/ante/expected_keepers.go +++ b/x/feeshare/ante/expected_keepers.go @@ -5,7 +5,7 @@ package ante import ( sdk "github.com/cosmos/cosmos-sdk/types" - revtypes "github.com/CosmosContracts/juno/v24/x/feeshare/types" + revtypes "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) type BankKeeper interface { diff --git a/x/feeshare/client/cli/query.go b/x/feeshare/client/cli/query.go index 5696917f8..92073f47c 100644 --- a/x/feeshare/client/cli/query.go +++ b/x/feeshare/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/feeshare/client/cli/tx.go b/x/feeshare/client/cli/tx.go index 1cef77f04..72a311dc3 100644 --- a/x/feeshare/client/cli/tx.go +++ b/x/feeshare/client/cli/tx.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) // NewTxCmd returns a root CLI command handler for certain modules/FeeShare diff --git a/x/feeshare/genesis.go b/x/feeshare/genesis.go index 05ed865da..16962110f 100644 --- a/x/feeshare/genesis.go +++ b/x/feeshare/genesis.go @@ -3,8 +3,8 @@ package feeshare import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/feeshare/keeper" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/x/feeshare/keeper" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) // InitGenesis import module genesis diff --git a/x/feeshare/genesis_test.go b/x/feeshare/genesis_test.go index 056b4000a..e9ba6dffd 100644 --- a/x/feeshare/genesis_test.go +++ b/x/feeshare/genesis_test.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/app" - "github.com/CosmosContracts/juno/v24/x/feeshare" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/app" + "github.com/CosmosContracts/juno/v25/x/feeshare" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) type GenesisTestSuite struct { diff --git a/x/feeshare/integration_test.go b/x/feeshare/integration_test.go index 2706cf1d2..f0750b4af 100644 --- a/x/feeshare/integration_test.go +++ b/x/feeshare/integration_test.go @@ -19,8 +19,8 @@ import ( simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" - junoapp "github.com/CosmosContracts/juno/v24/app" - "github.com/CosmosContracts/juno/v24/x/mint/types" + junoapp "github.com/CosmosContracts/juno/v25/app" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) // returns context and an app with updated mint keeper diff --git a/x/feeshare/keeper/feeshare.go b/x/feeshare/keeper/feeshare.go index 7f217f70d..4a30a73ae 100644 --- a/x/feeshare/keeper/feeshare.go +++ b/x/feeshare/keeper/feeshare.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) // GetFeeShares returns all registered FeeShares. diff --git a/x/feeshare/keeper/grpc_query.go b/x/feeshare/keeper/grpc_query.go index 360eea548..8494275a3 100644 --- a/x/feeshare/keeper/grpc_query.go +++ b/x/feeshare/keeper/grpc_query.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) var _ types.QueryServer = Querier{} diff --git a/x/feeshare/keeper/grpc_query_test.go b/x/feeshare/keeper/grpc_query_test.go index b001467ab..481df5d6f 100644 --- a/x/feeshare/keeper/grpc_query_test.go +++ b/x/feeshare/keeper/grpc_query_test.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/CosmosContracts/juno/v24/testutil/nullify" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/testutil/nullify" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) func (s *IntegrationTestSuite) TestFeeShares() { diff --git a/x/feeshare/keeper/keeper.go b/x/feeshare/keeper/keeper.go index a9a89c90a..38987133c 100644 --- a/x/feeshare/keeper/keeper.go +++ b/x/feeshare/keeper/keeper.go @@ -11,7 +11,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - revtypes "github.com/CosmosContracts/juno/v24/x/feeshare/types" + revtypes "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) // Keeper of this module maintains collections of feeshares for contracts diff --git a/x/feeshare/keeper/keeper_test.go b/x/feeshare/keeper/keeper_test.go index 8717b57bf..56e251fe1 100644 --- a/x/feeshare/keeper/keeper_test.go +++ b/x/feeshare/keeper/keeper_test.go @@ -14,9 +14,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/CosmosContracts/juno/v24/app" - "github.com/CosmosContracts/juno/v24/x/feeshare/keeper" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/app" + "github.com/CosmosContracts/juno/v25/x/feeshare/keeper" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) // BankKeeper defines the expected interface needed to retrieve account balances. diff --git a/x/feeshare/keeper/migrator.go b/x/feeshare/keeper/migrator.go index c26c490a7..8250a8fca 100644 --- a/x/feeshare/keeper/migrator.go +++ b/x/feeshare/keeper/migrator.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/feeshare/exported" - v2 "github.com/CosmosContracts/juno/v24/x/feeshare/migrations/v2" + "github.com/CosmosContracts/juno/v25/x/feeshare/exported" + v2 "github.com/CosmosContracts/juno/v25/x/feeshare/migrations/v2" ) // Migrator is a struct for handling in-place state migrations. diff --git a/x/feeshare/keeper/msg_server.go b/x/feeshare/keeper/msg_server.go index 82a56b88c..804d5b303 100644 --- a/x/feeshare/keeper/msg_server.go +++ b/x/feeshare/keeper/msg_server.go @@ -11,7 +11,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/feeshare/keeper/msg_server_test.go b/x/feeshare/keeper/msg_server_test.go index e1b18eeba..a87d72ea4 100644 --- a/x/feeshare/keeper/msg_server_test.go +++ b/x/feeshare/keeper/msg_server_test.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) //go:embed testdata/reflect.wasm diff --git a/x/feeshare/keeper/params.go b/x/feeshare/keeper/params.go index 45a013071..66c068e97 100644 --- a/x/feeshare/keeper/params.go +++ b/x/feeshare/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) // GetParams returns the total set of fees parameters. diff --git a/x/feeshare/migrations/v2/migrate.go b/x/feeshare/migrations/v2/migrate.go index 0dd5dea5a..73597a48a 100644 --- a/x/feeshare/migrations/v2/migrate.go +++ b/x/feeshare/migrations/v2/migrate.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/feeshare/exported" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/x/feeshare/exported" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) const ( diff --git a/x/feeshare/migrations/v2/migrate_test.go b/x/feeshare/migrations/v2/migrate_test.go index c5e21edff..0803b6313 100644 --- a/x/feeshare/migrations/v2/migrate_test.go +++ b/x/feeshare/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/CosmosContracts/juno/v24/x/feeshare" - "github.com/CosmosContracts/juno/v24/x/feeshare/exported" - v2 "github.com/CosmosContracts/juno/v24/x/feeshare/migrations/v2" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/x/feeshare" + "github.com/CosmosContracts/juno/v25/x/feeshare/exported" + v2 "github.com/CosmosContracts/juno/v25/x/feeshare/migrations/v2" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) type mockSubspace struct { diff --git a/x/feeshare/module.go b/x/feeshare/module.go index f8149896d..ff59539da 100644 --- a/x/feeshare/module.go +++ b/x/feeshare/module.go @@ -19,10 +19,10 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - "github.com/CosmosContracts/juno/v24/x/feeshare/client/cli" - "github.com/CosmosContracts/juno/v24/x/feeshare/exported" - "github.com/CosmosContracts/juno/v24/x/feeshare/keeper" - "github.com/CosmosContracts/juno/v24/x/feeshare/types" + "github.com/CosmosContracts/juno/v25/x/feeshare/client/cli" + "github.com/CosmosContracts/juno/v25/x/feeshare/exported" + "github.com/CosmosContracts/juno/v25/x/feeshare/keeper" + "github.com/CosmosContracts/juno/v25/x/feeshare/types" ) // type check to ensure the interface is properly implemented diff --git a/x/globalfee/alias.go b/x/globalfee/alias.go index 769177e9b..4a3734aba 100644 --- a/x/globalfee/alias.go +++ b/x/globalfee/alias.go @@ -1,7 +1,7 @@ package globalfee import ( - "github.com/CosmosContracts/juno/v24/x/globalfee/types" + "github.com/CosmosContracts/juno/v25/x/globalfee/types" ) const ( diff --git a/x/globalfee/ante/fee.go b/x/globalfee/ante/fee.go index 8545d0f99..77bb58676 100644 --- a/x/globalfee/ante/fee.go +++ b/x/globalfee/ante/fee.go @@ -11,7 +11,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - globalfeekeeper "github.com/CosmosContracts/juno/v24/x/globalfee/keeper" + globalfeekeeper "github.com/CosmosContracts/juno/v25/x/globalfee/keeper" ) // FeeWithBypassDecorator checks if the transaction's fee is at least as large diff --git a/x/globalfee/client/cli/query.go b/x/globalfee/client/cli/query.go index 338674a90..853c8b475 100644 --- a/x/globalfee/client/cli/query.go +++ b/x/globalfee/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/CosmosContracts/juno/v24/x/globalfee/types" + "github.com/CosmosContracts/juno/v25/x/globalfee/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/globalfee/genesis_test.go b/x/globalfee/genesis_test.go index 8714daaa5..b107e03d2 100644 --- a/x/globalfee/genesis_test.go +++ b/x/globalfee/genesis_test.go @@ -15,9 +15,9 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - appparams "github.com/CosmosContracts/juno/v24/app/params" - globalfeekeeper "github.com/CosmosContracts/juno/v24/x/globalfee/keeper" - "github.com/CosmosContracts/juno/v24/x/globalfee/types" + appparams "github.com/CosmosContracts/juno/v25/app/params" + globalfeekeeper "github.com/CosmosContracts/juno/v25/x/globalfee/keeper" + "github.com/CosmosContracts/juno/v25/x/globalfee/types" ) func TestDefaultGenesis(t *testing.T) { diff --git a/x/globalfee/keeper/keeper.go b/x/globalfee/keeper/keeper.go index 379818c0d..d72a6aedf 100644 --- a/x/globalfee/keeper/keeper.go +++ b/x/globalfee/keeper/keeper.go @@ -5,7 +5,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/globalfee/types" + "github.com/CosmosContracts/juno/v25/x/globalfee/types" ) // Keeper of the globalfee store diff --git a/x/globalfee/keeper/migrator.go b/x/globalfee/keeper/migrator.go index 70d08686e..e0b0d146e 100644 --- a/x/globalfee/keeper/migrator.go +++ b/x/globalfee/keeper/migrator.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v2 "github.com/CosmosContracts/juno/v24/x/globalfee/migrations/v2" + v2 "github.com/CosmosContracts/juno/v25/x/globalfee/migrations/v2" ) // Migrator is a struct for handling in-place state migrations. diff --git a/x/globalfee/keeper/msg_server.go b/x/globalfee/keeper/msg_server.go index 377d35392..e1d691332 100644 --- a/x/globalfee/keeper/msg_server.go +++ b/x/globalfee/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/CosmosContracts/juno/v24/x/globalfee/types" + "github.com/CosmosContracts/juno/v25/x/globalfee/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/globalfee/migrations/v2/migrate.go b/x/globalfee/migrations/v2/migrate.go index 2c2183fe4..66ab26976 100644 --- a/x/globalfee/migrations/v2/migrate.go +++ b/x/globalfee/migrations/v2/migrate.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/globalfee/types" + "github.com/CosmosContracts/juno/v25/x/globalfee/types" ) const ( diff --git a/x/globalfee/migrations/v2/migrator_test.go b/x/globalfee/migrations/v2/migrator_test.go index db24a654e..1043951f9 100644 --- a/x/globalfee/migrations/v2/migrator_test.go +++ b/x/globalfee/migrations/v2/migrator_test.go @@ -9,9 +9,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/CosmosContracts/juno/v24/x/globalfee" - v2 "github.com/CosmosContracts/juno/v24/x/globalfee/migrations/v2" - "github.com/CosmosContracts/juno/v24/x/globalfee/types" + "github.com/CosmosContracts/juno/v25/x/globalfee" + v2 "github.com/CosmosContracts/juno/v25/x/globalfee/migrations/v2" + "github.com/CosmosContracts/juno/v25/x/globalfee/types" ) func TestMigrateMainnet(t *testing.T) { diff --git a/x/globalfee/module.go b/x/globalfee/module.go index f31e2270a..4aa0df530 100644 --- a/x/globalfee/module.go +++ b/x/globalfee/module.go @@ -19,9 +19,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/CosmosContracts/juno/v24/x/globalfee/client/cli" - "github.com/CosmosContracts/juno/v24/x/globalfee/keeper" - "github.com/CosmosContracts/juno/v24/x/globalfee/types" + "github.com/CosmosContracts/juno/v25/x/globalfee/client/cli" + "github.com/CosmosContracts/juno/v25/x/globalfee/keeper" + "github.com/CosmosContracts/juno/v25/x/globalfee/types" ) var ( diff --git a/x/globalfee/querier.go b/x/globalfee/querier.go index 6b1793e43..f8434b9aa 100644 --- a/x/globalfee/querier.go +++ b/x/globalfee/querier.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/globalfee/keeper" - "github.com/CosmosContracts/juno/v24/x/globalfee/types" + "github.com/CosmosContracts/juno/v25/x/globalfee/keeper" + "github.com/CosmosContracts/juno/v25/x/globalfee/types" ) var _ types.QueryServer = &GrpcQuerier{} diff --git a/x/globalfee/querier_test.go b/x/globalfee/querier_test.go index d9dbe704e..8a4ce4e6f 100644 --- a/x/globalfee/querier_test.go +++ b/x/globalfee/querier_test.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - globalfeekeeper "github.com/CosmosContracts/juno/v24/x/globalfee/keeper" - "github.com/CosmosContracts/juno/v24/x/globalfee/types" + globalfeekeeper "github.com/CosmosContracts/juno/v25/x/globalfee/keeper" + "github.com/CosmosContracts/juno/v25/x/globalfee/types" ) func TestQueryMinimumGasPrices(t *testing.T) { diff --git a/x/mint/abci.go b/x/mint/abci.go index 8e9f97980..2c0e2d299 100644 --- a/x/mint/abci.go +++ b/x/mint/abci.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/mint/keeper" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/keeper" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) // BeginBlocker mints new tokens for the previous block. diff --git a/x/mint/client/cli/query.go b/x/mint/client/cli/query.go index 9e7ba2792..e0f5b3577 100644 --- a/x/mint/client/cli/query.go +++ b/x/mint/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) // GetQueryCmd returns the cli query commands for the minting module. diff --git a/x/mint/client/testutil/suite.go b/x/mint/client/testutil/suite.go index 7f88137a0..110170e64 100644 --- a/x/mint/client/testutil/suite.go +++ b/x/mint/client/testutil/suite.go @@ -13,8 +13,8 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/mint/client/cli" - minttypes "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/client/cli" + minttypes "github.com/CosmosContracts/juno/v25/x/mint/types" ) type IntegrationTestSuite struct { diff --git a/x/mint/genesis.go b/x/mint/genesis.go index 39fd1b8e5..969718d12 100644 --- a/x/mint/genesis.go +++ b/x/mint/genesis.go @@ -3,8 +3,8 @@ package mint import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/mint/keeper" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/keeper" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) // InitGenesis new mint genesis diff --git a/x/mint/keeper/grpc_query.go b/x/mint/keeper/grpc_query.go index 5b2681b5c..0a4d8c3cd 100644 --- a/x/mint/keeper/grpc_query.go +++ b/x/mint/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/mint/keeper/grpc_query_test.go b/x/mint/keeper/grpc_query_test.go index a03385fe8..fc9b5d870 100644 --- a/x/mint/keeper/grpc_query_test.go +++ b/x/mint/keeper/grpc_query_test.go @@ -11,8 +11,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/app" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/app" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) type MintTestSuite struct { diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index 5f86bb016..2e5690af8 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -11,7 +11,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) // Keeper of the mint store diff --git a/x/mint/keeper/migrator.go b/x/mint/keeper/migrator.go index 5d01d611c..1ff2fc5f5 100644 --- a/x/mint/keeper/migrator.go +++ b/x/mint/keeper/migrator.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v2 "github.com/CosmosContracts/juno/v24/x/mint/migrations/v2" - v3 "github.com/CosmosContracts/juno/v24/x/mint/migrations/v3" + v2 "github.com/CosmosContracts/juno/v25/x/mint/migrations/v2" + v3 "github.com/CosmosContracts/juno/v25/x/mint/migrations/v3" ) // Migrator is a struct for handling in-place state migrations. diff --git a/x/mint/keeper/msg_server.go b/x/mint/keeper/msg_server.go index 0afac5848..f2c3f8433 100644 --- a/x/mint/keeper/msg_server.go +++ b/x/mint/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/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/mint/keeper/querier.go b/x/mint/keeper/querier.go index 7a2678d51..7324cccbe 100644 --- a/x/mint/keeper/querier.go +++ b/x/mint/keeper/querier.go @@ -6,7 +6,7 @@ package keeper // import ( // abci "github.com/cometbft/cometbft/abci/types" -// "github.com/CosmosContracts/juno/v24/x/mint/types" +// "github.com/CosmosContracts/juno/v25/x/mint/types" // "github.com/cosmos/cosmos-sdk/codec" // sdk "github.com/cosmos/cosmos-sdk/types" // sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/mint/keeper/querier_test.go b/x/mint/keeper/querier_test.go index c80c91d6d..1a07b0ff1 100644 --- a/x/mint/keeper/querier_test.go +++ b/x/mint/keeper/querier_test.go @@ -7,8 +7,8 @@ package keeper_test // "github.com/stretchr/testify/require" -// keep "github.com/CosmosContracts/juno/v24/x/mint/keeper" -// "github.com/CosmosContracts/juno/v24/x/mint/types" +// keep "github.com/CosmosContracts/juno/v25/x/mint/keeper" +// "github.com/CosmosContracts/juno/v25/x/mint/types" // sdk "github.com/cosmos/cosmos-sdk/types" // abci "github.com/cometbft/cometbft/abci/types" diff --git a/x/mint/migrations/v2/migrate.go b/x/mint/migrations/v2/migrate.go index ce2afe49d..61ac3480a 100644 --- a/x/mint/migrations/v2/migrate.go +++ b/x/mint/migrations/v2/migrate.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) const ( diff --git a/x/mint/migrations/v3/migrate.go b/x/mint/migrations/v3/migrate.go index 98558c54e..56cb94dc3 100644 --- a/x/mint/migrations/v3/migrate.go +++ b/x/mint/migrations/v3/migrate.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) const ( diff --git a/x/mint/migrations/v3/migrator_test.go b/x/mint/migrations/v3/migrator_test.go index bb6a05d43..da5bec653 100644 --- a/x/mint/migrations/v3/migrator_test.go +++ b/x/mint/migrations/v3/migrator_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/CosmosContracts/juno/v24/x/mint" - "github.com/CosmosContracts/juno/v24/x/mint/exported" - v3 "github.com/CosmosContracts/juno/v24/x/mint/migrations/v3" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint" + "github.com/CosmosContracts/juno/v25/x/mint/exported" + v3 "github.com/CosmosContracts/juno/v25/x/mint/migrations/v3" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) type mockSubspace struct { diff --git a/x/mint/module.go b/x/mint/module.go index d403417fc..8c119889e 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -17,10 +17,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/CosmosContracts/juno/v24/x/mint/client/cli" - "github.com/CosmosContracts/juno/v24/x/mint/keeper" - "github.com/CosmosContracts/juno/v24/x/mint/simulation" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/client/cli" + "github.com/CosmosContracts/juno/v25/x/mint/keeper" + "github.com/CosmosContracts/juno/v25/x/mint/simulation" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) var ( diff --git a/x/mint/module_test.go b/x/mint/module_test.go index 1fc9d01c2..2dc9b3213 100644 --- a/x/mint/module_test.go +++ b/x/mint/module_test.go @@ -12,7 +12,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/nft/testutil" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) // TestItCreatesModuleAccountOnInitBlock tests that the module account is created on InitBlock diff --git a/x/mint/simulation/decoder.go b/x/mint/simulation/decoder.go index ff0051d25..1673fb455 100644 --- a/x/mint/simulation/decoder.go +++ b/x/mint/simulation/decoder.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/mint/simulation/decoder_test.go b/x/mint/simulation/decoder_test.go index ca717577a..456f43f1b 100644 --- a/x/mint/simulation/decoder_test.go +++ b/x/mint/simulation/decoder_test.go @@ -9,9 +9,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/CosmosContracts/juno/v24/app" - "github.com/CosmosContracts/juno/v24/x/mint/simulation" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/app" + "github.com/CosmosContracts/juno/v25/x/mint/simulation" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) // TestDecodeStore tests the decoding of the store diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go index 61023b4f2..c83beb2dd 100644 --- a/x/mint/simulation/genesis.go +++ b/x/mint/simulation/genesis.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) // Simulation parameter constants diff --git a/x/mint/simulation/genesis_test.go b/x/mint/simulation/genesis_test.go index 4026dcba6..b601377a0 100644 --- a/x/mint/simulation/genesis_test.go +++ b/x/mint/simulation/genesis_test.go @@ -15,8 +15,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/CosmosContracts/juno/v24/x/mint/simulation" - "github.com/CosmosContracts/juno/v24/x/mint/types" + "github.com/CosmosContracts/juno/v25/x/mint/simulation" + "github.com/CosmosContracts/juno/v25/x/mint/types" ) // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState. diff --git a/x/tokenfactory/bindings/custom_msg_test.go b/x/tokenfactory/bindings/custom_msg_test.go index fb416ef61..432ecaf4b 100644 --- a/x/tokenfactory/bindings/custom_msg_test.go +++ b/x/tokenfactory/bindings/custom_msg_test.go @@ -11,9 +11,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/app" - bindings "github.com/CosmosContracts/juno/v24/x/tokenfactory/bindings/types" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/app" + bindings "github.com/CosmosContracts/juno/v25/x/tokenfactory/bindings/types" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) func TestCreateDenomMsg(t *testing.T) { diff --git a/x/tokenfactory/bindings/custom_query_test.go b/x/tokenfactory/bindings/custom_query_test.go index 4a1d1f5cd..dcaffe499 100644 --- a/x/tokenfactory/bindings/custom_query_test.go +++ b/x/tokenfactory/bindings/custom_query_test.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/app" - bindings "github.com/CosmosContracts/juno/v24/x/tokenfactory/bindings/types" + "github.com/CosmosContracts/juno/v25/app" + bindings "github.com/CosmosContracts/juno/v25/x/tokenfactory/bindings/types" ) func TestQueryFullDenom(t *testing.T) { diff --git a/x/tokenfactory/bindings/helpers_test.go b/x/tokenfactory/bindings/helpers_test.go index 84cffa356..881ef3e51 100644 --- a/x/tokenfactory/bindings/helpers_test.go +++ b/x/tokenfactory/bindings/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/CosmosContracts/juno/v24/app" + "github.com/CosmosContracts/juno/v25/app" ) func CreateTestInput(t *testing.T) (*app.App, sdk.Context) { diff --git a/x/tokenfactory/bindings/message_plugin.go b/x/tokenfactory/bindings/message_plugin.go index 1bbac493a..ec3ef97f2 100644 --- a/x/tokenfactory/bindings/message_plugin.go +++ b/x/tokenfactory/bindings/message_plugin.go @@ -12,9 +12,9 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - bindingstypes "github.com/CosmosContracts/juno/v24/x/tokenfactory/bindings/types" - tokenfactorykeeper "github.com/CosmosContracts/juno/v24/x/tokenfactory/keeper" - tokenfactorytypes "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + bindingstypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/bindings/types" + tokenfactorykeeper "github.com/CosmosContracts/juno/v25/x/tokenfactory/keeper" + tokenfactorytypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) // CustomMessageDecorator returns decorator for custom CosmWasm bindings messages diff --git a/x/tokenfactory/bindings/queries.go b/x/tokenfactory/bindings/queries.go index cf86948b7..a0bd0adf4 100644 --- a/x/tokenfactory/bindings/queries.go +++ b/x/tokenfactory/bindings/queries.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - bindingstypes "github.com/CosmosContracts/juno/v24/x/tokenfactory/bindings/types" - tokenfactorykeeper "github.com/CosmosContracts/juno/v24/x/tokenfactory/keeper" + bindingstypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/bindings/types" + tokenfactorykeeper "github.com/CosmosContracts/juno/v25/x/tokenfactory/keeper" ) type QueryPlugin struct { diff --git a/x/tokenfactory/bindings/query_plugin.go b/x/tokenfactory/bindings/query_plugin.go index 98252a2d6..aa4452185 100644 --- a/x/tokenfactory/bindings/query_plugin.go +++ b/x/tokenfactory/bindings/query_plugin.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - bindingstypes "github.com/CosmosContracts/juno/v24/x/tokenfactory/bindings/types" + bindingstypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/bindings/types" ) // CustomQuerier dispatches custom CosmWasm bindings queries. diff --git a/x/tokenfactory/bindings/validate_msg_test.go b/x/tokenfactory/bindings/validate_msg_test.go index 1535b3c44..f4d0c58a5 100644 --- a/x/tokenfactory/bindings/validate_msg_test.go +++ b/x/tokenfactory/bindings/validate_msg_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - wasmbinding "github.com/CosmosContracts/juno/v24/x/tokenfactory/bindings" - bindings "github.com/CosmosContracts/juno/v24/x/tokenfactory/bindings/types" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + wasmbinding "github.com/CosmosContracts/juno/v25/x/tokenfactory/bindings" + bindings "github.com/CosmosContracts/juno/v25/x/tokenfactory/bindings/types" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) func TestCreateDenom(t *testing.T) { diff --git a/x/tokenfactory/bindings/validate_queries_test.go b/x/tokenfactory/bindings/validate_queries_test.go index 5700bc46d..611dab5f9 100644 --- a/x/tokenfactory/bindings/validate_queries_test.go +++ b/x/tokenfactory/bindings/validate_queries_test.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - wasmbinding "github.com/CosmosContracts/juno/v24/x/tokenfactory/bindings" + wasmbinding "github.com/CosmosContracts/juno/v25/x/tokenfactory/bindings" ) func TestFullDenom(t *testing.T) { diff --git a/x/tokenfactory/bindings/wasm.go b/x/tokenfactory/bindings/wasm.go index 8d034ce9e..fab7ac417 100644 --- a/x/tokenfactory/bindings/wasm.go +++ b/x/tokenfactory/bindings/wasm.go @@ -5,7 +5,7 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - tokenfactorykeeper "github.com/CosmosContracts/juno/v24/x/tokenfactory/keeper" + tokenfactorykeeper "github.com/CosmosContracts/juno/v25/x/tokenfactory/keeper" ) func RegisterCustomPlugins( diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go index c262eb757..08ee240d7 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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/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 c1effaf21..4557dd57b 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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/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 ca28423b9..4d684763d 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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/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 d9b7a0216..f0ff477a7 100644 --- a/x/tokenfactory/keeper/admins_test.go +++ b/x/tokenfactory/keeper/admins_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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestAdminMsgs() { diff --git a/x/tokenfactory/keeper/bankactions.go b/x/tokenfactory/keeper/bankactions.go index cdec130ac..0a9511a62 100644 --- a/x/tokenfactory/keeper/bankactions.go +++ b/x/tokenfactory/keeper/bankactions.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/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 e2ae5bc4f..f8dffdae1 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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/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 988d6b128..75d70f2b2 100644 --- a/x/tokenfactory/keeper/createdenom_test.go +++ b/x/tokenfactory/keeper/createdenom_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmosContracts/juno/v24/app/apptesting" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/app/apptesting" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestMsgCreateDenom() { diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go index e5dc08340..22debaef5 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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/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 b4811dc80..18e73bd96 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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestGenesis() { diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go index 0a574bd5a..fae0d5528 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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index d51b8baf1..47da9b52a 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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) type ( diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index d6d9431e4..abdb12120 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmosContracts/juno/v24/app/apptesting" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/keeper" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/app/apptesting" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/keeper" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) type KeeperTestSuite struct { diff --git a/x/tokenfactory/keeper/migrator.go b/x/tokenfactory/keeper/migrator.go index 976fbe89b..fc3f7def1 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/CosmosContracts/juno/v24/x/tokenfactory/exported" - v2 "github.com/CosmosContracts/juno/v24/x/tokenfactory/migrations/v2" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/exported" + v2 "github.com/CosmosContracts/juno/v25/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 5ba102db0..5145eb285 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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/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 bcb3c2f27..d0b9da39a 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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/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 de1d5e1cd..82fea0b59 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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/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 540904af1..9f783c0fd 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/CosmosContracts/juno/v24/x/tokenfactory/exported" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/exported" + "github.com/CosmosContracts/juno/v25/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 e227afd5f..a26a18d57 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/CosmosContracts/juno/v24/x/tokenfactory" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/exported" - v2 "github.com/CosmosContracts/juno/v24/x/tokenfactory/migrations/v2" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/x/tokenfactory" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/exported" + v2 "github.com/CosmosContracts/juno/v25/x/tokenfactory/migrations/v2" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) type mockSubspace struct { diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go index ab182180f..539e2f09b 100644 --- a/x/tokenfactory/module.go +++ b/x/tokenfactory/module.go @@ -26,11 +26,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/client/cli" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/exported" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/keeper" - simulation "github.com/CosmosContracts/juno/v24/x/tokenfactory/simulation" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/client/cli" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/exported" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/keeper" + simulation "github.com/CosmosContracts/juno/v25/x/tokenfactory/simulation" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) var ( diff --git a/x/tokenfactory/simulation/genesis.go b/x/tokenfactory/simulation/genesis.go index b64046163..a77f15ea7 100644 --- a/x/tokenfactory/simulation/genesis.go +++ b/x/tokenfactory/simulation/genesis.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - appparams "github.com/CosmosContracts/juno/v24/app/params" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + appparams "github.com/CosmosContracts/juno/v25/app/params" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) // RandDenomCreationFeeParam returns a random DenomCreationFeeParam diff --git a/x/tokenfactory/simulation/operations.go b/x/tokenfactory/simulation/operations.go index eed06adb4..c9c6c2631 100644 --- a/x/tokenfactory/simulation/operations.go +++ b/x/tokenfactory/simulation/operations.go @@ -10,8 +10,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/simulation" - appparams "github.com/CosmosContracts/juno/v24/app/params" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + appparams "github.com/CosmosContracts/juno/v25/app/params" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) // Simulation operation weights constants diff --git a/x/tokenfactory/types/denoms_test.go b/x/tokenfactory/types/denoms_test.go index aa6396e6e..a1d288284 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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/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 8a2b0f9c8..579d5d19f 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/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/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 b1dc8201c..03211da8d 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/CosmosContracts/juno/v24/x/tokenfactory/testhelpers" - "github.com/CosmosContracts/juno/v24/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/testhelpers" + "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" ) // Test authz serialize and de-serializes for tokenfactory msg. From 9221295804b1196218807da230211ada1d11a9bf Mon Sep 17 00:00:00 2001 From: dimiandre Date: Mon, 23 Sep 2024 13:13:43 +0200 Subject: [PATCH 2/6] update wasmvm --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 51469e245..784446676 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( cosmossdk.io/math v1.3.0 cosmossdk.io/tools/rosetta v0.2.1 github.com/CosmWasm/wasmd v0.46.0 - github.com/CosmWasm/wasmvm v1.5.4 + github.com/CosmWasm/wasmvm v1.5.5 github.com/cometbft/cometbft v0.37.8 github.com/cometbft/cometbft-db v0.12.0 github.com/cosmos/cosmos-sdk v0.47.12 diff --git a/go.sum b/go.sum index c95d3c92b..e51a25560 100644 --- a/go.sum +++ b/go.sum @@ -217,8 +217,8 @@ github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRr github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/CosmWasm/wasmd v0.46.0 h1:78kmiobbVE8JWBcM+ssxiFV2cS+4l9lmZQqPAQ0mA04= github.com/CosmWasm/wasmd v0.46.0/go.mod h1:BZFz+CFGdLNGomshb3IeccFyD4R+XbnS/mXpytOUyTA= -github.com/CosmWasm/wasmvm v1.5.4 h1:Opqy65ubJ8bMsT08dn85VjRdsLJVPIAgIXif92qOMGc= -github.com/CosmWasm/wasmvm v1.5.4/go.mod h1:Q0bSEtlktzh7W2hhEaifrFp1Erx11ckQZmjq8FLCyys= +github.com/CosmWasm/wasmvm v1.5.5 h1:XlZI3xO5iUhiBqMiyzsrWEfUtk5gcBMNYIdHnsTB+NI= +github.com/CosmWasm/wasmvm v1.5.5/go.mod h1:Q0bSEtlktzh7W2hhEaifrFp1Erx11ckQZmjq8FLCyys= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= From ff5553decc1340e28eca5fcc7c41273bfec4e3a8 Mon Sep 17 00:00:00 2001 From: dimiandre Date: Mon, 23 Sep 2024 13:15:01 +0200 Subject: [PATCH 3/6] update upgrade test --- interchaintest/chain_upgrade_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interchaintest/chain_upgrade_test.go b/interchaintest/chain_upgrade_test.go index ac674bcb0..b03791328 100644 --- a/interchaintest/chain_upgrade_test.go +++ b/interchaintest/chain_upgrade_test.go @@ -24,7 +24,7 @@ import ( const ( chainName = "juno" - upgradeName = "v23" + upgradeName = "v25" haltHeightDelta = int64(9) // will propose upgrade this many blocks in the future blocksAfterUpgrade = int64(7) @@ -34,7 +34,7 @@ var ( // baseChain is the current version of the chain that will be upgraded from baseChain = ibc.DockerImage{ Repository: JunoMainRepo, - Version: "v22.0.1", + Version: "v24.0.0", UidGid: "1025:1025", } ) From eeebfd67b921f031cf1e64ff5d8ec0e6855a603a Mon Sep 17 00:00:00 2001 From: dimiandre Date: Mon, 23 Sep 2024 13:50:04 +0200 Subject: [PATCH 4/6] ict juno version --- interchaintest/go.mod | 6 +++--- interchaintest/go.sum | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interchaintest/go.mod b/interchaintest/go.mod index 1e1188b88..e98406601 100644 --- a/interchaintest/go.mod +++ b/interchaintest/go.mod @@ -4,7 +4,7 @@ go 1.22.2 replace ( // For this nested module, you always want to replace the parent reference with the current worktree. - github.com/CosmosContracts/juno/v25 v24.0.0-00010101000000-000000000000 => ../ + github.com/CosmosContracts/juno/v25 v25.0.0-00010101000000-000000000000 => ../ github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/misko9/go-substrate-rpc-client/v4 => github.com/faddat/go-substrate-rpc-client/v4 v4.0.1-0.20240402155230-48db8c110afe @@ -15,7 +15,7 @@ replace ( require ( cosmossdk.io/math v1.3.0 github.com/CosmWasm/wasmd v0.46.0 - github.com/CosmosContracts/juno/v25 v24.0.0-00010101000000-000000000000 + github.com/CosmosContracts/juno/v25 v25.0.0-00010101000000-000000000000 github.com/cosmos/cosmos-sdk v0.47.12 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-go/v7 v7.6.0 @@ -65,7 +65,7 @@ require ( github.com/99designs/keyring v1.2.2 // indirect github.com/BurntSushi/toml v1.3.2 // indirect github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect - github.com/CosmWasm/wasmvm v1.5.4 // indirect + github.com/CosmWasm/wasmvm v1.5.5 // indirect github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e // indirect github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec // indirect github.com/Microsoft/go-winio v0.6.1 // indirect diff --git a/interchaintest/go.sum b/interchaintest/go.sum index 5efad259a..68eb9b317 100644 --- a/interchaintest/go.sum +++ b/interchaintest/go.sum @@ -211,8 +211,8 @@ github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRr github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/CosmWasm/wasmd v0.46.0 h1:78kmiobbVE8JWBcM+ssxiFV2cS+4l9lmZQqPAQ0mA04= github.com/CosmWasm/wasmd v0.46.0/go.mod h1:BZFz+CFGdLNGomshb3IeccFyD4R+XbnS/mXpytOUyTA= -github.com/CosmWasm/wasmvm v1.5.4 h1:Opqy65ubJ8bMsT08dn85VjRdsLJVPIAgIXif92qOMGc= -github.com/CosmWasm/wasmvm v1.5.4/go.mod h1:Q0bSEtlktzh7W2hhEaifrFp1Erx11ckQZmjq8FLCyys= +github.com/CosmWasm/wasmvm v1.5.5 h1:XlZI3xO5iUhiBqMiyzsrWEfUtk5gcBMNYIdHnsTB+NI= +github.com/CosmWasm/wasmvm v1.5.5/go.mod h1:Q0bSEtlktzh7W2hhEaifrFp1Erx11ckQZmjq8FLCyys= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= From 2ba936ef1c2031ff20f80322da31c41e427677bb Mon Sep 17 00:00:00 2001 From: dimiandre Date: Mon, 23 Sep 2024 15:41:15 +0200 Subject: [PATCH 5/6] lint --- .golangci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index 5635d1c9a..a3e83f331 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -22,7 +22,6 @@ linters: - nakedret - staticcheck - stylecheck - - typecheck - unconvert - unused - unparam From 64a22b05bde6e7a5189f811374bd082b5bd37c56 Mon Sep 17 00:00:00 2001 From: dimiandre Date: Mon, 23 Sep 2024 16:01:34 +0200 Subject: [PATCH 6/6] lint --- app/upgrades/v13/upgrades.go | 1 - app/upgrades/v16/upgrades.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/app/upgrades/v13/upgrades.go b/app/upgrades/v13/upgrades.go index 12fe9f780..ed0dbd99c 100644 --- a/app/upgrades/v13/upgrades.go +++ b/app/upgrades/v13/upgrades.go @@ -15,7 +15,6 @@ import ( "github.com/CosmosContracts/juno/v25/app/keepers" "github.com/CosmosContracts/juno/v25/app/upgrades" - // types feesharetypes "github.com/CosmosContracts/juno/v25/x/feeshare/types" tokenfactorytypes "github.com/CosmosContracts/juno/v25/x/tokenfactory/types" diff --git a/app/upgrades/v16/upgrades.go b/app/upgrades/v16/upgrades.go index 60beb445a..3347c004c 100644 --- a/app/upgrades/v16/upgrades.go +++ b/app/upgrades/v16/upgrades.go @@ -18,7 +18,6 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - // SDK v47 modules authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" @@ -33,7 +32,6 @@ import ( "github.com/CosmosContracts/juno/v25/app/keepers" "github.com/CosmosContracts/juno/v25/app/upgrades" - // Juno modules feesharetypes "github.com/CosmosContracts/juno/v25/x/feeshare/types" globalfeetypes "github.com/CosmosContracts/juno/v25/x/globalfee/types"