wip: fmt solar

.config/nextest.toml

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

.devcontainer/Dockerfile.dev

@@ -0,0 +1,84 @@
+FROM ubuntu:22.04
+
+ARG USERNAME=foundry
+ARG USER_UID=1000
+ARG USER_GID=$USER_UID
+ARG PYTHON_VERSION=3.11
+ARG NODE_MAJOR=20
+ARG VYPER_VERSION=0.4.3
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV CARGO_TERM_COLOR=always \
+    RUST_BACKTRACE=full
+
+WORKDIR /workspace
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    # Build tools
+    build-essential \
+    clang \
+    lld \
+    pkg-config \
+    # Network/SSL
+    curl \
+    ca-certificates \
+    gnupg \
+    libssl-dev \
+    # Version control & utils
+    git \
+    sudo \
+    unzip \
+    # Python
+    python${PYTHON_VERSION} \
+    python3-pip \
+    python${PYTHON_VERSION}-venv \
+    # Add Node.js repo
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_${NODE_MAJOR}.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+    # Update again after adding repo and install Node.js
+    && apt-get update && apt-get install -y --no-install-recommends \
+    nodejs \
+    # Clean up apt cache
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Ensure python points to the installed python version
+RUN ln -sf /usr/bin/python${PYTHON_VERSION} /usr/bin/python && \
+    ln -sf /usr/bin/python${PYTHON_VERSION} /usr/bin/python3
+
+# Create non-root user with sudo privileges
+RUN groupadd --gid $USER_GID $USERNAME \
+    && useradd --uid $USER_UID --gid $USER_GID -m $USERNAME -s /bin/bash \
+    # Setup sudo without password prompt
+    && echo "$USERNAME ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/$USERNAME \
+    && chmod 0440 /etc/sudoers.d/$USERNAME \
+    # Add user to the sudo group (standard practice)
+    && usermod -aG sudo $USERNAME
+
+# Switch to the non-root user
+USER $USERNAME
+WORKDIR /home/$USERNAME
+
+# --- User-specific installations ---
+
+# Install Bun
+ENV BUN_INSTALL="/home/$USERNAME/.bun"
+ENV PATH="$BUN_INSTALL/bin:$PATH"
+RUN curl -fsSL https://bun.sh/install | bash
+
+# Install Rust & cargo-nextest
+ENV CARGO_HOME="/home/$USERNAME/.cargo"
+ENV RUSTUP_HOME="/home/$USERNAME/.rustup"
+ENV PATH="$CARGO_HOME/bin:$PATH"
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
+    && cargo install cargo-nextest --locked
+
+# Install Vyper using pip
+# Ensure pip user install directory is in PATH
+ENV PYTHONUSERBASE="/home/$USERNAME/.local"
+ENV PATH="$PYTHONUSERBASE/bin:$PATH"
+RUN pip3 install --user vyper==${VYPER_VERSION}
+
+# Switch back to the main workspace directory
+WORKDIR /workspace
+

.devcontainer/devcontainer.json

@@ -0,0 +1,49 @@
+// For format details, see https://aka.ms/devcontainer.json.
+{
+  "name": "Foundry Development",
+  "build": {
+    "context": "..",
+    "dockerfile": "Dockerfile.dev"
+  },
+
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "installZsh": true,
+      "configureZshAsDefaultShell": true,
+      "installOhMyZsh": true,
+      "upgradePackages": true
+    }
+  },
+
+  "forwardPorts": [],
+
+  "postCreateCommand": "rustup default stable && rustup update",
+
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "rust-lang.rust-analyzer",
+        "serayuzgur.crates",
+        "tamasfe.even-better-toml",
+        "ms-python.python",
+        "dbaeumer.vscode-eslint",
+        "oven.bun-vscode"
+      ],
+      "settings": {
+        "rust-analyzer.checkOnSave": true,
+        "rust-analyzer.cargo.features": "all"
+      }
+    }
+  },
+
+  "remoteUser": "foundry",
+
+  "workspaceMount": "source=${localWorkspaceFolder},target=/workspace,type=bind,consistency=cached",
+
+  "workspaceFolder": "/workspace",
+
+  "mounts": [
+    "source=${localEnv:HOME}/.cargo/registry,target=/home/foundry/.cargo/registry,type=bind,consistency=cached",
+    "source=${localEnv:HOME}/.cargo/git,target=/home/foundry/.cargo/git,type=bind,consistency=cached"
+  ]
+}

.git-blame-ignore-revs

@@ -10,3 +10,6 @@
 
 # fmt: all (#3398)
 860d083183b51a6f8d865408ef1a44aa694d6862
+
+# chore: bump to rust edition 2024 (#10802)
+710a1584aae8e0f8ca8d5ba552632dc72381091e

.gitattributes

@@ -3,3 +3,8 @@ testdata/cheats/Vm.sol linguist-generated
 
 # See <https://git-scm.com/docs/gitattributes#_defining_a_custom_hunk_header>
 *.rs diff=rust
+crates/lint/testdata/* text eol=lf
+testdata/fixtures/**/* eol=lf
+
+dprint.json linguist-language=JSON-with-Comments
+.devcontainer/devcontainer.json linguist-language=JSON-with-Comments

.github/PULL_REQUEST_TEMPLATE.md

@@ -31,4 +31,4 @@ the code change.
 
 - [ ] Added Tests
 - [ ] Added Documentation
-- [ ] Breaking changes
+- [ ] Breaking changes

.github/scripts/combine-benchmarks.sh

@@ -0,0 +1,204 @@
+#!/bin/bash
+set -euo pipefail
+
+# Script to combine individual benchmark results into LATEST.md
+# Usage: ./combine-benchmarks.sh <output_dir>
+
+OUTPUT_DIR="${1:-benches}"
+
+# Create output directory if it doesn't exist
+mkdir -p "$OUTPUT_DIR"
+
+# Define the benchmark files and their section names
+declare -A BENCHMARK_FILES=(
+    ["forge_test_bench.md"]="Forge Test"
+    ["forge_build_bench.md"]="Forge Build" 
+    ["forge_coverage_bench.md"]="Forge Coverage"
+)
+
+# Function to extract a specific section from a benchmark file
+extract_section() {
+    local file=$1
+    local section=$2
+    local in_section=0
+
+    while IFS= read -r line; do
+        if [[ "$line" =~ ^##[[:space:]]+"$section" ]]; then
+            in_section=1
+            echo "$line"
+        elif [[ $in_section -eq 1 && "$line" =~ ^##[[:space:]] && ! "$line" =~ ^##[[:space:]]+"$section" ]]; then
+            break
+        elif [[ $in_section -eq 1 ]]; then
+            echo "$line"
+        fi
+    done < "$file"
+}
+
+# Function to extract summary info (repos and versions) from a file
+extract_summary_info() {
+    local file=$1
+    local in_summary=0
+    local in_repos=0
+    local in_versions=0
+
+    while IFS= read -r line; do
+        # Check for Summary section
+        if [[ "$line" =~ ^##[[:space:]]+Summary ]]; then
+            in_summary=1
+            continue
+        fi
+
+        # Check for Repositories Tested subsection
+        if [[ $in_summary -eq 1 && "$line" =~ ^###[[:space:]]+Repositories[[:space:]]+Tested ]]; then
+            in_repos=1
+            echo "### Repositories Tested"
+            echo
+            continue
+        fi
+
+        # Check for Foundry Versions subsection
+        if [[ $in_summary -eq 1 && "$line" =~ ^###[[:space:]]+Foundry[[:space:]]+Versions ]]; then
+            in_repos=0
+            in_versions=1
+            echo "### Foundry Versions"
+            echo
+            continue
+        fi
+
+        # End of summary section
+        if [[ $in_summary -eq 1 && "$line" =~ ^##[[:space:]] && ! "$line" =~ ^##[[:space:]]+Summary ]]; then
+            break
+        fi
+
+        # Output repo or version lines
+        if [[ ($in_repos -eq 1 || $in_versions -eq 1) && -n "$line" ]]; then
+            echo "$line"
+        fi
+    done < "$file"
+}
+
+# Function to extract benchmark table from a section
+extract_benchmark_table() {
+    local file=$1
+    local section=$2
+    local in_section=0
+    local found_table=0
+
+    while IFS= read -r line; do
+        if [[ "$line" =~ ^##[[:space:]]+"$section" ]]; then
+            in_section=1
+            continue
+        elif [[ $in_section -eq 1 && "$line" =~ ^##[[:space:]] && ! "$line" =~ ^##[[:space:]]+"$section" ]]; then
+            break
+        elif [[ $in_section -eq 1 ]]; then
+            # Skip empty lines before table
+            if [[ -z "$line" && $found_table -eq 0 ]]; then
+                continue
+            fi
+            # Detect table start
+            if [[ "$line" =~ ^\|[[:space:]]*Repository ]]; then
+                found_table=1
+            fi
+            # Output table lines
+            if [[ $found_table -eq 1 && -n "$line" ]]; then
+                echo "$line"
+            fi
+        fi
+    done < "$file"
+}
+
+# Function to extract system information
+extract_system_info() {
+    local file=$1
+    # Extract from System Information to end of file (EOF)
+    awk '/^## System Information/ { found=1; next } found { print }' "$file"
+}
+
+# Start building LATEST.md
+cat > "$OUTPUT_DIR/LATEST.md" << EOF
+# 📊 Foundry Benchmark Results
+
+**Generated at**: $(date -u '+%Y-%m-%d %H:%M:%S UTC')
+
+EOF
+
+# Process each benchmark file
+FIRST_FILE=1
+SYSTEM_INFO=""
+
+for bench_file in "forge_test_bench.md" "forge_isolate_test_bench.md" "forge_build_bench.md" "forge_coverage_bench.md"; do
+    if [ -f "$OUTPUT_DIR/$bench_file" ]; then
+        echo "Processing $bench_file..."
+
+        # Get the section name
+        case "$bench_file" in
+            "forge_test_bench.md")
+                SECTION_NAME="Forge Test"
+                ;;
+            "forge_isolate_test_bench.md")
+                SECTION_NAME="Forge Test (Isolated)"
+                ;;
+            "forge_build_bench.md")
+                SECTION_NAME="Forge Build"
+                ;;
+            "forge_coverage_bench.md")
+                SECTION_NAME="Forge Coverage"
+                ;;
+        esac
+
+        # Add section header
+        echo "## $SECTION_NAME" >> "$OUTPUT_DIR/LATEST.md"
+        echo >> "$OUTPUT_DIR/LATEST.md"
+
+        # Add summary info (repos and versions)
+        extract_summary_info "$OUTPUT_DIR/$bench_file" >> "$OUTPUT_DIR/LATEST.md"
+        echo >> "$OUTPUT_DIR/LATEST.md"
+
+        # Handle different benchmark types
+        if [[ "$bench_file" == "forge_test_bench.md" ]]; then
+            # Extract both Forge Test and Forge Fuzz Test tables
+            extract_benchmark_table "$OUTPUT_DIR/$bench_file" "Forge Test" >> "$OUTPUT_DIR/LATEST.md"
+
+            # Check if Forge Fuzz Test section exists
+            if grep -q "^## Forge Fuzz Test" "$OUTPUT_DIR/$bench_file"; then
+                echo >> "$OUTPUT_DIR/LATEST.md"
+                echo "## Forge Fuzz Test" >> "$OUTPUT_DIR/LATEST.md"
+                echo >> "$OUTPUT_DIR/LATEST.md"
+                extract_benchmark_table "$OUTPUT_DIR/$bench_file" "Forge Fuzz Test" >> "$OUTPUT_DIR/LATEST.md"
+            fi
+        elif [[ "$bench_file" == "forge_build_bench.md" ]]; then
+            # Extract No Cache table
+            echo "### No Cache" >> "$OUTPUT_DIR/LATEST.md"
+            echo >> "$OUTPUT_DIR/LATEST.md"
+            extract_benchmark_table "$OUTPUT_DIR/$bench_file" "Forge Build (No Cache)" >> "$OUTPUT_DIR/LATEST.md"
+            echo >> "$OUTPUT_DIR/LATEST.md"
+
+            # Extract With Cache table
+            echo "### With Cache" >> "$OUTPUT_DIR/LATEST.md"
+            echo >> "$OUTPUT_DIR/LATEST.md"
+            extract_benchmark_table "$OUTPUT_DIR/$bench_file" "Forge Build (With Cache)" >> "$OUTPUT_DIR/LATEST.md"
+        else
+            # Extract the benchmark table for other types
+            extract_benchmark_table "$OUTPUT_DIR/$bench_file" "$SECTION_NAME" >> "$OUTPUT_DIR/LATEST.md"
+        fi
+
+        echo >> "$OUTPUT_DIR/LATEST.md"
+
+        # Extract system info from first file only
+        if [[ $FIRST_FILE -eq 1 ]]; then
+            SYSTEM_INFO=$(extract_system_info "$OUTPUT_DIR/$bench_file")
+            FIRST_FILE=0
+        fi
+    else
+        echo "Warning: $bench_file not found, skipping..."
+    fi
+done
+
+# Add system information at the end
+if [[ -n "$SYSTEM_INFO" ]]; then
+    echo "## System Information" >> "$OUTPUT_DIR/LATEST.md"
+    echo >> "$OUTPUT_DIR/LATEST.md"
+    echo "$SYSTEM_INFO" >> "$OUTPUT_DIR/LATEST.md"
+fi
+
+echo "Successfully combined benchmark results into $OUTPUT_DIR/LATEST.md"