Do not merge - just showing what changes we have made since forking from foundry

.cargo/config.toml

@@ -1,15 +1,11 @@
+[alias]
+cheats = "test -p foundry-cheatcodes-spec --features schema tests::"
+test-debugger = "test -p forge --test cli manual_debug_setup -- --include-ignored --nocapture"
+
+# Increase the stack size to 10MB for Windows targets, which is in line with Linux
+# (whereas default for Windows is 1MB).
 [target.x86_64-pc-windows-msvc]
-rustflags = [
-    # Increases the stack size to 10MB, which is
-    # in line with Linux (whereas default for Windows is 1MB)
-    "-C",
-    "link-arg=/STACK:10000000",
-]
+rustflags = ["-Clink-arg=/STACK:10000000"]
 
 [target.i686-pc-windows-msvc]
-rustflags = [
-    # Increases the stack size to 10MB, which is
-    # in line with Linux (whereas default for Windows is 1MB)
-    "-C",
-    "link-arg=/STACK:10000000",
-]
+rustflags = ["-Clink-arg=/STACK:10000000"]

.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

@@ -0,0 +1,11 @@
+[profile.default]
+retries = { backoff = "exponential", count = 2, delay = "3s", jitter = true }
+slow-timeout = { period = "1m", terminate-after = 3 }
+
+[[profile.default.overrides]]
+filter = "test(/ext_integration|can_test_forge_std/)"
+slow-timeout = { period = "5m", terminate-after = 4 }
+
+[[profile.default.overrides]]
+filter = "package(foundry-cheatcodes-spec)"
+retries = 0

.gitattributes

@@ -1,4 +1,5 @@
-# auto-detection may fail for human-readable files, like the ones in abi/abi/*.sol
-**/*.sol linguist-language=Solidity
+crates/cheatcodes/assets/*.json linguist-generated
+testdata/cheats/Vm.sol linguist-generated
 
-crates/abi/src/bindings/*.rs linguist-generated
+# See <https://git-scm.com/docs/gitattributes#_defining_a_custom_hunk_header>
+*.rs diff=rust

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @danipopes @klkvr @mattsse @grandizzy @yash-atreya @zerosnacks

.github/INTEGRATION_FAILURE.md

@@ -3,8 +3,8 @@ title: "bug: long-running integration tests failed"
 labels: P-high, T-bug
 ---
 
-The heavy (long-running) integration tests have failed. This indicates a regression in foundry.
+The heavy (long-running) integration tests have failed. This indicates a regression in Foundry.
 
-Check the [heavy integration tests workflow page]({{env.WORKFLOW_URL}}) for details.
+Check the [heavy integration tests workflow page]({{ env.WORKFLOW_URL }}) for details.
 
-This issue was raised by the workflow at `.github/workflows/heavy-integration.yml`.
+This issue was raised by the workflow at `.github/workflows/heavy-integration.yml`.

.github/ISSUE_TEMPLATE/BUG-FORM.yml

@@ -1,6 +1,6 @@
 name: Bug report
 description: File a bug report
-labels: ["T-bug"]
+labels: ["T-bug", "T-needs-triage"]
 body:
     - type: markdown
       attributes:
@@ -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/ISSUE_TEMPLATE/FEATURE-FORM.yml

@@ -1,6 +1,6 @@
 name: Feature request
 description: Suggest a feature
-labels: ["T-feature"]
+labels: ["T-feature", "T-needs-triage"]
 body:
     - type: markdown
       attributes:

.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/RELEASE_FAILURE_ISSUE_TEMPLATE.md

@@ -5,6 +5,6 @@ labels: P-high, T-bug
 
 The release workflow has failed. Some or all binaries might have not been published correctly.
 
-Check the [release workflow page]({{env.WORKFLOW_URL}}) for details.
+Check the [release workflow page]({{ env.WORKFLOW_URL }}) for details.
 
-This issue was raised by the workflow at `.github/workflows/release.yml`.
+This issue was raised by the workflow at `.github/workflows/release.yml`.

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

.github/scripts/format.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+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
+cargo run --bin forge -- fmt "$@" \
+    $(find testdata -name '*.sol' ! -name Vm.sol ! -name console.sol)

.github/scripts/matrices.py

@@ -0,0 +1,146 @@
+#!/usr/bin/env python3
+
+import json
+import os
+
+
+# A runner target
+class Target:
+    # GHA runner
+    runner_label: str
+    # Rust target triple
+    target: str
+    # SVM Solc target
+    svm_target_platform: str
+
+    def __init__(self, runner_label: str, target: str, svm_target_platform: str):
+        self.runner_label = runner_label
+        self.target = target
+        self.svm_target_platform = svm_target_platform
+
+
+# A single test suite to run.
+class Case:
+    # Name of the test suite.
+    name: str
+    # Nextest filter expression.
+    filter: str
+    # Number of partitions to split the test suite into.
+    n_partitions: int
+    # Whether to run on non-Linux platforms for PRs. All platforms and tests are run on pushes.
+    pr_cross_platform: bool
+
+    def __init__(
+        self, name: str, filter: str, n_partitions: int, pr_cross_platform: bool
+    ):
+        self.name = name
+        self.filter = filter
+        self.n_partitions = n_partitions
+        self.pr_cross_platform = pr_cross_platform
+
+
+# GHA matrix entry
+class Expanded:
+    name: str
+    runner_label: str
+    target: str
+    svm_target_platform: str
+    flags: str
+    partition: int
+
+    def __init__(
+        self,
+        name: str,
+        runner_label: str,
+        target: str,
+        svm_target_platform: str,
+        flags: str,
+        partition: int,
+    ):
+        self.name = name
+        self.runner_label = runner_label
+        self.target = target
+        self.svm_target_platform = svm_target_platform
+        self.flags = flags
+        self.partition = partition
+
+
+profile = os.environ.get("PROFILE")
+is_pr = os.environ.get("EVENT_NAME") == "pull_request"
+t_linux_x86 = Target("ubuntu-latest", "x86_64-unknown-linux-gnu", "linux-amd64")
+# 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]
+
+config = [
+    Case(
+        name="unit",
+        filter="!kind(test)",
+        n_partitions=1,
+        pr_cross_platform=True,
+    ),
+    Case(
+        name="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(/\\bissue/)",
+        n_partitions=2,
+        pr_cross_platform=False,
+    ),
+    Case(
+        name="integration / external",
+        filter="package(=forge) & test(/\\bext_integration/)",
+        n_partitions=2,
+        pr_cross_platform=False,
+    ),
+]
+
+
+def main():
+    expanded = []
+    for target in targets:
+        for case in config:
+            if is_pr and (not case.pr_cross_platform and target != t_linux_x86):
+                continue
+
+            for partition in range(1, case.n_partitions + 1):
+                os_str = ""
+                if len(targets) > 1:
+                    os_str = f" ({target.target})"
+
+                name = case.name
+                flags = f"-E '{case.filter}'"
+                if case.n_partitions > 1:
+                    s = f"{partition}/{case.n_partitions}"
+                    name += f" ({s})"
+                    flags += f" --partition count:{s}"
+
+                if profile == "isolate":
+                    flags += " --features=isolate-by-default"
+                name += os_str
+
+                obj = Expanded(
+                    name=name,
+                    runner_label=target.runner_label,
+                    target=target.target,
+                    svm_target_platform=target.svm_target_platform,
+                    flags=flags,
+                    partition=partition,
+                )
+                expanded.append(vars(obj))
+
+    print_json({"include": expanded})
+
+
+def print_json(obj):
+    print(json.dumps(obj), end="", flush=True)
+
+
+if __name__ == "__main__":
+    main()