Merge remote-tracking branch 'foundry-zksync/main'

.codespellrc

@@ -0,0 +1,3 @@
+[codespell]
+skip = .git,target,testdata,Cargo.toml,Cargo.lock
+ignore-words-list = crate,ser,ratatui,Caf,froms,strat

.config/nextest.toml

@@ -1,5 +1,5 @@
 [profile.default]
-retries = { backoff = "exponential", count = 2, delay = "2s", jitter = true }
+retries = { backoff = "exponential", count = 2, delay = "3s", jitter = true }
 slow-timeout = { period = "1m", terminate-after = 3 }
 
 [[profile.default.overrides]]

.gitattributes

@@ -1,2 +1,5 @@
 crates/cheatcodes/assets/*.json linguist-generated
 testdata/cheats/Vm.sol linguist-generated
+
+# See <https://git-scm.com/docs/gitattributes#_defining_a_custom_hunk_header>
+*.rs diff=rust

.github/CODEOWNERS

@@ -1 +1,2 @@
-* @danipopes @klkvr @mattsse
+* @matter-labs/devxp
+* @matter-labs/external-moonsonglabs-team

.github/ISSUE_TEMPLATE/BUG-FORM.yml

@@ -1,6 +1,6 @@
 name: Bug report
 description: File a bug report
-labels: ["T-bug", "T-needs-triage"]
+labels: ["bug 🐛", "needs triage ♟️"]
 body:
     - type: markdown
       attributes:
@@ -16,9 +16,7 @@ body:
           options:
               - Forge
               - Cast
-              - Anvil
               - Foundryup
-              - Chisel
               - Other (please describe)
       validations:
           required: true
@@ -32,6 +30,10 @@ body:
       attributes:
           label: What version of Foundry are you on?
           placeholder: "Run forge --version and paste the output here"
+    - type: input
+      attributes:
+          label: What version of Foundryup are you on?
+          placeholder: "Run foundryup --version and paste the output here"
     - type: input
       attributes:
           label: What command(s) is the bug in?
@@ -51,4 +53,4 @@ body:
           label: Describe the bug
           description: Please include relevant Solidity snippets as well if relevant.
       validations:
-          required: true
+          required: true

.github/ISSUE_TEMPLATE/FEATURE-FORM.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: Suggest a feature
-labels: ["T-feature", "T-needs-triage"]
+labels: ["feature ➕", "needs triage ♟️"]
 body:
     - type: markdown
       attributes:
@@ -16,9 +16,7 @@ body:
           options:
               - Forge
               - Cast
-              - Anvil
               - Foundryup
-              - Chisel
               - Other (please describe)
       validations:
           required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-    - name: Support
-      url: https://t.me/foundry_support
-      about: This issue tracker is only for bugs and feature requests. Support is available on Telegram!
+    - name: Dev Support
+      url: https://github.com/ZKsync-Community-Hub/zksync-developers/discussions/
+      about: This issue tracker is only for bugs and feature requests. Support is available on Dev Discussions!

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,21 +1,23 @@
-<!--
-Thank you for your Pull Request. Please provide a description above and review
-the requirements below.
+# What :computer: 
+* First thing updated with this PR
+* Second thing updated with this PR
+* Third thing updated with this PR
 
-Bug fixes and new features should include tests.
--->
+# Why :hand:
+* Reason why first thing was added to PR
+* Reason why second thing was added to PR
+* Reason why third thing was added to PR
 
-## Motivation
+# Evidence :camera:
+Include screenshots, screen recordings, or `console` output here demonstrating that your changes work as intended
 
-<!--
-Explain the context and why you're making that change. What is the problem
-you're trying to solve? In some cases there is not a problem and this can be
-thought of as being the motivation for your change.
--->
+# Documentation :books:
+Please ensure the following before submitting your PR:
 
-## Solution
+- [ ] Check if these changes affect any documented features or workflows.
+- [ ] Update the [book](https://github.com/matter-labs/foundry-zksync-book) if these changes affect any documented features or workflows.
 
-<!--
-Summarize the solution and provide any necessary context needed to understand
-the code change.
--->
+<!-- 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? -->

.github/RELEASE_FAILURE_ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 ---
 title: "bug: release workflow failed"
-labels: P-high, T-bug
+labels: p0 :white_circle:, bug 🐛
 ---
 
 The release workflow has failed. Some or all binaries might have not been published correctly.

.github/changelog.json

@@ -1,16 +1,66 @@
 {
     "categories": [
         {
-            "title": "## Features",
-            "labels": ["T-feature"]
+            "title": "## Breaking changes",
+            "labels": ["T-likely-breaking "]
         },
         {
-            "title": "## Fixes",
-            "labels": ["T-bug", "T-fix"]
+            "title": "## Anvil Features",
+            "labels": ["C-anvil", "T-feature"],
+            "exhaustive": true,
+            "exhaustive_rules": false
+        },
+        {
+            "title": "## Anvil Fixes",
+            "labels": ["C-anvil", "T-bug"],
+            "exhaustive": true,
+            "exhaustive_rules": false
+        },
+        {
+            "title": "## Cast Features",
+            "labels": ["C-cast", "T-feature"],
+            "exhaustive": true,
+            "exhaustive_rules": false
+        },
+        {
+            "title": "## Cast Fixes",
+            "labels": ["C-cast", "T-bug"],
+            "exhaustive": true,
+            "exhaustive_rules": false
+        },
+        {
+            "title": "## Chisel Features",
+            "labels": ["C-chisel", "T-feature"],
+            "exhaustive": true,
+            "exhaustive_rules": false
+        },
+        {
+            "title": "## Chisel Fixes",
+            "labels": ["C-chisel", "T-bug"],
+            "exhaustive": true,
+            "exhaustive_rules": false
+        },
+        {
+            "title": "## Forge Features",
+            "labels": ["C-forge", "T-feature"],
+            "exhaustive": true,
+            "exhaustive_rules": false
+        },
+        {
+            "title": "## Forge Fixes",
+            "labels": ["C-forge", "T-bug"],
+            "exhaustive": true,
+            "exhaustive_rules": false
+        },
+        {
+            "title": "## Performance improvements",
+            "labels": ["T-perf"]
         }
     ],
     "ignore_labels": ["L-ignore"],
-    "template": "${{CHANGELOG}}\n## Other\n\n${{UNCATEGORIZED}}",
-    "pr_template": "- ${{TITLE}} (#${{NUMBER}})",
-    "empty_template": "- No changes"
+    "template": "${{CHANGELOG}}\n## Other\n\n${{UNCATEGORIZED}}\n## Full Changelog:\n ${{RELEASE_DIFF}}",
+    "pr_template": "- ${{TITLE}} (#${{NUMBER}}) by @${{AUTHOR}}",
+    "empty_template": "- No changes",
+    "max_pull_requests": 100,
+    "max_back_track_time_days": 60
 }

.github/release-please/config.json

@@ -0,0 +1,17 @@
+{
+  "bump-minor-pre-major": true,
+  "bump-patch-for-minor-pre-major": true,
+  "include-component-in-tag": true,
+  "release-type": "simple",
+  "packages": {
+    ".": {
+      "component": "foundry-zksync",
+      "extra-files": [
+        {
+          "type": "generic",
+          "path": "Cargo.toml"
+        }
+      ]
+    }
+  }
+}

.github/release-please/manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.0.8"
+}

.github/scripts/format.sh

@@ -3,5 +3,5 @@ set -eo pipefail
 
 # We have to ignore at shell level because testdata/ is not a valid Foundry project,
 # so running `forge fmt` with `--root testdata` won't actually check anything
-shopt -s extglob
-cargo run --bin forge -- fmt "$@" $(find testdata -name '*.sol' ! -name Vm.sol)
+cargo run --bin forge -- fmt "$@" \
+    $(find testdata -name '*.sol' ! -name Vm.sol ! -name console.sol)

.github/scripts/matrices.py

@@ -71,8 +71,9 @@ def __init__(
 # TODO: Figure out how to make this work
 # t_linux_arm = Target("ubuntu-latest", "aarch64-unknown-linux-gnu", "linux-aarch64")
 t_macos = Target("macos-latest", "aarch64-apple-darwin", "macosx-aarch64")
-t_windows = Target("windows-latest", "x86_64-pc-windows-msvc", "windows-amd64")
-targets = [t_linux_x86, t_windows] if is_pr else [t_linux_x86, t_macos, t_windows]
+# NOTE(zk): ZKsync-era doesn't support windows as of now
+# t_windows = Target("windows-latest", "x86_64-pc-windows-msvc", "windows-amd64")
+targets = [t_linux_x86] if is_pr else [t_linux_x86, t_macos]
 
 config = [
     Case(
@@ -115,7 +116,8 @@ def main():
                     os_str = f" ({target.target})"
 
                 name = case.name
-                flags = f"-E '{case.filter}'"
+                # NOTE(zk): filter out zk tests from upstream ci runs
+                flags = f"-E '{case.filter} & not (test(~zk) or test(~test_zk_aave_di) or package(~zksync))'"
                 if case.n_partitions > 1:
                     s = f"{partition}/{case.n_partitions}"
                     name += f" ({s})"