migrations

app/upgrades/v4/delayedack_params.go

@@ -0,0 +1,18 @@
+package v4
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	delayedackkeeper "github.com/dymensionxyz/dymension/v3/x/delayedack/keeper"
+	delayedacktypes "github.com/dymensionxyz/dymension/v3/x/delayedack/types"
+)
+
+func migrateDelayedAckParams(ctx sdk.Context, delayedAckKeeper delayedackkeeper.Keeper) {
+	// overwrite params for rollapp module due to proto change
+	params := delayedacktypes.DefaultParams()
+
+	// EpochIdentifier is the only one that hasn't changed
+	params.EpochIdentifier = delayedAckKeeper.GetParams(ctx).EpochIdentifier
+
+	delayedAckKeeper.SetParams(ctx, params)
+}

app/upgrades/v4/dymns_params.go

@@ -0,0 +1,13 @@
+package v4
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	dymnskeeper "github.com/dymensionxyz/dymension/v3/x/dymns/keeper"
+	dymnstypes "github.com/dymensionxyz/dymension/v3/x/dymns/types"
+)
+
+func migrateDymnsParams(ctx sdk.Context, dk dymnskeeper.Keeper) error {
+	params := dymnstypes.DefaultParams()
+	return dk.SetParams(ctx, params)
+}

app/upgrades/v4/old_rollapps.go

@@ -1,12 +1,8 @@
 package v4
 
 import (
-	"fmt"
-
 	"cosmossdk.io/math"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	rollappkeeper "github.com/dymensionxyz/dymension/v3/x/rollapp/keeper"
 	rollapptypes "github.com/dymensionxyz/dymension/v3/x/rollapp/types"
 )
 
@@ -84,16 +80,3 @@ var (
 		"ibc/04E01477A69DF1E5EE99F85C15B66D68D23292275357CAA44B2E0527310A405E", // EVMOS
 	}
 )
-
-func validateOldRollappsAreInStore(ctx sdk.Context, rk *rollappkeeper.Keeper) error {
-	// validate old rollapps are in the store
-	_, found := rk.GetRollapp(ctx, nimRollappID)
-	if !found {
-		return fmt.Errorf("rollapp not found: %s", nimRollappID)
-	}
-	_, found = rk.GetRollapp(ctx, mandeRollappID)
-	if !found {
-		return fmt.Errorf("rollapp not found: %s", mandeRollappID)
-	}
-	return nil
-}

app/upgrades/v4/upgrade.go

@@ -49,11 +49,6 @@ func CreateUpgradeHandler(
 	return func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
 		logger := ctx.Logger().With("upgrade", UpgradeName)
 
-		// sanity check to re-ensure old rollapps are in the store
-		if err := validateOldRollappsAreInStore(ctx, keepers.RollappKeeper); err != nil {
-			return nil, err
-		}
-
 		LoadDeprecatedParamsSubspaces(keepers)
 
 		migrateModuleParams(ctx, keepers)
@@ -87,6 +82,10 @@ func CreateUpgradeHandler(
 			return nil, err
 		}
 
+		if err := migrateDymnsParams(ctx, keepers.DymNSKeeper); err != nil {
+			return nil, err
+		}
+
 		// Start running the module migrations
 		logger.Debug("running module migrations ...")
 		return mm.RunMigrations(ctx, configurator, fromVM)
@@ -145,12 +144,6 @@ func LoadDeprecatedParamsSubspaces(keepers *keepers.AppKeepers) {
 	}
 }
 
-func migrateDelayedAckParams(ctx sdk.Context, delayedAckKeeper delayedackkeeper.Keeper) {
-	// overwrite params for delayedack module due to added parameters
-	params := delayedacktypes.DefaultParams()
-	delayedAckKeeper.SetParams(ctx, params)
-}
-
 // migrateRollappGauges creates a gauge for each rollapp in the store
 func migrateRollappGauges(ctx sdk.Context, rollappkeeper *rollappkeeper.Keeper, incentivizeKeeper *incentiveskeeper.Keeper) error {
 	rollapps := rollappkeeper.GetAllRollapps(ctx)

app/upgrades/v4/upgrade_test.go

@@ -204,6 +204,8 @@ func (s *UpgradeTestSuite) validateRollappsMigration(numRoll int) error {
 	s.Require().Equal(expectLivenessSlashInterval, s.App.RollappKeeper.GetParams(s.Ctx).LivenessSlashInterval)
 
 	if !reflect.DeepEqual(rollapps, expectRollapps) {
+		s.T().Log("Expect rollapps", expectRollapps)
+		s.T().Log("Actual rollapps", rollapps)
 		return fmt.Errorf("rollapps do not match")
 	}
 	return nil

proto/dymensionxyz/dymension/eibc/demand_order.proto

@@ -26,7 +26,11 @@ message DemandOrder {
       (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
     ];
     string recipient = 5;
-    reserved 6;
+
+    // Deprecated: use DemandOrder.IsFulfilled method instead.
+    // Only used for backwards compatibility.
+    bool deprecated_is_fulfilled = 6 [deprecated = true];
+
     dymensionxyz.dymension.common.Status tracking_packet_status = 8;
     string rollapp_id = 9;
     common.RollappPacket.Type type = 10;

x/eibc/types/demand_order.go

@@ -161,7 +161,7 @@ func (m *DemandOrder) ValidateOrderIsOutstanding() error {
 }
 
 func (m *DemandOrder) IsFulfilled() bool {
-	return m.FulfillerAddress != ""
+	return m.FulfillerAddress != "" || m.DeprecatedIsFulfilled
 }
 
 // BuildDemandIDFromPacketKey returns a unique demand order id from the packet key.