gn-provider 1.1.7 → 1.1.9

package/dist/gn-provider.d.ts

@@ -5,6 +5,9 @@ declare enum ProviderEvent {
     Connected = "connected",
     NetworkChange = "networkChange"
 }
+export type UTXOWithHeight = UTXO & {
+    height: number;
+};
 export declare class GNProvider extends Provider {
     emit: (event: ProviderEvent, ...args: any[]) => boolean;
     private _network;
@@ -21,7 +24,7 @@ export declare class GNProvider extends Provider {
     protected _ready: () => Promise<void>;
     sendRawTransaction: (rawTxHex: string) => Promise<TxHash>;
     sendTransaction: (signedTx: scryptlib.bsv.Transaction) => Promise<string>;
-    listUnspent: (address: AddressOption, options?: UtxoQueryOptions) => Promise<UTXO[]>;
+    listUnspent: (address: AddressOption, options?: UtxoQueryOptions) => Promise<UTXOWithHeight[]>;
     getBalance: (address: AddressOption) => Promise<{
         confirmed: number;
         unconfirmed: number;

package/dist/gn-provider.js

@@ -43,14 +43,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GNProvider = void 0;
-// Agrega esto al inicio del archivo
-// @ts-ignore
 const events_1 = require("events");
 const scryptlib = __importStar(require("scryptlib"));
 const abstract_provider_1 = require("scrypt-ts/dist/bsv/abstract-provider");
 const superagent = __importStar(require("superagent"));
-const utils_1 = require("scrypt-ts/dist/bsv/utils");
-//import { EventEmitter } from 'events';
 var ProviderEvent;
 (function (ProviderEvent) {
     ProviderEvent["Connected"] = "connected";
@@ -63,19 +59,11 @@ class GNProvider extends abstract_provider_1.Provider {
         this._getHeaders = () => {
             return Object.assign({ 'Content-Type': 'application/json' }, (this._apiKey ? { 'woc-api-key': this._apiKey } : {}));
         };
-        /*get apiPrefix(): string {
-            const networkStr = this._network.name === scryptlib.bsv.Networks.mainnet.name ? 'main' : 'test';
-            return `https://api.whatsonchain.com/v1/bsv/${networkStr}`;
-        }*/
-        /*apiPrefix = (): string => {
-             const networkStr = this._network.name === scryptlib.bsv.Networks.mainnet.name ? 'main' : 'test';
-             return `https://api.whatsonchain.com/v1/bsv/${networkStr}`;
-         }*/
         this.connect = () => __awaiter(this, void 0, void 0, function* () {
             var _a;
             try {
                 const headers = this._getHeaders();
-                const res = yield superagent.get(`${this.apiPrefix()}/woc`) //`${this.apiPrefix}/woc`) 
+                const res = yield superagent.get(`${this.apiPrefix()}/woc`)
                     .timeout(3000)
                     .set(headers);
                 if (res.ok && res.text === "Whats On Chain") {
@@ -91,7 +79,6 @@ class GNProvider extends abstract_provider_1.Provider {
                 throw new Error(`connect failed: ${error.message || "unknown error"}`);
             }
         });
-        //async getFeePerKb(): Promise<number> {
         this.getFeePerKb = () => __awaiter(this, void 0, void 0, function* () {
             yield this._ready();
             const headers = this._getHeaders();
@@ -111,40 +98,15 @@ class GNProvider extends abstract_provider_1.Provider {
                 throw new Error("No fee data available");
             }
             catch (error) {
-                return 1.05; // Valor de fallback
+                return 1.05;
             }
         });
-        /*isConnected(): boolean {
-        return this._isConnected;
-    }*/
         this.isConnected = () => this._isConnected;
-        /*private _getHeaders() {
-            return {
-                'Content-Type': 'application/json',
-                ...(this._apiKey ? { 'woc-api-key': this._apiKey } : {})
-            };
-        }*/
-        /*updateNetwork(network: scryptlib.bsv.Networks.Network): void {
-            this._network = network;
-            this.emit(ProviderEvent.NetworkChange, network);
-        }*/
         this.updateNetwork = (network) => {
             this._network = network;
             this.emit(ProviderEvent.NetworkChange, network);
         };
-        /*getNetwork(): scryptlib.bsv.Networks.Network {
-            return this._network;
-        }*/
         this.getNetwork = () => this._network;
-        /*protected async _ready(): Promise<void> {
-            if (!this.isConnected()) {
-                try {
-                    await this.connect();
-                } catch (error) {
-                    throw error;
-                }
-            }
-        }*/
         this._ready = () => __awaiter(this, void 0, void 0, function* () {
             if (!this.isConnected()) {
                 try {
@@ -155,13 +117,12 @@ class GNProvider extends abstract_provider_1.Provider {
                 }
             }
         });
-        //async sendRawTransaction(rawTxHex: string): Promise<TxHash> {
         this.sendRawTransaction = (rawTxHex) => __awaiter(this, void 0, void 0, function* () {
             var _a;
             yield this._ready();
             const headers = this._getHeaders();
-            const size = Math.max(1, rawTxHex.length / 2 / 1024); // Tamaño en KB
-            const timeout = Math.max(10000, 1000 * size); // Timeout dinámico
+            const size = Math.max(1, rawTxHex.length / 2 / 1024);
+            const timeout = Math.max(10000, 1000 * size);
             try {
                 const res = yield superagent.post(`${this.apiPrefix()}/tx/raw`)
                     .timeout({
@@ -182,14 +143,12 @@ class GNProvider extends abstract_provider_1.Provider {
                 throw new Error(`GNProvider ERROR: ${error.message}`);
             }
         });
-        // Implementación correcta de sendTransaction
         this.sendTransaction = (signedTx) => __awaiter(this, void 0, void 0, function* () {
             try {
                 const txHex = signedTx.serialize({ disableIsFullySigned: true });
                 return yield this.sendRawTransaction(txHex);
             }
             catch (error) {
-                // Manejo seguro del error unknown
                 let errorMessage = "Unknown error occurred";
                 if (error instanceof Error) {
                     errorMessage = error.message;
@@ -206,21 +165,20 @@ class GNProvider extends abstract_provider_1.Provider {
                 throw new Error(`GNProvider ERROR: failed to send transaction: ${errorMessage}`);
             }
         });
-        //async listUnspent(address: AddressOption, options?: UtxoQueryOptions): Promise<UTXO[]> {
         this.listUnspent = (address, options) => __awaiter(this, void 0, void 0, function* () {
             yield this._ready();
             const headers = this._getHeaders();
             const res = yield superagent.get(`${this.apiPrefix()}/address/${address}/unspent`)
                 .set(headers);
-            const utxos = res.body.map((item) => ({
+            return res.body.map((item) => ({
                 txId: item.tx_hash,
                 outputIndex: item.tx_pos,
                 satoshis: item.value,
                 script: scryptlib.bsv.Script.buildPublicKeyHashOut(address).toHex(),
+                height: item.height
             }));
-            return options ? (0, utils_1.filterUTXO)(utxos, options) : utxos;
+            //return options ? filterUTXO(utxos, options) : utxos;
         });
-        //async getBalance(address: AddressOption): Promise<{ confirmed: number; unconfirmed: number }> {
         this.getBalance = (address) => __awaiter(this, void 0, void 0, function* () {
             try {
                 const headers = this._getHeaders();
@@ -240,7 +198,6 @@ class GNProvider extends abstract_provider_1.Provider {
                 };
             }
         });
-        //async getTransaction(txHash: string): Promise<TransactionResponse> {
         this.getTransaction = (txHash) => __awaiter(this, void 0, void 0, function* () {
             yield this._ready();
             const headers = this._getHeaders();
@@ -256,7 +213,34 @@ class GNProvider extends abstract_provider_1.Provider {
                 throw new Error(`Error fetching transaction: ${error.message}`);
             }
         });
-        // Inicializa propiedades primero
+        this.needIgnoreError = (inMsg) => {
+            if (inMsg.includes('Transaction already in the mempool'))
+                return true;
+            if (inMsg.includes('txn-already-known'))
+                return true;
+            return false;
+        };
+        this.friendlyBIP22RejectionMsg = (inMsg) => {
+            const messages = {
+                'bad-txns-vin-empty': 'Transaction is missing inputs.',
+                'bad-txns-vout-empty': 'Transaction is missing outputs.',
+                'bad-txns-oversize': 'Transaction is too large.',
+                'bad-txns-vout-negative': 'Transaction output value is negative.',
+                'bad-txns-vout-toolarge': 'Transaction output value is too large.',
+                'bad-txns-txouttotal-toolarge': 'Transaction total output value is too large.',
+                'bad-txns-prevout-null': 'Transaction inputs previous TX reference is null.',
+                'bad-txns-inputs-duplicate': 'Transaction contains duplicate inputs.',
+                'bad-txns-inputs-too-large': 'Transaction inputs too large.',
+                'bad-txns-fee-negative': 'Transaction network fee is negative.',
+                'bad-txns-fee-outofrange': 'Transaction network fee is out of range.',
+                'mandatory-script-verify-flag-failed': 'Script evaluation failed.'
+            };
+            for (const [key, msg] of Object.entries(messages)) {
+                if (inMsg.includes(key))
+                    return msg;
+            }
+            return inMsg;
+        };
         this._network = network;
         this._apiKey = apiKey;
         this._isConnected = false;
@@ -264,38 +248,8 @@ class GNProvider extends abstract_provider_1.Provider {
             const networkStr = this._network.name === scryptlib.bsv.Networks.mainnet.name ? 'main' : 'test';
             return `https://api.whatsonchain.com/v1/bsv/${networkStr}`;
         };
-        // Configura EventEmitter
         Object.setPrototypeOf(this, events_1.EventEmitter.prototype);
-        // Conexión directa
         this.connect().catch(console.error);
     }
-    needIgnoreError(inMsg) {
-        if (inMsg.includes('Transaction already in the mempool'))
-            return true;
-        if (inMsg.includes('txn-already-known'))
-            return true;
-        return false;
-    }
-    friendlyBIP22RejectionMsg(inMsg) {
-        const messages = {
-            'bad-txns-vin-empty': 'Transaction is missing inputs.',
-            'bad-txns-vout-empty': 'Transaction is missing outputs.',
-            'bad-txns-oversize': 'Transaction is too large.',
-            'bad-txns-vout-negative': 'Transaction output value is negative.',
-            'bad-txns-vout-toolarge': 'Transaction output value is too large.',
-            'bad-txns-txouttotal-toolarge': 'Transaction total output value is too large.',
-            'bad-txns-prevout-null': 'Transaction inputs previous TX reference is null.',
-            'bad-txns-inputs-duplicate': 'Transaction contains duplicate inputs.',
-            'bad-txns-inputs-too-large': 'Transaction inputs too large.',
-            'bad-txns-fee-negative': 'Transaction network fee is negative.',
-            'bad-txns-fee-outofrange': 'Transaction network fee is out of range.',
-            'mandatory-script-verify-flag-failed': 'Script evaluation failed.'
-        };
-        for (const [key, msg] of Object.entries(messages)) {
-            if (inMsg.includes(key))
-                return msg;
-        }
-        return inMsg;
-    }
 }
 exports.GNProvider = GNProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gn-provider",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "files": [
     "dist",
     "scripts",