@pioneer-platform/blockbook 8.3.12 → 8.3.15

package/lib/index.d.ts

@@ -6,7 +6,6 @@ declare const Axios: any;
 declare const https: any;
 declare const nodes: any;
 declare const axios: any;
-declare const axiosRetry: any;
 declare let NOW_NODES_API: string | undefined;
 declare let BLOCKBOOK_URLS: any;
 declare let BLOCKBOOK_SOCKETS: any;
@@ -16,10 +15,7 @@ declare let get_info_by_pubkey: (coin: string, pubkey: string, page?: string | u
 declare let get_txids_by_address: (coin: string, address: string, page?: number) => Promise<any>;
 declare let get_info_by_address: (coin: string, address: string, filter?: string) => Promise<any>;
 declare let get_txs_by_xpub: (coin: string, xpub: string) => Promise<any>;
-declare let broadcast_transaction: (coin: string, hex: string) => Promise<{
-    txid: any;
-    success: boolean;
-}>;
+declare let broadcast_transaction: (coin: string, hex: string) => Promise<any>;
 declare let get_transaction: (coin: string, txid: string) => Promise<any>;
 declare let get_utxos_by_xpub: (coin: string, xpub: string) => Promise<any>;
 declare let get_balance_by_xpub: (coin: string, xpub: any) => Promise<number>;

package/lib/index.js

@@ -52,22 +52,21 @@ var axios = Axios.create({
     }),
     timeout: 30000 // 10 seconds
 });
-var axiosRetry = require('axios-retry');
+// const axiosRetry = require('axios-retry');
 var NOW_NODES_API = process.env['NOW_NODES_API'];
-axiosRetry(axios, {
-    retries: 3, // number of retries
-    retryDelay: function (retryCount) {
-        log.error(TAG, "retry attempt: ".concat(retryCount));
-        return retryCount * 2000; // time interval between retries
-    },
-    retryCondition: function (error) {
-        var _a;
-        log.error(TAG, error);
-        //@TODO mark node offline, and punish
-        // if retry condition is not specified, by default idempotent requests are retried
-        return ((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) === 503;
-    },
-});
+// axiosRetry(axios, {
+//     retries: 3, // number of retries
+//     retryDelay: (retryCount: number) => {
+//         log.error(TAG,`retry attempt: ${retryCount}`);
+//         return retryCount * 2000; // time interval between retries
+//     },
+//     retryCondition: (error: { response: { status: number; }; }) => {
+//         log.error(TAG,error)
+//         //@TODO mark node offline, and punish
+//         // if retry condition is not specified, by default idempotent requests are retried
+//         return error?.response?.status === 503;
+//     },
+// });
 var BLOCKBOOK_URLS = {};
 var BLOCKBOOK_SOCKETS = {};
 module.exports = {
@@ -352,61 +351,91 @@ var get_txs_by_xpub = function (coin, xpub) {
 };
 var broadcast_transaction = function (coin, hex) {
     return __awaiter(this, void 0, void 0, function () {
-        var tag, url, body, resp, e_7;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var tag, url, data, body, output, resp, e_7, errorMessage, statusCode, e_8;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     tag = TAG + " | broadcast_transaction | ";
-                    _a.label = 1;
+                    _b.label = 1;
                 case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    log.info(tag, "Broadcasting transaction:", hex.substring(0, 20) + "..." + " for coin " + coin);
-                    if (!BLOCKBOOK_URLS[coin.toUpperCase()]) {
-                        throw new Error("No blockbook URL configured for coin: ".concat(coin));
-                    }
-                    url = BLOCKBOOK_URLS[coin.toUpperCase()] + "/api/v2/sendtx";
-                    log.debug(tag, "Broadcasting to URL:", url);
+                    _b.trys.push([1, 6, , 7]);
+                    url = BLOCKBOOK_URLS[coin.toUpperCase()] + "/api/v2/sendtx/";
+                    data = hex;
                     body = {
-                        method: 'POST',
                         url: url,
                         headers: {
-                            'Content-Type': 'application/json',
+                            'content-type': 'application/json',
                             'User-Agent': fakeUa()
                         },
-                        data: {
-                            hex: hex
-                        }
+                        method: 'POST',
+                        json: false,
+                        data: data,
                     };
-                    return [4 /*yield*/, axios(body)];
+                    output = {
+                        success: false
+                    };
+                    resp = void 0;
+                    _b.label = 2;
                 case 2:
-                    resp = _a.sent();
-                    log.debug(tag, "Broadcast response:", resp.data);
-                    // Blockbook returns { result: "txid" } or { error: "message" }
-                    if (resp.data && resp.data.result) {
-                        return [2 /*return*/, {
-                                txid: resp.data.result,
-                                success: true
-                            }];
+                    _b.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, axios(body)];
+                case 3:
+                    resp = _b.sent();
+                    output.resp = resp;
+                    output.success = true;
+                    return [3 /*break*/, 5];
+                case 4:
+                    e_7 = _b.sent();
+                    log.error(tag, "Broadcast error: ", e_7.message || e_7);
+                    errorMessage = 'Unknown error occurred';
+                    statusCode = null;
+                    if (e_7.response) {
+                        statusCode = e_7.response.status;
+                        log.debug(tag, "HTTP Status: ", statusCode);
+                        log.debug(tag, "Response headers: ", e_7.response.headers);
+                        if (e_7.response.data) {
+                            log.debug(tag, "Response data: ", e_7.response.data);
+                            if (e_7.response.data.error) {
+                                errorMessage = e_7.response.data.error;
+                                log.error(tag, "API Error: ", errorMessage);
+                            }
+                            else if (typeof e_7.response.data === 'string') {
+                                errorMessage = e_7.response.data;
+                            }
+                            else {
+                                errorMessage = "HTTP ".concat(statusCode, ": ").concat(e_7.response.statusText || 'Request failed');
+                            }
+                        }
+                        else {
+                            errorMessage = "HTTP ".concat(statusCode, ": ").concat(e_7.response.statusText || 'Request failed');
+                        }
                     }
-                    else if (resp.data && resp.data.error) {
-                        throw new Error("Blockchain broadcast failed: ".concat(resp.data.error));
+                    else if (e_7.request) {
+                        // Request was made but no response received
+                        errorMessage = 'Network error: No response received';
+                        log.debug(tag, "Request config: ", (_a = e_7.config) === null || _a === void 0 ? void 0 : _a.url);
                     }
                     else {
-                        throw new Error("Unexpected response format: ".concat(JSON.stringify(resp.data)));
+                        // Something else happened
+                        errorMessage = e_7.message || 'Request setup error';
                     }
-                    return [3 /*break*/, 4];
-                case 3:
-                    e_7 = _a.sent();
-                    console.error(tag, "Broadcast error:", e_7);
-                    throw e_7;
-                case 4: return [2 /*return*/];
+                    output.error = errorMessage;
+                    output.statusCode = statusCode;
+                    return [3 /*break*/, 5];
+                case 5: return [2 /*return*/, output];
+                case 6:
+                    e_8 = _b.sent();
+                    console.error(tag, 'error: ', e_8);
+                    throw e_8;
+                case 7: return [2 /*return*/];
             }
         });
     });
 };
 var get_transaction = function (coin, txid) {
     return __awaiter(this, void 0, void 0, function () {
-        var tag, url, body, resp, e_8;
+        var tag, url, body, resp, e_9;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -429,9 +458,9 @@ var get_transaction = function (coin, txid) {
                     resp = _a.sent();
                     return [2 /*return*/, resp.data];
                 case 3:
-                    e_8 = _a.sent();
-                    console.error(tag, e_8);
-                    throw e_8;
+                    e_9 = _a.sent();
+                    console.error(tag, e_9);
+                    throw e_9;
                 case 4: return [2 /*return*/];
             }
         });
@@ -439,7 +468,7 @@ var get_transaction = function (coin, txid) {
 };
 var get_utxos_by_xpub = function (coin, xpub) {
     return __awaiter(this, void 0, void 0, function () {
-        var tag, url, body, resp, e_9;
+        var tag, url, body, resp, e_10;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -464,9 +493,9 @@ var get_utxos_by_xpub = function (coin, xpub) {
                     resp = _a.sent();
                     return [2 /*return*/, resp.data];
                 case 3:
-                    e_9 = _a.sent();
-                    console.error(tag, e_9);
-                    throw e_9;
+                    e_10 = _a.sent();
+                    console.error(tag, e_10);
+                    throw e_10;
                 case 4: return [2 /*return*/];
             }
         });
@@ -474,7 +503,7 @@ var get_utxos_by_xpub = function (coin, xpub) {
 };
 var get_balance_by_xpub = function (coin, xpub) {
     return __awaiter(this, void 0, void 0, function () {
-        var tag, output, balance, i, uxto, e_10;
+        var tag, output, balance, i, uxto, e_11;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -496,9 +525,9 @@ var get_balance_by_xpub = function (coin, xpub) {
                     }
                     return [2 /*return*/, balance / 100000000];
                 case 3:
-                    e_10 = _a.sent();
-                    console.error(tag, e_10);
-                    throw e_10;
+                    e_11 = _a.sent();
+                    console.error(tag, e_11);
+                    throw e_11;
                 case 4: return [2 /*return*/];
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pioneer-platform/blockbook",
-  "version": "8.3.12",
+  "version": "8.3.15",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {
@@ -13,11 +13,12 @@
   "dependencies": {
     "@pioneer-platform/loggerdog": "^8.3.1",
     "@pioneer-platform/nodes": "^8.3.1",
+    "@pioneer-platform/pioneer-caip": "^9.2.38",
     "@types/request-promise-native": "^1.0.17",
     "axiom": "^0.1.6",
     "axios": "^1.6.0",
     "axios-retry": "^3.8.0",
-    "blockbook-client": "^1.0.26",
+    "blockbook-client": "^0.7.8",
     "fake-useragent": "^1.0.1",
     "long": "^5.2.3",
     "request": "^2.88.2",