chore: add split function

metalet-labs · Aug 28, 2024 · f382f47 · f382f47
1 parent 592d88d
commit f382f47
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/lib/wallets/btc.ts b/src/lib/wallets/btc.ts
@@ -69,7 +69,7 @@ export const split = async (feeRate: number, utxos: UTXO[]) => {
   const addressType = wallet.getScriptType()
   const payment = await createPayment(addressType)
 
-  const buildPsbt = async (utxos: UTXO[]) => {
+  const buildPsbt = async (utxos: UTXO[], fee: number) => {
     const psbt = new Psbt({ network: btcNetwork })
     let total = getTotalSatoshi(utxos)
 
@@ -83,7 +83,7 @@ export const split = async (feeRate: number, utxos: UTXO[]) => {
     psbt.addOutput({
       value: total
         .minus(1999 * 1600)
-        .minus(68971 * 2)
+        .minus(fee)
         .toNumber(),
       address: address,
     })
@@ -104,12 +104,12 @@ export const split = async (feeRate: number, utxos: UTXO[]) => {
 
   let total = getTotalSatoshi(utxos)
 
-  let psbt = await buildPsbt(utxos)
+  let psbt = await buildPsbt(utxos, 0)
 
-  psbt = await buildPsbt(utxos)
-  console.log('virtualSize', psbt.extractTransaction().virtualSize())
+  psbt = await buildPsbt(utxos, Math.ceil(psbt.extractTransaction().virtualSize() * feeRate))
+  // console.log('virtualSize', psbt.extractTransaction().virtualSize())
 
-  console.log(Math.floor(new Decimal(68971 * 2).div(psbt.extractTransaction().virtualSize()).toNumber()))
+  // console.log(Math.floor(new Decimal(68971 * 2).div(psbt.extractTransaction().virtualSize()).toNumber()))
 
   // return { txId: psbt.extractTransaction().getId() }
 

diff --git a/src/pages/settings/components/BTCMerge.vue b/src/pages/settings/components/BTCMerge.vue
@@ -94,6 +94,7 @@ const mergeFn = async () => {
 const splitFn = async () => {
   if (feeRate.value && utxos.value) {
     operationLock.value = true
+    await sleep(1000)
     const { txId } = await split(feeRate.value, utxos.value)
     operationLock.value = false
     isOpenResultModal.value = true
@@ -217,16 +218,16 @@ const broadcast = () => {
 
       <TransactionResultModal v-model:is-open-result="isOpenResultModal" :result="transactionResult" />
     </div>
-    <!-- <button
+    <button
       @click="splitFn"
       :class="[
-        { 'cursor-not-allowed opacity-50': false },
+        { 'cursor-not-allowed opacity-50': mergeDisabled },
         'bg-blue-primary text-white text-xs w-61.5 rounded-3xl my-12 py-4 mx-auto flex items-center justify-center gap-x-2',
       ]"
     >
       <ArrowPathIcon class="animate-spin w-4 h-4" v-if="operationLock" />
       Split
-    </button> -->
+    </button>
 
     <button
       @click="mergeFn"