Avoid Reprocess the full batch (#2240)

* Avoid reset trusted batch * avoid read batch from db all the time * linter * remove BatchL2Data decodification * logs * Avoid process the whole batch * sync working * refactor * remove unused code * fixed unittest * removed commented code --------- Co-authored-by: joanestebanr <[email protected]>
0xPolygonHermez · Jun 30, 2023 · 93b54af · 93b54af
1 parent 99cd6bd
commit 93b54af
Show file tree

Hide file tree

Showing 6 changed files with 224 additions and 416 deletions.
diff --git a/etherman/etherman.go b/etherman/etherman.go
@@ -996,18 +996,6 @@ func (etherMan *Client) GetL2ChainID() (uint64, error) {
 	return etherMan.ZkEVM.ChainID(&bind.CallOpts{Pending: false})
 }
 
-// GetL2ForkID returns current L2 Fork ID
-func (etherMan *Client) GetL2ForkID() (uint64, error) {
-	// TODO: implement this
-	return 1, nil
-}
-
-// GetL2ForkIDIntervals return L2 Fork ID intervals
-func (etherMan *Client) GetL2ForkIDIntervals() ([]state.ForkIDInterval, error) {
-	// TODO: implement this
-	return []state.ForkIDInterval{{FromBatchNumber: 0, ToBatchNumber: math.MaxUint64, ForkId: 1}}, nil
-}
-
 // GetL1GasPrice gets the l1 gas price
 func (etherMan *Client) GetL1GasPrice(ctx context.Context) *big.Int {
 	// Get gasPrice from providers

diff --git a/state/transaction.go b/state/transaction.go
@@ -886,7 +886,7 @@ func (s *State) isContractCreation(tx *types.Transaction) bool {
 	return tx.To() == nil && len(tx.Data()) > 0
 }
 
-// StoreTransaction is used by the sequencer to add process a transaction
+// StoreTransaction is used by the sequencer and trusted state synchronizer to add process a transaction.
 func (s *State) StoreTransaction(ctx context.Context, batchNumber uint64, processedTx *ProcessTransactionResponse, coinbase common.Address, timestamp uint64, dbTx pgx.Tx) error {
 	if dbTx == nil {
 		return ErrDBTxNil

diff --git a/synchronizer/interfaces.go b/synchronizer/interfaces.go
@@ -44,8 +44,8 @@ type stateInterface interface {
 	SetGenesis(ctx context.Context, block state.Block, genesis state.Genesis, dbTx pgx.Tx) ([]byte, error)
 	OpenBatch(ctx context.Context, processingContext state.ProcessingContext, dbTx pgx.Tx) error
 	CloseBatch(ctx context.Context, receipt state.ProcessingReceipt, dbTx pgx.Tx) error
-	ProcessSequencerBatch(ctx context.Context, batchNumber uint64, batchL2Data []byte, caller metrics.CallerLabel, dbTx pgx.Tx) (*state.ProcessBatchResponse, error)
-	StoreTransactions(ctx context.Context, batchNum uint64, processedTxs []*state.ProcessTransactionResponse, dbTx pgx.Tx) error
+	ProcessBatch(ctx context.Context, request state.ProcessRequest, updateMerkleTree bool) (*state.ProcessBatchResponse, error)
+	StoreTransaction(ctx context.Context, batchNumber uint64, processedTx *state.ProcessTransactionResponse, coinbase common.Address, timestamp uint64, dbTx pgx.Tx) error
 	GetStateRootByBatchNumber(ctx context.Context, batchNum uint64, dbTx pgx.Tx) (common.Hash, error)
 	ExecuteBatch(ctx context.Context, batch state.Batch, updateMerkleTree bool, dbTx pgx.Tx) (*pb.ProcessBatchResponse, error)
 	GetLastVerifiedBatch(ctx context.Context, dbTx pgx.Tx) (*state.VerifiedBatch, error)

diff --git a/synchronizer/mock_state.go b/synchronizer/mock_state.go