Merge pull request #395 from 0xPolygonHermez/feature/banana-25

Banana N=25 - fork 12
0xPolygonHermez · Aug 5, 2024 · d1e5af2 · d1e5af2
2 parents c93c1eb + ee8acbe
commit d1e5af2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/main/constants.zkasm b/main/constants.zkasm
@@ -6,7 +6,7 @@ CONST %BATCH_DIFFICULTY = 0
 CONST %TX_GAS_LIMIT = 30000000
 CONSTL %BLOCK_GAS_LIMIT = 2**50
 CONST %MAX_MEM_EXPANSION_BYTES = 0x3fffe0
-CONST %FORK_ID = 9
+CONST %FORK_ID = 12
 CONST %L1INFO_TREE_LEVELS = 32
 CONST %CALLDATA_RESERVED_CTX = 1
 CONSTL %FOUR_GOLDILOCKS = 0xffffffff00000001ffffffff00000001ffffffff00000001ffffffff00000001n
@@ -103,7 +103,7 @@ CONST %SSTORE_CLEARS_SCHEDULE = 15000
 
 ; COUNTERS
 CONST %MIN_STEPS_FINISH_BATCH = 200 ; min steps to finish tx
-CONST %TOTAL_STEPS_LIMIT = 2**23
+CONST %TOTAL_STEPS_LIMIT = 2**25
 
 CONST %MAX_CNT_STEPS_LIMIT = %TOTAL_STEPS_LIMIT - %MIN_STEPS_FINISH_BATCH
 CONST %MAX_CNT_ARITH_LIMIT = %TOTAL_STEPS_LIMIT / 32
@@ -114,7 +114,7 @@ CONST %MAX_CNT_PADDING_PG_LIMIT = (%TOTAL_STEPS_LIMIT / 56)
 CONST %MAX_CNT_POSEIDON_G_LIMIT = (%TOTAL_STEPS_LIMIT / 30)
 CONST %MAX_CNT_SHA256_F_LIMIT = ((%TOTAL_STEPS_LIMIT - 1) / 31488) * 7
 
-CONST %SAFE_RANGE = 20 ; safe guard counters to not take into account (%RANGE = 1 / SAFE_RANGE)
+CONST %SAFE_RANGE = 80 ; safe guard counters to not take into account (%RANGE = 1 / SAFE_RANGE)
 
 CONST %MAX_CNT_STEPS = %MAX_CNT_STEPS_LIMIT - (%MAX_CNT_STEPS_LIMIT / %SAFE_RANGE)
 CONST %MAX_CNT_ARITH = %MAX_CNT_ARITH_LIMIT - (%MAX_CNT_ARITH_LIMIT / %SAFE_RANGE)

diff --git a/package.json b/package.json
@@ -43,9 +43,9 @@
     "yargs": "^17.5.1"
   },
   "devDependencies": {
-    "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#v6.0.0-fork.9",
+    "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#v8.0.0-rc.1-fork.12",
     "@0xpolygonhermez/zkevm-proverjs": "github:0xPolygonHermez/zkevm-proverjs#39508f69cb191487a065ffbf76c647cd83b59720",
-    "@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#develop",
+    "@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#v8.0.0-rc.2-fork.12",
     "chai": "^4.3.6",
     "chalk": "^3.0.0",
     "eslint": "^8.25.0",

diff --git a/tools/parallel-testing/parallel-tests-sample/sample.test.js b/tools/parallel-testing/parallel-tests-sample/sample.test.js
@@ -13,7 +13,7 @@ const smMain = require('@0xpolygonhermez/zkevm-proverjs/src/sm/sm_main/sm_main')
 
 let rom = require('../../../build/rom.json');
 
-let stepsN = 2 ** 23;
+let stepsN = 2 ** 25;
 let counters = false;
 
 const fileCachePil = path.join(__dirname, '../../../node_modules/@0xpolygonhermez/zkevm-proverjs/cache-main-pil.json');