chore: show opening auction markets in market list

2023-05-17 22:20:08 -07:00
214 changed files with 1980 additions and 3517 deletions
@@ -1,74 +0,0 @@
-name: After Release
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  after-release:
-    runs-on: ubuntu-22.04
-    timeout-minutes: 30
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to the Container registry (ghcr)
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Log in to the Container registry (docker hub)
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: resolve ipfs hashes for release
-        run: |
-          echo "Tag name: ${{ github.event.release.tag_name }}"
-          echo "Name: ${{ github.event.release.name }}"
-          echo "Description: ${{ github.event.release.body }}"
-          until docker pull vegaprotocol/trading:${{ github.event.release.tag_name }}; do
-            echo "Image not pushed yet, waiting 60 seconds"
-            sleep 60
-          done
-          docker run --rm vegaprotocol/trading:${{ github.event.release.tag_name }} cat /ipfs-hash > ipfs-hash
-          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
-          tar -xzf kubo.tgz
-          export PATH="$PATH:$PWD/kubo"
-          which ipfs
-          echo IPFS_V0=$(cat ipfs-hash) >> $GITHUB_ENV
-          echo IPFS_V1=$(ipfs cid format -v 1 -b base32 $(cat ipfs-hash)) >> $GITHUB_ENV
-
-      - name: Edit Release
-        uses: irongut/EditRelease@v1.2.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          id: ${{ github.event.release.id }}
-          body: |
-            ---
-
-            # Deployments
-            * https://explorer.vega.xyz
-            * https://governance.vega.xyz
-
-            # IPFS releases
-            Tye IPFS hash of this release of the Trading app is:
-
-            CIDv0: ${{ env.IPFS_V0 }}
-            CIDv1: ${{ env.IPFS_V1 }}
-
-            You can always access the latest IPFS release by visiting [vega.trading](https://vega.trading).
-
-            You can also access Trading directly from an IPFS gateway.
-            BEWARE: The Trading interface uses [localStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) to remember your settings, such as which tokens you have imported. You should always use an IPFS gateway that enforces [origin separation](https://ipfs.github.io/public-gateway-checker/).
-
-            Your settings are not remembered across different URLs.
-
-            IPFS gateways:
-
-            https://${{ env.IPFS_V1 }}.ipfs.dweb.link/
-            https://${{ env.IPFS_V1 }}.ipfs.cf-ipfs.com/
-            ipfs://${{ env.IPFS_V0 }}/
@@ -170,6 +170,12 @@ jobs:
          labels: ${{ matrix.app }}-preview
          number: ${{ github.event.number }}

+      - name: Add ipfs hash to release
+        uses: softprops/action-gh-release@v1
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
+        with:
+          files: ${{ matrix.app }}-ipfs-hash
+
      - name: Trigger fleek deployment
        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
        run: |
@@ -1,77 +0,0 @@
-name: 'Rollback console'
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version that should be set on rollback'
-        required: true
-        type: string
-
-jobs:
-  rollback:
-    runs-on: ubuntu-22.04
-    timeout-minutes: 10
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to the Container registry (docker hub)
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Retag mainnet
-        run: |
-          docker pull vegaprotocol/trading:${{ inputs.version }}
-          docker tag vegaprotocol/trading:${{ inputs.version }} vegaprotocol/trading:mainnet
-          docker push vegaprotocol/trading:mainnet
-          docker run --rm vegaprotocol/trading:mainnet cat /ipfs-hash > ipfs-hash
-
-      - name: Trigger fleek deployment
-        run: |
-          # display info about app
-          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-            -H "Content-Type: application/json" \
-            -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
-            https://api.fleek.co/graphql
-
-          # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
-          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-            -H "Content-Type: application/json" \
-            -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
-            https://api.fleek.co/graphql
-
-      - name: Update vega.trading DNS to redirect to the new console
-        run: |
-          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
-          tar -xzf kubo.tgz
-          export PATH="$PATH:$PWD/kubo"
-          which ipfs
-          new_hash=$(cat ipfs-hash)
-          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
-
-          # Generate console URL
-          new_console_url_type=ipfs
-          # new_console_url_type=ipns
-          new_console_url_domain=cf-ipfs.com
-          # new_console_url_domain=dweb.link
-          new_console_url="https://${new_cid}.${new_console_url_type}.${new_console_url_domain}/"
-          echo "new_console_url=${new_console_url}"
-
-          # Update record in DNSimple
-          # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
-          dnsimple_account_id=84895
-          dnsimple_zone_name=vega.trading
-          dnsimple_record_id=44409591
-          # see: https://dnsimple.com/a/84895/domains/vega.trading/records/44409591/edit
-
-          curl  -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
-                -H 'Accept: application/json' \
-                -H 'Content-Type: application/json' \
-                -X PATCH \
-                -d "{
-                      \"content\": \"${new_console_url}\"
-                }" \
-                https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}
@@ -1,8 +1,8 @@
 import { t } from '@vegaprotocol/i18n';
-import type { MarketInfoWithData } from '@vegaprotocol/markets';
+import type { MarketInfoWithData } from '@vegaprotocol/market-info';
+import { LiquidityInfoPanel } from '@vegaprotocol/market-info';
+import { LiquidityMonitoringParametersInfoPanel } from '@vegaprotocol/market-info';
 import {
-  LiquidityInfoPanel,
-  LiquidityMonitoringParametersInfoPanel,
  InstrumentInfoPanel,
  KeyDetailsInfoPanel,
  LiquidityPriceRangeInfoPanel,
@@ -12,8 +12,8 @@ import {
  RiskModelInfoPanel,
  RiskParametersInfoPanel,
  SettlementAssetInfoPanel,
-} from '@vegaprotocol/markets';
-import { MarketInfoTable } from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-info';
+import { MarketInfoTable } from '@vegaprotocol/market-info';
 import type { DataSourceDefinition } from '@vegaprotocol/types';
 import isEqual from 'lodash/isEqual';

@@ -1,4 +1,4 @@
-import type { MarketFieldsFragment } from '@vegaprotocol/markets';
+import type { MarketFieldsFragment } from '@vegaprotocol/market-list';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
@@ -8,7 +8,7 @@ import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import compact from 'lodash/compact';
 import { JsonViewerDialog } from '../../components/dialogs/json-viewer-dialog';
-import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
+import { marketInfoWithDataProvider } from '@vegaprotocol/market-info';
 import { PageTitle } from '../../components/page-helpers/page-title';

 export const MarketPage = () => {
@@ -1,6 +1,6 @@
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
-import { marketsProvider } from '@vegaprotocol/markets';
+import { marketsProvider } from '@vegaprotocol/market-list';
 import { RouteTitle } from '../../components/route-title';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
@@ -16,7 +16,6 @@ import { AppStateProvider } from './contexts/app-state/app-state-provider';
 import { ContractsProvider } from './contexts/contracts/contracts-provider';
 import { AppRouter } from './routes';
 import type { EthereumConfig } from '@vegaprotocol/web3';
-import { WithdrawalApprovalDialogContainer } from '@vegaprotocol/web3';
 import {
  createConnectors,
  useEthTransactionManager,
@@ -44,7 +43,7 @@ import {
 } from '@vegaprotocol/environment';
 import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
-import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
+import { WithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
 import { ToastsManager } from './toasts-manager';
 import {
@@ -159,8 +158,7 @@ const Web3Container = ({
                  <InitializeHandlers />
                  <VegaWalletDialogs />
                  <TransactionModal />
-                  <CreateWithdrawalDialog />
-                  <WithdrawalApprovalDialogContainer />
+                  <WithdrawalDialog />
                  <TelemetryDialog />
                </>
              </BalanceManager>
@@ -10,8 +10,8 @@ import {
  displayChange,
 } from '@vegaprotocol/liquidity';

-import type { Candle } from '@vegaprotocol/markets';
-import { marketCandlesProvider } from '@vegaprotocol/markets';
+import type { Candle } from '@vegaprotocol/market-list';
+import { marketCandlesProvider } from '@vegaprotocol/market-list';

 const THROTTLE_UPDATE_TIME = 500;

@@ -1,7 +1,7 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import * as Schema from '@vegaprotocol/types';
 import type { CyHttpMessages } from 'cypress/types/net-stubbing';
-import type { Provider, Status } from '@vegaprotocol/markets';
+import type { Provider, Status } from '@vegaprotocol/market-info';
 import {
  accountsQuery,
  assetQuery,
@@ -32,7 +32,7 @@ import {
  blockStatisticsQuery,
 } from '@vegaprotocol/mock';
 import type { PartialDeep } from 'type-fest';
-import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/markets';
+import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/market-list';

 type MarketPageMockData = {
  state: Schema.MarketState;
@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { marketsWithDataProvider } from '@vegaprotocol/markets';
+import { marketsWithDataProvider } from '@vegaprotocol/market-list';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Links, Routes } from '../../pages/client-router';
@@ -5,7 +5,7 @@ import {
  lpAggregatedDataProvider,
  useCheckLiquidityStatus,
 } from '@vegaprotocol/liquidity';
-import { tooltipMapping } from '@vegaprotocol/markets';
+import { tooltipMapping } from '@vegaprotocol/market-info';
 import {
  addDecimalsFormatNumber,
  formatNumberPercentage,
@@ -37,7 +37,7 @@ import type { LiquidityProvisionData, Filter } from '@vegaprotocol/liquidity';
 import { Link, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';

-import { useMarket, useStaticMarketData } from '@vegaprotocol/markets';
+import { useMarket, useStaticMarketData } from '@vegaprotocol/market-list';
 import { DocsLinks } from '@vegaprotocol/environment';

 const enum LiquidityTabs {
@@ -2,12 +2,12 @@ import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { ButtonLink, Link } from '@vegaprotocol/ui-toolkit';
 import { MarketProposalNotification } from '@vegaprotocol/proposals';
-import type { Market } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';
 import { getExpiryDate, getMarketExpiryDate } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { HeaderStat } from '../../components/header';
 import { MarketMarkPrice } from '../../components/market-mark-price';
-import { Last24hPriceChange, Last24hVolume } from '@vegaprotocol/markets';
+import { Last24hPriceChange, Last24hVolume } from '@vegaprotocol/market-info';
 import { MarketState } from '../../components/market-state';
 import { HeaderStatMarketTradingMode } from '../../components/market-trading-mode';
 import { MarketLiquiditySupplied } from '../../components/liquidity-supplied';
@@ -8,8 +8,8 @@ import { MockedProvider } from '@apollo/client/testing';
 import type {
  MarketDataUpdateFieldsFragment,
  MarketDataUpdateSubscription,
-} from '@vegaprotocol/markets';
-import { MarketDataUpdateDocument } from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-list';
+import { MarketDataUpdateDocument } from '@vegaprotocol/market-list';
 import {
  AuctionTrigger,
  MarketState,
@@ -6,8 +6,8 @@ import {
  formatNumber,
  priceChangePercentage,
 } from '@vegaprotocol/utils';
-import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
-import { useMarketDataUpdateSubscription } from '@vegaprotocol/markets';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/market-list';
+import { useMarketDataUpdateSubscription } from '@vegaprotocol/market-list';
 import { Sparkline } from '@vegaprotocol/ui-toolkit';

 export const MarketSelectorItem = ({
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { MarketSelector } from './market-selector';
-import { useMarketList } from '@vegaprotocol/markets';
+import { useMarketList } from '@vegaprotocol/market-list';
 import { createMarketFragment } from '@vegaprotocol/mock';
 import { MarketState } from '@vegaprotocol/types';
 import { MemoryRouter } from 'react-router-dom';
@@ -12,7 +12,7 @@ import { Sort } from './sort-dropdown';
 import { subDays } from 'date-fns';
 import { isMarketActive } from './use-market-selector-list';

-jest.mock('@vegaprotocol/markets');
+jest.mock('@vegaprotocol/market-list');
 const mockUseMarketList = useMarketList as jest.Mock;

 // mock market list items to avoid subscriptions starting
@@ -1,6 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import uniqBy from 'lodash/uniqBy';
-import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/market-list';
 import {
  Input,
  TinyScroll,
@@ -7,7 +7,7 @@ import {
  useThrottledDataProvider,
 } from '@vegaprotocol/data-provider';
 import { AsyncRenderer, ExternalLink, Splash } from '@vegaprotocol/ui-toolkit';
-import { marketProvider, marketDataProvider } from '@vegaprotocol/markets';
+import { marketProvider, marketDataProvider } from '@vegaprotocol/market-list';
 import { useGlobalStore, usePageTitleStore } from '../../stores';
 import { TradeGrid } from './trade-grid';
 import { TradePanels } from './trade-panels';
@@ -6,8 +6,8 @@ import classNames from 'classnames';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import type { PinnedAsset } from '@vegaprotocol/accounts';
 import { t } from '@vegaprotocol/i18n';
-import { OracleBanner } from '@vegaprotocol/markets';
-import type { Market } from '@vegaprotocol/markets';
+import { OracleBanner } from '@vegaprotocol/market-info';
+import type { Market } from '@vegaprotocol/market-list';
 import { Filter } from '@vegaprotocol/orders';
 import {
  usePaneLayout,
@@ -1,6 +1,6 @@
 import type { PinnedAsset } from '@vegaprotocol/accounts';
-import type { Market } from '@vegaprotocol/markets';
-import { OracleBanner } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';
+import { OracleBanner } from '@vegaprotocol/market-info';
 import {
  useMarketClickHandler,
  useMarketLiquidityClickHandler,
@@ -1,5 +1,5 @@
 import { DealTicketContainer } from '@vegaprotocol/deal-ticket';
-import { MarketInfoAccordionContainer } from '@vegaprotocol/markets';
+import { MarketInfoAccordionContainer } from '@vegaprotocol/market-info';
 import { OrderbookContainer } from '@vegaprotocol/market-depth';
 import { OrderListContainer, Filter } from '@vegaprotocol/orders';
 import type { OrderListContainerProps } from '@vegaprotocol/orders';
@@ -8,11 +8,11 @@ import { Product } from './product-selector';
 import { Sort } from './sort-dropdown';
 import { createMarketFragment } from '@vegaprotocol/mock';
 import { MarketState } from '@vegaprotocol/types';
-import { useMarketList } from '@vegaprotocol/markets';
+import { useMarketList } from '@vegaprotocol/market-list';
 import type { Filter } from './market-selector';
 import { subDays } from 'date-fns';

-jest.mock('@vegaprotocol/markets');
+jest.mock('@vegaprotocol/market-list');
 const mockUseMarketList = useMarketList as jest.Mock;

 describe('useMarketSelectorList', () => {
@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import orderBy from 'lodash/orderBy';
 import { MarketState } from '@vegaprotocol/types';
-import { useMarketList } from '@vegaprotocol/markets';
+import { useMarketList } from '@vegaprotocol/market-list';
 import { priceChangePercentage } from '@vegaprotocol/utils';
 import type { Filter } from './market-selector';
 import { Sort } from './sort-dropdown';
@@ -6,16 +6,8 @@ import { MarketState } from '@vegaprotocol/types';
 import { subDays } from 'date-fns';
 import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
-import type {
-  OracleSpecDataConnectionQuery,
-  MarketsDataQuery,
-  MarketsQuery,
-} from '@vegaprotocol/markets';
-import {
-  OracleSpecDataConnectionDocument,
-  MarketsDataDocument,
-  MarketsDocument,
-} from '@vegaprotocol/markets';
+import type { OracleSpecDataConnectionQuery } from '@vegaprotocol/market-info';
+import { OracleSpecDataConnectionDocument } from '@vegaprotocol/market-info';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import type {
@@ -24,6 +16,9 @@ import type {
 } from '@vegaprotocol/positions';
 import { PositionsDocument } from '@vegaprotocol/positions';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import type { MarketsDataQuery, MarketsQuery } from '@vegaprotocol/market-list';
+import { MarketsDataDocument } from '@vegaprotocol/market-list';
+import { MarketsDocument } from '@vegaprotocol/market-list';
 import {
  createMarketFragment,
  marketsQuery,
@@ -13,11 +13,11 @@ import {
  getMarketExpiryDate,
 } from '@vegaprotocol/utils';
 import { usePositionsQuery } from '@vegaprotocol/positions';
-import type { MarketMaybeWithData } from '@vegaprotocol/markets';
+import type { MarketMaybeWithData } from '@vegaprotocol/market-list';
 import {
  MarketTableActions,
  closedMarketsWithDataProvider,
-} from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-list';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import type { ColDef } from 'ag-grid-community';
@@ -1,4 +1,4 @@
-import { MarketsContainer } from '@vegaprotocol/markets';
+import { MarketsContainer } from '@vegaprotocol/market-list';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';

 export const Markets = () => {
@@ -2,8 +2,8 @@ import { render, screen } from '@testing-library/react';
 import type { Property } from '@vegaprotocol/types';
 import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
-import type { OracleSpecDataConnectionQuery } from '@vegaprotocol/markets';
-import { OracleSpecDataConnectionDocument } from '@vegaprotocol/markets';
+import type { OracleSpecDataConnectionQuery } from '@vegaprotocol/market-info';
+import { OracleSpecDataConnectionDocument } from '@vegaprotocol/market-info';
 import type { SettlementPriceCellProps } from './settlement-price-cell';
 import { SettlementPriceCell } from './settlement-price-cell';

@@ -1,6 +1,6 @@
 import { DApp, EXPLORER_ORACLE, useLinks } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
-import { useOracleSpecBindingData } from '@vegaprotocol/markets';
+import { useOracleSpecBindingData } from '@vegaprotocol/market-info';
 import { Link } from '@vegaprotocol/ui-toolkit';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';

@@ -26,7 +26,7 @@ import type { Account } from '@vegaprotocol/accounts';
 import { accountsDataProvider } from '@vegaprotocol/accounts';
 import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import type { Market } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';

 const DateRange = {
  RANGE_1D: '1D',
@@ -5,7 +5,6 @@ import {
  RoundedWrapper,
  Switch,
  ThemeSwitcher,
-  ToastPositionSetter,
 } from '@vegaprotocol/ui-toolkit';
 import { useThemeSwitcher } from '@vegaprotocol/react-helpers';

@@ -42,8 +41,6 @@ export const Settings = () => {
                'Help identify bugs and improve the service by sharing anonymous usage data.'
              )}
            />
-            <Divider />
-            <ToastPositionSetter />
          </RoundedWrapper>
        </div>
      </div>
@@ -4,8 +4,8 @@ import {
  useNetworkParams,
 } from '@vegaprotocol/network-parameters';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import type { MarketData } from '@vegaprotocol/markets';
-import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
+import type { MarketData } from '@vegaprotocol/market-list';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
 import { HeaderStat } from '../header';
 import {
  ExternalLink,
@@ -3,7 +3,7 @@ import { useInView } from 'react-intersection-observer';
 import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils';
 import { useThrottledDataProvider } from '@vegaprotocol/data-provider';
 import { PriceCell } from '@vegaprotocol/datagrid';
-import { marketDataProvider } from '@vegaprotocol/markets';
+import { marketDataProvider } from '@vegaprotocol/market-list';
 import { THROTTLE_UPDATE_TIME } from '../constants';

 interface Props {
@@ -1,6 +1,6 @@
 import throttle from 'lodash/throttle';
-import type { MarketData, Market } from '@vegaprotocol/markets';
-import { marketDataProvider } from '@vegaprotocol/markets';
+import type { MarketData, Market } from '@vegaprotocol/market-list';
+import { marketDataProvider } from '@vegaprotocol/market-list';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import * as Schema from '@vegaprotocol/types';
@@ -5,7 +5,7 @@ import { useInView } from 'react-intersection-observer';
 import * as Schema from '@vegaprotocol/types';
 import { HeaderStat } from '../header';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
-import { useStaticMarketData } from '@vegaprotocol/markets';
+import { useStaticMarketData } from '@vegaprotocol/market-list';

 const getTradingModeLabel = (
  marketTradingMode?: Schema.MarketTradingMode,
@@ -3,8 +3,8 @@ import throttle from 'lodash/throttle';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import type { MarketData } from '@vegaprotocol/markets';
-import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
+import type { MarketData } from '@vegaprotocol/market-list';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
 import { HeaderStat } from '../header';
 import * as constants from '../constants';

@@ -1,21 +1,20 @@
 import type { RefObject, MouseEvent } from 'react';
+import { FeesCell } from '@vegaprotocol/market-info';
 import {
-  FeesCell,
  calcCandleHigh,
  calcCandleLow,
  calcCandleVolume,
-  Last24hPriceChange,
-  Last24hVolume,
-} from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-list';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { PriceCell } from '@vegaprotocol/datagrid';
 import { Link as UILink, Sparkline, Tooltip } from '@vegaprotocol/ui-toolkit';
 import isNil from 'lodash/isNil';
 import type { CandleClose } from '@vegaprotocol/types';
-import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/market-list';
 import { Link } from 'react-router-dom';
 import { MarketMarkPrice } from '../market-mark-price';
+import { Last24hPriceChange, Last24hVolume } from '@vegaprotocol/market-info';
 import { MarketTradingMode } from '../market-trading-mode';
 import { Links, Routes } from '../../pages/client-router';

@@ -4,7 +4,7 @@ import { Dialog } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { activeMarketsProvider } from '@vegaprotocol/markets';
+import { activeMarketsProvider } from '@vegaprotocol/market-list';
 import * as constants from '../constants';
 import { RiskNoticeDialog } from './risk-notice-dialog';
 import { WelcomeNoticeDialog } from './welcome-notice-dialog';
@@ -6,7 +6,7 @@ import type {
  MarketMaybeWithCandles,
  MarketMaybeWithData,
  MarketData,
-} from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-list';
 import { SelectMarketLandingTable } from './welcome-landing-dialog';
 const mockMarketClickHandler = jest.fn();
 jest.mock('../../lib/hooks/use-market-click-handler', () => ({
@@ -43,28 +43,10 @@ const MARKET_A: PartialMarket = {
        dataSourceSpecForTradingTermination: {
          __typename: 'DataSourceSpec',
          id: 'oracleId',
-          data: {
-            __typename: 'DataSourceDefinition',
-            sourceType: {
-              __typename: 'DataSourceDefinitionExternal',
-              sourceType: {
-                __typename: 'DataSourceSpecConfiguration',
-              },
-            },
-          },
        },
        dataSourceSpecForSettlementData: {
          __typename: 'DataSourceSpec',
          id: 'oracleId',
-          data: {
-            __typename: 'DataSourceDefinition',
-            sourceType: {
-              __typename: 'DataSourceDefinitionExternal',
-              sourceType: {
-                __typename: 'DataSourceSpecConfiguration',
-              },
-            },
-          },
        },
        dataSourceSpecBinding: {
          __typename: 'DataSourceSpecToFutureBinding',
@@ -147,28 +129,10 @@ const MARKET_B: PartialMarket = {
        dataSourceSpecForTradingTermination: {
          __typename: 'DataSourceSpec',
          id: 'oracleId',
-          data: {
-            __typename: 'DataSourceDefinition',
-            sourceType: {
-              __typename: 'DataSourceDefinitionExternal',
-              sourceType: {
-                __typename: 'DataSourceSpecConfiguration',
-              },
-            },
-          },
        },
        dataSourceSpecForSettlementData: {
          __typename: 'DataSourceSpec',
          id: 'oracleId',
-          data: {
-            __typename: 'DataSourceDefinition',
-            sourceType: {
-              __typename: 'DataSourceDefinitionExternal',
-              sourceType: {
-                __typename: 'DataSourceSpecConfiguration',
-              },
-            },
-          },
        },
        dataSourceSpecBinding: {
          __typename: 'DataSourceSpecToFutureBinding',
@@ -1,10 +1,10 @@
 import React, { useCallback } from 'react';
-import { useMarketList } from '@vegaprotocol/markets';
+import { useMarketList } from '@vegaprotocol/market-list';
 import { t } from '@vegaprotocol/i18n';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import { Link as UILink, TinyScroll } from '@vegaprotocol/ui-toolkit';
 import type { OnCellClickHandler } from '../select-market';
-import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/market-list';
 import {
  ColumnKind,
  columns,
@@ -6,10 +6,7 @@ import { VegaConnectDialog } from '@vegaprotocol/wallet';
 import { Connectors } from '../lib/vega-connectors';
 import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
 import { DepositDialog } from '@vegaprotocol/deposits';
-import {
-  Web3ConnectUncontrolledDialog,
-  WithdrawalApprovalDialogContainer,
-} from '@vegaprotocol/web3';
+import { Web3ConnectUncontrolledDialog } from '@vegaprotocol/web3';
 import { WelcomeDialog } from '../components/welcome-dialog';
 import { TransferDialog } from '@vegaprotocol/accounts';

@@ -30,7 +27,6 @@ const DialogsContainer = () => {
      <Web3ConnectUncontrolledDialog />
      <CreateWithdrawalDialog />
      <TransferDialog />
-      <WithdrawalApprovalDialogContainer />
    </>
  );
 };
@@ -1,6 +0,0 @@
-function ReactMarkdown({ children }) {
-  // eslint-disable-next-line react/jsx-no-useless-fragment
-  return <>{children}</>;
-}
-
-export default ReactMarkdown;
@@ -1,5 +1,5 @@
 import { assetsProvider } from '@vegaprotocol/assets';
-import { marketsProvider } from '@vegaprotocol/markets';
+import { marketsProvider } from '@vegaprotocol/market-list';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import {
  makeDataProvider,
@@ -20,7 +20,7 @@ import type {
  AccountEventsSubscription,
  AccountsQueryVariables,
 } from './__generated__/Accounts';
-import type { Market } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';
 import type { Asset } from '@vegaprotocol/assets';

 const AccountType = Schema.AccountType;
@@ -115,19 +115,7 @@ export function createClient({
      )
    : httpLink;

-  const errorLink = onError(({ graphQLErrors, networkError, operation }) => {
-    // if any of these queries error don't capture any errors, its
-    // likely the user is connecting to a dodgy node, NodeGuard gets
-    // called on startup, NodeCheck and NodeCheckTimeUpdate are called
-    // by the NodeSwitcher component and the useNodeHealth hook
-    if (
-      ['NodeGuard', 'NodeCheck', 'NodeCheckTimeUpdate'].includes(
-        operation.operationName
-      )
-    ) {
-      return;
-    }
-
+  const errorLink = onError(({ graphQLErrors, networkError }) => {
    if (graphQLErrors) {
      graphQLErrors.forEach((e) => {
        if (e.extensions && e.extensions['type'] !== NOT_FOUND) {
@@ -12,13 +12,13 @@ export * from '../fills/src/lib/fills.mock';
 export * from '../proposals/src/lib/proposals-data-provider/proposals.mock';
 export * from '../ledger/src/lib/ledger-entries.mock';
 export * from '../market-depth/src/lib/market-depth.mock';
-export * from '../markets/src/lib/components/market-info/market-info.mock';
-export * from '../markets/src/lib/market-candles.mock';
-export * from '../markets/src/lib/market-data.mock';
-export * from '../markets/src/lib/markets-candles.mock';
-export * from '../markets/src/lib/markets-data.mock';
-export * from '../markets/src/lib/markets.mock';
-export * from '../markets/src/lib/oracle-spec-data-connection.mock';
+export * from '../market-info/src/lib/components/market-info/market-info.mock';
+export * from '../market-list/src/lib/market-candles.mock';
+export * from '../market-list/src/lib/market-data.mock';
+export * from '../market-list/src/lib/markets-candles.mock';
+export * from '../market-list/src/lib/markets-data.mock';
+export * from '../market-list/src/lib/markets.mock';
+export * from '../market-info/src/lib/oracle-spec-data-connection.mock';
 export * from '../orders/src/lib/components/order-data-provider/orders.mock';
 export * from '../positions/src/lib/positions.mock';
 export * from '../network-parameters/src/network-params.mock';
@@ -1,5 +1,5 @@
 import type { Control } from 'react-hook-form';
-import type { Market, MarketData } from '@vegaprotocol/markets';
+import type { Market, MarketData } from '@vegaprotocol/market-list';
 import { DealTicketMarketAmount } from './deal-ticket-market-amount';
 import { DealTicketLimitAmount } from './deal-ticket-limit-amount';
 import * as Schema from '@vegaprotocol/types';
@@ -2,7 +2,7 @@ import { AsyncRenderer, Splash } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
 import { useThrottledDataProvider } from '@vegaprotocol/data-provider';
 import { useVegaTransactionStore } from '@vegaprotocol/wallet';
-import { useMarket, marketDataProvider } from '@vegaprotocol/markets';
+import { useMarket, marketDataProvider } from '@vegaprotocol/market-list';
 import { DealTicket } from './deal-ticket';

 export interface DealTicketContainerProps {
@@ -44,7 +44,7 @@ import {
 } from '../../utils';
 import { ZeroBalanceError } from '../deal-ticket-validation/zero-balance-error';
 import { SummaryValidationType } from '../../constants';
-import type { Market, MarketData } from '@vegaprotocol/markets';
+import type { Market, MarketData } from '@vegaprotocol/market-list';
 import { MarginWarning } from '../deal-ticket-validation/margin-warning';
 import {
  useMarketAccountBalance,
@@ -10,7 +10,7 @@ import { t } from '@vegaprotocol/i18n';
 import { timeInForceLabel } from '@vegaprotocol/orders';
 import { compileGridData } from '../trading-mode-tooltip';
 import { MarketModeValidationType } from '../../constants';
-import type { Market, StaticMarketData } from '@vegaprotocol/markets';
+import type { Market, StaticMarketData } from '@vegaprotocol/market-list';

 interface TimeInForceSelectorProps {
  value: Schema.OrderTimeInForce;
@@ -7,7 +7,7 @@ import {
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
 import { Toggle } from '@vegaprotocol/ui-toolkit';
-import type { Market, MarketData } from '@vegaprotocol/markets';
+import type { Market, MarketData } from '@vegaprotocol/market-list';
 import { compileGridData } from '../trading-mode-tooltip';
 import { MarketModeValidationType } from '../../constants';

@@ -8,7 +8,7 @@ import { Link as UILink } from '@vegaprotocol/ui-toolkit';
 import type { SimpleGridProps } from '@vegaprotocol/ui-toolkit';
 import type { ReactNode } from 'react';
 import { Link } from 'react-router-dom';
-import type { Market, MarketData } from '@vegaprotocol/markets';
+import type { Market, MarketData } from '@vegaprotocol/market-list';

 export const compileGridData = (
  market: Pick<
@@ -8,7 +8,7 @@ import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
 import { ExternalLink, SimpleGrid } from '@vegaprotocol/ui-toolkit';
 import { compileGridData } from './compile-grid-data';
-import { useMarket, useStaticMarketData } from '@vegaprotocol/markets';
+import { useMarket, useStaticMarketData } from '@vegaprotocol/market-list';

 type TradingModeTooltipProps = {
  marketId?: string;
@@ -1,8 +1,8 @@
-import { FeesBreakdown } from '@vegaprotocol/markets';
+import { FeesBreakdown } from '@vegaprotocol/market-info';
 import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import type { Market } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';
 import type { EstimatePositionQuery } from '@vegaprotocol/positions';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import {
@@ -1,4 +1,4 @@
-import type { Market, MarketData } from '@vegaprotocol/markets';
+import type { Market, MarketData } from '@vegaprotocol/market-list';
 import * as Schema from '@vegaprotocol/types';
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';
@@ -37,28 +37,10 @@ export function generateMarket(override?: PartialDeep<Market>): Market {
          dataSourceSpecForTradingTermination: {
            __typename: 'DataSourceSpec',
            id: 'oracleId',
-            data: {
-              __typename: 'DataSourceDefinition',
-              sourceType: {
-                __typename: 'DataSourceDefinitionExternal',
-                sourceType: {
-                  __typename: 'DataSourceSpecConfiguration',
-                },
-              },
-            },
          },
          dataSourceSpecForSettlementData: {
            __typename: 'DataSourceSpec',
            id: 'oracleId',
-            data: {
-              __typename: 'DataSourceDefinition',
-              sourceType: {
-                __typename: 'DataSourceDefinitionExternal',
-                sourceType: {
-                  __typename: 'DataSourceSpecConfiguration',
-                },
-              },
-            },
          },
          dataSourceSpecBinding: {
            __typename: 'DataSourceSpecToFutureBinding',
@@ -1,6 +1,6 @@
 import * as Schema from '@vegaprotocol/types';
 import { isMarketInAuction } from './is-market-in-auction';
-import type { MarketData } from '@vegaprotocol/markets';
+import type { MarketData } from '@vegaprotocol/market-list';

 /**
 * Get the market price based on market mode (auction or not auction)
@@ -1,6 +0,0 @@
-function ReactMarkdown({ children }) {
-  // eslint-disable-next-line react/jsx-no-useless-fragment
-  return <>{children}</>;
-}
-
-export default ReactMarkdown;
@@ -3,13 +3,11 @@ import { MockedProvider } from '@apollo/react-testing';
 import { act, render, screen, waitFor } from '@testing-library/react';
 import { RadioGroup } from '@vegaprotocol/ui-toolkit';
 import type {
-  NodeCheckTimeUpdateSubscription,
-  NodeCheckQuery,
-} from '../../utils/__generated__/NodeCheck';
-import {
-  NodeCheckDocument,
-  NodeCheckTimeUpdateDocument,
-} from '../../utils/__generated__/NodeCheck';
+  BlockTimeSubscription,
+  StatisticsQuery,
+} from '../../utils/__generated__/Node';
+import { BlockTimeDocument } from '../../utils/__generated__/Node';
+import { StatisticsDocument } from '../../utils/__generated__/Node';
 import type { RowDataProps } from './row-data';
 import { POLL_INTERVAL } from './row-data';
 import { BLOCK_THRESHOLD, RowData } from './row-data';
@@ -21,9 +19,9 @@ jest.mock('@vegaprotocol/apollo-client', () => ({
  useHeaderStore: jest.fn().mockReturnValue({}),
 }));

-const statsQueryMock: MockedResponse<NodeCheckQuery> = {
+const statsQueryMock: MockedResponse<StatisticsQuery> = {
  request: {
-    query: NodeCheckDocument,
+    query: StatisticsDocument,
  },
  result: {
    data: {
@@ -36,9 +34,9 @@ const statsQueryMock: MockedResponse<NodeCheckQuery> = {
  },
 };

-const subMock: MockedResponse<NodeCheckTimeUpdateSubscription> = {
+const subMock: MockedResponse<BlockTimeSubscription> = {
  request: {
-    query: NodeCheckTimeUpdateDocument,
+    query: BlockTimeDocument,
  },
  result: {
    data: {
@@ -73,8 +71,8 @@ const mockHeaders = (

 const renderComponent = (
  props: RowDataProps,
-  queryMock: MockedResponse<NodeCheckQuery>,
-  subMock: MockedResponse<NodeCheckTimeUpdateSubscription>
+  queryMock: MockedResponse<StatisticsQuery>,
+  subMock: MockedResponse<BlockTimeSubscription>
 ) => {
  return (
    <MockedProvider mocks={[queryMock, subMock, subMock, subMock]}>
@@ -129,16 +127,16 @@ describe('RowData', () => {
  it('radio button still enabled if query fails', async () => {
    mockHeaders(props.url, {});

-    const failedQueryMock: MockedResponse<NodeCheckQuery> = {
+    const failedQueryMock: MockedResponse<StatisticsQuery> = {
      request: {
-        query: NodeCheckDocument,
+        query: StatisticsDocument,
      },
      error: new Error('failed'),
    };

-    const failedSubMock: MockedResponse<NodeCheckTimeUpdateSubscription> = {
+    const failedSubMock: MockedResponse<BlockTimeSubscription> = {
      request: {
-        query: NodeCheckTimeUpdateDocument,
+        query: BlockTimeDocument,
      },
      error: new Error('failed'),
    };
@@ -246,10 +244,10 @@ describe('RowData', () => {
    jest.useFakeTimers();
    const createStatsQueryMock = (
      blockHeight: string
-    ): MockedResponse<NodeCheckQuery> => {
+    ): MockedResponse<StatisticsQuery> => {
      return {
        request: {
-          query: NodeCheckDocument,
+          query: StatisticsDocument,
        },
        result: {
          data: {
@@ -263,10 +261,10 @@ describe('RowData', () => {
      };
    };

-    const createFailedStatsQueryMock = (): MockedResponse<NodeCheckQuery> => {
+    const createFailedStatsQueryMock = (): MockedResponse<StatisticsQuery> => {
      return {
        request: {
-          query: NodeCheckDocument,
+          query: StatisticsDocument,
        },
        result: {
          data: undefined,
@@ -6,9 +6,9 @@ import { Radio } from '@vegaprotocol/ui-toolkit';
 import { useEffect, useState } from 'react';
 import { CUSTOM_NODE_KEY } from '../../types';
 import {
-  useNodeCheckQuery,
-  useNodeCheckTimeUpdateSubscription,
-} from '../../utils/__generated__/NodeCheck';
+  useBlockTimeSubscription,
+  useStatisticsQuery,
+} from '../../utils/__generated__/Node';
 import { LayoutCell } from './layout-cell';

 export const POLL_INTERVAL = 1000;
@@ -30,14 +30,13 @@ export const RowData = ({
  const [subFailed, setSubFailed] = useState(false);
  const [time, setTime] = useState<number>();
  // no use of data here as we need the data nodes reference to block height
-  const { data, error, loading, startPolling, stopPolling } = useNodeCheckQuery(
-    {
+  const { data, error, loading, startPolling, stopPolling } =
+    useStatisticsQuery({
      pollInterval: POLL_INTERVAL,
      // fix for pollInterval
      // https://github.com/apollographql/apollo-client/issues/9819
      ssr: false,
-    }
-  );
+    });
  const headerStore = useHeaderStore();
  const headers = headerStore[url];

@@ -45,7 +44,7 @@ export const RowData = ({
    data: subData,
    error: subError,
    loading: subLoading,
-  } = useNodeCheckTimeUpdateSubscription();
+  } = useBlockTimeSubscription();

  useEffect(() => {
    const timeout = setTimeout(() => {
@@ -1,11 +1,11 @@
 import {
-  NodeCheckDocument,
-  NodeCheckTimeUpdateDocument,
-} from '../../utils/__generated__/NodeCheck';
+  StatisticsDocument,
+  BlockTimeDocument,
+} from '../../utils/__generated__/Node';
 import type {
-  NodeCheckQuery,
-  NodeCheckTimeUpdateSubscription,
-} from '../../utils/__generated__/NodeCheck';
+  StatisticsQuery,
+  BlockTimeSubscription,
+} from '../../utils/__generated__/Node';
 import { Networks } from '../../types';
 import type { RequestHandlerResponse } from 'mock-apollo-client';
 import { createMockClient } from 'mock-apollo-client';
@@ -21,7 +21,7 @@ type MockClientProps = {
  busEvents?: MockRequestConfig;
 };

-export const getMockBusEventsResult = (): NodeCheckTimeUpdateSubscription => ({
+export const getMockBusEventsResult = (): BlockTimeSubscription => ({
  busEvents: [
    {
      __typename: 'BusEvent',
@@ -32,21 +32,19 @@ export const getMockBusEventsResult = (): NodeCheckTimeUpdateSubscription => ({

 export const getMockStatisticsResult = (
  env: Networks = Networks.TESTNET
-): NodeCheckQuery => ({
+): StatisticsQuery => ({
  statistics: {
    __typename: 'Statistics',
    chainId: `${env.toLowerCase()}-0123`,
    blockHeight: '11',
-    vegaTime: new Date().toISOString(),
  },
 });

-export const getMockQueryResult = (env: Networks): NodeCheckQuery => ({
+export const getMockQueryResult = (env: Networks): StatisticsQuery => ({
  statistics: {
    __typename: 'Statistics',
    chainId: `${env.toLowerCase()}-0123`,
    blockHeight: '11',
-    vegaTime: new Date().toISOString(),
  },
 });

@@ -74,11 +72,11 @@ export default function ({
  const mockClient = createMockClient();

  mockClient.setRequestHandler(
-    NodeCheckDocument,
+    StatisticsDocument,
    getHandler(statistics, getMockStatisticsResult(network))
  );
  mockClient.setRequestHandler(
-    NodeCheckTimeUpdateDocument,
+    BlockTimeDocument,
    getHandler(busEvents, getMockBusEventsResult())
  );

@@ -5,13 +5,11 @@ import { useEffect } from 'react';
 import { create } from 'zustand';
 import { createClient } from '@vegaprotocol/apollo-client';
 import type {
-  NodeCheckTimeUpdateSubscription,
-  NodeCheckQuery,
-} from '../utils/__generated__/NodeCheck';
-import {
-  NodeCheckDocument,
-  NodeCheckTimeUpdateDocument,
-} from '../utils/__generated__/NodeCheck';
+  BlockTimeSubscription,
+  StatisticsQuery,
+} from '../utils/__generated__/Node';
+import { BlockTimeDocument } from '../utils/__generated__/Node';
+import { StatisticsDocument } from '../utils/__generated__/Node';
 import type { Environment } from '../types';
 import { Networks } from '../types';
 import { compileErrors } from '../utils/compile-errors';
@@ -222,8 +220,8 @@ const testNode = async (
 */
 const testQuery = async (client: Client) => {
  try {
-    const result = await client.query<NodeCheckQuery>({
-      query: NodeCheckDocument,
+    const result = await client.query<StatisticsQuery>({
+      query: StatisticsDocument,
    });
    if (!result || result.error) {
      return false;
@@ -242,8 +240,8 @@ const testQuery = async (client: Client) => {
 const testSubscription = (client: Client) => {
  return new Promise((resolve) => {
    const sub = client
-      .subscribe<NodeCheckTimeUpdateSubscription>({
-        query: NodeCheckTimeUpdateDocument,
+      .subscribe<BlockTimeSubscription>({
+        query: BlockTimeDocument,
        errorPolicy: 'all',
      })
      .subscribe({
@@ -2,8 +2,8 @@ import { renderHook, waitFor } from '@testing-library/react';
 import { useNodeHealth } from './use-node-health';
 import type { MockedResponse } from '@apollo/react-testing';
 import { MockedProvider } from '@apollo/react-testing';
-import type { NodeCheckQuery } from '../utils/__generated__/NodeCheck';
-import { NodeCheckDocument } from '../utils/__generated__/NodeCheck';
+import type { StatisticsQuery } from '../utils/__generated__/Node';
+import { StatisticsDocument } from '../utils/__generated__/Node';
 import { useHeaderStore } from '@vegaprotocol/apollo-client';
 import { Intent } from '@vegaprotocol/ui-toolkit';

@@ -16,10 +16,10 @@ jest.mock('@vegaprotocol/apollo-client');

 const createStatsMock = (
  blockHeight: number
-): MockedResponse<NodeCheckQuery> => {
+): MockedResponse<StatisticsQuery> => {
  return {
    request: {
-      query: NodeCheckDocument,
+      query: StatisticsDocument,
    },
    result: {
      data: {
@@ -34,7 +34,7 @@ const createStatsMock = (
 };

 function setup(
-  mock: MockedResponse<NodeCheckQuery>,
+  mock: MockedResponse<StatisticsQuery>,
  headers:
    | {
        blockHeight: number;
@@ -93,9 +93,9 @@ describe('useNodeHealth', () => {
  );

  it('block diff is null if query fails indicating non operational', async () => {
-    const failedQuery: MockedResponse<NodeCheckQuery> = {
+    const failedQuery: MockedResponse<StatisticsQuery> = {
      request: {
-        query: NodeCheckDocument,
+        query: StatisticsDocument,
      },
      result: {
        // @ts-ignore failed query with no result
@@ -1,5 +1,5 @@
 import { useEffect, useMemo } from 'react';
-import { useNodeCheckQuery } from '../utils/__generated__/NodeCheck';
+import { useStatisticsQuery } from '../utils/__generated__/Node';
 import { useHeaderStore } from '@vegaprotocol/apollo-client';
 import { useEnvironment } from './use-environment';
 import { useNavigatorOnline } from '@vegaprotocol/react-helpers';
@@ -16,7 +16,7 @@ export const useNodeHealth = () => {
  const url = useEnvironment((store) => store.VEGA_URL);
  const headerStore = useHeaderStore();
  const headers = url ? headerStore[url] : undefined;
-  const { data, error, startPolling, stopPolling } = useNodeCheckQuery({
+  const { data, error, startPolling, stopPolling } = useStatisticsQuery({
    fetchPolicy: 'no-cache',
  });

@@ -8,4 +8,4 @@ export * from './hooks';
 export * from './types';

 // Utils
-export * from './utils/__generated__/NodeCheck';
+export * from './utils/__generated__/Node';
@@ -1,4 +1,4 @@
-query NodeCheck {
+query Statistics {
  statistics {
    chainId
    blockHeight
@@ -6,7 +6,7 @@ query NodeCheck {
  }
 }

-subscription NodeCheckTimeUpdate {
+subscription BlockTime {
  busEvents(types: TimeUpdate, batchSize: 1) {
    id
  }
@@ -0,0 +1,81 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type StatisticsQueryVariables = Types.Exact<{ [key: string]: never; }>;
+
+
+export type StatisticsQuery = { __typename?: 'Query', statistics: { __typename?: 'Statistics', chainId: string, blockHeight: string, vegaTime: any } };
+
+export type BlockTimeSubscriptionVariables = Types.Exact<{ [key: string]: never; }>;
+
+
+export type BlockTimeSubscription = { __typename?: 'Subscription', busEvents?: Array<{ __typename?: 'BusEvent', id: string }> | null };
+
+
+export const StatisticsDocument = gql`
+    query Statistics {
+  statistics {
+    chainId
+    blockHeight
+    vegaTime
+  }
+}
+    `;
+
+/**
+ * __useStatisticsQuery__
+ *
+ * To run a query within a React component, call `useStatisticsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useStatisticsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useStatisticsQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useStatisticsQuery(baseOptions?: Apollo.QueryHookOptions<StatisticsQuery, StatisticsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<StatisticsQuery, StatisticsQueryVariables>(StatisticsDocument, options);
+      }
+export function useStatisticsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<StatisticsQuery, StatisticsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<StatisticsQuery, StatisticsQueryVariables>(StatisticsDocument, options);
+        }
+export type StatisticsQueryHookResult = ReturnType<typeof useStatisticsQuery>;
+export type StatisticsLazyQueryHookResult = ReturnType<typeof useStatisticsLazyQuery>;
+export type StatisticsQueryResult = Apollo.QueryResult<StatisticsQuery, StatisticsQueryVariables>;
+export const BlockTimeDocument = gql`
+    subscription BlockTime {
+  busEvents(types: TimeUpdate, batchSize: 1) {
+    id
+  }
+}
+    `;
+
+/**
+ * __useBlockTimeSubscription__
+ *
+ * To run a query within a React component, call `useBlockTimeSubscription` and pass it any options that fit your needs.
+ * When your component renders, `useBlockTimeSubscription` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the subscription, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useBlockTimeSubscription({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useBlockTimeSubscription(baseOptions?: Apollo.SubscriptionHookOptions<BlockTimeSubscription, BlockTimeSubscriptionVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useSubscription<BlockTimeSubscription, BlockTimeSubscriptionVariables>(BlockTimeDocument, options);
+      }
+export type BlockTimeSubscriptionHookResult = ReturnType<typeof useBlockTimeSubscription>;
+export type BlockTimeSubscriptionResult = Apollo.SubscriptionResult<BlockTimeSubscription>;
@@ -1,81 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type NodeCheckQueryVariables = Types.Exact<{ [key: string]: never; }>;
-
-
-export type NodeCheckQuery = { __typename?: 'Query', statistics: { __typename?: 'Statistics', chainId: string, blockHeight: string, vegaTime: any } };
-
-export type NodeCheckTimeUpdateSubscriptionVariables = Types.Exact<{ [key: string]: never; }>;
-
-
-export type NodeCheckTimeUpdateSubscription = { __typename?: 'Subscription', busEvents?: Array<{ __typename?: 'BusEvent', id: string }> | null };
-
-
-export const NodeCheckDocument = gql`
-    query NodeCheck {
-  statistics {
-    chainId
-    blockHeight
-    vegaTime
-  }
-}
-    `;
-
-/**
- * __useNodeCheckQuery__
- *
- * To run a query within a React component, call `useNodeCheckQuery` and pass it any options that fit your needs.
- * When your component renders, `useNodeCheckQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useNodeCheckQuery({
- *   variables: {
- *   },
- * });
- */
-export function useNodeCheckQuery(baseOptions?: Apollo.QueryHookOptions<NodeCheckQuery, NodeCheckQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<NodeCheckQuery, NodeCheckQueryVariables>(NodeCheckDocument, options);
-      }
-export function useNodeCheckLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<NodeCheckQuery, NodeCheckQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<NodeCheckQuery, NodeCheckQueryVariables>(NodeCheckDocument, options);
-        }
-export type NodeCheckQueryHookResult = ReturnType<typeof useNodeCheckQuery>;
-export type NodeCheckLazyQueryHookResult = ReturnType<typeof useNodeCheckLazyQuery>;
-export type NodeCheckQueryResult = Apollo.QueryResult<NodeCheckQuery, NodeCheckQueryVariables>;
-export const NodeCheckTimeUpdateDocument = gql`
-    subscription NodeCheckTimeUpdate {
-  busEvents(types: TimeUpdate, batchSize: 1) {
-    id
-  }
-}
-    `;
-
-/**
- * __useNodeCheckTimeUpdateSubscription__
- *
- * To run a query within a React component, call `useNodeCheckTimeUpdateSubscription` and pass it any options that fit your needs.
- * When your component renders, `useNodeCheckTimeUpdateSubscription` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the subscription, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useNodeCheckTimeUpdateSubscription({
- *   variables: {
- *   },
- * });
- */
-export function useNodeCheckTimeUpdateSubscription(baseOptions?: Apollo.SubscriptionHookOptions<NodeCheckTimeUpdateSubscription, NodeCheckTimeUpdateSubscriptionVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useSubscription<NodeCheckTimeUpdateSubscription, NodeCheckTimeUpdateSubscriptionVariables>(NodeCheckTimeUpdateDocument, options);
-      }
-export type NodeCheckTimeUpdateSubscriptionHookResult = ReturnType<typeof useNodeCheckTimeUpdateSubscription>;
-export type NodeCheckTimeUpdateSubscriptionResult = Apollo.SubscriptionResult<NodeCheckTimeUpdateSubscription>;
@@ -1,11 +1,11 @@
-import type { NodeCheckQuery } from './__generated__/NodeCheck';
+import type { StatisticsQuery } from './__generated__/Node';
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';

 export const statisticsQuery = (
-  override?: PartialDeep<NodeCheckQuery>
-): NodeCheckQuery => {
-  const defaultResult: NodeCheckQuery = {
+  override?: PartialDeep<StatisticsQuery>
+): StatisticsQuery => {
+  const defaultResult: StatisticsQuery = {
    statistics: {
      __typename: 'Statistics',
      chainId: 'chain-id',
@@ -1,6 +0,0 @@
-function ReactMarkdown({ children }) {
-  // eslint-disable-next-line react/jsx-no-useless-fragment
-  return <>{children}</>;
-}
-
-export default ReactMarkdown;
@@ -9,8 +9,8 @@ import {
  paginatedCombineDelta as combineDelta,
  paginatedCombineInsertionData as combineInsertionData,
 } from '@vegaprotocol/data-provider';
-import type { Market } from '@vegaprotocol/markets';
-import { marketsProvider } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';
+import { marketsProvider } from '@vegaprotocol/market-list';
 import { FillsDocument, FillsEventDocument } from './__generated__/Fills';
 import type {
  FillsQuery,
@@ -80,28 +80,10 @@ export const generateFill = (override?: PartialDeep<Trade>) => {
            dataSourceSpecForTradingTermination: {
              __typename: 'DataSourceSpec',
              id: 'oracleId',
-              data: {
-                __typename: 'DataSourceDefinition',
-                sourceType: {
-                  __typename: 'DataSourceDefinitionExternal',
-                  sourceType: {
-                    __typename: 'DataSourceSpecConfiguration',
-                  },
-                },
-              },
            },
            dataSourceSpecForSettlementData: {
              __typename: 'DataSourceSpec',
              id: 'oracleId',
-              data: {
-                __typename: 'DataSourceDefinition',
-                sourceType: {
-                  __typename: 'DataSourceDefinitionExternal',
-                  sourceType: {
-                    __typename: 'DataSourceSpecConfiguration',
-                  },
-                },
-              },
            },
            dataSourceSpecBinding: {
              __typename: 'DataSourceSpecToFutureBinding',
@@ -1,7 +1,7 @@
 import type { Asset } from '@vegaprotocol/assets';
 import { assetsProvider } from '@vegaprotocol/assets';
-import type { Market } from '@vegaprotocol/markets';
-import { marketsProvider } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';
+import { marketsProvider } from '@vegaprotocol/market-list';
 import { makeInfiniteScrollGetRows } from '@vegaprotocol/data-provider';
 import { updateGridData } from '@vegaprotocol/datagrid';
 import {
@@ -10,9 +10,9 @@ import type {
  MarketCandles,
  MarketMaybeWithDataAndCandles,
  MarketsCandlesQueryVariables,
-} from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-list';

-import { marketListProvider } from '@vegaprotocol/markets';
+import { marketListProvider } from '@vegaprotocol/market-list';

 import type { LiquidityProvisionMarketsQuery } from './__generated__/MarketsLiquidity';
 import { LiquidityProvisionMarketsDocument } from './__generated__/MarketsLiquidity';
@@ -1,6 +0,0 @@
-function ReactMarkdown({ children }) {
-  // eslint-disable-next-line react/jsx-no-useless-fragment
-  return <>{children}</>;
-}
-
-export default ReactMarkdown;
@@ -7,8 +7,8 @@ import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { marketDepthProvider } from './market-depth-provider';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
-import type { MarketData } from '@vegaprotocol/markets';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
+import type { MarketData } from '@vegaprotocol/market-list';
 import type {
  MarketDepthQuery,
  MarketDepthUpdateSubscription,
@@ -3,7 +3,7 @@ import uniqBy from 'lodash/uniqBy';
 import reverse from 'lodash/reverse';
 import cloneDeep from 'lodash/cloneDeep';
 import * as Schema from '@vegaprotocol/types';
-import type { MarketData } from '@vegaprotocol/markets';
+import type { MarketData } from '@vegaprotocol/market-list';
 import type { PriceLevelFieldsFragment } from './__generated__/MarketDepth';

 export enum VolumeType {
@@ -3,8 +3,8 @@ import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Orderbook } from './orderbook';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { marketDepthProvider } from './market-depth-provider';
-import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
-import type { MarketData } from '@vegaprotocol/markets';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
+import type { MarketData } from '@vegaprotocol/market-list';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import type {
  MarketDepthUpdateSubscription,
@@ -0,0 +1,7 @@
+# market-info
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test market-info` to execute the unit tests via [Jest](https://jestjs.io).
@@ -1,11 +1,11 @@
 /* eslint-disable */
 export default {
-  displayName: 'markets',
+  displayName: 'market-info',
  preset: '../../jest.preset.js',
  transform: {
    '^.+\\.[tj]sx?$': 'babel-jest',
  },
  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../coverage/libs/markets',
+  coverageDirectory: '../../coverage/libs/market-info',
  setupFilesAfterEnv: ['./src/setup-tests.ts'],
 };
@@ -0,0 +1,4 @@
+{
+  "name": "@vegaprotocol/market-info",
+  "version": "0.0.1"
+}
@@ -1,6 +1,6 @@
 {
  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "libs/markets/src",
+  "sourceRoot": "libs/market-info/src",
  "projectType": "library",
  "tags": [],
  "targets": {
@@ -8,16 +8,16 @@
      "executor": "@nrwl/web:rollup",
      "outputs": ["{options.outputPath}"],
      "options": {
-        "outputPath": "dist/libs/markets",
-        "tsConfig": "libs/markets/tsconfig.lib.json",
-        "project": "libs/markets/package.json",
-        "entryFile": "libs/markets/src/index.ts",
+        "outputPath": "dist/libs/market-info",
+        "tsConfig": "libs/market-info/tsconfig.lib.json",
+        "project": "libs/market-info/package.json",
+        "entryFile": "libs/market-info/src/index.ts",
        "external": ["react/jsx-runtime"],
        "rollupConfig": "@nrwl/react/plugins/bundle-rollup",
        "compiler": "babel",
        "assets": [
          {
-            "glob": "libs/markets/README.md",
+            "glob": "libs/market-info/README.md",
            "input": ".",
            "output": "."
          }
@@ -28,14 +28,14 @@
      "executor": "@nrwl/linter:eslint",
      "outputs": ["{options.outputFile}"],
      "options": {
-        "lintFilePatterns": ["libs/markets/**/*.{ts,tsx,js,jsx}"]
+        "lintFilePatterns": ["libs/market-info/**/*.{ts,tsx,js,jsx}"]
      }
    },
    "test": {
      "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/libs/markets"],
+      "outputs": ["coverage/libs/market-info"],
      "options": {
-        "jestConfig": "libs/markets/jest.config.ts",
+        "jestConfig": "libs/market-info/jest.config.ts",
        "passWithNoTests": true
      }
    },
@@ -45,7 +45,7 @@
        "uiFramework": "@storybook/react",
        "port": 4400,
        "config": {
-          "configFolder": "libs/markets/.storybook"
+          "configFolder": "libs/market-info/.storybook"
        }
      },
      "configurations": {
@@ -59,9 +59,9 @@
      "outputs": ["{options.outputPath}"],
      "options": {
        "uiFramework": "@storybook/react",
-        "outputPath": "dist/storybook/markets",
+        "outputPath": "dist/storybook/market-info",
        "config": {
-          "configFolder": "libs/markets/.storybook"
+          "configFolder": "libs/market-info/.storybook"
        }
      },
      "configurations": {
@@ -74,7 +74,7 @@
      "executor": "@nrwl/workspace:run-commands",
      "outputs": [],
      "options": {
-        "command": "yarn tsc --project ./libs/markets/tsconfig.spec.json"
+        "command": "yarn tsc --project ./libs/market-info/tsconfig.spec.json"
      }
    }
  }
@@ -0,0 +1 @@
+export * from './OracleSpecDataConnection';
@@ -1,4 +1,4 @@
-import { totalFeesPercentage } from '../../market-utils';
+import { totalFeesPercentage } from '@vegaprotocol/market-list';
 import type { TradeFee, FeeFactors } from '@vegaprotocol/types';
 import {
  addDecimalsFormatNumber,
@@ -1,8 +1,7 @@
-export * from './fees-breakdown';
+export * from './market-info';
 export * from './last-24h-price-change';
 export * from './last-24h-volume';
-export * from './market-info';
-export * from './markets-container';
-export * from './oracle-banner';
+export * from './fees-breakdown';
 export * from './oracle-basic-profile';
 export * from './oracle-full-profile';
+export * from './oracle-banner';
@@ -6,7 +6,7 @@ import { useThrottledDataProvider } from '@vegaprotocol/data-provider';
 import { PriceChangeCell } from '@vegaprotocol/datagrid';
 import * as Schema from '@vegaprotocol/types';
 import type { CandleClose } from '@vegaprotocol/types';
-import { marketCandlesProvider } from '../../market-candles-provider';
+import { marketCandlesProvider } from '@vegaprotocol/market-list';

 interface Props {
  marketId?: string;
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`export * from './OracleSpecDataConnection';`