chore: v0.55.0-0.0

fix: revert to deprecated candles query due to core bug
2022-09-20 18:51:14 -07:00 · 2022-09-20 18:48:01 -07:00
75 changed files with 984 additions and 1460 deletions
@@ -3,7 +3,7 @@ import { MarketState } from '@vegaprotocol/types';
 import type {
  Market,
  MarketsCandlesQuery_marketsConnection_edges_node,
-  MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges,
+  MarketsCandlesQuery_marketsConnection_edges_node_candles,
  Markets,
  MarketsCandlesQuery,
  MarketsDataQuery,
@@ -516,530 +516,483 @@ export const generateMarketsCandles = (): MarketsCandlesQuery => {
    {
      id: protoMarket.id,
      __typename: 'Market',
-      candlesConnection: {
+      candles:
-        __typename: 'CandleDataConnection',
+        protoCandles as MarketsCandlesQuery_marketsConnection_edges_node_candles[],
        edges: protoCandles.map((node) => ({
          __typename: 'CandleEdge',
          node,
        })) as unknown as MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges[],
      },
    },
    {
      id: '6030e5b4e0ca3297a26081e5af4d453f97f96baab2d74bf56f84efcffc4c382f',
      __typename: 'Market',
-      candlesConnection: {
+      candles: [
-        __typename: 'CandleDataConnection',
+        { open: '723082', close: '726800', __typename: 'Candle' },
-        edges: [
+        {
-          { open: '723082', close: '726800', __typename: 'Candle' },
+          open: '726800',
-          {
+          close: '733551',
-            open: '726800',
+          __typename: 'Candle',
-            close: '733551',
+        },
-            __typename: 'Candle',
+        { open: '733557', close: '719960', __typename: 'Candle' },
-          },
+        {
-          { open: '733557', close: '719960', __typename: 'Candle' },
+          open: '719961',
-          {
+          close: '707711',
-            open: '719961',
+          __typename: 'Candle',
-            close: '707711',
+        },
-            __typename: 'Candle',
+        { open: '702459', close: '705275', __typename: 'Candle' },
-          },
+        {
-          { open: '702459', close: '705275', __typename: 'Candle' },
+          open: '701609',
-          {
+          close: '698494',
-            open: '701609',
+          __typename: 'Candle',
-            close: '698494',
+        },
-            __typename: 'Candle',
+        { open: '698494', close: '702201', __typename: 'Candle' },
-          },
+        {
-          { open: '698494', close: '702201', __typename: 'Candle' },
+          open: '704749',
-          {
+          close: '704248',
-            open: '704749',
+          __typename: 'Candle',
-            close: '704248',
+        },
-            __typename: 'Candle',
+        { open: '708562', close: '714712', __typename: 'Candle' },
-          },
+        {
-          { open: '708562', close: '714712', __typename: 'Candle' },
+          open: '718434',
-          {
+          close: '732567',
-            open: '718434',
+          __typename: 'Candle',
-            close: '732567',
+        },
-            __typename: 'Candle',
+        { open: '732567', close: '750475', __typename: 'Candle' },
-          },
+        {
-          { open: '732567', close: '750475', __typename: 'Candle' },
+          open: '768916',
-          {
+          close: '746371',
-            open: '768916',
+          __typename: 'Candle',
-            close: '746371',
+        },
-            __typename: 'Candle',
+        { open: '740240', close: '744910', __typename: 'Candle' },
-          },
+        {
-          { open: '740240', close: '744910', __typename: 'Candle' },
+          open: '746902',
-          {
+          close: '731680',
-            open: '746902',
+          __typename: 'Candle',
-            close: '731680',
+        },
-            __typename: 'Candle',
+        { open: '730156', close: '729021', __typename: 'Candle' },
-          },
+        {
-          { open: '730156', close: '729021', __typename: 'Candle' },
+          open: '730503',
-          {
+          close: '738096',
-            open: '730503',
+          __typename: 'Candle',
-            close: '738096',
+        },
-            __typename: 'Candle',
+        { open: '738096', close: '743087', __typename: 'Candle' },
-          },
+        {
-          { open: '738096', close: '743087', __typename: 'Candle' },
+          open: '739244',
-          {
+          close: '732352',
-            open: '739244',
+          __typename: 'Candle',
-            close: '732352',
+        },
-            __typename: 'Candle',
+        { open: '732352', close: '751259', __typename: 'Candle' },
-          },
+        {
-          { open: '732352', close: '751259', __typename: 'Candle' },
+          open: '751259',
-          {
+          close: '751455',
-            open: '751259',
+          __typename: 'Candle',
-            close: '751455',
+        },
-            __typename: 'Candle',
+        { open: '751455', close: '753990', __typename: 'Candle' },
-          },
+        {
-          { open: '751455', close: '753990', __typename: 'Candle' },
+          open: '757174',
-          {
+          close: '761100',
-            open: '757174',
+          __typename: 'Candle',
-            close: '761100',
+        },
-            __typename: 'Candle',
+        { open: '758974', close: '759379', __typename: 'Candle' },
-          },
+        {
-          { open: '758974', close: '759379', __typename: 'Candle' },
+          open: '762834',
-          {
+          close: '761777',
-            open: '762834',
+          __typename: 'Candle',
-            close: '761777',
+        },
-            __typename: 'Candle',
+      ] as MarketsCandlesQuery_marketsConnection_edges_node_candles[],
          },
        ].map((node) => ({
          __typename: 'CandleEdge',
          node,
        })) as unknown as MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges[],
      },
    },
    {
      id: 'de74a5572045b300e8ec50d136896912ec76e7d7ec135bc305dfd4854d9363a4',
      __typename: 'Market',
-      candlesConnection: {
+      candles: [
-        __typename: 'CandleDataConnection',
+        { open: '14602', close: '14596', __typename: 'Candle' },
-        edges: [
+        {
-          { open: '14602', close: '14596', __typename: 'Candle' },
+          open: '14596',
-          {
+          close: '14731',
-            open: '14596',
+          __typename: 'Candle',
-            close: '14731',
+        },
-            __typename: 'Candle',
+        { open: '14732', close: '14592', __typename: 'Candle' },
-          },
+        {
-          { open: '14732', close: '14592', __typename: 'Candle' },
+          open: '14592',
-          {
+          close: '14516',
-            open: '14592',
+          __typename: 'Candle',
-            close: '14516',
+        },
-            __typename: 'Candle',
+        { open: '14516', close: '14179', __typename: 'Candle' },
-          },
+        {
-          { open: '14516', close: '14179', __typename: 'Candle' },
+          open: '14179',
-          {
+          close: '14031',
-            open: '14179',
+          __typename: 'Candle',
-            close: '14031',
+        },
-            __typename: 'Candle',
+        { open: '14032', close: '14115', __typename: 'Candle' },
-          },
+        {
-          { open: '14032', close: '14115', __typename: 'Candle' },
+          open: '14116',
-          {
+          close: '14166',
-            open: '14116',
+          __typename: 'Candle',
-            close: '14166',
+        },
-            __typename: 'Candle',
+        { open: '14166', close: '14377', __typename: 'Candle' },
-          },
+        {
-          { open: '14166', close: '14377', __typename: 'Candle' },
+          open: '14377',
-          {
+          close: '14714',
-            open: '14377',
+          __typename: 'Candle',
-            close: '14714',
+        },
-            __typename: 'Candle',
+        { open: '14713', close: '14593', __typename: 'Candle' },
-          },
+        {
-          { open: '14713', close: '14593', __typename: 'Candle' },
+          open: '14594',
-          {
+          close: '14273',
-            open: '14594',
+          __typename: 'Candle',
-            close: '14273',
+        },
-            __typename: 'Candle',
+        { open: '14272', close: '14245', __typename: 'Candle' },
-          },
+        {
-          { open: '14272', close: '14245', __typename: 'Candle' },
+          open: '14244',
-          {
+          close: '14337',
-            open: '14244',
+          __typename: 'Candle',
-            close: '14337',
+        },
-            __typename: 'Candle',
+        { open: '14338', close: '14384', __typename: 'Candle' },
-          },
+        {
-          { open: '14338', close: '14384', __typename: 'Candle' },
+          open: '14385',
-          {
+          close: '14257',
-            open: '14385',
+          __typename: 'Candle',
-            close: '14257',
+        },
-            __typename: 'Candle',
+        { open: '14256', close: '14105', __typename: 'Candle' },
-          },
+        {
-          { open: '14256', close: '14105', __typename: 'Candle' },
+          open: '14106',
-          {
+          close: '14067',
-            open: '14106',
+          __typename: 'Candle',
-            close: '14067',
+        },
-            __typename: 'Candle',
+        { open: '14066', close: '14196', __typename: 'Candle' },
-          },
+        {
-          { open: '14066', close: '14196', __typename: 'Candle' },
+          open: '14197',
-          {
+          close: '14316',
-            open: '14197',
+          __typename: 'Candle',
-            close: '14316',
+        },
-            __typename: 'Candle',
+        { open: '14315', close: '14377', __typename: 'Candle' },
-          },
+        {
-          { open: '14315', close: '14377', __typename: 'Candle' },
+          open: '14378',
-          {
+          close: '14106',
-            open: '14378',
+          __typename: 'Candle',
-            close: '14106',
+        },
-            __typename: 'Candle',
+        { open: '14105', close: '14317', __typename: 'Candle' },
-          },
+        {
-          { open: '14105', close: '14317', __typename: 'Candle' },
+          open: '14318',
-          {
+          close: '14467',
-            open: '14318',
+          __typename: 'Candle',
-            close: '14467',
+        },
-            __typename: 'Candle',
+      ] as MarketsCandlesQuery_marketsConnection_edges_node_candles[],
          },
        ].map((node) => ({
          __typename: 'CandleEdge',
          node,
        })) as unknown as MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges[],
      },
    },
    {
      id: '87b0bbb3c171baa5d97dfc3852332829c91e5c5dc9f7c8fb584c6d8ac75aaaf2',
      __typename: 'Market',
-      candlesConnection: {
+      candles: [
-        __typename: 'CandleDataConnection',
+        { open: '5700', close: '5688', __typename: 'Candle' },
-        edges: [
+        {
-          { open: '5700', close: '5688', __typename: 'Candle' },
+          open: '5688',
-          {
+          close: '5644',
-            open: '5688',
+          __typename: 'Candle',
-            close: '5644',
+        },
-            __typename: 'Candle',
+        { open: '5644', close: '5664', __typename: 'Candle' },
-          },
+        {
-          { open: '5644', close: '5664', __typename: 'Candle' },
+          open: '5664',
-          {
+          close: '5694',
-            open: '5664',
+          __typename: 'Candle',
-            close: '5694',
+        },
-            __typename: 'Candle',
+        { open: '5694', close: '5751', __typename: 'Candle' },
-          },
+        {
-          { open: '5694', close: '5751', __typename: 'Candle' },
+          open: '5751',
-          {
+          close: '5853',
-            open: '5751',
+          __typename: 'Candle',
-            close: '5853',
+        },
-            __typename: 'Candle',
+        { open: '5853', close: '5773', __typename: 'Candle' },
-          },
+        {
-          { open: '5853', close: '5773', __typename: 'Candle' },
+          open: '5773',
-          {
+          close: '5697',
-            open: '5773',
+          __typename: 'Candle',
-            close: '5697',
+        },
-            __typename: 'Candle',
+        { open: '5697', close: '5683', __typename: 'Candle' },
-          },
+        {
-          { open: '5697', close: '5683', __typename: 'Candle' },
+          open: '5683',
-          {
+          close: '5655',
-            open: '5683',
+          __typename: 'Candle',
-            close: '5655',
+        },
-            __typename: 'Candle',
+        { open: '5655', close: '5674', __typename: 'Candle' },
-          },
+        {
-          { open: '5655', close: '5674', __typename: 'Candle' },
+          open: '5674',
-          {
+          close: '5705',
-            open: '5674',
+          __typename: 'Candle',
-            close: '5705',
+        },
-            __typename: 'Candle',
+        { open: '5705', close: '5648', __typename: 'Candle' },
-          },
+        {
-          { open: '5705', close: '5648', __typename: 'Candle' },
+          open: '5648',
-          {
+          close: '5646',
-            open: '5648',
+          __typename: 'Candle',
-            close: '5646',
+        },
-            __typename: 'Candle',
+        { open: '5646', close: '5687', __typename: 'Candle' },
-          },
+        {
-          { open: '5646', close: '5687', __typename: 'Candle' },
+          open: '5687',
-          {
+          close: '5675',
-            open: '5687',
+          __typename: 'Candle',
-            close: '5675',
+        },
-            __typename: 'Candle',
+        { open: '5675', close: '5696', __typename: 'Candle' },
-          },
+        {
-          { open: '5675', close: '5696', __typename: 'Candle' },
+          open: '5696',
-          {
+          close: '5699',
-            open: '5696',
+          __typename: 'Candle',
-            close: '5699',
+        },
-            __typename: 'Candle',
+        { open: '5699', close: '5731', __typename: 'Candle' },
-          },
+        {
-          { open: '5699', close: '5731', __typename: 'Candle' },
+          open: '5731',
-          {
+          close: '5768',
-            open: '5731',
+          __typename: 'Candle',
-            close: '5768',
+        },
-            __typename: 'Candle',
+      ] as MarketsCandlesQuery_marketsConnection_edges_node_candles[],
          },
        ].map((node) => ({
          __typename: 'CandleEdge',
          node,
        })) as unknown as MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges[],
      },
    },
    {
      id: '65663ebdc96161162769c4d5c5508137416748178d7cb28e2cb0d07a151a2bc6',
      __typename: 'Market',
-      candlesConnection: {
+      candles: [
-        __typename: 'CandleDataConnection',
+        { open: '6680', close: '6600', __typename: 'Candle' },
-        edges: [
+        {
-          { open: '6680', close: '6600', __typename: 'Candle' },
+          open: '6600',
-          {
+          close: '6630',
-            open: '6600',
+          __typename: 'Candle',
-            close: '6630',
+        },
-            __typename: 'Candle',
+        { open: '6630', close: '6677', __typename: 'Candle' },
-          },
+        {
-          { open: '6630', close: '6677', __typename: 'Candle' },
+          open: '6735',
-          {
+          close: '6720',
-            open: '6735',
+          __typename: 'Candle',
-            close: '6720',
+        },
-            __typename: 'Candle',
+        { open: '6720', close: '6691', __typename: 'Candle' },
-          },
+        {
-          { open: '6720', close: '6691', __typename: 'Candle' },
+          open: '6681',
-          {
+          close: '6730',
-            open: '6681',
+          __typename: 'Candle',
-            close: '6730',
+        },
-            __typename: 'Candle',
+        { open: '6756', close: '6778', __typename: 'Candle' },
-          },
+        {
-          { open: '6756', close: '6778', __typename: 'Candle' },
+          open: '6778',
-          {
+          close: '6768',
-            open: '6778',
+          __typename: 'Candle',
-            close: '6768',
+        },
-            __typename: 'Candle',
+        { open: '6768', close: '6834', __typename: 'Candle' },
-          },
+        {
-          { open: '6768', close: '6834', __typename: 'Candle' },
+          open: '6834',
-          {
+          close: '7001',
-            open: '6834',
+          __typename: 'Candle',
-            close: '7001',
+        },
-            __typename: 'Candle',
+        { open: '7001', close: '6894', __typename: 'Candle' },
-          },
+        {
-          { open: '7001', close: '6894', __typename: 'Candle' },
+          open: '6910',
-          {
+          close: '6867',
-            open: '6910',
+          __typename: 'Candle',
-            close: '6867',
+        },
-            __typename: 'Candle',
+        { open: '6867', close: '6827', __typename: 'Candle' },
-          },
+        {
-          { open: '6867', close: '6827', __typename: 'Candle' },
+          open: '6899',
-          {
+          close: '6910',
-            open: '6899',
+          __typename: 'Candle',
-            close: '6910',
+        },
-            __typename: 'Candle',
+        { open: '6868', close: '6902', __typename: 'Candle' },
-          },
+        {
-          { open: '6868', close: '6902', __typename: 'Candle' },
+          open: '6905',
-          {
+          close: '6947',
-            open: '6905',
+          __typename: 'Candle',
-            close: '6947',
+        },
-            __typename: 'Candle',
+        { open: '6932', close: '6900', __typename: 'Candle' },
-          },
+        {
-          { open: '6932', close: '6900', __typename: 'Candle' },
+          open: '6900',
-          {
+          close: '6911',
-            open: '6900',
+          __typename: 'Candle',
-            close: '6911',
+        },
-            __typename: 'Candle',
+        { open: '6936', close: '6948', __typename: 'Candle' },
-          },
+        {
-          { open: '6936', close: '6948', __typename: 'Candle' },
+          open: '6936',
-          {
+          close: '6946',
-            open: '6936',
+          __typename: 'Candle',
-            close: '6946',
+        },
-            __typename: 'Candle',
+        { open: '6946', close: '6906', __typename: 'Candle' },
-          },
+        {
-          { open: '6946', close: '6906', __typename: 'Candle' },
+          open: '6947',
-          {
+          close: '6962',
-            open: '6947',
+          __typename: 'Candle',
-            close: '6962',
+        },
-            __typename: 'Candle',
+        { open: '6962', close: '7027', __typename: 'Candle' },
-          },
+        {
-          { open: '6962', close: '7027', __typename: 'Candle' },
+          open: '6941',
-          {
+          close: '6921',
-            open: '6941',
+          __typename: 'Candle',
-            close: '6921',
+        },
-            __typename: 'Candle',
+      ] as MarketsCandlesQuery_marketsConnection_edges_node_candles[],
          },
        ].map((node) => ({
          __typename: 'CandleEdge',
          node,
        })) as unknown as MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges[],
      },
    },
    {
      id: '234afabd27e3bce1a879039c041f9f00f915d98459935ddafd0169d38dd13850',
      __typename: 'Market',
-      candlesConnection: {
+      candles: [
-        __typename: 'CandleDataConnection',
+        { open: '15126319', close: '15087482', __typename: 'Candle' },
-        edges: [
+        {
-          { open: '15126319', close: '15087482', __typename: 'Candle' },
+          open: '15087482',
-          {
+          close: '15119759',
-            open: '15087482',
+          __typename: 'Candle',
-            close: '15119759',
+        },
-            __typename: 'Candle',
+        { open: '15119759', close: '15061361', __typename: 'Candle' },
-          },
+        {
-          { open: '15119759', close: '15061361', __typename: 'Candle' },
+          open: '15061361',
-          {
+          close: '14742622',
-            open: '15061361',
+          __typename: 'Candle',
-            close: '14742622',
+        },
-            __typename: 'Candle',
+        { open: '14742622', close: '14735571', __typename: 'Candle' },
-          },
+        {
-          { open: '14742622', close: '14735571', __typename: 'Candle' },
+          open: '14735571',
-          {
+          close: '14694437',
-            open: '14735571',
+          __typename: 'Candle',
-            close: '14694437',
+        },
-            __typename: 'Candle',
+        { open: '14694437', close: '14670479', __typename: 'Candle' },
-          },
+        {
-          { open: '14694437', close: '14670479', __typename: 'Candle' },
+          open: '14670479',
-          {
+          close: '14624796',
-            open: '14670479',
+          __typename: 'Candle',
-            close: '14624796',
+        },
-            __typename: 'Candle',
+        { open: '14621001', close: '14722835', __typename: 'Candle' },
-          },
+        {
-          { open: '14621001', close: '14722835', __typename: 'Candle' },
+          open: '14722835',
-          {
+          close: '14705183',
-            open: '14722835',
+          __typename: 'Candle',
-            close: '14705183',
+        },
-            __typename: 'Candle',
+        { open: '14705183', close: '14710797', __typename: 'Candle' },
-          },
+        {
-          { open: '14705183', close: '14710797', __typename: 'Candle' },
+          open: '14710796',
-          {
+          close: '14713874',
-            open: '14710796',
+          __typename: 'Candle',
-            close: '14713874',
+        },
-            __typename: 'Candle',
+        { open: '14713874', close: '14677982', __typename: 'Candle' },
-          },
+        {
-          { open: '14713874', close: '14677982', __typename: 'Candle' },
+          open: '14677982',
-          {
+          close: '14710031',
-            open: '14677982',
+          __typename: 'Candle',
-            close: '14710031',
+        },
-            __typename: 'Candle',
+        { open: '14751685', close: '14737556', __typename: 'Candle' },
-          },
+        {
-          { open: '14751685', close: '14737556', __typename: 'Candle' },
+          open: '14737556',
-          {
+          close: '14769139',
-            open: '14737556',
+          __typename: 'Candle',
-            close: '14769139',
+        },
-            __typename: 'Candle',
+        { open: '14760616', close: '14761691', __typename: 'Candle' },
-          },
+        {
-          { open: '14760616', close: '14761691', __typename: 'Candle' },
+          open: '14761691',
-          {
+          close: '14714380',
-            open: '14761691',
+          __typename: 'Candle',
-            close: '14714380',
+        },
-            __typename: 'Candle',
+        { open: '14714380', close: '14740160', __typename: 'Candle' },
-          },
+        {
-          { open: '14714380', close: '14740160', __typename: 'Candle' },
+          open: '14740160',
-          {
+          close: '14764832',
-            open: '14740160',
+          __typename: 'Candle',
-            close: '14764832',
+        },
-            __typename: 'Candle',
+        { open: '14764832', close: '14778059', __typename: 'Candle' },
-          },
+        {
-          { open: '14764832', close: '14778059', __typename: 'Candle' },
+          open: '14761936',
-          {
+          close: '14707831',
-            open: '14761936',
+          __typename: 'Candle',
-            close: '14707831',
+        },
-            __typename: 'Candle',
+        { open: '14707831', close: '14753272', __typename: 'Candle' },
-          },
+        {
-          { open: '14707831', close: '14753272', __typename: 'Candle' },
+          open: '14753272',
-          {
+          close: '14771411',
-            open: '14753272',
+          __typename: 'Candle',
-            close: '14771411',
+        },
-            __typename: 'Candle',
+      ] as MarketsCandlesQuery_marketsConnection_edges_node_candles[],
          },
        ].map((node) => ({
          __typename: 'CandleEdge',
          node,
        })) as unknown as MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges[],
      },
    },
    {
      id: '9f2a3c1caa67bb0773ec18d908d32b55b129b9ec2d106a8e9a87f6aa5c0375a6',
      __typename: 'Market',
-      candlesConnection: {
+      candles: [
-        __typename: 'CandleDataConnection',
+        { open: '71263667', close: '71173749', __typename: 'Candle' },
-        edges: [
+        {
-          { open: '71263667', close: '71173749', __typename: 'Candle' },
+          open: '71173749',
-          {
+          close: '71055959',
-            open: '71173749',
+          __typename: 'Candle',
-            close: '71055959',
+        },
-            __typename: 'Candle',
+        { open: '71055959', close: '71078605', __typename: 'Candle' },
-          },
+        {
-          { open: '71055959', close: '71078605', __typename: 'Candle' },
+          open: '71078605',
-          {
+          close: '69838205',
-            open: '71078605',
+          __typename: 'Candle',
-            close: '69838205',
+        },
-            __typename: 'Candle',
+        { open: '69838205', close: '69166023', __typename: 'Candle' },
-          },
+        {
-          { open: '69838205', close: '69166023', __typename: 'Candle' },
+          open: '69166023',
-          {
+          close: '68841759',
-            open: '69166023',
+          __typename: 'Candle',
-            close: '68841759',
+        },
-            __typename: 'Candle',
+        { open: '68841759', close: '68711290', __typename: 'Candle' },
-          },
+        {
-          { open: '68841759', close: '68711290', __typename: 'Candle' },
+          open: '68711290',
-          {
+          close: '68650154',
-            open: '68711290',
+          __typename: 'Candle',
-            close: '68650154',
+        },
-            __typename: 'Candle',
+        { open: '68644289', close: '68638322', __typename: 'Candle' },
-          },
+        {
-          { open: '68644289', close: '68638322', __typename: 'Candle' },
+          open: '68704232',
-          {
+          close: '68343581',
-            open: '68704232',
+          __typename: 'Candle',
-            close: '68343581',
+        },
-            __typename: 'Candle',
+        { open: '67345721', close: '67554701', __typename: 'Candle' },
-          },
+        {
-          { open: '67345721', close: '67554701', __typename: 'Candle' },
+          open: '67533143',
-          {
+          close: '67551571',
-            open: '67533143',
+          __typename: 'Candle',
-            close: '67551571',
+        },
-            __typename: 'Candle',
+        { open: '67533286', close: '67543539', __typename: 'Candle' },
-          },
+        {
-          { open: '67533286', close: '67543539', __typename: 'Candle' },
+          open: '67580208',
-          {
+          close: '67472337',
-            open: '67580208',
+          __typename: 'Candle',
-            close: '67472337',
+        },
-            __typename: 'Candle',
+        { open: '67416289', close: '67459697', __typename: 'Candle' },
-          },
+        {
-          { open: '67416289', close: '67459697', __typename: 'Candle' },
+          open: '67396085',
-          {
+          close: '67528265',
-            open: '67396085',
+          __typename: 'Candle',
-            close: '67528265',
+        },
-            __typename: 'Candle',
+        { open: '67491799', close: '67538833', __typename: 'Candle' },
-          },
+        {
-          { open: '67491799', close: '67538833', __typename: 'Candle' },
+          open: '67493210',
-          {
+          close: '67362908',
-            open: '67493210',
+          __typename: 'Candle',
-            close: '67362908',
+        },
-            __typename: 'Candle',
+        { open: '67362908', close: '67518182', __typename: 'Candle' },
-          },
+        {
-          { open: '67362908', close: '67518182', __typename: 'Candle' },
+          open: '67518182',
-          {
+          close: '67635775',
-            open: '67518182',
+          __typename: 'Candle',
-            close: '67635775',
+        },
-            __typename: 'Candle',
+        { open: '67635775', close: '67734861', __typename: 'Candle' },
-          },
+        {
-          { open: '67635775', close: '67734861', __typename: 'Candle' },
+          open: '67714943',
-          {
+          close: '67736742',
-            open: '67714943',
+          __typename: 'Candle',
-            close: '67736742',
+        },
-            __typename: 'Candle',
+        { open: '67716074', close: '67690826', __typename: 'Candle' },
-          },
+        {
-          { open: '67716074', close: '67690826', __typename: 'Candle' },
+          open: '67714352',
-          {
+          close: '67817444',
-            open: '67714352',
+          __typename: 'Candle',
-            close: '67817444',
+        },
-            __typename: 'Candle',
+      ] as MarketsCandlesQuery_marketsConnection_edges_node_candles[],
          },
        ].map((node) => ({
          __typename: 'CandleEdge',
          node,
        })) as unknown as MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges[],
      },
    },
    {
      id: '8a45ee934d3ddac4b036f9884df1064a5353c620a56f775ba36597d0edef9a7a',
      __typename: 'Market',
-      candlesConnection: {
+      candles: [
-        __typename: 'CandleDataConnection',
+        { open: '5809', close: '5795', __typename: 'Candle' },
-        edges: [
+        {
-          { open: '5809', close: '5795', __typename: 'Candle' },
+          open: '5795',
-          {
+          close: '5845',
-            open: '5795',
+          __typename: 'Candle',
-            close: '5845',
+        },
-            __typename: 'Candle',
+        { open: '5845', close: '5779', __typename: 'Candle' },
-          },
+        {
-          { open: '5845', close: '5779', __typename: 'Candle' },
+          open: '5779',
-          {
+          close: '5710',
-            open: '5779',
+          __typename: 'Candle',
-            close: '5710',
+        },
-            __typename: 'Candle',
+        { open: '5710', close: '5691', __typename: 'Candle' },
-          },
+      ] as MarketsCandlesQuery_marketsConnection_edges_node_candles[],
          { open: '5710', close: '5691', __typename: 'Candle' },
        ].map((node) => ({
          __typename: 'CandleEdge',
          node,
        })) as unknown as MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges[],
      },
    },
  ];
  return {
@@ -53,9 +53,6 @@ export interface Deposits_assetsConnection_edges_node {
 export interface Deposits_assetsConnection_edges {
  __typename: "AssetEdge";
  /**
   * The asset information
   */
  node: Deposits_assetsConnection_edges_node;
 }
@@ -10,7 +10,7 @@
 export interface MarketMarkPrice_market_data {
  __typename: "MarketData";
  /**
-   * The mark price (an unsigned integer)
+   * the mark price (an unsigned integer)
   */
  markPrice: string;
 }
@@ -18,7 +18,7 @@ export interface MarketMarkPrice_market_data {
 export interface MarketMarkPrice_market {
  __typename: "Market";
  /**
-   * The number of decimal places that an integer must be shifted by in order to get a correct
+   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
   * number denominated in the currency of the market. (uint64)
   * 
   * Examples:
@@ -60,19 +60,19 @@ export interface PartyMarketData_party_marginsConnection_edges_node_market {
 export interface PartyMarketData_party_marginsConnection_edges_node {
  __typename: "MarginLevels";
  /**
-   * Market in which the margin is required for this party
+   * market in which the margin is required for this party
   */
  market: PartyMarketData_party_marginsConnection_edges_node_market;
  /**
-   * This is the minimum margin required for a party to place a new order on the network (unsigned integer)
+   * this is the minimum margin required for a party to place a new order on the network (unsigned integer)
   */
  initialLevel: string;
  /**
-   * Minimal margin for the position to be maintained in the network (unsigned integer)
+   * minimal margin for the position to be maintained in the network (unsigned integer)
   */
  maintenanceLevel: string;
  /**
-   * If the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer)
+   * if the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer)
   */
  searchLevel: string;
 }
@@ -28,7 +28,7 @@ export interface EstimateOrder_estimateOrder_fee {
 export interface EstimateOrder_estimateOrder_marginLevels {
  __typename: "MarginLevels";
  /**
-   * This is the minimum margin required for a party to place a new order on the network (unsigned integer)
+   * this is the minimum margin required for a party to place a new order on the network (unsigned integer)
   */
  initialLevel: string;
 }
@@ -47,7 +47,7 @@ export interface EstimateOrder_estimateOrder {
 export interface EstimateOrder {
  /**
-   * Return an estimation of the potential cost for a new order
+   * return an estimation of the potential cost for a new order
   */
  estimateOrder: EstimateOrder_estimateOrder;
 }
@@ -67,9 +67,6 @@ export interface MarketPositions_party_positionsConnection_edges_node {
 export interface MarketPositions_party_positionsConnection_edges {
  __typename: "PositionEdge";
  /**
   * The position
   */
  node: MarketPositions_party_positionsConnection_edges_node;
 }
@@ -81,9 +81,6 @@ export interface AssetsQuery_assetsConnection_edges_node {
 export interface AssetsQuery_assetsConnection_edges {
  __typename: "AssetEdge";
  /**
   * The asset information
   */
  node: AssetsQuery_assetsConnection_edges_node;
 }
@@ -265,7 +265,7 @@ export interface ProposalsQuery_proposalsConnection_edges_node {
   */
  datetime: string;
  /**
-   * Why the proposal was rejected by the core
+   * Reason for the proposal to be rejected by the core
   */
  rejectionReason: ProposalRejectionReason | null;
  /**
@@ -104,15 +104,15 @@ export interface MarketsQuery_markets_tradableInstrument_instrument {
 export interface MarketsQuery_markets_tradableInstrument_riskModel_LogNormalRiskModel_params {
  __typename: "LogNormalModelParams";
  /**
-   * R parameter
+   * r parameter
   */
  r: number;
  /**
-   * Sigma parameter, annualised volatility of the underlying asset, must be a strictly non-negative real number
+   * sigma parameter, annualised volatility of the underlying asset, must be a strictly non-negative real number
   */
  sigma: number;
  /**
-   * Mu parameter, annualised growth rate of the underlying asset
+   * mu parameter, annualised growth rate of the underlying asset
   */
  mu: number;
 }
@@ -158,15 +158,15 @@ export type MarketsQuery_markets_tradableInstrument_riskModel = MarketsQuery_mar
 export interface MarketsQuery_markets_tradableInstrument_marginCalculator_scalingFactors {
  __typename: "ScalingFactors";
  /**
-   * The scaling factor that determines the margin level at which Vega has to search for more money
+   * the scaling factor that determines the margin level at which Vega has to search for more money
   */
  searchLevel: number;
  /**
-   * The scaling factor that determines the optimal margin level
+   * the scaling factor that determines the optimal margin level
   */
  initialMargin: number;
  /**
-   * The scaling factor that determines the overflow margin level
+   * the scaling factor that determines the overflow margin level
   */
  collateralRelease: number;
 }
@@ -362,47 +362,47 @@ export interface MarketsQuery_markets_data_liquidityProviderFeeShare {
 export interface MarketsQuery_markets_data {
  __typename: "MarketData";
  /**
-   * The mark price (an unsigned integer)
+   * the mark price (an unsigned integer)
   */
  markPrice: string;
  /**
-   * The highest price level on an order book for buy orders.
+   * the highest price level on an order book for buy orders.
   */
  bestBidPrice: string;
  /**
-   * The aggregated volume being bid at the best bid price.
+   * the aggregated volume being bid at the best bid price.
   */
  bestBidVolume: string;
  /**
-   * The lowest price level on an order book for offer orders.
+   * the lowest price level on an order book for offer orders.
   */
  bestOfferPrice: string;
  /**
-   * The aggregated volume being offered at the best offer price.
+   * the aggregated volume being offered at the best offer price.
   */
  bestOfferVolume: string;
  /**
-   * The highest price level on an order book for buy orders not including pegged orders.
+   * the highest price level on an order book for buy orders not including pegged orders.
   */
  bestStaticBidPrice: string;
  /**
-   * The aggregated volume being offered at the best static bid price, excluding pegged orders
+   * the aggregated volume being offered at the best static bid price, excluding pegged orders
   */
  bestStaticBidVolume: string;
  /**
-   * The lowest price level on an order book for offer orders not including pegged orders.
+   * the lowest price level on an order book for offer orders not including pegged orders.
   */
  bestStaticOfferPrice: string;
  /**
-   * The aggregated volume being offered at the best static offer price, excluding pegged orders.
+   * the aggregated volume being offered at the best static offer price, excluding pegged orders.
   */
  bestStaticOfferVolume: string;
  /**
-   * The arithmetic average of the best bid price and best offer price.
+   * the arithmetic average of the best bid price and best offer price.
   */
  midPrice: string;
  /**
-   * The arithmetic average of the best static bid price and best static offer price
+   * the arithmetic average of the best static bid price and best static offer price
   */
  staticMidPrice: string;
  /**
@@ -410,7 +410,7 @@ export interface MarketsQuery_markets_data {
   */
  timestamp: string;
  /**
-   * The sum of the size of all positions greater than 0.
+   * the sum of the size of all positions greater than 0.
   */
  openInterest: string;
  /**
@@ -422,39 +422,39 @@ export interface MarketsQuery_markets_data {
   */
  auctionStart: string | null;
  /**
-   * Indicative price if the auction ended now, 0 if not in auction mode
+   * indicative price if the auction ended now, 0 if not in auction mode
   */
  indicativePrice: string;
  /**
-   * Indicative volume if the auction ended now, 0 if not in auction mode
+   * indicative volume if the auction ended now, 0 if not in auction mode
   */
  indicativeVolume: string;
  /**
-   * What triggered an auction (if an auction was started)
+   * what triggered an auction (if an auction was started)
   */
  trigger: AuctionTrigger;
  /**
-   * What extended the ongoing auction (if an auction was extended)
+   * what extended the ongoing auction (if an auction was extended)
   */
  extensionTrigger: AuctionTrigger;
  /**
-   * The amount of stake targeted for this market
+   * the amount of stake targeted for this market
   */
  targetStake: string | null;
  /**
-   * The supplied stake for the market
+   * the supplied stake for the market
   */
  suppliedStake: string | null;
  /**
-   * A list of valid price ranges per associated trigger
+   * a list of valid price ranges per associated trigger
   */
  priceMonitoringBounds: MarketsQuery_markets_data_priceMonitoringBounds[] | null;
  /**
-   * The market value proxy
+   * the market value proxy
   */
  marketValueProxy: string;
  /**
-   * The equity like share of liquidity fee for each liquidity provider
+   * the equity like share of liquidity fee for each liquidity provider
   */
  liquidityProviderFeeShare: MarketsQuery_markets_data_liquidityProviderFeeShare[] | null;
 }
@@ -474,7 +474,7 @@ export interface MarketsQuery_markets {
   */
  tradableInstrument: MarketsQuery_markets_tradableInstrument;
  /**
-   * The number of decimal places that an integer must be shifted by in order to get a correct
+   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
   * number denominated in the currency of the market. (uint64)
   * 
   * Examples:
@@ -21,7 +21,7 @@ export interface NetworkParametersQuery_networkParameters {
 export interface NetworkParametersQuery {
  /**
-   * Return the full list of network parameters
+   * return the full list of network parameters
   */
  networkParameters: NetworkParametersQuery_networkParameters[] | null;
 }
@@ -12,11 +12,11 @@ import { OracleSpecStatus, PropertyKeyType, ConditionOperator } from "@vegaproto
 export interface OracleSpecs_oracleSpecs_filters_key {
  __typename: "PropertyKey";
  /**
-   * The name of the property.
+   * name is the name of the property.
   */
  name: string | null;
  /**
-   * The type of the property.
+   * type is the type of the property.
   */
  type: PropertyKeyType;
 }
@@ -24,11 +24,11 @@ export interface OracleSpecs_oracleSpecs_filters_key {
 export interface OracleSpecs_oracleSpecs_filters_conditions {
  __typename: "Condition";
  /**
-   * The value to compare against.
+   * value is used by the comparator.
   */
  value: string | null;
  /**
-   * The type of comparison to make on the value.
+   * comparator is the type of comparison to make on the value.
   */
  operator: ConditionOperator;
 }
@@ -36,11 +36,11 @@ export interface OracleSpecs_oracleSpecs_filters_conditions {
 export interface OracleSpecs_oracleSpecs_filters {
  __typename: "Filter";
  /**
-   * The oracle data property key targeted by the filter.
+   * key is the oracle data property key targeted by the filter.
   */
  key: OracleSpecs_oracleSpecs_filters_key;
  /**
-   * The conditions that should be matched by the data to be
+   * conditions are the conditions that should be matched by the data to be
   * considered of interest.
   */
  conditions: OracleSpecs_oracleSpecs_filters_conditions[] | null;
@@ -49,7 +49,7 @@ export interface OracleSpecs_oracleSpecs_filters {
 export interface OracleSpecs_oracleSpecs_data {
  __typename: "OracleData";
  /**
-   * The list of public keys that signed the data
+   * pubKeys is the list of public keys that signed the data
   */
  pubKeys: string[] | null;
 }
@@ -57,7 +57,7 @@ export interface OracleSpecs_oracleSpecs_data {
 export interface OracleSpecs_oracleSpecs {
  __typename: "OracleSpec";
  /**
-   * Status describes the status of the oracle spec
+   * status describes the status of the oracle spec
   */
  status: OracleSpecStatus;
  /**
@@ -73,18 +73,18 @@ export interface OracleSpecs_oracleSpecs {
   */
  updatedAt: string | null;
  /**
-   * The list of authorized public keys that signed the data for this
+   * pubKeys is the list of authorized public keys that signed the data for this
   * oracle. All the public keys in the oracle data should be contained in these
   * public keys.
   */
  pubKeys: string[] | null;
  /**
-   * Filters describes which oracle data are considered of interest or not for
+   * filters describes which oracle data are considered of interest or not for
   * the product (or the risk model).
   */
  filters: OracleSpecs_oracleSpecs_filters[] | null;
  /**
-   * Data list all the oracle data broadcast to this spec
+   * data list all the oracle data broadcast to this spec
   */
  data: OracleSpecs_oracleSpecs_data[];
 }
@@ -69,19 +69,13 @@ export interface NodesQuery_nodes {
   * Amount of stake on the next epoch
   */
  pendingStake: string;
  /**
   * Summary of epoch data across all nodes
   */
  epochData: NodesQuery_nodes_epochData | null;
  /**
   * Validator status of the node
   */
  status: NodeStatus;
 }
 export interface NodesQuery {
  /**
-   * All known network nodes
+   * all known network nodes
   */
  nodes: NodesQuery_nodes[] | null;
 }
@@ -12,7 +12,7 @@ import { AccountType } from "@vegaprotocol/types";
 export interface Delegations_epoch {
  __typename: "Epoch";
  /**
-   * Numeric sequence number used to identify the epoch
+   * Presumably this is an integer or something. If there's no such thing, disregard
   */
  id: string;
 }
@@ -131,7 +131,7 @@ export interface Delegations_party {
 export interface Delegations {
  /**
-   * Get data for a specific epoch, if ID omitted it gets the current epoch. If the string is 'next', fetch the next epoch
+   * get data for a specific epoch, if ID omitted it gets the current epoch. If the string is 'next', fetch the next epoch
   */
  epoch: Delegations_epoch;
  /**
@@ -293,7 +293,7 @@ export interface ProposalFields {
   */
  datetime: string;
  /**
-   * Why the proposal was rejected by the core
+   * Reason for the proposal to be rejected by the core
   */
  rejectionReason: ProposalRejectionReason | null;
  /**
@@ -293,7 +293,7 @@ export interface Proposal_proposal {
   */
  datetime: string;
  /**
-   * Why the proposal was rejected by the core
+   * Reason for the proposal to be rejected by the core
   */
  rejectionReason: ProposalRejectionReason | null;
  /**
@@ -293,7 +293,7 @@ export interface Proposals_proposalsConnection_edges_node {
   */
  datetime: string;
  /**
-   * Why the proposal was rejected by the core
+   * Reason for the proposal to be rejected by the core
   */
  rejectionReason: ProposalRejectionReason | null;
  /**
@@ -21,7 +21,7 @@ export interface NodeData_nodeData {
 export interface NodeData {
  /**
-   * Returns information about nodes
+   * returns information about nodes
   */
  nodeData: NodeData_nodeData | null;
 }
@@ -40,7 +40,7 @@ export interface Rewards_party_rewardDetails_rewards_party {
 export interface Rewards_party_rewardDetails_rewards_epoch {
  __typename: "Epoch";
  /**
-   * Numeric sequence number used to identify the epoch
+   * Presumably this is an integer or something. If there's no such thing, disregard
   */
  id: string;
 }
@@ -124,7 +124,7 @@ export interface Rewards_party {
   */
  id: string;
  /**
-   * Return reward information
+   * return reward information
   */
  rewardDetails: (Rewards_party_rewardDetails | null)[] | null;
  delegations: Rewards_party_delegations[] | null;
@@ -149,7 +149,7 @@ export interface Rewards_epoch_timestamps {
 export interface Rewards_epoch {
  __typename: "Epoch";
  /**
-   * Numeric sequence number used to identify the epoch
+   * Presumably this is an integer or something. If there's no such thing, disregard
   */
  id: string;
  /**
@@ -164,7 +164,7 @@ export interface Rewards {
   */
  party: Rewards_party | null;
  /**
-   * Get data for a specific epoch, if ID omitted it gets the current epoch. If the string is 'next', fetch the next epoch
+   * get data for a specific epoch, if ID omitted it gets the current epoch. If the string is 'next', fetch the next epoch
   */
  epoch: Rewards_epoch;
 }
@@ -81,11 +81,11 @@ export interface Nodes_nodeData {
 export interface Nodes {
  /**
-   * All known network nodes
+   * all known network nodes
   */
  nodes: Nodes_nodes[] | null;
  /**
-   * Returns information about nodes
+   * returns information about nodes
   */
  nodeData: Nodes_nodeData | null;
 }
@@ -47,7 +47,7 @@ export interface PartyDelegations_party {
 export interface PartyDelegations_epoch {
  __typename: "Epoch";
  /**
-   * Numeric sequence number used to identify the epoch
+   * Presumably this is an integer or something. If there's no such thing, disregard
   */
  id: string;
 }
@@ -58,7 +58,7 @@ export interface PartyDelegations {
   */
  party: PartyDelegations_party | null;
  /**
-   * Get data for a specific epoch, if ID omitted it gets the current epoch. If the string is 'next', fetch the next epoch
+   * get data for a specific epoch, if ID omitted it gets the current epoch. If the string is 'next', fetch the next epoch
   */
  epoch: PartyDelegations_epoch;
 }
@@ -81,7 +81,7 @@ export interface Staking_epoch_timestamps {
 export interface Staking_epoch {
  __typename: "Epoch";
  /**
-   * Numeric sequence number used to identify the epoch
+   * Presumably this is an integer or something. If there's no such thing, disregard
   */
  id: string;
  /**
@@ -181,13 +181,7 @@ export interface Staking_nodes {
   * The pending staked field formatted by the client
   */
  pendingStakeFormatted: string;
  /**
   * Summary of epoch data across all nodes
   */
  epochData: Staking_nodes_epochData | null;
  /**
   * Validator status of the node
   */
  status: NodeStatus;
  /**
   * Ranking scores and status for the validator for the current epoch
@@ -229,15 +223,15 @@ export interface Staking {
   */
  party: Staking_party | null;
  /**
-   * Get data for a specific epoch, if ID omitted it gets the current epoch. If the string is 'next', fetch the next epoch
+   * get data for a specific epoch, if ID omitted it gets the current epoch. If the string is 'next', fetch the next epoch
   */
  epoch: Staking_epoch;
  /**
-   * All known network nodes
+   * all known network nodes
   */
  nodes: Staking_nodes[] | null;
  /**
-   * Returns information about nodes
+   * returns information about nodes
   */
  nodeData: Staking_nodeData | null;
 }
@@ -10,7 +10,7 @@ export const generateCandles = (
 ): CandlesQuery => {
  const candles: CandleFieldsFragment[] = [
    {
-      periodStart: '1661515200000000000',
+      start: '1661515200000000000',
      high: '17481092',
      low: '17403651',
      open: '17458833',
@@ -19,7 +19,7 @@ export const generateCandles = (
      __typename: 'Candle',
    },
    {
-      periodStart: '1661516100000000000',
+      start: '1661516100000000000',
      high: '17491202',
      low: '17361138',
      open: '17446470',
@@ -28,7 +28,7 @@ export const generateCandles = (
      __typename: 'Candle',
    },
    {
-      periodStart: '1661517000000000000',
+      start: '1661517000000000000',
      high: '17424522',
      low: '17337719',
      open: '17367174',
@@ -50,11 +50,7 @@ export const generateCandles = (
        },
        __typename: 'TradableInstrument',
      },
-      candlesConnection: {
+      candles,
        edges: candles.map((node) => ({
          node,
        })),
      },
      __typename: 'Market',
    },
  };
@@ -113,7 +113,7 @@ export const generateMarketInfoQuery = (
        },
        __typename: 'LiquidityMonitoringParameters',
      },
-      candlesConnection: null,
+      candles: null,
      tradableInstrument: {
        __typename: 'TradableInstrument',
        instrument: {
@@ -11,6 +11,7 @@ import type { Market } from '../../../../trading/pages/markets/__generated__/Mar
 export const generateMarket = (override?: PartialDeep<Market>): Market => {
  const defaultResult: Market = {
    market: {
      __typename: 'Market',
      id: 'market-0',
      tradingMode: MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
      state: MarketState.STATE_ACTIVE,
@@ -75,30 +76,20 @@ export const generateMarket = (override?: PartialDeep<Market>): Market => {
        close: null,
        __typename: 'MarketTimestamps',
      },
-      candlesConnection: {
+      candles: [
-        __typename: 'CandleDataConnection',
+        {
-        edges: [
+          open: '2095312844',
-          {
+          close: '2090090607',
-            __typename: 'CandleEdge',
+          volume: '4847',
-            node: {
+          __typename: 'Candle',
-              open: '2095312844',
+        },
-              close: '2090090607',
+        {
-              volume: '4847',
+          open: '2090090000',
-              __typename: 'Candle',
+          close: '2090090607',
-            },
+          volume: '4847',
-          },
+          __typename: 'Candle',
-          {
+        },
-            __typename: 'CandleEdge',
+      ],
            node: {
              open: '2090090000',
              close: '2090090607',
              volume: '4847',
              __typename: 'Candle',
            },
          },
        ],
      },
      __typename: 'Market',
    },
  };
@@ -313,82 +313,58 @@ export const generateMarketsCandles = (
    {
      __typename: 'Market',
      id: 'market-0',
-      candlesConnection: {
+      candles: [
-        __typename: 'CandleDataConnection',
+        {
-        edges: [
+          __typename: 'Candle',
-          {
+          open: '100',
-            __typename: 'CandleEdge',
+          close: '100',
-            node: {
+          high: '110',
-              __typename: 'Candle',
+          low: '90',
-              open: '100',
+          volume: '1',
-              close: '100',
+        },
-              high: '110',
+      ],
              low: '90',
              volume: '1',
            },
          },
        ],
      },
    },
    {
      __typename: 'Market',
      id: 'market-1',
-      candlesConnection: {
+      candles: [
-        __typename: 'CandleDataConnection',
+        {
-        edges: [
+          __typename: 'Candle',
-          {
+          open: '100',
-            __typename: 'CandleEdge',
+          close: '100',
-            node: {
+          high: '110',
-              __typename: 'Candle',
+          low: '90',
-              open: '100',
+          volume: '1',
-              close: '100',
+        },
-              high: '110',
+      ],
              low: '90',
              volume: '1',
            },
          },
        ],
      },
    },
    {
      __typename: 'Market',
      id: 'market-2',
-      candlesConnection: {
+      candles: [
-        __typename: 'CandleDataConnection',
+        {
-        edges: [
+          __typename: 'Candle',
-          {
+          open: '100',
-            __typename: 'CandleEdge',
+          close: '100',
-            node: {
+          high: '110',
-              __typename: 'Candle',
+          low: '90',
-              open: '100',
+          volume: '1',
-              close: '100',
+        },
-              high: '110',
+      ],
              low: '90',
              volume: '1',
            },
          },
        ],
      },
    },
    {
      __typename: 'Market',
      id: 'market-3',
-      candlesConnection: {
+      candles: [
-        __typename: 'CandleDataConnection',
+        {
-        edges: [
+          __typename: 'Candle',
-          {
+          open: '100',
-            __typename: 'CandleEdge',
+          close: '100',
-            node: {
+          high: '110',
-              __typename: 'Candle',
+          low: '90',
-              open: '100',
+          volume: '1',
-              close: '100',
+        },
-              high: '110',
+      ],
              low: '90',
              volume: '1',
            },
          },
        ],
      },
    },
  ];
  const defaultResult: MarketsCandlesQuery = {
@@ -50,14 +50,10 @@ query Market($marketId: ID!, $interval: Interval!, $since: String!) {
      open
      close
    }
-    candlesConnection(interval: $interval, since: $since) {
+    candles(interval: $interval, since: $since) {
-      edges {
+      open
-        node {
+      close
-          open
+      volume
          close
          volume
        }
      }
    }
  }
 }
@@ -65,14 +65,10 @@ const MARKET_QUERY = gql`
        open
        close
      }
-      candlesConnection(interval: $interval, since: $since) {
+      candles(interval: $interval, since: $since) {
-        edges {
+        open
-          node {
+        close
-            open
+        volume
            close
            volume
          }
        }
      }
    }
  }
@@ -20,7 +20,7 @@ export interface Market_market_data_market {
 export interface Market_market_data {
  __typename: "MarketData";
  /**
-   * Market of the associated mark price
+   * market of the associated mark price
   */
  market: Market_market_data_market;
  /**
@@ -32,43 +32,43 @@ export interface Market_market_data {
   */
  auctionEnd: string | null;
  /**
-   * The mark price (an unsigned integer)
+   * the mark price (an unsigned integer)
   */
  markPrice: string;
  /**
-   * Indicative volume if the auction ended now, 0 if not in auction mode
+   * indicative volume if the auction ended now, 0 if not in auction mode
   */
  indicativeVolume: string;
  /**
-   * Indicative price if the auction ended now, 0 if not in auction mode
+   * indicative price if the auction ended now, 0 if not in auction mode
   */
  indicativePrice: string;
  /**
-   * The supplied stake for the market
+   * the supplied stake for the market
   */
  suppliedStake: string | null;
  /**
-   * The amount of stake targeted for this market
+   * the amount of stake targeted for this market
   */
  targetStake: string | null;
  /**
-   * The aggregated volume being bid at the best bid price.
+   * the aggregated volume being bid at the best bid price.
   */
  bestBidVolume: string;
  /**
-   * The aggregated volume being offered at the best offer price.
+   * the aggregated volume being offered at the best offer price.
   */
  bestOfferVolume: string;
  /**
-   * The aggregated volume being offered at the best static bid price, excluding pegged orders
+   * the aggregated volume being offered at the best static bid price, excluding pegged orders
   */
  bestStaticBidVolume: string;
  /**
-   * The aggregated volume being offered at the best static offer price, excluding pegged orders.
+   * the aggregated volume being offered at the best static offer price, excluding pegged orders.
   */
  bestStaticOfferVolume: string;
  /**
-   * What triggered an auction (if an auction was started)
+   * what triggered an auction (if an auction was started)
   */
  trigger: AuctionTrigger;
 }
@@ -169,7 +169,7 @@ export interface Market_market_marketTimestamps {
  close: string | null;
 }
-export interface Market_market_candlesConnection_edges_node {
+export interface Market_market_candles {
  __typename: "Candle";
  /**
   * Open price (uint64)
@@ -185,22 +185,6 @@ export interface Market_market_candlesConnection_edges_node {
  volume: string;
 }
 export interface Market_market_candlesConnection_edges {
  __typename: "CandleEdge";
  /**
   * The candle
   */
  node: Market_market_candlesConnection_edges_node;
 }
 export interface Market_market_candlesConnection {
  __typename: "CandleDataConnection";
  /**
   * The candles
   */
  edges: (Market_market_candlesConnection_edges | null)[] | null;
 }
 export interface Market_market {
  __typename: "Market";
  /**
@@ -216,7 +200,7 @@ export interface Market_market {
   */
  state: MarketState;
  /**
-   * The number of decimal places that an integer must be shifted by in order to get a correct
+   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
   * number denominated in the currency of the market. (uint64)
   * 
   * Examples:
@@ -233,7 +217,7 @@ export interface Market_market {
   */
  decimalPlaces: number;
  /**
-   * The number of decimal places that an integer must be shifted in order to get a correct size (uint64).
+   * positionDecimalPlaces indicates the number of decimal places that an integer must be shifted in order to get a correct size (uint64).
   * i.e. 0 means there are no fractional orders for the market, and order sizes are always whole sizes.
   * 2 means sizes given as 10^2 * desired size, e.g. a desired size of 1.23 is represented as 123 in this market.
   * This sets how big the smallest order / position on the market can be.
@@ -248,13 +232,13 @@ export interface Market_market {
   */
  tradableInstrument: Market_market_tradableInstrument;
  /**
-   * Timestamps for state changes in the market
+   * timestamps for state changes in the market
   */
  marketTimestamps: Market_market_marketTimestamps;
  /**
-   * Candles on a market, for the 'last' n candles, at 'interval' seconds as specified by parameters using cursor based pagination
+   * Candles on a market, for the 'last' n candles, at 'interval' seconds as specified by parameters
   */
-  candlesConnection: Market_market_candlesConnection | null;
+  candles: (Market_market_candles | null)[] | null;
 }
 export interface Market {
@@ -10,7 +10,7 @@ export type MarketQueryVariables = Types.Exact<{
 }>;
-export type MarketQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, tradingMode: Types.MarketTradingMode, state: Types.MarketState, decimalPlaces: number, positionDecimalPlaces: number, data?: { __typename?: 'MarketData', auctionStart?: string | null, auctionEnd?: string | null, markPrice: string, indicativeVolume: string, indicativePrice: string, suppliedStake?: string | null, targetStake?: string | null, bestBidVolume: string, bestOfferVolume: string, bestStaticBidVolume: string, bestStaticOfferVolume: string, trigger: Types.AuctionTrigger, market: { __typename?: 'Market', id: string } } | null, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, oracleSpecForTradingTermination: { __typename?: 'OracleSpec', id: string }, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open?: string | null, close?: string | null }, candlesConnection?: { __typename?: 'CandleDataConnection', edges?: Array<{ __typename?: 'CandleEdge', node: { __typename?: 'Candle', open: string, close: string, volume: string } } | null> | null } | null } | null };
+export type MarketQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, tradingMode: Types.MarketTradingMode, state: Types.MarketState, decimalPlaces: number, positionDecimalPlaces: number, data?: { __typename?: 'MarketData', auctionStart?: string | null, auctionEnd?: string | null, markPrice: string, indicativeVolume: string, indicativePrice: string, suppliedStake?: string | null, targetStake?: string | null, bestBidVolume: string, bestOfferVolume: string, bestStaticBidVolume: string, bestStaticOfferVolume: string, trigger: Types.AuctionTrigger, market: { __typename?: 'Market', id: string } } | null, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, oracleSpecForTradingTermination: { __typename?: 'OracleSpec', id: string }, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open?: string | null, close?: string | null }, candles?: Array<{ __typename?: 'Candle', open: string, close: string, volume: string } | null> | null } | null };
 export const MarketDocument = gql`
@@ -66,14 +66,10 @@ export const MarketDocument = gql`
      open
      close
    }
-    candlesConnection(interval: $interval, since: $since) {
+    candles(interval: $interval, since: $since) {
-      edges {
+      open
-        node {
+      close
-          open
+      volume
          close
          volume
        }
      }
    }
  }
 }
@@ -1,3 +1,4 @@
 import compact from 'lodash/compact';
 import { DealTicketContainer } from '@vegaprotocol/deal-ticket';
 import { MarketInfoContainer } from '@vegaprotocol/market-info';
 import { OrderbookContainer } from '@vegaprotocol/market-depth';
@@ -121,8 +122,8 @@ export const TradeMarketHeader = ({
  const { setAssetDetailsDialogOpen, setAssetDetailsDialogSymbol } =
    useAssetDetailsDialogStore();
-  const candlesClose: string[] = (market?.candlesConnection?.edges || [])
+  const candlesClose: string[] = compact(market?.candles)
-    .map((candle) => candle?.node.close)
+    .map((candle) => candle.close)
    .filter((c): c is CandleClose => c !== null);
  const symbol =
    market.tradableInstrument.instrument.product?.settlementAsset?.symbol;
@@ -53,9 +53,6 @@ export interface DepositPage_assetsConnection_edges_node {
 export interface DepositPage_assetsConnection_edges {
  __typename: "AssetEdge";
  /**
   * The asset information
   */
  node: DepositPage_assetsConnection_edges_node;
 }
@@ -1,60 +0,0 @@
 import { Schema as Types } from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type AssetsConnectionQueryVariables = Types.Exact<{ [key: string]: never; }>;
 export type AssetsConnectionQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset' } | { __typename?: 'ERC20', contractAddress: string, lifetimeLimit: string, withdrawThreshold: string } } } | null> | null } | null };
 export const AssetsConnectionDocument = gql`
    query AssetsConnection {
  assetsConnection {
    edges {
      node {
        id
        name
        symbol
        decimals
        quantum
        source {
          ... on ERC20 {
            contractAddress
            lifetimeLimit
            withdrawThreshold
          }
        }
      }
    }
  }
 }
    `;
 /**
 * __useAssetsConnectionQuery__
 *
 * To run a query within a React component, call `useAssetsConnectionQuery` and pass it any options that fit your needs.
 * When your component renders, `useAssetsConnectionQuery` 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 } = useAssetsConnectionQuery({
 *   variables: {
 *   },
 * });
 */
 export function useAssetsConnectionQuery(baseOptions?: Apollo.QueryHookOptions<AssetsConnectionQuery, AssetsConnectionQueryVariables>) {
        const options = {...defaultOptions, ...baseOptions}
        return Apollo.useQuery<AssetsConnectionQuery, AssetsConnectionQueryVariables>(AssetsConnectionDocument, options);
      }
 export function useAssetsConnectionLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<AssetsConnectionQuery, AssetsConnectionQueryVariables>) {
          const options = {...defaultOptions, ...baseOptions}
          return Apollo.useLazyQuery<AssetsConnectionQuery, AssetsConnectionQueryVariables>(AssetsConnectionDocument, options);
        }
 export type AssetsConnectionQueryHookResult = ReturnType<typeof useAssetsConnectionQuery>;
 export type AssetsConnectionLazyQueryHookResult = ReturnType<typeof useAssetsConnectionLazyQuery>;
 export type AssetsConnectionQueryResult = Apollo.QueryResult<AssetsConnectionQuery, AssetsConnectionQueryVariables>;
@@ -1,5 +1,5 @@
 fragment CandleFields on Candle {
-  periodStart
+  datetime
  high
  low
  open
@@ -18,12 +18,8 @@ query Candles($marketId: ID!, $interval: Interval!, $since: String!) {
        code
      }
    }
-    candlesConnection(interval: $interval, since: $since) {
+    candles(interval: $interval, since: $since) {
-      edges {
+      ...CandleFields
        node {
          ...CandleFields
        }
      }
    }
  }
 }
@@ -3,7 +3,7 @@ import { Schema as Types } from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type CandleFieldsFragment = { __typename?: 'Candle', periodStart: string, high: string, low: string, open: string, close: string, volume: string };
+export type CandleFieldsFragment = { __typename?: 'Candle', datetime: string, high: string, low: string, open: string, close: string, volume: string };
 export type CandlesQueryVariables = Types.Exact<{
  marketId: Types.Scalars['ID'];
@@ -12,7 +12,7 @@ export type CandlesQueryVariables = Types.Exact<{
 }>;
-export type CandlesQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string } }, candlesConnection?: { __typename?: 'CandleDataConnection', edges?: Array<{ __typename?: 'CandleEdge', node: { __typename?: 'Candle', periodStart: string, high: string, low: string, open: string, close: string, volume: string } } | null> | null } | null } | null };
+export type CandlesQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string } }, candles?: Array<{ __typename?: 'Candle', datetime: string, high: string, low: string, open: string, close: string, volume: string } | null> | null } | null };
 export type CandlesEventsSubscriptionVariables = Types.Exact<{
  marketId: Types.Scalars['ID'];
@@ -20,11 +20,11 @@ export type CandlesEventsSubscriptionVariables = Types.Exact<{
 }>;
-export type CandlesEventsSubscription = { __typename?: 'Subscription', candles: { __typename?: 'Candle', periodStart: string, high: string, low: string, open: string, close: string, volume: string } };
+export type CandlesEventsSubscription = { __typename?: 'Subscription', candles: { __typename?: 'Candle', datetime: string, high: string, low: string, open: string, close: string, volume: string } };
 export const CandleFieldsFragmentDoc = gql`
    fragment CandleFields on Candle {
-  periodStart
+  datetime
  high
  low
  open
@@ -44,12 +44,8 @@ export const CandlesDocument = gql`
        code
      }
    }
-    candlesConnection(interval: $interval, since: $since) {
+    candles(interval: $interval, since: $since) {
-      edges {
+      ...CandleFields
        node {
          ...CandleFields
        }
      }
    }
  }
 }
@@ -143,11 +143,10 @@ export class VegaDataSource implements DataSource {
        fetchPolicy: 'no-cache',
      });
-      if (data?.market?.candlesConnection?.edges) {
+      if (data?.market?.candles) {
        const decimalPlaces = data.market.decimalPlaces;
-        const candles = data.market.candlesConnection.edges
+        const candles = data.market.candles
          .map((edge) => edge?.node)
          .filter((node): node is CandleFieldsFragment => !!node)
          .map((node) => parseCandle(node, decimalPlaces));
@@ -200,7 +199,7 @@ function parseCandle(
  decimalPlaces: number
 ): Candle {
  return {
-    date: new Date(Number(candle.periodStart) / 1_000_000),
+    date: new Date(candle.datetime),
    high: Number(addDecimal(candle.high, decimalPlaces)),
    low: Number(addDecimal(candle.low, decimalPlaces)),
    open: Number(addDecimal(candle.open, decimalPlaces)),
@@ -84,7 +84,7 @@ export interface DealTicketQuery_market {
   */
  id: string;
  /**
-   * The number of decimal places that an integer must be shifted by in order to get a correct
+   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
   * number denominated in the currency of the market. (uint64)
   * 
   * Examples:
@@ -101,7 +101,7 @@ export interface DealTicketQuery_market {
   */
  decimalPlaces: number;
  /**
-   * The number of decimal places that an integer must be shifted in order to get a correct size (uint64).
+   * positionDecimalPlaces indicates the number of decimal places that an integer must be shifted in order to get a correct size (uint64).
   * i.e. 0 means there are no fractional orders for the market, and order sizes are always whole sizes.
   * 2 means sizes given as 10^2 * desired size, e.g. a desired size of 1.23 is represented as 123 in this market.
   * This sets how big the smallest order / position on the market can be.
@@ -34,7 +34,7 @@ export type DepositEvent_busEvents_event = DepositEvent_busEvents_event_TimeUpda
 export interface DepositEvent_busEvents {
  __typename: "BusEvent";
  /**
-   * The payload - the wrapped event
+   * the payload - the wrapped event
   */
  event: DepositEvent_busEvents_event;
 }
@@ -66,7 +66,7 @@ export type DepositEventSub_busEvents_event = DepositEventSub_busEvents_event_Ti
 export interface DepositEventSub_busEvents {
  __typename: "BusEvent";
  /**
-   * The payload - the wrapped event
+   * the payload - the wrapped event
   */
  event: DepositEventSub_busEvents_event;
 }
@@ -10,7 +10,7 @@
 export interface BlockTime_busEvents {
  __typename: "BusEvent";
  /**
-   * The ID for this event
+   * the ID for this event
   */
  id: string;
 }
@@ -21,7 +21,7 @@ export interface Statistics_statistics {
 export interface Statistics {
  /**
-   * Get statistics about the Vega node
+   * get statistics about the Vega node
   */
  statistics: Statistics_statistics;
 }
@@ -84,7 +84,7 @@ export interface Fills_party_tradesConnection_edges_node {
   */
  price: string;
  /**
-   * The number of units traded, will always be <= the remaining size of both orders immediately before the trade (uint64)
+   * The number of contracts trades, will always be <= the remaining size of both orders immediately before the trade (uint64)
   */
  size: string;
  /**
@@ -119,33 +119,15 @@ export interface Fills_party_tradesConnection_edges_node {
 export interface Fills_party_tradesConnection_edges {
  __typename: "TradeEdge";
  /**
   * The trade
   */
  node: Fills_party_tradesConnection_edges_node;
  /**
   * The cursor for this trade
   */
  cursor: string;
 }
 export interface Fills_party_tradesConnection_pageInfo {
  __typename: "PageInfo";
  /**
   * The first cursor in the current page
   */
  startCursor: string;
  /**
   * The last cursor in the current page
   */
  endCursor: string;
  /**
   * The connection has more pages to fetch when traversing forward through the connection
   */
  hasNextPage: boolean;
  /**
   * The connection has more pages to fetch when traversing backward through the connection
   */
  hasPreviousPage: boolean;
 }
@@ -28,7 +28,7 @@ export interface ProposalEvent_busEvents_event_Proposal {
   */
  state: ProposalState;
  /**
-   * Why the proposal was rejected by the core
+   * Reason for the proposal to be rejected by the core
   */
  rejectionReason: ProposalRejectionReason | null;
  /**
@@ -42,11 +42,11 @@ export type ProposalEvent_busEvents_event = ProposalEvent_busEvents_event_TimeUp
 export interface ProposalEvent_busEvents {
  __typename: "BusEvent";
  /**
-   * The type of event
+   * the type of event
   */
  type: BusEventType;
  /**
-   * The payload - the wrapped event
+   * the payload - the wrapped event
   */
  event: ProposalEvent_busEvents_event;
 }
@@ -174,27 +174,27 @@ export interface MarketLiquidity_market_data_liquidityProviderFeeShare {
 export interface MarketLiquidity_market_data {
  __typename: "MarketData";
  /**
-   * Market of the associated mark price
+   * market of the associated mark price
   */
  market: MarketLiquidity_market_data_market;
  /**
-   * The supplied stake for the market
+   * the supplied stake for the market
   */
  suppliedStake: string | null;
  /**
-   * The sum of the size of all positions greater than 0.
+   * the sum of the size of all positions greater than 0.
   */
  openInterest: string;
  /**
-   * The amount of stake targeted for this market
+   * the amount of stake targeted for this market
   */
  targetStake: string | null;
  /**
-   * The market value proxy
+   * the market value proxy
   */
  marketValueProxy: string;
  /**
-   * The equity like share of liquidity fee for each liquidity provider
+   * the equity like share of liquidity fee for each liquidity provider
   */
  liquidityProviderFeeShare: MarketLiquidity_market_data_liquidityProviderFeeShare[] | null;
 }
@@ -206,7 +206,7 @@ export interface MarketLiquidity_market {
   */
  id: string;
  /**
-   * The number of decimal places that an integer must be shifted by in order to get a correct
+   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
   * number denominated in the currency of the market. (uint64)
   * 
   * Examples:
@@ -223,7 +223,7 @@ export interface MarketLiquidity_market {
   */
  decimalPlaces: number;
  /**
-   * The number of decimal places that an integer must be shifted in order to get a correct size (uint64).
+   * positionDecimalPlaces indicates the number of decimal places that an integer must be shifted in order to get a correct size (uint64).
   * i.e. 0 means there are no fractional orders for the market, and order sizes are always whole sizes.
   * 2 means sizes given as 10^2 * desired size, e.g. a desired size of 1.23 is represented as 123 in this market.
   * This sets how big the smallest order / position on the market can be.
@@ -79,12 +79,8 @@ query MarketInfoQuery($marketId: ID!, $interval: Interval!, $since: String!) {
        scalingFactor
      }
    }
-    candlesConnection(interval: $interval, since: $since) {
+    candles(interval: $interval, since: $since) {
-      edges {
+      volume
        node {
          volume
        }
      }
    }
    tradableInstrument {
      instrument {
@@ -10,7 +10,7 @@ export type MarketInfoQueryQueryVariables = Types.Exact<{
 }>;
-export type MarketInfoQueryQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, accounts?: Array<{ __typename?: 'Account', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string } }> | null, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, priceMonitoringSettings: { __typename?: 'PriceMonitoringSettings', parameters?: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null } | null }, riskFactors?: { __typename?: 'RiskFactor', market: string, short: string, long: string } | null, data?: { __typename?: 'MarketData', markPrice: string, indicativeVolume: string, bestBidVolume: string, bestOfferVolume: string, bestStaticBidVolume: string, bestStaticOfferVolume: string, openInterest: string, bestBidPrice: string, bestOfferPrice: string, trigger: Types.AuctionTrigger, market: { __typename?: 'Market', id: string }, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null } | null, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: number, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, candlesConnection?: { __typename?: 'CandleDataConnection', edges?: Array<{ __typename?: 'CandleEdge', node: { __typename?: 'Candle', volume: string } } | null> | null } | null, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string }, oracleSpecForSettlementPrice: { __typename?: 'OracleSpec', id: string }, oracleSpecForTradingTermination: { __typename?: 'OracleSpec', id: string }, oracleSpecBinding: { __typename?: 'OracleSpecToFutureBinding', settlementPriceProperty: string, tradingTerminationProperty: string } } }, riskModel: { __typename?: 'LogNormalRiskModel', tau: number, riskAversionParameter: number, params: { __typename?: 'LogNormalModelParams', r: number, sigma: number, mu: number } } | { __typename?: 'SimpleRiskModel', params: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } } }, depth: { __typename?: 'MarketDepth', lastTrade?: { __typename?: 'Trade', price: string } | null } } | null };
+export type MarketInfoQueryQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, accounts?: Array<{ __typename?: 'Account', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string } }> | null, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, priceMonitoringSettings: { __typename?: 'PriceMonitoringSettings', parameters?: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null } | null }, riskFactors?: { __typename?: 'RiskFactor', market: string, short: string, long: string } | null, data?: { __typename?: 'MarketData', markPrice: string, indicativeVolume: string, bestBidVolume: string, bestOfferVolume: string, bestStaticBidVolume: string, bestStaticOfferVolume: string, openInterest: string, bestBidPrice: string, bestOfferPrice: string, trigger: Types.AuctionTrigger, market: { __typename?: 'Market', id: string }, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null } | null, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: number, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, candles?: Array<{ __typename?: 'Candle', volume: string } | null> | null, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string }, oracleSpecForSettlementPrice: { __typename?: 'OracleSpec', id: string }, oracleSpecForTradingTermination: { __typename?: 'OracleSpec', id: string }, oracleSpecBinding: { __typename?: 'OracleSpecToFutureBinding', settlementPriceProperty: string, tradingTerminationProperty: string } } }, riskModel: { __typename?: 'LogNormalRiskModel', tau: number, riskAversionParameter: number, params: { __typename?: 'LogNormalModelParams', r: number, sigma: number, mu: number } } | { __typename?: 'SimpleRiskModel', params: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } } }, depth: { __typename?: 'MarketDepth', lastTrade?: { __typename?: 'Trade', price: string } | null } } | null };
 export const MarketInfoQueryDocument = gql`
@@ -95,12 +95,8 @@ export const MarketInfoQueryDocument = gql`
        scalingFactor
      }
    }
-    candlesConnection(interval: $interval, since: $since) {
+    candles(interval: $interval, since: $since) {
-      edges {
+      volume
        node {
          volume
        }
      }
    }
    tradableInstrument {
      instrument {
@@ -168,59 +168,59 @@ export interface MarketInfoQuery_market_data_priceMonitoringBounds {
 export interface MarketInfoQuery_market_data {
  __typename: "MarketData";
  /**
-   * Market of the associated mark price
+   * market of the associated mark price
   */
  market: MarketInfoQuery_market_data_market;
  /**
-   * The mark price (an unsigned integer)
+   * the mark price (an unsigned integer)
   */
  markPrice: string;
  /**
-   * The aggregated volume being bid at the best bid price.
+   * the aggregated volume being bid at the best bid price.
   */
  bestBidVolume: string;
  /**
-   * The aggregated volume being offered at the best offer price.
+   * the aggregated volume being offered at the best offer price.
   */
  bestOfferVolume: string;
  /**
-   * The aggregated volume being offered at the best static bid price, excluding pegged orders
+   * the aggregated volume being offered at the best static bid price, excluding pegged orders
   */
  bestStaticBidVolume: string;
  /**
-   * The aggregated volume being offered at the best static offer price, excluding pegged orders.
+   * the aggregated volume being offered at the best static offer price, excluding pegged orders.
   */
  bestStaticOfferVolume: string;
  /**
-   * The highest price level on an order book for buy orders.
+   * the highest price level on an order book for buy orders.
   */
  bestBidPrice: string;
  /**
-   * The lowest price level on an order book for offer orders.
+   * the lowest price level on an order book for offer orders.
   */
  bestOfferPrice: string;
  /**
-   * What triggered an auction (if an auction was started)
+   * what triggered an auction (if an auction was started)
   */
  trigger: AuctionTrigger;
  /**
-   * The sum of the size of all positions greater than 0.
+   * the sum of the size of all positions greater than 0.
   */
  openInterest: string;
  /**
-   * The supplied stake for the market
+   * the supplied stake for the market
   */
  suppliedStake: string | null;
  /**
-   * The amount of stake targeted for this market
+   * the amount of stake targeted for this market
   */
  targetStake: string | null;
  /**
-   * The market value proxy
+   * the market value proxy
   */
  marketValueProxy: string;
  /**
-   * A list of valid price ranges per associated trigger
+   * a list of valid price ranges per associated trigger
   */
  priceMonitoringBounds: MarketInfoQuery_market_data_priceMonitoringBounds[] | null;
 }
@@ -249,7 +249,7 @@ export interface MarketInfoQuery_market_liquidityMonitoringParameters {
  targetStakeParameters: MarketInfoQuery_market_liquidityMonitoringParameters_targetStakeParameters;
 }
-export interface MarketInfoQuery_market_candlesConnection_edges_node {
+export interface MarketInfoQuery_market_candles {
  __typename: "Candle";
  /**
   * Volume price (uint64)
@@ -257,22 +257,6 @@ export interface MarketInfoQuery_market_candlesConnection_edges_node {
  volume: string;
 }
 export interface MarketInfoQuery_market_candlesConnection_edges {
  __typename: "CandleEdge";
  /**
   * The candle
   */
  node: MarketInfoQuery_market_candlesConnection_edges_node;
 }
 export interface MarketInfoQuery_market_candlesConnection {
  __typename: "CandleDataConnection";
  /**
   * The candles
   */
  edges: (MarketInfoQuery_market_candlesConnection_edges | null)[] | null;
 }
 export interface MarketInfoQuery_market_tradableInstrument_instrument_metadata {
  __typename: "InstrumentMetadata";
  /**
@@ -374,15 +358,15 @@ export interface MarketInfoQuery_market_tradableInstrument_instrument {
 export interface MarketInfoQuery_market_tradableInstrument_riskModel_LogNormalRiskModel_params {
  __typename: "LogNormalModelParams";
  /**
-   * R parameter
+   * r parameter
   */
  r: number;
  /**
-   * Sigma parameter, annualised volatility of the underlying asset, must be a strictly non-negative real number
+   * sigma parameter, annualised volatility of the underlying asset, must be a strictly non-negative real number
   */
  sigma: number;
  /**
-   * Mu parameter, annualised growth rate of the underlying asset
+   * mu parameter, annualised growth rate of the underlying asset
   */
  mu: number;
 }
@@ -460,7 +444,7 @@ export interface MarketInfoQuery_market {
   */
  id: string;
  /**
-   * The number of decimal places that an integer must be shifted by in order to get a correct
+   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
   * number denominated in the currency of the market. (uint64)
   * 
   * Examples:
@@ -477,7 +461,7 @@ export interface MarketInfoQuery_market {
   */
  decimalPlaces: number;
  /**
-   * The number of decimal places that an integer must be shifted in order to get a correct size (uint64).
+   * positionDecimalPlaces indicates the number of decimal places that an integer must be shifted in order to get a correct size (uint64).
   * i.e. 0 means there are no fractional orders for the market, and order sizes are always whole sizes.
   * 2 means sizes given as 10^2 * desired size, e.g. a desired size of 1.23 is represented as 123 in this market.
   * This sets how big the smallest order / position on the market can be.
@@ -516,9 +500,9 @@ export interface MarketInfoQuery_market {
   */
  liquidityMonitoringParameters: MarketInfoQuery_market_liquidityMonitoringParameters;
  /**
-   * Candles on a market, for the 'last' n candles, at 'interval' seconds as specified by parameters using cursor based pagination
+   * Candles on a market, for the 'last' n candles, at 'interval' seconds as specified by parameters
   */
-  candlesConnection: MarketInfoQuery_market_candlesConnection | null;
+  candles: (MarketInfoQuery_market_candles | null)[] | null;
  /**
   * An instance of, or reference to, a tradable instrument.
   */
@@ -74,12 +74,8 @@ export const MARKET_INFO_QUERY = gql`
          scalingFactor
        }
      }
-      candlesConnection(interval: $interval, since: $since) {
+      candles(interval: $interval, since: $since) {
-        edges {
+        volume
          node {
            volume
          }
        }
      }
      tradableInstrument {
        instrument {
@@ -20,7 +20,7 @@ import { MARKET_INFO_QUERY } from './info-market-query';
 import type {
  MarketInfoQuery,
  MarketInfoQuery_market,
-  MarketInfoQuery_market_candlesConnection_edges,
+  MarketInfoQuery_market_candles,
 } from './__generated__/MarketInfoQuery';
 import { MarketInfoTable } from './info-key-value-table';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
@@ -39,16 +39,10 @@ export interface InfoProps {
 export const calcCandleVolume = (
  m: MarketInfoQuery_market
 ): string | undefined => {
-  return m.candlesConnection?.edges
+  return m.candles
-    ?.reduce(
+    ?.reduce((acc: BigNumber, c: MarketInfoQuery_market_candles | null) => {
-      (
+      return acc.plus(new BigNumber(c?.volume ?? 0));
-        acc: BigNumber,
+    }, new BigNumber(m.candles[0]?.volume ?? 0))
        c: MarketInfoQuery_market_candlesConnection_edges | null
      ) => {
        return acc.plus(new BigNumber(c?.node?.volume ?? 0));
      },
      new BigNumber(m.candlesConnection?.edges[0]?.node.volume ?? 0)
    )
    ?.toString();
 };
@@ -9,7 +9,7 @@ import { Interval } from "@vegaprotocol/types";
 // GraphQL query operation: MarketCandlesQuery
 // ====================================================
-export interface MarketCandlesQuery_marketsConnection_edges_node_candlesConnection_edges_node {
+export interface MarketCandlesQuery_marketsConnection_edges_node_candles {
  __typename: "Candle";
  /**
   * High price (uint64)
@@ -33,35 +33,16 @@ export interface MarketCandlesQuery_marketsConnection_edges_node_candlesConnecti
  volume: string;
 }
 export interface MarketCandlesQuery_marketsConnection_edges_node_candlesConnection_edges {
  __typename: "CandleEdge";
  /**
   * The candle
   */
  node: MarketCandlesQuery_marketsConnection_edges_node_candlesConnection_edges_node;
 }
 export interface MarketCandlesQuery_marketsConnection_edges_node_candlesConnection {
  __typename: "CandleDataConnection";
  /**
   * The candles
   */
  edges: (MarketCandlesQuery_marketsConnection_edges_node_candlesConnection_edges | null)[] | null;
 }
 export interface MarketCandlesQuery_marketsConnection_edges_node {
  __typename: "Market";
  /**
-   * Candles on a market, for the 'last' n candles, at 'interval' seconds as specified by parameters using cursor based pagination
+   * Candles on a market, for the 'last' n candles, at 'interval' seconds as specified by parameters
   */
-  candlesConnection: MarketCandlesQuery_marketsConnection_edges_node_candlesConnection | null;
+  candles: (MarketCandlesQuery_marketsConnection_edges_node_candles | null)[] | null;
 }
 export interface MarketCandlesQuery_marketsConnection_edges {
  __typename: "MarketEdge";
  /**
   * The market
   */
  node: MarketCandlesQuery_marketsConnection_edges_node;
 }
@@ -74,9 +55,6 @@ export interface MarketCandlesQuery_marketsConnection {
 }
 export interface MarketCandlesQuery {
  /**
   * One or more instruments that are trading on the Vega network
   */
  marketsConnection: MarketCandlesQuery_marketsConnection | null;
 }
@@ -20,47 +20,47 @@ export interface MarketDataQuery_marketsConnection_edges_node_data_market {
 export interface MarketDataQuery_marketsConnection_edges_node_data {
  __typename: "MarketData";
  /**
-   * Market of the associated mark price
+   * market of the associated mark price
   */
  market: MarketDataQuery_marketsConnection_edges_node_data_market;
  /**
-   * The highest price level on an order book for buy orders.
+   * the highest price level on an order book for buy orders.
   */
  bestBidPrice: string;
  /**
-   * The lowest price level on an order book for offer orders.
+   * the lowest price level on an order book for offer orders.
   */
  bestOfferPrice: string;
  /**
-   * The mark price (an unsigned integer)
+   * the mark price (an unsigned integer)
   */
  markPrice: string;
  /**
-   * What triggered an auction (if an auction was started)
+   * what triggered an auction (if an auction was started)
   */
  trigger: AuctionTrigger;
  /**
-   * The arithmetic average of the best static bid price and best static offer price
+   * the arithmetic average of the best static bid price and best static offer price
   */
  staticMidPrice: string;
  /**
-   * What mode the market is in (auction, continuous, etc)
+   * what mode the market is in (auction, continuous, etc)
   */
  marketTradingMode: MarketTradingMode;
  /**
-   * Indicative volume if the auction ended now, 0 if not in auction mode
+   * indicative volume if the auction ended now, 0 if not in auction mode
   */
  indicativeVolume: string;
  /**
-   * Indicative price if the auction ended now, 0 if not in auction mode
+   * indicative price if the auction ended now, 0 if not in auction mode
   */
  indicativePrice: string;
  /**
-   * The highest price level on an order book for buy orders not including pegged orders.
+   * the highest price level on an order book for buy orders not including pegged orders.
   */
  bestStaticBidPrice: string;
  /**
-   * The lowest price level on an order book for offer orders not including pegged orders.
+   * the lowest price level on an order book for offer orders not including pegged orders.
   */
  bestStaticOfferPrice: string;
 }
@@ -75,9 +75,6 @@ export interface MarketDataQuery_marketsConnection_edges_node {
 export interface MarketDataQuery_marketsConnection_edges {
  __typename: "MarketEdge";
  /**
   * The market
   */
  node: MarketDataQuery_marketsConnection_edges_node;
 }
@@ -90,9 +87,6 @@ export interface MarketDataQuery_marketsConnection {
 }
 export interface MarketDataQuery {
  /**
   * One or more instruments that are trading on the Vega network
   */
  marketsConnection: MarketDataQuery_marketsConnection | null;
 }
@@ -12,47 +12,47 @@ import { AuctionTrigger, MarketTradingMode } from "@vegaprotocol/types";
 export interface MarketDataSub_marketsData {
  __typename: "ObservableMarketData";
  /**
-   * Market ID of the associated mark price
+   * market ID of the associated mark price
   */
  marketId: string;
  /**
-   * The highest price level on an order book for buy orders.
+   * the highest price level on an order book for buy orders.
   */
  bestBidPrice: string;
  /**
-   * The lowest price level on an order book for offer orders.
+   * the lowest price level on an order book for offer orders.
   */
  bestOfferPrice: string;
  /**
-   * The mark price (an unsigned integer)
+   * the mark price (an unsigned integer)
   */
  markPrice: string;
  /**
-   * What triggered an auction (if an auction was started)
+   * what triggered an auction (if an auction was started)
   */
  trigger: AuctionTrigger;
  /**
-   * The arithmetic average of the best static bid price and best static offer price
+   * the arithmetic average of the best static bid price and best static offer price
   */
  staticMidPrice: string;
  /**
-   * What mode the market is in (auction, continuous etc)
+   * what mode the market is in (auction, continuous etc)
   */
  marketTradingMode: MarketTradingMode;
  /**
-   * Indicative volume if the auction ended now, 0 if not in auction mode
+   * indicative volume if the auction ended now, 0 if not in auction mode
   */
  indicativeVolume: string;
  /**
-   * Indicative price if the auction ended now, 0 if not in auction mode
+   * indicative price if the auction ended now, 0 if not in auction mode
   */
  indicativePrice: string;
  /**
-   * The highest price level on an order book for buy orders not including pegged orders.
+   * the highest price level on an order book for buy orders not including pegged orders.
   */
  bestStaticBidPrice: string;
  /**
-   * The lowest price level on an order book for offer orders not including pegged orders
+   * the lowest price level on an order book for offer orders not including pegged orders
   */
  bestStaticOfferPrice: string;
 }
@@ -116,7 +116,7 @@ export interface MarketFields {
   */
  id: string;
  /**
-   * The number of decimal places that an integer must be shifted by in order to get a correct
+   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
   * number denominated in the currency of the market. (uint64)
   * 
   * Examples:
@@ -133,7 +133,7 @@ export interface MarketFields {
   */
  decimalPlaces: number;
  /**
-   * The number of decimal places that an integer must be shifted in order to get a correct size (uint64).
+   * positionDecimalPlaces indicates the number of decimal places that an integer must be shifted in order to get a correct size (uint64).
   * i.e. 0 means there are no fractional orders for the market, and order sizes are always whole sizes.
   * 2 means sizes given as 10^2 * desired size, e.g. a desired size of 1.23 is represented as 123 in this market.
   * This sets how big the smallest order / position on the market can be.
@@ -156,7 +156,7 @@ export interface MarketFields {
   */
  tradableInstrument: MarketFields_tradableInstrument;
  /**
-   * Timestamps for state changes in the market
+   * timestamps for state changes in the market
   */
  marketTimestamps: MarketFields_marketTimestamps;
 }
@@ -116,7 +116,7 @@ export interface Markets_marketsConnection_edges_node {
   */
  id: string;
  /**
-   * The number of decimal places that an integer must be shifted by in order to get a correct
+   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
   * number denominated in the currency of the market. (uint64)
   * 
   * Examples:
@@ -133,7 +133,7 @@ export interface Markets_marketsConnection_edges_node {
   */
  decimalPlaces: number;
  /**
-   * The number of decimal places that an integer must be shifted in order to get a correct size (uint64).
+   * positionDecimalPlaces indicates the number of decimal places that an integer must be shifted in order to get a correct size (uint64).
   * i.e. 0 means there are no fractional orders for the market, and order sizes are always whole sizes.
   * 2 means sizes given as 10^2 * desired size, e.g. a desired size of 1.23 is represented as 123 in this market.
   * This sets how big the smallest order / position on the market can be.
@@ -156,16 +156,13 @@ export interface Markets_marketsConnection_edges_node {
   */
  tradableInstrument: Markets_marketsConnection_edges_node_tradableInstrument;
  /**
-   * Timestamps for state changes in the market
+   * timestamps for state changes in the market
   */
  marketTimestamps: Markets_marketsConnection_edges_node_marketTimestamps;
 }
 export interface Markets_marketsConnection_edges {
  __typename: "MarketEdge";
  /**
   * The market
   */
  node: Markets_marketsConnection_edges_node;
 }
@@ -178,8 +175,5 @@ export interface Markets_marketsConnection {
 }
 export interface Markets {
  /**
   * One or more instruments that are trading on the Vega network
   */
  marketsConnection: Markets_marketsConnection | null;
 }
@@ -9,7 +9,7 @@ import { Interval } from "@vegaprotocol/types";
 // GraphQL query operation: MarketsCandlesQuery
 // ====================================================
-export interface MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges_node {
+export interface MarketsCandlesQuery_marketsConnection_edges_node_candles {
  __typename: "Candle";
  /**
   * High price (uint64)
@@ -33,22 +33,6 @@ export interface MarketsCandlesQuery_marketsConnection_edges_node_candlesConnect
  volume: string;
 }
 export interface MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges {
  __typename: "CandleEdge";
  /**
   * The candle
   */
  node: MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges_node;
 }
 export interface MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection {
  __typename: "CandleDataConnection";
  /**
   * The candles
   */
  edges: (MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges | null)[] | null;
 }
 export interface MarketsCandlesQuery_marketsConnection_edges_node {
  __typename: "Market";
  /**
@@ -56,16 +40,13 @@ export interface MarketsCandlesQuery_marketsConnection_edges_node {
   */
  id: string;
  /**
-   * Candles on a market, for the 'last' n candles, at 'interval' seconds as specified by parameters using cursor based pagination
+   * Candles on a market, for the 'last' n candles, at 'interval' seconds as specified by parameters
   */
-  candlesConnection: MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection | null;
+  candles: (MarketsCandlesQuery_marketsConnection_edges_node_candles | null)[] | null;
 }
 export interface MarketsCandlesQuery_marketsConnection_edges {
  __typename: "MarketEdge";
  /**
   * The market
   */
  node: MarketsCandlesQuery_marketsConnection_edges_node;
 }
@@ -78,9 +59,6 @@ export interface MarketsCandlesQuery_marketsConnection {
 }
 export interface MarketsCandlesQuery {
  /**
   * One or more instruments that are trading on the Vega network
   */
  marketsConnection: MarketsCandlesQuery_marketsConnection | null;
 }
@@ -20,47 +20,47 @@ export interface MarketsDataQuery_marketsConnection_edges_node_data_market {
 export interface MarketsDataQuery_marketsConnection_edges_node_data {
  __typename: "MarketData";
  /**
-   * Market of the associated mark price
+   * market of the associated mark price
   */
  market: MarketsDataQuery_marketsConnection_edges_node_data_market;
  /**
-   * The highest price level on an order book for buy orders.
+   * the highest price level on an order book for buy orders.
   */
  bestBidPrice: string;
  /**
-   * The lowest price level on an order book for offer orders.
+   * the lowest price level on an order book for offer orders.
   */
  bestOfferPrice: string;
  /**
-   * The mark price (an unsigned integer)
+   * the mark price (an unsigned integer)
   */
  markPrice: string;
  /**
-   * What triggered an auction (if an auction was started)
+   * what triggered an auction (if an auction was started)
   */
  trigger: AuctionTrigger;
  /**
-   * The arithmetic average of the best static bid price and best static offer price
+   * the arithmetic average of the best static bid price and best static offer price
   */
  staticMidPrice: string;
  /**
-   * What mode the market is in (auction, continuous, etc)
+   * what mode the market is in (auction, continuous, etc)
   */
  marketTradingMode: MarketTradingMode;
  /**
-   * Indicative volume if the auction ended now, 0 if not in auction mode
+   * indicative volume if the auction ended now, 0 if not in auction mode
   */
  indicativeVolume: string;
  /**
-   * Indicative price if the auction ended now, 0 if not in auction mode
+   * indicative price if the auction ended now, 0 if not in auction mode
   */
  indicativePrice: string;
  /**
-   * The highest price level on an order book for buy orders not including pegged orders.
+   * the highest price level on an order book for buy orders not including pegged orders.
   */
  bestStaticBidPrice: string;
  /**
-   * The lowest price level on an order book for offer orders not including pegged orders.
+   * the lowest price level on an order book for offer orders not including pegged orders.
   */
  bestStaticOfferPrice: string;
 }
@@ -75,9 +75,6 @@ export interface MarketsDataQuery_marketsConnection_edges_node {
 export interface MarketsDataQuery_marketsConnection_edges {
  __typename: "MarketEdge";
  /**
   * The market
   */
  node: MarketsDataQuery_marketsConnection_edges_node;
 }
@@ -90,8 +87,5 @@ export interface MarketsDataQuery_marketsConnection {
 }
 export interface MarketsDataQuery {
  /**
   * One or more instruments that are trading on the Vega network
   */
  marketsConnection: MarketsDataQuery_marketsConnection | null;
 }
@@ -1,8 +1,9 @@
 import compact from 'lodash/compact';
 import { gql } from '@apollo/client';
 import { makeDataProvider } from '@vegaprotocol/react-helpers';
 import type {
  MarketCandlesQuery,
-  MarketCandlesQuery_marketsConnection_edges_node_candlesConnection_edges_node,
+  MarketCandlesQuery_marketsConnection_edges_node_candles,
  MarketCandlesSub,
  MarketCandlesSub_candles,
 } from './__generated__';
@@ -16,16 +17,12 @@ export const MARKET_CANDLES_QUERY = gql`
    marketsConnection(id: $marketId) {
      edges {
        node {
-          candlesConnection(interval: $interval, since: $since) {
+          candles(interval: $interval, since: $since) {
-            edges {
+            high
-              node {
+            low
-                high
+            open
-                low
+            close
-                open
+            volume
                close
                volume
              }
            }
          }
        }
      }
@@ -45,8 +42,7 @@ const MARKET_CANDLES_SUB = gql`
  }
 `;
-export type Candle =
+export type Candle = MarketCandlesQuery_marketsConnection_edges_node_candles;
  MarketCandlesQuery_marketsConnection_edges_node_candlesConnection_edges_node;
 const update = (data: Candle[], delta: MarketCandlesSub_candles) => {
  return data && delta
@@ -60,10 +56,9 @@ const update = (data: Candle[], delta: MarketCandlesSub_candles) => {
    : data;
 };
-const getData = (responseData: MarketCandlesQuery): Candle[] | null =>
+const getData = (responseData: MarketCandlesQuery): Candle[] | null => {
-  responseData?.marketsConnection?.edges[0]?.node.candlesConnection?.edges
+  return compact(responseData?.marketsConnection?.edges[0]?.node.candles);
-    ?.filter((edge) => edge?.node)
+};
    .map((edge) => edge?.node as Candle) || null;
 const getDelta = (
  subscriptionData: MarketCandlesSub
@@ -1,9 +1,10 @@
 import compact from 'lodash/compact';
 import { gql } from '@apollo/client';
 import { makeDataProvider } from '@vegaprotocol/react-helpers';
 import type {
  MarketsCandlesQuery,
  MarketsCandlesQuery_marketsConnection_edges_node as Market,
-  MarketsCandlesQuery_marketsConnection_edges_node_candlesConnection_edges_node as Candle,
+  MarketsCandlesQuery_marketsConnection_edges_node_candles as Candle,
 } from './__generated__';
 export const MARKETS_CANDLES_QUERY = gql`
@@ -12,16 +13,12 @@ export const MARKETS_CANDLES_QUERY = gql`
      edges {
        node {
          id
-          candlesConnection(interval: $interval, since: $since) {
+          candles(interval: $interval, since: $since) {
-            edges {
+            high
-              node {
+            low
-                high
+            open
-                low
+            close
-                open
+            volume
                close
                volume
              }
            }
          }
        }
      }
@@ -37,9 +34,7 @@ export interface MarketCandles {
 const getData = (responseData: MarketsCandlesQuery): MarketCandles[] | null =>
  responseData?.marketsConnection?.edges.map((edge) => ({
    marketId: edge.node.id,
-    candles: edge.node.candlesConnection?.edges
+    candles: compact(edge.node.candles),
      ?.filter((edge) => edge?.node)
      .map((edge) => edge?.node as Candle),
  })) || null;
 export const marketsCandlesProvider = makeDataProvider<
@@ -85,11 +85,11 @@ export interface NetworkStats_statistics {
 export interface NetworkStats {
  /**
-   * Returns information about nodes
+   * returns information about nodes
   */
  nodeData: NetworkStats_nodeData | null;
  /**
-   * Get statistics about the Vega node
+   * get statistics about the Vega node
   */
  statistics: NetworkStats_statistics;
 }
@@ -75,33 +75,15 @@ export interface Orders_party_ordersConnection_edges_node {
 export interface Orders_party_ordersConnection_edges {
  __typename: "OrderEdge";
  /**
   * The order
   */
  node: Orders_party_ordersConnection_edges_node;
  /**
   * The cursor for this order
   */
  cursor: string | null;
 }
 export interface Orders_party_ordersConnection_pageInfo {
  __typename: "PageInfo";
  /**
   * The first cursor in the current page
   */
  startCursor: string;
  /**
   * The last cursor in the current page
   */
  endCursor: string;
  /**
   * The connection has more pages to fetch when traversing forward through the connection
   */
  hasNextPage: boolean;
  /**
   * The connection has more pages to fetch when traversing backward through the connection
   */
  hasPreviousPage: boolean;
 }
@@ -153,7 +153,7 @@ export const ordersWithMarketProvider = makeDerivedDataProvider<
 >(
  [ordersProvider, marketsProvider],
  (partsData): OrderWithMarketEdge[] =>
-    (partsData[0] as Parameters<typeof update>['0']).map((edge) => ({
+    (partsData[0] as Parameters<typeof update>['0'])?.map((edge) => ({
      cursor: edge.cursor,
      node: {
        ...edge.node,
@@ -40,7 +40,7 @@ export interface OrderEvent_busEvents_event_Order_market {
   */
  tradableInstrument: OrderEvent_busEvents_event_Order_market_tradableInstrument;
  /**
-   * The number of decimal places that an integer must be shifted by in order to get a correct
+   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
   * number denominated in the currency of the market. (uint64)
   * 
   * Examples:
@@ -57,7 +57,7 @@ export interface OrderEvent_busEvents_event_Order_market {
   */
  decimalPlaces: number;
  /**
-   * The number of decimal places that an integer must be shifted in order to get a correct size (uint64).
+   * positionDecimalPlaces indicates the number of decimal places that an integer must be shifted in order to get a correct size (uint64).
   * i.e. 0 means there are no fractional orders for the market, and order sizes are always whole sizes.
   * 2 means sizes given as 10^2 * desired size, e.g. a desired size of 1.23 is represented as 123 in this market.
   * This sets how big the smallest order / position on the market can be.
@@ -118,11 +118,11 @@ export type OrderEvent_busEvents_event = OrderEvent_busEvents_event_TimeUpdate |
 export interface OrderEvent_busEvents {
  __typename: "BusEvent";
  /**
-   * The type of event
+   * the type of event
   */
  type: BusEventType;
  /**
-   * The payload - the wrapped event
+   * the payload - the wrapped event
   */
  event: OrderEvent_busEvents_event;
 }
@@ -28,19 +28,19 @@ export interface PositionFields_marginsConnection_edges_node_asset {
 export interface PositionFields_marginsConnection_edges_node {
  __typename: "MarginLevels";
  /**
-   * Market in which the margin is required for this party
+   * market in which the margin is required for this party
   */
  market: PositionFields_marginsConnection_edges_node_market;
  /**
-   * Minimal margin for the position to be maintained in the network (unsigned integer)
+   * minimal margin for the position to be maintained in the network (unsigned integer)
   */
  maintenanceLevel: string;
  /**
-   * If the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer)
+   * if the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer)
   */
  searchLevel: string;
  /**
-   * This is the minimum margin required for a party to place a new order on the network (unsigned integer)
+   * this is the minimum margin required for a party to place a new order on the network (unsigned integer)
   */
  initialLevel: string;
  /**
@@ -49,7 +49,7 @@ export interface PositionFields_marginsConnection_edges_node {
   */
  collateralReleaseLevel: string;
  /**
-   * Asset for the current margins
+   * asset for the current margins
   */
  asset: PositionFields_marginsConnection_edges_node_asset;
 }
@@ -94,11 +94,11 @@ export interface PositionFields_market_data_market {
 export interface PositionFields_market_data {
  __typename: "MarketData";
  /**
-   * The mark price (an unsigned integer)
+   * the mark price (an unsigned integer)
   */
  markPrice: string;
  /**
-   * Market of the associated mark price
+   * market of the associated mark price
   */
  market: PositionFields_market_data_market;
 }
@@ -110,7 +110,7 @@ export interface PositionFields_market {
   */
  id: string;
  /**
-   * The number of decimal places that an integer must be shifted by in order to get a correct
+   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
   * number denominated in the currency of the market. (uint64)
   * 
   * Examples:
@@ -127,7 +127,7 @@ export interface PositionFields_market {
   */
  decimalPlaces: number;
  /**
-   * The number of decimal places that an integer must be shifted in order to get a correct size (uint64).
+   * positionDecimalPlaces indicates the number of decimal places that an integer must be shifted in order to get a correct size (uint64).
   * i.e. 0 means there are no fractional orders for the market, and order sizes are always whole sizes.
   * 2 means sizes given as 10^2 * desired size, e.g. a desired size of 1.23 is represented as 123 in this market.
   * This sets how big the smallest order / position on the market can be.
@@ -28,19 +28,19 @@ export interface Positions_party_positionsConnection_edges_node_marginsConnectio
 export interface Positions_party_positionsConnection_edges_node_marginsConnection_edges_node {
  __typename: "MarginLevels";
  /**
-   * Market in which the margin is required for this party
+   * market in which the margin is required for this party
   */
  market: Positions_party_positionsConnection_edges_node_marginsConnection_edges_node_market;
  /**
-   * Minimal margin for the position to be maintained in the network (unsigned integer)
+   * minimal margin for the position to be maintained in the network (unsigned integer)
   */
  maintenanceLevel: string;
  /**
-   * If the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer)
+   * if the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer)
   */
  searchLevel: string;
  /**
-   * This is the minimum margin required for a party to place a new order on the network (unsigned integer)
+   * this is the minimum margin required for a party to place a new order on the network (unsigned integer)
   */
  initialLevel: string;
  /**
@@ -49,7 +49,7 @@ export interface Positions_party_positionsConnection_edges_node_marginsConnectio
   */
  collateralReleaseLevel: string;
  /**
-   * Asset for the current margins
+   * asset for the current margins
   */
  asset: Positions_party_positionsConnection_edges_node_marginsConnection_edges_node_asset;
 }
@@ -94,11 +94,11 @@ export interface Positions_party_positionsConnection_edges_node_market_data_mark
 export interface Positions_party_positionsConnection_edges_node_market_data {
  __typename: "MarketData";
  /**
-   * The mark price (an unsigned integer)
+   * the mark price (an unsigned integer)
   */
  markPrice: string;
  /**
-   * Market of the associated mark price
+   * market of the associated mark price
   */
  market: Positions_party_positionsConnection_edges_node_market_data_market;
 }
@@ -110,7 +110,7 @@ export interface Positions_party_positionsConnection_edges_node_market {
   */
  id: string;
  /**
-   * The number of decimal places that an integer must be shifted by in order to get a correct
+   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
   * number denominated in the currency of the market. (uint64)
   * 
   * Examples:
@@ -127,7 +127,7 @@ export interface Positions_party_positionsConnection_edges_node_market {
   */
  decimalPlaces: number;
  /**
-   * The number of decimal places that an integer must be shifted in order to get a correct size (uint64).
+   * positionDecimalPlaces indicates the number of decimal places that an integer must be shifted in order to get a correct size (uint64).
   * i.e. 0 means there are no fractional orders for the market, and order sizes are always whole sizes.
   * 2 means sizes given as 10^2 * desired size, e.g. a desired size of 1.23 is represented as 123 in this market.
   * This sets how big the smallest order / position on the market can be.
@@ -181,9 +181,6 @@ export interface Positions_party_positionsConnection_edges_node {
 export interface Positions_party_positionsConnection_edges {
  __typename: "PositionEdge";
  /**
   * The position
   */
  node: Positions_party_positionsConnection_edges_node;
 }
@@ -28,19 +28,19 @@ export interface PositionsSubscription_positions_marginsConnection_edges_node_as
 export interface PositionsSubscription_positions_marginsConnection_edges_node {
  __typename: "MarginLevels";
  /**
-   * Market in which the margin is required for this party
+   * market in which the margin is required for this party
   */
  market: PositionsSubscription_positions_marginsConnection_edges_node_market;
  /**
-   * Minimal margin for the position to be maintained in the network (unsigned integer)
+   * minimal margin for the position to be maintained in the network (unsigned integer)
   */
  maintenanceLevel: string;
  /**
-   * If the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer)
+   * if the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer)
   */
  searchLevel: string;
  /**
-   * This is the minimum margin required for a party to place a new order on the network (unsigned integer)
+   * this is the minimum margin required for a party to place a new order on the network (unsigned integer)
   */
  initialLevel: string;
  /**
@@ -49,7 +49,7 @@ export interface PositionsSubscription_positions_marginsConnection_edges_node {
   */
  collateralReleaseLevel: string;
  /**
-   * Asset for the current margins
+   * asset for the current margins
   */
  asset: PositionsSubscription_positions_marginsConnection_edges_node_asset;
 }
@@ -94,11 +94,11 @@ export interface PositionsSubscription_positions_market_data_market {
 export interface PositionsSubscription_positions_market_data {
  __typename: "MarketData";
  /**
-   * The mark price (an unsigned integer)
+   * the mark price (an unsigned integer)
   */
  markPrice: string;
  /**
-   * Market of the associated mark price
+   * market of the associated mark price
   */
  market: PositionsSubscription_positions_market_data_market;
 }
@@ -110,7 +110,7 @@ export interface PositionsSubscription_positions_market {
   */
  id: string;
  /**
-   * The number of decimal places that an integer must be shifted by in order to get a correct
+   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
   * number denominated in the currency of the market. (uint64)
   * 
   * Examples:
@@ -127,7 +127,7 @@ export interface PositionsSubscription_positions_market {
   */
  decimalPlaces: number;
  /**
-   * The number of decimal places that an integer must be shifted in order to get a correct size (uint64).
+   * positionDecimalPlaces indicates the number of decimal places that an integer must be shifted in order to get a correct size (uint64).
   * i.e. 0 means there are no fractional orders for the market, and order sizes are always whole sizes.
   * 2 means sizes given as 10^2 * desired size, e.g. a desired size of 1.23 is represented as 123 in this market.
   * This sets how big the smallest order / position on the market can be.
@@ -21,7 +21,7 @@ export interface NetworkParams_networkParameters {
 export interface NetworkParams {
  /**
-   * Return the full list of network parameters
+   * return the full list of network parameters
   */
  networkParameters: NetworkParams_networkParameters[] | null;
 }
@@ -28,7 +28,7 @@ export interface Trades_market_tradesConnection_edges_node {
   */
  price: string;
  /**
-   * The number of units traded, will always be <= the remaining size of both orders immediately before the trade (uint64)
+   * The number of contracts trades, will always be <= the remaining size of both orders immediately before the trade (uint64)
   */
  size: string;
  /**
@@ -43,33 +43,15 @@ export interface Trades_market_tradesConnection_edges_node {
 export interface Trades_market_tradesConnection_edges {
  __typename: "TradeEdge";
  /**
   * The trade
   */
  node: Trades_market_tradesConnection_edges_node;
  /**
   * The cursor for this trade
   */
  cursor: string;
 }
 export interface Trades_market_tradesConnection_pageInfo {
  __typename: "PageInfo";
  /**
   * The first cursor in the current page
   */
  startCursor: string;
  /**
   * The last cursor in the current page
   */
  endCursor: string;
  /**
   * The connection has more pages to fetch when traversing forward through the connection
   */
  hasNextPage: boolean;
  /**
   * The connection has more pages to fetch when traversing backward through the connection
   */
  hasPreviousPage: boolean;
 }
@@ -1 +0,0 @@
 GRAPHQL_SCHEMA_PATH=https://api.n04.d.vega.xyz/graphql
@@ -143,9 +143,6 @@ export enum MarketTradingMode {
  TRADING_MODE_OPENING_AUCTION = "TRADING_MODE_OPENING_AUCTION",
 }
 /**
 * Validating status of a node, i.e. validator or non-validator
 */
 export enum NodeStatus {
  NODE_STATUS_NON_VALIDATOR = "NODE_STATUS_NON_VALIDATOR",
  NODE_STATUS_VALIDATOR = "NODE_STATUS_VALIDATOR",
@@ -160,7 +157,7 @@ export enum OracleSpecStatus {
 }
 /**
- * Why the order was rejected by the core node
+ * Reason for the order being rejected by the core node
 */
 export enum OrderRejectionReason {
  ORDER_ERROR_AMEND_FAILURE = "ORDER_ERROR_AMEND_FAILURE",
@@ -255,7 +252,7 @@ export enum PropertyKeyType {
 }
 /**
- * Why the proposal was rejected by the core node
+ * Reason for the proposal being rejected by the core node
 */
 export enum ProposalRejectionReason {
  PROPOSAL_ERROR_CLOSE_TIME_TOO_LATE = "PROPOSAL_ERROR_CLOSE_TIME_TOO_LATE",
@@ -21,7 +21,7 @@ export interface NetworkParamsQuery_networkParameters {
 export interface NetworkParamsQuery {
  /**
-   * Return the full list of network parameters
+   * return the full list of network parameters
   */
  networkParameters: NetworkParamsQuery_networkParameters[] | null;
 }
@@ -42,7 +42,7 @@ export interface Erc20Approval_erc20WithdrawalApproval {
 export interface Erc20Approval {
  /**
-   * Find an erc20 withdrawal approval using its withdrawal ID
+   * find an erc20 withdrawal approval using its withdrawal ID
   */
  erc20WithdrawalApproval: Erc20Approval_erc20WithdrawalApproval | null;
 }
@@ -109,9 +109,6 @@ export interface WithdrawFormQuery_assetsConnection_edges_node {
 export interface WithdrawFormQuery_assetsConnection_edges {
  __typename: "AssetEdge";
  /**
   * The asset information
   */
  node: WithdrawFormQuery_assetsConnection_edges_node;
 }
@@ -108,7 +108,7 @@ export type WithdrawalEvent_busEvents_event = WithdrawalEvent_busEvents_event_Ti
 export interface WithdrawalEvent_busEvents {
  __typename: "BusEvent";
  /**
-   * The payload - the wrapped event
+   * the payload - the wrapped event
   */
  event: WithdrawalEvent_busEvents_event;
 }
@@ -101,9 +101,6 @@ export interface Withdrawals_party_withdrawalsConnection_edges_node {
 export interface Withdrawals_party_withdrawalsConnection_edges {
  __typename: "WithdrawalEdge";
  /**
   * The withdrawal
   */
  node: Withdrawals_party_withdrawalsConnection_edges_node;
 }
@@ -1,6 +1,6 @@
 {
  "name": "nx-monorepo",
-  "version": "0.0.0",
+  "version": "0.55.0-0.0",
  "license": "MIT",
  "scripts": {
    "start": "nx serve",
Author	SHA1	Message	Date
Matthew Russell	024be309b5	chore: v0.55.0-0.0	2022-09-20 18:51:14 -07:00
Matthew Russell	e62f5f8ea2	fix: revert to deprecated candles query due to core bug	2022-09-20 18:48:01 -07:00
		`@@ -1 +0,0 @@`
			`GRAPHQL_SCHEMA_PATH=https://api.n04.d.vega.xyz/graphql`