feat: boojum integration sync with main (#200)

* 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 <[email protected]> * 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 [email protected] (#194) * fix: Release drafts now attach files correctly (#196) * contracts_for_l2_call was missed during merge * Fix compilation errors * Fix tests --------- Co-authored-by: Dustin Brickwood <[email protected]> Co-authored-by: Nicolas Villanueva <[email protected]> Co-authored-by: Nisheeth Barthwal <[email protected]> Co-authored-by: George W <[email protected]>
matter-labs · Oct 25, 2023 · b929315 · b929315
1 parent 8e1ef9e
commit b929315
Show file tree

Hide file tree

Showing 68 changed files with 11,671 additions and 1,690 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -11,7 +11,7 @@
 # Evidence :camera:
 Include screenshots, screen recordings, or `console` output here demonstrating that your changes work as intended
 
-<!-- All sections below are optional. You can erase any section not applicable to your Pull Request. -->
+<!-- All sections below are optional. You can uncomment any section applicable to your Pull Request. -->
 
-# Notes :memo:
-* Any notes/thoughts that the reviewers should know prior to reviewing the code?
+<!-- # Notes :memo:
+* Any notes/thoughts that the reviewers should know prior to reviewing the code? -->
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -31,6 +31,8 @@ jobs:
         uses: actions/checkout@v3
       - name: Setup Pages
         uses: actions/configure-pages@v3
+      - name: Install mdbook
+        run: cargo install mdbook
       - name: Generate rust docs
         run: |
           echo "Generating docs..."
@@ -50,6 +52,10 @@ jobs:
                   If you are not redirected automatically, follow this <a href='./era_test_node/index.html'>link to example</a>.
               </body>
           </html>' > ./target/doc/index.html
+      - name: Generate rustbook
+        run: |
+          make book
+          cp -r docs/rustbook/book target/doc
       - name: Fix permissions
         run: |
           chmod -c -R +rX "target/doc/" | while read line; do

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -4,7 +4,11 @@ on:
 
 jobs:
   e2e:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
     name: e2e
     steps:
       - uses: actions/checkout@v3
@@ -20,13 +24,13 @@ jobs:
       - name: Download artifacts
         uses: actions/download-artifact@v3
         with:
-          name: era_test_node-ubuntu-latest.tar.gz
+          name: era_test_node-${{ matrix.os }}.tar.gz
 
       - name: Start the era_test_node
         id: start_node
         run: |
           echo "Extracting era_test_node binary"
-          tar -xzf era_test_node-ubuntu-latest.tar.gz
+          tar -xzf era_test_node-${{ matrix.os }}.tar.gz
           chmod +x era_test_node
           echo "Starting node in background"
           ./era_test_node run 2>&1 | tee era_test_node_output.log &

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,12 +28,12 @@ jobs:
     name: build release
     strategy:
       matrix:
-        # TODO: fix and add aarch64-unknown-linux-gnu target
-        # See: https://github.com/matter-labs/era-test-node/issues/56
-        arch: [x86_64-unknown-linux-gnu, x86_64-apple-darwin, aarch64-apple-darwin]
+        arch: [x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu, x86_64-apple-darwin, aarch64-apple-darwin]
         include:
           -   arch: x86_64-unknown-linux-gnu
               platform: ubuntu-20.04
+          -   arch: aarch64-unknown-linux-gnu
+              platform: ubuntu-20.04
           -   arch: x86_64-apple-darwin
               platform: macos-latest
           -   arch: aarch64-apple-darwin
@@ -131,7 +131,7 @@ jobs:
           echo "CONTRIBUTORS<<EOF" >> $GITHUB_OUTPUT
           echo "$(git log --pretty=format:"- %aN (%aE)" $(git describe --tags --abbrev=0 ${{ env.VERSION }}^)..${{ env.VERSION }} | sort | uniq)" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
-
+        
       - name: Create release draft
         env:
           GITHUB_USER: ${{ github.repository_owner }}
@@ -140,17 +140,18 @@ jobs:
         # The formatting here is borrowed from reth which borrowed it from Lighthouse (which is borrowed from OpenEthereum): https://github.com/openethereum/openethereum/blob/main/.github/workflows/build.yml
         run: |
           body=$(cat <<- "ENDBODY"
-          Release: ${{ env.VERSION }}
-          
+          <!--Watch Release Notes video below 👇 
+          [![YouTube Release Notes](https://img.youtube.com/vi/FZefCZW7JJk/0.jpg)](https://www.youtube.com/watch?v=FZefCZW7JJk)-->
+
           ## 📋 Summary
           
-          🐛 **Bug Fixes:**
+          ### 🐛 Bug Fixes:
           - TBD
           
-          ✨ **New Features:**
+          ### ✨ New Features:
           - TBD
           
-          ⚠️ **Breaking Changes:**
+          ### ⚠️ Breaking Changes:
           - TBD
           
           ## 📜 All Changes
@@ -166,14 +167,15 @@ jobs:
           | System | Architecture | Binary |
           |:---:|:---:|:---:|
           | <img src="https://simpleicons.org/icons/linux.svg" style="width: 32px;"/> | x86_64 | [era-test-node-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/era_test_node-${{ env.VERSION }}-x86_64-unknown-linux-gnu.tar.gz) | 
+          | <img src="https://simpleicons.org/icons/linux.svg" style="width: 32px;"/> | aarch64 | [era-test-node-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/era_test_node-${{ env.VERSION }}-aarch64-unknown-linux-gnu.tar.gz) | 
           | <img src="https://simpleicons.org/icons/apple.svg" style="width: 32px;"/> | x86_64 | [era-test-node-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/era_test_node-${{ env.VERSION }}-x86_64-apple-darwin.tar.gz) | 
           | <img src="https://simpleicons.org/icons/apple.svg" style="width: 32px;"/> | aarch64 | [era-test-node-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz](https://github.com/${{ env.REPO_NAME }}/releases/download/${{ env.VERSION }}/era_test_node-${{ env.VERSION }}-aarch64-apple-darwin.tar.gz) |
           | | | | 
           ENDBODY
           )
           assets=()
           for asset in ./era_test_node-*.tar.gz*; do
-              assets+=("-a" "$asset/$asset")
+              assets+=("$asset/$asset")
           done
           tag_name="${{ env.VERSION }}"
-          echo "$body" | hub release create --draft "${assets[@]}" -F "-" "$tag_name"
+          echo "$body" | gh release create "$tag_name" "${assets[@]}" --draft -F "-" -t "Release: $tag_name"