Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 11:31:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Wallet restore fix (#1904)

Browse source 
* wallet restore txlog + status fixes

* rustfmt
This commit is contained in:
Yeastplume 2018-11-01 11:36:29 +00:00 committed by GitHub
parent 368e1a461e
commit 9d0641c2b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
wallet/src/libwallet/internal/restore.rs
View file

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