test: fix for api column size error

Makefile

@@ -1,20 +1,20 @@
 .PHONY: latest-release
 latest-release:
-	gh release list | head -n 1 | awk '{print $1}'
+  gh release list | head -n 1 | awk '{print $1}'
 
 .PHONY: show-latest-release
 show-latest-release:
-	gh release view `gh release list | head -n 1 | awk '{print $1}'`
+  gh release view `gh release list | head -n 1 | awk '{print $1}'`
 
 .PHONY: recalculate-ipfs
 recalculate-ipfs:
-	echo "ipfs hash inside the image"
-	docker run --rm ${TAG} cat /ipfs-hash
-	echo "recalculating ipfs hash"
-	docker run --rm ${TAG} ipfs add -rw /usr/share/nginx/html
+  echo "ipfs hash inside the image"
+  docker run --rm ${TAG} cat /ipfs-hash
+  echo "recalculating ipfs hash"
+  docker run --rm ${TAG} ipfs add -rw /usr/share/nginx/html
 
 .PHONY: eject-ipfs-hash
 unpack:
-	docker create --name=dist ${TAG}
-	docker cp dist:/usr/share/nginx/html dist
-	docker rm dist
+  docker create --name=dist ${TAG}
+  docker cp dist:/usr/share/nginx/html dist
+  docker rm dist

apps/governance-e2e/src/integration/flow/staking-flow.cy.ts

@@ -7,7 +7,6 @@ import {
   waitForSpinner,
   navigateTo,
   navigation,
-  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
   clickOnValidatorFromList,
@@ -57,7 +56,6 @@ context(
     // 2001-STKE-002, 2001-STKE-032
     before('visit staking tab and connect vega wallet', function () {
       cy.visit('/');
-      cy.validatorsSelfDelegate();
       ethereumWalletConnect();
       // this is a workaround for #2422 which can be removed once issue is resolved
       cy.associateTokensToVegaWallet('4');
@@ -69,7 +67,6 @@ context(
         'teardown wallet & drill into a specific validator',
         function () {
           cy.clearLocalStorage();
-          turnTelemetryOff();
           cy.reload();
           waitForSpinner();
           cy.connectVegaWallet();
@@ -255,10 +252,10 @@ context(
           waitForBeginningOfEpoch();
           cy.getByTestId(stakeValidatorListStakePercentage).should(
             'have.text',
-            '50.02%'
+            '100%'
           );
           navigateTo(navigation.validators);
-          validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
+          validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
         }
       );
 

apps/governance-e2e/src/integration/view/validators.cy.ts

@@ -29,10 +29,7 @@ const performancePenaltyToolTip = '[data-testid="performance-penalty-tooltip"]';
 const overstakedPenaltyToolTip = '[data-testid="overstaked-penalty-tooltip"]';
 const totalPenaltyToolTip = '[data-testid="total-penalty-tooltip"]';
 const epochCountDown = '[data-testid="epoch-countdown"]';
-const stakeNumberRegex = /^\d{1,3}(,\d{3})*(\.\d+)?$/;
-
-// If running locally, validators need to have self-stake to be displayed
-// Run cy.validatorsSelfDelegate() in before hook
+const stakeNumberRegex = /^\d*\.?\d*$/;
 
 context('Validators Page - verify elements on page', function () {
   before('navigate to validators page', function () {
@@ -87,13 +84,13 @@ context('Validators Page - verify elements on page', function () {
 
           cy.get(stakedByOperatorToolTip)
             .invoke('text')
-            .should('contain', 'Staked by operator: 3,000.00');
+            .should('contain', 'Staked by operator: 0.00');
           cy.get(stakedByDelegatesToolTip)
             .invoke('text')
             .should('contain', 'Staked by delegates: 0.00');
           cy.get(totalStakedToolTip)
             .invoke('text')
-            .should('contain', 'Total stake: 3,000.00');
+            .should('contain', 'Total stake: 0.00');
         });
 
         it('Should be able to see validator normalised voting power', function () {
@@ -109,10 +106,10 @@ context('Validators Page - verify elements on page', function () {
 
           cy.get(unnormalisedVotingPowerToolTip)
             .invoke('text')
-            .should('contain', 'Unnormalised voting power: 20.00%');
+            .should('contain', 'Unnormalised voting power: 0.00%');
           cy.get(normalisedVotingPowerToolTip)
             .invoke('text')
-            .should('contain', 'Normalised voting power: 50.00%');
+            .should('contain', 'Normalised voting power: 0.10%');
         });
 
         // 2002-SINC-018
@@ -129,13 +126,13 @@ context('Validators Page - verify elements on page', function () {
 
           cy.get(performancePenaltyToolTip)
             .invoke('text')
-            .should('contain', 'Performance penalty: 0.00%');
+            .should('contain', 'Performance penalty: 100.00%');
           cy.get(overstakedPenaltyToolTip)
             .invoke('text')
-            .should('contain', 'Overstaked penalty: 60.00%'); // value not asserted due to #2886
+            .should('contain', 'Overstaked penalty:'); // value not asserted due to #2886
           cy.get(totalPenaltyToolTip)
             .invoke('text')
-            .should('contain', 'Total penalties: 60.00%');
+            .should('contain', 'Total penalties: 0.00%');
         });
 
         it('Should be able to see validator pending stake', function () {

apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx

@@ -216,7 +216,7 @@ export const ConsensusValidatorsTable = ({
               : undefined,
             [ValidatorFields.PENDING_USER_STAKE]: pendingUserStake,
             [ValidatorFields.USER_STAKE_SHARE]: userStakeShare
-              ? formatNumberPercentage(new BigNumber(userStakeShare), 2)
+              ? formatNumberPercentage(new BigNumber(userStakeShare))
               : undefined,
           };
         }

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

@@ -48,8 +48,8 @@
     "tranche_start": "2023-04-20T00:00:00.000Z",
     "tranche_end": "2023-05-20T00:00:00.000Z",
     "total_added": "19242.125",
-    "total_removed": "1979.64045368475",
-    "locked_amount": "5608.9383879726076446",
+    "total_removed": "1523.8177488329475",
+    "locked_amount": "6250.46875684799321663875",
     "deposits": [
       {
         "amount": "188",
@@ -228,16 +228,6 @@
         "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
         "tx": "0x2b3571c143ecebddf91fb62f402d516d51110edfe37b13200a6e5cf682dc5bb0"
       },
-      {
-        "amount": "336.4580555509875",
-        "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
-        "tx": "0x7af5942634e236f5f9c580f4ed042794ed309e83885f652a55ab37793ea2e85c"
-      },
-      {
-        "amount": "119.364649300815",
-        "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
-        "tx": "0x47f5bf2c758c5270dd1b6519ac649ddabef8199f8a0bae319e36f8ac5c9c142e"
-      },
       {
         "amount": "202.093666077975",
         "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
@@ -372,12 +362,6 @@
             "tranche_id": 56,
             "tx": "0x2b3571c143ecebddf91fb62f402d516d51110edfe37b13200a6e5cf682dc5bb0"
           },
-          {
-            "amount": "119.364649300815",
-            "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
-            "tranche_id": 56,
-            "tx": "0x47f5bf2c758c5270dd1b6519ac649ddabef8199f8a0bae319e36f8ac5c9c142e"
-          },
           {
             "amount": "195.89040769089",
             "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
@@ -386,8 +370,8 @@
           }
         ],
         "total_tokens": "914.25",
-        "withdrawn_tokens": "624.076855605525",
-        "remaining_tokens": "290.173144394475"
+        "withdrawn_tokens": "504.71220630471",
+        "remaining_tokens": "409.53779369529"
       },
       {
         "address": "0x9573BDF7FfC5519912d293e4D1f750eab2E471E7",
@@ -721,12 +705,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "336.4580555509875",
-            "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
-            "tranche_id": 56,
-            "tx": "0x7af5942634e236f5f9c580f4ed042794ed309e83885f652a55ab37793ea2e85c"
-          },
           {
             "amount": "422.1034736680125",
             "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
@@ -735,8 +713,8 @@
           }
         ],
         "total_tokens": "1121.25",
-        "withdrawn_tokens": "758.561529219",
-        "remaining_tokens": "362.688470781"
+        "withdrawn_tokens": "422.1034736680125",
+        "remaining_tokens": "699.1465263319875"
       },
       {
         "address": "0x237D23FcA6d7B2530C7614a9cB921CF27924911E",
@@ -899,7 +877,7 @@
     "tranche_start": "2023-04-06T00:00:00.000Z",
     "tranche_end": "2023-05-06T00:00:00.000Z",
     "total_added": "14610",
-    "total_removed": "6675.45090157707",
+    "total_removed": "6141.45090157707",
     "locked_amount": "0",
     "deposits": [
       {
@@ -1099,11 +1077,6 @@
         "user": "0x9E53F72210479BF46aE7ABF77c48B0d611b3c3dB",
         "tx": "0x1dbcf713b48965a82aa2e17cb3e7db9a491668d859d408a39c8a74b0ea860b6b"
       },
-      {
-        "amount": "534",
-        "user": "0x2586bA83696a92b5467Aaa0CF9EEC052F28F2c02",
-        "tx": "0x5aa922056cad64f97a7dfa750da57d63abfdaea4499192d4d57958bfb4fba2ea"
-      },
       {
         "amount": "106.53500000286",
         "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -1227,17 +1200,10 @@
             "tx": "0xf970ea0ce3e36fa0014d24bb830dd2ea0dbea06f6e53af486de5ee7e1c63e540"
           }
         ],
-        "withdrawals": [
-          {
-            "amount": "534",
-            "user": "0x2586bA83696a92b5467Aaa0CF9EEC052F28F2c02",
-            "tranche_id": 54,
-            "tx": "0x5aa922056cad64f97a7dfa750da57d63abfdaea4499192d4d57958bfb4fba2ea"
-          }
-        ],
+        "withdrawals": [],
         "total_tokens": "534",
-        "withdrawn_tokens": "534",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "534"
       },
       {
         "address": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
@@ -1860,7 +1826,7 @@
     "tranche_start": "2023-03-06T00:00:00.000Z",
     "tranche_end": "2023-04-06T00:00:00.000Z",
     "total_added": "14099",
-    "total_removed": "3785.49002352036",
+    "total_removed": "3722.49002352036",
     "locked_amount": "0",
     "deposits": [
       {
@@ -2625,11 +2591,6 @@
       }
     ],
     "withdrawals": [
-      {
-        "amount": "63",
-        "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc",
-        "tx": "0xb0edcc25e422bc3db3ad8027dfdfc0928abd7a8af8957a1699e4cf2dc8cee8f7"
-      },
       {
         "amount": "30",
         "user": "0xBe9F912Ad481C61B653463E8F1D2b2b310D49861",
@@ -3668,17 +3629,10 @@
             "tx": "0xd4a269b070cbaaff7e29a99f6b3997117d765f69512bb760e28bade799fcbba4"
           }
         ],
-        "withdrawals": [
-          {
-            "amount": "63",
-            "user": "0x2a65Ae527C6Ff4665e048B0E0883c486A7BA4DBc",
-            "tranche_id": 53,
-            "tx": "0xb0edcc25e422bc3db3ad8027dfdfc0928abd7a8af8957a1699e4cf2dc8cee8f7"
-          }
-        ],
+        "withdrawals": [],
         "total_tokens": "63",
-        "withdrawn_tokens": "63",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "63"
       },
       {
         "address": "0xc3B1eB0feE837Db0A3ded5bf16A050726955195B",
@@ -4907,7 +4861,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "49327.3172923405910546417",
+    "locked_amount": "49564.8059208238813573587",
     "deposits": [
       {
         "amount": "86666.297",
@@ -4973,7 +4927,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "284.955770502645375",
+    "locked_amount": "298.694736975987075",
     "deposits": [
       {
         "amount": "2500",
@@ -5006,7 +4960,7 @@
     "tranche_end": "2023-11-01T00:00:00.000Z",
     "total_added": "15000.000000000000015",
     "total_removed": "0",
-    "locked_amount": "14163.9766379830905141639766379830905",
+    "locked_amount": "14245.5144172705305142455144172705305",
     "deposits": [
       {
         "amount": "1.5e-14",
@@ -5094,7 +5048,7 @@
     "tranche_end": "2023-09-01T00:00:00.000Z",
     "total_added": "17500",
     "total_removed": "0",
-    "locked_amount": "10723.00897619766325",
+    "locked_amount": "10818.136385366345",
     "deposits": [
       {
         "amount": "12500",
@@ -5360,8 +5314,8 @@
     "tranche_start": "2023-02-01T00:00:00.000Z",
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
-    "total_removed": "18302.01762945",
-    "locked_amount": "16936.07322360343725",
+    "total_removed": "18077.0118744",
+    "locked_amount": "17143.2963090853275",
     "deposits": [
       {
         "amount": "7500",
@@ -5375,11 +5329,6 @@
       }
     ],
     "withdrawals": [
-      {
-        "amount": "225.00575505",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0x0a46fa3cc0154727ae4c7abca97bd7e26e6835018f96cf3a3860a9fcc791b9a4"
-      },
       {
         "amount": "164.727209925",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5558,12 +5507,6 @@
           }
         ],
         "withdrawals": [
-          {
-            "amount": "225.00575505",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 34,
-            "tx": "0x0a46fa3cc0154727ae4c7abca97bd7e26e6835018f96cf3a3860a9fcc791b9a4"
-          },
           {
             "amount": "164.727209925",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5746,8 +5689,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "4092.25895865",
-        "remaining_tokens": "3407.74104135"
+        "withdrawn_tokens": "3867.2532036",
+        "remaining_tokens": "3632.7467964"
       },
       {
         "address": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -5791,7 +5734,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "49282.312321912380332265",
+    "locked_amount": "49519.584271904149936995",
     "deposits": [
       {
         "amount": "129999.45",
@@ -5824,7 +5767,7 @@
     "tranche_end": "2024-04-01T00:00:00.000Z",
     "total_added": "54144.7663",
     "total_removed": "0",
-    "locked_amount": "48189.54915726316779685587",
+    "locked_amount": "48337.51478508860464254277",
     "deposits": [
       {
         "amount": "54144.7663",
@@ -5857,7 +5800,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "19679.51570903094634",
+    "locked_amount": "19851.056303906648696",
     "deposits": [
       {
         "amount": "10000",
@@ -6050,7 +5993,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "1763.627124556063",
+    "locked_amount": "1777.32845002536775",
     "deposits": [
       {
         "amount": "5000",
@@ -7119,7 +7062,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "1709370.7872515768348",
-    "locked_amount": "115570.728817751808474185",
+    "locked_amount": "120886.6468420560097536622",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -40991,7 +40934,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "715655.108029600523393",
-    "locked_amount": "202093.2974680882797136777084",
+    "locked_amount": "210262.01266536406332744534",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -42383,8 +42326,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
-    "total_removed": "873375.18460711694221852",
-    "locked_amount": "6016297.4428328087189762607645230040375777",
+    "total_removed": "872635.89843522227071852",
+    "locked_amount": "6045263.1824407030758288827453507606055691",
     "deposits": [
       {
         "amount": "16249.93",
@@ -42898,11 +42841,6 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x4301fcb38d16c1f6aa4a93a18a277a4e77eb3b4565bf98ca6218f6598b78b90b"
       },
-      {
-        "amount": "739.2861718946715",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0x989d22d5ba66353cb132b5643100a99e78133e5d40aef1ac91ed6ab0a2290299"
-      },
       {
         "amount": "10150.87581603206683",
         "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -45083,12 +45021,6 @@
             "tranche_id": 2,
             "tx": "0x4301fcb38d16c1f6aa4a93a18a277a4e77eb3b4565bf98ca6218f6598b78b90b"
           },
-          {
-            "amount": "739.2861718946715",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 2,
-            "tx": "0x989d22d5ba66353cb132b5643100a99e78133e5d40aef1ac91ed6ab0a2290299"
-          },
           {
             "amount": "913.910324501590625",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -46645,8 +46577,8 @@
           }
         ],
         "total_tokens": "259998.8875",
-        "withdrawn_tokens": "161285.6283934563635",
-        "remaining_tokens": "98713.2591065436365"
+        "withdrawn_tokens": "160546.342221561692",
+        "remaining_tokens": "99452.545278438308"
       },
       {
         "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -59171,7 +59103,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
     "total_removed": "44544.1737890903416",
-    "locked_amount": "32022.838198356764871382775241",
+    "locked_amount": "33317.21781573185824187773769658",
     "deposits": [
       {
         "amount": "3000",

apps/trading-e2e/src/integration/wallet-eth.cy.ts

@@ -17,6 +17,7 @@ describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
   it('can connect', () => {
     // 0004-EWAL-001
 
+    cy.wait('@NetworkParams');
     cy.getByTestId('Deposits').click();
     cy.getByTestId('deposit-button').click();
     cy.getByTestId('connect-eth-wallet-btn').click();
@@ -29,6 +30,7 @@ describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
   it('should see QR code modal for WalletConnect', () => {
     // 0004-EWAL-003
 
+    cy.wait('@NetworkParams');
     cy.getByTestId('Deposits').click();
     cy.getByTestId('deposit-button').click();
     cy.getByTestId('connect-eth-wallet-btn').click();

docker/prepare-dist.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 yarn --pure-lockfile
-app=${1:-trading}
-flags="--env=${2:-mainnet}"
+app={$1:-trading}
+flags="--env=${$2:-mainnet}"
 yarn install
 if [ "${app}" = "trading" ]; then
   yarn nx export trading $flags

libs/candles-chart/src/lib/data-source.spec.ts

@@ -1,280 +0,0 @@
-import { VegaDataSource } from './data-source';
-import type { ApolloClient } from '@apollo/client';
-import { Interval } from 'pennant';
-import type {
-  CandleFieldsFragment,
-  CandlesQuery,
-} from './__generated__/Candles';
-import * as Schema from '@vegaprotocol/types';
-
-const returnDataMocks = (nodes: CandleFieldsFragment[]): CandlesQuery => {
-  return {
-    data: {
-      market: {
-        decimalPlaces: 1,
-        positionDecimalPlaces: 1,
-        candlesConnection: {
-          edges: nodes.map((node) => ({ node })),
-        },
-      },
-    },
-  } as CandlesQuery;
-};
-
-const dataMocks: { [key in Schema.Interval]: Partial<CandleFieldsFragment>[] } =
-  {
-    [Schema.Interval.INTERVAL_I1M]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:05:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I5M]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:25:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I15M]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T13:15:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I1H]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T17:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I6H]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T12:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-11T18:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_I1D]: [
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-10T00:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '10',
-        volume: '1',
-      },
-      {
-        __typename: 'Candle',
-        periodStart: '2023-05-15T00:00:00Z',
-        lastUpdateInPeriod: '',
-        close: '5',
-        volume: '2',
-      },
-    ],
-    [Schema.Interval.INTERVAL_BLOCK]: [],
-  };
-
-describe('VegaDataSource', () => {
-  const marketId = 'marketId';
-  const partyId = 'partyId';
-  const client = {
-    query: jest.fn().mockImplementation(({ variables: { interval } }) => {
-      return returnDataMocks(
-        dataMocks[interval as Schema.Interval] as CandleFieldsFragment[]
-      );
-    }),
-  } as unknown as ApolloClient<object>;
-
-  it('should be properly initialized', () => {
-    const dataSource = new VegaDataSource(client, marketId, partyId);
-    expect(dataSource).toBeInstanceOf(VegaDataSource);
-    expect(dataSource.onReady).toBeDefined();
-    expect(dataSource.query).toBeDefined();
-    expect(dataSource.subscribeData).toBeDefined();
-    expect(dataSource.unsubscribeData).toBeDefined();
-    expect(dataSource.decimalPlaces).toBeDefined();
-    expect(dataSource.positionDecimalPlaces).toBeDefined();
-  });
-
-  describe('query should return continuous data', () => {
-    it('when interval is I1M', async () => {
-      const dataSource = new VegaDataSource(client, marketId, partyId);
-      const data = await dataSource.query(Interval.I1M, '');
-      expect(data).toHaveLength(6);
-      expect(data[1]).toStrictEqual({
-        date: new Date('2023-05-10T12:01:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-      expect(data[2]).toStrictEqual({
-        date: new Date('2023-05-10T12:02:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-    });
-
-    it('when interval is I5M', async () => {
-      const dataSource = new VegaDataSource(client, marketId, partyId);
-      const data = await dataSource.query(Interval.I5M, '');
-      expect(data).toHaveLength(6);
-      expect(data[1]).toStrictEqual({
-        date: new Date('2023-05-10T12:05:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-      expect(data[2]).toStrictEqual({
-        date: new Date('2023-05-10T12:10:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-    });
-
-    it('when interval is I15M', async () => {
-      const dataSource = new VegaDataSource(client, marketId, partyId);
-      const data = await dataSource.query(Interval.I15M, '');
-      expect(data).toHaveLength(6);
-      expect(data[1]).toStrictEqual({
-        date: new Date('2023-05-10T12:15:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-      expect(data[2]).toStrictEqual({
-        date: new Date('2023-05-10T12:30:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-    });
-
-    it('when interval is I1H', async () => {
-      const dataSource = new VegaDataSource(client, marketId, partyId);
-      const data = await dataSource.query(Interval.I1H, '');
-      expect(data).toHaveLength(6);
-      expect(data[1]).toStrictEqual({
-        date: new Date('2023-05-10T13:00:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-      expect(data[2]).toStrictEqual({
-        date: new Date('2023-05-10T14:00:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-    });
-
-    it('when interval is I6H', async () => {
-      const dataSource = new VegaDataSource(client, marketId, partyId);
-      const data = await dataSource.query(Interval.I6H, '');
-      expect(data).toHaveLength(6);
-      expect(data[1]).toStrictEqual({
-        date: new Date('2023-05-10T18:00:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-      expect(data[2]).toStrictEqual({
-        date: new Date('2023-05-11T00:00:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-    });
-
-    it('when interval is I1D', async () => {
-      const dataSource = new VegaDataSource(client, marketId, partyId);
-      const data = await dataSource.query(Interval.I1D, '');
-      expect(data).toHaveLength(6);
-      expect(data[1]).toStrictEqual({
-        date: new Date('2023-05-11T00:00:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-      expect(data[2]).toStrictEqual({
-        date: new Date('2023-05-12T00:00:00Z'),
-        high: 1,
-        low: 1,
-        open: 1,
-        close: 1,
-        volume: 0,
-      });
-    });
-  });
-});

libs/candles-chart/src/lib/data-source.ts

@@ -1,11 +1,4 @@
 import type { ApolloClient } from '@apollo/client';
-import type { Duration } from 'date-fns';
-import {
-  add,
-  differenceInDays,
-  differenceInHours,
-  differenceInMinutes,
-} from 'date-fns';
 import type { Candle, DataSource } from 'pennant';
 import { Interval as PennantInterval } from 'pennant';
 
@@ -160,6 +153,7 @@ export class VegaDataSource implements DataSource {
         },
         fetchPolicy: 'no-cache',
       });
+
       if (data?.market?.candlesConnection?.edges) {
         const decimalPlaces = data.market.decimalPlaces;
         const positionDecimalPlaces = data.market.positionDecimalPlaces;
@@ -169,8 +163,8 @@ export class VegaDataSource implements DataSource {
           .filter((node): node is CandleFieldsFragment => !!node)
           .map((node) =>
             parseCandle(node, decimalPlaces, positionDecimalPlaces)
-          )
-          .reduce(checkGranulationContinuity(interval), []);
+          );
+
         return candles;
       } else {
         return [];
@@ -219,85 +213,6 @@ export class VegaDataSource implements DataSource {
   }
 }
 
-const getDuration = (
-  interval: PennantInterval,
-  multiplier: number
-): Duration => {
-  switch (interval) {
-    case 'I1D':
-      return {
-        days: 1 * multiplier,
-      };
-    case 'I1H':
-      return {
-        hours: 1 * multiplier,
-      };
-    case 'I1M':
-      return {
-        minutes: 1 * multiplier,
-      };
-    case 'I5M':
-      return {
-        minutes: 5 * multiplier,
-      };
-    case 'I6H':
-      return {
-        hours: 6 * multiplier,
-      };
-    case 'I15M':
-      return {
-        minutes: 15 * multiplier,
-      };
-  }
-};
-
-const getDifference = (
-  interval: PennantInterval,
-  dateLeft: Date,
-  dateRight: Date
-): number => {
-  switch (interval) {
-    case 'I1D':
-      return differenceInDays(dateRight, dateLeft);
-    case 'I6H':
-      return differenceInHours(dateRight, dateLeft) / 6;
-    case 'I1H':
-      return differenceInHours(dateRight, dateLeft);
-    case 'I15M':
-      return differenceInMinutes(dateRight, dateLeft) / 15;
-    case 'I5M':
-      return differenceInMinutes(dateRight, dateLeft) / 5;
-    case 'I1M':
-      return differenceInMinutes(dateRight, dateLeft);
-  }
-};
-
-const checkGranulationContinuity =
-  (interval: PennantInterval) =>
-  (agg: Candle[], candle: Candle, i: number): Candle[] => {
-    if (agg.length && i) {
-      const previous = agg[agg.length - 1];
-      const difference = getDifference(interval, previous.date, candle.date);
-      if (difference > 1) {
-        for (let j = 1; j < difference; j++) {
-          const duration = getDuration(interval, j);
-          const newStartDate = add(previous.date, duration);
-          const newParsedCandle: Candle = {
-            date: newStartDate,
-            high: previous.close,
-            low: previous.close,
-            open: previous.close,
-            close: previous.close,
-            volume: 0,
-          };
-          agg.push(newParsedCandle);
-        }
-      }
-    }
-    agg.push(candle);
-    return agg;
-  };
-
 function parseCandle(
   candle: CandleFieldsFragment,
   decimalPlaces: number,

libs/datagrid/src/lib/cells/order-type-cell.tsx

@@ -3,7 +3,6 @@ import { useMemo } from 'react';
 import { useCallback } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 
 interface OrderTypeCellProps {
   value?: Schema.OrderType;
@@ -24,15 +23,7 @@ export const OrderTypeCell = ({
     }
     if (!value) return '-';
     if (order?.peggedOrder) {
-      const reference =
-        Schema.PeggedReferenceMapping[order.peggedOrder?.reference];
-      // the offset (e.g. + 0.001 for a Sell, or -1231.023 for a Buy)
-      const side = order.side === Schema.Side.SIDE_BUY ? '-' : '+';
-      const offset = addDecimalsFormatNumber(
-        order.peggedOrder?.offset,
-        order.market.decimalPlaces
-      );
-      return t('%s %s %s Peg limit', [reference, side, offset]);
+      return t('Pegged');
     }
     if (order?.liquidityProvision) {
       return t('Liquidity provision');

libs/network-info/src/network-info.tsx

@@ -2,6 +2,7 @@ import { Fragment } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { Link, Lozenge } from '@vegaprotocol/ui-toolkit';
 import {
+  NodeSwitcherDialog,
   useEnvironment,
   useNodeSwitcherStore,
 } from '@vegaprotocol/environment';

libs/orders/src/lib/components/order-data-provider/Orders.graphql

@@ -21,8 +21,6 @@ fragment OrderFields on Order {
   }
   peggedOrder {
     __typename
-    reference
-    offset
   }
 }
 
@@ -66,7 +64,6 @@ fragment OrderUpdateFields on OrderUpdate {
   type
   side
   size
-  remaining
   status
   rejectionReason
   price
@@ -78,8 +75,6 @@ fragment OrderUpdateFields on OrderUpdate {
   liquidityProvisionId
   peggedOrder {
     __typename
-    reference
-    offset
   }
 }
 

libs/orders/src/lib/components/order-data-provider/__generated__/Orders.ts

@@ -3,14 +3,14 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type OrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null };
+export type OrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder' } | null };
 
 export type OrderByIdQueryVariables = Types.Exact<{
   orderId: Types.Scalars['ID'];
 }>;
 
 
-export type OrderByIdQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } };
+export type OrderByIdQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder' } | null } };
 
 export type OrdersQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
@@ -20,9 +20,9 @@ export type OrdersQueryVariables = Types.Exact<{
 }>;
 
 
-export type OrdersQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, ordersConnection?: { __typename?: 'OrderConnection', edges?: Array<{ __typename?: 'OrderEdge', cursor?: string | null, node: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null } }> | null, pageInfo?: { __typename?: 'PageInfo', startCursor: string, endCursor: string, hasNextPage: boolean, hasPreviousPage: boolean } | null } | null } | null };
+export type OrdersQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, ordersConnection?: { __typename?: 'OrderConnection', edges?: Array<{ __typename?: 'OrderEdge', cursor?: string | null, node: { __typename?: 'Order', id: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, postOnly?: boolean | null, reduceOnly?: boolean | null, market: { __typename?: 'Market', id: string }, liquidityProvision?: { __typename: 'LiquidityProvision' } | null, peggedOrder?: { __typename: 'PeggedOrder' } | null } }> | null, pageInfo?: { __typename?: 'PageInfo', startCursor: string, endCursor: string, hasNextPage: boolean, hasPreviousPage: boolean } | null } | null } | null };
 
-export type OrderUpdateFieldsFragment = { __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, remaining: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null };
+export type OrderUpdateFieldsFragment = { __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder' } | null };
 
 export type OrdersUpdateSubscriptionVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
@@ -30,7 +30,7 @@ export type OrdersUpdateSubscriptionVariables = Types.Exact<{
 }>;
 
 
-export type OrdersUpdateSubscription = { __typename?: 'Subscription', orders?: Array<{ __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, remaining: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null }> | null };
+export type OrdersUpdateSubscription = { __typename?: 'Subscription', orders?: Array<{ __typename?: 'OrderUpdate', id: string, marketId: string, type?: Types.OrderType | null, side: Types.Side, size: string, status: Types.OrderStatus, rejectionReason?: Types.OrderRejectionReason | null, price: string, timeInForce: Types.OrderTimeInForce, remaining: string, expiresAt?: any | null, createdAt: any, updatedAt?: any | null, liquidityProvisionId?: string | null, peggedOrder?: { __typename: 'PeggedOrder' } | null }> | null };
 
 export const OrderFieldsFragmentDoc = gql`
     fragment OrderFields on Order {
@@ -56,8 +56,6 @@ export const OrderFieldsFragmentDoc = gql`
   }
   peggedOrder {
     __typename
-    reference
-    offset
   }
 }
     `;
@@ -68,7 +66,6 @@ export const OrderUpdateFieldsFragmentDoc = gql`
   type
   side
   size
-  remaining
   status
   rejectionReason
   price
@@ -80,8 +77,6 @@ export const OrderUpdateFieldsFragmentDoc = gql`
   liquidityProvisionId
   peggedOrder {
     __typename
-    reference
-    offset
   }
 }
     `;

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

@@ -213,8 +213,6 @@ describe('OrderListTable', () => {
         timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
         peggedOrder: {
           __typename: 'PeggedOrder',
-          reference: Schema.PeggedReference.PEGGED_REFERENCE_MID,
-          offset: '100',
         },
       });
 
@@ -224,7 +222,7 @@ describe('OrderListTable', () => {
 
       const amendCell = getAmendCell();
       const typeCell = screen.getAllByRole('gridcell')[2];
-      expect(typeCell).toHaveTextContent('Mid - 10.0 Peg limit');
+      expect(typeCell).toHaveTextContent('Pegged');
       expect(amendCell.queryAllByRole('button')).toHaveLength(0);
     });
 

libs/types/src/global-types-mappings.ts

@@ -1,4 +1,4 @@
-import type { ConditionOperator, PeggedReference } from './__generated__/types';
+import type { ConditionOperator } from './__generated__/types';
 import type {
   AccountType,
   AuctionTrigger,
@@ -474,9 +474,3 @@ export const ConditionOperatorMapping: { [C in ConditionOperator]: string } = {
   OPERATOR_LESS_THAN: 'Less than',
   OPERATOR_LESS_THAN_OR_EQUAL: 'Less than or equal to',
 };
-
-export const PeggedReferenceMapping: { [R in PeggedReference]: string } = {
-  PEGGED_REFERENCE_BEST_ASK: 'Ask',
-  PEGGED_REFERENCE_BEST_BID: 'Bid',
-  PEGGED_REFERENCE_MID: 'Mid',
-};