@teleportdao/bitcoin 2.2.5 → 2.3.0-alpha.0

package/src/bitcoin-wallet-base.ts

@@ -13,7 +13,7 @@ import type {
   Target,
   TargetAddress,
 } from "./transaction-builder/transaction-builder"
-import BitcoinSign from "./sign/sign-transaction"
+import BitcoinSigner from "./sign/sign-transaction"
 
 import { getPubKeyFromPrivateKeyHex } from "./bitcoin-utils"
 import networks from "./utils/networks"
@@ -24,26 +24,39 @@ 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: BitcoinSign
-  currentAccount?: string
-  currentAccountType?: string
+  signer: BitcoinSigner
+
+  currentAccount?: string // current account address
+  currentAccountType?: string // current account type
+  addressObj?: Payment
+
   privateKey?: Buffer
   publicKey?: Buffer
-  publicKeys?: Buffer[]
-  addressObj?: Payment
-  bitcoinAddress: string | undefined
+
+  // multisig
+  multisig?: {
+    publicKeys: Buffer[]
+    numberOfSigners: number
+  }
+
   constructor(
     networkName: string,
     connectionInfo?: {
@@ -62,7 +75,7 @@ export class BitcoinBaseWallet {
     )
     this.btcInterface = this.transactionBuilder.btcInterface
 
-    this.signer = new BitcoinSign(this.network)
+    this.signer = new BitcoinSigner(this.network)
 
     // initialize account
     this.currentAccount = undefined
@@ -79,38 +92,65 @@ 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!,
-          publicKey: this.publicKey!.toString("hex"),
           addressType: this.currentAccountType!,
+          publicKey: this.publicKey!.toString("hex"),
+          publicKeys: this.multisig?.publicKeys.map((p) => p.toString("hex")),
+          numberOfSigners: this.multisig?.numberOfSigners,
         }
       : undefined
   }
 
-  setAccountPrivateKey(privateKeyHex: string) {
+  setAccountPrivateKey(privateKeyHex: string, accountType = "p2wpkh") {
     this.privateKey = Buffer.from(privateKeyHex, "hex")
     let publicKey = getPubKeyFromPrivateKeyHex(privateKeyHex, this.network)
     this.publicKey = publicKey
-    this.setAccountType("p2wpkh")
+    this.setAccountType(accountType)
   }
 
-  setAccountType(accountType = "p2pkh") {
+  setAccountType(
+    accountType = "p2wpkh",
+    multisig?: {
+      publicKeys: string[]
+      numberOfSigners?: number
+    },
+  ) {
     if (!this.publicKey) {
       throw new Error("account not initialized")
     }
-    let addressObj = this.transactionBuilder.createAddressObject({
-      addressType: accountType,
-      publicKey: this.publicKey,
-    })
+
+    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
+    }
+
     this.currentAccount = addressObj.address
     this.currentAccountType = accountType
     this.addressObj = addressObj
-    this.bitcoinAddress = addressObj.address
-    return addressObj.address!
+    if (!addressObj.address) throw new Error("address not exist")
+    return addressObj.address
   }
 
   setAccountPrivateKeyByMnemonic({
@@ -199,7 +239,7 @@ export class BitcoinBaseWallet {
       staticExtendedUtxo,
     )
     let signedPsbt = await this.signer.signPsbt(unsignedTx, this.privateKey)
-    let signedTx = this.signer.finalizePsbts([signedPsbt])
+    let { hex: signedTx } = this.signer.finalizePsbts([signedPsbt])
     let txId = await this.sendSignedTx(signedTx)
     return txId
   }
@@ -219,7 +259,7 @@ export class BitcoinBaseWallet {
       staticExtendedUtxo,
     )
     let signedPsbt = await this.signer.signPsbt(unsignedTx, this.privateKey)
-    let signedTx = this.signer.finalizePsbts([signedPsbt])
+    let { hex: signedTx } = this.signer.finalizePsbts([signedPsbt])
     let txId = await this.sendSignedTx(signedTx)
     return txId
   }
@@ -275,7 +315,7 @@ export class BitcoinBaseWallet {
   }
 
   async sendSignedPsbt(signedPsbt: string) {
-    let signedTx = this.signer.finalizePsbts([signedPsbt])
+    let { hex: signedTx } = this.signer.finalizePsbts([signedPsbt])
     let txId = await this.sendSignedTx(signedTx)
     return txId
   }
@@ -288,7 +328,7 @@ export class BitcoinBaseWallet {
   }
 
   async sendMultiSignedPsbt(signedPsbts: string[] = []) {
-    let signedTx = this.signer.finalizePsbts(signedPsbts)
+    let { hex: signedTx } = this.signer.finalizePsbts(signedPsbts)
     let txId = await this.btcInterface.sendRawTransaction(signedTx)
     return txId
   }

package/src/multisig-coordinator-wallet.ts

@@ -0,0 +1,9 @@
+import { BitcoinBaseWallet } from "./bitcoin-wallet-base"
+
+class BitcoinMultiSigWithCoordinatorWallet extends BitcoinBaseWallet {
+  // register wallet
+  // get wallet state
+  // get utxo and feeRate
+  // sendTx
+  // get tx state
+}

package/src/sign/sign-transaction.ts

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