From af734fcb358ae16b6c23c86fa8fbe199a449cf14 Mon Sep 17 00:00:00 2001 From: krlosMata Date: Thu, 2 Mar 2023 14:01:22 +0100 Subject: [PATCH] update to forkid 2 & fix comments --- main/constants.zkasm | 2 +- main/load-tx-rlp.zkasm | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/constants.zkasm b/main/constants.zkasm index 8f3697f8..216975d1 100644 --- a/main/constants.zkasm +++ b/main/constants.zkasm @@ -9,7 +9,7 @@ CONST %LOCAL_EXIT_ROOT_STORAGE_POS = 1 CONST %LAST_TX_STORAGE_POS = 0 CONST %STATE_ROOT_STORAGE_POS = 1 CONST %MAX_MEM_EXPANSION_BYTES = 0x3fffe0 -CONST %FORK_ID = 1 +CONST %FORK_ID = 2 ; RLP CONST %MIN_VALUE_SHORT = 128 diff --git a/main/load-tx-rlp.zkasm b/main/load-tx-rlp.zkasm index 10737d02..fc96871b 100644 --- a/main/load-tx-rlp.zkasm +++ b/main/load-tx-rlp.zkasm @@ -34,7 +34,7 @@ loadTx_rlp: :CALL(addBatchHashData) A - 0xc0 :JMPN(invalidTxRLP) A - 0xf8 :JMPN(shortList) - ; do not allow lists over 2**24 bytes + ; do not allow lists over 2**24 bits ; Transaction could not have more than 300.000 due to smart contract limitation (keccaks counters) ; meaning that the RLP encoding is wrong A - 0xfb :JMPN(longList, invalidTxRLP) @@ -171,7 +171,7 @@ dataREAD: A - 0x80 :JMPN(veryShortData) A - 0x81 :JMPN(endData) A - 0xb8 :JMPN(shortData) - ; do not allow string over 2**24 bytes + ; do not allow string over 2**24 bits ; Transaction could not have more than 300.000 due to smart contract limitation (keccaks counters) ; meaning that the RLP encoding is wrong A - 0xbb :JMPN(longData, invalidTxRLP) diff --git a/package.json b/package.json index 8500ede4..2d3ef872 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ }, "devDependencies": { "@0xpolygonhermez/zkevm-proverjs": "github:0xPolygonHermez/zkevm-proverjs#864399e9e78ac6a24601c0e620909e1be02110aa", - "@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#feature/add-test-mstorex", + "@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#feature/update-forkid-2", "chai": "^4.3.6", "chalk": "^3.0.0", "eslint": "^8.25.0",