@teleportdao/bitcoin 2.3.0-alpha.0 → 3.0.3

package/src/bitcoin-wallet-base.ts

@@ -13,7 +13,7 @@ import type {
   Target,
   TargetAddress,
 } from "./transaction-builder/transaction-builder"
-import BitcoinSigner from "./sign/sign-transaction"
+import BitcoinSign from "./sign/sign-transaction"
 
 import { getPubKeyFromPrivateKeyHex } from "./bitcoin-utils"
 import networks from "./utils/networks"
@@ -24,39 +24,26 @@ const bip32 = BIP32Factory(ecc)
 
 export type FeeRateType = "normal" | "slow" | "fast" | number
 export class BitcoinBaseWallet {
-  SINGLESIG_TYPES = ["p2pkh", "p2wpkh", "p2sh-p2wpkh", "p2tr"]
-  MULTISIG_TYPES = ["p2sh", "p2wsh", "p2sh-p2wsh"]
-
-  //
   network: Network
   hdWalletPath: {
     p2pkh: string
     p2wpkh: string
     "p2sh-p2wpkh": string
-    // multisig
     p2sh: string
     p2wsh: string
     "p2sh-p2wsh": string
-    // taproot
     p2tr: string
   }
   transactionBuilder: BitcoinTransactionBuilder
   btcInterface: BitcoinInterfaceWallet
-  signer: BitcoinSigner
-
-  currentAccount?: string // current account address
-  currentAccountType?: string // current account type
-  addressObj?: Payment
-
+  signer: BitcoinSign
+  currentAccount?: string
+  currentAccountType?: string
   privateKey?: Buffer
   publicKey?: Buffer
-
-  // multisig
-  multisig?: {
-    publicKeys: Buffer[]
-    numberOfSigners: number
-  }
-
+  publicKeys?: Buffer[]
+  addressObj?: Payment
+  bitcoinAddress: string | undefined
   constructor(
     networkName: string,
     connectionInfo?: {
@@ -75,7 +62,7 @@ export class BitcoinBaseWallet {
     )
     this.btcInterface = this.transactionBuilder.btcInterface
 
-    this.signer = new BitcoinSigner(this.network)
+    this.signer = new BitcoinSign(this.network)
 
     // initialize account
     this.currentAccount = undefined
@@ -92,65 +79,38 @@ export class BitcoinBaseWallet {
     return new BigNumber(btc).multipliedBy(1e8).toFixed(0)
   }
 
-  get bitcoinAddress() {
-    return this.currentAccount
-  }
-
   // initialize account
 
   get signerInfo() {
     return this.privateKey
       ? {
           address: this.bitcoinAddress!,
-          addressType: this.currentAccountType!,
           publicKey: this.publicKey!.toString("hex"),
-          publicKeys: this.multisig?.publicKeys.map((p) => p.toString("hex")),
-          numberOfSigners: this.multisig?.numberOfSigners,
+          addressType: this.currentAccountType!,
         }
       : undefined
   }
 
-  setAccountPrivateKey(privateKeyHex: string, accountType = "p2wpkh") {
+  setAccountPrivateKey(privateKeyHex: string) {
     this.privateKey = Buffer.from(privateKeyHex, "hex")
     let publicKey = getPubKeyFromPrivateKeyHex(privateKeyHex, this.network)
     this.publicKey = publicKey
-    this.setAccountType(accountType)
+    this.setAccountType("p2wpkh")
   }
 
-  setAccountType(
-    accountType = "p2wpkh",
-    multisig?: {
-      publicKeys: string[]
-      numberOfSigners?: number
-    },
-  ) {
+  setAccountType(accountType = "p2pkh") {
     if (!this.publicKey) {
       throw new Error("account not initialized")
     }
-
-    let addressObj
-    if (this.SINGLESIG_TYPES.includes(accountType)) {
-      addressObj = this.btcInterface.createAddressObjectByPublicKey(
-        this.publicKey.toString("hex"),
-        accountType,
-      )
-    } else {
-      if (!multisig) {
-        throw new Error("multisig is required")
-      }
-      const m = {
-        publicKeys: multisig.publicKeys.map((p) => Buffer.from(p, "hex")),
-        numberOfSigners: multisig.numberOfSigners || multisig.publicKeys.length,
-      }
-      addressObj = this.btcInterface.createMultisigAddressObjectByPublicKeys(m, accountType)
-      this.multisig = m
-    }
-
+    let addressObj = this.transactionBuilder.createAddressObject({
+      addressType: accountType,
+      publicKey: this.publicKey,
+    })
     this.currentAccount = addressObj.address
     this.currentAccountType = accountType
     this.addressObj = addressObj
-    if (!addressObj.address) throw new Error("address not exist")
-    return addressObj.address
+    this.bitcoinAddress = addressObj.address
+    return addressObj.address!
   }
 
   setAccountPrivateKeyByMnemonic({
@@ -239,7 +199,7 @@ export class BitcoinBaseWallet {
       staticExtendedUtxo,
     )
     let signedPsbt = await this.signer.signPsbt(unsignedTx, this.privateKey)
-    let { hex: signedTx } = this.signer.finalizePsbts([signedPsbt])
+    let signedTx = this.signer.finalizePsbts([signedPsbt])
     let txId = await this.sendSignedTx(signedTx)
     return txId
   }
@@ -259,7 +219,7 @@ export class BitcoinBaseWallet {
       staticExtendedUtxo,
     )
     let signedPsbt = await this.signer.signPsbt(unsignedTx, this.privateKey)
-    let { hex: signedTx } = this.signer.finalizePsbts([signedPsbt])
+    let signedTx = this.signer.finalizePsbts([signedPsbt])
     let txId = await this.sendSignedTx(signedTx)
     return txId
   }
@@ -315,7 +275,7 @@ export class BitcoinBaseWallet {
   }
 
   async sendSignedPsbt(signedPsbt: string) {
-    let { hex: signedTx } = this.signer.finalizePsbts([signedPsbt])
+    let signedTx = this.signer.finalizePsbts([signedPsbt])
     let txId = await this.sendSignedTx(signedTx)
     return txId
   }
@@ -328,7 +288,7 @@ export class BitcoinBaseWallet {
   }
 
   async sendMultiSignedPsbt(signedPsbts: string[] = []) {
-    let { hex: signedTx } = this.signer.finalizePsbts(signedPsbts)
+    let signedTx = this.signer.finalizePsbts(signedPsbts)
     let txId = await this.btcInterface.sendRawTransaction(signedTx)
     return txId
   }

package/src/sign/sign-transaction.ts

@@ -93,13 +93,15 @@ class BitcoinLikeSignTransaction {
     const finals = psbtsBase64.map((psbtBase64) =>
       Psbt.fromBase64(psbtBase64, { network: this.network }),
     )
-    let psbt = finals[0]
-    for (let i = 1; i < finals.length; i += 1) {
-      psbt.combine(finals[i])
-    }
+    const psbt =
+      finals.length === 1 ? finals[0] : new Psbt({ network: this.network }).combine(...finals)
+
     psbt.finalizeAllInputs()
+
     let finalizeTx = psbt.extractTransaction()
-    return { hex: finalizeTx.toHex(), txId: finalizeTx.getId(), vBytes: finalizeTx.virtualSize() }
+    // const rawTx = finalizeTx.toBuffer()
+    // const hex = rawTx.toString("hex")
+    return finalizeTx.toHex()
   }
 }
 

package/src/teleswap-wallet.ts

@@ -43,6 +43,7 @@ export class TeleswapWallet extends BitcoinBaseWallet {
     appId = exchange
       ? teleswap.requestAppId.WrapAndSwap.default
       : teleswap.requestAppId.Wrap.default,
+    speed = false,
     fee: FeeRateType = "normal",
     thirdPartyId?: number,
     staticExtendedUtxo?: ExtendedUtxo[],
@@ -61,6 +62,7 @@ export class TeleswapWallet extends BitcoinBaseWallet {
       this.signerInfo,
       exchange,
       appId,
+      speed,
       fee,
       thirdPartyId,
       staticExtendedUtxo,
@@ -88,6 +90,7 @@ export class TeleswapWallet extends BitcoinBaseWallet {
     appId = exchange
       ? teleswap.requestAppId.WrapAndSwap.default
       : teleswap.requestAppId.Wrap.default,
+    speed = false,
     fee: FeeRateType = "normal",
     thirdPartyId?: number,
     staticExtendedUtxo?: ExtendedUtxo[],
@@ -99,7 +102,7 @@ export class TeleswapWallet extends BitcoinBaseWallet {
       appId,
       recipientAddress,
       networkFee,
-      speed: false,
+      speed,
       isExchange: !!exchange,
       outputAmount: exchange?.outputAmount,
       outputToken: exchange?.outputToken,
@@ -119,12 +122,14 @@ export class TeleswapWallet extends BitcoinBaseWallet {
           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