Add MultiCallSendOnly support to Safe{Wallet} guard

.github/workflows/safeguard-zksync.yml

@@ -0,0 +1,37 @@
+name: SafeGuard ZKsync
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  safeguard-zksync:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Foundry-ZKsync
+        run: |
+          curl -L https://raw.githubusercontent.com/matter-labs/foundry-zksync/main/foundryup-zksync/install -o install-foundry-zksync
+          chmod +x ./install-foundry-zksync
+          ./install-foundry-zksync
+          FOUNDRY_ZKSYNC_BIN_DIR="${XDG_CONFIG_HOME:-$HOME}/.foundry/bin"
+          echo "$FOUNDRY_ZKSYNC_BIN_DIR" >> "$GITHUB_PATH"
+          "$FOUNDRY_ZKSYNC_BIN_DIR/foundryup-zksync" --install 0.1.9
+
+      - name: Install dependencies
+        run: git submodule update --recursive --init
+
+      - name: Build zkSync SafeGuard artifacts
+        run: forge build --zksync --zk-compile -o zkout --cache-path zkcache src/deployer/SafeGuard.sol zksrc/SafeGuardWrappers.sol
+        env:
+          FOUNDRY_EVM_VERSION: london
+          FOUNDRY_OPTIMIZER_RUNS: 200
+
+      - name: Run zkSync SafeGuard tests
+        run: forge test --zksync -C zktest --root "$GITHUB_WORKSPACE" --lib-paths "$GITHUB_WORKSPACE/lib" --match-contract TestSafeGuardZkSyncArtifacts

.github/workflows/size.yml

@@ -36,4 +36,4 @@ jobs:
         run: npm install
 
       - name: Check chain-specific Settler contract sizes
-        run: forge build --sizes --skip MultiCall.sol --skip CrossChainReceiverFactory.sol --skip AllowanceHolder.sol --skip Deployer.sol --skip 'test/*' -- src/chains/
+        run: forge build --sizes --skip MultiCall.sol --skip CrossChainReceiverFactory.sol --skip SafeGuard.sol --skip AllowanceHolder.sol --skip Deployer.sol --skip 'test/*' -- src/chains/

.github/workflows/test.yml

@@ -27,11 +27,23 @@ jobs:
       - name: Install dependencies
         run: git submodule update --recursive --init
 
+      - name: Build Safe Guard
+        run: forge build src/deployer/SafeGuard.sol
+        env:
+          FOUNDRY_EVM_VERSION: london
+          FOUNDRY_OPTIMIZER_RUNS: 200
+
+      - name: Run SafeGuard tests
+        run: forge test --skip 'src/*' --skip 'test/unit/*' --skip 'test/integration/*' --skip 'test/0.8.28/*' --mp test/0.8.25/SafeGuard.t.sol
+        env:
+          MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
+          BNB_MAINNET_RPC_URL: ${{ secrets.BNB_MAINNET_RPC_URL }}
+
       - name: Run EulerSwap math tests
         run: forge test --skip 'src/*' --skip 'script/*' --skip 'test/unit/*' --skip 'test/integration/*' --skip 'test/0.8.25/*' --mp test/0.8.28/EulerSwapBUSL.t.sol
 
       - name: Build contracts
-        run: forge build --skip MultiCall.sol --skip CrossChainReceiverFactory.sol --skip AllowanceHolder.sol --skip Deployer.sol --skip 'test/*' --skip 'script/*'
+        run: forge build --skip MultiCall.sol --skip CrossChainReceiverFactory.sol --skip SafeGuard.sol --skip AllowanceHolder.sol --skip Deployer.sol --skip 'test/*' --skip 'script/*'
 
       - name: Build AllowanceHolder and Deployer
         run: forge build -- src/allowanceholder/AllowanceHolder.sol src/deployer/Deployer.sol

foundry.toml

@@ -18,14 +18,23 @@ block_gas_limit = 16_777_216
 no_match_path = "test/integration/*"
 # needed for marktoda/forge-gas-snapshot
 ffi = true
-fs_permissions = [{ access = "read-write", path = ".forge-snapshots/" }, { access = "read", path = "out" }, { access = "read", path = "script/" }]
+fs_permissions = [
+    { access = "read-write", path = ".forge-snapshots/" },
+    { access = "read", path = "out" },
+    { access = "read", path = "zkout" },
+    { access = "read", path = "script/" },
+]
 gas_snapshot_emit = true
 
 # https://github.com/foundry-rs/foundry/issues/6780#issuecomment-1962319449
 [profile.default.optimizer_details]
 constantOptimizer = true
 yul = true
 
+[profile.default.zksync]
+bytecode_hash = "none"
+cbor_metadata = false
+
 [profile.integration]
 no_match_path = "test/unit/*"
 match_path = "test/integration/*"