Merge pull request #390 from 0xPolygonHermez/feature/address-collision

Dont revert touched address on deploy collision
0xPolygonHermez · Jul 22, 2024 · c93c1eb · c93c1eb
2 parents 2be6d91 + 9778f2c
commit c93c1eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/main/process-tx.zkasm b/main/process-tx.zkasm
@@ -330,9 +330,9 @@ deploy:
         %MAX_CNT_POSEIDON_G - CNT_POSEIDON_G - %MAX_CNT_POSEIDON_SLOAD_SSTORE*3 :JMPN(outOfCountersPoseidon)
         %MAX_CNT_BINARY - CNT_BINARY - 3                                        :JMPN(outOfCountersBinary)
                                                                                 :CALL(isColdAddress) ; add address to touched addresses
+        A => E                                                                  :CALL(checkpointTouched) ; new address is ward even after error
         ; check if address is deployable ( nonce == bytecode == 0)
-        A => E
-
+        E => A
         ; read nonce
         0 => C
         %SMT_KEY_NONCE => B

diff --git 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#v6.0.1-fork.9",
+    "@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#develop",
     "chai": "^4.3.6",
     "chalk": "^3.0.0",
     "eslint": "^8.25.0",