mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix duration calculations

Browse source 
Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
This commit is contained in:
HenrikJannsen 2022-11-09 12:54:09 -05:00
parent 3213c5e770
commit c747a486a7
No known key found for this signature in database
GPG key ID: 02AA2BAE387C8307
3 changed files with 59 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
core/src/main/java/bisq/core/dao/CyclesInDaoStateService.java
View file

@ -20,6 +20,7 @@ package bisq.core.dao;
import bisq.core.dao.governance.period.CycleService;
import bisq.core.dao.state.DaoStateService;
import bisq.core.dao.state.model.governance.Cycle;
import bisq.core.dao.state.model.governance.DaoPhase;
import javax.inject.Inject;
import javax.inject.Singleton;
@ -57,6 +58,33 @@ public class CyclesInDaoStateService {
.orElse(-1);
}
public int getHeightOfFirstBlockOfResultPhaseOfPastCycle(int chainHeight, int numPastCycles) {
return findCycleAtHeight(chainHeight)
.map(cycle -> {
int cycleIndex = getIndexForCycle(cycle);
int targetIndex = Math.max(0, (cycleIndex - numPastCycles));
return getCycleAtIndex(targetIndex);
})
.map(cycle -> cycle.getFirstBlockOfPhase(DaoPhase.Phase.RESULT))
.orElse(daoStateService.getGenesisBlockHeight());
}
/**
*
* @param chainHeight Chain height from where we start
* @param numPastCycles Number of past cycles
* @return The height at the same offset from the first block of the cycle as in the current cycle minus the past cycles.
*/
public int getChainHeightOfPastCycle(int chainHeight, int numPastCycles) {
return getHeightOfFirstBlockOfPastCycle(chainHeight, numPastCycles) + getOffsetFromFirstBlockInCycle(chainHeight);
}
public Integer getOffsetFromFirstBlockInCycle(int chainHeight) {
return daoStateService.getCycle(chainHeight)
.map(c -> chainHeight - c.getHeightOfFirstBlock())
.orElse(0);
}
public int getHeightOfFirstBlockOfPastCycle(int chainHeight, int numPastCycles) {
return findCycleAtHeight(chainHeight)
.map(cycle -> {
@ -68,7 +96,7 @@ public class CyclesInDaoStateService {
.orElse(daoStateService.getGenesisBlockHeight());
}
private Cycle getCycleAtIndex(int index) {
public Cycle getCycleAtIndex(int index) {
int cycleIndex = Math.max(0, index);
return Optional.ofNullable(cyclesByIndex.get(cycleIndex))
.orElseGet(() -> {
@ -78,7 +106,7 @@ public class CyclesInDaoStateService {
});
}
private int getIndexForCycle(Cycle cycle) {
public int getIndexForCycle(Cycle cycle) {
return Optional.ofNullable(indexByCycle.get(cycle))
.orElseGet(() -> {
int index = cycleService.getCycleIndex(cycle);
@ -87,7 +115,7 @@ public class CyclesInDaoStateService {
});
}
private Optional<Cycle> findCycleAtHeight(int chainHeight) {
public Optional<Cycle> findCycleAtHeight(int chainHeight) {
return Optional.ofNullable(cyclesByHeight.get(chainHeight))
.or(() -> {
Optional<Cycle> optionalCycle = daoStateService.getCycle(chainHeight);

41
core/src/main/java/bisq/core/dao/burningman/BurnTargetService.java
View file

@ -96,17 +96,21 @@ class BurnTargetService {
}
long getBurnTarget(int chainHeight, Collection<BurningManCandidate> burningManCandidates) {
int fromBlock = cyclesInDaoStateService.getHeightOfFirstBlockOfPastCycle(chainHeight, NUM_CYCLES_BURN_TARGET);
long accumulatedReimbursements = getAccumulatedReimbursements(chainHeight, fromBlock);
long accumulatedEstimatedBtcTradeFees = getAccumulatedEstimatedBtcTradeFees(chainHeight, fromBlock);
// Reimbursements are taken into account at result vote block
int chainHeightOfPastCycle = cyclesInDaoStateService.getChainHeightOfPastCycle(chainHeight, NUM_CYCLES_BURN_TARGET);
long accumulatedReimbursements = getAccumulatedReimbursements(chainHeight, chainHeightOfPastCycle);
// Param changes are taken into account at first block at next cycle after voting
int heightOfFirstBlockOfPastCycle = cyclesInDaoStateService.getHeightOfFirstBlockOfPastCycle(chainHeight, NUM_CYCLES_BURN_TARGET - 1);
long accumulatedEstimatedBtcTradeFees = getAccumulatedEstimatedBtcTradeFees(chainHeight, heightOfFirstBlockOfPastCycle);
// Legacy BurningMan
Set<Tx> proofOfBurnTxs = getProofOfBurnTxs(chainHeight, fromBlock);
long burnedAmountFromLegacyBurningManDPT = getBurnedAmountFromLegacyBurningManDPT(proofOfBurnTxs, chainHeight, fromBlock);
long burnedAmountFromLegacyBurningMansBtcFees = getBurnedAmountFromLegacyBurningMansBtcFees(proofOfBurnTxs, chainHeight, fromBlock);
Set<Tx> proofOfBurnTxs = getProofOfBurnTxs(chainHeight, chainHeightOfPastCycle);
long burnedAmountFromLegacyBurningManDPT = getBurnedAmountFromLegacyBurningManDPT(proofOfBurnTxs, chainHeight, chainHeightOfPastCycle);
long burnedAmountFromLegacyBurningMansBtcFees = getBurnedAmountFromLegacyBurningMansBtcFees(proofOfBurnTxs, chainHeight, chainHeightOfPastCycle);
// Distributed BurningMen
long burnedAmountFromBurningMen = getBurnedAmountFromBurningMen(burningManCandidates, chainHeight, fromBlock);
long burnedAmountFromBurningMen = getBurnedAmountFromBurningMen(burningManCandidates, chainHeight, chainHeightOfPastCycle);
long burnTarget = accumulatedReimbursements
+ accumulatedEstimatedBtcTradeFees
@ -130,9 +134,14 @@ class BurnTargetService {
}
long getAverageDistributionPerCycle(int chainHeight) {
int fromBlock = cyclesInDaoStateService.getHeightOfFirstBlockOfPastCycle(chainHeight, NUM_CYCLES_AVERAGE_DISTRIBUTION);
long reimbursements = getAccumulatedReimbursements(chainHeight, fromBlock);
long btcTradeFees = getAccumulatedEstimatedBtcTradeFees(chainHeight, fromBlock);
// Reimbursements are taken into account at result vote block
int chainHeightOfPastCycle = cyclesInDaoStateService.getChainHeightOfPastCycle(chainHeight, NUM_CYCLES_AVERAGE_DISTRIBUTION);
long reimbursements = getAccumulatedReimbursements(chainHeight, chainHeightOfPastCycle);
// Param changes are taken into account at first block at next cycle after voting
int firstBlockOfPastCycle = cyclesInDaoStateService.getHeightOfFirstBlockOfPastCycle(chainHeight, NUM_CYCLES_AVERAGE_DISTRIBUTION - 1);
long btcTradeFees = getAccumulatedEstimatedBtcTradeFees(chainHeight, firstBlockOfPastCycle);
return Math.round((reimbursements + btcTradeFees) / (double) NUM_CYCLES_AVERAGE_DISTRIBUTION);
}
@ -151,11 +160,13 @@ class BurnTargetService {
private long getAccumulatedReimbursements(int chainHeight, int fromBlock) {
return getReimbursements(chainHeight).stream()
.filter(reimbursementModel -> reimbursementModel.getHeight() >= fromBlock)
.filter(reimbursementModel -> reimbursementModel.getHeight() > fromBlock)
.filter(reimbursementModel -> reimbursementModel.getHeight() <= chainHeight)
.mapToLong(ReimbursementModel::getAmount)
.sum();
}
// The BTC fees are set by parameter and becomes active at first block of the next cycle after voting.
private long getAccumulatedEstimatedBtcTradeFees(int chainHeight, int fromBlock) {
return daoStateService.getCycles().stream()
.filter(cycle -> cycle.getHeightOfFirstBlock() >= fromBlock)
@ -172,7 +183,7 @@ class BurnTargetService {
private Set<Tx> getProofOfBurnTxs(int chainHeight, int fromBlock) {
return daoStateService.getProofOfBurnTxs().stream()
.filter(tx -> tx.getBlockHeight() >= fromBlock)
.filter(tx -> tx.getBlockHeight() > fromBlock)
.filter(tx -> tx.getBlockHeight() <= chainHeight)
.collect(Collectors.toSet());
}
@ -184,7 +195,7 @@ class BurnTargetService {
// opReturn data from delayed payout txs when BM traded with the refund agent: 1701e47e5d8030f444c182b5e243871ebbaeadb5e82f
// opReturn data from delayed payout txs when BM traded with traders who got reimbursed by the DAO: 1701293c488822f98e70e047012f46f5f1647f37deb7
return proofOfBurnTxs.stream()
.filter(tx -> tx.getBlockHeight() >= fromBlock)
.filter(tx -> tx.getBlockHeight() > fromBlock)
.filter(tx -> tx.getBlockHeight() <= chainHeight)
.filter(tx -> {
String hash = Hex.encode(tx.getLastTxOutput().getOpReturnData());
@ -201,7 +212,7 @@ class BurnTargetService {
// opReturn data from delayed payout txs when BM traded with the refund agent: 1701e47e5d8030f444c182b5e243871ebbaeadb5e82f
// opReturn data from delayed payout txs when BM traded with traders who got reimbursed by the DAO: 1701293c488822f98e70e047012f46f5f1647f37deb7
return proofOfBurnTxs.stream()
.filter(tx -> tx.getBlockHeight() >= fromBlock)
.filter(tx -> tx.getBlockHeight() > fromBlock)
.filter(tx -> tx.getBlockHeight() <= chainHeight)
.filter(tx -> "1701721206fe6b40777763de1c741f4fd2706d94775d".equals(Hex.encode(tx.getLastTxOutput().getOpReturnData())))
.mapToLong(Tx::getBurntBsq)
@ -213,7 +224,7 @@ class BurnTargetService {
int fromBlock) {
return burningManCandidates.stream()
.map(burningManCandidate -> burningManCandidate.getBurnOutputModels().stream()
.filter(burnOutputModel -> burnOutputModel.getHeight() >= fromBlock)
.filter(burnOutputModel -> burnOutputModel.getHeight() > fromBlock)
.filter(burnOutputModel -> burnOutputModel.getHeight() <= chainHeight)
.mapToLong(BurnOutputModel::getAmount)
.sum())

4
core/src/main/java/bisq/core/dao/burningman/BurningManService.java
View file

@ -234,7 +234,7 @@ class BurningManService {
}
private long getDecayedCompensationAmount(long amount, int issuanceHeight, int chainHeight) {
int fromHeight = cyclesInDaoStateService.getHeightOfFirstBlockOfPastCycle(chainHeight, NUM_CYCLES_COMP_REQUEST_DECAY);
int fromHeight = cyclesInDaoStateService.getChainHeightOfPastCycle(chainHeight, NUM_CYCLES_COMP_REQUEST_DECAY);
return getDecayedAmount(amount, issuanceHeight, chainHeight, fromHeight, 0);
}
@ -296,7 +296,7 @@ class BurningManService {
}
private long getDecayedBurnedAmount(long amount, int issuanceHeight, int chainHeight) {
int fromHeight = cyclesInDaoStateService.getHeightOfFirstBlockOfPastCycle(chainHeight, NUM_CYCLES_BURN_AMOUNT_DECAY);
int fromHeight = cyclesInDaoStateService.getChainHeightOfPastCycle(chainHeight, NUM_CYCLES_BURN_AMOUNT_DECAY);
return getDecayedAmount(amount,
issuanceHeight,
chainHeight,