fix lint

tac0turtle · Mar 25, 2025 · Mar 19, 2025 · Mar 19, 2025 · Mar 19, 2025 · Mar 19, 2025
commit 6ac0053ec0f95cbf383ad6f32f6774978455c3c1
diff --git a/block/block-manager.md b/block/block-manager.md
@@ -50,7 +50,7 @@ The block manager is initialized using several parameters as defined below:
 |-----|-----|-----|
 signing key|crypto.PrivKey|used for signing a block after it is created
 config|config.BlockManagerConfig|block manager configurations (see config options below)
-genesis|*cmtypes.GenesisDoc|initialize the block manager with genesis state (genesis configuration defined in `config/genesis.json` file under the app directory)
+genesis|coreexecutor.Genesis|initialize the block manager with genesis state (genesis configuration defined in `config/genesis.json` file under the app directory)
 store|store.Store|local datastore for storing rollup blocks and states (default local store path is `$db_dir/rollkit` and `db_dir` specified in the `config.yaml` file under the app directory)
 mempool, proxyapp, eventbus|mempool.Mempool, proxy.AppConnConsensus, *cmtypes.EventBus|for initializing the executor (state transition function). mempool is also used in the manager to check for availability of transactions for lazy block production
 dalc|da.DAClient|the data availability light client used to submit and retrieve blocks to DA network

diff --git a/block/manager.go b/block/manager.go
@@ -166,7 +166,7 @@ type Manager struct {
 	bq            *BatchQueue
 }
 
-// getInitialState tries to load lastState from Store, and if it's not available it reads GenesisDoc.
+// getInitialState tries to load lastState from Store, and if it's not available it reads genesis.
 func getInitialState(ctx context.Context, genesis coreexecutor.Genesis, store store.Store, exec coreexecutor.Executor, logger log.Logger) (types.State, error) {
 	// Load the state from store.
 	s, err := store.GetState(ctx)

diff --git a/block/manager_test.go b/block/manager_test.go
@@ -62,8 +62,8 @@ func TestInitialStateClean(t *testing.T) {
 	s, err := getInitialState(context.TODO(), genesisData, emptyStore, coreexecutor.NewDummyExecutor(), logger)
 	require.NoError(err)
 	initialHeight := genesisData.InitialHeight()
-	require.Equal(uint64(initialHeight-1), s.LastBlockHeight)
-	require.Equal(uint64(initialHeight), s.InitialHeight)
+	require.Equal(initialHeight-1, s.LastBlockHeight)
+	require.Equal(initialHeight, s.InitialHeight)
 }
 
 func TestInitialStateStored(t *testing.T) {
@@ -397,42 +397,6 @@ func Test_isProposer(t *testing.T) {
 			isProposer: true,
 			err:        nil,
 		},
-		//{
-		//	name: "Signing key does not match genesis proposer public key",
-		//	args: func() args {
-		//		genesisData, _ := types.GetGenesisWithPrivkey(types.DefaultSigningKeyType, "Test_isProposer")
-		//		s, err := types.NewFromGenesisDoc(genesisData)
-		//		require.NoError(err)
-
-		//		randomPrivKey := ed25519.GenPrivKey()
-		//		signingKey, err := types.PrivKeyToSigningKey(randomPrivKey)
-		//		require.NoError(err)
-		//		return args{
-		//			s,
-		//			signingKey,
-		//		}
-		//	}(),
-		//	isProposer: false,
-		//	err:        nil,
-		//},
-		//{
-		//	name: "No validators found in genesis",
-		//	args: func() args {
-		//		genesisData, privKey := types.GetGenesisWithPrivkey(types.DefaultSigningKeyType, "Test_isProposer")
-		//		genesisData.Validators = nil
-		//		s, err := types.NewFromGenesisDoc(genesisData)
-		//		require.NoError(err)
-
-		//		signingKey, err := types.PrivKeyToSigningKey(privKey)
-		//		require.NoError(err)
-		//		return args{
-		//			s,
-		//			signingKey,
-		//		}
-		//	}(),
-		//	isProposer: false,
-		//	err:        ErrNoValidatorsInState,
-		//},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

diff --git a/block/sync_service.go b/block/sync_service.go
@@ -134,8 +134,8 @@ func (syncService *SyncService[H]) initStoreAndStartSyncer(ctx context.Context,
 // WriteToStoreAndBroadcast initializes store if needed and broadcasts  provided header or block.
 // Note: Only returns an error in case store can't be initialized. Logs error if there's one while broadcasting.
 func (syncService *SyncService[H]) WriteToStoreAndBroadcast(ctx context.Context, headerOrData H) error {
-	if syncService.genesis.InitialHeight() < 0 {
-		return fmt.Errorf("invalid initial height; cannot be negative")
+	if syncService.genesis.InitialHeight() == 0 {
+		return fmt.Errorf("invalid initial height; cannot be zero")
 	}
 	isGenesis := headerOrData.Height() == syncService.genesis.InitialHeight()
 	// For genesis header/block initialize the store and start the syncer

diff --git a/cmd/rollkit/commands/run_node.go b/cmd/rollkit/commands/run_node.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"math/rand"
 	"net"
 	"net/http"
 	"os"
@@ -15,7 +14,6 @@ import (
 
 	"cosmossdk.io/log"
 	cometprivval "github.com/cometbft/cometbft/privval"
-	comettypes "github.com/cometbft/cometbft/types"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/rs/zerolog"
 	"github.com/spf13/cobra"
@@ -61,10 +59,13 @@ func NewRunNodeCmd() *cobra.Command {
 			return initFiles()
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			genDocProvider := RollkitGenesisDocProviderFunc(nodeConfig)
-			genDoc, err := genDocProvider()
+			ctx, cancel := context.WithCancel(cmd.Context())
+			defer cancel() // Ensure context is cancelled when command exits
+
+			kvExecutor := createDirectKVExecutor(ctx)
+			genesis, err := kvExecutor.BuildGenesis(nodeConfig)
 			if err != nil {
-				return err
+				return fmt.Errorf("failed to build genesis: %w", err)
 			}
 
 			// TODO: this should be moved elsewhere
@@ -81,10 +82,11 @@ func NewRunNodeCmd() *cobra.Command {
 			metrics := node.DefaultMetricsProvider(rollconf.DefaultInstrumentationConfig())
 
 			// Determine which rollupID to use. If the flag has been set we want to use that value and ensure that the chainID in the genesis doc matches.
-			if cmd.Flags().Lookup(rollconf.FlagSequencerRollupID).Changed {
-				genDoc.ChainID = nodeConfig.Node.SequencerRollupID
-			}
-			sequencerRollupID := genDoc.ChainID
+			//if cmd.Flags().Lookup(rollconf.FlagSequencerRollupID).Changed {
+			//	genDoc.ChainID = nodeConfig.Node.SequencerRollupID
+			//}
+
+			sequencerRollupID := nodeConfig.Node.SequencerRollupID
 			// Try and launch a mock gRPC sequencer if there is no sequencer running.
 			// Only start mock Sequencer if the user did not provide --rollkit.sequencer_address
 			var seqSrv *grpc.Server = nil
@@ -104,17 +106,8 @@ func NewRunNodeCmd() *cobra.Command {
 			logger.Info("Executor address", "address", nodeConfig.Node.ExecutorAddress)
 
 			// Create a cancellable context for the node
-			ctx, cancel := context.WithCancel(cmd.Context())
-			defer cancel() // Ensure context is cancelled when command exits
-
-			kvExecutor := createDirectKVExecutor(ctx)
 			dummySequencer := coresequencer.NewDummySequencer()
 
-			genesis, err := kvExecutor.BuildGenesis(nodeConfig)
-			if err != nil {
-				return fmt.Errorf("failed to build genesis: %w", err)
-			}
-
 			dummyDA := coreda.NewDummyDA(100_000)
 			dummyDALC := da.NewDAClient(dummyDA, nodeConfig.DA.GasPrice, nodeConfig.DA.GasMultiplier, []byte(nodeConfig.DA.Namespace), []byte(nodeConfig.DA.SubmitOptions), logger)
 			// create the rollkit node
@@ -316,13 +309,11 @@ func initFiles() error {
 	// Generate the private validator config files
 	cometprivvalKeyFile := filepath.Join(configDir, "priv_validator_key.json")
 	cometprivvalStateFile := filepath.Join(dataDir, "priv_validator_state.json")
-	var pv *cometprivval.FilePV
 	if rollos.FileExists(cometprivvalKeyFile) {
-		pv = cometprivval.LoadFilePV(cometprivvalKeyFile, cometprivvalStateFile)
 		logger.Info("Found private validator", "keyFile", cometprivvalKeyFile,
 			"stateFile", cometprivvalStateFile)
 	} else {
-		pv = cometprivval.GenFilePV(cometprivvalKeyFile, cometprivvalStateFile)
+		pv := cometprivval.GenFilePV(cometprivvalKeyFile, cometprivvalStateFile)
 		pv.Save()
 		logger.Info("Generated private validator", "keyFile", cometprivvalKeyFile,
 			"stateFile", cometprivvalStateFile)
@@ -333,24 +324,16 @@ func initFiles() error {
 	if rollos.FileExists(genFile) {
 		logger.Info("Found genesis file", "path", genFile)
 	} else {
-		genDoc := comettypes.GenesisDoc{
-			ChainID:         fmt.Sprintf("test-rollup-%08x", rand.Uint32()), //nolint:gosec
-			GenesisTime:     time.Now().Round(0).UTC(),
-			ConsensusParams: comettypes.DefaultConsensusParams(),
-		}
-		pubKey, err := pv.GetPubKey()
+		// Create a KVExecutor to generate genesis
+		kvExecutor := testExecutor.NewKVExecutor()
+		genesis, err := kvExecutor.BuildGenesis(nodeConfig)
 		if err != nil {
-			return fmt.Errorf("can't get pubkey: %w", err)
+			return fmt.Errorf("failed to build genesis: %w", err)
 		}
-		genDoc.Validators = []comettypes.GenesisValidator{{
-			Address: pubKey.Address(),
-			PubKey:  pubKey,
-			Power:   1000,
-			Name:    "Rollkit Sequencer",
-		}}
-
-		if err := genDoc.SaveAs(genFile); err != nil {
-			return err
+
+		// Write genesis bytes directly to file
+		if err := os.WriteFile(genFile, genesis.Bytes(), 0600); err != nil {
+			return fmt.Errorf("failed to write genesis file: %w", err)
 		}
 		logger.Info("Generated genesis file", "path", genFile)
 	}
@@ -420,13 +403,3 @@ func setupLogger(config rollconf.Config) log.Logger {
 	// Add module to logger
 	return configuredLogger.With("module", "main")
 }
-
-// RollkitGenesisDocProviderFunc returns a function that loads the GenesisDoc from the filesystem
-// using nodeConfig instead of config.
-func RollkitGenesisDocProviderFunc(nodeConfig rollconf.Config) func() (*comettypes.GenesisDoc, error) {
-	return func() (*comettypes.GenesisDoc, error) {
-		// Construct the genesis file path using rootify
-		genFile := filepath.Join(nodeConfig.RootDir, nodeConfig.ConfigDir, "genesis.json")
-		return comettypes.GenesisDocFromFile(genFile)
-	}
-}
diff --git a/cmd/rollkit/commands/run_node_test.go b/cmd/rollkit/commands/run_node_test.go
@@ -301,61 +301,6 @@ func TestStartMockSequencerServer(t *testing.T) {
 	}
 }
 
-func TestRollkitGenesisDocProviderFunc(t *testing.T) {
-	// Create a temporary directory for the test
-	tempDir, err := os.MkdirTemp("", "rollkit-test")
-	assert.NoError(t, err)
-	defer func() {
-		err := os.RemoveAll(tempDir)
-		assert.NoError(t, err)
-	}()
-
-	// Create the config directory
-	configDir := filepath.Join(tempDir, "config")
-	err = os.MkdirAll(configDir, rollconf.DefaultDirPerm)
-	assert.NoError(t, err)
-
-	// Create a simple test genesis file
-	testChainID := "test-chain-id"
-	genFileContent := fmt.Sprintf(`{
-		"chain_id": "%s",
-		"genesis_time": "2023-01-01T00:00:00Z",
-		"consensus_params": {
-			"block": {
-				"max_bytes": "22020096",
-				"max_gas": "-1"
-			},
-			"evidence": {
-				"max_age_num_blocks": "100000",
-				"max_age_duration": "172800000000000"
-			},
-			"validator": {
-				"pub_key_types": ["ed25519"]
-			}
-		}
-	}`, testChainID)
-
-	genFile := filepath.Join(configDir, "genesis.json")
-	err = os.WriteFile(genFile, []byte(genFileContent), 0600)
-	assert.NoError(t, err)
-
-	// Create a test node config
-	testNodeConfig := rollconf.Config{
-		RootDir:   tempDir,
-		ConfigDir: "config",
-	}
-
-	// Get the genesis doc provider function
-	genDocProvider := RollkitGenesisDocProviderFunc(testNodeConfig)
-	assert.NotNil(t, genDocProvider)
-
-	// Call the provider function and verify the result
-	loadedGenDoc, err := genDocProvider()
-	assert.NoError(t, err)
-	assert.NotNil(t, loadedGenDoc)
-	assert.Equal(t, testChainID, loadedGenDoc.ChainID)
-}
-
 func TestInitFiles(t *testing.T) {
 	// Save the original nodeConfig
 	origNodeConfig := nodeConfig

diff --git a/node/full_node.md b/node/full_node.md
@@ -14,7 +14,7 @@ Note that unlike a light node which only syncs and stores block headers seen on
 
 The Full Node mainly encapsulates and initializes/manages the following components:
 
-### genesisDoc
+### genesis
 
 The [genesis] document contains information about the initial state of the rollup chain, in particular its validator set.
 

diff --git a/node/full_node_integration_test.go b/node/full_node_integration_test.go
@@ -359,7 +359,7 @@ func (s *FullNodeTestSuite) TestGenesisInitialization() {
 
 	// Verify genesis state
 	state := s.node.blockManager.GetLastState()
-	require.Equal(uint64(s.node.genesis.InitialHeight()), state.InitialHeight)
+	require.Equal(s.node.genesis.InitialHeight(), state.InitialHeight)
 	require.Equal(s.node.genesis.ChainID(), state.ChainID)
 }
 

diff --git a/test/executors/kv/kvexecutor.go b/test/executors/kv/kvexecutor.go
@@ -65,7 +65,23 @@ func (k *KVExecutor) computeStateRoot() []byte {
 
 // BuildGenesis implements execution.Executor.
 func (k *KVExecutor) BuildGenesis(config config.Config) (execution.Genesis, error) {
-	panic("unimplemented")
+	k.mu.Lock()
+	defer k.mu.Unlock()
+
+	// Compute initial state root from current store
+	stateRoot := k.computeStateRoot()
+
+	// Create a new genesis with a random chain ID if not provided
+	chainID := fmt.Sprintf("test-chain-%d", time.Now().UnixNano())
+
+	// Create genesis with initial height 1
+	return execution.NewBaseGenesis(
+		chainID,
+		1, // Initial height
+		time.Now().UTC(),
+		nil, // No proposer address for testing
+		stateRoot,
+	), nil
 }
 
 // InitChain initializes the chain state with genesis parameters.

diff --git a/types/state.go b/types/state.go
@@ -8,6 +8,7 @@ import (
 	cmversion "github.com/cometbft/cometbft/proto/tendermint/version"
 	"github.com/cometbft/cometbft/types"
 	"github.com/cometbft/cometbft/version"
+
 	coreexecutor "github.com/rollkit/rollkit/core/execution"
 )
 
@@ -76,7 +77,7 @@ func NewFromGenesisDoc(genDoc coreexecutor.Genesis) (State, error) {
 
 		DAHeight: 1,
 
-		LastBlockHeight: uint64(genDoc.InitialHeight()) - 1,
+		LastBlockHeight: genDoc.InitialHeight() - 1,
 		LastBlockID:     types.BlockID{},
 		LastBlockTime:   genDoc.GenesisTime(),
 
@@ -85,7 +86,7 @@ func NewFromGenesisDoc(genDoc coreexecutor.Genesis) (State, error) {
 		LastValidators:              validatorSet,
 		LastHeightValidatorsChanged: int64(genDoc.InitialHeight()),
 
-		LastHeightConsensusParamsChanged: uint64(genDoc.InitialHeight()),
+		LastHeightConsensusParamsChanged: genDoc.InitialHeight(),
 	}
 
 	s.AppHash = genDoc.Bytes()

diff --git a/types/utils.go b/types/utils.go
@@ -272,44 +272,12 @@ func GetFirstSignedHeader(privkey cmEd25519.PrivKey, valSet *cmtypes.ValidatorSe
 	return &signedHeader, nil
 }
 
-// GetValidatorSetFromGenesis returns a ValidatorSet from a GenesisDoc, for usage with the centralized sequencer scheme.
-func GetValidatorSetFromGenesis(g *cmtypes.GenesisDoc) cmtypes.ValidatorSet {
-	vals := []*cmtypes.Validator{
-		{
-			Address:          g.Validators[0].Address,
-			PubKey:           g.Validators[0].PubKey,
-			VotingPower:      int64(1),
-			ProposerPriority: int64(1),
-		},
-	}
-	return cmtypes.ValidatorSet{
-		Validators: vals,
-		Proposer:   vals[0],
-	}
-}
-
 // GetGenesisWithPrivkey returns a genesis doc with a single validator and a signing key
 func GetGenesisWithPrivkey(chainID string) (coreexecutor.Genesis, crypto.PrivKey, cmEd25519.PubKey) {
 	// Generate Ed25519 key pair using CometBFT
 	cmtPrivKey := cmEd25519.GenPrivKey()
 	cmtPubKey := cmtPrivKey.PubKey().(cmEd25519.PubKey)
 
-	// Create genesis validator with CometBFT public key
-	genesisValidators := []cmtypes.GenesisValidator{{
-		Address: cmtPubKey.Address(),
-		PubKey:  cmtPubKey,
-		Power:   int64(1),
-		Name:    "sequencer",
-	}}
-
-	// Create genesis document
-	genDoc := &cmtypes.GenesisDoc{
-		ChainID:       chainID,
-		InitialHeight: 1,
-		Validators:    genesisValidators,
-		GenesisTime:   time.Now(),
-	}
-
 	// Convert CometBFT private key to libp2p format
 	privKeyBytes := cmtPrivKey.Bytes()
 	libp2pPrivKey, err := crypto.UnmarshalEd25519PrivateKey(privKeyBytes)
@@ -320,8 +288,8 @@ func GetGenesisWithPrivkey(chainID string) (coreexecutor.Genesis, crypto.PrivKey
 	// Create base genesis with validator's address
 	return coreexecutor.NewBaseGenesis(
 		chainID,
-		uint64(genDoc.InitialHeight),
-		genDoc.GenesisTime,
+		uint64(1),
+		time.Now(),
 		cmtPubKey.Address().Bytes(),
 		nil, // No raw bytes for now
 	), libp2pPrivKey, cmtPubKey