@teleportdao/bitcoin 1.7.20 → 1.7.21

package/.tmp/rbf.ts

@@ -1,45 +1,42 @@
+import blockchainConfig from "@teleportdao/teleswap-nodes/src/config/blockchain.config"
+import getAndDecryptAccount from "@teleportdao/teleswap-nodes/src/config/account"
 import { sleep } from "../dist/utils/tools"
-import { BitcoinBase, TeleportDaoPayment, TransferRequest } from "@teleportdao/bitcoin"
+import { BitcoinBaseWallet } from "@teleportdao/bitcoin"
 import { parseRawTransaction } from "../dist/bitcoin-utils"
+
 require("dotenv").config()
 ;(async () => {
-  let btc = new TeleportDaoPayment("bitcoin_testnet", {
+  let btc = new BitcoinBaseWallet("bitcoin_testnet", {
     api: {
-      enabled: true,
       provider: "MempoolSpace",
     },
   })
+
+  const account = await getAndDecryptAccount()
   btc.setAccountPrivateKeyByMnemonic({
-    mnemonic: process.env.ACCOUNT__MNEMONIC!,
-    index: 2,
-    addressType: "p2wpkh",
+    mnemonic: account.mnemonic,
+    mnemonicPassword: account.mnemonicPassword,
+    index: 3,
+    addressType: "p2tr",
   })
 
   console.log(btc.bitcoinAddress)
-  let balance = await btc.btcInterface.getBalance(btc.bitcoinAddress!)
 
-  console.log(balance)
+  const extendedUtxo = await btc.getExtendedUtxo(btc.signerInfo!)
 
-  let txId = await btc.send({
-    receiverAddress: btc.bitcoinAddress!,
-    fullAmount: true,
-    amount: 0,
+  const unsignedTx = await btc.transactionBuilder.processUnsignedTransaction({
+    extendedUtxo,
+    feeRate: await btc.btcInterface.getFeeRate(),
+    targets: [
+      btc.transactionBuilder.getOpReturnTarget("0x0101010101"),
+      btc.transactionBuilder.getOpReturnTarget("0x0202020202"),
+    ],
+    changeAddress: btc.bitcoinAddress!,
+    fullAmount: false,
   })
 
-  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)
+  const signedTx = await btc.signer.signPsbt(unsignedTx, btc.privateKey!)
+  const txId = await btc.sendSignedPsbt(signedTx)
 
-  console.log(txIdNew)
+  console.log(txId)
 })()

package/dist/helper/teleswap-helper.js

@@ -47,7 +47,7 @@ function generateWrapOpReturn({ chainId, appId, recipientAddress, networkFee, th
         throw new Error("invalid outputAmount");
     }
     if ((bridgePercentageFee || 0) > 100 ||
-        (bridgePercentageFee || 0) < 0.00001 ||
+        (bridgePercentageFee && bridgePercentageFee < 0.00001) ||
         (0, bignumber_js_1.default)((bridgePercentageFee === null || bridgePercentageFee === void 0 ? void 0 : bridgePercentageFee.toFixed(5)) || 0)
             .multipliedBy(1e5)
             .toString(16).length > wrapOpReturnLength.bridgePercentageFee) {

package/dist/helper/teleswap-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"teleswap-helper.js","sourceRoot":"","sources":["../../src/helper/teleswap-helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"teleswap-helper.js","sourceRoot":"","sources":["../../src/helper/teleswap-helper.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teleportdao/bitcoin",
-  "version": "1.7.20",
+  "version": "1.7.21",
   "description": "teleswap bitcoin package",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,7 +14,7 @@
   "license": "ISC",
   "dependencies": {
     "@bitcoinerlab/secp256k1": "^1.0.5",
-    "@teleportdao/configs": "^1.7.20",
+    "@teleportdao/configs": "^1.7.21",
     "@teleportdao/providers": "^1.7.14",
     "axios": "^0.27.2",
     "bignumber.js": "^9.1.1",
@@ -31,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "450823edbb14374c0acafb1c4e66a2f92e007bcc"
+  "gitHead": "baf4ea51ed79d55ca01c2b41dac9342ffc8b7eb6"
 }

package/src/bitcoin-interface-ordinal.ts

@@ -1,181 +1,181 @@
-import BigNumber from "bignumber.js"
-import { bitcoin as bitcoinProviders } from "@teleportdao/providers"
-import { BitcoinInterface } from "./bitcoin-interface"
-import { Transaction, BitcoinConnectionInfo } from "./type"
-import type { SignerInfo } from "./transaction-builder"
-
-import { sleep } from "./utils/tools"
-import { checkAndParseBrc20Request } from "./helper/brc20-helper"
-
-export class BitcoinInterfaceOrdinal extends BitcoinInterface {
-  unisat: bitcoinProviders.UniSat
-  constructor(connectionInfo: BitcoinConnectionInfo, networkName: string, uniSatToken: string) {
-    super(connectionInfo, networkName)
-    this.unisat = new bitcoinProviders.UniSat(
-      {
-        token: uniSatToken,
-      },
-      networkName.includes("testnet"),
-    )
-  }
-  async getInscriptionWithRetry(
-    inscriptionId: string,
-    { numberOfRetry = 5, sleepTime = 20000 } = {},
-  ) {
-    let count = 0
-    while (count <= numberOfRetry) {
-      try {
-        let inscription = await this.unisat.getInscriptionInfo(inscriptionId)
-        if (inscription?.brc20) {
-          return inscription
-        }
-      } catch (e: any) {
-        console.log(e.message)
-      }
-      await sleep(sleepTime + count * 5000)
-      count += 1
-    }
-    return null
-  }
-
-  async getTransactionBrc20TransferInfo(transaction: {
-    txId: string
-    vout: {
-      address: string | null
-      script: string
-      value: number
-    }[]
-    vin: {
-      txId: string
-      index: number
-      address?: string | null
-      script?: string | null
-      value?: number | null
-    }[]
-  }) {
-    let txBrc20s: {
-      txId: string
-      receiver: string
-      index: number
-      brc20: {
-        op: string
-        tick: string
-        lim: string
-        amt: string
-        decimal: string
-      }
-      inscription: bitcoinProviders.UnisatInscription
-    }[] = []
-    for (let x = 0; x < transaction.vout.length - 1; x += 1) {
-      if (!transaction.vout[x].address) {
-        return []
-      }
-      let inscription = await this.unisat.getInscriptionInfo(
-        `${transaction.vin[x].txId}i${transaction.vin[x].index}`,
-      )
-
-      const brc20 = inscription?.brc20?.op === "transfer" ? inscription.brc20 : undefined
-      if (brc20 && inscription) {
-        txBrc20s.push({
-          txId: transaction.txId,
-          receiver: transaction.vout[x].address!,
-          index: x,
-          inscription,
-          brc20,
-        })
-      } else {
-        return []
-      }
-    }
-
-    return txBrc20s
-  }
-
-  async convertToBrc20WrapRequest(transaction: Transaction, lockerAddress: string) {
-    let { vout } = transaction
-    let request = checkAndParseBrc20Request(vout, lockerAddress)
-    let lockerLockingScript: string =
-      transaction.addressScript ||
-      this.convertAddressToScript(lockerAddress).script!.toString("hex")
-
-    return {
-      transaction,
-      request,
-      lockerAddress,
-      lockerLockingScript,
-    }
-  }
-
-  async getBrc20WrapRequests(
-    addresses: string[],
-    startblockNumber: number,
-    endBlockNumber: number,
-  ) {
-    // transaction in StartBlock is not returned --> (startblockNumber,endBlockNumber]
-    let transactions: Transaction[] = await this.getMultipleBlocksTransactions(
-      addresses,
-      startblockNumber,
-      endBlockNumber || (await this.getLatestBlockNumber()),
-    )
-
-    let requests = []
-    let invalidRequests = []
-
-    // eslint-disable-next-line no-restricted-syntax
-    for (let inputTx of transactions) {
-      let data = await this.convertToBrc20WrapRequest(inputTx, inputTx.address)
-      if (data.request.status) {
-        let inscription = await this.getInscriptionWithRetry(
-          `${inputTx.vin[0].txId}i${inputTx.vin[0].index}`,
-        )
-        const brc20 = inscription?.brc20?.op === "transfer" ? inscription.brc20 : undefined
-
-        if (!brc20) {
-          invalidRequests.push({
-            ...data,
-            message: `invalid brc20 -> ${inscription?.brc20?.op}:${inscription?.brc20?.amt}`,
-          })
-        } else if (
-          !BigNumber(brc20.amt)
-            .multipliedBy(1e18)
-            .isEqualTo(data.request.data?.inputAmount || 0)
-        ) {
-          invalidRequests.push({
-            ...data,
-            message: `invalid brc20 amount -> ${inscription?.brc20?.op}:${inscription?.brc20?.amt}:${data.request.data?.inputAmount}`,
-          })
-        } else {
-          requests.push({ ...data, brc20 })
-        }
-        // check brc20 info
-        // this.unisat.getBrc20TickerTxHistory(data.request.data!.brc20!.ticker, data.transaction.txId)
-        // ignore normal transaction
-      } else if (data.request.code !== "NO_OP_RETURN") {
-        invalidRequests.push(data)
-      }
-    }
-    return { requests, invalidRequests }
-  }
-
-  async getBTCUtxo(address: string, signerInfo: SignerInfo) {
-    return bitcoinProviders.UniSat.convertToNormalUtxo(
-      (await this.unisat.getBTCUtxo(address))?.utxo || [],
-    ).map(({ txId, index, value }) => ({
-      hash: txId,
-      index,
-      value,
-      signerInfo,
-    }))
-  }
-
-  async getInscriptionUtxo(address: string, signerInfo: SignerInfo) {
-    return bitcoinProviders.UniSat.convertToNormalUtxo(
-      (await this.unisat.getInscriptionUtxo(address))?.utxo || [],
-    ).map(({ txId, index, value }) => ({
-      hash: txId,
-      index,
-      value,
-      signerInfo,
-    }))
-  }
-}
+import BigNumber from "bignumber.js"
+import { bitcoin as bitcoinProviders } from "@teleportdao/providers"
+import { BitcoinInterface } from "./bitcoin-interface"
+import { Transaction, BitcoinConnectionInfo } from "./type"
+import type { SignerInfo } from "./transaction-builder"
+
+import { sleep } from "./utils/tools"
+import { checkAndParseBrc20Request } from "./helper/brc20-helper"
+
+export class BitcoinInterfaceOrdinal extends BitcoinInterface {
+  unisat: bitcoinProviders.UniSat
+  constructor(connectionInfo: BitcoinConnectionInfo, networkName: string, uniSatToken: string) {
+    super(connectionInfo, networkName)
+    this.unisat = new bitcoinProviders.UniSat(
+      {
+        token: uniSatToken,
+      },
+      networkName.includes("testnet"),
+    )
+  }
+  async getInscriptionWithRetry(
+    inscriptionId: string,
+    { numberOfRetry = 5, sleepTime = 20000 } = {},
+  ) {
+    let count = 0
+    while (count <= numberOfRetry) {
+      try {
+        let inscription = await this.unisat.getInscriptionInfo(inscriptionId)
+        if (inscription?.brc20) {
+          return inscription
+        }
+      } catch (e: any) {
+        console.log(e.message)
+      }
+      await sleep(sleepTime + count * 5000)
+      count += 1
+    }
+    return null
+  }
+
+  async getTransactionBrc20TransferInfo(transaction: {
+    txId: string
+    vout: {
+      address: string | null
+      script: string
+      value: number
+    }[]
+    vin: {
+      txId: string
+      index: number
+      address?: string | null
+      script?: string | null
+      value?: number | null
+    }[]
+  }) {
+    let txBrc20s: {
+      txId: string
+      receiver: string
+      index: number
+      brc20: {
+        op: string
+        tick: string
+        lim: string
+        amt: string
+        decimal: string
+      }
+      inscription: bitcoinProviders.UnisatInscription
+    }[] = []
+    for (let x = 0; x < transaction.vout.length - 1; x += 1) {
+      if (!transaction.vout[x].address) {
+        return []
+      }
+      let inscription = await this.unisat.getInscriptionInfo(
+        `${transaction.vin[x].txId}i${transaction.vin[x].index}`,
+      )
+
+      const brc20 = inscription?.brc20?.op === "transfer" ? inscription.brc20 : undefined
+      if (brc20 && inscription) {
+        txBrc20s.push({
+          txId: transaction.txId,
+          receiver: transaction.vout[x].address!,
+          index: x,
+          inscription,
+          brc20,
+        })
+      } else {
+        return []
+      }
+    }
+
+    return txBrc20s
+  }
+
+  async convertToBrc20WrapRequest(transaction: Transaction, lockerAddress: string) {
+    let { vout } = transaction
+    let request = checkAndParseBrc20Request(vout, lockerAddress)
+    let lockerLockingScript: string =
+      transaction.addressScript ||
+      this.convertAddressToScript(lockerAddress).script!.toString("hex")
+
+    return {
+      transaction,
+      request,
+      lockerAddress,
+      lockerLockingScript,
+    }
+  }
+
+  async getBrc20WrapRequests(
+    addresses: string[],
+    startblockNumber: number,
+    endBlockNumber: number,
+  ) {
+    // transaction in StartBlock is not returned --> (startblockNumber,endBlockNumber]
+    let transactions: Transaction[] = await this.getMultipleBlocksTransactions(
+      addresses,
+      startblockNumber,
+      endBlockNumber || (await this.getLatestBlockNumber()),
+    )
+
+    let requests = []
+    let invalidRequests = []
+
+    // eslint-disable-next-line no-restricted-syntax
+    for (let inputTx of transactions) {
+      let data = await this.convertToBrc20WrapRequest(inputTx, inputTx.address)
+      if (data.request.status) {
+        let inscription = await this.getInscriptionWithRetry(
+          `${inputTx.vin[0].txId}i${inputTx.vin[0].index}`,
+        )
+        const brc20 = inscription?.brc20?.op === "transfer" ? inscription.brc20 : undefined
+
+        if (!brc20) {
+          invalidRequests.push({
+            ...data,
+            message: `invalid brc20 -> ${inscription?.brc20?.op}:${inscription?.brc20?.amt}`,
+          })
+        } else if (
+          !BigNumber(brc20.amt)
+            .multipliedBy(1e18)
+            .isEqualTo(data.request.data?.inputAmount || 0)
+        ) {
+          invalidRequests.push({
+            ...data,
+            message: `invalid brc20 amount -> ${inscription?.brc20?.op}:${inscription?.brc20?.amt}:${data.request.data?.inputAmount}`,
+          })
+        } else {
+          requests.push({ ...data, brc20 })
+        }
+        // check brc20 info
+        // this.unisat.getBrc20TickerTxHistory(data.request.data!.brc20!.ticker, data.transaction.txId)
+        // ignore normal transaction
+      } else if (data.request.code !== "NO_OP_RETURN") {
+        invalidRequests.push(data)
+      }
+    }
+    return { requests, invalidRequests }
+  }
+
+  async getBTCUtxo(address: string, signerInfo: SignerInfo) {
+    return bitcoinProviders.UniSat.convertToNormalUtxo(
+      (await this.unisat.getBTCUtxo(address))?.utxo || [],
+    ).map(({ txId, index, value }) => ({
+      hash: txId,
+      index,
+      value,
+      signerInfo,
+    }))
+  }
+
+  async getInscriptionUtxo(address: string, signerInfo: SignerInfo) {
+    return bitcoinProviders.UniSat.convertToNormalUtxo(
+      (await this.unisat.getInscriptionUtxo(address))?.utxo || [],
+    ).map(({ txId, index, value }) => ({
+      hash: txId,
+      index,
+      value,
+      signerInfo,
+    }))
+  }
+}