tx monitoring

Author: bitrequest

assets_js_bitrequest_config.js

@@ -1033,14 +1033,14 @@ const glob_config = {
                     "icon": "sphere",
                     "selected": {
                         "name": "bitrequest.app",
-                        "url": glob_const.main_nano_node,
+                        "url": "https://www.bitrequest.app:8020",
                         "username": "",
                         "password": "",
                         "display": true
                     },
                     "apis": [{
                             "name": "bitrequest.app",
-                            "url": glob_const.main_nano_node,
+                            "url": "https://www.bitrequest.app:8020",
                             "username": "",
                             "password": "",
                             "display": true

assets_js_bitrequest_core.js

@@ -1863,21 +1863,6 @@ function continue_cpd() {
 function after_scan_init(api_data) {
     if (is_scanning()) return;
     glob_let.rpc_attempts = {};
-    forceclosesocket();
-    after_scan(api_data);
-}
-
-// Scan address one last time
-function after_scan(api_data) {
-    if (glob_const.inframe) {
-        loader(true);
-        loadertext(translate("lookuppayment", {
-            "currency": request.payment,
-            "blockexplorer": api_data.name
-        }));
-    } else {
-        hide_paymentdialog();
-    }
     const rq_init = request.rq_init,
         request_ts = rq_init + glob_const.timezone,
         set_confirmations = request.set_confirmations || 0,
@@ -1889,7 +1874,21 @@ function after_scan(api_data) {
             "cachetime": 20,
             "source": "after_scan"
         };
-    select_rpc(request, api_data, rdo);
+    after_scan(request, api_data, rdo);
+}
+
+// Scan address one last time
+function after_scan(rd, api_data, rdo) {
+    if (glob_const.inframe) {
+        loader(true);
+        loadertext(translate("lookuppayment", {
+            "currency": rd.payment,
+            "blockexplorer": api_data.name
+        }));
+    } else {
+        hide_paymentdialog();
+    }
+    continue_select(rd, api_data, rdo);
     socket_info(api_data, true);
 }
 
@@ -2749,8 +2748,8 @@ function reset_paymentdialog() {
         request = null,
         helper = null,
         glob_let.l2s = {},
-        glob_let.socket_overflow = 0,
-        glob_let.polling_overflow = 0;
+        glob_let.apikey_fails = false;
+    reset_overflow(); // reset overflow limits
     const wstimeout = setTimeout(function() {
         closesocket();
     }, 500, function() {
@@ -3069,7 +3068,7 @@ function showtransaction_trigger() {
             rqli = thisnode.closest("li.rqli"),
             li_dat = thislist.data(),
             rql_dat = rqli.data(),
-            txhash = rqli.txhash || rql_dat.txhash;
+            txhash = li_dat.txhash || rql_dat.txhash;
         if (txhash) {
             const lnhash = txhash.startsWith("lightning");
             if (lnhash) {

assets_js_bitrequest_ethl2.js

@@ -141,8 +141,7 @@ function query_ethl2_api(rd, rdo, api_dat, l2) {
 
 function scan_ethl2_api(rd, rdo, api_dat, l2) {
     glob_let.l2_fetched = {};
-    const requestid = rd.requestid,
-        req_l2_arr = rd.eth_l2s;
+    const req_l2_arr = rd.eth_l2s;
     if (empty_obj(req_l2_arr)) { // No l2's
         api_callback(rdo);
         return
@@ -153,21 +152,20 @@ function scan_ethl2_api(rd, rdo, api_dat, l2) {
         if (l2) { // l2 network is known so only scan this network
             const api_data = api_dat || q_obj(l2_options, l2 + ".apis.selected")
             if (api_data) {
-                const rq_id = requestid || "",
-                    contract = ctracts[l2],
+                const contract = ctracts[l2],
                     dat = {
                         contract,
                         rd,
                         api_data,
                         rdo
                     };
-                glob_let.rpc_attempts[sha_sub(rq_id + api_data.url + l2, 15)] = true;
                 ethl2_networks(dat, l2);
             }
             return
         }
         // scan all supported l2 networks
-        const l2_length = Object.keys(l2_options).length,
+        const requestid = rd.requestid,
+            l2_length = Object.keys(l2_options).length,
             add_delay = 2000;
         let index = 0,
             delay = 0;
@@ -179,15 +177,13 @@ function scan_ethl2_api(rd, rdo, api_dat, l2) {
                     if (inarr) {
                         const api_data = api_dat || q_obj(l2_dat, "apis.selected");
                         if (api_data) {
-                            const rq_id = requestid || "",
-                                contract = ctracts[l2],
+                            const contract = ctracts[l2],
                                 dat = {
                                     contract,
                                     rd,
                                     api_data,
                                     rdo
                                 };
-                            glob_let.rpc_attempts[sha_sub(rq_id + api_data.url + l2, 15)] = true;
                             ethl2_networks(dat, l2);
                         }
                     }
@@ -214,14 +210,11 @@ function scan_ethl2_api(rd, rdo, api_dat, l2) {
 }
 
 function poll_ethl2_api(rd, rdo, api_dat, l2) {
-    const requestid = rd.requestid,
-        rq_id = requestid || "",
-        l2_options = fertch_l2s(rd.payment),
+    const l2_options = fertch_l2s(rd.payment),
         api_data = api_dat || q_obj(l2_options, l2 + ".apis.selected"),
         api_name = api_data.name,
         network = api_data.network;
     if (api_name && network) {
-        glob_let.rpc_attempts[sha_sub(rq_id + api_data.url + l2, 15)] = true;
         const ccsymbol = rd.currencysymbol,
             ctracts = contracts(ccsymbol),
             contract = ctracts[network],
@@ -238,14 +231,23 @@ function poll_ethl2_api(rd, rdo, api_dat, l2) {
 // ** L2 Networks **
 
 function ethl2_networks(dat, network) {
-    const l2 = network || q_obj(dat, "api_data.network");
-    if (l2 === "arbitrum") {
-        arbitrum_apis(dat);
-    } else if (l2 === "polygon") {
-        polygon_apis(dat);
-    } else if (l2 === "bnb") {
-        bnb_apis(dat);
+    if (dat) {
+        const url = q_obj(dat, "api_data.url");
+        if (url) {
+            const rq_id = q_obj(dat, "rd.requestid") || "",
+                l2 = network || q_obj(dat, "api_data.network");
+            glob_let.rpc_attempts[sha_sub(rq_id + url + l2, 15)] = true;
+            if (l2 === "arbitrum") {
+                arbitrum_apis(dat);
+            } else if (l2 === "polygon") {
+                polygon_apis(dat);
+            } else if (l2 === "bnb") {
+                bnb_apis(dat);
+            }
+            return
+        }
     }
+    console.error("error", "missing api data");
 }
 
 // Handles Arbitrum APIS