@argonprotocol/mainchain 1.3.10 → 1.3.12

package/lib/index.cjs

@@ -208,7 +208,12 @@ var TxResult = (_class = class {
         }
       }
       if (encounteredError) {
-        const error = dispatchErrorToExtrinsicError(this.client, encounteredError, batchErrorIndex);
+        const error = dispatchErrorToExtrinsicError(
+          this.client,
+          encounteredError,
+          batchErrorIndex,
+          this.finalFee
+        );
         this.reject(error);
       } else {
         this.inBlockResolve(new Uint8Array(status.asInBlock));
@@ -281,11 +286,12 @@ function dispatchErrorToString(client, error) {
   return message;
 }
 var ExtrinsicError2 = class extends Error {
-  constructor(errorCode, details, batchInterruptedIndex) {
+  constructor(errorCode, details, batchInterruptedIndex, txFee = 0n) {
     super(errorCode);
     this.errorCode = errorCode;
     this.details = details;
     this.batchInterruptedIndex = batchInterruptedIndex;
+    this.txFee = txFee;
   }
   toString() {
     if (this.batchInterruptedIndex !== void 0) {
@@ -294,13 +300,13 @@ var ExtrinsicError2 = class extends Error {
     return `${this.errorCode} ${_nullishCoalesce(this.details, () => ( ""))}`;
   }
 };
-function dispatchErrorToExtrinsicError(client, error, batchInterruptedIndex) {
+function dispatchErrorToExtrinsicError(client, error, batchInterruptedIndex, txFee) {
   if (error.isModule) {
     const decoded = client.registry.findMetaError(error.asModule);
     const { docs, name, section } = decoded;
-    return new ExtrinsicError2(`${section}.${name}`, docs.join(" "), batchInterruptedIndex);
+    return new ExtrinsicError2(`${section}.${name}`, docs.join(" "), batchInterruptedIndex, txFee);
   }
-  return new ExtrinsicError2(error.toString(), void 0, batchInterruptedIndex);
+  return new ExtrinsicError2(error.toString(), void 0, batchInterruptedIndex, txFee);
 }
 function checkForExtrinsicSuccess(events, client) {
   return new Promise((resolve, reject) => {
@@ -844,12 +850,7 @@ var BitcoinLocks = class {
       unavailableBalance: securityFee + (_nullishCoalesce(args.reducedBalanceBy, () => ( 0n))),
       includeExistentialDeposit: true
     });
-    if (!canAfford) {
-      throw new Error(
-        `Insufficient funds to initialize lock. Available: ${formatArgons(availableBalance)}, Required: ${satoshis}`
-      );
-    }
-    return { tx, securityFee, txFee };
+    return { tx, securityFee, txFee, canAfford, availableBalance, txFeePlusTip: txFee + tip };
   }
   async getBitcoinLockFromTxResult(txResult) {
     const client = this.client;
@@ -868,7 +869,12 @@ var BitcoinLocks = class {
   async initializeLock(args) {
     const { argonKeyring, tip = 0n, txProgressCallback } = args;
     const client = this.client;
-    const { tx, securityFee } = await this.createInitializeLockTx(args);
+    const { tx, securityFee, canAfford, txFeePlusTip } = await this.createInitializeLockTx(args);
+    if (!canAfford) {
+      throw new Error(
+        `Insufficient funds to initialize bitcoin lock. Required security fee: ${formatArgons(securityFee)}, Tx fee plus tip: ${formatArgons(txFeePlusTip)}`
+      );
+    }
     const submitter = new TxSubmitter(client, tx, argonKeyring);
     const txResult = await submitter.submit({
       waitForBlock: true,
@@ -895,7 +901,7 @@ var BitcoinLocks = class {
       priceIndex,
       releaseRequest: { bitcoinNetworkFee, toScriptPubkey },
       argonKeyring,
-      tip,
+      tip = 0n,
       txProgressCallback
     } = args;
     if (!toScriptPubkey.startsWith("0x")) {
@@ -913,7 +919,7 @@ var BitcoinLocks = class {
     });
     if (!canAfford.canAfford) {
       throw new Error(
-        `Insufficient funds to release lock. Available: ${formatArgons(canAfford.availableBalance)}, Required: ${formatArgons(redemptionPrice)}`
+        `Insufficient funds to release lock. Available: ${formatArgons(canAfford.availableBalance)}, Required: ${formatArgons(redemptionPrice + canAfford.txFee + tip)}`
       );
     }
     const txResult = await submitter.submit({