Merge pull request #29 from 0xPolygonHermez/release/v0.5.12

Release/v0.5.12

docker-compose.yml

@@ -107,7 +107,7 @@ services:
   zkevm-prover:
     container_name: zkevm-prover
     restart: unless-stopped
-    image: hermeznetwork/zkevm-prover:v4.0.4
+    image: hermeznetwork/zkevm-prover:v4.0.14
     depends_on:
       zkevm-state-db:
         condition: service_healthy

event/event.go

@@ -42,6 +42,11 @@ const (
 	EventID_SynchronizerHalt EventID = "SYNCHRONIZER HALT"
 	// EventID_SequenceSenderHalt is triggered when the SequenceSender halts
 	EventID_SequenceSenderHalt EventID = "SEQUENCESENDER HALT"
+	// EventID_UnsupportedPrecompile is triggered when the executor returns an unsupported precompile error
+	EventID_UnsupportedPrecompile EventID = "UNSUPPORTED PRECOMPILE"
+
+	// EventID_NodeOOC is triggered when an OOC at node level is detected
+	EventID_NodeOOC EventID = "NODE OOC"
 	// Source_Node is the source of the event
 	Source_Node Source = "node"
 

jsonrpc/endpoints_eth.go

@@ -106,7 +106,7 @@ func (e *EthEndpoints) Call(arg *types.TxArgs, blockArg *types.BlockNumberOrHash
 		result, err := e.state.ProcessUnsignedTransaction(ctx, tx, sender, blockToProcess, true, dbTx)
 		if err != nil {
 			errMsg := fmt.Sprintf("failed to execute the unsigned transaction: %v", err.Error())
-			logError := !executor.IsROMOutOfCountersError(executor.RomErrorCode(err)) && !errors.Is(err, runtime.ErrOutOfGas)
+			logError := !executor.IsROMOutOfCountersError(executor.RomErrorCode(err)) && !(errors.Is(err, runtime.ErrOutOfGas) || errors.Is(err, runtime.ErrExecutorErrorOOG2))
 			return RPCErrorResponse(types.DefaultErrorCode, errMsg, nil, logError)
 		}
 

pool/pool.go

@@ -298,7 +298,7 @@ func (p *Pool) preExecuteTx(ctx context.Context, tx types.Transaction) (preExecu
 	processBatchResponse, err := p.state.PreProcessTransaction(ctx, &tx, nil)
 	if err != nil {
 		isOOC := executor.IsROMOutOfCountersError(executor.RomErrorCode(err))
-		isOOG := errors.Is(err, runtime.ErrOutOfGas)
+		isOOG := errors.Is(err, runtime.ErrOutOfGas) || errors.Is(err, runtime.ErrExecutorErrorOOG2)
 		if !isOOC && !isOOG {
 			return response, err
 		} else {
@@ -324,7 +324,7 @@ func (p *Pool) preExecuteTx(ctx context.Context, tx types.Transaction) (preExecu
 			if executor.IsROMOutOfCountersError(executor.RomErrorCode(errorToCheck)) {
 				response.OOCError = err
 			}
-			if errors.Is(errorToCheck, runtime.ErrOutOfGas) {
+			if errors.Is(errorToCheck, runtime.ErrOutOfGas) || errors.Is(errorToCheck, runtime.ErrExecutorErrorOOG2) {
 				response.OOGError = err
 			}
 		} else {

proto/src/proto/executor/v1/executor.proto

@@ -292,6 +292,7 @@ message ProcessBatchRequestV2 {
     // prior to executing the call.
     map<string, OverrideAccountV2> state_override = 23;
     DebugV2 debug = 24;
+    uint64 execution_mode = 25;   
 }
 
 message L1DataV2 {
@@ -854,4 +855,18 @@ enum ExecutorError {
     EXECUTOR_ERROR_INVALID_L1_INFO_TREE_INDEX = 111;
     // EXECUTOR_ERROR_INVALID_L1_INFO_TREE_SMT_PROOF_VALUE indicates that the ROM asked for an L1InfoTree SMT proof that was not present in the input
     EXECUTOR_ERROR_INVALID_L1_INFO_TREE_SMT_PROOF_VALUE = 112;
+    // EXECUTOR_ERROR_INVALID_WITNESS indicates that the provided witness data is invalid
+    EXECUTOR_ERROR_INVALID_WITNESS = 113;
+    // EXECUTOR_ERROR_INVALID_CBOR indicates that the provided CBOR data is invalid
+    EXECUTOR_ERROR_INVALID_CBOR = 114;
+    // EXECUTOR_ERROR_INVALID_DATA_STREAM indicates that the provided data stream data is invalid
+    EXECUTOR_ERROR_INVALID_DATA_STREAM = 115;
+    // EXECUTOR_ERROR_INVALID_UPDATE_MERKLE_TREE indicates that the provided update merkle tree is invalid, e.g. because the executor is configured not to write to database
+    EXECUTOR_ERROR_INVALID_UPDATE_MERKLE_TREE = 116;
+    // EXECUTOR_ERROR_UNSUPPORTED_PRECOMPILED indicates that an unsupported precompiled has been used
+    EXECUTOR_ERROR_UNSUPPORTED_PRECOMPILED = 117;
+    // EXECUTOR_ERROR_OOG_2 indicates that an out of gas has occurred
+    EXECUTOR_ERROR_OOG_2 = 118;
+    // EXECUTOR_ERROR_CLOSE_BATCH indicates that batch must be closed
+    EXECUTOR_ERROR_CLOSE_BATCH = 119;
 }

sequencer/batch.go

@@ -3,6 +3,7 @@ package sequencer
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"time"
 
@@ -11,6 +12,8 @@ import (
 	"github.com/0xPolygonHermez/zkevm-node/sequencer/metrics"
 	"github.com/0xPolygonHermez/zkevm-node/state"
 	stateMetrics "github.com/0xPolygonHermez/zkevm-node/state/metrics"
+	"github.com/0xPolygonHermez/zkevm-node/state/runtime"
+	"github.com/0xPolygonHermez/zkevm-node/state/runtime/executor"
 	"github.com/ethereum/go-ethereum/common"
 )
 
@@ -305,6 +308,11 @@ func (f *finalizer) openNewWIPBatch(ctx context.Context, batchNumber uint64, sta
 
 // closeWIPBatch closes the current batch in the state
 func (f *finalizer) closeWIPBatch(ctx context.Context) error {
+	// Sanity check: batch must not be empty (should have L2 blocks)
+	if f.wipBatch.isEmpty() {
+		f.Halt(ctx, fmt.Errorf("closing WIP batch %d without L2 blocks and should have at least 1", f.wipBatch.batchNumber), false)
+	}
+
 	usedResources := getUsedBatchResources(f.batchConstraints, f.wipBatch.imRemainingResources)
 	receipt := state.ProcessingReceipt{
 		BatchNumber:    f.wipBatch.batchNumber,
@@ -346,12 +354,16 @@ func (f *finalizer) batchSanityCheck(ctx context.Context, batchNum uint64, initi
 
 		// Log batch detailed info
 		log.Errorf("batch %d sanity check error: initialStateRoot: %s, expectedNewStateRoot: %s", batch.BatchNumber, initialStateRoot, expectedNewStateRoot)
-		for i, rawL2block := range rawL2Blocks.Blocks {
-			log.Infof("block[%d], txs: %d, deltaTimestamp: %d, l1InfoTreeIndex: %d", i, len(rawL2block.Transactions), rawL2block.DeltaTimestamp, rawL2block.IndexL1InfoTree)
-			for j, rawTx := range rawL2block.Transactions {
-				log.Infof("block[%d].tx[%d]: %s, egpPct: %d", batch.BatchNumber, i, j, rawTx.Tx.Hash(), rawTx.EfficiencyPercentage)
+		batchLog := ""
+		totalTxs := 0
+		for blockIdx, rawL2block := range rawL2Blocks.Blocks {
+			totalTxs += len(rawL2block.Transactions)
+			batchLog += fmt.Sprintf("block[%d], txs: %d, deltaTimestamp: %d, l1InfoTreeIndex: %d\n", blockIdx, len(rawL2block.Transactions), rawL2block.DeltaTimestamp, rawL2block.IndexL1InfoTree)
+			for txIdx, rawTx := range rawL2block.Transactions {
+				batchLog += fmt.Sprintf("   tx[%d]: %s, egpPct: %d\n", txIdx, rawTx.Tx.Hash(), rawTx.EfficiencyPercentage)
 			}
 		}
+		log.Infof("DUMP batch %d, blocks: %d, txs: %d\n%s", batch.BatchNumber, len(rawL2Blocks.Blocks), totalTxs, batchLog)
 
 		f.Halt(ctx, fmt.Errorf("batch sanity check error. Check previous errors in logs to know which was the cause"), false)
 	}
@@ -371,14 +383,15 @@ func (f *finalizer) batchSanityCheck(ctx context.Context, batchNum uint64, initi
 
 	batchRequest := state.ProcessRequest{
 		BatchNumber:             batch.BatchNumber,
-		L1InfoRoot_V2:           mockL1InfoRoot,
+		L1InfoRoot_V2:           state.GetMockL1InfoRoot(),
 		OldStateRoot:            initialStateRoot,
 		Transactions:            batch.BatchL2Data,
 		Coinbase:                batch.Coinbase,
 		TimestampLimit_V2:       uint64(time.Now().Unix()),
 		ForkID:                  f.stateIntf.GetForkIDByBatchNumber(batch.BatchNumber),
 		SkipVerifyL1InfoRoot_V2: true,
 		Caller:                  caller,
+		ExecutionMode:           executor.ExecutionMode0,
 	}
 	batchRequest.L1InfoTreeData_V2, _, _, err = f.stateIntf.GetL1InfoTreeDataFromBatchL2Data(ctx, batch.BatchL2Data, nil)
 	if err != nil {
@@ -399,7 +412,7 @@ func (f *finalizer) batchSanityCheck(ctx context.Context, batchNum uint64, initi
 		return nil, ErrProcessBatch
 	}
 
-	if batchResponse.ExecutorError != nil {
+	if batchResponse.ExecutorError != nil && !errors.Is(batchResponse.ExecutorError, runtime.ErrExecutorErrorCloseBatch) {
 		log.Errorf("executor error when reprocessing batch %d, error: %v", batch.BatchNumber, batchResponse.ExecutorError)
 		reprocessError(batch)
 		return nil, ErrExecutorError