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.

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

Wire up Rewards Multiplier on Points Markets page #1708

Merged
merged 3 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export function Well<T extends ElementType = "div">({
return (
<Component
className={classNames(
"group relative z-10 flex w-full cursor-pointer items-center overflow-hidden rounded-xl p-[1.5px] transition duration-300 hover:-translate-y-0.5 hover:scale-[1.01] hover:shadow-xl hover:shadow-primary/5",
"group relative z-10 flex cursor-pointer items-center overflow-hidden rounded-xl p-[1.5px] transition duration-300 hover:-translate-y-0.5 hover:scale-[1.01] hover:shadow-xl hover:shadow-primary/5",
)}
onClick={onClick}
disabled={disabled}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
import { fixed, parseFixed } from "@delvtech/fixed-point-wasm";
import { fixed } from "@delvtech/fixed-point-wasm";
import {
getYieldSource,
HyperdriveConfig,
PointMultiplierReward,
} from "@delvtech/hyperdrive-appconfig";
import { Link, useSearch } from "@tanstack/react-router";
import { Link, useNavigate, useSearch } from "@tanstack/react-router";
import { ReactElement, ReactNode } from "react";
import Skeleton from "react-loading-skeleton";
import { formatRate } from "src/base/formatRate";
import { calculateMarketYieldMultiplier } from "src/hyperdrive/calculateMarketYieldMultiplier";
import { useAppConfigForConnectedChain } from "src/ui/appconfig/useAppConfigForConnectedChain";
import { Well } from "src/ui/base/components/Well/Well";
import { useCurrentLongPrice } from "src/ui/hyperdrive/longs/hooks/useCurrentLongPrice";
import { useLpApy } from "src/ui/hyperdrive/lp/hooks/useLpApy";
import { AssetStack } from "src/ui/markets/AssetStack";
import { usePoolsList } from "src/ui/markets/hooks/usePoolsList";
import { usePointsMultipliers } from "src/ui/markets/PointsMarkets/usePointsMultipliers";
import {
MARKET_DETAILS_ROUTE,
POINTS_MARKETS_ROUTE,
} from "src/ui/markets/routes";
import { useRewards } from "src/ui/rewards/useRewards";
import { useYieldSourceRate } from "src/ui/vaults/useYieldSourceRate";
import { useAccount } from "wagmi";

Expand All @@ -46,17 +43,17 @@ export function PointsMarkets(): ReactElement | null {
: [];

return (
<div className="mx-[2vw] mt-4 space-y-8 lg:w-[1064px]">
<div className="mx-[2vw] mt-4 space-y-8 lg:w-[1080px]">
<div className="space-y-4">
<h1 className="gradient-text text-h4 font-medium md:text-h4">
Points Markets
</h1>
<p className="font-inter text-lg leading-bodyText text-neutral-content">
Maximize your returns on DeFi&apos;s top yield sources and boost your
exposure to points and rewards.
Boost your exposure to points and rewards on DeFi&apos;s top yield
sources.
</p>
</div>
<div className="flex flex-wrap gap-8">
<div className="flex w-full flex-wrap gap-8">
{poolsWithPoints.map((hyperdrive) => (
<PointsMarketCard key={hyperdrive.address} hyperdrive={hyperdrive} />
))}
Expand All @@ -70,8 +67,24 @@ function PointsMarketCard({
}: {
hyperdrive: HyperdriveConfig;
}): ReactElement {
const navigate = useNavigate();
return (
<Well as="div" className="w-[514px] shrink-0 gap-6">
<Well
as="div"
className="w-[514px] shrink-0 gap-6"
onClick={() => {
// Clicking on the card will navigate you to the LP tab by default
navigate({
to: MARKET_DETAILS_ROUTE,
resetScroll: true,
params: {
address: hyperdrive.address,
chainId: hyperdrive.chainId.toString(),
},
search: { position: "lp" },
});
}}
>
<PointsMarketCardHeader hyperdrive={hyperdrive} />
<PointsMarketCardBanner hyperdrive={hyperdrive} />
<PointsMarketTable hyperdrive={hyperdrive} />
Expand Down Expand Up @@ -116,35 +129,15 @@ function PointsMarketCardBanner({
}: {
hyperdrive: HyperdriveConfig;
}) {
const { rewards } = useRewards(hyperdrive);
const { longPrice } = useCurrentLongPrice({
chainId: hyperdrive.chainId,
hyperdriveAddress: hyperdrive.address,
});
const pointRewards = rewards?.filter(
({ type }) => type === "pointMultiplier",
) as PointMultiplierReward[] | undefined;

const multipliers =
longPrice && pointRewards
? pointRewards.map(({ pointMultiplier, pointTokenLabel }) => {
const capitalMultiplier = calculateMarketYieldMultiplier(longPrice);
return {
multiplier: capitalMultiplier
.mul(parseFixed(pointMultiplier))
.format({ decimals: 0 }),
label: pointTokenLabel,
};
})
: [];
const multipliers = usePointsMultipliers({ hyperdrive });
return (
<div className="flex w-full items-center justify-between rounded-xl bg-base-200 p-5">
<div className="flex w-full flex-col items-center justify-center gap-1.5">
<p className="font-medium text-neutral-content sm:text-sm">
Earn up to
</p>
<div className="flex w-full justify-between">
{multipliers.map(({ multiplier, label }) => (
{multipliers?.map(({ multiplier, label }) => (
<div
key={label}
className="flex w-full flex-col items-center justify-center gap-1.5"
Expand Down Expand Up @@ -173,6 +166,8 @@ function PointsMarketTable({ hyperdrive }: { hyperdrive: HyperdriveConfig }) {
chainId: hyperdrive.chainId,
hyperdriveAddress: hyperdrive.address,
});

const multipliers = usePointsMultipliers({ hyperdrive });
return (
<div className="flex flex-col gap-3">
<PointsMarketRow
Expand Down Expand Up @@ -264,9 +259,15 @@ function PointsMarketTable({ hyperdrive }: { hyperdrive: HyperdriveConfig }) {
</span>
}
col2={
<span className="gradient-text mr-5 text-sm font-medium">64x</span>
<span className="gradient-text mr-5 text-sm font-medium">
{multipliers?.[0].multiplier}x
</span>
}
col3={
<span className="mr-3 text-sm">
Up to {multipliers?.[0].multiplier}x
</span>
}
col3={<span className="mr-3 text-sm">Up to 64x</span>}
/>
<PointsMarketRow
col1={<span className="text-sm text-neutral-content">Term</span>}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import { parseFixed } from "@delvtech/fixed-point-wasm";
import {
HyperdriveConfig,
PointMultiplierReward,
} from "@delvtech/hyperdrive-appconfig";
import { calculateMarketYieldMultiplier } from "src/hyperdrive/calculateMarketYieldMultiplier";
import { useCurrentLongPrice } from "src/ui/hyperdrive/longs/hooks/useCurrentLongPrice";
import { useRewards } from "src/ui/rewards/useRewards";

export function usePointsMultipliers({
hyperdrive,
}: {
hyperdrive: HyperdriveConfig;
}): { multiplier: string; label: string }[] | undefined {
const { rewards } = useRewards(hyperdrive);
const { longPrice } = useCurrentLongPrice({
chainId: hyperdrive.chainId,
hyperdriveAddress: hyperdrive.address,
});
const pointRewards = rewards?.filter(
({ type }) => type === "pointMultiplier",
) as PointMultiplierReward[] | undefined;

if (!longPrice || !pointRewards) {
return;
}

const multipliers = pointRewards.map(
({ pointMultiplier, pointTokenLabel }) => {
const capitalMultiplier = calculateMarketYieldMultiplier(longPrice);
return {
multiplier: capitalMultiplier
.mul(parseFixed(pointMultiplier))
.format({ decimals: 0 }),
label: pointTokenLabel,
};
},
);

return multipliers;
}
Loading