= ({
= ({
return (
|
-
+
|
{item?.pair?.name} |
{collateralName} |
diff --git a/src/app/pages/PerpetualPage/components/CompetitionPage/CompetitionPageContainer.tsx b/src/app/pages/PerpetualPage/components/CompetitionPage/CompetitionPageContainer.tsx
new file mode 100644
index 000000000..5f8ad6fc3
--- /dev/null
+++ b/src/app/pages/PerpetualPage/components/CompetitionPage/CompetitionPageContainer.tsx
@@ -0,0 +1,178 @@
+import React, { useEffect, useState, useMemo, useCallback } from 'react';
+import { useTranslation, Trans } from 'react-i18next';
+import { useDispatch } from 'react-redux';
+import { Helmet } from 'react-helmet-async';
+import { Link, useHistory } from 'react-router-dom';
+import axios from 'axios';
+
+import { translations } from 'locales/i18n';
+import { actions as walletProviderActions } from 'app/containers/WalletProvider/slice';
+import { actions } from 'app/pages/PerpetualPage/slice';
+import { HeaderLabs } from 'app/components/HeaderLabs';
+import { Button } from 'app/pages/BuySovPage/components/Button';
+import { Leaderboard } from './components/Leaderboard';
+import { useIsConnected, useAccount } from 'app/hooks/useAccount';
+import {
+ isMainnet,
+ discordInvite,
+ notificationServiceUrl,
+ currentChainId,
+ WIKI_PERPETUAL_FUTURES_LINK,
+} from 'utils/classifiers';
+import { ChainId } from 'types';
+import { useWalletContext } from '@sovryn/react-wallet';
+import { ProviderType } from '@sovryn/wallet';
+import { RegisteredTraderData } from './types';
+import { PerpetualQueriesContextProvider } from '../../contexts/PerpetualQueriesContext';
+import {
+ PerpetualPairDictionary,
+ PerpetualPairType,
+} from 'utils/dictionaries/perpetual-pair-dictionary';
+
+const baseUrl = notificationServiceUrl[currentChainId];
+
+export const CompetitionPageContainer: React.FC = () => {
+ const [isRegistered, setIsRegistered] = useState(false);
+ const [registeredTraders, setRegisteredTraders] = useState<
+ RegisteredTraderData[]
+ >([]);
+
+ const history = useHistory();
+ const dispatch = useDispatch();
+ const walletContext = useWalletContext();
+ const account = useAccount();
+ const connected = useIsConnected();
+ const { t } = useTranslation();
+
+ const getRegisteredWallets = useCallback(() => {
+ axios
+ .get(`${baseUrl}tradingCompetition`)
+ .then(res => {
+ if (res?.status === 200 && res.data) {
+ setRegisteredTraders(res.data);
+ }
+ })
+ .catch(console.error);
+ }, []);
+
+ useEffect(() => {
+ getRegisteredWallets();
+
+ if (walletContext.provider !== ProviderType.WEB3) {
+ walletContext.disconnect();
+ }
+
+ //set the bridge chain id to BSC
+ dispatch(
+ walletProviderActions.setBridgeChainId(
+ isMainnet ? ChainId.BSC_MAINNET : ChainId.BSC_TESTNET,
+ ),
+ );
+
+ return () => {
+ // Unset bridge settings
+ dispatch(walletProviderActions.setBridgeChainId(null));
+ dispatch(actions.reset());
+ };
+
+ // only run once on mounting
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, []);
+
+ useEffect(() => {
+ if (!account || !connected || isRegistered) {
+ return;
+ }
+
+ axios
+ .get(`${baseUrl}tradingCompetition/${account.toLowerCase()}`)
+ .then(res => {
+ if (
+ res?.status === 200 &&
+ res?.data?.walletAddress === account.toLowerCase()
+ )
+ setIsRegistered(true);
+ })
+ .catch(e => {
+ console.error(e);
+ setIsRegistered(false);
+ });
+ }, [account, connected, isRegistered]);
+
+ const pair = useMemo(
+ () => PerpetualPairDictionary.get(PerpetualPairType.BTCUSD),
+ [],
+ );
+
+ return (
+ <>
+
+ {t(translations.competitionPage.meta.title)}
+
+
+
+ {t(translations.competitionPage.nav.perpetualSwap)}
+
+ }
+ />
+
+
+
+
+
+
+
+
+ {t(translations.competitionPage.rules.title)}
+
+
+
+
+
+ {!connected && (
+
+
+
+
+ {data.rank}
+
+ 0 ? 'tw-text-success' : 'tw-text-warning',
+ 'tw-px-1 tw-w-2/12 tw-my-auto tw-text-center',
+ )}
+ >
+ {data.openedPositions}
+
+
+ {!data.lastTrade ? (
+ '-'
+ ) : (
+ <>
+ BTC/USD:
+
+ {toNumberFormat(data.lastTrade, 2)}%
+
+
+ )}
+
+
+ {toNumberFormat(data.totalPnL, 2)}%
+
+
+
+
+ {t(translations.competitionPage.table.rank)}
+
+
+ {t(translations.competitionPage.table.name)}
+
+
+ {t(translations.competitionPage.table.positions)}
+
+
+ {t(translations.competitionPage.table.trade)}
+
+
+ {t(translations.competitionPage.table.total)}
+
+
+
+ {items.map(val => {
+ const isUser = val.walletAddress === account?.toLowerCase();
+ return (
+
+ );
+ })}
+ {(!data || (!loaded && !items?.length)) && }
+ {loaded && items && items.length === 0 && (
+
+ {t(translations.competitionPage.table.empty)}
+
+ )}
+
+
+
+ ...
+
+ {userData && }
+
+
+
+
-
-
- {title}
-
- {onClose && (
-
-
-
- )}
-
+ {title && (
+
+
+ {title}
+
+ {onClose && (
+
+
+
+ )}
+
+ )}
= ({
return (
|
-
+
|
{item.pair.name} |
{collateralAsset} |
diff --git a/src/app/pages/PerpetualPage/components/GsnSwitch/GsnSwitch.tsx b/src/app/pages/PerpetualPage/components/GsnSwitch/GsnSwitch.tsx
index da9ced7b8..9910a5e78 100644
--- a/src/app/pages/PerpetualPage/components/GsnSwitch/GsnSwitch.tsx
+++ b/src/app/pages/PerpetualPage/components/GsnSwitch/GsnSwitch.tsx
@@ -73,6 +73,7 @@ export const GsnSwitch: React.FC = () => {
disabled={isGsnInMaintenance || !isGsnSupported}
checked={useMetaTransactions}
onChange={onToggleMetaTransactions}
+ data-action-id="perps-gsn-switch"
/>
);
diff --git a/src/app/pages/PerpetualPage/components/LayoutMenu/index.tsx b/src/app/pages/PerpetualPage/components/LayoutMenu/index.tsx
index f2209a56a..6daf25deb 100644
--- a/src/app/pages/PerpetualPage/components/LayoutMenu/index.tsx
+++ b/src/app/pages/PerpetualPage/components/LayoutMenu/index.tsx
@@ -33,6 +33,7 @@ export const LayoutMenu: React.FC = () => {
)}
checked={showAmmDepth}
onChange={() => dispatch(actions.setShowAmmDepth(!showAmmDepth))}
+ data-action-id="perps-layoutMenu-ammDepth"
/>
{
)}
checked={showChart}
onChange={() => dispatch(actions.setShowChart(!showChart))}
+ data-action-id="perps-layoutMenu-chart"
/>
{
onChange={() =>
dispatch(actions.setShowRecentTrades(!showRecentTrades))
}
+ data-action-id="perps-layoutMenu-recentTrades"
/>
{
)}
checked={showTradeForm}
onChange={() => dispatch(actions.setShowTradeForm(!showTradeForm))}
+ data-action-id="perps-layoutMenu-tradeForm"
/>
{
)}
checked={showTables}
onChange={() => dispatch(actions.setShowTables(!showTables))}
+ data-action-id="perps-layoutMenu-tables"
/>
}
>
-
diff --git a/src/app/pages/PerpetualPage/components/OpenPositionsTable/components/OpenPositionRow.tsx b/src/app/pages/PerpetualPage/components/OpenPositionsTable/components/OpenPositionRow.tsx
index 0c20b458d..a6f2d7a97 100644
--- a/src/app/pages/PerpetualPage/components/OpenPositionsTable/components/OpenPositionRow.tsx
+++ b/src/app/pages/PerpetualPage/components/OpenPositionsTable/components/OpenPositionRow.tsx
@@ -208,6 +208,7 @@ export const OpenPositionRow: React.FC = ({ item }) => {
.editLeverage,
)}
onClick={onEditLeverage}
+ dataActionId="perps-tables-openPositions-action-editLeverage"
/>
= ({ item }) => {
.editMargin,
)}
onClick={onEditMargin}
+ dataActionId="perps-tables-openPositions-action-editMargin"
/>
= ({ item }) => {
.editClose,
)}
onClick={onCloseTrade}
+ dataActionId="perps-tables-openPositions-action-closeTrade"
/>
)}
diff --git a/src/app/pages/PerpetualPage/components/OrderHistoryTable/OrderHistoryRow.tsx b/src/app/pages/PerpetualPage/components/OrderHistoryTable/OrderHistoryRow.tsx
index ef8fcf21d..6402fe314 100644
--- a/src/app/pages/PerpetualPage/components/OrderHistoryTable/OrderHistoryRow.tsx
+++ b/src/app/pages/PerpetualPage/components/OrderHistoryTable/OrderHistoryRow.tsx
@@ -88,7 +88,11 @@ export const OrderHistoryRow: React.FC = ({
return (
|
-
+
|
{pair?.name} |
= ({
: 'tw-bg-gray-4 tw-cursor-pointer hover:tw-bg-gray-5',
)}
onClick={onClick}
+ data-action-id={`perps-pairSelectorButton-${pair.name}`}
>
{pair.name}
diff --git a/src/app/pages/PerpetualPage/components/PairSelector/index.tsx b/src/app/pages/PerpetualPage/components/PairSelector/index.tsx
index 91e71e1d8..177a4ecc0 100644
--- a/src/app/pages/PerpetualPage/components/PairSelector/index.tsx
+++ b/src/app/pages/PerpetualPage/components/PairSelector/index.tsx
@@ -15,7 +15,9 @@ type PairSelectorProps = {
onChange: (pair: PerpetualPairType) => void;
};
-const perpetualPairs = PerpetualPairDictionary.list();
+const perpetualPairs = PerpetualPairDictionary.list().filter(
+ pair => !pair.deprecated,
+);
export const PairSelector: React.FC = ({
pair,
diff --git a/src/app/pages/PerpetualPage/components/TableRowAction/index.tsx b/src/app/pages/PerpetualPage/components/TableRowAction/index.tsx
index 74ff89cf7..e28075fff 100644
--- a/src/app/pages/PerpetualPage/components/TableRowAction/index.tsx
+++ b/src/app/pages/PerpetualPage/components/TableRowAction/index.tsx
@@ -5,12 +5,14 @@ type TableRowActionProps = {
tooltip: ReactElement | string;
label: ReactElement | string;
onClick: MouseEventHandler;
+ dataActionId?: string;
};
export const TableRowAction: React.FC = ({
tooltip,
label,
onClick,
+ dataActionId,
}) => (
= ({
diff --git a/src/app/pages/PerpetualPage/components/TradeDialog/components/TradeSummary.tsx b/src/app/pages/PerpetualPage/components/TradeDialog/components/TradeSummary.tsx
index 29ddd4a10..d80a65edd 100644
--- a/src/app/pages/PerpetualPage/components/TradeDialog/components/TradeSummary.tsx
+++ b/src/app/pages/PerpetualPage/components/TradeDialog/components/TradeSummary.tsx
@@ -67,7 +67,7 @@ export const TradeSummary: React.FC = ({
[trade?.pairType, currentPair],
);
- const { lotPrecision } = perpetuals[pair.id];
+ const { lotPrecision, perpetualParameters } = perpetuals[pair.id];
const {
amountChange,
@@ -314,14 +314,30 @@ export const TradeSummary: React.FC = ({
+
+ {t(translations.perpetualPage.tradeForm.labels.relayerFee)}
+
+
+
+
+
@@ -329,8 +345,8 @@ export const TradeSummary: React.FC = ({
= ({
availableBalance,
} = perpetuals[pair.id];
+ const minimumPositionSize = useMemo(
+ () =>
+ String(
+ Number(getMinimalPositionSize(perpParameters).toFixed(lotPrecision)), // Number conversion is performed so we trim additional zeros
+ ),
+
+ [lotPrecision, perpParameters],
+ );
+
const collateralName = useMemo(
() => getCollateralName(pair.collateralAsset),
[pair.collateralAsset],
);
+ const hasOpenTrades = useMemo(
+ () => traderState?.marginAccountPositionBC !== 0,
+ [traderState?.marginAccountPositionBC],
+ );
+
const maxTradeSize = useMemo(() => {
const maxTradeSize = shrinkToLot(
Math.abs(
@@ -120,7 +138,14 @@ export const TradeForm: React.FC = ({
lotSize,
);
- return Number.isFinite(maxTradeSize) ? maxTradeSize : 0;
+ const finiteMaxTradeSize = Number.isFinite(maxTradeSize) ? maxTradeSize : 0;
+
+ return hasOpenTrades
+ ? Math.max(
+ finiteMaxTradeSize,
+ Math.abs(traderState.marginAccountPositionBC),
+ )
+ : finiteMaxTradeSize;
}, [
trade.position,
trade.slippage,
@@ -130,6 +155,7 @@ export const TradeForm: React.FC = ({
ammState,
liqPoolState,
lotSize,
+ hasOpenTrades,
]);
const isMarketOrder = useMemo(
@@ -145,8 +171,6 @@ export const TradeForm: React.FC = ({
[trade.tradeType],
);
- const hasOpenTrades = traderState?.marginAccountPositionBC !== 0;
-
const [minLeverage, maxLeverage] = useMemo(() => {
const amountChange = getSignedAmount(trade.position, trade.amount);
const amountTarget = traderState.marginAccountPositionBC + amountChange;
@@ -208,12 +232,35 @@ export const TradeForm: React.FC = ({
}
}, [amount, maxTradeSize, trade.position]);
+ useEffect(() => {
+ if (
+ isValidNumerishValue(amount) &&
+ !bignumber(amount).isZero() &&
+ bignumber(amount).lessThan(lotSize)
+ ) {
+ setAmount(String(lotSize));
+ setTrade(trade => ({ ...trade, amount: toWei(lotSize) }));
+ }
+ }, [amount, lotSize, setTrade]);
+
+ useEffect(() => {
+ if (
+ !hasOpenTrades &&
+ isValidNumerishValue(amount) &&
+ !bignumber(amount).isZero() &&
+ bignumber(amount).lessThan(minimumPositionSize)
+ ) {
+ setAmount(minimumPositionSize);
+ setTrade(trade => ({ ...trade, amount: toWei(minimumPositionSize) }));
+ }
+ }, [amount, hasOpenTrades, lotPrecision, minimumPositionSize, setTrade]);
+
const onChangeOrderAmount = useCallback(
(amount: string) => {
const roundedAmount = Number(
shrinkToLot(
Math.max(Math.min(Number(amount) || 0, maxTradeSize), 0),
- lotSize,
+ perpParameters.fLotSizeBC, // non-rounded lot size
).toFixed(lotPrecision),
);
setAmount(amount);
@@ -224,7 +271,14 @@ export const TradeForm: React.FC = ({
leverage: Math.max(minLeverage, Math.min(maxLeverage, trade.leverage)),
}));
},
- [lotSize, lotPrecision, maxTradeSize, minLeverage, maxLeverage, setTrade],
+ [
+ maxTradeSize,
+ perpParameters.fLotSizeBC,
+ lotPrecision,
+ setTrade,
+ minLeverage,
+ maxLeverage,
+ ],
);
const onBlurOrderAmount = useCallback(() => {
@@ -259,19 +313,25 @@ export const TradeForm: React.FC = ({
[setTrade],
);
- // reset amount, limit price and trigger price if pair or position changes
- useEffect(() => {
- setAmount('0');
- setLimit(undefined);
- setTriggerPrice(undefined);
+ const resetForm = useCallback(() => {
+ if (trade.tradeType === PerpetualTradeType.MARKET) {
+ setAmount('0');
+ setTrade({ ...trade, amount: '0', leverage: 1 });
+ } else {
+ setAmount('0');
+ setLimit(undefined);
+ setTriggerPrice(undefined);
- setTrade(trade => ({
- ...trade,
- amount: '0',
- limit: undefined,
- trigger: undefined,
- }));
- }, [setTrade, trade.pairType, trade.position]);
+ setTrade({
+ ...trade,
+ amount: '0',
+ limit: undefined,
+ trigger: undefined,
+ leverage: 1,
+ reduceOnly: undefined,
+ });
+ }
+ }, [setTrade, trade]);
useEffect(() => {
if (entryPrice && (limit === undefined || triggerPrice === undefined)) {
@@ -299,9 +359,15 @@ export const TradeForm: React.FC = ({
[setTrade, trade],
);
+ const onReduceOnly = useCallback(() => {
+ setTrade(prevTrade => ({
+ ...prevTrade,
+ reduceOnly: !prevTrade.reduceOnly,
+ }));
+ }, [setTrade]);
+
const bindSelectPosition = useCallback(
- (position: TradingPosition) => () =>
- setTrade(trade => ({ ...trade, position })),
+ (position: TradingPosition) => setTrade(trade => ({ ...trade, position })),
[setTrade],
);
@@ -311,6 +377,16 @@ export const TradeForm: React.FC = ({
[setTrade],
);
+ const onLongClick = useCallback(() => {
+ resetForm();
+ bindSelectPosition(TradingPosition.LONG);
+ }, [bindSelectPosition, resetForm]);
+
+ const onShortClick = useCallback(() => {
+ resetForm();
+ bindSelectPosition(TradingPosition.SHORT);
+ }, [bindSelectPosition, resetForm]);
+
const tradeButtonLabel = useMemo(() => {
const i18nKey = {
LONG_LIMIT: translations.perpetualPage.tradeForm.buttons.buyLimit,
@@ -442,6 +518,19 @@ export const TradeForm: React.FC = ({
triggerPrice,
]);
+ useEffect(() => {
+ setAmount(
+ trade.amount !== '0'
+ ? Math.abs(numberFromWei(trade.amount)).toFixed(lotPrecision)
+ : '0',
+ );
+ setTriggerPrice(
+ trade.trigger ? numberFromWei(trade.trigger).toFixed(2) : undefined,
+ );
+ setLimit(trade.limit ? numberFromWei(trade.limit).toFixed(2) : undefined);
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, [lotPrecision, trade.pairType]);
+
useEffect(() => {
// resets trade.keepPositionLeverage in case we flip the sign
if (trade.tradeType !== PerpetualTradeType.MARKET && keepPositionLeverage) {
@@ -456,304 +545,278 @@ export const TradeForm: React.FC = ({
disabled && 'tw-pointer-events-none',
)}
>
-
+
-
-
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
- {isLimitOrder && (
- <>
-
-
-
-
+ {isLimitOrder && (
+ <>
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+ {t(translations.perpetualPage.tradeForm.labels.days)}
+
+
-
-
-
-
-
-
-
- {t(translations.perpetualPage.tradeForm.labels.days)}
-
-
-
-
- )}
+
+
+
+
+
+
+ )}
-
-
-
-
-
-
- {(!pair.isQuanto || isMarketOrder) && (
+
+
+
+
+
- )}
-
- }
- >
-
-
-
-
-
-
-
-
-
-
- }
+ {(!pair.isQuanto || isMarketOrder) && (
+
+ )}
+
+ }
+ >
+
+
+
= ({
minDecimals={8}
maxDecimals={8}
mode={AssetValueMode.auto}
- value={perpParameters.fReferralRebateCC}
+ value={tradingFee}
assetString={collateralName}
/>
= ({
minDecimals={2}
maxDecimals={2}
mode={AssetValueMode.auto}
- value={
- perpParameters.fReferralRebateCC / quoteToCollateralFactor
- }
+ value={tradingFee / quoteToCollateralFactor}
assetString={pair.quoteAsset}
isApproximation
/>
@@ -786,114 +847,174 @@ export const TradeForm: React.FC = ({
minDecimals={4}
maxDecimals={4}
mode={AssetValueMode.auto}
- value={perpParameters.fReferralRebateCC}
+ value={tradingFee}
assetString={collateralName}
/>
- )}
-
-
- {isMarketOrder && (
- <>
-
-
- onChangeKeepPositionLeverage(!keepPositionLeverage)
+ {isLimitOrder && (
+
+
+
+
+
+
+
+
}
- disabled={!hasOpenTrades}
- label={t(
- translations.perpetualPage.tradeForm.labels
+ >
+
+
+
-
-
+
+
+
-
-
- )}
+
+
+ )}
- {Number(amount) > 0 && (
-
- )}
-
- {!inMaintenance ? (
-
- ) : (
-
- x
- ,
- ]}
- />
- }
- className="tw-mb-0 tw-pb-0"
- />
+ {Number(amount) > 0 && (
+
)}
+
+ {!inMaintenance ? (
+
+ ) : (
+
+ x
+ ,
+ ]}
+ />
+ }
+ className="tw-mb-0 tw-pb-0"
+ />
+ )}
+
);
diff --git a/src/app/pages/PerpetualPage/components/TradingChart/streaming.ts b/src/app/pages/PerpetualPage/components/TradingChart/streaming.ts
index 9402ff875..91cd1c17d 100644
--- a/src/app/pages/PerpetualPage/components/TradingChart/streaming.ts
+++ b/src/app/pages/PerpetualPage/components/TradingChart/streaming.ts
@@ -54,7 +54,7 @@ subscription.on('data', data => {
}
const tradePrice = ABK64x64ToFloat(BigNumber.from(decoded.price));
- const tradeAmount = ABK64x64ToFloat(BigNumber.from(decoded.tradeAmountBC));
+ const tradeAmount = ABK64x64ToFloat(BigNumber.from(decoded[3][2]));
const tradeTime = Date.now();
const channelString = Object.keys(symbolMap).find(
item => symbolMap[item].toLowerCase() === decoded.perpetualId.toLowerCase(),
diff --git a/src/app/pages/PerpetualPage/contexts/GraphQLProvider.tsx b/src/app/pages/PerpetualPage/contexts/GraphQLProvider.tsx
index 8d3b3dfe2..c8c7f906c 100644
--- a/src/app/pages/PerpetualPage/contexts/GraphQLProvider.tsx
+++ b/src/app/pages/PerpetualPage/contexts/GraphQLProvider.tsx
@@ -1,5 +1,6 @@
import React, { useState, useEffect } from 'react';
import { ApolloClient, InMemoryCache, ApolloProvider } from '@apollo/client';
+import { isMainnet, isStaging } from 'utils/classifiers';
type GraphQLEndpoint = { graph: string; index?: string; isFallback?: boolean };
@@ -134,20 +135,34 @@ const evaluateEndpoint = async (endpoint: GraphQLEndpoint) => {
return result;
};
-// TODO: add Perpetual GraphQL mainnet urls
// fallback endpoint has to always be the last entry.
-const config: GraphQLEndpoint[] = [
- // {
- // graph:
- // 'https://api.thegraph.com/subgraphs/name/omerzam/perpetual-swaps-compete',
- // index: 'https://api.thegraph.com/index-node/graphql',
- // },
- {
- graph:
- 'https://sovryn-perps-subgraph.test.sovryn.app/subgraphs/name/DistributedCollective/Sovryn-perpetual-swaps-subgraph',
- // isFallback: true,
- },
-];
+const config: GraphQLEndpoint[] =
+ isMainnet || isStaging
+ ? [
+ {
+ graph:
+ 'https://sovryn-perps-subgraph.sovryn.app/subgraphs/name/DistributedCollective/Sovryn-perpetual-swaps-subgraph',
+ index: 'https://sovryn-perps-subgraph.sovryn.app/graphql',
+ },
+ {
+ graph:
+ 'https://api.thegraph.com/subgraphs/name/distributedcollective/sovryn-perpetual-futures',
+ index: 'https://api.thegraph.com/index-node/graphql',
+ isFallback: true,
+ },
+ ]
+ : [
+ // {
+ // graph:
+ // 'https://api.thegraph.com/subgraphs/name/omerzam/perpetual-swaps-compete',
+ // index: 'https://api.thegraph.com/index-node/graphql',
+ // },
+ {
+ graph:
+ 'https://sovryn-perps-subgraph.test.sovryn.app/subgraphs/name/DistributedCollective/Sovryn-perpetual-swaps-subgraph',
+ // isFallback: true,
+ },
+ ];
type GraphQLProviderProps = {
children: React.ReactNode;
diff --git a/src/app/pages/PerpetualPage/contexts/PerpetualQueriesContext.tsx b/src/app/pages/PerpetualPage/contexts/PerpetualQueriesContext.tsx
index 96db175d3..ee9c3a3e4 100644
--- a/src/app/pages/PerpetualPage/contexts/PerpetualQueriesContext.tsx
+++ b/src/app/pages/PerpetualPage/contexts/PerpetualQueriesContext.tsx
@@ -27,9 +27,6 @@ import {
traderStateCallData,
balanceCallData,
} from '../utils/contractUtils';
-import { useBridgeNetworkMultiCall } from '../../../hooks/useBridgeNetworkMultiCall';
-import { PERPETUAL_CHAIN } from '../types';
-import { usePerpetual_queryLiqPoolId } from '../hooks/usePerpetual_queryLiqPoolId';
import {
perpUtils,
AMMState,
@@ -37,8 +34,17 @@ import {
PerpParameters,
TraderState,
} from '@sovryn/perpetual-swap';
-import { PerpetualPairDictionary } from 'utils/dictionaries/perpetual-pair-dictionary';
-import { MultiCallData } from 'app/pages/BridgeDepositPage/utils/bridge-network';
+import {
+ PerpetualPairDictionary,
+ PerpetualPairType,
+} from 'utils/dictionaries/perpetual-pair-dictionary';
+import {
+ MultiCallData,
+ MultiCallResult,
+} from 'app/pages/BridgeDepositPage/utils/bridge-network';
+import { isMainnet, isStaging } from 'utils/classifiers';
+import { useFetchBTCUSD } from './hooks/useFetchBTCUSD';
+import { useFetchAllPairs } from './hooks/useFetchAllPairs';
const { getDepthMatrix } = perpUtils;
@@ -46,7 +52,21 @@ const THROTTLE_DELAY = 1000; // 1s
const UPDATE_INTERVAL = 10000; // 10s
const address = getContract('perpetualManager').address.toLowerCase();
-const pairIds = PerpetualPairDictionary.list().map(item => item.id);
+
+export type FetchResult = {
+ firstResult?: MultiCallResult;
+ firstRefetch?: () => Promise ;
+ secondResult?: MultiCallResult;
+ secondRefetch?: () => Promise;
+};
+
+const isMainnetDeployment = isMainnet || isStaging;
+const fetchDataHook = isMainnetDeployment ? useFetchBTCUSD : useFetchAllPairs;
+
+// TODO: Find some generic solution for that
+const pairIds = isMainnetDeployment
+ ? [PerpetualPairDictionary.get(PerpetualPairType.BTCUSD).id]
+ : PerpetualPairDictionary.list().map(item => item.id);
type InitSocketParams = {
update: (isEventByTrader: boolean) => void;
@@ -141,23 +161,12 @@ export const PerpetualQueriesContextProvider: React.FC getMultiCallData([firstPoolId, secondPoolId], account),
- [account, firstPoolId, secondPoolId],
- );
-
- const {
- result: firstResult,
- refetch: firstRefetch,
- } = useBridgeNetworkMultiCall(PERPETUAL_CHAIN, multiCallData[0]);
-
const {
- result: secondResult,
- refetch: secondRefetch,
- } = useBridgeNetworkMultiCall(PERPETUAL_CHAIN, multiCallData[1]);
+ firstResult,
+ firstRefetch,
+ secondResult,
+ secondRefetch,
+ } = fetchDataHook();
const perpetuals = useMemo(
() =>
@@ -203,8 +212,8 @@ export const PerpetualQueriesContextProvider: React.FC {
- firstRefetch().catch(console.error);
- secondRefetch().catch(console.error);
+ firstRefetch?.().catch(console.error);
+ secondRefetch?.().catch(console.error);
}, [firstRefetch, secondRefetch]);
const refetchDebounced = useMemo(
@@ -290,7 +299,7 @@ const getAdditionalInfo = (
};
};
-const getMultiCallData = (poolIds: (string | undefined)[], account) => {
+export const getMultiCallData = (poolIds: (string | undefined)[], account) => {
const multiCallData: MultiCallData[][] = [];
pairIds.forEach((pairId, index) => {
diff --git a/src/app/pages/PerpetualPage/contexts/RecentTradesContext.tsx b/src/app/pages/PerpetualPage/contexts/RecentTradesContext.tsx
index 475c3a1ce..b138a134a 100644
--- a/src/app/pages/PerpetualPage/contexts/RecentTradesContext.tsx
+++ b/src/app/pages/PerpetualPage/contexts/RecentTradesContext.tsx
@@ -70,7 +70,7 @@ const addSocketEventListeners = (
BigNumber.from(decoded.price || decoded.liquidationPrice),
);
const tradeAmount = ABK64x64ToFloat(
- BigNumber.from(decoded.tradeAmountBC || decoded.amountLiquidatedBC),
+ BigNumber.from(decoded[3][2] || decoded.amountLiquidatedBC),
);
const parsedTrade: RecentTradesDataEntry = {
id: data.transactionHash,
diff --git a/src/app/pages/PerpetualPage/contexts/hooks/useFetchAllPairs.ts b/src/app/pages/PerpetualPage/contexts/hooks/useFetchAllPairs.ts
new file mode 100644
index 000000000..47224e167
--- /dev/null
+++ b/src/app/pages/PerpetualPage/contexts/hooks/useFetchAllPairs.ts
@@ -0,0 +1,40 @@
+import { useAccount } from 'app/hooks/useAccount';
+import { useBridgeNetworkMultiCall } from 'app/hooks/useBridgeNetworkMultiCall';
+import { MultiCallData } from 'app/pages/BridgeDepositPage/utils/bridge-network';
+import { useMemo } from 'react';
+import { PerpetualPairDictionary } from 'utils/dictionaries/perpetual-pair-dictionary';
+import { usePerpetual_queryLiqPoolId } from '../../hooks/usePerpetual_queryLiqPoolId';
+import { PERPETUAL_CHAIN } from '../../types';
+import { FetchResult, getMultiCallData } from '../PerpetualQueriesContext';
+
+const pairIds = PerpetualPairDictionary.list().map(item => item.id);
+
+export const useFetchAllPairs = (): FetchResult => {
+ const account = useAccount();
+
+ const { result: firstPoolId } = usePerpetual_queryLiqPoolId(pairIds[0]);
+
+ const { result: secondPoolId } = usePerpetual_queryLiqPoolId(pairIds[1]);
+
+ const multiCallData: MultiCallData[][] = useMemo(
+ () => getMultiCallData([firstPoolId, secondPoolId], account),
+ [account, firstPoolId, secondPoolId],
+ );
+
+ const {
+ result: firstResult,
+ refetch: firstRefetch,
+ } = useBridgeNetworkMultiCall(PERPETUAL_CHAIN, multiCallData[0]);
+
+ const {
+ result: secondResult,
+ refetch: secondRefetch,
+ } = useBridgeNetworkMultiCall(PERPETUAL_CHAIN, multiCallData[1]);
+
+ return {
+ firstResult,
+ firstRefetch,
+ secondResult,
+ secondRefetch,
+ };
+};
diff --git a/src/app/pages/PerpetualPage/contexts/hooks/useFetchBTCUSD.ts b/src/app/pages/PerpetualPage/contexts/hooks/useFetchBTCUSD.ts
new file mode 100644
index 000000000..6abfc2c49
--- /dev/null
+++ b/src/app/pages/PerpetualPage/contexts/hooks/useFetchBTCUSD.ts
@@ -0,0 +1,33 @@
+import { useAccount } from 'app/hooks/useAccount';
+import { useBridgeNetworkMultiCall } from 'app/hooks/useBridgeNetworkMultiCall';
+import { MultiCallData } from 'app/pages/BridgeDepositPage/utils/bridge-network';
+import { useMemo } from 'react';
+import {
+ PerpetualPairDictionary,
+ PerpetualPairType,
+} from 'utils/dictionaries/perpetual-pair-dictionary';
+import { usePerpetual_queryLiqPoolId } from '../../hooks/usePerpetual_queryLiqPoolId';
+import { PERPETUAL_CHAIN } from '../../types';
+import { FetchResult, getMultiCallData } from '../PerpetualQueriesContext';
+
+const pairId = PerpetualPairDictionary.get(PerpetualPairType.BTCUSD).id;
+
+export const useFetchBTCUSD = (): FetchResult => {
+ const account = useAccount();
+ const { result: poolId } = usePerpetual_queryLiqPoolId(pairId);
+
+ const multiCallData: MultiCallData[][] = useMemo(
+ () => getMultiCallData([poolId], account),
+ [account, poolId],
+ );
+
+ const {
+ result: firstResult,
+ refetch: firstRefetch,
+ } = useBridgeNetworkMultiCall(PERPETUAL_CHAIN, multiCallData[0]);
+
+ return {
+ firstResult,
+ firstRefetch,
+ };
+};
diff --git a/src/app/pages/PerpetualPage/hooks/graphql/useGetCandles.ts b/src/app/pages/PerpetualPage/hooks/graphql/useGetCandles.ts
index b38abbfdd..776d8ef97 100644
--- a/src/app/pages/PerpetualPage/hooks/graphql/useGetCandles.ts
+++ b/src/app/pages/PerpetualPage/hooks/graphql/useGetCandles.ts
@@ -70,7 +70,7 @@ export const generateFirstCandleQuery = (
}
orderBy: periodStartUnix
orderDirection: asc
- first: ${Math.max(candleNumber, MAX_CANDLE_COUNT)}
+ first: ${Math.min(candleNumber, MAX_CANDLE_COUNT)}
) {
perpetualId
open
diff --git a/src/app/pages/PerpetualPage/hooks/graphql/useGetLeaderboardData.ts b/src/app/pages/PerpetualPage/hooks/graphql/useGetLeaderboardData.ts
new file mode 100644
index 000000000..42b573fd8
--- /dev/null
+++ b/src/app/pages/PerpetualPage/hooks/graphql/useGetLeaderboardData.ts
@@ -0,0 +1,52 @@
+import { useMemo } from 'react';
+import { useQuery, gql } from '@apollo/client';
+import {
+ PerpetualPairType,
+ PerpetualPairDictionary,
+} from '../../../../../utils/dictionaries/perpetual-pair-dictionary';
+
+/**
+ * Hook to retrieve trade data for a list of trader IDs (wallet addresses)
+ */
+
+export function useGetLeaderboardData(
+ pairType: PerpetualPairType,
+ traderIDs: string[],
+) {
+ const pair = useMemo(() => PerpetualPairDictionary.get(pairType), [pairType]);
+ const TRADER_DATA_QUERY = gql`
+ {
+ traders(
+ where: {id_in: ${JSON.stringify(traderIDs)}}
+ first: ${traderIDs.length}
+ ){
+ id
+ totalFundingPaymentCC
+ positionsTotalCount
+ traderStates (where: {perpetual: ${JSON.stringify(pair.id)}}) {
+ marginBalanceCC
+ availableMarginCC
+ availableCashCC
+ marginAccountCashCC
+ marginAccountPositionBC
+ marginAccountLockedInValueQC
+ fUnitAccumulatedFundingStart
+ totalPnLCC
+ balance
+ capitalUsed
+ }
+ positions(where: {perpetual: ${JSON.stringify(
+ pair.id,
+ )}}, orderBy: lastChanged, orderDirection: desc) {
+ currentPositionSizeBC
+ totalPnLCC
+ isClosed
+ lastChanged
+ }
+ }
+ }
+ `;
+ const traderDataQuery = useQuery(TRADER_DATA_QUERY);
+ //console.log(traderDataQuery?.data);
+ return traderDataQuery;
+}
diff --git a/src/app/pages/PerpetualPage/hooks/usePerpetual_ContractDetails.ts b/src/app/pages/PerpetualPage/hooks/usePerpetual_ContractDetails.ts
index 0a1e868bd..c75972478 100644
--- a/src/app/pages/PerpetualPage/hooks/usePerpetual_ContractDetails.ts
+++ b/src/app/pages/PerpetualPage/hooks/usePerpetual_ContractDetails.ts
@@ -10,13 +10,14 @@ import {
} from '../../../../utils/dictionaries/perpetual-pair-dictionary';
import { useApolloClient } from '@apollo/client';
import { usePerpetual_getCurrentPairId } from './usePerpetual_getCurrentPairId';
+import { getMinimalPositionSize } from '@sovryn/perpetual-swap/dist/scripts/utils/perpUtils';
export type PerpetualContractDetailsData = {
volume24h: number;
openInterest: number;
fundingRate: number;
lotSize: number;
- minTradeAmount: number;
+ minPositionSize: number;
};
export const usePerpetual_ContractDetails = (pairType: PerpetualPairType) => {
@@ -71,11 +72,12 @@ export const usePerpetual_ContractDetails = (pairType: PerpetualPairType) => {
openInterest: perpetualParameters.fOpenInterest,
fundingRate: perpetualParameters.fCurrentFundingRate,
lotSize,
- minTradeAmount: perpetualParameters.fLotSizeBC,
+ minPositionSize: getMinimalPositionSize(perpetualParameters),
}),
[
ammState,
lotSize,
+ perpetualParameters,
perpetualParameters.fCurrentFundingRate,
perpetualParameters.fLotSizeBC,
perpetualParameters.fOpenInterest,
diff --git a/src/app/pages/PerpetualPage/hooks/usePerpetual_analyseTrade.ts b/src/app/pages/PerpetualPage/hooks/usePerpetual_analyseTrade.ts
index ac74ad50b..41bf7afec 100644
--- a/src/app/pages/PerpetualPage/hooks/usePerpetual_analyseTrade.ts
+++ b/src/app/pages/PerpetualPage/hooks/usePerpetual_analyseTrade.ts
@@ -71,6 +71,8 @@ export const usePerpetual_analyseTrade = (
availableBalance,
} = perpetuals[pair.id];
+ const relayerFee = perpParameters.fReferralRebateCC;
+
const {
leverage: leverageTarget,
size: amountTarget,
@@ -115,16 +117,17 @@ export const usePerpetual_analyseTrade = (
let orderCost = Math.max(0, marginChange);
if (isLimitOrder) {
- orderCost = getEstimatedMarginCollateralForLimitOrder(
- perpParameters,
- ammState,
- trade.leverage,
- amountChange,
- numberFromWei(trade.limit),
- trade.trigger && trade.trigger !== '0'
- ? numberFromWei(trade.trigger)
- : undefined,
- );
+ orderCost =
+ getEstimatedMarginCollateralForLimitOrder(
+ perpParameters,
+ ammState,
+ trade.leverage,
+ amountChange,
+ numberFromWei(trade.limit),
+ trade.trigger && trade.trigger !== '0'
+ ? numberFromWei(trade.trigger)
+ : undefined,
+ ) + relayerFee;
} else if (amountChange !== 0) {
orderCost = getRequiredMarginCollateralWithGasFees(
leverageTarget,
@@ -186,6 +189,7 @@ export const usePerpetual_analyseTrade = (
requiredAllowance,
availableBalance,
limitOrdersCount,
+ relayerFee,
useMetaTransactions,
]);
diff --git a/src/app/pages/PerpetualPage/types.ts b/src/app/pages/PerpetualPage/types.ts
index 4f5882c9b..16246a602 100644
--- a/src/app/pages/PerpetualPage/types.ts
+++ b/src/app/pages/PerpetualPage/types.ts
@@ -4,7 +4,7 @@ import { PerpetualPairType } from '../../../utils/dictionaries/perpetual-pair-di
import { Transaction } from 'ethers';
import { CheckAndApproveResult } from '../../../utils/sovryn/contract-writer';
import { getBridgeChainId } from '../BridgeDepositPage/utils/helpers';
-import { isMainnet } from '../../../utils/classifiers';
+import { isMainnet, isStaging } from '../../../utils/classifiers';
import { toWei } from '../../../utils/blockchain/math-helpers';
import { Validation } from './utils/contractUtils';
@@ -15,13 +15,13 @@ export const PERPETUAL_CHAIN = Chain.BSC;
export const PERPETUAL_CHAIN_ID =
getBridgeChainId(Chain.BSC) || ChainId.BSC_MAINNET;
-export const PERPETUAL_PAYMASTER = isMainnet
- ? '' // TODO: add mainnet paymaster address
- : '0x402e4370f6871Ff59Db75aE578e038E101454dc1';
+export const PERPETUAL_PAYMASTER =
+ isMainnet || isStaging
+ ? '0xd537EB00E053Fc97A58f22b2FB6f064Bd4C10cCA'
+ : '0x402e4370f6871Ff59Db75aE578e038E101454dc1';
-export const PERPETUAL_GAS_PRICE_DEFAULT = isMainnet
- ? undefined
- : toWei(10, 'gwei');
+export const PERPETUAL_GAS_PRICE_DEFAULT =
+ isMainnet || isStaging ? undefined : toWei(10, 'gwei');
export enum PerpetualTradeType {
MARKET = 'MARKET',
@@ -129,6 +129,7 @@ export type PerpetualTrade = {
leverage: number;
slippage: number;
keepPositionLeverage?: boolean;
+ reduceOnly?: boolean;
isClosePosition?: boolean;
};
@@ -157,6 +158,7 @@ export const isPerpetualTrade = (x: any): x is PerpetualTrade =>
(x.margin === undefined || typeof x.margin === 'string') &&
(x.keepPositionLeverage === undefined ||
typeof x.keepPositionLeverage === 'boolean') &&
+ (x.reduceOnly === undefined || typeof x.reduceOnly === 'boolean') &&
(x.isClosingPosition === undefined ||
typeof x.isClosingPosition === 'boolean');
@@ -252,6 +254,7 @@ export interface PerpetualTxCreateLimitOrder extends PerpetualTxBase {
created: number;
leverage?: number;
tradingPosition?: TradingPosition;
+ reduceOnly?: boolean;
approvalTx: Nullable;
}
diff --git a/src/app/pages/PerpetualPage/utils/contractUtils.tsx b/src/app/pages/PerpetualPage/utils/contractUtils.tsx
index 47ed4b05c..58b958924 100644
--- a/src/app/pages/PerpetualPage/utils/contractUtils.tsx
+++ b/src/app/pages/PerpetualPage/utils/contractUtils.tsx
@@ -434,26 +434,20 @@ export const initialLiquidityPoolState: LiqPoolState = {
fPnLparticipantsCashCC: 0,
fAMMFundCashCC: 0,
fDefaultFundCashCC: 0,
- iPriceUpdateTimeSec: 0,
fTargetAMMFundSize: 0,
fTargetDFSize: 0,
- iLastTargetPoolSizeTime: 0,
- iLastFundingTime: 0,
isRunning: false,
};
const parseLiquidityPoolState = (response: any): LiqPoolState =>
response?.[0]
? {
- fPnLparticipantsCashCC: ABK64x64ToFloat(response[0][6]),
- fAMMFundCashCC: ABK64x64ToFloat(response[0][7]),
- fDefaultFundCashCC: ABK64x64ToFloat(response[0][8]),
- iPriceUpdateTimeSec: ABK64x64ToFloat(response[0][9]),
- fTargetAMMFundSize: ABK64x64ToFloat(response[0][10]),
- fTargetDFSize: ABK64x64ToFloat(response[0][11]),
- iLastTargetPoolSizeTime: ABK64x64ToFloat(response[0][12]),
- iLastFundingTime: ABK64x64ToFloat(response[0][13]),
- isRunning: response[0][1],
+ fPnLparticipantsCashCC: ABK64x64ToFloat(response[0][5]),
+ fAMMFundCashCC: ABK64x64ToFloat(response[0][6]),
+ fDefaultFundCashCC: ABK64x64ToFloat(response[0][7]),
+ fTargetAMMFundSize: ABK64x64ToFloat(response[0][8]),
+ fTargetDFSize: ABK64x64ToFloat(response[0][9]),
+ isRunning: response[0][16],
}
: initialLiquidityPoolState;
@@ -515,36 +509,36 @@ const parsePerpetualParameters = (response: any): PerpParameters =>
oracleS3Addr: response[0][3],
fCurrentFundingRate: ABK64x64ToFloat(response[0][10]),
fUnitAccumulatedFunding: ABK64x64ToFloat(response[0][11]),
- fOpenInterest: ABK64x64ToFloat(response[0][13]),
- fInitialMarginRateAlpha: ABK64x64ToFloat(response[0][17]),
- fMarginRateBeta: ABK64x64ToFloat(response[0][18]),
- fInitialMarginRateCap: ABK64x64ToFloat(response[0][19]),
- fMaintenanceMarginRateAlpha: ABK64x64ToFloat(response[0][20]),
- fTreasuryFeeRate: ABK64x64ToFloat(response[0][21]),
- fPnLPartRate: ABK64x64ToFloat(response[0][22]),
- fReferralRebateCC: ABK64x64ToFloat(response[0][23]),
- fLiquidationPenaltyRate: ABK64x64ToFloat(response[0][24]),
- fMinimalSpread: ABK64x64ToFloat(response[0][25]),
- fMinimalSpreadInStress: ABK64x64ToFloat(response[0][26]),
- fLotSizeBC: ABK64x64ToFloat(response[0][27]),
- fFundingRateClamp: ABK64x64ToFloat(response[0][28]),
- fMarkPriceEMALambda: ABK64x64ToFloat(response[0][29]),
- fSigma2: ABK64x64ToFloat(response[0][30]),
- fSigma3: ABK64x64ToFloat(response[0][31]),
- fRho23: ABK64x64ToFloat(response[0][32]),
- fStressReturnS2_0: ABK64x64ToFloat(response[0][34][0]),
- fStressReturnS2_1: ABK64x64ToFloat(response[0][34][1]),
- fStressReturnS3_0: ABK64x64ToFloat(response[0][35][0]),
- fStressReturnS3_1: ABK64x64ToFloat(response[0][35][1]),
- fDFCoverNRate: ABK64x64ToFloat(response[0][36]),
- fDFLambda_0: ABK64x64ToFloat(response[0][37][0]),
- fDFLambda_1: ABK64x64ToFloat(response[0][37][1]),
- fAMMTargetDD_0: ABK64x64ToFloat(response[0][38][0]),
- fAMMTargetDD_1: ABK64x64ToFloat(response[0][38][1]),
- fAMMMinSizeCC: ABK64x64ToFloat(response[0][39]),
- fMinimalTraderExposureEMA: ABK64x64ToFloat(response[0][40]),
- fMaximalTradeSizeBumpUp: ABK64x64ToFloat(response[0][42]),
- fMaxPositionBC: ABK64x64ToFloat(response[0][49]),
+ fOpenInterest: ABK64x64ToFloat(response[0][12]),
+ fInitialMarginRateAlpha: ABK64x64ToFloat(response[0][16]),
+ fMarginRateBeta: ABK64x64ToFloat(response[0][17]),
+ fInitialMarginRateCap: ABK64x64ToFloat(response[0][18]),
+ fMaintenanceMarginRateAlpha: ABK64x64ToFloat(response[0][19]),
+ fTreasuryFeeRate: ABK64x64ToFloat(response[0][20]),
+ fPnLPartRate: ABK64x64ToFloat(response[0][21]),
+ fReferralRebateCC: ABK64x64ToFloat(response[0][22]),
+ fLiquidationPenaltyRate: ABK64x64ToFloat(response[0][23]),
+ fMinimalSpread: ABK64x64ToFloat(response[0][24]),
+ fMinimalSpreadInStress: ABK64x64ToFloat(response[0][25]),
+ fLotSizeBC: ABK64x64ToFloat(response[0][26]),
+ fFundingRateClamp: ABK64x64ToFloat(response[0][27]),
+ fMarkPriceEMALambda: ABK64x64ToFloat(response[0][28]),
+ fSigma2: ABK64x64ToFloat(response[0][29]),
+ fSigma3: ABK64x64ToFloat(response[0][30]),
+ fRho23: ABK64x64ToFloat(response[0][31]),
+ fStressReturnS2_0: ABK64x64ToFloat(response[0][33][0]),
+ fStressReturnS2_1: ABK64x64ToFloat(response[0][33][1]),
+ fStressReturnS3_0: ABK64x64ToFloat(response[0][34][0]),
+ fStressReturnS3_1: ABK64x64ToFloat(response[0][34][1]),
+ fDFCoverNRate: ABK64x64ToFloat(response[0][35]),
+ fDFLambda_0: ABK64x64ToFloat(response[0][36][0]),
+ fDFLambda_1: ABK64x64ToFloat(response[0][36][1]),
+ fAMMTargetDD_0: ABK64x64ToFloat(response[0][37][0]),
+ fAMMTargetDD_1: ABK64x64ToFloat(response[0][37][1]),
+ fAMMMinSizeCC: ABK64x64ToFloat(response[0][38]),
+ fMinimalTraderExposureEMA: ABK64x64ToFloat(response[0][39]),
+ fMaximalTradeSizeBumpUp: ABK64x64ToFloat(response[0][41]),
+ fMaxPositionBC: ABK64x64ToFloat(response[0][43]),
}
: initialPerpetualParameters;
@@ -655,6 +649,7 @@ const perpetualCreateLimitTradeArgs = async (
created,
leverage = 1,
pair: pairType,
+ reduceOnly,
} = transaction;
const pair = PerpetualPairDictionary.get(pairType);
@@ -663,6 +658,12 @@ const perpetualCreateLimitTradeArgs = async (
const createdSeconds = Math.floor(created / 1000);
const deadlineSeconds = createdSeconds + expiry * 24 * 60 * 60;
+ let flags = MASK_LIMIT_ORDER;
+
+ if (reduceOnly) {
+ flags = flags.or(MASK_CLOSE_ONLY);
+ }
+
const order = {
iPerpetualId: pair.id,
traderAddr: account,
@@ -671,7 +672,7 @@ const perpetualCreateLimitTradeArgs = async (
fTriggerPrice: weiToABK64x64(trigger).toString(),
iDeadline: deadlineSeconds,
referrerAddr: ethGenesisAddress,
- flags: MASK_LIMIT_ORDER,
+ flags,
fLeverage: floatToABK64x64(leverage).toString(),
createdTimestamp: createdSeconds,
};
diff --git a/src/app/pages/SpotTradingPage/components/PriceHistory/index.tsx b/src/app/pages/SpotTradingPage/components/PriceHistory/index.tsx
deleted file mode 100644
index cee79825f..000000000
--- a/src/app/pages/SpotTradingPage/components/PriceHistory/index.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import axios from 'axios';
-import { backendUrl, currentChainId } from 'utils/classifiers';
-import { useTranslation } from 'react-i18next';
-import { translations } from 'locales/i18n';
-
-const url = backendUrl[currentChainId];
-
-export function PriceHistory() {
- const { t } = useTranslation();
- const [currentPrice, setCurrentPrice] = useState(-1);
- const [turnover, setTurnover] = useState(-1);
- useEffect(() => {
- axios
- .get(url + '/sov/trading-volume')
- .then(({ data }) => {
- setTurnover(data?.total?.sov);
- })
- .catch(console.error);
- }, []);
-
- useEffect(() => {
- const getPrice = () =>
- axios
- .get(url + '/sov/current-price')
- .then(({ data }) => setCurrentPrice(data?.price * 1e8))
- .catch(console.error);
-
- getPrice();
-
- const intervalId = setInterval(() => getPrice(), 30000);
-
- return () => clearInterval(intervalId);
- }, []);
-
- return (
-
-
- {t(translations.spotTradingPage.priceHistory.turnover)}:{' '}
- {turnover !== null && turnover > -1 && (
- {Number(turnover.toFixed(2)).toLocaleString()} SOV
- )}
-
-
- {t(translations.spotTradingPage.priceHistory.lastTradedPrice)}:{' '}
- {currentPrice > -1 && {currentPrice.toLocaleString()} sats}
-
- | |