Fix types: returnTransactionObjects param value affects resolve type (#…

…4911) (#5000) * returnTransactionObjects val affects resolve type Co-authored-by: wbt <wbt@users.noreply.github.com>
web3 · May 4, 2022 · 7c4f1a5 · 7c4f1a5
1 parent 69c0b1a
commit 7c4f1a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -548,6 +548,7 @@ Released with 1.0.0-beta.37 code base.
 -  Fix web3-core-method throws on `f.call = this.call` when intrinsic is frozen (#4918) (#4938)
 -  Fix static tuple encoding (#4673) (#4884)
 -  Fix bug in handleRevert logic for eth_sendRawTransaction (#4902)
+-  Fix resolve type of getBlock function (#4911)
 
 ### Changed
 -  Replace deprecated String.prototype.substr() (#4855)

diff --git a/packages/web3-eth/types/index.d.ts b/packages/web3-eth/types/index.d.ts
@@ -218,15 +218,24 @@ export class Eth {
     getBlock(blockHashOrBlockNumber: BlockNumber | string): Promise<BlockTransactionString>;
     getBlock(
         blockHashOrBlockNumber: BlockNumber | string,
-        returnTransactionObjects: boolean
+        returnTransactionObjects: false
+    ): Promise<BlockTransactionString>;
+    getBlock(
+        blockHashOrBlockNumber: BlockNumber | string,
+        returnTransactionObjects: true
     ): Promise<BlockTransactionObject>;
     getBlock(
         blockHashOrBlockNumber: BlockNumber | string,
         callback?: (error: Error, block: BlockTransactionString) => void
     ): Promise<BlockTransactionString>;
     getBlock(
         blockHashOrBlockNumber: BlockNumber | string,
-        returnTransactionObjects: boolean,
+        returnTransactionObjects: false,
+        callback?: (error: Error, block: BlockTransactionString) => void
+    ): Promise<BlockTransactionString>;
+    getBlock(
+        blockHashOrBlockNumber: BlockNumber | string,
+        returnTransactionObjects: true,
         callback?: (error: Error, block: BlockTransactionObject) => void
     ): Promise<BlockTransactionObject>;