cache xmr node connection

Author: bitrequest

assets_js_bitrequest_core.js

@@ -388,6 +388,7 @@ function finishfunctions() {
     //initaddressform
     submit_erc20();
     //validateaddress_vk
+    //set_xmr_node_access
     //validateaddress
     //check_address
     //check_vk
@@ -1870,7 +1871,7 @@ function after_scan_init(api_data) {
     const rq_init = request.rq_init,
         request_ts = rq_init + glob_const.timezone,
         set_confirmations = request.set_confirmations || 0,
-        rdo = {
+        rdo = { // request data object
             "request_timestamp": request_ts,
             "setconfirmations": set_confirmations,
             "pending": "scanning",
@@ -2456,6 +2457,7 @@ function validateaddress_vk(ad) {
                 }
                 const start_height = data.start_height;
                 if (start_height > -1) { // success!
+                    set_xmr_node_access(vkinputval);
                     validateaddress(ad, vkinputval);
                 }
             }).fail(function(xhr, stat, err) {
@@ -2469,6 +2471,17 @@ function validateaddress_vk(ad) {
     popnotify("error", translate("pickacurrency"));
 }
 
+// Save mymonero node status in session
+function set_xmr_node_access(vk) {
+    const stored_vk_list = br_get_session("xmrvks", true);
+    if (stored_vk_list) {
+        stored_vk_list.push(vk);
+        br_set_session("xmrvks", stored_vk_list, true);
+        return
+    }
+    br_set_session("xmrvks", [vk], true);
+}
+
 // Validates the address for the selected currency and handles the addition or editing of the address
 function validateaddress(ad, vk) {
     const currency = ad.currency,

assets_js_bitrequest_fetchblocks.js

@@ -3,6 +3,7 @@ $(document).ready(function() {
     // ** API **
 
     //lightning_fetch
+    //monero_fetch_init
     //monero_fetch
     //match_xmr_pid
     //blockchair_xmr_poll
@@ -299,28 +300,27 @@ function lightning_fetch(rd, api_data, rdo) {
 
 // This function handles fetching and processing Monero transaction data.
 // It uses different APIs based on the pending status and performs various checks and data manipulations.
-function monero_fetch(rd, api_data, rdo) {
+function monero_fetch_init(rd, api_data, rdo) {
     if (rdo.pending === "polling") {
         blockchair_xmr_poll(rd, api_data, rdo); // use blockchair api for tx lookup
         return
     }
-    const vk = rd.viewkey;
+    const vk = q_obj(rd, "viewkey.vk");
     if (!vk) return;
-    const api_name = api_data.name,
-        transactionlist = rdo.transactionlist,
-        xmr_ia = rd.xmr_ia,
-        payment_id = rd.payment_id,
-        account = vk.account || rd.address,
-        viewkey = vk.vk,
-        source = rdo.source,
+    const viewkey = rd.viewkey;
+    if (xmr_node_access(vk)) {
+        monero_fetch(rd, api_data, rdo, viewkey);
+        return
+    }
+    const account = vk.account || rd.address,
         payload = JSON.stringify({
             "address": account,
-            "view_key": viewkey,
+            "view_key": vk,
             "create_account": true,
             "generated_locally": false
         });
     api_proxy({
-        "api": api_name,
+        "api": "mymonero api",
         "search": "login",
         "cachetime": 25,
         "cachefolder": "1h",
@@ -336,59 +336,8 @@ function monero_fetch(rd, api_data, rdo) {
         const data = br_result(e).result;
         if (data) {
             if (data.start_height > -1) { // success!
-                const pl = {
-                    "address": account,
-                    "view_key": viewkey
-                };
-                api_proxy({
-                    "api": api_name,
-                    "search": "get_address_txs",
-                    "cachetime": 25,
-                    "cachefolder": "1h",
-                    "proxy": true,
-                    "params": {
-                        "method": "POST",
-                        "data": JSON.stringify(pl),
-                        "headers": {
-                            "Content-Type": "application/json"
-                        }
-                    }
-                }).done(function(e) {
-                    const data = br_result(e).result,
-                        transactions = data.transactions;
-                    if (transactions) {
-                        const sortlist = sort_by_date(xmr_scan_data, transactions);
-                        let counter = 0,
-                            txdat = false;
-                        $.each(sortlist, function(dat, value) {
-                            const txd = xmr_scan_data(value, rdo.setconfirmations, "xmr", data.blockchain_height);
-                            if (txd) {
-                                const xid_match = match_xmr_pid(xmr_ia, payment_id, txd.payment_id); // match xmr payment_id if set
-                                if (xid_match) {
-                                    if (txd.ccval && txd.transactiontime > rdo.request_timestamp) {
-                                        txdat = txd;
-                                        if (source === "requests") {
-                                            const tx_listitem = append_tx_li(txd, rd.requesttype);
-                                            if (tx_listitem) {
-                                                transactionlist.append(tx_listitem.data(txd));
-                                                counter++;
-                                            }
-                                        }
-                                        return false;
-                                    }
-                                }
-                            }
-                        });
-                        scan_match(rd, api_data, rdo, counter, txdat);
-                        return
-                    }
-                    api_callback(rdo);
-                }).fail(function(xhr, stat, err) {
-                    const error_object = xhr || stat || err;
-                    tx_api_scan_fail({
-                        "error": error_object
-                    }, rd, api_data, rdo);
-                });
+                set_xmr_node_access(vk);
+                monero_fetch(rd, api_data, rdo, viewkey);
                 return
             }
         }
@@ -407,6 +356,63 @@ function monero_fetch(rd, api_data, rdo) {
     });
 }
 
+function monero_fetch(rd, api_data, rdo, viewkey) {
+    const account = viewkey.account || rd.address,
+        pl = {
+            "address": account,
+            "view_key": viewkey.vk
+        };
+    api_proxy({
+        "api": "mymonero api",
+        "search": "get_address_txs",
+        "cachetime": 25,
+        "cachefolder": "1h",
+        "proxy": true,
+        "params": {
+            "method": "POST",
+            "data": JSON.stringify(pl),
+            "headers": {
+                "Content-Type": "application/json"
+            }
+        }
+    }).done(function(e) {
+        const data = br_result(e).result,
+            transactions = data.transactions;
+        if (transactions) {
+            const sortlist = sort_by_date(xmr_scan_data, transactions);
+            let counter = 0,
+                txdat = false;
+            $.each(sortlist, function(dat, value) {
+                const txd = xmr_scan_data(value, rdo.setconfirmations, "xmr", data.blockchain_height);
+                if (txd) {
+                    const xid_match = match_xmr_pid(rd.xmr_ia, rd.payment_id, txd.payment_id); // match xmr payment_id if set
+                    if (xid_match) {
+                        if (txd.ccval && txd.transactiontime > rdo.request_timestamp) {
+                            txdat = txd;
+                            if (rdo.source === "requests") {
+                                const tx_listitem = append_tx_li(txd, rd.requesttype);
+                                if (tx_listitem) {
+                                    rdo.transactionlist.append(tx_listitem.data(txd));
+                                    counter++;
+                                }
+                            }
+                            return false;
+                        }
+                    }
+                }
+            });
+            scan_match(rd, api_data, rdo, counter, txdat);
+            return
+        }
+        api_callback(rdo);
+    }).fail(function(xhr, stat, err) {
+        const error_object = xhr || stat || err;
+        tx_api_scan_fail({
+            "error": error_object
+        }, rd, api_data, rdo);
+    });
+}
+
 // This function matches Monero payment IDs.
 // It checks if the provided payment IDs match based on certain conditions.
 function match_xmr_pid(xmria, xmrpid, xmr_pid) {

assets_js_bitrequest_lang_en.js

@@ -137,7 +137,7 @@ function lang_en(id, data) {
         "fallbackaddress": "Fallback address",
         "paymentid": "Payment ID",
         "integratedaddress": "Integrated Address",
-        "network": "Netwerk",
+        "network": "Network",
         "incoming": "Incoming",
         "outgoing": "Outgoing",
         "point of sale": "Point of sale",

assets_js_bitrequest_monitors.js

@@ -222,11 +222,11 @@ function continue_select(rd, api_data, rdo) {
 function continue_select_api(rd, api_data, rdo) {
     const api_name = api_data.name;
     if (api_name === "mymonero api") {
-        monero_fetch(rd, api_data, rdo);
+        monero_fetch_init(rd, api_data, rdo);
         return
     }
     if (api_name === "blockchair_xmr") {
-        monero_fetch(rd, api_data, rdo);
+        monero_fetch_init(rd, api_data, rdo);
         return
     }
     if (api_name === "mempool.space") {

assets_js_bitrequest_polling.js

@@ -2,10 +2,14 @@
 
 //tx_polling_init
 //tx_polling
+//tx_polling_l1
+//tx_polling_l2
 //clear_tpto
 //address_polling_init
 //address_polling
 //init_xmr_node
+//xmr_node_access
+//init_xmr_ping
 //ping_xmr_node
 //confirmations
 //clearpinging
@@ -51,33 +55,20 @@ function tx_polling(tx_data, api_dat, retry) {
     glob_const.paymentdialogbox.removeClass("transacting");
 }
 
-function tx_polling_l2(eth_layer2, api_dat, retry) {
-    clear_tpto();
-    const to_time = retry ? 10 : api_dat ? 30000 : 10,
-        l2_options = fertch_l2s(request.payment),
-        api_data = api_dat || q_obj(l2_options, eth_layer2 + ".apis.selected"),
-        ctracts = contracts(request.currencysymbol),
-        contract = ctracts ? ctracts[eth_layer2] : false;
-    glob_let.tpto = setTimeout(function() {
-        omni_poll(api_data, contract);
-    }, to_time, function() {
-        clear_tpto();
-    });
-}
-
+// Layer 1 transaction polling
 function tx_polling_l1(tx_data, api_dat, retry) {
     clear_tpto();
     const to_time = retry ? 10 : api_dat ? 30000 : 10,
         api_data = api_dat || q_obj(helper, "api_info.data"),
-        rdo = {
+        rdo = { // request data object
             "requestid": request.requestid,
             "pending": "polling",
             "txdat": tx_data,
             "source": "tx_polling",
             "setconfirmations": tx_data.setconfirmations,
             "cachetime": 25
         },
-        rd = {
+        rd = { // custom request data
             "requestid": request.requestid,
             "payment": request.payment,
             "erc20": request.erc20,
@@ -94,6 +85,21 @@ function tx_polling_l1(tx_data, api_dat, retry) {
     });
 }
 
+// Layer 2 transaction polling
+function tx_polling_l2(eth_layer2, api_dat, retry) {
+    clear_tpto();
+    const to_time = retry ? 10 : api_dat ? 30000 : 10,
+        l2_options = fertch_l2s(request.payment),
+        api_data = api_dat || q_obj(l2_options, eth_layer2 + ".apis.selected"),
+        ctracts = contracts(request.currencysymbol),
+        contract = ctracts ? ctracts[eth_layer2] : false;
+    glob_let.tpto = setTimeout(function() {
+        omni_poll(api_data, contract);
+    }, to_time, function() {
+        clear_tpto();
+    });
+}
+
 // clear tx_polling timer
 function clear_tpto() {
     clearTimeout(glob_let.tpto);
@@ -127,7 +133,7 @@ function address_polling(timeout, api_data) {
         request_ts = request_ts_utc - 15000, // 15 second margin
         set_confirmations = request.set_confirmations || 0,
         cachetime = (timeout - 1000) / 1000,
-        rdo = {
+        rdo = { // request data object
             "requestid": request.requestid,
             "request_timestamp": request_ts,
             "setconfirmations": set_confirmations,
@@ -148,6 +154,10 @@ function address_polling(timeout, api_data) {
 
 // Initializes Monero node connection
 function init_xmr_node(cachetime, address, vk) {
+    if (xmr_node_access(vk)) {
+        init_xmr_ping(cachetime, address, vk);
+        return
+    }
     const payload = {
         "address": address,
         "view_key": vk,
@@ -178,16 +188,8 @@ function init_xmr_node(cachetime, address, vk) {
             }
             const start_height = data.start_height;
             if (start_height > -1) { // success!
-                const rq_init = request.rq_init,
-                    request_ts_utc = rq_init + glob_const.timezone,
-                    request_ts = request_ts_utc - 10000; // 10 second compensation
-                socket_info({
-                    "url": "mymonero api"
-                }, true, true);
-                glob_let.pinging[address] = setInterval(function() {
-                    poll_animate();
-                    ping_xmr_node(cachetime, address, vk, request_ts);
-                }, 12000);
+                set_xmr_node_access(vk);
+                init_xmr_ping(cachetime, address, vk);
                 return
             }
         }
@@ -201,6 +203,32 @@ function init_xmr_node(cachetime, address, vk) {
     });
 }
 
+function xmr_node_access(vk) {
+    if (vk) {
+        const stored_vk_list = br_get_session("xmrvks", true);
+        if (stored_vk_list) {
+            if (stored_vk_list.includes(vk)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+// Initializes Monero node connection
+function init_xmr_ping(cachetime, address, vk) {
+    const rq_init = request.rq_init,
+        request_ts_utc = rq_init + glob_const.timezone,
+        request_ts = request_ts_utc - 10000; // 10 second compensation
+    socket_info({
+        "url": "mymonero api"
+    }, true, true);
+    glob_let.pinging[address] = setInterval(function() {
+        poll_animate();
+        ping_xmr_node(cachetime, address, vk, request_ts);
+    }, 12000);
+}
+
 // Pings Monero node for transaction updates
 function ping_xmr_node(cachetime, address, vk, request_ts) {
     if (!isopenrequest()) { // only when request is visible
@@ -245,7 +273,7 @@ function ping_xmr_node(cachetime, address, vk, request_ts) {
         $.each(txflip_strip, function(dat, value) {
             const txd = xmr_scan_data(value, set_confirmations, "xmr", data.blockchain_height);
             if (txd.ccval && txd.transactiontime > request_ts) {
-                const txid_match = get_requestli("txhash", txd.txhash); // check if txhash already exists
+                const txid_match = get_requestli("txhash", txd.txhash); // scan pending xmr tx's to prevent duplicates, mempool tx's don't have correct timestamps
                 if (txid_match.length) {
                     return false;
                 }