Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 14 additions & 4 deletions app/upgrades.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import (
storetypes "cosmossdk.io/store/types"
upgradetypes "cosmossdk.io/x/upgrade/types"
v10 "github.com/xrplevm/node/v10/app/upgrades/v10"
v11 "github.com/xrplevm/node/v10/app/upgrades/v11"
v101 "github.com/xrplevm/node/v10/app/upgrades/v101"
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"
Expand Down Expand Up @@ -65,8 +66,15 @@ func (app *App) setupUpgradeHandlers() {
),
)
app.UpgradeKeeper.SetUpgradeHandler(
v11.UpgradeName,
v11.CreateUpgradeHandler(
v101.UpgradeName,
v101.CreateUpgradeHandler(
app.mm,
app.configurator,
),
)
app.UpgradeKeeper.SetUpgradeHandler(
v111.UpgradeName,
v111.CreateUpgradeHandler(
app.mm,
app.configurator,
app.ICAHostKeeper,
Expand Down Expand Up @@ -95,7 +103,9 @@ func (app *App) setupUpgradeHandlers() {
v7.UpgradeName,
v8.UpgradeName,
v9.UpgradeName,
v10.UpgradeName:
v10.UpgradeName,
v101.UpgradeName,
v111.UpgradeName:
storeUpgrades = &storetypes.StoreUpgrades{}
}

Expand Down
5 changes: 5 additions & 0 deletions app/upgrades/v101/constants.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package v101

const (
UpgradeName = "v10.1.0"
)
21 changes: 21 additions & 0 deletions app/upgrades/v101/upgrades.go
Original file line number Diff line number Diff line change
@@ -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)
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package v11
package v111

import (
sdkmath "cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
)

const (
UpgradeName = "v11.0.0"
UpgradeName = "v11.1.0"
EVMCoinDenom = "axrp"

// mainnet
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package v11
package v111

import (
"context"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package v11
package v111

import (
"context"
Expand All @@ -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)
Expand All @@ -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
}
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down