Zksync full

.github/actions/install-solidity-foundry/action.yml

@@ -29,3 +29,10 @@ runs:
       uses: foundry-rs/foundry-toolchain@de808b1eea699e761c404bda44ba8f21aba30b2c # v1.3.1
       with:
         version: ${{ steps.extract-foundry-version.outputs.foundry-version }}
+
+    - name: Install Foundry ZKSync
+      shell: bash
+      run: |
+        mkdir -p ~/.zksync
+        wget -qc https://github.com/matter-labs/foundry-zksync/releases/download/foundry-zksync-v0.0.11/foundry_zksync_v0.0.11_linux_amd64.tar.gz -O - | tar -xz -C ~/.zksync
+        echo "$HOME/.zksync" >> $GITHUB_PATH

contracts/.gitignore

@@ -2,6 +2,7 @@ artifacts
 cache
 node_modules
 solc
+zkout
 abi
 coverage
 coverage.json

contracts/GNUmakefile

@@ -37,6 +37,15 @@ pnpmdep: ## Install solidity contract dependencies through pnpm
 abigen: ## Build & install abigen.
 	../tools/bin/build_abigen
 
+.PHONY: foundry-zksync
+foundry-zksync:
+	# https://docs.zksync.io/zksync-era/tooling/foundry/installation
+	curl -L https://raw.githubusercontent.com/matter-labs/foundry-zksync/main/install-foundry-zksync -o install-foundry-zksync
+	chmod +x install-foundry-zksync
+	./install-foundry-zksync
+	rm install-foundry-zksync
+	rm foundryup-zksync
+
 .PHONY: mockery
 mockery: $(mockery) ## Install mockery.
 	go install github.com/vektra/mockery/[email protected]

contracts/scripts/native_solc_compile_all_ccip

@@ -23,8 +23,11 @@ compileContract() {
   contract=$(basename "$1")
   echo "Compiling" "$contract"
 
+  local in
+  in=$CONTRACTS_DIR/src/v0.8/$PROJECT/"$1.sol"
+
   local command
-  command="forge build $CONTRACTS_DIR/src/v0.8/$PROJECT/"$1.sol" \
+  command="forge build $in \
    --root $CONTRACTS_DIR \
    $(getOptimizations "$contract") \
    --extra-output-files bin abi \
@@ -34,6 +37,10 @@ compileContract() {
 
   # Copy the generated abi files to a single folder
   cp "$CONTRACTS_DIR"/solc/$PROJECT/"$contract"/"$contract".sol/"$contract".abi.json "$ABI_DIR""$contract".abi
+
+  forge build $in --zksync \
+    --root $CONTRACTS_DIR
+
 }
 
 # Define optimization overrides in this function. Anything that is not an override will use the default value

contracts/scripts/native_solc_compile_all_keystone

@@ -19,15 +19,23 @@ compileContract () {
   contract=$(basename "$1")
   echo "Compiling" "$contract"
 
+  local in
+  in=$CONTRACTS_DIR/src/v0.8/$PROJECT/"$1.sol"
+
   local command
-  command="forge build $CONTRACTS_DIR/src/v0.8/$PROJECT/"$1.sol" \
+  command="forge build $in \
        --root $CONTRACTS_DIR \
        --extra-output-files bin abi \
        -o $CONTRACTS_DIR/solc/$PROJECT/$contract"
   $command
+
+  if [ -n "$2" ]; then
+    forge build $in --zksync \
+      --root $CONTRACTS_DIR
+  fi
 }
 
-compileContract CapabilitiesRegistry
+compileContract CapabilitiesRegistry zk
 compileContract KeystoneForwarder
 compileContract OCR3Capability
 compileContract KeystoneFeedsConsumer

contracts/scripts/native_solc_compile_all_shared

@@ -22,22 +22,32 @@ compileContract() {
     PROJECT=$2
   fi
 
+  local in
+  in=$CONTRACTS_DIR/src/v0.8/$PROJECT/"$1.sol"
+
   # We override the foundry.toml Solidity version to not change the bytecode.
   local command
-  command="forge build $CONTRACTS_DIR/src/v0.8/$PROJECT/"$1.sol" \
+  command="forge build $in \
    --root $CONTRACTS_DIR \
    --extra-output-files bin abi \
    --use 0.8.19 \
    -o $CONTRACTS_DIR/solc/$PROJECT/$contract"
 
   $command
+
+  if [ -n "$3" ]; then
+    forge build $in --zksync \
+      --root $CONTRACTS_DIR \
+      --use 0.8.19 \
+      $4
+  fi
 }
 
 compileContract interfaces/AggregatorV3Interface
 compileContract interfaces/ITypeAndVersion
 compileContract token/ERC677/ERC677
-compileContract token/ERC677/BurnMintERC677
-compileContract token/ERC677/LinkToken
+compileContract token/ERC677/BurnMintERC677 "" zk
+compileContract token/ERC677/LinkToken "" zk
 compileContract token/ERC20/BurnMintERC20
 compileContract test/helpers/ChainReaderTester
 compileContract test/helpers/LogEmitter
@@ -46,5 +56,5 @@ compileContract mocks/MockV3Aggregator
 compileContract mocks/WERC20Mock
 
 compileContract openzeppelin-solidity/v4.8.3/contracts/token/ERC20/ERC20 vendor
-compileContract multicall/ebd8b64/src/Multicall3 vendor
-compileContract canonical-weth/WETH9 vendor
+compileContract multicall/ebd8b64/src/Multicall3 vendor zk
+compileContract canonical-weth/WETH9 vendor zk "--suppress-errors sendtransfer"