Merge branch 'master' into feature/anvil-block-overrides

Author: mablr

.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.0
+
+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"
+  ]
+}

.github/workflows/nextest.yml

@@ -72,6 +72,7 @@ jobs:
         with:
           python-version: 3.11
       - name: Install Vyper
+        # Also update vyper version in .devcontainer/Dockerfile.dev
         run: pip --version && pip install vyper==0.4.0
 
       - name: Forge RPC cache

Cargo.lock

@@ -29,7 +29,6 @@ alloy-rlp.workspace = true
 alloy-eips.workspace = true
 alloy-consensus = { workspace = true, features = ["k256", "kzg"] }
 alloy-dyn-abi = { workspace = true, features = ["std", "eip712"] }
-alloy-trie.workspace = true
 op-alloy-consensus = { workspace = true, features = ["serde"] }
 alloy-network.workspace = true
 serde.workspace = true

crates/anvil/core/Cargo.toml

@@ -1,9 +1,5 @@
-use super::{
-    transaction::{TransactionInfo, TypedReceipt},
-    trie,
-};
-use alloy_consensus::{Header, EMPTY_OMMER_ROOT_HASH};
-use alloy_eips::eip2718::Encodable2718;
+use super::transaction::{TransactionInfo, TypedReceipt};
+use alloy_consensus::{proofs::calculate_transaction_root, Header, EMPTY_OMMER_ROOT_HASH};
 use alloy_primitives::{Address, Bloom, Bytes, B256, B64, U256};
 use alloy_rlp::{RlpDecodable, RlpEncodable};
 
@@ -36,8 +32,9 @@ impl Block {
         T: Into<Transaction>,
     {
         let transactions: Vec<_> = transactions.into_iter().map(Into::into).collect();
-        let transactions_root =
-            trie::ordered_trie_root(transactions.iter().map(|r| r.encoded_2718()));
+        let transactions1: Vec<super::transaction::TypedTransaction> =
+            transactions.clone().into_iter().map(Into::into).collect();
+        let transactions_root = calculate_transaction_root(&transactions1);
 
         Self {
             header: Header {

crates/anvil/core/src/eth/block.rs

@@ -18,10 +18,8 @@ use foundry_common::serde_helpers::{
 };
 
 pub mod block;
-pub mod proof;
 pub mod subscription;
 pub mod transaction;
-pub mod trie;
 pub mod wallet;
 
 pub mod serde_helpers;

crates/anvil/core/src/eth/mod.rs

@@ -1,24 +0,0 @@
-//! Return types for `eth_getProof`
-
-use crate::eth::trie::KECCAK_NULL_RLP;
-use alloy_primitives::{B256, U256};
-use revm::primitives::KECCAK_EMPTY;
-
-#[derive(Clone, Debug, PartialEq, Eq, alloy_rlp::RlpEncodable, alloy_rlp::RlpDecodable)]
-pub struct BasicAccount {
-    pub nonce: U256,
-    pub balance: U256,
-    pub storage_root: B256,
-    pub code_hash: B256,
-}
-
-impl Default for BasicAccount {
-    fn default() -> Self {
-        Self {
-            balance: U256::ZERO,
-            nonce: U256::ZERO,
-            code_hash: KECCAK_EMPTY,
-            storage_root: KECCAK_NULL_RLP,
-        }
-    }
-}

crates/anvil/core/src/eth/proof.rs

@@ -1,30 +1,6 @@
-use alloy_primitives::{Bytes, B256, U256};
+use alloy_primitives::Bytes;
 use alloy_rpc_types::TransactionRequest;
-use serde::{Deserialize, Serialize, Serializer};
-
-/// Represents the result of `eth_getWork`.
-///
-/// This may or may not include the block number.
-#[derive(Debug, Default, PartialEq, Eq)]
-pub struct Work {
-    pub pow_hash: B256,
-    pub seed_hash: B256,
-    pub target: B256,
-    pub number: Option<u64>,
-}
-
-impl Serialize for Work {
-    fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        if let Some(num) = self.number {
-            (&self.pow_hash, &self.seed_hash, &self.target, U256::from(num)).serialize(s)
-        } else {
-            (&self.pow_hash, &self.seed_hash, &self.target).serialize(s)
-        }
-    }
-}
+use serde::Deserialize;
 
 /// Represents the options used in `anvil_reorg`
 #[derive(Debug, Clone, Deserialize)]

crates/anvil/core/src/eth/trie.rs

@@ -65,7 +65,7 @@ use alloy_rpc_types::{
     },
     txpool::{TxpoolContent, TxpoolInspect, TxpoolInspectSummary, TxpoolStatus},
     AccessList, AccessListResult, BlockId, BlockNumberOrTag as BlockNumber, BlockTransactions,
-    EIP1186AccountProofResponse, FeeHistory, Filter, FilteredParams, Index, Log,
+    EIP1186AccountProofResponse, FeeHistory, Filter, FilteredParams, Index, Log, Work,
 };
 use alloy_serde::WithOtherFields;
 use alloy_transport::TransportErrorKind;
@@ -79,7 +79,7 @@ use anvil_core::{
         wallet::{WalletCapabilities, WalletError},
         EthRequest,
     },
-    types::{ReorgOptions, TransactionData, Work},
+    types::{ReorgOptions, TransactionData},
 };
 use anvil_rpc::{error::RpcError, response::ResponseResult};
 use foundry_common::provider::ProviderBuilder;
@@ -92,10 +92,14 @@ use foundry_evm::{
         primitives::BlockEnv,
     },
 };
-use futures::channel::{mpsc::Receiver, oneshot};
+use futures::{
+    channel::{mpsc::Receiver, oneshot},
+    StreamExt,
+};
 use parking_lot::RwLock;
 use revm::primitives::Bytecode;
 use std::{future::Future, sync::Arc, time::Duration};
+use tokio::sync::mpsc::{unbounded_channel, UnboundedReceiver};
 
 /// The client version: `anvil/v{major}.{minor}.{patch}`
 pub const CLIENT_VERSION: &str = concat!("anvil/v", env!("CARGO_PKG_VERSION"));
@@ -2877,6 +2881,26 @@ impl EthApi {
         self.pool.add_ready_listener()
     }
 
+    /// Returns a listener for pending transactions, yielding full transactions
+    pub fn full_pending_transactions(&self) -> UnboundedReceiver<AnyRpcTransaction> {
+        let (tx, rx) = unbounded_channel();
+        let mut hashes = self.new_ready_transactions();
+
+        let this = self.clone();
+
+        tokio::spawn(async move {
+            while let Some(hash) = hashes.next().await {
+                if let Ok(Some(txn)) = this.transaction_by_hash(hash).await {
+                    if tx.send(txn).is_err() {
+                        break;
+                    }
+                }
+            }
+        });
+
+        rx
+    }
+
     /// Returns a new accessor for certain storage elements
     pub fn storage_info(&self) -> StorageInfo {
         StorageInfo::new(Arc::clone(&self.backend))

crates/anvil/core/src/types.rs

@@ -8,15 +8,16 @@ use crate::{
     mem::inspector::Inspector,
     PrecompileFactory,
 };
-use alloy_consensus::{constants::EMPTY_WITHDRAWALS, Receipt, ReceiptWithBloom};
-use alloy_eips::{eip2718::Encodable2718, eip7685::EMPTY_REQUESTS_HASH};
+use alloy_consensus::{
+    constants::EMPTY_WITHDRAWALS, proofs::calculate_receipt_root, Receipt, ReceiptWithBloom,
+};
+use alloy_eips::eip7685::EMPTY_REQUESTS_HASH;
 use alloy_primitives::{Bloom, BloomInput, Log, B256};
 use anvil_core::eth::{
     block::{Block, BlockInfo, PartialHeader},
     transaction::{
         DepositReceipt, PendingTransaction, TransactionInfo, TypedReceipt, TypedTransaction,
     },
-    trie,
 };
 use foundry_evm::{
     backend::DatabaseError,
@@ -211,8 +212,7 @@ impl<DB: Db + ?Sized, V: TransactionValidator> TransactionExecutor<'_, DB, V> {
             transactions.push(transaction.pending_transaction.transaction.clone());
         }
 
-        let receipts_root =
-            trie::ordered_trie_root(receipts.iter().map(Encodable2718::encoded_2718));
+        let receipts_root = calculate_receipt_root(&receipts);
 
         let partial_header = PartialHeader {
             parent_hash,