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

fix: lock on process invoice while updating slate state

Browse Source
This commit is contained in:
ardocrat
2026-06-23 14:22:15 +03:00
parent 18060987ef
commit 1825e66ea9
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/src/owner.rs
+13 -5
View File
@@ -827,10 +827,12 @@ where
slate: &Slate,
args: InitTxArgs,
) -> Result<Slate, Error> {
let mut w_lock = self.wallet_inst.lock();
let w = w_lock.lc_provider()?.wallet_inst()?;
let send_args = args.send_args.clone();
let slate = owner::process_invoice_tx(w, keychain_mask, slate, args, self.doctest_mode)?;
let slate = {
let mut w_lock = self.wallet_inst.lock();
let w = w_lock.lc_provider()?.wallet_inst()?;
owner::process_invoice_tx(w, keychain_mask, slate, args, self.doctest_mode)?
};
// Helper functionality. If send arguments exist, attempt to send
match send_args {
Some(sa) => {
@@ -847,8 +849,14 @@ where
let res = try_slatepack_sync_workflow(&slate, &sa.dest, tc, None, true);
match res {
Ok(s) => {
let parent_key_id = w.parent_key_id();
let _ = update_tx_slate_state(w, keychain_mask, &parent_key_id, &s);
// Update slate state.
{
let mut w_lock = self.wallet_inst.lock();
let w = w_lock.lc_provider()?.wallet_inst()?;
let parent_key_id = w.parent_key_id();
let _ = update_tx_slate_state(w, keychain_mask, &parent_key_id, &s);
}
// Output slatepack message to file.
let _ = output_slatepack_file(&self, keychain_mask, &s, &sa.dest);
Ok(s)
}