boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2024-12-23 04:29:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

thaw reserved outputs within task if canceled

Browse source
This commit is contained in:
woodser 2024-05-23 18:17:27 -04:00
parent f2f5a6fd24
commit 796603f82b
2 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/src/main/java/haveno/core/offer/placeoffer/tasks/MakerReserveOfferFunds.java
View file

@ -79,6 +79,7 @@ public class MakerReserveOfferFunds extends Task<PlaceOfferModel> {
Integer preferredSubaddressIndex = fundingEntry == null ? null : fundingEntry.getSubaddressIndex(); Integer preferredSubaddressIndex = fundingEntry == null ? null : fundingEntry.getSubaddressIndex();
// attempt creating reserve tx // attempt creating reserve tx
try {
synchronized (HavenoUtils.getWalletFunctionLock()) { synchronized (HavenoUtils.getWalletFunctionLock()) {
for (int i = 0; i < TradeProtocol.MAX_ATTEMPTS; i++) { for (int i = 0; i < TradeProtocol.MAX_ATTEMPTS; i++) {
try { try {
@ -96,6 +97,16 @@ public class MakerReserveOfferFunds extends Task<PlaceOfferModel> {
if (reserveTx != null) break; if (reserveTx != null) break;
} }
} }
} catch (Exception e) {
// reset state with wallet lock
model.getXmrWalletService().resetAddressEntriesForOpenOffer(offer.getId());
if (reserveTx != null) {
model.getXmrWalletService().thawOutputs(HavenoUtils.getInputKeyImages(reserveTx));
}
throw e;
}
// reset protocol timeout // reset protocol timeout
model.getProtocol().startTimeoutTimer(); model.getProtocol().startTimeoutTimer();

3
core/src/main/java/haveno/core/trade/protocol/tasks/TakerReserveTradeFunds.java
View file

@ -81,7 +81,8 @@ public class TakerReserveTradeFunds extends TradeTask {
} }
} catch (Exception e) { } catch (Exception e) {
// thaw reserved inputs // reset state with wallet lock
model.getXmrWalletService().resetAddressEntriesForTrade(trade.getId());
if (reserveTx != null) { if (reserveTx != null) {
model.getXmrWalletService().thawOutputs(HavenoUtils.getInputKeyImages(reserveTx)); model.getXmrWalletService().thawOutputs(HavenoUtils.getInputKeyImages(reserveTx));
trade.getSelf().setReserveTxKeyImages(null); trade.getSelf().setReserveTxKeyImages(null);