fix(RpcProvider): update of RpcProvider getBlock method to work with …

…v0.3.0 of pathfinder
starknet-io · Aug 19, 2022 · 3b12421 · 3b12421
1 parent a67af4a
commit 3b12421
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/src/provider/rpc.ts b/src/provider/rpc.ts
@@ -90,14 +90,17 @@ export class RpcProvider implements ProviderInterface {
   }
 
   public async getBlock(blockIdentifier: BlockIdentifier = 'pending'): Promise<GetBlockResponse> {
-    const method =
-      typeof blockIdentifier === 'string' && isHex(blockIdentifier)
-        ? 'starknet_getBlockByHash'
-        : 'starknet_getBlockByNumber';
-
-    return this.fetchEndpoint(method, [blockIdentifier]).then(
-      this.responseParser.parseGetBlockResponse
-    );
+    const method = 'starknet_getBlockWithTxHashes';
+    if (typeof blockIdentifier === 'string' && isHex(blockIdentifier)) {
+      return this.fetchEndpoint(method, [{ block_hash: blockIdentifier }]).then(
+        this.responseParser.parseGetBlockResponse
+      );
+    }
+    else {
+      return this.fetchEndpoint(method, [{ block_number: blockIdentifier }]).then(
+        this.responseParser.parseGetBlockResponse
+      );
+    }
   }
 
   public async getStorageAt(

diff --git a/src/types/api/rpc.ts b/src/types/api/rpc.ts
@@ -143,12 +143,7 @@ export namespace RPC {
   };
 
   export type Methods = {
-    starknet_getBlockByHash: {
-      QUERY: never;
-      REQUEST: any[];
-      RESPONSE: GetBlockResponse;
-    };
-    starknet_getBlockByNumber: {
+    starknet_getBlockWithTxHashes: {
       QUERY: never;
       REQUEST: any[];
       RESPONSE: GetBlockResponse;