proper l2 handling

Author: bitrequest

assets_js_bitrequest_ethl2.js

@@ -39,23 +39,23 @@ $(document).ready(function() {
 
 // Initializes Layer 2 socket connections for Ethereum and ERC20 token transactions
 function initialize_layer2_connections(payment, address, ct, socket_node) {
-    const l2_options = get_layer2_config(payment);
+    const idx_array = glob_const.eth_l2s,
+        l2_options = get_layer2_config(payment);
     if (l2_options) {
         const ctracts = ct || contracts(request.currencysymbol),
             l2_arr = [],
             is_request = request.isrequest,
             req_l2_arr = request.eth_l2s;
-        let index = 0;
         $.each(l2_options, function(l2, l2_dat) {
             const set_select = is_request ? false : (l2_dat.selected === false) ? false : !empty_obj(l2_dat),
+                index = idx_array.indexOf(l2),
                 inarr = ($.inArray(index, req_l2_arr) > -1),
                 selected = set_select || inarr;
             if (selected) {
                 l2_arr.push(index);
                 const sn = socket_node || get_network_node_config(payment, l2, l2_dat, "websockets");
                 setup_layer2_monitoring(l2, sn, address, ctracts);
             }
-            index++;
         });
         if (l2_arr.length) { // layer 2
             if (!is_request) {
@@ -77,7 +77,7 @@ function setup_layer2_monitoring(l2, sn, address, ctracts, retry) {
                 ping_id = sha_sub(socket_node.url + layer2, 15);
             socket_info(socket_node, true);
             glob_let.socket_attempt[ping_id] = true;
-            if (node_name === "infura") {
+            if (ctracts && node_name === "infura") {
                 web3_erc20_websocket(socket_node, address, contract, ping_id);
                 return
             }

assets_js_bitrequest_lang_nl.js

@@ -425,7 +425,7 @@ function lang_nl(id, data) {
         "disableproxy": "Schakel proxy " + data.set_proxy_val + " uit?",
         "enableproxy": "Schakel proxy " + data.set_proxy_val + " in?",
         // dialog
-        "unabletoconnectln": "Kan geen verbinding aken met de lightning node",
+        "unabletoconnectln": "Kan geen verbinding maken met de lightning node",
 
         // BIP39
         "disclaimer": "Disclaimer!",

assets_js_bitrequest_sockets.js

@@ -1011,7 +1011,7 @@ function init_eth_sockets(payment_type, socket_node, wallet_address, retry) {
         if (str_incudes(socket_node.url, glob_const.main_alchemy_socket)) {
             alchemy_eth_websocket(socket_node, wallet_address); // L1 Alchemy
         } else {
-            web3_eth_websocket(socket_node, wallet_address, glob_const.main_eth_node); // L1 Infura
+            web3_eth_websocket(socket_node, wallet_address); // L1 Infura
         }
     } else {
         web3_erc20_websocket(socket_node, wallet_address, token_contracts.main);
@@ -1074,7 +1074,7 @@ function alchemy_eth_websocket(socket_node, wallet_address) {
 }
 
 // Establishes WebSocket connection to Ethereum node for monitoring new blocks with RPC-based transaction filtering
-function web3_eth_websocket(socket_node, wallet_address, rpc_url) {
+function web3_eth_websocket(socket_node, wallet_address) {
     const network_type = socket_node.network,
         base_url = socket_node.url,
         infura_key = get_infura_apikey(base_url),
@@ -1105,7 +1105,7 @@ function web3_eth_websocket(socket_node, wallet_address, rpc_url) {
             if (block_data && block_data.hash) {
                 const api_data = helper ? q_obj(helper, "api_info.data") : null;
                 if (!api_data) return;
-                const node_url = api_data.default === false ? api_data.url : rpc_url;
+                const node_url = api_data.default === false ? api_data.url : glob_const.main_eth_node;
                 api_proxy(eth_params(node_url, 25, "eth_getBlockByHash", [block_data.hash, true])).done(function(response) {
                     const result_data = inf_result(response),
                         transactions = result_data.transactions;
@@ -1143,6 +1143,10 @@ function web3_erc20_websocket(socket_node, wallet_address, contract_address, soc
     if (glob_let.sockets[socket_id]) {
         return
     }
+    if (!contract_address) {
+        web3_eth_websocket(socket_node, wallet_address);
+        return
+    }
     const network_type = socket_node.network,
         base_url = complete_url(socket_node.url),
         infura_key = get_infura_apikey(base_url),

assets_js_lib_global_queries.js

@@ -158,7 +158,8 @@ const br_bipobj = br_get_local("bpdat", true),
             "litecoin": "https://litecoinspace.org",
             "dogecoin": null,
             "bitcoin-cash": null
-        }
+        },
+        "eth_l2s": ["arbitrum", "polygon", "bnb"]
     },
     glob_let = {
         "socket_attempt": {},