opnet 1.8.4 → 1.8.6

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [v1.8.5] - 2026-03-13
+
+### Features
+
+- Fix/bug with building tx ([#146](https://github.com/btc-vision/opnet/pull/146)) by @BlobMaster41
+
+### Bug Fixes
+
+- Fix/bug with building tx ([#146](https://github.com/btc-vision/opnet/pull/146)) by @BlobMaster41
+
+
+
+
 ## [v1.8.3] - 2026-03-09
 
 ### Features

package/browser/_version.d.ts

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

package/browser/block/BlockWitness.d.ts

@@ -1,7 +1,6 @@
 import { Address } from '../../node_modules/@btc-vision/transaction/build/index.js';
 import { BlockWitnesses, IBlockWitness, IBlockWitnessAPI, RawBlockWitnessAPI } from './interfaces/IBlockWitness.js';
 export declare class BlockWitnessAPI implements IBlockWitnessAPI {
-    readonly trusted: boolean;
     readonly signature: Uint8Array;
     readonly timestamp: number;
     readonly proofs: readonly Uint8Array[];

package/browser/block/interfaces/IBlockWitness.d.ts

@@ -1,6 +1,5 @@
 import { Address } from '../../../node_modules/@btc-vision/transaction/build/index.js';
 export interface IBlockWitnessAPI {
-    readonly trusted: boolean;
     readonly signature: Uint8Array;
     readonly timestamp: number;
     readonly proofs: readonly Uint8Array[];
@@ -8,7 +7,6 @@ export interface IBlockWitnessAPI {
     readonly publicKey?: Address;
 }
 export interface RawBlockWitnessAPI {
-    readonly trusted: boolean;
     readonly signature: string;
     readonly timestamp: number;
     readonly proofs: readonly string[];

package/browser/contracts/CallResult.d.ts

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

package/browser/index.js

@@ -2,7 +2,7 @@ import { a as __toESM, r as __exportAll } from "./rolldown-runtime.js";
 import { A as bitcoin, C as AddressVerificator, D as fromHex, E as toBase64, M as regtest, N as testnet, O as toHex, S as AddressTypes, T as fromBase64, _ as BinaryWriter, a as ABICoder, b as AddressMap, c as isAbiTuple, d as process$1, f as P2MR_MS, g as Logger, h as TransactionFactory, i as NetEvent, j as opnetTestnet, k as fromBech32, l as ABIDataTypes, m as ChallengeSolution, n as Long, o as abiTypeToSelectorString, p as P2TR_MS, r as pLimit, s as isAbiStruct, t as BigNumber, u as init_dist, v as BinaryReader, w as decompile, x as Address, y as BufferHelper } from "./vendors.js";
 import { t as require_protobuf_min } from "./protobuf.js";
 //#region src/_version.ts
-var version = "1.8.4";
+var version = "1.8.5";
 //#endregion
 //#region src/interfaces/opnet/OPNetTransactionTypes.ts
 var OPNetTransactionTypes = /* @__PURE__ */ function(OPNetTransactionTypes) {
@@ -548,14 +548,12 @@ function stringBase64ToBuffer(str) {
 //#endregion
 //#region src/block/BlockWitness.ts
 var BlockWitnessAPI = class {
-	trusted;
 	signature;
 	timestamp;
 	proofs;
 	identity;
 	publicKey;
 	constructor(data) {
-		this.trusted = data.trusted;
 		this.signature = stringBase64ToBuffer(data.signature);
 		this.timestamp = data.timestamp;
 		this.proofs = Object.freeze(data.proofs.map((proof) => stringBase64ToBuffer(proof)));
@@ -1355,6 +1353,13 @@ var CallResult = 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;
+	}
 	/**
 	* Acquire UTXOs for the transaction.
 	* @param {TransactionParameters} interactionParams - The transaction parameters.
@@ -1369,17 +1374,20 @@ var CallResult = 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 = this.max(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 = this.max(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;
 			if (refetched) throw new Error("Not enough sat to complete transaction");
 			utxos = await this.#fetchUTXOs(want, interactionParams);
 			refetched = true;
+			this.ensureUTXOsAvailable(utxos);
 			if (utxos.reduce((s, u) => s + u.value, 0n) === have) throw new Error("Not enough sat to complete transaction");
 		}
 		return utxos;
@@ -2685,16 +2693,14 @@ var AbstractRpcProvider = class {
 	* Get block witnesses.
 	* @description This method is used to get the witnesses of a block. This proves that the actions executed inside a block are valid and confirmed by the network. If the minimum number of witnesses are not met, the block is considered as potentially invalid.
 	* @param {BlockTag} height The block number or hash, use -1 for latest block
-	* @param {boolean} [trusted] Whether to trust the witnesses or not
 	* @param {number} [limit] The maximum number of witnesses to return
 	* @param {number} [page] The page number of the witnesses
 	* @returns {Promise<BlockWitnesses>} The witnesses of the block
 	* @example await getBlockWitness(123456n);
 	* @throws {Error} If something went wrong while fetching the witnesses
 	*/
-	async getBlockWitness(height = -1, trusted, limit, page) {
+	async getBlockWitness(height = -1, limit, page) {
 		const params = [height.toString()];
-		if (trusted !== void 0 && trusted !== null) params.push(trusted);
 		if (limit !== void 0 && limit !== null) params.push(limit);
 		if (page !== void 0 && page !== null) params.push(page);
 		const payload = this.buildJsonRpcPayload(JSONRpcMethods.BLOCK_WITNESS, params);
@@ -4462,8 +4468,7 @@ var WebSocketRpcProvider = class extends AbstractRpcProvider {
 			case JSONRpcMethods.BLOCK_WITNESS: return {
 				2: Long.fromString(String(params[0] ?? -1)),
 				3: params[1],
-				4: params[2],
-				5: params[3]
+				4: params[2]
 			};
 			case JSONRpcMethods.GAS: return {};
 			case JSONRpcMethods.GET_TRANSACTION_BY_HASH: return { 2: params[0] };
@@ -8853,7 +8858,7 @@ var OP721Events = [
 				type: ABIDataTypes.ADDRESS
 			},
 			{
-				name: "amount",
+				name: "tokenId",
 				type: ABIDataTypes.UINT256
 			}
 		],
@@ -8867,11 +8872,11 @@ var OP721Events = [
 				type: ABIDataTypes.ADDRESS
 			},
 			{
-				name: "spender",
+				name: "operator",
 				type: ABIDataTypes.ADDRESS
 			},
 			{
-				name: "amount",
+				name: "tokenId",
 				type: ABIDataTypes.UINT256
 			}
 		],
@@ -8895,6 +8900,28 @@ var OP721Events = [
 		],
 		type: BitcoinAbiTypes.Event
 	},
+	{
+		name: "Burned",
+		values: [{
+			name: "from",
+			type: ABIDataTypes.ADDRESS
+		}, {
+			name: "tokenId",
+			type: ABIDataTypes.UINT256
+		}],
+		type: BitcoinAbiTypes.Event
+	},
+	{
+		name: "Minted",
+		values: [{
+			name: "to",
+			type: ABIDataTypes.ADDRESS
+		}, {
+			name: "tokenId",
+			type: ABIDataTypes.UINT256
+		}],
+		type: BitcoinAbiTypes.Event
+	},
 	{
 		name: "URI",
 		values: [{
@@ -8941,30 +8968,6 @@ var OP_721_ABI = [
 			type: ABIDataTypes.UINT256
 		}]
 	},
-	{
-		name: "collectionInfo",
-		type: BitcoinAbiTypes.Function,
-		constant: true,
-		inputs: [],
-		outputs: [
-			{
-				name: "icon",
-				type: ABIDataTypes.STRING
-			},
-			{
-				name: "banner",
-				type: ABIDataTypes.STRING
-			},
-			{
-				name: "description",
-				type: ABIDataTypes.STRING
-			},
-			{
-				name: "website",
-				type: ABIDataTypes.STRING
-			}
-		]
-	},
 	{
 		name: "tokenURI",
 		type: BitcoinAbiTypes.Function,
@@ -9210,7 +9213,7 @@ var OP_721_ABI = [
 		}]
 	},
 	{
-		name: "getApproveNonce",
+		name: "nonceOf",
 		type: BitcoinAbiTypes.Function,
 		constant: true,
 		inputs: [{

package/browser/providers/AbstractRpcProvider.d.ts

@@ -61,7 +61,7 @@ export declare abstract class AbstractRpcProvider {
     sendRawTransaction(tx: string, psbt: boolean): Promise<BroadcastedTransaction>;
     sendRawTransactions(txs: string[]): Promise<BroadcastedTransaction[]>;
     sendRawTransactionPackage(txs: string[], isPackage?: boolean): Promise<BroadcastedTransactionPackage>;
-    getBlockWitness(height?: BigNumberish, trusted?: boolean, limit?: number, page?: number): Promise<BlockWitnesses>;
+    getBlockWitness(height?: BigNumberish, limit?: number, page?: number): Promise<BlockWitnesses>;
     getReorg(fromBlock?: BigNumberish, toBlock?: BigNumberish): Promise<ReorgInformation[]>;
     abstract _send(payload: JsonRpcPayload | JsonRpcPayload[]): Promise<JsonRpcCallResult>;
     callPayloadSingle(payload: JsonRpcPayload): Promise<JsonRpcResult>;

package/build/_version.d.ts

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

package/build/_version.js

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

package/build/abi/shared/json/opnet/OP_721_ABI.js

@@ -18,7 +18,7 @@ export const OP721Events = [
                 type: ABIDataTypes.ADDRESS,
             },
             {
-                name: 'amount',
+                name: 'tokenId',
                 type: ABIDataTypes.UINT256,
             },
         ],
@@ -32,11 +32,11 @@ export const OP721Events = [
                 type: ABIDataTypes.ADDRESS,
             },
             {
-                name: 'spender',
+                name: 'operator',
                 type: ABIDataTypes.ADDRESS,
             },
             {
-                name: 'amount',
+                name: 'tokenId',
                 type: ABIDataTypes.UINT256,
             },
         ],
@@ -60,6 +60,34 @@ export const OP721Events = [
         ],
         type: BitcoinAbiTypes.Event,
     },
+    {
+        name: 'Burned',
+        values: [
+            {
+                name: 'from',
+                type: ABIDataTypes.ADDRESS
+            },
+            {
+                name: 'tokenId',
+                type: ABIDataTypes.UINT256
+            },
+        ],
+        type: BitcoinAbiTypes.Event,
+    },
+    {
+        name: 'Minted',
+        values: [
+            {
+                name: 'to',
+                type: ABIDataTypes.ADDRESS,
+            },
+            {
+                name: 'tokenId',
+                type: ABIDataTypes.UINT256,
+            },
+        ],
+        type: BitcoinAbiTypes.Event,
+    },
     {
         name: 'URI',
         values: [
@@ -112,30 +140,6 @@ export const OP_721_ABI = [
             },
         ],
     },
-    {
-        name: 'collectionInfo',
-        type: BitcoinAbiTypes.Function,
-        constant: true,
-        inputs: [],
-        outputs: [
-            {
-                name: 'icon',
-                type: ABIDataTypes.STRING,
-            },
-            {
-                name: 'banner',
-                type: ABIDataTypes.STRING,
-            },
-            {
-                name: 'description',
-                type: ABIDataTypes.STRING,
-            },
-            {
-                name: 'website',
-                type: ABIDataTypes.STRING,
-            },
-        ],
-    },
     {
         name: 'tokenURI',
         type: BitcoinAbiTypes.Function,
@@ -417,7 +421,7 @@ export const OP_721_ABI = [
         ],
     },
     {
-        name: 'getApproveNonce',
+        name: 'nonceOf',
         type: BitcoinAbiTypes.Function,
         constant: true,
         inputs: [

package/build/block/BlockWitness.d.ts

@@ -1,7 +1,6 @@
 import { Address } from '@btc-vision/transaction';
 import { BlockWitnesses, IBlockWitness, IBlockWitnessAPI, RawBlockWitnessAPI } from './interfaces/IBlockWitness.js';
 export declare class BlockWitnessAPI implements IBlockWitnessAPI {
-    readonly trusted: boolean;
     readonly signature: Uint8Array;
     readonly timestamp: number;
     readonly proofs: readonly Uint8Array[];

package/build/block/BlockWitness.js

@@ -1,14 +1,12 @@
 import { Address } from '@btc-vision/transaction';
 import { stringBase64ToBuffer } from '../utils/StringToBuffer.js';
 export class BlockWitnessAPI {
-    trusted;
     signature;
     timestamp;
     proofs;
     identity;
     publicKey;
     constructor(data) {
-        this.trusted = data.trusted;
         this.signature = stringBase64ToBuffer(data.signature);
         this.timestamp = data.timestamp;
         this.proofs = Object.freeze(data.proofs.map((proof) => stringBase64ToBuffer(proof)));

package/build/block/interfaces/IBlockWitness.d.ts

@@ -1,6 +1,5 @@
 import { Address } from '@btc-vision/transaction';
 export interface IBlockWitnessAPI {
-    readonly trusted: boolean;
     readonly signature: Uint8Array;
     readonly timestamp: number;
     readonly proofs: readonly Uint8Array[];
@@ -8,7 +7,6 @@ export interface IBlockWitnessAPI {
     readonly publicKey?: Address;
 }
 export interface RawBlockWitnessAPI {
-    readonly trusted: boolean;
     readonly signature: string;
     readonly timestamp: number;
     readonly proofs: readonly string[];

package/build/contracts/CallResult.d.ts

@@ -108,6 +108,8 @@ export declare class CallResult<T extends ContractDecodedObjectResult = {}, U ex
     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

@@ -430,6 +430,16 @@ 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');
@@ -442,12 +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 = this.max(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 = this.max(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;
@@ -456,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');

package/build/providers/AbstractRpcProvider.d.ts

@@ -62,7 +62,7 @@ export declare abstract class AbstractRpcProvider {
     sendRawTransaction(tx: string, psbt: boolean): Promise<BroadcastedTransaction>;
     sendRawTransactions(txs: string[]): Promise<BroadcastedTransaction[]>;
     sendRawTransactionPackage(txs: string[], isPackage?: boolean): Promise<BroadcastedTransactionPackage>;
-    getBlockWitness(height?: BigNumberish, trusted?: boolean, limit?: number, page?: number): Promise<BlockWitnesses>;
+    getBlockWitness(height?: BigNumberish, limit?: number, page?: number): Promise<BlockWitnesses>;
     getReorg(fromBlock?: BigNumberish, toBlock?: BigNumberish): Promise<ReorgInformation[]>;
     abstract _send(payload: JsonRpcPayload | JsonRpcPayload[]): Promise<JsonRpcCallResult>;
     callPayloadSingle(payload: JsonRpcPayload): Promise<JsonRpcResult>;

package/build/providers/AbstractRpcProvider.js

@@ -339,10 +339,8 @@ export class AbstractRpcProvider {
         const result = await this.callPayloadSingle(payload);
         return result.result;
     }
-    async getBlockWitness(height = -1, trusted, limit, page) {
+    async getBlockWitness(height = -1, limit, page) {
         const params = [height.toString()];
-        if (trusted !== undefined && trusted !== null)
-            params.push(trusted);
         if (limit !== undefined && limit !== null)
             params.push(limit);
         if (page !== undefined && page !== null)

package/build/providers/WebsocketRpcProvider.js

@@ -226,7 +226,6 @@ export class WebSocketRpcProvider extends AbstractRpcProvider {
                     2: Long.fromString(String(params[0] ?? -1)),
                     3: params[1],
                     4: params[2],
-                    5: params[3],
                 };
             case JSONRpcMethods.GAS:
                 return {};