gn-provider 1.1.8 → 1.2.0

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,60 +79,44 @@ 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();
             try {
-                const now = Math.floor(Date.now() / 1000);
-                const from = now - 1800; // 30 minutos atrás
-                const res = yield superagent.get(`${this.apiPrefix()}/miner/fees?from=${from}&to=${now}`)
+                // Paso 1: Obtener la información de la cadena para obtener la altura actual
+                const chainInfoRes = yield superagent.get(`${this.apiPrefix()}/chain/info`)
+                    .set(headers);
+                const currentHeight = chainInfoRes.body.blocks;
+                // Paso 2: Obtener las estadísticas del bloque actual
+                const blockStatsRes = yield superagent.get(`${this.apiPrefix()}/block/height/${currentHeight}/stats`)
                     .set(headers);
-                if (res.body && Array.isArray(res.body) && res.body.length > 0) {
-                    const totalFeeRate = res.body.reduce((sum, minerData) => {
-                        return sum + minerData.min_fee_rate;
-                    }, 0);
-                    const averageFeeRate = totalFeeRate / res.body.length;
-                    const feeRateWithMargin = averageFeeRate * 1.3;
-                    return Math.round(feeRateWithMargin * 100) / 100;
+                const blockStats = blockStatsRes.body;
+                const totalFee = blockStats.total_fee;
+                const size = blockStats.size;
+                // Si el tamaño es 0, evitar división por cero
+                if (size === 0) {
+                    throw new Error('Block size is zero');
                 }
-                throw new Error("No fee data available");
+                // Calcular tarifa por kilobyte: (total_fee * 1024) / size
+                const feePerKb = (totalFee * 1024) / size;
+                // Aplicar un multiplicador para asegurar una tarifa competitiva (1.5x)
+                const competitiveFee = feePerKb * 1.5;
+                // Establecer un mínimo de 50 sat/kb y un máximo de 5000 sat/kb para evitar valores extremos
+                const safeFee = Math.max(50, Math.min(competitiveFee, 5000));
+                console.log(`Calculated fee rate: ${safeFee.toFixed(2)} sat/kb from block ${currentHeight}`);
+                return Math.round(safeFee * 100) / 100;
             }
             catch (error) {
-                return 1.05; // Valor de fallback
+                console.warn('Fee estimation from block stats failed, using fallback');
+                return 500; // Fallback a 500 sat/kb
             }
         });
-        /*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 +127,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 +153,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 +175,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 +208,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,11 +223,6 @@ class GNProvider extends abstract_provider_1.Provider {
                 throw new Error(`Error fetching transaction: ${error.message}`);
             }
         });
-        /*private needIgnoreError(inMsg: string): boolean {
-            if (inMsg.includes('Transaction already in the mempool')) return true;
-            if (inMsg.includes('txn-already-known')) return true;
-            return false;
-        }*/
         this.needIgnoreError = (inMsg) => {
             if (inMsg.includes('Transaction already in the mempool'))
                 return true;
@@ -268,7 +230,6 @@ class GNProvider extends abstract_provider_1.Provider {
                 return true;
             return false;
         };
-        //private friendlyBIP22RejectionMsg(inMsg: string): string {
         this.friendlyBIP22RejectionMsg = (inMsg) => {
             const messages = {
                 'bad-txns-vin-empty': 'Transaction is missing inputs.',
@@ -290,7 +251,6 @@ class GNProvider extends abstract_provider_1.Provider {
             }
             return inMsg;
         };
-        // Inicializa propiedades primero
         this._network = network;
         this._apiKey = apiKey;
         this._isConnected = false;
@@ -298,9 +258,7 @@ 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);
     }
 }

package/package.json

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