@teleportdao/bitcoin 4.0.3 → 4.1.0-alpha.0

package/src/teleswap-wallet.ts

@@ -5,7 +5,7 @@ import type {
   TargetAddress,
 } from "./transaction-builder/transaction-builder"
 import { BitcoinBaseWallet, FeeRateType } from "./bitcoin-wallet-base"
-import { generateWrapOpReturn } from "./helper/teleswap-helper"
+import { generateWrapOpReturn, generateWrapOpReturnV2 } from "./helper/teleswap-helper"
 
 export type TransferRequest = {
   changeAddress?: string
@@ -134,5 +134,71 @@ export class TeleswapWallet extends BitcoinBaseWallet {
 
     return unsignedTx
   }
+
+  async wrapUnsignedV2(
+    recipientAddress: string,
+    amount: string,
+    networkFee: string,
+    lockerAddress: string,
+    chainId: number, // 80001
+    signer: SignerInfo,
+    exchange?: {
+      outputToken: string
+      minOutputAmount: string
+      bridgePercentageFee?: number
+    },
+    appId = exchange
+      ? teleswap.requestAppId.WrapAndSwap.default
+      : teleswap.requestAppId.Wrap.default,
+    speed = false,
+    fee: FeeRateType = "normal",
+    thirdPartyId?: number,
+    staticExtendedUtxo?: ExtendedUtxo[],
+    changeAddress?: string,
+    fullAmount = false,
+  ) {
+    // split last 8 bytes of outputToken to get outputTokenId
+
+    const outputTokenId = exchange?.outputToken
+      ? exchange.outputToken.replace("0x", "").slice(-16)
+      : undefined
+    const dataHex = generateWrapOpReturnV2({
+      chainId,
+      appId,
+      recipientAddress,
+      networkFee,
+      speed,
+      isExchange: !!exchange,
+      minOutputAmount: exchange?.minOutputAmount,
+      minIntermediaryTokenAmount: "0",
+      outputTokenId,
+      bridgePercentageFee: exchange?.bridgePercentageFee,
+      thirdPartyId,
+    })
+    let extendedUtxo = staticExtendedUtxo || (await this.getExtendedUtxo(signer))
+    let feeRate = await this.getFeeRate(fee)
+
+    const targets = fullAmount
+      ? [this.transactionBuilder.getOpReturnTarget(dataHex)]
+      : [
+          {
+            address: lockerAddress,
+            value: +amount,
+          },
+          this.transactionBuilder.getOpReturnTarget(dataHex),
+        ]
+
+    const sequenceNumber = speed === true ? this.transactionBuilder.NO_RBF_SEQUENCE : undefined
+    const unsignedTx = this.transactionBuilder.processUnsignedTransaction({
+      extendedUtxo,
+      feeRate,
+      targets,
+      changeAddress: fullAmount ? lockerAddress : changeAddress || signer.address,
+      fullAmount,
+      sequenceNumber,
+    })
+
+    return unsignedTx
+  }
 }
 export default TeleswapWallet

package/src/transaction-builder/transaction-builder.ts

@@ -257,10 +257,6 @@ export abstract class BaseTransactionBuilder {
     }
 
     let diff = fee - txFee
-
-    if (Math.abs(diff) >= DUST) {
-      console.log("diff", diff, "fee", fee, "txFee", txFee)
-    }
     let changeIndex = outputs.findIndex((x) => !x?.address && !x.script && (x.value || 0) > 0)
     let change: ChangeTarget | undefined
     if (diff > 0) {
@@ -312,9 +308,7 @@ export abstract class BaseTransactionBuilder {
     }
 
     if (Math.abs(fee - newFee) > DUST) {
-      console.log("fee", fee)
-      console.log("newFee", newFee)
-      throw new Error("fee mismatch")
+      throw new Error(`fee mismatch: ${JSON.stringify({ fee, newFee })}`)
     }
 
     // check outputs
@@ -322,32 +316,38 @@ export abstract class BaseTransactionBuilder {
     let totalNewOutputValue = newOutputs.reduce((a, b) => a + b.value, 0)
 
     if (totalOutputValue - totalNewOutputValue !== 0) {
-      console.log("totalOutputValue", totalOutputValue)
-      console.log("totalNewOutputValue", totalNewOutputValue)
-      console.log("diff", totalOutputValue - totalNewOutputValue)
-      throw new Error("output value mismatch")
+      throw new Error(
+        `output value mismatch${JSON.stringify({ totalOutputValue, totalNewOutputValue })}`,
+      )
     }
 
     if (outputs.length !== newOutputs.length) {
-      console.log("outputs", outputs)
-      console.log("newOutputs", newOutputs)
-      throw new Error("output length mismatch")
+      throw new Error(`output length mismatch: ${JSON.stringify({ outputs, newOutputs })}`)
     }
     for (let i = 0; i < outputs.length; i += 1) {
       if (outputs[i].value !== newOutputs[i].value) {
-        console.log("outputs[i].value", outputs[i].value)
-        console.log("newOutputs[i].value", newOutputs[i].value)
-        throw new Error("output value mismatch")
+        throw new Error(
+          `output value mismatch: ${JSON.stringify({
+            old: outputs[i].value,
+            new: newOutputs[i].value,
+          })}`,
+        )
       }
       if (outputs[i].address !== newOutputs[i].address) {
-        console.log("outputs[i].address", outputs[i].address)
-        console.log("newOutputs[i].address", newOutputs[i].address)
-        throw new Error("output address mismatch")
+        throw new Error(
+          `output address mismatch: ${JSON.stringify({
+            old: outputs[i].address,
+            new: newOutputs[i].address,
+          })}`,
+        )
       }
       if (outputs[i].script !== newOutputs[i].script) {
-        console.log("outputs[i].script", outputs[i].script)
-        console.log("newOutputs[i].script", newOutputs[i].script)
-        throw new Error("output script mismatch")
+        throw new Error(
+          `output script mismatch: ${JSON.stringify({
+            old: outputs[i].script,
+            new: newOutputs[i].script,
+          })}`,
+        )
       }
     }
 
@@ -360,8 +360,14 @@ export abstract class BaseTransactionBuilder {
         totalInputValue - (change?.value || 0) - (totalNewInputValue - (newChange?.value || 0)),
       ) > DUST
     ) {
-      console.log("totalInputValue", totalInputValue)
-      throw new Error("input value mismatch")
+      throw new Error(
+        `input value mismatch: ${JSON.stringify({
+          totalInputValue,
+          totalNewInputValue,
+          changeValue: change?.value,
+          newChangeValue: newChange?.value,
+        })}`,
+      )
     }
 
     return { inputs, outputs, change, fee }

package/src/utils/tools.ts

@@ -25,7 +25,6 @@ async function runWithRetries<T>(
       return await action()
     } catch (error: any) {
       error.message += `\n${trace}`
-      console.log(`Attempt ${count + 1} failed: ${error.message}`)
       lastError = error
       if (count < maxTries - 1) {
         await sleep(retrySleep)