Merge branch 'dev' into zjg/merge-v2.61.13-RC1-fix-ut

okx · Feb 14, 2025 · 0e16ac8 · 0e16ac8
2 parents 1e5d061 + 113b604
commit 0e16ac8
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/zk/l1infotree/updater.go b/zk/l1infotree/updater.go
@@ -137,10 +137,13 @@ LOOP:
 	ticker := time.NewTicker(10 * time.Second)
 	defer ticker.Stop()
 	processed := 0
-
-	tree, err := InitialiseL1InfoTree(hermezDb)
-	if err != nil {
-		return nil, fmt.Errorf("InitialiseL1InfoTree: %w", err)
+	var tree *L1InfoTree
+	if len(allLogs) > 0 {
+		log.Info(fmt.Sprintf("[%s] Checking for L1 info tree updates, logs count:%v", logPrefix, len(allLogs)))
+		tree, err = InitialiseL1InfoTree(hermezDb)
+		if err != nil {
+			return nil, fmt.Errorf("InitialiseL1InfoTree: %w", err)
+		}
 	}
 
 	// process the logs in chunks

diff --git a/zk/metrics/statistics_xlayer.go b/zk/metrics/statistics_xlayer.go
@@ -18,6 +18,7 @@ const (
 	FailTxResourceOverCounter     logTag = "FailTxResourceOverCounter"
 	BatchGas                      logTag = "BatchGas"
 	ProcessingTxTiming            logTag = "ProcessingTxTiming"
+	ProcessingPauseTiming         logTag = "ProcessingPauseTiming"
 	ProcessingInvalidTxCounter    logTag = "ProcessingInvalidTxCounter"
 	FinalizeBatchNumber           logTag = "FinalizeBatchNumber"
 	BatchCommitDBTiming           logTag = "BatchCommitDBTiming"

diff --git a/zk/metrics/statisticsimpl_xlayer.go b/zk/metrics/statisticsimpl_xlayer.go
@@ -61,14 +61,15 @@ func (l *statisticsInstance) Summary() string {
 	zkOverflowBlock := "ZKOverflowBlock<" + strconv.Itoa(int(l.statistics[ZKOverflowBlockCounter])) + ">, "
 	invalidTx := "InvalidTx<" + strconv.Itoa(int(l.statistics[ProcessingInvalidTxCounter])) + ">, "
 	processTxTiming := "ProcessTx<" + strconv.Itoa(int(l.statistics[ProcessingTxTiming])) + "ms>, "
+	processTxPauseTiming := "ProcessTxPauseTiming<" + strconv.Itoa(int(l.statistics[ProcessingPauseTiming])) + "ms>, "
 	batchCommitDBTiming := "BatchCommitDBTiming<" + strconv.Itoa(int(l.statistics[BatchCommitDBTiming])) + "ms>, "
 	pbStateTiming := "PbStateTiming<" + strconv.Itoa(int(l.statistics[PbStateTiming])) + "ms>, "
 	zkIncIntermediateHashesTiming := "ZkIncIntermediateHashesTiming<" + strconv.Itoa(int(l.statistics[ZkIncIntermediateHashesTiming])) + "ms>, "
 	finaliseBlockWriteTiming := "FinaliseBlockWriteTiming<" + strconv.Itoa(int(l.statistics[FinaliseBlockWriteTiming])) + "ms>, "
 	batchCloseReason := "BatchCloseReason<" + l.tags[BatchCloseReason] + ">"
 
 	result := batch + totalDuration + gasUsed + blockCount + tx + getTx + getTxPause + getTxPauseTiming +
-		reprocessTx + resourceOverTx + zkOverflowBlock + invalidTx + processTxTiming + pbStateTiming +
+		reprocessTx + resourceOverTx + zkOverflowBlock + invalidTx + processTxTiming + processTxPauseTiming + pbStateTiming +
 		zkIncIntermediateHashesTiming + finaliseBlockWriteTiming + batchCommitDBTiming +
 		batchCloseReason
 	log.Info(result)

diff --git a/zk/metrics/statisticsimpl_xlayer_test.go b/zk/metrics/statisticsimpl_xlayer_test.go
@@ -26,9 +26,10 @@ func TestStatisticsInstanceSummary(t *testing.T) {
 				GetTxPauseTiming:              time.Second.Milliseconds() * 30,
 				ReprocessingTxCounter:         3,
 				FailTxResourceOverCounter:     1,
-				ZKOverflowBlockCounter:                 1,
+				ZKOverflowBlockCounter:        1,
 				ProcessingInvalidTxCounter:    2,
 				ProcessingTxTiming:            time.Second.Milliseconds() * 30,
+				ProcessingPauseTiming:         time.Second.Milliseconds() * 10,
 				BatchCommitDBTiming:           time.Second.Milliseconds() * 10,
 				PbStateTiming:                 time.Second.Milliseconds() * 20,
 				ZkIncIntermediateHashesTiming: time.Second.Milliseconds() * 15,

diff --git a/zk/stages/stage_sequence_execute_blocks.go b/zk/stages/stage_sequence_execute_blocks.go
@@ -187,9 +187,16 @@ func finaliseBlock(
 
 	// For X Layer
 	zkIncStart := time.Now()
+	quit := batchContext.ctx.Done()
+	batchContext.sdb.eridb.OpenBatch(quit)
 	// this is actually the interhashes stage
 	newRoot, err := zkIncrementIntermediateHashes(batchContext.ctx, batchContext.s.LogPrefix(), batchContext.s, batchContext.sdb.tx, batchContext.sdb.eridb, batchContext.sdb.smt, newHeader.Number.Uint64()-1, newHeader.Number.Uint64())
 	if err != nil {
+		batchContext.sdb.eridb.RollbackBatch()
+		return nil, err
+	}
+
+	if err = batchContext.sdb.eridb.CommitBatch(); err != nil {
 		return nil, err
 	}
 

diff --git a/zk/txpool/pool_zk.go b/zk/txpool/pool_zk.go
@@ -93,7 +93,7 @@ func (p *TxPool) onSenderStateChange(senderID uint64, senderNonce uint64, sender
 				if dGp != nil {
 					newGpBig = newGpBig.Mul(dGp, big.NewInt(int64(gpMul)))
 				}
-				log.Debug(fmt.Sprintf("Free tx: nonce:%d, type %d. dGp:%v, factor:%d, newGp:%d", mt.Tx.Nonce, freeType, dGp, gpMul, newGpBig))
+				//log.Debug(fmt.Sprintf("Free tx: nonce:%d, type %d. dGp:%v, factor:%d, newGp:%d", mt.Tx.Nonce, freeType, dGp, gpMul, newGpBig))
 			}
 
 			mt.minTip = newGpBig.Uint64()