mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add methods for confirmed and unconfirmed trades

Browse Source
This commit is contained in:
chimp1984 2021-11-03 20:06:01 +01:00
parent 792bbaa6f2
commit ba64ba55e8
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/main/java/bisq/core/trade/bsq_swap/BsqSwapTradeManager.java
View File

@ -17,6 +17,7 @@
package bisq.core.trade.bsq_swap;
import bisq.core.btc.wallet.BsqWalletService;
import bisq.core.offer.Offer;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.model.TradableList;
@ -26,6 +27,8 @@ import bisq.common.crypto.KeyRing;
import bisq.common.persistence.PersistenceManager;
import bisq.common.proto.persistable.PersistedDataHost;
import org.bitcoinj.core.TransactionConfidence;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@ -39,6 +42,7 @@ import javafx.collections.ObservableList;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
@ -46,6 +50,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@Singleton
public class BsqSwapTradeManager implements PersistedDataHost {
private final BsqWalletService bsqWalletService;
private final PersistenceManager<TradableList<BsqSwapTrade>> persistenceManager;
private final TradableList<BsqSwapTrade> bsqSwapTrades = new TradableList<>();
private final KeyRing keyRing;
@ -58,9 +63,11 @@ public class BsqSwapTradeManager implements PersistedDataHost {
@Inject
public BsqSwapTradeManager(KeyRing keyRing,
PriceFeedService priceFeedService,
BsqWalletService bsqWalletService,
PersistenceManager<TradableList<BsqSwapTrade>> persistenceManager) {
this.keyRing = keyRing;
this.priceFeedService = priceFeedService;
this.bsqWalletService = bsqWalletService;
this.persistenceManager = persistenceManager;
this.persistenceManager.initialize(bsqSwapTrades, "BsqSwapTrades", PersistenceManager.Source.PRIVATE);
@ -113,6 +120,28 @@ public class BsqSwapTradeManager implements PersistedDataHost {
return bsqSwapTrades.stream().filter(e -> e.getId().equals(id)).findFirst();
}
public Stream<BsqSwapTrade> getUnconfirmedBsqSwapTrades() {
return getObservableList().stream().filter(this::isUnconfirmedTx);
}
public Stream<BsqSwapTrade> getConfirmedBsqSwapTrades() {
return getObservableList().stream().filter(this::isConfirmedTx);
}
private boolean isUnconfirmedTx(BsqSwapTrade bsqSwapTrade) {
return isConfirmedTx(bsqSwapTrade, TransactionConfidence.ConfidenceType.PENDING);
}
private boolean isConfirmedTx(BsqSwapTrade bsqSwapTrade) {
return isConfirmedTx(bsqSwapTrade, TransactionConfidence.ConfidenceType.BUILDING);
}
private boolean isConfirmedTx(BsqSwapTrade bsqSwapTrade, TransactionConfidence.ConfidenceType confidenceTyp) {
TransactionConfidence confidenceForTxId = bsqWalletService.getConfidenceForTxId(bsqSwapTrade.getTxId());
return confidenceForTxId != null &&
confidenceForTxId.getConfidenceType() == confidenceTyp;
}
private void requestPersistence() {
persistenceManager.requestPersistence();
}