Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-12-28 00:39:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

deduplicate early trades due to bug

Browse Source
This commit is contained in:
woodser 2024-05-17 13:07:42 -04:00
parent 36e2f8675c
commit ea0ce9b449
1 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/src/main/java/haveno/core/trade/statistics/TradeStatisticsManager.java
View File

@ -35,6 +35,7 @@ import haveno.network.p2p.storage.persistence.AppendOnlyDataStoreService;
import java.io.File; import java.io.File;
import java.time.Instant; import java.time.Instant;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -98,6 +99,11 @@ public class TradeStatisticsManager {
.map(e -> (TradeStatistics3) e) .map(e -> (TradeStatistics3) e)
.filter(TradeStatistics3::isValid) .filter(TradeStatistics3::isValid)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
// remove duplicates in early trades due to bug
deduplicateEarlyTradeStatistics(set);
synchronized (observableTradeStatisticsSet) { synchronized (observableTradeStatisticsSet) {
observableTradeStatisticsSet.addAll(set); observableTradeStatisticsSet.addAll(set);
priceFeedService.applyLatestHavenoMarketPrice(observableTradeStatisticsSet); priceFeedService.applyLatestHavenoMarketPrice(observableTradeStatisticsSet);
@ -105,6 +111,37 @@ public class TradeStatisticsManager {
maybeDumpStatistics(); maybeDumpStatistics();
} }
private void deduplicateEarlyTradeStatistics(Set<TradeStatistics3> set) {
// collect trades before May 18, 2024
Set<TradeStatistics3> tradesBeforeMay18_24 = set.stream()
.filter(e -> e.getDate().toInstant().isBefore(Instant.parse("2024-05-18T00:00:00Z")))
.collect(Collectors.toSet());
// collect duplicated trades
Set<TradeStatistics3> duplicated = new HashSet<TradeStatistics3>();
Set<TradeStatistics3> deduplicated = new HashSet<TradeStatistics3>();
for (TradeStatistics3 tradeStatistics : tradesBeforeMay18_24) {
if (hasLenientDuplicate(tradeStatistics, deduplicated)) duplicated.add(tradeStatistics);
else deduplicated.add(tradeStatistics);
}
// remove duplicated trades
set.removeAll(duplicated);
}
private boolean hasLenientDuplicate(TradeStatistics3 tradeStatistics, Set<TradeStatistics3> set) {
return set.stream().anyMatch(e -> isLenientDuplicate(tradeStatistics, e));
}
private boolean isLenientDuplicate(TradeStatistics3 tradeStatistics1, TradeStatistics3 tradeStatistics2) {
boolean isWithin2Minutes = Math.abs(tradeStatistics1.getDate().getTime() - tradeStatistics2.getDate().getTime()) < 120000;
return isWithin2Minutes &&
tradeStatistics1.getCurrency().equals(tradeStatistics2.getCurrency()) &&
tradeStatistics1.getAmount() == tradeStatistics2.getAmount() &&
tradeStatistics1.getPrice() == tradeStatistics2.getPrice();
}
public ObservableSet<TradeStatistics3> getObservableTradeStatisticsSet() { public ObservableSet<TradeStatistics3> getObservableTradeStatisticsSet() {
return observableTradeStatisticsSet; return observableTradeStatisticsSet;
} }