write the batch fork id when we detect an upgrade (erigontech#1187)

* write the batch fork id when we detect an upgrade without this we use the previous fork when sending this first batch in the new fork id to the executors * fix batch number arguments for executor stream bytes
cffls · Sep 19, 2024 · 5dab990 · 5dab990
1 parent f2a86f1
commit 5dab990
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/smt/pkg/smt/smt_create.go b/smt/pkg/smt/smt_create.go
@@ -64,7 +64,7 @@ func (s *SMT) GenerateFromKVBulk(ctx context.Context, logPrefix string, nodeKeys
 
 	maxReachedLevel := 0
 
-	deletesWorker := utils.NewWorker(ctx, "smt_save_finished", 1000)
+	deletesWorker := utils.NewWorker(ctx, "smt_save_finished", 5)
 
 	// start a worker to delete finished parts of the tree and return values to save to the db
 	wg := sync.WaitGroup{}

diff --git a/zk/legacy_executor_verifier/legacy_executor_verifier.go b/zk/legacy_executor_verifier/legacy_executor_verifier.go
@@ -443,7 +443,7 @@ func (v *LegacyExecutorVerifier) GetWholeBatchStreamBytes(
 		txsPerBlock[blockNumber] = filteredTransactions
 	}
 
-	entries, err := server.BuildWholeBatchStreamEntriesProto(tx, hermezDb, v.streamServer.GetChainId(), batchNumber, previousBatch, blocks, txsPerBlock, l1InfoTreeMinTimestamps)
+	entries, err := server.BuildWholeBatchStreamEntriesProto(tx, hermezDb, v.streamServer.GetChainId(), previousBatch, batchNumber, blocks, txsPerBlock, l1InfoTreeMinTimestamps)
 	if err != nil {
 		return nil, err
 	}