@teleportdao/bitcoin 1.8.5 → 1.8.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teleportdao/bitcoin",
-  "version": "1.8.5",
+  "version": "1.8.7",
   "description": "teleswap bitcoin package",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,8 +14,8 @@
   "license": "ISC",
   "dependencies": {
     "@bitcoinerlab/secp256k1": "^1.0.5",
-    "@teleportdao/configs": "^1.8.5",
-    "@teleportdao/providers": "^1.8.5",
+    "@teleportdao/configs": "^1.8.7",
+    "@teleportdao/providers": "^1.8.7",
     "axios": "^0.27.2",
     "bignumber.js": "^9.1.1",
     "bip32": "^4.0.0",
@@ -31,5 +31,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "44029dde7a34bd864a23c1d7d4f48098fc4ba01a"
+  "gitHead": "a88e25610122c7d7caeed55ebcf17c848d428326"
 }

package/src/bitcoin-interface.ts

@@ -177,10 +177,8 @@ export class BitcoinInterface extends BitcoinInterfaceUtils {
   }
 
   async getBalance(address: string) {
-    if (!this.apiProvider) {
-      throw new Error("this function need an api provider")
-    }
-    return this.apiProvider.getBalance(address)
+    let utxos = await this.utxoProvider.getUtxos(address)
+    return utxos.reduce((a, tx) => a + Number(tx.value), 0)
   }
 
   // rpc

package/src/helper/brc20-helper.ts

@@ -12,7 +12,7 @@ export type WrapOpReturn = {
   thirdPartyId?: number
 }
 export type WrapOpReturnAndType = WrapOpReturn & {
-  requestType: "wrap" | "wrapAndSwap"
+  requestType: "Wrap" | "WrapAndSwap"
 }
 
 const brc20WrapRequests = brc20.requestAppId
@@ -49,15 +49,15 @@ export function generateBrc2OpReturn({
 }
 
 export function parseBrc20OpReturn(data: string) {
-  let parsedData: any = {}
+  let parsedData: Partial<WrapOpReturnAndType> = {}
   parsedData.chainId = Number(`0x${data.slice(0, 4)}`) // 2 bytes
   parsedData.appId = Number(`0x${data.slice(4, 6)}`) // 1 bytes
   parsedData.brc20TokenId = Number(`0x${data.slice(6, 10)}`) // 2 bytes
   parsedData.inputAmount = new BigNumber(`0x${data.slice(10, 36)}`).toFixed(0) // 11 bytes
   parsedData.recipientAddress = `0x${data.slice(36, 76)}` // 20 bytes
-  parsedData.thirdPartyId = `0x${data.slice(76, 78)}` // 20 bytes
+  parsedData.thirdPartyId = Number(`0x${data.slice(76, 78)}`) // 20 bytes
   if (data.length === 78) {
-    parsedData.requestType = "wrap"
+    parsedData.requestType = "Wrap"
     return {
       status: true,
       data: parsedData as WrapOpReturnAndType,
@@ -66,7 +66,7 @@ export function parseBrc20OpReturn(data: string) {
   parsedData.outputToken = `0x${data.slice(78, 118)}` // 20 bytes
   parsedData.outputAmount = new BigNumber(`0x${data.slice(118, 144)}`).toFixed(0) // 20 bytes
   if (data.length === 144) {
-    parsedData.requestType = "swapAndWrap"
+    parsedData.requestType = "WrapAndSwap"
     return {
       status: true,
       data: parsedData as WrapOpReturnAndType,
@@ -105,8 +105,8 @@ function parseBrc20RawRequest(opReturnData: string): {
   )
 
   switch (requestType) {
-    case "wrap":
-    case "wrapAndSwap":
+    case "Wrap":
+    case "WrapAndSwap":
       return parseBrc20OpReturn(data)
     default:
       return {

package/src/ordinal-wallet.ts

@@ -1,19 +1,16 @@
 import BigNumber from "bignumber.js"
 import { bitcoin as bitcoinProviders } from "@teleportdao/providers"
-import { BitcoinBaseWallet } from "./bitcoin-wallet-base"
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { BitcoinConnectionInfo } from "./type"
-import type { SignerInfo, ChangeTarget, Target, ExtendedUtxo } from "./transaction-builder"
-
-import { OrdinalTransactionBuilder } from "./transaction-builder"
+import { OrdinalTransactionBuilder } from "./transaction-builder/ordinal-transaction-builder"
 import BitcoinSign from "./sign/sign-transaction"
 //
 import { BitcoinInterfaceOrdinal } from "./bitcoin-interface-ordinal"
-
 import { generateBrc2OpReturn } from "./helper/brc20-helper"
-import { sleep } from "./utils/tools"
+import { runWithRetries, sleep } from "./utils/tools"
+import { BitcoinConnectionInfo } from "./type"
+import { ChangeTarget, ExtendedUtxo, SignerInfo, Target } from "./transaction-builder"
+import { BitcoinBaseWallet } from "./bitcoin-wallet-base"
 
-export class OrdinalWallet extends BitcoinBaseWallet {
+class OrdinalWallet extends BitcoinBaseWallet {
   unisat: bitcoinProviders.UniSat
   transactionBuilder: OrdinalTransactionBuilder
   btcInterface: BitcoinInterfaceOrdinal
@@ -37,19 +34,11 @@ export class OrdinalWallet extends BitcoinBaseWallet {
     this.unisat = this.btcInterface.unisat
   }
 
-  async sendSignedPsbtWithRetry(signedPsbt: string, { numberOfRetry = 5, sleepTime = 5000 } = {}) {
-    let count = 0
-    while (count <= numberOfRetry) {
-      try {
-        let txId = await this.sendSignedPsbt(signedPsbt)
-        return txId
-      } catch (e: any) {
-        console.log(e.message)
-        await sleep(sleepTime + count * 5000)
-        count += 1
-      }
-    }
-    throw new Error("failed to send transaction")
+  async sendSignedPsbtWithRetry(signedPsbt: string, { maxTries = 5, retrySleep = 5000 } = {}) {
+    return runWithRetries(() => this.sendSignedPsbt(signedPsbt), {
+      retrySleep,
+      maxTries,
+    })
   }
 
   static deployBRC20Data(tickName: string, max: number | string, limit: number | string) {
@@ -68,6 +57,7 @@ export class OrdinalWallet extends BitcoinBaseWallet {
   }
 
   static mintBRC20Data(tickName: string, amount: string | number) {
+    if (BigNumber(amount).isLessThanOrEqualTo(0)) throw new Error("amount should be greater than 0")
     let data = {
       p: "brc-20",
       op: "mint",
@@ -82,6 +72,7 @@ export class OrdinalWallet extends BitcoinBaseWallet {
   }
 
   static transferBRC20Data(tickName: string, amount: string | number) {
+    if (BigNumber(amount).isLessThanOrEqualTo(0)) throw new Error("amount should be greater than 0")
     let data = {
       p: "brc-20",
       op: "transfer",
@@ -177,10 +168,12 @@ export class OrdinalWallet extends BitcoinBaseWallet {
       type: string
     },
     signer: SignerInfo,
+    ordinalSigner?: SignerInfo,
     extendedUtxo?: ExtendedUtxo[],
     staticFeeRate?: number,
   ) {
-    const publicKey = Buffer.from(signer.publicKey, "hex")
+    const ordinalSignerPublicKey = ordinalSigner?.publicKey || signer.publicKey
+    const publicKey = Buffer.from(ordinalSignerPublicKey, "hex")
     let transferOrdinal = this.transactionBuilder.createOrdinalAddress(file, publicKey)
     const leafScript = transferOrdinal.redeem.output
     const { ordinalAddress } = transferOrdinal
@@ -215,11 +208,19 @@ export class OrdinalWallet extends BitcoinBaseWallet {
       type: string
     },
     signer: SignerInfo,
+    ordinalSigner?: SignerInfo,
     extendedUtxo?: ExtendedUtxo[],
     staticFeeRate?: number,
   ) {
+    const receiverAddress = ordinalSigner?.address || signer.address
     const { inscribeDepositUnsignedInfo, transferOrdinal } =
-      await this.inscribeOrdinalDepositUnsigned(file, signer, extendedUtxo, staticFeeRate)
+      await this.inscribeOrdinalDepositUnsigned(
+        file,
+        signer,
+        ordinalSigner,
+        extendedUtxo,
+        staticFeeRate,
+      )
     const { ordinalAddress } = transferOrdinal
     let ordinalAmount = 600
     let inscribeDeposit: {
@@ -234,7 +235,7 @@ export class OrdinalWallet extends BitcoinBaseWallet {
     let inscribeUnsignedInfo = this.transactionBuilder.createInscribeUnsignedTx(
       transferOrdinal,
       inscribeDeposit,
-      this.bitcoinAddress!,
+      receiverAddress,
       ordinalAmount,
     )
     return {
@@ -251,6 +252,7 @@ export class OrdinalWallet extends BitcoinBaseWallet {
         ),
       },
       inscribeAddress: ordinalAddress,
+      receiverAddress,
     }
   }
 
@@ -261,14 +263,21 @@ export class OrdinalWallet extends BitcoinBaseWallet {
     },
     extendedUtxo?: ExtendedUtxo[],
     staticFeeRate?: number,
+    ordinalReceiverAddress?: string,
   ) {
     if (!this.currentAccount || !this.currentAccountType || !this.publicKey || !this.privateKey) {
       throw new Error("account not initialized")
     }
+    const receiverAddress = ordinalReceiverAddress || this.bitcoinAddress!
 
     const { inscribeDepositUnsignedInfo, transferOrdinal } =
-      await this.inscribeOrdinalDepositUnsigned(file, this.signerInfo!, extendedUtxo, staticFeeRate)
-
+      await this.inscribeOrdinalDepositUnsigned(
+        file,
+        this.signerInfo!,
+        undefined,
+        extendedUtxo,
+        staticFeeRate,
+      )
     let ordinalUtxo = await this.btcInterface.getBTCUtxo(
       transferOrdinal.ordinalAddress,
       this.signerInfo!,
@@ -327,7 +336,7 @@ export class OrdinalWallet extends BitcoinBaseWallet {
     let inscribeUnsignedInfo = this.transactionBuilder.createInscribeUnsignedTx(
       transferOrdinal,
       inscribeDeposit,
-      this.bitcoinAddress!,
+      receiverAddress,
       ordinalAmount,
     )
 
@@ -370,11 +379,12 @@ export class OrdinalWallet extends BitcoinBaseWallet {
   async inscribeBrc20Unsigned(
     brc: { tick: string; amount: number | string },
     signer: SignerInfo,
+    ordinalSigner?: SignerInfo,
     extendedUtxo?: ExtendedUtxo[],
     staticFeeRate?: number,
   ) {
     let file = OrdinalWallet.transferBRC20Data(brc.tick, brc.amount)
-    return this.inscribeOrdinalUnsigned(file, signer, extendedUtxo, staticFeeRate)
+    return this.inscribeOrdinalUnsigned(file, signer, ordinalSigner, extendedUtxo, staticFeeRate)
   }
 
   async inscribeBrc20(
@@ -394,10 +404,12 @@ export class OrdinalWallet extends BitcoinBaseWallet {
       index: number
     },
     signer: SignerInfo,
+    ordinalSigner?: SignerInfo,
     extendedUtxo?: ExtendedUtxo[],
     staticFeeRate?: number,
     otherTargets?: Target[],
   ) {
+    const ordinalSignerInfo = ordinalSigner || signer
     let utxo = extendedUtxo || (await this.btcInterface.getBTCUtxo(signer.address, signer))
     let feeRate = staticFeeRate || (await this.btcInterface.getFeeRate("normal"))
     let unsignedTx = await this.transactionBuilder.createNftPsbt({
@@ -406,7 +418,7 @@ export class OrdinalWallet extends BitcoinBaseWallet {
         hash: brcInscribeUtxo.hash,
         index: 0,
         value: brcInscribeUtxo.value,
-        signerInfo: signer,
+        signerInfo: ordinalSignerInfo,
       },
       feeRate,
       receiverAddress: receiver,
@@ -464,10 +476,12 @@ export class OrdinalWallet extends BitcoinBaseWallet {
     receiver: string,
     brc: { tick: string; amount: number | string },
     signer: SignerInfo,
+    ordinalSigner?: SignerInfo,
     otherTargets?: Target[],
     extendedUtxo?: ExtendedUtxo[],
     staticFeeRate?: number,
   ) {
+    const ordinalSignerInfo = ordinalSigner || signer
     // check all fee before process transaction
     let brc20Balance = await this.unisat.getBrc20AddressBalanceForTicker(signer.address, brc.tick)
 
@@ -489,7 +503,7 @@ export class OrdinalWallet extends BitcoinBaseWallet {
       extendedUtxo || (await this.btcInterface.getBTCUtxo(signer.address, signer))
     let utxo2: ExtendedUtxo[] = []
     const { inscribeAddress, inscribeDepositUnsignedInfo, inscribeUnsignedInfo } =
-      await this.inscribeBrc20Unsigned(brc, signer, utxo1, feeRate)
+      await this.inscribeBrc20Unsigned(brc, signer, ordinalSignerInfo, utxo1, feeRate)
 
     utxo2 = utxo1.filter(
       (u) =>
@@ -514,6 +528,7 @@ export class OrdinalWallet extends BitcoinBaseWallet {
         index: 0,
       },
       signer,
+      ordinalSignerInfo,
       utxo2,
       feeRate,
       otherTargets,
@@ -618,12 +633,10 @@ export class OrdinalWallet extends BitcoinBaseWallet {
       outputToken: string
       outputAmount: string
     },
+    ordinalSigner?: SignerInfo,
     extendedUtxo?: ExtendedUtxo[],
     staticFeeRate?: number,
-    {
-      chainId = 137, // 80001
-      appId = exchange ? 1 : 0,
-    } = {},
+    { chainId = 137, appId = exchange ? 1 : 0 } = {},
   ) {
     const isExchange = !!exchange
     let dataHex = generateBrc2OpReturn({
@@ -641,6 +654,7 @@ export class OrdinalWallet extends BitcoinBaseWallet {
       lockerAddress,
       brc,
       signer,
+      ordinalSigner,
       [opTarget],
       extendedUtxo,
       staticFeeRate,
@@ -662,12 +676,10 @@ export class OrdinalWallet extends BitcoinBaseWallet {
       outputToken: string
       outputAmount: string
     },
+    ordinalSigner?: SignerInfo,
     extendedUtxo?: ExtendedUtxo[],
     staticFeeRate?: number,
-    {
-      chainId = 137, // 80001
-      appId = exchange ? 1 : 0,
-    } = {},
+    { chainId = 137, appId = exchange ? 1 : 0 } = {},
   ) {
     let utxo: ExtendedUtxo[] =
       extendedUtxo || (await this.btcInterface.getBTCUtxo(signer.address, signer))
@@ -689,6 +701,7 @@ export class OrdinalWallet extends BitcoinBaseWallet {
       lockerAddress,
       brcInscribeTx,
       signer,
+      ordinalSigner,
       utxo,
       feeRate,
       [opTarget],
@@ -707,10 +720,7 @@ export class OrdinalWallet extends BitcoinBaseWallet {
     },
     extendedUtxo?: ExtendedUtxo[],
     staticFeeRate?: number,
-    {
-      chainId = 137, // 80001
-      appId = exchange ? 1 : 0,
-    } = {},
+    { chainId = 137, appId = exchange ? 1 : 0 } = {},
   ) {
     const isExchange = !!exchange
 

package/dist/bitcoin-base.d.ts

@@ -1,93 +0,0 @@
-/// <reference types="node" />
-import TransactionBuilder, { BitcoinConnectionInfo } from "./transaction-builder/bitcoin-transaction-builder";
-import type { ExtendedUtxo, SignerInfo, Target } from "./transaction-builder/transaction-builder";
-import BitcoinSign from "./sign/sign-transaction";
-import { Network, Payment } from "bitcoinjs-lib";
-import { BitcoinInterface } from "./bitcoin-interface";
-declare class BitcoinBase {
-    network: Network;
-    hdWalletPath: {
-        p2pkh: string;
-        p2wpkh: string;
-        "p2sh-p2wpkh": string;
-        p2sh: string;
-        p2wsh: string;
-        "p2sh-p2wsh": string;
-        p2tr: string;
-    };
-    transactionBuilder: TransactionBuilder;
-    btcInterface: BitcoinInterface;
-    signer: BitcoinSign;
-    currentAccount?: string;
-    currentAccountType?: string;
-    privateKey?: Buffer;
-    publicKey?: Buffer;
-    publicKeys?: Buffer[];
-    addressObj?: Payment;
-    bitcoinAddress: string | undefined;
-    constructor(networkName: string, connectionInfo?: BitcoinConnectionInfo);
-    get signerInfo(): {
-        address: string;
-        publicKey: string;
-        addressType: string;
-    } | undefined;
-    createTransactionInputsAndOutputs({ targets, extendedUtxo, changeAddress, feeRate, }: {
-        targets: Target[];
-        extendedUtxo: ExtendedUtxo[];
-        changeAddress: string;
-        feeRate: number;
-        fullAmount?: boolean;
-    }): {
-        inputs: ExtendedUtxo[];
-        fee: number;
-        outputs: Target[];
-        change: import("./transaction-builder/transaction-builder").ChangeTarget | undefined;
-    };
-    checkBalanceIsSufficient({ targets, extendedUtxo, changeAddress, feeRate, fullAmount, }: {
-        targets: Target[];
-        extendedUtxo: ExtendedUtxo[];
-        changeAddress: string;
-        feeRate: number;
-        fullAmount?: boolean;
-    }): boolean;
-    setMultiSigAccount(accountType?: string): void;
-    setAccountPrivateKey(privateKeyHex: string): void;
-    setAccountPublicKey(publicKeyHex: string): void;
-    setAccountPrivateKeyByMnemonic({ mnemonic, mnemonicPassword, index, walletNumber, addressType, }: {
-        mnemonic: string;
-        mnemonicPassword?: string;
-        index?: number;
-        walletNumber?: number;
-        addressType?: string;
-    }): string | undefined;
-    setAccount(accountType?: string): string | undefined;
-    getExtendedUtxo(input: SignerInfo): Promise<{
-        signerInfo: SignerInfo;
-        hash: string;
-        value: number;
-        index: number;
-    }[]>;
-    send({ receiverAddress, amount, fullAmount, speed, }: {
-        receiverAddress: string;
-        amount: number;
-        fullAmount?: boolean;
-        speed?: "normal" | "fast" | "slow";
-    }): Promise<string>;
-    sendSignedPsbt(signedPsbt: string): Promise<string>;
-    sendSignedTx(signedTx: string): Promise<string>;
-    sendMultiSignedPsbt(signedPsbts?: string[]): Promise<string>;
-    increaseTransactionFeeUnsignedPsbt(txId: string, signerInfos: SignerInfo[], extraExtendedUtxo: ExtendedUtxo[], changeAddress: string, staticFeeRate?: number): Promise<{
-        unsignedTransaction: string;
-        outputs: Target[];
-        inputs: {
-            hash: string;
-            value: number;
-            index: number;
-            signerInfo: SignerInfo;
-        }[];
-        fee: number;
-        change: import("./transaction-builder/transaction-builder").ChangeTarget | undefined;
-    }>;
-}
-export { BitcoinBase };
-//# sourceMappingURL=bitcoin-base.d.ts.map

package/dist/bitcoin-base.d.ts.map

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