Skip to content

feat: add Yield+ feature #5463

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

Draft
therealemjy wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: add Yield+ feature #5463

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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .changeset/chilly-pugs-trade.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@venusprotocol/evm": minor
---

add Yield+ feature
1 change: 1 addition & 0 deletions apps/evm/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
"i18next-browser-languagedetector": "^8.2.0",
"immer": "^10.1.1",
"lodash-es": "^4.17.21",
"klinecharts": "^10.0.0-beta1",
"motion": "^12.0.3",
"noop-ts": "^1.0.6",
"ogl": "^1.0.11",
Expand Down
13 changes: 13 additions & 0 deletions apps/evm/src/App/Routes/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ const Stats = safeLazyLoad(() => import('pages/Stats'));
const Skills = safeLazyLoad(() => import('pages/Skills'));
const PrivacyPolicy = safeLazyLoad(() => import('pages/PrivacyPolicy'));
const TermsOfUse = safeLazyLoad(() => import('pages/TermsOfUse'));
const YieldPlus = safeLazyLoad(() => import('pages/YieldPlus'));

const AppRoutes = () => {
const location = useLocation();
const swapRouteEnabled = useIsFeatureEnabled({ name: 'swapRoute' });
const vaiRouteEnabled = useIsFeatureEnabled({ name: 'vaiRoute' });
const bridgeEnabled = useIsFeatureEnabled({ name: 'bridgeRoute' });
const yieldPlusRouteEnabled = useIsFeatureEnabled({ name: 'yieldPlus' });
const primeCalculatorEnabled = useIsFeatureEnabled({
name: 'primeCalculator',
});
Expand Down Expand Up @@ -178,6 +180,17 @@ const AppRoutes = () => {
}
/>

{yieldPlusRouteEnabled && (
<Route
path={Subdirectory.YIELD_PLUS}
element={
<PageSuspense>
<YieldPlus />
</PageSuspense>
}
/>
)}

{swapRouteEnabled && (
<Route
path={Subdirectory.SWAP}
Expand Down
2 changes: 1 addition & 1 deletion apps/evm/src/App/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { QueryClientProvider } from '@tanstack/react-query';
import { queryClient } from 'clients/api';
import { queryClient } from 'clients/api/queryClient';
import config from 'config';
import { AnalyticProvider } from 'libs/analytics';
import { ErrorBoundary } from 'libs/errors';
Expand Down
13 changes: 12 additions & 1 deletion apps/evm/src/__mocks__/models/swap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ExactInSwapQuote } from 'types';
import type { ApproximateOutSwapQuote, ExactInSwapQuote } from 'types';
import { lisUsd, usdc } from './tokens';

export const exactInSwapQuote: ExactInSwapQuote = {
Expand All @@ -11,3 +11,14 @@ export const exactInSwapQuote: ExactInSwapQuote = {
minimumToTokenAmountReceivedMantissa: 100000000n,
callData: '0x',
};

export const approximateOutSwapQuote: ApproximateOutSwapQuote = {
fromToken: lisUsd,
toToken: usdc,
direction: 'approximate-out',
priceImpactPercentage: 0.1,
fromTokenAmountSoldMantissa: 100000000n,
expectedToTokenAmountReceivedMantissa: 100000000n,
minimumToTokenAmountReceivedMantissa: 100000000n,
callData: '0x',
};
82 changes: 38 additions & 44 deletions apps/evm/src/__mocks__/models/transactions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,103 +6,97 @@ export const transactions = {
transactions: [
{
accountAddress: '0x3d759121234cd36F8124C21aFe1c6852d2bEd848',
amountCents: new BigNumber('2406931.018168454893468167206'),
amountTokens: new BigNumber('24066181578079398.612862'),
amounts: [
{
amountCents: 2406931.018168455,
amountTokens: new BigNumber('24066181578079398.612862'),
token: usdt,
},
],
blockNumber: '41604850',
blockTimestamp: new Date('2024-08-23T04:17:09.000Z'),
chainId: 97,
contractAddress: '0xb7526572FFE56AB9D7489838Bf2E18e3323b441A',
hash: '0xda13a0f45b10dabd21b863b6b602c6d8776edd4c6b10fe65a0881d491f468f35',
poolName: 'Metaverse',
vTokenSymbol: vUsdtCorePool.symbol,
token: usdt,
txType: 'redeem',
vToken: vUsdtCorePool,
txType: 'withdraw',
},
{
accountAddress: '0x3d759121234cd36F8124C21aFe1c6852d2bEd848',
amountCents: new BigNumber('2401121.576132434220587935367386'),
amountTokens: new BigNumber('24001813290985731.455439'),
amounts: [
{
amountCents: 2401121.5761324344,
amountTokens: new BigNumber('24001813290985731.455439'),
token: usdt,
},
],
blockNumber: '41114054',
blockTimestamp: new Date('2024-08-06T02:18:03.000Z'),
chainId: 97,
contractAddress: '0xb7526572FFE56AB9D7489838Bf2E18e3323b441A',
hash: '0xb0435b135762a7ca2ad7dccb9aa6c7f50237c6139b16a76348d6c64dfece110e',
poolName: 'Metaverse',
vTokenSymbol: vUsdtCorePool.symbol,
token: usdt,
txType: 'mint',
vToken: vUsdtCorePool,
txType: 'supply',
},
{
accountAddress: '0x3d759121234cd36F8124C21aFe1c6852d2bEd848',
amountCents: new BigNumber('2401121.576132434220587935367386'),
amountTokens: new BigNumber('24001813290985731.455439'),
amounts: [
{
amountCents: 2401121.5761324344,
amountTokens: new BigNumber('24001813290985731.455439'),
token: usdt,
},
],
blockNumber: '41114053',
blockTimestamp: new Date('2024-08-05T02:18:03.000Z'),
chainId: 97,
contractAddress: '0xb7526572FFE56AB9D7489838Bf2E18e3323b441A',
hash: '0xb0435b135762a7ca2ad7dccb9aa6c7f50237c6139b16a76348d6c64dfece110e',
poolName: 'Metaverse',
vTokenSymbol: vUsdtCorePool.symbol,
token: usdt,
vToken: vUsdtCorePool,
txType: 'borrow',
},
{
accountAddress: '0x3d759121234cd36F8124C21aFe1c6852d2bEd848',
amountCents: new BigNumber('2401121.576132434220587935367386'),
amountTokens: new BigNumber('24001813290985731.455439'),
amounts: [
{
amountCents: 2401121.5761324344,
amountTokens: new BigNumber('24001813290985731.455439'),
token: usdt,
},
],
blockNumber: '41114052',
blockTimestamp: new Date('2024-08-04T02:18:03.000Z'),
chainId: 97,
contractAddress: '0xb7526572FFE56AB9D7489838Bf2E18e3323b441A',
hash: '0xb0435b135762a7ca2ad7dccb9aa6c7f50237c6139b16a76348d6c64dfece110e',
poolName: 'Metaverse',
vTokenSymbol: vUsdtCorePool.symbol,
token: usdt,
vToken: vUsdtCorePool,
txType: 'repay',
},
{
accountAddress: '0x3d759121234cd36F8124C21aFe1c6852d2bEd848',
amountCents: new BigNumber('2401121.576132434220587935367386'),
amountTokens: new BigNumber('24001813290985731.455439'),
blockNumber: '41114051',
blockTimestamp: new Date('2024-08-03T02:18:03.000Z'),
chainId: 97,
contractAddress: '0xb7526572FFE56AB9D7489838Bf2E18e3323b441A',
hash: '0xb0435b135762a7ca2ad7dccb9aa6c7f50237c6139b16a76348d6c64dfece110e',
poolName: 'Metaverse',
vTokenSymbol: vUsdtCorePool.symbol,
token: usdt,
txType: 'enter_market',
vToken: vUsdtCorePool,
txType: 'enterMarket',
},
{
accountAddress: '0x3d759121234cd36F8124C21aFe1c6852d2bEd848',
amountCents: new BigNumber('2401121.576132434220587935367386'),
amountTokens: new BigNumber('24001813290985731.455439'),
blockNumber: '41114050',
blockTimestamp: new Date('2024-08-03T02:18:00.000Z'),
chainId: 97,
contractAddress: '0xb7526572FFE56AB9D7489838Bf2E18e3323b441A',
hash: '0xb0435b135762a7ca2ad7dccb9aa6c7f50237c6139b16a76348d6c64dfece110e',
poolName: 'Metaverse',
vTokenSymbol: vUsdtCorePool.symbol,
token: usdt,
txType: 'exit_market',
},
{
accountAddress: '0x3d759121234cd36F8124C21aFe1c6852d2bEd848',
amountCents: new BigNumber('0'),
amountTokens: new BigNumber(
'115792089237316195423570985008687907853269984665640564039457584007913129639935',
),
blockNumber: '41114008',
blockTimestamp: new Date('2024-08-02T02:18:00.000Z'),
chainId: 97,
contractAddress: '0xb7526572FFE56AB9D7489838Bf2E18e3323b441A',
hash: '0xb0435b135762a7ca2ad7dccb9aa6c7f50237c6139b16a76348d6c64dfece110e',
poolName: 'Metaverse',
vTokenSymbol: vUsdtCorePool.symbol,
token: vUsdtCorePool,
txType: 'approve',
vToken: vUsdtCorePool,
txType: 'exitMarket',
},
],
count: 7,
Expand Down
156 changes: 156 additions & 0 deletions apps/evm/src/__mocks__/models/yieldPlus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,156 @@
import type { ApiYieldPlusPosition } from 'clients/api/queries/getRawYieldPlusPositions';
import type { YieldPlusPosition } from 'types';
import { convertTokensToMantissa } from 'utilities';
import { formatToYieldPlusPosition } from 'utilities/formatToYieldPlusPosition';
import fakeAddress, { altAddress } from './address';
import { poolData } from './pools';

const pool = poolData[0];
const xvsAsset = pool.assets[0];
const usdcAsset = pool.assets[1];
const usdtAsset = pool.assets[2];
const busdAsset = pool.assets[3];

export const apiYieldPlusPositions: ApiYieldPlusPosition[] = [
{
pnl: {
realizedPnlShortAssetMantissa: '0',
realizedPnlUsd: '0',
unrealizedPnlShortAssetMantissa: '0',
unrealizedPnlUsd: '0',
unrealizedPnlRatio: '0',
entryRatio: '1',
currentRatio: '1',
closeEventsWithPnlData: [],
totalShortOpenedMantissa: '0',
totalLongReceivedMantissa: '0',
},
positionAccountAddress: fakeAddress,
accountAddress: fakeAddress,
longVTokenAddress: usdtAsset.vToken.address,
shortVTokenAddress: busdAsset.vToken.address,
chainId: String(busdAsset.vToken.underlyingToken.chainId),
isActive: true,
cycleId: '1',
dsaVTokenAddress: xvsAsset.vToken.address,
effectiveLeverageRatio: '2',
capitalUtilization: {
suppliedPrincipalMantissa: convertTokensToMantissa({
value: xvsAsset.userSupplyBalanceTokens,
token: xvsAsset.vToken.underlyingToken,
}).toFixed(),
capitalUtilizedMantissa: '0',
withdrawableCapitalMantissa: '0',
},
},
{
positionAccountAddress: altAddress,
accountAddress: altAddress,
dsaVTokenAddress: usdcAsset.vToken.address,
longVTokenAddress: usdtAsset.vToken.address,
shortVTokenAddress: busdAsset.vToken.address,
chainId: String(busdAsset.vToken.underlyingToken.chainId),
isActive: true,
cycleId: '1',
effectiveLeverageRatio: '3',
pnl: {
realizedPnlShortAssetMantissa: '0',
realizedPnlUsd: '0',
unrealizedPnlShortAssetMantissa: '0',
unrealizedPnlUsd: '1.5',
unrealizedPnlRatio: '0.12',
entryRatio: '1.1',
currentRatio: '1.1',
closeEventsWithPnlData: [],
totalShortOpenedMantissa: '0',
totalLongReceivedMantissa: '0',
},
capitalUtilization: {
suppliedPrincipalMantissa: convertTokensToMantissa({
value: usdcAsset.userSupplyBalanceTokens,
token: usdcAsset.vToken.underlyingToken,
}).toFixed(),
capitalUtilizedMantissa: '0',
withdrawableCapitalMantissa: '0',
},
},
{
positionAccountAddress: altAddress,
accountAddress: altAddress,
dsaVTokenAddress: usdcAsset.vToken.address,
longVTokenAddress: usdcAsset.vToken.address,
shortVTokenAddress: usdtAsset.vToken.address,
chainId: String(usdtAsset.vToken.underlyingToken.chainId),
isActive: true,
cycleId: '1',
effectiveLeverageRatio: '1.5',
pnl: {
realizedPnlShortAssetMantissa: '0',
realizedPnlUsd: '0',
unrealizedPnlShortAssetMantissa: '0',
unrealizedPnlUsd: '-0.5',
unrealizedPnlRatio: '-0.4',
entryRatio: '0.95',
currentRatio: '0.95',
closeEventsWithPnlData: [],
totalShortOpenedMantissa: '0',
totalLongReceivedMantissa: '0',
},
capitalUtilization: {
suppliedPrincipalMantissa: convertTokensToMantissa({
value: usdcAsset.userSupplyBalanceTokens,
token: usdcAsset.vToken.underlyingToken,
}).toFixed(),
capitalUtilizedMantissa: '0',
withdrawableCapitalMantissa: '0',
},
},
];

export const yieldPlusPositions: YieldPlusPosition[] = [
formatToYieldPlusPosition({
pool,
chainId: busdAsset.vToken.underlyingToken.chainId,
positionAccountAddress: fakeAddress,
dsaVTokenAddress: xvsAsset.vToken.address,
dsaBalanceMantissa: convertTokensToMantissa({
value: xvsAsset.userSupplyBalanceTokens,
token: xvsAsset.vToken.underlyingToken,
}),
longVTokenAddress: usdtAsset.vToken.address,
shortVTokenAddress: busdAsset.vToken.address,
leverageFactor: 2,
unrealizedPnlCents: 0,
unrealizedPnlPercentage: 0,
})!,
formatToYieldPlusPosition({
pool,
chainId: busdAsset.vToken.underlyingToken.chainId,
positionAccountAddress: altAddress,
dsaVTokenAddress: usdcAsset.vToken.address,
dsaBalanceMantissa: convertTokensToMantissa({
value: usdcAsset.userSupplyBalanceTokens,
token: usdcAsset.vToken.underlyingToken,
}),
longVTokenAddress: usdtAsset.vToken.address,
shortVTokenAddress: busdAsset.vToken.address,
leverageFactor: 3,
unrealizedPnlCents: 150,
unrealizedPnlPercentage: 1.2,
})!,
formatToYieldPlusPosition({
pool,
chainId: usdtAsset.vToken.underlyingToken.chainId,
positionAccountAddress: altAddress,
dsaVTokenAddress: usdcAsset.vToken.address,
dsaBalanceMantissa: convertTokensToMantissa({
value: usdcAsset.userSupplyBalanceTokens,
token: usdcAsset.vToken.underlyingToken,
}),
longVTokenAddress: usdcAsset.vToken.address,
shortVTokenAddress: usdtAsset.vToken.address,
leverageFactor: 1.5,
unrealizedPnlCents: -50,
unrealizedPnlPercentage: -0.4,
})!,
];
1 change: 1 addition & 0 deletions apps/evm/src/assets/styles/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* {
&::-webkit-scrollbar {
width: 4px;
height: 4px;
}

/* Track */
Expand Down
Loading
Loading