Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Speed up loading and scrolling of trade history #6552

Merged
merged 3 commits into from
Feb 3, 2023
Merged

Speed up loading and scrolling of trade history #6552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f02bc78
Optimize 'getNumPastTrades' to speed up trade history view
stejbac Feb 1, 2023
42ea12f
Rename WalletService.getAddressToMatchingTxSetMultiset to multimap
stejbac Feb 1, 2023
57b2b4b
Add txs-by-id cache to WalletService to speed up trade history view
stejbac Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 22 additions & 10 deletions core/src/main/java/bisq/core/btc/wallet/WalletService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@

import javax.inject.Inject;

import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultiset;
import com.google.common.collect.ImmutableSetMultimap;
import com.google.common.collect.Multiset;
Expand All @@ -87,6 +88,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
Expand Down Expand Up @@ -122,6 +124,7 @@ public abstract class WalletService {
private final WalletChangeEventListener cacheInvalidationListener;
private final AtomicReference<Multiset<Address>> txOutputAddressCache = new AtomicReference<>();
private final AtomicReference<SetMultimap<Address, Transaction>> addressToMatchingTxSetCache = new AtomicReference<>();
private final AtomicReference<Map<Sha256Hash, Transaction>> txByIdCache = new AtomicReference<>();
@Getter
protected Wallet wallet;
@Getter
Expand All @@ -147,6 +150,7 @@ public abstract class WalletService {
cacheInvalidationListener = wallet -> {
txOutputAddressCache.set(null);
addressToMatchingTxSetCache.set(null);
txByIdCache.set(null);
};
}

Expand Down Expand Up @@ -440,15 +444,15 @@ public void broadcastTx(Transaction tx, TxBroadcaster.Callback callback, int tim
public TransactionConfidence getConfidenceForAddress(Address address) {
List<TransactionConfidence> transactionConfidenceList = new ArrayList<>();
if (wallet != null) {
Set<Transaction> transactions = getAddressToMatchingTxSetMultiset().get(address);
Set<Transaction> transactions = getAddressToMatchingTxSetMultimap().get(address);
transactionConfidenceList.addAll(transactions.stream().map(tx ->
getTransactionConfidence(tx, address)).collect(Collectors.toList()));
}
return getMostRecentConfidence(transactionConfidenceList);
}

private SetMultimap<Address, Transaction> getAddressToMatchingTxSetMultiset() {
return addressToMatchingTxSetCache.updateAndGet(set -> set != null ? set : computeAddressToMatchingTxSetMultimap());
private SetMultimap<Address, Transaction> getAddressToMatchingTxSetMultimap() {
return addressToMatchingTxSetCache.updateAndGet(map -> map != null ? map : computeAddressToMatchingTxSetMultimap());
}

private SetMultimap<Address, Transaction> computeAddressToMatchingTxSetMultimap() {
Expand All @@ -463,17 +467,25 @@ private SetMultimap<Address, Transaction> computeAddressToMatchingTxSetMultimap(
}

@Nullable
public TransactionConfidence getConfidenceForTxId(String txId) {
if (wallet != null) {
Set<Transaction> transactions = wallet.getTransactions(false);
for (Transaction tx : transactions) {
if (tx.getTxId().toString().equals(txId))
return tx.getConfidence();
public TransactionConfidence getConfidenceForTxId(@Nullable String txId) {
if (wallet != null && txId != null) {
Transaction tx = getTxByIdMap().get(Sha256Hash.wrap(txId));
if (tx != null) {
return tx.getConfidence();
}
}
return null;
}

private Map<Sha256Hash, Transaction> getTxByIdMap() {
return txByIdCache.updateAndGet(map -> map != null ? map : computeTxByIdMap());
}

private Map<Sha256Hash, Transaction> computeTxByIdMap() {
return wallet.getTransactions(false).stream()
.collect(ImmutableMap.toImmutableMap(Transaction::getTxId, tx -> tx));
}

@Nullable
private TransactionConfidence getTransactionConfidence(Transaction tx, Address address) {
List<TransactionConfidence> transactionConfidenceList = getOutputsWithConnectedOutputs(tx).stream()
Expand Down Expand Up @@ -761,7 +773,7 @@ public Transaction getTransaction(Sha256Hash hash) {
}

@Nullable
public Transaction getTransaction(String txId) {
public Transaction getTransaction(@Nullable String txId) {
if (txId == null) {
return null;
}
Expand Down
31 changes: 21 additions & 10 deletions core/src/main/java/bisq/core/trade/ClosedTradableManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import bisq.core.trade.model.MakerTrade;
import bisq.core.trade.model.Tradable;
import bisq.core.trade.model.TradableList;
import bisq.core.trade.model.TradeModel;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.trade.statistics.TradeStatisticsManager;
import bisq.core.user.Preferences;
Expand All @@ -47,6 +46,8 @@
import com.google.inject.Inject;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMultiset;
import com.google.common.collect.Multiset;

import javafx.collections.ObservableList;

Expand All @@ -63,6 +64,8 @@

import lombok.extern.slf4j.Slf4j;

import javax.annotation.Nullable;

import static bisq.core.offer.OpenOffer.State.CANCELED;
import static bisq.core.trade.ClosedTradableUtil.castToTrade;
import static bisq.core.trade.ClosedTradableUtil.castToTradeModel;
Expand All @@ -88,6 +91,8 @@ public class ClosedTradableManager implements PersistedDataHost {
private final DumpDelayedPayoutTx dumpDelayedPayoutTx;

private final TradableList<Tradable> closedTradables = new TradableList<>();
@Nullable
private Multiset<NodeAddress> closedTradeNodeAddressCache;

@Inject
public ClosedTradableManager(KeyRing keyRing,
Expand All @@ -109,6 +114,8 @@ public ClosedTradableManager(KeyRing keyRing,
this.dumpDelayedPayoutTx = dumpDelayedPayoutTx;
this.persistenceManager = persistenceManager;

closedTradables.addListener(c -> closedTradeNodeAddressCache = null);

this.persistenceManager.initialize(closedTradables, "ClosedTrades", PersistenceManager.Source.PRIVATE);
}

Expand Down Expand Up @@ -206,8 +213,7 @@ public boolean canTradeHaveSensitiveDataCleared(String tradeId) {
Instant safeDate = getSafeDateForSensitiveDataClearing();
return closedTradables.stream()
.filter(e -> e.getId().equals(tradeId))
.filter(e -> e.getDate().toInstant().isBefore(safeDate))
.count() > 0;
.anyMatch(e -> e.getDate().toInstant().isBefore(safeDate));
}

public Instant getSafeDateForSensitiveDataClearing() {
Expand All @@ -220,20 +226,25 @@ public Stream<Trade> getTradesStreamWithFundsLockedIn() {
.filter(Trade::isFundsLockedIn);
}

public Stream<TradeModel> getTradeModelStream() {
return Stream.concat(bsqSwapTradeManager.getConfirmedBsqSwapTrades(), getClosedTrades().stream());
private Multiset<NodeAddress> getClosedTradeNodeAddresses() {
var addresses = closedTradeNodeAddressCache;
if (addresses == null) {
closedTradeNodeAddressCache = addresses = closedTradables.stream()
.filter(t -> t instanceof Trade)
.map(t -> ((Trade) t).getTradingPeerNodeAddress())
.filter(Objects::nonNull)
.collect(ImmutableMultiset.toImmutableMultiset());
}
return addresses;
}

public int getNumPastTrades(Tradable tradable) {
if (isOpenOffer(tradable)) {
return 0;
}
NodeAddress addressInTrade = castToTradeModel(tradable).getTradingPeerNodeAddress();
return (int) getTradeModelStream()
.map(TradeModel::getTradingPeerNodeAddress)
.filter(Objects::nonNull)
.filter(address -> address.equals(addressInTrade))
.count();
return bsqSwapTradeManager.getConfirmedBsqSwapNodeAddresses().count(addressInTrade) +
getClosedTradeNodeAddresses().count(addressInTrade);
}

public boolean isCurrencyForTradeFeeBtc(Tradable tradable) {
Expand Down
29 changes: 27 additions & 2 deletions core/src/main/java/bisq/core/trade/bsq_swap/BsqSwapTradeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.model.Tradable;
import bisq.core.trade.model.TradableList;
import bisq.core.trade.model.TradeModel;
import bisq.core.trade.model.bsq_swap.BsqSwapTrade;

import bisq.network.p2p.NodeAddress;

import bisq.common.crypto.KeyRing;
import bisq.common.persistence.PersistenceManager;
import bisq.common.proto.persistable.PersistedDataHost;
Expand All @@ -34,6 +37,8 @@
import com.google.inject.Singleton;

import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMultiset;
import com.google.common.collect.Multiset;

import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty;
Expand All @@ -42,20 +47,25 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.stream.Stream;

import lombok.Getter;
import lombok.extern.slf4j.Slf4j;

import javax.annotation.Nullable;

@Slf4j
@Singleton
public class BsqSwapTradeManager implements PersistedDataHost {
private final KeyRing keyRing;
private final PriceFeedService priceFeedService;
private final BsqWalletService bsqWalletService;
private final PersistenceManager<TradableList<BsqSwapTrade>> persistenceManager;
private final TradableList<BsqSwapTrade> bsqSwapTrades = new TradableList<>();
private final KeyRing keyRing;
private final PriceFeedService priceFeedService;
@Nullable
private Multiset<NodeAddress> confirmedBsqSwapNodeAddressCache;

// Used for listening for notifications in the UI
@Getter
Expand All @@ -71,6 +81,9 @@ public BsqSwapTradeManager(KeyRing keyRing,
this.bsqWalletService = bsqWalletService;
this.persistenceManager = persistenceManager;

bsqWalletService.addWalletTransactionsChangeListener(() -> confirmedBsqSwapNodeAddressCache = null);
bsqSwapTrades.addListener(c -> confirmedBsqSwapNodeAddressCache = null);

this.persistenceManager.initialize(bsqSwapTrades, "BsqSwapTrades", PersistenceManager.Source.PRIVATE);
}

Expand Down Expand Up @@ -133,6 +146,18 @@ public Stream<BsqSwapTrade> getConfirmedBsqSwapTrades() {
return getObservableList().stream().filter(this::isConfirmed);
}

public Multiset<NodeAddress> getConfirmedBsqSwapNodeAddresses() {
var addresses = confirmedBsqSwapNodeAddressCache;
if (addresses == null) {
confirmedBsqSwapNodeAddressCache = addresses = bsqSwapTrades.stream()
.filter(this::isConfirmed)
.map(TradeModel::getTradingPeerNodeAddress)
.filter(Objects::nonNull)
.collect(ImmutableMultiset.toImmutableMultiset());
}
return addresses;
}

private boolean isUnconfirmed(BsqSwapTrade bsqSwapTrade) {
return matchesConfidence(bsqSwapTrade, TransactionConfidence.ConfidenceType.PENDING);
}
Expand Down