Merge branch 'master' into forge/master

Author: Dargon789

.config/nextest.toml

@@ -10,6 +10,13 @@ default-filter = "not test(/flaky_/)"
 filter = "test(/ext_integration/)"
 slow-timeout = { period = "5m", terminate-after = 4 }
 
+# `cast vaddr` end-to-end tests mine a 4-byte TIP-1022 PoW salt (CPU-bound,
+# minutes in debug mode) before exercising register/resolve/forward/watch
+# against an in-process Anvil Tempo node.
+[[profile.default.overrides]]
+filter = "test(/vaddr_e2e::/)"
+slow-timeout = { period = "5m", terminate-after = 4 }
+
 # Do not re-run so that `cargo cheats` is ran locally.
 [[profile.default.overrides]]
 filter = "package(foundry-cheatcodes-spec)"

.github/workflows/benchmarks.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
     inputs:
       versions:
-        description: "Comma-separated list of Foundry versions to benchmark (optional, defaults to 'v1.5.1,v1.7.0')"
+        description: "Comma-separated list of Foundry versions to benchmark (optional, defaults to 'stable,local'). Use 'local' to bench HEAD of the current branch."
         required: false
         type: string
       repos:
@@ -15,7 +15,7 @@ on:
         type: string
 
 env:
-  DEFAULT_VERSIONS: "v1.5.1,v1.7.0"
+  DEFAULT_VERSIONS: "stable,local"
 
   # Repos to benchmark per step. Each comma-separated entry has the form
   #   org/repo[:rev][ <extra args>]
@@ -24,7 +24,7 @@ env:
   # `--nmc BrokenTest`, so a single failing test does not fail the whole CI).
   TEST_REPOS: >-
     ithacaxyz/account:v0.5.7,
-    vectorized/solady:v0.1.26 --nmc 'LifebuoyTest|LibBitTest|Base58Test',
+    vectorized/solady:v0.1.26 --nmc 'LifebuoyTest|LibBitTest|Base58Test|LibStringTest',
     uniswap/v4-core:46c6834698c48bc4a463a86d8420f4eb1d7f3b75 --nmc 'TickMathTestTest',
     sparkdotfi/spark-psm:v1.0.0 --nmc PSMInvariants_TimeBasedRateSetting_WithTransfers_WithPocketSetting
 
@@ -145,6 +145,9 @@ jobs:
       - name: Combine benchmark results
         run: ./.github/scripts/combine-benchmarks.sh benches
 
+      - name: Print benchmark results
+        run: cat benches/LATEST.md
+
       - name: Upload benchmark results as artifacts
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
@@ -179,6 +182,7 @@ jobs:
 
       - name: Commit benchmark results
         id: commit_results
+        if: "!contains(github.event.inputs.versions || env.DEFAULT_VERSIONS, 'local')"
         env:
           GITHUB_HEAD_REF: ${{ github.head_ref }}
         run: ./.github/scripts/commit-benchmark-results.sh benches "${{ github.event_name }}" "${{ github.repository }}"
@@ -208,3 +212,37 @@ jobs:
             });
 
             console.log(`Created PR #${pr.number}: ${pr.html_url}`);
+
+      - name: Comment on PR
+        if: contains(github.event.inputs.versions || env.DEFAULT_VERSIONS, 'local')
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const { execSync } = require('child_process');
+
+            const formatted = execSync('./.github/scripts/format-pr-comment.sh benches/LATEST.md').toString();
+
+            const branch = context.ref.replace('refs/heads/', '');
+            const { data: prs } = await github.rest.pulls.list({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              head: `${context.repo.owner}:${branch}`,
+              state: 'open',
+            });
+
+            if (prs.length === 0) {
+              console.log(`No open PR found for branch '${branch}', skipping comment.`);
+              return;
+            }
+
+            const prNumber = prs[0].number;
+            const body = `## Benchmark Results (stable vs this branch)\n\n${formatted}\n\n---\n\n🤖 This comment was automatically generated by the [Foundry Benchmarks workflow](https://github.com/${{ github.repository }}/actions/workflows/benchmarks.yml).`;
+
+            await github.rest.issues.createComment({
+              issue_number: prNumber,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body,
+            });
+
+            console.log(`Posted benchmark results to PR #${prNumber}`);

.github/workflows/stale-prs.yml

@@ -0,0 +1,32 @@
+# Marks pull requests as stale.
+
+name: stale PRs
+
+on:
+  workflow_dispatch: {}
+  schedule:
+    - cron: "30 1 * * *"
+
+permissions: {}
+
+jobs:
+  stale-prs:
+    if: github.repository == 'foundry-rs/foundry'
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
+        with:
+          days-before-issue-stale: -1
+          days-before-issue-close: -1
+          days-before-pr-stale: 14
+          days-before-pr-close: 7
+          stale-pr-label: "stale"
+          exempt-pr-labels: "stop-stale"
+          stale-pr-message: "This pull request is stale because it has been open for 14 days with no activity. It will be closed in 7 days if there is no further activity."
+          close-pr-message: "This pull request was closed because it has been inactive for 7 days since being marked as stale."
+          labels-to-add-when-unstale: "stop-stale"
+          exempt-all-milestones: true
+          exempt-all-assignees: true

Cargo.lock

@@ -455,9 +455,20 @@ impl BenchmarkProject {
     }
 }
 
-/// Switch to a specific foundry version
+/// The workspace root, embedded at compile time.
+/// `benches/` is one level below the workspace root.
+const WORKSPACE_ROOT: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/..");
+
+/// Switch to a specific foundry version.
+///
+/// The special keyword `local` builds and activates the current workspace via
+/// `foundryup --path <workspace>` instead of `foundryup --use`.
 #[allow(unused_must_use)]
 pub fn switch_foundry_version(version: &str) -> Result<()> {
+    if version == "local" {
+        return install_local_version();
+    }
+
     let output = Command::new("foundryup")
         .args(["--use", version])
         .output()
@@ -480,6 +491,27 @@ pub fn switch_foundry_version(version: &str) -> Result<()> {
     Ok(())
 }
 
+/// Build and activate the local workspace via `foundryup --path`.
+/// Uses cargo's incremental compilation so re-runs are fast.
+#[allow(unused_must_use)]
+pub fn install_local_version() -> Result<()> {
+    let workspace =
+        std::fs::canonicalize(WORKSPACE_ROOT).wrap_err("Failed to resolve workspace root")?;
+    sh_println!("  Building local workspace at {}", workspace.display());
+
+    let status = Command::new("foundryup")
+        .args(["--path", workspace.to_str().unwrap()])
+        .status()
+        .wrap_err("Failed to run foundryup --path")?;
+
+    if !status.success() {
+        eyre::bail!("foundryup --path failed for local workspace");
+    }
+
+    sh_println!("  Successfully activated local build");
+    Ok(())
+}
+
 /// Get the current forge version
 pub fn get_forge_version() -> Result<String> {
     let output = Command::new("forge")

benches/src/lib.rs

@@ -2,7 +2,7 @@ use clap::Parser;
 use eyre::{Result, WrapErr};
 use foundry_bench::{
     BENCHMARK_REPOS, BenchmarkProject, FOUNDRY_VERSIONS, RUNS, RepoConfig, get_forge_version,
-    get_forge_version_details,
+    get_forge_version_details, install_local_version,
     results::{BenchmarkResults, HyperfineResult},
     switch_foundry_version,
 };
@@ -255,6 +255,11 @@ fn install_foundry_versions(versions: &[String]) -> Result<()> {
     for version in versions {
         sh_println!("Installing {version}...");
 
+        if version == "local" {
+            install_local_version()?;
+            continue;
+        }
+
         let status = Command::new("foundryup")
             .args(["--install", version, "--force"])
             .status()

benches/src/main.rs

@@ -3642,13 +3642,11 @@ fn tempo_parallel_nonce_markers(
 ) -> Option<(Vec<TxMarker>, Vec<TxMarker>)> {
     // Tempo txs with non-zero nonce_key use a 2D nonce system and should not
     // be sequenced by account nonce markers.
-    if let FoundryTxEnvelope::Tempo(aa_tx) = pending_transaction.transaction.as_ref()
-        && !aa_tx.tx().nonce_key.is_zero()
-    {
-        Some((vec![], vec![pending_transaction.hash().to_vec()]))
-    } else {
-        None
-    }
+    pending_transaction
+        .transaction
+        .as_ref()
+        .has_nonzero_tempo_nonce_key()
+        .then(|| (vec![], vec![pending_transaction.hash().to_vec()]))
 }
 
 fn convert_transact_out(out: &Option<Output>) -> Bytes {

crates/anvil/src/eth/api.rs

@@ -4326,7 +4326,10 @@ fn get_pool_transactions_nonce(
 ) -> Option<u64> {
     if let Some(highest_nonce) = pool_transactions
         .iter()
-        .filter(|tx| *tx.pending_transaction.sender() == address)
+        .filter(|tx| {
+            *tx.pending_transaction.sender() == address
+                && !tx.pending_transaction.transaction.as_ref().has_nonzero_tempo_nonce_key()
+        })
         .map(|tx| tx.pending_transaction.nonce())
         .max()
     {

crates/anvil/src/eth/backend/mem/mod.rs

@@ -13,7 +13,7 @@ use alloy_eips::eip2718::Encodable2718;
 use alloy_network::{ReceiptResponse, TransactionBuilder, TransactionResponse};
 use alloy_primitives::{Address, Bytes, TxKind, U256, address};
 use alloy_provider::Provider;
-use alloy_rpc_types::{BlockNumberOrTag, TransactionRequest};
+use alloy_rpc_types::{BlockId, BlockNumberOrTag, TransactionRequest};
 use alloy_serde::WithOtherFields;
 use alloy_signer::Signer;
 use alloy_signer_local::PrivateKeySigner;
@@ -616,6 +616,61 @@ async fn test_tempo_aa_transaction_with_2d_nonce() {
     }
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn test_tempo_nonzero_lane_pending_tx_does_not_advance_scalar_nonce() {
+    let (api, handle) = spawn(NodeConfig::test_tempo()).await;
+    let provider = handle.http_provider();
+
+    api.anvil_set_auto_mine(false).await.unwrap();
+
+    let accounts: Vec<Address> = handle.dev_accounts().collect();
+    let recipient = accounts[1];
+    let signer = dev_key(0);
+    let from = signer.address();
+
+    let pending_nonce =
+        provider.get_transaction_count(from).block_id(BlockId::pending()).await.unwrap();
+    assert_eq!(pending_nonce, 0);
+
+    let token = IERC20::new(PATH_USD, &provider);
+    let transfer_call = token.transfer(recipient, U256::from(50_000));
+    let calldata: Bytes = transfer_call.calldata().clone();
+
+    let chain_id = provider.get_chain_id().await.unwrap();
+    let base_fee = provider.get_gas_price().await.unwrap();
+
+    let tempo_tx = TempoTransaction {
+        chain_id,
+        fee_token: Some(ALPHA_USD),
+        max_priority_fee_per_gas: base_fee / 10,
+        max_fee_per_gas: base_fee * 2,
+        gas_limit: TIP20_TRANSFER_GAS,
+        calls: vec![Call { to: TxKind::Call(PATH_USD), value: U256::ZERO, input: calldata }],
+        access_list: Default::default(),
+        nonce_key: U256::from(42),
+        nonce: 7,
+        fee_payer_signature: None,
+        valid_before: None,
+        valid_after: None,
+        key_authorization: None,
+        tempo_authorization_list: vec![],
+    };
+
+    let sig_hash = tempo_tx.signature_hash();
+    let signature = signer.sign_hash(&sig_hash).await.unwrap();
+    let tempo_sig = TempoSignature::Primitive(PrimitiveSignature::Secp256k1(signature));
+    let signed_tx = AASigned::new_unhashed(tempo_tx, tempo_sig);
+    let envelope = TempoTxEnvelope::AA(signed_tx);
+
+    let mut encoded = Vec::new();
+    envelope.encode_2718(&mut encoded);
+    let _ = provider.send_raw_transaction(&encoded).await.unwrap();
+
+    let pending_nonce =
+        provider.get_transaction_count(from).block_id(BlockId::pending()).await.unwrap();
+    assert_eq!(pending_nonce, 0);
+}
+
 #[tokio::test(flavor = "multi_thread")]
 async fn test_tempo_aa_transaction_with_valid_before() {
     let (_api, handle) = spawn(NodeConfig::test_tempo()).await;

crates/anvil/tests/it/tempo.rs

@@ -98,6 +98,7 @@ alloy-serde.workspace = true
 dirs.workspace = true
 anvil.workspace = true
 foundry-test-utils.workspace = true
+tempo-chainspec.workspace = true
 
 [features]
 default = ["jemalloc", "asm-keccak", "optimism"]