Merge remote-tracking branch 'origin/main' into feat/multichain

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

@@ -26,5 +26,3 @@ runs:
         # 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

.syncpackrc.js

@@ -10,6 +10,11 @@ const config = {
       // latest ethers v5 version
       pinVersion: "5.7.2",
     },
+    {
+      packages: ["**"],
+      dependencies: ["@nomicfoundation/edr"],
+      dependencyTypes: ["local"],
+    },
   ],
   semverGroups: [
     {

Cargo.toml

@@ -1,6 +1,15 @@
 [workspace]
 members = [
-    "crates/*",
+    "crates/edr_defaults",
+    "crates/edr_eth",
+    "crates/edr_evm",
+    "crates/edr_napi",
+    "crates/edr_provider",
+    "crates/edr_rpc_client",
+    "crates/edr_rpc_eth",
+    "crates/edr_solidity",
+    "crates/edr_test_utils",
+    "crates/tools",
 ]
 resolver = "2"
 

crates/edr_defaults/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.3.5"
 edition = "2021"
 
 [dependencies]
+ruint = "1.12.3"
 
 [lints]
 workspace = true

crates/edr_defaults/src/lib.rs

@@ -1,3 +1,5 @@
+use ruint::aliases::U256;
+
 /// The default secret keys from which the local accounts will be derived.
 pub const SECRET_KEYS: [&str; 20] = [
     // these were taken from the standard output of a run of `hardhat node`
@@ -36,3 +38,6 @@ pub const MIX_HASH_SEED: &str = "randomMixHashSeed";
 
 /// Seed value for the generator of state root hashes.
 pub const STATE_ROOT_HASH_SEED: &str = "seed";
+
+/// Terminal total difficulty for the Merge on main net
+pub const TERMINAL_TOTAL_DIFFICULTY: U256 = ruint::uint!(58750000000000000000000_U256);

crates/edr_evm/src/blockchain/remote.rs

@@ -215,9 +215,13 @@ where
             .get_block_by_hash_with_transaction_data(*hash)
             .await?
         {
+            // Geth has recently removed the total difficulty field from block RPC
+            // responses, so we fall back to the terminal total difficulty of main net to
+            // provide backwards compatibility.
+            // TODO https://github.com/NomicFoundation/edr/issues/696
             let total_difficulty = *block
                 .total_difficulty()
-                .expect("Must be present as this is not a pending transaction");
+                .unwrap_or(&edr_defaults::TERMINAL_TOTAL_DIFFICULTY);
 
             self.fetch_and_cache_block(cache, block).await?;
 
@@ -234,9 +238,13 @@ where
         cache: RwLockUpgradableReadGuard<'_, SparseBlockchainStorage<BlockT, ChainSpecT>>,
         block: ChainSpecT::RpcBlock<ChainSpecT::RpcTransaction>,
     ) -> Result<BlockT, ForkedBlockchainError<ChainSpecT>> {
+        // Geth has recently removed the total difficulty field from block RPC
+        // responses, so we fall back to the terminal total difficulty of main net to
+        // provide backwards compatibility.
+        // TODO https://github.com/NomicFoundation/edr/issues/696
         let total_difficulty = *block
             .total_difficulty()
-            .expect("Must be present as this is not a pending block");
+            .unwrap_or(&edr_defaults::TERMINAL_TOTAL_DIFFICULTY);
 
         let block = RemoteBlock::new(block, self.client.clone(), self.runtime.clone())
             .map_err(ForkedBlockchainError::BlockCreation)?;

crates/edr_napi/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @nomicfoundation/edr
 
+## 0.6.4
+
+### Patch Changes
+
+- 14620c9: Fix panic due to remote nodes not returning total difficulty by adding fallback value
+
+## 0.6.3
+
+### Patch Changes
+
+- a1cee4f: fix(tracing): Make sure to correctly 0x-prefix hex encoded strings in custom error message
+- 7047e6c: Fixed panic from unknown opcode in stack traces
+
 ## 0.6.2
 
 ### Patch Changes

crates/edr_napi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nomicfoundation/edr",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "devDependencies": {
     "@napi-rs/cli": "^2.18.4",
     "@nomicfoundation/ethereumjs-util": "^9.0.4",

crates/edr_napi/src/trace/error_inferrer.rs

@@ -1173,7 +1173,7 @@ impl ErrorInferrer {
                 _ => return Ok(false),
             };
 
-            let inst = subtrace_bytecode.get_instruction(step.pc)?;
+            let inst = bytecode.get_instruction(step.pc)?;
 
             // All the remaining locations should be valid, as they are part of the inline
             // asm
@@ -1302,7 +1302,9 @@ impl ErrorInferrer {
             .expect("The TS code type-checks this to always have bytecode");
         let contract = bytecode.contract.borrow();
 
-        let version = Version::parse(&bytecode.compiler_version).unwrap();
+        let version =
+            Version::parse(&bytecode.compiler_version).expect("Failed to parse SemVer version");
+
         // this only makes sense when receive functions are available
         if version < FIRST_SOLC_VERSION_RECEIVE_FUNCTION {
             return Ok(false);
@@ -1586,7 +1588,11 @@ impl ErrorInferrer {
         trace: &CallMessageTrace,
         func: &ContractFunction,
     ) -> napi::Result<bool> {
-        let last_step = trace.steps.last().unwrap();
+        let last_step = trace
+            .steps
+            .last()
+            .expect("There should at least be one step");
+
         let last_step = match last_step {
             Either4::A(step) => step,
             _ => panic!("JS code asserted this is always an EvmStep"),
@@ -2206,14 +2212,44 @@ fn format_dyn_sol_value(val: &DynSolValue) -> String {
         // surround string values with quotes
         DynSolValue::String(s) => format!("\"{s}\""),
 
-        DynSolValue::Address(address) => format!("\"0x{address}\""),
-        DynSolValue::Bytes(bytes) => format!("\"0x{}\"", hex::encode(bytes)),
+        DynSolValue::Address(address) => format!("\"{address}\""),
+        DynSolValue::Bytes(bytes) => format!("\"{}\"", hex::encode_prefixed(bytes)),
         DynSolValue::FixedBytes(word, size) => {
-            format!("\"0x{}\"", hex::encode(&word.0.as_slice()[..*size]))
+            format!("\"{}\"", hex::encode_prefixed(&word.0.as_slice()[..*size]))
         }
         DynSolValue::Bool(b) => b.to_string(),
         DynSolValue::Function(_) => "<function>".to_string(),
         DynSolValue::Int(int, _bits) => int.to_string(),
         DynSolValue::Uint(uint, _bits) => uint.to_string(),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_sol_value_to_string() {
+        assert_eq!(
+            format_dyn_sol_value(&DynSolValue::String("hello".to_string())),
+            "\"hello\""
+        );
+        // Uniform, 0-prefixed hex strings
+        assert_eq!(
+            format_dyn_sol_value(&DynSolValue::Address([0u8; 20].into())),
+            format!(r#""0x{}""#, "0".repeat(2 * 20))
+        );
+        assert_eq!(
+            format_dyn_sol_value(&DynSolValue::Bytes(vec![0u8; 32])),
+            format!(r#""0x{}""#, "0".repeat(2 * 32))
+        );
+        assert_eq!(
+            format_dyn_sol_value(&DynSolValue::FixedBytes([0u8; 32].into(), 10)),
+            format!(r#""0x{}""#, "0".repeat(2 * 10))
+        );
+        assert_eq!(
+            format_dyn_sol_value(&DynSolValue::FixedBytes([0u8; 32].into(), 32)),
+            format!(r#""0x{}""#, "0".repeat(2 * 32))
+        );
+    }
+}

crates/edr_solidity/src/contracts_identifier.rs

@@ -96,7 +96,12 @@ impl BytecodeTrie {
 fn is_matching_metadata(code: &[u8], last_byte: u32) -> bool {
     let mut byte = 0;
     while byte < last_byte {
-        let opcode = OpCode::new(code[byte as usize]).unwrap();
+        // It's possible we don't recognize the opcode if it's from an unknown chain, so
+        // just return false in that case.
+        let Some(opcode) = OpCode::new(code[byte as usize]) else {
+            return false;
+        };
+
         let next = code.get(byte as usize + 1).copied().and_then(OpCode::new);
 
         if opcode == OpCode::REVERT && next == Some(OpCode::INVALID) {

crates/tools/js/benchmark/package.json

@@ -17,7 +17,7 @@
     "eslint-plugin-import": "2.27.5",
     "eslint-plugin-mocha": "10.4.1",
     "eslint-plugin-prettier": "5.2.1",
-    "hardhat": "2.22.10",
+    "hardhat": "2.22.12",
     "lodash": "^4.17.11",
     "mocha": "^10.0.0",
     "prettier": "^3.2.5",

hardhat-tests/integration/smock/package.json

@@ -9,7 +9,7 @@
     "@types/node": "^20.0.0",
     "chai": "^4.3.6",
     "ethers": "5.7.2",
-    "hardhat": "2.22.10",
+    "hardhat": "2.22.12",
     "mocha": "^10.0.0"
   },
   "keywords": [],

hardhat-tests/package.json

@@ -4,6 +4,7 @@
   "author": "Nomic Foundation",
   "devDependencies": {
     "@metamask/eth-sig-util": "^4.0.0",
+    "@nomicfoundation/edr": "workspace:*",
     "@nomicfoundation/ethereumjs-block": "5.0.4",
     "@nomicfoundation/ethereumjs-common": "^4.0.4",
     "@nomicfoundation/ethereumjs-tx": "^5.0.4",
@@ -38,7 +39,7 @@
     "ethereumjs-abi": "^0.6.8",
     "ethers": "^6.1.0",
     "fs-extra": "^7.0.1",
-    "hardhat": "2.22.10",
+    "hardhat": "2.22.12",
     "mocha": "^10.0.0",
     "prettier": "^3.2.5",
     "rimraf": "^3.0.2",

hardhat-tests/test/internal/hardhat-network/stack-traces/README.md

@@ -62,6 +62,6 @@ These compilers are grouped by minor version (that is, a group with all the 0.5.
 
 The solidity files in each test directory are compiled (unless a cached compilation output exists) and then the `test.json` description is then executed.
 
-## The `HARDHAT_TESTS_SOLC_PATH` environment variable
+## The `EDR_TESTS_SOLC_PATH` environment variable
 
-If this variable is set, the only compiler used will be the one that is available in that path. For example, if you want to test a nightly version, you would set the envvars `HARDHAT_TESTS_SOLC_PATH=/path/to/solc-nightly-0.8.21 HARDHAT_TESTS_SOLC_VERSION=0.8.21` and then run the tests. This would only run the test files under `test-files/0_8` and `test-files/version-independent`.
+If this variable is set, the only compiler used will be the one that is available in that path. For example, if you want to test a nightly version, you would set the envvars `EDR_TESTS_SOLC_PATH=/path/to/solc-nightly-0.8.21 EDR_TESTS_SOLC_VERSION=0.8.21` and then run the tests. This would only run the test files under `test-files/0_8` and `test-files/version-independent`.

hardhat-tests/test/internal/hardhat-network/stack-traces/compilation.ts

@@ -132,7 +132,7 @@ export async function compileFiles(
   if (path.isAbsolute(compilerOptions.compilerPath)) {
     compiler = {
       compilerPath: compilerOptions.compilerPath,
-      isSolcJs: process.env.HARDHAT_TESTS_SOLC_NATIVE !== "true",
+      isSolcJs: process.env.EDR_TESTS_SOLC_NATIVE !== "true",
       version: compilerOptions.solidityVersion,
       longVersion: compilerOptions.solidityVersion,
     };

hardhat-tests/test/internal/hardhat-network/stack-traces/compilers-list.ts

@@ -220,7 +220,6 @@ export const solidityCompilers: SolidityCompiler[] = [
   {
     solidityVersion: "0.8.22",
     compilerPath: "soljson-v0.8.22+commit.4fc1097e.js",
-    latestSolcVersion: true,
   },
   {
     solidityVersion: "0.8.22",
@@ -229,12 +228,10 @@ export const solidityCompilers: SolidityCompiler[] = [
       runs: 200,
       viaIR: true,
     },
-    latestSolcVersion: true,
   },
   {
     solidityVersion: "0.8.23",
     compilerPath: "soljson-v0.8.23+commit.f704f362.js",
-    latestSolcVersion: true,
   },
   {
     solidityVersion: "0.8.23",
@@ -243,12 +240,10 @@ export const solidityCompilers: SolidityCompiler[] = [
       runs: 200,
       viaIR: true,
     },
-    latestSolcVersion: true,
   },
   {
     solidityVersion: "0.8.24",
     compilerPath: "soljson-v0.8.24+commit.e11b9ed9.js",
-    latestSolcVersion: true,
   },
   {
     solidityVersion: "0.8.24",
@@ -257,6 +252,47 @@ export const solidityCompilers: SolidityCompiler[] = [
       runs: 200,
       viaIR: true,
     },
+  },
+  {
+    solidityVersion: "0.8.25",
+    compilerPath: "soljson-v0.8.25+commit.b61c2a91.js",
+    latestSolcVersion: true,
+  },
+  {
+    solidityVersion: "0.8.25",
+    compilerPath: "soljson-v0.8.25+commit.b61c2a91.js",
+    optimizer: {
+      runs: 200,
+      viaIR: true,
+    },
+    latestSolcVersion: true,
+  },
+  {
+    solidityVersion: "0.8.26",
+    compilerPath: "soljson-v0.8.26+commit.8a97fa7a.js",
+    latestSolcVersion: true,
+  },
+  {
+    solidityVersion: "0.8.26",
+    compilerPath: "soljson-v0.8.26+commit.8a97fa7a.js",
+    optimizer: {
+      runs: 200,
+      viaIR: true,
+    },
+    latestSolcVersion: true,
+  },
+  {
+    solidityVersion: "0.8.27",
+    compilerPath: "soljson-v0.8.27+commit.40a35a09.js",
+    latestSolcVersion: true,
+  },
+  {
+    solidityVersion: "0.8.27",
+    compilerPath: "soljson-v0.8.27+commit.40a35a09.js",
+    optimizer: {
+      runs: 200,
+      viaIR: true,
+    },
     latestSolcVersion: true,
   },
 ];

hardhat-tests/test/internal/hardhat-network/stack-traces/execution.ts

@@ -31,7 +31,7 @@ export async function instantiateProvider(
   tracingConfig: TracingConfig
 ): Promise<EdrProviderWrapper> {
   const config = {
-    hardfork: "shanghai",
+    hardfork: "cancun",
     chainId: 1,
     networkId: 1,
     blockGasLimit: 10_000_000,

hardhat-tests/test/internal/hardhat-network/stack-traces/test-files/0_8/custom-errors/complex-custom-error/c.sol

@@ -6,7 +6,7 @@ contract C {
     uint y;
   }
 
-  error MyError(uint x, uint[] xs, bytes4 b, Point p, Point[] ps);
+  error MyError(uint x, uint[] xs, address a, bytes4 b, Point p, Point[] ps);
 
   function test() public {
     uint x = 0;
@@ -18,12 +18,14 @@ contract C {
 
     bytes4 b = 0x12345678;
 
+    address a = address(0xDEADBEEF);
+
     Point memory p = Point(4, 5);
 
     Point[] memory ps = new Point[](2);
     ps[0] = Point(6,7);
     ps[1] = Point(8,9);
 
-    revert MyError(x, xs, b, p, ps);
+    revert MyError(x, xs, a, b, p, ps);
   }
 }