mirror of
https://github.com/haveno-dex/haveno.git
synced 2024-12-25 07:19:30 -05:00
fix scheduling offers with funds sent to self
This commit is contained in:
parent
103c45d412
commit
98e2df3c7e
@ -1169,18 +1169,26 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
|
||||
Set<MoneroTxWallet> scheduledTxs = new HashSet<MoneroTxWallet>();
|
||||
for (MoneroTxWallet tx : xmrWalletService.getTxs()) {
|
||||
|
||||
// skip if outputs unavailable
|
||||
if (tx.getIncomingTransfers() == null || tx.getIncomingTransfers().isEmpty()) continue;
|
||||
// skip if no funds available
|
||||
BigInteger sentToSelfAmount = xmrWalletService.getAmountSentToSelf(tx); // amount sent to self always shows 0, so compute from destinations manually
|
||||
if (sentToSelfAmount.equals(BigInteger.ZERO) && (tx.getIncomingTransfers() == null || tx.getIncomingTransfers().isEmpty())) continue;
|
||||
if (!isOutputsAvailable(tx)) continue;
|
||||
if (isTxScheduledByOtherOffer(openOffers, openOffer, tx.getHash())) continue;
|
||||
|
||||
// add scheduled tx
|
||||
// schedule transaction if funds sent to self, because they are not included in incoming transfers // TODO: fix in libraries?
|
||||
if (sentToSelfAmount.compareTo(BigInteger.ZERO) > 0) {
|
||||
scheduledAmount = scheduledAmount.add(sentToSelfAmount);
|
||||
scheduledTxs.add(tx);
|
||||
} else if (tx.getIncomingTransfers() != null) {
|
||||
|
||||
// schedule transaction if incoming tranfers to account 0
|
||||
for (MoneroIncomingTransfer transfer : tx.getIncomingTransfers()) {
|
||||
if (transfer.getAccountIndex() == 0) {
|
||||
scheduledAmount = scheduledAmount.add(transfer.getAmount());
|
||||
scheduledTxs.add(tx);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// break if sufficient funds
|
||||
if (scheduledAmount.compareTo(offerReserveAmount) >= 0) break;
|
||||
|
@ -1219,10 +1219,29 @@ public class XmrWalletService extends XmrWalletBase {
|
||||
return cachedAvailableBalance;
|
||||
}
|
||||
|
||||
public boolean hasAddress(String address) {
|
||||
for (MoneroSubaddress subaddress : getSubaddresses()) {
|
||||
if (subaddress.getAddress().equals(address)) return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public List<MoneroSubaddress> getSubaddresses() {
|
||||
return cachedSubaddresses;
|
||||
}
|
||||
|
||||
public BigInteger getAmountSentToSelf(MoneroTxWallet tx) {
|
||||
BigInteger sentToSelfAmount = BigInteger.ZERO;
|
||||
if (tx.getOutgoingTransfer() != null && tx.getOutgoingTransfer().getDestinations() != null) {
|
||||
for (MoneroDestination destination : tx.getOutgoingTransfer().getDestinations()) {
|
||||
if (hasAddress(destination.getAddress())) {
|
||||
sentToSelfAmount = sentToSelfAmount.add(destination.getAmount());
|
||||
}
|
||||
}
|
||||
}
|
||||
return sentToSelfAmount;
|
||||
}
|
||||
|
||||
public List<MoneroOutputWallet> getOutputs(MoneroOutputQuery query) {
|
||||
List<MoneroOutputWallet> filteredOutputs = new ArrayList<MoneroOutputWallet>();
|
||||
for (MoneroOutputWallet output : cachedOutputs) {
|
||||
|
Loading…
Reference in New Issue
Block a user