opnet 1.8.3 → 1.8.5

package/browser/worker_threads-browser.js

@@ -1,10 +1,8 @@
-// Browser shim for worker_threads - not used in browser context
-// WorkerCreator.ts uses Web Workers directly in browser via isNode check
-
-class Worker {
-    constructor() {
-        throw new Error('worker_threads is not available in browser. Use Web Workers instead.');
-    }
-}
-
+//#region src/shims/worker_threads-browser.js
+var Worker = class {
+	constructor() {
+		throw new Error("worker_threads is not available in browser. Use Web Workers instead.");
+	}
+};
+//#endregion
 export { Worker };

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.8.3";
+export declare const version = "1.8.5";

package/build/_version.js

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

package/build/contracts/CallResult.d.ts

@@ -107,6 +107,9 @@ export declare class CallResult<T extends ContractDecodedObjectResult = {}, U ex
     setEvents(events: U): void;
     setCalldata(calldata: Uint8Array): void;
     toOfflineBuffer(refundAddress: string, amount: bigint): Promise<Uint8Array>;
+    private max;
+    private ensureUTXOsAvailable;
+    private computeRequiredAmount;
     private acquire;
     private bigintMax;
     private getValuesFromAccessList;

package/build/contracts/CallResult.js

@@ -427,6 +427,19 @@ export class CallResult {
             }
         }
     }
+    max(a, b) {
+        return a > b ? a : b;
+    }
+    ensureUTXOsAvailable(utxos) {
+        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.');
+        }
+    }
+    computeRequiredAmount(gasFee, priority, amountAddition, totalOuts, extraInputValue, miningCost = 0n, maximumAllowedSatToSpend = 0n) {
+        const gross = this.max(gasFee + priority + amountAddition + totalOuts + miningCost, maximumAllowedSatToSpend);
+        return gross > extraInputValue ? gross - extraInputValue : 1n;
+    }
     async acquire(interactionParams, amountAddition = 0n) {
         if (!this.calldata) {
             throw new Error('Calldata not set');
@@ -439,21 +452,14 @@ export class CallResult {
         const addedOuts = interactionParams.extraOutputs ?? [];
         const totalOuts = addedOuts.reduce((s, o) => s + BigInt(o.value), 0n);
         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(utxos, addedOuts, this.calldata.length + 200, interactionParams.network, 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;
@@ -462,6 +468,7 @@ 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');