Merge pull request #30 from fracek/optional-block-id

Optional block id
starknet-io · Oct 28, 2021 · a687562 · a687562
2 parents de1afcb + fbd09ba
commit a687562
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 6 deletions.
diff --git a/__tests__/index.test.ts b/__tests__/index.test.ts
@@ -27,16 +27,29 @@ describe('starknet endpoints', () => {
     test('getBlock()', () => {
       return expect(getBlock(46500)).resolves.not.toThrow();
     });
+    test('getBlock(blockId=null)', () => {
+      return expect(getBlock()).resolves.not.toThrow();
+    });
     test('getCode()', () => {
       return expect(
         getCode('0x5f778a983bf8760ad37868f4c869d70247c5546044a7f0386df96d8043d4e9d', 46500)
       ).resolves.not.toThrow();
     });
+    test('getCode(blockId=null)', () => {
+      return expect(
+        getCode('0x5f778a983bf8760ad37868f4c869d70247c5546044a7f0386df96d8043d4e9d')
+      ).resolves.not.toThrow();
+    });
     test('getStorageAt()', () => {
       return expect(
         getStorageAt('0x5f778a983bf8760ad37868f4c869d70247c5546044a7f0386df96d8043d4e9d', 0, 46500)
       ).resolves.not.toThrow();
     });
+    test('getStorageAt(blockId=null)', () => {
+      return expect(
+        getStorageAt('0x5f778a983bf8760ad37868f4c869d70247c5546044a7f0386df96d8043d4e9d', 0)
+      ).resolves.not.toThrow();
+    });
     test('getTransactionStatus()', () => {
       return expect(getTransactionStatus(286136)).resolves.not.toThrow();
     });

diff --git a/src/starknet.ts b/src/starknet.ts
@@ -62,10 +62,10 @@ export function callContract(invokeTx: Call, blockId?: number): Promise<CallCont
  * @param blockId
  * @returns the block object { block_id, previous_block_id, state_root, status, timestamp, transaction_receipts, transactions }
  */
-export function getBlock(blockId: number): Promise<GetBlockResponse> {
+export function getBlock(blockId?: number): Promise<GetBlockResponse> {
   return new Promise((resolve, reject) => {
     axios
-      .get<GetBlockResponse>(`${FEEDER_GATEWAY_URL}/get_block?blockId=${blockId}`)
+      .get<GetBlockResponse>(`${FEEDER_GATEWAY_URL}/get_block?blockId=${blockId ?? 'null'}`)
       .then((resp: any) => {
         resolve(resp.data);
       })
@@ -82,11 +82,13 @@ export function getBlock(blockId: number): Promise<GetBlockResponse> {
  * @param blockId
  * @returns Bytecode and ABI of compiled contract
  */
-export function getCode(contractAddress: string, blockId: number): Promise<GetCodeResponse> {
+export function getCode(contractAddress: string, blockId?: number): Promise<GetCodeResponse> {
   return new Promise((resolve, reject) => {
     axios
       .get<GetCodeResponse>(
-        `${FEEDER_GATEWAY_URL}/get_code?contractAddress=${contractAddress}&blockId=${blockId}`
+        `${FEEDER_GATEWAY_URL}/get_code?contractAddress=${contractAddress}&blockId=${
+          blockId ?? 'null'
+        }`
       )
       .then((resp) => {
         resolve(resp.data);
@@ -109,12 +111,14 @@ export function getCode(contractAddress: string, blockId: number): Promise<GetCo
 export function getStorageAt(
   contractAddress: string,
   key: number,
-  blockId: number
+  blockId?: number
 ): Promise<object> {
   return new Promise((resolve, reject) => {
     axios
       .get(
-        `${FEEDER_GATEWAY_URL}/get_storage_at?contractAddress=${contractAddress}&key=${key}&blockId=${blockId}`
+        `${FEEDER_GATEWAY_URL}/get_storage_at?contractAddress=${contractAddress}&key=${key}&blockId=${
+          blockId ?? 'null'
+        }`
       )
       .then((resp: any) => {
         resolve(resp.data);