Merge pull request #24 from bgd-labs/feat/zkSync

Feat/zk sync
bgd-labs · Jul 30, 2024 · 55d2020 · 55d2020
2 parents 71a623a + d711446
commit 55d2020
Show file tree

Hide file tree

Showing 32 changed files with 683 additions and 280 deletions.
diff --git a/.env.example b/.env.example
@@ -18,6 +18,8 @@ RPC_BASE=https://base.llamarpc.com
 RPC_ZKEVM=https://zkevm-rpc.com
 RPC_GNOSIS=https://rpc.ankr.com/gnosis
 RPC_BNB=https://binance.llamarpc.com
+RPC_ZK_SYNC=https://mainnet.era.zksync.io
+RPC_ZK_SYNC_TESTNET=https://sepolia.era.zksync.dev
 
 # Etherscan api keys for verification & download utils
 ETHERSCAN_API_KEY_MAINNET=
@@ -30,5 +32,4 @@ ETHERSCAN_API_KEY_BASE=
 ETHERSCAN_API_KEY_ZKEVM=
 ETHERSCAN_API_KEY_GNOSIS=
 ETHERSCAN_API_KEY_BNB=
-
-
+ETHERSCAN_API_KEY_ZK_SYNC=
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,5 @@ broadcast/
 input.json
 
 run-latest.json
+zkout/
+input.json
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "lib/aave-delivery-infrastructure"]
 	path = lib/aave-delivery-infrastructure
 	url = https://github.com/bgd-labs/aave-delivery-infrastructure
+[submodule "lib/aave-helpers"]
+	path = lib/aave-helpers
+	url = https://github.com/bgd-labs/aave-helpers
+	branch = fix/e2e-fix-forwarder-diff-zksync
diff --git a/Makefile b/Makefile
@@ -23,6 +23,7 @@ BASE_KEY = --private-key ${PRIVATE_KEY}
 #custom_metis-testnet := --legacy --verifier-url https://goerli.explorer.metisdevops.link/api/
 #custom_metis := --verifier-url  https://api.routescan.io/v2/network/mainnet/evm/1088/etherscan
 #custom_scroll-testnet := --legacy --with-gas-price 1000000000 # 1 gwei
+custom_zksync := --zksync
 
 # params:
 #  1 - path/file_name
@@ -31,25 +32,25 @@ BASE_KEY = --private-key ${PRIVATE_KEY}
 #  to define custom params per network add vars custom_network-name
 #  to use ledger, set LEDGER=true to env
 #  default to testnet deployment, to run production, set PROD=true to env
-#define deploy_single_fn
-#forge script \
-# scripts/$(1).s.sol:$(if $(3),$(if $(PROD),$(3),$(3)_testnet),$(shell UP=$(if $(PROD),$(2),$(2)_testnet); echo $${UP} | perl -nE 'say ucfirst')) \
-# --rpc-url $(if $(PROD),$(2),$(2)-testnet) --broadcast --verify -vvvv \
-# $(if $(LEDGER),$(BASE_LEDGER),$(BASE_KEY)) \
-# $(custom_$(if $(PROD),$(2),$(2)-testnet))
-#
-#endef
-
-# catapulta
 define deploy_single_fn
-npx catapulta@latest script \
- scripts/$(1).s.sol:$(if $(3),$(3),$(shell UP=$(if $(PROD),$(2),$(2)_testnet); echo $${UP} | perl -nE 'say ucfirst')) \
- --network $(2) --slow --skip-git \
+forge script \
+ scripts/$(1).s.sol:$(if $(3),$(if $(PROD),$(3),$(3)_testnet),$(shell UP=$(if $(PROD),$(2),$(2)_testnet); echo $${UP} | perl -nE 'say ucfirst')) \
+ --rpc-url $(if $(PROD),$(2),$(2)-testnet) --broadcast --verify -vvvv \
  $(if $(LEDGER),$(BASE_LEDGER),$(BASE_KEY)) \
  $(custom_$(if $(PROD),$(2),$(2)-testnet))
 
 endef
 
+# catapulta
+#define deploy_single_fn
+#npx catapulta@latest script \
+# scripts/$(1).s.sol:$(if $(3),$(3),$(shell UP=$(if $(PROD),$(2),$(2)_testnet); echo $${UP} | perl -nE 'say ucfirst')) \
+# --network $(2) --slow --skip-git \
+# $(if $(LEDGER),$(BASE_LEDGER),$(BASE_KEY)) \
+# $(custom_$(if $(PROD),$(2),$(2)-testnet))
+#
+#endef
+
 define deploy_fn
  $(foreach network,$(2),$(call deploy_single_fn,$(1),$(network),$(3)))
 endef
@@ -112,13 +113,16 @@ deploy-zkevm-adapters:
 deploy-wormhole-adapters:
 	$(call deploy_fn,adapters/DeployWormholeAdapter,ethereum celo)
 
+deploy-zksync-adapters-test:
+	$(call deploy_fn,adapters/DeployZkSyncAdapter,ethereum)
+
 ## Set sender bridge dapters. Only eth pol avax are needed as other networks will only receive
 set-ccf-sender-adapters:
-	$(call deploy_fn,CCC/Set_CCF_Sender_Adapters,ethereum)
+	$(call deploy_fn,ccc/Set_CCF_Sender_Adapters,ethereum)
 
 # Set the bridge adapters allowed to receive messages
 set-ccr-receiver-adapters:
-	$(call deploy_fn,CCC/Set_CCR_Receivers_Adapters,ethereum polygon avalanche binance arbitrum optimism base metis gnosis zkevm)
+	$(call deploy_fn,ccc/Set_CCR_Receivers_Adapters,ethereum polygon avalanche binance arbitrum optimism base metis gnosis zkevm)
 
 # Sets the required confirmations
 set-ccr-confirmations:
@@ -154,11 +158,11 @@ deploy-full:
 
 # Deploy Proxy Factories on all networks
 deploy-proxy-factory-test:
-	$(call deploy_fn,InitialDeployments,base)
+	$(call deploy_fn,InitialDeployments,zksync)
 
 # Deploy Cross Chain Infra on all networks
 deploy-cross-chain-infra-test:
-	$(call deploy_fn,CCC/Deploy_CCC,ethereum)
+	$(call deploy_fn,ccc/DeployCCC,zksync)
 
 ## Deploy CCIP bridge adapters on all networks
 deploy-ccip-bridge-adapters-test:
@@ -202,15 +206,15 @@ deploy-base-adapters-test:
 
 ## Set sender bridge dapters. Only eth pol avax are needed as other networks will only receive
 set-ccf-sender-adapters-test:
-	$(call deploy_fn,CCC/Set_CCF_Sender_Adapters,avalanche)
+	$(call deploy_fn,ccc/Set_CCF_Sender_Adapters,ethereum)
 
 # Set the bridge adapters allowed to receive messages
 set-ccr-receiver-adapters-test:
-	$(call deploy_fn,CCC/Set_CCR_Receivers_Adapters,celo)
+	$(call deploy_fn,ccc/Set_CCR_Receivers_Adapters,zksync)
 
 # Sets the required confirmations
 set-ccr-confirmations-test:
-	$(call deploy_fn,CCC/Set_CCR_Confirmations,ethereum)
+	$(call deploy_fn,ccc/Set_CCR_Confirmations,zksync)
 
 
 ## Deploy and configure all contracts
@@ -238,7 +242,7 @@ send-direct-message:
 	$(call deploy_fn,helpers/Send_Direct_CCMessage,avalanche)
 
 deploy_mock_destination:
-	$(call deploy_fn,helpers/Deploy_Mock_destination,ethereum)
+	$(call deploy_fn,helpers/Deploy_Mock_destination,zksync)
 
 set-approved-ccf-senders:
 	$(call deploy_fn,helpers/Set_Approved_Senders,ethereum)
@@ -253,7 +257,7 @@ send-message-via-adapter:
 	$(call deploy_fn,helpers/Send_Message_Via_Adapter,ethereum)
 
 deploy_ccc_granular_guardian:
-	$(call deploy_fn,access_control/DeployGranularGuardian,ethereum avalanche polygon binance gnosis metis scroll optimism arbitrum base)
+	$(call deploy_fn,access_control/network_scripts/GranularGuardianNetworkDeploys,zksync)
 
 deploy-ccc-revision-and-update:
 	$(call deploy_fn,CCC/UpdateCCC,ethereum)
@@ -263,3 +267,6 @@ deploy-ccc-update-payload:
 
 deploy-ccc-shuffle-payload:
 	$(call deploy_fn,payloads/ccc/shuffle/Network_Deployments,metis)
+
+deploy-zksync-path-payload:
+	$(call deploy_fn,payloads/adapters/zksync/Network_Deployments,ethereum)
diff --git a/deployments/ethereum.json b/deployments/ethereum.json
@@ -24,5 +24,5 @@
   "scrollAdapter": "0xA4dC3F123e1c601A19B3DC8382BB9311F678cafA",
   "wormholeAdapter": "0x42206271373675661500F8a4d6A6CE2FDc6b5De5",
   "zkevmAdapter": "0xe0a6Eee6d0c883734A7a7e7B378BD09fffb89EB6",
-  "zksyncAdapter": "0x0000000000000000000000000000000000000000"
+  "zksyncAdapter": "0x6aD9d4147467f08b165e1b6364584C5d28898b84"
 }
diff --git a/deployments/ethereum_sepolia.json b/deployments/ethereum_sepolia.json
@@ -24,5 +24,5 @@
   "scrollAdapter": "0xba62183cc12d68ca9Cf9a8b2ed64107fAd1F1d2f",
   "wormholeAdapter": "0x42D8D601cB91df86367229d04D8cf3556464c5c7",
   "zkevmAdapter": "0x0000000000000000000000000000000000000000",
-  "zksyncAdapter": "0x0000000000000000000000000000000000000000"
+  "zksyncAdapter": "0xC0d55FEa916180a8e38d842651c6472f4bA8337E"
 }
diff --git a/deployments/pre_prod_ethereum.json b/deployments/pre_prod_ethereum.json
@@ -9,8 +9,8 @@
   "crossChainControllerImpl": "0x04458aBf3844995FA28Fd5503034AE69A3E6a400",
   "emergencyRegistry": "0x0000000000000000000000000000000000000000",
   "gnosisAdapter": "0x0BED83079C2c994C54112d07110F09C9Be6d485E",
-  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
   "hlAdapter": "0x834607F5d65451918a8fDD5D22d6eF97f84917ef",
   "lzAdapter": "0xE35B90E1B1eF522dC40a5829c59e3d2d291a9360",
   "metisAdapter": "0x92bce04e8B33c7098AA0bEc7663cA8Eb0930f6a4",
@@ -24,5 +24,5 @@
   "scrollAdapter": "0x525EC320AbD05FF316683BA3e38023CEe72f9868",
   "wormholeAdapter": "0x7458fd003C60D6B581D20249386188eA976e0556",
   "zkevmAdapter": "0x0000000000000000000000000000000000000000",
-  "zksyncAdapter": "0x0000000000000000000000000000000000000000"
-}
+  "zksyncAdapter": "0x22b56CC7c45ed007eA7E4Ea10D28967d36E314D6"
+}
diff --git a/deployments/pre_prod_zksync.json b/deployments/pre_prod_zksync.json
@@ -0,0 +1,28 @@
+{
+  "arbAdapter": "0x0000000000000000000000000000000000000000",
+  "baseAdapter": "0x0000000000000000000000000000000000000000",
+  "ccipAdapter": "0x0000000000000000000000000000000000000000",
+  "chainId": 324,
+  "clEmergencyOracle": "0x0000000000000000000000000000000000000000",
+  "create3Factory": "0x0000000000000000000000000000000000000000",
+  "crossChainController": "0xEFB85c47F666829e9dD9Ad56fC2ca0E5C2569e17",
+  "crossChainControllerImpl": "0x93aF5EA45d7eDCD37EFd601C943592b71A2F3682",
+  "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "gnosisAdapter": "0x0000000000000000000000000000000000000000",
+  "granularCCCGuardian": "0x0000000000000000000000000000000000000000",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "hlAdapter": "0x0000000000000000000000000000000000000000",
+  "lzAdapter": "0x0000000000000000000000000000000000000000",
+  "metisAdapter": "0x0000000000000000000000000000000000000000",
+  "mockDestination": "0x63Ba24d305dCBEd249E9808e4855387bd62424Cc",
+  "opAdapter": "0x0000000000000000000000000000000000000000",
+  "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "polAdapter": "0x0000000000000000000000000000000000000000",
+  "proxyAdmin": "0xb4b3048fD1a6e2e488b51A8a831181D528B9C5c5",
+  "proxyFactory": "0x8Ef21C75Ce360078cAD162565ED0c27617eCccE0",
+  "sameChainAdapter": "0x0000000000000000000000000000000000000000",
+  "scrollAdapter": "0x0000000000000000000000000000000000000000",
+  "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "zkevmAdapter": "0x0000000000000000000000000000000000000000",
+  "zksyncAdapter": "0x53Cc59f9F3F4093ecBd2E9e366B35056022eCc8B"
+}
diff --git a/deployments/zksync.json b/deployments/zksync.json
@@ -0,0 +1,28 @@
+{
+  "arbAdapter": "0x0000000000000000000000000000000000000000",
+  "baseAdapter": "0x0000000000000000000000000000000000000000",
+  "ccipAdapter": "0x0000000000000000000000000000000000000000",
+  "chainId": 324,
+  "clEmergencyOracle": "0x0000000000000000000000000000000000000000",
+  "create3Factory": "0x0000000000000000000000000000000000000000",
+  "crossChainController": "0x800813f4714BC7A0a95310e3fB9e4f18872CA92C",
+  "crossChainControllerImpl": "0x2b6D63bf3e0abC405C50e00A015c4EE47780a42f",
+  "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "gnosisAdapter": "0x0000000000000000000000000000000000000000",
+  "granularCCCGuardian": "0xe0e23196D42b54F262a3DE952e6B34B197D1A228",
+  "guardian": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "hlAdapter": "0x0000000000000000000000000000000000000000",
+  "lzAdapter": "0x0000000000000000000000000000000000000000",
+  "metisAdapter": "0x0000000000000000000000000000000000000000",
+  "mockDestination": "0x0000000000000000000000000000000000000000",
+  "opAdapter": "0x0000000000000000000000000000000000000000",
+  "owner": "0xEAF6183bAb3eFD3bF856Ac5C058431C8592394d6",
+  "polAdapter": "0x0000000000000000000000000000000000000000",
+  "proxyAdmin": "0x158d6c497317367CEa3CBAb0BD84E6de236F060D",
+  "proxyFactory": "0x8Ef21C75Ce360078cAD162565ED0c27617eCccE0",
+  "sameChainAdapter": "0x0000000000000000000000000000000000000000",
+  "scrollAdapter": "0x0000000000000000000000000000000000000000",
+  "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "zkevmAdapter": "0x0000000000000000000000000000000000000000",
+  "zksyncAdapter": "0x1BC5C10CAe378fDbd7D52ec4F9f34590a619c68E"
+}
diff --git a/deployments/zksync_sepolia.json b/deployments/zksync_sepolia.json
@@ -0,0 +1,27 @@
+{
+  "arbAdapter": "0x0000000000000000000000000000000000000000",
+  "baseAdapter": "0x0000000000000000000000000000000000000000",
+  "ccipAdapter": "0x0000000000000000000000000000000000000000",
+  "chainId": 300,
+  "clEmergencyOracle": "0x0000000000000000000000000000000000000000",
+  "create3Factory": "0x0000000000000000000000000000000000000000",
+  "crossChainController": "0x77430FCd47F62A9706CAca6300563c6B27885F5F",
+  "crossChainControllerImpl": "0xb8e9DFC71C1d232db103E7ae72bF0CF70c03F912",
+  "emergencyRegistry": "0x0000000000000000000000000000000000000000",
+  "gnosisAdapter": "0x0000000000000000000000000000000000000000",
+  "guardian": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
+  "hlAdapter": "0x0000000000000000000000000000000000000000",
+  "lzAdapter": "0x0000000000000000000000000000000000000000",
+  "metisAdapter": "0x0000000000000000000000000000000000000000",
+  "mockDestination": "0x3676a657F22Ea4A6Eb3A51Da7233A37E8D604967",
+  "opAdapter": "0x0000000000000000000000000000000000000000",
+  "owner": "0x6D603081563784dB3f83ef1F65Cc389D94365Ac9",
+  "polAdapter": "0x0000000000000000000000000000000000000000",
+  "proxyAdmin": "0x91123BA04bEDd58195C985B28F1F99d4a15E1910",
+  "proxyFactory": "0xcd1416eA758CFf55b7aBA279632446A4272800AB",
+  "sameChainAdapter": "0x0000000000000000000000000000000000000000",
+  "scrollAdapter": "0x0000000000000000000000000000000000000000",
+  "wormholeAdapter": "0x0000000000000000000000000000000000000000",
+  "zkevmAdapter": "0x0000000000000000000000000000000000000000",
+  "zksyncAdapter": "0x013D88537bFdb7984700D44a8c0427D13d352D90"
+}
diff --git a/...d_zksync_path_to_adiethereum_before_adi_add_zksync_path_to_adiethereum_after.md b/...d_zksync_path_to_adiethereum_before_adi_add_zksync_path_to_adiethereum_after.md
@@ -0,0 +1,14 @@
+## Raw diff
+
+```json
+{
+  "forwarderAdaptersByChain": {
+    "324": {
+      "from": "",
+      "to": {
+        "0x6aD9d4147467f08b165e1b6364584C5d28898b84": "0x1BC5C10CAe378fDbd7D52ec4F9f34590a619c68E"
+      }
+    }
+  }
+}
+```
diff --git a/foundry.toml b/foundry.toml
@@ -11,6 +11,11 @@ metadata="none"
 solc = "0.8.19"
 ffi = true
 
+[profile.default.zksync]
+fallback_oz = true
+mode = "3"
+zksolc="1.4.1"
+
 [rpc_endpoints]
 ethereum="${RPC_MAINNET}"
 ethereum_sepolia="${RPC_ETHEREUM_SEPOLIA}"
@@ -38,6 +43,8 @@ scroll="${RPC_SCROLL}"
 scroll-testnet="${RPC_SCROLL_TESTNET}"
 celo="${RPC_CELO}"
 celo-testnet="${RPC_CELO_ALFAJORES}"
+zksync="${RPC_ZK_SYNC}"
+zksync-testnet="${RPC_ZK_SYNC_TESTNET}"
 
 [etherscan]
 ethereum={key="${ETHERSCAN_API_KEY_MAINNET}", chain=1 }
@@ -66,5 +73,11 @@ scroll={key="${ETHERSCAN_API_KEY_SCROLL}", chain=534352, utl='https://api.scroll
 scroll-testnet={key="${ETHERSCAN_API_KEY_SCROLL}", chain=534351, url='https://api-sepolia.scrollscan.com/api/'}
 celo={key="${ETHERSCAN_API_KEY_CELO}", chain=42220, utl='https://api.celoscan.io/api'}
 celo-testnet={key="${ETHERSCAN_API_KEY_CELO}", chain=44787, url='https://api-alfajores.celoscan.io/api'}
+zksync={key="${ETHERSCAN_API_KEY_ZK_SYNC}", chain=324}
+zksync-testnet={key="${ETHERSCAN_API_KEY_ZK_SYNC}", chain=300, url='https://api-sepolia-era.zksync.network/api'}
 
 # See more config options https://github.com/gakonst/foundry/tree/master/config
+[fuzz]
+no_zksync_reserved_addresses = true
+[invariant]
+no_zksync_reserved_addresses = true
diff --git a/lib/aave-delivery-infrastructure b/lib/aave-delivery-infrastructure
diff --git a/lib/aave-helpers b/lib/aave-helpers
diff --git a/remappings.txt b/remappings.txt
@@ -1,11 +1,11 @@
-solidity-utils/=lib/aave-delivery-infrastructure/lib/aave-helpers/lib/solidity-utils/src/
-ds-test/=lib/aave-delivery-infrastructure/lib/aave-helpers/lib/forge-std/lib/ds-test/src/
-forge-std/=lib/aave-delivery-infrastructure/lib/aave-helpers/lib/forge-std/src/
+solidity-utils/=lib/aave-delivery-infrastructure/lib/solidity-utils/src/
+forge-std/=lib/aave-helpers/lib/forge-std/src/
 openzeppelin-contracts/=lib/aave-delivery-infrastructure/lib/openzeppelin-contracts/
-aave-helpers/=lib/aave-delivery-infrastructure/lib/aave-helpers/src/
-aave-address-book/=lib/aave-delivery-infrastructure/lib/aave-helpers/lib/aave-address-book/src/
+aave-helpers/=lib/aave-helpers/src/
+aave-address-book/=lib/aave-helpers/lib/aave-address-book/src/
 adi/=lib/aave-delivery-infrastructure/src/contracts/
 adi-scripts/=lib/aave-delivery-infrastructure/scripts/
 adi-tests/=lib/aave-delivery-infrastructure/tests/
+aave-v3-origin/=lib/aave-helpers/lib/aave-address-book/lib/aave-v3-origin/src/
 
 
diff --git a/scripts/BaseDeployerScript.sol b/scripts/BaseDeployerScript.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import 'forge-std/Script.sol';
 import 'adi-scripts/BaseScript.sol';
-import {ChainHelpers} from 'aave-helpers/ChainIds.sol';
+import {ChainHelpers} from 'solidity-utils/contracts/utils/ChainHelpers.sol';
 
 struct Addresses {
   address arbAdapter;

diff --git a/scripts/InitialDeployments.s.sol b/scripts/InitialDeployments.s.sol
@@ -258,6 +258,24 @@ contract Celo is BaseInitialDeployment {
   }
 }
 
+contract Zksync is BaseInitialDeployment {
+  function TRANSPARENT_PROXY_FACTORY() internal pure override returns (address) {
+    return 0x8Ef21C75Ce360078cAD162565ED0c27617eCccE0;
+  }
+
+  function PROXY_ADMIN() internal pure override returns (address) {
+    return 0x158d6c497317367CEa3CBAb0BD84E6de236F060D;
+  }
+
+  //  function GUARDIAN() internal pure override returns (address) {
+  //    return;
+  //  }
+
+  function TRANSACTION_NETWORK() internal pure override returns (uint256) {
+    return ChainIds.ZK_SYNC;
+  }
+}
+
 contract Ethereum_testnet is BaseInitialDeployment {
   function TRANSACTION_NETWORK() internal pure override returns (uint256) {
     return TestNetChainIds.ETHEREUM_SEPOLIA;
+1 −0		.gitignore
+3 −3		.gitmodules
+14 −0		foundry.toml
+0 −1		lib/aave-helpers
+1 −1		lib/openzeppelin-contracts
+1 −0		lib/solidity-utils
+2 −7		remappings.txt
+2 −3		scripts/Adapters/BaseAdapterScript.sol
+84 −0		scripts/Adapters/DeployZkSyncAdapter.sol
+9 −2		scripts/BaseScript.sol
+8 −0		scripts/CCC/DeployCrossChainController.sol
+1 −1		scripts/contract_extensions/ArbitrumAdapter.sol
+1 −1		scripts/contract_extensions/CBAdapter.sol
+1 −1		scripts/contract_extensions/CCIPAdapter.sol
+1 −1		scripts/contract_extensions/GnosisChainAdapter.sol
+2 −2		scripts/contract_extensions/LayerZeroAdapter.sol
+1 −1		scripts/contract_extensions/MetisAdapter.sol
+1 −1		scripts/contract_extensions/OptimismAdapter.sol
+1 −1		scripts/contract_extensions/PolygonAdapterTestnets.sol
+1 −1		scripts/contract_extensions/ScrollAdapter.sol
+1 −1		scripts/contract_extensions/WormholeAdapter.sol
+25 −0		scripts/contract_extensions/ZkSyncAdapterTestnet.sol
+1 −1		scripts/examples/Payload_SolveEmergencyPrePopulated.s.sol
+2 −4		security/certora/confs/verifyCrossChainControllerWithEmergency.conf
+2 −4		security/certora/confs/verifyCrossChainForwarder-encode-decode-correct.conf
+2 −4		security/certora/confs/verifyCrossChainForwarder-envelopRetry.conf
+2 −4		security/certora/confs/verifyCrossChainForwarder-invariants.conf
+2 −4		security/certora/confs/verifyCrossChainForwarder-newEnvelope.conf
+2 −4		security/certora/confs/verifyCrossChainForwarder-sanity.conf
+2 −4		security/certora/confs/verifyCrossChainForwarder-shuffle.conf
+2 −4		security/certora/confs/verifyCrossChainForwarder-simpleRules.conf
+2 −4		security/certora/confs/verifyCrossChainReceiver.conf
+1 −1		src/contracts/adapters/arbitrum/ArbAdapter.sol
+1 −1		src/contracts/adapters/cBase/CBaseAdapter.sol
+1 −1		src/contracts/adapters/ccip/CCIPAdapter.sol
+1 −1		src/contracts/adapters/gnosisChain/GnosisChainAdapter.sol
+1 −1		src/contracts/adapters/hyperLane/HyperLaneAdapter.sol
+2 −2		src/contracts/adapters/layerZero/LayerZeroAdapter.sol
+1 −1		src/contracts/adapters/layerZero/libs/OptionsBuilder.sol
+2 −2		src/contracts/adapters/optimism/OpAdapter.sol
+1 −1		src/contracts/adapters/polygon/PolygonAdapterBase.sol
+2 −2		src/contracts/adapters/wormhole/WormholeAdapter.sol
+1 −1		src/contracts/adapters/zkEVM/ZkEVMAdapter.sol
+49 −0		src/contracts/adapters/zkSync/IZkSyncAdapter.sol
+123 −0		src/contracts/adapters/zkSync/ZkSyncAdapter.sol
+35 −0		src/contracts/adapters/zkSync/interfaces/IBridgehub.sol
+44 −0		src/contracts/adapters/zkSync/libs/AddressAliasHelper.sol
+2 −0		src/contracts/libs/Errors.sol
+8 −8		tests/BaseCrossChainController.t.sol
+1 −1		tests/BaseTest.sol
+0 −227		tests/CrossChainCommunicationSettings.t.sol
+16 −3		tests/CrossChainControllerWithEmergencyMode.t.sol
+9 −9		tests/CrossChainForwarder.t.sol
+7 −7		tests/CrossChainReceiver.t.sol
+3 −1		tests/Forwarder.t.sol
+0 −359		tests/access_control/GranularGuardianAccessControl_int.t.sol
+1 −1		tests/adapters/ArbAdapter.t.sol
+1 −1		tests/adapters/CCIPAdapter.t.sol
+2 −2		tests/adapters/GnosisChainAdapter.t.sol
+3 −2		tests/adapters/HyperLaneAdapter.t.sol
+2 −1		tests/adapters/LayerZeroAdapter.t.sol
+7 −6		tests/adapters/MetisAdapter.t.sol
+2 −2		tests/adapters/OpAdapter.t.sol
+1 −1		tests/adapters/PolygonAdapter.t.sol
+7 −6		tests/adapters/ScrollAdapter.t.sol
+2 −1		tests/adapters/WormholeAdapter.t.sol
+1 −1		tests/adapters/ZkEvmAdapter.t.sol
+334 −0		tests/adapters/ZkSyncAdapter.t.sol