Merge branch '1.x' into release/1.6.1

spacesailor24 · spacesailor24 · commit dfa2dce4d5e1 · 2021-11-09T17:23:01.000-10:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -482,4 +482,5 @@ Released with 1.0.0-beta.37 code base.
 
 ### Changed
 
-- Correct `web3.rst` example in documentation (#4511)
+- Correct `web3.rst` example in documentation (#4511)
+- Correct `BlockHeader` typing (`receiptRoot` -> `receiptsRoot`) (#4452)
diff --git a/packages/web3-eth/types/index.d.ts b/packages/web3-eth/types/index.d.ts
@@ -403,7 +403,7 @@ export interface BlockHeader {
     logsBloom: string;
     transactionRoot: string;
     stateRoot: string;
-    receiptRoot: string;
+    receiptsRoot: string;
     miner: string;
     extraData: string;
     gasLimit: number;
diff --git a/test/eth.subscribe.js b/test/eth.subscribe.js
@@ -29,7 +29,7 @@ var tests = [{
             number: "0x1348c9",
             size: "0x0",
             parentHash: "0x7736fab79e05dc611604d22470dadad26f56fe494421b5b333de816ce1f25701",
-            receiptRoot: "0x2fab35823ad00c7bb388595cb46652fe7886e00660a01e867824d3dceb1c8d36",
+            receiptsRoot: "0x2fab35823ad00c7bb388595cb46652fe7886e00660a01e867824d3dceb1c8d36",
             sha3Uncles: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
             stateRoot: "0xb3346685172db67de536d8765c43c31009d0eb3bd9c501c9be3229203f15f378",
             timestamp: "0x56ffeff8",
@@ -48,7 +48,7 @@ var tests = [{
         nonce: "0x084149998194cc5f",
         number: 1263817,
         parentHash: "0x7736fab79e05dc611604d22470dadad26f56fe494421b5b333de816ce1f25701",
-        receiptRoot: "0x2fab35823ad00c7bb388595cb46652fe7886e00660a01e867824d3dceb1c8d36",
+        receiptsRoot: "0x2fab35823ad00c7bb388595cb46652fe7886e00660a01e867824d3dceb1c8d36",
         sha3Uncles: "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
         stateRoot: "0xb3346685172db67de536d8765c43c31009d0eb3bd9c501c9be3229203f15f378",
         timestamp: 1459613688,
