opnet 1.8.4 → 1.8.6

package/docs/abi-reference/op721-abi.md

@@ -30,7 +30,6 @@ import {
 | `name()` | - | `string` | Collection name |
 | `symbol()` | - | `string` | Collection symbol |
 | `maxSupply()` | - | `bigint` | Maximum supply |
-| `collectionInfo()` | - | `{ icon, banner, description, website }` | Collection metadata |
 | `tokenURI(tokenId)` | `bigint` | `string` | Token metadata URI |
 | `metadata()` | - | Full metadata object | All metadata in one call |
 
@@ -79,7 +78,7 @@ import {
 | `changeMetadata()` | - | - | Trigger metadata change |
 | `setBaseURI(baseURI)` | `string` | - | Set base URI for tokens |
 | `domainSeparator()` | - | `Uint8Array` | EIP-712 domain separator |
-| `getApproveNonce(owner)` | `Address` | `bigint` | Get nonce for signatures |
+| `nonceOf(owner)` | `Address` | `bigint` | Get nonce for signatures |
 
 ---
 
@@ -94,7 +93,7 @@ interface TransferredEventNFT {
     operator: Address;  // Who initiated the transfer
     from: Address;      // Sender
     to: Address;        // Recipient
-    amount: bigint;     // Amount (1 for single NFT)
+    tokenId: bigint;    // Token ID
 }
 ```
 
@@ -105,8 +104,8 @@ Emitted when single token approval changes.
 ```typescript
 interface ApprovedEventNFT {
     owner: Address;     // Token owner
-    spender: Address;   // Approved spender
-    amount: bigint;     // Token ID as amount
+    operator: Address;  // Approved operator
+    tokenId: bigint;    // Token ID
 }
 ```
 
@@ -122,6 +121,28 @@ interface ApprovedForAllEventNFT {
 }
 ```
 
+### Burned
+
+Emitted when a token is burned.
+
+```typescript
+interface BurnedEventNFT {
+    from: Address;      // Token owner
+    tokenId: bigint;    // Token ID
+}
+```
+
+### Minted
+
+Emitted when a new token is minted.
+
+```typescript
+interface MintedEventNFT {
+    to: Address;        // Recipient
+    tokenId: bigint;    // Token ID
+}
+```
+
 ### URI
 
 Emitted when token URI changes.
@@ -165,10 +186,10 @@ console.log('Collection:', name.properties.name);
 console.log('Symbol:', symbol.properties.symbol);
 console.log('Max Supply:', maxSupply.properties.maxSupply);
 
-// Get full collection metadata
-const info = await nft.collectionInfo();
-console.log('Description:', info.properties.description);
-console.log('Website:', info.properties.website);
+// Get full collection metadata in one call
+const metadata = await nft.metadata();
+console.log('Description:', metadata.properties.description);
+console.log('Website:', metadata.properties.website);
 ```
 
 ### Check Ownership
@@ -363,18 +384,6 @@ export const OP_721_ABI: BitcoinInterfaceAbi = [
         outputs: [{ name: 'maxSupply', type: ABIDataTypes.UINT256 }],
         type: BitcoinAbiTypes.Function,
     },
-    {
-        name: 'collectionInfo',
-        constant: true,
-        inputs: [],
-        outputs: [
-            { name: 'icon', type: ABIDataTypes.STRING },
-            { name: 'banner', type: ABIDataTypes.STRING },
-            { name: 'description', type: ABIDataTypes.STRING },
-            { name: 'website', type: ABIDataTypes.STRING },
-        ],
-        type: BitcoinAbiTypes.Function,
-    },
     {
         name: 'tokenURI',
         constant: true,
@@ -549,7 +558,7 @@ export const OP_721_ABI: BitcoinInterfaceAbi = [
         type: BitcoinAbiTypes.Function,
     },
     {
-        name: 'getApproveNonce',
+        name: 'nonceOf',
         constant: true,
         inputs: [{ name: 'owner', type: ABIDataTypes.ADDRESS }],
         outputs: [{ name: 'nonce', type: ABIDataTypes.UINT256 }],
@@ -563,7 +572,7 @@ export const OP_721_ABI: BitcoinInterfaceAbi = [
             { name: 'operator', type: ABIDataTypes.ADDRESS },
             { name: 'from', type: ABIDataTypes.ADDRESS },
             { name: 'to', type: ABIDataTypes.ADDRESS },
-            { name: 'amount', type: ABIDataTypes.UINT256 },
+            { name: 'tokenId', type: ABIDataTypes.UINT256 },
         ],
         type: BitcoinAbiTypes.Event,
     },
@@ -571,8 +580,8 @@ export const OP_721_ABI: BitcoinInterfaceAbi = [
         name: 'Approved',
         values: [
             { name: 'owner', type: ABIDataTypes.ADDRESS },
-            { name: 'spender', type: ABIDataTypes.ADDRESS },
-            { name: 'amount', type: ABIDataTypes.UINT256 },
+            { name: 'operator', type: ABIDataTypes.ADDRESS },
+            { name: 'tokenId', type: ABIDataTypes.UINT256 },
         ],
         type: BitcoinAbiTypes.Event,
     },
@@ -585,6 +594,22 @@ export const OP_721_ABI: BitcoinInterfaceAbi = [
         ],
         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: [

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "opnet",
     "type": "module",
-    "version": "1.8.4",
+    "version": "1.8.6",
     "author": "OP_NET",
     "description": "The perfect library for building Bitcoin-based applications.",
     "engines": {
@@ -101,7 +101,7 @@
     },
     "devDependencies": {
         "@babel/core": "^7.29.0",
-        "@babel/preset-env": "^7.29.0",
+        "@babel/preset-env": "^7.29.2",
         "@babel/preset-typescript": "^7.28.5",
         "@eslint/js": "^10.0.1",
         "@microsoft/api-extractor": "7.57.7",
@@ -116,7 +116,7 @@
         "stream-browserify": "^3.0.0",
         "typedoc": "^0.28.17",
         "typescript": "^5.9.3",
-        "typescript-eslint": "^8.57.0",
+        "typescript-eslint": "^8.57.1",
         "vite": "^8.0.0",
         "vite-plugin-dts": "4.5.4",
         "vite-plugin-node-polyfills": "^0.25.0",
@@ -143,7 +143,7 @@
         "p-limit": "^7.3.0",
         "pako": "^2.1.0",
         "protobufjs": "^8.0.0",
-        "undici": "^7.24.0"
+        "undici": "^7.24.4"
     },
     "overrides": {
         "vite-plugin-node-polyfills": {

package/src/_version.ts

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

package/src/abi/shared/json/opnet/OP_721_ABI.ts

@@ -23,7 +23,7 @@ export const OP721Events: BitcoinInterfaceAbi = [
                 type: ABIDataTypes.ADDRESS,
             },
             {
-                name: 'amount',
+                name: 'tokenId',
                 type: ABIDataTypes.UINT256,
             },
         ],
@@ -37,11 +37,11 @@ export const OP721Events: BitcoinInterfaceAbi = [
                 type: ABIDataTypes.ADDRESS,
             },
             {
-                name: 'spender',
+                name: 'operator',
                 type: ABIDataTypes.ADDRESS,
             },
             {
-                name: 'amount',
+                name: 'tokenId',
                 type: ABIDataTypes.UINT256,
             },
         ],
@@ -65,6 +65,34 @@ export const OP721Events: BitcoinInterfaceAbi = [
         ],
         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: [
@@ -121,30 +149,6 @@ export const OP_721_ABI: BitcoinInterfaceAbi = [
             },
         ],
     },
-    {
-        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,
@@ -426,7 +430,7 @@ export const OP_721_ABI: BitcoinInterfaceAbi = [
         ],
     },
     {
-        name: 'getApproveNonce',
+        name: 'nonceOf',
         type: BitcoinAbiTypes.Function,
         constant: true,
         inputs: [

package/src/block/BlockWitness.ts

@@ -8,7 +8,6 @@ import {
 } from './interfaces/IBlockWitness.js';
 
 export class BlockWitnessAPI implements IBlockWitnessAPI {
-    public readonly trusted: boolean;
     public readonly signature: Uint8Array;
     public readonly timestamp: number;
     public readonly proofs: readonly Uint8Array[];
@@ -16,7 +15,6 @@ export class BlockWitnessAPI implements IBlockWitnessAPI {
     public readonly publicKey?: Address;
 
     constructor(data: RawBlockWitnessAPI) {
-        this.trusted = data.trusted;
         this.signature = stringBase64ToBuffer(data.signature);
         this.timestamp = data.timestamp;
         this.proofs = Object.freeze(data.proofs.map((proof) => stringBase64ToBuffer(proof)));

package/src/block/interfaces/IBlockWitness.ts

@@ -1,7 +1,6 @@
 import { Address } from '@btc-vision/transaction';
 
 export interface IBlockWitnessAPI {
-    readonly trusted: boolean;
     readonly signature: Uint8Array;
     readonly timestamp: number;
 
@@ -12,7 +11,6 @@ export interface IBlockWitnessAPI {
 }
 
 export interface RawBlockWitnessAPI {
-    readonly trusted: boolean;
     readonly signature: string;
     readonly timestamp: number;
 

package/src/contracts/CallResult.ts

@@ -1,13 +1,5 @@
 import { QuantumBIP32Interface } from '@btc-vision/bip32';
-import {
-    fromBase64,
-    fromHex,
-    Network,
-    networks,
-    PsbtOutputExtended,
-    Signer,
-    toHex,
-} from '@btc-vision/bitcoin';
+import { fromBase64, fromHex, Network, networks, PsbtOutputExtended, Signer, toHex, } from '@btc-vision/bitcoin';
 import { UniversalSigner } from '@btc-vision/ecpair';
 import {
     Address,
@@ -816,6 +808,34 @@ export class CallResult<
         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.
@@ -841,13 +861,25 @@ export class CallResult<
 
         const gasFee = this.bigintMax(this.estimatedSatGas, interactionParams.minGas ?? 0n);
 
-        const preWant = this.max(
-            gasFee + priority + amountAddition + totalOuts,
+        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(
@@ -858,8 +890,13 @@ export class CallResult<
                 feeRate,
             );
 
-            const want = this.max(
-                gasFee + priority + amountAddition + totalOuts + miningCost,
+            const want = this.computeRequiredAmount(
+                gasFee,
+                priority,
+                amountAddition,
+                totalOuts,
+                extraInputValue,
+                miningCost,
                 interactionParams.maximumAllowedSatToSpend,
             );
 
@@ -873,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');

package/src/providers/AbstractRpcProvider.ts

@@ -759,7 +759,6 @@ export abstract class AbstractRpcProvider {
      * 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
@@ -768,13 +767,11 @@ export abstract class AbstractRpcProvider {
      */
     public async getBlockWitness(
         height: BigNumberish = -1,
-        trusted?: boolean,
         limit?: number,
         page?: number,
     ): Promise<BlockWitnesses> {
-        const params: [BigNumberish, boolean?, number?, number?] = [height.toString()];
+        const params: [BigNumberish, number?, number?] = [height.toString()];
 
-        if (trusted !== undefined && trusted !== null) params.push(trusted);
         if (limit !== undefined && limit !== null) params.push(limit);
         if (page !== undefined && page !== null) params.push(page);
 

package/src/providers/WebsocketRpcProvider.ts

@@ -398,12 +398,11 @@ export class WebSocketRpcProvider extends AbstractRpcProvider {
                 };
 
             case JSONRpcMethods.BLOCK_WITNESS:
-                // GetBlockWitnessRequest: requestId=1, height=2, trusted=3, limit=4, page=5
+                // GetBlockWitnessRequest: requestId=1, height=2, limit=3, page=4
                 return {
                     2: Long.fromString(String(params[0] ?? -1)),
                     3: params[1],
                     4: params[2],
-                    5: params[3],
                 };
 
             case JSONRpcMethods.GAS:

package/test/mempool.test.ts

@@ -5,7 +5,7 @@ import { AddressTypes } from '@btc-vision/transaction';
 import type { JsonRpcPayload } from '../src/providers/interfaces/JSONRpc.js';
 import type { JsonRpcCallResult } from '../src/providers/interfaces/JSONRpcResult.js';
 import type { MempoolInfo } from '../src/providers/interfaces/mempool/MempoolInfo.js';
-import type { IMempoolTransactionData } from '../src/providers/interfaces/mempool/MempoolTransactionData.js';
+import type { IMempoolTransactionData, IMempoolOPNetTransactionData } from '../src/providers/interfaces/mempool/MempoolTransactionData.js';
 
 // ============================================================================
 // Mock provider that intercepts _send
@@ -146,7 +146,7 @@ describe('Mempool API - Unit Tests', () => {
     // ========================================================================
 
     describe('getPendingTransaction', () => {
-        const mockTx: IMempoolTransactionData = {
+        const mockTx: IMempoolOPNetTransactionData = {
             id: 'abc123def456abc123def456abc123def456abc123def456abc123def456abc1',
             firstSeen: '2023-11-14T22:13:20.000Z',
             blockHeight: '0xcf080',
@@ -270,13 +270,14 @@ describe('Mempool API - Unit Tests', () => {
 
         it('should handle Generic transaction', async () => {
             const nonOPNetTx: IMempoolTransactionData = {
-                ...mockTx,
+                id: mockTx.id,
+                firstSeen: mockTx.firstSeen,
+                blockHeight: mockTx.blockHeight,
                 transactionType: 'Generic',
-                theoreticalGasLimit: undefined,
-                priorityFee: undefined,
-                from: undefined,
-                contractAddress: undefined,
-                calldata: undefined,
+                psbt: mockTx.psbt,
+                inputs: mockTx.inputs,
+                outputs: mockTx.outputs,
+                raw: mockTx.raw,
             };
 
             provider.mockSend.mockResolvedValue([
@@ -350,7 +351,7 @@ describe('Mempool API - Unit Tests', () => {
     // ========================================================================
 
     describe('getLatestPendingTransactions', () => {
-        const mockTx1: IMempoolTransactionData = {
+        const mockTx1: IMempoolOPNetTransactionData = {
             id: 'a000000000000000000000000000000000000000000000000000000000000001',
             firstSeen: '2023-11-14T22:13:20.000Z',
             blockHeight: '0xcf080',
@@ -603,7 +604,7 @@ describe('Mempool API - Unit Tests', () => {
     // ========================================================================
 
     describe('getLatestPendingTransactionsByAddresses', () => {
-        const mockTx1: IMempoolTransactionData = {
+        const mockTx1: IMempoolOPNetTransactionData = {
             id: 'a000000000000000000000000000000000000000000000000000000000000001',
             firstSeen: '2023-11-14T22:13:20.000Z',
             blockHeight: '0xcf080',
@@ -710,12 +711,12 @@ describe('Mempool API - Unit Tests', () => {
 // Integration Tests - Real Regtest Network
 // ============================================================================
 
-describe('Mempool API - Integration Tests (regtest.opnet.org)', () => {
-    const REGTEST_URL = 'https://regtest.opnet.org';
+describe('Mempool API - Integration Tests (testnet.opnet.org)', () => {
+    const TESTNET_URL = 'https://testnet.opnet.org';
     let provider: JSONRpcProvider;
 
     beforeEach(() => {
-        provider = new JSONRpcProvider({ url: REGTEST_URL, network: networks.regtest });
+        provider = new JSONRpcProvider({ url: TESTNET_URL, network: networks.opnetTestnet });
     });
 
     describe('getMempoolInfo', () => {
@@ -745,8 +746,8 @@ describe('Mempool API - Integration Tests (regtest.opnet.org)', () => {
             if (txs.length > 0) {
                 const tx = txs[0];
                 expect(typeof tx.id).toBe('string');
-                expect(typeof tx.firstSeen).toBe('string');
-                expect(typeof tx.blockHeight).toBe('string');
+                expect(tx.firstSeen).toBeDefined();
+                expect(tx.blockHeight).toBeDefined();
                 expect(typeof tx.transactionType).toBe('string');
                 expect(typeof tx.psbt).toBe('boolean');
                 expect(Array.isArray(tx.inputs)).toBe(true);