From eee78e14bde37dea309c1f553b153d858441b906 Mon Sep 17 00:00:00 2001 From: Laia Soler Date: Mon, 22 Jul 2024 17:34:23 +0200 Subject: [PATCH 1/4] N=24 --- main/constants.zkasm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/constants.zkasm b/main/constants.zkasm index ac187c9a..5681e573 100644 --- a/main/constants.zkasm +++ b/main/constants.zkasm @@ -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**24 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 = 40 ; 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) From d4557d22adc3f48a9e8a1dd99e4ff37d2b25503e Mon Sep 17 00:00:00 2001 From: Laia Soler Date: Mon, 22 Jul 2024 17:35:49 +0200 Subject: [PATCH 2/4] Banana N=24 --> fork 13 --- main/constants.zkasm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/constants.zkasm b/main/constants.zkasm index 5681e573..92386b51 100644 --- 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 = 13 CONST %L1INFO_TREE_LEVELS = 32 CONST %CALLDATA_RESERVED_CTX = 1 CONSTL %FOUR_GOLDILOCKS = 0xffffffff00000001ffffffff00000001ffffffff00000001ffffffff00000001n From 7f86207106ab325cc57e7d612b62e88ab1ec27a5 Mon Sep 17 00:00:00 2001 From: Laia Soler Date: Mon, 22 Jul 2024 17:59:24 +0200 Subject: [PATCH 3/4] update test-vectors fork 13 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49b53e29..b2d70b37 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "devDependencies": { "@0xpolygonhermez/zkevm-commonjs": "github:0xPolygonHermez/zkevm-commonjs#v6.0.0-fork.9", "@0xpolygonhermez/zkevm-proverjs": "github:0xPolygonHermez/zkevm-proverjs#39508f69cb191487a065ffbf76c647cd83b59720", - "@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#develop", + "@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#feature/banana-24", "chai": "^4.3.6", "chalk": "^3.0.0", "eslint": "^8.25.0", From 9e90747abec808159dd69768e4f62eabacd781a6 Mon Sep 17 00:00:00 2001 From: Laia Soler Date: Wed, 24 Jul 2024 11:44:57 +0200 Subject: [PATCH 4/4] update sample test parallel --- tools/parallel-testing/parallel-tests-sample/sample.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/parallel-testing/parallel-tests-sample/sample.test.js b/tools/parallel-testing/parallel-tests-sample/sample.test.js index fbc55079..7382a5e2 100644 --- 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 ** 24; let counters = false; const fileCachePil = path.join(__dirname, '../../../node_modules/@0xpolygonhermez/zkevm-proverjs/cache-main-pil.json');