US-2041 Added a fetch all to rif wallet services fetcher, and also ad…

…ded prices to the return type of the init RifWalletServicesSocket.ts (#105) Co-authored-by: Jesse Clark <[email protected]>
rsksmart · Dec 18, 2023 · 8119aea · 8119aea
1 parent 195e375
commit 8119aea
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/packages/rifWalletServices/package.json b/packages/rifWalletServices/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rsksmart/rif-wallet-services",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "RIF Wallet Services library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/packages/rifWalletServices/src/RifWalletServicesFetcher.ts b/packages/rifWalletServices/src/RifWalletServicesFetcher.ts
@@ -1,4 +1,6 @@
 import {
+  FetchBalancesTransactionsPricesByAddressFunction,
+  FetchBalancesTransactionsPricesByAddressFunctionResult,
   IRegisteredDappsGroup,
   ITokenWithBalance, IXPubBalanceData,
   RifWalletFetcherDependencies, RIFWalletServicesFetcherInterface,
@@ -83,6 +85,14 @@ export class RifWalletServicesFetcher implements RIFWalletServicesFetcherInterfa
     return response.data
   }
 
+  fetchBalancesTransactionsPricesByAddress = async ({ address, prev, next, blockNumber = '0', limit }: FetchBalancesTransactionsPricesByAddressFunction) => {
+    const addressLowerCase = address.toLowerCase()
+    const url = `/address/${addressLowerCase}/all`
+    const promise = this.axiosInstance.get<FetchBalancesTransactionsPricesByAddressFunctionResult>(url, { params: { prev, next, blockNumber, limit } })
+    const response = await this.retryPromise(promise, 2)
+    return response.data
+  }
+
   fetchDapps = (): Promise<IRegisteredDappsGroup[]> =>
     this.axiosInstance
       .get<IRegisteredDappsGroup[]>('/dapps')

diff --git a/packages/rifWalletServices/src/RifWalletServicesSocket.ts b/packages/rifWalletServices/src/RifWalletServicesSocket.ts
@@ -56,15 +56,7 @@ export class RifWalletServicesSocket
     const blockNumber = this.cache.get(cacheBlockNumberText) || '0'
     const catchedTxs = this.cache.get(cacheTxsText) || []
 
-    const [fetchedTokens, fetchedTransactions] = await Promise.all([
-      fetcher.fetchTokensByAddress(address),
-      fetcher.fetchTransactionsByAddress(
-        address,
-        null,
-        null,
-        blockNumber,
-      )
-    ])
+    const { prices, tokens: fetchedTokens, transactions: fetchedTransactions } = await fetcher.fetchBalancesTransactionsPricesByAddress({ address, blockNumber })
 
     let lastBlockNumber = blockNumber
     const activityTransactions = await Promise.all(
@@ -103,6 +95,7 @@ export class RifWalletServicesSocket
     this.emit('init', {
       transactions: transactions,
       balances: fetchedTokens,
+      prices,
     })
   }
 

diff --git a/packages/rifWalletServices/src/types.ts b/packages/rifWalletServices/src/types.ts
@@ -202,3 +202,17 @@ export type RifWalletSocketDependencies = {
   onBeforeInit: OnBeforeInitFunction
   onEnhanceTransaction: EnhanceTransactionFunction
 }
+
+export interface FetchBalancesTransactionsPricesByAddressFunction {
+  address: string
+  blockNumber?: string
+  prev?: string
+  next?: string
+  limit?: string
+}
+
+export interface FetchBalancesTransactionsPricesByAddressFunctionResult {
+  tokens: ITokenWithBalance[]
+  prices: Record<string, { price: number, lastUpdated: string }>
+  transactions: TransactionsServerResponse
+}