opnet 1.8.3 → 1.8.5

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "opnet",
     "type": "module",
-    "version": "1.8.3",
+    "version": "1.8.5",
     "author": "OP_NET",
     "description": "The perfect library for building Bitcoin-based applications.",
     "engines": {
@@ -104,22 +104,23 @@
         "@babel/preset-env": "^7.29.0",
         "@babel/preset-typescript": "^7.28.5",
         "@eslint/js": "^10.0.1",
-        "@microsoft/api-extractor": "7.57.6",
-        "@types/node": "^25.3.5",
-        "@vitest/browser": "^4.0.18",
-        "@vitest/browser-playwright": "^4.0.18",
-        "@vitest/ui": "^4.0.18",
+        "@microsoft/api-extractor": "7.57.7",
+        "@types/node": "^25.5.0",
+        "@vitest/browser": "^4.1.0",
+        "@vitest/browser-playwright": "^4.1.0",
+        "@vitest/ui": "^4.1.0",
+        "esbuild": "^0.27.4",
         "eslint": "^10.0.3",
         "madge": "^8.0.0",
         "playwright": "^1.58.2",
         "stream-browserify": "^3.0.0",
         "typedoc": "^0.28.17",
         "typescript": "^5.9.3",
-        "typescript-eslint": "^8.56.1",
-        "vite": "^7.3.1",
+        "typescript-eslint": "^8.57.0",
+        "vite": "^8.0.0",
         "vite-plugin-dts": "4.5.4",
         "vite-plugin-node-polyfills": "^0.25.0",
-        "vitest": "^4.0.18"
+        "vitest": "^4.1.0"
     },
     "peerDependencies": {
         "react-native-worklets": ">=0.7.0"
@@ -135,13 +136,18 @@
         "@btc-vision/bitcoin-rpc": "^1.1.2",
         "@btc-vision/ecpair": "^4.0.5",
         "@btc-vision/logger": "^1.0.8",
-        "@btc-vision/transaction": "^1.8.0",
+        "@btc-vision/transaction": "^1.8.2",
         "@noble/hashes": "^2.0.1",
         "bignumber.js": "^10.0.2",
         "long": "^5.3.2",
         "p-limit": "^7.3.0",
         "pako": "^2.1.0",
         "protobufjs": "^8.0.0",
-        "undici": "^7.22.0"
+        "undici": "^7.24.0"
+    },
+    "overrides": {
+        "vite-plugin-node-polyfills": {
+            "vite": "$vite"
+        }
     }
 }

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.8.3';
+export const version = '1.8.5';

package/src/contracts/CallResult.ts

@@ -804,6 +804,38 @@ export class CallResult<
         }
     }
 
+    private max(a: bigint, b: bigint): bigint {
+        return a > b ? a : b;
+    }
+
+    private ensureUTXOsAvailable(
+        utxos: UTXO[] | undefined | null,
+    ): asserts utxos is UTXO[] & { length: number } {
+        if (!utxos || utxos.length === 0) {
+            throw new Error(
+                'Wallet optimization required. No UTXOs available. You may need to split your wallet UTXOs so at ' +
+                    'least one non-extra-input UTXO is available for the funding transaction.',
+            );
+        }
+    }
+
+    private computeRequiredAmount(
+        gasFee: bigint,
+        priority: bigint,
+        amountAddition: bigint,
+        totalOuts: bigint,
+        extraInputValue: bigint,
+        miningCost: bigint = 0n,
+        maximumAllowedSatToSpend: bigint = 0n,
+    ): bigint {
+        const gross = this.max(
+            gasFee + priority + amountAddition + totalOuts + miningCost,
+            maximumAllowedSatToSpend,
+        );
+
+        return gross > extraInputValue ? gross - extraInputValue : 1n;
+    }
+
     /**
      * Acquire UTXOs for the transaction.
      * @param {TransactionParameters} interactionParams - The transaction parameters.
@@ -829,15 +861,25 @@ export class CallResult<
 
         const gasFee = this.bigintMax(this.estimatedSatGas, interactionParams.minGas ?? 0n);
 
-        const preWant =
-            gasFee +
-            priority +
-            amountAddition +
-            totalOuts +
-            interactionParams.maximumAllowedSatToSpend;
+        const extraInputValue = (interactionParams.extraInputs ?? []).reduce(
+            (s, u) => s + u.value,
+            0n,
+        );
+
+        const preWant = this.computeRequiredAmount(
+            gasFee,
+            priority,
+            amountAddition,
+            totalOuts,
+            extraInputValue,
+            0n,
+            interactionParams.maximumAllowedSatToSpend,
+        );
 
         let utxos = interactionParams.utxos ?? (await this.#fetchUTXOs(preWant, interactionParams));
 
+        this.ensureUTXOsAvailable(utxos);
+
         let refetched = false;
         while (true) {
             const miningCost = TransactionHelper.estimateMiningCost(
@@ -848,13 +890,15 @@ export class CallResult<
                 feeRate,
             );
 
-            const want =
-                gasFee +
-                priority +
-                amountAddition +
-                totalOuts +
-                miningCost +
-                interactionParams.maximumAllowedSatToSpend;
+            const want = this.computeRequiredAmount(
+                gasFee,
+                priority,
+                amountAddition,
+                totalOuts,
+                extraInputValue,
+                miningCost,
+                interactionParams.maximumAllowedSatToSpend,
+            );
 
             const have = utxos.reduce((s, u) => s + u.value, 0n);
             if (have >= want) break;
@@ -866,6 +910,8 @@ export class CallResult<
             utxos = await this.#fetchUTXOs(want, interactionParams);
             refetched = true;
 
+            this.ensureUTXOsAvailable(utxos);
+
             const haveAfter = utxos.reduce((s, u) => s + u.value, 0n);
             if (haveAfter === have) {
                 throw new Error('Not enough sat to complete transaction');