v7.2.5

Kwenta · Jun 14, 2023 · 81f2bad · 81f2bad · vercel · Jun 14, 2023
2 parents 82ec0fa + 7cf007c
commit 81f2bad
Show file tree

Hide file tree

Showing 53 changed files with 292 additions and 264 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -40,7 +40,8 @@
 					"builtin", 
 					"external", 
 					"internal", 
-					["parent", "sibling"]
+					"parent",
+					"sibling"
 				],
 				"newlines-between": "always",
 				"pathGroups": [

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -42,4 +42,4 @@ jobs:
         category: "/language:${{matrix.language}}"
 
     - name: eslint-annotations
-      uses: DerLev/[email protected].0
+      uses: DerLev/[email protected].1
diff --git a/assets/png/currencies/sstETH.png b/assets/png/currencies/sstETH.png
diff --git a/components/TVChart/DataFeed.ts b/components/TVChart/DataFeed.ts
@@ -63,6 +63,7 @@ const getPriceScale = (asset: string | null) => {
 		case 'BTC':
 		case 'BNB':
 		case 'ETH':
+		case 'stETH':
 		case 'XAU':
 			return 100;
 		case 'DOGE':
@@ -86,7 +87,7 @@ const fetchCombinedCandles = async (
 	networkId: NetworkId
 ) => {
 	const candleData = await requestCandlesticks(
-		getDisplayAsset(base),
+		getDisplayAsset(base)?.toUpperCase() ?? '',
 		from,
 		to,
 		resolutionToSeconds(resolution),

diff --git a/components/TVChart/TVChart.tsx b/components/TVChart/TVChart.tsx
@@ -20,6 +20,7 @@ import {
 	IPositionLineAdapter,
 	widget,
 } from '../../public/static/charting_library';
+
 import { DEFAULT_RESOLUTION } from './constants';
 import DataFeedFactory from './DataFeed';
 import { ChartPosition } from './types';

diff --git a/components/TextToggle/TextToggle.tsx b/components/TextToggle/TextToggle.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import styled, { css } from 'styled-components';
+
+import { FlexDiv, FlexDivCol } from 'components/layout/flex';
+import { Body } from 'components/Text';
+
+interface TextToggleProps<T> {
+	title: string;
+	options: T[];
+	selectedOption: T;
+	onOptionChange: (value: T) => void;
+}
+
+const TextToggle: React.FC<TextToggleProps<any>> = ({
+	title,
+	options,
+	selectedOption,
+	onOptionChange,
+}) => {
+	return (
+		<FlexDivCol>
+			<Body color="secondary">{title}</Body>
+			<FlexDiv columnGap="10px">
+				{options.map((value) => (
+					<ToggleButton $active={selectedOption === value} onClick={() => onOptionChange(value)}>
+						{value}
+					</ToggleButton>
+				))}
+			</FlexDiv>
+		</FlexDivCol>
+	);
+};
+
+const ToggleButton = styled(Body)<{ $active: boolean }>`
+	cursor: pointer;
+	text-transform: capitalize;
+	color: ${(props) => props.theme.colors.selectedTheme.newTheme.text.disabled};
+
+	${(props) =>
+		props.$active &&
+		css`
+			color: ${props.theme.colors.selectedTheme.newTheme.text.primary};
+			font-family: ${(props) => props.theme.fonts.bold};
+		`}
+`;
+
+export default TextToggle;
diff --git a/components/TextToggle/index.tsx b/components/TextToggle/index.tsx
@@ -0,0 +1 @@
+export { default } from './TextToggle';
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "kwenta",
-	"version": "7.2.4",
+	"version": "7.2.5",
 	"scripts": {
 		"dev": "next",
 		"build": "next build",

diff --git a/queries/futures/useGetStats.ts b/queries/futures/useGetStats.ts
@@ -11,6 +11,7 @@ import { truncateAddress } from 'utils/formatters/string';
 import logError from 'utils/logError';
 
 import { getFuturesStats } from '../../sdk/utils/subgraph';
+
 import { AccountStat, FuturesStat } from './types';
 
 const useGetStats = (homepage?: boolean, options?: UseQueryOptions<any>) => {

diff --git a/sdk/constants/futures.ts b/sdk/constants/futures.ts
@@ -481,6 +481,16 @@ export const MARKETS: Record<FuturesMarketKey, FuturesMarketConfig> = {
 			testnet: '0x2d9315a88f3019f8efa88dfe9c0f0843712da0bac814461e27733f6b83eb51b3',
 		},
 	},
+	[FuturesMarketKey.sSTETHPERP]: {
+		key: FuturesMarketKey.sSTETHPERP,
+		asset: FuturesMarketAsset.STETH,
+		supports: 'both',
+		version: 2,
+		pythIds: {
+			mainnet: '0x846ae1bdb6300b817cee5fdee2a6da192775030db5615b94a465f53bd40850b5',
+			testnet: '0xb7abd25a76ddaffdf847224f03198ccb92723f90b2429cf33f0eecb96e352a86',
+		},
+	},
 };
 
 export const MARKET_ASSETS_BY_PYTH_ID = Object.values(MARKETS)

diff --git a/sdk/contracts/PerpsV2MarketInternalV2.ts b/sdk/contracts/PerpsV2MarketInternalV2.ts
@@ -159,8 +159,8 @@ class FuturesMarketInternal {
 		);
 
 		const liqPrice = await this._approxLiquidationPrice(newPos, newPos.lastPrice);
-		const exactLiqPrice = await this._exactLiquidationPrice(newPos, liqPrice);
-		return { ...newPos, liqPrice: exactLiqPrice, fee, price: newPos.lastPrice, status: status };
+
+		return { ...newPos, liqPrice: liqPrice, fee, price: newPos.lastPrice, status: status };
 	};
 
 	_postTradeDetails = async (
@@ -268,18 +268,6 @@ class FuturesMarketInternal {
 		return multiplyDecimal(value, liqPremiumMultiplier);
 	};
 
-	_exactLiquidationPremium = async (positionSize: BigNumber, currentPrice: BigNumber) => {
-		if (positionSize.eq(0)) {
-			return 0;
-		}
-
-		const skewScale = await this._getSetting('skewScale');
-		const liqPremiumMultiplier = await this._getSetting('liquidationPremiumMultiplier');
-		const skewedSize = divideDecimal(positionSize.pow(2).div(UNIT_BIG_NUM).abs(), skewScale);
-		const value = multiplyDecimal(skewedSize, currentPrice);
-		return multiplyDecimal(value, liqPremiumMultiplier);
-	};
-
 	_orderFee = async (tradeParams: TradeParams) => {
 		const notionalDiff = multiplyDecimal(tradeParams.sizeDelta, tradeParams.fillPrice);
 		const marketSkew = await this._onChainData.marketSkew;
@@ -419,50 +407,6 @@ class FuturesMarketInternal {
 		return result.lt(0) ? BigNumber.from(0) : result;
 	};
 
-	_exactLiquidationPrice = async (position: Position, approxLiquidationPrice: BigNumber) => {
-		if (position.size.isZero()) {
-			return BigNumber.from('0');
-		}
-
-		const prices = Array.from(Array(1001).keys()).map((x) =>
-			wei(approxLiquidationPrice)
-				.mul(1 + (x - 500) / 1000)
-				.toBN()
-		);
-
-		// get settings once to avoid synchronous calls
-		await this._batchGetSettings();
-
-		// start with initial margin
-		const margins = await Promise.all(
-			prices.map((price) => this._marginPlusProfitFunding(position, price))
-		);
-
-		const liqMargins = await Promise.all(
-			prices.map((price) => this._exactLiquidationMargin(position.size, price))
-		);
-		const liqPremiums = await Promise.all(
-			prices.map((price) => this._exactLiquidationPremium(position.size, price))
-		);
-
-		const validPrices = prices.filter((price, i) => {
-			const margin = margins[i];
-			const liqMargin = liqMargins[i];
-			const liqPremium = liqPremiums[i];
-			return margin.sub(liqMargin).sub(liqPremium).lt(0);
-		});
-
-		let exactLiqPrice;
-		if (validPrices.length > 0) {
-			exactLiqPrice = position.size.gt(0)
-				? validPrices.reduce((max, current) => (max.gt(current) ? max : current))
-				: validPrices.reduce((min, current) => (min.lt(current) ? min : current));
-		} else {
-			exactLiqPrice = BigNumber.from(0);
-		}
-		return exactLiqPrice;
-	};
-
 	_exactLiquidationMargin = async (positionSize: BigNumber, price: BigNumber) => {
 		const keeperFee = await this._liquidationFee(positionSize, price);
 		const stakerFee = await this._stakerFee(positionSize, price);

diff --git a/sdk/contracts/index.ts b/sdk/contracts/index.ts
@@ -8,6 +8,7 @@ import MultipleMerkleDistributorABI from '../contracts/abis/MultipleMerkleDistri
 import MultipleMerkleDistributorPerpsV2ABI from '../contracts/abis/MultipleMerkleDistributorPerpsV2.json';
 import RewardEscrowABI from '../contracts/abis/RewardEscrow.json';
 import SupplyScheduleABI from '../contracts/abis/SupplySchedule.json';
+
 import DappMaintenanceABI from './abis/DappMaintenance.json';
 import ExchangeRatesABI from './abis/ExchangeRates.json';
 import FuturesMarketDataABI from './abis/FuturesMarketData.json';

diff --git a/sdk/services/futures.ts b/sdk/services/futures.ts
@@ -134,8 +134,22 @@ export default class FuturesService {
 
 		const parametersCalls = marketKeys.map((key: string) => PerpsV2MarketSettings.parameters(key));
 
-		const responses = await this.sdk.context.multicallProvider.all([...parametersCalls]);
-		const marketParameters = responses as IPerpsV2MarketSettings.ParametersStructOutput[];
+		let marketParameters: IPerpsV2MarketSettings.ParametersStructOutput[] = [];
+
+		if (this.sdk.context.isMainnet) {
+			marketParameters = await this.sdk.context.multicallProvider.all(parametersCalls);
+		} else {
+			const firstResponses = await this.sdk.context.multicallProvider.all(
+				parametersCalls.slice(0, 20)
+			);
+			const secondResponses = await this.sdk.context.multicallProvider.all(
+				parametersCalls.slice(20, parametersCalls.length)
+			);
+			marketParameters = [
+				...firstResponses,
+				...secondResponses,
+			] as IPerpsV2MarketSettings.ParametersStructOutput[];
+		}
 
 		const { suspensions, reasons } = await SystemStatus.getFuturesMarketSuspensions(marketKeys);
 
@@ -256,18 +270,10 @@ export default class FuturesService {
 		const positions = await Promise.all(
 			positionDetails.map(async (position, ind) => {
 				const canLiquidate = canLiquidateState[ind];
-				const marketAddress = futuresMarkets[ind].address;
 				const marketKey = futuresMarkets[ind].marketKey;
 				const asset = futuresMarkets[ind].asset;
-				const liquidationPrice = position.position.size.abs().gt(0)
-					? await this.sdk.futures.getExactLiquidationPrice(marketKey, marketAddress, position)
-					: position.liquidationPrice;
-				return mapFuturesPosition(
-					{ ...position, liquidationPrice },
-					canLiquidate,
-					asset,
-					marketKey
-				);
+
+				return mapFuturesPosition(position, canLiquidate, asset, marketKey);
 			})
 		);
 
@@ -544,27 +550,6 @@ export default class FuturesService {
 		);
 	}
 
-	public async getExactLiquidationPrice(
-		marketKey: FuturesMarketKey,
-		marketAddress: string,
-		positionDetails: PositionDetail
-	) {
-		const marketInternal = this.getInternalFuturesMarket(marketAddress, marketKey);
-		const internalPosition = {
-			id: '0',
-			size: positionDetails.position.size,
-			margin: positionDetails.position.margin,
-			lastFundingIndex: positionDetails.position.fundingIndex,
-			lastPrice: positionDetails.position.lastPrice,
-		};
-		const approxLiquidationPrice = positionDetails.liquidationPrice;
-		const exactLiqPrice = await marketInternal._exactLiquidationPrice(
-			internalPosition,
-			approxLiquidationPrice
-		);
-		return exactLiqPrice;
-	}
-
 	public async getCrossMarginTradePreview(
 		crossMarginAccount: string,
 		marketKey: FuturesMarketKey,
@@ -902,7 +887,10 @@ export default class FuturesService {
 		walletAddress: string,
 		crossMarginAddress: string,
 		order: SmartMarginOrderInputs,
-		cancelPendingReduceOrders?: boolean
+		options?: {
+			cancelPendingReduceOrders?: boolean;
+			cancelExpiredDelayedOrders?: boolean;
+		}
 	) {
 		const crossMarginAccountContract = SmartMarginAccount__factory.connect(
 			crossMarginAddress,
@@ -911,6 +899,11 @@ export default class FuturesService {
 		const commands = [];
 		const inputs = [];
 
+		if (options?.cancelExpiredDelayedOrders) {
+			commands.push(AccountExecuteFunctions.PERPS_V2_CANCEL_OFFCHAIN_DELAYED_ORDER);
+			inputs.push(defaultAbiCoder.encode(['address'], [market.address]));
+		}
+
 		const idleMargin = await this.getIdleMargin(walletAddress, crossMarginAddress);
 		const freeMargin = await this.getCrossMarginAccountBalance(crossMarginAddress);
 
@@ -998,7 +991,7 @@ export default class FuturesService {
 			}
 		}
 
-		if (cancelPendingReduceOrders) {
+		if (options?.cancelPendingReduceOrders) {
 			// Remove all pending reduce only orders if instructed
 			existingOrdersForMarket.forEach((o) => {
 				commands.push(AccountExecuteFunctions.GELATO_CANCEL_CONDITIONAL_ORDER);

diff --git a/sdk/types/futures.ts b/sdk/types/futures.ts
@@ -115,6 +115,7 @@ export enum FuturesMarketKey {
 	sTRXPERP = 'sTRXPERP',
 	sFLOKIPERP = 'sFLOKIPERP',
 	sINJPERP = 'sINJPERP',
+	sSTETHPERP = 'sSTETHPERP',
 }
 
 export enum FuturesMarketAsset {
@@ -159,6 +160,7 @@ export enum FuturesMarketAsset {
 	TRX = 'TRX',
 	FLOKI = 'FLOKI',
 	INJ = 'INJ',
+	STETH = 'STETH',
 }
 
 export interface FuturesMarketConfig {

diff --git a/sdk/utils/futures.ts b/sdk/utils/futures.ts
@@ -122,7 +122,9 @@ export const getMarketName = (asset: FuturesMarketAsset | null) => {
 };
 
 export const getDisplayAsset = (asset: string | null) => {
-	return asset ? (asset[0] === 's' ? asset.slice(1) : asset) : null;
+	if (!asset) return null;
+	if (asset === 'STETH') return 'stETH';
+	return asset[0] === 's' ? asset.slice(1) : asset;
 };
 
 export const calculateVolumes = (
@@ -690,6 +692,7 @@ export const MarketAssetByKey: Record<FuturesMarketKey, FuturesMarketAsset> = {
 	[FuturesMarketKey.sFLOKIPERP]: FuturesMarketAsset.FLOKI,
 	[FuturesMarketKey.sINJPERP]: FuturesMarketAsset.INJ,
 	[FuturesMarketKey.sTRXPERP]: FuturesMarketAsset.TRX,
+	[FuturesMarketKey.sSTETHPERP]: FuturesMarketAsset.STETH,
 } as const;
 
 export const MarketKeyByAsset: Record<FuturesMarketAsset, FuturesMarketKey> = {
@@ -734,6 +737,7 @@ export const MarketKeyByAsset: Record<FuturesMarketAsset, FuturesMarketKey> = {
 	[FuturesMarketAsset.FLOKI]: FuturesMarketKey.sFLOKIPERP,
 	[FuturesMarketAsset.INJ]: FuturesMarketKey.sINJPERP,
 	[FuturesMarketAsset.TRX]: FuturesMarketKey.sTRXPERP,
+	[FuturesMarketAsset.STETH]: FuturesMarketKey.sSTETHPERP,
 } as const;
 
 export const AssetDisplayByAsset: Record<FuturesMarketAsset, string> = {
@@ -778,6 +782,7 @@ export const AssetDisplayByAsset: Record<FuturesMarketAsset, string> = {
 	[FuturesMarketAsset.FLOKI]: 'Floki',
 	[FuturesMarketAsset.INJ]: 'Injective',
 	[FuturesMarketAsset.TRX]: 'Tron',
+	[FuturesMarketAsset.STETH]: 'Lido Staked ETH',
 } as const;
 
 export const marketOverrides: Partial<Record<FuturesMarketKey, Record<string, any>>> = {};
diff --git a/sections/exchange/TradeCard/CurrencyCard/CurrencyCard.tsx b/sections/exchange/TradeCard/CurrencyCard/CurrencyCard.tsx
@@ -7,6 +7,7 @@ import Card, { CardBody } from 'components/Card';
 import { FlexDivRowCentered } from 'components/layout/flex';
 
 import { Side } from '../types';
+
 import CurrencyCardInput from './CurrencyCardInput';
 import CurrencyCardSelector from './CurrencyCardSelector';