@teleportdao/bitcoin 1.5.9 → 1.6.1

package/dist/utils/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/utils/tools.ts"],"names":[],"mappings":"AAEA,iBAAS,KAAK,CAAC,EAAE,EAAE,MAAM,oBAExB;AAED,iBAAe,cAAc,CAC3B,MAAM,EAAE,MAAM,GAAG,EACjB,MAAM;;;CAGL,gBAcF;AAED,iBAAS,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,UAEjD;AAED,iBAAS,gBAAgB,CAAC,EACxB,OAAO,EACP,OAAe,EACf,OAAY,EACZ,IAAI,GACL,EAAE;IACD,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACnC,IAAI,CAAC,EAAE;QACL,QAAQ,EAAE,MAAM,CAAA;QAChB,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;CACF,iCAkCA;AAED,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/utils/tools.ts"],"names":[],"mappings":"AAEA,iBAAS,KAAK,CAAC,EAAE,EAAE,MAAM,oBAExB;AAED,iBAAe,cAAc,CAC3B,MAAM,EAAE,MAAM,GAAG,EACjB,MAAM;;;CAGL,gBAgBF;AAED,iBAAS,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,UAEjD;AAED,iBAAS,gBAAgB,CAAC,EACxB,OAAO,EACP,OAAe,EACf,OAAY,EACZ,IAAI,GACL,EAAE;IACD,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;IACnC,IAAI,CAAC,EAAE;QACL,QAAQ,EAAE,MAAM,CAAA;QAChB,QAAQ,EAAE,MAAM,CAAA;KACjB,CAAA;CACF,iCAkCA;AAED,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,CAAA"}

package/dist/utils/tools.js

@@ -31,6 +31,7 @@ function runWithRetries(action, config = {
                 return yield action();
             }
             catch (error) {
+                console.log("error:" + error.message);
                 lastError = error;
             }
             yield sleep(retrySleep);

package/dist/utils/tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/utils/tools.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;AAC1D,CAAC;AA4EQ,sBAAK;AA1Ed,SAAe,cAAc,CAC3B,MAAiB,EACjB,MAAM,GAAG;IACP,QAAQ,EAAE,CAAC;IACX,UAAU,EAAE,IAAI;CACjB;;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAA;QACrC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,IAAI,CAAA;QAC5C,IAAI,SAAS,CAAA;QACb,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,QAAQ,EAAE,KAAK,IAAI,CAAC,EAAE;YAChD,IAAI;gBACF,OAAO,MAAM,MAAM,EAAE,CAAA;aACtB;YAAC,OAAO,KAAU,EAAE;gBACnB,SAAS,GAAG,KAAK,CAAA;aAClB;YACD,MAAM,KAAK,CAAC,UAAU,CAAC,CAAA;SACxB;QACD,MAAM,SAAS,IAAI,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;IAC/D,CAAC;CAAA;AAuDe,wCAAc;AArD9B,SAAS,gBAAgB,CAAC,GAAW,EAAE,GAAW;IAChD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAA;AACtD,CAAC;AAmD+B,4CAAgB;AAjDhD,SAAS,gBAAgB,CAAC,EACxB,OAAO,EACP,OAAO,GAAG,KAAK,EACf,OAAO,GAAG,EAAE,EACZ,IAAI,GASL;IACC,IAAI,IAAI,GAAG,OAAO,CAAA;IAClB,IAAI,QAAQ,CAAA;IAEZ,QAAQ,GAAG,eAAK,CAAC,MAAM,CAAC;QACtB,OAAO,EAAE,IAAI;QACb,OAAO;QACP,IAAI;QACJ,OAAO,oBACF,OAAO,CACX;KACF,CAAC,CAAA;IAGF,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAChC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EACtB,CAAC,KAAK,EAAE,EAAE;QAER,IAAI,KAAK,CAAC,QAAQ,EAAE;YAClB,MAAM,YAAY,GAAG,IAAI,KAAK,CAC5B,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CACtE,CAAA;YACD,OAAO,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SACpC;QAED,IAAI,KAAK,CAAC,OAAO,EAAE;YACjB,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC7C,OAAO,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SACpC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC,CACF,CAAA;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC;AAEiD,4CAAgB"}
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/utils/tools.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;AAC1D,CAAC;AA8EQ,sBAAK;AA5Ed,SAAe,cAAc,CAC3B,MAAiB,EACjB,MAAM,GAAG;IACP,QAAQ,EAAE,CAAC;IACX,UAAU,EAAE,IAAI;CACjB;;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAA;QACrC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,IAAI,CAAA;QAC5C,IAAI,SAAS,CAAA;QACb,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,QAAQ,EAAE,KAAK,IAAI,CAAC,EAAE;YAChD,IAAI;gBACF,OAAO,MAAM,MAAM,EAAE,CAAA;aACtB;YAAC,OAAO,KAAU,EAAE;gBACnB,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,CAAA;gBAErC,SAAS,GAAG,KAAK,CAAA;aAClB;YACD,MAAM,KAAK,CAAC,UAAU,CAAC,CAAA;SACxB;QACD,MAAM,SAAS,IAAI,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;IAC/D,CAAC;CAAA;AAuDe,wCAAc;AArD9B,SAAS,gBAAgB,CAAC,GAAW,EAAE,GAAW;IAChD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAA;AACtD,CAAC;AAmD+B,4CAAgB;AAjDhD,SAAS,gBAAgB,CAAC,EACxB,OAAO,EACP,OAAO,GAAG,KAAK,EACf,OAAO,GAAG,EAAE,EACZ,IAAI,GASL;IACC,IAAI,IAAI,GAAG,OAAO,CAAA;IAClB,IAAI,QAAQ,CAAA;IAEZ,QAAQ,GAAG,eAAK,CAAC,MAAM,CAAC;QACtB,OAAO,EAAE,IAAI;QACb,OAAO;QACP,IAAI;QACJ,OAAO,oBACF,OAAO,CACX;KACF,CAAC,CAAA;IAGF,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAChC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,EACtB,CAAC,KAAK,EAAE,EAAE;QAER,IAAI,KAAK,CAAC,QAAQ,EAAE;YAClB,MAAM,YAAY,GAAG,IAAI,KAAK,CAC5B,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CACtE,CAAA;YACD,OAAO,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SACpC;QAED,IAAI,KAAK,CAAC,OAAO,EAAE;YACjB,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YAC7C,OAAO,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;SACpC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAC9B,CAAC,CACF,CAAA;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC;AAEiD,4CAAgB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teleportdao/bitcoin",
-  "version": "1.5.9",
+  "version": "1.6.1",
   "description": "teleswap bitcoin package",
   "main": "dist/index.js",
   "browser": "dist/bundle.js",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@bitcoinerlab/secp256k1": "^1.0.5",
     "@teleportdao/configs": "^1.5.6",
-    "@teleportdao/providers": "^1.5.9",
+    "@teleportdao/providers": "^1.6.0",
     "axios": "^0.27.2",
     "bignumber.js": "^9.1.1",
     "bip32": "^4.0.0",
@@ -26,15 +26,12 @@
     "coinselect": "^3.1.13",
     "ecpair": "^2.0.1",
     "merkle-lib": "^2.0.10",
-    "merkle-patricia-tree": "^2.3.2",
-    "npm": "^10.2.3",
-    "uninstall": "^0.0.0",
     "varuint-bitcoin": "^1.1.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fa3fce938c210923ccb13255b200487695436f4f",
+  "gitHead": "739b0206e1024364e8f7ee19f9ecaf2f48889553",
   "devDependencies": {
     "@babel/preset-react": "^7.23.3"
   }

package/src/bitcoin-base.ts

@@ -280,7 +280,7 @@ class BitcoinBase {
     }
 
     let changeIndex = transaction.vout.findIndex((vo) =>
-      transaction.vin.find((vi) => vo.address === vi.address),
+      transaction.vin.find((vi) => vo.address === vi.address || vo.address === changeAddress),
     )
 
     const feeRate = staticFeeRate || (await this.transactionBuilder._getFeeRate("fast"))

package/src/bitcoin-interface.ts

@@ -174,7 +174,10 @@ export class BitcoinInterface extends BitcoinInterfaceUtils {
     if (!this.rpcProvider) {
       throw new Error("RPC provider not set")
     }
-    let txIds = await this.rpcProvider.getBlockTransactionIds(blockHash)
+    let txIds = await runWithRetries(() => this.rpcProvider!.getBlockTransactionIds(blockHash), {
+      maxTries: 10,
+      retrySleep: 2000,
+    })
     // let a = await this.provider.getMerkleProof(txId)
     let proof = calculateMerkleProof(txIds, txId)
     // console.log(a.intermediateNodes === proof.intermediateNodes)
@@ -265,7 +268,13 @@ export class BitcoinInterface extends BitcoinInterfaceUtils {
     if (!this.rpcProvider) {
       throw new Error("RPC provider not set")
     }
-    let rawBlockHex = await this.rpcProvider.getBlockByBlockNumber(blockNumber, 0)
+    let rawBlockHex = await runWithRetries(
+      () => this.rpcProvider!.getBlockByBlockNumber(blockNumber, 0),
+      {
+        maxTries: 10,
+        retrySleep: 2000,
+      },
+    )
     let { withdrawTxs, depositTxs } = extractTransactionsAndBlockInfoFromRawBlock(
       rawBlockHex,
       blockNumber,
@@ -289,7 +298,6 @@ export class BitcoinInterface extends BitcoinInterfaceUtils {
     let blockTxs = []
     for (let blockNumber = +startBlockNumber + 1; blockNumber <= endBlockNumber; blockNumber += 1) {
       console.log(blockNumber)
-
       const response = await this.getBlockTransactions(addresses, blockNumber, inputTxIds)
       blockTxs.push(response)
       // await sleep(200)

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,53 +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) => {
-      console.log("r", 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 {
-        console.log(changeObject?.address)
-
-        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) -
@@ -500,6 +537,7 @@ class BaseBitcoinLikeTransaction {
     fee: number
     feeRate: number
   }) {
+    const sequence = 0xffffffff - 2
     const { network } = this
     const newPsbt = new bitcoin.Psbt({ network })
     newPsbt.setMaximumFeeRate(+(feeRate + feeRate / 100).toFixed())
@@ -512,7 +550,7 @@ class BaseBitcoinLikeTransaction {
             hash: input.hash,
             index: Number(input.index),
             nonWitnessUtxo: input.nonWitnessUtxo,
-            sequence: 0xffffffff - 1,
+            sequence,
             bip32Derivation: input.bip32Derivation,
           }
           if (!i.bip32Derivation) delete i.bip32Derivation
@@ -526,7 +564,7 @@ class BaseBitcoinLikeTransaction {
             witnessUtxo: input.witnessUtxo,
             // we dont need nonWitnessUtxo. bud some application force nonWitnessUtxo
             nonWitnessUtxo: input.nonWitnessUtxo,
-            sequence: 0xffffffff - 1,
+            sequence,
             bip32Derivation: input.bip32Derivation,
           }
           if (!i.bip32Derivation) delete i.bip32Derivation
@@ -542,7 +580,7 @@ class BaseBitcoinLikeTransaction {
             // we dont need nonWitnessUtxo. bud some application force nonWitnessUtxo
             nonWitnessUtxo: input.nonWitnessUtxo,
             redeemScript: input.redeemScript,
-            sequence: 0xffffffff - 1,
+            sequence,
             bip32Derivation: input.bip32Derivation,
           }
           if (!i.bip32Derivation) delete i.bip32Derivation
@@ -558,7 +596,7 @@ class BaseBitcoinLikeTransaction {
             // we dont need nonWitnessUtxo. bud some application force nonWitnessUtxo
             nonWitnessUtxo: input.nonWitnessUtxo,
             tapInternalKey: input.tapInternalKey,
-            sequence: 0xffffffff - 1,
+            sequence,
             bip32Derivation: input.bip32Derivation,
           }
           if (!i.bip32Derivation) delete i.bip32Derivation
@@ -612,7 +650,6 @@ class BaseBitcoinLikeTransaction {
     changeAddress = undefined,
     fullAmount = false,
     feeRate,
-    selfTransaction = false,
     selectType = "normal",
   }: {
     extendedUtxo: ExtendedUtxo[]
@@ -621,10 +658,9 @@ class BaseBitcoinLikeTransaction {
 
     changeAddress?: string | SignerInfo
     fullAmount?: boolean
-    selfTransaction?: boolean
     selectType?: "normal" | "accumulative" | "full"
   }) {
-    if (!selfTransaction && targets.length === 0) throw new Error("no target")
+    if (!changeAddress && targets.length === 0) throw new Error("no target")
     let changeObject =
       typeof changeAddress === "string"
         ? {
@@ -649,5 +685,3 @@ class BaseBitcoinLikeTransaction {
     return unsignedTransaction
   }
 }
-
-export default BaseBitcoinLikeTransaction

package/src/utils/tools.ts

@@ -18,6 +18,8 @@ async function runWithRetries(
     try {
       return await action()
     } catch (error: any) {
+      console.log("error:" + error.message)
+
       lastError = error
     }
     await sleep(retrySleep)

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/rbf.ts

@@ -1,22 +0,0 @@
-import { BitcoinBase, TeleportDaoPayment, TransferRequest } from "@teleportdao/bitcoin"
-import { parseRawTransaction } from "../dist/bitcoin-utils"
-require("dotenv").config()
-;(async () => {
-  let btc = new TeleportDaoPayment("bitcoin_testnet")
-  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,
-  })
-})()