fix(trading): remove market value proxy and formatting (#4916)

apps/explorer-e2e/src/integration/market.cy.js

@@ -87,7 +87,13 @@ context('Market page', { tags: '@regression' }, function () {
       // Liquidity
       cy.validate_element_from_table('Target Stake', '0.00 fUSDC');
       cy.validate_element_from_table('Supplied Stake', '0.00 fUSDC');
-      cy.validate_element_from_table('Market Value Proxy', '0.00 fUSDC');
+      // Liquidity price range
+      cy.validate_element_from_table(
+        'Liquidity Price Range',
+        '1,000.00% of mid price'
+      );
+      cy.validate_element_from_table('Lowest Price', '0.00 fUSDC');
+      cy.validate_element_from_table('Highest Price', '0.00 fUSDC');
       cy.getByTestId('oracle-spec-links')
         .should('have.attr', 'href')
         .and(

apps/trading/components/liquidity-header/liquidity-header.tsx

@@ -12,10 +12,6 @@ import {
 import { t } from '@vegaprotocol/i18n';
 import { ExternalLink, Indicator } from '@vegaprotocol/ui-toolkit';
 import { DocsLinks } from '@vegaprotocol/environment';
-import {
-  NetworkParams,
-  useNetworkParams,
-} from '@vegaprotocol/network-parameters';
 import { useCheckLiquidityStatus } from '@vegaprotocol/liquidity';
 import { useParams } from 'react-router-dom';
 
@@ -31,12 +27,8 @@ export const LiquidityHeader = () => {
   const assetDecimalPlaces = asset?.decimals || 0;
   const symbol = asset?.symbol;
 
-  const { params } = useNetworkParams([
-    NetworkParams.market_liquidity_stakeToCcyVolume,
-    NetworkParams.market_liquidity_targetstake_triggering_ratio,
-  ]);
   const triggeringRatio =
-    params.market_liquidity_targetstake_triggering_ratio || '1';
+    market?.liquidityMonitoringParameters.triggeringRatio || '1';
 
   const { percentage, status } = useCheckLiquidityStatus({
     suppliedStake: suppliedStake || 0,

apps/trading/components/market-selector/market-selector-item.spec.tsx

@@ -61,7 +61,6 @@ describe('MarketSelectorItem', () => {
     indicativeVolume: '100',
     marketState: MarketState.STATE_ACTIVE,
     marketTradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
-    marketValueProxy: '100',
     markPrice: '50000',
     midPrice: '100',
     staticMidPrice: '100',

apps/trading/components/market-selector/market-selector.tsx

@@ -126,10 +126,12 @@ export const MarketSelector = ({
           onSelect={onSelect}
           noItems={
             filter.product === Product.Perpetual
-              ? t('Perpetual markets coming soon.')
+              ? t('No perpetual markets.')
               : filter.product === Product.Spot
               ? t('Spot markets coming soon.')
-              : t('No markets')
+              : filter.product === Product.Future
+              ? t('No future markets.')
+              : t('No markets.')
           }
           allProducts={allProducts}
         />

libs/deal-ticket/src/test-helpers.ts

@@ -11,6 +11,9 @@ export function generateMarket(override?: PartialDeep<Market>): Market {
     positionDecimalPlaces: 1,
     tradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
     state: Schema.MarketState.STATE_ACTIVE,
+    liquidityMonitoringParameters: {
+      triggeringRatio: '1',
+    },
     marketTimestamps: {
       __typename: 'MarketTimestamps',
       close: '',

libs/fills/src/lib/test-helpers.ts

@@ -42,6 +42,9 @@ export const generateFill = (override?: PartialDeep<Trade>) => {
       decimalPlaces: 5,
       state: MarketState.STATE_ACTIVE,
       tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
+      liquidityMonitoringParameters: {
+        triggeringRatio: '1',
+      },
       fees: {
         __typename: 'Fees',
         factors: {

libs/markets/src/lib/__generated__/market-data.ts

@@ -3,23 +3,23 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type MarketDataUpdateFieldsFragment = { __typename?: 'ObservableMarketData', marketId: string, auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, marketValueProxy: string, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null };
+export type MarketDataUpdateFieldsFragment = { __typename?: 'ObservableMarketData', marketId: string, auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null };
 
 export type MarketDataUpdateSubscriptionVariables = Types.Exact<{
   marketId: Types.Scalars['ID'];
 }>;
 
 
-export type MarketDataUpdateSubscription = { __typename?: 'Subscription', marketsData: Array<{ __typename?: 'ObservableMarketData', marketId: string, auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, marketValueProxy: string, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null }> };
+export type MarketDataUpdateSubscription = { __typename?: 'Subscription', marketsData: Array<{ __typename?: 'ObservableMarketData', marketId: string, auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null }> };
 
-export type MarketDataFieldsFragment = { __typename?: 'MarketData', auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, marketValueProxy: string, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, market: { __typename?: 'Market', id: string }, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null };
+export type MarketDataFieldsFragment = { __typename?: 'MarketData', auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, market: { __typename?: 'Market', id: string }, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null };
 
 export type MarketDataQueryVariables = Types.Exact<{
   marketId: Types.Scalars['ID'];
 }>;
 
 
-export type MarketDataQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', data?: { __typename?: 'MarketData', auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, marketValueProxy: string, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, market: { __typename?: 'Market', id: string }, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null } | null } }> } | null };
+export type MarketDataQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', data?: { __typename?: 'MarketData', auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, market: { __typename?: 'Market', id: string }, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null } | null } }> } | null };
 
 export const MarketDataUpdateFieldsFragmentDoc = gql`
     fragment MarketDataUpdateFields on ObservableMarketData {
@@ -46,7 +46,6 @@ export const MarketDataUpdateFieldsFragmentDoc = gql`
   indicativeVolume
   marketState
   marketTradingMode
-  marketValueProxy
   markPrice
   midPrice
   openInterest
@@ -94,7 +93,6 @@ export const MarketDataFieldsFragmentDoc = gql`
   indicativeVolume
   marketState
   marketTradingMode
-  marketValueProxy
   markPrice
   midPrice
   openInterest

libs/markets/src/lib/components/market-info/market-info-panels.spec.tsx

@@ -6,12 +6,14 @@ import {
 import { DataSourceProof, SuccessionLineInfoPanel } from './market-info-panels';
 import { MockedProvider } from '@apollo/react-testing';
 import { SuccessorMarketIdsDocument } from '../../__generated__';
+import { getDateTimeFormat } from '@vegaprotocol/utils';
 
 jest.mock('../../hooks/use-oracle-markets', () => ({
   useOracleMarkets: () => [],
 }));
 
-describe('DataSourceProof', () => {
+describe('MarketInfoPanels', () => {
+  describe('DataSourceProof', () => {
     const ORACLE_PUBKEY =
       '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f';
 
@@ -115,7 +117,7 @@ describe('DataSourceProof', () => {
       const condition = {
         __typename: 'Condition' as const,
         operator: ConditionOperator.OPERATOR_GREATER_THAN,
-      value: '100',
+        value: '1696238009',
       };
       const props = {
         data: {
@@ -132,15 +134,20 @@ describe('DataSourceProof', () => {
       };
       render(<DataSourceProof dataSourceSpecId={''} {...props} />);
       expect(screen.getByText('Internal conditions')).toBeInTheDocument();
+      const dateFromUnixTimestamp = condition.value
+        ? getDateTimeFormat().format(new Date(parseInt(condition.value)))
+        : '-';
       expect(
         screen.getByText(
-        `${ConditionOperatorMapping[condition.operator]} ${condition.value}`
+          `${
+            ConditionOperatorMapping[condition.operator]
+          } ${dateFromUnixTimestamp}`
         )
       ).toBeInTheDocument();
     });
-});
+  });
 
-describe('SuccessionLineInfoPanel', () => {
+  describe('SuccessionLineInfoPanel', () => {
     const mocks = [
       {
         request: {
@@ -228,4 +235,5 @@ describe('SuccessionLineInfoPanel', () => {
         });
       }
     );
+  });
 });

libs/markets/src/lib/components/market-info/market-info-panels.tsx

@@ -858,7 +858,6 @@ export const LiquidityInfoPanel = ({ market, children }: MarketInfoProps) => {
         data={{
           targetStake: data?.targetStake,
           suppliedStake: data?.suppliedStake,
-          marketValueProxy: data?.marketValueProxy,
         }}
         decimalPlaces={asset.decimals}
         assetSymbol={asset.symbol}
@@ -1033,9 +1032,13 @@ export const DataSourceProof = ({
           <h3>{t('Internal conditions')}</h3>
           {data.sourceType.sourceType?.conditions?.map((condition, i) => {
             if (!condition) return null;
+            const dateFromUnixTimestamp = condition.value
+              ? getDateTimeFormat().format(new Date(parseInt(condition.value)))
+              : '-';
             return (
               <p key={i}>
-                {ConditionOperatorMapping[condition.operator]} {condition.value}
+                {ConditionOperatorMapping[condition.operator]}{' '}
+                {dateFromUnixTimestamp}
               </p>
             );
           })}

libs/markets/src/lib/market-data.graphql

@@ -22,7 +22,6 @@ fragment MarketDataUpdateFields on ObservableMarketData {
   indicativeVolume
   marketState
   marketTradingMode
-  marketValueProxy
   markPrice
   midPrice
   openInterest
@@ -75,7 +74,6 @@ fragment MarketDataFields on MarketData {
   indicativeVolume
   marketState
   marketTradingMode
-  marketValueProxy
   markPrice
   midPrice
   openInterest

libs/markets/src/lib/market-data.mock.ts

@@ -58,7 +58,6 @@ const marketDataFields: MarketDataFieldsFragment = {
   indicativeVolume: '0',
   marketState: Schema.MarketState.STATE_ACTIVE,
   marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-  marketValueProxy: '2000000',
   markPrice: '4612690058',
   midPrice: '4612690000',
   openInterest: '0',
@@ -97,7 +96,6 @@ const marketDataUpdateFields: MarketDataUpdateFieldsFragment = {
   marketId: 'market-0',
   marketState: Schema.MarketState.STATE_ACTIVE,
   marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-  marketValueProxy: '',
   markPrice: '4612690058',
   midPrice: '0',
   lastTradedPrice: '0',

libs/markets/src/lib/markets.graphql

@@ -35,6 +35,9 @@ fragment MarketFields on Market {
     open
     close
   }
+  liquidityMonitoringParameters {
+    triggeringRatio
+  }
 }
 
 query Markets {

libs/markets/src/lib/markets.mock.ts

@@ -53,6 +53,9 @@ export const createMarketFragment = (
         liquidityFee: '',
       },
     },
+    liquidityMonitoringParameters: {
+      triggeringRatio: '1',
+    },
     tradableInstrument: {
       instrument: {
         id: '',

libs/orders/src/lib/components/mocks/generate-orders.ts

@@ -20,6 +20,9 @@ export const generateOrder = (partialOrder?: PartialDeep<Order>) => {
           makerFee: '0.1',
         },
       },
+      liquidityMonitoringParameters: {
+        triggeringRatio: '1',
+      },
       marketTimestamps: {
         __typename: 'MarketTimestamps',
         close: '',

libs/orders/src/lib/components/mocks/generate-stop-orders.ts

@@ -21,6 +21,9 @@ export const generateStopOrder = (
       __typename: 'Market',
       id: 'market-id',
       decimalPlaces: 1,
+      liquidityMonitoringParameters: {
+        triggeringRatio: '0.7',
+      },
       fees: {
         __typename: 'Fees',
         factors: {

libs/orders/src/lib/components/order-list/order-view-dialog.spec.tsx

@@ -31,6 +31,9 @@ describe('OrderViewDialog', () => {
             liquidityFee: '0.001',
           },
         },
+        liquidityMonitoringParameters: {
+          triggeringRatio: '1',
+        },
         tradableInstrument: {
           __typename: 'TradableInstrument',
           instrument: {

libs/withdraws/src/lib/withdraw-form-container.spec.tsx

@@ -149,6 +149,9 @@ describe('WithdrawFormContainer', () => {
               liquidityFee: '0.001',
             },
           },
+          liquidityMonitoringParameters: {
+            triggeringRatio: '0.7',
+          },
           tradableInstrument: {
             __typename: 'TradableInstrument',
             instrument: {

specs/6002-MDET-market-details.md

@@ -105,7 +105,6 @@ When I look into market info I **Must** see following specification:
 - Liquidity: (<a name="6002-MDET-214" href="#6002-MDET-214">6002-MDET-214</a>)
   - Target Stake
   - Supplied Stake
-  - Market Value Proxy
   - link to liquidity provision table
 - Liquidity price range: (<a name="6002-MDET-215" href="#6002-MDET-215">6002-MDET-215</a>)
   - Liquidity Price Range