nihilist/haveno-reto
1
0
Fork 0
mirror of https://github.com/retoaccess1/haveno-reto.git synced 2024-11-10 13:13:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

seller resets address entries on payout published

Browse Source
This commit is contained in:
woodser 2022-10-01 17:43:19 -04:00
parent 58aad5e6ae
commit 139896bced
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/bisq/core/offer/OpenOfferManager.java
View File

@ -251,8 +251,9 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
xmrWalletService.getAddressEntriesForOpenOffer().stream()
.filter(e -> !openOffersIdSet.contains(e.getOfferId()))
.forEach(e -> {
log.warn("We found an outdated addressEntry for openOffer {} (openOffers does not contain that " +
log.warn("We found an outdated addressEntry with context {} for openOffer {} (openOffers does not contain that " +
"offer), offers.size={}",
e.getContext(),
e.getOfferId(), openOffers.size());
xmrWalletService.resetAddressEntriesForOpenOffer(e.getOfferId());
});
@ -579,7 +580,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
openOffers.remove(openOffer);
openOffer.setState(OpenOffer.State.CLOSED);
offerBookService.removeOffer(openOffer.getOffer().getOfferPayload(),
() -> log.trace("Successful removed offer"),
() -> log.info("Successfully removed offer {}", offer.getId()),
log::error);
requestPersistence();
});

3
core/src/main/java/bisq/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java
View File

@ -41,6 +41,9 @@ public class SellerPreparePaymentReceivedMessage extends TradeTask {
if (trade.getPayoutTxHex() != null) {
log.info("Seller verifying, signing, and publishing payout tx");
trade.verifyPayoutTx(trade.getPayoutTxHex(), true, true);
// mark address entries as available
processModel.getXmrWalletService().resetAddressEntriesForPendingTrade(trade.getId());
} else {
// create unsigned payout tx