fix: charts in testnet

Merge branch 'release/testnet' of github.com:vegaprotocol/frontend-monorepo into release/testnet
2023-04-18 13:36:40 +03:00 · 2023-04-18 12:57:16 +03:00
39 changed files with 287 additions and 959 deletions
@@ -9,5 +9,5 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou

 NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
 NX_TENDERMINT_URL=https://tm-be.validators-testnet.vega.rocks
-NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
+NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
@@ -8,4 +8,3 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -7,10 +7,9 @@ query PreviousEpoch($epochId: ID) {
          id
          rewardScore {
            rawValidatorScore
-            performanceScore
          }
          rankingScore {
-            stakeScore
+            performanceScore
          }
        }
      }
@@ -8,7 +8,7 @@ export type PreviousEpochQueryVariables = Types.Exact<{
 }>;


-export type PreviousEpochQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string, validatorsConnection?: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, rewardScore?: { __typename?: 'RewardScore', rawValidatorScore: string, performanceScore: string } | null, rankingScore: { __typename?: 'RankingScore', stakeScore: string } } } | null> | null } | null } };
+export type PreviousEpochQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string, validatorsConnection?: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, rewardScore?: { __typename?: 'RewardScore', rawValidatorScore: string } | null, rankingScore: { __typename?: 'RankingScore', performanceScore: string } } } | null> | null } | null } };


 export const PreviousEpochDocument = gql`
@@ -21,10 +21,9 @@ export const PreviousEpochDocument = gql`
          id
          rewardScore {
            rawValidatorScore
-            performanceScore
          }
          rankingScore {
-            stakeScore
+            performanceScore
          }
        }
      }
@@ -81,10 +81,9 @@ const MOCK_PREVIOUS_EPOCH: PreviousEpochQuery = {
            id: 'ccc022b7e63a4d0a6d3a193c3940c88574060e58a184964c994998d86835a1b4',
            rewardScore: {
              rawValidatorScore: '0.25',
-              performanceScore: '0.9998677767864936',
            },
            rankingScore: {
-              stakeScore: '0.2499583402766206',
+              performanceScore: '0.9998677767864936',
            },
          },
        },
@@ -93,10 +92,9 @@ const MOCK_PREVIOUS_EPOCH: PreviousEpochQuery = {
            id: '966438c6bffac737cfb08173ffcb3f393c4692b099ad80cb45a82e2dc0a8cf99',
            rewardScore: {
              rawValidatorScore: '0.3',
-              performanceScore: '1',
            },
            rankingScore: {
-              stakeScore: '0.25',
+              performanceScore: '1',
            },
          },
        },
@@ -105,10 +103,9 @@ const MOCK_PREVIOUS_EPOCH: PreviousEpochQuery = {
            id: '12c81b738e8051152e1afe44376ec37bca9216466e6d44cdd772194bad0ada81',
            rewardScore: {
              rawValidatorScore: '0.35',
-              performanceScore: '0.999629748500531',
            },
            rankingScore: {
-              stakeScore: '0.2312',
+              performanceScore: '0.999629748500531',
            },
          },
        },
@@ -10,6 +10,7 @@ import {
  getFormattedPerformanceScore,
  getLastEpochScoreAndPerformance,
  getNormalisedVotingPower,
+  getOverstakedAmount,
  getOverstakingPenalty,
  getPerformancePenalty,
  getTotalPenalties,
@@ -51,6 +52,7 @@ interface CanonisedConsensusNodeProps {
  [ValidatorFields.STAKED_BY_OPERATOR]: string;
  [ValidatorFields.PERFORMANCE_SCORE]: string;
  [ValidatorFields.PERFORMANCE_PENALTY]: string;
+  [ValidatorFields.OVERSTAKED_AMOUNT]: string;
  [ValidatorFields.OVERSTAKING_PENALTY]: string;
  [ValidatorFields.TOTAL_PENALTIES]: string;
  [ValidatorFields.PENDING_STAKE]: string;
@@ -162,11 +164,14 @@ export const ConsensusValidatorsTable = ({
          pendingUserStake,
          userStakeShare,
        }) => {
-          const {
-            rawValidatorScore: previousEpochValidatorScore,
-            performanceScore: previousEpochPerformanceScore,
-            stakeScore: previousEpochStakeScore,
-          } = getLastEpochScoreAndPerformance(previousEpochData, id);
+          const { rawValidatorScore, performanceScore } =
+            getLastEpochScoreAndPerformance(previousEpochData, id);
+
+          const overstakedAmount = getOverstakedAmount(
+            rawValidatorScore,
+            stakedTotal,
+            totalStake
+          );

          return {
            id,
@@ -179,7 +184,7 @@ export const ConsensusValidatorsTable = ({
            [ValidatorFields.NORMALISED_VOTING_POWER]:
              getNormalisedVotingPower(votingPower),
            [ValidatorFields.UNNORMALISED_VOTING_POWER]:
-              getUnnormalisedVotingPower(previousEpochValidatorScore),
+              getUnnormalisedVotingPower(rawValidatorScore),
            [ValidatorFields.STAKE_SHARE]: stakedTotalPercentage(stakeScore),
            [ValidatorFields.STAKED_BY_DELEGATES]: formatNumber(
              toBigNum(stakedByDelegates, decimals),
@@ -189,19 +194,18 @@ export const ConsensusValidatorsTable = ({
              toBigNum(stakedByOperator, decimals),
              2
            ),
-            [ValidatorFields.PERFORMANCE_SCORE]: getFormattedPerformanceScore(
-              previousEpochPerformanceScore
-            ).toString(),
-            [ValidatorFields.PERFORMANCE_PENALTY]: getPerformancePenalty(
-              previousEpochPerformanceScore
-            ),
+            [ValidatorFields.PERFORMANCE_SCORE]:
+              getFormattedPerformanceScore(performanceScore).toString(),
+            [ValidatorFields.PERFORMANCE_PENALTY]:
+              getPerformancePenalty(performanceScore),
+            [ValidatorFields.OVERSTAKED_AMOUNT]: overstakedAmount.toString(),
            [ValidatorFields.OVERSTAKING_PENALTY]: getOverstakingPenalty(
-              previousEpochValidatorScore,
-              previousEpochStakeScore
+              overstakedAmount,
+              totalStake
            ),
            [ValidatorFields.TOTAL_PENALTIES]: getTotalPenalties(
-              previousEpochValidatorScore,
-              previousEpochPerformanceScore,
+              rawValidatorScore,
+              performanceScore,
              stakedTotal,
              totalStake
            ),
@@ -7,6 +7,7 @@ import { BigNumber } from '../../../../lib/bignumber';
 import {
  getFormattedPerformanceScore,
  getLastEpochScoreAndPerformance,
+  getOverstakedAmount,
  getOverstakingPenalty,
  getPerformancePenalty,
  getTotalPenalties,
@@ -81,21 +82,21 @@ export const StandbyPendingValidatorsTable = ({
          pendingUserStake,
          userStakeShare,
        }) => {
-          const {
-            rawValidatorScore: previousEpochValidatorScore,
-            performanceScore: previousEpochPerformanceScore,
-            stakeScore: previousEpochStakeScore,
-          } = getLastEpochScoreAndPerformance(previousEpochData, id);
+          const { rawValidatorScore, performanceScore } =
+            getLastEpochScoreAndPerformance(previousEpochData, id);

+          const overstakedAmount = getOverstakedAmount(
+            rawValidatorScore,
+            stakedTotal,
+            totalStake
+          );
          let individualStakeNeededForPromotion,
            individualStakeNeededForPromotionDescription;

-          if (stakeNeededForPromotion && previousEpochPerformanceScore) {
+          if (stakeNeededForPromotion && performanceScore) {
            const stakedTotalBigNum = new BigNumber(stakedTotal);
            const stakeNeededBigNum = new BigNumber(stakeNeededForPromotion);
-            const performanceScoreBigNum = new BigNumber(
-              previousEpochPerformanceScore
-            );
+            const performanceScoreBigNum = new BigNumber(performanceScore);

            const calc = stakeNeededBigNum
              .dividedBy(performanceScoreBigNum)
@@ -141,19 +142,18 @@ export const StandbyPendingValidatorsTable = ({
              toBigNum(stakedByOperator, decimals),
              2
            ),
-            [ValidatorFields.PERFORMANCE_SCORE]: getFormattedPerformanceScore(
-              previousEpochPerformanceScore
-            ).toString(),
-            [ValidatorFields.PERFORMANCE_PENALTY]: getPerformancePenalty(
-              previousEpochPerformanceScore
-            ),
+            [ValidatorFields.PERFORMANCE_SCORE]:
+              getFormattedPerformanceScore(performanceScore).toString(),
+            [ValidatorFields.PERFORMANCE_PENALTY]:
+              getPerformancePenalty(performanceScore),
+            [ValidatorFields.OVERSTAKED_AMOUNT]: overstakedAmount.toString(),
            [ValidatorFields.OVERSTAKING_PENALTY]: getOverstakingPenalty(
-              previousEpochValidatorScore,
-              previousEpochStakeScore
+              overstakedAmount,
+              totalStake
            ),
            [ValidatorFields.TOTAL_PENALTIES]: getTotalPenalties(
-              previousEpochValidatorScore,
-              previousEpochPerformanceScore,
+              rawValidatorScore,
+              performanceScore,
              stakedTotal,
              totalStake
            ),
@@ -20,6 +20,7 @@ import { SubHeading } from '../../../components/heading';
 import {
  getLastEpochScoreAndPerformance,
  getNormalisedVotingPower,
+  getOverstakedAmount,
  getOverstakingPenalty,
  getPerformancePenalty,
  getTotalPenalties,
@@ -74,9 +75,15 @@ export const ValidatorTable = ({

  const stakedOnNode = toBigNum(node.stakedTotal, decimals);

-  const { rawValidatorScore, performanceScore, stakeScore } =
+  const { rawValidatorScore, performanceScore } =
    getLastEpochScoreAndPerformance(previousEpochData, node.id);

+  const overstakedAmount = getOverstakedAmount(
+    rawValidatorScore,
+    stakedTotal,
+    node.stakedTotal
+  );
+
  const stakePercentage = getStakePercentage(total, stakedOnNode);

  const totalPenaltiesAmount = getTotalPenalties(
@@ -238,7 +245,7 @@ export const ValidatorTable = ({

              <Tooltip description={t('OverstakedPenaltyDescription')}>
                <span data-testid="overstaking-penalty">
-                  {getOverstakingPenalty(rawValidatorScore, stakeScore)}
+                  {getOverstakingPenalty(overstakedAmount, node.stakedTotal)}
                </span>
              </Tooltip>
            </KeyValueTableRow>
@@ -4,6 +4,7 @@ import {
  getNormalisedVotingPower,
  getUnnormalisedVotingPower,
  getOverstakingPenalty,
+  getOverstakedAmount,
  getFormattedPerformanceScore,
  getPerformancePenalty,
  getTotalPenalties,
@@ -21,10 +22,9 @@ describe('getLastEpochScoreAndPerformance', () => {
              id: '0x123',
              rewardScore: {
                rawValidatorScore: '0.25',
-                performanceScore: '0.75',
              },
              rankingScore: {
-                stakeScore: '0.25',
+                performanceScore: '0.75',
              },
            },
          },
@@ -33,10 +33,9 @@ describe('getLastEpochScoreAndPerformance', () => {
              id: '0x234',
              rewardScore: {
                rawValidatorScore: '0.35',
-                performanceScore: '0.85',
              },
              rankingScore: {
-                stakeScore: '0.25',
+                performanceScore: '0.85',
              },
            },
          },
@@ -51,14 +50,12 @@ describe('getLastEpochScoreAndPerformance', () => {
    ).toEqual({
      rawValidatorScore: '0.25',
      performanceScore: '0.75',
-      stakeScore: '0.25',
    });
    expect(
      getLastEpochScoreAndPerformance(mockPreviousEpochData, '0x234')
    ).toEqual({
      rawValidatorScore: '0.35',
      performanceScore: '0.85',
-      stakeScore: '0.25',
    });
  });
 });
@@ -82,34 +79,40 @@ describe('getUnnormalisedVotingPower', () => {
 });

 describe('getOverstakingPenalty', () => {
-  it('returns "0%" when both arguments are null or undefined', () => {
-    expect(getOverstakingPenalty(null, null)).toBe('0%');
-    expect(getOverstakingPenalty(undefined, undefined)).toBe('0%');
-    expect(getOverstakingPenalty(null, undefined)).toBe('0%');
-    expect(getOverstakingPenalty(undefined, null)).toBe('0%');
+  it('should return the overstaking penalty', () => {
+    expect(
+      getOverstakingPenalty(new BigNumber(100), Number(1000).toString())
+    ).toEqual('10.00%');
+    expect(
+      getOverstakingPenalty(new BigNumber(500), Number(2000).toString())
+    ).toEqual('25.00%');
+  });
+});
+
+describe('getOverstakedAmount', () => {
+  it('should return the overstaked amount', () => {
+    expect(
+      // If a validator score is 0, any amount staked on the node is considered overstaked
+      getOverstakedAmount('0', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(20));
+    expect(
+      getOverstakedAmount('0.05', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(15));
+    expect(
+      getOverstakedAmount('0.1', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(10));
+    expect(
+      getOverstakedAmount('0.15', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(5));
+    expect(
+      getOverstakedAmount('0.2', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(0));
  });

-  it('returns "0%" when one argument is null or undefined', () => {
-    expect(getOverstakingPenalty('10', null)).toBe('0%');
-    expect(getOverstakingPenalty(null, '20')).toBe('0%');
-    expect(getOverstakingPenalty('10', undefined)).toBe('0%');
-    expect(getOverstakingPenalty(undefined, '20')).toBe('0%');
-  });
-
-  it('returns "0%" when validatorScore or stakeScore is zero', () => {
-    expect(getOverstakingPenalty('0', '20')).toBe('0%');
-    expect(getOverstakingPenalty('10', '0')).toBe('0%');
-  });
-
-  it('returns the correct overstaking penalty', () => {
-    expect(getOverstakingPenalty('0.18', '0.2')).toBe('10.00%');
-    expect(getOverstakingPenalty('0.2', '0.2')).toBe('0.00%');
-    expect(getOverstakingPenalty('0.04', '0.2')).toBe('80.00%');
-  });
-
-  it('handles string numbers with decimals', () => {
-    expect(getOverstakingPenalty('7.5', '15')).toBe('50.00%');
-    expect(getOverstakingPenalty('12.5', '25')).toBe('50.00%');
+  it('should return 0 if the overstaked amount is negative', () => {
+    expect(
+      getOverstakedAmount('0.8', Number(100).toString(), Number(20).toString())
+    ).toEqual(new BigNumber(0));
  });
 });

@@ -15,8 +15,7 @@ export const getLastEpochScoreAndPerformance = (

  return {
    rawValidatorScore: validator?.rewardScore?.rawValidatorScore,
-    performanceScore: validator?.rewardScore?.performanceScore,
-    stakeScore: validator?.rankingScore?.stakeScore,
+    performanceScore: validator?.rankingScore?.performanceScore,
  };
 };

@@ -43,26 +42,31 @@ export const getPerformancePenalty = (performanceScore?: string) =>
    2
  );

-export const getOverstakingPenalty = (
+export const getOverstakedAmount = (
  validatorScore: string | null | undefined,
-  stakeScore: string | null | undefined
+  totalStake: string,
+  stakedOnNode: string
 ) => {
-  if (!validatorScore || !stakeScore) {
-    return '0%';
-  }
+  const toReturn = validatorScore
+    ? new BigNumber(stakedOnNode).minus(
+        new BigNumber(validatorScore).times(new BigNumber(totalStake))
+      )
+    : new BigNumber(0);

+  return toReturn.isNegative() ? new BigNumber(0) : toReturn;
+};
+
+export const getOverstakingPenalty = (
+  overstakedAmount: BigNumber,
+  stakedOnNode: string
+) => {
  // avoid division by zero
-  if (
-    new BigNumber(validatorScore).isZero() ||
-    new BigNumber(stakeScore).isZero()
-  ) {
-    return '0%';
+  if (new BigNumber(stakedOnNode).isZero() || overstakedAmount.isZero()) {
+    return '0';
  }

  return formatNumberPercentage(
-    new BigNumber(1)
-      .minus(new BigNumber(validatorScore).dividedBy(new BigNumber(stakeScore)))
-      .times(100),
+    overstakedAmount.dividedBy(new BigNumber(stakedOnNode)).times(100),
    2
  );
 };
@@ -3,9 +3,9 @@
    "tranche_id": 56,
    "tranche_start": "2023-04-20T00:00:00.000Z",
    "tranche_end": "2023-05-20T00:00:00.000Z",
-    "total_added": "12533.75",
+    "total_added": "10724.25",
    "total_removed": "0",
-    "locked_amount": "12533.75",
+    "locked_amount": "10724.25",
    "deposits": [
      {
        "amount": "50",
@@ -36,26 +36,6 @@
        "amount": "51.75",
        "user": "0x237D23FcA6d7B2530C7614a9cB921CF27924911E",
        "tx": "0x3e9c304b5ca74d1238cc4ee2f1396812aac6e62eb8674e8be3e01c9ad3e5bcb0"
-      },
-      {
-        "amount": "379.5",
-        "user": "0x6536B87D6a31a37645c2E0E948BB1a2166FAcdaE",
-        "tx": "0x6dc1c78046509fc85f149ad55a0683e059f46d53eab51397ff202c22ee55938f"
-      },
-      {
-        "amount": "138",
-        "user": "0x9f709F2b44e14B2832832FC35aC378e41Bf14bBC",
-        "tx": "0x1b2921c481d2af4dead917173e4fc821ca119bc9408460caff9c25ae09e06a3d"
-      },
-      {
-        "amount": "1154",
-        "user": "0x981D29D939cAa4ADC04A5e44224dBB45539E8730",
-        "tx": "0x3e8baadb612f97fd9fa0b4a8f28c57381d87ff43a083117e19d0332e37869a7f"
-      },
-      {
-        "amount": "138",
-        "user": "0xF2c8658Bad7314c3c3c1FED7e300a1691EC4f98A",
-        "tx": "0xa9db9e09f9841a8cbcaf161bf98d32e67f24c2c162f13c364450487ccaf8ebd6"
      }
    ],
    "withdrawals": [],
@@ -149,66 +129,6 @@
        "total_tokens": "51.75",
        "withdrawn_tokens": "0",
        "remaining_tokens": "51.75"
-      },
-      {
-        "address": "0x6536B87D6a31a37645c2E0E948BB1a2166FAcdaE",
-        "deposits": [
-          {
-            "amount": "379.5",
-            "user": "0x6536B87D6a31a37645c2E0E948BB1a2166FAcdaE",
-            "tranche_id": 56,
-            "tx": "0x6dc1c78046509fc85f149ad55a0683e059f46d53eab51397ff202c22ee55938f"
-          }
-        ],
-        "withdrawals": [],
-        "total_tokens": "379.5",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "379.5"
-      },
-      {
-        "address": "0x9f709F2b44e14B2832832FC35aC378e41Bf14bBC",
-        "deposits": [
-          {
-            "amount": "138",
-            "user": "0x9f709F2b44e14B2832832FC35aC378e41Bf14bBC",
-            "tranche_id": 56,
-            "tx": "0x1b2921c481d2af4dead917173e4fc821ca119bc9408460caff9c25ae09e06a3d"
-          }
-        ],
-        "withdrawals": [],
-        "total_tokens": "138",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "138"
-      },
-      {
-        "address": "0x981D29D939cAa4ADC04A5e44224dBB45539E8730",
-        "deposits": [
-          {
-            "amount": "1154",
-            "user": "0x981D29D939cAa4ADC04A5e44224dBB45539E8730",
-            "tranche_id": 56,
-            "tx": "0x3e8baadb612f97fd9fa0b4a8f28c57381d87ff43a083117e19d0332e37869a7f"
-          }
-        ],
-        "withdrawals": [],
-        "total_tokens": "1154",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "1154"
-      },
-      {
-        "address": "0xF2c8658Bad7314c3c3c1FED7e300a1691EC4f98A",
-        "deposits": [
-          {
-            "amount": "138",
-            "user": "0xF2c8658Bad7314c3c3c1FED7e300a1691EC4f98A",
-            "tranche_id": 56,
-            "tx": "0xa9db9e09f9841a8cbcaf161bf98d32e67f24c2c162f13c364450487ccaf8ebd6"
-          }
-        ],
-        "withdrawals": [],
-        "total_tokens": "138",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "138"
      }
    ]
  },
@@ -269,9 +189,9 @@
    "tranche_id": 54,
    "tranche_start": "2023-04-06T00:00:00.000Z",
    "tranche_end": "2023-05-06T00:00:00.000Z",
-    "total_added": "8661",
+    "total_added": "8565",
    "total_removed": "0",
-    "locked_amount": "8515.0394282407400778",
+    "locked_amount": "8565",
    "deposits": [
      {
        "amount": "33",
@@ -303,11 +223,6 @@
        "user": "0xf96afaB11e5617560b9183766470B23F45c38C56",
        "tx": "0x49ab3f37bda02347cb1966e8fa21885a463f09d0593a890e96b2e36dfb8dec49"
      },
-      {
-        "amount": "96",
-        "user": "0x6324334064d1d807940191C658d925DA7d323b12",
-        "tx": "0x96b16197328b59556848409bcc4ebf1f71648485fabedde2848461247aa4be32"
-      },
      {
        "amount": "111",
        "user": "0x268070d5EEd5b24E34a5F4C17B5482178b18089D",
@@ -481,21 +396,6 @@
        "withdrawn_tokens": "0",
        "remaining_tokens": "2523"
      },
-      {
-        "address": "0x6324334064d1d807940191C658d925DA7d323b12",
-        "deposits": [
-          {
-            "amount": "96",
-            "user": "0x6324334064d1d807940191C658d925DA7d323b12",
-            "tranche_id": 54,
-            "tx": "0x96b16197328b59556848409bcc4ebf1f71648485fabedde2848461247aa4be32"
-          }
-        ],
-        "withdrawals": [],
-        "total_tokens": "96",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "96"
-      },
      {
        "address": "0x268070d5EEd5b24E34a5F4C17B5482178b18089D",
        "deposits": [
@@ -842,8 +742,8 @@
    "tranche_start": "2023-03-06T00:00:00.000Z",
    "tranche_end": "2023-04-06T00:00:00.000Z",
    "total_added": "14099",
-    "total_removed": "332.88824447236",
-    "locked_amount": "0",
+    "total_removed": "165.10784124668",
+    "locked_amount": "1020.23509744623685628",
    "deposits": [
      {
        "amount": "30",
@@ -1617,16 +1517,6 @@
        "user": "0x6A228Fffda4D1B3C773b9ce38DA43592581b36FC",
        "tx": "0x5a8d0a823b77eb011079663279e0f2eaf0bd8773114dd6d5bfe65c2ab47680e6"
      },
-      {
-        "amount": "27.78040322568",
-        "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
-        "tx": "0x47ef65d8ea128dfa3308d25fadf4e3b6b2b95a91f98bd074b268c002babf1edf"
-      },
-      {
-        "amount": "140",
-        "user": "0xF3C6c37B9EBB4D21e8bf119841C0e0e296e3EA04",
-        "tx": "0x3af459fccc854056f4a3a3d0223e5b5fec587f2990c0ec48f0f1be65882e5d96"
-      },
      {
        "amount": "14.85013776876",
        "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -1865,12 +1755,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "27.78040322568",
-            "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
-            "tranche_id": 53,
-            "tx": "0x47ef65d8ea128dfa3308d25fadf4e3b6b2b95a91f98bd074b268c002babf1edf"
-          },
          {
            "amount": "14.85013776876",
            "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -1885,8 +1769,8 @@
          }
        ],
        "total_tokens": "63",
-        "withdrawn_tokens": "62.78320228446",
-        "remaining_tokens": "0.21679771554"
+        "withdrawn_tokens": "35.00279905878",
+        "remaining_tokens": "27.99720094122"
      },
      {
        "address": "0x8499411Bff99ddE9A02903008F917EEa0E27B42A",
@@ -2286,17 +2170,10 @@
            "tx": "0x46d80a145d2f49ef3152cbfaa6d2bb054deabe21396ab43553a3f076e2db62e1"
          }
        ],
-        "withdrawals": [
-          {
-            "amount": "140",
-            "user": "0xF3C6c37B9EBB4D21e8bf119841C0e0e296e3EA04",
-            "tranche_id": 53,
-            "tx": "0x3af459fccc854056f4a3a3d0223e5b5fec587f2990c0ec48f0f1be65882e5d96"
-          }
-        ],
+        "withdrawals": [],
        "total_tokens": "140",
-        "withdrawn_tokens": "140",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "140"
      },
      {
        "address": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008",
@@ -3654,7 +3531,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "86666.297",
    "total_removed": "0",
-    "locked_amount": "57578.3384572820232579218",
+    "locked_amount": "58231.0206471161547092772",
    "deposits": [
      {
        "amount": "86666.297",
@@ -3720,7 +3597,7 @@
    "tranche_end": "2023-06-01T00:00:00.000Z",
    "total_added": "2500",
    "total_removed": "0",
-    "locked_amount": "762.286006817256825",
+    "locked_amount": "800.044356684981575",
    "deposits": [
      {
        "amount": "2500",
@@ -3841,7 +3718,7 @@
    "tranche_end": "2023-09-01T00:00:00.000Z",
    "total_added": "17500",
    "total_removed": "0",
-    "locked_amount": "14028.00202546296225",
+    "locked_amount": "14289.43755661231775",
    "deposits": [
      {
        "amount": "12500",
@@ -4108,7 +3985,7 @@
    "tranche_end": "2023-08-01T00:00:00.000Z",
    "total_added": "37500",
    "total_removed": "11781.2245815",
-    "locked_amount": "24135.58452271332",
+    "locked_amount": "24705.08891574585375",
    "deposits": [
      {
        "amount": "7500",
@@ -4428,7 +4305,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "129999.45",
    "total_removed": "0",
-    "locked_amount": "57525.8054682240954858435",
+    "locked_amount": "58177.89216768362770314",
    "deposits": [
      {
        "amount": "129999.45",
@@ -4461,7 +4338,7 @@
    "tranche_end": "2024-04-01T00:00:00.000Z",
    "total_added": "54144.7663",
    "total_removed": "0",
-    "locked_amount": "53330.29014628881803117649",
+    "locked_amount": "53736.93921662980913205788",
    "deposits": [
      {
        "amount": "54144.7663",
@@ -4494,7 +4371,7 @@
    "tranche_end": "2023-09-03T00:00:00.000Z",
    "total_added": "62600",
    "total_removed": "0",
-    "locked_amount": "25639.31718670725918",
+    "locked_amount": "26110.75656392694224",
    "deposits": [
      {
        "amount": "10000",
@@ -4687,7 +4564,7 @@
    "tranche_end": "2023-09-17T00:00:00.000Z",
    "total_added": "5000",
    "total_removed": "0",
-    "locked_amount": "2239.6496067985795",
+    "locked_amount": "2277.30450913242",
    "deposits": [
      {
        "amount": "5000",
@@ -4898,7 +4775,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "97499.58",
    "total_removed": "0",
-    "locked_amount": "0",
+    "locked_amount": "289.2943236127702715019",
    "deposits": [
      {
        "amount": "97499.58",
@@ -4931,7 +4808,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "135173.4239508",
    "total_removed": "133818.54965292963650862",
-    "locked_amount": "0",
+    "locked_amount": "395.4153957972609424964042112",
    "deposits": [
      {
        "amount": "135173.4239508",
@@ -4988,7 +4865,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "32499.86",
    "total_removed": "0",
-    "locked_amount": "0",
+    "locked_amount": "121.701126098142348042122",
    "deposits": [
      {
        "amount": "32499.86",
@@ -5021,7 +4898,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "10833.29",
    "total_removed": "0",
-    "locked_amount": "0",
+    "locked_amount": "39.612535585171623792263",
    "deposits": [
      {
        "amount": "10833.29",
@@ -5054,7 +4931,7 @@
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "22749.93",
    "total_removed": "4720.860935375",
-    "locked_amount": "0",
+    "locked_amount": "148.080505317408011860722",
    "deposits": [
      {
        "amount": "6500",
@@ -5206,7 +5083,7 @@
    "tranche_end": "2023-05-01T00:00:00.000Z",
    "total_added": "22500",
    "total_removed": "6357.929999175",
-    "locked_amount": "3044.886625230202125",
+    "locked_amount": "3386.5892610497226",
    "deposits": [
      {
        "amount": "7500",
@@ -5646,7 +5523,7 @@
    "tranche_end": "2023-06-02T00:00:00.000Z",
    "total_added": "1939928.38",
    "total_removed": "928642.9598472029154",
-    "locked_amount": "300260.63338181247167142",
+    "locked_amount": "314870.1961185216721358008",
    "deposits": [
      {
        "amount": "1852091.69",
@@ -11134,7 +11011,7 @@
    "tranche_id": 11,
    "tranche_start": "2021-09-03T00:00:00.000Z",
    "tranche_end": "2022-09-03T00:00:00.000Z",
-    "total_added": "57238.000000000000000003",
+    "total_added": "57213.000000000000000003",
    "total_removed": "48157.21518131551",
    "locked_amount": "0",
    "deposits": [
@@ -11158,11 +11035,6 @@
        "user": "0x363D3d06d70761c34D6EfEB25E409A9549E6970D",
        "tx": "0x180cd3aca2d716aa233483a9a52b02e83d9ac88716ca85d998269965c7a01a96"
      },
-      {
-        "amount": "25",
-        "user": "0x981D29D939cAa4ADC04A5e44224dBB45539E8730",
-        "tx": "0xac528ad2b9d958135e7556c5d9d36ce97eb6fb723dd44b3430374276e0fae9be"
-      },
      {
        "amount": "150",
        "user": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008",
@@ -22966,21 +22838,6 @@
        "withdrawn_tokens": "0",
        "remaining_tokens": "25"
      },
-      {
-        "address": "0x981D29D939cAa4ADC04A5e44224dBB45539E8730",
-        "deposits": [
-          {
-            "amount": "25",
-            "user": "0x981D29D939cAa4ADC04A5e44224dBB45539E8730",
-            "tranche_id": 11,
-            "tx": "0xac528ad2b9d958135e7556c5d9d36ce97eb6fb723dd44b3430374276e0fae9be"
-          }
-        ],
-        "withdrawals": [],
-        "total_tokens": "25",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "25"
-      },
      {
        "address": "0xEb01fF124D71b6C7E6613fd6E0A86c28C733F008",
        "deposits": [
@@ -39399,7 +39256,7 @@
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "3732368.4671",
    "total_removed": "700133.348465855088393",
-    "locked_amount": "485897.284061159463725724765",
+    "locked_amount": "508347.190004695251441550046",
    "deposits": [
      {
        "amount": "1998.95815",
@@ -40780,8 +40637,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "15870102.715470999700000001",
-    "total_removed": "815921.67873801845247952",
-    "locked_amount": "7022648.15733426372108476030466951593836177",
+    "total_removed": "814951.95458233668060452",
+    "locked_amount": "7102254.0823883096815429813321985808150852",
    "deposits": [
      {
        "amount": "16249.93",
@@ -41320,16 +41177,6 @@
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
        "tx": "0x625ce40117b67b756a12ad676cfbfd2c59e264b3c86adbc624bf7107c4dbc5d5"
      },
-      {
-        "amount": "462.457470607163625",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0xa65322922116e2e0949be9d83e65ef0b1f2d8fe3eb399616a5cbbb7c95593717"
-      },
-      {
-        "amount": "507.26668507460825",
-        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-        "tx": "0x8be0ce3e72ef8b69c5682a9272305c5adfc68fa2d082381f47ae13e917a6cef8"
-      },
      {
        "amount": "545.4204142199725",
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -43360,18 +43207,6 @@
            "tranche_id": 2,
            "tx": "0x625ce40117b67b756a12ad676cfbfd2c59e264b3c86adbc624bf7107c4dbc5d5"
          },
-          {
-            "amount": "462.457470607163625",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 2,
-            "tx": "0xa65322922116e2e0949be9d83e65ef0b1f2d8fe3eb399616a5cbbb7c95593717"
-          },
-          {
-            "amount": "507.26668507460825",
-            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
-            "tranche_id": 2,
-            "tx": "0x8be0ce3e72ef8b69c5682a9272305c5adfc68fa2d082381f47ae13e917a6cef8"
-          },
          {
            "amount": "545.4204142199725",
            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44748,8 +44583,8 @@
          }
        ],
        "total_tokens": "259998.8875",
-        "withdrawn_tokens": "144465.698336257346125",
-        "remaining_tokens": "115533.189163742653875"
+        "withdrawn_tokens": "143495.97418057557425",
+        "remaining_tokens": "116502.91331942442575"
      },
      {
        "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -47094,8 +46929,8 @@
    "tranche_start": "2021-11-05T00:00:00.000Z",
    "tranche_end": "2023-05-05T00:00:00.000Z",
    "total_added": "14597706.0446472999",
-    "total_removed": "5808173.326897276766376406",
-    "locked_amount": "761818.71252882815442491758389864",
+    "total_removed": "5806817.570026167688715156",
+    "locked_amount": "835310.394250092778046317149087858",
    "deposits": [
      {
        "amount": "129284.449",
@@ -47369,16 +47204,6 @@
        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
        "tx": "0x523cbf99fb25ac9633e40a26cf1aa66ac5442392e577299159bf50e844a860e1"
      },
-      {
-        "amount": "646.042220779495735",
-        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-        "tx": "0xcd3480c11e987e702a52413185dcc232b399747ef2fd7529aa46bea02c6f4be5"
-      },
-      {
-        "amount": "709.71465032958192625",
-        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-        "tx": "0x0464f4416616032385d6cecf639d1b1b8f3d75beab762529d23688456a170602"
-      },
      {
        "amount": "755.482067130393772",
        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -50551,18 +50376,6 @@
            "tranche_id": 3,
            "tx": "0x523cbf99fb25ac9633e40a26cf1aa66ac5442392e577299159bf50e844a860e1"
          },
-          {
-            "amount": "646.042220779495735",
-            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-            "tranche_id": 3,
-            "tx": "0xcd3480c11e987e702a52413185dcc232b399747ef2fd7529aa46bea02c6f4be5"
-          },
-          {
-            "amount": "709.71465032958192625",
-            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
-            "tranche_id": 3,
-            "tx": "0x0464f4416616032385d6cecf639d1b1b8f3d75beab762529d23688456a170602"
-          },
          {
            "amount": "755.482067130393772",
            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -53241,8 +53054,8 @@
          }
        ],
        "total_tokens": "359123.469575",
-        "withdrawn_tokens": "339719.996781712978353",
-        "remaining_tokens": "19403.472793287021647"
+        "withdrawn_tokens": "338364.23991060390069175",
+        "remaining_tokens": "20759.22966439609930825"
      },
      {
        "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -54669,8 +54482,8 @@
    "tranche_start": "2021-10-05T00:00:00.000Z",
    "tranche_end": "2023-04-05T00:00:00.000Z",
    "total_added": "5778205.3912159303",
-    "total_removed": "3421590.665302980803025769",
-    "locked_amount": "0",
+    "total_removed": "3381706.364737906998719578",
+    "locked_amount": "13132.78514323649783129733831977186",
    "deposits": [
      {
        "amount": "552496.6455",
@@ -54814,26 +54627,6 @@
      }
    ],
    "withdrawals": [
-      {
-        "amount": "10509.407528939748325",
-        "user": "0xBc934494675a6ceB639B9EfEe5b9C0f017D35a75",
-        "tx": "0x621a569bfd19dbc0a6ba78addf836a9f2f1897258a88198d994e5b18c9f4901e"
-      },
-      {
-        "amount": "13312.213609122936225",
-        "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
-        "tx": "0x8a1d50991be09f4adc9eba704fbbcd271e8022db56498b300f39d3111bf187ea"
-      },
-      {
-        "amount": "13385.167736021049216341",
-        "user": "0xC24da173A250e9Ca5c54870639EbE5f88be5102d",
-        "tx": "0xa6c475d9dc04d4f722ead66481243b19a2eaafac7d81b4b3bc711a8269a52259"
-      },
-      {
-        "amount": "2677.51169099007053985",
-        "user": "0x6ae83EAB68b7112BaD5AfD72d6B24546AbFF137D",
-        "tx": "0x5d28a9be9d82440733d43afac61bcf6ff79024f1f73d621aa1d3afdba072db4c"
-      },
      {
        "amount": "8511.948415174862415",
        "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
@@ -55831,12 +55624,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "10509.407528939748325",
-            "user": "0xBc934494675a6ceB639B9EfEe5b9C0f017D35a75",
-            "tranche_id": 4,
-            "tx": "0x621a569bfd19dbc0a6ba78addf836a9f2f1897258a88198d994e5b18c9f4901e"
-          },
          {
            "amount": "990.74735267405816",
            "user": "0xBc934494675a6ceB639B9EfEe5b9C0f017D35a75",
@@ -55941,8 +55728,8 @@
          }
        ],
        "total_tokens": "110499.5291",
-        "withdrawn_tokens": "110307.617158818603845",
-        "remaining_tokens": "191.911941181396155"
+        "withdrawn_tokens": "99798.20962987885552",
+        "remaining_tokens": "10701.31947012114448"
      },
      {
        "address": "0xdbC5d439F373EB646345e1c67D1d46231ACE7dD3",
@@ -55983,12 +55770,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "2677.51169099007053985",
-            "user": "0x6ae83EAB68b7112BaD5AfD72d6B24546AbFF137D",
-            "tranche_id": 4,
-            "tx": "0x5d28a9be9d82440733d43afac61bcf6ff79024f1f73d621aa1d3afdba072db4c"
-          },
          {
            "amount": "3239.30329480758879835",
            "user": "0x6ae83EAB68b7112BaD5AfD72d6B24546AbFF137D",
@@ -56093,8 +55874,8 @@
          }
        ],
        "total_tokens": "92082.572555",
-        "withdrawn_tokens": "92064.7311274626806437",
-        "remaining_tokens": "17.8414275373193563"
+        "withdrawn_tokens": "89387.21943647261010385",
+        "remaining_tokens": "2695.35311852738989615"
      },
      {
        "address": "0x1dC9B91DE003fd503F25cB5d114cf0fc68F7aFe6",
@@ -56122,12 +55903,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "13385.167736021049216341",
-            "user": "0xC24da173A250e9Ca5c54870639EbE5f88be5102d",
-            "tranche_id": 4,
-            "tx": "0xa6c475d9dc04d4f722ead66481243b19a2eaafac7d81b4b3bc711a8269a52259"
-          },
          {
            "amount": "16197.295646834677510988",
            "user": "0xC24da173A250e9Ca5c54870639EbE5f88be5102d",
@@ -56256,8 +56031,8 @@
          }
        ],
        "total_tokens": "460415.072915097",
-        "withdrawn_tokens": "460324.930117256149193663",
-        "remaining_tokens": "90.142797840850806337"
+        "withdrawn_tokens": "446939.762381235099977322",
+        "remaining_tokens": "13475.310533861900022678"
      },
      {
        "address": "0xd66e4853c0880df150e7329974715BFC8d2da47D",
@@ -56472,12 +56247,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "13312.213609122936225",
-            "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
-            "tranche_id": 4,
-            "tx": "0x8a1d50991be09f4adc9eba704fbbcd271e8022db56498b300f39d3111bf187ea"
-          },
          {
            "amount": "8511.948415174862415",
            "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
@@ -56738,8 +56507,8 @@
          }
        ],
        "total_tokens": "331498.5873",
-        "withdrawn_tokens": "331278.641779670288712",
-        "remaining_tokens": "219.945520329711288"
+        "withdrawn_tokens": "317966.428170547352487",
+        "remaining_tokens": "13532.159129452647513"
      },
      {
        "address": "0x16da609341ed67750A8BCC5AAa2005471006Cd77",
@@ -56841,8 +56610,8 @@
    "tranche_start": "2022-06-05T00:00:00.000Z",
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "472355.6199999996",
-    "total_removed": "41511.9808435861949",
-    "locked_amount": "76993.20216677886451988387975646",
+    "total_removed": "40152.1324861581949",
+    "locked_amount": "80550.51809266543339246000913244",
    "deposits": [
      {
        "amount": "3000",
@@ -63521,31 +63290,6 @@
        "user": "0x28FC83947F02f59Cb36b40f97f2D32BBC5D00585",
        "tx": "0x14da65fbf5ae2f3a593036daa58b3353ab88fc22666e5514f9160e252ad2fdf9"
      },
-      {
-        "amount": "332.441235412",
-        "user": "0x5c8fadaf56946d60823Dae0526A540EEfE791c99",
-        "tx": "0x67af8d72b36a27796fbe8f52ac55951d54102ac58582f848f0d21cf8ca427e77"
-      },
-      {
-        "amount": "831.7632864",
-        "user": "0x9405F540EcC1204801De5C4444D06386BD6693F0",
-        "tx": "0x0df6ec04cbdda41c8649a5e360ec541d14371e3877d82e1404308180024ede02"
-      },
-      {
-        "amount": "152.077625568",
-        "user": "0x7345AaA0D0e4C4A46d921fA9323973956F2b7392",
-        "tx": "0xf2737eb145aea0c573c2f604ae4b840fd56358a89f1470e37a26fff91df2e38d"
-      },
-      {
-        "amount": "11.682496196",
-        "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1",
-        "tx": "0xc757d9ea4d28133266b723ac41ba64d3bc5e1f4498e08b24745bf84e203009e0"
-      },
-      {
-        "amount": "31.883713852",
-        "user": "0x0e199b123f71f964d6567869B6B849C1f255A855",
-        "tx": "0xf44b1dc9f007be2df82ffea31d470f6f959b19d16d03aff3d4811ed0e065b72e"
-      },
      {
        "amount": "154.812094114",
        "user": "0x27e2254A2A8c9c9D1321E5Fe64cAD88e7A4f0ba7",
@@ -68713,17 +68457,10 @@
            "tx": "0x1c2c084e3efafb2ffa09c0b259bd229cce0d6da04dd092d911c7e6136a7ac8a9"
          }
        ],
-        "withdrawals": [
-          {
-            "amount": "831.7632864",
-            "user": "0x9405F540EcC1204801De5C4444D06386BD6693F0",
-            "tranche_id": 5,
-            "tx": "0x0df6ec04cbdda41c8649a5e360ec541d14371e3877d82e1404308180024ede02"
-          }
-        ],
+        "withdrawals": [],
        "total_tokens": "1000",
-        "withdrawn_tokens": "831.7632864",
-        "remaining_tokens": "168.2367136"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "1000"
      },
      {
        "address": "0x99b4635De6c5c8cdbBf728d7AA0d1b9DD8Ee381F",
@@ -81415,12 +81152,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "31.883713852",
-            "user": "0x0e199b123f71f964d6567869B6B849C1f255A855",
-            "tranche_id": 5,
-            "tx": "0xf44b1dc9f007be2df82ffea31d470f6f959b19d16d03aff3d4811ed0e065b72e"
-          },
          {
            "amount": "32.691171992",
            "user": "0x0e199b123f71f964d6567869B6B849C1f255A855",
@@ -81483,8 +81214,8 @@
          }
        ],
        "total_tokens": "400",
-        "withdrawn_tokens": "334.615512428",
-        "remaining_tokens": "65.384487572"
+        "withdrawn_tokens": "302.731798576",
+        "remaining_tokens": "97.268201424"
      },
      {
        "address": "0x74Da54F44975a1C224ABb5CAB8e5fc38a268B425",
@@ -81925,12 +81656,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "152.077625568",
-            "user": "0x7345AaA0D0e4C4A46d921fA9323973956F2b7392",
-            "tranche_id": 5,
-            "tx": "0xf2737eb145aea0c573c2f604ae4b840fd56358a89f1470e37a26fff91df2e38d"
-          },
          {
            "amount": "94.45296804",
            "user": "0x7345AaA0D0e4C4A46d921fA9323973956F2b7392",
@@ -81981,8 +81706,8 @@
          }
        ],
        "total_tokens": "1200",
-        "withdrawn_tokens": "1002.094025868",
-        "remaining_tokens": "197.905974132"
+        "withdrawn_tokens": "850.0164003",
+        "remaining_tokens": "349.9835997"
      },
      {
        "address": "0x47181cf36aDFb0b5dB7EfDB123f403D890607841",
@@ -82180,12 +81905,6 @@
            "tranche_id": 5,
            "tx": "0x9d4c99fdeee2d95caee8d6725f6796f8e02f8a9fd2d911a8e151b2665e192ebc"
          },
-          {
-            "amount": "11.682496196",
-            "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1",
-            "tranche_id": 5,
-            "tx": "0xc757d9ea4d28133266b723ac41ba64d3bc5e1f4498e08b24745bf84e203009e0"
-          },
          {
            "amount": "19.74474886",
            "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1",
@@ -82218,8 +81937,8 @@
          }
        ],
        "total_tokens": "400",
-        "withdrawn_tokens": "334.458891424",
-        "remaining_tokens": "65.541108576"
+        "withdrawn_tokens": "322.776395228",
+        "remaining_tokens": "77.223604772"
      },
      {
        "address": "0x3738bec36216eA2F11B954891C65AAd1Bc852156",
@@ -84578,17 +84297,10 @@
            "tx": "0xb59405747c8088945a412703637a7b422f3639439ec2ee15e180c0a2a0d71ee4"
          }
        ],
-        "withdrawals": [
-          {
-            "amount": "332.441235412",
-            "user": "0x5c8fadaf56946d60823Dae0526A540EEfE791c99",
-            "tranche_id": 5,
-            "tx": "0x67af8d72b36a27796fbe8f52ac55951d54102ac58582f848f0d21cf8ca427e77"
-          }
-        ],
+        "withdrawals": [],
        "total_tokens": "400",
-        "withdrawn_tokens": "332.441235412",
-        "remaining_tokens": "67.558764588"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "400"
      },
      {
        "address": "0x96715eF2F036069202B1C8065Db14601F40C9554",
@@ -86436,7 +86148,7 @@
    "tranche_start": "2021-12-05T00:00:00.000Z",
    "tranche_end": "2022-06-05T00:00:00.000Z",
    "total_added": "171288.42",
-    "total_removed": "68803.5995794947989",
+    "total_removed": "67553.5995794947989",
    "locked_amount": "0",
    "deposits": [
      {
@@ -90661,11 +90373,6 @@
      }
    ],
    "withdrawals": [
-      {
-        "amount": "1250",
-        "user": "0x9405F540EcC1204801De5C4444D06386BD6693F0",
-        "tx": "0x7dbc1e3f31a7aeea4e74f2bf14137bb99045b84afe7582a9ed2bc9d63b5458a4"
-      },
      {
        "amount": "250",
        "user": "0x2dd204e9cC4D41C68f2bb7Aa3b8Ce49884e482f5",
@@ -96090,17 +95797,10 @@
            "tx": "0x1c2c084e3efafb2ffa09c0b259bd229cce0d6da04dd092d911c7e6136a7ac8a9"
          }
        ],
-        "withdrawals": [
-          {
-            "amount": "1250",
-            "user": "0x9405F540EcC1204801De5C4444D06386BD6693F0",
-            "tranche_id": 6,
-            "tx": "0x7dbc1e3f31a7aeea4e74f2bf14137bb99045b84afe7582a9ed2bc9d63b5458a4"
-          }
-        ],
+        "withdrawals": [],
        "total_tokens": "1250",
-        "withdrawn_tokens": "1250",
-        "remaining_tokens": "0"
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "1250"
      },
      {
        "address": "0xf36f5369adBE86DF71f5bFfB0264fc1D99fA2935",
@@ -141906,11 +141606,6 @@
      }
    ],
    "withdrawals": [
-      {
-        "amount": "0",
-        "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
-        "tx": "0x840e84fd087fe976bfc1321c1fd60e63f7820e0d1b247c631ebc7268666945f5"
-      },
      {
        "amount": "38999.8338",
        "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
@@ -142176,12 +141871,6 @@
          }
        ],
        "withdrawals": [
-          {
-            "amount": "0",
-            "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
-            "tranche_id": 9,
-            "tx": "0x840e84fd087fe976bfc1321c1fd60e63f7820e0d1b247c631ebc7268666945f5"
-          },
          {
            "amount": "38999.8338",
            "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
@@ -1,5 +1,5 @@
 import * as Schema from '@vegaprotocol/types';
-import { aliasGQLQuery, checkSorting } from '@vegaprotocol/cypress';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { marketsQuery } from '@vegaprotocol/mock';
 import { getDateTimeFormat } from '@vegaprotocol/utils';

@@ -85,7 +85,6 @@ describe('markets table', { tags: '@smoke' }, () => {
    cy.getByTestId('view-market-list-link')
      .should('have.attr', 'href', '#/markets/all')
      .click();
-
    cy.get('[data-testid="All markets"]').should(
      'have.attr',
      'data-state',
@@ -118,85 +117,6 @@ describe('markets table', { tags: '@smoke' }, () => {
        `${Cypress.env('VEGA_TOKEN_URL')}/proposals/propose/new-market`
      );
  });
-  it('proposed markets tab should be sorted properly', () => {
-    cy.getByTestId('view-market-list-link').click();
-    cy.get('[data-testid="Proposed markets"]').click();
-    const marketColDefault = [
-      'ETHUSD',
-      'LINKUSD',
-      'ETHUSD',
-      'ETHDAI.MF21',
-      'AAPL.MF21',
-      'BTCUSD.MF21',
-      'TSLA.QM21',
-      'AAVEDAI.MF21',
-      'ETHBTC.QM21',
-      'UNIDAI.MF21',
-    ];
-    const marketColAsc = [
-      'AAPL.MF21',
-      'AAVEDAI.MF21',
-      'BTCUSD.MF21',
-      'ETHBTC.QM21',
-      'ETHDAI.MF21',
-      'ETHUSD',
-      'ETHUSD',
-      'LINKUSD',
-      'TSLA.QM21',
-      'UNIDAI.MF21',
-    ];
-    const marketColDesc = [
-      'UNIDAI.MF21',
-      'TSLA.QM21',
-      'LINKUSD',
-      'ETHUSD',
-      'ETHUSD',
-      'ETHDAI.MF21',
-      'ETHBTC.QM21',
-      'BTCUSD.MF21',
-      'AAVEDAI.MF21',
-      'AAPL.MF21',
-    ];
-    checkSorting('market', marketColDefault, marketColAsc, marketColDesc);
-
-    const stateColDefault = [
-      'Open',
-      'Passed',
-      'Waiting for Node Vote',
-      'Open',
-      'Passed',
-      'Open',
-      'Passed',
-      'Open',
-      'Waiting for Node Vote',
-      'Open',
-    ];
-    const stateColAsc = [
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-      'Passed',
-      'Passed',
-      'Passed',
-      'Waiting for Node Vote',
-      'Waiting for Node Vote',
-    ];
-    const stateColDesc = [
-      'Waiting for Node Vote',
-      'Waiting for Node Vote',
-      'Passed',
-      'Passed',
-      'Passed',
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-      'Open',
-    ];
-    checkSorting('state', stateColDefault, stateColAsc, stateColDesc);
-  });

  it('opening auction subsets should be properly displayed', () => {
    cy.mockTradingPage(
@@ -8,7 +8,6 @@ import {
 import { tooltipMapping } from '@vegaprotocol/market-info';
 import {
  addDecimalsFormatNumber,
-  createDocsLinks,
  formatNumberPercentage,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
@@ -24,7 +23,6 @@ import {
  Tabs,
  Link as UiToolkitLink,
  Indicator,
-  ExternalLink,
 } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { memo, useCallback, useEffect, useRef, useState } from 'react';
@@ -39,7 +37,6 @@ import { Link, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';

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

 const enum LiquidityTabs {
  Active = 'active',
@@ -147,7 +144,6 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
    market?.tradableInstrument.instrument.product.settlementAsset.decimals || 0;
  const symbol =
    market?.tradableInstrument.instrument.product.settlementAsset.symbol;
-  const { VEGA_DOCS_URL } = useEnvironment();

  const { params } = useNetworkParams([
    NetworkParams.market_liquidity_stakeToCcyVolume,
@@ -215,13 +211,6 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
      <HeaderStat heading={t('Market ID')}>
        <div className="break-word">{marketId}</div>
      </HeaderStat>
-      <HeaderStat heading={t('Learn more')}>
-        {VEGA_DOCS_URL && (
-          <ExternalLink href={createDocsLinks(VEGA_DOCS_URL).LIQUIDITY}>
-            {t('Providing liquidity')}
-          </ExternalLink>
-        )}
-      </HeaderStat>
    </Header>
  );
 });
@@ -8,7 +8,6 @@ import type { MarketData } from '@vegaprotocol/market-list';
 import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
 import { HeaderStat } from '../header';
 import {
-  ExternalLink,
  Indicator,
  KeyValueTable,
  KeyValueTableRow,
@@ -19,11 +18,9 @@ import { useCheckLiquidityStatus } from '@vegaprotocol/liquidity';
 import { AuctionTrigger, MarketTradingMode } from '@vegaprotocol/types';
 import {
  addDecimalsFormatNumber,
-  createDocsLinks,
  formatNumberPercentage,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { useEnvironment } from '@vegaprotocol/environment';

 interface Props {
  marketId?: string;
@@ -47,8 +44,6 @@ export const MarketLiquiditySupplied = ({
    params.market_liquidity_targetstake_triggering_ratio
  );

-  const { VEGA_DOCS_URL } = useEnvironment();
-
  const variables = useMemo(
    () => ({
      marketId: marketId || '',
@@ -131,14 +126,6 @@ export const MarketLiquiditySupplied = ({
      <Link href={`/#/liquidity/${marketId}`} data-testid="view-liquidity-link">
        {t('View liquidity provision table')}
      </Link>
-      {VEGA_DOCS_URL && (
-        <ExternalLink
-          href={createDocsLinks(VEGA_DOCS_URL).LIQUIDITY}
-          className="mt-2"
-        >
-          {t('Learn about providing liquidity')}
-        </ExternalLink>
-      )}
      {showMessage && (
        <p className="mt-4">
          {t(
@@ -23,7 +23,6 @@ import {
 } from '@vegaprotocol/ui-toolkit';

 import { Links, Routes } from '../../pages/client-router';
-import { createDocsLinks } from '@vegaprotocol/utils';

 export const Navbar = ({
  theme = 'system',
@@ -38,7 +37,6 @@ export const Navbar = ({
  const tradingPath = marketId
    ? Links[Routes.MARKET](marketId)
    : Links[Routes.MARKET]();
-
  return (
    <Navigation
      appName="Console"
@@ -91,9 +89,7 @@ export const Navbar = ({
            <NavigationContent>
              <NavigationList>
                <NavigationItem>
-                  <NavExternalLink
-                    href={createDocsLinks(VEGA_DOCS_URL).NEW_TO_VEGA}
-                  >
+                  <NavExternalLink href={VEGA_DOCS_URL}>
                    {t('Docs')}
                  </NavExternalLink>
                </NavigationItem>
@@ -52,9 +52,6 @@ export const checkSorting = (
    cy.get(`[col-id="${column}"]`).click();
  });
  checkSortChange(orderTabDesc, column);
-  cy.get('.ag-header-container').within(() => {
-    cy.get(`[col-id="${column}"]`).click();
-  });
 };

 const checkSortChange = (tabsArr: string[], column: string) => {
@@ -174,7 +174,7 @@ const ApprovalTxFeedback = ({
            <>
              <p>
                {t(
-                  `Your ${selectedAsset?.symbol} approval is being confirmed by the Ethereum network. When this is complete, you can continue your deposit`
+                  `Your ${selectedAsset?.symbol} is being confirmed by the Ethereum network. When this is complete, you can continue your deposit`
                )}{' '}
              </p>
              {txLink && <p>{txLink}</p>}
@@ -61,7 +61,6 @@ beforeEach(() => {
    submitDeposit: jest.fn(),
    submitFaucet: jest.fn(),
    onDisconnect: jest.fn(),
-    handleAmountChange: jest.fn(),
    approveTxId: null,
    faucetTxId: null,
    isFaucetable: true,
@@ -25,9 +25,11 @@ import {
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useWeb3React } from '@web3-react/core';
 import BigNumber from 'bignumber.js';
-import type { ButtonHTMLAttributes, ChangeEvent, ReactNode } from 'react';
-import { useMemo, useState } from 'react';
-import { useWatch, Controller, useForm } from 'react-hook-form';
+import type { ButtonHTMLAttributes, ReactNode } from 'react';
+import { useState } from 'react';
+import { useMemo } from 'react';
+import { useWatch } from 'react-hook-form';
+import { Controller, useForm } from 'react-hook-form';
 import { DepositLimits } from './deposit-limits';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import {
@@ -38,7 +40,6 @@ import {
 import type { DepositBalances } from './use-deposit-balances';
 import { FaucetNotification } from './faucet-notification';
 import { ApproveNotification } from './approve-notification';
-import { usePersistentDeposit } from './use-persistent-deposit';

 interface FormFields {
  asset: string;
@@ -52,7 +53,6 @@ export interface DepositFormProps {
  selectedAsset?: Asset;
  balances: DepositBalances | null;
  onSelectAsset: (assetId: string) => void;
-  handleAmountChange: (amount: string) => void;
  onDisconnect: () => void;
  submitApprove: () => void;
  approveTxId: number | null;
@@ -71,7 +71,6 @@ export const DepositForm = ({
  selectedAsset,
  balances,
  onSelectAsset,
-  handleAmountChange,
  onDisconnect,
  submitApprove,
  submitDeposit,
@@ -86,8 +85,6 @@ export const DepositForm = ({
  const { pubKey, pubKeys: _pubKeys } = useVegaWallet();
  const [approveNotificationIntent, setApproveNotificationIntent] =
    useState<Intent>(Intent.Warning);
-  const [persistedDeposit] = usePersistentDeposit(selectedAsset?.id);
-
  const {
    register,
    handleSubmit,
@@ -98,8 +95,7 @@ export const DepositForm = ({
  } = useForm<FormFields>({
    defaultValues: {
      to: pubKey ? pubKey : undefined,
-      asset: selectedAsset?.id,
-      amount: persistedDeposit.amount,
+      asset: selectedAsset?.id || '',
    },
  });

@@ -337,9 +333,6 @@ export const DepositForm = ({
                  return maxSafe(balances?.balance || new BigNumber(0))(v);
                },
              },
-              onChange: (e: ChangeEvent<HTMLInputElement>) => {
-                handleAmountChange(e.target.value || '');
-              },
            })}
          />
          {errors.amount?.message && (
@@ -350,9 +343,10 @@ export const DepositForm = ({
          {selectedAsset && balances && (
            <UseButton
              onClick={() => {
-                const amount = balances.balance.toFixed(selectedAsset.decimals);
-                setValue('amount', amount);
-                handleAmountChange(amount);
+                setValue(
+                  'amount',
+                  balances.balance.toFixed(selectedAsset.decimals)
+                );
                clearErrors('amount');
              }}
            >
@@ -5,7 +5,7 @@ import { prepend0x } from '@vegaprotocol/smart-contracts';
 import sortBy from 'lodash/sortBy';
 import { useSubmitApproval } from './use-submit-approval';
 import { useSubmitFaucet } from './use-submit-faucet';
-import { useCallback, useState } from 'react';
+import { useState } from 'react';
 import { useDepositBalances } from './use-deposit-balances';
 import { useDepositDialog } from './deposit-dialog';
 import type { Asset } from '@vegaprotocol/assets';
@@ -14,7 +14,6 @@ import {
  useBridgeContract,
  useEthereumConfig,
 } from '@vegaprotocol/web3';
-import { usePersistentDeposit } from './use-persistent-deposit';

 interface DepositManagerProps {
  assetId?: string;
@@ -29,9 +28,7 @@ export const DepositManager = ({
 }: DepositManagerProps) => {
  const createEthTransaction = useEthTransactionStore((state) => state.create);
  const { config } = useEthereumConfig();
-  const [persistentDeposit, savePersistentDeposit] =
-    usePersistentDeposit(initialAssetId);
-  const [assetId, setAssetId] = useState(persistentDeposit?.assetId);
+  const [assetId, setAssetId] = useState(initialAssetId);
  const asset = assets.find((a) => a.id === assetId);
  const bridgeContract = useBridgeContract();
  const closeDepositDialog = useDepositDialog((state) => state.close);
@@ -68,26 +65,17 @@ export const DepositManager = ({
    closeDepositDialog();
  };

-  const onAmountChange = useCallback(
-    (amount: string) => {
-      savePersistentDeposit({ ...persistentDeposit, amount });
-    },
-    [savePersistentDeposit, persistentDeposit]
-  );
-
  return (
    <DepositForm
      selectedAsset={asset}
      onDisconnect={reset}
      onSelectAsset={(id) => {
        setAssetId(id);
-        savePersistentDeposit({ assetId: id });
        // When we change asset, also clear the tracked faucet/approve transactions so
        // we dont render stale UI
        approve.reset();
        faucet.reset();
      }}
-      handleAmountChange={onAmountChange}
      assets={sortBy(assets, 'name')}
      submitApprove={approve.perform}
      submitDeposit={submitDeposit}
@@ -1,21 +0,0 @@
-import { renderHook, waitFor, act } from '@testing-library/react';
-import { usePersistentDeposit } from './use-persistent-deposit';
-
-describe('usePersistenDeposit', () => {
-  it('should return empty data', () => {
-    const { result } = renderHook(() => usePersistentDeposit());
-    expect(result.current).toEqual([{ assetId: '' }, expect.any(Function)]);
-  });
-  it('should return empty and properly saved data', async () => {
-    const aId = 'test';
-    const retObj = { assetId: 'test', amount: '1.00000' };
-    const { result } = renderHook(() => usePersistentDeposit(aId));
-    expect(result.current).toEqual([{ assetId: 'test' }, expect.any(Function)]);
-    await act(() => {
-      result.current[1](retObj);
-    });
-    await waitFor(() => {
-      expect(result.current[0]).toEqual(retObj);
-    });
-  });
-});
@@ -1,42 +0,0 @@
-import { useMemo } from 'react';
-import { create } from 'zustand';
-import { persist } from 'zustand/middleware';
-import { immer } from 'zustand/middleware/immer';
-
-const STORAGE_KEY = 'vega_deposit_store';
-interface PersistedDeposit {
-  assetId: string;
-  amount?: string;
-}
-type PersistedDepositData = Record<string, PersistedDeposit>;
-
-const usePersistentDepositStore = create<{
-  deposits: PersistedDepositData;
-  saveValue: (entry: PersistedDeposit) => void;
-  lastVisited?: PersistedDeposit;
-}>()(
-  persist(
-    immer((set) => ({
-      deposits: {},
-      saveValue: (entry) =>
-        set((state) => {
-          const oldValue = state.deposits[entry.assetId] || null;
-          state.deposits[entry.assetId] = { ...oldValue, ...entry };
-          state.lastVisited = { ...oldValue, ...entry };
-          return state;
-        }),
-    })),
-    { name: STORAGE_KEY }
-  )
-);
-
-export const usePersistentDeposit = (
-  assetId?: string
-): [PersistedDeposit, (entry: PersistedDeposit) => void] => {
-  const { deposits, lastVisited, saveValue } = usePersistentDepositStore();
-  const discoveredData = useMemo(() => {
-    return deposits[assetId || ''] || lastVisited || { assetId: assetId || '' };
-  }, [deposits, lastVisited, assetId]);
-
-  return [discoveredData, saveValue];
-};
@@ -11,13 +11,12 @@ import {
  AgGridDynamic as AgGrid,
  PriceFlashCell,
  MarketNameCell,
-  SetFilter,
 } from '@vegaprotocol/datagrid';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import { AgGridColumn } from 'ag-grid-react';
 import type { AgGridReact } from 'ag-grid-react';
 import * as Schema from '@vegaprotocol/types';
-import type { MarketMaybeWithData } from '../../';
+import type { MarketMaybeWithData, MarketFieldsFragment } from '../../';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';

 const { MarketTradingMode, AuctionTrigger } = Schema;
@@ -34,6 +33,7 @@ export const MarketListTable = forwardRef<
  return (
    <AgGrid
      style={{ width: '100%', height: '100%' }}
+      overlayNoRowsTemplate={t('No markets')}
      getRowId={getRowId}
      ref={ref}
      defaultColDef={{
@@ -43,7 +43,7 @@ export const MarketListTable = forwardRef<
        filter: true,
        filterParams: { buttons: ['reset'] },
      }}
-      suppressCellFocus
+      suppressCellFocus={true}
      components={{ PriceFlashCell, MarketNameCell }}
      {...props}
    >
@@ -59,11 +59,11 @@ export const MarketListTable = forwardRef<
      />
      <AgGridColumn
        headerName={t('Trading mode')}
-        field="tradingMode"
+        field="data"
        minWidth={170}
-        valueFormatter={({
+        valueGetter={({
          data,
-        }: VegaValueFormatterParams<MarketMaybeWithData, 'data'>) => {
+        }: VegaValueGetterParams<MarketMaybeWithData, 'data'>) => {
          if (!data?.data) return undefined;
          const { trigger } = data.data;
          const { tradingMode } = data;
@@ -75,22 +75,14 @@ export const MarketListTable = forwardRef<
            - ${Schema.AuctionTriggerMapping[trigger]}`
            : Schema.MarketTradingModeMapping[tradingMode];
        }}
-        filter={SetFilter}
-        filterParams={{
-          set: Schema.MarketTradingModeMapping,
-        }}
      />
      <AgGridColumn
        headerName={t('Status')}
        field="state"
-        valueFormatter={({
+        valueGetter={({
          data,
-        }: VegaValueFormatterParams<MarketMaybeWithData, 'state'>) => {
-          return data?.state ? Schema.MarketStateMapping[data.state] : '-';
-        }}
-        filter={SetFilter}
-        filterParams={{
-          set: Schema.MarketStateMapping,
+        }: VegaValueGetterParams<MarketFieldsFragment, 'state'>) => {
+          return data?.state ? Schema.MarketStateMapping[data?.state] : '-';
        }}
      />
      <AgGridColumn
@@ -1,6 +1,4 @@
 import type { MouseEvent } from 'react';
-import { useCallback, useEffect, useRef, useState } from 'react';
-import type { AgGridReact } from 'ag-grid-react';
 import { t } from '@vegaprotocol/i18n';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { MarketListTable } from './market-list-table';
@@ -14,24 +12,15 @@ interface MarketsContainerProps {
 }

 export const MarketsContainer = ({ onSelect }: MarketsContainerProps) => {
-  const gridRef = useRef<AgGridReact | null>(null);
-  const [dataCount, setDataCount] = useState(0);
  const { data, error, loading, reload } = useDataProvider({
    dataProvider,
    skipUpdates: true,
    variables: undefined,
  });
-  useEffect(() => {
-    setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
-  }, [data]);
-  const onFilterChanged = useCallback(() => {
-    setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
-  }, []);
  return (
    <div className="h-full relative">
      <MarketListTable
-        ref={gridRef}
-        rowData={data}
+        rowData={error ? [] : data}
        suppressLoadingOverlay
        suppressNoRowsOverlay
        onCellClicked={(cellEvent: CellClickedEvent) => {
@@ -51,7 +40,6 @@ export const MarketsContainer = ({ onSelect }: MarketsContainerProps) => {
          );
        }}
        onMarketClick={onSelect}
-        onFilterChanged={onFilterChanged}
      />
      <div className="pointer-events-none absolute inset-0">
        <AsyncRenderer
@@ -59,7 +47,6 @@ export const MarketsContainer = ({ onSelect }: MarketsContainerProps) => {
          error={error}
          data={data}
          noDataMessage={t('No markets')}
-          noDataCondition={() => !dataCount}
          reload={reload}
        />
      </div>
@@ -91,6 +91,6 @@ describe('ProposalsList', () => {
    await waitFor(() => {
      expect(container).toBeInTheDocument();
    });
-    expect(screen.getByText('No markets')).toBeInTheDocument();
+    expect(screen.getByText('No Rows To Show')).toBeInTheDocument();
  });
 });
@@ -1,21 +1,13 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
-import { t } from '@vegaprotocol/i18n';
 import * as Types from '@vegaprotocol/types';
 import { proposalsDataProvider } from '../proposals-data-provider';
+import { useCallback, useRef } from 'react';
 import type { AgGridReact } from 'ag-grid-react';
 import { useColumnDefs } from './use-column-defs';
 import type { ProposalListFieldsFragment } from '../proposals-data-provider/__generated__/Proposals';

-// prevent cutting filter windows by auto-height layout
-const CUSTOM_GRID_STYLES = `
-  .ag-layout-auto-height {
-    min-height: 200px !important;
-  }
-`;
-
 export const getNewMarketProposals = (data: ProposalListFieldsFragment[]) =>
  data.filter((proposal) =>
    [
@@ -27,7 +19,6 @@ export const getNewMarketProposals = (data: ProposalListFieldsFragment[]) =>

 export const ProposalsList = () => {
  const gridRef = useRef<AgGridReact | null>(null);
-  const [dataCount, setDataCount] = useState(0);
  const handleOnGridReady = useCallback(() => {
    gridRef.current?.api?.sizeColumnsToFit();
  }, [gridRef]);
@@ -39,37 +30,22 @@ export const ProposalsList = () => {
  });
  const filteredData = getNewMarketProposals(data || []);
  const { columnDefs, defaultColDef } = useColumnDefs();
-  useEffect(() => {
-    setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
-  }, [filteredData]);
-  const onFilterChanged = useCallback(() => {
-    setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
-  }, []);
  return (
-    <div className="relative">
+    <AsyncRenderer
+      loading={loading}
+      error={error}
+      data={filteredData}
+      reload={reload}
+    >
      <AgGrid
        ref={gridRef}
-        className="w-full h-full"
        domLayout="autoHeight"
+        className="min-w-full"
        columnDefs={columnDefs}
        rowData={filteredData}
        defaultColDef={defaultColDef}
        onGridReady={handleOnGridReady}
-        suppressLoadingOverlay
-        suppressNoRowsOverlay
-        onFilterChanged={onFilterChanged}
-        customThemeParams={CUSTOM_GRID_STYLES}
      />
-      <div className="pointer-events-none absolute inset-0">
-        <AsyncRenderer
-          loading={loading}
-          error={error}
-          data={filteredData}
-          noDataMessage={t('No markets')}
-          noDataCondition={() => !dataCount}
-          reload={reload}
-        />
-      </div>
-    </div>
+    </AsyncRenderer>
  );
 };
@@ -1,7 +1,6 @@
 import { useMemo } from 'react';
 import BigNumber from 'bignumber.js';
 import type { ColDef } from 'ag-grid-community';
-import { DateRangeFilter, SetFilter } from '@vegaprotocol/datagrid';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
@@ -74,10 +73,6 @@ export const useColumnDefs = () => {
          value,
        }: VegaValueFormatterParams<ProposalListFieldsFragment, 'state'>) =>
          value ? ProposalStateMapping[value] : '-',
-        filter: SetFilter,
-        filterParams: {
-          set: ProposalStateMapping,
-        },
      },
      {
        colId: 'voting',
@@ -104,7 +99,6 @@ export const useColumnDefs = () => {
          }
          return '-';
        },
-        filter: false,
      },
      {
        colId: 'closing-date',
@@ -116,7 +110,6 @@ export const useColumnDefs = () => {
          ProposalListFieldsFragment,
          'terms.closingDatetime'
        >) => (value ? getDateTimeFormat().format(new Date(value)) : '-'),
-        filter: DateRangeFilter,
      },
      {
        colId: 'enactment-date',
@@ -128,18 +121,13 @@ export const useColumnDefs = () => {
          ProposalListFieldsFragment,
          'terms.enactmentDatetime'
        >) => (value ? getDateTimeFormat().format(new Date(value)) : '-'),
-        filter: DateRangeFilter,
      },
    ];
  }, [VEGA_TOKEN_URL, requiredMajorityPercentage]);
  const defaultColDef: ColDef = useMemo(() => {
    return {
-      sortable: true,
+      sortable: false,
      cellClass: cellCss,
-      flex: 1,
-      resizable: true,
-      filter: true,
-      filterParams: { buttons: ['reset'] },
    };
  }, []);
  return useMemo(
@@ -1,7 +1,6 @@
 import { ethers } from 'ethers';
 import { hexlify } from 'ethers/lib/utils';
 import abi from '../abis/claim_abi.json';
-import { calcGasBuffer } from '../utils';

 export const UNSPENT_CODE = '0x0000000000000000000000000000000000000000';
 export const SPENT_CODE = '0x0000000000000000000000000000000000000001';
@@ -43,7 +42,7 @@ export class Claim {
   * was performed and mined beforehand
   * @return {Promise<boolean>}
   */
-  public async claim({
+  public claim({
    amount,
    tranche,
    expiry,
@@ -62,20 +61,20 @@ export class Claim {
    r: string;
    s: string;
  }): Promise<ethers.ContractTransaction> {
-    const method = target != null ? 'claim_targeted' : 'claim_untargeted';
-    const args = [
-      { r, s, v },
-      {
-        amount,
-        tranche,
-        expiry,
-      },
-      hexlify(country),
-      target,
-    ].filter(Boolean);
-    const res = await this.contract.estimateGas[method](...args);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract[method](...args, { gasLimit });
+    return this.contract[
+      target != null ? 'claim_targeted' : 'claim_untargeted'
+    ](
+      ...[
+        { r, s, v },
+        {
+          amount,
+          tranche,
+          expiry,
+        },
+        hexlify(country),
+        target,
+      ].filter(Boolean)
+    );
  }

  /**
@@ -1,7 +1,6 @@
 import type { BigNumber } from 'ethers';
 import { ethers } from 'ethers';
 import abi from '../abis/erc20_bridge_abi.json';
-import { calcGasBuffer } from '../utils';

 export class CollateralBridge {
  public contract: ethers.Contract;
@@ -14,20 +13,8 @@ export class CollateralBridge {
    this.contract = new ethers.Contract(address, abi, signerOrProvider);
  }

-  async deposit_asset(
-    assetSource: string,
-    amount: string,
-    vegaPublicKey: string
-  ) {
-    const res = await this.contract.estimateGas.deposit_asset(
-      assetSource,
-      amount,
-      vegaPublicKey
-    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.deposit_asset(assetSource, amount, vegaPublicKey, {
-      gasLimit,
-    });
+  deposit_asset(assetSource: string, amount: string, vegaPublicKey: string) {
+    return this.contract.deposit_asset(assetSource, amount, vegaPublicKey);
  }
  get_asset_source(vegaAssetId: string) {
    return this.contract.get_asset_source(vegaAssetId);
@@ -50,7 +37,7 @@ export class CollateralBridge {
  default_withdraw_delay() {
    return this.contract.default_withdraw_delay();
  }
-  async list_asset(
+  list_asset(
    address: string,
    vegaAssetId: string,
    lifetimeLimit: string,
@@ -58,7 +45,7 @@ export class CollateralBridge {
    nonce: string,
    signatures: string
  ) {
-    const res = await this.contract.estimateGas.list_asset(
+    return this.contract.list_asset(
      address,
      vegaAssetId,
      lifetimeLimit,
@@ -66,20 +53,8 @@ export class CollateralBridge {
      nonce,
      signatures
    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.list_asset(
-      address,
-      vegaAssetId,
-      lifetimeLimit,
-      withdraw_threshold,
-      nonce,
-      signatures,
-      {
-        gasLimit,
-      }
-    );
  }
-  async withdraw_asset(
+  withdraw_asset(
    assetSource: string,
    amount: string,
    target: string,
@@ -87,25 +62,13 @@ export class CollateralBridge {
    nonce: string,
    signatures: string
  ) {
-    const res = await this.contract.estimateGas.withdraw_asset(
-      assetSource,
-      amount,
-      target,
-      creation,
-      nonce,
-      signatures
-    );
-    const gasLimit = calcGasBuffer(res);
    return this.contract.withdraw_asset(
      assetSource,
      amount,
      target,
      creation,
      nonce,
-      signatures,
-      {
-        gasLimit,
-      }
+      signatures
    );
  }

@@ -1,6 +1,5 @@
 import { ethers } from 'ethers';
 import abi from '../abis/multisig_abi.json';
-import { calcGasBuffer } from '../utils';

 export class MultisigControl {
  public contract: ethers.Contract;
@@ -14,20 +13,12 @@ export class MultisigControl {
    this.address = address;
  }

-  async add_signer(newSigner: string, nonce: string, signatures: string) {
-    const res = await this.contract.estimateGas.add_signer(
-      newSigner,
-      nonce,
-      signatures
-    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.add_signer(newSigner, nonce, signatures, { gasLimit });
+  add_signer(newSigner: string, nonce: string, signatures: string) {
+    return this.contract.add_signer(newSigner, nonce, signatures);
  }

-  async burn_nonce(nonce: string, signatures: string) {
-    const res = await this.contract.estimateGas.burn_nonce(nonce, signatures);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.burn_nonce(nonce, signatures, { gasLimit });
+  burn_nonce(nonce: string, signatures: string) {
+    return this.contract.burn_nonce(nonce, signatures);
  }

  get_current_threshold() {
@@ -46,43 +37,19 @@ export class MultisigControl {
    return this.contract.is_valid_signer(signerAddress);
  }

-  async remove_signer(oldSigner: string, nonce: string, signatures: string) {
-    const res = await this.contract.estimateGas.remove_signer(
-      oldSigner,
-      nonce,
-      signatures
-    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.remove_signer(oldSigner, nonce, signatures, {
-      gasLimit,
-    });
+  remove_signer(oldSigner: string, nonce: string, signatures: string) {
+    return this.contract.remove_signer(oldSigner, nonce, signatures);
  }

-  async set_threshold(newThreshold: string, nonce: string, signatures: string) {
-    const res = await this.contract.estimateGas.set_threshold(
-      newThreshold,
-      nonce,
-      signatures
-    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.set_threshold(newThreshold, nonce, signatures, {
-      gasLimit,
-    });
+  set_threshold(newThreshold: string, nonce: string, signatures: string) {
+    return this.contract.set_threshold(newThreshold, nonce, signatures);
  }

  signers(address: string) {
    return this.contract.signers(address);
  }

-  async verify_signatures(nonce: string, message: string, signatures: string) {
-    const res = await this.contract.estimateGas.verify_signatures(
-      nonce,
-      message,
-      signatures
-    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.verify_signatures(nonce, message, signatures, {
-      gasLimit,
-    });
+  verify_signatures(nonce: string, message: string, signatures: string) {
+    return this.contract.verify_signatures(nonce, message, signatures);
  }
 }
@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import abi from '../abis/staking_abi.json';
-import { calcGasBuffer, prepend0x } from '../utils';
+import { prepend0x } from '../utils';

 export class StakingBridge {
  public contract: ethers.Contract;
@@ -13,41 +13,20 @@ export class StakingBridge {
    this.contract = new ethers.Contract(address, abi, signerOrProvider);
    this.address = address;
  }
-  async stake(amount: string, vegaPublicKey: string) {
-    const key = prepend0x(vegaPublicKey);
-    const res = await this.contract.estimateGas.stake(amount, key);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.stake(amount, key, {
-      gasLimit,
-    });
-  }

-  async remove_stake(amount: string, vegaPublicKey: string) {
-    const key = prepend0x(vegaPublicKey);
-    const res = await this.contract.estimateGas.remove_stake(amount, key);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.remove_stake(amount, key, {
-      gasLimit,
-    });
+  stake(amount: string, vegaPublicKey: string) {
+    return this.contract.stake(amount, prepend0x(vegaPublicKey));
  }
-
-  async transfer_stake(
-    amount: string,
-    newAddress: string,
-    vegaPublicKey: string
-  ) {
-    const key = prepend0x(vegaPublicKey);
-    const res = await this.contract.estimateGas.transfer_stake(
+  remove_stake(amount: string, vegaPublicKey: string) {
+    return this.contract.remove_stake(amount, prepend0x(vegaPublicKey));
+  }
+  transfer_stake(amount: string, newAddress: string, vegaPublicKey: string) {
+    return this.contract.transfer_stake(
      amount,
      newAddress,
-      key
+      prepend0x(vegaPublicKey)
    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.transfer_stake(amount, newAddress, key, {
-      gasLimit,
-    });
  }
-
  staking_token() {
    return this.contract.staking_token();
  }
@@ -1,7 +1,6 @@
 import type { BigNumber } from 'ethers';
 import { ethers } from 'ethers';
 import erc20AbiFaucetable from '../abis/erc20_abi_faucet.json';
-import { calcGasBuffer } from '../utils';

 export class TokenFaucetable {
  public contract: ethers.Contract;
@@ -28,17 +27,13 @@ export class TokenFaucetable {
  allowance(owner: string, spender: string): Promise<BigNumber> {
    return this.contract.allowance(owner, spender);
  }
-  async approve(spender: string, amount: string) {
-    const res = await this.contract.estimateGas.approve(spender, amount);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.approve(spender, amount, { gasLimit });
+  approve(spender: string, amount: string) {
+    return this.contract.approve(spender, amount);
  }
  decimals(): Promise<number> {
    return this.contract.decimals();
  }
-  async faucet() {
-    const res = await this.contract.estimateGas.faucet();
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.faucet({ gasLimit });
+  faucet() {
+    return this.contract.faucet();
  }
 }
@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import abi from '../abis/vesting_abi.json';
-import { calcGasBuffer, prepend0x } from '../utils';
+import { prepend0x } from '../utils';

 export class TokenVesting {
  public contract: ethers.Contract;
@@ -13,21 +13,12 @@ export class TokenVesting {
    this.contract = new ethers.Contract(address, abi, signerOrProvider);
    this.address = address;
  }
-  async stake_tokens(amount: string, vegaPublicKey: string) {
-    const key = prepend0x(vegaPublicKey);
-    const res = await this.contract.estimateGas.stake_tokens(amount, key);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.stake_tokens(amount, key, {
-      gasLimit,
-    });
+
+  stake_tokens(amount: string, vegaPublicKey: string) {
+    return this.contract.stake_tokens(amount, prepend0x(vegaPublicKey));
  }
-  async remove_stake(amount: string, vegaPublicKey: string) {
-    const key = prepend0x(vegaPublicKey);
-    const res = await this.contract.estimateGas.remove_stake(amount, key);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.remove_stake(amount, key, {
-      gasLimit,
-    });
+  remove_stake(amount: string, vegaPublicKey: string) {
+    return this.contract.remove_stake(amount, prepend0x(vegaPublicKey));
  }
  stake_balance(address: string, vegaPublicKey: string) {
    return this.contract.stake_balance(address, prepend0x(vegaPublicKey));
@@ -47,13 +38,7 @@ export class TokenVesting {
  user_total_all_tranches(address: string) {
    return this.contract.user_total_all_tranches(address);
  }
-  async withdraw_from_tranche(trancheId: number) {
-    const res = await this.contract.estimateGas.withdraw_from_tranche(
-      trancheId
-    );
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.withdraw_from_tranche(trancheId, {
-      gasLimit,
-    });
+  withdraw_from_tranche(trancheId: number) {
+    return this.contract.withdraw_from_tranche(trancheId);
  }
 }
@@ -1,7 +1,6 @@
 import type { BigNumber } from 'ethers';
 import { ethers } from 'ethers';
 import erc20Abi from '../abis/erc20_abi.json';
-import { calcGasBuffer } from '../utils';

 export class Token {
  public contract: ethers.Contract;
@@ -24,15 +23,13 @@ export class Token {
  allowance(owner: string, spender: string): Promise<BigNumber> {
    return this.contract.allowance(owner, spender);
  }
-  async approve(spender: string, amount: string) {
-    const res = await this.contract.estimateGas.approve(spender, amount);
-    const gasLimit = calcGasBuffer(res);
-    return this.contract.approve(spender, amount, { gasLimit });
+  approve(spender: string, amount: string) {
+    return this.contract.approve(spender, amount);
  }
  decimals(): Promise<number> {
    return this.contract.decimals();
  }
-  async faucet() {
+  faucet() {
    /* No op */
  }
 }
@@ -1,5 +0,0 @@
-import type { BigNumber as EthersBigNumber } from 'ethers';
-
-export function calcGasBuffer(value: EthersBigNumber): EthersBigNumber {
-  return value.mul(120).div(100);
-}
@@ -1,2 +1 @@
-export * from './calc-gas-buffer';
 export * from './prepend-0x';
@@ -3,7 +3,6 @@
 */

 export const createDocsLinks = (docsUrl: string) => ({
-  NEW_TO_VEGA: `${docsUrl}/concepts/new-to-vega`,
  AUCTION_TYPE_OPENING: `${docsUrl}/concepts/trading-on-vega/trading-modes#auction-type-opening`,
  AUCTION_TYPE_LIQUIDITY_MONITORING: `${docsUrl}/concepts/trading-on-vega/trading-modes#auction-type-liquidity-monitoring`,
  AUCTION_TYPE_PRICE_MONITORING: `${docsUrl}/concepts/trading-on-vega/trading-modes#auction-type-price-monitoring`,
@@ -15,7 +14,6 @@ export const createDocsLinks = (docsUrl: string) => ({
  NODE_OPERATORS: `${docsUrl}/node-operators`,
  LOSS_SOCIALIZATION: `${docsUrl}/concepts/trading-on-vega/market-protections#loss-socialisation`,
  POSITION_RESOLUTION: `${docsUrl}/concepts/trading-on-vega/market-protections#position-resolution`,
-  LIQUIDITY: `${docsUrl}/concepts/liquidity/provision`,
 });

 export const ExternalLinks = {
@@ -43,7 +43,7 @@
    "@web3-react/walletconnect": "^8.0.23-beta.0",
    "ag-grid-community": "^27.0.1",
    "ag-grid-react": "^27.0.1",
-    "allotment": "^1.17.1",
+    "allotment": "1.18.1",
    "alpha-lyrae": "vegaprotocol/alpha-lyrae",
    "apollo": "^2.33.9",
    "apollo-link-timeout": "^4.0.0",
@@ -63,14 +63,14 @@
    "js-sha3": "^0.8.0",
    "lodash": "^4.17.21",
    "next": "12.2.3",
-    "pennant": "1.6.0",
+    "pennant": "1.8.1",
    "react": "18.2.0",
    "react-copy-to-clipboard": "^5.0.4",
    "react-dom": "18.2.0",
    "react-hook-form": "^7.27.0",
    "react-i18next": "^11.11.4",
    "react-intersection-observer": "^9.2.2",
-    "react-markdown": "^8.0.5",
+    "react-markdown": "^8.0.6",
    "react-router-dom": "^6.9.0",
    "react-syntax-highlighter": "^15.4.5",
    "react-use-websocket": "^3.0.0",
@@ -8153,13 +8153,13 @@ ajv@^8.0.0, ajv@^8.0.1, ajv@^8.8.0:
    require-from-string "^2.0.2"
    uri-js "^4.2.2"

-allotment@1.17.1, allotment@^1.17.1:
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/allotment/-/allotment-1.17.1.tgz#1a87fe911e520e6028df3740d9ba397c48f8e8d7"
-  integrity sha512-3/blHxKZfP441IZRwoOJaaNfDOx9XtvQQaeRYYrn7xjQWF7ZhYZCfR7oNxudwx2ga21tIskvfytbZF2P/ydE3A==
+allotment@1.18.1:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/allotment/-/allotment-1.18.1.tgz#a31b0cb5b301309334dfa352c7704361437058de"
+  integrity sha512-ZhmpHoSvxHyPT5XjzTHeCBjzCMIFn1aGdNAzBCZhj1CcRMp31CaJCi+lfweoOLDbbjJqbFZqUk3xf+p7Mb0x5A==
  dependencies:
    classnames "^2.3.0"
-    eventemitter3 "^4.0.0"
+    eventemitter3 "^5.0.0"
    lodash.clamp "^4.0.0"
    lodash.debounce "^4.0.0"
    lodash.isequal "^4.5.0"
@@ -9962,6 +9962,11 @@ chownr@^2.0.0:
  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==

+chroma-js@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-2.4.2.tgz#dffc214ed0c11fa8eefca2c36651d8e57cbfb2b0"
+  integrity sha512-U9eDw6+wt7V8z5NncY2jJfZa+hUH8XEj8FQHgFJTrUFnJfXYf4Ml4adI2vXZOjqRDpFWtYVWypDfZwnJ+HIR4A==
+
 chrome-trace-event@^1.0.2:
  version "1.0.3"
  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
@@ -18460,10 +18465,10 @@ pend@~1.2.0:
  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==

-pennant@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.6.0.tgz#9c7d873527defba689439a18f2ff2f9aa5ababea"
-  integrity sha512-0eWZmFNaWMCYHj9C/+KgwFy8sf/dEkR2TilYrkoRgOVgziDFakojHSiNIwFrqYZFXH1HincYwS7PjKFtQkvrRA==
+pennant@1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.8.1.tgz#bb5f8fd2ae78e0e53ff43bea565765bf7e47b255"
+  integrity sha512-kUKRLfM8GdE+RSlS45Rz/QMQ6xorbzAqw/ybOVR/2gVO6L3sY16+vrgVSJd89RbR+sI/foWe5buXwFmjwFR7Kg==
  dependencies:
    "@babel/runtime" "^7.13.10"
    "@d3fc/d3fc-technical-indicator" "^8.0.1"
@@ -18484,7 +18489,8 @@ pennant@1.6.0:
    "@types/react" "^18.0.14"
    "@types/react-dom" "^18.0.5"
    "@types/react-virtualized-auto-sizer" "^1.0.0"
-    allotment "1.17.1"
+    allotment "1.18.1"
+    chroma-js "^2.4.2"
    classnames "^2.2.6"
    d3-array "2.8.0"
    d3-axis "^3.0.0"
@@ -18505,7 +18511,6 @@ pennant@1.6.0:
    lodash "^4.17.20"
    react-virtualized-auto-sizer "^1.0.4"
    sass "^1.49.9"
-    typescript "^4.1.2"
    use-resize-observer "^9.0.0"

 performance-now@^2.1.0:
@@ -19536,10 +19541,10 @@ react-lifecycles-compat@^3.0.4:
  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
  integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==

-react-markdown@^8.0.5:
-  version "8.0.5"
-  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.5.tgz#c9a70a33ca9aeeafb769c6582e7e38843b9d70ad"
-  integrity sha512-jGJolWWmOWAvzf+xMdB9zwStViODyyFQhNB/bwCerbBKmrTmgmA599CGiOlP58OId1IMoIRsA8UdI1Lod4zb5A==
+react-markdown@^8.0.6:
+  version "8.0.7"
+  resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-8.0.7.tgz#c8dbd1b9ba5f1c5e7e5f2a44de465a3caafdf89b"
+  integrity sha512-bvWbzG4MtOU62XqBx3Xx+zB2raaFFsq4mYiAzfjXJMEz2sixgeAfraA3tvzULF02ZdOMUOKTBFFaZJDDrq+BJQ==
  dependencies:
    "@types/hast" "^2.0.0"
    "@types/prop-types" "^15.0.0"
@@ -22304,11 +22309,6 @@ typescript@4.7.4:
  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
  integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==

-typescript@^4.1.2:
-  version "4.9.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.4.tgz#a2a3d2756c079abda241d75f149df9d561091e78"
-  integrity sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==
-
 typescript@^4.4.3:
  version "4.8.4"
  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6"
Author	SHA1	Message	Date
Madalina Raicu	c69400feda	fix: charts in testnet	2023-04-18 13:36:40 +03:00
Madalina Raicu	3e92bb92be	Merge branch 'release/testnet' of github.com:vegaprotocol/frontend-monorepo into release/testnet	2023-04-18 12:57:16 +03:00