fix: utxo size calculation

enkryptcom · Sep 25, 2023 · bbb55d5 · bbb55d5 · github-actions · Sep 25, 2023
1 parent 6f2b6c9
commit bbb55d5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/packages/extension/src/providers/bitcoin/ui/btc-verify-transaction.vue b/packages/extension/src/providers/bitcoin/ui/btc-verify-transaction.vue
@@ -238,7 +238,7 @@ const updateUTXOs = async () => {
       2,
       (network.value as BitcoinNetwork).networkInfo.paymentType
     );
-    setTransactionFees(Math.ceil(txSize.txVBytes));
+    setTransactionFees(Math.ceil(txSize));
   });
 };
 

diff --git a/packages/extension/src/providers/bitcoin/ui/libs/tx-size.ts b/packages/extension/src/providers/bitcoin/ui/libs/tx-size.ts
@@ -228,7 +228,6 @@ const calculateSize = (
     txVBytes +
     (inputWitnessSize * input_count * 3) / 4;
   const txWeight = txVBytes * 4;
-
   return {
     txVBytes,
     txBytes,
@@ -239,14 +238,14 @@ const calculateSizeBasedOnType = (
   numInputs: number,
   numOutputs: number,
   type: PaymentType
-) => {
+): number => {
   const output: calcOutputType = {};
   if (type === PaymentType.P2PKH) {
     output.p2pkh_output_count = numOutputs;
   } else {
     output.p2wpkh_output_count = numOutputs;
   }
-  return calculateSize(
+  const size = calculateSize(
     {
       input_script:
         type === PaymentType.P2PKH
@@ -256,5 +255,6 @@ const calculateSizeBasedOnType = (
     },
     output
   );
+  return type === PaymentType.P2PKH ? size.txBytes : size.txVBytes;
 };
 export { InputScriptType, calculateSize, calculateSizeBasedOnType };
diff --git a/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue b/packages/extension/src/providers/bitcoin/ui/send-transaction/index.vue
@@ -226,7 +226,7 @@ const updateUTXOs = async () => {
       2,
       (props.network as BitcoinNetwork).networkInfo.paymentType
     );
-    setTransactionFees(Math.ceil(txSize.txVBytes));
+    setTransactionFees(Math.ceil(txSize));
   });
 };
 

diff --git a/packages/extension/src/ui/action/views/swap/libs/bitcoin-gasvals.ts b/packages/extension/src/ui/action/views/swap/libs/bitcoin-gasvals.ts
@@ -18,7 +18,7 @@ export const getBitcoinGasVals = async (
   );
   return getGasCostValues(
     network as BitcoinNetwork,
-    Math.ceil(txSize.txVBytes),
+    Math.ceil(txSize),
     price.toString(),
     network.decimals,
     network.currencyName
-Original file line number
+Diff line change
@@ Expand Up / @@ -238,7 +238,7 @@ const updateUTXOs = async () => { @@
 ,
           (network.value as BitcoinNetwork).networkInfo.paymentType
         );
-        setTransactionFees(Math.ceil(txSize.txVBytes));
+        setTransactionFees(Math.ceil(txSize));
       });
     };
@@ Expand Down @@