assorted fixes and refactors

Author: bitrequest

assets/js/bitrequest/bip39.js

@@ -553,6 +553,11 @@ function bip39(dat) {
             </div>\
         </div>\
     </div>").data(dialog_data);
+    // hasbip but no readable phrase = decrypt failed; refuse rather than fabricate a new seed
+    if (glob_let.hasbip && !is_restore && !saved_phrase) {
+        topnotify(tl("seederror"));
+        return
+    }
     if (inj(ui_state)) return // xss filter
     $("#sd_panel").html(markup).addClass(ui_state);
     glob_const.body.addClass("seed_dialog");

assets/js/bitrequest/fetchblocks.js

@@ -2030,9 +2030,11 @@ function electrum_scan_data(data, setconfirmations, ccsymbol, script_pub, latest
         height = data.height || 0,
         timestamp = data.timestamp,
         now = now_utc(),
-        now_correction = parseInt(now / 1000) - 8640,
-        time_correction = timestamp < now_correction ? now : timestamp, // correct weird timestamp in mempool with current timestamp
-        transactiontime = normalize_timestamp(time_correction) - 3000,
+        // Confirmed txs (height > 0) carry a real block time — use it.
+        // Fall back to "now" only for mempool/unconfirmed (height 0 or -1)
+        // or a missing/zero timestamp.
+        time_correction = (height > 0 && timestamp > 0) ? timestamp : now,
+        transactiontime = normalize_timestamp(time_correction),
         confirmations = latest_block ? get_block_confirmations(height, latest_block) : height;
     let outputsum = 0;
     if (outputs) {

assets/js/bitrequest/lang_controller.js

@@ -62,21 +62,37 @@ function systemlang() { // get system language
         (tl_short) ? lang_single : "en";
 }
 
+const tl_cache = {}; // resolved no-data strings, keyed "langcode:id" (langcode is const per session)
+
 function tl(id, dat) {
-    const data = (dat) ? dat : {};
     if (id === "obj") {
         const languages = {};
         $.each(LANG_META, function(code, meta) {
             const fn = window[meta.fn];
             languages[code] = {
                 "lang": meta.lang,
                 "flag": meta.flag,
-                "obj": typeof fn === "function" ? fn(id, data) : null
+                "obj": typeof fn === "function" ? fn(id, dat || {}) : null
             };
         });
         return languages;
     }
-    // Fast path: only the selected language + English fallback.
+    // No-data lookups are deterministic per language — memoize so each lang function
+    // (which rebuilds its full ~500-key object per call) runs at most once per id
+    // instead of on every call. Calls WITH data interpolate and bypass the cache.
+    if (!dat) {
+        const key = langcode + ":" + id,
+            cached = tl_cache[key];
+        if (cached !== undefined) {
+            return cached;
+        }
+        return tl_cache[key] = tl_resolve(id, {});
+    }
+    return tl_resolve(id, dat);
+}
+
+// Resolve via the selected language, fall back to English, then the raw id.
+function tl_resolve(id, data) {
     try {
         const selected_meta = LANG_META[langcode],
             selected_fn = selected_meta && window[selected_meta.fn],

assets/js/bitrequest/lang_meta.js

@@ -3,12 +3,12 @@
 const LANG_META = {
     "en": {
         "lang": "English",
-        "flag": "🇺🇲",
+        "flag": "🇺🇸",
         "fn": "lang_en"
     },
     "nl": {
         "lang": "Dutch",
-        "flag": "🇾🇪",
+        "flag": "🇳🇱",
         "fn": "lang_nl"
     },
     "fr": {
@@ -51,4 +51,31 @@ const LANG_META = {
         "flag": "👾",
         "fn": "lang_ai2"
     }
-};
+};
+
+// Pick saved/system language and synchronously inject the matching script tag.
+// Runs here (parser-blocking, after LANG_META) so document.write lands before the
+// deferred app bundle that calls tl().
+(function() {
+    const SUPPORTED = Object.keys(LANG_META);
+    function pick_lang() {
+        try {
+            const cache = localStorage.getItem("bitrequest_settings");
+            if (cache) {
+                const parsed = JSON.parse(cache),
+                    saved = parsed && parsed[2] && parsed[2].selected;
+                if (saved && saved.length > 0 && saved.length < 7 && SUPPORTED.indexOf(saved) > -1) {
+                    return saved;
+                }
+            }
+        } catch (e) {}
+        const nav_lang = (navigator.language || navigator.userLanguage || "en").toLowerCase();
+        if (SUPPORTED.indexOf(nav_lang) > -1) return nav_lang;
+        const short = nav_lang.split("-")[0];
+        return SUPPORTED.indexOf(short) > -1 ? short : "en";
+    }
+    const lang = pick_lang();
+    if (lang !== "en") {
+        document.write('<script src="assets/js/bitrequest/lang/' + lang.replace(/-/g, "_") + '.js"><\/script>');
+    }
+})();

assets/js/bitrequest/monitors.js

@@ -252,28 +252,17 @@ function route_api_request(rd, api_data, rdo) {
 }
 
 // Routes cryptocurrency requests to specific API endpoints based on provider capabilities.
+// Invariant: CRYPTO_API_DISPATCH_BY_PROVIDER (keyed on api_data.name) and
+// CRYPTO_API_DISPATCH_BY_PAYMENT (keyed on rd.payment) have disjoint keyspaces — the
+// payment-routed coins (nimiq/kaspa/monero) use bespoke providers absent from the
+// provider table, so no request resolves in both. The provider-first || precedence is
+// therefore unambiguous. If a payment-routed coin ever also gains a provider-table
+// provider, that precedence becomes load-bearing — add an explicit handler key then.
 function route_crypto_api(rd, api_data, rdo) {
-    // First seven provider checks (mempool.space → blockchair).
-    const provider_order_1 = ["mempool.space", "blockchain.info", "blockcypher",
-        "etherscan", "alchemy", "ethplorer", "blockchair"
-    ];
-    if (provider_order_1.indexOf(api_data.name) > -1) {
-        CRYPTO_API_DISPATCH_BY_PROVIDER[api_data.name](rd, api_data, rdo);
-        return
-    }
-    // nimiq sits between blockchair and dash.org — preserved.
-    if (rd.payment === "nimiq") {
-        CRYPTO_API_DISPATCH_BY_PAYMENT.nimiq(rd, api_data, rdo);
-        return
-    }
-    if (api_data.name === "dash.org") {
-        CRYPTO_API_DISPATCH_BY_PROVIDER["dash.org"](rd, api_data, rdo);
-        return
-    }
-    // Remaining payment checks (kaspa, monero).
-    const by_payment = CRYPTO_API_DISPATCH_BY_PAYMENT[rd.payment];
-    if (by_payment) {
-        by_payment(rd, api_data, rdo);
+    const handler = CRYPTO_API_DISPATCH_BY_PROVIDER[api_data.name]
+        || CRYPTO_API_DISPATCH_BY_PAYMENT[rd.payment];
+    if (handler) {
+        handler(rd, api_data, rdo);
         return
     }
     finalize_request_state(rdo);

assets/js/bitrequest/sockets.js

@@ -166,17 +166,14 @@ function init_socket(socket_node, wallet_address, retry, foreground) {
     }
     glob_let.socket_attempt[sha_sub(socket_node.url || node_name, 15)] = true;
 
-    // Original branch order is monero → ethereum/erc20 → other coins.
-    // Preserve that explicitly so payment_type="monero" + erc20=true still
-    // routes to monero (matches pre-refactor behavior).
-    let handler;
-    if (payment_type === "monero") {
-        handler = SOCKET_HANDLERS.monero;
-    } else if (payment_type === "ethereum" || request.erc20) {
-        handler = SOCKET_HANDLERS.ethereum;
-    } else {
-        handler = SOCKET_HANDLERS[payment_type];
-    }
+    // erc20 is a cross-cutting flag, not a payment key: an ERC20 token's
+    // payment_type isn't "ethereum", so the flag must override the table lookup
+    // and route it to the ethereum socket. That precedence is the one piece of
+    // ordering here that does real work; everything else is a plain table lookup
+    // (monero included — SOCKET_HANDLERS.monero is reached via the fallback).
+    const handler = (payment_type === "ethereum" || request.erc20)
+        ? SOCKET_HANDLERS.ethereum
+        : SOCKET_HANDLERS[payment_type];
     if (handler) handler(socket_node, wallet_address, retry);
 }
 

assets/js/lib/global_queries.js

@@ -64,7 +64,7 @@ const br_bipobj = br_get_local("bpdat", true),
     glob_const = {
         // --- App metadata ---
         "apptitle": "Bitrequest",
-        "proxy_version": "0.034",
+        "proxy_version": "0.035",
         "androidpackagename": br_androidpackagename,
         "approot": br_approot,
         "hostname": br_hostname,

index.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html class="firstload">
 <head>
+	<meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' data: https://fonts.gstatic.com; img-src 'self' data: blob: https:; connect-src * ws: wss:; worker-src 'self' blob:; media-src 'self'; object-src 'none'; base-uri 'self'" />
 	<meta name="robots" content="noindex" />
 	<meta charset="utf-8" />
 	<meta name="google" content="notranslate" />
@@ -19,32 +20,6 @@
 	<meta name="theme-color" content="#4D5359" />
 	<meta name="color-scheme" content="light only" />
 	<script src="assets/js/bitrequest/lang_meta.js"></script>
-	<script>
-		// Pick saved/system language and synchronously inject the matching script tag.
-		(function() {
-			const SUPPORTED = Object.keys(LANG_META);
-			function pick_lang() {
-				try {
-					const cache = localStorage.getItem("bitrequest_settings");
-					if (cache) {
-						const parsed = JSON.parse(cache),
-							saved = parsed && parsed[2] && parsed[2].selected;
-						if (saved && saved.length > 0 && saved.length < 7 && SUPPORTED.indexOf(saved) > -1) {
-							return saved;
-						}
-					}
-				} catch (e) {}
-				const nav_lang = (navigator.language || navigator.userLanguage || "en").toLowerCase();
-				if (SUPPORTED.indexOf(nav_lang) > -1) return nav_lang;
-				const short = nav_lang.split("-")[0];
-				return SUPPORTED.indexOf(short) > -1 ? short : "en";
-			}
-			const lang = pick_lang();
-			if (lang !== "en") {
-				document.write('<script src="assets/js/bitrequest/lang/' + lang.replace(/-/g, "_") + '.js"><\/script>');
-			}
-		})();
-	</script>
 	<link rel="icon" type="image/x-icon" href="https://bitrequest.github.io/favicon.ico">
 	<link rel="apple-touch-icon" sizes="180x180" href="assets/img/icons/apple-touch-icon.png">
 	<link rel="shortcut icon" type="image/png" sizes="32x32" href="assets/img/icons/favicon-32x32.png">