fix: no wallet balance service calls

leather-io · Jan 17, 2025 · 20dccd5 · 20dccd5
1 parent e6e1099
commit 20dccd5
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 25 deletions.
diff --git a/packages/services/src/balances/btc-balances.service.ts b/packages/services/src/balances/btc-balances.service.ts
@@ -10,6 +10,7 @@ import { MarketDataService } from '../market-data/market-data.service';
 import { BitcoinAccountIdentifier, BitcoinAccountServiceRequest } from '../shared/bitcoin.types';
 import { UtxosService } from '../utxos/utxos.service';
 import { sumUtxoValues } from '../utxos/utxos.utils';
+import { btcCryptoAssetZeroBalanceBtc, btcCryptoAssetZeroBalanceUsd } from './constants';
 
 export interface BtcAccountBalance {
   account: BitcoinAccountIdentifier;
@@ -50,8 +51,14 @@ export function createBtcBalancesService(
       balanceRequests.map(req => getBtcAccountBalance(req, signal))
     );
     return {
-      btc: aggregateBtcCryptoAssetBalances(accountBalances.map(bal => bal.btc)),
-      usd: aggregateBtcCryptoAssetBalances(accountBalances.map(bal => bal.usd)),
+      btc: aggregateBtcCryptoAssetBalances([
+        btcCryptoAssetZeroBalanceBtc,
+        ...accountBalances.map(bal => bal.btc),
+      ]),
+      usd: aggregateBtcCryptoAssetBalances([
+        btcCryptoAssetZeroBalanceUsd,
+        ...accountBalances.map(bal => bal.usd),
+      ]),
       accountBalances,
     };
   }

diff --git a/packages/services/src/balances/constants.ts b/packages/services/src/balances/constants.ts
@@ -0,0 +1,11 @@
+import {
+  createBtcCryptoAssetBalance,
+  createMoney,
+  createStxCryptoAssetBalance,
+} from '@leather.io/utils';
+
+export const btcCryptoAssetZeroBalanceBtc = createBtcCryptoAssetBalance(createMoney(0, 'BTC'));
+export const btcCryptoAssetZeroBalanceUsd = createBtcCryptoAssetBalance(createMoney(0, 'USD'));
+export const stxCryptoAssetZeroBalanceStx = createStxCryptoAssetBalance(createMoney(0, 'STX'));
+export const stxCryptoAssetZeroBalanceUsd = createStxCryptoAssetBalance(createMoney(0, 'USD'));
+export const baseCryptoAssetZeroBalanceUsd = createStxCryptoAssetBalance(createMoney(0, 'USD'));
diff --git a/packages/services/src/balances/runes-balances.service.ts b/packages/services/src/balances/runes-balances.service.ts
@@ -11,6 +11,7 @@ import { RuneAssetService } from '../assets/rune-asset.service';
 import { BestInSlotApiClient } from '../infrastructure/api/best-in-slot/best-in-slot-api.client';
 import { MarketDataService } from '../market-data/market-data.service';
 import { BitcoinAccountIdentifier } from '../shared/bitcoin.types';
+import { baseCryptoAssetZeroBalanceUsd } from './constants';
 import { parseRunesOutputsBalances } from './runes-balances.utils';
 
 export interface RuneAssetBalance {
@@ -58,7 +59,10 @@ export function createRunesBalancesService(
       accounts.map(account => getRunesAccountBalance(account, signal))
     );
     return {
-      usd: aggregateBaseCryptoAssetBalances(accountBalances.map(b => b.usd)),
+      usd: aggregateBaseCryptoAssetBalances([
+        baseCryptoAssetZeroBalanceUsd,
+        ...accountBalances.map(b => b.usd),
+      ]),
       accountBalances,
     };
   }

diff --git a/packages/services/src/balances/sip10-balances.service.ts b/packages/services/src/balances/sip10-balances.service.ts
@@ -9,6 +9,7 @@ import {
 import { Sip10AssetService } from '../assets/sip10-asset.service';
 import { HiroStacksApiClient } from '../infrastructure/api/hiro/hiro-stacks-api.client';
 import { MarketDataService } from '../market-data/market-data.service';
+import { baseCryptoAssetZeroBalanceUsd } from './constants';
 
 export interface Sip10AssetBalance {
   asset: Sip10CryptoAssetInfo;
@@ -47,7 +48,10 @@ export function createSip10BalancesService(
     const addressBalances = await Promise.all(
       addresses.map(address => getSip10AddressBalance(address, signal))
     );
-    const totalUsdBalance = aggregateBaseCryptoAssetBalances(addressBalances.map(r => r.usd));
+    const totalUsdBalance = aggregateBaseCryptoAssetBalances([
+      baseCryptoAssetZeroBalanceUsd,
+      ...addressBalances.map(r => r.usd),
+    ]);
     return {
       usd: totalUsdBalance,
       addressBalances,

diff --git a/packages/services/src/balances/stx-balances.service.ts b/packages/services/src/balances/stx-balances.service.ts
@@ -13,6 +13,7 @@ import {
 } from '../infrastructure/api/hiro/hiro-stacks-api.utils';
 import { MarketDataService } from '../market-data/market-data.service';
 import { StacksTransactionsService } from '../transactions/stacks-transactions.service';
+import { stxCryptoAssetZeroBalanceStx, stxCryptoAssetZeroBalanceUsd } from './constants';
 import { calculateInboundStxBalance, calculateOutboundStxBalance } from './stx-balances.utils';
 
 export interface StxAggregateBalance {
@@ -46,8 +47,14 @@ export function createStxBalancesService(
       addresses.map(address => getStxAddressBalance(address, signal))
     );
     return {
-      stx: aggregateStxCryptoAssetBalances(addressBalances.map(res => res.stx)),
-      usd: aggregateStxCryptoAssetBalances(addressBalances.map(res => res.usd)),
+      stx: aggregateStxCryptoAssetBalances([
+        stxCryptoAssetZeroBalanceStx,
+        ...addressBalances.map(res => res.stx),
+      ]),
+      usd: aggregateStxCryptoAssetBalances([
+        stxCryptoAssetZeroBalanceUsd,
+        ...addressBalances.map(res => res.usd),
+      ]),
       balances: addressBalances,
     };
   }

diff --git a/packages/services/src/infrastructure/api/best-in-slot/best-in-slot-api.client.ts b/packages/services/src/infrastructure/api/best-in-slot/best-in-slot-api.client.ts
@@ -92,26 +92,29 @@ export function createBestInSlotApiClient(
     params.append('offset', '0');
     params.append('count', '2000');
 
-    return await cache.fetchWithCache(
-      [
-        'best-in-slot-inscriptions',
-        bitcoinNetworkModeToCoreNetworkMode(networkService.getConfig().chain.bitcoin.mode),
-        descriptor,
-      ],
-      async () => {
-        const res = await limiter.add(
-          RateLimiterType.BestInSlot,
-          () =>
-            axios.get<BestInSlotApiResponse<BisInscription[]>>(
-              `${getBestInSlotBasePath(networkService.getConfig().chain.bitcoin.mode)}/wallet/inscriptions_xpub`,
-              { params, signal }
-            ),
-          { signal }
+    return bitcoinNetworkModeToCoreNetworkMode(networkService.getConfig().chain.bitcoin.mode) !==
+      'mainnet'
+      ? []
+      : await cache.fetchWithCache(
+          [
+            'best-in-slot-inscriptions',
+            bitcoinNetworkModeToCoreNetworkMode(networkService.getConfig().chain.bitcoin.mode),
+            descriptor,
+          ],
+          async () => {
+            const res = await limiter.add(
+              RateLimiterType.BestInSlot,
+              () =>
+                axios.get<BestInSlotApiResponse<BisInscription[]>>(
+                  `${getBestInSlotBasePath(networkService.getConfig().chain.bitcoin.mode)}/wallet/inscriptions_xpub`,
+                  { params, signal }
+                ),
+              { signal }
+            );
+            return z.array(bisInscriptionSchema).parse(res.data.data);
+          },
+          { ttl: HttpCacheTimeMs.twoMinutes }
         );
-        return z.array(bisInscriptionSchema).parse(res.data.data);
-      },
-      { ttl: HttpCacheTimeMs.twoMinutes }
-    );
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars