Skip to content

chore: bump node version to v7 #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AdriaCarrera merged 3 commits into from
Mar 20, 2025
Merged

chore: bump node version to v7 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd441bf
chore: bump to v7
AdriaCarrera Mar 19, 2025
a716164
feat(upgrade): register upgrade handler
AdriaCarrera Mar 19, 2025
2ebb46b
fix: package name
AdriaCarrera Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/ante.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion app/simulation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
14 changes: 11 additions & 3 deletions app/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ 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"
v7 "github.com/xrplevm/node/v7/app/upgrades/v7"
)

func (app *App) setupUpgradeHandlers() {
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions app/upgrades/v7/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package v7

const (
UpgradeName = "v7.0.0"
)
21 changes: 21 additions & 0 deletions app/upgrades/v7/upgrades.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package v7

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)
}
}
2 changes: 1 addition & 1 deletion cmd/exrpd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand Down
4 changes: 2 additions & 2 deletions cmd/exrpd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/xrplevm/node/v6
module github.com/xrplevm/node/v7

go 1.22.11

Expand Down
2 changes: 1 addition & 1 deletion proto/poa/genesis.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]; }
2 changes: 1 addition & 1 deletion proto/poa/params.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {}
2 changes: 1 addition & 1 deletion proto/poa/query.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion proto/poa/tx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/poa_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/slashing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions tests/integration/suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions tests/upgrade/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/upgrade/suite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/upgrade/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions testutil/integration/common/factory/base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions testutil/integration/common/factory/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion testutil/integration/common/factory/fund.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion testutil/integration/common/grpc/grpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions testutil/integration/exrp/common/clients.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion testutil/integration/exrp/common/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion testutil/integration/exrp/common/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion testutil/integration/exrp/integration/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion testutil/integration/exrp/integration/keepers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions testutil/integration/exrp/integration/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions testutil/integration/exrp/integration/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions testutil/integration/exrp/integration/unit_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion testutil/integration/exrp/upgrade/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion testutil/integration/exrp/upgrade/keepers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading