import multisig hex if needed on create payout tx

This commit is contained in:
woodser 2024-10-25 11:34:07 -04:00
parent 74e094fa99
commit 5c4fa7a53f

View file

@ -1064,6 +1064,14 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
} }
} }
public void importMultisigHexIfNeeded() {
synchronized (walletLock) {
if (wallet.isMultisigImportNeeded()) {
importMultisigHex();
}
}
}
public void importMultisigHex() { public void importMultisigHex() {
synchronized (walletLock) { synchronized (walletLock) {
synchronized (HavenoUtils.getDaemonLock()) { // lock on daemon because import calls full refresh synchronized (HavenoUtils.getDaemonLock()) { // lock on daemon because import calls full refresh
@ -1184,6 +1192,11 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
// create payout tx // create payout tx
synchronized (walletLock) { synchronized (walletLock) {
synchronized (HavenoUtils.getWalletFunctionLock()) { synchronized (HavenoUtils.getWalletFunctionLock()) {
// import multisig hex if needed
importMultisigHexIfNeeded();
// create payout tx
for (int i = 0; i < TradeProtocol.MAX_ATTEMPTS; i++) { for (int i = 0; i < TradeProtocol.MAX_ATTEMPTS; i++) {
MoneroRpcConnection sourceConnection = xmrConnectionService.getConnection(); MoneroRpcConnection sourceConnection = xmrConnectionService.getConnection();
try { try {