fix: accomodate type changes for libs/liquidity

.eslintrc.json

@@ -51,7 +51,8 @@
             "ul": ["list"],
             "ol": ["list"]
           }
-        ]
+        ],
+        "curly": "warn"
       }
     },
     {
@@ -74,8 +75,7 @@
             "prefer": "type-imports",
             "disallowTypeAnnotations": true
           }
-        ],
-        "curly": ["error", "multi-line"]
+        ]
       }
     },
     {

.github/ISSUE_TEMPLATE/---bug.md

@@ -1,45 +0,0 @@
----
-name: "\U0001F41B Bug"
-about: Create a report to help us improve
-title: ''
-labels: "\U0001F41B bug"
-assignees: ''
----
-
-## Description
-
-A clear and concise description of what the bug is.
-
-## Steps to Reproduce
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-## Expected behavior
-
-A clear and concise description of what you expected to happen.
-
-## Screenshots
-
-If applicable, add screenshots to help explain your problem.
-
-## Device details
-
-**Desktop (please complete the following information):**
-
-- OS: [e.g. iOS]
-- Browser [e.g. chrome, safari]
-- Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
-
-- Device: [e.g. iPhone6]
-- OS: [e.g. iOS8.1]
-- Browser [e.g. stock browser, safari]
-- Version [e.g. 22]
-
-## Additional context
-
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/chore.md

@@ -1,21 +0,0 @@
----
-name: Chore
-about:
-  A template to capture non feature / enhancement work we need to do like work
-  to support other functions or housekeeping etc.
-title: ''
-labels: chore
-assignees: ''
----
-
-## The Chore
-
-What we need to achieve and who for
-
-## Tasks
-
-- [ ] What do we need to do first
-- [ ] and then what?
-- [ ] Etc.
-
-## Additional details / background info

.github/ISSUE_TEMPLATE/user-story.md

@@ -1,33 +0,0 @@
----
-name: User Story
-about:
-  A template to describe a features or enhancements we want to make from a users
-  perspective to ensure we understand what is needed and the value it would add
-title: ''
-labels: feature
-assignees: ''
----
-
-## Story
-
-As a
-I want
-So that
-
-## Acceptance Criteria
-
-- [ ] I can
-- [ ] I can
-- [ ] I can
-
-## Tasks
-
-- [ ] Explore and sketch
-- [ ] Team and stakeholder review
-- [ ] Visual Design
-- [ ] Team review
-- [ ] Etc.
-
-## Sketch
-
-## Additional details / background info

.github/workflows/capsule-cypress-manual-trigger.yml

@@ -78,7 +78,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: vegaprotocol/vega
-          ref: v0.55.0
+          ref: v0.54.0
           token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
           path: './vega'
 
@@ -140,7 +140,6 @@ jobs:
           CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
           CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
           CYPRESS_INCLUDE_FLOWS: ${{ github.event.inputs.includeFlows }}
-          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true
 
       ######
       ## Upload logs

.github/workflows/capsule-cypress-night-run.yml

@@ -62,7 +62,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: vegaprotocol/vega
-          ref: v0.55.0
+          ref: v0.54.0
           token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
           path: './vega'
 
@@ -125,7 +125,6 @@ jobs:
           CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
           CYPRESS_NIGHTLY_RUN: true
           CYPRESS_INCLUDE_FLOWS: true
-          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true
 
       ######
       ## Upload logs

.github/workflows/capsule-cypress.yml

@@ -137,7 +137,6 @@ jobs:
           CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
           CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
           CYPRESS_INCLUDE_FLOWS: false
-          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true
 
       ######
       ## Upload logs

.github/workflows/test.yml

@@ -55,7 +55,7 @@ jobs:
       - name: Derive appropriate SHAs for base and head for `nx affected` commands
         uses: nrwl/nx-set-shas@v2
         with:
-          main-branch-name: develop
+          main-branch-name: master
       - name: Use Node.js 16
         id: Node
         uses: actions/setup-node@v3

apps/console-lite-e2e/.env

@@ -23,4 +23,5 @@ NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL
 
 NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
+NX_VEGA_REST=https://api.n11.testnet.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789/api/v1

apps/console-lite-e2e/src/integration/market-list.test.ts

@@ -1,19 +1,14 @@
 import { aliasQuery } from '@vegaprotocol/cypress';
-import type { Markets } from '@vegaprotocol/market-list';
 import {
   generateLongListMarkets,
   generateSimpleMarkets,
-  generateMarketsData,
-  generateMarketsCandles,
 } from '../support/mocks/generate-markets';
 
 describe('market list', () => {
   describe('simple url', () => {
     beforeEach(() => {
       cy.mockGQL((req) => {
-        aliasQuery(req, 'Markets', generateSimpleMarkets());
-        aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
-        aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
+        aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
       });
       cy.visit('/markets');
     });
@@ -67,9 +62,7 @@ describe('market list', () => {
   describe('url params should select filters', () => {
     beforeEach(() => {
       cy.mockGQL((req) => {
-        aliasQuery(req, 'Markets', generateSimpleMarkets());
-        aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
-        aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
+        aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
       });
     });
 
@@ -80,11 +73,10 @@ describe('market list', () => {
 
     it('last asset (if exists)', () => {
       cy.visit('/markets');
-      cy.wait('@Markets').then((filters) => {
-        const data: Markets | undefined = filters?.response?.body?.data;
-        if (data.marketsConnection.edges.length) {
+      cy.wait('@SimpleMarkets').then((filters) => {
+        if (filters?.response?.body?.data?.markets?.length) {
           const asset =
-            data.marketsConnection.edges[0].node.tradableInstrument.instrument
+            filters.response.body.data.markets[0].tradableInstrument.instrument
               .product.settlementAsset.symbol;
           cy.visit(`/markets/Suspended/Future/${asset}`);
           cy.getByTestId('market-assets-menu')
@@ -106,9 +98,7 @@ describe('market list', () => {
     it('handles 1000 markets', () => {
       cy.viewport(1440, 900);
       cy.mockGQL((req) => {
-        aliasQuery(req, 'Markets', generateLongListMarkets(1000));
-        aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
-        aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
+        aliasQuery(req, 'SimpleMarkets', generateLongListMarkets(1000));
       });
       performance.mark('start-1k');
       cy.visit('/markets');

apps/console-lite-e2e/src/integration/market-selector.test.ts

@@ -1,10 +1,6 @@
 import { connectVegaWallet } from '../support/connect-wallet';
 import { aliasQuery } from '@vegaprotocol/cypress';
-import {
-  generateMarketsCandles,
-  generateMarketsData,
-  generateSimpleMarkets,
-} from '../support/mocks/generate-markets';
+import { generateSimpleMarkets } from '../support/mocks/generate-markets';
 import { generateDealTicket } from '../support/mocks/generate-deal-ticket';
 import { generateMarketTags } from '../support/mocks/generate-market-tags';
 import { generateMarketPositions } from '../support/mocks/generate-market-positions';
@@ -13,16 +9,12 @@ import { generatePartyBalance } from '../support/mocks/generate-party-balance';
 import { generatePartyMarketData } from '../support/mocks/generate-party-market-data';
 import { generateMarketMarkPrice } from '../support/mocks/generate-market-mark-price';
 import { generateMarketNames } from '../support/mocks/generate-market-names';
-import { generateMarketDepth } from '../support/mocks/generate-market-depth';
-import type { Market, Markets } from '@vegaprotocol/market-list';
 
 describe('market selector', () => {
-  let markets: Market[];
+  let markets;
   beforeEach(() => {
     cy.mockGQL((req) => {
-      aliasQuery(req, 'Markets', generateSimpleMarkets());
-      aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
-      aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
+      aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
       aliasQuery(req, 'DealTicketQuery', generateDealTicket());
       aliasQuery(req, 'MarketTags', generateMarketTags());
       aliasQuery(req, 'MarketPositions', generateMarketPositions());
@@ -31,14 +23,12 @@ describe('market selector', () => {
       aliasQuery(req, 'PartyMarketData', generatePartyMarketData());
       aliasQuery(req, 'MarketMarkPrice', generateMarketMarkPrice());
       aliasQuery(req, 'MarketNames', generateMarketNames());
-      aliasQuery(req, 'MarketDepth', generateMarketDepth());
     });
 
     cy.visit('/markets');
-    cy.wait('@Markets').then((response) => {
-      const data: Markets | undefined = response?.response?.body?.data;
-      if (data.marketsConnection.edges.length) {
-        markets = data.marketsConnection.edges.map((edge) => edge.node);
+    cy.wait('@SimpleMarkets').then((response) => {
+      if (response.response.body.data?.markets?.length) {
+        markets = response.response.body.data.markets;
       }
     });
   });
@@ -136,7 +126,7 @@ describe('market selector', () => {
       cy.getByTestId('market-pane')
         .children()
         .find('[role="button"]')
-        .should('have.length', 9);
+        .should('have.length', 3);
       cy.get('div[role="dialog"]').should('have.class', 'w-screen');
       cy.getByTestId('dialog-close').click();
       cy.get('input[placeholder="Search"]').should(

apps/console-lite-e2e/src/integration/market-trade.test.ts

@@ -1,9 +1,5 @@
 import { aliasQuery } from '@vegaprotocol/cypress';
-import {
-  generateSimpleMarkets,
-  generateMarketsCandles,
-  generateMarketsData,
-} from '../support/mocks/generate-markets';
+import { generateSimpleMarkets } from '../support/mocks/generate-markets';
 import { generateDealTicket } from '../support/mocks/generate-deal-ticket';
 import { generateMarketTags } from '../support/mocks/generate-market-tags';
 import { generateMarketPositions } from '../support/mocks/generate-market-positions';
@@ -13,15 +9,11 @@ import { generatePartyMarketData } from '../support/mocks/generate-party-market-
 import { generateMarketMarkPrice } from '../support/mocks/generate-market-mark-price';
 import { generateMarketDepth } from '../support/mocks/generate-market-depth';
 import { connectVegaWallet } from '../support/connect-wallet';
-import type { Markets, Market } from '@vegaprotocol/market-list';
 
 describe('Market trade', () => {
-  let markets: Market[];
+  let markets;
   beforeEach(() => {
     cy.mockGQL((req) => {
-      aliasQuery(req, 'Markets', generateSimpleMarkets());
-      aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
-      aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
       aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
       aliasQuery(req, 'DealTicketQuery', generateDealTicket());
       aliasQuery(req, 'MarketTags', generateMarketTags());
@@ -33,10 +25,9 @@ describe('Market trade', () => {
       aliasQuery(req, 'MarketDepth', generateMarketDepth());
     });
     cy.visit('/markets');
-    cy.wait('@Markets').then((response) => {
-      const data: Markets | undefined = response?.response?.body?.data;
-      if (data.marketsConnection.edges.length) {
-        markets = data.marketsConnection.edges.map((edge) => edge.node);
+    cy.wait('@SimpleMarkets').then((response) => {
+      if (response.response.body.data?.markets?.length) {
+        markets = response.response.body.data.markets;
       }
     });
   });

apps/console-lite-e2e/src/support/mocks/commons.ts

@@ -1,7 +1,4 @@
-import type { Market } from '@vegaprotocol/market-list';
-import { MarketState, MarketTradingMode } from '@vegaprotocol/types';
-
-export const protoCandles = [
+const protoCandles = [
   { open: '9556163', close: '9587028', __typename: 'Candle' },
   {
     open: '9587028',
@@ -76,29 +73,11 @@ export const protoCandles = [
   },
 ];
 
-export const protoMarket: Market = {
+export const protoMarket = {
   id: 'first-btcusd-id',
-  tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
-  state: MarketState.STATE_ACTIVE,
-  decimalPlaces: 5,
-  positionDecimalPlaces: 0,
-  marketTimestamps: {
-    __typename: 'MarketTimestamps',
-    close: '',
-    open: '',
-  },
-  fees: {
-    __typename: 'Fees',
-    factors: {
-      __typename: 'FeeFactors',
-      makerFee: '',
-      infrastructureFee: '',
-      liquidityFee: '',
-    },
-  },
+  state: 'STATE_ACTIVE',
   tradableInstrument: {
     instrument: {
-      id: '',
       code: 'AAVEDAI.MF21',
       name: 'AAVEDAI Monthly (30 Jun 2022)',
       metadata: {
@@ -115,11 +94,12 @@ export const protoMarket: Market = {
       product: {
         __typename: 'Future',
         quoteName: 'DAI',
-        settlementAsset: { symbol: 'tDAI', __typename: 'Asset', decimals: 5 },
+        settlementAsset: { symbol: 'tDAI', __typename: 'Asset' },
       },
       __typename: 'Instrument',
     },
     __typename: 'TradableInstrument',
   },
+  candles: protoCandles,
   __typename: 'Market',
 };

apps/console-lite-e2e/src/support/mocks/generate-market-depth.ts

@@ -1,15 +1,24 @@
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
-import type { MarketDepth } from '../../../../../libs/market-depth/src/lib/__generated__/MarketDepth';
-
-export const generateMarketDepth = (
-  override?: PartialDeep<MarketDepth>
-): MarketDepth => {
-  const defaultResult: MarketDepth = {
+export const generateMarketDepth = () => {
+  return {
     market: {
       id: 'a46bd7e5277087723b7ab835844dec3cef8b4445738101269624bf5537d5d423',
+      decimalPlaces: 5,
+      positionDecimalPlaces: 0,
+      data: {
+        staticMidPrice: '9893006',
+        marketTradingMode: 'TRADING_MODE_CONTINUOUS',
+        indicativeVolume: '0',
+        indicativePrice: '0',
+        bestStaticBidPrice: '9893006',
+        bestStaticOfferPrice: '9893006',
+        market: {
+          id: 'a46bd7e5277087723b7ab835844dec3cef8b4445738101269624bf5537d5d423',
+          __typename: 'Market',
+        },
+        __typename: 'MarketData',
+      },
       depth: {
+        lastTrade: { price: '9893006', __typename: 'Trade' },
         sell: [
           {
             price: '9893007',
@@ -206,5 +215,4 @@ export const generateMarketDepth = (
       __typename: 'Market',
     },
   };
-  return merge(defaultResult, override);
 };

apps/console-lite/.env.capsule

@@ -1,3 +1,4 @@
 # App configuration variables
 NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_ENV=LOCAL
+NX_VEGA_REST=http://localhost:3029

apps/console-lite/.env.devnet

@@ -2,6 +2,7 @@
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_ENV=DEVNET
+NX_VEGA_REST=https://api.n04.d.vega.xyz
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\"}
 NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://ropsten.etherscan.io

apps/console-lite/.env.mainnet

@@ -1,7 +1,8 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
-NX_VEGA_URL=https://api.vega.xyz/query
+NX_VEGA_URL=https://api.token.vega.xyz/query
 NX_VEGA_ENV=MAINNET
+NX_VEGA_REST=https://api.token.vega.xyz
 NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}'
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io

apps/console-lite/.env.stagnet3

@@ -2,6 +2,7 @@
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET3
+NX_VEGA_REST=https://api.n01.stagnet3.vega.xyz
 NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://ropsten.etherscan.io
 NX_VEGA_EXPLORER_URL=https://staging2.explorer.vega.xyz

apps/console-lite/.env.testnet

@@ -2,6 +2,7 @@
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
 NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
+NX_VEGA_REST=https://api.n11.testnet.vega.xyz
 NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}'
 NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://ropsten.etherscan.io

apps/console-lite/setup-tests.ts

@@ -1,5 +1,4 @@
 import '@testing-library/jest-dom';
-import 'jest-canvas-mock';
 import { defaultFallbackInView } from 'react-intersection-observer';
 import ResizeObserver from 'resize-observer-polyfill';
 
@@ -39,5 +38,3 @@ Object.defineProperty(window, 'matchMedia', {
     dispatchEvent: jest.fn(),
   })),
 });
-
-jest.setTimeout(30000);

apps/console-lite/src/app/components/simple-market-list/Candles.graphql

@@ -0,0 +1,5 @@
+subscription CandleLive($marketId: ID!) {
+  candles(marketId: $marketId, interval: INTERVAL_I1H) {
+    close
+  }
+}

apps/console-lite/src/app/components/simple-market-list/SimpleMarkets.graphql

@@ -0,0 +1,39 @@
+fragment SimpleMarketDataFields on ObservableMarketData {
+  marketId
+  marketState
+}
+
+query SimpleMarkets($CandleSince: String!) {
+  markets {
+    id
+    state
+    tradableInstrument {
+      instrument {
+        name
+        code
+        metadata {
+          tags
+        }
+        product {
+          __typename
+          ... on Future {
+            quoteName
+            settlementAsset {
+              symbol
+            }
+          }
+        }
+      }
+    }
+    candles(interval: INTERVAL_I1H, since: $CandleSince) {
+      open
+      close
+    }
+  }
+}
+
+subscription SimpleMarketDataSub($marketIds: [ID!]!) {
+  marketsData(marketIds: $marketIds) {
+    ...SimpleMarketDataFields
+  }
+}

apps/console-lite/src/app/components/simple-market-list/__generated__/SimpleMarketDataSub.ts

@@ -0,0 +1,33 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+import { MarketState } from "@vegaprotocol/types";
+
+// ====================================================
+// GraphQL subscription operation: SimpleMarketDataSub
+// ====================================================
+
+export interface SimpleMarketDataSub_marketsData {
+  __typename: "ObservableMarketData";
+  /**
+   * current state of the market
+   */
+  marketState: MarketState;
+  /**
+   * market ID of the associated mark price
+   */
+  marketId: string;
+}
+
+export interface SimpleMarketDataSub {
+  /**
+   * Subscribe to the mark price changes
+   */
+  marketsData: SimpleMarketDataSub_marketsData[];
+}
+
+export interface SimpleMarketDataSubVariables {
+  marketIds: string[];
+}

apps/console-lite/src/app/components/simple-market-list/__generated__/SimpleMarkets.ts

@@ -0,0 +1,109 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+import { MarketState } from "@vegaprotocol/types";
+
+// ====================================================
+// GraphQL query operation: SimpleMarkets
+// ====================================================
+
+export interface SimpleMarkets_markets_tradableInstrument_instrument_metadata {
+  __typename: "InstrumentMetadata";
+  /**
+   * An arbitrary list of tags to associated to associate to the Instrument (string list)
+   */
+  tags: string[] | null;
+}
+
+export interface SimpleMarkets_markets_tradableInstrument_instrument_product_settlementAsset {
+  __typename: "Asset";
+  /**
+   * The symbol of the asset (e.g: GBP)
+   */
+  symbol: string;
+}
+
+export interface SimpleMarkets_markets_tradableInstrument_instrument_product {
+  __typename: "Future";
+  /**
+   * String representing the quote (e.g. BTCUSD -> USD is quote)
+   */
+  quoteName: string;
+  /**
+   * The name of the asset (string)
+   */
+  settlementAsset: SimpleMarkets_markets_tradableInstrument_instrument_product_settlementAsset;
+}
+
+export interface SimpleMarkets_markets_tradableInstrument_instrument {
+  __typename: "Instrument";
+  /**
+   * A short non necessarily unique code used to easily describe the instrument (e.g: FX:BTCUSD/DEC18) (string)
+   */
+  code: string;
+  /**
+   * Full and fairly descriptive name for the instrument
+   */
+  name: string;
+  /**
+   * Metadata for this instrument
+   */
+  metadata: SimpleMarkets_markets_tradableInstrument_instrument_metadata;
+  /**
+   * A reference to or instance of a fully specified product, including all required product parameters for that product (Product union)
+   */
+  product: SimpleMarkets_markets_tradableInstrument_instrument_product;
+}
+
+export interface SimpleMarkets_markets_tradableInstrument {
+  __typename: "TradableInstrument";
+  /**
+   * An instance of, or reference to, a fully specified instrument.
+   */
+  instrument: SimpleMarkets_markets_tradableInstrument_instrument;
+}
+
+export interface SimpleMarkets_markets_candles {
+  __typename: "Candle";
+  /**
+   * Open price (uint64)
+   */
+  open: string;
+  /**
+   * Close price (uint64)
+   */
+  close: string;
+}
+
+export interface SimpleMarkets_markets {
+  __typename: "Market";
+  /**
+   * Market ID
+   */
+  id: string;
+  /**
+   * Current state of the market
+   */
+  state: MarketState;
+  /**
+   * An instance of, or reference to, a tradable instrument.
+   */
+  tradableInstrument: SimpleMarkets_markets_tradableInstrument;
+  /**
+   * Candles on a market, for the 'last' n candles, at 'interval' seconds as specified by parameters
+   */
+  candles: (SimpleMarkets_markets_candles | null)[] | null;
+}
+
+export interface SimpleMarkets {
+  /**
+   * One or more instruments that are trading on the VEGA network
+   */
+  markets: SimpleMarkets_markets[] | null;
+}
+
+export interface SimpleMarketsVariables {
+  CandleSince: string;
+}

apps/console-lite/src/app/components/simple-market-list/__generated___/SimpleMarkets.ts

@@ -0,0 +1,115 @@
+import { Schema as Types } from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type SimpleMarketDataFieldsFragment = { __typename?: 'ObservableMarketData', marketId: string, marketState: Types.MarketState };
+
+export type SimpleMarketsQueryVariables = Types.Exact<{
+  CandleSince: Types.Scalars['String'];
+}>;
+
+
+export type SimpleMarketsQuery = { __typename?: 'Query', markets?: Array<{ __typename?: 'Market', id: string, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', symbol: string } } } }, candles?: Array<{ __typename?: 'Candle', open: string, close: string } | null> | null }> | null };
+
+export type SimpleMarketDataSubSubscriptionVariables = Types.Exact<{
+  marketIds: Array<Types.Scalars['ID']> | Types.Scalars['ID'];
+}>;
+
+
+export type SimpleMarketDataSubSubscription = { __typename?: 'Subscription', marketsData: Array<{ __typename?: 'ObservableMarketData', marketId: string, marketState: Types.MarketState }> };
+
+export const SimpleMarketDataFieldsFragmentDoc = gql`
+    fragment SimpleMarketDataFields on ObservableMarketData {
+  marketId
+  marketState
+}
+    `;
+export const SimpleMarketsDocument = gql`
+    query SimpleMarkets($CandleSince: String!) {
+  markets {
+    id
+    state
+    tradableInstrument {
+      instrument {
+        name
+        code
+        metadata {
+          tags
+        }
+        product {
+          __typename
+          ... on Future {
+            quoteName
+            settlementAsset {
+              symbol
+            }
+          }
+        }
+      }
+    }
+    candles(interval: INTERVAL_I1H, since: $CandleSince) {
+      open
+      close
+    }
+  }
+}
+    `;
+
+/**
+ * __useSimpleMarketsQuery__
+ *
+ * To run a query within a React component, call `useSimpleMarketsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useSimpleMarketsQuery` 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 } = useSimpleMarketsQuery({
+ *   variables: {
+ *      CandleSince: // value for 'CandleSince'
+ *   },
+ * });
+ */
+export function useSimpleMarketsQuery(baseOptions: Apollo.QueryHookOptions<SimpleMarketsQuery, SimpleMarketsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<SimpleMarketsQuery, SimpleMarketsQueryVariables>(SimpleMarketsDocument, options);
+      }
+export function useSimpleMarketsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<SimpleMarketsQuery, SimpleMarketsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<SimpleMarketsQuery, SimpleMarketsQueryVariables>(SimpleMarketsDocument, options);
+        }
+export type SimpleMarketsQueryHookResult = ReturnType<typeof useSimpleMarketsQuery>;
+export type SimpleMarketsLazyQueryHookResult = ReturnType<typeof useSimpleMarketsLazyQuery>;
+export type SimpleMarketsQueryResult = Apollo.QueryResult<SimpleMarketsQuery, SimpleMarketsQueryVariables>;
+export const SimpleMarketDataSubDocument = gql`
+    subscription SimpleMarketDataSub($marketIds: [ID!]!) {
+  marketsData(marketIds: $marketIds) {
+    ...SimpleMarketDataFields
+  }
+}
+    ${SimpleMarketDataFieldsFragmentDoc}`;
+
+/**
+ * __useSimpleMarketDataSubSubscription__
+ *
+ * To run a query within a React component, call `useSimpleMarketDataSubSubscription` and pass it any options that fit your needs.
+ * When your component renders, `useSimpleMarketDataSubSubscription` 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 } = useSimpleMarketDataSubSubscription({
+ *   variables: {
+ *      marketIds: // value for 'marketIds'
+ *   },
+ * });
+ */
+export function useSimpleMarketDataSubSubscription(baseOptions: Apollo.SubscriptionHookOptions<SimpleMarketDataSubSubscription, SimpleMarketDataSubSubscriptionVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useSubscription<SimpleMarketDataSubSubscription, SimpleMarketDataSubSubscriptionVariables>(SimpleMarketDataSubDocument, options);
+      }
+export type SimpleMarketDataSubSubscriptionHookResult = ReturnType<typeof useSimpleMarketDataSubSubscription>;
+export type SimpleMarketDataSubSubscriptionResult = Apollo.SubscriptionResult<SimpleMarketDataSubSubscription>;

apps/console-lite/src/app/components/simple-market-list/constants.ts

@@ -2,8 +2,8 @@ import { t } from '@vegaprotocol/react-helpers';
 import { themelite as theme } from '@vegaprotocol/tailwindcss-config';
 import { MarketState } from '@vegaprotocol/types';
 import { IS_MARKET_TRADABLE } from '../../constants';
+import type { SimpleMarkets_markets } from './__generated__/SimpleMarkets';
 import colors from 'tailwindcss/colors';
-import type { Market } from '@vegaprotocol/market-list';
 
 export const STATES_FILTER = [
   { value: 'all', text: t('All') },
@@ -192,10 +192,8 @@ export const agGridDarkVariables = `
 `;
 
 export const ROW_CLASS_RULES = {
-  'cursor-pointer': ({ data }: { data: Market }) =>
+  'cursor-pointer': ({ data }: { data: SimpleMarkets_markets }) =>
     IS_MARKET_TRADABLE(data || {}),
 };
 
 export const LARGE_SCREENS = ['xl', 'xxl'];
-
-export const AG_GRID_CONTAINER_STYLES = { width: '100%', height: '100%' };

apps/console-lite/src/app/components/simple-market-list/data-provider.ts

@@ -0,0 +1,92 @@
+import produce from 'immer';
+import { gql } from '@apollo/client';
+import { makeDataProvider } from '@vegaprotocol/react-helpers';
+import type {
+  SimpleMarkets,
+  SimpleMarkets_markets,
+} from './__generated__/SimpleMarkets';
+import type {
+  SimpleMarketDataSub,
+  SimpleMarketDataSub_marketData,
+} from './__generated__/SimpleMarketDataSub';
+
+export const MARKETS_QUERY = gql`
+  query SimpleMarkets($CandleSince: String!) {
+    markets {
+      id
+      state
+      tradableInstrument {
+        instrument {
+          code
+          name
+          metadata {
+            tags
+          }
+          product {
+            __typename
+            ... on Future {
+              quoteName
+              settlementAsset {
+                symbol
+              }
+            }
+          }
+        }
+      }
+      candles(interval: INTERVAL_I1H, since: $CandleSince) {
+        open
+        close
+      }
+    }
+  }
+`;
+
+const MARKET_DATA_SUB = gql`
+  subscription SimpleMarketDataSub($marketIds: [ID!]!) {
+    marketsData(marketIds: $marketIds) {
+      marketState
+      marketId
+    }
+  }
+`;
+
+export const CANDLE_SUB = gql`
+  subscription CandleLive($marketId: ID!) {
+    candles(marketId: $marketId, interval: INTERVAL_I1H) {
+      close
+    }
+  }
+`;
+
+const update = (
+  data: SimpleMarkets_markets[],
+  delta: SimpleMarketDataSub_marketData
+) => {
+  return produce(data, (draft) => {
+    const index = draft.findIndex((m) => m.id === delta.market.id);
+    if (index !== -1) {
+      draft[index].state = delta.market.state;
+    }
+    // @TODO - else push new market to draft
+  });
+};
+
+const getData = (responseData: SimpleMarkets) => responseData.markets;
+const getDelta = (
+  subscriptionData: SimpleMarketDataSub
+): SimpleMarketDataSub_marketData => subscriptionData.marketData;
+
+export const dataProvider = makeDataProvider<
+  SimpleMarkets,
+  SimpleMarkets_markets[],
+  SimpleMarketDataSub,
+  SimpleMarketDataSub_marketData
+>({
+  query: MARKETS_QUERY,
+  subscriptionQuery: MARKET_DATA_SUB,
+  update,
+  getData,
+  getDelta,
+});
+
+export default dataProvider;

apps/console-lite/src/app/components/simple-market-list/simple-market-list.spec.tsx

@@ -4,14 +4,21 @@ import {
   render,
   screen,
   waitFor,
+  cleanup,
   getAllByRole,
   fireEvent,
 } from '@testing-library/react';
 import { MockedProvider } from '@apollo/client/testing';
+import type { MockedResponse } from '@apollo/client/testing';
 import { BrowserRouter } from 'react-router-dom';
 import { MarketState } from '@vegaprotocol/types';
-import type { Market } from '@vegaprotocol/market-list';
 import SimpleMarketList from './simple-market-list';
+import { MARKETS_QUERY } from './data-provider';
+import type {
+  SimpleMarkets_markets,
+  SimpleMarkets,
+} from './__generated__/SimpleMarkets';
+import type { SimpleMarketDataSub_marketData } from './__generated__/SimpleMarketDataSub';
 
 const mockedNavigate = jest.fn();
 
@@ -21,11 +28,20 @@ jest.mock('react-router-dom', () => ({
   useParams: () => ({}),
 }));
 
-jest.mock('./simple-market-percent-change', () => jest.fn());
+jest.mock('date-fns', () => ({
+  subDays: () => new Date('2022-06-02T11:11:21.721Z'),
+}));
 
-let marketsMock = [
+let updateMock: ({
+  delta,
+}: {
+  delta: SimpleMarketDataSub_marketData;
+}) => boolean;
+
+let mockData = [
   {
-    id: 'MARKET_A',
+    id: '1',
+    name: 'Market 1',
     state: MarketState.STATE_ACTIVE,
     tradableInstrument: {
       instrument: {
@@ -41,7 +57,8 @@ let marketsMock = [
     },
   },
   {
-    id: 'MARKET_B',
+    id: '2',
+    name: 'Market 2',
     state: MarketState.STATE_ACTIVE,
     tradableInstrument: {
       instrument: {
@@ -56,26 +73,20 @@ let marketsMock = [
       },
     },
   },
-] as unknown as Market[];
+] as unknown as SimpleMarkets_markets[];
 
-const LIB = '@vegaprotocol/market-list';
-const useMarketList = () => {
-  return {
-    data: {
-      markets: marketsMock,
-      marketsData: [],
-      marketsCandles: [],
-    },
-    loading: false,
-    error: false,
-  };
+const mockUseDataProvider = ({ update }: { update: () => boolean }) => {
+  updateMock = update;
+  return { data: mockData, loading: false, error: false };
 };
-jest.mock(LIB, () => ({
-  ...jest.requireActual(LIB),
-  useMarketList: jest.fn(() => useMarketList()),
+
+jest.mock('@vegaprotocol/react-helpers', () => ({
+  ...jest.requireActual('@vegaprotocol/react-helpers'),
+  useDataProvider: jest.fn((args) => mockUseDataProvider(args)),
 }));
 
 const mockIsTradable = jest.fn((_arg) => true);
+
 jest.mock('../../constants', () => ({
   ...jest.requireActual('../../constants'),
   IS_MARKET_TRADABLE: jest.fn((arg) => mockIsTradable(arg)),
@@ -84,12 +95,25 @@ jest.mock('../../constants', () => ({
 describe('SimpleMarketList', () => {
   afterEach(() => {
     jest.clearAllMocks();
+    cleanup();
   });
 
+  const mocks: MockedResponse<SimpleMarkets> = {
+    request: {
+      query: MARKETS_QUERY,
+      variables: {
+        CandleSince: '2022-06-02T11:11:21.721Z',
+      },
+    },
+    result: {
+      data: { markets: mockData },
+    },
+  };
+
   it('should be properly rendered with some data', async () => {
     await act(async () => {
       render(
-        <MockedProvider mocks={[]}>
+        <MockedProvider mocks={[mocks]}>
           <SimpleMarketList />
         </MockedProvider>,
         { wrapper: BrowserRouter }
@@ -100,49 +124,95 @@ describe('SimpleMarketList', () => {
       expect(
         document.querySelector('.ag-center-cols-container')
       ).toBeInTheDocument();
+    });
+    await waitFor(() => {
       const container = document.querySelector('.ag-center-cols-container');
       expect(getAllByRole(container as HTMLDivElement, 'row')).toHaveLength(2);
     });
   });
 
-  it('click on row should be properly handled', async () => {
+  it('update should return proper boolean value', async () => {
     await act(async () => {
       render(
-        <MockedProvider mocks={[]}>
+        <MockedProvider mocks={[mocks]}>
           <SimpleMarketList />
         </MockedProvider>,
         { wrapper: BrowserRouter }
       );
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+    await waitFor(() => {
+      expect(
+        document.querySelector('.ag-center-cols-container')
+      ).toBeInTheDocument();
+    });
+
+    await expect(
+      updateMock({
+        delta: {
+          __typename: 'MarketData',
+          market: {
+            __typename: 'Market',
+            id: '2',
+            state: MarketState.STATE_ACTIVE,
+          },
+        },
+      })
+    ).toEqual(true);
+
+    await expect(
+      updateMock({
+        delta: {
+          __typename: 'MarketData',
+          market: {
+            __typename: 'Market',
+            id: '2',
+            state: MarketState.STATE_SUSPENDED,
+          },
+        },
+      })
+    ).toEqual(false);
+  });
+
+  it('click on row should be properly handled', async () => {
+    await act(async () => {
+      render(
+        <MockedProvider mocks={[mocks]}>
+          <SimpleMarketList />
+        </MockedProvider>,
+        { wrapper: BrowserRouter }
+      );
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+    await waitFor(() => {
+      expect(
+        document.querySelector('.ag-center-cols-container')
+      ).toBeInTheDocument();
     });
     mockIsTradable.mockClear();
     const container = document.querySelector('.ag-center-cols-container');
     const firstRow = getAllByRole(container as HTMLDivElement, 'row')[0];
-    expect(firstRow).toHaveAttribute('row-id', marketsMock[0].id);
-    await act(async () => {
-      fireEvent.click(firstRow);
-    });
+    expect(firstRow).toHaveAttribute('row-id', '1');
+    fireEvent.click(firstRow);
     await waitFor(() => {
-      expect(mockIsTradable).toHaveBeenCalledWith(
-        expect.objectContaining({
-          id: marketsMock[0].id,
-          state: MarketState.STATE_ACTIVE,
-        })
-      );
-      expect(mockedNavigate).toHaveBeenCalledWith(
-        `/trading/${marketsMock[0].id}`
-      );
+      expect(mockIsTradable).toHaveBeenCalledWith({
+        ...mockData[0],
+        percentChange: '-',
+      });
+      expect(mockedNavigate).toHaveBeenCalledWith(`/trading/${mockData[0].id}`);
     });
   });
 
   it('should be properly renderer as empty', async () => {
-    marketsMock = [];
+    mockData = [];
     await act(async () => {
       render(
-        <MockedProvider mocks={[]}>
+        <MockedProvider mocks={[mocks]}>
           <SimpleMarketList />
         </MockedProvider>,
         { wrapper: BrowserRouter }
       );
+      await new Promise((resolve) => setTimeout(resolve, 0));
     });
     await waitFor(() => {
       expect(screen.getByText('No data to display')).toBeInTheDocument();

apps/console-lite/src/app/components/simple-market-list/simple-market-list.tsx

@@ -1,16 +1,29 @@
-import { useCallback, useContext, useEffect, useMemo, useRef } from 'react';
+import React, {
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+} from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
+import { subDays } from 'date-fns';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridDynamic as AgGrid } from '@vegaprotocol/ui-toolkit';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
+import {
+  useDataProvider,
+  useScreenDimensions,
+} from '@vegaprotocol/react-helpers';
 import { t } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { ThemeContext } from '@vegaprotocol/react-helpers';
 import type { MarketState } from '@vegaprotocol/types';
-import useMarketsFilterData from './use-markets-filter-data';
-import useColumnDefinitions from './use-column-definitions';
+import useMarketsFilterData from '../../hooks/use-markets-filter-data';
+import useColumnDefinitions from '../../hooks/use-column-definitions';
+import dataProvider from './data-provider';
 import * as constants from './constants';
 import SimpleMarketToolbar from './simple-market-toolbar';
+import type { SimpleMarkets_markets } from './__generated__/SimpleMarkets';
+import type { SimpleMarketDataSub_marketData } from './__generated__/SimpleMarketDataSub';
 import { IS_MARKET_TRADABLE } from '../../constants';
 import type {
   CellKeyDownEvent,
@@ -20,10 +33,8 @@ import type {
   GetRowIdParams,
   TabToNextCellParams,
 } from 'ag-grid-community/dist/lib/entities/iCallbackParams';
-import type { Market, MarketsListData } from '@vegaprotocol/market-list';
-import { useMarketList } from '@vegaprotocol/market-list';
 
-export type MarketWithPercentChange = Market & {
+export type SimpleMarketsType = SimpleMarkets_markets & {
   percentChange?: number | '-';
 };
 
@@ -40,9 +51,27 @@ const SimpleMarketList = () => {
   const theme = useContext(ThemeContext);
   const statusesRef = useRef<Record<string, MarketState | ''>>({});
   const gridRef = useRef<AgGridReact | null>(null);
+  const variables = useMemo(
+    () => ({
+      CandleSince: subDays(Date.now(), 1).toJSON(),
+    }),
+    []
+  );
+  const update = useCallback(
+    ({ delta }: { delta: SimpleMarketDataSub_marketData }) =>
+      statusesRef.current[delta.market.id] === delta.market.state,
+    [statusesRef]
+  );
 
-  const { data, error, loading } = useMarketList();
-  const localData = useMarketsFilterData(data as MarketsListData, params);
+  const { data, error, loading } = useDataProvider({
+    dataProvider,
+    update,
+    variables,
+  });
+  const localData: Array<SimpleMarketsType> = useMarketsFilterData(
+    data || [],
+    params
+  );
 
   const handleOnGridReady = useCallback(() => {
     gridRef.current?.api?.sizeColumnsToFit();
@@ -50,7 +79,7 @@ const SimpleMarketList = () => {
 
   useEffect(() => {
     const statuses: Record<string, MarketState | ''> = {};
-    data?.markets?.forEach((market) => {
+    data?.forEach((market) => {
       statuses[market.id] = market.state || '';
     });
     statusesRef.current = statuses;
@@ -66,7 +95,7 @@ const SimpleMarketList = () => {
   const getRowId = useCallback(({ data }: GetRowIdParams) => data.id, []);
 
   const handleRowClicked = useCallback(
-    ({ data }: { data: Market }) => {
+    ({ data }: { data: SimpleMarketsType }) => {
       if (IS_MARKET_TRADABLE(data)) {
         navigate(`/trading/${data.id}`);
       }
@@ -106,11 +135,10 @@ const SimpleMarketList = () => {
 
   return (
     <div className="h-full p-4 md:p-6 grid grid-rows-[min-content,1fr]">
-      <SimpleMarketToolbar data={data?.markets || []} />
+      <SimpleMarketToolbar data={data || []} />
       <AsyncRenderer loading={loading} error={error} data={localData}>
         <AgGrid
-          className="mb-32 min-h-[300px] w-full"
-          style={constants.AG_GRID_CONTAINER_STYLES}
+          className="mb-32 min-h-[300px]"
           defaultColDef={defaultColDef}
           columnDefs={columnDefs}
           rowData={localData}

apps/console-lite/src/app/components/simple-market-list/simple-market-percent-change.spec.tsx

@@ -2,10 +2,10 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { MockedProvider } from '@apollo/react-testing';
 import SimpleMarketPercentChange from './simple-market-percent-change';
-import type { Candle } from '@vegaprotocol/market-list';
+import type { SimpleMarkets_markets_candles } from './__generated__/SimpleMarkets';
 
 describe('SimpleMarketPercentChange should parse proper change', () => {
-  let candles: (Candle | null)[] | null;
+  let candles: (SimpleMarkets_markets_candles | null)[] | null;
   const setValue = () => undefined;
   it('empty array', () => {
     candles = [];
@@ -34,7 +34,11 @@ describe('SimpleMarketPercentChange should parse proper change', () => {
     expect(screen.getByText('-')).toBeInTheDocument();
   });
   it('an appreciated one', () => {
-    candles = [{ open: '50' } as Candle, { close: '100' } as Candle, null];
+    candles = [
+      { open: '50' } as SimpleMarkets_markets_candles,
+      { close: '100' } as SimpleMarkets_markets_candles,
+      null,
+    ];
     render(
       <MockedProvider>
         <SimpleMarketPercentChange
@@ -50,7 +54,11 @@ describe('SimpleMarketPercentChange should parse proper change', () => {
     );
   });
   it('a depreciated one', () => {
-    candles = [{ open: '100' } as Candle, { close: '50' } as Candle, null];
+    candles = [
+      { open: '100' } as SimpleMarkets_markets_candles,
+      { close: '50' } as SimpleMarkets_markets_candles,
+      null,
+    ];
     render(
       <MockedProvider>
         <SimpleMarketPercentChange

apps/console-lite/src/app/components/simple-market-list/simple-market-percent-change.tsx

@@ -1,20 +1,26 @@
-import { useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import classNames from 'classnames';
 import { InView } from 'react-intersection-observer';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
-import type { Candle } from '@vegaprotocol/market-list';
-import { marketCandlesProvider } from '@vegaprotocol/market-list';
-import { Interval } from '@vegaprotocol/types';
+import { useSubscription } from '@apollo/client';
+import type { SimpleMarkets_markets_candles } from './__generated__/SimpleMarkets';
+import type {
+  CandleLive,
+  CandleLiveVariables,
+} from './__generated__/CandleLive';
+import { CANDLE_SUB } from './data-provider';
 
 interface Props {
-  candles: (Candle | null)[] | null;
+  candles: (SimpleMarkets_markets_candles | null)[] | null;
   marketId: string;
   setValue: (arg: unknown) => void;
 }
 
 const EMPTY_VALUE = ' - ';
 
-const getChange = (candles: (Candle | null)[] | null, lastClose?: string) => {
+const getChange = (
+  candles: (SimpleMarkets_markets_candles | null)[] | null,
+  lastClose?: string
+) => {
   if (candles) {
     const first = parseInt(candles.find((item) => item?.open)?.open || '-1');
     const last =
@@ -68,14 +74,11 @@ const SimpleMarketPercentChangeWrapper = (props: Props) => {
 };
 
 const SimpleMarketPercentChange = ({ candles, marketId, setValue }: Props) => {
-  const { data } = useDataProvider({
-    dataProvider: marketCandlesProvider,
-    variables: { marketId, interval: Interval.INTERVAL_I1D },
-  });
-
-  const close = data?.map((m) => m.close);
-
-  const change = getChange(candles, close?.[0]);
+  const { data: { candles: { close = undefined } = {} } = {} } =
+    useSubscription<CandleLive, CandleLiveVariables>(CANDLE_SUB, {
+      variables: { marketId },
+    });
+  const change = getChange(candles, close);
   const colorClasses = getClassColor(change);
   useEffect(() => {
     const value = parseFloat(change);

apps/console-lite/src/app/components/simple-market-list/simple-market-renderer.spec.tsx

@@ -1,36 +1,36 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
+import type { MarketNames_markets } from '@vegaprotocol/deal-ticket';
 import { MarketState } from '@vegaprotocol/types';
 import MarketNameRenderer from './simple-market-renderer';
-import type { Market } from '@vegaprotocol/market-list';
 
 describe('SimpleMarketRenderer', () => {
   const market = {
-    id: 'MARKET_A',
+    id: 'marketId',
     state: MarketState.STATE_ACTIVE,
     tradableInstrument: {
       instrument: {
-        code: 'MARKET_A_CODE',
-        name: 'MARKET_A_NAME',
+        code: 'Market code',
+        name: 'Market Name',
         product: {
-          quoteName: 'MARKET_A_QUOTE_NAME',
+          quoteName: 'Quote name',
         },
         metadata: {
           tags: null,
         },
       },
     },
-  } as Market;
+  } as MarketNames_markets;
 
   it('should properly render not mobile', () => {
     render(<MarketNameRenderer market={market} isMobile={false} />);
-    expect(screen.getByText('MARKET_A_NAME')).toBeInTheDocument();
-    expect(screen.getByText('MARKET_A_QUOTE_NAME')).toBeInTheDocument();
+    expect(screen.getByText('Market Name')).toBeInTheDocument();
+    expect(screen.getByText('Quote name')).toBeInTheDocument();
   });
 
   it('should properly render mobile', () => {
     render(<MarketNameRenderer market={market} isMobile={true} />);
-    expect(screen.getByText('MARKET_A_CODE')).toBeInTheDocument();
-    expect(screen.getByText('MARKET_A_QUOTE_NAME')).toBeInTheDocument();
+    expect(screen.getByText('Market code')).toBeInTheDocument();
+    expect(screen.getByText('Quote name')).toBeInTheDocument();
   });
 });

apps/console-lite/src/app/components/simple-market-list/simple-market-renderer.tsx

@@ -1,9 +1,10 @@
+import React from 'react';
 import classNames from 'classnames';
+import type { MarketNames_markets } from '@vegaprotocol/deal-ticket';
 import SimpleMarketExpires from './simple-market-expires';
-import type { Market } from '@vegaprotocol/market-list';
 
 interface Props {
-  market: Market;
+  market: MarketNames_markets;
   isMobile?: boolean;
 }
 

apps/console-lite/src/app/components/simple-market-list/simple-market-toolbar.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import classNames from 'classnames';
 import { useNavigate, useParams, Link } from 'react-router-dom';
 import {
@@ -17,10 +17,10 @@ import {
 import { MarketState } from '@vegaprotocol/types';
 import useMarketFiltersData from '../../hooks/use-markets-filter';
 import { STATES_FILTER } from './constants';
-import type { Markets_marketsConnection_edges_node } from '@vegaprotocol/market-list';
+import type { SimpleMarkets_markets } from './__generated__/SimpleMarkets';
 
 interface Props {
-  data: Markets_marketsConnection_edges_node[];
+  data: SimpleMarkets_markets[];
 }
 
 const SimpleMarketToolbar = ({ data }: Props) => {
@@ -98,7 +98,7 @@ const SimpleMarketToolbar = ({ data }: Props) => {
           </Link>
         </li>
         {products.map((product, i) => (
-          <li key={`${product}-${i}`} className="mx-2 whitespace-nowrap">
+          <li key={product} className="mx-2 whitespace-nowrap">
             <Link
               to={`/markets/${
                 params.state || MarketState.STATE_ACTIVE

apps/console-lite/src/app/components/simple-market-list/use-markets-filter-data.ts

@@ -1,52 +0,0 @@
-import { useMemo } from 'react';
-import { MarketState } from '@vegaprotocol/types';
-import type { MarketsListData } from '@vegaprotocol/market-list';
-import type { RouterParams } from './simple-market-list';
-
-const useMarketsFilterData = (data: MarketsListData, params: RouterParams) => {
-  return useMemo(() => {
-    const markets =
-      data?.markets?.filter((item) => {
-        if (
-          params.product &&
-          params.product !==
-            item.tradableInstrument.instrument.product.__typename
-        ) {
-          return false;
-        }
-        if (
-          params.asset &&
-          params.asset !== 'all' &&
-          params.asset !==
-            item.tradableInstrument.instrument.product.settlementAsset.symbol
-        ) {
-          return false;
-        }
-        const state =
-          params.state === 'all'
-            ? ''
-            : params.state
-            ? params.state
-            : MarketState.STATE_ACTIVE;
-        if (state && state !== item.state) {
-          return false;
-        }
-        return true;
-      }) || [];
-
-    return markets.map((market) => ({
-      ...market,
-      candles: (data?.marketsCandles || [])
-        .filter((c) => c.marketId === market.id)
-        .map((c) => c.candles),
-    }));
-  }, [
-    data?.marketsCandles,
-    data?.markets,
-    params.product,
-    params.asset,
-    params.state,
-  ]);
-};
-
-export default useMarketsFilterData;

apps/console-lite/src/app/constants/index.ts

@@ -1,6 +1,6 @@
+import type { SimpleMarkets_markets } from '../components/simple-market-list/__generated__/SimpleMarkets';
 import { MarketState } from '@vegaprotocol/types';
 import { t } from '@vegaprotocol/react-helpers';
-import type { Market } from '@vegaprotocol/market-list';
 
 export const DATE_FORMAT = 'dd MMMM yyyy HH:mm';
 export const EXPIRE_DATE_FORMAT = 'MMM dd';
@@ -9,7 +9,7 @@ export const TRADABLE_STATES = {
   [MarketState.STATE_ACTIVE]: true,
 };
 
-export const IS_MARKET_TRADABLE = (market: Market) =>
+export const IS_MARKET_TRADABLE = (market: SimpleMarkets_markets) =>
   Boolean((market.state ?? '') in TRADABLE_STATES && market?.id);
 
 export const MARKET_STATES_MAP: Record<MarketState | '', string> = {

apps/console-lite/src/app/hooks/use-calculate-slippage.spec.tsx

@@ -64,15 +64,6 @@ jest.mock('@vegaprotocol/market-depth', () => ({
   useOrderBookData: jest.fn(() => mockOrderBookData),
 }));
 
-jest.mock('@vegaprotocol/react-helpers', () => ({
-  ...jest.requireActual('@vegaprotocol/react-helpers'),
-  useDataProvider: jest.fn(() => ({
-    data: {
-      marketsConnection: [],
-    },
-  })),
-}));
-
 describe('useCalculateSlippage Hook', () => {
   describe('calculate proper result', () => {
     afterEach(() => {

apps/console-lite/src/app/hooks/use-calculate-slippage.ts

@@ -1,15 +1,9 @@
 import { useMemo } from 'react';
 import { Side } from '@vegaprotocol/types';
 import { useOrderBookData } from '@vegaprotocol/market-depth';
-import { marketProvider } from '@vegaprotocol/market-list';
-import type { Market } from '@vegaprotocol/market-list';
 import type { Order } from '@vegaprotocol/orders';
 import { BigNumber } from 'bignumber.js';
-import {
-  formatNumber,
-  toBigNum,
-  useDataProvider,
-} from '@vegaprotocol/react-helpers';
+import { formatNumber, toBigNum } from '@vegaprotocol/react-helpers';
 
 interface Props {
   marketId: string;
@@ -22,16 +16,11 @@ const useCalculateSlippage = ({ marketId, order }: Props) => {
     variables,
     throttleMilliseconds: 5000,
   });
-  const { data: market } = useDataProvider<Market, never>({
-    dataProvider: marketProvider,
-    noUpdate: true,
-    variables,
-  });
   const volPriceArr =
     data?.depth[order.side === Side.SIDE_BUY ? 'sell' : 'buy'] || [];
-  if (volPriceArr.length && market) {
-    const decimals = market.decimalPlaces ?? 0;
-    const positionDecimals = market.positionDecimalPlaces ?? 0;
+  if (volPriceArr.length) {
+    const decimals = data?.decimalPlaces ?? 0;
+    const positionDecimals = data?.positionDecimalPlaces ?? 0;
     const bestPrice = toBigNum(volPriceArr[0].price, decimals);
     const { size } = order;
     let descSize = new BigNumber(size);

apps/console-lite/src/app/hooks/use-column-definitions.tsx

@@ -1,13 +1,14 @@
-import { useMemo } from 'react';
+import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { t } from '@vegaprotocol/react-helpers';
-import MarketNameRenderer from './simple-market-renderer';
-import SimpleMarketPercentChange from './simple-market-percent-change';
+import type { SimpleMarkets_markets } from '../components/simple-market-list/__generated__/SimpleMarkets';
+import MarketNameRenderer from '../components/simple-market-list/simple-market-renderer';
+import SimpleMarketPercentChange from '../components/simple-market-list/simple-market-percent-change';
 import { Icon } from '@vegaprotocol/ui-toolkit';
 import type { ValueSetterParams } from 'ag-grid-community';
+import type { SimpleMarketsType } from '../components/simple-market-list/simple-market-list';
 import { IconNames } from '@blueprintjs/icons';
-import { IS_MARKET_TRADABLE, MARKET_STATES_MAP } from '../../constants';
-import type { Candle, Market } from '@vegaprotocol/market-list';
+import { IS_MARKET_TRADABLE, MARKET_STATES_MAP } from '../constants';
 
 interface Props {
   isMobile: boolean;
@@ -23,7 +24,7 @@ const useColumnDefinitions = ({ isMobile }: Props) => {
         minWidth: isMobile ? 160 : 350,
         field: 'tradableInstrument.instrument.name',
         cellClass: 'overflow-visible',
-        cellRenderer: ({ data }: { data: Market }) => (
+        cellRenderer: ({ data }: { data: SimpleMarketsType }) => (
           <MarketNameRenderer market={data} isMobile={isMobile} />
         ),
       },
@@ -34,7 +35,7 @@ const useColumnDefinitions = ({ isMobile }: Props) => {
         minWidth: isMobile ? 50 : 80,
         cellClass: 'uppercase flex h-full items-center',
         field: 'tradableInstrument.instrument.product.settlementAsset.symbol',
-        cellRenderer: ({ data }: { data: Market }) => (
+        cellRenderer: ({ data }: { data: SimpleMarketsType }) => (
           <div
             className="grid h-full items-center text-center"
             title={
@@ -69,7 +70,7 @@ const useColumnDefinitions = ({ isMobile }: Props) => {
           data,
           setValue,
         }: {
-          data: { id: string; candles: Candle[] };
+          data: SimpleMarketsType;
           setValue: (arg: unknown) => void;
         }) => (
           <SimpleMarketPercentChange
@@ -95,7 +96,7 @@ const useColumnDefinitions = ({ isMobile }: Props) => {
         field: 'state',
         headerClass: 'uppercase',
         minWidth: 100,
-        cellRenderer: ({ data }: { data: Market }) => (
+        cellRenderer: ({ data }: { data: SimpleMarkets_markets }) => (
           <div className="uppercase flex h-full items-center justify-center">
             <div className="border text-center px-2 md:px-6 leading-4 md:leading-6">
               {MARKET_STATES_MAP[data.state || '']}
@@ -109,7 +110,7 @@ const useColumnDefinitions = ({ isMobile }: Props) => {
         headerClass: 'uppercase',
         sortable: false,
         width: isMobile ? 35 : 100,
-        cellRenderer: ({ data }: { data: Market }) => (
+        cellRenderer: ({ data }: { data: SimpleMarkets_markets }) => (
           <div className="h-full flex h-full items-center justify-end">
             <div className="uppercase text-center pr-2">
               {!isMobile && t('Trade')}

apps/console-lite/src/app/hooks/use-markets-filter-data.ts

@@ -0,0 +1,37 @@
+import type { SimpleMarkets_markets } from '../components/simple-market-list/__generated__/SimpleMarkets';
+import type { RouterParams } from '../components/simple-market-list/simple-market-list';
+import { MarketState } from '@vegaprotocol/types';
+
+const useMarketsFilterData = (
+  data: SimpleMarkets_markets[] = [],
+  params: RouterParams
+) => {
+  return data.filter((item) => {
+    if (
+      params.product &&
+      params.product !== item.tradableInstrument.instrument.product.__typename
+    ) {
+      return false;
+    }
+    if (
+      params.asset &&
+      params.asset !== 'all' &&
+      params.asset !==
+        item.tradableInstrument.instrument.product.settlementAsset.symbol
+    ) {
+      return false;
+    }
+    const state =
+      params.state === 'all'
+        ? ''
+        : params.state
+        ? params.state
+        : MarketState.STATE_ACTIVE;
+    if (state && state !== item.state) {
+      return false;
+    }
+    return true;
+  });
+};
+
+export default useMarketsFilterData;

apps/console-lite/src/app/hooks/use-markets-filter.ts

@@ -1,7 +1,7 @@
-import type { Market } from '@vegaprotocol/market-list';
 import { useEffect, useState } from 'react';
+import type { SimpleMarkets_markets } from '../components/simple-market-list/__generated__/SimpleMarkets';
 
-const useMarketFilters = (data: Market[]) => {
+const useMarketFilters = (data: SimpleMarkets_markets[]) => {
   const [products, setProducts] = useState<string[]>([]);
   const [assetsPerProduct, setAssetsPerProduct] = useState<
     Record<string, string[]>

apps/console-lite/src/app/hooks/use-order-closeout.ts

@@ -74,7 +74,7 @@ const useOrderCloseOut = ({ order, market, partyData }: Props): string => {
 
   const marginMaintenanceLevel = new BigNumber(
     addDecimal(
-      data?.party?.marginsConnection?.edges?.find(
+      data?.party?.marginsConnection.edges?.find(
         (nodes) => nodes.node.market.id === market.id
       )?.node.maintenanceLevel || 0,
       market.decimalPlaces

apps/console-lite/src/app/lib/apollo-client.tsx

@@ -38,9 +38,6 @@ export function createClient(base?: string) {
       Node: {
         keyFields: false,
       },
-      Instrument: {
-        keyFields: false,
-      },
     },
   });
 

apps/explorer-e2e/.env

@@ -3,6 +3,7 @@ NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_ENV=CUSTOM
+NX_VEGA_REST=http://localhost:3029
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/capsule-network.json
 
 CYPRESS_VEGA_TENDERMINT_URL=http://localhost:26617

apps/explorer-e2e/.env.devnet

@@ -4,6 +4,7 @@ NX_TENDERMINT_URL=https://n04.d.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_ENV=DEVNET
+NX_VEGA_REST=https://api.n04.d.vega.xyz
 
 # App flags
 NX_EXPLORER_ASSETS=1
@@ -11,7 +12,7 @@ NX_EXPLORER_GENESIS=1
 NX_EXPLORER_GOVERNANCE=1
 NX_EXPLORER_MARKETS=1
 NX_EXPLORER_ORACLES=1
-NX_EXPLORER_TXS_LIST=0
+NX_EXPLORER_TXS_LIST=1
 NX_EXPLORER_NETWORK_PARAMETERS=1
 NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1

apps/explorer-e2e/.env.mainnet

@@ -2,8 +2,9 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://mainnet-observer-proxy01.ops.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocket
-NX_VEGA_URL=https://api.vega.xyz/query
+NX_VEGA_URL=https://api.token.vega.xyz/query
 NX_VEGA_ENV=MAINNET
+NX_VEGA_REST=https://api.token.vega.xyz/
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer-e2e/.env.stagnet3

@@ -4,6 +4,7 @@ NX_TENDERMINT_URL=https://n01.stagnet3.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://n01.stagnet3.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET3
+NX_VEGA_REST=https://api.n01.stagnet3.vega.xyz
 
 # App flags
 NX_EXPLORER_ASSETS=1
@@ -11,7 +12,7 @@ NX_EXPLORER_GENESIS=1
 NX_EXPLORER_GOVERNANCE=1
 NX_EXPLORER_MARKETS=1
 NX_EXPLORER_ORACLES=1
-NX_EXPLORER_TXS_LIST=0
+NX_EXPLORER_TXS_LIST=1
 NX_EXPLORER_NETWORK_PARAMETERS=1
 NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1

apps/explorer-e2e/.env.testnet

@@ -1,9 +1,10 @@
 # App configuration variables
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
-NX_TENDERMINT_URL=https://tm.n07.testnet.vega.xyz/tm
+NX_TENDERMINT_URL=https://tm.n06.testnet.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://lb.testnet.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
+NX_VEGA_REST=https://api.n11.testnet.vega.xyz
 
 # App flags
 NX_EXPLORER_ASSETS=1
@@ -11,7 +12,7 @@ NX_EXPLORER_GENESIS=1
 NX_EXPLORER_GOVERNANCE=1
 NX_EXPLORER_MARKETS=1
 NX_EXPLORER_ORACLES=1
-NX_EXPLORER_TXS_LIST=0
+NX_EXPLORER_TXS_LIST=1
 NX_EXPLORER_NETWORK_PARAMETERS=1
 NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1

apps/explorer/.env

@@ -1,7 +1,14 @@
+NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
+NX_TENDERMINT_URL=http://localhost:26617
+NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
+NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_ENV=CUSTOM
+
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://n01.stagnet3.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://n01.stagnet3.vega.xyz/tm/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
+NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -15,4 +22,4 @@ NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1
 NX_EXPLORER_MARKETS=1
 NX_EXPLORER_ORACLES=1
-NX_EXPLORER_TXS_LIST=0
+NX_EXPLORER_TXS_LIST=1

apps/explorer/.env.capsule

@@ -13,7 +13,7 @@ NX_EXPLORER_GENESIS=1
 NX_EXPLORER_GOVERNANCE=1
 NX_EXPLORER_MARKETS=1
 NX_EXPLORER_ORACLES=1
-NX_EXPLORER_TXS_LIST=0
+NX_EXPLORER_TXS_LIST=1
 NX_EXPLORER_NETWORK_PARAMETERS=1
 NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1

apps/explorer/.env.mainnet

@@ -3,7 +3,7 @@ NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-exp
 NX_TENDERMINT_URL=https://mainnet-observer-proxy01.ops.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
-NX_VEGA_URL=https://api.vega.xyz/query
+NX_VEGA_URL=https://api.token.vega.xyz/query
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=MAINNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

apps/explorer/.env.testnet

@@ -1,8 +1,9 @@
 # App configuration variables
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
-NX_TENDERMINT_URL=https://tm.n07.testnet.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n07.testnet.vega.xyz/websocket
+NX_TENDERMINT_URL=https://tm.n06.testnet.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n06.testnet.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
+NX_VEGA_URL=https://api.n09.testnet.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=TESTNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

apps/explorer/src/app/routes/assets/index.tsx

@@ -1,5 +1,6 @@
+import compact from 'lodash/compact';
 import { gql, useQuery } from '@apollo/client';
-import { getAssets, t } from '@vegaprotocol/react-helpers';
+import { t } from '@vegaprotocol/react-helpers';
 import React from 'react';
 import { RouteTitle } from '../../components/route-title';
 import { SubHeading } from '../../components/sub-heading';
@@ -39,7 +40,7 @@ export const ASSETS_QUERY = gql`
 const Assets = () => {
   const { data } = useQuery<AssetsQuery>(ASSETS_QUERY);
 
-  const assets = getAssets(data);
+  const assets = compact(data?.assetsConnection?.edges).map((e) => e.node);
 
   return (
     <section>

apps/explorer/src/app/routes/governance/index.tsx

@@ -1,3 +1,4 @@
+import compact from 'lodash/compact';
 import { gql, useQuery } from '@apollo/client';
 import { t } from '@vegaprotocol/react-helpers';
 import React from 'react';
@@ -99,9 +100,10 @@ const Governance = () => {
   const { data } = useQuery<ProposalsQuery>(PROPOSALS_QUERY, {
     errorPolicy: 'ignore',
   });
-  const proposals = getProposals(
-    data
-  ) as ProposalsQuery_proposalsConnection_edges_node[];
+
+  const proposals = compact(data?.proposalsConnection?.edges).map(
+    (e) => e.node
+  );
 
   if (!data) return null;
   return (

apps/explorer/src/app/routes/oracles/OracleSpecs.graphql

@@ -1,26 +1,22 @@
 query OracleSpecs {
-  oracleSpecsConnection {
-    edges {
-      node {
-        status
-        id
-        createdAt
-        updatedAt
-        pubKeys
-        filters {
-          key {
-            name
-            type
-          }
-          conditions {
-            value
-            operator
-          }
-        }
-        data {
-          pubKeys
-        }
+  oracleSpecs {
+    status
+    id
+    createdAt
+    updatedAt
+    pubKeys
+    filters {
+      key {
+        name
+        type
       }
+      conditions {
+        value
+        operator
+      }
+    }
+    data {
+      pubKeys
     }
   }
 }

apps/explorer/src/app/routes/oracles/__generated___/OracleSpecs.ts

@@ -6,33 +6,29 @@ const defaultOptions = {} as const;
 export type OracleSpecsQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type OracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', status: Types.OracleSpecStatus, id: string, createdAt: string, updatedAt?: string | null, pubKeys?: Array<string> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null, data: Array<{ __typename?: 'OracleData', pubKeys?: Array<string> | null }> } } | null> | null } | null };
+export type OracleSpecsQuery = { __typename?: 'Query', oracleSpecs?: Array<{ __typename?: 'OracleSpec', status: Types.OracleSpecStatus, id: string, createdAt: string, updatedAt?: string | null, pubKeys?: Array<string> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null, data: Array<{ __typename?: 'OracleData', pubKeys?: Array<string> | null }> }> | null };
 
 
 export const OracleSpecsDocument = gql`
     query OracleSpecs {
-  oracleSpecsConnection {
-    edges {
-      node {
-        status
-        id
-        createdAt
-        updatedAt
-        pubKeys
-        filters {
-          key {
-            name
-            type
-          }
-          conditions {
-            value
-            operator
-          }
-        }
-        data {
-          pubKeys
-        }
+  oracleSpecs {
+    status
+    id
+    createdAt
+    updatedAt
+    pubKeys
+    filters {
+      key {
+        name
+        type
       }
+      conditions {
+        value
+        operator
+      }
+    }
+    data {
+      pubKeys
     }
   }
 }

apps/explorer/src/app/routes/pending/index.tsx

@@ -17,6 +17,7 @@ const PendingTxs = () => {
       <RouteTitle data-testid="unconfirmed-transactions-header">
         {t('Unconfirmed transactions')}
       </RouteTitle>
+      https://tm.n06.testnet.vega.xyz/tm/unconfirmed_txs
       <br />
       <div>{t(`Number: ${unconfirmedTransactions?.result?.n_txs || 0}`)}</div>
       <br />

apps/explorer/src/app/routes/validators/Nodes.graphql

@@ -18,5 +18,6 @@ query NodesQuery {
       online
     }
     status
+    name
   }
 }

apps/explorer/src/app/routes/validators/__generated___/Nodes.ts

@@ -30,6 +30,7 @@ export const NodesQueryDocument = gql`
       online
     }
     status
+    name
   }
 }
     `;

apps/liquidity-provision-dashboard-e2e/.eslintrc.json

@@ -1,10 +0,0 @@
-{
-  "extends": ["plugin:cypress/recommended", "../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"],
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {}
-    }
-  ]
-}

apps/liquidity-provision-dashboard-e2e/cypress.config.js

@@ -1,24 +0,0 @@
-const { defineConfig } = require('cypress');
-
-module.exports = defineConfig({
-  projectId: 'et4snf',
-
-  e2e: {
-    baseUrl: 'http://localhost:4200',
-    fileServerFolder: '.',
-    fixturesFolder: false,
-    specPattern: './src/integration/*.ts',
-    excludeSpecPattern: '**/*.js',
-    modifyObstructiveCode: false,
-    supportFile: './src/support/index.ts',
-    video: true,
-    videoUploadOnPasses: false,
-    videosFolder:
-      '../../dist/cypress/apps/liquidity-provision-dashboard-e2e/videos',
-    screenshotsFolder:
-      '../../dist/cypress/apps/liquidity-provision-dashboard-e2e/screenshots',
-    chromeWebSecurity: false,
-    viewportWidth: 1440,
-    viewportHeight: 900,
-  },
-});

apps/liquidity-provision-dashboard-e2e/project.json

@@ -1,30 +0,0 @@
-{
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "apps/liquidity-provision-dashboard-e2e/src",
-  "projectType": "application",
-  "targets": {
-    "e2e": {
-      "executor": "@nrwl/cypress:cypress",
-      "options": {
-        "cypressConfig": "apps/liquidity-provision-dashboard-e2e/cypress.config.js",
-        "devServerTarget": "liquidity-provision-dashboard:serve"
-      },
-      "configurations": {
-        "production": {
-          "devServerTarget": "liquidity-provision-dashboard:serve:production"
-        }
-      }
-    },
-    "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "apps/liquidity-provision-dashboard-e2e/**/*.{js,ts}"
-        ]
-      }
-    }
-  },
-  "tags": [],
-  "implicitDependencies": ["liquidity-provision-dashboard"]
-}

apps/liquidity-provision-dashboard-e2e/src/integration/app.cy.ts

@@ -1,10 +0,0 @@
-import { getGreeting } from '../support/app.po';
-
-describe('liquidity-provision-dashboard', () => {
-  beforeEach(() => cy.visit('/'));
-
-  it('should display welcome message', () => {
-    // Function helper example, see `../support/app.po.ts` file
-    getGreeting().contains('Top liquidity opportunities');
-  });
-});

apps/liquidity-provision-dashboard-e2e/src/support/app.po.ts

@@ -1 +0,0 @@
-export const getGreeting = () => cy.get('h1');

apps/liquidity-provision-dashboard-e2e/src/support/commands.ts

@@ -1,9 +0,0 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************

apps/liquidity-provision-dashboard-e2e/src/support/index.ts

@@ -1,19 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-import '@vegaprotocol/cypress';
-import 'cypress-real-events/support';
-// Import commands.js using ES2015 syntax:
-import './commands';

apps/liquidity-provision-dashboard-e2e/tsconfig.json

@@ -1,12 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "jsx": "react-jsx",
-    "sourceMap": false,
-    "allowSyntheticDefaultImports": true,
-    "outDir": "../../dist/out-tsc",
-    "allowJs": true,
-    "types": ["cypress", "node", "cypress-real-events"]
-  },
-  "include": ["src/**/*.ts", "src/**/*.js"]
-}

apps/liquidity-provision-dashboard/.babelrc

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

apps/liquidity-provision-dashboard/.browserslistrc

@@ -1,16 +0,0 @@
-# This file is used by:
-# 1. autoprefixer to adjust CSS to support the below specified browsers
-# 2. babel preset-env to adjust included polyfills
-#
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-#
-# If you need to support different browsers in production, you may tweak the list below.
-
-last 1 Chrome version
-last 1 Firefox version
-last 2 Edge major versions
-last 2 Safari major version
-last 2 iOS major versions
-Firefox ESR
-not IE 9-11 # For IE 9-11 support, remove 'not'.

apps/liquidity-provision-dashboard/.env

@@ -1,27 +0,0 @@
-# React Environment Variables
-# https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#expanding-environment-variables-in-env
-
-# Netlify Environment Variables
-# https://www.netlify.com/docs/continuous-deployment/#environment-variables
-NX_VERSION=$npm_package_version
-NX_REPOSITORY_URL=$REPOSITORY_URL
-NX_BRANCH=$BRANCH
-NX_PULL_REQUEST=$PULL_REQUEST
-NX_HEAD=$HEAD
-NX_COMMIT_REF=$COMMIT_REF
-NX_CONTEXT=$CONTEXT
-NX_REVIEW_ID=$REVIEW_ID
-NX_INCOMING_HOOK_TITLE=$INCOMING_HOOK_TITLE
-NX_INCOMING_HOOK_URL=$INCOMING_HOOK_URL
-NX_INCOMING_HOOK_BODY=$INCOMING_HOOK_BODY
-NX_URL=$URL
-NX_DEPLOY_URL=$DEPLOY_URL
-NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL
-NX_VEGA_CONFIG_URL="https://static.vega.xyz/assets/testnet-network.json"
-NX_VEGA_ENV = 'TESTNET'
-NX_VEGA_URL="https://api.n11.testnet.vega.xyz/graphql"
-NX_VEGA_WALLET_URL=http://localhost:1789/api/v1
-NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://ropsten.etherscan.io
-NX_VEGA_NETWORKS={"MAINNET":"https://alpha.console.vega.xyz"}
-NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf

apps/liquidity-provision-dashboard/.env.capsule

@@ -1,3 +0,0 @@
-# App configuration variables
-NX_VEGA_URL=http://localhost:3028/query
-NX_VEGA_ENV=LOCAL

apps/liquidity-provision-dashboard/.env.devnet

@@ -1,8 +0,0 @@
-# App configuration variables
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
-NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
-NX_VEGA_ENV=DEVNET
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\"}
-NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://ropsten.etherscan.io
-NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz

apps/liquidity-provision-dashboard/.env.mainnet

@@ -1,8 +0,0 @@
-# App configuration variables
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
-NX_VEGA_URL=https://api.vega.xyz/query
-NX_VEGA_ENV=MAINNET
-NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}'
-NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://etherscan.io
-NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz

apps/liquidity-provision-dashboard/.env.stagnet3

@@ -1,7 +0,0 @@
-# App configuration variables
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
-NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
-NX_VEGA_ENV=STAGNET3
-NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://ropsten.etherscan.io
-NX_VEGA_EXPLORER_URL=https://staging2.explorer.vega.xyz

apps/liquidity-provision-dashboard/.env.testnet

@@ -1,8 +0,0 @@
-# App configuration variables
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
-NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
-NX_VEGA_ENV=TESTNET
-NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}'
-NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://ropsten.etherscan.io
-NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf

apps/liquidity-provision-dashboard/.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": {}
-    }
-  ]
-}

apps/liquidity-provision-dashboard/jest.config.ts

@@ -1,11 +0,0 @@
-/* eslint-disable */
-export default {
-  displayName: 'liquidity-provision-dashboard',
-  preset: '../../jest.preset.js',
-  transform: {
-    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
-    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nrwl/next/babel'] }],
-  },
-  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../coverage/apps/liquidity-provision-dashboard',
-};

apps/liquidity-provision-dashboard/netlify.toml

@@ -1,4 +0,0 @@
-[[redirects]]
-  from = "/*"
-  to = "/index.html"
-  status = 200

apps/liquidity-provision-dashboard/postcss.config.js

@@ -1,10 +0,0 @@
-const { join } = require('path');
-
-module.exports = {
-  plugins: {
-    tailwindcss: {
-      config: join(__dirname, 'tailwind.config.js'),
-    },
-    autoprefixer: {},
-  },
-};

apps/liquidity-provision-dashboard/project.json

@@ -1,93 +0,0 @@
-{
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "apps/liquidity-provision-dashboard/src",
-  "projectType": "application",
-  "targets": {
-    "build": {
-      "executor": "@nrwl/web:webpack",
-      "outputs": ["{options.outputPath}"],
-      "defaultConfiguration": "production",
-      "options": {
-        "compiler": "babel",
-        "outputPath": "dist/apps/liquidity-provision-dashboard",
-        "index": "apps/liquidity-provision-dashboard/src/index.html",
-        "baseHref": "/",
-        "main": "apps/liquidity-provision-dashboard/src/main.tsx",
-        "polyfills": "apps/liquidity-provision-dashboard/src/polyfills.ts",
-        "tsConfig": "apps/liquidity-provision-dashboard/tsconfig.app.json",
-        "assets": [
-          "apps/liquidity-provision-dashboard/src/favicon.ico",
-          "apps/liquidity-provision-dashboard/src/assets"
-        ],
-        "styles": ["apps/liquidity-provision-dashboard/src/styles.scss"],
-        "scripts": [],
-        "webpackConfig": "@nrwl/react/plugins/webpack"
-      },
-      "configurations": {
-        "development": {
-          "extractLicenses": false,
-          "optimization": false,
-          "sourceMap": true,
-          "vendorChunk": true
-        },
-        "production": {
-          "fileReplacements": [
-            {
-              "replace": "apps/liquidity-provision-dashboard/src/environments/environment.ts",
-              "with": "apps/liquidity-provision-dashboard/src/environments/environment.prod.ts"
-            }
-          ],
-          "optimization": true,
-          "outputHashing": "all",
-          "sourceMap": false,
-          "namedChunks": false,
-          "extractLicenses": true,
-          "vendorChunk": false
-        }
-      }
-    },
-    "serve": {
-      "executor": "./tools/executors/webpack:serve",
-      "options": {
-        "buildTarget": "liquidity-provision-dashboard:build",
-        "hmr": true
-      },
-      "configurations": {
-        "development": {
-          "buildTarget": "liquidity-provision-dashboard:build:development"
-        },
-        "production": {
-          "buildTarget": "liquidity-provision-dashboard:build:production",
-          "hmr": false
-        }
-      }
-    },
-    "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "outputs": ["{options.outputFile}"],
-      "options": {
-        "lintFilePatterns": [
-          "apps/liquidity-provision-dashboard/**/*.{ts,tsx,js,jsx}"
-        ]
-      }
-    },
-    "test": {
-      "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/apps/liquidity-provision-dashboard"],
-      "options": {
-        "jestConfig": "apps/liquidity-provision-dashboard/jest.config.ts",
-        "passWithNoTests": true
-      }
-    },
-    "build-netlify": {
-      "executor": "@nrwl/workspace:run-commands",
-      "options": {
-        "commands": [
-          "cp apps/liquidity-provision-dashboard/netlify.toml netlify.toml",
-          "nx build liquidity-provision-dashboard"
-        ]
-      }
-    }
-  },
-  "tags": []
-}

apps/liquidity-provision-dashboard/src/app/app.tsx

@@ -1,11 +0,0 @@
-import '../styles.scss';
-
-export function App() {
-  return (
-    <div className="flex items-stretch px-6 py-6">
-      <h1 className="text-3xl">Top liquidity opportunities</h1>
-    </div>
-  );
-}
-
-export default App;

apps/liquidity-provision-dashboard/src/environments/environment.prod.ts

@@ -1,3 +0,0 @@
-export const environment = {
-  production: true,
-};

apps/liquidity-provision-dashboard/src/environments/environment.ts

@@ -1,6 +0,0 @@
-// This file can be replaced during build by using the `fileReplacements` array.
-// When building for production, this file is replaced with `environment.prod.ts`.
-
-export const environment = {
-  production: false,
-};

apps/liquidity-provision-dashboard/src/index.html

@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>Liquidity Provision Dashboard</title>
-    <base href="/" />
-
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" type="image/x-icon" href="favicon.ico" />
-    <link
-      rel="preload"
-      href="https://static.vega.xyz/AlphaLyrae-Medium.woff2"
-      as="font"
-      type="font/woff2"
-      crossorigin="anonymous"
-    />
-
-    <link rel="stylesheet" href="https://static.vega.xyz/fonts.css" />
-  </head>
-  <body>
-    <div id="root" class="h-full max-h-full"></div>
-  </body>
-</html>

apps/liquidity-provision-dashboard/src/main.tsx

@@ -1,13 +0,0 @@
-import { StrictMode } from 'react';
-import { createRoot } from 'react-dom/client';
-
-import App from './app/app';
-
-const rootElement = document.getElementById('root');
-const root = rootElement && createRoot(rootElement);
-
-root?.render(
-  <StrictMode>
-    <App />
-  </StrictMode>
-);

apps/liquidity-provision-dashboard/src/polyfills.ts

@@ -1,7 +0,0 @@
-/**
- * Polyfill stable language features. These imports will be optimized by `@babel/preset-env`.
- *
- * See: https://github.com/zloirock/core-js#babel
- */
-import 'core-js/stable';
-import 'regenerator-runtime/runtime';

apps/liquidity-provision-dashboard/src/styles.scss

@@ -1,8 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-html,
-body {
-  @apply h-full;
-}

apps/liquidity-provision-dashboard/tailwind.config.js

@@ -1,16 +0,0 @@
-const { join } = require('path');
-const { createGlobPatternsForDependencies } = require('@nrwl/next/tailwind');
-const theme = require('../../libs/tailwindcss-config/src/theme-lite');
-const vegaCustomClasses = require('../../libs/tailwindcss-config/src/vega-custom-classes');
-const vegaCustomClassesLite = require('../../libs/tailwindcss-config/src/vega-custom-classes-lite');
-
-module.exports = {
-  content: [
-    join(__dirname, 'src/**/*.{js,ts,jsx,tsx}'),
-    'libs/ui-toolkit/src/utils/shared.ts',
-    ...createGlobPatternsForDependencies(__dirname),
-  ],
-  darkMode: 'class',
-  theme,
-  plugins: [vegaCustomClasses, vegaCustomClassesLite],
-};

apps/liquidity-provision-dashboard/tsconfig.app.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": [
-    "jest.config.ts",
-    "**/*.spec.ts",
-    "**/*.test.ts",
-    "**/*.spec.tsx",
-    "**/*.test.tsx",
-    "**/*.spec.js",
-    "**/*.test.js",
-    "**/*.spec.jsx",
-    "**/*.test.jsx"
-  ],
-  "include": ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"]
-}

apps/liquidity-provision-dashboard/tsconfig.json

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

apps/liquidity-provision-dashboard/tsconfig.spec.json

@@ -1,27 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node", "@testing-library/jest-dom"],
-    "jsx": "react",
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true
-  },
-  "include": [
-    "jest.config.ts",
-    "**/*.test.ts",
-    "**/*.spec.ts",
-    "**/*.test.tsx",
-    "**/*.spec.tsx",
-    "**/*.test.js",
-    "**/*.spec.js",
-    "**/*.test.jsx",
-    "**/*.spec.jsx",
-    "**/*.d.ts"
-  ],
-  "files": [
-    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "../../node_modules/@nrwl/react/typings/image.d.ts"
-  ]
-}

apps/static/src/assets/testnet-network.json

@@ -1,11 +1,3 @@
 {
-  "hosts": [
-    "https://api.n06.testnet.vega.xyz/graphql",
-    "https://api.n07.testnet.vega.xyz/graphql",
-    "https://api.n08.testnet.vega.xyz/graphql",
-    "https://api.n09.testnet.vega.xyz/graphql",
-    "https://api.n10.testnet.vega.xyz/graphql",
-    "https://api.n11.testnet.vega.xyz/graphql",
-    "https://api.n12.testnet.vega.xyz/graphql"
-  ]
+  "hosts": ["https://api.n09.testnet.vega.xyz/graphql"]
 }

apps/static/src/assets/testnet-tranches.json

@@ -89,7 +89,7 @@
     "tranche_end": "2022-10-12T00:53:20.000Z",
     "total_added": "1010.000000000000000001",
     "total_removed": "668.4622323651",
-    "locked_amount": "54.70804509132417790005416638127853879",
+    "locked_amount": "81.0314903602232870000802291983764587",
     "deposits": [
       {
         "amount": "1000",

apps/stats-e2e/.env

@@ -1,3 +1,4 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
 CYPRESS_VEGA_ENV=TESTNET
+NX_VEGA_REST=https://api.n10.testnet.vega.xyz

apps/stats-e2e/.env.devnet

@@ -1,3 +1,4 @@
 # App configuration variables
 NX_VEGA_ENV=DEVNET
 CYPRESS_VEGA_ENV=DEVNET
+NX_VEGA_REST=https://api.n04.d.vega.xyz

apps/stats-e2e/.env.mainnet

@@ -1,3 +1,4 @@
 # App configuration variables
 NX_VEGA_ENV=MAINNET
 CYPRESS_VEGA_ENV=MAINNET
+NX_VEGA_REST=https://api.token.vega.xyz/