Integrate the zkevm-node v0.7.0 changes (#146)

* Update DS Format (0xPolygonHermez#3608) * protobuf datastream * proto batch end (0xPolygonHermez#3612) * fix genesis DS (0xPolygonHermez#3615) * Fix DSSendL2Block batch number (0xPolygonHermez#3617) * Fix DSSendL2Block batch number * latest proto (0xPolygonHermez#3620) * Fix DSSendBatchEnd (0xPolygonHermez#3621) * add TxFeeCap config (0xPolygonHermez#3611) * Add delay when getting storedFlushId from the executor/hashdb (0xPolygonHermez#3625) * Add sleep delay when getting storedFlushId from the executor/hashdb * update config doc * Fix use of L2coinbase configured in sequencesender.L2Coinbase parameter (0xPolygonHermez#3642) * fix use l2coinbase configured in sequencesender.L2Coinbase parameter * update doc * Feature/3640 synchronizer choose to sync from l2 (0xPolygonHermez#3641) * 0xPolygonHermez#3640. New Param Synchronizer.L2Synchronization.Enable to choose if sync from L2 * change synchronization config params 'Enable' to 'Enabled' (0xPolygonHermez#3656) * change 'Enable' to 'Enabled' on sync config and changed comments * Cherry-pick 0xPolygonHermez#3650: Do fatal when datastream channel is full (workaround to fix datastream blocking issue) (0xPolygonHermez#3654) * Do fatal when datastream channel is full (workaround to fix datastream blocking issue) (0xPolygonHermez#3650) * Do fatal when datastream channel is full (this will restart sequencer automatically) * update datastream library (more ds-debug logs) * fix decrease DataToStreamChannelCount * add optimistic gas computation while estimating gas (0xPolygonHermez#3653) * Use Eth block hash for l2 blocks in data stream (0xPolygonHermez#3661) * Use Eth block hash for l2 blocks in data stream * handle minTimestamp * empty imStateRoot (0xPolygonHermez#3663) * empty imStateRoot * fix comment * Cherry-pick 0xPolygonHermez#3659,0xPolygonHermez#3662: Remove sync with virtual state (synchronizer). Add L1 block confirmations (0xPolygonHermez#3666) * Remove sync with virtual state (synchronizer). Add L1 block confirmat… (0xPolygonHermez#3659) * Remove sync with virtual state (synchronizer). Add L1 block confirmations to consider sequence final * fix get monitored tx receipt * update doc * Skip wait L1 block confirmations after restart (0xPolygonHermez#3662) * skip wait L1 block confirmations after restart * skip checking last batch sequenced in SC after restart * set default value of SequenceL1BlockConfirmations to 32 * set default value of SequenceL1BlockConfirmations to 2 for debug/test * fix config_test * fix doc * remove db tx from RPC (0xPolygonHermez#3648) (0xPolygonHermez#3683) * remove synchronizer dependency from eth tx manager to confirm monitored tx (0xPolygonHermez#3658) (0xPolygonHermez#3677) * Cherry-pick 0xPolygonHermez#3669: Add WriteTimeout config parameter to StreamServer (0xPolygonHermez#3690) * Add WriteTimeout config parameter to StreamServer (0xPolygonHermez#3669) * Add WriteTimeout config parameter to StreamServer. Update DS library * update doc * update default value for StreamServer.WriteTimeout config parameter. Increase buffer for datastream channel * fix doc * fix config test * fix doc * change imstateroot handling in DS (0xPolygonHermez#3698) * change imstateroot handling in DS * Fix tests * Generate node config doc * Update the diff --------- Co-authored-by: Toni Ramírez <58293609+ToniRamirezM@users.noreply.github.com> Co-authored-by: agnusmor <100322135+agnusmor@users.noreply.github.com> Co-authored-by: Thiago Coimbra Lemos <tclemos@users.noreply.github.com> Co-authored-by: Joan Esteban <129153821+joanestebanr@users.noreply.github.com>
0xPolygon · Jul 2, 2024 · 44863ea · 44863ea
1 parent d8e6026
commit 44863ea
Show file tree

Hide file tree

Showing 64 changed files with 53,943 additions and 281,497 deletions.
diff --git a/Makefile b/Makefile
@@ -164,6 +164,7 @@ generate-code-from-proto: ## Generates code from proto files
 	cd proto/src/proto/hashdb/v1 && protoc --proto_path=. --proto_path=../../../../include --go_out=../../../../../merkletree/hashdb --go-grpc_out=../../../../../merkletree/hashdb --go_opt=paths=source_relative --go-grpc_opt=paths=source_relative hashdb.proto
 	cd proto/src/proto/executor/v1 && protoc --proto_path=. --go_out=../../../../../state/runtime/executor --go-grpc_out=../../../../../state/runtime/executor --go-grpc_opt=paths=source_relative --go_opt=paths=source_relative executor.proto
 	cd proto/src/proto/aggregator/v1 && protoc --proto_path=. --proto_path=../../../../include --go_out=../../../../../aggregator/prover --go-grpc_out=../../../../../aggregator/prover --go-grpc_opt=paths=source_relative --go_opt=paths=source_relative aggregator.proto
+	cd proto/src/proto/datastream/v1 && protoc --proto_path=. --proto_path=../../../../include --go_out=../../../../../state/datastream --go-grpc_out=../../../../../state/datastream --go-grpc_opt=paths=source_relative --go_opt=paths=source_relative datastream.proto
 
 ## Help display.
 ## Pulls comments from beside commands and prints a nicely formatted

diff --git a/cmd/run.go b/cmd/run.go
@@ -507,6 +507,8 @@ func runJSONRPCServer(c config.Config, etherman *etherman.Client, chainID uint64
 }
 
 func createSequencer(cfg config.Config, pool *pool.Pool, st *state.State, etherman *etherman.Client, eventLog *event.EventLog) *sequencer.Sequencer {
+	cfg.Sequencer.L2Coinbase = cfg.SequenceSender.L2Coinbase
+
 	seq, err := sequencer.New(cfg.Sequencer, cfg.State.Batch, cfg.Pool, pool, st, etherman, eventLog)
 	if err != nil {
 		log.Fatal(err)

diff --git a/config/config_test.go b/config/config_test.go
@@ -69,6 +69,18 @@ func Test_Defaults(t *testing.T) {
 			path:          "Synchronizer.L2Synchronization.DataSourcePriority",
 			expectedValue: []dataavailability.DataSourcePriority{"local", "trusted", "external"},
 		},
+		{
+			path:          "Synchronizer.L1BlockCheck.Enabled",
+			expectedValue: true,
+		},
+		{
+			path:          "Synchronizer.L1BlockCheck.PreCheckEnabled",
+			expectedValue: true,
+		},
+		{
+			path:          "Synchronizer.L2Synchronization.Enabled",
+			expectedValue: true,
+		},
 		{
 			path:          "Sequencer.DeletePoolTxsL1BlockConfirmations",
 			expectedValue: uint64(100),
@@ -137,6 +149,10 @@ func Test_Defaults(t *testing.T) {
 			path:          "Sequencer.Finalizer.BatchMaxDeltaTimestamp",
 			expectedValue: types.NewDuration(1800 * time.Second),
 		},
+		{
+			path:          "Sequencer.Finalizer.FlushIdCheckInterval",
+			expectedValue: types.NewDuration(50 * time.Millisecond),
+		},
 		{
 			path:          "Sequencer.Finalizer.Metrics.Interval",
 			expectedValue: types.NewDuration(60 * time.Minute),
@@ -157,6 +173,10 @@ func Test_Defaults(t *testing.T) {
 			path:          "Sequencer.StreamServer.Version",
 			expectedValue: uint8(0),
 		},
+		{
+			path:          "Sequencer.StreamServer.WriteTimeout",
+			expectedValue: types.NewDuration(5 * time.Second),
+		},
 		{
 			path:          "Sequencer.StreamServer.Enabled",
 			expectedValue: false,
@@ -185,6 +205,10 @@ func Test_Defaults(t *testing.T) {
 			path:          "SequenceSender.MaxBatchesForL1",
 			expectedValue: uint64(300),
 		},
+		{
+			path:          "SequenceSender.SequenceL1BlockConfirmations",
+			expectedValue: uint64(32),
+		},
 		{
 			path:          "Etherman.URL",
 			expectedValue: "http://localhost:8545",
@@ -306,6 +330,10 @@ func Test_Defaults(t *testing.T) {
 			path:          "Pool.GlobalQueue",
 			expectedValue: uint64(1024),
 		},
+		{
+			path:          "Pool.TxFeeCap",
+			expectedValue: float64(1),
+		},
 		{
 			path:          "Pool.EffectiveGasPrice.Enabled",
 			expectedValue: false,

diff --git a/config/default.go b/config/default.go
@@ -44,6 +44,7 @@ MinAllowedGasPriceInterval = "5m"
 PollMinAllowedGasPriceInterval = "15s"
 AccountQueue = 64
 GlobalQueue = 1024
+TxFeeCap = 1.0
     [Pool.EffectiveGasPrice]
 	Enabled = false
 	L1GasPriceFactor = 0.25
@@ -107,11 +108,11 @@ L1SynchronizationMode = "sequential"
 L1SyncCheckL2BlockHash = true
 L1SyncCheckL2BlockNumberhModulus = 600
 	[Synchronizer.L1BlockCheck]
-		Enable = true
+		Enabled = true
 		L1SafeBlockPoint = "finalized"
 		L1SafeBlockOffset = 0
 		ForceCheckBeforeStart = true
-		PreCheckEnable = true
+		PreCheckEnabled = true
 		L1PreSafeBlockPoint = "safe"
 		L1PreSafeBlockOffset = 0
 	[Synchronizer.L1ParallelSynchronization]
@@ -128,6 +129,7 @@ L1SyncCheckL2BlockNumberhModulus = 600
 			AceptableInacctivityTime = "5s"
 			ApplyAfterNumRollupReceived = 10
 	[Synchronizer.L2Synchronization]
+		Enabled = true
 		AcceptEmptyClosedBatches = false
 		ReprocessFullBatchOnClose = false
 		CheckLastL2BlockHashOnCloseBatch = true
@@ -151,6 +153,7 @@ StateConsistencyCheckInterval = "5s"
 		L2BlockMaxDeltaTimestamp = "3s"
 		ResourceExhaustedMarginPct = 10
 		StateRootSyncInterval = "3600s"
+		FlushIdCheckInterval = "50ms"
 		HaltOnBatchNumber = 0
 		SequentialBatchSanityCheck = false
 		SequentialProcessL2Block = false
@@ -161,13 +164,15 @@ StateConsistencyCheckInterval = "5s"
 		Port = 0
 		Filename = ""
 		Version = 0
+		WriteTimeout = "5s"
 		Enabled = false
 
 [SequenceSender]
 WaitPeriodSendSequence = "5s"
 LastBatchVirtualizationTimeMaxWaitPeriod = "5s"
 L1BlockTimestampMargin = "30s"
 MaxTxSizeForL1 = 131072
+SequenceL1BlockConfirmations = 32
 L2Coinbase = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
 PrivateKey = {Path = "/pk/sequencer.keystore", Password = "testonly"}
 GasOffset = 80000

diff --git a/config/environments/local/local.node.config.toml b/config/environments/local/local.node.config.toml
@@ -102,6 +102,7 @@ StateConsistencyCheckInterval = "5s"
 		L2BlockMaxDeltaTimestamp = "3s"
 		ResourceExhaustedMarginPct = 10
 		StateRootSyncInterval = "360s"
+		FlushIdCheckInterval = "50ms"
 		HaltOnBatchNumber = 0
 		SequentialBatchSanityCheck = false
 		SequentialProcessL2Block = false
@@ -111,13 +112,15 @@ StateConsistencyCheckInterval = "5s"
 	[Sequencer.StreamServer]
 		Port = 0
 		Filename = ""
+		WriteTimeout = "5s"
 		Enabled = false
 
 [SequenceSender]
 WaitPeriodSendSequence = "5s"
 LastBatchVirtualizationTimeMaxWaitPeriod = "5s"
 L1BlockTimestampMargin = "30s"
 MaxTxSizeForL1 = 131072
+SequenceL1BlockConfirmations = 32
 L2Coinbase = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
 PrivateKey = {Path = "/pk/sequencer.keystore", Password = "testonly"}
 

diff --git a/docs/config-file/node-config-doc.html b/docs/config-file/node-config-doc.html