WIP on development

improvments on validation imporovements on UI feedback
tari-project · Aug 14, 2024 · b74b1d3 · b74b1d3
1 parent 131225c
commit b74b1d3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/applications/minotari_console_wallet/src/ui/components/transactions_tab.rs b/applications/minotari_console_wallet/src/ui/components/transactions_tab.rs
@@ -407,9 +407,17 @@ impl TransactionsTab {
             );
 
             let confirmation_count = app_state.get_confirmations(tx.tx_id);
-            let confirmations_msg = if tx.status == TransactionStatus::MinedConfirmed && tx.cancelled.is_none() {
+            let confirmations_msg = if (tx.status == TransactionStatus::MinedConfirmed ||
+                tx.status == TransactionStatus::OneSidedConfirmed ||
+                tx.status == TransactionStatus::CoinbaseConfirmed) &&
+                tx.cancelled.is_none()
+            {
                 format!("{} required confirmations met", required_confirmations)
-            } else if tx.status == TransactionStatus::MinedUnconfirmed && tx.cancelled.is_none() {
+            } else if (tx.status == TransactionStatus::MinedUnconfirmed ||
+                tx.status == TransactionStatus::OneSidedUnconfirmed ||
+                tx.status == TransactionStatus::CoinbaseUnconfirmed) &&
+                tx.cancelled.is_none()
+            {
                 if let Some(count) = confirmation_count {
                     format!("{} of {} required confirmations met", count, required_confirmations)
                 } else {

diff --git a/base_layer/wallet/src/base_node_service/config.rs b/base_layer/wallet/src/base_node_service/config.rs
@@ -40,7 +40,7 @@ pub struct BaseNodeServiceConfig {
 impl Default for BaseNodeServiceConfig {
     fn default() -> Self {
         Self {
-            base_node_monitor_max_refresh_interval: Duration::from_secs(90),
+            base_node_monitor_max_refresh_interval: Duration::from_secs(30),
             base_node_rpc_pool_size: 10,
             event_channel_size: 250,
         }

diff --git a/base_layer/wallet/src/output_manager_service/tasks/txo_validation_task.rs b/base_layer/wallet/src/output_manager_service/tasks/txo_validation_task.rs
@@ -47,7 +47,6 @@ use crate::{
             database::{OutputManagerBackend, OutputManagerDatabase},
             models::DbWalletOutput,
             sqlite_db::{ReceivedOutputInfoForBatch, SpentOutputInfoForBatch},
-            OutputStatus,
         },
     },
 };
@@ -351,7 +350,6 @@ where
 
             let unmined_and_invalid: Vec<_> = unmined
                 .iter()
-                .filter(|uo| uo.status == OutputStatus::UnspentMinedUnconfirmed)
                 .map(|uo| {
                     info!(
                         target: LOG_TARGET,

diff --git a/base_layer/wallet/src/transaction_service/tasks/check_faux_transaction_status.rs b/base_layer/wallet/src/transaction_service/tasks/check_faux_transaction_status.rs
@@ -20,7 +20,7 @@
 // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-const SAFETY_HEIGHT_MARGIN: u64 = 1000;
+const SAFETY_HEIGHT_MARGIN: u64 = 3000;
 
 use std::sync::Arc;
 
@@ -52,11 +52,12 @@ pub async fn check_detected_transactions<TBackend: 'static + TransactionBackend>
     // height or current tip height with safety margin to determine if these should be returned
     let last_mined_transaction = db.fetch_last_mined_transaction().unwrap_or_default();
 
-    let height_with_margin = tip_height.saturating_sub(SAFETY_HEIGHT_MARGIN);
     let check_height = if let Some(tx) = last_mined_transaction {
-        tx.mined_height.unwrap_or(height_with_margin)
+        tx.mined_height
+            .unwrap_or(tip_height)
+            .saturating_sub(SAFETY_HEIGHT_MARGIN)
     } else {
-        height_with_margin
+        tip_height.saturating_sub(SAFETY_HEIGHT_MARGIN)
     };
 
     let mut all_detected_transactions: Vec<CompletedTransaction> = match db.get_imported_transactions() {
@@ -78,7 +79,7 @@ pub async fn check_detected_transactions<TBackend: 'static + TransactionBackend>
     };
     all_detected_transactions.append(&mut unconfirmed_detected);
 
-    let mut unmined_coinbases_detected = match db.get_unmined_coinbase_transactions(height_with_margin) {
+    let mut unmined_coinbases_detected = match db.get_unmined_coinbase_transactions(check_height) {
         Ok(txs) => txs,
         Err(e) => {
             error!(