feat: boojum integration merge main (#233)

* chore: adds proper null response to zks_batchDetails method (#152) * fix: add back call stacks, console logs, and correct call stack count (#155) * fix: add back call stacks, console logs, and correct call stack count * Add comments. Fix typo. * fix lint * feat: add eth_getStorageAt (#134) * add get_storage_at * add eth_getStorageAt * limit max archived blocks to 128 * remove ethers-contract dep * feat: add evm_snapshot/revert (#158) * fix: update compiled smart contracts to latest (#157) * Update compile smart contracts checked into source * Hide Notes section of PR template by default * Update e2e tests to also be run on MacOS * Add commented link to YouTube video at the top of release notes * Limit rust/clippy linting to only the era_test_node package/crate * Re-enable e2e test for zks_estimateFee * Add more trace level logs for gas estimation * feat: add eth_getTransactionByBlockHashAndIndex and eth_getTransactionByBlockNumberAndIndex (#159) * feat: add eth_protocolVersion (#161) * feat: impl debug_traceCall (#151) * feat: impl debug_traceCall * feat: adds test contract dir * add refresh_test_contracts in Makefile * fix: rename contacts_for_l2_call -> contracts_for_l2_call * move not_implemented() to crate::utils, replace usage of macro --------- Co-authored-by: Nicolas Villanueva <nicolasvillanueva@msn.com> * feat: Add well-known log selectors to console output (#162) * add aarch64-unknown-linux-gnu target (#164) * feat: add rustbook (#163) * fix: install mdbook for ci (#169) * feat: impl debug_traceTransaction (#165) * feat: impl `debug_traceBlockByHash` and `debug_traceBlockByNumber` (#168) * fix: update zksync-era deps to v16.0.0 (#173) * chore: remove hub usage in favour of gh for draft releases (#175) * feat: add hardhat_setCode (#171) * feat: impl `zks_getTransactionDetails` (#176) * feat: forbid ".only" from e2e-tests (#179) * feat: impl zks_getBlockDetails (#182) * feat: support builtInWithoutSecurity option (#186) * feat: add zks_getBridgeContracts (#184) * feat: add zks_getBytecodeByHash (#180) * feat: refactor logging to use tracing crate and make it dynamic (#187) * feat: impl zks_getRawBlockTransactions (#185) * fix: unit-tests fixed on main (#193) * fix: fix forking for zksync-era@16.0.2 (#194) * fix: Release drafts now attach files correctly (#196) * feat: impl `zks_getAllAccountBalances` and `zks_getConfirmedTokens` (#198) * fix: Update transaction type for gas estimation if one is not provided for EIP712 transactions, this fixes paymasters for era-test-node. (#195) * chore: updates zksync dep, and replaces vm with multivm crate (#199) * chore: update era test node to latest * chore: cargo fmt * chore: switch toolchain actions and use nightly * chore: updates zks gas estimate * chore: remove +stable for nexttest action * chore: use larger runner * debug: collect runner stats * chore: invalidate cache to collect stats * chore: remove default runner for 16core * chore: fix workflows to use nightly (#203) * chore: fix workflows to use nightly * chore: fix workflows to use nightly * chore: refactor node namespaces (#197) * fix: validate gas_limit and max_fee_per_gas before transaction execution (#207) * fix: validate gas_limit and max_fee_per_gas before transaction execution * fix: add validation for max_fee_per_gas being to low * fix: move validate_tx to node/in_memoty.ts * fix: lint * fix: move tx validation logic to run_l2_tx * test: add tests for tx validation * fix: remove unneeded match from eth.rs * fix: lint * fix: remove +nightly from vscode debug config * fix: remove extra new line log * feat: add parent hash linking for blocks (#209) * feat: add parent_hash linking for blocks * test: add tests * fix: lint * fix: use correct genesis block hash as initial current_miniblock_hash * chore: Update zksync-era dependency to latest (#210) * chore: Update zksync-era dependency to latest * add Version17 to list of supported version * chore: add rust toolchain for version mgt, make inner_tx pub (#213) * chore: add rust toolchain for version mgt, update to make inner tx pub again * chore: change version to reflect ci * fix: rename run_l2_tx_inner, fix panics for lib users (#214) * rename run_l2_tx_inner, fix panics for lib users * add test * undo dep changes * cleanup comments * inline params * cleanup ExternalStorage * fix test messages * feat: get block returns null for non existing blocks (#218) * chore: fix docs issue (#215) * chore: fix rust-toolchain extension (#216) * run smoke test on PRs (#219) * feat: update `multivm::vm_virtual_blocks` dependency to `multivim::vm_latest` (#220) * bugfix: Set removed property in Logs to false (#224) * feat: Implement web3_clientVersion (#223) * feat: Implement web3_clientVersion * lint fix --------- Co-authored-by: Dustin Brickwood <dustinbrickwood204@gmail.com> * feat: Update event formatter and observability formatter (#226) * chore: bump cargo toml for upcoming `0.1.0-alpha.12` release (#227) * chore: bump cargo toml for upcoming release * chore: bump cargo toml for upcoming release * feat(vm): Adapt code for the latest zksync era changes (#230) Signed-off-by: Danil <deniallugo@gmail.com> * feat: Allow to pass custom tracers to run_raw_tx (#231) Signed-off-by: Danil <deniallugo@gmail.com> * Merge main * latest vm * Small refactoring * System contracts 18.4.0 * EcAdd, EcMul, rebuild system contracts * Small change in system-contracts/VERSION.md * Update zksync-era dependency * Fix test * Prepare to merge into main --------- Signed-off-by: Danil <deniallugo@gmail.com> Co-authored-by: Dustin Brickwood <dustinbrickwood204@gmail.com> Co-authored-by: Nicolas Villanueva <nicolasvillanueva@msn.com> Co-authored-by: Nisheeth Barthwal <nbaztec@gmail.com> Co-authored-by: George W <140627974+grw-ms@users.noreply.github.com> Co-authored-by: Roman Petriv <petriv.roma@gmail.com> Co-authored-by: Vasyl Ivanchuk <vasyl.ivanchuk@gmail.com> Co-authored-by: Agustin Aon <21188659+aon@users.noreply.github.com> Co-authored-by: Danil <deniallugo@gmail.com>
matter-labs · Dec 6, 2023 · 55fcc09 · 55fcc09
1 parent 1d1effa
commit 55fcc09
Show file tree

Hide file tree

Showing 161 changed files with 11,796 additions and 5,873 deletions.
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
@@ -6,7 +6,7 @@ on:
     tags:
       - 'v*'
   pull_request:
-    branches: [boojum-integration]
+    branches: [main]
   workflow_dispatch:
 
 jobs:
@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Install rust
+      - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2023-07-21
+          toolchain: nightly-2023-07-23
           components: rustfmt, clippy
 
       - uses: actions/setup-node@v3
@@ -44,7 +44,7 @@ jobs:
       - name: Install Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: nightly-2023-07-21
+          toolchain: nightly-2023-07-23
 
       - name: Build Code
         run: make all

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -29,14 +29,22 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+
+      - name: Install Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: nightly-2023-07-21
       - name: Setup Pages
         uses: actions/configure-pages@v3
+
       - name: Install mdbook
         run: cargo install mdbook
+
       - name: Generate rust docs
         run: |
           echo "Generating docs..."
           cargo doc --no-deps
+
       - name: Make index.html
         run: echo '<!DOCTYPE HTML>
           <html lang="en-US">

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -44,13 +44,14 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
-      - name: Set version of nightly Rust
-        run: rustup default nightly-2023-07-21
+
+      - name: Install Rust
+        uses: actions-rust-lang/setup-rust-toolchain@v1
+        with:
+          toolchain: nightly-2023-07-21
       - name: Install target
         run: rustup target add ${{ matrix.arch }}
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: false
+
       - name: Run cargo clean
         run: cargo clean
 

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -2,18 +2,19 @@ name: run
 
 on:
   push:
-    branches: [boojum-integration]
+    branches: [main]
     tags:
       - 'v*'
   pull_request:
-    branches: [boojum-integration]
+    branches: [main]
   workflow_dispatch:
+
 jobs:
   test:
     name: unit-tests
     strategy:
       matrix:
-        platform: [ubuntu-latest, macos-latest]
+        platform: [macos-latest, ubuntu-22.04-github-hosted-16core]
     runs-on: ${{ matrix.platform }}
 
     steps:
@@ -30,3 +31,31 @@ jobs:
 
     - name: Run tests
       run: cargo nextest run
+
+  smoke-test:
+    name: smoke-test
+    runs-on: ubuntu-22.04-github-hosted-16core
+    env:
+      TEST_REPO_DIR: test-repo
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4 
+      with:
+        path: ${{ env.TEST_REPO_DIR }}
+        ref: ${{ github.event.pull_request.head.sha }}
+
+    - name: Install Rust
+      uses: actions-rust-lang/setup-rust-toolchain@v1
+      with:
+        toolchain: nightly-2023-07-23
+
+    - name: Run smoke-test
+      env:
+        TEST_REPO: ${{ github.event.repository.name }}
+        TEST_REPO_DIR: "../${{ env.TEST_REPO_DIR }}"
+        RUST_BACKTRACE: full
+      run: |
+        git clone https://github.com/matter-labs/zkfoundry-smoke-test
+        cd zkfoundry-smoke-test
+        ./smoke-test.sh
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -44,7 +44,7 @@
                 "ZKSYNC_HOME": "${workspaceFolder}"
             },
             "args": [
-                "--dev-use-local-contracts",
+                "--dev-system-contracts=local",
                 "run"
             ],
             "preLaunchTask": "rebuild-contracts",