From 1fe1e8f1f9d36b4a87cbec33b383cdc79b2675d5 Mon Sep 17 00:00:00 2001
From: Ignasi <ignasi@polygon.technology>
Date: Tue, 11 Jun 2024 16:37:22 +0200
Subject: [PATCH] Dont revert touched address on deploy collision

---
 main/utils.zkasm | 4 +++-
 package.json     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/main/utils.zkasm b/main/utils.zkasm
index 9044f3cf..036dcb6a 100644
--- a/main/utils.zkasm
+++ b/main/utils.zkasm
@@ -858,7 +858,9 @@ stackUnderflow:
 stackOverflow:
     $${eventLog(onError, overflow)}                 :JMP(handleError)
 deployAddressCollision:
-    $${eventLog(onError, invalidAddressCollision)}  :JMP(handleError)
+    ; In case deployAddressCollision error, touched addresses are not reverted
+    $${eventLog(onError, invalidAddressCollision)}  :CALL(checkpointTouched)
+                                                    :JMP(handleError)
 invalidStaticTx:
     $${eventLog(onError, invalidStaticTx)}          :JMP(handleError)
 invalidCodeSize:
diff --git a/package.json b/package.json
index 123cf032..72f1326c 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#v6.0.1-fork.9",
+    "@0xpolygonhermez/zkevm-testvectors": "github:0xPolygonHermez/zkevm-testvectors#feature/address-collision",
     "chai": "^4.3.6",
     "chalk": "^3.0.0",
     "eslint": "^8.25.0",