feat: use updated zksync-contracts for foundry support

.github/workflows/foundry-build.yml

@@ -0,0 +1,47 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+env:
+  FOUNDRY_PROFILE: ci
+
+jobs:
+  check:
+    name: Foundry project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+
+      - name: Install Foundry
+        uses: abstract-foundation/foundry-toolchain-zksync@v1
+
+      - name: Install dependencies
+        run: |
+          npm ci --legacy-peer-deps
+
+      - name: Show Forge version
+        run: |
+          forge --version
+
+    #   - name: Run Forge fmt
+    #     run: |
+    #       forge fmt --check
+    #     id: fmt
+
+      - name: Run Forge build
+        run: |
+          forge build --zksync
+        id: build
+
+    #   - name: Run Forge tests
+    #     run: |
+    #       forge test -vvv --zksync
+    #     id: test

.gitignore

@@ -113,3 +113,6 @@ dist
 
 # TernJS port file
 .tern-port
+
+out/
+zkout/

contracts/AGWAccount.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.17;
 
-import {IAccount, ACCOUNT_VALIDATION_SUCCESS_MAGIC} from '@matterlabs/zksync-contracts/l2/system-contracts/interfaces/IAccount.sol';
-import {Transaction, TransactionHelper} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/TransactionHelper.sol';
-import {EfficientCall} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/EfficientCall.sol';
-import {BOOTLOADER_FORMAL_ADDRESS, NONCE_HOLDER_SYSTEM_CONTRACT, DEPLOYER_SYSTEM_CONTRACT, INonceHolder} from '@matterlabs/zksync-contracts/l2/system-contracts/Constants.sol';
-import {SystemContractsCaller} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/SystemContractsCaller.sol';
-import {SystemContractHelper} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/SystemContractHelper.sol';
-import {Utils} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/Utils.sol';
+import {IAccount, ACCOUNT_VALIDATION_SUCCESS_MAGIC} from '@matterlabs/zksync-contracts/contracts/system-contracts/interfaces/IAccount.sol';
+import {Transaction, TransactionHelper} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/TransactionHelper.sol';
+import {EfficientCall} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/EfficientCall.sol';
+import {BOOTLOADER_FORMAL_ADDRESS, NONCE_HOLDER_SYSTEM_CONTRACT, DEPLOYER_SYSTEM_CONTRACT, INonceHolder} from '@matterlabs/zksync-contracts/contracts/system-contracts/Constants.sol';
+import {SystemContractsCaller} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/SystemContractsCaller.sol';
+import {SystemContractHelper} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/SystemContractHelper.sol';
+import {Utils} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/Utils.sol';
 import {Initializable} from '@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol';
 
 import {HookManager} from './managers/HookManager.sol';

contracts/AccountFactory.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.17;
 
-import {DEPLOYER_SYSTEM_CONTRACT, IContractDeployer} from '@matterlabs/zksync-contracts/l2/system-contracts/Constants.sol';
-import {SystemContractsCaller} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/SystemContractsCaller.sol';
+import {DEPLOYER_SYSTEM_CONTRACT, IContractDeployer} from '@matterlabs/zksync-contracts/contracts/system-contracts/Constants.sol';
+import {SystemContractsCaller} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/SystemContractsCaller.sol';
 import {Ownable, Ownable2Step} from '@openzeppelin/contracts/access/Ownable2Step.sol';
-import {EfficientCall} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/EfficientCall.sol';
+import {EfficientCall} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/EfficientCall.sol';
 import {Errors} from './libraries/Errors.sol';
 import {IAGWRegistry} from './interfaces/IAGWRegistry.sol';
 

contracts/AccountProxy.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.17;
 
-import {EfficientCall} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/EfficientCall.sol';
+import {EfficientCall} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/EfficientCall.sol';
 
 contract AccountProxy {
     event Upgraded(address indexed implementation);

contracts/auth/BootloaderAuth.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.17;
 
-import {BOOTLOADER_FORMAL_ADDRESS} from '@matterlabs/zksync-contracts/l2/system-contracts/Constants.sol';
+import {BOOTLOADER_FORMAL_ADDRESS} from '@matterlabs/zksync-contracts/contracts/system-contracts/Constants.sol';
 import {Errors} from '../libraries/Errors.sol';
 
 /**

contracts/batch/BatchCaller.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.17;
 
-import {SystemContractsCaller} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/SystemContractsCaller.sol';
-import {EfficientCall} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/EfficientCall.sol';
-import { DEPLOYER_SYSTEM_CONTRACT } from "@matterlabs/zksync-contracts/l2/system-contracts/Constants.sol";
+import {SystemContractsCaller} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/SystemContractsCaller.sol';
+import {EfficientCall} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/EfficientCall.sol';
+import { DEPLOYER_SYSTEM_CONTRACT } from "@matterlabs/zksync-contracts/contracts/system-contracts/Constants.sol";
 import {Errors} from '../libraries/Errors.sol';
 import {SelfAuth} from '../auth/SelfAuth.sol';
 // Each call data for batches

contracts/interfaces/IAGWAccount.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.17;
 
-import {IAccount} from '@matterlabs/zksync-contracts/l2/system-contracts/interfaces/IAccount.sol';
+import {IAccount} from '@matterlabs/zksync-contracts/contracts/system-contracts/interfaces/IAccount.sol';
 
 import {IERC1271} from '@openzeppelin/contracts/interfaces/IERC1271.sol';
 import {IERC777Recipient} from '@openzeppelin/contracts/interfaces/IERC777Recipient.sol';

contracts/interfaces/IHook.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.17;
 
-import {Transaction} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/TransactionHelper.sol';
+import {Transaction} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/TransactionHelper.sol';
 import {IInitable} from '../interfaces/IInitable.sol';
 import {IERC165} from '@openzeppelin/contracts/utils/introspection/IERC165.sol';
 

contracts/libraries/SessionLib.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.24;
 
-import { Transaction } from "@matterlabs/zksync-contracts/l2/system-contracts/libraries/TransactionHelper.sol";
-import { IPaymasterFlow } from "@matterlabs/zksync-contracts/l2/system-contracts/interfaces/IPaymasterFlow.sol";
+import { Transaction } from "@matterlabs/zksync-contracts/contracts/system-contracts/libraries/TransactionHelper.sol";
+import { IPaymasterFlow } from "@matterlabs/zksync-contracts/contracts/system-contracts/interfaces/IPaymasterFlow.sol";
 import { TimestampAsserterLocator } from "../helpers/TimestampAsserterLocator.sol";
 
 library SessionLib {

contracts/managers/HookManager.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.17;
 
 import {ERC165Checker} from '@openzeppelin/contracts/utils/introspection/ERC165Checker.sol';
-import {Transaction} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/TransactionHelper.sol';
+import {Transaction} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/TransactionHelper.sol';
 import {ExcessivelySafeCall} from '@nomad-xyz/excessively-safe-call/src/ExcessivelySafeCall.sol';
 
 import {Auth} from '../auth/Auth.sol';

contracts/paymasters/AAFactoryPaymaster.sol

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import {Transaction} from "@matterlabs/zksync-contracts/l2/system-contracts/libraries/TransactionHelper.sol";
+import {Transaction} from "@matterlabs/zksync-contracts/contracts/system-contracts/libraries/TransactionHelper.sol";
 import {
     IPaymaster,
     ExecutionResult,
     PAYMASTER_VALIDATION_SUCCESS_MAGIC
-} from "@matterlabs/zksync-contracts/l2/system-contracts/interfaces/IPaymaster.sol";
+} from "@matterlabs/zksync-contracts/contracts/system-contracts/interfaces/IPaymaster.sol";
 import {AccountFactory} from "../AccountFactory.sol";
 
-import {BOOTLOADER_FORMAL_ADDRESS} from "@matterlabs/zksync-contracts/l2/system-contracts/Constants.sol";
+import {BOOTLOADER_FORMAL_ADDRESS} from "@matterlabs/zksync-contracts/contracts/system-contracts/Constants.sol";
 /**
  * This Paymaster sponsors the gas for any user attempting to deploy an AGW account for themselves
  * It also allows the canonical AGW deployer to sponsor deployments for users

contracts/paymasters/ERC20Paymaster.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.17;
 
-import {IPaymaster, ExecutionResult, PAYMASTER_VALIDATION_SUCCESS_MAGIC} from '@matterlabs/zksync-contracts/l2/system-contracts/interfaces/IPaymaster.sol';
-import {IPaymasterFlow} from '@matterlabs/zksync-contracts/l2/system-contracts/interfaces/IPaymasterFlow.sol';
-import {Transaction} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/TransactionHelper.sol';
-import {BOOTLOADER_FORMAL_ADDRESS} from '@matterlabs/zksync-contracts/l2/system-contracts/Constants.sol';
+import {IPaymaster, ExecutionResult, PAYMASTER_VALIDATION_SUCCESS_MAGIC} from '@matterlabs/zksync-contracts/contracts/system-contracts/interfaces/IPaymaster.sol';
+import {IPaymasterFlow} from '@matterlabs/zksync-contracts/contracts/system-contracts/interfaces/IPaymasterFlow.sol';
+import {Transaction} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/TransactionHelper.sol';
+import {BOOTLOADER_FORMAL_ADDRESS} from '@matterlabs/zksync-contracts/contracts/system-contracts/Constants.sol';
 import {Ownable} from '@openzeppelin/contracts/access/Ownable.sol';
 import {PrimaryProdDataServiceConsumerBase} from '@redstone-finance/evm-connector/contracts/data-services/PrimaryProdDataServiceConsumerBase.sol';
 import {Errors} from '../libraries/Errors.sol';

contracts/paymasters/GaslessPaymaster.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.17;
-import {IPaymaster, ExecutionResult, PAYMASTER_VALIDATION_SUCCESS_MAGIC} from '@matterlabs/zksync-contracts/l2/system-contracts/interfaces/IPaymaster.sol';
-import {IPaymasterFlow} from '@matterlabs/zksync-contracts/l2/system-contracts/interfaces/IPaymasterFlow.sol';
-import {Transaction} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/TransactionHelper.sol';
-import {BOOTLOADER_FORMAL_ADDRESS} from '@matterlabs/zksync-contracts/l2/system-contracts/Constants.sol';
+import {IPaymaster, ExecutionResult, PAYMASTER_VALIDATION_SUCCESS_MAGIC} from '@matterlabs/zksync-contracts/contracts/system-contracts/interfaces/IPaymaster.sol';
+import {IPaymasterFlow} from '@matterlabs/zksync-contracts/contracts/system-contracts/interfaces/IPaymasterFlow.sol';
+import {Transaction} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/TransactionHelper.sol';
+import {BOOTLOADER_FORMAL_ADDRESS} from '@matterlabs/zksync-contracts/contracts/system-contracts/Constants.sol';
 import {Ownable} from '@openzeppelin/contracts/access/Ownable.sol';
 import {Errors} from '../libraries/Errors.sol';
 import {IAGWRegistry} from '../interfaces/IAGWRegistry.sol';

contracts/test/ERC20PaymasterMock.sol

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.17;
 
-import {IPaymaster, ExecutionResult, PAYMASTER_VALIDATION_SUCCESS_MAGIC} from '@matterlabs/zksync-contracts/l2/system-contracts/interfaces/IPaymaster.sol';
-import {IPaymasterFlow} from '@matterlabs/zksync-contracts/l2/system-contracts/interfaces/IPaymasterFlow.sol';
-import {Transaction} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/TransactionHelper.sol';
-import {BOOTLOADER_FORMAL_ADDRESS} from '@matterlabs/zksync-contracts/l2/system-contracts/Constants.sol';
+import {IPaymaster, ExecutionResult, PAYMASTER_VALIDATION_SUCCESS_MAGIC} from '@matterlabs/zksync-contracts/contracts/system-contracts/interfaces/IPaymaster.sol';
+import {IPaymasterFlow} from '@matterlabs/zksync-contracts/contracts/system-contracts/interfaces/IPaymasterFlow.sol';
+import {Transaction} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/TransactionHelper.sol';
+import {BOOTLOADER_FORMAL_ADDRESS} from '@matterlabs/zksync-contracts/contracts/system-contracts/Constants.sol';
 import {Ownable} from '@openzeppelin/contracts/access/Ownable.sol';
 import {PrimaryProdDataServiceConsumerBase} from '@redstone-finance/evm-connector/contracts/data-services/PrimaryProdDataServiceConsumerBase.sol';
 import {Errors} from '../libraries/Errors.sol';

contracts/test/MockHook.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.17;
 
-import {Transaction} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/TransactionHelper.sol';
+import {Transaction} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/TransactionHelper.sol';
 import {IERC165} from '@openzeppelin/contracts/utils/introspection/IERC165.sol';
 
 import {IValidationHook, IExecutionHook} from '../interfaces/IHook.sol';

contracts/test/MockValidator.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.17;
 
 import {IR1Validator, IERC165, OperationType} from '../interfaces/IValidator.sol';
-import {Transaction} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/TransactionHelper.sol';
+import {Transaction} from '@matterlabs/zksync-contracts/contracts/system-contracts/libraries/TransactionHelper.sol';
 
 /**
  * @title Mock validator contract implementing r1validator interface

contracts/validators/SessionKeyValidator.sol

@@ -8,7 +8,7 @@ import { IModule } from "../interfaces/IModule.sol";
 import { IValidationHook } from "../interfaces/IHook.sol";
 import { IModuleValidator } from "../interfaces/IModuleValidator.sol";
 import { OperationType } from "../interfaces/IValidator.sol";
-import { Transaction } from "@matterlabs/zksync-contracts/l2/system-contracts/libraries/TransactionHelper.sol";
+import { Transaction } from "@matterlabs/zksync-contracts/contracts/system-contracts/libraries/TransactionHelper.sol";
 import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 
 import { IHookManager } from "../interfaces/IHookManager.sol";

foundry.toml

@@ -0,0 +1,20 @@
+[profile.default]
+src = "contracts"
+test = "test"
+script = "script"
+out = "out"
+libs = ["node_modules"]
+remappings = [
+    "@chainlink/=node_modules/@chainlink/",
+    "@eth-optimism/=node_modules/@chainlink/contracts/node_modules/@eth-optimism/",
+    "@matterlabs/=node_modules/@matterlabs/",
+    "@nomad-xyz/=node_modules/@nomad-xyz/",
+    "@openzeppelin/=node_modules/@openzeppelin/",
+    "@redstone-finance/=node_modules/@redstone-finance/",
+    "hardhat/=node_modules/hardhat/",
+]
+solc = "0.8.26"
+
+[profile.default.zksync]
+enable_eravm_extensions = true
+zksolc = "1.5.6"

hardhat.config.ts

@@ -68,6 +68,9 @@ const abstractMainnet: NetworkUserConfig = {
 }
 
 const config: HardhatUserConfig = {
+    zksyncAnvil: {
+        version: "0.6.5",
+    },
     zksolc: {
         version: '1.5.6',
         settings: {