fix: bitcoin fees tx size calc

leather-io · Nov 28, 2023 · 3f5718c · 3f5718c
1 parent cddf09b
commit 3f5718c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/src/app/common/transactions/bitcoin/coinselect/local-coin-selection.ts b/src/app/common/transactions/bitcoin/coinselect/local-coin-selection.ts
@@ -70,7 +70,7 @@ export function determineUtxosForSpend({
     sizeInfo = txSizer.calcTxSize({
       // Only p2wpkh is supported by the wallet
       input_script: 'p2wpkh',
-      input_count: neededUtxos.length + 1,
+      input_count: neededUtxos.length,
       // From the address of the recipient, we infer the output type
       [addressInfo.type + '_output_count']: 2,
     });

diff --git a/src/app/query/bitcoin/bitcoin-client.ts b/src/app/query/bitcoin/bitcoin-client.ts
@@ -76,10 +76,10 @@ interface FeeResult {
 class FeeEstimatesApi {
   constructor(public configuration: Configuration) {}
 
-  async getFeeEstimatesFromBlockcypherApi(): Promise<FeeResult> {
+  async getFeeEstimatesFromBlockcypherApi(network: string): Promise<FeeResult> {
     return fetchData({
       errorMsg: 'No fee estimates fetched',
-      url: `https://api.blockcypher.com/v1/btc/main`,
+      url: `https://api.blockcypher.com/v1/btc/${network}`,
     }).then((resp: FeeEstimateEarnApiResponse) => {
       const { low_fee_per_kb, medium_fee_per_kb, high_fee_per_kb } = resp;
       // These fees are in satoshis per kb

diff --git a/src/app/query/bitcoin/fees/fee-estimates.query.ts b/src/app/query/bitcoin/fees/fee-estimates.query.ts
@@ -1,16 +1,22 @@
 import { useQuery } from '@tanstack/react-query';
 
+import { BitcoinNetworkModes } from '@shared/constants';
+
 import { AppUseQueryConfig } from '@app/query/query-config';
 import { useBitcoinClient } from '@app/store/common/api-clients.hooks';
+import { useCurrentNetwork } from '@app/store/networks/networks.selectors';
 
 import { BitcoinClient } from '../bitcoin-client';
 
-function fetchAllBitcoinFeeEstimates(client: BitcoinClient) {
+function fetchAllBitcoinFeeEstimates(client: BitcoinClient, network: BitcoinNetworkModes) {
   return async () =>
-    Promise.allSettled([
-      client.feeEstimatesApi.getFeeEstimatesFromMempoolSpaceApi(),
-      client.feeEstimatesApi.getFeeEstimatesFromBlockcypherApi(),
-    ]);
+    network === 'mainnet'
+      ? Promise.allSettled([
+          client.feeEstimatesApi.getFeeEstimatesFromMempoolSpaceApi(),
+          client.feeEstimatesApi.getFeeEstimatesFromBlockcypherApi('main'),
+        ])
+      : // Using `allSettled` so we can add more testnet apis to the array
+        Promise.allSettled([client.feeEstimatesApi.getFeeEstimatesFromBlockcypherApi('test3')]);
 }
 
 type FetchAllBitcoinFeeEstimatesResp = Awaited<
@@ -21,9 +27,11 @@ export function useGetAllBitcoinFeeEstimatesQuery<
   T extends unknown = FetchAllBitcoinFeeEstimatesResp,
 >(options?: AppUseQueryConfig<FetchAllBitcoinFeeEstimatesResp, T>) {
   const client = useBitcoinClient();
+  const network = useCurrentNetwork();
+
   return useQuery({
-    queryKey: ['average-bitcoin-fee-estimates'],
-    queryFn: fetchAllBitcoinFeeEstimates(client),
+    queryKey: ['average-bitcoin-fee-estimates', network.chain.bitcoin.bitcoinNetwork],
+    queryFn: fetchAllBitcoinFeeEstimates(client, network.chain.bitcoin.bitcoinNetwork),
     refetchInterval: 2000 * 60,
     ...options,
   });