add genesis and import/export logic

zeta-chain · Dec 11, 2024 · 2063a5a · 2063a5a
1 parent 3265296
commit 2063a5a
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 44 deletions.
diff --git a/cmd/zetacored/parse_genesis.go b/cmd/zetacored/parse_genesis.go
@@ -205,6 +205,8 @@ func ModifyObserverState(
 	currentGenState := observertypes.GetGenesisStateFromAppState(cdc, appState)
 	currentGenState.Ballots = importedObserverGenState.Ballots
 	currentGenState.NonceToCctx = importedObserverGenState.NonceToCctx
+	// zero operational flags as they are network specific
+	currentGenState.OperationalFlags = observertypes.OperationalFlags{}
 
 	currentGenStateBz, err := cdc.MarshalJSON(&currentGenState)
 	if err != nil {

diff --git a/proto/zetachain/zetacore/observer/genesis.proto b/proto/zetachain/zetacore/observer/genesis.proto
@@ -14,6 +14,7 @@ import "zetachain/zetacore/observer/params.proto";
 import "zetachain/zetacore/observer/pending_nonces.proto";
 import "zetachain/zetacore/observer/tss.proto";
 import "zetachain/zetacore/observer/tss_funds_migrator.proto";
+import "zetachain/zetacore/observer/operational.proto";
 
 option go_package = "github.com/zeta-chain/node/x/observer/types";
 
@@ -35,4 +36,5 @@ message GenesisState {
   repeated PendingNonces pending_nonces = 13 [ (gogoproto.nullable) = false ];
   repeated ChainNonces chain_nonces = 14 [ (gogoproto.nullable) = false ];
   repeated NonceToCctx nonce_to_cctx = 15 [ (gogoproto.nullable) = false ];
+  OperationalFlags operational_flags = 16 [ (gogoproto.nullable) = false ];
 }
diff --git a/x/observer/genesis.go b/x/observer/genesis.go
@@ -130,6 +130,7 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState)
 	for _, elem := range genState.NonceToCctx {
 		k.SetNonceToCctx(ctx, elem)
 	}
+	k.SetOperationalFlags(ctx, genState.OperationalFlags)
 }
 
 // ExportGenesis returns the observer module's exported genesis.
@@ -185,6 +186,8 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 		os = observers
 	}
 
+	of, _ := k.GetOperationalFlags(ctx)
+
 	return &types.GenesisState{
 		Ballots:           k.GetAllBallots(ctx),
 		ChainParamsList:   chainParams,
@@ -200,5 +203,6 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
 		BlameList:         k.GetAllBlame(ctx),
 		ChainNonces:       k.GetAllChainNonces(ctx),
 		NonceToCctx:       k.GetAllNonceToCctx(ctx),
+		OperationalFlags:  of,
 	}
 }
diff --git a/x/observer/genesis_test.go b/x/observer/genesis_test.go
@@ -39,9 +39,10 @@ func TestGenesis(t *testing.T) {
 				sample.ChainNonces(1),
 				sample.ChainNonces(2),
 			},
-			PendingNonces: sample.PendingNoncesList(t, "sample", 20),
-			NonceToCctx:   sample.NonceToCctxList(t, "sample", 20),
-			TssHistory:    []types.TSS{sample.Tss()},
+			PendingNonces:    sample.PendingNoncesList(t, "sample", 20),
+			NonceToCctx:      sample.NonceToCctxList(t, "sample", 20),
+			TssHistory:       []types.TSS{sample.Tss()},
+			OperationalFlags: sample.OperationalFlags(),
 		}
 
 		// Init and export
@@ -84,6 +85,7 @@ func TestGenesis(t *testing.T) {
 			Keygen:            &types.Keygen{},
 			LastObserverCount: &types.LastObserverCount{},
 			NodeAccountList:   []*types.NodeAccount{},
+			OperationalFlags:  types.OperationalFlags{},
 		}
 
 		require.Equal(t, expectedGenesisState, *got)
@@ -148,6 +150,7 @@ func TestGenesis(t *testing.T) {
 			BlameList:         k.GetAllBlame(ctx),
 			ChainNonces:       k.GetAllChainNonces(ctx),
 			NonceToCctx:       k.GetAllNonceToCctx(ctx),
+			OperationalFlags:  types.OperationalFlags{},
 		}
 
 		require.Equal(t, expectedGenesisState, *got)

diff --git a/x/observer/types/genesis.pb.go b/x/observer/types/genesis.pb.go
diff --git a/x/observer/types/operational.pb.go b/x/observer/types/operational.pb.go