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

Extract coeff computation in curve function #59

Closed
wants to merge 4 commits into from
Closed

Extract coeff computation in curve function #59

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c123cfd
chore: space
MathisGD Nov 4, 2023
94753ff
refactor: extract coeff computation
MerlinEgalite Nov 6, 2023
3eb9580
docs: move comment to the right place
MerlinEgalite Nov 6, 2023
f3eaa08
refactor: rename variable
MerlinEgalite Nov 9, 2023
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
9 changes: 4 additions & 5 deletions src/SpeedJumpIrm.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ contract AdaptativeCurveIrm is IIrm {
// <=> endBorrowRate <= startBorrowRate.
avgBorrowRate = uint256((int256(endBorrowRate) - int256(startBorrowRate)).wDivDown(linearVariation));
}

return (avgBorrowRate, endRateAtTarget);
}
}
Expand All @@ -164,10 +165,8 @@ contract AdaptativeCurveIrm is IIrm {
/// ((C-1)*err + 1) * rateAtTarget else.
function _curve(uint256 _rateAtTarget, int256 err) private view returns (uint256) {
// Safe "unchecked" cast because err >= -1 (in WAD).
MerlinEgalite marked this conversation as resolved.
Show resolved Hide resolved
if (err < 0) {
return uint256((WAD - WAD.wDivDown(CURVE_STEEPNESS)).wMulDown(err) + WAD_INT).wMulDown(_rateAtTarget);
} else {
return uint256((CURVE_STEEPNESS - WAD).wMulDown(err) + WAD_INT).wMulDown(_rateAtTarget);
}
uint256 steeringCoeff = err < 0 ? WAD - WAD.wDivDown(CURVE_STEEPNESS) : CURVE_STEEPNESS - WAD;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not the steering coefficient but the steering coefficient divided by _rateAtTarget.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So what name do you suggest? just coeff? coeffAdjusted?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest my proposal lol

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or we can divide by the denominator now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes but it's not readable to me


return uint256(steeringCoeff.wMulDown(err) + WAD_INT).wMulDown(_rateAtTarget);
}
}