fix(sequencers): sequencers genesis operator address not exported (#367)

x/sequencers/genesis.go → x/sequencers/keeper/genesis.go

@@ -1,16 +1,15 @@
-package sequencers
+package keeper
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 
-	"github.com/dymensionxyz/dymension-rdk/x/sequencers/keeper"
 	"github.com/dymensionxyz/dymension-rdk/x/sequencers/types"
 )
 
-// InitGenesis initializes the capability module's state from a provided genesis state.
+// InitGenesis initializes the sequencers module's state from a provided genesis state.
 // We return the for ValidatorUpdate only the sequencers set by dymint
-func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) []abci.ValidatorUpdate {
+func (k *Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) []abci.ValidatorUpdate {
 	var updates []abci.ValidatorUpdate
 	k.SetParams(ctx, genState.Params)
 
@@ -56,9 +55,16 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState)
 	return updates
 }
 
-// ExportGenesis returns the capability module's exported genesis.
-func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
+// ExportGenesis returns the sequencers module's exported genesis.
+func (k *Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 	genesis := types.DefaultGenesis()
 	genesis.Params = k.GetParams(ctx)
+
+	sequencers := k.GetAllSequencers(ctx)
+	// other cases are not supported. will be handled by the sequencer switch feature
+	if len(sequencers) == 1 {
+		genesis.GenesisOperatorAddress = sequencers[0].OperatorAddress
+	}
+
 	return genesis
 }

x/sequencers/keeper/genesis_test.go

@@ -0,0 +1,45 @@
+package keeper_test
+
+import (
+	"testing"
+
+	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	abci "github.com/tendermint/tendermint/abci/types"
+
+	testkeepers "github.com/dymensionxyz/dymension-rdk/testutil/keepers"
+	"github.com/dymensionxyz/dymension-rdk/testutil/utils"
+)
+
+func TestEpochsInitAndExportGenesis(t *testing.T) {
+	app := utils.Setup(t, false)
+	k, ctx := testkeepers.NewTestSequencerKeeperFromApp(app)
+
+	params := k.GetParams(ctx)
+	seqs := k.GetAllSequencers(ctx)
+	require.Equal(t, 1, len(seqs))
+	expectedOperator := seqs[0].GetOperator().String()
+	require.NotEmpty(t, expectedOperator)
+
+	genState := k.ExportGenesis(ctx)
+	assert.Equal(t, expectedOperator, genState.GenesisOperatorAddress)
+	assert.Equal(t, params, genState.Params)
+
+	// Test InitGenesis
+	genState.Params.HistoricalEntries = 100
+
+	// init dymint sequencer as expected for initGenesis
+	pubkey := utils.CreateTestPubKeys(1)[0]
+	tmPubkey, err := cryptocodec.ToTmProtoPublicKey(pubkey)
+	require.NoError(t, err)
+	dymintSeq := abci.ValidatorUpdate{
+		PubKey: tmPubkey,
+		Power:  1,
+	}
+
+	k.SetDymintSequencers(ctx, []abci.ValidatorUpdate{dymintSeq})
+
+	_ = k.InitGenesis(ctx, *genState)
+	assert.Equal(t, genState.Params, k.GetParams(ctx))
+}

x/sequencers/module.go

@@ -132,12 +132,12 @@ func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, gs json.Ra
 	// Initialize global index to index in genesis state
 	var genState types.GenesisState
 	cdc.MustUnmarshalJSON(gs, &genState)
-	return InitGenesis(ctx, am.keeper, genState)
+	return am.keeper.InitGenesis(ctx, genState)
 }
 
 // ExportGenesis returns the capability module's exported genesis state as raw JSON bytes.
 func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage {
-	genState := ExportGenesis(ctx, am.keeper)
+	genState := am.keeper.ExportGenesis(ctx)
 	return cdc.MustMarshalJSON(genState)
 }