Skip to content

fix: gho user data #615

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
merged 3 commits into from
Feb 14, 2025
Merged

fix: gho user data #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9125ad
fix: gho user data
grothem Feb 12, 2025
bd72feb
fix: test
grothem Feb 12, 2025
db28ac7
fix: rename vars, comments
grothem Feb 13, 2025
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
8 changes: 4 additions & 4 deletions packages/math-utils/src/formatters/gho/index.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ describe('formatGhoData', () => {
expect(result.userGhoDiscountPercent).toEqual(0.1);
expect(result.userGhoAvailableToBorrowAtDiscount).toEqual(10000);
expect(result.userDiscountTokenBalance).toEqual(100);
expect(result.userGhoBorrowBalance).toEqual(1.1000000063419584);
expect(result.userDiscountedGhoInterest).toEqual(0.9000000570776255);
expect(result.userGhoBorrowBalance).toEqual(1.9000000570776256);
expect(result.userDiscountedGhoInterest).toEqual(0.1000000063419584);
});

it('calculates the amount of GHO available to borrow at discount', () => {
Expand All @@ -53,8 +53,8 @@ describe('formatGhoData', () => {
expect(result.userGhoDiscountPercent).toEqual(0.1);
expect(result.userGhoAvailableToBorrowAtDiscount).toEqual(0);
expect(result.userDiscountTokenBalance).toEqual(0.1);
expect(result.userGhoBorrowBalance).toEqual(1.1000000063419584);
expect(result.userDiscountedGhoInterest).toEqual(0.9000000570776255);
expect(result.userGhoBorrowBalance).toEqual(1.9000000570776256);
expect(result.userDiscountedGhoInterest).toEqual(0.1000000063419584);
});

it('properly formats user summary with GHO discount', () => {
Expand Down
14 changes: 7 additions & 7 deletions packages/math-utils/src/formatters/gho/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,30 +122,30 @@ export function formatGhoUserData({
userGhoAvailableToBorrowAtDiscount = 0;
}

const userBalancePreDiscount = getCompoundedBalance({
const balance = getCompoundedBalance({
principalBalance: ghoUserData.userGhoScaledBorrowBalance,
reserveIndex: ghoReserveData.ghoCurrentBorrowIndex,
reserveRate: ghoReserveData.ghoBaseVariableBorrowRate,
lastUpdateTimestamp: Number(ghoReserveData.ghoReserveLastUpdateTimestamp),
currentTimestamp,
});
const accruedInterest = userBalancePreDiscount.minus(
const balanceIncrease = balance.minus(
rayMul(
ghoUserData.userGhoScaledBorrowBalance,
ghoUserData.userPreviousGhoBorrowIndex,
),
);
const discount = accruedInterest.multipliedBy(
1 - Number(normalize(ghoUserData.userGhoDiscountPercent, 4)),
);
const userBorrowBalance = userBalancePreDiscount.minus(discount);
const discountedAmount = balanceIncrease
.multipliedBy(ghoUserData.userGhoDiscountPercent)
.dividedBy(10000); // discount is in basis points
const userBorrowBalance = balance.minus(discountedAmount);
return {
userGhoDiscountPercent: Number(
normalize(ghoUserData.userGhoDiscountPercent, 4),
),
userDiscountTokenBalance: formattedUserDiscountTokenBalance,
userGhoBorrowBalance: Number(normalize(userBorrowBalance, 18)),
userDiscountedGhoInterest: Number(normalize(discount, 18)),
userDiscountedGhoInterest: Number(normalize(discountedAmount, 18)),
userGhoAvailableToBorrowAtDiscount,
};
}
Expand Down
Loading