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

Add BSQ burned column in monthly burningman status report. #6741

Merged
merged 1 commit into from Jun 30, 2023
Merged

Add BSQ burned column in monthly burningman status report. #6741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions core/src/main/java/bisq/core/dao/burningman/BurningManPresentationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@
import com.google.common.annotations.VisibleForTesting;

import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.LongStream;

import lombok.extern.slf4j.Slf4j;

Expand Down Expand Up @@ -359,6 +361,17 @@ public long getTotalAmountOfBurnedBsq() {
.sum();
}

public long getBsqBurnedByMonth(Date dateFilter) {
Set<BurnOutputModel> defaultZeroBurn = new HashSet<>();
defaultZeroBurn.add(new BurnOutputModel(0, 0, 0, "", 0L, 0));
Map<String, BurningManCandidate> burningMen = getBurningManCandidatesByName();
return burningMen.values().stream()
.map(burningMan -> burningMan.getBurnOutputModelsByMonth().getOrDefault(dateFilter, defaultZeroBurn).stream()
.mapToLong(BurnOutputModel::getAmount))
.mapToLong(LongStream::sum)
.sum();
}

public String getGenesisTxId() {
return daoStateService.getGenesisTxId();
}
Expand Down
13 changes: 8 additions & 5 deletions desktop/src/main/java/bisq/desktop/main/dao/burnbsq/burningman/BurningManView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ private void onUpdateAvailableBalance(Coin availableBalance) {
private void exportToCSV() {
List<String> result = new ArrayList<>();
String separator = "~";
String tableColumns = "Month~BTC Fees~Fees as BSQ~DPT as BTC~DPT as BSQ~Distributed BTC~Distributed BTC as BSQ";
String tableColumns = "Month~BTC Fees~Fees as BSQ~DPT as BTC~DPT as BSQ~Distributed BTC~Distributed BTC as BSQ~BSQ burned";
CSVEntryConverter<String> headerConverter = item -> tableColumns.split(separator);
CSVEntryConverter<String> contentConverter = item -> item.split(separator);
Date now = new Date();
Expand All @@ -686,6 +686,7 @@ private void exportToCSV() {
long feeAsBsqSum = 0;
long dptAsBsqSum = 0;
long distributedBtcAsBsqSum = 0;
long bsqBurnedSum = 0;
long feeAsBsq, dptAsBsq, distributedBtcAsBsq;
int year = 2023;
int month = 0;
Expand All @@ -697,7 +698,7 @@ private void exportToCSV() {

Map<Date, Price> averageBsqPriceByMonth = burningManAccountingService.getAverageBsqPriceByMonth();
Optional<Price> price = Optional.ofNullable(averageBsqPriceByMonth.get(date));

long bsqBurned = burningManPresentationService.getBsqBurnedByMonth(date);
List<ReceivedBtcBalanceEntry> distributedBtcBalanceByMonth = burningManAccountingService.getDistributedBtcBalanceByMonth(date)
.collect(Collectors.toList());
long feeAsBtc = distributedBtcBalanceByMonth.stream()
Expand Down Expand Up @@ -726,15 +727,16 @@ private void exportToCSV() {
feeAsBsqSum += feeAsBsq;
dptAsBsqSum += dptAsBsq;
distributedBtcAsBsqSum += distributedBtcAsBsq;

bsqBurnedSum += bsqBurned;

line = new SimpleDateFormat("MMM yyyy", Locale.ENGLISH).format(date)
+ separator + btcFormatter.formatCoin(Coin.valueOf(feeAsBtc))
+ separator + bsqFormatter.formatCoin(Coin.valueOf(feeAsBsq))
+ separator + btcFormatter.formatCoin(Coin.valueOf(dptAsBtc))
+ separator + bsqFormatter.formatCoin(Coin.valueOf(dptAsBsq))
+ separator + btcFormatter.formatCoin(Coin.valueOf(distributedBtc))
+ separator + bsqFormatter.formatCoin(Coin.valueOf(distributedBtcAsBsq));
+ separator + bsqFormatter.formatCoin(Coin.valueOf(distributedBtcAsBsq))
+ separator + bsqFormatter.formatCoin(Coin.valueOf(bsqBurned));
result.add(line);
if (++month > 11) {
month = 0;
Expand All @@ -750,7 +752,8 @@ private void exportToCSV() {
+ separator + btcFormatter.formatCoin(Coin.valueOf(dptAsBtcSum))
+ separator + bsqFormatter.formatCoin(Coin.valueOf(dptAsBsqSum))
+ separator + btcFormatter.formatCoin(Coin.valueOf(distributedBtcSum))
+ separator + bsqFormatter.formatCoin(Coin.valueOf(distributedBtcAsBsqSum));
+ separator + bsqFormatter.formatCoin(Coin.valueOf(distributedBtcAsBsqSum))
+ separator + bsqFormatter.formatCoin(Coin.valueOf(bsqBurnedSum));
result.add(line);

GUIUtil.exportCSV("Burningman_dao_revenue.csv", headerConverter, contentConverter,
Expand Down