Skip to content

fix: Fix rounding error in reserves in Preview epoch 372 #60

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

Merged
fabianbormann merged 1 commit into from
Feb 19, 2025
Merged

fix: Fix rounding error in reserves in Preview epoch 372 #60

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
2 changes: 1 addition & 1 deletion calculation/src/main/java/org/cardanofoundation/rewards/calculation/EpochCalculation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static EpochCalculationResult calculateEpochRewardPots(final int epoch,

if (epochInfo != null) {
activeStakeInEpoch = epochInfo.getActiveStake();
totalFeesForCurrentEpoch = epochInfo.getFees();
totalFeesForCurrentEpoch = epochInfo.getFees() != null? epochInfo.getFees(): BigInteger.ZERO;
totalBlocksInEpoch = epochInfo.getBlockCount();
if (isLower(decentralizationParameter, BigDecimal.valueOf(0.8)) && isHigher(decentralizationParameter, BigDecimal.ZERO)) {
totalBlocksInEpoch = epochInfo.getNonOBFTBlockCount();
Expand Down
17 changes: 8 additions & 9 deletions ...ation/src/main/java/org/cardanofoundation/rewards/calculation/PoolRewardsCalculation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package org.cardanofoundation.rewards.calculation;

import lombok.extern.slf4j.Slf4j;
import org.cardanofoundation.rewards.calculation.config.NetworkConfig;
import org.cardanofoundation.rewards.calculation.domain.*;

import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.*;
import java.util.HashSet;
import java.util.Set;

import static org.cardanofoundation.rewards.calculation.util.BigNumberUtils.*;
import static org.cardanofoundation.rewards.calculation.util.BigNumberUtils.divide;

import lombok.extern.slf4j.Slf4j;

@Slf4j
public class PoolRewardsCalculation {
Expand Down Expand Up @@ -97,14 +96,14 @@ public static BigInteger calculatePoolReward(BigInteger optimalPoolReward, BigDe
* This method calculates the pool operator reward regarding the formula described
* in the shelly-ledger.pdf p. 61, figure 47
*/
public static BigInteger calculateLeaderReward(BigInteger poolReward, double margin, BigInteger poolCost,
public static BigInteger calculateLeaderReward(BigInteger poolReward, BigDecimal margin, BigInteger poolCost,
BigDecimal relativeOwnerStake, BigDecimal relativeStakeOfPool) {
if (isLowerOrEquals(poolReward, poolCost)) {
return poolReward;
}

return add(poolCost, floor(multiply(subtract(poolReward, poolCost),
add(margin, multiply((1 - margin), divide(relativeOwnerStake, relativeStakeOfPool))))));
add(margin, multiply(BigDecimal.ONE.subtract(margin), divide(relativeOwnerStake, relativeStakeOfPool))))));
}

/*
Expand All @@ -113,7 +112,7 @@ public static BigInteger calculateLeaderReward(BigInteger poolReward, double mar
*
* See Haskell implementation: https://github.com/input-output-hk/cardano-ledger/blob/aed5dde9cd1096cfc2e255879cd617c0d64f8d9d/eras/shelley/impl/src/Cardano/Ledger/Shelley/Rewards.hs#L117
*/
public static BigInteger calculateMemberReward(BigInteger poolReward, double margin, BigInteger poolCost,
public static BigInteger calculateMemberReward(BigInteger poolReward, BigDecimal margin, BigInteger poolCost,
BigDecimal relativeMemberStake, BigDecimal relativeStakeOfPool) {
if (isLowerOrEquals(poolReward, poolCost)) {
return BigInteger.ZERO;
Expand Down Expand Up @@ -156,11 +155,11 @@ public static PoolRewardCalculationResult calculatePoolRewardInEpoch(final Strin

final BigInteger poolStake = poolStateCurrentEpoch.getActiveStake();
final BigInteger poolPledge = poolStateCurrentEpoch.getPledge();
final double poolMargin = poolStateCurrentEpoch.getMargin();
final BigDecimal poolMargin = BigDecimal.valueOf(poolStateCurrentEpoch.getMargin());
final BigInteger poolFixedCost = poolStateCurrentEpoch.getFixedCost();
final int blocksPoolHasMinted = poolStateCurrentEpoch.getBlockCount();

poolRewardCalculationResult.setPoolMargin(poolMargin);
poolRewardCalculationResult.setPoolMargin(poolStateCurrentEpoch.getMargin());
poolRewardCalculationResult.setPoolCost(poolFixedCost);
poolRewardCalculationResult.setRewardAddress(poolStateCurrentEpoch.getRewardAddress());

Expand Down
Loading