execution mode (#3285)

* execution mode * execution mode * execution mode
0xPolygonHermez · Feb 16, 2024 · ca5a2c2 · ca5a2c2
1 parent f968d8b
commit ca5a2c2
Show file tree

Hide file tree

Showing 15 changed files with 806 additions and 763 deletions.
diff --git a/proto/src/proto/executor/v1/executor.proto b/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 {

diff --git a/sequencer/batch.go b/sequencer/batch.go
@@ -13,6 +13,7 @@ import (
 	"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"
 )
 
@@ -386,6 +387,7 @@ func (f *finalizer) batchSanityCheck(ctx context.Context, batchNum uint64, initi
 		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 {

diff --git a/sequencer/finalizer.go b/sequencer/finalizer.go
@@ -366,6 +366,7 @@ func (f *finalizer) processTransaction(ctx context.Context, tx *TxTracker, first
 		SkipWriteBlockInfoRoot_V2: true,
 		SkipVerifyL1InfoRoot_V2:   true,
 		L1InfoTreeData_V2:         map[uint32]state.L1DataV2{},
+		ExecutionMode:             executor.ExecutionMode0,
 	}
 
 	txGasPrice := tx.GasPrice

diff --git a/sequencer/forcedbatch.go b/sequencer/forcedbatch.go
@@ -8,6 +8,7 @@ import (
 	"github.com/0xPolygonHermez/zkevm-node/log"
 	"github.com/0xPolygonHermez/zkevm-node/state"
 	stateMetrics "github.com/0xPolygonHermez/zkevm-node/state/metrics"
+	"github.com/0xPolygonHermez/zkevm-node/state/runtime/executor"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/jackc/pgx/v4"
 )
@@ -105,6 +106,7 @@ func (f *finalizer) processForcedBatch(ctx context.Context, forcedBatch state.Fo
 		ForkID:                  f.stateIntf.GetForkIDByBatchNumber(lastBatchNumber),
 		SkipVerifyL1InfoRoot_V2: true,
 		Caller:                  stateMetrics.SequencerCallerLabel,
+		ExecutionMode:           executor.ExecutionMode0,
 	}
 
 	batchResponse, err := f.stateIntf.ProcessBatchV2(ctx, batchRequest, true)

diff --git a/sequencer/l2block.go b/sequencer/l2block.go
@@ -13,6 +13,7 @@ import (
 	"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"
 )
 
@@ -262,6 +263,7 @@ func (f *finalizer) executeL2Block(ctx context.Context, initialStateRoot common.
 		ForkID:                    f.stateIntf.GetForkIDByBatchNumber(f.wipBatch.batchNumber),
 		SkipVerifyL1InfoRoot_V2:   true,
 		L1InfoTreeData_V2:         map[uint32]state.L1DataV2{},
+		ExecutionMode:             executor.ExecutionMode0,
 	}
 	batchRequest.L1InfoTreeData_V2[l2Block.l1InfoTreeExitRoot.L1InfoTreeIndex] = state.L1DataV2{
 		GlobalExitRoot: l2Block.l1InfoTreeExitRoot.GlobalExitRoot.GlobalExitRoot,
@@ -545,6 +547,7 @@ func (f *finalizer) executeNewWIPL2Block(ctx context.Context) (*state.ProcessBat
 		SkipFirstChangeL2Block_V2: false,
 		Transactions:              f.stateIntf.BuildChangeL2Block(f.wipL2Block.deltaTimestamp, f.wipL2Block.getL1InfoTreeIndex()),
 		L1InfoTreeData_V2:         map[uint32]state.L1DataV2{},
+		ExecutionMode:             executor.ExecutionMode0,
 	}
 
 	batchRequest.L1InfoTreeData_V2[f.wipL2Block.l1InfoTreeExitRoot.L1InfoTreeIndex] = state.L1DataV2{

diff --git a/state/batchV2.go b/state/batchV2.go
@@ -33,6 +33,7 @@ type ProcessingContextV2 struct {
 	ForcedBlockHashL1    *common.Hash
 	SkipVerifyL1InfoRoot uint32
 	GlobalExitRoot       common.Hash // GlobalExitRoot is not use for execute but use to OpenBatch (data on  DB)
+	ExecutionMode        uint64
 }
 
 // ProcessBatchV2 processes a batch for forkID >= ETROG
@@ -67,6 +68,7 @@ func (s *State) ProcessBatchV2(ctx context.Context, request ProcessRequest, upda
 		ChainId:           s.cfg.ChainID,
 		ForkId:            request.ForkID,
 		ContextId:         uuid.NewString(),
+		ExecutionMode:     request.ExecutionMode,
 	}
 
 	if request.SkipFirstChangeL2Block_V2 {
@@ -129,6 +131,7 @@ func (s *State) ExecuteBatchV2(ctx context.Context, batch Batch, L1InfoTreeRoot
 		ForkId:               forkId,
 		ContextId:            uuid.NewString(),
 		SkipVerifyL1InfoRoot: skipVerifyL1InfoRoot,
+		ExecutionMode:        executor.ExecutionMode1,
 	}
 
 	if forcedBlockHashL1 != nil {
@@ -229,6 +232,7 @@ func (s *State) processBatchV2(ctx context.Context, processingCtx *ProcessingCon
 		ContextId:            uuid.NewString(),
 		SkipVerifyL1InfoRoot: processingCtx.SkipVerifyL1InfoRoot,
 		L1InfoRoot:           processingCtx.L1InfoRoot.Bytes(),
+		ExecutionMode:        processingCtx.ExecutionMode,
 	}
 
 	if processingCtx.ForcedBlockHashL1 != nil {

diff --git a/state/runtime/executor/client.go b/state/runtime/executor/client.go
@@ -10,6 +10,13 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 )
 
+const (
+	// ExecutionMode0 is the execution mode for the sequencer and RPC, default one
+	ExecutionMode0 = uint64(0)
+	// ExecutionMode1 is the execution mode for the synchronizer
+	ExecutionMode1 = uint64(1)
+)
+
 // NewExecutorClient is the executor client constructor.
 func NewExecutorClient(ctx context.Context, c Config) (ExecutorServiceClient, *grpc.ClientConn, context.CancelFunc) {
 	opts := []grpc.DialOption{