Merge/main into multichain

.github/actions/setup-rust/action.yml

@@ -1,13 +1,30 @@
-name: Setup rust
-description: Sets up rust
+name: Setup Rust
+description: Sets up Rust
+inputs:
+  toolchain:
+    description: The Rust toolchain to use
+    required: false
+  components:
+    description: Comma-separated list of components to install
+    required: false
 
 runs:
   using: composite
   steps:
-    - name: Install Rust (stable)
-      uses: actions-rs/toolchain@v1
+    - name: Install Rust
+      uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
-        profile: minimal
-        override: true
+        # Empty string means rust-toolchain if it exists, otherwise stable
+        toolchain: ${{ inputs.toolchain }}
+        components: ${{ inputs.components }}
+        cache: true
+        # Do not override the RUSTFLAGS by default and instead do that per job,
+        # if needed. Setting RUSTFLAGS via env var, config, etc. is mutually
+        # exclusive and often a source of bugs.
+        # Empty string here means no override.
+        rustflags: ""
+        # By default, we do not override the toolchain from rust-toolchain.
+        # The user needs to explicitly use `<cmd> +<toolchain>` for clarity.
+        override: false
 
     - uses: Swatinem/rust-cache@v2

.github/workflows/edr-ci.yml

@@ -27,13 +27,9 @@ jobs:
       # Install pre-built binaries for cargo hack
       - uses: taiki-e/install-action@cargo-hack
 
-      - name: Cargo hack
-        uses: actions-rs/cargo@v1
+      - run: cargo hack check --feature-powerset --no-dev-deps
         env:
           RUSTFLAGS: -Dwarnings
-        with:
-          command: hack
-          args: check --feature-powerset --no-dev-deps
 
   test-edr-rs:
     name: Test EDR (${{ matrix.os }})
@@ -60,13 +56,10 @@ jobs:
           key: edr-rs-rpc-cache-v1
 
       - name: Run cargo tests (with coverage)
-        uses: actions-rs/cargo@v1
         env:
           ALCHEMY_URL: ${{ secrets.ALCHEMY_URL }}
           INFURA_URL: ${{ secrets.INFURA_URL }}
-        with:
-          command: llvm-cov
-          args: --workspace --all-targets --all-features --codecov --output-path codecov.json
+        run: cargo llvm-cov --workspace --all-targets --all-features --codecov --output-path codecov.json
 
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4
@@ -77,10 +70,7 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Doctests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --doc --workspace --features tracing
+        run: cargo test --doc --workspace --features tracing
 
       # disable until:
       # 1) https://github.com/napi-rs/napi-rs/issues/1405 is resolved (Windows-only)
@@ -92,13 +82,10 @@ jobs:
       #   uses: taiki-e/install-action@nextest
 
       # - name: Test with latest nextest release
-      #   uses: actions-rs/cargo@v1
       #   env:
       #     CARGO_INCREMENTAL: ${{ matrix.CARGO_INCREMENTAL }}
       #     ALCHEMY_URL: ${{ secrets.ALCHEMY_URL }}
-      #   with:
-      #     command: nextest
-      #     args: run --workspace --all-features --all-targets
+      #   run: cargo nextest run --workspace --all-features --all-targets
 
   test-edr-ts:
     name: Test EDR TS bindings (${{ matrix.os }})
@@ -112,23 +99,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 9
-
-      - name: Install Node
-        uses: actions/setup-node@v3
+      - uses: ./.github/actions/setup-node
         with:
           node-version: ${{ matrix.node }}
-          cache: pnpm
-
-      - name: Install Rust (stable)
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          override: true
 
-      - uses: Swatinem/rust-cache@v2
+      - uses: ./.github/actions/setup-rust
 
       - name: Cache EDR RPC cache
         uses: actions/cache@v2
@@ -151,29 +126,18 @@ jobs:
     needs: check-edr
     steps:
       - uses: actions/checkout@v3
+      - uses: ./.github/actions/setup-rust
+        with:
+          components: clippy
 
       - name: Install nightly rustfmt
-        uses: actions-rs/toolchain@v1
+        uses: ./.github/actions/setup-rust
         with:
           toolchain: nightly
-          profile: minimal
           components: rustfmt
 
-      - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          override: true
-          components: clippy
-
-      - uses: Swatinem/rust-cache@v2
-
       - name: Run cargo fmt
-        uses: actions-rs/cargo@v1
-        with:
-          toolchain: nightly
-          command: fmt
-          args: --all --check
+        run: cargo +nightly fmt --all --check
 
       - name: Run cargo clippy
         run: cargo clippy --workspace --all-targets --all-features -- -D warnings
@@ -187,10 +151,7 @@ jobs:
       - uses: ./.github/actions/setup-rust
 
       - name: Cargo doc
-        uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --workspace --no-deps --all-features
+        run: cargo doc --workspace --no-deps --all-features
 
   lint:
     name: Run Prettier

.github/workflows/test-recent-mainnet-block.yml

@@ -20,11 +20,7 @@ jobs:
             **/edr-cache
           key: test-recent-mainnet-block-rpc-cache-v1
 
-      - name: Run test
-        uses: actions-rs/cargo@v1
-        with:
-          command: replay-block
-          args: -u ${{ secrets.ALCHEMY_URL }} -c l1
+      - run: cargo replay-block -u ${{ secrets.ALCHEMY_URL }} -c l1
 
       - name: Notify failures
         if: failure()

.github/workflows/test-recent-optimism-block.yml

@@ -14,13 +14,7 @@ jobs:
         with:
           ref: feat/multichain
 
-      - name: Install Rust (stable)
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          override: true
-
-      - uses: Swatinem/rust-cache@v2
+      - uses: ./.github/actions/setup-rust
 
       - name: Cache EDR RPC cache
         uses: actions/cache@v4
@@ -29,11 +23,7 @@ jobs:
             **/edr-cache
           key: test-recent-optimism-block-rpc-cache-v1
 
-      - name: Run test
-        uses: actions-rs/cargo@v1
-        with:
-          command: replay-block
-          args: -u ${{ secrets.ALCHEMY_URL }} -c optimism
+      - run: cargo replay-block -u ${{ secrets.ALCHEMY_URL }} -c optimism
 
       - name: Notify failures
         if: failure()

crates/edr_napi/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @nomicfoundation/edr
 
+## 0.6.2
+
+### Patch Changes
+
+- af56289: fix(tracing): Decode unmapped instructions only at the opcode boundary
+- debac88: fix(tracing): Use correct subtrace when detecting error error propagation across delegatecall
+
+## 0.6.1
+
+### Patch Changes
+
+- c8fbf3b: Allow forked block time offset to be negative
+- bb3808b: Handle optional solc settings better in the tracing engine
+
 ## 0.6.0
 
 ### Minor Changes

crates/edr_napi/index.d.ts

@@ -668,16 +668,16 @@ export interface Withdrawal {
   /** The value contained in withdrawal */
   amount: bigint
 }
-export class EdrContext {
+export declare class EdrContext {
   /**Creates a new [`EdrContext`] instance. Should only be called once! */
   constructor()
   /**Constructs a new provider with the provided configuration. */
   createProvider(chainType: string, providerConfig: ProviderConfig, loggerConfig: LoggerConfig, subscriptionConfig: SubscriptionConfig): Promise<Provider>
   /**Registers a new provider factory for the provided chain type. */
   registerProviderFactory(chainType: string, factory: ProviderFactory): Promise<void>
 }
-export class ProviderFactory { }
-export class Response {
+export declare class ProviderFactory { }
+export declare class Response {
   /**Returns the response data as a JSON string or a JSON object. */
   get data(): string | any
   /**Returns the Solidity trace of the transaction that failed to execute, if any. */
@@ -686,7 +686,7 @@ export class Response {
   get traces(): Array<RawTrace>
 }
 /** A JSON-RPC provider for Ethereum. */
-export class Provider {
+export declare class Provider {
   /**Handles a JSON-RPC request and returns a JSON-RPC response. */
   handleRequest(request: string): Promise<Response>
   setCallOverrideCallback(callOverrideCallback: (contract_address: Buffer, data: Buffer) => Promise<CallOverrideResult | undefined>): Promise<void>
@@ -702,13 +702,13 @@ export class Provider {
  * Opaque handle to the `Bytecode` struct.
  * Only used on the JS side by the `VmTraceDecoder` class.
  */
-export class BytecodeWrapper { }
-export class Exit {
+export declare class BytecodeWrapper { }
+export declare class Exit {
   get kind(): ExitCode
   isError(): boolean
   getReason(): string
 }
-export class ReturnData {
+export declare class ReturnData {
   readonly value: Uint8Array
   constructor(value: Uint8Array)
   isEmpty(): boolean
@@ -717,26 +717,26 @@ export class ReturnData {
   decodeError(): string
   decodePanic(): bigint
 }
-export class SolidityTracer {
+export declare class SolidityTracer {
 
   constructor()
   getStackTrace(trace: PrecompileMessageTrace | CallMessageTrace | CreateMessageTrace): SolidityStackTrace
 }
-export class VmTraceDecoder {
+export declare class VmTraceDecoder {
   constructor()
   addBytecode(bytecode: BytecodeWrapper): void
   tryToDecodeMessageTrace(messageTrace: PrecompileMessageTrace | CallMessageTrace | CreateMessageTrace): PrecompileMessageTrace | CallMessageTrace | CreateMessageTrace
   getContractAndFunctionNamesForCall(code: Uint8Array, calldata: Uint8Array | undefined): ContractAndFunctionName
 }
 export type VMTracer = VmTracer
 /** N-API bindings for the Rust port of `VMTracer` from Hardhat. */
-export class VmTracer {
+export declare class VmTracer {
   constructor()
   /** Observes a trace, collecting information about the execution of the EVM. */
   observe(trace: RawTrace): void
   getLastTopLevelMessageTrace(): PrecompileMessageTrace | CallMessageTrace | CreateMessageTrace | undefined
   getLastError(): Error | undefined
 }
-export class RawTrace {
+export declare class RawTrace {
   trace(): Array<TracingMessage | TracingStep | TracingMessageResult>
 }

crates/edr_napi/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "devDependencies": {
-    "@napi-rs/cli": "^2.18.3",
+    "@napi-rs/cli": "^2.18.4",
     "@nomicfoundation/ethereumjs-util": "^9.0.4",
     "@types/chai": "^4.2.0",
     "@types/chai-as-promised": "^7.1.8",

crates/edr_rpc_eth/src/transaction.rs

@@ -223,32 +223,8 @@ impl TransactionWithSignature {
 
     /// Returns whether the transaction is a legacy transaction.
     pub fn is_legacy(&self) -> bool {
-        matches!(self.transaction_type(), RpcTransactionType::Legacy) && matches!(self.v, 27 | 28)
+        matches!(self.transaction_type, None | Some(0)) && matches!(self.v, 27 | 28)
     }
-
-    pub fn transaction_type(&self) -> RpcTransactionType {
-        match self.transaction_type {
-            Some(0) | None => RpcTransactionType::Legacy,
-            Some(1) => RpcTransactionType::AccessList,
-            Some(2) => RpcTransactionType::Eip1559,
-            Some(3) => RpcTransactionType::Eip4844,
-            Some(r#type) => RpcTransactionType::Unknown(r#type),
-        }
-    }
-}
-
-/// The transaction type of the remote transaction.
-pub enum RpcTransactionType {
-    /// Legacy transaction
-    Legacy,
-    /// EIP-2930 access list transaction
-    AccessList,
-    /// EIP-1559 transaction
-    Eip1559,
-    /// EIP-4844 transaction
-    Eip4844,
-    /// Unknown transaction type
-    Unknown(u8),
 }
 
 impl From<TransactionWithSignature> for transaction::signed::Legacy {