Merge branch 'master' into yipu3/clearer-error

Author: DaniPopes

.config/nextest.toml

@@ -1,5 +1,8 @@
+[test-groups]
+chisel-serial = { max-threads = 1 }
+
 [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]]
@@ -9,3 +12,7 @@ slow-timeout = { period = "5m", terminate-after = 4 }
 [[profile.default.overrides]]
 filter = "package(foundry-cheatcodes-spec)"
 retries = 0
+
+[[profile.default.overrides]]
+filter = "package(chisel)"
+test-group = "chisel-serial"

.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/ISSUE_TEMPLATE/BUG-FORM.yml

@@ -32,6 +32,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 +55,4 @@ body:
           label: Describe the bug
           description: Please include relevant Solidity snippets as well if relevant.
       validations:
-          required: true
+          required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,8 +3,15 @@ Thank you for your Pull Request. Please provide a description above and review
 the requirements below.
 
 Bug fixes and new features should include tests.
+
+Contributors guide: https://github.com/foundry-rs/foundry/blob/master/CONTRIBUTING.md
+
+The contributors guide includes instructions for running rustfmt and building the
+documentation.
 -->
 
+<!-- ** Please select "Allow edits from maintainers" in the PR Options ** -->
+
 ## Motivation
 
 <!--
@@ -19,3 +26,9 @@ thought of as being the motivation for your change.
 Summarize the solution and provide any necessary context needed to understand
 the code change.
 -->
+
+## PR Checklist
+
+- [ ] Added Tests
+- [ ] Added Documentation
+- [ ] Breaking changes

.github/assets/banner.png

@@ -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": 500,
+    "max_back_track_time_days": 120
 }

.github/assets/build_benchmark_openzeppelin_dark.png

@@ -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/assets/build_benchmark_openzeppelin_light.png

@@ -83,19 +83,19 @@ def __init__(
     ),
     Case(
         name="integration",
-        filter="kind(test) & !test(/issue|forge_std|ext_integration/)",
+        filter="kind(test) & !test(/\\b(issue|ext_integration)/)",
         n_partitions=3,
         pr_cross_platform=True,
     ),
     Case(
         name="integration / issue-repros",
-        filter="package(=forge) & test(~issue)",
+        filter="package(=forge) & test(/\\bissue/)",
         n_partitions=2,
         pr_cross_platform=False,
     ),
     Case(
         name="integration / external",
-        filter="package(=forge) & test(~ext_integration)",
+        filter="package(=forge) & test(/\\bext_integration/)",
         n_partitions=2,
         pr_cross_platform=False,
     ),

.github/assets/build_benchmark_solady_dark.png

@@ -9,53 +9,12 @@ on:
   workflow_dispatch:
     # Needed so we can run it manually
 
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  BRANCH: cargo-update
-  TITLE: "chore(deps): weekly `cargo update`"
-  BODY: |
-    Automation to keep dependencies in `Cargo.lock` current.
-
-    <details><summary><strong>cargo update log</strong></summary>
-    <p>
-
-    ```log
-    $cargo_update_log
-    ```
-
-    </p>
-    </details>
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
   update:
-    name: Update
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@nightly
-
-      - name: cargo update
-        # Remove first line that always just says "Updating crates.io index"
-        run: cargo update --color never 2>&1 | sed '/crates.io index/d' | tee -a cargo_update.log
-
-      - name: craft commit message and PR body
-        id: msg
-        run: |
-          export cargo_update_log="$(cat cargo_update.log)"
-
-          echo "commit_message<<EOF" >> $GITHUB_OUTPUT
-          printf "$TITLE\n\n$cargo_update_log\n" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-
-          echo "body<<EOF" >> $GITHUB_OUTPUT
-          echo "$BODY" | envsubst >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
-        with:
-          add-paths: ./Cargo.lock
-          commit-message: ${{ steps.msg.outputs.commit_message }}
-          title: ${{ env.TITLE }}
-          body: ${{ steps.msg.outputs.body }}
-          branch: ${{ env.BRANCH }}
+    uses: ithacaxyz/ci/.github/workflows/cargo-update-pr.yml@main
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}