opnet 1.4.0 → 1.4.2

package/browser/transactions/interfaces/BroadcastedTransaction.d.ts

@@ -3,5 +3,4 @@ export interface BroadcastedTransaction {
     readonly result?: string;
     readonly error?: string;
     readonly peers?: number;
-    readonly id: string;
 }

package/browser/utxos/UTXOsManager.d.ts

@@ -3,17 +3,14 @@ import { AbstractRpcProvider } from '../providers/AbstractRpcProvider.js';
 import { RequestUTXOsParams, RequestUTXOsParamsWithAmount } from './interfaces/IUTXOsManager.js';
 export declare class UTXOsManager {
     private readonly provider;
-    private spentUTXOs;
-    private pendingUTXOs;
-    private pendingUtxoDepth;
-    private lastCleanup;
-    private lastFetchTimestamp;
-    private lastFetchedData;
+    private dataByAddress;
     constructor(provider: AbstractRpcProvider);
-    spentUTXO(spent: UTXOs, newUTXOs: UTXOs): void;
-    clean(): void;
+    spentUTXO(address: string, spent: UTXOs, newUTXOs: UTXOs): void;
+    getPendingUTXOs(address: string): UTXOs;
+    clean(address?: string): void;
     getUTXOs({ address, optimize, mergePendingUTXOs, filterSpentUTXOs, }: RequestUTXOsParams): Promise<UTXOs>;
     getUTXOsForAmount({ address, amount, optimize, mergePendingUTXOs, filterSpentUTXOs, throwErrors, }: RequestUTXOsParamsWithAmount): Promise<UTXOs>;
+    private getAddressData;
     private maybeFetchUTXOs;
     private fetchUTXOs;
     private syncPendingDepthWithFetched;

package/build/_version.d.ts

@@ -1 +1 @@
-export declare const version = "1.4.0";
+export declare const version = "1.4.2";

package/build/_version.js

@@ -1 +1 @@
-export const version = '1.4.0';
+export const version = '1.4.2';

package/build/contracts/CallResult.js

@@ -137,7 +137,7 @@ export class CallResult {
             if (!tx2.result) {
                 throw new Error('No transaction ID returned');
             }
-            this.#provider.utxoManager.spentUTXO(UTXOs, transaction.nextUTXOs);
+            this.#provider.utxoManager.spentUTXO(interactionParams.refundTo, UTXOs, transaction.nextUTXOs);
             return {
                 transactionId: tx2.result,
                 peerAcknowledgements: tx2.peers || 0,

package/build/providers/AbstractRpcProvider.js

@@ -278,14 +278,7 @@ export class AbstractRpcProvider {
         }
         const payload = this.buildJsonRpcPayload(JSONRpcMethods.BROADCAST_TRANSACTION, [tx, psbt]);
         const rawTx = await this.callPayloadSingle(payload);
-        const result = rawTx.result;
-        if (result && result.id) {
-            return {
-                ...result,
-                id: result.id,
-            };
-        }
-        return result;
+        return rawTx.result;
     }
     async sendRawTransactions(txs) {
         const payloads = txs.map((tx) => {
@@ -296,14 +289,7 @@ export class AbstractRpcProvider {
             throw new Error(`Error sending transactions: ${rawTxs.error}`);
         }
         return rawTxs.map((rawTx) => {
-            const result = rawTx.result;
-            if (result && result.id) {
-                return {
-                    ...result,
-                    id: result.id,
-                };
-            }
-            return result;
+            return rawTx.result;
         });
     }
     async getBlockWitness(height = -1, trusted, limit, page) {

package/build/transactions/interfaces/BroadcastedTransaction.d.ts

@@ -3,5 +3,4 @@ export interface BroadcastedTransaction {
     readonly result?: string;
     readonly error?: string;
     readonly peers?: number;
-    readonly id: string;
 }

package/build/utxos/UTXOsManager.d.ts

@@ -3,17 +3,14 @@ import { AbstractRpcProvider } from '../providers/AbstractRpcProvider.js';
 import { RequestUTXOsParams, RequestUTXOsParamsWithAmount } from './interfaces/IUTXOsManager.js';
 export declare class UTXOsManager {
     private readonly provider;
-    private spentUTXOs;
-    private pendingUTXOs;
-    private pendingUtxoDepth;
-    private lastCleanup;
-    private lastFetchTimestamp;
-    private lastFetchedData;
+    private dataByAddress;
     constructor(provider: AbstractRpcProvider);
-    spentUTXO(spent: UTXOs, newUTXOs: UTXOs): void;
-    clean(): void;
+    spentUTXO(address: string, spent: UTXOs, newUTXOs: UTXOs): void;
+    getPendingUTXOs(address: string): UTXOs;
+    clean(address?: string): void;
     getUTXOs({ address, optimize, mergePendingUTXOs, filterSpentUTXOs, }: RequestUTXOsParams): Promise<UTXOs>;
     getUTXOsForAmount({ address, amount, optimize, mergePendingUTXOs, filterSpentUTXOs, throwErrors, }: RequestUTXOsParamsWithAmount): Promise<UTXOs>;
+    private getAddressData;
     private maybeFetchUTXOs;
     private fetchUTXOs;
     private syncPendingDepthWithFetched;

package/build/utxos/UTXOsManager.js

@@ -5,30 +5,26 @@ const FETCH_COOLDOWN = 10000;
 const MEMPOOL_CHAIN_LIMIT = 25;
 export class UTXOsManager {
     provider;
-    spentUTXOs = [];
-    pendingUTXOs = [];
-    pendingUtxoDepth = {};
-    lastCleanup = Date.now();
-    lastFetchTimestamp = 0;
-    lastFetchedData = null;
+    dataByAddress = {};
     constructor(provider) {
         this.provider = provider;
     }
-    spentUTXO(spent, newUTXOs) {
+    spentUTXO(address, spent, newUTXOs) {
+        const addressData = this.getAddressData(address);
         const utxoKey = (u) => `${u.transactionId}:${u.outputIndex}`;
-        this.pendingUTXOs = this.pendingUTXOs.filter((utxo) => {
+        addressData.pendingUTXOs = addressData.pendingUTXOs.filter((utxo) => {
             return !spent.some((spentUtxo) => spentUtxo.transactionId === utxo.transactionId &&
                 spentUtxo.outputIndex === utxo.outputIndex);
         });
         for (const spentUtxo of spent) {
             const key = utxoKey(spentUtxo);
-            delete this.pendingUtxoDepth[key];
+            delete addressData.pendingUtxoDepth[key];
         }
-        this.spentUTXOs.push(...spent);
+        addressData.spentUTXOs.push(...spent);
         let maxParentDepth = 0;
         for (const spentUtxo of spent) {
             const key = utxoKey(spentUtxo);
-            const parentDepth = this.pendingUtxoDepth[key] ?? 0;
+            const parentDepth = addressData.pendingUtxoDepth[key] ?? 0;
             if (parentDepth > maxParentDepth) {
                 maxParentDepth = parentDepth;
             }
@@ -38,23 +34,34 @@ export class UTXOsManager {
             throw new Error(`too-long-mempool-chain, too many descendants for tx ... [limit: ${MEMPOOL_CHAIN_LIMIT}]`);
         }
         for (const nu of newUTXOs) {
-            this.pendingUTXOs.push(nu);
-            this.pendingUtxoDepth[utxoKey(nu)] = newDepth;
+            addressData.pendingUTXOs.push(nu);
+            addressData.pendingUtxoDepth[utxoKey(nu)] = newDepth;
         }
     }
-    clean() {
-        this.spentUTXOs = [];
-        this.pendingUTXOs = [];
-        this.pendingUtxoDepth = {};
-        this.lastCleanup = Date.now();
-        this.lastFetchTimestamp = 0;
-        this.lastFetchedData = null;
+    getPendingUTXOs(address) {
+        const addressData = this.getAddressData(address);
+        return addressData.pendingUTXOs;
+    }
+    clean(address) {
+        if (address) {
+            const addressData = this.getAddressData(address);
+            addressData.spentUTXOs = [];
+            addressData.pendingUTXOs = [];
+            addressData.pendingUtxoDepth = {};
+            addressData.lastCleanup = Date.now();
+            addressData.lastFetchTimestamp = 0;
+            addressData.lastFetchedData = null;
+        }
+        else {
+            this.dataByAddress = {};
+        }
     }
     async getUTXOs({ address, optimize = true, mergePendingUTXOs = true, filterSpentUTXOs = true, }) {
+        const addressData = this.getAddressData(address);
         const fetchedData = await this.maybeFetchUTXOs(address, optimize);
         const utxoKey = (utxo) => `${utxo.transactionId}:${utxo.outputIndex}`;
-        const pendingUTXOKeys = new Set(this.pendingUTXOs.map(utxoKey));
-        const spentUTXOKeys = new Set(this.spentUTXOs.map(utxoKey));
+        const pendingUTXOKeys = new Set(addressData.pendingUTXOs.map(utxoKey));
+        const spentUTXOKeys = new Set(addressData.spentUTXOs.map(utxoKey));
         const fetchedSpentKeys = new Set(fetchedData.spentTransactions.map(utxoKey));
         const combinedUTXOs = [];
         const combinedKeysSet = new Set();
@@ -66,7 +73,7 @@ export class UTXOsManager {
             }
         }
         if (mergePendingUTXOs) {
-            for (const utxo of this.pendingUTXOs) {
+            for (const utxo of addressData.pendingUTXOs) {
                 const key = utxoKey(utxo);
                 if (!combinedKeysSet.has(key)) {
                     combinedUTXOs.push(utxo);
@@ -108,23 +115,36 @@ export class UTXOsManager {
         }
         return utxoUntilAmount;
     }
+    getAddressData(address) {
+        if (!this.dataByAddress[address]) {
+            this.dataByAddress[address] = {
+                spentUTXOs: [],
+                pendingUTXOs: [],
+                pendingUtxoDepth: {},
+                lastCleanup: Date.now(),
+                lastFetchTimestamp: 0,
+                lastFetchedData: null,
+            };
+        }
+        return this.dataByAddress[address];
+    }
     async maybeFetchUTXOs(address, optimize) {
+        const addressData = this.getAddressData(address);
         const now = Date.now();
-        const age = now - this.lastFetchTimestamp;
-        if (now - this.lastCleanup > AUTO_PURGE_AFTER) {
-            this.clean();
+        const age = now - addressData.lastFetchTimestamp;
+        if (now - addressData.lastCleanup > AUTO_PURGE_AFTER) {
+            this.clean(address);
         }
-        if (this.lastFetchedData && age < FETCH_COOLDOWN) {
-            return this.lastFetchedData;
+        if (addressData.lastFetchedData && age < FETCH_COOLDOWN) {
+            return addressData.lastFetchedData;
         }
-        this.lastFetchedData = await this.fetchUTXOs(address, optimize);
-        this.lastFetchTimestamp = now;
-        this.syncPendingDepthWithFetched();
-        return this.lastFetchedData;
+        addressData.lastFetchedData = await this.fetchUTXOs(address, optimize);
+        addressData.lastFetchTimestamp = now;
+        this.syncPendingDepthWithFetched(address);
+        return addressData.lastFetchedData;
     }
     async fetchUTXOs(address, optimize = false) {
-        const addressStr = address.toString();
-        const payload = this.provider.buildJsonRpcPayload(JSONRpcMethods.GET_UTXOS, [addressStr, optimize]);
+        const payload = this.provider.buildJsonRpcPayload(JSONRpcMethods.GET_UTXOS, [address, optimize]);
         const rawUTXOs = await this.provider.callPayloadSingle(payload);
         if ('error' in rawUTXOs) {
             throw new Error(`Error fetching block: ${rawUTXOs.error}`);
@@ -140,16 +160,17 @@ export class UTXOsManager {
             spentTransactions: result.spentTransactions.map((utxo) => new UTXO(utxo)),
         };
     }
-    syncPendingDepthWithFetched() {
-        if (!this.lastFetchedData) {
+    syncPendingDepthWithFetched(address) {
+        const addressData = this.getAddressData(address);
+        const fetched = addressData.lastFetchedData;
+        if (!fetched)
             return;
-        }
-        const confirmedKeys = new Set(this.lastFetchedData.confirmed.map((u) => `${u.transactionId}:${u.outputIndex}`));
-        const spentKeys = new Set(this.lastFetchedData.spentTransactions.map((u) => `${u.transactionId}:${u.outputIndex}`));
-        this.pendingUTXOs = this.pendingUTXOs.filter((u) => {
+        const confirmedKeys = new Set(fetched.confirmed.map((u) => `${u.transactionId}:${u.outputIndex}`));
+        const spentKeys = new Set(fetched.spentTransactions.map((u) => `${u.transactionId}:${u.outputIndex}`));
+        addressData.pendingUTXOs = addressData.pendingUTXOs.filter((u) => {
             const key = `${u.transactionId}:${u.outputIndex}`;
             if (confirmedKeys.has(key) || spentKeys.has(key)) {
-                delete this.pendingUtxoDepth[key];
+                delete addressData.pendingUtxoDepth[key];
                 return false;
             }
             return true;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "opnet",
     "type": "module",
-    "version": "1.4.0",
+    "version": "1.4.2",
     "author": "OP_NET",
     "description": "The perfect library for building Bitcoin-based applications.",
     "engines": {
@@ -103,7 +103,7 @@
         "@bitcoinerlab/secp256k1": "^1.2.0",
         "@btc-vision/bitcoin": "^6.3.6",
         "@btc-vision/bitcoin-rpc": "^1.0.1",
-        "@btc-vision/transaction": "^1.3.8",
+        "@btc-vision/transaction": "^1.4.0",
         "@noble/hashes": "^1.7.1",
         "bignumber.js": "^9.1.2",
         "buffer": "^6.0.3",

package/src/_version.ts

@@ -1 +1 @@
-export const version = '1.4.0';
+export const version = '1.4.2';

package/src/contracts/CallResult.ts

@@ -250,7 +250,11 @@ export class CallResult<
                 throw new Error('No transaction ID returned');
             }
 
-            this.#provider.utxoManager.spentUTXO(UTXOs, transaction.nextUTXOs);
+            this.#provider.utxoManager.spentUTXO(
+                interactionParams.refundTo,
+                UTXOs,
+                transaction.nextUTXOs,
+            );
 
             return {
                 transactionId: tx2.result,

package/src/providers/AbstractRpcProvider.ts

@@ -586,15 +586,7 @@ export abstract class AbstractRpcProvider {
         );
 
         const rawTx: JsonRpcResult = await this.callPayloadSingle(payload);
-        const result: BroadcastedTransaction = rawTx.result as BroadcastedTransaction;
-        if (result && result.id) {
-            return {
-                ...result,
-                id: result.id,
-            };
-        }
-
-        return result;
+        return rawTx.result as BroadcastedTransaction;
     }
 
     /**
@@ -615,15 +607,7 @@ export abstract class AbstractRpcProvider {
         }
 
         return rawTxs.map((rawTx) => {
-            const result: BroadcastedTransaction = rawTx.result as BroadcastedTransaction;
-            if (result && result.id) {
-                return {
-                    ...result,
-                    id: result.id,
-                };
-            }
-
-            return result;
+            return rawTx.result as BroadcastedTransaction;
         });
     }
 

package/src/transactions/interfaces/BroadcastedTransaction.ts

@@ -16,9 +16,4 @@ export interface BroadcastedTransaction {
      * The number of peers that the transaction was broadcasted to.
      */
     readonly peers?: number;
-
-    /**
-     * The identifier of the transaction.
-     */
-    readonly id: string;
 }