fix l2coinbase

config/default.go

@@ -90,6 +90,7 @@ MaxBinaries = 473170
 MaxSteps = 7570538
 TxLifetimeCheckTimeout = "10m"
 MaxTxLifetime = "3h"
+L2Coinbase = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
 	[Sequencer.Finalizer]
 		GERDeadlineTimeout = "5s"
 		ForcedBatchDeadlineTimeout = "60s"
@@ -116,8 +117,8 @@ MaxTxLifetime = "3h"
 [SequenceSender]
 WaitPeriodSendSequence = "5s"
 LastBatchVirtualizationTimeMaxWaitPeriod = "5s"
+MaxTxSizeForL1 = 131072
 MaxBatchesForL1 = 10
-L2Coinbase = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
 PrivateKey = {Path = "/pk/sequencer.keystore", Password = "testonly"}
 UseValidium = true
 

docs/config-file/node-config-schema.json

@@ -521,6 +521,16 @@
 						"300ms"
 					]
 				},
+				"L2Coinbase": {
+					"items": {
+						"type": "integer"
+					},
+					"type": "array",
+					"maxItems": 20,
+					"minItems": 20,
+					"description": "L2Coinbase defines which addess is going to receive the fees",
+					"default": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
+				},
 				"Finalizer": {
 					"properties": {
 						"GERDeadlineTimeout": {
@@ -715,7 +725,7 @@
 				"MaxTxSizeForL1": {
 					"type": "integer",
 					"description": "MaxTxSizeForL1 is the maximum size a single transaction can have. This field has\nnon-trivial consequences: larger transactions than 128KB are significantly harder and\nmore expensive to propagate; larger transactions also take more resources\nto validate whether they fit into the pool or not.",
-					"default": 0
+					"default": 131072
 				},
 				"MaxBatchesForL1": {
 					"type": "integer",
@@ -731,16 +741,6 @@
 					"minItems": 20,
 					"description": "SenderAddress defines which private key the eth tx manager needs to use\nto sign the L1 txs"
 				},
-				"L2Coinbase": {
-					"items": {
-						"type": "integer"
-					},
-					"type": "array",
-					"maxItems": 20,
-					"minItems": 20,
-					"description": "L2Coinbase defines which addess is going to receive the fees",
-					"default": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
-				},
 				"PrivateKey": {
 					"properties": {
 						"Path": {

sequencer/config.go

@@ -2,6 +2,7 @@ package sequencer
 
 import (
 	"github.com/0xPolygonHermez/zkevm-node/config/types"
+	"github.com/ethereum/go-ethereum/common"
 )
 
 // Config represents the configuration of a sequencer
@@ -53,6 +54,9 @@ type Config struct {
 	// MaxTxLifetime is the time a tx can be in the sequencer/worker memory
 	MaxTxLifetime types.Duration `mapstructure:"MaxTxLifetime"`
 
+	// L2Coinbase defines which addess is going to receive the fees
+	L2Coinbase common.Address `mapstructure:"L2Coinbase"`
+
 	// Finalizer's specific config properties
 	Finalizer FinalizerCfg `mapstructure:"Finalizer"`
 

sequencer/dbmanager.go

@@ -29,6 +29,10 @@ func (d *dbManager) GetBatchByNumber(ctx context.Context, batchNumber uint64, db
 	return d.state.GetBatchByNumber(ctx, batchNumber, dbTx)
 }
 
+func (d *dbManager) DeleteBatchByNumber(ctx context.Context, batchNumber uint64, dbTx pgx.Tx) error {
+	return d.state.DeleteBatchByNumber(ctx, batchNumber, dbTx)
+}
+
 // ClosingBatchParameters contains the necessary parameters to close a batch
 type ClosingBatchParameters struct {
 	BatchNumber          uint64
@@ -72,10 +76,10 @@ func (d *dbManager) OpenBatch(ctx context.Context, processingContext state.Proce
 }
 
 // CreateFirstBatch is using during genesis
-func (d *dbManager) CreateFirstBatch(ctx context.Context, sequencerAddress common.Address) state.ProcessingContext {
+func (d *dbManager) CreateFirstBatch(ctx context.Context, l2coinbase common.Address) state.ProcessingContext {
 	processingCtx := state.ProcessingContext{
 		BatchNumber:    1,
-		Coinbase:       sequencerAddress,
+		Coinbase:       l2coinbase,
 		Timestamp:      time.Now(),
 		GlobalExitRoot: state.ZeroHash,
 	}

sequencer/finalizer.go

@@ -1,6 +1,7 @@
 package sequencer
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
@@ -40,7 +41,7 @@ type finalizer struct {
 	effectiveGasPriceCfg    EffectiveGasPriceCfg
 	closingSignalCh         ClosingSignalCh
 	isSynced                func(ctx context.Context) bool
-	sequencerAddress        common.Address
+	l2coinbase              common.Address
 	worker                  workerInterface
 	dbManager               dbManagerInterface
 	executor                stateInterface
@@ -112,7 +113,7 @@ func newFinalizer(
 	worker workerInterface,
 	dbManager dbManagerInterface,
 	executor stateInterface,
-	sequencerAddr common.Address,
+	l2coinbase common.Address,
 	isSynced func(ctx context.Context) bool,
 	closingSignalCh ClosingSignalCh,
 	batchConstraints batchConstraints,
@@ -123,7 +124,7 @@ func newFinalizer(
 		effectiveGasPriceCfg: effectiveGasPriceCfg,
 		closingSignalCh:      closingSignalCh,
 		isSynced:             isSynced,
-		sequencerAddress:     sequencerAddr,
+		l2coinbase:           l2coinbase,
 		worker:               worker,
 		dbManager:            dbManager,
 		executor:             executor,
@@ -962,11 +963,29 @@ func (f *finalizer) syncWithState(ctx context.Context, lastBatchNum *uint64) err
 			return err
 		}
 	} else {
-		f.batch, err = f.dbManager.GetWIPBatch(ctx)
-		if err != nil {
-			return fmt.Errorf("failed to get work-in-progress batch, err: %w", err)
+		if bytes.Equal(lastBatch.Coinbase.Bytes(), f.l2coinbase.Bytes()) {
+			f.batch, err = f.dbManager.GetWIPBatch(ctx)
+			if err != nil {
+				return fmt.Errorf("failed to get work-in-progress batch, err: %w", err)
+			}
+		} else {
+			oldGER := lastBatch.GlobalExitRoot
+			if err := f.dbManager.DeleteBatchByNumber(ctx, *lastBatchNum, nil); err != nil {
+				return fmt.Errorf("failed to delete last no-closed batch, err: %w", err)
+			}
+			lastBatch, err = f.dbManager.GetLastBatch(ctx)
+			if err != nil {
+				return fmt.Errorf("failed to get last batch again, err: %w", err)
+			}
+			oldStateRoot := lastBatch.StateRoot
+
+			f.batch, err = f.openWIPBatch(ctx, *lastBatchNum, oldGER, oldStateRoot)
+			if err != nil {
+				return err
+			}
 		}
 	}
+
 	log.Infof("Initial Batch: %+v", f.batch)
 	log.Infof("Initial Batch.StateRoot: %s", f.batch.stateRoot.String())
 	log.Infof("Initial Batch.GER: %s", f.batch.globalExitRoot.String())
@@ -978,7 +997,7 @@ func (f *finalizer) syncWithState(ctx context.Context, lastBatchNum *uint64) err
 		BatchNumber:    *lastBatchNum,
 		OldStateRoot:   f.batch.stateRoot,
 		GlobalExitRoot: f.batch.globalExitRoot,
-		Coinbase:       f.sequencerAddress,
+		Coinbase:       f.l2coinbase,
 		Timestamp:      f.batch.timestamp,
 		Transactions:   make([]byte, 0, 1),
 		Caller:         stateMetrics.SequencerCallerLabel,
@@ -1030,7 +1049,7 @@ func (f *finalizer) processForcedBatch(ctx context.Context, lastBatchNumberInSta
 		OldStateRoot:   stateRoot,
 		GlobalExitRoot: forcedBatch.GlobalExitRoot,
 		Transactions:   forcedBatch.RawTxsData,
-		Coinbase:       f.sequencerAddress,
+		Coinbase:       f.l2coinbase,
 		Timestamp:      now(),
 		Caller:         stateMetrics.SequencerCallerLabel,
 	}
@@ -1093,7 +1112,7 @@ func (f *finalizer) openWIPBatch(ctx context.Context, batchNum uint64, ger, stat
 
 	return &WipBatch{
 		batchNumber:        batchNum,
-		coinbase:           f.sequencerAddress,
+		coinbase:           f.l2coinbase,
 		initialStateRoot:   stateRoot,
 		stateRoot:          stateRoot,
 		timestamp:          openBatchResp.Timestamp,
@@ -1129,7 +1148,7 @@ func (f *finalizer) closeBatch(ctx context.Context) error {
 func (f *finalizer) openBatch(ctx context.Context, num uint64, ger common.Hash, dbTx pgx.Tx) (state.ProcessingContext, error) {
 	processingCtx := state.ProcessingContext{
 		BatchNumber:    num,
-		Coinbase:       f.sequencerAddress,
+		Coinbase:       f.l2coinbase,
 		Timestamp:      now(),
 		GlobalExitRoot: ger,
 	}