@teleportdao/bitcoin 1.6.0 → 1.6.1

package/src/helper/burn-request-helper.js

@@ -1,27 +1,27 @@
-function getBurnTransactionInfo(address, vin = [], vouts = []) {
-  let lockerVinIndex = vin.findIndex((vi) => vi.address === address)
-  if (lockerVinIndex >= 0) {
-    let lockerVin = vin[lockerVinIndex]
-    lockerVin.vinIndex = lockerVinIndex
-    let totalInputValue = vin.reduce((acc, current) => +acc + +current.value, 0)
-    let receivers = []
-    let changes = []
-    for (let i in vouts) {
-      let vout = {
-        ...vouts[i],
-        index: i,
-      }
-      if (vout.address === address) {
-        changes.push(vout)
-      } else {
-        receivers.push(vout)
-      }
-    }
-    return { receivers, changes, totalInputValue, lockerVin }
-  }
-  return null
-}
-
-module.exports = {
-  getBurnTransactionInfo,
-}
+function getBurnTransactionInfo(address, vin = [], vouts = []) {
+  let lockerVinIndex = vin.findIndex((vi) => vi.address === address)
+  if (lockerVinIndex >= 0) {
+    let lockerVin = vin[lockerVinIndex]
+    lockerVin.vinIndex = lockerVinIndex
+    let totalInputValue = vin.reduce((acc, current) => +acc + +current.value, 0)
+    let receivers = []
+    let changes = []
+    for (let i in vouts) {
+      let vout = {
+        ...vouts[i],
+        index: i,
+      }
+      if (vout.address === address) {
+        changes.push(vout)
+      } else {
+        receivers.push(vout)
+      }
+    }
+    return { receivers, changes, totalInputValue, lockerVin }
+  }
+  return null
+}
+
+module.exports = {
+  getBurnTransactionInfo,
+}

package/src/index.ts

@@ -3,3 +3,5 @@ export * from "./teleport-dao-payments"
 export * from "./bitcoin-interface"
 export * from "./bitcoin-interface-utils"
 export * from "./bitcoin-base"
+export * from "./transaction-builder"
+export * from "./sign"

package/src/sign/index.ts

@@ -0,0 +1 @@
+export { default as BaseBitcoinSigner } from "./sign-transaction"

package/src/sign/sign-transaction.ts

@@ -1,56 +1,58 @@
 import { Psbt, crypto, Network } from "bitcoinjs-lib"
 // import BIP32Factory from "bip32"
 import ecc from "@bitcoinerlab/secp256k1"
-import * as bitcoinEcPair from "bitcoinjs-ecpair"
-const ECPair = bitcoinEcPair.ECPair
+import ECPairFactory from "ecpair"
+
+const ECPair = ECPairFactory(ecc)
 
 function tapTweakHash(pubKey: Buffer, h?: Buffer) {
   return crypto.taggedHash("TapTweak", Buffer.concat(h ? [pubKey, h] : [pubKey]))
 }
 
-function tweakSigner(
-  privateKey: Buffer,
-  opts = {} as {
-    [key: string]: Buffer
-  },
-  network: Network,
-) {
-  let newPrv = privateKey
-  let keyPair = ECPair.fromPrivateKey(privateKey, {
-    network: network,
-    compressed: true,
-  })
-
-  if (!keyPair.privateKey) throw new Error("private key not exist")
-
-  if (keyPair.publicKey.toString("hex").startsWith("03")) {
-    newPrv = ecc.privateNegate(keyPair.privateKey) as Buffer
-  }
-
-  const tweakedPrivateKey = ecc.privateAdd(
-    newPrv,
-    tapTweakHash(Buffer.from(keyPair.publicKey.toString("hex").slice(2), "hex"), opts?.tweakHash),
-  )
-  if (!tweakedPrivateKey) {
-    throw new Error("Invalid tweaked private key!")
-  }
-
-  return ECPair.fromPrivateKey(Buffer.from(tweakedPrivateKey), {
-    network: network,
-  })
-}
-
 class BitcoinLikeSignTransaction {
   network: Network
   constructor(network: Network) {
     this.network = network
   }
 
+  static tweakSigner(
+    privateKey: Buffer,
+    opts = {} as {
+      [key: string]: Buffer
+    },
+    network: Network,
+  ) {
+    let newPrv = privateKey
+    let keyPair = ECPair.fromPrivateKey(privateKey, {
+      network: network,
+      compressed: true,
+    })
+
+    if (!keyPair.privateKey) throw new Error("private key not exist")
+
+    if (keyPair.publicKey.toString("hex").startsWith("03")) {
+      newPrv = ecc.privateNegate(keyPair.privateKey) as Buffer
+    }
+
+    const tweakedPrivateKey = ecc.privateAdd(
+      newPrv,
+      tapTweakHash(Buffer.from(keyPair.publicKey.toString("hex").slice(2), "hex"), opts?.tweakHash),
+    )
+    if (!tweakedPrivateKey) {
+      throw new Error("Invalid tweaked private key!")
+    }
+
+    return ECPair.fromPrivateKey(Buffer.from(tweakedPrivateKey), {
+      network: network,
+    })
+  }
+
   async signPsbt(
     unsignedPsbt: {
       unsignedTransaction: string
     },
     privateKey: Buffer,
+    sighashTypes?: any[],
   ) {
     const { network } = this
     const keyPair = ECPair.fromPrivateKey(privateKey, {
@@ -66,10 +68,10 @@ class BitcoinLikeSignTransaction {
     for (let i = 0; i < numberOfInputs; i += 1) {
       let type = psbt.getInputType(i)
       if (type === "nonstandard") {
-        let a = tweakSigner(privateKey, undefined, this.network)
-        await psbt.signInputAsync(i, a)
+        let a = BitcoinLikeSignTransaction.tweakSigner(privateKey, undefined, this.network)
+        await psbt.signInputAsync(i, a, sighashTypes)
       } else {
-        await psbt.signInputAsync(i, keyPair)
+        await psbt.signInputAsync(i, keyPair, sighashTypes)
       }
     }
 

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

@@ -1,4 +1,4 @@
-import BaseTransactionBuilder from "./transaction-builder"
+import { BaseTransactionBuilder } from "./transaction-builder"
 import { BitcoinInterface } from "../bitcoin-interface"
 import * as bitcoin from "bitcoinjs-lib"
 

package/src/transaction-builder/index.ts

@@ -0,0 +1,2 @@
+export { default as BitcoinTransactionBuilder } from "./bitcoin-transaction-builder"
+export * from "./transaction-builder"

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

@@ -8,19 +8,39 @@ const coinselectSplit = require("coinselect/split")
 const coinselectAccumulative = require("coinselect/accumulative")
 
 // https://bitcoin.stackexchange.com/questions/84004/how-do-virtual-size-stripped-size-and-raw-size-compare-between-legacy-address-f
-const componentBytes = {
+// export const componentBytes = {
+//   bytePerInput: {
+//     p2pkh: 148,
+//     p2wpkh: 70, // 68
+//     "p2sh-p2wpkh": 91,
+//     p2tr: 60, // actual 58
+//   },
+//   baseTxBytes: 10 + 5, // +5 extra bytes to be sure
+//   bytePerOutput: {
+//     p2pkh: 35, // 34
+//     p2wpkh: 35, // 31
+//     p2sh: 35, // 32
+//     p2tr: 45, // 43
+//     default: 35,
+//   },
+//   opReturn: {
+//     dataLessThan75: 31,
+//     dataMoreThan75: 91,
+//   },
+// }
+export const componentBytes = {
   bytePerInput: {
     p2pkh: 148,
-    p2wpkh: 70, // 68
+    p2wpkh: 68, // 68
     "p2sh-p2wpkh": 91,
-    p2tr: 65, // actual 58
+    p2tr: 58, // actual 58
   },
-  baseTxBytes: 10 + 5, // +2 extra bytes to be sure
+  baseTxBytes: 10 + 5, // +5 extra bytes to be sure
   bytePerOutput: {
-    p2pkh: 35, // 34
-    p2wpkh: 35, // 31
-    p2sh: 35, // 32
-    p2tr: 45, // 43
+    p2pkh: 34, // 34
+    p2wpkh: 31, // 31
+    p2sh: 32, // 32
+    p2tr: 43, // 43
     default: 35,
   },
   opReturn: {
@@ -97,7 +117,7 @@ export type ExtendedUnsignedTransaction = {
   change: TargetAddress | undefined
 }
 
-class BaseBitcoinLikeTransaction {
+export class BaseTransactionBuilder {
   testnet: boolean
   network: bitcoin.Network
   maximumNumberOfOutputsInTransaction: number
@@ -177,6 +197,52 @@ class BaseBitcoinLikeTransaction {
     return extendedUtxo
   }
 
+  calculateTxSize(
+    inputTypes: string[],
+    outputs: {
+      script?: Buffer
+      address?: string
+      value: number
+    }[],
+    changeAddressType = "default",
+  ) {
+    const inputsSizes = inputTypes.map(
+      (addressType) =>
+        componentBytes.bytePerInput[addressType as keyof typeof componentBytes.bytePerInput],
+    )
+    const outputSizes = outputs.map((outP: any) => {
+      if (outP.address) {
+        let addressType = "default"
+        try {
+          addressType = getAddressType(outP.address, this.network)
+        } catch {
+          addressType = "default"
+        }
+        return componentBytes.bytePerOutput[
+          addressType as keyof typeof componentBytes.bytePerOutput
+        ]
+      }
+
+      if (outP.script) {
+        if (outP.script.byteLength < 75) {
+          return componentBytes.opReturn.dataLessThan75
+        }
+        return componentBytes.opReturn.dataMoreThan75
+      }
+
+      return componentBytes.bytePerOutput[
+        changeAddressType as keyof typeof componentBytes.bytePerOutput
+      ]
+    })
+
+    const txSize =
+      componentBytes.baseTxBytes +
+      inputsSizes.reduce((a, c) => a + c, 0) +
+      outputSizes.reduce((a, c) => a + c, 0)
+
+    return txSize
+  }
+
   helperHandleInputsAndOutputs({
     targets,
     extendedUtxo,
@@ -247,49 +313,24 @@ class BaseBitcoinLikeTransaction {
       fee = inputs.reduce((a, b) => a + b.value, 0) - outputs.reduce((a, b) => a + b.value, 0)
     }
 
-    const inputsSizes = inputs.map(
-      (i) =>
-        componentBytes.bytePerInput[
-          i.signerInfo.addressType as keyof typeof componentBytes.bytePerInput
-        ],
-    )
-    const outputSizes = outputs.map((outP) => {
-      if (outP.address) {
-        let addressType = "default"
-        try {
-          addressType = getAddressType(outP.address, this.network)
-        } catch {
-          addressType = "default"
-        }
-        return componentBytes.bytePerOutput[
-          addressType as keyof typeof componentBytes.bytePerOutput
-        ]
-      }
-
-      if (outP.script) {
-        if (outP.script.byteLength < 75) {
-          return componentBytes.opReturn.dataLessThan75
-        }
-        return componentBytes.opReturn.dataMoreThan75
-      }
-
-      let addressType = "default"
-      try {
-        addressType = getAddressType(changeObject?.address || "", this.network)
-      } catch {
-        addressType = "default"
-      }
-
-      return componentBytes.bytePerOutput[addressType as keyof typeof componentBytes.bytePerOutput]
-    })
+    let changeAddressType = "default"
+    try {
+      changeAddressType = getAddressType(changeObject?.address || "", this.network)
+    } catch {
+      changeAddressType = "default"
+    }
 
     const txSize =
-      componentBytes.baseTxBytes +
-      inputsSizes.reduce((a, c) => a + c, 0) +
-      outputSizes.reduce((a, c) => a + c, 0) +
-      componentBytes.bytePerOutput.default
-
-    const txFee = txSize * Math.round(feeRate)
+      this.calculateTxSize(
+        inputs.map((i) => i.signerInfo.addressType),
+        outputs,
+        changeAddressType,
+      ) + componentBytes.bytePerOutput.default
+
+    let txFee = Math.round(txSize * feeRate)
+    if (Math.round(feeRate) === 1) {
+      txFee = Math.round(txFee + txFee * 0.1)
+    }
     if (
       inputs.reduce((a, b) => a + b.value, 0) -
         outputs.filter((o) => o.address || o.script).reduce((a, b) => a + b.value, 0) -
@@ -644,5 +685,3 @@ class BaseBitcoinLikeTransaction {
     return unsignedTransaction
   }
 }
-
-export default BaseBitcoinLikeTransaction

package/.tmp/check.ts

@@ -1,101 +0,0 @@
-import { BitcoinBase, TeleportDaoPayment, TransferRequest } from "@teleportdao/bitcoin"
-import { parseRawTransaction } from "../dist/bitcoin-utils"
-;(async () => {
-  const testnet = true
-  let address = "tb1psfytxls4urhycq63xjrfmseq73wwuql2syn3n8398rqkyf5m3z8shy5sl7"
-  let btc = new TeleportDaoPayment("bitcoin_testnet")
-  let deadline = Math.ceil(new Date().getTime() / 1000 + 3600)
-  let transferRequest: TransferRequest = {
-    changeAddress: address,
-    lockerAddress: testnet
-      ? "2MzQA2boKkWPkooDkN9dKfqzFndSvjHw5kg"
-      : "3CAQAw7m95axbY761Xq8d9DADhjNaX9b8o",
-    amount: +(0.0001 * 1e8).toFixed(),
-    recipientAddress: "0x7C124a845BC48D957748661452dc996FF487B252",
-    percentageFee: 4, // 2 bytes in satoshi
-
-    chainId: 3,
-    appId: 0,
-    speed: 0, // 1 byte
-
-    // exchange
-    isExchange: false,
-    exchangeTokenAddress: undefined,
-    outputAmount: undefined,
-    isFixedToken: false,
-    deadline,
-    feeSpeed: "normal",
-  }
-
-  let extendedUtxo = await btc.transactionBuilder.getExtendedUtxo({
-    address: address,
-    addressType: "p2tr",
-    publicKey: "021f6adece8789d520aaea90a2ca9faff45bdd2dca02fd819815673953dc674d54",
-    includeHex: false,
-  })
-  console.log(extendedUtxo.reduce((a, b) => a + b.value, 0) / 1e8)
-  extendedUtxo = extendedUtxo.filter((u) => u.value > 145 * 68)
-  console.log(extendedUtxo.reduce((a, b) => a + b.value, 0) / 1e8)
-  console.log(extendedUtxo.length)
-
-  // const extendedUtxo = [
-  //   {
-  //     hash: "1a69625b1fe4392e4130f30fa1e6794dd8b81f54bc9d7ccf7a3479d8ccf419a6",
-  //     value: 99787,
-  //     index: 1,
-  //     signerInfo: {
-  //       address: "tb1psfytxls4urhycq63xjrfmseq73wwuql2syn3n8398rqkyf5m3z8shy5sl7",
-  //       publicKey: "021f6adece8789d520aaea90a2ca9faff45bdd2dca02fd819815673953dc674d54",
-  //       addressType: "p2tr",
-  //     },
-  //   },
-  //   {
-  //     hash: "93f0b41f26480068a219a8620313f6fa146f076e4ef03ab781638965a2a1c7c4",
-  //     value: 8000,
-  //     index: 1,
-  //     signerInfo: {
-  //       address: "tb1psfytxls4urhycq63xjrfmseq73wwuql2syn3n8398rqkyf5m3z8shy5sl7",
-  //       publicKey: "021f6adece8789d520aaea90a2ca9faff45bdd2dca02fd819815673953dc674d54",
-  //       addressType: "p2tr",
-  //     },
-  //   },
-  //   {
-  //     hash: "6c666a7036fdff9f4c1cce2f9233eac3c4b56601cdc5ea82554b8af90e962ced",
-  //     value: 8000,
-  //     index: 1,
-  //     signerInfo: {
-  //       address: "tb1psfytxls4urhycq63xjrfmseq73wwuql2syn3n8398rqkyf5m3z8shy5sl7",
-  //       publicKey: "021f6adece8789d520aaea90a2ca9faff45bdd2dca02fd819815673953dc674d54",
-  //       addressType: "p2tr",
-  //     },
-  //   },
-  //   {
-  //     hash: "2437ddbde4bb469c5c1f8dcb09959962a9e844ba9b56420bb5391fb29f50400c",
-  //     value: 8000,
-  //     index: 0,
-  //     signerInfo: {
-  //       address: "tb1psfytxls4urhycq63xjrfmseq73wwuql2syn3n8398rqkyf5m3z8shy5sl7",
-  //       publicKey: "021f6adece8789d520aaea90a2ca9faff45bdd2dca02fd819815673953dc674d54",
-  //       addressType: "p2tr",
-  //     },
-  //   },
-  // ]
-
-  // normal transfer
-  // let tx = await btc.transactionBuilder.processUnsignedTransaction({
-  //   extendedUtxo,
-  //   targets: [{
-  //     address: addressObj.address!,
-  //     value: 0.0001 * 1e8
-  //   }],
-  //   feeRate:1,
-  //   changeAddress: addressObj.address!
-  // })
-
-  let tx = await btc.getBitcoinToEthUnsignedPsbt({
-    ...transferRequest,
-    extendedUtxo,
-  })
-
-  console.log("tx", tx)
-})()

package/.tmp/psbt/sign-transaction.ts

@@ -1,115 +0,0 @@
-import { Psbt, crypto, Network } from "bitcoinjs-lib"
-// import BIP32Factory from "bip32"
-import ecc from "@bitcoinerlab/secp256k1"
-import * as bitcoinEcPair from "bitcoinjs-ecpair"
-const ECPair = bitcoinEcPair.ECPair
-
-function tapTweakHash(pubKey: Buffer, h?: Buffer) {
-  return crypto.taggedHash("TapTweak", Buffer.concat(h ? [pubKey, h] : [pubKey]))
-}
-
-function tweakSigner(
-  privateKey: Buffer,
-  opts = {} as {
-    [key: string]: Buffer
-  },
-  network: Network,
-) {
-  let newPrv = privateKey
-  let keyPair = ECPair.fromPrivateKey(privateKey, {
-    network: network,
-    compressed: true,
-  })
-
-  if (!keyPair.privateKey) throw new Error("private key not exist")
-
-  if (keyPair.publicKey.toString("hex").startsWith("03")) {
-    newPrv = ecc.privateNegate(keyPair.privateKey) as Buffer
-  }
-
-  const tweakedPrivateKey = ecc.privateAdd(
-    newPrv,
-    tapTweakHash(Buffer.from(keyPair.publicKey.toString("hex").slice(2), "hex"), opts?.tweakHash),
-  )
-  if (!tweakedPrivateKey) {
-    throw new Error("Invalid tweaked private key!")
-  }
-
-  return ECPair.fromPrivateKey(Buffer.from(tweakedPrivateKey), {
-    network: network,
-  })
-}
-
-class BitcoinLikeSignTransaction {
-  network: Network
-  constructor(network: Network) {
-    this.network = network
-  }
-
-  async signPsbt(
-    unsignedPsbt: {
-      unsignedTransaction: string
-    },
-    privateKey: Buffer,
-  ) {
-    const { network } = this
-    const keyPair = ECPair.fromPrivateKey(privateKey, {
-      network,
-      compressed: true,
-    })
-    const psbt = Psbt.fromBase64(unsignedPsbt.unsignedTransaction, {
-      network,
-    })
-
-    let numberOfInputs = psbt.inputCount
-
-    for (let i = 0; i < numberOfInputs; i += 1) {
-      let type = psbt.getInputType(i)
-      if (type === "nonstandard") {
-        let a = tweakSigner(privateKey, undefined, this.network)
-        await psbt.signInputAsync(i, a)
-      } else {
-        await psbt.signInputAsync(i, keyPair)
-      }
-    }
-
-    // psbt.signAllInputs(keyPair)
-    const partialSigendPsbt = psbt.toBase64()
-    return partialSigendPsbt
-  }
-
-  finalizePsbts(psbtsBase64: string[] = []) {
-    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 newPsbt = new Psbt({ network: this.network })
-    newPsbt.addOutputs(psbt.txOutputs)
-
-    newPsbt.addInputs(
-      psbt.txInputs.map((txIn, i) => ({
-        ...txIn,
-        partialSig: psbt.data.inputs[i].partialSig,
-        witnessUtxo: psbt.data.inputs[i].witnessUtxo,
-      })),
-    )
-
-    psbt.finalizeAllInputs()
-
-    for (let i = 0; i < psbt.txInputs.length; i += 1) {
-      // console.log(psbt.data.inputs[i])
-    }
-
-    newPsbt.finalizeAllInputs()
-
-    let finalizeTx = newPsbt.extractTransaction()
-    // console.log(finalizeTx.getId())
-
-    // console.log(finalizeTx.ins, finalizeTx.outs)
-    return finalizeTx.toHex()
-  }
-}
-
-export default BitcoinLikeSignTransaction

package/.tmp/rbf.ts

@@ -1,45 +0,0 @@
-import { sleep } from "../dist/utils/tools"
-import { BitcoinBase, TeleportDaoPayment, TransferRequest } from "@teleportdao/bitcoin"
-import { parseRawTransaction } from "../dist/bitcoin-utils"
-require("dotenv").config()
-;(async () => {
-  let btc = new TeleportDaoPayment("bitcoin_testnet", {
-    api: {
-      enabled: true,
-      provider: "MempoolSpace",
-    },
-  })
-  btc.setAccountPrivateKeyByMnemonic({
-    mnemonic: process.env.ACCOUNT__MNEMONIC!,
-    index: 2,
-    addressType: "p2wpkh",
-  })
-
-  console.log(btc.bitcoinAddress)
-  let balance = await btc.btcInterface.getBalance(btc.bitcoinAddress!)
-
-  console.log(balance)
-
-  let txId = await btc.send({
-    receiverAddress: btc.bitcoinAddress!,
-    fullAmount: true,
-    amount: 0,
-  })
-
-  console.log(txId)
-  await sleep(5_000)
-
-  // const txId = "a4335df47c09cc983d0ba56373212b86c266ea434bb87d610ae5c892da79e1b7"
-
-  let unsigned = await btc.increaseTransactionFeeUnsignedPsbt(
-    txId,
-    [btc.signerInfo!],
-    [],
-    btc.bitcoinAddress!,
-    5,
-  )
-  let signedPsbt = await btc.signer.signPsbt(unsigned, btc.privateKey!)
-  let txIdNew = await btc.sendSignedPsbt(signedPsbt)
-
-  console.log(txIdNew)
-})()