Skip to content

fix: remove supply APY from interest rate model graph #1160

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 1 commit into from
Sep 22, 2022
Merged

fix: remove supply APY from interest rate model graph #1160

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
45 changes: 0 additions & 45 deletions src/modules/reserve-overview/graphs/InterestRateModelGraph.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ import { Trans } from '@lingui/macro';
type TooltipData = Rate;

type InterestRateModelType = {
reserveFactor: string;
supplyAPR: string;
variableRateSlope1: string;
variableRateSlope2: string;
stableRateSlope1: string;
Expand All @@ -36,19 +34,14 @@ type Rate = {
stableRate: number;
variableRate: number;
utilization: number;
supplyRate: number;
};

// accessors
const getDate = (d: Rate) => d.utilization;
const bisectDate = bisector<Rate, number>((d) => d.utilization).center;
const getSupplyRate = (d: Rate) => {
return d.supplyRate ?? 0 * 100;
};
const getVariableBorrowRate = (d: Rate) => d.variableRate * 100;
const getStableBorrowRate = (d: Rate) => d.stableRate * 100;
const tooltipValueAccessors = {
liquidityRate: getSupplyRate,
stableBorrowRate: getStableBorrowRate,
variableBorrowRate: getVariableBorrowRate,
utilizationRate: () => 38,
Expand All @@ -63,8 +56,6 @@ const step = 100 / resolution;
// );

function getRates({
supplyAPR,
reserveFactor,
variableRateSlope1,
variableRateSlope2,
stableRateSlope1,
Expand All @@ -81,7 +72,6 @@ function getRates({
// When zero
if (utilization === 0) {
rates.push({
supplyRate: 0,
stableRate: 0,
variableRate: 0,
utilization,
Expand All @@ -102,7 +92,6 @@ function getRates({
27
).toNumber();
rates.push({
supplyRate: parseFloat(supplyAPR),
stableRate: theoreticalStableAPY,
variableRate: theoreticalVariableAPY,
utilization,
Expand All @@ -126,10 +115,7 @@ function getRates({
.plus(rayMul(variableRateSlope2, excess)),
27
).toNumber();
// Calculate the supply APR based off of the hypothetical variable borrow rate
const theoreticalSupplyAPR = theoreticalVariableAPY * 100 - parseFloat(reserveFactor);
rates.push({
supplyRate: theoreticalSupplyAPR,
stableRate: theoreticalStableAPY,
variableRate: theoreticalVariableAPY,
utilization,
Expand Down Expand Up @@ -259,16 +245,6 @@ export const InterestRateModelGraph = withTooltip<AreaProps, TooltipData>(
numTicks={3}
/>

{/* Supply APR Line */}
<LinePath
stroke="#2EBAC6"
strokeWidth={2}
data={data}
x={(d) => dateScale(getDate(d)) ?? 0}
y={(d) => yValueScale(getSupplyRate(d)) ?? 0}
curve={curveMonotoneX}
/>

{/* Variable Borrow APR Line */}
<LinePath
stroke="#B6509E"
Expand Down Expand Up @@ -404,27 +380,6 @@ export const InterestRateModelGraph = withTooltip<AreaProps, TooltipData>(
strokeWidth={2}
pointerEvents="none"
/>
{/* Supply rate circle */}
<circle
cx={tooltipLeft}
cy={yValueScale(getSupplyRate(tooltipData)) + 1}
r={4}
fill="black"
fillOpacity={0.1}
stroke="black"
strokeOpacity={0.1}
strokeWidth={2}
pointerEvents="none"
/>
<circle
cx={tooltipLeft}
cy={yValueScale(getSupplyRate(tooltipData))}
r={4}
fill={accentColorDark}
stroke="white"
strokeWidth={2}
pointerEvents="none"
/>
{/* Stable borrow rate circle */}
{reserve.stableBorrowRateEnabled && (
<Fragment key={'stable'}>
Expand Down
5 changes: 1 addition & 4 deletions src/modules/reserve-overview/graphs/InterestRateModelGraphContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ type InteresetRateModelGraphContainerProps = {
reserve: ComputedReserveData;
};

export type Field = 'liquidityRate' | 'stableBorrowRate' | 'variableBorrowRate' | 'utilizationRate';
export type Field = 'stableBorrowRate' | 'variableBorrowRate' | 'utilizationRate';

export type Fields = { name: Field; color: string; text: string }[];

Expand All @@ -18,7 +18,6 @@ export const InterestRateModelGraphContainer = ({
}: InteresetRateModelGraphContainerProps): JSX.Element => {
const CHART_HEIGHT = 155;
const fields: Fields = [
{ name: 'liquidityRate', text: 'Supply APR', color: '#2EBAC6' },
{ name: 'variableBorrowRate', text: 'Borrow APR, variable', color: '#B6509E' },
...(reserve.stableBorrowRateEnabled
? ([{ name: 'stableBorrowRate', text: 'Borrow APR, stable', color: '#E7C6DF' }] as const)
Expand All @@ -44,8 +43,6 @@ export const InterestRateModelGraphContainer = ({
height={CHART_HEIGHT}
fields={fields}
reserve={{
reserveFactor: reserve.reserveFactor,
supplyAPR: reserve.supplyAPR,
baseStableBorrowRate: reserve.baseStableBorrowRate,
baseVariableBorrowRate: reserve.baseVariableBorrowRate,
optimalUsageRatio: reserve.optimalUsageRatio,
Expand Down