@teleportdao/bitcoin 1.8.9 → 2.0.0

package/dist/ordinal-wallet.d.ts

@@ -3,19 +3,18 @@ import { bitcoin as bitcoinProviders } from "@teleportdao/providers";
 import { OrdinalTransactionBuilder } from "./transaction-builder/ordinal-transaction-builder";
 import BitcoinSign from "./sign/sign-transaction";
 import { BitcoinInterfaceOrdinal } from "./bitcoin-interface-ordinal";
-import { BitcoinConnectionInfo } from "./type";
 import { ChangeTarget, ExtendedUtxo, SignerInfo, Target } from "./transaction-builder";
-import { BitcoinBaseWallet } from "./bitcoin-wallet-base";
+import { BitcoinBaseWallet, FeeRateType } from "./bitcoin-wallet-base";
+import { RPCConnectionInfo, UtxoConnectionInfo } from "./type";
 declare class OrdinalWallet extends BitcoinBaseWallet {
     unisat: bitcoinProviders.UniSat;
     transactionBuilder: OrdinalTransactionBuilder;
     btcInterface: BitcoinInterfaceOrdinal;
     signer: BitcoinSign;
-    constructor(networkName: string, uniSatToken: string, connectionInfo?: BitcoinConnectionInfo);
-    sendSignedPsbtWithRetry(signedPsbt: string, { maxTries, retrySleep }?: {
-        maxTries?: number | undefined;
-        retrySleep?: number | undefined;
-    }): Promise<string>;
+    constructor(networkName: string, uniSatToken: string, connectionInfo: {
+        rpc: RPCConnectionInfo;
+        utxo?: UtxoConnectionInfo;
+    });
     static deployBRC20Data(tickName: string, max: number | string, limit: number | string): {
         buffer: Buffer;
         type: string;
@@ -28,53 +27,11 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
         buffer: Buffer;
         type: string;
     };
-    sendUsingUtxosUnsigned({ receivers, speed, utxo, changeAddress, staticFeeRate, }: {
-        receivers: {
-            address: string;
-            value: number;
-        }[];
-        changeAddress: string;
-        speed?: "normal" | "fast" | "slow";
-        staticFeeRate?: number;
-        utxo: ExtendedUtxo[];
-    }): Promise<{
-        possibleTxId: string;
-        unsignedTransaction: string;
-        outputs: Target[];
-        inputs: {
-            hash: string;
-            value: number;
-            index: number;
-            signerInfo: SignerInfo;
-        }[];
-        fee: number;
-        change: ChangeTarget | undefined;
-    }>;
-    sendUsingUtxos({ receivers, speed, utxo, }: {
-        receivers: {
-            address: string;
-            value: number;
-        }[];
-        speed?: "normal" | "fast" | "slow";
-        utxo?: ExtendedUtxo[];
-    }): Promise<{
-        txId: string;
-        inputs: {
-            hash: string;
-            value: number;
-            index: number;
-            signerInfo: SignerInfo;
-        }[];
-        outputs: Target[];
-        change: ChangeTarget | undefined;
-        fee: number;
-    }>;
     inscribeOrdinalDepositUnsigned(file: {
         buffer: Buffer;
         type: string;
-    }, signer: SignerInfo, ordinalSigner?: SignerInfo, extendedUtxo?: ExtendedUtxo[], staticFeeRate?: number): Promise<{
+    }, signer: SignerInfo, ordinalSigner?: SignerInfo, fee?: FeeRateType, extendedUtxo?: ExtendedUtxo[]): Promise<{
         inscribeDepositUnsignedInfo: {
-            possibleTxId: string;
             unsignedTransaction: string;
             outputs: Target[];
             inputs: {
@@ -85,6 +42,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
             }[];
             fee: number;
             change: ChangeTarget | undefined;
+            possibleTxId: string | undefined;
         };
         transferOrdinal: {
             ordinalAddress: string;
@@ -99,9 +57,8 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
     inscribeOrdinalUnsigned(file: {
         buffer: Buffer;
         type: string;
-    }, signer: SignerInfo, ordinalSigner?: SignerInfo, extendedUtxo?: ExtendedUtxo[], staticFeeRate?: number): Promise<{
+    }, signer: SignerInfo, ordinalSigner?: SignerInfo, fee?: FeeRateType, extendedUtxo?: ExtendedUtxo[]): Promise<{
         inscribeDepositUnsignedInfo: {
-            possibleTxId: string;
             unsignedTransaction: string;
             outputs: Target[];
             inputs: {
@@ -112,9 +69,9 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
             }[];
             fee: number;
             change: ChangeTarget | undefined;
+            possibleTxId: string | undefined;
         };
         inscribeUnsignedInfo: {
-            possibleTxId: string;
             unsignedTransaction: string;
             inputs: {
                 hash: string;
@@ -126,6 +83,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
                 address: string;
             }[];
             fee: number;
+            possibleTxId: string;
         };
         inscribeAddress: string;
         receiverAddress: string;
@@ -133,7 +91,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
     inscribeOrdinal(file: {
         buffer: Buffer;
         type: string;
-    }, extendedUtxo?: ExtendedUtxo[], staticFeeRate?: number, ordinalReceiverAddress?: string): Promise<{
+    }, fee?: FeeRateType, extendedUtxo?: ExtendedUtxo[], ordinalReceiverAddress?: string): Promise<{
         inscribeTx: {
             hash: string;
             index: number;
@@ -158,7 +116,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
         tick: string;
         max: number;
         limit: number;
-    }, extendedUtxo?: ExtendedUtxo[], staticFeeRate?: number): Promise<{
+    }, fee?: FeeRateType, extendedUtxo?: ExtendedUtxo[]): Promise<{
         inscribeTx: {
             hash: string;
             index: number;
@@ -182,7 +140,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
     mintBrc20(brc: {
         tick: string;
         amount: number | string;
-    }, extendedUtxo?: ExtendedUtxo[], staticFeeRate?: number): Promise<{
+    }, fee?: FeeRateType, extendedUtxo?: ExtendedUtxo[]): Promise<{
         inscribeTx: {
             hash: string;
             index: number;
@@ -206,9 +164,8 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
     inscribeBrc20Unsigned(brc: {
         tick: string;
         amount: number | string;
-    }, signer: SignerInfo, ordinalSigner?: SignerInfo, extendedUtxo?: ExtendedUtxo[], staticFeeRate?: number): Promise<{
+    }, signer: SignerInfo, ordinalSigner?: SignerInfo, fee?: FeeRateType, extendedUtxo?: ExtendedUtxo[]): Promise<{
         inscribeDepositUnsignedInfo: {
-            possibleTxId: string;
             unsignedTransaction: string;
             outputs: Target[];
             inputs: {
@@ -219,9 +176,9 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
             }[];
             fee: number;
             change: ChangeTarget | undefined;
+            possibleTxId: string | undefined;
         };
         inscribeUnsignedInfo: {
-            possibleTxId: string;
             unsignedTransaction: string;
             inputs: {
                 hash: string;
@@ -233,6 +190,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
                 address: string;
             }[];
             fee: number;
+            possibleTxId: string;
         };
         inscribeAddress: string;
         receiverAddress: string;
@@ -240,7 +198,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
     inscribeBrc20(brc: {
         tick: string;
         amount: number | string;
-    }, extendedUtxo?: ExtendedUtxo[], staticFeeRate?: number): Promise<{
+    }, fee?: FeeRateType, extendedUtxo?: ExtendedUtxo[]): Promise<{
         inscribeTx: {
             hash: string;
             index: number;
@@ -265,7 +223,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
         hash: string;
         value: number;
         index: number;
-    }, signer: SignerInfo, ordinalSigner?: SignerInfo, extendedUtxo?: ExtendedUtxo[], staticFeeRate?: number, otherTargets?: Target[]): Promise<{
+    }, signer: SignerInfo, ordinalSigner?: SignerInfo, fee?: FeeRateType, extendedUtxo?: ExtendedUtxo[], otherTargets?: Target[]): Promise<{
         possibleTxId: string;
         unsignedTransaction: string;
         outputs: Target[];
@@ -282,7 +240,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
         hash: string;
         value: number;
         index: number;
-    }, extendedUtxo: ExtendedUtxo[], staticFeeRate?: number, otherTargets?: Target[]): Promise<{
+    }, fee: FeeRateType | undefined, extendedUtxo: ExtendedUtxo[], otherTargets?: Target[]): Promise<{
         hash: string;
         index: number;
         value: number;
@@ -298,9 +256,8 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
     inscribeAndTransferBrc20Unsigned(receiver: string, brc: {
         tick: string;
         amount: number | string;
-    }, signer: SignerInfo, ordinalSigner?: SignerInfo, otherTargets?: Target[], extendedUtxo?: ExtendedUtxo[], staticFeeRate?: number): Promise<{
+    }, signer: SignerInfo, ordinalSigner?: SignerInfo, otherTargets?: Target[], fee?: FeeRateType, extendedUtxo?: ExtendedUtxo[]): Promise<{
         inscribeDepositUnsignedInfo: {
-            possibleTxId: string;
             unsignedTransaction: string;
             outputs: Target[];
             inputs: {
@@ -311,9 +268,9 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
             }[];
             fee: number;
             change: ChangeTarget | undefined;
+            possibleTxId: string | undefined;
         };
         inscribeUnsignedInfo: {
-            possibleTxId: string;
             unsignedTransaction: string;
             inputs: {
                 hash: string;
@@ -325,6 +282,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
                 address: string;
             }[];
             fee: number;
+            possibleTxId: string;
         };
         transferTxUnsignedInfo: {
             possibleTxId: string;
@@ -344,7 +302,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
     inscribeAndTransferBrc20(receiver: string, brc: {
         tick: string;
         amount: number | string;
-    }, otherTargets?: Target[], extendedUtxo?: ExtendedUtxo[], staticFeeRate?: number): Promise<{
+    }, otherTargets?: Target[], fee?: FeeRateType, extendedUtxo?: ExtendedUtxo[]): Promise<{
         transferTx: {
             hash: string;
             index: number;
@@ -401,12 +359,11 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
     }, brc20TokenId: number, signer: SignerInfo, lockerAddress: string, exchange?: {
         outputToken: string;
         outputAmount: string;
-    }, ordinalSigner?: SignerInfo, extendedUtxo?: ExtendedUtxo[], staticFeeRate?: number, { chainId, appId }?: {
+    }, ordinalSigner?: SignerInfo, fee?: FeeRateType, extendedUtxo?: ExtendedUtxo[], { chainId, appId }?: {
         chainId?: number | undefined;
         appId?: number | undefined;
     }): Promise<{
         inscribeDepositUnsignedInfo: {
-            possibleTxId: string;
             unsignedTransaction: string;
             outputs: Target[];
             inputs: {
@@ -417,9 +374,9 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
             }[];
             fee: number;
             change: ChangeTarget | undefined;
+            possibleTxId: string | undefined;
         };
         inscribeUnsignedInfo: {
-            possibleTxId: string;
             unsignedTransaction: string;
             inputs: {
                 hash: string;
@@ -431,6 +388,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
                 address: string;
             }[];
             fee: number;
+            possibleTxId: string;
         };
         transferTxUnsignedInfo: {
             possibleTxId: string;
@@ -457,7 +415,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
     }, brc20TokenId: number, signer: SignerInfo, lockerAddress: string, exchange?: {
         outputToken: string;
         outputAmount: string;
-    }, ordinalSigner?: SignerInfo, extendedUtxo?: ExtendedUtxo[], staticFeeRate?: number, { chainId, appId }?: {
+    }, ordinalSigner?: SignerInfo, fee?: FeeRateType, extendedUtxo?: ExtendedUtxo[], { chainId, appId }?: {
         chainId?: number | undefined;
         appId?: number | undefined;
     }): Promise<{
@@ -479,7 +437,7 @@ declare class OrdinalWallet extends BitcoinBaseWallet {
     }, brc20TokenId: number, lockerAddress: string, exchange?: {
         outputToken: string;
         outputAmount: string;
-    }, extendedUtxo?: ExtendedUtxo[], staticFeeRate?: number, { chainId, appId }?: {
+    }, fee?: FeeRateType, extendedUtxo?: ExtendedUtxo[], { chainId, appId }?: {
         chainId?: number | undefined;
         appId?: number | undefined;
     }): Promise<{

package/dist/ordinal-wallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ordinal-wallet.d.ts","sourceRoot":"","sources":["../src/ordinal-wallet.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAA;AAC7F,OAAO,WAAW,MAAM,yBAAyB,CAAA;AAEjD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AAGrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAA;AAC9C,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAEzD,cAAM,aAAc,SAAQ,iBAAiB;IAC3C,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAA;IAC/B,kBAAkB,EAAE,yBAAyB,CAAA;IAC7C,YAAY,EAAE,uBAAuB,CAAA;IACrC,MAAM,EAAE,WAAW,CAAA;gBAEjB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,cAAc,GAAE,qBAIf;IAYG,uBAAuB,CAAC,UAAU,EAAE,MAAM,EAAE,EAAE,QAAY,EAAE,UAAiB,EAAE;;;KAAK;IAO1F,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM;;;;IAerF,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;;;;IAe9D,MAAM,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;;;;IAe5D,sBAAsB,CAAC,EAC3B,SAAS,EACT,KAAgB,EAChB,IAAI,EACJ,aAAa,EACb,aAAa,GACd,EAAE;QACD,SAAS,EAAE;YACT,OAAO,EAAE,MAAM,CAAA;YACf,KAAK,EAAE,MAAM,CAAA;SACd,EAAE,CAAA;QACH,aAAa,EAAE,MAAM,CAAA;QACrB,KAAK,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAA;QAClC,aAAa,CAAC,EAAE,MAAM,CAAA;QACtB,IAAI,EAAE,YAAY,EAAE,CAAA;KACrB;;;;;;;;;;;;;IAwBK,cAAc,CAAC,EACnB,SAAS,EACT,KAAgB,EAChB,IAAI,GACL,EAAE;QACD,SAAS,EAAE;YACT,OAAO,EAAE,MAAM,CAAA;YACf,KAAK,EAAE,MAAM,CAAA;SACd,EAAE,CAAA;QACH,KAAK,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAA;QAClC,IAAI,CAAC,EAAE,YAAY,EAAE,CAAA;KACtB;;;;;;;;;;;;IA0BK,8BAA8B,CAClC,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM,CAAA;QACd,IAAI,EAAE,MAAM,CAAA;KACb,EACD,MAAM,EAAE,UAAU,EAClB,aAAa,CAAC,EAAE,UAAU,EAC1B,YAAY,CAAC,EAAE,YAAY,EAAE,EAC7B,aAAa,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;IAgClB,uBAAuB,CAC3B,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM,CAAA;QACd,IAAI,EAAE,MAAM,CAAA;KACb,EACD,MAAM,EAAE,UAAU,EAClB,aAAa,CAAC,EAAE,UAAU,EAC1B,YAAY,CAAC,EAAE,YAAY,EAAE,EAC7B,aAAa,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA8ClB,eAAe,CACnB,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM,CAAA;QACd,IAAI,EAAE,MAAM,CAAA;KACb,EACD,YAAY,CAAC,EAAE,YAAY,EAAE,EAC7B,aAAa,CAAC,EAAE,MAAM,EACtB,sBAAsB,CAAC,EAAE,MAAM;;;;;;;oBAqBrB;gBACN,IAAI,EAAE,MAAM,CAAA;gBACZ,KAAK,EAAE,MAAM,CAAA;gBACb,KAAK,EAAE,MAAM,CAAA;gBACb,UAAU,EAAE,UAAU,CAAA;aACvB,EAAE;kBACG,MAAM;mBACL,MAAM;mBACN,MAAM;;;;;;IAkEX,WAAW,CACf,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EACjD,YAAY,CAAC,EAAE,YAAY,EAAE,EAC7B,aAAa,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;IAMlB,SAAS,CACb,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAC9C,YAAY,CAAC,EAAE,YAAY,EAAE,EAC7B,aAAa,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;IAMlB,qBAAqB,CACzB,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAC9C,MAAM,EAAE,UAAU,EAClB,aAAa,CAAC,EAAE,UAAU,EAC1B,YAAY,CAAC,EAAE,YAAY,EAAE,EAC7B,aAAa,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAMlB,aAAa,CACjB,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAC9C,YAAY,CAAC,EAAE,YAAY,EAAE,EAC7B,aAAa,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;IAMlB,qBAAqB,CACzB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE;QACf,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,MAAM,CAAA;KACd,EACD,MAAM,EAAE,UAAU,EAClB,aAAa,CAAC,EAAE,UAAU,EAC1B,YAAY,CAAC,EAAE,YAAY,EAAE,EAC7B,aAAa,CAAC,EAAE,MAAM,EACtB,YAAY,CAAC,EAAE,MAAM,EAAE;;;;;;;;;;;;;IAwBnB,aAAa,CACjB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE;QACf,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,MAAM,CAAA;KACd,EACD,YAAY,EAAE,YAAY,EAAE,EAC5B,aAAa,CAAC,EAAE,MAAM,EACtB,YAAY,CAAC,EAAE,MAAM,EAAE;;;;;;;;;;;;;IAgCnB,gCAAgC,CACpC,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAC9C,MAAM,EAAE,UAAU,EAClB,aAAa,CAAC,EAAE,UAAU,EAC1B,YAAY,CAAC,EAAE,MAAM,EAAE,EACvB,YAAY,CAAC,EAAE,YAAY,EAAE,EAC7B,aAAa,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA8DlB,wBAAwB,CAC5B,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAC9C,YAAY,CAAC,EAAE,MAAM,EAAE,EACvB,YAAY,CAAC,EAAE,YAAY,EAAE,EAC7B,aAAa,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA6ElB,iBAAiB,CACrB,gBAAgB,EAAE,MAAM,EACxB,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAC9C,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE;QACT,WAAW,EAAE,MAAM,CAAA;QACnB,YAAY,EAAE,MAAM,CAAA;KACrB,EACD,aAAa,CAAC,EAAE,UAAU,EAC1B,YAAY,CAAC,EAAE,YAAY,EAAE,EAC7B,aAAa,CAAC,EAAE,MAAM,EACtB,EAAE,OAAa,EAAE,KAAwB,EAAE;;;KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAyB5C,6BAA6B,CACjC,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE;QACb,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,MAAM,CAAA;QACb,KAAK,EAAE,MAAM,CAAA;KACd,EACD,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAC9C,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE;QACT,WAAW,EAAE,MAAM,CAAA;QACnB,YAAY,EAAE,MAAM,CAAA;KACrB,EACD,aAAa,CAAC,EAAE,UAAU,EAC1B,YAAY,CAAC,EAAE,YAAY,EAAE,EAC7B,aAAa,CAAC,EAAE,MAAM,EACtB,EAAE,OAAa,EAAE,KAAwB,EAAE;;;KAAK;;;;;;;;;;;;;IA8B5C,SAAS,CACb,gBAAgB,EAAE,MAAM,EACxB,GAAG,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAC9C,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,EACrB,QAAQ,CAAC,EAAE;QACT,WAAW,EAAE,MAAM,CAAA;QACnB,YAAY,EAAE,MAAM,CAAA;KACrB,EACD,YAAY,CAAC,EAAE,YAAY,EAAE,EAC7B,aAAa,CAAC,EAAE,MAAM,EACtB,EAAE,OAAa,EAAE,KAAwB,EAAE;;;KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuBnD;AAED,eAAe,aAAa,CAAA"}
+{"version":3,"file":"ordinal-wallet.d.ts","sourceRoot":"","sources":["../src/ordinal-wallet.ts"],"names":[],"mappings":"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"}

package/dist/ordinal-wallet.js

@@ -20,29 +20,16 @@ const brc20_helper_1 = require("./helper/brc20-helper");
 const tools_1 = require("./utils/tools");
 const bitcoin_wallet_base_1 = require("./bitcoin-wallet-base");
 class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
-    constructor(networkName, uniSatToken, connectionInfo = {
-        api: {
-            provider: "MempoolSpace",
-        },
-    }) {
-        var _a;
-        super(networkName, connectionInfo);
-        if (!((_a = connectionInfo.rpc) === null || _a === void 0 ? void 0 : _a.enabled)) {
+    constructor(networkName, uniSatToken, connectionInfo) {
+        if (!connectionInfo.rpc) {
             throw new Error("rpc is required");
         }
-        this.transactionBuilder = new ordinal_transaction_builder_1.OrdinalTransactionBuilder(connectionInfo, networkName);
+        super(networkName, connectionInfo);
+        this.transactionBuilder = new ordinal_transaction_builder_1.OrdinalTransactionBuilder(networkName, this.network, connectionInfo);
         this.signer = new sign_transaction_1.default(this.network);
         this.btcInterface = new bitcoin_interface_ordinal_1.BitcoinInterfaceOrdinal(connectionInfo, networkName, uniSatToken);
         this.unisat = this.btcInterface.unisat;
     }
-    sendSignedPsbtWithRetry(signedPsbt, { maxTries = 5, retrySleep = 5000 } = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (0, tools_1.runWithRetries)(() => this.sendSignedPsbt(signedPsbt), {
-                retrySleep,
-                maxTries,
-            });
-        });
-    }
     static deployBRC20Data(tickName, max, limit) {
         let data = {
             p: "brc-20",
@@ -84,82 +71,32 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
             type: "text/plain",
         };
     }
-    sendUsingUtxosUnsigned({ receivers, speed = "normal", utxo, changeAddress, staticFeeRate, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let extendedUtxo = utxo;
-            receivers.forEach(({ value }) => {
-                if (value - +value.toFixed(0) !== 0)
-                    throw new Error("incorrect amount. amount should be in satoshi");
-            });
-            let feeRate = staticFeeRate || (yield this.transactionBuilder._getFeeRate(speed));
-            let unsignedTx = yield this.transactionBuilder.processUnsignedTransaction({
-                extendedUtxo,
-                targets: receivers,
-                changeAddress,
-                feeRate,
-                fullAmount: false,
-            });
-            return Object.assign(Object.assign({}, unsignedTx), { possibleTxId: this.transactionBuilder.getUnsignedPsbtTxId(unsignedTx.unsignedTransaction) });
-        });
-    }
-    sendUsingUtxos({ receivers, speed = "normal", utxo, }) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.currentAccount || !this.currentAccountType || !this.publicKey || !this.privateKey) {
-                throw new Error("account not initialized");
-            }
-            let extendedUtxo = utxo
-                ? utxo.filter((u) => u.signerInfo.address === this.currentAccount)
-                : yield this.getExtendedUtxo({
-                    address: this.currentAccount,
-                    addressType: this.currentAccountType,
-                    publicKey: this.publicKey.toString("hex"),
-                });
-            let unsignedTx = yield this.sendUsingUtxosUnsigned({
-                receivers,
-                speed,
-                utxo: extendedUtxo,
-                changeAddress: this.bitcoinAddress,
-            });
-            let signedPsbt = yield this.signer.signPsbt(unsignedTx, this.privateKey);
-            let signedTx = this.signer.finalizePsbts([signedPsbt]);
-            let txId = yield this.transactionBuilder.sendTx(signedTx);
-            const { inputs, outputs, change, fee } = unsignedTx;
-            return { txId, inputs, outputs, change, fee };
-        });
-    }
-    inscribeOrdinalDepositUnsigned(file, signer, ordinalSigner, extendedUtxo, staticFeeRate) {
+    inscribeOrdinalDepositUnsigned(file, signer, ordinalSigner, fee = "normal", extendedUtxo) {
         return __awaiter(this, void 0, void 0, function* () {
             const ordinalSignerPublicKey = (ordinalSigner === null || ordinalSigner === void 0 ? void 0 : 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;
-            let feeRate = staticFeeRate || (yield this.btcInterface.getFeeRate("normal"));
-            let fee = +(((400 + leafScript.length) / 4) * feeRate * 1.5).toFixed(0);
+            let feeRate = yield this.getFeeRate(fee);
+            let extraFee = +(((400 + leafScript.length) / 4) * feeRate * 1.5).toFixed(0);
             let ordinalAmount = 600;
             let utxo1 = extendedUtxo || (yield this.btcInterface.getBTCUtxo(signer.address, signer));
-            let inscribeDepositUnsignedInfo = yield this.sendUsingUtxosUnsigned({
-                receivers: [
-                    {
-                        address: ordinalAddress,
-                        value: ordinalAmount + fee,
-                    },
-                ],
-                utxo: utxo1,
-                changeAddress: signer.address,
-            });
+            let inscribeDepositUnsignedInfo = yield this.sendBTCUnsignedTx(ordinalAddress, ordinalAmount + extraFee, signer, feeRate, utxo1);
             return {
                 inscribeDepositUnsignedInfo,
                 transferOrdinal,
             };
         });
     }
-    inscribeOrdinalUnsigned(file, signer, ordinalSigner, extendedUtxo, staticFeeRate) {
+    inscribeOrdinalUnsigned(file, signer, ordinalSigner, fee = "normal", extendedUtxo) {
         return __awaiter(this, void 0, void 0, function* () {
             const receiverAddress = (ordinalSigner === null || ordinalSigner === void 0 ? void 0 : ordinalSigner.address) || signer.address;
-            const { inscribeDepositUnsignedInfo, transferOrdinal } = yield this.inscribeOrdinalDepositUnsigned(file, signer, ordinalSigner, extendedUtxo, staticFeeRate);
+            const { inscribeDepositUnsignedInfo, transferOrdinal } = yield this.inscribeOrdinalDepositUnsigned(file, signer, ordinalSigner, fee, extendedUtxo);
             const { ordinalAddress } = transferOrdinal;
             let ordinalAmount = 600;
+            if (!inscribeDepositUnsignedInfo.possibleTxId)
+                throw new Error("inscribeDepositUnsignedInfo.possibleTxId is required. inscriber address type is not p2tr");
             let inscribeDeposit = {
                 hash: inscribeDepositUnsignedInfo.possibleTxId,
                 value: inscribeDepositUnsignedInfo.outputs[0].value,
@@ -167,20 +104,20 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
             };
             let inscribeUnsignedInfo = this.transactionBuilder.createInscribeUnsignedTx(transferOrdinal, inscribeDeposit, receiverAddress, ordinalAmount);
             return {
-                inscribeDepositUnsignedInfo: Object.assign(Object.assign({}, inscribeDepositUnsignedInfo), { possibleTxId: this.transactionBuilder.getUnsignedPsbtTxId(inscribeDepositUnsignedInfo.unsignedTransaction) }),
-                inscribeUnsignedInfo: Object.assign(Object.assign({}, inscribeUnsignedInfo), { possibleTxId: this.transactionBuilder.getUnsignedPsbtTxId(inscribeUnsignedInfo.unsignedTransaction) }),
+                inscribeDepositUnsignedInfo,
+                inscribeUnsignedInfo,
                 inscribeAddress: ordinalAddress,
                 receiverAddress,
             };
         });
     }
-    inscribeOrdinal(file, extendedUtxo, staticFeeRate, ordinalReceiverAddress) {
+    inscribeOrdinal(file, fee = "normal", extendedUtxo, ordinalReceiverAddress) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.currentAccount || !this.currentAccountType || !this.publicKey || !this.privateKey) {
                 throw new Error("account not initialized");
             }
             const receiverAddress = ordinalReceiverAddress || this.bitcoinAddress;
-            const { inscribeDepositUnsignedInfo, transferOrdinal } = yield this.inscribeOrdinalDepositUnsigned(file, this.signerInfo, undefined, extendedUtxo, staticFeeRate);
+            const { inscribeDepositUnsignedInfo, transferOrdinal } = yield this.inscribeOrdinalDepositUnsigned(file, this.signerInfo, undefined, fee, extendedUtxo);
             let ordinalUtxo = yield this.btcInterface.getBTCUtxo(transferOrdinal.ordinalAddress, this.signerInfo);
             let inscribeDeposit;
             if (ordinalUtxo.length > 1) {
@@ -228,35 +165,35 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
             };
         });
     }
-    deployBrc20(brc, extendedUtxo, staticFeeRate) {
+    deployBrc20(brc, fee = "normal", extendedUtxo) {
         return __awaiter(this, void 0, void 0, function* () {
             let file = OrdinalWallet.deployBRC20Data(brc.tick, brc.max, brc.limit);
-            return this.inscribeOrdinal(file, extendedUtxo, staticFeeRate);
+            return this.inscribeOrdinal(file, fee, extendedUtxo);
         });
     }
-    mintBrc20(brc, extendedUtxo, staticFeeRate) {
+    mintBrc20(brc, fee = "normal", extendedUtxo) {
         return __awaiter(this, void 0, void 0, function* () {
             let file = OrdinalWallet.mintBRC20Data(brc.tick, brc.amount);
-            return this.inscribeOrdinal(file, extendedUtxo, staticFeeRate);
+            return this.inscribeOrdinal(file, fee, extendedUtxo);
         });
     }
-    inscribeBrc20Unsigned(brc, signer, ordinalSigner, extendedUtxo, staticFeeRate) {
+    inscribeBrc20Unsigned(brc, signer, ordinalSigner, fee = "normal", extendedUtxo) {
         return __awaiter(this, void 0, void 0, function* () {
             let file = OrdinalWallet.transferBRC20Data(brc.tick, brc.amount);
-            return this.inscribeOrdinalUnsigned(file, signer, ordinalSigner, extendedUtxo, staticFeeRate);
+            return this.inscribeOrdinalUnsigned(file, signer, ordinalSigner, fee, extendedUtxo);
         });
     }
-    inscribeBrc20(brc, extendedUtxo, staticFeeRate) {
+    inscribeBrc20(brc, fee = "normal", extendedUtxo) {
         return __awaiter(this, void 0, void 0, function* () {
             let file = OrdinalWallet.transferBRC20Data(brc.tick, brc.amount);
-            return this.inscribeOrdinal(file, extendedUtxo, staticFeeRate);
+            return this.inscribeOrdinal(file, fee, extendedUtxo);
         });
     }
-    transferBrc20Unsigned(receiver, brcInscribeUtxo, signer, ordinalSigner, extendedUtxo, staticFeeRate, otherTargets) {
+    transferBrc20Unsigned(receiver, brcInscribeUtxo, signer, ordinalSigner, fee = "normal", extendedUtxo, otherTargets) {
         return __awaiter(this, void 0, void 0, function* () {
             const ordinalSignerInfo = ordinalSigner || signer;
             let utxo = extendedUtxo || (yield this.btcInterface.getBTCUtxo(signer.address, signer));
-            let feeRate = staticFeeRate || (yield this.btcInterface.getFeeRate("normal"));
+            let feeRate = yield this.getFeeRate(fee);
             let unsignedTx = yield this.transactionBuilder.createNftPsbt({
                 extendedUtxo: utxo,
                 nftExtendedUtxo: {
@@ -273,12 +210,12 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
             return Object.assign(Object.assign({}, unsignedTx), { possibleTxId: this.transactionBuilder.getUnsignedPsbtTxId(unsignedTx.unsignedTransaction) });
         });
     }
-    transferBrc20(receiver, brcInscribeUtxo, extendedUtxo, staticFeeRate, otherTargets) {
+    transferBrc20(receiver, brcInscribeUtxo, fee = "normal", extendedUtxo, otherTargets) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.currentAccount || !this.currentAccountType || !this.publicKey || !this.privateKey) {
                 throw new Error("account not initialized");
             }
-            let feeRate = staticFeeRate || (yield this.btcInterface.getFeeRate("normal"));
+            let feeRate = yield this.getFeeRate(fee);
             let unsignedTx = yield this.transactionBuilder.createNftPsbt({
                 extendedUtxo,
                 nftExtendedUtxo: {
@@ -304,7 +241,7 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
             };
         });
     }
-    inscribeAndTransferBrc20Unsigned(receiver, brc, signer, ordinalSigner, otherTargets, extendedUtxo, staticFeeRate) {
+    inscribeAndTransferBrc20Unsigned(receiver, brc, signer, ordinalSigner, otherTargets, fee = "normal", extendedUtxo) {
         return __awaiter(this, void 0, void 0, function* () {
             const ordinalSignerInfo = ordinalSigner || signer;
             let brc20Balance = yield this.unisat.getBrc20AddressBalanceForTicker(signer.address, brc.tick);
@@ -315,12 +252,15 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
             if ((0, bignumber_js_1.default)(brc20Balance.availableBalanceSafe).isLessThan(brc.amount)) {
                 throw new Error("insufficient balance");
             }
-            let feeRate = staticFeeRate || (yield this.btcInterface.getFeeRate("normal"));
+            let feeRate = yield this.getFeeRate(fee);
             let utxo1 = extendedUtxo || (yield this.btcInterface.getBTCUtxo(signer.address, signer));
             let utxo2 = [];
-            const { inscribeAddress, inscribeDepositUnsignedInfo, inscribeUnsignedInfo } = yield this.inscribeBrc20Unsigned(brc, signer, ordinalSignerInfo, utxo1, feeRate);
+            const { inscribeAddress, inscribeDepositUnsignedInfo, inscribeUnsignedInfo } = yield this.inscribeBrc20Unsigned(brc, signer, ordinalSignerInfo, feeRate, utxo1);
             utxo2 = utxo1.filter((u) => inscribeDepositUnsignedInfo.inputs.findIndex((i) => i.hash === u.hash && i.index === u.index) === -1);
             if (inscribeDepositUnsignedInfo.change) {
+                if (!inscribeDepositUnsignedInfo.possibleTxId) {
+                    throw new Error("inscribeDepositUnsignedInfo.possibleTxId is required");
+                }
                 utxo2.push({
                     hash: inscribeDepositUnsignedInfo.possibleTxId,
                     index: inscribeDepositUnsignedInfo.outputs.length,
@@ -332,7 +272,7 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
                 hash: inscribeUnsignedInfo.possibleTxId,
                 value: inscribeUnsignedInfo.outputs[0].value,
                 index: 0,
-            }, signer, ordinalSignerInfo, utxo2, feeRate, otherTargets);
+            }, signer, ordinalSignerInfo, feeRate, utxo2, otherTargets);
             return {
                 inscribeDepositUnsignedInfo,
                 inscribeUnsignedInfo,
@@ -341,7 +281,7 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
             };
         });
     }
-    inscribeAndTransferBrc20(receiver, brc, otherTargets, extendedUtxo, staticFeeRate) {
+    inscribeAndTransferBrc20(receiver, brc, otherTargets, fee = "normal", extendedUtxo) {
         return __awaiter(this, void 0, void 0, function* () {
             let brc20Balance = yield this.unisat.getBrc20AddressBalanceForTicker(this.bitcoinAddress, brc.tick);
             if ((0, bignumber_js_1.default)(brc20Balance.transferableBalance).gte(brc.amount)) {
@@ -354,8 +294,8 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
                             hash: ins.utxo.txid,
                             index: ins.utxo.vout,
                             value: ins.utxo.satoshi,
-                        }, extendedUtxo ||
-                            (yield this.btcInterface.getBTCUtxo(this.bitcoinAddress, this.signerInfo)), staticFeeRate || (yield this.btcInterface.getFeeRate("normal")), otherTargets);
+                        }, yield this.getFeeRate(fee), extendedUtxo ||
+                            (yield this.btcInterface.getBTCUtxo(this.bitcoinAddress, this.signerInfo)), otherTargets);
                         return {
                             transferTx,
                         };
@@ -365,10 +305,10 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
             if ((0, bignumber_js_1.default)(brc20Balance.availableBalanceSafe).isLessThan(brc.amount)) {
                 throw new Error(`insufficient balance ${brc20Balance.availableBalanceSafe} ${brc.amount}`);
             }
-            let feeRate = staticFeeRate || (yield this.btcInterface.getFeeRate("normal"));
+            let feeRate = yield this.getFeeRate(fee);
             let utxo1 = extendedUtxo || (yield this.btcInterface.getBTCUtxo(this.bitcoinAddress, this.signerInfo));
             let utxo2 = [];
-            const { inscribeAddress, inscribeDepositTx, inscribeTx } = yield this.inscribeBrc20(brc, utxo1, feeRate);
+            const { inscribeAddress, inscribeDepositTx, inscribeTx } = yield this.inscribeBrc20(brc, feeRate, utxo1);
             utxo2 = utxo1.filter((u) => inscribeDepositTx.inputs.findIndex((i) => i.hash === u.hash && i.index === u.index) === -1);
             if (inscribeDepositTx.change) {
                 utxo2.push({
@@ -379,7 +319,7 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
                 });
             }
             yield (0, tools_1.sleep)(10 * 1000);
-            let transferTx = yield this.transferBrc20(receiver, inscribeTx, utxo2, feeRate, otherTargets);
+            let transferTx = yield this.transferBrc20(receiver, inscribeTx, feeRate, utxo2, otherTargets);
             return {
                 inscribeTx,
                 inscribeAddress,
@@ -388,7 +328,7 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
             };
         });
     }
-    wrapBrc20Unsigned(recipientAddress, brc, brc20TokenId, signer, lockerAddress, exchange, ordinalSigner, extendedUtxo, staticFeeRate, { chainId = 137, appId = exchange ? 1 : 0 } = {}) {
+    wrapBrc20Unsigned(recipientAddress, brc, brc20TokenId, signer, lockerAddress, exchange, ordinalSigner, fee = "normal", extendedUtxo, { chainId = 137, appId = exchange ? 1 : 0 } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const isExchange = !!exchange;
             let dataHex = (0, brc20_helper_1.generateBrc2OpReturn)({
@@ -402,10 +342,10 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
                 outputAmount: exchange === null || exchange === void 0 ? void 0 : exchange.outputAmount,
             });
             let opTarget = this.transactionBuilder.getOpReturnTarget(dataHex);
-            return this.inscribeAndTransferBrc20Unsigned(lockerAddress, brc, signer, ordinalSigner, [opTarget], extendedUtxo, staticFeeRate);
+            return this.inscribeAndTransferBrc20Unsigned(lockerAddress, brc, signer, ordinalSigner, [opTarget], fee, extendedUtxo);
         });
     }
-    wrapBrc20OnlyTransferUnsigned(recipientAddress, brcInscribeTx, brc, brc20TokenId, signer, lockerAddress, exchange, ordinalSigner, extendedUtxo, staticFeeRate, { chainId = 137, appId = exchange ? 1 : 0 } = {}) {
+    wrapBrc20OnlyTransferUnsigned(recipientAddress, brcInscribeTx, brc, brc20TokenId, signer, lockerAddress, exchange, ordinalSigner, fee = "normal", extendedUtxo, { chainId = 137, appId = exchange ? 1 : 0 } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             let utxo = extendedUtxo || (yield this.btcInterface.getBTCUtxo(signer.address, signer));
             const isExchange = !!exchange;
@@ -420,12 +360,12 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
                 outputAmount: exchange === null || exchange === void 0 ? void 0 : exchange.outputAmount,
             });
             let opTarget = this.transactionBuilder.getOpReturnTarget(dataHex);
-            let feeRate = staticFeeRate || (yield this.btcInterface.getFeeRate("normal"));
-            let transferTxUnsignedInfo = yield this.transferBrc20Unsigned(lockerAddress, brcInscribeTx, signer, ordinalSigner, utxo, feeRate, [opTarget]);
+            let feeRate = yield this.getFeeRate(fee);
+            let transferTxUnsignedInfo = yield this.transferBrc20Unsigned(lockerAddress, brcInscribeTx, signer, ordinalSigner, feeRate, utxo, [opTarget]);
             return transferTxUnsignedInfo;
         });
     }
-    wrapBrc20(recipientAddress, brc, brc20TokenId, lockerAddress, exchange, extendedUtxo, staticFeeRate, { chainId = 137, appId = exchange ? 1 : 0 } = {}) {
+    wrapBrc20(recipientAddress, brc, brc20TokenId, lockerAddress, exchange, fee = "normal", extendedUtxo, { chainId = 137, appId = exchange ? 1 : 0 } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const isExchange = !!exchange;
             let dataHex = (0, brc20_helper_1.generateBrc2OpReturn)({
@@ -439,7 +379,7 @@ class OrdinalWallet extends bitcoin_wallet_base_1.BitcoinBaseWallet {
                 outputAmount: exchange === null || exchange === void 0 ? void 0 : exchange.outputAmount,
             });
             let opTarget = this.transactionBuilder.getOpReturnTarget(dataHex);
-            return this.inscribeAndTransferBrc20(lockerAddress, brc, [opTarget], extendedUtxo, staticFeeRate);
+            return this.inscribeAndTransferBrc20(lockerAddress, brc, [opTarget], fee, extendedUtxo);
         });
     }
 }