crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug in LibFractions reference function

Browse Source
This commit is contained in:
Michael Zhu
2019-12-11 18:06:27 -08:00
parent 49538f272e
commit e4a3b1cb05
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/exchange-libs/src/reference_functions.ts
View File

@@ -129,7 +129,7 @@ export const LibFractions = {
normalize: ( normalize: (
numerator: BigNumber, numerator: BigNumber,
denominator: BigNumber, denominator: BigNumber,
maxValue: BigNumber = new BigNumber(2 ** 127), maxValue: BigNumber = new BigNumber(2).exponentiatedBy(127),
): [BigNumber, BigNumber] => { ): [BigNumber, BigNumber] => {
if (numerator.isGreaterThan(maxValue) || denominator.isGreaterThan(maxValue)) { if (numerator.isGreaterThan(maxValue) || denominator.isGreaterThan(maxValue)) {
let rescaleBase = numerator.isGreaterThanOrEqualTo(denominator) ? numerator : denominator; let rescaleBase = numerator.isGreaterThanOrEqualTo(denominator) ? numerator : denominator;

8
contracts/integrations/test/framework/assertions/finalizePool.ts
View File

@@ -179,13 +179,7 @@ export function validFinalizePoolAssertion(
beforeInfo.poolStats.membersStake, beforeInfo.poolStats.membersStake,
); );
[numerator, denominator] = ReferenceFunctions.LibFractions.normalize(numerator, denominator); [numerator, denominator] = ReferenceFunctions.LibFractions.normalize(numerator, denominator);
// There's a bug in our reference functions, probably due to the fact that safeDiv in expect(mostRecentCumulativeRewards).to.deep.equal({ numerator, denominator });
// Solidity truncates in bits, whereas the safeDiv reference function truncates in base 10.
assertRoughlyEquals(
mostRecentCumulativeRewards.numerator.dividedBy(mostRecentCumulativeRewards.denominator),
numerator.dividedBy(denominator),
PRECISION,
);
// Check that aggregated stats have been updated // Check that aggregated stats have been updated
const aggregatedStats = AggregatedStats.fromArray( const aggregatedStats = AggregatedStats.fromArray(