gn-provider 1.1.2 → 1.1.4

package/dist/gn-provider.d.ts

@@ -10,22 +10,22 @@ export declare class GNProvider extends Provider {
     private _network;
     private _isConnected;
     private _apiKey;
-    constructor(network: scryptlib.bsv.Networks.Network, apiKey?: string);
-    get apiPrefix(): string;
-    isConnected(): boolean;
-    connect: () => Promise<this>;
+    private apiPrefix;
     private _getHeaders;
-    updateNetwork(network: scryptlib.bsv.Networks.Network): void;
-    getNetwork(): scryptlib.bsv.Networks.Network;
-    protected _ready(): Promise<void>;
-    sendRawTransaction(rawTxHex: string): Promise<TxHash>;
-    listUnspent(address: AddressOption, options?: UtxoQueryOptions): Promise<UTXO[]>;
-    getBalance(address: AddressOption): Promise<{
+    connect: () => Promise<this>;
+    getFeePerKb: () => Promise<number>;
+    constructor(network: scryptlib.bsv.Networks.Network, apiKey?: string);
+    isConnected: () => boolean;
+    updateNetwork: (network: scryptlib.bsv.Networks.Network) => void;
+    getNetwork: () => scryptlib.bsv.Networks.Network;
+    protected _ready: () => Promise<void>;
+    sendRawTransaction: (rawTxHex: string) => Promise<TxHash>;
+    listUnspent: (address: AddressOption, options?: UtxoQueryOptions) => Promise<UTXO[]>;
+    getBalance: (address: AddressOption) => Promise<{
         confirmed: number;
         unconfirmed: number;
     }>;
-    getTransaction(txHash: string): Promise<TransactionResponse>;
-    getFeePerKb(): Promise<number>;
+    getTransaction: (txHash: string) => Promise<TransactionResponse>;
     private needIgnoreError;
     private friendlyBIP22RejectionMsg;
 }

package/dist/gn-provider.js

@@ -48,8 +48,6 @@ exports.GNProvider = void 0;
 const events_1 = require("events");
 const scryptlib = __importStar(require("scryptlib"));
 const abstract_provider_1 = require("scrypt-ts/dist/bsv/abstract-provider");
-//import * as bsv from 'bsv';
-//import superagent from 'superagent';
 const superagent = __importStar(require("superagent"));
 const utils_1 = require("scrypt-ts/dist/bsv/utils");
 //import { EventEmitter } from 'events';
@@ -59,43 +57,25 @@ var ProviderEvent;
     ProviderEvent["NetworkChange"] = "networkChange";
 })(ProviderEvent || (ProviderEvent = {}));
 class GNProvider extends abstract_provider_1.Provider {
-    /*protected _initializeConnection = () => {
-        this.connect().catch(console.error);
-    }*/
-    /*constructor(network: scryptlib.bsv.Networks.Network, apiKey = '') {
-        super();
-        Object.setPrototypeOf(this, EventEmitter.prototype);
-        this._network = network;
-        this._apiKey = apiKey;
-        this._initializeConnection();
-    }*/
     constructor(network, apiKey = '') {
         super();
         this._isConnected = false;
-        /*async connect(): Promise<this> {
-            try {
-                const headers = this._getHeaders();
-                const res = await superagent.get(`${this.apiPrefix}/woc`)
-                    .timeout(3000)
-                    .set(headers);
-    
-                if (res.ok && res.text === "Whats On Chain") {
-                    this._isConnected = true;
-                    this.emit(ProviderEvent.Connected, true);
-                    return this;
-                }
-                throw new Error(res.body?.msg || res.text);
-            } catch (error: any) {
-                this._isConnected = false;
-                this.emit(ProviderEvent.Connected, false);
-                throw new Error(`connect failed: ${error.message || "unknown error"}`);
-            }
+        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`)
+                const res = yield superagent.get(`${this.apiPrefix()}/woc`) //`${this.apiPrefix}/woc`) 
                     .timeout(3000)
                     .set(headers);
                 if (res.ok && res.text === "Whats On Chain") {
@@ -111,34 +91,61 @@ class GNProvider extends abstract_provider_1.Provider {
                 throw new Error(`connect failed: ${error.message || "unknown error"}`);
             }
         });
-        // Inicializa propiedades primero
-        this._network = network;
-        this._apiKey = apiKey;
-        this._isConnected = false;
-        // Configura EventEmitter
-        Object.setPrototypeOf(this, events_1.EventEmitter.prototype);
-        // Conexión directa
-        this.connect().catch(console.error);
-    }
-    get apiPrefix() {
-        const networkStr = this._network.name === scryptlib.bsv.Networks.mainnet.name ? 'main' : 'test';
-        return `https://api.whatsonchain.com/v1/bsv/${networkStr}`;
-    }
-    isConnected() {
+        //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}`)
+                    .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;
+                }
+                throw new Error("No fee data available");
+            }
+            catch (error) {
+                return 1.05; // Valor de fallback
+            }
+        });
+        /*isConnected(): boolean {
         return this._isConnected;
-    }
-    _getHeaders() {
-        return Object.assign({ 'Content-Type': 'application/json' }, (this._apiKey ? { 'woc-api-key': this._apiKey } : {}));
-    }
-    updateNetwork(network) {
-        this._network = network;
-        this.emit(ProviderEvent.NetworkChange, network);
-    }
-    getNetwork() {
-        return this._network;
-    }
-    _ready() {
-        return __awaiter(this, void 0, void 0, function* () {
+    }*/
+        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 {
                     yield this.connect();
@@ -148,16 +155,15 @@ class GNProvider extends abstract_provider_1.Provider {
                 }
             }
         });
-    }
-    sendRawTransaction(rawTxHex) {
-        return __awaiter(this, void 0, void 0, function* () {
+        //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
             try {
-                const res = yield superagent.post(`${this.apiPrefix}/tx/raw`)
+                const res = yield superagent.post(`${this.apiPrefix()}/tx/raw`)
                     .timeout({
                     response: timeout,
                     deadline: 60000
@@ -176,12 +182,11 @@ class GNProvider extends abstract_provider_1.Provider {
                 throw new Error(`GNProvider ERROR: ${error.message}`);
             }
         });
-    }
-    listUnspent(address, options) {
-        return __awaiter(this, void 0, void 0, function* () {
+        //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`)
+            const res = yield superagent.get(`${this.apiPrefix()}/address/${address}/unspent`)
                 .set(headers);
             const utxos = res.body.map((item) => ({
                 txId: item.tx_hash,
@@ -191,12 +196,11 @@ class GNProvider extends abstract_provider_1.Provider {
             }));
             return options ? (0, utils_1.filterUTXO)(utxos, options) : utxos;
         });
-    }
-    getBalance(address) {
-        return __awaiter(this, void 0, void 0, function* () {
+        //async getBalance(address: AddressOption): Promise<{ confirmed: number; unconfirmed: number }> {
+        this.getBalance = (address) => __awaiter(this, void 0, void 0, function* () {
             try {
                 const headers = this._getHeaders();
-                const res = yield superagent.get(`${this.apiPrefix}/address/${address}/balance`)
+                const res = yield superagent.get(`${this.apiPrefix()}/address/${address}/balance`)
                     .set(headers);
                 return {
                     confirmed: res.body.confirmed || 0,
@@ -212,13 +216,12 @@ class GNProvider extends abstract_provider_1.Provider {
                 };
             }
         });
-    }
-    getTransaction(txHash) {
-        return __awaiter(this, void 0, void 0, function* () {
+        //async getTransaction(txHash: string): Promise<TransactionResponse> {
+        this.getTransaction = (txHash) => __awaiter(this, void 0, void 0, function* () {
             yield this._ready();
             const headers = this._getHeaders();
             try {
-                const res = yield superagent.get(`${this.apiPrefix}/tx/${txHash}/hex`)
+                const res = yield superagent.get(`${this.apiPrefix()}/tx/${txHash}/hex`)
                     .set(headers);
                 if (res.ok) {
                     return new scryptlib.bsv.Transaction(res.text);
@@ -229,30 +232,18 @@ class GNProvider extends abstract_provider_1.Provider {
                 throw new Error(`Error fetching transaction: ${error.message}`);
             }
         });
-    }
-    getFeePerKb() {
-        return __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}`)
-                    .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;
-                }
-                throw new Error("No fee data available");
-            }
-            catch (error) {
-                return 1.05; // Valor de fallback
-            }
-        });
+        // Inicializa propiedades primero
+        this._network = network;
+        this._apiKey = apiKey;
+        this._isConnected = false;
+        this.apiPrefix = () => {
+            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'))

package/package.json

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