From cd441bfe899a250172e90c860e2c4c6c81fd3850 Mon Sep 17 00:00:00 2001 From: AdriaCarrera Date: Wed, 19 Mar 2025 10:57:32 +0100 Subject: [PATCH 1/3] chore: bump to v7 --- app/ante.go | 2 +- app/app.go | 10 +++++----- app/simulation_test.go | 2 +- app/upgrades.go | 6 +++--- cmd/exrpd/cmd/root.go | 2 +- cmd/exrpd/main.go | 4 ++-- go.mod | 2 +- proto/poa/genesis.proto | 2 +- proto/poa/params.proto | 2 +- proto/poa/query.proto | 2 +- proto/poa/tx.proto | 2 +- tests/integration/network.go | 8 ++++---- tests/integration/poa_test.go | 4 ++-- tests/integration/slashing_test.go | 2 +- tests/integration/suite.go | 10 +++++----- tests/upgrade/network.go | 8 ++++---- tests/upgrade/suite.go | 2 +- tests/upgrade/suite_test.go | 2 +- testutil/integration/common/factory/base.go | 4 ++-- testutil/integration/common/factory/factory.go | 4 ++-- testutil/integration/common/factory/fund.go | 2 +- testutil/integration/common/grpc/grpc.go | 2 +- testutil/integration/exrp/common/clients.go | 4 ++-- testutil/integration/exrp/common/config.go | 2 +- testutil/integration/exrp/common/setup.go | 2 +- testutil/integration/exrp/integration/config.go | 2 +- testutil/integration/exrp/integration/keepers.go | 2 +- testutil/integration/exrp/integration/network.go | 4 ++-- testutil/integration/exrp/integration/setup.go | 4 ++-- testutil/integration/exrp/integration/unit_network.go | 4 ++-- testutil/integration/exrp/upgrade/config.go | 2 +- testutil/integration/exrp/upgrade/keepers.go | 2 +- testutil/integration/exrp/upgrade/network.go | 4 ++-- testutil/integration/exrp/upgrade/unit_network.go | 4 ++-- testutil/integration/exrp/utils/gov.go | 6 +++--- x/poa/ante/poa_test.go | 4 ++-- x/poa/keeper/common_test.go | 4 ++-- x/poa/keeper/genesis.go | 2 +- x/poa/keeper/keeper.go | 2 +- x/poa/keeper/keeper_test.go | 4 ++-- x/poa/keeper/msg_server.go | 2 +- x/poa/keeper/msg_server_add_validator.go | 2 +- x/poa/keeper/msg_server_add_validator_test.go | 4 ++-- x/poa/keeper/msg_server_remove_validator.go | 2 +- x/poa/keeper/msg_server_remove_validator_test.go | 2 +- x/poa/keeper/params.go | 2 +- x/poa/keeper/query.go | 2 +- x/poa/keeper/query_params.go | 2 +- x/poa/module.go | 4 ++-- x/poa/module_simulation.go | 6 +++--- x/poa/simulation/proposals.go | 2 +- x/poa/simulation/proposals_test.go | 2 +- 52 files changed, 87 insertions(+), 87 deletions(-) diff --git a/app/ante.go b/app/ante.go index 5a257c8..2d178f5 100644 --- a/app/ante.go +++ b/app/ante.go @@ -8,7 +8,7 @@ import ( "github.com/evmos/evmos/v20/app/ante" ethante "github.com/evmos/evmos/v20/app/ante/evm" etherminttypes "github.com/evmos/evmos/v20/types" - poaante "github.com/xrplevm/node/v6/x/poa/ante" + poaante "github.com/xrplevm/node/v7/x/poa/ante" ) type AnteHandlerOptions ante.HandlerOptions diff --git a/app/app.go b/app/app.go index 6917742..076992d 100644 --- a/app/app.go +++ b/app/app.go @@ -42,7 +42,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/consensus" consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" - "github.com/xrplevm/node/v6/x/poa" + "github.com/xrplevm/node/v7/x/poa" "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" @@ -120,11 +120,11 @@ import ( ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" ibctestingtypes "github.com/cosmos/ibc-go/v8/testing/types" - "github.com/xrplevm/node/v6/docs" - poakeeper "github.com/xrplevm/node/v6/x/poa/keeper" - poatypes "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/docs" + poakeeper "github.com/xrplevm/node/v7/x/poa/keeper" + poatypes "github.com/xrplevm/node/v7/x/poa/types" - // "github.com/xrplevm/node/v6/app/ante" + // "github.com/xrplevm/node/v7/app/ante" "github.com/evmos/evmos/v20/app/ante" srvflags "github.com/evmos/evmos/v20/server/flags" diff --git a/app/simulation_test.go b/app/simulation_test.go index d6f4bcd..f66f79b 100644 --- a/app/simulation_test.go +++ b/app/simulation_test.go @@ -22,7 +22,7 @@ import ( simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli" "github.com/evmos/evmos/v20/app/ante" "github.com/stretchr/testify/require" - "github.com/xrplevm/node/v6/app" + "github.com/xrplevm/node/v7/app" ) func init() { diff --git a/app/upgrades.go b/app/upgrades.go index efeb33c..358797f 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -9,9 +9,9 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" ratelimittypes "github.com/cosmos/ibc-apps/modules/rate-limiting/v8/types" icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types" - v4 "github.com/xrplevm/node/v6/app/upgrades/v4" - v5 "github.com/xrplevm/node/v6/app/upgrades/v5" - v6 "github.com/xrplevm/node/v6/app/upgrades/v6" + v4 "github.com/xrplevm/node/v7/app/upgrades/v4" + v5 "github.com/xrplevm/node/v7/app/upgrades/v5" + v6 "github.com/xrplevm/node/v7/app/upgrades/v6" ) func (app *App) setupUpgradeHandlers() { diff --git a/cmd/exrpd/cmd/root.go b/cmd/exrpd/cmd/root.go index 1276491..6b13f7c 100644 --- a/cmd/exrpd/cmd/root.go +++ b/cmd/exrpd/cmd/root.go @@ -47,7 +47,7 @@ import ( ethermintserver "github.com/evmos/evmos/v20/server" ethermintservercfg "github.com/evmos/evmos/v20/server/config" ethermintserverflags "github.com/evmos/evmos/v20/server/flags" - "github.com/xrplevm/node/v6/app" + "github.com/xrplevm/node/v7/app" ) type emptyAppOptions struct{} diff --git a/cmd/exrpd/main.go b/cmd/exrpd/main.go index 1711c74..705abaf 100644 --- a/cmd/exrpd/main.go +++ b/cmd/exrpd/main.go @@ -11,8 +11,8 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/xrplevm/node/v6/app" - "github.com/xrplevm/node/v6/cmd/exrpd/cmd" + "github.com/xrplevm/node/v7/app" + "github.com/xrplevm/node/v7/cmd/exrpd/cmd" ) func main() { diff --git a/go.mod b/go.mod index 10ffe84..2439c8f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/xrplevm/node/v6 +module github.com/xrplevm/node/v7 go 1.22.11 diff --git a/proto/poa/genesis.proto b/proto/poa/genesis.proto index 6ddc06f..027ff3d 100644 --- a/proto/poa/genesis.proto +++ b/proto/poa/genesis.proto @@ -4,7 +4,7 @@ package poa; import "gogoproto/gogo.proto"; import "poa/params.proto"; -option go_package = "github.com/xrplevm/node/v6/x/poa/types"; +option go_package = "github.com/xrplevm/node/v7/x/poa/types"; // GenesisState defines the poa module's genesis state. message GenesisState { Params params = 1 [ (gogoproto.nullable) = false ]; } diff --git a/proto/poa/params.proto b/proto/poa/params.proto index 253ac94..2539b01 100644 --- a/proto/poa/params.proto +++ b/proto/poa/params.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package poa; -option go_package = "github.com/xrplevm/node/v6/x/poa/types"; +option go_package = "github.com/xrplevm/node/v7/x/poa/types"; // Params defines the parameters for the module. message Params {} diff --git a/proto/poa/query.proto b/proto/poa/query.proto index 5ce8123..5cb379a 100644 --- a/proto/poa/query.proto +++ b/proto/poa/query.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "poa/params.proto"; -option go_package = "github.com/xrplevm/node/v6/x/poa/types"; +option go_package = "github.com/xrplevm/node/v7/x/poa/types"; // Query defines the gRPC querier service. service Query { diff --git a/proto/poa/tx.proto b/proto/poa/tx.proto index f1b2835..8dcc7fb 100644 --- a/proto/poa/tx.proto +++ b/proto/poa/tx.proto @@ -8,7 +8,7 @@ import "cosmos/staking/v1beta1/staking.proto"; import "google/protobuf/any.proto"; import "amino/amino.proto"; -option go_package = "github.com/xrplevm/node/v6/x/poa/types"; +option go_package = "github.com/xrplevm/node/v7/x/poa/types"; // Msg defines the Msg service. service Msg { diff --git a/tests/integration/network.go b/tests/integration/network.go index c71a799..d515f8b 100644 --- a/tests/integration/network.go +++ b/tests/integration/network.go @@ -11,10 +11,10 @@ import ( erc20types "github.com/evmos/evmos/v20/x/erc20/types" evmtypes "github.com/evmos/evmos/v20/x/evm/types" feemarkettypes "github.com/evmos/evmos/v20/x/feemarket/types" - commonnetwork "github.com/xrplevm/node/v6/testutil/integration/common/network" - exrpcommon "github.com/xrplevm/node/v6/testutil/integration/exrp/common" - exrpintegration "github.com/xrplevm/node/v6/testutil/integration/exrp/integration" - poatypes "github.com/xrplevm/node/v6/x/poa/types" + commonnetwork "github.com/xrplevm/node/v7/testutil/integration/common/network" + exrpcommon "github.com/xrplevm/node/v7/testutil/integration/exrp/common" + exrpintegration "github.com/xrplevm/node/v7/testutil/integration/exrp/integration" + poatypes "github.com/xrplevm/node/v7/x/poa/types" ) var _ commonnetwork.Network = (*Network)(nil) diff --git a/tests/integration/poa_test.go b/tests/integration/poa_test.go index 0c8f8c2..1a9ac4a 100644 --- a/tests/integration/poa_test.go +++ b/tests/integration/poa_test.go @@ -15,8 +15,8 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/require" - "github.com/xrplevm/node/v6/testutil/integration/exrp/utils" - poatypes "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/testutil/integration/exrp/utils" + poatypes "github.com/xrplevm/node/v7/x/poa/types" ) // AddValidator tests diff --git a/tests/integration/slashing_test.go b/tests/integration/slashing_test.go index 53ada4b..bc3efc8 100644 --- a/tests/integration/slashing_test.go +++ b/tests/integration/slashing_test.go @@ -9,7 +9,7 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" "github.com/stretchr/testify/require" - "github.com/xrplevm/node/v6/testutil/integration/exrp/utils" + "github.com/xrplevm/node/v7/testutil/integration/exrp/utils" ) // Slashing tests diff --git a/tests/integration/suite.go b/tests/integration/suite.go index 662727d..4c1a269 100644 --- a/tests/integration/suite.go +++ b/tests/integration/suite.go @@ -5,11 +5,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" evmtypes "github.com/evmos/evmos/v20/x/evm/types" "github.com/stretchr/testify/suite" - "github.com/xrplevm/node/v6/app" - factory "github.com/xrplevm/node/v6/testutil/integration/common/factory" - "github.com/xrplevm/node/v6/testutil/integration/common/grpc" - "github.com/xrplevm/node/v6/testutil/integration/common/keyring" - exrpcommon "github.com/xrplevm/node/v6/testutil/integration/exrp/common" + "github.com/xrplevm/node/v7/app" + factory "github.com/xrplevm/node/v7/testutil/integration/common/factory" + "github.com/xrplevm/node/v7/testutil/integration/common/grpc" + "github.com/xrplevm/node/v7/testutil/integration/common/keyring" + exrpcommon "github.com/xrplevm/node/v7/testutil/integration/exrp/common" ) type TestSuite struct { diff --git a/tests/upgrade/network.go b/tests/upgrade/network.go index 960cbab..4a63d88 100644 --- a/tests/upgrade/network.go +++ b/tests/upgrade/network.go @@ -10,10 +10,10 @@ import ( erc20types "github.com/evmos/evmos/v20/x/erc20/types" evmtypes "github.com/evmos/evmos/v20/x/evm/types" feemarkettypes "github.com/evmos/evmos/v20/x/feemarket/types" - commonnetwork "github.com/xrplevm/node/v6/testutil/integration/common/network" - exrpcommon "github.com/xrplevm/node/v6/testutil/integration/exrp/common" - upgradenetwork "github.com/xrplevm/node/v6/testutil/integration/exrp/upgrade" - poatypes "github.com/xrplevm/node/v6/x/poa/types" + commonnetwork "github.com/xrplevm/node/v7/testutil/integration/common/network" + exrpcommon "github.com/xrplevm/node/v7/testutil/integration/exrp/common" + upgradenetwork "github.com/xrplevm/node/v7/testutil/integration/exrp/upgrade" + poatypes "github.com/xrplevm/node/v7/x/poa/types" ) var _ commonnetwork.Network = (*UpgradeTestNetwork)(nil) diff --git a/tests/upgrade/suite.go b/tests/upgrade/suite.go index ec76fc4..eb0c86c 100644 --- a/tests/upgrade/suite.go +++ b/tests/upgrade/suite.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - exrpupgrade "github.com/xrplevm/node/v6/testutil/integration/exrp/upgrade" + exrpupgrade "github.com/xrplevm/node/v7/testutil/integration/exrp/upgrade" ) const defaultStateFile = "upgrade-state.json" diff --git a/tests/upgrade/suite_test.go b/tests/upgrade/suite_test.go index a5513a2..acd7ac5 100644 --- a/tests/upgrade/suite_test.go +++ b/tests/upgrade/suite_test.go @@ -6,7 +6,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/stretchr/testify/suite" - "github.com/xrplevm/node/v6/app" + "github.com/xrplevm/node/v7/app" ) func TestUpgradeTestSuite(t *testing.T) { diff --git a/testutil/integration/common/factory/base.go b/testutil/integration/common/factory/base.go index 7239e67..d9f9600 100644 --- a/testutil/integration/common/factory/base.go +++ b/testutil/integration/common/factory/base.go @@ -12,8 +12,8 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" testutiltypes "github.com/cosmos/cosmos-sdk/types/module/testutil" authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" - "github.com/xrplevm/node/v6/testutil/integration/common/grpc" - "github.com/xrplevm/node/v6/testutil/integration/common/network" + "github.com/xrplevm/node/v7/testutil/integration/common/grpc" + "github.com/xrplevm/node/v7/testutil/integration/common/network" ) // BaseTxFactory is the interface that wraps the common methods to build and broadcast transactions diff --git a/testutil/integration/common/factory/factory.go b/testutil/integration/common/factory/factory.go index c07d19f..6aa98c0 100644 --- a/testutil/integration/common/factory/factory.go +++ b/testutil/integration/common/factory/factory.go @@ -4,8 +4,8 @@ package factory import ( - "github.com/xrplevm/node/v6/testutil/integration/common/grpc" - "github.com/xrplevm/node/v6/testutil/integration/common/network" + "github.com/xrplevm/node/v7/testutil/integration/common/grpc" + "github.com/xrplevm/node/v7/testutil/integration/common/network" ) const ( diff --git a/testutil/integration/common/factory/fund.go b/testutil/integration/common/factory/fund.go index b7aa778..2bbda82 100644 --- a/testutil/integration/common/factory/fund.go +++ b/testutil/integration/common/factory/fund.go @@ -8,7 +8,7 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/xrplevm/node/v6/testutil/integration/common/keyring" + "github.com/xrplevm/node/v7/testutil/integration/common/keyring" ) // FundTxFactory is the interface that wraps the common methods to fund accounts diff --git a/testutil/integration/common/grpc/grpc.go b/testutil/integration/common/grpc/grpc.go index 84423ec..9c20052 100644 --- a/testutil/integration/common/grpc/grpc.go +++ b/testutil/integration/common/grpc/grpc.go @@ -10,7 +10,7 @@ import ( distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" feemarkettypes "github.com/evmos/evmos/v20/x/feemarket/types" - network "github.com/xrplevm/node/v6/testutil/integration/common/network" + network "github.com/xrplevm/node/v7/testutil/integration/common/network" ) // Handler is an interface that defines the common methods that are used to query diff --git a/testutil/integration/exrp/common/clients.go b/testutil/integration/exrp/common/clients.go index f10d2db..18e334b 100644 --- a/testutil/integration/exrp/common/clients.go +++ b/testutil/integration/exrp/common/clients.go @@ -27,8 +27,8 @@ import ( evmtypes "github.com/evmos/evmos/v20/x/evm/types" feemarketkeeper "github.com/evmos/evmos/v20/x/feemarket/keeper" feemarkettypes "github.com/evmos/evmos/v20/x/feemarket/types" - poakeeper "github.com/xrplevm/node/v6/x/poa/keeper" - poatypes "github.com/xrplevm/node/v6/x/poa/types" + poakeeper "github.com/xrplevm/node/v7/x/poa/keeper" + poatypes "github.com/xrplevm/node/v7/x/poa/types" ) type NetworkKeepers interface { diff --git a/testutil/integration/exrp/common/config.go b/testutil/integration/exrp/common/config.go index 3e3527c..75842c1 100644 --- a/testutil/integration/exrp/common/config.go +++ b/testutil/integration/exrp/common/config.go @@ -8,7 +8,7 @@ import ( sdktypes "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" evmostypes "github.com/evmos/evmos/v20/types" - "github.com/xrplevm/node/v6/app" + "github.com/xrplevm/node/v7/app" ) const ( diff --git a/testutil/integration/exrp/common/setup.go b/testutil/integration/exrp/common/setup.go index fbb0d65..f7ec3b9 100644 --- a/testutil/integration/exrp/common/setup.go +++ b/testutil/integration/exrp/common/setup.go @@ -11,7 +11,7 @@ import ( dbm "github.com/cosmos/cosmos-db" simutils "github.com/cosmos/cosmos-sdk/testutil/sims" "github.com/cosmos/gogoproto/proto" - "github.com/xrplevm/node/v6/app" + "github.com/xrplevm/node/v7/app" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" diff --git a/testutil/integration/exrp/integration/config.go b/testutil/integration/exrp/integration/config.go index fb2b49b..8ba8a46 100644 --- a/testutil/integration/exrp/integration/config.go +++ b/testutil/integration/exrp/integration/config.go @@ -11,7 +11,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" testtx "github.com/evmos/evmos/v20/testutil/tx" - exrpcommon "github.com/xrplevm/node/v6/testutil/integration/exrp/common" + exrpcommon "github.com/xrplevm/node/v7/testutil/integration/exrp/common" ) // DefaultIntegrationConfig returns the default configuration for a chain. diff --git a/testutil/integration/exrp/integration/keepers.go b/testutil/integration/exrp/integration/keepers.go index 067b6ff..0a52a65 100644 --- a/testutil/integration/exrp/integration/keepers.go +++ b/testutil/integration/exrp/integration/keepers.go @@ -12,7 +12,7 @@ import ( erc20keeper "github.com/evmos/evmos/v20/x/erc20/keeper" evmkeeper "github.com/evmos/evmos/v20/x/evm/keeper" feemarketkeeper "github.com/evmos/evmos/v20/x/feemarket/keeper" - poakeeper "github.com/xrplevm/node/v6/x/poa/keeper" + poakeeper "github.com/xrplevm/node/v7/x/poa/keeper" ) func (n *IntegrationNetwork) BankKeeper() bankkeeper.Keeper { diff --git a/testutil/integration/exrp/integration/network.go b/testutil/integration/exrp/integration/network.go index 1ebbe35..08b73d6 100644 --- a/testutil/integration/exrp/integration/network.go +++ b/testutil/integration/exrp/integration/network.go @@ -12,7 +12,7 @@ import ( sdkmath "cosmossdk.io/math" gethparams "github.com/ethereum/go-ethereum/params" - "github.com/xrplevm/node/v6/app" + "github.com/xrplevm/node/v7/app" "github.com/evmos/evmos/v20/types" @@ -27,7 +27,7 @@ import ( txtypes "github.com/cosmos/cosmos-sdk/types/tx" consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - exrpcommon "github.com/xrplevm/node/v6/testutil/integration/exrp/common" + exrpcommon "github.com/xrplevm/node/v7/testutil/integration/exrp/common" ) // Network is the interface that wraps the methods to interact with integration test network. diff --git a/testutil/integration/exrp/integration/setup.go b/testutil/integration/exrp/integration/setup.go index 630c68d..e3a0137 100644 --- a/testutil/integration/exrp/integration/setup.go +++ b/testutil/integration/exrp/integration/setup.go @@ -35,9 +35,9 @@ import ( infltypes "github.com/evmos/evmos/v20/x/inflation/v1/types" evmtypes "github.com/evmos/evmos/v20/x/evm/types" - exrpcommon "github.com/xrplevm/node/v6/testutil/integration/exrp/common" + exrpcommon "github.com/xrplevm/node/v7/testutil/integration/exrp/common" - "github.com/xrplevm/node/v6/app" + "github.com/xrplevm/node/v7/app" ) // genSetupFn is the type for the module genesis setup functions diff --git a/testutil/integration/exrp/integration/unit_network.go b/testutil/integration/exrp/integration/unit_network.go index 74af9a1..ceb1d27 100644 --- a/testutil/integration/exrp/integration/unit_network.go +++ b/testutil/integration/exrp/integration/unit_network.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/evmos/evmos/v20/x/evm/statedb" inflationtypes "github.com/evmos/evmos/v20/x/inflation/v1/types" - "github.com/xrplevm/node/v6/app" - exrpcommon "github.com/xrplevm/node/v6/testutil/integration/exrp/common" + "github.com/xrplevm/node/v7/app" + exrpcommon "github.com/xrplevm/node/v7/testutil/integration/exrp/common" ) // UnitTestIntegrationNetwork is the implementation of the Network interface for unit tests. diff --git a/testutil/integration/exrp/upgrade/config.go b/testutil/integration/exrp/upgrade/config.go index 524423f..4319242 100644 --- a/testutil/integration/exrp/upgrade/config.go +++ b/testutil/integration/exrp/upgrade/config.go @@ -6,7 +6,7 @@ package exrpupgrade import ( "os" - exrpcommon "github.com/xrplevm/node/v6/testutil/integration/exrp/common" + exrpcommon "github.com/xrplevm/node/v7/testutil/integration/exrp/common" ) func DefaultUpgradeConfig() exrpcommon.Config { diff --git a/testutil/integration/exrp/upgrade/keepers.go b/testutil/integration/exrp/upgrade/keepers.go index bf0d139..c9e9c02 100644 --- a/testutil/integration/exrp/upgrade/keepers.go +++ b/testutil/integration/exrp/upgrade/keepers.go @@ -12,7 +12,7 @@ import ( erc20keeper "github.com/evmos/evmos/v20/x/erc20/keeper" evmkeeper "github.com/evmos/evmos/v20/x/evm/keeper" feemarketkeeper "github.com/evmos/evmos/v20/x/feemarket/keeper" - poakeeper "github.com/xrplevm/node/v6/x/poa/keeper" + poakeeper "github.com/xrplevm/node/v7/x/poa/keeper" ) func (n *UpgradeIntegrationNetwork) BankKeeper() bankkeeper.Keeper { diff --git a/testutil/integration/exrp/upgrade/network.go b/testutil/integration/exrp/upgrade/network.go index 329f2c4..1b41ce0 100644 --- a/testutil/integration/exrp/upgrade/network.go +++ b/testutil/integration/exrp/upgrade/network.go @@ -11,8 +11,8 @@ import ( "time" sdkmath "cosmossdk.io/math" - "github.com/xrplevm/node/v6/app" - exrpcommon "github.com/xrplevm/node/v6/testutil/integration/exrp/common" + "github.com/xrplevm/node/v7/app" + exrpcommon "github.com/xrplevm/node/v7/testutil/integration/exrp/common" abcitypes "github.com/cometbft/cometbft/abci/types" ed25519 "github.com/cometbft/cometbft/crypto/ed25519" diff --git a/testutil/integration/exrp/upgrade/unit_network.go b/testutil/integration/exrp/upgrade/unit_network.go index 042a7a2..bdb611b 100644 --- a/testutil/integration/exrp/upgrade/unit_network.go +++ b/testutil/integration/exrp/upgrade/unit_network.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/evmos/evmos/v20/x/evm/statedb" inflationtypes "github.com/evmos/evmos/v20/x/inflation/v1/types" - "github.com/xrplevm/node/v6/app" - exrpcommon "github.com/xrplevm/node/v6/testutil/integration/exrp/common" + "github.com/xrplevm/node/v7/app" + exrpcommon "github.com/xrplevm/node/v7/testutil/integration/exrp/common" ) // UnitTestUpgradeNetwork is the implementation of the Network interface for unit tests. diff --git a/testutil/integration/exrp/utils/gov.go b/testutil/integration/exrp/utils/gov.go index 248ba28..617c033 100644 --- a/testutil/integration/exrp/utils/gov.go +++ b/testutil/integration/exrp/utils/gov.go @@ -16,9 +16,9 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - commonfactory "github.com/xrplevm/node/v6/testutil/integration/common/factory" - "github.com/xrplevm/node/v6/testutil/integration/common/keyring" - "github.com/xrplevm/node/v6/testutil/integration/common/network" + commonfactory "github.com/xrplevm/node/v7/testutil/integration/common/factory" + "github.com/xrplevm/node/v7/testutil/integration/common/keyring" + "github.com/xrplevm/node/v7/testutil/integration/common/network" ) // SubmitProposal is a helper function to submit a governance proposal and diff --git a/x/poa/ante/poa_test.go b/x/poa/ante/poa_test.go index 3d0acd1..a0e7527 100644 --- a/x/poa/ante/poa_test.go +++ b/x/poa/ante/poa_test.go @@ -13,8 +13,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/xrplevm/node/v6/x/poa/testutil" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/testutil" + "github.com/xrplevm/node/v7/x/poa/types" ) func setupPoaDecorator(t *testing.T) ( diff --git a/x/poa/keeper/common_test.go b/x/poa/keeper/common_test.go index 107ce1e..8ddb820 100644 --- a/x/poa/keeper/common_test.go +++ b/x/poa/keeper/common_test.go @@ -13,8 +13,8 @@ import ( moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/golang/mock/gomock" - "github.com/xrplevm/node/v6/x/poa/testutil" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/testutil" + "github.com/xrplevm/node/v7/x/poa/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" ) diff --git a/x/poa/keeper/genesis.go b/x/poa/keeper/genesis.go index e8ce295..07f83c6 100644 --- a/x/poa/keeper/genesis.go +++ b/x/poa/keeper/genesis.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/types" ) // InitGenesis initializes the module's state from a provided genesis state. diff --git a/x/poa/keeper/keeper.go b/x/poa/keeper/keeper.go index 91f38de..cd2bdd4 100644 --- a/x/poa/keeper/keeper.go +++ b/x/poa/keeper/keeper.go @@ -17,7 +17,7 @@ import ( paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/types" ) var _ types.QueryServer = Querier{} diff --git a/x/poa/keeper/keeper_test.go b/x/poa/keeper/keeper_test.go index 4858da6..844ac81 100644 --- a/x/poa/keeper/keeper_test.go +++ b/x/poa/keeper/keeper_test.go @@ -10,8 +10,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/xrplevm/node/v6/x/poa/testutil" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/testutil" + "github.com/xrplevm/node/v7/x/poa/types" ) func poaKeeperTestSetup(t *testing.T) (*Keeper, sdk.Context) { diff --git a/x/poa/keeper/msg_server.go b/x/poa/keeper/msg_server.go index a6e20e2..ce5cc34 100644 --- a/x/poa/keeper/msg_server.go +++ b/x/poa/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/types" ) type msgServer struct { diff --git a/x/poa/keeper/msg_server_add_validator.go b/x/poa/keeper/msg_server_add_validator.go index 4b7a369..4156e73 100644 --- a/x/poa/keeper/msg_server_add_validator.go +++ b/x/poa/keeper/msg_server_add_validator.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" gov "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/types" ) func (k msgServer) AddValidator(goCtx context.Context, msg *types.MsgAddValidator) (*types.MsgAddValidatorResponse, error) { diff --git a/x/poa/keeper/msg_server_add_validator_test.go b/x/poa/keeper/msg_server_add_validator_test.go index 00e0b0b..80333cc 100644 --- a/x/poa/keeper/msg_server_add_validator_test.go +++ b/x/poa/keeper/msg_server_add_validator_test.go @@ -9,8 +9,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/xrplevm/node/v6/x/poa/testutil" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/testutil" + "github.com/xrplevm/node/v7/x/poa/types" ) func TestMsgServer_AddValidator(t *testing.T) { diff --git a/x/poa/keeper/msg_server_remove_validator.go b/x/poa/keeper/msg_server_remove_validator.go index d8ed6ed..fac2b03 100644 --- a/x/poa/keeper/msg_server_remove_validator.go +++ b/x/poa/keeper/msg_server_remove_validator.go @@ -8,7 +8,7 @@ import ( gov "github.com/cosmos/cosmos-sdk/x/gov/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/types" ) func (k msgServer) RemoveValidator(goCtx context.Context, msg *types.MsgRemoveValidator) (*types.MsgRemoveValidatorResponse, error) { diff --git a/x/poa/keeper/msg_server_remove_validator_test.go b/x/poa/keeper/msg_server_remove_validator_test.go index 32d0b5b..838b334 100644 --- a/x/poa/keeper/msg_server_remove_validator_test.go +++ b/x/poa/keeper/msg_server_remove_validator_test.go @@ -6,7 +6,7 @@ import ( govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/stretchr/testify/require" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/types" ) func TestMsgServer_RemoveValidator(t *testing.T) { diff --git a/x/poa/keeper/params.go b/x/poa/keeper/params.go index 0f04160..ec3e465 100644 --- a/x/poa/keeper/params.go +++ b/x/poa/keeper/params.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/types" ) // GetParams get all parameters as types.Params diff --git a/x/poa/keeper/query.go b/x/poa/keeper/query.go index 63fa5f5..7657ed0 100644 --- a/x/poa/keeper/query.go +++ b/x/poa/keeper/query.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/poa/keeper/query_params.go b/x/poa/keeper/query_params.go index 2748daf..390dd09 100644 --- a/x/poa/keeper/query_params.go +++ b/x/poa/keeper/query_params.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/poa/module.go b/x/poa/module.go index adc6c21..146e197 100644 --- a/x/poa/module.go +++ b/x/poa/module.go @@ -15,8 +15,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/xrplevm/node/v6/x/poa/keeper" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/keeper" + "github.com/xrplevm/node/v7/x/poa/types" ) var ( diff --git a/x/poa/module_simulation.go b/x/poa/module_simulation.go index 5fe7443..f89e66a 100644 --- a/x/poa/module_simulation.go +++ b/x/poa/module_simulation.go @@ -9,9 +9,9 @@ import ( "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/xrplevm/node/v6/testutil/sample" - poasimulation "github.com/xrplevm/node/v6/x/poa/simulation" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/testutil/sample" + poasimulation "github.com/xrplevm/node/v7/x/poa/simulation" + "github.com/xrplevm/node/v7/x/poa/types" ) // avoid unused import issue diff --git a/x/poa/simulation/proposals.go b/x/poa/simulation/proposals.go index 55129cd..d9a873c 100644 --- a/x/poa/simulation/proposals.go +++ b/x/poa/simulation/proposals.go @@ -9,7 +9,7 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/types" ) const ( diff --git a/x/poa/simulation/proposals_test.go b/x/poa/simulation/proposals_test.go index efa11db..80b460e 100644 --- a/x/poa/simulation/proposals_test.go +++ b/x/poa/simulation/proposals_test.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/address" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/stretchr/testify/require" - "github.com/xrplevm/node/v6/x/poa/types" + "github.com/xrplevm/node/v7/x/poa/types" sdk "github.com/cosmos/cosmos-sdk/types" ) From a716164c76d1c06af1199f8b252953dd0ed30cae Mon Sep 17 00:00:00 2001 From: AdriaCarrera Date: Wed, 19 Mar 2025 10:59:52 +0100 Subject: [PATCH 2/3] feat(upgrade): register upgrade handler --- app/upgrades.go | 8 ++++++++ app/upgrades/v7/constants.go | 5 +++++ app/upgrades/v7/upgrades.go | 21 +++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 app/upgrades/v7/constants.go create mode 100644 app/upgrades/v7/upgrades.go diff --git a/app/upgrades.go b/app/upgrades.go index 358797f..610abd6 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -12,6 +12,7 @@ import ( v4 "github.com/xrplevm/node/v7/app/upgrades/v4" v5 "github.com/xrplevm/node/v7/app/upgrades/v5" v6 "github.com/xrplevm/node/v7/app/upgrades/v6" + v7 "github.com/xrplevm/node/v7/app/upgrades/v7" ) func (app *App) setupUpgradeHandlers() { @@ -44,6 +45,13 @@ func (app *App) setupUpgradeHandlers() { app.configurator, ), ) + app.UpgradeKeeper.SetUpgradeHandler( + v7.UpgradeName, + v7.CreateUpgradeHandler( + app.mm, + app.configurator, + ), + ) // When a planned update height is reached, the old binary will panic // writing on disk the height and name of the update that triggered it diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go new file mode 100644 index 0000000..afa808a --- /dev/null +++ b/app/upgrades/v7/constants.go @@ -0,0 +1,5 @@ +package v6 + +const ( + UpgradeName = "v7.0.0" +) diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go new file mode 100644 index 0000000..9c34092 --- /dev/null +++ b/app/upgrades/v7/upgrades.go @@ -0,0 +1,21 @@ +package v6 + +import ( + "context" + + upgradetypes "cosmossdk.io/x/upgrade/types" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" +) + +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, +) upgradetypes.UpgradeHandler { + return func(c context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + ctx := sdk.UnwrapSDKContext(c) + logger := ctx.Logger().With("upgrade", UpgradeName) + logger.Info("Running v7 upgrade handler...") + return mm.RunMigrations(ctx, configurator, vm) + } +} From 2ebb46b526b6eb48be538c5e46b044c758dba671 Mon Sep 17 00:00:00 2001 From: AdriaCarrera Date: Wed, 19 Mar 2025 11:06:29 +0100 Subject: [PATCH 3/3] fix: package name --- app/upgrades/v7/constants.go | 2 +- app/upgrades/v7/upgrades.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go index afa808a..ab8f7f4 100644 --- a/app/upgrades/v7/constants.go +++ b/app/upgrades/v7/constants.go @@ -1,4 +1,4 @@ -package v6 +package v7 const ( UpgradeName = "v7.0.0" diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go index 9c34092..e248ece 100644 --- a/app/upgrades/v7/upgrades.go +++ b/app/upgrades/v7/upgrades.go @@ -1,4 +1,4 @@ -package v6 +package v7 import ( "context"