fix!: changes balance query (#6158)

Description --- changes balance query to be more in line with you would expect. FFI now matches grpc BREAKING CHANGE --- This changes the external API for the wallet_ffi and the wallet library
tari-project · Feb 27, 2024 · 9ccc615 · 9ccc615
1 parent 19a824d
commit 9ccc615
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/applications/minotari_console_wallet/src/grpc/wallet_grpc_server.rs b/applications/minotari_console_wallet/src/grpc/wallet_grpc_server.rs
@@ -264,10 +264,7 @@ impl wallet_server::Wallet for WalletGrpcServer {
             Err(e) => return Err(Status::not_found(format!("GetBalance error! {}", e))),
         };
         Ok(Response::new(GetBalanceResponse {
-            available_balance: balance
-                .available_balance
-                .saturating_sub(balance.time_locked_balance.unwrap_or_default())
-                .0,
+            available_balance: balance.available_balance.0,
             pending_incoming_balance: balance.pending_incoming_balance.0,
             pending_outgoing_balance: balance.pending_outgoing_balance.0,
             timelocked_balance: balance.time_locked_balance.unwrap_or_default().0,

diff --git a/applications/minotari_console_wallet/src/ui/components/balance.rs b/applications/minotari_console_wallet/src/ui/components/balance.rs
@@ -53,7 +53,7 @@ impl<B: Backend> Component<B> for Balance {
         let available_balance = Spans::from(vec![
             Span::styled("Available:", Style::default().fg(Color::Magenta)),
             Span::raw(" "),
-            Span::raw(format!("{}", balance.available_balance.saturating_sub(time_locked))),
+            Span::raw(format!("{}", balance.available_balance)),
             Span::raw(format!(" (Time Locked: {})", time_locked)),
         ]);
         let incoming_balance = Spans::from(vec![

diff --git a/applications/minotari_console_wallet/src/ui/state/debouncer.rs b/applications/minotari_console_wallet/src/ui/state/debouncer.rs
@@ -72,8 +72,9 @@ impl BalanceEnquiryDebouncer {
         if let Ok(balance) = self.output_manager_service.get_balance().await {
             trace!(
                 target: LOG_TARGET,
-                "Initial balance: available {}, incoming {}, outgoing {}",
+                "Initial balance: available {}, time-locked {}, incoming {}, outgoing {}",
                 balance.available_balance,
+                balance.time_locked_balance.unwrap_or(0.into()),
                 balance.pending_incoming_balance,
                 balance.pending_outgoing_balance
             );

diff --git a/base_layer/wallet/src/output_manager_service/storage/sqlite_db/output_sql.rs b/base_layer/wallet/src/output_manager_service/storage/sqlite_db/output_sql.rs
@@ -394,7 +394,7 @@ impl OutputSql {
         let balance_query_result = if let Some(current_tip) = current_tip_for_time_lock_calculation {
             let balance_query = sql_query(
                 "SELECT coalesce(sum(value), 0) as amount, 'available_balance' as category \
-                 FROM outputs WHERE status = ? \
+                 FROM outputs WHERE status = ? AND maturity <= ? AND script_lock_height <= ? \
                  UNION ALL \
                  SELECT coalesce(sum(value), 0) as amount, 'time_locked_balance' as category \
                  FROM outputs WHERE status = ? AND maturity > ? OR script_lock_height > ? \
@@ -407,6 +407,8 @@ impl OutputSql {
             )
                 // available_balance
                 .bind::<diesel::sql_types::Integer, _>(OutputStatus::Unspent as i32)
+                .bind::<diesel::sql_types::BigInt, _>(current_tip as i64)
+                .bind::<diesel::sql_types::BigInt, _>(current_tip as i64)
                 // time_locked_balance
                 .bind::<diesel::sql_types::Integer, _>(OutputStatus::Unspent as i32)
                 .bind::<diesel::sql_types::BigInt, _>(current_tip as i64)

diff --git a/base_layer/wallet/tests/output_manager_service_tests/storage.rs b/base_layer/wallet/tests/output_manager_service_tests/storage.rs
@@ -163,7 +163,7 @@ pub async fn test_db_backend<T: OutputManagerBackend + 'static>(backend: T) {
 
     let balance = db.get_balance(Some(3)).unwrap();
     assert_eq!(balance, Balance {
-        available_balance,
+        available_balance: available_balance - time_locked_balance,
         time_locked_balance: Some(time_locked_balance),
         pending_incoming_balance,
         pending_outgoing_balance