From db013d4c826f8173d1a5b1510fd562c846fa420e Mon Sep 17 00:00:00 2001 From: Kevin Pita Date: Mon, 27 Jul 2026 17:46:19 +0200 Subject: [PATCH 1/3] feat(evm): update go.mod v0.6.1-xrplevm.1 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f0bea8d..4a16a3f 100644 --- a/go.mod +++ b/go.mod @@ -282,7 +282,7 @@ replace ( // use Cosmos-SDK fork to enable Ledger functionality github.com/cosmos/cosmos-sdk => github.com/xrplevm/cosmos-sdk v0.53.6-xrplevm.1 // cosmos evm private fork - github.com/cosmos/evm => github.com/xrplevm/evm v0.6.0-xrplevm.6 + github.com/cosmos/evm => github.com/xrplevm/evm v0.6.1-xrplevm.1 // fix cosmos-sdk store path mismatch // github.com/cosmos/cosmos-sdk/store => cosmossdk.io/store v1.1.2 github.com/ethereum/go-ethereum => github.com/cosmos/go-ethereum v0.0.0-20250806193535-2fc7571efa91 diff --git a/go.sum b/go.sum index 15fefde..818bee7 100644 --- a/go.sum +++ b/go.sum @@ -1727,8 +1727,8 @@ github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGC github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM= github.com/xrplevm/cosmos-sdk v0.53.6-xrplevm.1 h1:fBMklkMKZbrVoEhGU0JyeaINkRA9lVA9K/zRY73EGh0= github.com/xrplevm/cosmos-sdk v0.53.6-xrplevm.1/go.mod h1:N6YuprhAabInbT3YGumGDKONbvPX5dNro7RjHvkQoKE= -github.com/xrplevm/evm v0.6.0-xrplevm.6 h1:kgFyqrDwwJYfPyYstbCl2fqg70AP7/rw8oNEk+Gz6S8= -github.com/xrplevm/evm v0.6.0-xrplevm.6/go.mod h1:MUrVrODPlGdehAzc2KjUPEVHLtA7WChEvrFLs5kWa9E= +github.com/xrplevm/evm v0.6.1-xrplevm.1 h1:YrB+qiTo59Hh0SMzn6V6/z4v9lgbSSwWfAFVIjpHFeY= +github.com/xrplevm/evm v0.6.1-xrplevm.1/go.mod h1:QnaJDtxqon2mywiYqxM8VwW8FKeFazi0au0qzVpFAG8= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= From 497baebca95b1bd57e6eecaa0565ad1184450b53 Mon Sep 17 00:00:00 2001 From: Kevin Pita Date: Mon, 13 Jul 2026 19:38:06 +0200 Subject: [PATCH 2/3] feat: add v10.1.0 upgrade handler --- app/upgrades.go | 7 +++++++ app/upgrades/v101/constants.go | 5 +++++ app/upgrades/v101/upgrades.go | 21 +++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 app/upgrades/v101/constants.go create mode 100644 app/upgrades/v101/upgrades.go diff --git a/app/upgrades.go b/app/upgrades.go index 5217635..6ea81bf 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -6,6 +6,7 @@ import ( storetypes "cosmossdk.io/store/types" upgradetypes "cosmossdk.io/x/upgrade/types" v10 "github.com/xrplevm/node/v10/app/upgrades/v10" + v101 "github.com/xrplevm/node/v10/app/upgrades/v101" v11 "github.com/xrplevm/node/v10/app/upgrades/v11" v9 "github.com/xrplevm/node/v10/app/upgrades/v9" @@ -73,6 +74,12 @@ func (app *App) setupUpgradeHandlers() { app.StakingKeeper, app.TransferKeeper, ), + app.UpgradeKeeper.SetUpgradeHandler( + v101.UpgradeName, + v101.CreateUpgradeHandler( + app.mm, + app.configurator, + ), ) // When a planned update height is reached, the old binary will panic diff --git a/app/upgrades/v101/constants.go b/app/upgrades/v101/constants.go new file mode 100644 index 0000000..ddc6fff --- /dev/null +++ b/app/upgrades/v101/constants.go @@ -0,0 +1,5 @@ +package v101 + +const ( + UpgradeName = "v10.1.0" +) diff --git a/app/upgrades/v101/upgrades.go b/app/upgrades/v101/upgrades.go new file mode 100644 index 0000000..51a5315 --- /dev/null +++ b/app/upgrades/v101/upgrades.go @@ -0,0 +1,21 @@ +package v101 + +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 v10.1.0 upgrade handler...") + return mm.RunMigrations(ctx, configurator, vm) + } +} From 1103b8d85bde9036db2dca185ca20e7aa0d80a66 Mon Sep 17 00:00:00 2001 From: Kevin Pita Date: Mon, 27 Jul 2026 18:15:19 +0200 Subject: [PATCH 3/3] feat: add v11.1.0 upgrade handler --- app/upgrades.go | 21 ++++++++++++--------- app/upgrades/{v11 => v111}/constants.go | 4 ++-- app/upgrades/{v11 => v111}/keepers.go | 2 +- app/upgrades/{v11 => v111}/upgrades.go | 6 +++--- 4 files changed, 18 insertions(+), 15 deletions(-) rename app/upgrades/{v11 => v111}/constants.go (97%) rename app/upgrades/{v11 => v111}/keepers.go (98%) rename app/upgrades/{v11 => v111}/upgrades.go (96%) diff --git a/app/upgrades.go b/app/upgrades.go index 6ea81bf..cdcb905 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -7,7 +7,7 @@ import ( upgradetypes "cosmossdk.io/x/upgrade/types" v10 "github.com/xrplevm/node/v10/app/upgrades/v10" v101 "github.com/xrplevm/node/v10/app/upgrades/v101" - v11 "github.com/xrplevm/node/v10/app/upgrades/v11" + v111 "github.com/xrplevm/node/v10/app/upgrades/v111" v9 "github.com/xrplevm/node/v10/app/upgrades/v9" v5 "github.com/xrplevm/node/v10/app/upgrades/v5" @@ -66,19 +66,20 @@ func (app *App) setupUpgradeHandlers() { ), ) app.UpgradeKeeper.SetUpgradeHandler( - v11.UpgradeName, - v11.CreateUpgradeHandler( + v101.UpgradeName, + v101.CreateUpgradeHandler( app.mm, app.configurator, - app.ICAHostKeeper, - app.StakingKeeper, - app.TransferKeeper, ), + ) app.UpgradeKeeper.SetUpgradeHandler( - v101.UpgradeName, - v101.CreateUpgradeHandler( + v111.UpgradeName, + v111.CreateUpgradeHandler( app.mm, app.configurator, + app.ICAHostKeeper, + app.StakingKeeper, + app.TransferKeeper, ), ) @@ -102,7 +103,9 @@ func (app *App) setupUpgradeHandlers() { v7.UpgradeName, v8.UpgradeName, v9.UpgradeName, - v10.UpgradeName: + v10.UpgradeName, + v101.UpgradeName, + v111.UpgradeName: storeUpgrades = &storetypes.StoreUpgrades{} } diff --git a/app/upgrades/v11/constants.go b/app/upgrades/v111/constants.go similarity index 97% rename from app/upgrades/v11/constants.go rename to app/upgrades/v111/constants.go index 6fcb92a..85f7e54 100644 --- a/app/upgrades/v11/constants.go +++ b/app/upgrades/v111/constants.go @@ -1,4 +1,4 @@ -package v11 +package v111 import ( sdkmath "cosmossdk.io/math" @@ -6,7 +6,7 @@ import ( ) const ( - UpgradeName = "v11.0.0" + UpgradeName = "v11.1.0" EVMCoinDenom = "axrp" // mainnet diff --git a/app/upgrades/v11/keepers.go b/app/upgrades/v111/keepers.go similarity index 98% rename from app/upgrades/v11/keepers.go rename to app/upgrades/v111/keepers.go index 482b59a..6ee6e2d 100644 --- a/app/upgrades/v11/keepers.go +++ b/app/upgrades/v111/keepers.go @@ -1,4 +1,4 @@ -package v11 +package v111 import ( "context" diff --git a/app/upgrades/v11/upgrades.go b/app/upgrades/v111/upgrades.go similarity index 96% rename from app/upgrades/v11/upgrades.go rename to app/upgrades/v111/upgrades.go index ab30147..87a4189 100644 --- a/app/upgrades/v11/upgrades.go +++ b/app/upgrades/v111/upgrades.go @@ -1,4 +1,4 @@ -package v11 +package v111 import ( "context" @@ -23,7 +23,7 @@ func CreateUpgradeHandler( 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 v11 upgrade handler...") + logger.Info("Running v11.1 upgrade handler...") // Run migrations first so no module migration can restore ICA host defaults. vm, err := mm.RunMigrations(ctx, configurator, vm) @@ -50,7 +50,7 @@ func CreateUpgradeHandler( return nil, err } - logger.Info("Finished v11 upgrade handler") + logger.Info("Finished v11.1 upgrade handler") return vm, nil } }