chore: cursor pagination v2 minor

Author: ivan-angjelkoski

packages/sdk-ts/src/client/indexer/grpc/IndexerGrpcExplorerApi.spec.ts

@@ -267,8 +267,6 @@ describe('IndexerGrpcExplorerApi', () => {
         perPage: 10,
       })
 
-      console.log(JSON.stringify(response, null, 2))
-
       expect(response).toBeDefined()
     } catch (e) {
       console.error(
@@ -283,8 +281,6 @@ describe('IndexerGrpcExplorerApi', () => {
         perPage: 10,
       })
 
-      console.log(JSON.stringify(response, null, 2))
-
       expect(response).toBeDefined()
     } catch (e) {
       console.error(
@@ -300,8 +296,6 @@ describe('IndexerGrpcExplorerApi', () => {
         perPage: 10,
       })
 
-      console.log(JSON.stringify(response, null, 2))
-
       expect(response).toBeDefined()
     } catch (e) {
       console.error(

packages/sdk-ts/src/client/indexer/grpc/IndexerGrpcExplorerApi.ts

@@ -571,21 +571,21 @@ export class IndexerGrpcExplorerApi extends BaseGrpcConsumer {
   }
 
   async fetchTxsV2({
-    blockNumber,
-    startTime,
-    endTime,
-    perPage,
-    status,
-    token,
     type,
+    token,
+    status,
+    perPage,
+    endTime,
+    startTime,
+    blockNumber,
   }: {
-    blockNumber?: number
-    startTime?: number
-    endTime?: number
-    perPage?: number
-    status?: string
-    token?: string
     type?: string
+    token?: string
+    status?: string
+    perPage?: number
+    endTime?: number
+    startTime?: number
+    blockNumber?: number
   }) {
     const request = InjectiveExplorerRpc.GetTxsV2Request.create()
 
@@ -641,19 +641,19 @@ export class IndexerGrpcExplorerApi extends BaseGrpcConsumer {
   }
 
   async fetchAccountTxsV2({
+    type,
+    token,
     address,
-    startTime,
     endTime,
     perPage,
-    token,
-    type,
+    startTime,
   }: {
+    type?: string
+    token?: string
     address: string
-    startTime?: number
     endTime?: number
     perPage?: number
-    token?: string
-    type?: string
+    startTime?: number
   }) {
     const request = InjectiveExplorerRpc.GetAccountTxsV2Request.create()
 
@@ -706,11 +706,11 @@ export class IndexerGrpcExplorerApi extends BaseGrpcConsumer {
   }
 
   async fetchBlocksV2({
-    perPage,
     token,
+    perPage,
   }: {
-    perPage?: number
     token?: string
+    perPage?: number
   }) {
     const request = InjectiveExplorerRpc.GetBlocksV2Request.create({})
 

packages/sdk-ts/src/client/indexer/transformers/IndexerGrpcExplorerTransformer.ts

@@ -1,5 +1,5 @@
-import { BigNumberInWei, BigNumberInBase } from '@injectivelabs/utils'
 import { isJsonString } from '../../../utils/helpers.js'
+import { BigNumberInWei, BigNumberInBase } from '@injectivelabs/utils'
 import {
   Block,
   GasFee,
@@ -522,23 +522,23 @@ export class IndexerGrpcExplorerTransformer {
     const blockNumber = parseInt(tx.blockNumber)
 
     return {
-      id: tx.id,
       logs,
-      code: tx.code,
-      hash: tx.hash,
+      info: '',
+      memo: '',
+      txType,
       claimIds,
-      errorLog: tx.errorLog,
       messages,
-      codespace: tx.codespace,
-      txType,
+      id: tx.id,
       signatures,
       blockNumber,
-      blockTimestamp: tx.blockTimestamp,
-      gasFee: { amounts: [], gasLimit: 0, granter: '', payer: '' },
-      info: '',
-      memo: '',
       gasUsed: 0,
       gasWanted: 0,
+      hash: tx.hash,
+      code: tx.code,
+      errorLog: tx.errorLog,
+      codespace: tx.codespace,
+      blockTimestamp: tx.blockTimestamp,
+      gasFee: { amounts: [], gasLimit: 0, granter: '', payer: '' },
     }
   }
 
@@ -573,33 +573,33 @@ export class IndexerGrpcExplorerTransformer {
         payer: tx.gasFee?.payer ?? '',
       },
       events: tx.events,
-      gasUsed: parseInt(tx.gasUsed, 10),
       errorLog: tx.errorLog,
-      claimIds: tx.claimIds.map((claimId) => parseInt(claimId, 10)),
+      codespace: tx.codespace,
+      gasUsed: parseInt(tx.gasUsed, 10),
+      blockTimestamp: tx.blockTimestamp,
       gasWanted: parseInt(tx.gasWanted, 10),
+      blockNumber: parseInt(tx.blockNumber, 10),
       signatures: tx.signatures.map((signature) => ({
         address: signature.address,
         pubkey: signature.pubkey,
         signature: signature.signature,
         sequence: parseInt(signature.sequence, 10),
       })),
-      blockNumber: parseInt(tx.blockNumber, 10),
-      blockTimestamp: tx.blockTimestamp,
-      data: '/' + Buffer.from(tx.data).toString('utf8').split('/').pop(),
       messages: transactionV2MessagesToMessages(tx.messages),
       logs: JSON.parse(Buffer.from(tx.logs).toString('utf8')),
-      codespace: tx.codespace,
+      data: '/' + Buffer.from(tx.data).toString('utf8').split('/').pop(),
+      claimIds: tx.claimIds.map((claimId) => parseInt(claimId, 10)),
     }
   }
 
   static getBlocksV2ResponseToBlocks(
     response: InjectiveExplorerRpc.GetBlocksV2Response,
   ) {
     return {
+      paging: response.paging,
       data: response.data.map((block) =>
         IndexerGrpcExplorerTransformer.grpcBlockV2ToBlock(block),
       ),
-      paging: response.paging,
     }
   }
 
@@ -633,25 +633,25 @@ export class IndexerGrpcExplorerTransformer {
     const messages = transactionV2MessagesToMessages(tx.messages)
 
     return {
+      messages,
       code: tx.code,
       memo: tx.memo,
       type: tx.txType,
+      txHash: tx.hash,
+      error_log: tx.errorLog,
+      height: parseInt(tx.blockNumber, 10),
+      tx_number: parseInt(tx.txNumber, 10),
+      time: parseInt(tx.blockTimestamp, 10),
+      amount: getContractTransactionV2Amount(tx),
+      logs: JSON.parse(Buffer.from(tx.logs).toString('utf8')),
+      data: '/' + Buffer.from(tx.data).toString('utf8').split('/').pop(),
+      fee: new BigNumberInWei(tx.gasFee?.amount[0]?.amount || '0').toBase(),
       signatures: tx.signatures.map((signature) => ({
         address: signature.address,
         pubkey: signature.pubkey,
         signature: signature.signature,
         sequence: parseInt(signature.sequence, 10),
       })),
-      data: '/' + Buffer.from(tx.data).toString('utf8').split('/').pop(),
-      messages,
-      logs: JSON.parse(Buffer.from(tx.logs).toString('utf8')),
-      height: parseInt(tx.blockNumber, 10),
-      error_log: tx.errorLog,
-      txHash: tx.hash,
-      tx_number: parseInt(tx.txNumber, 10),
-      time: parseInt(tx.blockTimestamp, 10),
-      fee: new BigNumberInWei(tx.gasFee?.amount[0]?.amount || '0').toBase(),
-      amount: getContractTransactionV2Amount(tx),
     }
   }
 }

packages/sdk-ts/src/client/indexer/types/explorer.ts

@@ -397,20 +397,20 @@ export interface ExplorerTxsV2Response {
 }
 
 export interface ExplorerTransactionV2 {
-  id: string
   logs: any
+  id: string
   code: number
   hash: string
-  claimIds: string[]
-  errorLog?: string
   messages: any
-  codespace: string
-  txMsgTypes: string[]
-  signatures: InjectiveExplorerRpc.Signature[]
   txNumber: number
+  errorLog?: string
+  codespace: string
+  claimIds: string[]
   blockNumber: number
+  txMsgTypes: string[]
   blockTimestamp: number
   blockUnixTimestamp: number
+  signatures: InjectiveExplorerRpc.Signature[]
 }
 
 export type GrpcIBCTransferTx = InjectiveExplorerRpc.IBCTransferTx