Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/86-linear-interest-optimization' into 'master'

Browse Source 
Fixes #86

Closes #86

See merge request aave-tech/protocol-v2!93
This commit is contained in:
The-3D 2020-10-27 12:02:32 +00:00
commit b1fdd59c39
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/libraries/math/MathUtils.sol
View File

@ -26,9 +26,7 @@ library MathUtils {
//solium-disable-next-line //solium-disable-next-line
uint256 timeDifference = block.timestamp.sub(uint256(lastUpdateTimestamp)); uint256 timeDifference = block.timestamp.sub(uint256(lastUpdateTimestamp));
uint256 timeDelta = timeDifference.wadToRay().rayDiv(SECONDS_PER_YEAR.wadToRay()); return (rate.mul(timeDifference) / SECONDS_PER_YEAR).add(WadRayMath.ray());
return rate.rayMul(timeDelta).add(WadRayMath.ray());
} }
/** /**

9
test/helpers/utils/calculations.ts
View File

@ -1153,11 +1153,12 @@ const calcLinearInterest = (
currentTimestamp: BigNumber, currentTimestamp: BigNumber,
lastUpdateTimestamp: BigNumber lastUpdateTimestamp: BigNumber
) => { ) => {
const timeDifference = currentTimestamp.minus(lastUpdateTimestamp).wadToRay(); const timeDifference = currentTimestamp.minus(lastUpdateTimestamp);
const timeDelta = timeDifference.rayDiv(new BigNumber(ONE_YEAR).wadToRay()); const cumulatedInterest = rate
.multipliedBy(timeDifference)
const cumulatedInterest = rate.rayMul(timeDelta).plus(RAY); .dividedBy(new BigNumber(ONE_YEAR))
.plus(RAY);
return cumulatedInterest; return cumulatedInterest;
}; };