From 9d0641c2b8b75d5a8996cb25c4e1f08ed900dd36 Mon Sep 17 00:00:00 2001
From: Yeastplume <yeastplume@gmail.com>
Date: Thu, 1 Nov 2018 11:36:29 +0000
Subject: [PATCH] Wallet restore fix (#1904)

* wallet restore txlog + status fixes

* rustfmt
---
 wallet/src/libwallet/internal/restore.rs | 33 +++++++++++++-----------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/wallet/src/libwallet/internal/restore.rs b/wallet/src/libwallet/internal/restore.rs
index 929c57e92..bcb2c6015 100644
--- a/wallet/src/libwallet/internal/restore.rs
+++ b/wallet/src/libwallet/internal/restore.rs
@@ -68,8 +68,6 @@ where
 			continue;
 		}
 
-		info!("Output found: {:?}, amount: {:?}", commit, info.value);
-
 		let lock_height = if *is_coinbase {
 			*height + global::coinbase_maturity()
 		} else {
@@ -80,6 +78,11 @@ where
 		// through to find the right path if required later
 		let key_id = Identifier::from_serialized_path(3u8, &info.message.as_bytes());
 
+		info!(
+			"Output found: {:?}, amount: {:?}, parent_key_id: {:?}",
+			commit, info.value, key_id
+		);
+
 		wallet_outputs.push(OutputResult {
 			commit: *commit,
 			key_id: key_id.clone(),
@@ -149,28 +152,28 @@ where
 			}
 
 			let log_id = batch.next_tx_log_id(&parent_key_id)?;
-			let mut tx_log_entry = None;
-			// wallet update will create tx log entries when it finds confirmed coinbase
-			// transactions
-			if !output.is_coinbase {
-				let mut t =
-					TxLogEntry::new(parent_key_id.clone(), TxLogEntryType::TxReceived, log_id);
-				t.amount_credited = output.value;
-				t.num_outputs = 1;
-				tx_log_entry = Some(log_id);
-				batch.save_tx_log_entry(t, &parent_key_id)?;
-			}
+			let entry_type = match output.is_coinbase {
+				true => TxLogEntryType::ConfirmedCoinbase,
+				false => TxLogEntryType::TxReceived,
+			};
+
+			let mut t = TxLogEntry::new(parent_key_id.clone(), entry_type, log_id);
+			t.confirmed = true;
+			t.amount_credited = output.value;
+			t.num_outputs = 1;
+			t.update_confirmation_ts();
+			batch.save_tx_log_entry(t, &parent_key_id)?;
 
 			let _ = batch.save(OutputData {
 				root_key_id: parent_key_id.clone(),
 				key_id: output.key_id,
 				n_child: output.n_child,
 				value: output.value,
-				status: OutputStatus::Unconfirmed,
+				status: OutputStatus::Unspent,
 				height: output.height,
 				lock_height: output.lock_height,
 				is_coinbase: output.is_coinbase,
-				tx_log_entry: tx_log_entry,
+				tx_log_entry: Some(log_id),
 			});
 
 			let max_child_index = found_parents.get(&parent_key_id).unwrap().clone();