gn-provider 1.2.6 → 1.2.8

package/README.md

@@ -122,7 +122,7 @@ Creates a new provider instance.
 | `listUnspent(address: string): Promise<UTXO[]>` | Lists UTXOs for an address |
 | `getBalance(address: string): Promise<{confirmed: number, unconfirmed: number}>` | Gets address balance |
 | `getTransaction(txHash: string): Promise<Transaction>` | Retrieves transaction details |
-| `getFeePerKb(): Promise<number>` | Estimates current fee rate |
+| `getFeePerKb(): Promise<number>` | Enhanced estimation of the fee rate based on current block stats |
 
 ## Features
 

package/dist/gn-provider.d.ts

@@ -5,6 +5,9 @@ declare enum ProviderEvent {
     Connected = "connected",
     NetworkChange = "networkChange"
 }
+export interface GNProviderOptions {
+    bridgeUrl?: string;
+}
 export declare class GNProvider extends Provider {
     emit: (event: ProviderEvent, ...args: any[]) => boolean;
     private _network;
@@ -13,10 +16,11 @@ export declare class GNProvider extends Provider {
     private _gorillaPoolApiKey;
     private apiPrefix;
     private _mapiURL;
+    private _bridgeUrl?;
     private _getHeaders;
     connect: () => Promise<this>;
     getFeePerKb: () => Promise<number>;
-    constructor(network: scryptlib.bsv.Networks.Network, wocApiKey?: string, gpApiKey?: string);
+    constructor(network: scryptlib.bsv.Networks.Network, wocApiKey?: string, gpApiKey?: string, options?: GNProviderOptions);
     isConnected: () => boolean;
     updateNetwork: (network: scryptlib.bsv.Networks.Network) => void;
     getNetwork: () => scryptlib.bsv.Networks.Network;

package/dist/gn-provider.js

@@ -53,11 +53,8 @@ var ProviderEvent;
     ProviderEvent["Connected"] = "connected";
     ProviderEvent["NetworkChange"] = "networkChange";
 })(ProviderEvent || (ProviderEvent = {}));
-/*export type UTXOWithHeight = UTXO & {
-    height: number;
-};*/
 class GNProvider extends abstract_provider_1.Provider {
-    constructor(network, wocApiKey = '', gpApiKey = '') {
+    constructor(network, wocApiKey = '', gpApiKey = '', options) {
         super();
         this._isConnected = false;
         this._getHeaders = () => {
@@ -87,32 +84,28 @@ class GNProvider extends abstract_provider_1.Provider {
             yield this._ready();
             const headers = this._getHeaders();
             try {
-                // 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 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);
-                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');
-                }
-                // Calcular tarifa por kilobyte: (total_fee * 1024) / size
-                const feePerKb = (totalFee * 1024) / size;
-                // Aplicar un multiplicador para asegurar una tarifa competitiva (1.5x)
+                const blockStatsRes = yield superagent.get(`${this.apiPrefix()}/block/height/${currentHeight}/stats`).set(headers);
+                const stats = blockStatsRes.body;
+                // 1. Extraer mediana de fee y tamaño medio de transacción
+                const medianFeePerTx = stats.median_fee; // Satoshis por transacción
+                const medianSizePerTx = stats.median_tx_size; // Bytes por transacción
+                if (!medianSizePerTx || medianSizePerTx === 0)
+                    throw new Error('Invalid block stats');
+                // 2. Calcular la tasa: (Satoshis / Bytes) * 1000 para obtener sat/kb
+                const feePerKb = (medianFeePerTx / medianSizePerTx) * 1000;
+                // 3. Aplicar multiplicador competitivo (1.5x es seguro en BSV)
                 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}`);
+                // 4. SafeFee con tus nuevos límites
+                // Nota: Subimos el mínimo a 1.1 para asegurar prioridad sobre el polvo de la red
+                const safeFee = Math.max(1.1, Math.min(competitiveFee, 500));
+                console.log(`Calculated MEDIAN fee rate: ${safeFee.toFixed(2)} sat/kb`);
                 return Math.round(safeFee * 100) / 100;
             }
             catch (error) {
-                console.warn('Fee estimation from block stats failed, using fallback');
-                return 500; // Fallback a 500 sat/kb
+                console.warn('Fee estimation failed, using fallback');
+                return 1.1; // Fallback mucho más realista para BSV que 500
             }
         });
         this.isConnected = () => this._isConnected;
@@ -225,24 +218,25 @@ class GNProvider extends abstract_provider_1.Provider {
                 throw new Error(`GNProvider ERROR: ${error.message}`);
             }
         }*/
-        this.sendRawTransaction = (rawTxHex) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            yield this._ready();
+        /*EN USO
+        sendRawTransaction = async (rawTxHex: string): Promise<TxHash> => {
+            await this._ready();
             const headers = this._getHeaders();
             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`)
+                const res = await superagent.post(`${this.apiPrefix()}/tx/raw`)
                     .timeout({
-                    response: timeout,
-                    deadline: 60000
-                })
+                        response: timeout,
+                        deadline: 60000
+                    })
                     .set(headers)
                     .send({ txhex: rawTxHex });
+                    
                 return res.body;
-            }
-            catch (error) {
-                if ((_a = error.response) === null || _a === void 0 ? void 0 : _a.text) {
+            } catch (error: any) {
+                if (error.response?.text) {
                     if (this.needIgnoreError(error.response.text)) {
                         return new scryptlib.bsv.Transaction(rawTxHex).id;
                     }
@@ -250,74 +244,48 @@ class GNProvider extends abstract_provider_1.Provider {
                 }
                 throw new Error(`GNProvider ERROR: ${error.message}`);
             }
-        });
-        /*sendRawTransaction = async (rawTxHex: string): Promise<TxHash> => {
-            await this._ready();
-            const headers = this._getHeaders();
-            const size = Math.max(1, rawTxHex.length / 2 / 1024);
-            const timeout = Math.max(15000, 1000 * size);
-    
-            const wocRequest = superagent.post(`${this.apiPrefix()}/tx/raw`)
-                .timeout({ response: timeout, deadline: 60000 })
-                .set(headers)
-                .send({ txhex: rawTxHex });
-    
-            const gpRequest = superagent.post(this._mapiURL + 'tx')
-                .timeout({ response: timeout, deadline: 60000 })
-                .set('Content-Type', 'application/octet-stream')
-                .send(Buffer.from(rawTxHex, 'hex'));
-            
-            if (this._gorillaPoolApiKey) {
-                gpRequest.set('Authorization', `Bearer ${this._gorillaPoolApiKey}`);
-            }
-    
+        }*/
+        this.sendRawTransaction = (rawTxHex) => __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            yield this._ready();
+            const isUsingBridge = !!this._bridgeUrl;
+            const url = isUsingBridge
+                ? `${this._bridgeUrl}/broadcast`
+                : `${this.apiPrefix()}/tx/raw`;
             try {
-                const responses = await Promise.allSettled([
-                    wocRequest.then(res => ({ source: 'WhatsOnChain', result: res.body })),
-                    gpRequest.then(res => {
-                        try {
-                            if (!res.body?.payload) {
-                                throw new Error('Respuesta inválida de GorillaPool: falta payload');
-                            }
-                            
-                            const payload = JSON.parse(res.body.payload);
-                            
-                            if (payload.returnResult === 'success') {
-                                return { source: 'GorillaPool', result: payload.txid };
-                            } else {
-                                throw new Error(`GorillaPool [${payload.returnResult || 'unknown'}]: ${payload.resultDescription || 'Sin descripción'}`);
-                            }
-                        } catch (parseError) {
-                            const message = parseError instanceof Error ? parseError.message : String(parseError);
-                            throw new Error(`GorillaPool: Error parsing response - ${message}`);
-                        }
-                    })
-                ]);
-    
-                for (const response of responses) {
-                    if (response.status === 'fulfilled') {
-                        console.log(`✅ Transacción aceptada por: ${response.value.source}`);
-                        return response.value.result;
-                    }
-                }
-    
-                const firstRejection = responses.find(r => r.status === 'rejected');
-                if (firstRejection) {
-                    throw new Error(firstRejection.reason.message || firstRejection.reason);
+                console.log(`🚀 [GNProvider] Broadcasting via ${isUsingBridge ? 'GoldenNotes Bridge' : 'WhatsOnChain'}...`);
+                const res = yield superagent
+                    .post(url)
+                    .send({
+                    txhex: rawTxHex,
+                    network: this._network.name === scryptlib.bsv.Networks.mainnet.name ? 'main' : 'test'
+                })
+                    .timeout(35000); // 35s para dar margen al polling del bridge
+                // Tu bridge devuelve el TXID como texto (res.text)
+                //const txid = typeof res.body === 'string' ? res.body : (res.text || res.body?.txid);
+                //const txid = res.text || (res.body && res.body.txid) || res.body;
+                const txid = isUsingBridge
+                    ? (res.text || (res.body && res.body.txid) || res.body)
+                    : res.body;
+                if (typeof txid !== 'string' || txid.length !== 64) {
+                    return new scryptlib.bsv.Transaction(rawTxHex).id;
                 }
-                
-                throw new Error('Todos los intentos de envío fallaron');
-    
-            } catch (error: any) {
-                if (error.response?.text) {
-                    if (this.needIgnoreError(error.response.text)) {
-                        return new scryptlib.bsv.Transaction(rawTxHex).id;
-                    }
-                    throw new Error(`GNProvider ERROR: ${this.friendlyBIP22RejectionMsg(error.response.text)}`);
+                console.log(`✅ [GNProvider] Éxito: ${txid}`);
+                return txid;
+            }
+            catch (error) {
+                const errorMsg = ((_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.error) || error.message || "";
+                // --- LOGICA DE TOLERANCIA ---
+                // Si el bridge falla porque la TX ya existe, no detenemos el contrato.
+                if (this.needIgnoreError(errorMsg)) {
+                    const recoveredTxid = new scryptlib.bsv.Transaction(rawTxHex).id;
+                    console.log(`ℹ️ [GNProvider] La TX ya estaba en red. ID recuperado: ${recoveredTxid}`);
+                    return recoveredTxid;
                 }
-                throw new Error(`GNProvider ERROR: ${error.message}`);
+                console.error(`❌ [GNProvider] Error crítico: ${errorMsg}`);
+                throw new Error(`GNProvider ERROR: ${this.friendlyBIP22RejectionMsg(errorMsg)}`);
             }
-        }*/
+        });
         this.sendTransaction = (signedTx) => __awaiter(this, void 0, void 0, function* () {
             try {
                 const txHex = signedTx.serialize({ disableIsFullySigned: true });
@@ -438,6 +406,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}`;
         };
+        this._bridgeUrl = options === null || options === void 0 ? void 0 : options.bridgeUrl;
         Object.setPrototypeOf(this, events_1.EventEmitter.prototype);
         this.connect().catch(console.error);
     }

package/package.json

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