Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-02-03 01:50:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

close multisig wallet after seller prepares payment received message

Browse Source
This commit is contained in:
woodser 2022-05-05 08:48:44 -04:00
parent c08ee2298d
commit ded73cad6c
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/bisq/core/trade/protocol/tasks/seller/SellerPreparesPaymentReceivedMessage.java
View File

@ -51,6 +51,8 @@ public class SellerPreparesPaymentReceivedMessage extends TradeTask {
trade.getSeller().setPayoutTxHex(payoutTx.getTxSet().getMultisigTxHex()); trade.getSeller().setPayoutTxHex(payoutTx.getTxSet().getMultisigTxHex());
} }
// close multisig wallet
processModel.getProvider().getXmrWalletService().closeMultisigWallet(trade.getId());
complete(); complete();
} catch (Throwable t) { } catch (Throwable t) {
failed(t); failed(t);

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

@ -25,7 +25,6 @@ import bisq.core.trade.Trade;
import bisq.core.trade.messages.PaymentSentMessage; import bisq.core.trade.messages.PaymentSentMessage;
import bisq.core.trade.protocol.tasks.TradeTask; import bisq.core.trade.protocol.tasks.TradeTask;
import bisq.core.util.Validator; import bisq.core.util.Validator;
import java.util.Arrays;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import monero.wallet.MoneroWallet; import monero.wallet.MoneroWallet;
@ -51,7 +50,7 @@ public class SellerProcessesPaymentSentMessage extends TradeTask {
// sync and update multisig wallet // sync and update multisig wallet
if (trade.getBuyer().getUpdatedMultisigHex() != null) { if (trade.getBuyer().getUpdatedMultisigHex() != null) {
XmrWalletService walletService = processModel.getProvider().getXmrWalletService(); XmrWalletService walletService = processModel.getProvider().getXmrWalletService();
MoneroWallet multisigWallet = walletService.getMultisigWallet(trade.getId()); // TODO: ensure sync() always called before importMultisigHex() MoneroWallet multisigWallet = walletService.getMultisigWallet(trade.getId()); // TODO: ensure sync() always called before importMultisigHex()
multisigWallet.importMultisigHex(trade.getBuyer().getUpdatedMultisigHex()); multisigWallet.importMultisigHex(trade.getBuyer().getUpdatedMultisigHex());
walletService.closeMultisigWallet(trade.getId()); walletService.closeMultisigWallet(trade.getId());
} }