feat: add check for operation name in apollo client error link

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/workflows/add-ipfs-notes-to-release.yml

@@ -0,0 +1,74 @@
+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 }}/

.github/workflows/publish-dist.yml

@@ -170,12 +170,6 @@ 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: |

.github/workflows/rollback-console.yml

@@ -0,0 +1,77 @@
+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}

apps/explorer/src/app/components/markets/market-details.tsx

@@ -1,8 +1,8 @@
 import { t } from '@vegaprotocol/i18n';
-import type { MarketInfoWithData } from '@vegaprotocol/market-info';
-import { LiquidityInfoPanel } from '@vegaprotocol/market-info';
-import { LiquidityMonitoringParametersInfoPanel } from '@vegaprotocol/market-info';
+import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import {
+  LiquidityInfoPanel,
+  LiquidityMonitoringParametersInfoPanel,
   InstrumentInfoPanel,
   KeyDetailsInfoPanel,
   LiquidityPriceRangeInfoPanel,
@@ -12,8 +12,8 @@ import {
   RiskModelInfoPanel,
   RiskParametersInfoPanel,
   SettlementAssetInfoPanel,
-} from '@vegaprotocol/market-info';
-import { MarketInfoTable } from '@vegaprotocol/market-info';
+} from '@vegaprotocol/markets';
+import { MarketInfoTable } from '@vegaprotocol/markets';
 import type { DataSourceDefinition } from '@vegaprotocol/types';
 import isEqual from 'lodash/isEqual';
 

apps/explorer/src/app/components/markets/markets-table.tsx

@@ -1,4 +1,4 @@
-import type { MarketFieldsFragment } from '@vegaprotocol/market-list';
+import type { MarketFieldsFragment } from '@vegaprotocol/markets';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';

apps/explorer/src/app/routes/markets/market-page.tsx

@@ -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/market-info';
+import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
 import { PageTitle } from '../../components/page-helpers/page-title';
 
 export const MarketPage = () => {

apps/explorer/src/app/routes/markets/markets-page.tsx

@@ -1,6 +1,6 @@
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
-import { marketsProvider } from '@vegaprotocol/market-list';
+import { marketsProvider } from '@vegaprotocol/markets';
 import { RouteTitle } from '../../components/route-title';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';

apps/governance/src/app.tsx

@@ -16,6 +16,7 @@ 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,
@@ -43,7 +44,7 @@ import {
 } from '@vegaprotocol/environment';
 import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
-import { WithdrawalDialog } from '@vegaprotocol/withdraws';
+import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
 import { ToastsManager } from './toasts-manager';
 import {
@@ -158,7 +159,8 @@ const Web3Container = ({
                   <InitializeHandlers />
                   <VegaWalletDialogs />
                   <TransactionModal />
-                  <WithdrawalDialog />
+                  <CreateWithdrawalDialog />
+                  <WithdrawalApprovalDialogContainer />
                   <TelemetryDialog />
                 </>
               </BalanceManager>

apps/liquidity-provision-dashboard/src/app/components/detail/last-24h-volume/last-24h-volume.tsx

@@ -10,8 +10,8 @@ import {
   displayChange,
 } from '@vegaprotocol/liquidity';
 
-import type { Candle } from '@vegaprotocol/market-list';
-import { marketCandlesProvider } from '@vegaprotocol/market-list';
+import type { Candle } from '@vegaprotocol/markets';
+import { marketCandlesProvider } from '@vegaprotocol/markets';
 
 const THROTTLE_UPDATE_TIME = 500;
 

apps/trading-e2e/src/support/trading.ts

@@ -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/market-info';
+import type { Provider, Status } from '@vegaprotocol/markets';
 import {
   accountsQuery,
   assetQuery,
@@ -32,7 +32,7 @@ import {
   blockStatisticsQuery,
 } from '@vegaprotocol/mock';
 import type { PartialDeep } from 'type-fest';
-import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/market-list';
+import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/markets';
 
 type MarketPageMockData = {
   state: Schema.MarketState;

apps/trading/client-pages/home/home.tsx

@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { marketsWithDataProvider } from '@vegaprotocol/market-list';
+import { marketsWithDataProvider } from '@vegaprotocol/markets';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Links, Routes } from '../../pages/client-router';

apps/trading/client-pages/liquidity/liquidity.tsx

@@ -5,7 +5,7 @@ import {
   lpAggregatedDataProvider,
   useCheckLiquidityStatus,
 } from '@vegaprotocol/liquidity';
-import { tooltipMapping } from '@vegaprotocol/market-info';
+import { tooltipMapping } from '@vegaprotocol/markets';
 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/market-list';
+import { useMarket, useStaticMarketData } from '@vegaprotocol/markets';
 import { DocsLinks } from '@vegaprotocol/environment';
 
 const enum LiquidityTabs {

apps/trading/client-pages/market/header-stats.tsx

@@ -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/market-list';
+import type { Market } from '@vegaprotocol/markets';
 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/market-info';
+import { Last24hPriceChange, Last24hVolume } from '@vegaprotocol/markets';
 import { MarketState } from '../../components/market-state';
 import { HeaderStatMarketTradingMode } from '../../components/market-trading-mode';
 import { MarketLiquiditySupplied } from '../../components/liquidity-supplied';

apps/trading/client-pages/market/market-selector-item.spec.tsx

@@ -8,8 +8,8 @@ import { MockedProvider } from '@apollo/client/testing';
 import type {
   MarketDataUpdateFieldsFragment,
   MarketDataUpdateSubscription,
-} from '@vegaprotocol/market-list';
-import { MarketDataUpdateDocument } from '@vegaprotocol/market-list';
+} from '@vegaprotocol/markets';
+import { MarketDataUpdateDocument } from '@vegaprotocol/markets';
 import {
   AuctionTrigger,
   MarketState,

apps/trading/client-pages/market/market-selector-item.tsx

@@ -6,8 +6,8 @@ import {
   formatNumber,
   priceChangePercentage,
 } from '@vegaprotocol/utils';
-import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/market-list';
-import { useMarketDataUpdateSubscription } from '@vegaprotocol/market-list';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
+import { useMarketDataUpdateSubscription } from '@vegaprotocol/markets';
 import { Sparkline } from '@vegaprotocol/ui-toolkit';
 
 export const MarketSelectorItem = ({

apps/trading/client-pages/market/market-selector.spec.tsx

@@ -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/market-list';
+import { useMarketList } from '@vegaprotocol/markets';
 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/market-list');
+jest.mock('@vegaprotocol/markets');
 const mockUseMarketList = useMarketList as jest.Mock;
 
 // mock market list items to avoid subscriptions starting

apps/trading/client-pages/market/market-selector.tsx

@@ -1,6 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import uniqBy from 'lodash/uniqBy';
-import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/market-list';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
 import {
   Input,
   TinyScroll,

apps/trading/client-pages/market/market.tsx

@@ -7,7 +7,7 @@ import {
   useThrottledDataProvider,
 } from '@vegaprotocol/data-provider';
 import { AsyncRenderer, ExternalLink, Splash } from '@vegaprotocol/ui-toolkit';
-import { marketProvider, marketDataProvider } from '@vegaprotocol/market-list';
+import { marketProvider, marketDataProvider } from '@vegaprotocol/markets';
 import { useGlobalStore, usePageTitleStore } from '../../stores';
 import { TradeGrid } from './trade-grid';
 import { TradePanels } from './trade-panels';

apps/trading/client-pages/market/trade-grid.tsx

@@ -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/market-info';
-import type { Market } from '@vegaprotocol/market-list';
+import { OracleBanner } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/markets';
 import { Filter } from '@vegaprotocol/orders';
 import {
   usePaneLayout,

apps/trading/client-pages/market/trade-panels.tsx

@@ -1,6 +1,6 @@
 import type { PinnedAsset } from '@vegaprotocol/accounts';
-import type { Market } from '@vegaprotocol/market-list';
-import { OracleBanner } from '@vegaprotocol/market-info';
+import type { Market } from '@vegaprotocol/markets';
+import { OracleBanner } from '@vegaprotocol/markets';
 import {
   useMarketClickHandler,
   useMarketLiquidityClickHandler,

apps/trading/client-pages/market/trade-views.tsx

@@ -1,5 +1,5 @@
 import { DealTicketContainer } from '@vegaprotocol/deal-ticket';
-import { MarketInfoAccordionContainer } from '@vegaprotocol/market-info';
+import { MarketInfoAccordionContainer } from '@vegaprotocol/markets';
 import { OrderbookContainer } from '@vegaprotocol/market-depth';
 import { OrderListContainer, Filter } from '@vegaprotocol/orders';
 import type { OrderListContainerProps } from '@vegaprotocol/orders';

apps/trading/client-pages/market/use-market-selector-list.spec.tsx

@@ -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/market-list';
+import { useMarketList } from '@vegaprotocol/markets';
 import type { Filter } from './market-selector';
 import { subDays } from 'date-fns';
 
-jest.mock('@vegaprotocol/market-list');
+jest.mock('@vegaprotocol/markets');
 const mockUseMarketList = useMarketList as jest.Mock;
 
 describe('useMarketSelectorList', () => {

apps/trading/client-pages/market/use-market-selector-list.ts

@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import orderBy from 'lodash/orderBy';
 import { MarketState } from '@vegaprotocol/types';
-import { useMarketList } from '@vegaprotocol/market-list';
+import { useMarketList } from '@vegaprotocol/markets';
 import { priceChangePercentage } from '@vegaprotocol/utils';
 import type { Filter } from './market-selector';
 import { Sort } from './sort-dropdown';

apps/trading/client-pages/markets/closed.spec.tsx

@@ -6,8 +6,16 @@ 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 } from '@vegaprotocol/market-info';
-import { OracleSpecDataConnectionDocument } from '@vegaprotocol/market-info';
+import type {
+  OracleSpecDataConnectionQuery,
+  MarketsDataQuery,
+  MarketsQuery,
+} from '@vegaprotocol/markets';
+import {
+  OracleSpecDataConnectionDocument,
+  MarketsDataDocument,
+  MarketsDocument,
+} from '@vegaprotocol/markets';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import type {
@@ -16,9 +24,6 @@ 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,

apps/trading/client-pages/markets/closed.tsx

@@ -13,11 +13,11 @@ import {
   getMarketExpiryDate,
 } from '@vegaprotocol/utils';
 import { usePositionsQuery } from '@vegaprotocol/positions';
-import type { MarketMaybeWithData } from '@vegaprotocol/market-list';
+import type { MarketMaybeWithData } from '@vegaprotocol/markets';
 import {
   MarketTableActions,
   closedMarketsWithDataProvider,
-} from '@vegaprotocol/market-list';
+} from '@vegaprotocol/markets';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import type { ColDef } from 'ag-grid-community';

apps/trading/client-pages/markets/markets.tsx

@@ -1,4 +1,4 @@
-import { MarketsContainer } from '@vegaprotocol/market-list';
+import { MarketsContainer } from '@vegaprotocol/markets';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
 export const Markets = () => {

apps/trading/client-pages/markets/settlement-price-cell.spec.tsx

@@ -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/market-info';
-import { OracleSpecDataConnectionDocument } from '@vegaprotocol/market-info';
+import type { OracleSpecDataConnectionQuery } from '@vegaprotocol/markets';
+import { OracleSpecDataConnectionDocument } from '@vegaprotocol/markets';
 import type { SettlementPriceCellProps } from './settlement-price-cell';
 import { SettlementPriceCell } from './settlement-price-cell';
 

apps/trading/client-pages/markets/settlement-price-cell.tsx

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

apps/trading/client-pages/portfolio/account-history-container.tsx

@@ -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/market-list';
+import type { Market } from '@vegaprotocol/markets';
 
 const DateRange = {
   RANGE_1D: '1D',

apps/trading/client-pages/settings/settings.tsx

@@ -5,6 +5,7 @@ import {
   RoundedWrapper,
   Switch,
   ThemeSwitcher,
+  ToastPositionSetter,
 } from '@vegaprotocol/ui-toolkit';
 import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 
@@ -41,6 +42,8 @@ export const Settings = () => {
                 'Help identify bugs and improve the service by sharing anonymous usage data.'
               )}
             />
+            <Divider />
+            <ToastPositionSetter />
           </RoundedWrapper>
         </div>
       </div>

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

@@ -4,8 +4,8 @@ import {
   useNetworkParams,
 } from '@vegaprotocol/network-parameters';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import type { MarketData } from '@vegaprotocol/market-list';
-import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
+import type { MarketData } from '@vegaprotocol/markets';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
 import { HeaderStat } from '../header';
 import {
   ExternalLink,

apps/trading/components/market-mark-price/market-mark-price.tsx

@@ -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/market-list';
+import { marketDataProvider } from '@vegaprotocol/markets';
 import { THROTTLE_UPDATE_TIME } from '../constants';
 
 interface Props {

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

@@ -1,6 +1,6 @@
 import throttle from 'lodash/throttle';
-import type { MarketData, Market } from '@vegaprotocol/market-list';
-import { marketDataProvider } from '@vegaprotocol/market-list';
+import type { MarketData, Market } from '@vegaprotocol/markets';
+import { marketDataProvider } from '@vegaprotocol/markets';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import * as Schema from '@vegaprotocol/types';

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

@@ -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/market-list';
+import { useStaticMarketData } from '@vegaprotocol/markets';
 
 const getTradingModeLabel = (
   marketTradingMode?: Schema.MarketTradingMode,

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

@@ -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/market-list';
-import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
+import type { MarketData } from '@vegaprotocol/markets';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
 import { HeaderStat } from '../header';
 import * as constants from '../constants';
 

apps/trading/components/select-market/select-market-columns.tsx

@@ -1,20 +1,21 @@
 import type { RefObject, MouseEvent } from 'react';
-import { FeesCell } from '@vegaprotocol/market-info';
 import {
+  FeesCell,
   calcCandleHigh,
   calcCandleLow,
   calcCandleVolume,
-} from '@vegaprotocol/market-list';
+  Last24hPriceChange,
+  Last24hVolume,
+} from '@vegaprotocol/markets';
 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/market-list';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
 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';
 

apps/trading/components/welcome-dialog/welcome-dialog.tsx

@@ -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/market-list';
+import { activeMarketsProvider } from '@vegaprotocol/markets';
 import * as constants from '../constants';
 import { RiskNoticeDialog } from './risk-notice-dialog';
 import { WelcomeNoticeDialog } from './welcome-notice-dialog';

apps/trading/components/welcome-dialog/welcome-landing-dialog.spec.tsx

@@ -6,7 +6,7 @@ import type {
   MarketMaybeWithCandles,
   MarketMaybeWithData,
   MarketData,
-} from '@vegaprotocol/market-list';
+} from '@vegaprotocol/markets';
 import { SelectMarketLandingTable } from './welcome-landing-dialog';
 const mockMarketClickHandler = jest.fn();
 jest.mock('../../lib/hooks/use-market-click-handler', () => ({
@@ -43,10 +43,28 @@ 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',
@@ -129,10 +147,28 @@ 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',

apps/trading/components/welcome-dialog/welcome-landing-dialog.tsx

@@ -1,10 +1,10 @@
 import React, { useCallback } from 'react';
-import { useMarketList } from '@vegaprotocol/market-list';
+import { useMarketList } from '@vegaprotocol/markets';
 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/market-list';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
 import {
   ColumnKind,
   columns,

apps/trading/pages/dialogs-container.tsx

@@ -6,7 +6,10 @@ import { VegaConnectDialog } from '@vegaprotocol/wallet';
 import { Connectors } from '../lib/vega-connectors';
 import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
 import { DepositDialog } from '@vegaprotocol/deposits';
-import { Web3ConnectUncontrolledDialog } from '@vegaprotocol/web3';
+import {
+  Web3ConnectUncontrolledDialog,
+  WithdrawalApprovalDialogContainer,
+} from '@vegaprotocol/web3';
 import { WelcomeDialog } from '../components/welcome-dialog';
 import { TransferDialog } from '@vegaprotocol/accounts';
 
@@ -27,6 +30,7 @@ const DialogsContainer = () => {
       <Web3ConnectUncontrolledDialog />
       <CreateWithdrawalDialog />
       <TransferDialog />
+      <WithdrawalApprovalDialogContainer />
     </>
   );
 };

libs/accounts/__mocks__/react-markdown.js

@@ -0,0 +1,6 @@
+function ReactMarkdown({ children }) {
+  // eslint-disable-next-line react/jsx-no-useless-fragment
+  return <>{children}</>;
+}
+
+export default ReactMarkdown;

libs/accounts/src/lib/accounts-data-provider.ts

@@ -1,5 +1,5 @@
 import { assetsProvider } from '@vegaprotocol/assets';
-import { marketsProvider } from '@vegaprotocol/market-list';
+import { marketsProvider } from '@vegaprotocol/markets';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import {
   makeDataProvider,
@@ -20,7 +20,7 @@ import type {
   AccountEventsSubscription,
   AccountsQueryVariables,
 } from './__generated__/Accounts';
-import type { Market } from '@vegaprotocol/market-list';
+import type { Market } from '@vegaprotocol/markets';
 import type { Asset } from '@vegaprotocol/assets';
 
 const AccountType = Schema.AccountType;

libs/apollo-client/src/lib/apollo-client.ts

@@ -115,7 +115,19 @@ export function createClient({
       )
     : httpLink;
 
-  const errorLink = onError(({ graphQLErrors, networkError }) => {
+  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;
+    }
+
     if (graphQLErrors) {
       graphQLErrors.forEach((e) => {
         if (e.extensions && e.extensions['type'] !== NOT_FOUND) {

libs/cypress/mock.ts

@@ -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 '../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 '../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 '../orders/src/lib/components/order-data-provider/orders.mock';
 export * from '../positions/src/lib/positions.mock';
 export * from '../network-parameters/src/network-params.mock';

libs/deal-ticket/src/components/deal-ticket/deal-ticket-amount.tsx

@@ -1,5 +1,5 @@
 import type { Control } from 'react-hook-form';
-import type { Market, MarketData } from '@vegaprotocol/market-list';
+import type { Market, MarketData } from '@vegaprotocol/markets';
 import { DealTicketMarketAmount } from './deal-ticket-market-amount';
 import { DealTicketLimitAmount } from './deal-ticket-limit-amount';
 import * as Schema from '@vegaprotocol/types';

libs/deal-ticket/src/components/deal-ticket/deal-ticket-container.tsx

@@ -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/market-list';
+import { useMarket, marketDataProvider } from '@vegaprotocol/markets';
 import { DealTicket } from './deal-ticket';
 
 export interface DealTicketContainerProps {

libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx

@@ -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/market-list';
+import type { Market, MarketData } from '@vegaprotocol/markets';
 import { MarginWarning } from '../deal-ticket-validation/margin-warning';
 import {
   useMarketAccountBalance,

libs/deal-ticket/src/components/deal-ticket/time-in-force-selector.tsx

@@ -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/market-list';
+import type { Market, StaticMarketData } from '@vegaprotocol/markets';
 
 interface TimeInForceSelectorProps {
   value: Schema.OrderTimeInForce;

libs/deal-ticket/src/components/deal-ticket/type-selector.tsx

@@ -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/market-list';
+import type { Market, MarketData } from '@vegaprotocol/markets';
 import { compileGridData } from '../trading-mode-tooltip';
 import { MarketModeValidationType } from '../../constants';
 

libs/deal-ticket/src/components/trading-mode-tooltip/compile-grid-data.tsx

@@ -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/market-list';
+import type { Market, MarketData } from '@vegaprotocol/markets';
 
 export const compileGridData = (
   market: Pick<

libs/deal-ticket/src/components/trading-mode-tooltip/trading-mode-tooltip.tsx

@@ -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/market-list';
+import { useMarket, useStaticMarketData } from '@vegaprotocol/markets';
 
 type TradingModeTooltipProps = {
   marketId?: string;

libs/deal-ticket/src/hooks/use-fee-deal-ticket-details.tsx

@@ -1,8 +1,8 @@
-import { FeesBreakdown } from '@vegaprotocol/market-info';
+import { FeesBreakdown } from '@vegaprotocol/markets';
 import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import type { Market } from '@vegaprotocol/market-list';
+import type { Market } from '@vegaprotocol/markets';
 import type { EstimatePositionQuery } from '@vegaprotocol/positions';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import {

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

@@ -1,4 +1,4 @@
-import type { Market, MarketData } from '@vegaprotocol/market-list';
+import type { Market, MarketData } from '@vegaprotocol/markets';
 import * as Schema from '@vegaprotocol/types';
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';
@@ -37,10 +37,28 @@ 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',

libs/deal-ticket/src/utils/get-price.ts

@@ -1,6 +1,6 @@
 import * as Schema from '@vegaprotocol/types';
 import { isMarketInAuction } from './is-market-in-auction';
-import type { MarketData } from '@vegaprotocol/market-list';
+import type { MarketData } from '@vegaprotocol/markets';
 
 /**
  * Get the market price based on market mode (auction or not auction)

libs/deposits/__mocks__/react-markdown.js

@@ -0,0 +1,6 @@
+function ReactMarkdown({ children }) {
+  // eslint-disable-next-line react/jsx-no-useless-fragment
+  return <>{children}</>;
+}
+
+export default ReactMarkdown;

libs/environment/src/components/node-switcher/row-data.spec.tsx

@@ -3,11 +3,13 @@ import { MockedProvider } from '@apollo/react-testing';
 import { act, render, screen, waitFor } from '@testing-library/react';
 import { RadioGroup } from '@vegaprotocol/ui-toolkit';
 import type {
-  BlockTimeSubscription,
-  StatisticsQuery,
-} from '../../utils/__generated__/Node';
-import { BlockTimeDocument } from '../../utils/__generated__/Node';
-import { StatisticsDocument } from '../../utils/__generated__/Node';
+  NodeCheckTimeUpdateSubscription,
+  NodeCheckQuery,
+} from '../../utils/__generated__/NodeCheck';
+import {
+  NodeCheckDocument,
+  NodeCheckTimeUpdateDocument,
+} from '../../utils/__generated__/NodeCheck';
 import type { RowDataProps } from './row-data';
 import { POLL_INTERVAL } from './row-data';
 import { BLOCK_THRESHOLD, RowData } from './row-data';
@@ -19,9 +21,9 @@ jest.mock('@vegaprotocol/apollo-client', () => ({
   useHeaderStore: jest.fn().mockReturnValue({}),
 }));
 
-const statsQueryMock: MockedResponse<StatisticsQuery> = {
+const statsQueryMock: MockedResponse<NodeCheckQuery> = {
   request: {
-    query: StatisticsDocument,
+    query: NodeCheckDocument,
   },
   result: {
     data: {
@@ -34,9 +36,9 @@ const statsQueryMock: MockedResponse<StatisticsQuery> = {
   },
 };
 
-const subMock: MockedResponse<BlockTimeSubscription> = {
+const subMock: MockedResponse<NodeCheckTimeUpdateSubscription> = {
   request: {
-    query: BlockTimeDocument,
+    query: NodeCheckTimeUpdateDocument,
   },
   result: {
     data: {
@@ -71,8 +73,8 @@ const mockHeaders = (
 
 const renderComponent = (
   props: RowDataProps,
-  queryMock: MockedResponse<StatisticsQuery>,
-  subMock: MockedResponse<BlockTimeSubscription>
+  queryMock: MockedResponse<NodeCheckQuery>,
+  subMock: MockedResponse<NodeCheckTimeUpdateSubscription>
 ) => {
   return (
     <MockedProvider mocks={[queryMock, subMock, subMock, subMock]}>
@@ -127,16 +129,16 @@ describe('RowData', () => {
   it('radio button still enabled if query fails', async () => {
     mockHeaders(props.url, {});
 
-    const failedQueryMock: MockedResponse<StatisticsQuery> = {
+    const failedQueryMock: MockedResponse<NodeCheckQuery> = {
       request: {
-        query: StatisticsDocument,
+        query: NodeCheckDocument,
       },
       error: new Error('failed'),
     };
 
-    const failedSubMock: MockedResponse<BlockTimeSubscription> = {
+    const failedSubMock: MockedResponse<NodeCheckTimeUpdateSubscription> = {
       request: {
-        query: BlockTimeDocument,
+        query: NodeCheckTimeUpdateDocument,
       },
       error: new Error('failed'),
     };
@@ -244,10 +246,10 @@ describe('RowData', () => {
     jest.useFakeTimers();
     const createStatsQueryMock = (
       blockHeight: string
-    ): MockedResponse<StatisticsQuery> => {
+    ): MockedResponse<NodeCheckQuery> => {
       return {
         request: {
-          query: StatisticsDocument,
+          query: NodeCheckDocument,
         },
         result: {
           data: {
@@ -261,10 +263,10 @@ describe('RowData', () => {
       };
     };
 
-    const createFailedStatsQueryMock = (): MockedResponse<StatisticsQuery> => {
+    const createFailedStatsQueryMock = (): MockedResponse<NodeCheckQuery> => {
       return {
         request: {
-          query: StatisticsDocument,
+          query: NodeCheckDocument,
         },
         result: {
           data: undefined,

libs/environment/src/components/node-switcher/row-data.tsx

@@ -6,9 +6,9 @@ import { Radio } from '@vegaprotocol/ui-toolkit';
 import { useEffect, useState } from 'react';
 import { CUSTOM_NODE_KEY } from '../../types';
 import {
-  useBlockTimeSubscription,
-  useStatisticsQuery,
-} from '../../utils/__generated__/Node';
+  useNodeCheckQuery,
+  useNodeCheckTimeUpdateSubscription,
+} from '../../utils/__generated__/NodeCheck';
 import { LayoutCell } from './layout-cell';
 
 export const POLL_INTERVAL = 1000;
@@ -30,13 +30,14 @@ 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 } =
-    useStatisticsQuery({
+  const { data, error, loading, startPolling, stopPolling } = useNodeCheckQuery(
+    {
       pollInterval: POLL_INTERVAL,
       // fix for pollInterval
       // https://github.com/apollographql/apollo-client/issues/9819
       ssr: false,
-    });
+    }
+  );
   const headerStore = useHeaderStore();
   const headers = headerStore[url];
 
@@ -44,7 +45,7 @@ export const RowData = ({
     data: subData,
     error: subError,
     loading: subLoading,
-  } = useBlockTimeSubscription();
+  } = useNodeCheckTimeUpdateSubscription();
 
   useEffect(() => {
     const timeout = setTimeout(() => {

libs/environment/src/hooks/mocks/apollo-client.tsx

@@ -1,11 +1,11 @@
 import {
-  StatisticsDocument,
-  BlockTimeDocument,
-} from '../../utils/__generated__/Node';
+  NodeCheckDocument,
+  NodeCheckTimeUpdateDocument,
+} from '../../utils/__generated__/NodeCheck';
 import type {
-  StatisticsQuery,
-  BlockTimeSubscription,
-} from '../../utils/__generated__/Node';
+  NodeCheckQuery,
+  NodeCheckTimeUpdateSubscription,
+} from '../../utils/__generated__/NodeCheck';
 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 = (): BlockTimeSubscription => ({
+export const getMockBusEventsResult = (): NodeCheckTimeUpdateSubscription => ({
   busEvents: [
     {
       __typename: 'BusEvent',
@@ -32,19 +32,21 @@ export const getMockBusEventsResult = (): BlockTimeSubscription => ({
 
 export const getMockStatisticsResult = (
   env: Networks = Networks.TESTNET
-): StatisticsQuery => ({
+): NodeCheckQuery => ({
   statistics: {
     __typename: 'Statistics',
     chainId: `${env.toLowerCase()}-0123`,
     blockHeight: '11',
+    vegaTime: new Date().toISOString(),
   },
 });
 
-export const getMockQueryResult = (env: Networks): StatisticsQuery => ({
+export const getMockQueryResult = (env: Networks): NodeCheckQuery => ({
   statistics: {
     __typename: 'Statistics',
     chainId: `${env.toLowerCase()}-0123`,
     blockHeight: '11',
+    vegaTime: new Date().toISOString(),
   },
 });
 
@@ -72,11 +74,11 @@ export default function ({
   const mockClient = createMockClient();
 
   mockClient.setRequestHandler(
-    StatisticsDocument,
+    NodeCheckDocument,
     getHandler(statistics, getMockStatisticsResult(network))
   );
   mockClient.setRequestHandler(
-    BlockTimeDocument,
+    NodeCheckTimeUpdateDocument,
     getHandler(busEvents, getMockBusEventsResult())
   );
 

libs/environment/src/hooks/use-environment.ts

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

libs/environment/src/hooks/use-node-health.spec.tsx

@@ -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 { StatisticsQuery } from '../utils/__generated__/Node';
-import { StatisticsDocument } from '../utils/__generated__/Node';
+import type { NodeCheckQuery } from '../utils/__generated__/NodeCheck';
+import { NodeCheckDocument } from '../utils/__generated__/NodeCheck';
 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<StatisticsQuery> => {
+): MockedResponse<NodeCheckQuery> => {
   return {
     request: {
-      query: StatisticsDocument,
+      query: NodeCheckDocument,
     },
     result: {
       data: {
@@ -34,7 +34,7 @@ const createStatsMock = (
 };
 
 function setup(
-  mock: MockedResponse<StatisticsQuery>,
+  mock: MockedResponse<NodeCheckQuery>,
   headers:
     | {
         blockHeight: number;
@@ -93,9 +93,9 @@ describe('useNodeHealth', () => {
   );
 
   it('block diff is null if query fails indicating non operational', async () => {
-    const failedQuery: MockedResponse<StatisticsQuery> = {
+    const failedQuery: MockedResponse<NodeCheckQuery> = {
       request: {
-        query: StatisticsDocument,
+        query: NodeCheckDocument,
       },
       result: {
         // @ts-ignore failed query with no result

libs/environment/src/hooks/use-node-health.ts

@@ -1,5 +1,5 @@
 import { useEffect, useMemo } from 'react';
-import { useStatisticsQuery } from '../utils/__generated__/Node';
+import { useNodeCheckQuery } from '../utils/__generated__/NodeCheck';
 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 } = useStatisticsQuery({
+  const { data, error, startPolling, stopPolling } = useNodeCheckQuery({
     fetchPolicy: 'no-cache',
   });
 

libs/environment/src/index.ts

@@ -8,4 +8,4 @@ export * from './hooks';
 export * from './types';
 
 // Utils
-export * from './utils/__generated__/Node';
+export * from './utils/__generated__/NodeCheck';

libs/environment/src/utils/NodeCheck.graphql

@@ -1,4 +1,4 @@
-query Statistics {
+query NodeCheck {
   statistics {
     chainId
     blockHeight
@@ -6,7 +6,7 @@ query Statistics {
   }
 }
 
-subscription BlockTime {
+subscription NodeCheckTimeUpdate {
   busEvents(types: TimeUpdate, batchSize: 1) {
     id
   }

libs/environment/src/utils/__generated__/Node.ts

@@ -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 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>;

libs/environment/src/utils/__generated__/NodeCheck.ts

@@ -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 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>;

libs/environment/src/utils/node.mock.ts

@@ -1,11 +1,11 @@
-import type { StatisticsQuery } from './__generated__/Node';
+import type { NodeCheckQuery } from './__generated__/NodeCheck';
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';
 
 export const statisticsQuery = (
-  override?: PartialDeep<StatisticsQuery>
-): StatisticsQuery => {
-  const defaultResult: StatisticsQuery = {
+  override?: PartialDeep<NodeCheckQuery>
+): NodeCheckQuery => {
+  const defaultResult: NodeCheckQuery = {
     statistics: {
       __typename: 'Statistics',
       chainId: 'chain-id',

libs/fills/__mocks__/react-markdown.js

@@ -0,0 +1,6 @@
+function ReactMarkdown({ children }) {
+  // eslint-disable-next-line react/jsx-no-useless-fragment
+  return <>{children}</>;
+}
+
+export default ReactMarkdown;

libs/fills/src/lib/fills-data-provider.ts

@@ -9,8 +9,8 @@ import {
   paginatedCombineDelta as combineDelta,
   paginatedCombineInsertionData as combineInsertionData,
 } from '@vegaprotocol/data-provider';
-import type { Market } from '@vegaprotocol/market-list';
-import { marketsProvider } from '@vegaprotocol/market-list';
+import type { Market } from '@vegaprotocol/markets';
+import { marketsProvider } from '@vegaprotocol/markets';
 import { FillsDocument, FillsEventDocument } from './__generated__/Fills';
 import type {
   FillsQuery,

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

@@ -80,10 +80,28 @@ 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',

libs/ledger/src/lib/ledger-entries-data-provider.ts

@@ -1,7 +1,7 @@
 import type { Asset } from '@vegaprotocol/assets';
 import { assetsProvider } from '@vegaprotocol/assets';
-import type { Market } from '@vegaprotocol/market-list';
-import { marketsProvider } from '@vegaprotocol/market-list';
+import type { Market } from '@vegaprotocol/markets';
+import { marketsProvider } from '@vegaprotocol/markets';
 import { makeInfiniteScrollGetRows } from '@vegaprotocol/data-provider';
 import { updateGridData } from '@vegaprotocol/datagrid';
 import {

libs/liquidity/src/lib/markets-liquidity-provider.ts

@@ -10,9 +10,9 @@ import type {
   MarketCandles,
   MarketMaybeWithDataAndCandles,
   MarketsCandlesQueryVariables,
-} from '@vegaprotocol/market-list';
+} from '@vegaprotocol/markets';
 
-import { marketListProvider } from '@vegaprotocol/market-list';
+import { marketListProvider } from '@vegaprotocol/markets';
 
 import type { LiquidityProvisionMarketsQuery } from './__generated__/MarketsLiquidity';
 import { LiquidityProvisionMarketsDocument } from './__generated__/MarketsLiquidity';

libs/market-depth/__mocks__/react-markdown.js

@@ -0,0 +1,6 @@
+function ReactMarkdown({ children }) {
+  // eslint-disable-next-line react/jsx-no-useless-fragment
+  return <>{children}</>;
+}
+
+export default ReactMarkdown;

libs/market-depth/src/lib/depth-chart.tsx

@@ -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/market-list';
-import type { MarketData } from '@vegaprotocol/market-list';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
+import type { MarketData } from '@vegaprotocol/markets';
 import type {
   MarketDepthQuery,
   MarketDepthUpdateSubscription,

libs/market-depth/src/lib/orderbook-data.ts

@@ -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/market-list';
+import type { MarketData } from '@vegaprotocol/markets';
 import type { PriceLevelFieldsFragment } from './__generated__/MarketDepth';
 
 export enum VolumeType {

libs/market-depth/src/lib/orderbook-manager.tsx

@@ -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/market-list';
-import type { MarketData } from '@vegaprotocol/market-list';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
+import type { MarketData } from '@vegaprotocol/markets';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import type {
   MarketDepthUpdateSubscription,

libs/market-info/README.md

@@ -1,7 +0,0 @@
-# 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).

libs/market-info/jest.config.ts

@@ -1,11 +0,0 @@
-/* eslint-disable */
-export default {
-  displayName: 'market-info',
-  preset: '../../jest.preset.js',
-  transform: {
-    '^.+\\.[tj]sx?$': 'babel-jest',
-  },
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../coverage/libs/market-info',
-  setupFilesAfterEnv: ['./src/setup-tests.ts'],
-};

libs/market-info/package.json

@@ -1,4 +0,0 @@
-{
-  "name": "@vegaprotocol/market-info",
-  "version": "0.0.1"
-}

libs/market-info/src/lib/__generated__/index.ts

@@ -1 +0,0 @@
-export * from './OracleSpecDataConnection';

libs/market-info/src/lib/hooks/use-market-oracle.ts

@@ -1,56 +0,0 @@
-import { useEnvironment } from '@vegaprotocol/environment';
-import { useOracleProofs } from './use-oracle-proofs';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import { marketInfoProvider } from '../components/market-info/market-info-data-provider';
-import { useMemo } from 'react';
-
-export const useMarketOracle = (
-  marketId: string,
-  dataSourceSpecKey:
-    | 'dataSourceSpecForSettlementData'
-    | 'dataSourceSpecForTradingTermination' = 'dataSourceSpecForSettlementData'
-) => {
-  const { ORACLE_PROOFS_URL } = useEnvironment();
-  const { data: marketInfo } = useDataProvider({
-    dataProvider: marketInfoProvider,
-    variables: { marketId },
-  });
-  const { data } = useOracleProofs(ORACLE_PROOFS_URL);
-  return useMemo(() => {
-    if (!data || !marketInfo) {
-      return undefined;
-    }
-    const dataSourceSpec =
-      marketInfo.tradableInstrument.instrument.product[dataSourceSpecKey];
-    const { data: dataSource, id: dataSourceSpecId } = dataSourceSpec;
-    const provider = data.find((provider) =>
-      provider.proofs.some((proof) => {
-        if (
-          proof.type === 'eth_address' &&
-          dataSource.sourceType.__typename === 'DataSourceDefinitionExternal'
-        ) {
-          return dataSource.sourceType.sourceType.signers?.some(
-            (signer) =>
-              signer.signer.__typename === 'ETHAddress' &&
-              signer.signer.address === proof.eth_address
-          );
-        }
-        if (
-          proof.type === 'public_key' &&
-          dataSource.sourceType.__typename === 'DataSourceDefinitionExternal'
-        ) {
-          return dataSource.sourceType.sourceType.signers?.some(
-            (signer) =>
-              signer.signer.__typename === 'PubKey' &&
-              signer.signer.key === proof.public_key
-          );
-        }
-        return false;
-      })
-    );
-    if (provider) {
-      return { provider, dataSourceSpecId };
-    }
-    return undefined;
-  }, [data, dataSourceSpecKey, marketInfo]);
-};

libs/market-info/src/lib/index.ts

@@ -1,5 +0,0 @@
-export * from './__generated__';
-export * from './components';
-export * from './oracle-schema';
-export * from './oracle-spec-data-connection.mock';
-export * from './hooks';

libs/market-info/tsconfig.spec.json

@@ -1,22 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node", "@testing-library/jest-dom"]
-  },
-  "include": [
-    "**/*.test.ts",
-    "**/*.spec.ts",
-    "**/*.test.tsx",
-    "**/*.spec.tsx",
-    "**/*.test.js",
-    "**/*.spec.js",
-    "**/*.test.jsx",
-    "**/*.spec.jsx",
-    "**/*.d.ts",
-    "jest.config.ts",
-    "../../index.d.ts",
-    "src/lib/use-oracle-spec-binding-data.spec.tsx"
-  ]
-}

libs/market-list/.babelrc

@@ -1,12 +0,0 @@
-{
-  "presets": [
-    [
-      "@nrwl/react/babel",
-      {
-        "runtime": "automatic",
-        "useBuiltIns": "usage"
-      }
-    ]
-  ],
-  "plugins": []
-}

libs/market-list/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-  "extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*", "__generated__", "__generated___"],
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.ts", "*.tsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.js", "*.jsx"],
-      "rules": {}
-    }
-  ]
-}

libs/market-list/README.md

@@ -1,7 +0,0 @@
-# market-list
-
-This library was generated with [Nx](https://nx.dev).
-
-## Running unit tests
-
-Run `nx test market-list` to execute the unit tests via [Jest](https://jestjs.io).

libs/market-list/package.json

@@ -1,4 +0,0 @@
-{
-  "name": "@vegaprotocol/market-list",
-  "version": "0.0.1"
-}

libs/market-list/project.json

@@ -1,50 +0,0 @@
-{
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "libs/market-list/src",
-  "projectType": "library",
-  "tags": [],
-  "targets": {
-    "build": {
-      "executor": "@nrwl/web:rollup",
-      "outputs": ["{options.outputPath}"],
-      "options": {
-        "outputPath": "dist/libs/market-list",
-        "tsConfig": "libs/market-list/tsconfig.lib.json",
-        "project": "libs/market-list/package.json",
-        "entryFile": "libs/market-list/src/index.ts",
-        "external": ["react/jsx-runtime"],
-        "rollupConfig": "@nrwl/react/plugins/bundle-rollup",
-        "compiler": "babel",
-        "assets": [
-          {
-            "glob": "libs/market-list/README.md",
-            "input": ".",
-            "output": "."
-          }
-        ]
-      }
-    },
-    "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": ["libs/market-list/**/*.{ts,tsx,js,jsx}"]
-      }
-    },
-    "test": {
-      "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/libs/market-list"],
-      "options": {
-        "jestConfig": "libs/market-list/jest.config.ts",
-        "passWithNoTests": true
-      }
-    },
-    "build-spec": {
-      "executor": "@nrwl/workspace:run-commands",
-      "outputs": [],
-      "options": {
-        "command": "yarn tsc --project ./libs/market-list/tsconfig.spec.json"
-      }
-    }
-  }
-}

libs/market-list/src/index.ts

@@ -1 +0,0 @@
-export * from './lib';

libs/market-list/src/lib/components/market-table-actions/index.ts

@@ -1 +0,0 @@
-export * from './market-table-actions';

libs/market-list/src/lib/components/markets-container/index.ts

@@ -1 +0,0 @@
-export * from './markets-container';

libs/market-list/src/lib/utils/index.ts

@@ -1 +0,0 @@
-export * from './market-utils';

libs/market-list/src/setup-tests.ts

@@ -1 +0,0 @@
-import '@testing-library/jest-dom';

libs/market-list/tsconfig.json

@@ -1,24 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "jsx": "react-jsx",
-    "allowJs": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitOverride": true,
-    "noPropertyAccessFromIndexSignature": false,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
-  },
-  "include": [],
-  "references": [
-    {
-      "path": "./tsconfig.lib.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    }
-  ]
-}

libs/market-list/tsconfig.lib.json

@@ -1,23 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "types": ["node"]
-  },
-  "files": [
-    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "../../node_modules/@nrwl/react/typings/image.d.ts"
-  ],
-  "exclude": [
-    "**/*.spec.ts",
-    "**/*.test.ts",
-    "**/*.spec.tsx",
-    "**/*.test.tsx",
-    "**/*.spec.js",
-    "**/*.test.js",
-    "**/*.spec.jsx",
-    "**/*.test.jsx",
-    "jest.config.ts"
-  ],
-  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
-}