Merge branch 'trufflesuite:develop' into feat/forked-logs

src/chains/ethereum/ethereum/src/api.ts

@@ -1274,14 +1274,12 @@ export default class EthereumApi implements Api {
   @assertArgLength(1)
   async eth_getBlockTransactionCountByHash(hash: DATA) {
     const { blocks } = this.#blockchain;
-    const blockNum = await blocks.getNumberFromHash(hash);
-    if (!blockNum) return null;
-
-    const rawBlock = await blocks.getRawByBlockNumber(Quantity.from(blockNum));
-    if (!rawBlock) return null;
-
-    const [, rawTransactions] = decode<GanacheRawBlock>(rawBlock);
-    return Quantity.from(rawTransactions.length);
+    const block = await blocks
+      .getByHash(hash)
+      .catch<Block>(_ => null);
+    if (!block) return null;
+    const transactions = block.getTransactions();
+    return Quantity.from(transactions.length);
   }
 
   /**

src/chains/ethereum/ethereum/tests/forking/block.test.ts

@@ -84,5 +84,12 @@ describe("forking", function () {
       const block = await provider.send("eth_getBlockByNumber", ["0x0", true]);
       assert.deepStrictEqual(block, block0);
     });
+
+    it("should get transaction count by hash from the original chain", async () => {
+      const block = await provider.send("eth_getBlockByNumber", ["0xB443", true]);
+      const blockTransactionCountByHash = await provider.send("eth_getBlockTransactionCountByHash", [block.hash]);
+      assert.deepStrictEqual(block.transactions.length, parseInt(blockTransactionCountByHash));
+    });
+
   });
 });