mirror of
https://github.com/haveno-dex/haveno.git
synced 2025-07-27 17:05:29 -04:00
fix confirmation progress in ui
fix my role label to show during trade initialization support arbitrator role label
This commit is contained in:
woodser
parent
247087ef46
commit
4fb62d8669
13 changed files with 60 additions and 277 deletions
|
|
@ -340,7 +340,6 @@ public class XmrWalletService {
|
|||
// freeze deposit inputs
|
||||
for (MoneroOutput input : depositTx.getInputs()) wallet.freezeOutput(input.getKeyImage().getHex());
|
||||
wallet.save();
|
||||
|
||||
return depositTx;
|
||||
}
|
||||
}
|
||||
|
|
@ -441,10 +440,8 @@ public class XmrWalletService {
|
|||
}
|
||||
|
||||
public MoneroTx getTx(String txHash) {
|
||||
synchronized (txCache) {
|
||||
List<MoneroTx> txs = getTxs(Arrays.asList(txHash));
|
||||
return txs.isEmpty() ? null : txs.get(0);
|
||||
}
|
||||
List<MoneroTx> txs = getTxs(Arrays.asList(txHash));
|
||||
return txs.isEmpty() ? null : txs.get(0);
|
||||
}
|
||||
|
||||
public List<MoneroTx> getTxs(List<String> txHashes) {
|
||||
|
|
@ -461,16 +458,14 @@ public class XmrWalletService {
|
|||
synchronized (txCache) {
|
||||
for (MoneroTx tx : txs) txCache.remove(tx.getHash());
|
||||
}
|
||||
}, connectionsService.getDefaultRefreshPeriodMs());
|
||||
}, connectionsService.getDefaultRefreshPeriodMs() / 1000);
|
||||
return txs;
|
||||
}
|
||||
}
|
||||
|
||||
public MoneroTx getTxWithCache(String txHash) {
|
||||
synchronized (txCache) {
|
||||
List<MoneroTx> cachedTxs = getTxsWithCache(Arrays.asList(txHash));
|
||||
return cachedTxs.isEmpty() ? null : cachedTxs.get(0);
|
||||
}
|
||||
List<MoneroTx> cachedTxs = getTxsWithCache(Arrays.asList(txHash));
|
||||
return cachedTxs.isEmpty() ? null : cachedTxs.get(0);
|
||||
}
|
||||
|
||||
public List<MoneroTx> getTxsWithCache(List<String> txHashes) {
|
||||
|
|
|
|||
|
|
@ -180,19 +180,14 @@ public class TradeUtil {
|
|||
* @return String describing a trader's role for a given trade
|
||||
*/
|
||||
public String getRole(Trade trade) {
|
||||
Contract contract = trade.getContract();
|
||||
if (contract == null)
|
||||
throw new IllegalStateException(format("could not get role because no contract was found for trade '%s'",
|
||||
trade.getShortId()));
|
||||
|
||||
Offer offer = trade.getOffer();
|
||||
if (offer == null)
|
||||
throw new IllegalStateException(format("could not get role because no offer was found for trade '%s'",
|
||||
trade.getShortId()));
|
||||
|
||||
return getRole(contract.isBuyerMakerAndSellerTaker(),
|
||||
offer.isMyOffer(keyRing),
|
||||
offer.getCurrencyCode());
|
||||
return (trade.isArbitrator() ? "Arbitrator for " : "") + // TODO: use Res.get()
|
||||
getRole(trade.getBuyer() == trade.getMaker(),
|
||||
trade.isArbitrator() ? true : trade.isMaker(), // arbitrator role in context of maker
|
||||
offer.getCurrencyCode());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ public class ArbitratorProcessDepositRequest extends TradeTask {
|
|||
|
||||
// relay txs
|
||||
MoneroDaemon daemon = trade.getXmrWalletService().getDaemon();
|
||||
daemon.submitTxHex(processModel.getMaker().getDepositTxHex()); // TODO (woodser): check that result is good. will need to release funds if one is submitted
|
||||
daemon.submitTxHex(processModel.getMaker().getDepositTxHex()); // TODO (woodser): check that result is good. will need to release funds if one is submitted
|
||||
daemon.submitTxHex(processModel.getTaker().getDepositTxHex());
|
||||
|
||||
// update trade state
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ public class ArbitratorSendInitTradeOrMultisigRequests extends TradeTask {
|
|||
null);
|
||||
|
||||
// send request to maker
|
||||
log.info("Send {} with offerId {} and uid {} to maker {} with pub key ring", makerRequest.getClass().getSimpleName(), makerRequest.getTradeId(), makerRequest.getUid(), trade.getMaker().getNodeAddress(), trade.getMaker().getPubKeyRing());
|
||||
log.info("Send {} with offerId {} and uid {} to maker {}", makerRequest.getClass().getSimpleName(), makerRequest.getTradeId(), makerRequest.getUid(), trade.getMaker().getNodeAddress());
|
||||
processModel.getP2PService().sendEncryptedDirectMessage(
|
||||
trade.getMaker().getNodeAddress(), // TODO (woodser): maker's address might be different from original owner address if they disconnect and reconnect, need to validate and update address when requests received
|
||||
trade.getMaker().getPubKeyRing(),
|
||||
|
|
|
|||
|
|
@ -1,179 +0,0 @@
|
|||
/*
|
||||
* This file is part of Haveno.
|
||||
*
|
||||
* Haveno is free software: you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or (at
|
||||
* your option) any later version.
|
||||
*
|
||||
* Haveno is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
|
||||
* License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with Haveno. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package bisq.core.trade.protocol.tasks;
|
||||
|
||||
import bisq.core.btc.listeners.AddressConfidenceListener;
|
||||
import bisq.core.trade.Trade;
|
||||
import bisq.common.taskrunner.TaskRunner;
|
||||
|
||||
import org.fxmisc.easybind.Subscription;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
// TODO (woodser): adapt to XMR or remove
|
||||
@Slf4j
|
||||
public class BuyerSetupDepositTxListener extends TradeTask {
|
||||
// Use instance fields to not get eaten up by the GC
|
||||
private Subscription tradeStateSubscription;
|
||||
private AddressConfidenceListener confidenceListener;
|
||||
|
||||
public BuyerSetupDepositTxListener(TaskRunner<Trade> taskHandler, Trade trade) {
|
||||
super(taskHandler, trade);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void run() {
|
||||
throw new RuntimeException("BuyerSetupDepositTxListener needs updated for XMR");
|
||||
// try {
|
||||
// runInterceptHook();
|
||||
//
|
||||
// if (trade.getDepositTx() == null && processModel.getPreparedDepositTx() != null) {
|
||||
// BtcWalletService walletService = processModel.getBtcWalletService();
|
||||
// NetworkParameters params = walletService.getParams();
|
||||
// Transaction preparedDepositTx = new Transaction(params, processModel.getPreparedDepositTx());
|
||||
// checkArgument(!preparedDepositTx.getOutputs().isEmpty(), "preparedDepositTx.getOutputs() must not be empty");
|
||||
// Address depositTxAddress = preparedDepositTx.getOutput(0).getScriptPubKey().getToAddress(params);
|
||||
//
|
||||
// // For buyer as maker takerFeeTxId is null
|
||||
// @Nullable String takerFeeTxId = trade.getTakerFeeTxId();
|
||||
// String makerFeeTxId = trade.getOffer().getOfferFeePaymentTxId();
|
||||
// TransactionConfidence confidence = walletService.getConfidenceForAddress(depositTxAddress);
|
||||
// if (isConfTxDepositTx(confidence, params, depositTxAddress, takerFeeTxId, makerFeeTxId) &&
|
||||
// isVisibleInNetwork(confidence)) {
|
||||
// applyConfidence(confidence);
|
||||
// } else {
|
||||
// confidenceListener = new AddressConfidenceListener(depositTxAddress) {
|
||||
// @Override
|
||||
// public void onTransactionConfidenceChanged(TransactionConfidence confidence) {
|
||||
// if (isConfTxDepositTx(confidence, params, depositTxAddress,
|
||||
// takerFeeTxId, makerFeeTxId) && isVisibleInNetwork(confidence)) {
|
||||
// applyConfidence(confidence);
|
||||
// }
|
||||
// }
|
||||
// };
|
||||
// walletService.addAddressConfidenceListener(confidenceListener);
|
||||
//
|
||||
// tradeStateSubscription = EasyBind.subscribe(trade.stateProperty(), newValue -> {
|
||||
// if (trade.isDepositPublished()) {
|
||||
// swapReservedForTradeEntry();
|
||||
//
|
||||
// // hack to remove tradeStateSubscription at callback
|
||||
// UserThread.execute(this::unSubscribeAndRemoveListener);
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// // we complete immediately, our object stays alive because the balanceListener is stored in the WalletService
|
||||
// complete();
|
||||
// } catch (Throwable t) {
|
||||
// failed(t);
|
||||
// }
|
||||
}
|
||||
|
||||
// // We check if the txIds of the inputs matches our maker fee tx and taker fee tx and if the depositTxAddress we
|
||||
// // use for the confidence lookup is use as an output address.
|
||||
// // This prevents that past txs which have the our depositTxAddress as input or output (deposit or payout txs) could
|
||||
// // be interpreted as our deposit tx. This happened because if a bug which caused re-use of the Multisig address
|
||||
// // entries and if both traders use the same key for multiple trades the depositTxAddress would be the same.
|
||||
// // We fix that bug as well but we also need to avoid that past already used addresses might be taken again
|
||||
// // (the Multisig flag got reverted to available in the address entry).
|
||||
// private boolean isConfTxDepositTx(@Nullable TransactionConfidence confidence,
|
||||
// NetworkParameters params,
|
||||
// Address depositTxAddress,
|
||||
// @Nullable String takerFeeTxId,
|
||||
// String makerFeeTxId) {
|
||||
// if (confidence == null) {
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// Transaction walletTx = processModel.getTradeWalletService().getWalletTx(confidence.getTransactionHash());
|
||||
// long numInputMatches = walletTx.getInputs().stream()
|
||||
// .map(TransactionInput::getOutpoint)
|
||||
// .filter(Objects::nonNull)
|
||||
// .map(TransactionOutPoint::getHash)
|
||||
// .map(Sha256Hash::toString)
|
||||
// .filter(txId -> txId.equals(takerFeeTxId) || txId.equals(makerFeeTxId))
|
||||
// .count();
|
||||
// if (takerFeeTxId == null && numInputMatches != 1) {
|
||||
// log.warn("We got a transactionConfidenceTx which does not match our inputs. " +
|
||||
// "takerFeeTxId is null (valid if role is buyer as maker) and numInputMatches " +
|
||||
// "is not 1 as expected (for makerFeeTxId). " +
|
||||
// "numInputMatches={}, transactionConfidenceTx={}",
|
||||
// numInputMatches, walletTx);
|
||||
// return false;
|
||||
// } else if (takerFeeTxId != null && numInputMatches != 2) {
|
||||
// log.warn("We got a transactionConfidenceTx which does not match our inputs. " +
|
||||
// "numInputMatches is not 2 as expected (for makerFeeTxId and takerFeeTxId). " +
|
||||
// "numInputMatches={}, transactionConfidenceTx={}",
|
||||
// numInputMatches, walletTx);
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// boolean isOutputMatching = walletTx.getOutputs().stream()
|
||||
// .map(transactionOutput -> transactionOutput.getScriptPubKey().getToAddress(params))
|
||||
// .anyMatch(address -> address.equals(depositTxAddress));
|
||||
// if (!isOutputMatching) {
|
||||
// log.warn("We got a transactionConfidenceTx which does not has the depositTxAddress " +
|
||||
// "as output (but as input). depositTxAddress={}, transactionConfidenceTx={}",
|
||||
// depositTxAddress, walletTx);
|
||||
// }
|
||||
// return isOutputMatching;
|
||||
// }
|
||||
//
|
||||
// private void applyConfidence(TransactionConfidence confidence) {
|
||||
// if (trade.getDepositTx() == null) {
|
||||
// Transaction walletTx = processModel.getTradeWalletService().getWalletTx(confidence.getTransactionHash());
|
||||
// trade.applyDepositTx(walletTx);
|
||||
// BtcWalletService.printTx("depositTx received from network", walletTx);
|
||||
//
|
||||
// // We don't want to trigger the tradeStateSubscription when setting the state, so we unsubscribe before
|
||||
// unSubscribeAndRemoveListener();
|
||||
// trade.setState(Trade.State.BUYER_SAW_DEPOSIT_TX_IN_NETWORK);
|
||||
//
|
||||
// processModel.getTradeManager().requestPersistence();
|
||||
// } else {
|
||||
// unSubscribeAndRemoveListener();
|
||||
// }
|
||||
//
|
||||
// swapReservedForTradeEntry();
|
||||
// }
|
||||
//
|
||||
// private boolean isVisibleInNetwork(TransactionConfidence confidence) {
|
||||
// return confidence != null &&
|
||||
// (confidence.getConfidenceType().equals(TransactionConfidence.ConfidenceType.BUILDING) ||
|
||||
// confidence.getConfidenceType().equals(TransactionConfidence.ConfidenceType.PENDING));
|
||||
// }
|
||||
//
|
||||
// private void swapReservedForTradeEntry() {
|
||||
// processModel.getBtcWalletService().swapTradeEntryToAvailableEntry(trade.getId(),
|
||||
// AddressEntry.Context.RESERVED_FOR_TRADE);
|
||||
// }
|
||||
//
|
||||
// private void unSubscribeAndRemoveListener() {
|
||||
// if (tradeStateSubscription != null) {
|
||||
// tradeStateSubscription.unsubscribe();
|
||||
// tradeStateSubscription = null;
|
||||
// }
|
||||
//
|
||||
// if (confidenceListener != null) {
|
||||
// processModel.getBtcWalletService().removeAddressConfidenceListener(confidenceListener);
|
||||
// confidenceListener = null;
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
|
@ -82,7 +82,7 @@ public class MakerSendInitTradeRequest extends TradeTask {
|
|||
null);
|
||||
|
||||
// send request to arbitrator
|
||||
log.info("Sending {} with offerId {} and uid {} to arbitrator {} with pub key ring {}", arbitratorRequest.getClass().getSimpleName(), arbitratorRequest.getTradeId(), arbitratorRequest.getUid(), trade.getArbitrator().getNodeAddress(), trade.getArbitrator().getPubKeyRing());
|
||||
log.info("Sending {} with offerId {} and uid {} to arbitrator {}", arbitratorRequest.getClass().getSimpleName(), arbitratorRequest.getTradeId(), arbitratorRequest.getUid(), trade.getArbitrator().getNodeAddress());
|
||||
processModel.getP2PService().sendEncryptedDirectMessage(
|
||||
trade.getArbitrator().getNodeAddress(),
|
||||
trade.getArbitrator().getPubKeyRing(),
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
package bisq.core.trade.protocol.tasks;
|
||||
|
||||
import bisq.core.btc.wallet.XmrWalletService;
|
||||
import bisq.core.trade.BuyerTrade;
|
||||
import bisq.core.trade.Trade;
|
||||
import bisq.core.trade.messages.DepositsConfirmedMessage;
|
||||
import bisq.core.trade.messages.TradeMailboxMessage;
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ public class TakerSendInitTradeRequestToArbitrator extends TradeTask {
|
|||
processModel.getMakerSignature());
|
||||
|
||||
// send request to arbitrator
|
||||
log.info("Sending {} with offerId {} and uid {} to arbitrator {} with pub key ring {}", arbitratorRequest.getClass().getSimpleName(), arbitratorRequest.getTradeId(), arbitratorRequest.getUid(), trade.getArbitrator().getNodeAddress(), trade.getArbitrator().getPubKeyRing());
|
||||
log.info("Sending {} with offerId {} and uid {} to arbitrator {}", arbitratorRequest.getClass().getSimpleName(), arbitratorRequest.getTradeId(), arbitratorRequest.getUid(), trade.getArbitrator().getNodeAddress());
|
||||
processModel.getP2PService().sendEncryptedDirectMessage(
|
||||
arbitratorNodeAddress,
|
||||
arbitrator.getPubKeyRing(),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue