feat: Sync layer stable

.github/workflows/l1-contracts-ci.yaml

@@ -22,21 +22,37 @@ jobs:
  node-version: 18.18.0
  cache: yarn
 
+ - name: Use Foundry
+ uses: foundry-rs/foundry-toolchain@v1
+
  - name: Install dependencies
  run: yarn
 
- - name: Build artifacts
- run: yarn l1 build
+ - name: Install l2 deps
+ working-directory: ./l2-contracts
+ run: yarn
+
+ - name: Install l1 deps
+ working-directory: ./l1-contracts
+ run: yarn
 
- - name: Build L2 artifacts
+ - name: Build l2 artifacts
  run: yarn l2 build
 
+ - name: Build l1 artifacts
+ run: yarn l1 build
+
+ - name: Build da-contracts artifacts
+ run: yarn da build:foundry
+
  - name: Create cache
  uses: actions/cache/save@v3
  with:
  key: artifacts-l1-${{ github.sha }}
  path: |
+ da-contracts/out
  l1-contracts/artifacts
+ l1-contracts/artifacts-zk
  l1-contracts/cache
  l1-contracts/typechain
  l2-contracts/artifacts-zk
@@ -90,12 +106,69 @@ jobs:
  fail-on-cache-miss: true
  key: artifacts-l1-${{ github.sha }}
  path: |
+ da-contracts/out
+ l1-contracts/artifacts
+ l1-contracts/artifacts-zk
+ l1-contracts/cache
+ l1-contracts/typechain
+ l2-contracts/artifacts-zk
+ l2-contracts/cache-zk
+ l2-contracts/typechain
+
+ - name: Run tests
+ working-directory: ./l1-contracts
+ run: FOUNDRY_PROFILE=default yarn test:foundry
+
+ test-foundry-zksync:
+ needs: [build, lint]
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout the repository
+ uses: actions/checkout@v4
+ with:
+ submodules: recursive
+
+ - name: Use Node.js
+ uses: actions/setup-node@v3
+ with:
+ node-version: 18.18.0
+ cache: yarn
+
+ - name: Install dependencies
+ run: yarn
+
+ - name: Build system contract artifacts
+ run: yarn sc build
+
+ - name: Restore artifacts cache
+ uses: actions/cache/restore@v3
+ with:
+ fail-on-cache-miss: true
+ key: artifacts-l1-${{ github.sha }}
+ path: |
+ da-contracts/out
  l1-contracts/artifacts
+ l1-contracts/artifacts-zk
  l1-contracts/cache
  l1-contracts/typechain
+ l2-contracts/artifacts-zk
+ l2-contracts/cache-zk
+ l2-contracts/typechain
+
+ - name: Install foundry zksync
+ run: |
+ wget https://github.com/matter-labs/foundry-zksync/releases/download/nightly-f908ce43834bc1ffb4de6576ea5600eaab49dddb/foundry_nightly_linux_amd64.tar.gz -O foundry-zksync.tar.gz
+ tar -xzf foundry-zksync.tar.gz
+ sudo mv forge /usr/local/bin/forge
+ sudo mv cast /usr/local/bin/cast
+ sudo chmod +x /usr/local/bin/forge
+ sudo chmod +x /usr/local/bin/cast
+ forge --version
 
  - name: Run tests
- run: yarn l1 test:foundry
+ working-directory: ./l1-contracts
+ run: FOUNDRY_PROFILE=default yarn test:zkfoundry
 
  test-hardhat:
  needs: [build, lint]
@@ -114,23 +187,32 @@ jobs:
  - name: Install dependencies
  run: yarn
 
+ - name: Install l1 deps
+ working-directory: ./l1-contracts
+ run: yarn
+
  - name: Restore artifacts cache
  uses: actions/cache/restore@v3
  with:
  fail-on-cache-miss: true
  key: artifacts-l1-${{ github.sha }}
  path: |
+ da-contracts/out
  l1-contracts/artifacts
+ l1-contracts/artifacts-zk
  l1-contracts/cache
  l1-contracts/typechain
  l2-contracts/artifacts-zk
  l2-contracts/cache-zk
  l2-contracts/typechain
 
+ - name: Build L2 contracts
+ run: yarn l2 build
+
  - name: Run tests
  run: yarn l1 test --no-compile
 
- check-verifier-generator:
+ check-verifier-generator-l1:
  runs-on: ubuntu-latest
 
  steps:
@@ -182,9 +264,14 @@ jobs:
  fail-on-cache-miss: true
  key: artifacts-l1-${{ github.sha }}
  path: |
+ da-contracts/out
  l1-contracts/artifacts
+ l1-contracts/artifacts-zk
  l1-contracts/cache
  l1-contracts/typechain
+ l2-contracts/artifacts-zk
+ l2-contracts/cache-zk
+ l2-contracts/typechain
 
  - name: Run coverage
  run: FOUNDRY_PROFILE=default yarn test:foundry && FOUNDRY_PROFILE=default yarn coverage:foundry --report summary --report lcov
@@ -199,7 +286,7 @@ jobs:
  - name: Filter directories
  run: |
  sudo apt update && sudo apt install -y lcov
- lcov --remove lcov.info 'test/*' 'contracts/dev-contracts/*' '../lib/forge-std/*' '../lib/murky/*' 'lib/*' '../lib/*' 'lib/' --output-file lcov.info --rc lcov_branch_coverage=1
+ lcov --remove lcov.info 'test/*' 'contracts/dev-contracts/*' '../lib/forge-std/*' '../lib/murky/*' 'lib/*' '../lib/*' 'lib/' 'deploy-scripts/*' --output-file lcov.info --rc lcov_branch_coverage=1
 
  # This step posts a detailed coverage report as a comment and deletes previous comments on
  # each push. The below step is used to fail coverage if the specified coverage threshold is
@@ -220,3 +307,56 @@ jobs:
  coverage-files: ./l1-contracts/lcov.info
  working-directory: l1-contracts
  minimum-coverage: 85 # Set coverage threshold.
+
+ gas-report:
+ needs: [build, lint]
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout the repository
+ uses: actions/checkout@v4
+ with:
+ submodules: recursive
+
+ - name: Use Foundry
+ uses: foundry-rs/foundry-toolchain@v1
+
+ - name: Use Node.js
+ uses: actions/setup-node@v3
+ with:
+ node-version: 18.18.0
+ cache: yarn
+
+ - name: Install dependencies
+ run: yarn
+
+ - name: Restore artifacts cache
+ uses: actions/cache/restore@v3
+ with:
+ fail-on-cache-miss: true
+ key: artifacts-l1-${{ github.sha }}
+ path: |
+ l1-contracts/artifacts
+ l1-contracts/cache
+ l1-contracts/typechain
+
+ # Add any step generating a gas report to a temporary file named gasreport.ansi. For example:
+ - name: Run tests
+ run: yarn l1 test:foundry --gas-report | tee gasreport.ansi # <- this file name should be unique in your repository!
+
+ - name: Compare gas reports
+ uses: Rubilmax/[email protected]
+ with:
+ summaryQuantile: 0.0 # only display the 10% most significant gas diffs in the summary (defaults to 20%)
+ sortCriteria: avg,max # sort diff rows by criteria
+ sortOrders: desc,asc # and directions
+ ignore: test-foundry/**/*,l1-contracts/contracts/dev-contracts/**/*,l1-contracts/lib/**/*,l1-contracts/contracts/common/Dependencies.sol
+ id: gas_diff
+
+ - name: Add gas diff to sticky comment
+ if: github.event_name == 'pull_request' || github.event_name == 'pull_request_target'
+ uses: marocchino/sticky-pull-request-comment@v2
+ with:
+ # delete the comment in case changes no longer impact gas costs
+ delete: ${{ !steps.gas_diff.outputs.markdown }}
+ message: ${{ steps.gas_diff.outputs.markdown }}

.github/workflows/l1-contracts-foundry-ci.yaml

@@ -0,0 +1,134 @@
+name: L1 contracts foundry CI
+
+env:
+ ANVIL_PRIVATE_KEY: "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"
+ ANVIL_RPC_URL: "http://127.0.0.1:8545"
+
+on:
+ pull_request:
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout the repository
+ uses: actions/checkout@v4
+ with:
+ submodules: true
+
+ - name: Use Foundry
+ uses: foundry-rs/foundry-toolchain@v1
+
+ - name: Use Node.js
+ uses: actions/setup-node@v4
+ with:
+ node-version: 18.18.0
+ cache: yarn
+
+ - name: Install dependencies
+ run: yarn
+
+ - name: Build hardhat artifacts
+ run: yarn l1 build
+
+ - name: Build artifacts
+ working-directory: ./l1-contracts
+ run: forge build
+
+ - name: Build system-contract artifacts
+ run: yarn sc build
+
+ - name: Build l2 artifacts
+ run: yarn l2 build
+
+ - name: Build da-contracts artifacts
+ run: yarn da build:foundry
+
+ - name: Create cache
+ uses: actions/cache/save@v3
+ with:
+ key: artifacts-l1-contracts-foudry-${{ github.sha }}
+ path: |
+ da-contracts/out
+ l1-contracts/cache
+ l1-contracts/out
+ l1-contracts/artifacts-zk
+ l2-contracts/artifacts-zk
+ l2-contracts/cache-zk
+ system-contracts/artifacts-zk
+ system-contracts/bootloader/build
+ system-contracts/cache-zk
+ system-contracts/contracts-preprocessed
+ system-contracts/typechain
+
+ scripts:
+ runs-on: ubuntu-latest
+ needs: build
+ steps:
+ - name: Checkout the repository
+ uses: actions/checkout@v4
+ with:
+ submodules: true
+
+ - name: Restore artifacts cache
+ uses: actions/cache/restore@v3
+ with:
+ fail-on-cache-miss: true
+ key: artifacts-l1-contracts-foudry-${{ github.sha }}
+ path: |
+ da-contracts/out
+ l1-contracts/cache
+ l1-contracts/out
+ l1-contracts/artifacts-zk
+ l2-contracts/artifacts-zk
+ l2-contracts/cache-zk
+ system-contracts/artifacts-zk
+ system-contracts/bootloader/build
+ system-contracts/cache-zk
+ system-contracts/contracts-preprocessed
+ system-contracts/typechain
+
+ - name: Use Foundry
+ uses: foundry-rs/foundry-toolchain@v1
+
+ - name: Copy configs from template
+ working-directory: ./l1-contracts
+ run: cp -r deploy-script-config-template/. script-config
+
+ - name: Run anvil
+ run: |
+ anvil --silent &
+
+ ANVIL_READY=0
+ for i in {1..10}; do
+ if curl -s -o /dev/null $ANVIL_RPC_URL -X POST -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"eth_chainId","id":1}'; then
+ echo "Anvil is ready"
+ ANVIL_READY=1
+ break
+ else
+ echo "Waiting for Anvil to become ready..."
+ sleep 1
+ fi
+ done
+
+ if [ $ANVIL_READY -ne 1 ]; then
+ echo "Anvil failed to become ready after 10 attempts."
+ exit 1
+ fi
+
+ - name: Run DeployL1 script
+ working-directory: ./l1-contracts
+ run: forge script ./deploy-scripts/DeployL1.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
+
+ - name: Run DeployErc20 script
+ working-directory: ./l1-contracts
+ run: forge script ./deploy-scripts/DeployErc20.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
+# TODO restore scripts verification
+# - name: Run RegisterZKChain script
+# working-directory: ./l1-contracts
+# run: |
+# cat ./script-out/output-deploy-l1.toml >> ./script-config/register-zk-chain.toml
+# forge script ./deploy-scripts/RegisterZKChain.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY
+# - name: Run InitializeL2WethToken script
+# working-directory: ./l1-contracts-foundry
+# run: forge script ./deploy-scripts/InitializeL2WethToken.s.sol --ffi --rpc-url $ANVIL_RPC_URL --broadcast --private-key $ANVIL_PRIVATE_KEY