immediate batch seal flag for counter overflows (#1415)

0xPolygonHermez · Nov 5, 2024 · 1ce7d81 · 1ce7d81
1 parent eefe88a
commit 1ce7d81
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 11 deletions.
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -683,6 +683,11 @@ var (
 		Usage: "The interval at which the sequencer checks the L1 for new GER information",
 		Value: 1 * time.Minute,
 	}
+	SealBatchImmediatelyOnOverflow = cli.BoolFlag{
+		Name:  "zkevm.seal-batch-immediately-on-overflow",
+		Usage: "Seal the batch immediately when detecting a counter overflow",
+		Value: false,
+	}
 	ACLPrintHistory = cli.IntFlag{
 		Name:  "acl.print-history",
 		Usage: "Number of entries to print from the ACL history on node start up",

diff --git a/eth/ethconfig/config_zkevm.go b/eth/ethconfig/config_zkevm.go
@@ -82,9 +82,10 @@ type Zk struct {
 
 	TxPoolRejectSmartContractDeployments bool
 
-	ACLPrintHistory        int
-	InfoTreeUpdateInterval time.Duration
-	BadBatches []uint64
+	ACLPrintHistory                int
+	InfoTreeUpdateInterval         time.Duration
+	BadBatches                     []uint64
+	SealBatchImmediatelyOnOverflow bool
 }
 
 var DefaultZkConfig = &Zk{}

diff --git a/turbo/cli/default_flags.go b/turbo/cli/default_flags.go
@@ -234,9 +234,9 @@ var DefaultFlags = []cli.Flag{
 	&utils.DisableVirtualCounters,
 	&utils.DAUrl,
 	&utils.VirtualCountersSmtReduction,
-
 
 	&utils.ACLPrintHistory,
 	&utils.InfoTreeUpdateInterval,
 	&utils.BadBatches,
+	&utils.SealBatchImmediatelyOnOverflow,
 }
diff --git a/turbo/cli/flags_zkevm.go b/turbo/cli/flags_zkevm.go
@@ -192,10 +192,11 @@ func ApplyFlagsForZkConfig(ctx *cli.Context, cfg *ethconfig.Config) {
 		DataStreamWriteTimeout:                 ctx.Duration(utils.DataStreamWriteTimeout.Name),
 		DataStreamInactivityTimeout:            ctx.Duration(utils.DataStreamInactivityTimeout.Name),
 		VirtualCountersSmtReduction:            ctx.Float64(utils.VirtualCountersSmtReduction.Name),
-
-		ACLPrintHistory:                        ctx.Int(utils.ACLPrintHistory.Name),
-		InfoTreeUpdateInterval:                 ctx.Duration(utils.InfoTreeUpdateInterval.Name),
-		BadBatches:                             badBatches,
+
+		ACLPrintHistory:                ctx.Int(utils.ACLPrintHistory.Name),
+		InfoTreeUpdateInterval:         ctx.Duration(utils.InfoTreeUpdateInterval.Name),
+		BadBatches:                     badBatches,
+		SealBatchImmediatelyOnOverflow: ctx.Bool(utils.SealBatchImmediatelyOnOverflow.Name),
 	}
 
 	utils2.EnableTimer(cfg.DebugTimers)

diff --git a/zk/debug_tools/test-contracts/contracts/KeccakLoop.sol b/zk/debug_tools/test-contracts/contracts/KeccakLoop.sol
@@ -0,0 +1,10 @@
+pragma solidity >=0.8.10;
+
+// 1616 for legacy, 226 for erigon -> 1198 -> 246
+contract KeccakLoop {
+    constructor () {
+        for(uint256 i = 0; i < 200; i++) {
+            keccak256(new bytes(i));
+        }
+    }
+}
diff --git a/zk/debug_tools/test-contracts/package.json b/zk/debug_tools/test-contracts/package.json
@@ -18,7 +18,8 @@
     "erc20Revert:local": "npx hardhat compile && npx hardhat run scripts/ERC20-revert.js --network local",
     "erc20Revert:sepolia": "npx hardhat compile && npx hardhat run scripts/ERC20-revert.js --network sepolia",
     "chainCall:local": "npx hardhat compile && npx hardhat run scripts/chain-call.js --network local",
-    "chainCall:sepolia": "npx hardhat compile && npx hardhat run scripts/chain-call.js --network sepolia"
+    "chainCall:sepolia": "npx hardhat compile && npx hardhat run scripts/chain-call.js --network sepolia",
+    "keccak:local": "npx hardhat compile && npx hardhat run scripts/keccak-loop.js --network local"
   },
   "keywords": [],
   "author": "",

diff --git a/zk/debug_tools/test-contracts/scripts/keccak-loop.js b/zk/debug_tools/test-contracts/scripts/keccak-loop.js
@@ -0,0 +1,26 @@
+async function main() {
+try {
+   // Get the ContractFactory of your KeccakLoopContract
+   const KeccakLoopContract = await hre.ethers.getContractFactory("KeccakLoop");
+
+   // Deploy the contract
+   const contract = await KeccakLoopContract.deploy();
+   // Wait for the deployment transaction to be mined
+   await contract.waitForDeployment();
+
+   console.log(`KeccakLoop deployed to: ${await contract.getAddress()}`);
+
+  //  const result = await contract.bigLoop(10000);
+  //  console.log(result);
+ } catch (error) {
+   console.error(error);
+   process.exit(1);
+ }
+}
+
+main()
+  .then(() => process.exit(0))
+  .catch(error => {
+    console.error(error);
+    process.exit(1);
+  });
diff --git a/zk/stages/stage_sequence_execute.go b/zk/stages/stage_sequence_execute.go
@@ -324,8 +324,8 @@ func SpawnSequencingStage(
 							} else {
 								batchState.newOverflowTransaction()
 								log.Info(fmt.Sprintf("[%s] transaction %s overflow counters", logPrefix, txHash), "count", batchState.overflowTransactions)
-								if batchState.reachedOverflowTransactionLimit() {
-									log.Info(fmt.Sprintf("[%s] closing batch due to counters", logPrefix), "count", batchState.overflowTransactions)
+								if batchState.reachedOverflowTransactionLimit() || cfg.zk.SealBatchImmediatelyOnOverflow {
+									log.Info(fmt.Sprintf("[%s] closing batch due to counters", logPrefix), "count", batchState.overflowTransactions, "immediate", cfg.zk.SealBatchImmediatelyOnOverflow)
 									runLoopBlocks = false
 									break LOOP_TRANSACTIONS
 								}