add state root checks

Author: colinlyguo

rollup/internal/controller/relayer/l2_relayer.go

@@ -277,6 +277,19 @@ func (r *Layer2Relayer) initializeGenesis() error {
 }
 
 func (r *Layer2Relayer) commitGenesisBatch(batchHash string, batchHeader []byte, stateRoot common.Hash) error {
+	// Basic sanity checks
+	if batchHash == "" {
+		return fmt.Errorf("batch hash is empty")
+	}
+
+	if len(batchHeader) == 0 {
+		return fmt.Errorf("batch header is empty")
+	}
+
+	if stateRoot == (common.Hash{}) {
+		return fmt.Errorf("state root is zero")
+	}
+
 	var calldata []byte
 	var packErr error
 
@@ -296,6 +309,11 @@ func (r *Layer2Relayer) commitGenesisBatch(batchHash string, batchHeader []byte,
 		log.Info("Rollup importGenesis", "calldata", common.Bytes2Hex(calldata), "stateRoot", stateRoot)
 	}
 
+	// Check generated calldata is not empty
+	if len(calldata) == 0 {
+		return fmt.Errorf("generated calldata is empty")
+	}
+
 	// submit genesis batch to L1 rollup contract
 	txHash, _, err := r.commitSender.SendTransaction(batchHash, &r.cfg.RollupContractAddress, calldata, nil)
 	if err != nil {
@@ -1083,6 +1101,12 @@ func (r *Layer2Relayer) constructCommitBatchPayloadValidium(batch *dbBatchWithCh
 		return nil, 0, 0, fmt.Errorf("batch %d has no chunks", batch.Batch.Index)
 	}
 
+	// Check state root is not zero
+	stateRoot := common.HexToHash(batch.Batch.StateRoot)
+	if stateRoot == (common.Hash{}) {
+		return nil, 0, 0, fmt.Errorf("batch %d state root is zero", batch.Batch.Index)
+	}
+
 	// Calculate metrics
 	var maxBlockHeight uint64
 	var totalGasUsed uint64
@@ -1102,7 +1126,6 @@ func (r *Layer2Relayer) constructCommitBatchPayloadValidium(batch *dbBatchWithCh
 
 	lastChunk := batch.Chunks[len(batch.Chunks)-1]
 	commitment := common.HexToHash(lastChunk.EndBlockHash)
-
 	if commitment == (common.Hash{}) {
 		return nil, 0, 0, fmt.Errorf("batch %d last chunk end block hash is zero, cannot create commitment", batch.Batch.Index)
 	}
@@ -1141,6 +1164,12 @@ func (r *Layer2Relayer) constructFinalizeBundlePayloadCodecV7(dbBatch *orm.Batch
 		return nil, fmt.Errorf("batch %d header is empty", dbBatch.Index)
 	}
 
+	// Check state root is not zero
+	stateRoot := common.HexToHash(dbBatch.StateRoot)
+	if stateRoot == (common.Hash{}) {
+		return nil, fmt.Errorf("batch %d state root is zero", dbBatch.Index)
+	}
+
 	// Check proof if present
 	if aggProof != nil && len(aggProof.Proof()) == 0 {
 		return nil, fmt.Errorf("aggregate proof is empty")
@@ -1530,6 +1559,11 @@ func (r *Layer2Relayer) validateBatchFields(batch *dbBatchWithChunks, i int, all
 		return fmt.Errorf("batch %d parent batch hash is zero", batch.Batch.Index)
 	}
 
+	stateRoot := common.HexToHash(batch.Batch.StateRoot)
+	if stateRoot == (common.Hash{}) {
+		return fmt.Errorf("batch %d state root is zero", batch.Batch.Index)
+	}
+
 	return nil
 }
 

rollup/internal/controller/relayer/l2_relayer_test.go

@@ -70,15 +70,18 @@ func testL2RelayerProcessPendingBatches(t *testing.T) {
 	_, err = chunkOrm.InsertChunk(context.Background(), chunk2, encoding.CodecV7, rutils.ChunkMetrics{})
 	assert.NoError(t, err)
 
+	batchOrm := orm.NewBatch(db)
+	genesisBatch, err := batchOrm.GetBatchByIndex(context.Background(), 0)
+	assert.NoError(t, err)
+
 	batch := &encoding.Batch{
 		Index:                      1,
 		TotalL1MessagePoppedBefore: 0,
-		ParentBatchHash:            common.Hash{},
+		ParentBatchHash:            common.HexToHash(genesisBatch.Hash),
 		Chunks:                     []*encoding.Chunk{chunk1, chunk2},
 		Blocks:                     []*encoding.Block{block1, block2},
 	}
 
-	batchOrm := orm.NewBatch(db)
 	dbBatch, err := batchOrm.InsertBatch(context.Background(), batch, encoding.CodecV7, rutils.BatchMetrics{})
 	assert.NoError(t, err)