Merged with main

Author: omritoptix

.github/workflows/generate_genesis_template.yml

@@ -0,0 +1,26 @@
+name: Generate Genesis Template
+on: ["push"]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Generate Genesis Template
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "1.23.1"
+
+      - name: Install Dasel
+        run: |
+          curl -sSLf https://github.com/TomWright/dasel/releases/latest/download/dasel_linux_amd64 -o /usr/local/bin/dasel
+          chmod +x /usr/local/bin/dasel
+          
+      - name: Generate genesis template mainnet
+        run: make generate-genesis env=mainnet
+        env:
+          BECH32_PREFIX: ethm
+
+      - name: Generate genesis template testnet
+        run: make generate-genesis env=testnet
+        env:
+          BECH32_PREFIX: ethm

Makefile

@@ -7,7 +7,7 @@ COMMIT := $(shell git log -1 --format='%H')
 ifndef BECH32_PREFIX
     $(error BECH32_PREFIX is not set)
 endif
-DRS_VERSION = 2
+DRS_VERSION = 3
 
 # don't override user values
 ifeq (,$(NAME))

app/app.go

@@ -162,6 +162,7 @@ import (
 	// Upgrade handlers
 	"github.com/dymensionxyz/rollapp-wasm/app/upgrades"
 	drs2 "github.com/dymensionxyz/rollapp-wasm/app/upgrades/drs-2"
+	drs3 "github.com/dymensionxyz/rollapp-wasm/app/upgrades/drs-3"
 )
 
 const (
@@ -187,7 +188,7 @@ var (
 		rollappparamstypes.StoreKey,
 	}
 	// Upgrades contains the upgrade handlers for the application
-	Upgrades = []upgrades.Upgrade{drs2.Upgrade}
+	Upgrades = []upgrades.Upgrade{drs2.Upgrade, drs3.Upgrade}
 )
 
 func getGovProposalHandlers() []govclient.ProposalHandler {

app/test_helpers.go

@@ -19,6 +19,7 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"github.com/dymensionxyz/dymension-rdk/testutil/utils"
 	rollappparamstypes "github.com/dymensionxyz/dymension-rdk/x/rollappparams/types"
+	"github.com/dymensionxyz/dymint/version"
 	"github.com/tendermint/tendermint/crypto/encoding"
 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/proto/tendermint/crypto"
@@ -92,6 +93,7 @@ func SetupWithGenesisValSet(t *testing.T, valSet *types2.ValidatorSet, genAccs [
 	app, genesisState := setup(true, 5)
 	genesisState = genesisStateWithValSet(t, app, genesisState, valSet, genAccs, balances...)
 
+	version.DRS = "1"
 	genesisState = setRollappVersion(app.appCodec, genesisState, 1)
 
 	denomMD := banktypes.Metadata{
@@ -126,7 +128,7 @@ func SetupWithGenesisValSet(t *testing.T, valSet *types2.ValidatorSet, genAccs [
 			ConsensusParams: utils.DefaultConsensusParams,
 			AppStateBytes:   stateBytes,
 			ChainId:         TestChainID,
-			GenesisChecksum: "notwmpty",
+			GenesisChecksum: "notempty",
 		},
 	)
 

app/upgrades/drs-2/upgrade.go

@@ -14,14 +14,19 @@ func CreateUpgradeHandler(
 	configurator module.Configurator,
 ) upgradetypes.UpgradeHandler {
 	return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
-		da := rpKeeper.DA(ctx)
-		version := uint32(2)
-		params := rollappparamstypes.DefaultParams()
-		params.Da = da
-		params.DrsVersion = version
-
-		rpKeeper.SetParams(ctx, params)
+		// upgrade drs to 2
+		if err := rpKeeper.SetVersion(ctx, uint32(2)); err != nil {
+			return nil, err
+		}
 
+		if err := HandleUpgrade(ctx, rpKeeper); err != nil {
+			return nil, err
+		}
 		return mm.RunMigrations(ctx, configurator, fromVM)
 	}
 }
+
+func HandleUpgrade(ctx sdk.Context, rpKeeper rollappparamskeeper.Keeper) error {
+	// migrate rollapp params with missing min-gas-prices
+	return rpKeeper.SetMinGasPrices(ctx, rollappparamstypes.DefaultParams().MinGasPrices)
+}

app/upgrades/drs-3/constants.go

@@ -0,0 +1,17 @@
+package drs3
+
+import (
+	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+
+	"github.com/dymensionxyz/rollapp-wasm/app/upgrades"
+)
+
+const (
+	UpgradeName = "drs-3"
+)
+
+var Upgrade = upgrades.Upgrade{
+	Name:          UpgradeName,
+	CreateHandler: CreateUpgradeHandler,
+	StoreUpgrades: storetypes.StoreUpgrades{},
+}

app/upgrades/drs-3/upgrade.go

@@ -0,0 +1,30 @@
+package drs3
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	rollappparamskeeper "github.com/dymensionxyz/dymension-rdk/x/rollappparams/keeper"
+
+	drs2 "github.com/dymensionxyz/rollapp-wasm/app/upgrades/drs-2"
+)
+
+func CreateUpgradeHandler(
+	rpKeeper rollappparamskeeper.Keeper,
+	mm *module.Manager,
+	configurator module.Configurator,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
+		if rpKeeper.GetParams(ctx).DrsVersion == 1 {
+			// first run drs-2 migration
+			if err := drs2.HandleUpgrade(ctx, rpKeeper); err != nil {
+				return nil, err
+			}
+		}
+		// upgrade drs to 3
+		if err := rpKeeper.SetVersion(ctx, uint32(3)); err != nil {
+			return nil, err
+		}
+		return mm.RunMigrations(ctx, configurator, fromVM)
+	}
+}

e2e/testing/chain.go

@@ -28,6 +28,7 @@ import (
 	"github.com/cosmos/ibc-go/v6/testing/mock"
 	rollappparamstypes "github.com/dymensionxyz/dymension-rdk/x/rollappparams/types"
 	seqtypes "github.com/dymensionxyz/dymension-rdk/x/sequencers/types"
+	"github.com/dymensionxyz/dymint/version"
 	"github.com/golang/protobuf/proto" //nolint:staticcheck
 	"github.com/stretchr/testify/require"
 	abci "github.com/tendermint/tendermint/abci/types"
@@ -248,6 +249,7 @@ func NewTestChain(t *testing.T, chainIdx int, opts ...interface{}) *TestChain {
 		}
 	}
 	genState[slashingTypes.ModuleName] = rollApp.AppCodec().MustMarshalJSON(slashingTypes.NewGenesisState(slashingTypes.DefaultParams(), signInfo, nil))
+	version.DRS = "1"
 
 	rollappParamsState := rollappparamstypes.DefaultGenesisState()
 	rollappParamsState.Params.DrsVersion = 1