github-jwinterm/grin-wallet
1
0
Fork 0
mirror of https://github.com/jwinterm/grin-wallet.git synced 2026-10-17 07:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Contracts: store the signed tx after the wallet-state commit

Browse Source 
save_step wrote the tx file (store_tx) before the atomic batch commit, so a DB
failure could leave the stored tx out of sync with wallet state. Move store_tx
to after batch.commit() (and after the post-commit signing-context check),
matching the core convention in internal::selection. #755 keeps stored txs as
files for all flows, so this reorder closes the desync window without diverging
from core.

Addresses PR #754 review (utils.rs).
This commit is contained in:
jwinterm
2026-06-10 14:57:09 -04:00
parent 25a54340e8
commit a134158170
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libwallet/src/contract/utils.rs
+7 -3
View File
@@ -215,9 +215,6 @@ where
// Update TxLogEntry if we have signed the contract (we have data about the kernel)
if is_signed {
update_tx_log_entry(w, keychain_mask, &slate, &context, &mut tx_log_entry)?;
// TODO: It's possible to store the transaction in a file while and the atomic commit below fails
// In this case, we should revert to the previous stored tx to avoid having discrepancy
w.store_tx(&format!("{}", slate.id), slate.tx_or_err()?)?;
}
// If we added outputs in this step, we have to create OutputData here because 'batch'
// takes the mutable ref and we can no longer call calc_commit_for_cache for output
@@ -300,6 +297,13 @@ where
));
}
}
// Store the signed transaction only after the wallet-state batch has committed (and
// the signing context is confirmed gone), so a DB failure can't leave the stored tx
// out of sync with wallet state. Matches the core convention (internal::selection).
if is_signed {
w.store_tx(&format!("{}", slate.id), slate.tx_or_err()?)?;
}
debug!("contract::utils::save_step => Atomic updated done");
Ok(())