From 48d3139fef29bcb1728406b74cc725604a2820b1 Mon Sep 17 00:00:00 2001
From: Ed Zynda <ezynda3@gmail.com>
Date: Tue, 10 Dec 2024 11:36:48 +0300
Subject: [PATCH] Deploy to zksync

---
 deployments/_deployments_log_file.json | 22 +++++++++++++++++++++-
 deployments/zksync.json                |  4 ++--
 script/deploy/deploySingleContract.sh  |  2 +-
 script/helperFunctions.sh              |  2 +-
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/deployments/_deployments_log_file.json b/deployments/_deployments_log_file.json
index cf01f11a6..bc1c618b0 100644
--- a/deployments/_deployments_log_file.json
+++ b/deployments/_deployments_log_file.json
@@ -24889,6 +24889,16 @@
             "SALT": "",
             "VERIFIED": "false"
           }
+        ],
+        "1.0.1": [
+          {
+            "ADDRESS": "0x68cb042aD93608e819b699427726e5c5E1A5F2dC",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2024-12-10 11:11:50",
+            "CONSTRUCTOR_ARGS": "0x000000000000000000000000156cebba59deb2cb23742f70dcb0a11cc775591f000000000000000000000000a9bfa49f26733271f4fd34a4b57bb7c563ae056a000000000000000000000000e0b015e54d54fc84a6cb9b666099c46ade9335ff00000000000000000000000000000000000000000000000000000000000186a0",
+            "SALT": "",
+            "VERIFIED": "true"
+          }
         ]
       }
     },
@@ -25181,6 +25191,16 @@
             "SALT": "",
             "VERIFIED": "false"
           }
+        ],
+        "1.2.0": [
+          {
+            "ADDRESS": "0x45C83B209878601d21604301dfE25bD6D0BBC218",
+            "OPTIMIZER_RUNS": "1000000",
+            "TIMESTAMP": "2024-12-10 10:31:33",
+            "CONSTRUCTOR_ARGS": "0x000000000000000000000000e0b015e54d54fc84a6cb9b666099c46ade9335ff0000000000000000000000005aea5775959fbc2557cc8789bc1bf90a239d9a9100000000000000000000000011f1022ca6adef6400e5677528a80d49a069c00c",
+            "SALT": "",
+            "VERIFIED": "true"
+          }
         ]
       }
     },
@@ -25973,4 +25993,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/deployments/zksync.json b/deployments/zksync.json
index 750531be8..77781aadd 100644
--- a/deployments/zksync.json
+++ b/deployments/zksync.json
@@ -21,8 +21,8 @@
   "CBridgeFacetPacked": "0xCe81D9bB9D9605FFF296CCF8Af6b6B38f02Cf15d",
   "LiFiDEXAggregator": "0x1F683faf1E2a770aa75f7B2e92117A5c11183E9C",
   "AcrossFacetV3": "0x2e47355B70D6935C6A69d5F67e0aFe437791138e",
-  "ReceiverAcrossV3": "0xFa94c1A99799B3cA89DE6cbB3ccCDEcf1da62aFE",
-  "AcrossFacetPackedV3": "0x9243578F60a2A3821642481b5851578cE92d9a78",
+  "ReceiverAcrossV3": "0x68cb042aD93608e819b699427726e5c5E1A5F2dC",
+  "AcrossFacetPackedV3": "0x45C83B209878601d21604301dfE25bD6D0BBC218",
   "GasZipFacet": "0x313c27Aad40c7e0A0b923b539F05617D8114566D",
   "GasZipPeriphery": "0x4000f76450d9d40558fd60F66863F583B7A5BCCb",
   "Permit2Proxy": "0x6275f6631c955DC5dA9fBe8Dc7f24a3A5919443A"
diff --git a/script/deploy/deploySingleContract.sh b/script/deploy/deploySingleContract.sh
index 15449095d..f4a08c373 100755
--- a/script/deploy/deploySingleContract.sh
+++ b/script/deploy/deploySingleContract.sh
@@ -225,7 +225,7 @@ deploySingleContract() {
 
     if [[ $NETWORK == "zksync" ]]; then
       # Deploy zksync scripts using the zksync specific fork of forge from Docker
-      RAW_RETURN_DATA=$(docker run --rm -it --volume .:/foundry -u $(id -u):$(id -g) -e FOUNDRY_PROFILE=zksync -e DEPLOYSALT=$DEPLOYSALT -e NETWORK=$NETWORK -e FILE_SUFFIX=$FILE_SUFFIX -e PRIVATE_KEY=$(getPrivateKey "$NETWORK" "$ENVIRONMENT") foundry-zksync forge script "$FULL_SCRIPT_PATH" -f $NETWORK --json --silent --broadcast --skip-simulation --slow --zksync)
+      RAW_RETURN_DATA=$(docker run --rm -it --volume .:/foundry -u $(id -u):$(id -g) -e FOUNDRY_PROFILE=zksync -e DEPLOYSALT=$DEPLOYSALT -e NETWORK=$NETWORK -e FILE_SUFFIX=$FILE_SUFFIX -e PRIVATE_KEY=$(getPrivateKey "$NETWORK" "$ENVIRONMENT") foundry-zksync forge script "$FULL_SCRIPT_PATH" -f $NETWORK --json --broadcast --skip-simulation --slow --zksync)
     else
       # try to execute call
       RAW_RETURN_DATA=$(DEPLOYSALT=$DEPLOYSALT CREATE3_FACTORY_ADDRESS=$CREATE3_FACTORY_ADDRESS NETWORK=$NETWORK FILE_SUFFIX=$FILE_SUFFIX DEFAULT_DIAMOND_ADDRESS_DEPLOYSALT=$DEFAULT_DIAMOND_ADDRESS_DEPLOYSALT DEPLOY_TO_DEFAULT_DIAMOND_ADDRESS=$DEPLOY_TO_DEFAULT_DIAMOND_ADDRESS PRIVATE_KEY=$(getPrivateKey "$NETWORK" "$ENVIRONMENT") DIAMOND_TYPE=$DIAMOND_TYPE forge script "$FULL_SCRIPT_PATH" -f $NETWORK --json --broadcast --skip-simulation --legacy)
diff --git a/script/helperFunctions.sh b/script/helperFunctions.sh
index 81b3bad43..8573d540d 100755
--- a/script/helperFunctions.sh
+++ b/script/helperFunctions.sh
@@ -1456,7 +1456,7 @@ function verifyContract() {
           # Verify using foundry-zksync from docker image
          docker run --rm -it -v .:/foundry -u $(id -u):$(id -g) -e FOUNDRY_PROFILE=zksync foundry-zksync forge verify-contract --zksync --watch --chain "$CHAIN_ID" "$ADDRESS" "$FULL_PATH" --constructor-args $ARGS --skip-is-verified-check -e "${!API_KEY}" >/dev/null 2>&1
         else
-          forge verify-contract --watch --chain "$CHAIN_ID" "$ADDRESS" "$FULL_PATH" --constructor-ar --zksyncgs $ARGS --skip-is-verified-check -e "${!API_KEY}" >/dev/null 2>&1
+          forge verify-contract --watch --chain "$CHAIN_ID" "$ADDRESS" "$FULL_PATH" --constructor-args $ARGS --skip-is-verified-check -e "${!API_KEY}" >/dev/null 2>&1
         fi
       fi
     fi