fix malformed tracking_packet_key by ensuring base64 encoding/decoding during Genesis export/import

x/eibc/genesis.go

@@ -1,6 +1,9 @@
 package eibc
 
 import (
+	"encoding/base64"
+	"fmt"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/dymensionxyz/dymension/v3/x/eibc/keeper"
 	"github.com/dymensionxyz/dymension/v3/x/eibc/types"
@@ -9,10 +12,20 @@
 // InitGenesis initializes the module's state from a provided genesis state.
 func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) {
 	k.SetParams(ctx, genState.Params)
-	// Add the demand orders
+
 	for _, demandOrder := range genState.DemandOrders {
 		// Create a copy of demandOrder to avoid reusing the same memory address
 		demandOrderCopy := demandOrder
+
+		// Decode base64 tracking_packet_key if it exists
+		if demandOrderCopy.TrackingPacketKey != "" {
+			decodedKey, err := base64.StdEncoding.DecodeString(demandOrderCopy.TrackingPacketKey)
+			if err != nil {
+				panic(fmt.Errorf("failed to decode tracking_packet_key: %v", err))
+			}
+			demandOrderCopy.TrackingPacketKey = string(decodedKey)
+		}
+
 		err := k.SetDemandOrder(ctx, &demandOrderCopy)
 		if err != nil {
 			panic(err)
@@ -24,14 +37,25 @@
 func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 	genesis := types.DefaultGenesis()
 	genesis.Params = k.GetParams(ctx)
+
 	// Add the demand orders
 	allDemandOrders, err := k.ListAllDemandOrders(ctx)
 	if err != nil {
 		panic(err)
 	}
+
 	genesis.DemandOrders = make([]types.DemandOrder, len(allDemandOrders))
 	for i, order := range allDemandOrders {
-		genesis.DemandOrders[i] = *order
+		// Create a copy to avoid modifying the original
+		orderCopy := *order
+
+		// Base64 encode tracking_packet_key if it exists
+		if orderCopy.TrackingPacketKey != "" {
+			encodedKey := base64.StdEncoding.EncodeToString([]byte(orderCopy.TrackingPacketKey))
+			orderCopy.TrackingPacketKey = encodedKey
+		}
+
+		genesis.DemandOrders[i] = orderCopy
 	}
 
 	return genesis

x/eibc/genesis_test.go

@@ -1,6 +1,7 @@
 package eibc_test
 
 import (
+	"encoding/base64"
 	"testing"
 
 	"cosmossdk.io/math"
@@ -74,15 +75,28 @@ func TestExportGenesis(t *testing.T) {
 			TrackingPacketStatus: commontypes.Status_PENDING,
 		},
 	}
+
 	for _, demandOrder := range demandOrders {
 		demandOrderCopy := demandOrder
 		err := k.SetDemandOrder(ctx, &demandOrderCopy)
 		require.NoError(t, err)
 	}
+
 	k.SetParams(ctx, params)
 	// Verify the exported genesis
 	got := eibc.ExportGenesis(ctx, *k)
-	require.NotNil(t, got)
-	require.ElementsMatch(t, demandOrders, got.DemandOrders)
-	require.Equal(t, params, got.Params)
+
+	require.NotNil(t, got, "ExportGenesis should not return nil")
+
+	require.Equal(t, params, got.Params, "Params should match the set params")
+
+	expectedDemandOrders := make([]types.DemandOrder, len(demandOrders))
+	for i, order := range demandOrders {
+		orderCopy := order
+		encodedKey := base64.StdEncoding.EncodeToString([]byte(order.TrackingPacketKey))
+		orderCopy.TrackingPacketKey = encodedKey
+		expectedDemandOrders[i] = orderCopy
+	}
+
+	require.ElementsMatch(t, expectedDemandOrders, got.DemandOrders, "DemandOrders should match after encoding TrackingPacketKey")
 }