gn-provider 1.2.3 → 1.2.5

package/dist/gn-provider.d.ts

@@ -9,12 +9,14 @@ export declare class GNProvider extends Provider {
     emit: (event: ProviderEvent, ...args: any[]) => boolean;
     private _network;
     private _isConnected;
-    private _apiKey;
+    private _wocApiKey;
+    private _gorillaPoolApiKey;
     private apiPrefix;
+    private _mapiURL;
     private _getHeaders;
     connect: () => Promise<this>;
     getFeePerKb: () => Promise<number>;
-    constructor(network: scryptlib.bsv.Networks.Network, apiKey?: string);
+    constructor(network: scryptlib.bsv.Networks.Network, wocApiKey?: string, gpApiKey?: string);
     isConnected: () => boolean;
     updateNetwork: (network: scryptlib.bsv.Networks.Network) => void;
     getNetwork: () => scryptlib.bsv.Networks.Network;

package/dist/gn-provider.js

@@ -57,11 +57,11 @@ var ProviderEvent;
     height: number;
 };*/
 class GNProvider extends abstract_provider_1.Provider {
-    constructor(network, apiKey = '') {
+    constructor(network, wocApiKey = '', gpApiKey = '') {
         super();
         this._isConnected = false;
         this._getHeaders = () => {
-            return Object.assign({ 'Content-Type': 'application/json' }, (this._apiKey ? { 'woc-api-key': this._apiKey } : {}));
+            return Object.assign({ 'Content-Type': 'application/json' }, (this._wocApiKey ? { 'woc-api-key': this._wocApiKey } : {}));
         };
         this.connect = () => __awaiter(this, void 0, void 0, function* () {
             var _a;
@@ -131,21 +131,151 @@ class GNProvider extends abstract_provider_1.Provider {
                 }
             }
         });
-        this.sendRawTransaction = (rawTxHex) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            yield this._ready();
+        /*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: 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)}`);
+                }
+                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);
+    
+            // 1. Preparar el envío a WhatsOnChain (tu implementación actual)
+            const wocRequest = superagent.post(`${this.apiPrefix()}/tx/raw`)
+                .timeout({
+                    response: timeout,
+                    deadline: 60000
+                })
+                .set(headers)
+                .send({ txhex: rawTxHex });
+    
+            // 2. Preparar el envío a GorillaPool (basado en el código de referencia)
+            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}`);
+            }
+    
+            // 3. Ejecutar ambos envíos en paralelo y obtener el primer resultado exitoso
+            try {
+                const responses = await Promise.allSettled([
+                    wocRequest.then(res => ({ source: 'WhatsOnChain', result: res.body })),
+                    gpRequest.then(res => {
+                        const payload = JSON.parse(res.body.payload);
+                        if (payload.returnResult === 'success') {
+                            return { source: 'GorillaPool', result: payload.txid };
+                        } else {
+                            throw new Error(`GorillaPool: ${payload.resultDescription}`);
+                        }
+                    })
+                ]);
+    
+                // Buscar el primer resultado exitoso
+                for (const response of responses) {
+                    if (response.status === 'fulfilled') {
+                        console.log(`✅ Transacción aceptada por: ${response.value.source}`);
+                        return response.value.result; // Retorna el TXID
+                    }
+                }
+    
+                // Si ambos fallan, lanza el primer error
+                const firstRejection = responses.find(r => r.status === 'rejected');
+                if (firstRejection) {
+                    throw new Error(firstRejection.reason.message || firstRejection.reason);
+                }
+                
+                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)}`);
+                }
+                throw new Error(`GNProvider ERROR: ${error.message}`);
+            }
+        }*/
+        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);
+            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}`);
+            }
+            try {
+                const responses = yield Promise.allSettled([
+                    wocRequest.then(res => ({ source: 'WhatsOnChain', result: res.body })),
+                    gpRequest.then(res => {
+                        var _a;
+                        try {
+                            if (!((_a = res.body) === null || _a === void 0 ? void 0 : _a.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);
+                }
+                throw new Error('Todos los intentos de envío fallaron');
             }
             catch (error) {
                 if ((_a = error.response) === null || _a === void 0 ? void 0 : _a.text) {
@@ -189,7 +319,7 @@ class GNProvider extends abstract_provider_1.Provider {
                     txId: item.tx_hash,
                     outputIndex: item.tx_pos,
                     satoshis: item.value,
-                    script: item.script, // ✅ CORRECTO - script real de la blockchain //scryptlib.bsv.Script.buildPublicKeyHashOut(address).toHex(),
+                    script: scryptlib.bsv.Script.buildPublicKeyHashOut(address).toHex(), //item.script, // ✅ CORRECTO - script real de la blockchain //
                 }));
                 return options ? (0, utils_1.filterUTXO)(utxos, options) : utxos;
             }
@@ -267,8 +397,12 @@ class GNProvider extends abstract_provider_1.Provider {
             return inMsg;
         };
         this._network = network;
-        this._apiKey = apiKey;
+        this._wocApiKey = wocApiKey;
+        this._gorillaPoolApiKey = gpApiKey;
         this._isConnected = false;
+        this._mapiURL = network == scryptlib.bsv.Networks.mainnet ?
+            'https://mapi.gorillapool.io/mapi/' :
+            'https://testnet-mapi.gorillapool.io/mapi/';
         this.apiPrefix = () => {
             const networkStr = this._network.name === scryptlib.bsv.Networks.mainnet.name ? 'main' : 'test';
             return `https://api.whatsonchain.com/v1/bsv/${networkStr}`;

package/package.json

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