tx monitoring

Author: bitrequest

assets_js_bitrequest_core.js

@@ -4093,18 +4093,19 @@ function add_historical_data(transaction_list, tx_history) {
 function animate_confbar(conf_bar, delay_index) {
     conf_bar.css("transform", "translate(-100%)");
     const tx_data = conf_bar.closest("li").data(),
-        confirm_ratio = (tx_data.confirmations / tx_data.setconfirmations) * 100,
+        confirmations = tx_data.confirmations;
+    if (!confirmations) return
+    const confirm_ratio = (confirmations / tx_data.setconfirmations) * 100,
         capped_percent = (confirm_ratio > 100) ? 100 : confirm_ratio,
         final_position = (capped_percent - 100).toFixed(2);
     setTimeout(function() {
-        conf_bar.css("transform", "tl(" + final_position + "%)");
-    }, delay_index * 500);
+        conf_bar.css("transform", "translate(" + final_position + "%)");
+    }, delay_index * 250);
 }
 
 // Shows transaction metadata on double click for touch devices
 function show_transaction_meta() {
     $(document).on("dblclick", ".requestlist li .transactionlist li", function() {
-        if (!glob_const.supportsTouch) return
         const tx_item = $(this),
             tx_meta = tx_item.children(".historic_meta");
         if (tx_meta.is(":visible")) {

assets_js_bitrequest_monitors.js

@@ -781,11 +781,11 @@ function validate_payment_amounts(rd, rdo) {
         if (first_transaction_time) {
             const is_crypto = rd.iscrypto,
                 pending_status = rd.pending,
-                required_confirmations = rd.set_confirmations,
-                confirmation_interval = required_confirmations === false ? 0 : (required_confirmations ? parseInt(required_confirmations) : 1),
-                minimum_confirmations = rd.lightning ? 1 : confirmation_interval, // set minimum confirmations to 1
+                set_confirmations = rd.set_confirmations || 1, // set minimum confirmations to 1
                 first_transaction = transaction_items.first(),
                 first_confirmations = first_transaction.data("confirmations"),
+                no_conf = rd.no_conf || first_confirmations === false,
+                conf = no_conf ? 0 : first_confirmations,
                 latest_transaction_time = first_transaction.data("transactiontime"),
                 time_offset = Math.abs(now() - (first_transaction_time - glob_const.timezone)),
                 single_transaction = transaction_count === 1,
@@ -808,27 +808,27 @@ function validate_payment_amounts(rd, rdo) {
                     transaction_counter++;
                     const current_transaction = $(this),
                         transaction_data = current_transaction.data(),
-                        correction_confirmations = transaction_data.instant_lock ? 0 : minimum_confirmations; // correction if dash instant_lock
+                        correction_confirmations = transaction_data.instant_lock ? 0 : set_confirmations; // correction if dash instant_lock
                     crypto_confirmations = transaction_data.confirmations,
                         crypto_payment_timestamp = transaction_data.transactiontime,
                         crypto_transaction_hash = transaction_data.txhash,
                         total_crypto_amount += parseFloat(transaction_data.ccval) || 0; // sum of outputs
-                    if (crypto_confirmations >= correction_confirmations || rd.no_conf || transaction_data.setconfirmations === false) { // check all confirmations + whitelist for currencies unable to fetch confirmations
+                    if (crypto_confirmations >= correction_confirmations || no_conf || transaction_data.setconfirmations === false) { // check all confirmations + whitelist for currencies unable to fetch confirmations
                         is_crypto_confirmed = true;
                         if (total_crypto_amount >= crypto_amount * amount_margin) { // compensation for small fluctuations in rounding amount
                             current_transaction.addClass("exceed").nextAll().addClass("exceed");
-                            return
+                            return false;
                         }
                     } else {
                         is_crypto_confirmed = false;
                     }
-                    const confirmation_bar = current_transaction.find(".confbar");
-                    if (confirmation_bar.length > 0) {
-                        confirmation_bar.each(function(bar_index) {
-                            animate_confbar($(this), bar_index);
-                        });
-                    };
                 });
+                const conf_bar = transaction_items.find(".confbar");
+                if (conf_bar.length) {
+                    conf_bar.each(function(i) {
+                        animate_confbar($(this), i);
+                    });
+                };
                 if (total_crypto_amount >= crypto_amount * amount_margin) { // compensation for small fluctuations in rounding amount
                     if (is_crypto_confirmed === false) { // check confirmations outside the loop
                         crypto_status = "pending",
@@ -860,7 +860,7 @@ function validate_payment_amounts(rd, rdo) {
                         }
                     }
                 } else {
-                    init_fiat_history(rd, rdo, first_confirmations, latest_transaction_time, first_transaction_time);
+                    init_fiat_history(rd, rdo, conf, latest_transaction_time, first_transaction_time);
                     return
                 }
             }
@@ -879,7 +879,7 @@ function validate_payment_amounts(rd, rdo) {
                 finalize_request_state(rdo);
                 return
             }
-            init_fiat_history(rd, rdo, first_confirmations, latest_transaction_time, first_transaction_time);
+            init_fiat_history(rd, rdo, conf, latest_transaction_time, first_transaction_time);
             return
         }
     }
@@ -904,19 +904,20 @@ function update_transaction_count(status_panel, count) {
 // ** Historical Data Processing: **
 
 // Triggers historical fiat data retrieval for transactions based on confirmation status
-function init_fiat_history(rd, rdo, conf, latestinput, firstinput) {
-    const confirm_level = conf || 0,
-        no_confirm = rd.no_conf || conf === false,
-        latest_confirm = no_confirm ? 0 : confirm_level, // only update on change
+function init_fiat_history(rd, rdo, latestconf, latest_input, firstinput) {
+    const cache_value = latest_input + latestconf.toString(), // only update on change
         cache_prefix = "historic_" + rd.requestid,
-        historic_cache = br_get_session(cache_prefix),
-        cache_value = parseInt(latestinput) + parseInt(latest_confirm);
-    if ((latest_confirm || no_confirm) && cache_value > historic_cache) { //new input detected; call historic api
+        cache_timestamp = br_get_session(cache_prefix), // set to small amount to trigger lookup exchange rates
+        cache_session = cache_timestamp || 1,
+        latest_input_slice = cache_timestamp ? cache_session.slice(0, 13) : latest_input,
+        latestinput = parseInt(latest_input_slice),
+        historic_cache = parseInt(cache_session);
+    if (cache_value > historic_cache) { //new input detected; call historic api
         br_remove_session(cache_prefix); // remove historic price cache
         const historic_payload = $.extend(rd, {
-                "latestinput": latestinput,
-                "latestconf": latest_confirm,
-                "firstinput": firstinput
+                latestinput,
+                latestconf,
+                firstinput
             }),
             api_list = "historic_fiat_price_apis",
             fiat_api = $("#fiatapisettings").data("selected"),
@@ -1052,8 +1053,8 @@ function fetch_crypto_rates(rd, rdo, fiat_api, api_list, api, currency_rate, usd
         coin_id = api === "coincodex" ? crypto_symbol : // coincodex id
         api === "coingecko" ? payment_method : // coingecko id
         crypto_symbol + "-" + payment_method, // coinpaprika id
-        start_time_sec = (first_input - glob_const.timezone) / 1000,
-        end_time_sec = (latest_input - glob_const.timezone) / 1000,
+        start_time_sec = parseInt((first_input - glob_const.timezone) / 1000),
+        end_time_sec = parseInt((latest_input - glob_const.timezone) / 1000),
         erc20_contract = rd.token_contract,
         history_api = api,
         search = history_api === "coincodex" ? get_payload_historic_coincodex(coin_id, start_time_sec, end_time_sec) :
@@ -1080,18 +1081,15 @@ function fetch_crypto_rates(rd, rdo, fiat_api, api_list, api, currency_rate, usd
                 tx_reverse = tx_list_length > 1 ? tx_list.get().reverse() : tx_list,
                 latest_confirm = rd.latestconf,
                 total_amount = rd.amount,
-                get_confirmations = rd.set_confirmations,
-                confirm_interval = get_confirmations === false ? 0 : (get_confirmations ? parseInt(get_confirmations) : 1),
-                is_lightning = rd.lightning,
-                set_confirmations = is_lightning ? 1 : confirm_interval, // set minimum confirmations to 1
-                is_erc20 = rd.erc20,
+                set_confirmations = rd.set_confirmations || 1; // Default to 1
+            is_erc20 = rd.erc20,
                 historic_usd_value = (total_amount / currency_rate) * usd_rate,
                 margin = historic_usd_value < 2 ? 0.60 : 0.95; // be flexible with small amounts
             let tx_counter = 0,
                 confirmations = 0,
-                payment_timestamp,
-                tx_hash,
-                received_crypto = 0,
+                paymenttimestamp,
+                txhash,
+                receivedamount = 0,
                 received_usd = 0,
                 confirmed = false,
                 status = "pending",
@@ -1115,9 +1113,9 @@ function fetch_crypto_rates(rd, rdo, fiat_api, api_list, api, currency_rate, usd
                     conf_correct = node_data.instant_lock ? 0 : set_confirmations; // correction if dash instant_lock
                 current_node.data("historic", historic_object);
                 confirmations = node_data.confirmations, // check confirmations
-                    payment_timestamp = transaction_timestamp,
-                    tx_hash = node_data.txhash,
-                    received_crypto += parseFloat(transaction_value) || 0; // sum of outputs CC
+                    paymenttimestamp = transaction_timestamp,
+                    txhash = node_data.txhash,
+                    receivedamount += parseFloat(transaction_value) || 0; // sum of outputs CC
                 if ((historic_price && confirmations >= conf_correct) || rd.no_conf === true || node_data.setconfirmations === false) { // check all confirmations + whitelist for currencies unable to fetch confirmations
                     confirmed = true;
                 } else {
@@ -1126,19 +1124,20 @@ function fetch_crypto_rates(rd, rdo, fiat_api, api_list, api, currency_rate, usd
                 let current_usd_sum = received_usd += parseFloat(historic_price * transaction_value) || 0;
                 if (current_usd_sum >= historic_usd_value * margin) { //minus 5% dollar for volatility compensation
                     current_node.addClass("exceed").nextAll().addClass("exceed");
+                    return false;
                 }
-                const conf_bar = current_node.find(".confbar");
-                if (conf_bar.length > 0) {
-                    conf_bar.each(function(i) {
-                        animate_confbar($(this), i);
-                    });
-                };
             });
+            const conf_bar = tx_list.find(".confbar");
+            if (conf_bar.length) {
+                conf_bar.each(function(i) {
+                    animate_confbar($(this), i);
+                });
+            };
             if (received_usd) {
                 if (received_usd >= historic_usd_value * margin) { // check total incoming amount // minus 5% dollar for volatility compensation
                     if (confirmed === false) { // check confirmations outside the loop
                         status = "pending",
-                            pending = tx_counter === 1 && tx_hash ? "polling" : pending; // switch to tx polling if there's only one transaction and txhash is known
+                            pending = tx_counter === 1 && txhash ? "polling" : pending; // switch to tx polling if there's only one transaction and txhash is known
                     } else {
                         status = "paid",
                             pending = "no";
@@ -1149,17 +1148,17 @@ function fetch_crypto_rates(rd, rdo, fiat_api, api_list, api, currency_rate, usd
                 }
                 update_request({
                     "requestid": rd.requestid,
-                    "status": status,
-                    "receivedamount": received_crypto,
+                    status,
+                    receivedamount,
                     "fiatvalue": (received_usd / usd_rate) * currency_rate,
-                    "paymenttimestamp": payment_timestamp,
-                    "txhash": tx_hash,
-                    "confirmations": confirmations,
-                    "pending": pending,
-                    "lightning": is_lightning
+                    paymenttimestamp,
+                    txhash,
+                    confirmations,
+                    pending,
+                    "lightning": rd.lightning
                 }, false);
                 if (pending !== "no") {
-                    const cache_value = parseInt(latest_input) + parseInt(latest_confirm);
+                    const cache_value = latest_input + latest_confirm.toString();
                     br_set_session("historic_" + rd.requestid, cache_value); // 'cache' historic data
                 }
                 finalize_request_state(rdo);

assets_js_bitrequest_payments.js

@@ -688,10 +688,9 @@ function continue_request() {
         request_name = decoded_data && decoded_data.n ? decoded_data.n : null,
         request_title = decoded_data && decoded_data.t ? decoded_data.t : null,
         eth_layer2_networks = decoded_data && decoded_data.l2 ? decoded_data.l2 : [],
-        current_confirmations = q_obj(coin_settings, "confirmations"),
-        no_confirmations = !current_confirmations || !is_monitored,
+        current_confirmations = q_obj(coin_settings, "confirmations.selected"),
         data_obj_confirmations = q_obj(decoded_data, "c"),
-        set_confirmations = parseFloat(data_obj_confirmations) || no_confirmations ? 0 : current_confirmations.selected || 0,
+        set_confirmations = parseFloat(data_obj_confirmations) || current_confirmations,
         is_instant = !set_confirmations,
         page_name_currency_param = is_crypto_account ? "" : payment_currency + " ",
         page_name = request_name ? tl("sharetitlename", {
@@ -740,7 +739,7 @@ function continue_request() {
             "requesttitle": request_title,
             "eth_l2s": eth_layer2_networks,
             set_confirmations,
-            "no_conf": no_confirmations,
+            "no_conf": !is_monitored,
             "instant": is_instant,
             "shared": is_request && request_timestamp !== null, // check if request is from a shared source,
             "iszero": is_zero_amount,

assets_styles_styles.css

@@ -1240,12 +1240,12 @@ html.dragmode .currentpage .applist li.dragging {
 
 .requestlist li[data-status="new"] .metalist li.receivedamount,
 .requestlist li[data-status="new"] .metalist li.payday {
-	display: none;
+	display: block;
 }
 
 .requestlist li.rqli.lightning .metalist li.receivedamount,
 .requestlist li.rqli.lightning .metalist li.payday {
-	display: none;
+	display: block;
 }
 
 .requestlist li.rqli.lightning[data-status="paid"] .metalist li.receivedamount,
@@ -1528,6 +1528,10 @@ html.dragmode .currentpage .applist li.dragging {
 	display: inline;
 }
 
+.transactionlist li .txli_content .icon-checkmark {
+	display: inline!important;
+}
+
 .requestlist li[data-pending="unknown"] .icon-eye-blocked {
 	display: inline;
 }