feat(3548): ensure the data node urls in the monorepo are valid

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

.github/workflows/cypress-run.yml

@@ -91,7 +91,11 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: ${{ failure() }}
         with:
-          name: test-report-and-logs-${{ matrix.project }}
-          path: |
-            /home/runner/.vegacapsule/testnet/logs
-            frontend-monorepo/apps/trading-e2e/cypress/reports
+          name: logs-${{ matrix.project }}
+          path: /home/runner/.vegacapsule/testnet/logs
+
+      - uses: actions/upload-artifact@v3
+        if: ${{ failure() }}
+        with:
+          name: test-report-${{ matrix.project }}
+          path: frontend-monorepo/apps/trading-e2e/cypress/reports

README.md

@@ -72,7 +72,7 @@ Run `nx serve my-app` for a dev server. Navigate to the port specified in `app/<
 In order to generate the schemas for your GraphQL queries, you can run `GRAPHQL_SCHEMA_PATH=[YOUR SCHEMA FILE / API URL HERE] nx run types:generate`.
 
 ```bash
-export  GRAPHQL_SCHEMA_PATH=https://api.n11.testnet.vega.xyz/graphql
+export  GRAPHQL_SCHEMA_PATH=https://api.n07.testnet.vega.xyz/graphql
 yarn nx run types:generate
 ```
 

apps/explorer-e2e/.env.testnet

@@ -2,7 +2,7 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://tm.n07.testnet.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://lb.testnet.vega.xyz/tm/websocket
-NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
 

apps/governance-e2e/.env.testnet

@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
-NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io

apps/governance-e2e/src/integration/view/wallet-vega.cy.ts

@@ -334,11 +334,8 @@ context(
                 .parent()
                 .siblings()
                 .invoke('text')
-                .should('have.length.above', 3)
-                .then((el) => {
-                  const value = parseFloat(el);
-                  cy.wrap(value).should('be.gte', parseFloat(expectedAmount));
-                });
+                .then(parseFloat)
+                .should('be.gte', parseFloat(expectedAmount));
 
               cy.get(vegaWalletCurrencyTitle)
                 .contains(id)

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

@@ -12,6 +12,7 @@ context(
   { tags: '@smoke' },
   function () {
     before('navigate to withdrawals page', function () {
+      cy.clearAllLocalStorage();
       cy.visit('/');
       navigateTo(navigation.withdraw);
     });

apps/governance-e2e/src/support/staking.functions.ts

@@ -54,6 +54,7 @@ export function stakingValidatorPageRemoveStake(stake: string) {
     .and('contain', `Remove ${stake} $VEGA tokens at the end of epoch`)
     .and('be.visible')
     .click();
+  cy.contains('been removed from validator').should('be.visible');
   closeDialog();
 }
 

apps/governance/.env.testnet

@@ -1,7 +1,7 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n08.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io

apps/governance/src/app.tsx

@@ -3,7 +3,7 @@ import './i18n';
 import React, { useEffect } from 'react';
 import * as Sentry from '@sentry/react';
 import { Integrations } from '@sentry/tracing';
-import { BrowserRouter as Router } from 'react-router-dom';
+import { BrowserRouter as Router, useLocation } from 'react-router-dom';
 import { AppLoader } from './app-loader';
 import { NetworkInfo } from '@vegaprotocol/network-info';
 import { BalanceManager } from './components/balance-manager';
@@ -149,6 +149,20 @@ const Web3Container = ({
   );
 };
 
+const ScrollToTop = () => {
+  const { pathname } = useLocation();
+
+  useEffect(() => {
+    // "document.documentElement.scrollTo" is the magic for React Router Dom v6
+    document.documentElement.scrollTo({
+      top: 0,
+      left: 0,
+    });
+  }, [pathname]);
+
+  return null;
+};
+
 const AppContainer = () => {
   const { config, loading, error } = useEthereumConfig();
   const { VEGA_ENV, GIT_COMMIT_HASH, GIT_BRANCH, ETHEREUM_PROVIDER_URL } =
@@ -183,6 +197,7 @@ const AppContainer = () => {
 
   return (
     <Router>
+      <ScrollToTop />
       <AppStateProvider>
         <div className="grid min-h-full text-white">
           <AsyncRenderer<EthereumConfig | null>

apps/governance/src/routes/staking/home/epoch-data.tsx

@@ -6,6 +6,7 @@ import { usePreviousEpochQuery } from '../__generated__/PreviousEpoch';
 import { ValidatorTables } from './validator-tables';
 import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
 import { useVegaWallet } from '@vegaprotocol/wallet';
+import { ENV } from '../../../config';
 
 export const EpochData = () => {
   // errorPolicy due to vegaprotocol/vega issue 5898
@@ -14,11 +15,23 @@ export const EpochData = () => {
     data: nodesData,
     error: nodesError,
     loading: nodesLoading,
-    refetch,
+    refetch: nodesRefetch,
   } = useNodesQuery();
-  const { data: userStakingData } = useStakingQuery({
+
+  const { delegationsPagination } = ENV;
+  const {
+    data: userStakingData,
+    error: userStakingError,
+    loading: userStakingLoading,
+    refetch: userStakingRefetch,
+  } = useStakingQuery({
     variables: {
       partyId: pubKey || '',
+      delegationsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
     },
   });
   const { data: previousEpochData } = usePreviousEpochQuery({
@@ -28,10 +41,17 @@ export const EpochData = () => {
     skip: !nodesData?.epoch.id,
   });
 
-  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, refetch);
+  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, () => {
+    nodesRefetch();
+    userStakingRefetch();
+  });
 
   return (
-    <AsyncRenderer loading={nodesLoading} error={nodesError} data={nodesData}>
+    <AsyncRenderer
+      loading={nodesLoading || userStakingLoading}
+      error={nodesError || userStakingError}
+      data={nodesData}
+    >
       {nodesData?.epoch &&
         nodesData.epoch.timestamps.start &&
         nodesData?.epoch.timestamps.expiry && (

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

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

apps/governance/src/routes/staking/home/validator-tables/shared.tsx

@@ -59,9 +59,9 @@ export const addUserDataToValidator = (
       : undefined,
     [ValidatorFields.USER_STAKE_SHARE]:
       currentEpochUserStaking && Number(currentEpochUserStaking.amount) > 0
-        ? new BigNumber(currentEpochUserStaking.amount).dividedBy(
-            new BigNumber(currentUserStakeAvailable)
-          )
+        ? new BigNumber(currentEpochUserStaking.amount)
+            .dividedBy(new BigNumber(currentUserStakeAvailable))
+            .times(100)
         : undefined,
   };
 };

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

@@ -26,7 +26,11 @@ import {
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
 import type { ValidatorsTableProps } from './shared';
-import { formatNumber, toBigNum } from '@vegaprotocol/utils';
+import {
+  formatNumber,
+  formatNumberPercentage,
+  toBigNum,
+} from '@vegaprotocol/utils';
 
 interface StandbyPendingValidatorsTableProps extends ValidatorsTableProps {
   stakeNeededForPromotion: string | undefined;
@@ -163,7 +167,7 @@ export const StandbyPendingValidatorsTable = ({
               : undefined,
             [ValidatorFields.PENDING_USER_STAKE]: pendingUserStake,
             [ValidatorFields.USER_STAKE_SHARE]: userStakeShare
-              ? stakedTotalPercentage(userStakeShare)
+              ? formatNumberPercentage(new BigNumber(userStakeShare))
               : undefined,
           };
         }

apps/liquidity-provision-dashboard/.env

@@ -19,7 +19,7 @@ NX_DEPLOY_URL=$DEPLOY_URL
 NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_ENV = 'TESTNET'
-NX_VEGA_URL="https://api.n11.testnet.vega.xyz/graphql"
+NX_VEGA_URL="https://api.n07.testnet.vega.xyz/graphql"
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io

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

@@ -1,6 +1,6 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"}
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8

apps/multisig-signer/.env.testnet

@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n09.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=TESTNET

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

@@ -1,17 +1,3 @@
 {
-  "hosts": [
-    "https://vega-data-graphql.chorus.one/query",
-    "https://vega.xprv.io/datanode/query",
-    "http://nala.mainnet.vega.community:3008/query",
-    "http://commodum.mainnet.vega.community:3008/query",
-    "http://lovali.mainnet.vega.community:3008/query",
-    "http://b-harvest.mainnet.vega.community:3008/query",
-    "http://staking-facilities.mainnet.vega.community:3008/query",
-    "http://figment.mainnet.vega.community:3008/query",
-    "http://nodes-guru.mainnet.vega.community:3008/query",
-    "http://p2p.mainnet.vega.community:3008/query",
-    "http://rockaway.mainnet.vega.community:3008/query",
-    "http://greenfield-one.mainnet.vega.community:3008/query",
-    "http://ryabina.mainnet.vega.community:3008/query"
-  ]
+  "hosts": ["https://vega.xprv.io/datanode/query"]
 }

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

@@ -36,10 +36,40 @@
     "tranche_id": 56,
     "tranche_start": "2023-04-20T00:00:00.000Z",
     "tranche_end": "2023-05-20T00:00:00.000Z",
-    "total_added": "15761.125",
-    "total_removed": "0",
-    "locked_amount": "14969.1223880690592062625",
+    "total_added": "19242.125",
+    "total_removed": "202.093666077975",
+    "locked_amount": "15230.0528535879635331",
     "deposits": [
+      {
+        "amount": "188",
+        "user": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
+        "tx": "0xefa5cb034a994bd2cf2b100b1ecca1877038e7b1188fab4ebf2065cb165027e4"
+      },
+      {
+        "amount": "50",
+        "user": "0xAc1c2783d64c29CDB79608f5B66a37Fd1ea35dD6",
+        "tx": "0xc1ede6de1653f205e0a743f609835648a67287a271a994cd141911ce13d5cac7"
+      },
+      {
+        "amount": "1207.5",
+        "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+        "tx": "0x9092eaf46d5cdba3b2219aa7187da4e1623004434c33a915956aa45d04d561f2"
+      },
+      {
+        "amount": "690",
+        "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95",
+        "tx": "0xa717d720df95537c07c8f24591d49fb35d2b2d935ec25da4b23a0819a78b499d"
+      },
+      {
+        "amount": "914.25",
+        "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
+        "tx": "0xa4b11dd967e1726d3f10d1a8330d3cac2338a93b3f8ea5db2f58a6c653ff8a1f"
+      },
+      {
+        "amount": "431.25",
+        "user": "0x9573BDF7FfC5519912d293e4D1f750eab2E471E7",
+        "tx": "0xcad28318a71f2c8c6f4d505b8c2029c44aa83a249c5428e97110d9c0071ab9e3"
+      },
       {
         "amount": "241.5",
         "user": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
@@ -181,8 +211,111 @@
         "tx": "0x679fcc1c3a29bdc259b6a4c044579a89c5357f42ed1963221669ebf43cc545b0"
       }
     ],
-    "withdrawals": [],
+    "withdrawals": [
+      {
+        "amount": "202.093666077975",
+        "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+        "tx": "0x300c18b4220d3bc357f054792cb65f05d4005912bf8e5d9580b5b830cc3c0845"
+      }
+    ],
     "users": [
+      {
+        "address": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
+        "deposits": [
+          {
+            "amount": "188",
+            "user": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
+            "tranche_id": 56,
+            "tx": "0xefa5cb034a994bd2cf2b100b1ecca1877038e7b1188fab4ebf2065cb165027e4"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "188",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "188"
+      },
+      {
+        "address": "0xAc1c2783d64c29CDB79608f5B66a37Fd1ea35dD6",
+        "deposits": [
+          {
+            "amount": "50",
+            "user": "0xAc1c2783d64c29CDB79608f5B66a37Fd1ea35dD6",
+            "tranche_id": 56,
+            "tx": "0xc1ede6de1653f205e0a743f609835648a67287a271a994cd141911ce13d5cac7"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "50",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "50"
+      },
+      {
+        "address": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+        "deposits": [
+          {
+            "amount": "1207.5",
+            "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+            "tranche_id": 56,
+            "tx": "0x9092eaf46d5cdba3b2219aa7187da4e1623004434c33a915956aa45d04d561f2"
+          }
+        ],
+        "withdrawals": [
+          {
+            "amount": "202.093666077975",
+            "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+            "tranche_id": 56,
+            "tx": "0x300c18b4220d3bc357f054792cb65f05d4005912bf8e5d9580b5b830cc3c0845"
+          }
+        ],
+        "total_tokens": "1207.5",
+        "withdrawn_tokens": "202.093666077975",
+        "remaining_tokens": "1005.406333922025"
+      },
+      {
+        "address": "0x33Ce1D9E53AFb7367E34749517C086405a651a95",
+        "deposits": [
+          {
+            "amount": "690",
+            "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95",
+            "tranche_id": 56,
+            "tx": "0xa717d720df95537c07c8f24591d49fb35d2b2d935ec25da4b23a0819a78b499d"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "690",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "690"
+      },
+      {
+        "address": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
+        "deposits": [
+          {
+            "amount": "914.25",
+            "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
+            "tranche_id": 56,
+            "tx": "0xa4b11dd967e1726d3f10d1a8330d3cac2338a93b3f8ea5db2f58a6c653ff8a1f"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "914.25",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "914.25"
+      },
+      {
+        "address": "0x9573BDF7FfC5519912d293e4D1f750eab2E471E7",
+        "deposits": [
+          {
+            "amount": "431.25",
+            "user": "0x9573BDF7FfC5519912d293e4D1f750eab2E471E7",
+            "tranche_id": 56,
+            "tx": "0xcad28318a71f2c8c6f4d505b8c2029c44aa83a249c5428e97110d9c0071ab9e3"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "431.25",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "431.25"
+      },
       {
         "address": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
         "deposits": [
@@ -664,10 +797,15 @@
     "tranche_id": 54,
     "tranche_start": "2023-04-06T00:00:00.000Z",
     "tranche_end": "2023-05-06T00:00:00.000Z",
-    "total_added": "8865",
-    "total_removed": "490.11243517665",
-    "locked_amount": "4282.530329861111133",
+    "total_added": "8976",
+    "total_removed": "596.64743517951",
+    "locked_amount": "2915.66244444444494976",
     "deposits": [
+      {
+        "amount": "111",
+        "user": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
+        "tx": "0x1229e077f48b796678436bfa8143cea3ae71df58b589ac922be205c4482be235"
+      },
       {
         "amount": "33",
         "user": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
@@ -805,6 +943,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "106.53500000286",
+        "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
+        "tx": "0x4027743264e01043ddb16676c6f7914c110df9e7212bd3f21cb6842614ce238f"
+      },
       {
         "amount": "5.46866782407",
         "user": "0x92A1e98C6f09970e45645Cbe57c6DcaF4547c8FE",
@@ -837,6 +980,21 @@
       }
     ],
     "users": [
+      {
+        "address": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
+        "deposits": [
+          {
+            "amount": "111",
+            "user": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
+            "tranche_id": 54,
+            "tx": "0x1229e077f48b796678436bfa8143cea3ae71df58b589ac922be205c4482be235"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "111",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "111"
+      },
       {
         "address": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
         "deposits": [
@@ -1043,6 +1201,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "106.53500000286",
+            "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
+            "tranche_id": 54,
+            "tx": "0x4027743264e01043ddb16676c6f7914c110df9e7212bd3f21cb6842614ce238f"
+          },
           {
             "amount": "155.03186111556",
             "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -1069,8 +1233,8 @@
           }
         ],
         "total_tokens": "858",
-        "withdrawn_tokens": "424.47530786232",
-        "remaining_tokens": "433.52469213768"
+        "withdrawn_tokens": "531.01030786518",
+        "remaining_tokens": "326.98969213482"
       },
       {
         "address": "0x0bBf7580e036eA5D69ABe679CC90117EeC2e3dc1",
@@ -4418,7 +4582,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "54016.2508690146860439521",
+    "locked_amount": "52888.9651733679574317733",
     "deposits": [
       {
         "amount": "86666.297",
@@ -4484,7 +4648,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "556.215500356125325",
+    "locked_amount": "491.00083943833945",
     "deposits": [
       {
         "amount": "2500",
@@ -4605,7 +4769,7 @@
     "tranche_end": "2023-09-01T00:00:00.000Z",
     "total_added": "17500",
     "total_removed": "0",
-    "locked_amount": "12601.1877579005635",
+    "locked_amount": "12149.6471165458935",
     "deposits": [
       {
         "amount": "12500",
@@ -4871,8 +5035,8 @@
     "tranche_start": "2023-02-01T00:00:00.000Z",
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
-    "total_removed": "12294.731717775",
-    "locked_amount": "21027.44925951504",
+    "total_removed": "12704.026146825",
+    "locked_amount": "20043.824815837935",
     "deposits": [
       {
         "amount": "7500",
@@ -4886,6 +5050,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "164.727209925",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x4dc6eefb43f5b1704894582aa926f0c6ecd94550ac354b7d5b5f49b0f17261fd"
+      },
       {
         "amount": "126.30064455",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -4901,6 +5070,11 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x2c8a0681fe27258861489cd7a891cf213c7ab930d86b1bf08cd54f2f3739a8b5"
       },
+      {
+        "amount": "244.567219125",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x4bc7559edf36b6ecda7656f8066479395ea441daf0ad37ad4324814348e41643"
+      },
       {
         "amount": "158.943370125",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5039,6 +5213,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "164.727209925",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 34,
+            "tx": "0x4dc6eefb43f5b1704894582aa926f0c6ecd94550ac354b7d5b5f49b0f17261fd"
+          },
           {
             "amount": "126.30064455",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5057,6 +5237,12 @@
             "tranche_id": 34,
             "tx": "0x2c8a0681fe27258861489cd7a891cf213c7ab930d86b1bf08cd54f2f3739a8b5"
           },
+          {
+            "amount": "244.567219125",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 34,
+            "tx": "0x4bc7559edf36b6ecda7656f8066479395ea441daf0ad37ad4324814348e41643"
+          },
           {
             "amount": "158.943370125",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5197,8 +5383,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "3059.282439375",
-        "remaining_tokens": "4440.717560625"
+        "withdrawn_tokens": "3468.576868425",
+        "remaining_tokens": "4031.423131575"
       },
       {
         "address": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -5236,7 +5422,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "53966.96783668199177511",
+    "locked_amount": "52840.7106473920320782625",
     "deposits": [
       {
         "amount": "129999.45",
@@ -5269,7 +5455,7 @@
     "tranche_end": "2024-04-01T00:00:00.000Z",
     "total_added": "54144.7663",
     "total_removed": "0",
-    "locked_amount": "51110.95640499238994528285",
+    "locked_amount": "50408.60894204117078453109",
     "deposits": [
       {
         "amount": "54144.7663",
@@ -5302,7 +5488,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "23066.3829464738684",
+    "locked_amount": "22252.132343987824124",
     "deposits": [
       {
         "amount": "10000",
@@ -5495,7 +5681,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "2034.14367706747865",
+    "locked_amount": "1969.1076864535767",
     "deposits": [
       {
         "amount": "5000",
@@ -6035,8 +6221,8 @@
     "tranche_start": "2022-11-01T00:00:00.000Z",
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
-    "total_removed": "6871.43713545",
-    "locked_amount": "1180.005467311232775",
+    "total_removed": "7280.725809525",
+    "locked_amount": "589.830801104973555",
     "deposits": [
       {
         "amount": "7500",
@@ -6050,6 +6236,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "164.727209925",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xa9dd827abcfaa4b289c6bcf5923d455380c1d4f9ce4ce615415a513df60b1ea8"
+      },
       {
         "amount": "126.2948895",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -6065,6 +6256,11 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x15840e283faffb39a5d0e3389137ec92cec3deee7df535a534908ccd7d6b0873"
       },
+      {
+        "amount": "244.56146415",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x00275dfbd06b609e69b430eef7fe04c7bb64314904a0478a0e55b643f7f0bc09"
+      },
       {
         "amount": "158.9433702",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -6258,6 +6454,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "164.727209925",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 33,
+            "tx": "0xa9dd827abcfaa4b289c6bcf5923d455380c1d4f9ce4ce615415a513df60b1ea8"
+          },
           {
             "amount": "126.2948895",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -6276,6 +6478,12 @@
             "tranche_id": 33,
             "tx": "0x15840e283faffb39a5d0e3389137ec92cec3deee7df535a534908ccd7d6b0873"
           },
+          {
+            "amount": "244.56146415",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 33,
+            "tx": "0x00275dfbd06b609e69b430eef7fe04c7bb64314904a0478a0e55b643f7f0bc09"
+          },
           {
             "amount": "158.9433702",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -6494,8 +6702,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "6871.43713545",
-        "remaining_tokens": "628.56286455"
+        "withdrawn_tokens": "7280.725809525",
+        "remaining_tokens": "219.274190475"
       },
       {
         "address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
@@ -6520,7 +6728,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "928642.9598472029154",
-    "locked_amount": "220527.2763130828877571306",
+    "locked_amount": "195294.2435304184652893786",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -40336,7 +40544,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "715655.108029600523393",
-    "locked_amount": "363374.968979732192792259132",
+    "locked_amount": "324600.582801707094573269852",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -41728,8 +41936,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
-    "total_removed": "848861.26613772708802852",
-    "locked_amount": "6588191.8947400391303406883760823381494998",
+    "total_removed": "861351.90789501781835852",
+    "locked_amount": "6450700.41090630502526979382962504965531225",
     "deposits": [
       {
         "amount": "16249.93",
@@ -42233,6 +42441,21 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "10150.87581603206683",
+        "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+        "tx": "0x2ee57ee8a712525955ad807f4d45eeaa5f6388bf0b4fceabc7de6871899f736e"
+      },
+      {
+        "amount": "913.910324501590625",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x455d2e8214a5071fd4de1642939780068d4694cc2a774e7a3ab9283c4d52e847"
+      },
+      {
+        "amount": "972.3599906033915",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x715201656de8957c81817e491e18394abf8bc419d96c86c5106ef3f30d7625e9"
+      },
       {
         "amount": "981.387731774910625",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -42298,6 +42521,11 @@
         "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
         "tx": "0x57c9c9396f67fb377f2d7cca30a1a6e6b73267408efde1239cbfdfd99c333345"
       },
+      {
+        "amount": "453.495626153681375",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xdad160466fa0b4805f3a12ff558d429bf48f81f9b99653dbce172d261861f1d0"
+      },
       {
         "amount": "998.454771147362375",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44336,6 +44564,18 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "913.910324501590625",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x455d2e8214a5071fd4de1642939780068d4694cc2a774e7a3ab9283c4d52e847"
+          },
+          {
+            "amount": "972.3599906033915",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x715201656de8957c81817e491e18394abf8bc419d96c86c5106ef3f30d7625e9"
+          },
           {
             "amount": "981.387731774910625",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44402,6 +44642,12 @@
             "tranche_id": 2,
             "tx": "0xbf3e00aef8ae756fb2f5de5d3eec6f925e9005c7acca1a6c2f88a84ad1e44fba"
           },
+          {
+            "amount": "453.495626153681375",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0xdad160466fa0b4805f3a12ff558d429bf48f81f9b99653dbce172d261861f1d0"
+          },
           {
             "amount": "998.454771147362375",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -45838,8 +46084,8 @@
           }
         ],
         "total_tokens": "259998.8875",
-        "withdrawn_tokens": "151718.26766889616725",
-        "remaining_tokens": "108280.61983110383275"
+        "withdrawn_tokens": "154058.03361015483075",
+        "remaining_tokens": "105940.85388984516925"
       },
       {
         "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -46066,6 +46312,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "10150.87581603206683",
+            "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+            "tranche_id": 2,
+            "tx": "0x2ee57ee8a712525955ad807f4d45eeaa5f6388bf0b4fceabc7de6871899f736e"
+          },
           {
             "amount": "2873.74755113623213",
             "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -46338,8 +46590,8 @@
           }
         ],
         "total_tokens": "150551.801",
-        "withdrawn_tokens": "78415.36940998198906",
-        "remaining_tokens": "72136.43159001801094"
+        "withdrawn_tokens": "88566.24522601405589",
+        "remaining_tokens": "61985.55577398594411"
       },
       {
         "address": "0x4d982Ab0823fD2f48e934a7be2bb0a5374a26148",
@@ -48196,8 +48448,8 @@
     "tranche_start": "2021-11-05T00:00:00.000Z",
     "tranche_end": "2023-05-05T00:00:00.000Z",
     "total_added": "14597706.0446472999",
-    "total_removed": "5846105.097444116645943876",
-    "locked_amount": "360731.4649312677941994769310657454",
+    "total_removed": "5849351.477870348891944626",
+    "locked_amount": "233800.2049473767333067685110206868",
     "deposits": [
       {
         "amount": "129284.449",
@@ -48406,6 +48658,16 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "1257.7360413991436375",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x42fa522871101c2d402faba52603df54599654f29ef5fe1211a9ea058b7eaad9"
+      },
+      {
+        "amount": "1359.59366006838426325",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x4aef9b3e2f51d9ed88eb15f4553ae6f8388122b113571035da8ccb9f25ba68aa"
+      },
       {
         "amount": "1360.32447632896938825",
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -48486,6 +48748,11 @@
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
         "tx": "0x6b1bd1880e5539566cb7110e80ef3e877e3c46a2fcd88798e82211a962dd2b7b"
       },
+      {
+        "amount": "629.0507247647181",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x537a8c34bee648cc1e658c0e55d30202694887899bfcbe529f9cf8284a4e90eb"
+      },
       {
         "amount": "37462.74710421168752574",
         "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
@@ -51701,6 +51968,18 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "1257.7360413991436375",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x42fa522871101c2d402faba52603df54599654f29ef5fe1211a9ea058b7eaad9"
+          },
+          {
+            "amount": "1359.59366006838426325",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x4aef9b3e2f51d9ed88eb15f4553ae6f8388122b113571035da8ccb9f25ba68aa"
+          },
           {
             "amount": "1360.32447632896938825",
             "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -51779,6 +52058,12 @@
             "tranche_id": 3,
             "tx": "0x6b1bd1880e5539566cb7110e80ef3e877e3c46a2fcd88798e82211a962dd2b7b"
           },
+          {
+            "amount": "629.0507247647181",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x537a8c34bee648cc1e658c0e55d30202694887899bfcbe529f9cf8284a4e90eb"
+          },
           {
             "amount": "1383.345213676043696",
             "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -54517,8 +54802,8 @@
           }
         ],
         "total_tokens": "359123.469575",
-        "withdrawn_tokens": "349768.27365466587745625",
-        "remaining_tokens": "9355.19592033412254375"
+        "withdrawn_tokens": "353014.654080898123457",
+        "remaining_tokens": "6108.815494101876543"
       },
       {
         "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -55969,7 +56254,7 @@
     "tranche_start": "2021-10-05T00:00:00.000Z",
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "5778205.3912159303",
-    "total_removed": "3421810.610823310514313769",
+    "total_removed": "3480709.486904665102263769",
     "locked_amount": "0",
     "deposits": [
       {
@@ -56114,6 +56399,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "58898.87608135458795",
+        "user": "0x83b1a48376E045D26420200345414e6b93066396",
+        "tx": "0xeb193da202cd833a574a524eff7f1dd13a0ee8669e51a7db36984ef4d6735fd6"
+      },
       {
         "amount": "219.945520329711288",
         "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
@@ -57631,6 +57921,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "58898.87608135458795",
+            "user": "0x83b1a48376E045D26420200345414e6b93066396",
+            "tranche_id": 4,
+            "tx": "0xeb193da202cd833a574a524eff7f1dd13a0ee8669e51a7db36984ef4d6735fd6"
+          },
           {
             "amount": "66753.39849271259062",
             "user": "0x83b1a48376E045D26420200345414e6b93066396",
@@ -57699,8 +57995,8 @@
           }
         ],
         "total_tokens": "1104995.291",
-        "withdrawn_tokens": "1046096.41491864541205",
-        "remaining_tokens": "58898.87608135458795"
+        "withdrawn_tokens": "1104995.291",
+        "remaining_tokens": "0"
       },
       {
         "address": "0x5565d64f29Ea17355106DF3bA5903Eb793B3e139",
@@ -58152,8 +58448,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
-    "total_removed": "43120.0853616251849",
-    "locked_amount": "57578.840974715197793192974327752",
+    "total_removed": "43542.8634352159416",
+    "locked_amount": "51434.817840966482989342423439868",
     "deposits": [
       {
         "amount": "3000",
@@ -64772,6 +65068,21 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "182.662252664",
+        "user": "0xb1169C6daAc76bAcaf0D8f87641Fc38fbabe569F",
+        "tx": "0xc182a183d124ab4faa413e71faa8c764fc265b4c568a5025ead367fbb86da331"
+      },
+      {
+        "amount": "62.6607306",
+        "user": "0x7345AaA0D0e4C4A46d921fA9323973956F2b7392",
+        "tx": "0xb13444d5ef684a442be6c285a6c38dcbc9959ff2eacc31474531826efe28c20a"
+      },
+      {
+        "amount": "177.4550903267567",
+        "user": "0x1ee93BF13d1D1d876330B011B28c507e392bc5E1",
+        "tx": "0xe4864b2d0f69c08809883553089d90b5a2318c4bc3c95ab5433db46cbd797bae"
+      },
       {
         "amount": "168.502276762",
         "user": "0x38A292CB98Dc602ECAFF94E8E5fADD9800e4bA13",
@@ -83322,6 +83633,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "62.6607306",
+            "user": "0x7345AaA0D0e4C4A46d921fA9323973956F2b7392",
+            "tranche_id": 5,
+            "tx": "0xb13444d5ef684a442be6c285a6c38dcbc9959ff2eacc31474531826efe28c20a"
+          },
           {
             "amount": "152.077625568",
             "user": "0x7345AaA0D0e4C4A46d921fA9323973956F2b7392",
@@ -83378,8 +83695,8 @@
           }
         ],
         "total_tokens": "1200",
-        "withdrawn_tokens": "1002.094025868",
-        "remaining_tokens": "197.905974132"
+        "withdrawn_tokens": "1064.754756468",
+        "remaining_tokens": "135.245243532"
       },
       {
         "address": "0x47181cf36aDFb0b5dB7EfDB123f403D890607841",
@@ -85416,10 +85733,17 @@
             "tx": "0xc8541da6a57f410b6faba47a5e5184bae700193b7bd042914fffc562114d92f5"
           }
         ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "177.4550903267567",
+            "user": "0x1ee93BF13d1D1d876330B011B28c507e392bc5E1",
+            "tranche_id": 5,
+            "tx": "0xe4864b2d0f69c08809883553089d90b5a2318c4bc3c95ab5433db46cbd797bae"
+          }
+        ],
         "total_tokens": "199.19",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "199.19"
+        "withdrawn_tokens": "177.4550903267567",
+        "remaining_tokens": "21.7349096732433"
       },
       {
         "address": "0xEeE68cBdc1cB918087ebf3ea7bce8D326766985B",
@@ -86347,6 +86671,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "182.662252664",
+            "user": "0xb1169C6daAc76bAcaf0D8f87641Fc38fbabe569F",
+            "tranche_id": 5,
+            "tx": "0xc182a183d124ab4faa413e71faa8c764fc265b4c568a5025ead367fbb86da331"
+          },
           {
             "amount": "78.04403856",
             "user": "0xb1169C6daAc76bAcaf0D8f87641Fc38fbabe569F",
@@ -86361,8 +86691,8 @@
           }
         ],
         "total_tokens": "400",
-        "withdrawn_tokens": "171.538952308",
-        "remaining_tokens": "228.461047692"
+        "withdrawn_tokens": "354.201204972",
+        "remaining_tokens": "45.798795028"
       },
       {
         "address": "0xF53D81D9f3A1465df9AD1b12ddDB5cC585D96877",
@@ -87839,7 +88169,7 @@
     "tranche_start": "2021-12-05T00:00:00.000Z",
     "tranche_end": "2022-06-05T00:00:00.000Z",
     "total_added": "171288.42",
-    "total_removed": "69390.5995794947989",
+    "total_removed": "69890.5995794947989",
     "locked_amount": "0",
     "deposits": [
       {
@@ -92079,6 +92409,16 @@
         "user": "0x0715B8bA27dB75F7601A9D8E22c15dcA1487FB70",
         "tx": "0x11c685c41ff0c2d5f1d7fe3b08dc84a7ddb9160764a45bc61b8f39df94729634"
       },
+      {
+        "amount": "250",
+        "user": "0xf8Ec254406f878dA2BEd160730d238524Af3D5F6",
+        "tx": "0xb79fdf2dddc0ac091d7cdc737800683482d24367f18daaf5ab98c703b30bfee5"
+      },
+      {
+        "amount": "250",
+        "user": "0xBD1da3A721510B6d76f5b2C553d31753cc148bEC",
+        "tx": "0x17504994220684f4ba61ec374fdd5b0e4c0e0a9cfb15aa6794338b5a4de9eb68"
+      },
       {
         "amount": "1250",
         "user": "0x9405F540EcC1204801De5C4444D06386BD6693F0",
@@ -99229,10 +99569,17 @@
             "tx": "0x75de6ca47e0da361181d14aceb5d08e572754861465caa67a12b528886d55307"
           }
         ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "250",
+            "user": "0xBD1da3A721510B6d76f5b2C553d31753cc148bEC",
+            "tranche_id": 6,
+            "tx": "0x17504994220684f4ba61ec374fdd5b0e4c0e0a9cfb15aa6794338b5a4de9eb68"
+          }
+        ],
         "total_tokens": "250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "250"
+        "withdrawn_tokens": "250",
+        "remaining_tokens": "0"
       },
       {
         "address": "0x4e8bA6747F20009163e51Ff1b5D3edd3Ef7c6C90",
@@ -99266,10 +99613,17 @@
             "tx": "0x75de6ca47e0da361181d14aceb5d08e572754861465caa67a12b528886d55307"
           }
         ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "250",
+            "user": "0xf8Ec254406f878dA2BEd160730d238524Af3D5F6",
+            "tranche_id": 6,
+            "tx": "0xb79fdf2dddc0ac091d7cdc737800683482d24367f18daaf5ab98c703b30bfee5"
+          }
+        ],
         "total_tokens": "250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "250"
+        "withdrawn_tokens": "250",
+        "remaining_tokens": "0"
       },
       {
         "address": "0xd995e89D6cCB2252388b9BaE0173981b5EfA0817",
@@ -143360,6 +143714,11 @@
         "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
         "tx": "0x11aafa8a2fb510a50d52e5d1e149c5c2027ad2c3dc2d9ef67c18d391c0331c49"
       },
+      {
+        "amount": "0",
+        "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
+        "tx": "0x2e48ba2e6ca4994286e85e57d26b578fb0fd625f44a6fd27202476bb18575a40"
+      },
       {
         "amount": "0",
         "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
@@ -143648,6 +144007,12 @@
             "tranche_id": 9,
             "tx": "0x11aafa8a2fb510a50d52e5d1e149c5c2027ad2c3dc2d9ef67c18d391c0331c49"
           },
+          {
+            "amount": "0",
+            "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
+            "tranche_id": 9,
+            "tx": "0x2e48ba2e6ca4994286e85e57d26b578fb0fd625f44a6fd27202476bb18575a40"
+          },
           {
             "amount": "0",
             "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",

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

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

apps/trading-e2e/src/integration/trading-fills.cy.ts

@@ -1,7 +1,18 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { fillsQuery } from '@vegaprotocol/mock';
 
+const tabFills = 'tab-fills';
+
 describe('fills', { tags: '@regression' }, () => {
+  // 7005-FILL-001
+  // 7005-FILL-002
+  // 7005-FILL-003
+  // 7005-FILL-004
+  // 7005-FILL-005
+  // 7005-FILL-006
+  // 7005-FILL-007
+  // 7005-FILL-008
+
   beforeEach(() => {
     // Ensure page loads with correct key
     cy.window().then((window) => {
@@ -38,31 +49,37 @@ describe('fills', { tags: '@regression' }, () => {
   });
 
   function validateFillsDisplayed() {
-    cy.getByTestId('tab-fills').should('be.visible');
-
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).should('be.visible');
+    cy.getByTestId(tabFills).contains('Market');
+    cy.getByTestId(tabFills)
       .get(
         '[role="gridcell"][col-id="market.tradableInstrument.instrument.name"]'
       )
       .each(($marketSymbol) => {
         cy.wrap($marketSymbol).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Size');
+    cy.get(`[col-id='size']`).eq(1).should('contain.text', '+');
+    cy.get(`[col-id='size']`).eq(2).should('contain.text', '-');
+    cy.getByTestId(tabFills)
       .get('[role="gridcell"][col-id="size"]')
       .each(($amount) => {
         cy.wrap($amount).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Price');
+    cy.getByTestId(tabFills)
       .get('[role="gridcell"][col-id="price"]')
       .each(($prices) => {
         cy.wrap($prices).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Notional');
+    cy.getByTestId(tabFills)
       .get('[role="gridcell"][col-id="price_1"]')
       .each(($total) => {
         cy.wrap($total).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Role');
+    cy.getByTestId(tabFills)
       .get('[role="gridcell"][col-id="aggressor"]')
       .each(($role) => {
         cy.wrap($role)
@@ -72,13 +89,15 @@ describe('fills', { tags: '@regression' }, () => {
             expect(roles.indexOf(text.trim())).to.be.greaterThan(-1);
           });
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Fee');
+    cy.getByTestId(tabFills)
       .get(
         '[role="gridcell"][col-id="market.tradableInstrument.instrument.product"]'
       )
       .each(($fees) => {
         cy.wrap($fees).invoke('text').should('not.be.empty');
       });
+    cy.getByTestId(tabFills).contains('Date');
     const dateTimeRegex =
       /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
     cy.get('[col-id="createdAt"]').each(($tradeDateTime, index) => {

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

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

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

@@ -12,11 +12,10 @@ import { memo, useState } from 'react';
 import type { ReactNode, ComponentProps } from 'react';
 import { DepthChartContainer } from '@vegaprotocol/market-depth';
 import { CandlesChartContainer } from '@vegaprotocol/candles-chart';
+import { OracleBanner } from '../../components/banner';
 import {
   Tab,
   LocalStoragePersistTabs as Tabs,
-  ResizableGrid,
-  ResizableGridPanel,
   Splash,
 } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
@@ -33,6 +32,10 @@ import {
   useMarketClickHandler,
   useMarketLiquidityClickHandler,
 } from '../../lib/hooks/use-market-click-handler';
+import {
+  ResizableGrid,
+  ResizableGridPanel,
+} from '../../components/resizable-grid';
 
 type MarketDependantView =
   | typeof CandlesChartContainer
@@ -271,7 +274,10 @@ export const TradeGrid = ({
 }: TradeGridProps) => {
   return (
     <div className="h-full grid grid-rows-[min-content_1fr]">
-      <TradeMarketHeader market={market} onSelect={onSelect} />
+      <div>
+        <TradeMarketHeader market={market} onSelect={onSelect} />
+        <OracleBanner marketId={market?.id || ''} />
+      </div>
       <MainGrid
         marketId={market?.id || ''}
         onSelect={onSelect}

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

@@ -2,18 +2,13 @@ import { titlefy } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { PositionsContainer } from '@vegaprotocol/positions';
 import { OrderListContainer } from '@vegaprotocol/orders';
-import {
-  ResizableGridPanel,
-  Tab,
-  LocalStoragePersistTabs as Tabs,
-} from '@vegaprotocol/ui-toolkit';
+import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
 import { WithdrawalsContainer } from './withdrawals-container';
 import { FillsContainer } from '@vegaprotocol/fills';
 import type { ReactNode } from 'react';
 import { useEffect } from 'react';
 import { VegaWalletContainer } from '../../components/vega-wallet-container';
 import { DepositsContainer } from './deposits-container';
-import { ResizableGrid } from '@vegaprotocol/ui-toolkit';
 import { LayoutPriority } from 'allotment';
 import { usePageTitleStore } from '../../stores';
 import { LedgerContainer } from '@vegaprotocol/ledger';
@@ -23,6 +18,10 @@ import {
   useMarketClickHandler,
   useMarketLiquidityClickHandler,
 } from '../../lib/hooks/use-market-click-handler';
+import {
+  ResizableGrid,
+  ResizableGridPanel,
+} from '../../components/resizable-grid';
 
 export const Portfolio = () => {
   const { updateTitle } = usePageTitleStore((store) => ({

apps/trading/components/banner/announcement-banner.tsx

@@ -1,16 +1,13 @@
-import { AnnouncementBanner } from '@vegaprotocol/announcements';
+import { AnnouncementBanner as Banner } from '@vegaprotocol/announcements';
 import { useEnvironment } from '@vegaprotocol/environment';
 
-export const Banner = () => {
+export const AnnouncementBanner = () => {
   const { ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
-
   // Return an empty div so that the grid layout in _app.page.ts
   // renders correctly
   if (!ANNOUNCEMENTS_CONFIG_URL) {
     return <div />;
   }
 
-  return (
-    <AnnouncementBanner app="console" configUrl={ANNOUNCEMENTS_CONFIG_URL} />
-  );
+  return <Banner app="console" configUrl={ANNOUNCEMENTS_CONFIG_URL} />;
 };

apps/trading/components/banner/index.tsx

@@ -1 +1,2 @@
-export * from './banner';
+export * from './announcement-banner';
+export * from './oracle-banner';

apps/trading/components/banner/oracle-banner.tsx

@@ -0,0 +1,44 @@
+import { t } from '@vegaprotocol/i18n';
+import { useMarketOracle } from '@vegaprotocol/market-info';
+import ReactMarkdown from 'react-markdown';
+import { Intent, NotificationBanner } from '@vegaprotocol/ui-toolkit';
+
+const oracleStatuses = {
+  UNKNOWN: t(
+    "This public key's proofs have not been verified yet, or no proofs have been provided yet."
+  ),
+  GOOD: t("This public key's proofs have been verified."),
+  SUSPICIOUS: t(
+    'This public key is suspected to be acting in bad faith, pending investigation.'
+  ),
+  MALICIOUS: t('This public key has been observed acting in bad faith.'),
+  RETIRED: t('This public key is no longer in use.'),
+  COMPROMISED: t(
+    'This public key is no longer in the control of its original owners.'
+  ),
+};
+
+export const OracleBanner = ({ marketId }: { marketId: string }) => {
+  const oracle = useMarketOracle(marketId);
+  if (!oracle || oracle.status === 'GOOD') {
+    return null;
+  }
+  return (
+    <NotificationBanner intent={Intent.Danger}>
+      <div>
+        Oracle status for this market is {oracle.status}.{' '}
+        {oracleStatuses[oracle.status]}
+      </div>
+      {oracle.status_reason ? (
+        <ReactMarkdown
+          className="react-markdown-container"
+          skipHtml={true}
+          disallowedElements={['img']}
+          linkTarget="_blank"
+        >
+          {oracle.status_reason}
+        </ReactMarkdown>
+      ) : null}
+    </NotificationBanner>
+  );
+};

apps/trading/pages/_app.page.tsx

@@ -30,7 +30,7 @@ import ToastsManager from './toasts-manager';
 import { HashRouter, useLocation, useSearchParams } from 'react-router-dom';
 import { Connectors } from '../lib/vega-connectors';
 import { ViewingBanner } from '../components/viewing-banner';
-import { Banner } from '../components/banner';
+import { AnnouncementBanner } from '../components/banner';
 import { AppLoader, DynamicLoader } from '../components/app-loader';
 import { Navbar } from '../components/navbar';
 import { ENV } from '../lib/config';
@@ -86,7 +86,7 @@ function AppBody({ Component }: AppProps) {
       </Head>
       <Title />
       <div className={gridClasses}>
-        <Banner />
+        <AnnouncementBanner />
         <Navbar theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'system'} />
         <ViewingBanner />
         <main data-testid={location.pathname}>

libs/accounts/src/lib/breakdown-table.tsx

@@ -1,16 +1,16 @@
 import { forwardRef } from 'react';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import {
-  Intent,
-  progressBarCellRendererSelector,
-} from '@vegaprotocol/ui-toolkit';
+import { Intent } from '@vegaprotocol/ui-toolkit';
 import { AgGridColumn } from 'ag-grid-react';
 import type { AgGridReact, AgGridReactProps } from 'ag-grid-react';
 import type { AccountFields } from './accounts-data-provider';
 import { AccountTypeMapping } from '@vegaprotocol/types';
-import type { ValueProps } from '@vegaprotocol/ui-toolkit';
-import type { VegaValueFormatterParams } from '@vegaprotocol/datagrid';
+import type {
+  ValueProps,
+  VegaValueFormatterParams,
+} from '@vegaprotocol/datagrid';
+import { progressBarCellRendererSelector } from '@vegaprotocol/datagrid';
 import { AgGridDynamic as AgGrid, PriceCell } from '@vegaprotocol/datagrid';
 import type { ValueFormatterParams } from 'ag-grid-community';
 import { accountValuesComparator } from './accounts-table';

libs/datagrid/src/index.ts

@@ -17,3 +17,5 @@ export * from './lib/filters/set-filter';
 
 export * from './lib/cell-class-rules';
 export * from './lib/type-helpers';
+
+export * from './lib/cells/grid-progress-bar';

libs/datagrid/src/lib/cells/grid-progress-bar.tsx

@@ -1,9 +1,9 @@
+import type { Intent } from '@vegaprotocol/ui-toolkit';
+import { ProgressBar } from '@vegaprotocol/ui-toolkit';
 import type {
   CellRendererSelectorResult,
   ICellRendererParams,
 } from 'ag-grid-community';
-import type { Intent } from '../../utils/intent';
-import { ProgressBar } from './progress-bar';
 
 export interface ValueProps {
   valueFormatted?: {

libs/i18n/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@vegaprotocol/i18n",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "type": "commonjs"
 }

libs/i18n/project.json

@@ -6,6 +6,7 @@
     "build": {
       "executor": "@nrwl/js:tsc",
       "outputs": ["{options.outputPath}"],
+      "format": ["esm", "cjs"],
       "options": {
         "outputPath": "dist/libs/i18n",
         "main": "libs/i18n/src/index.ts",

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

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

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

@@ -0,0 +1,132 @@
+import { renderHook } from '@testing-library/react';
+import { useMarketOracle } from './use-market-oracle';
+import type { MarketInfoQuery } from '../components/market-info/__generated__/MarketInfo';
+import type { Provider } from '@vegaprotocol/oracles';
+
+const ORACLE_PROOFS_URL = 'ORACLE_PROOFS_URL';
+
+const address = 'address';
+const key = 'key';
+
+const mockEnvironment = jest.fn(() => ({ ORACLE_PROOFS_URL }));
+const mockDataProvider = jest.fn<
+  { data: MarketInfoQuery['market'] },
+  unknown[]
+>(() => ({
+  data: {
+    tradableInstrument: {
+      instrument: {
+        product: {
+          dataSourceSpecForSettlementData: {
+            data: {
+              sourceType: {
+                __typename: 'DataSourceDefinitionExternal',
+                sourceType: {
+                  signers: [
+                    {
+                      signer: {
+                        __typename: 'ETHAddress',
+                        address,
+                      },
+                    },
+                    {
+                      signer: {
+                        __typename: 'PubKey',
+                        key,
+                      },
+                    },
+                  ],
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  } as MarketInfoQuery['market'],
+}));
+
+const mockOracleProofs = jest.fn<{ data?: Provider[] }, unknown[]>(() => ({}));
+
+jest.mock('@vegaprotocol/environment', () => ({
+  useEnvironment: jest.fn((args) => mockEnvironment()),
+}));
+
+jest.mock('@vegaprotocol/react-helpers', () => ({
+  useDataProvider: jest.fn((args) => mockDataProvider()),
+}));
+
+jest.mock('@vegaprotocol/oracles', () => ({
+  useOracleProofs: jest.fn((args) => mockOracleProofs()),
+}));
+
+const marketId = 'marketId';
+describe('useMarketOracle', () => {
+  it('returns undefined if no market info present', () => {
+    mockDataProvider.mockReturnValueOnce({ data: null });
+    const { result } = renderHook(() => useMarketOracle(marketId));
+    expect(result.current).toBeUndefined();
+  });
+
+  it('returns undefined if no oracle proofs present', () => {
+    mockOracleProofs.mockReturnValueOnce({ data: undefined });
+    const { result } = renderHook(() => useMarketOracle(marketId));
+    expect(result.current).toBeUndefined();
+  });
+
+  it('returns oracle matched by eth_address', () => {
+    const data = [
+      {
+        proofs: [
+          {
+            eth_address: 'eth_address',
+            type: 'eth_address',
+          },
+        ],
+        oracle: {},
+      } as Provider,
+      {
+        proofs: [
+          {
+            eth_address: address,
+            type: 'eth_address',
+          },
+        ],
+        oracle: {},
+      } as Provider,
+    ];
+    mockOracleProofs.mockReturnValueOnce({
+      data,
+    });
+    const { result } = renderHook(() => useMarketOracle(marketId));
+    expect(result.current).toBe(data[1].oracle);
+  });
+
+  it('returns oracle matching by public_key', () => {
+    const data = [
+      {
+        proofs: [
+          {
+            public_key: 'public_key',
+            type: 'public_key',
+          },
+        ],
+        oracle: {},
+      } as Provider,
+      {
+        proofs: [
+          {
+            public_key: key,
+            type: 'public_key',
+          },
+        ],
+        oracle: {},
+      } as Provider,
+    ];
+    mockOracleProofs.mockReturnValueOnce({
+      data,
+    });
+    const { result } = renderHook(() => useMarketOracle(marketId));
+    expect(result.current).toBe(data[1].oracle);
+  });
+});

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

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

libs/market-info/src/index.ts

@@ -1 +1,2 @@
 export * from './components';
+export * from './hooks';

libs/market-list/src/lib/components/markets-container/market-list-table.tsx

@@ -176,14 +176,16 @@ export const MarketListTable = forwardRef<
       />
       <AgGridColumn
         headerName={t('Settlement asset')}
-        field="tradableInstrument.instrument.product.settlementAsset"
+        field="tradableInstrument.instrument.product.settlementAsset.symbol"
         cellRenderer={({
-          value,
+          data,
         }: VegaICellRendererParams<
           MarketMaybeWithData,
-          'tradableInstrument.instrument.product.settlementAsset'
-        >) =>
-          value ? (
+          'tradableInstrument.instrument.product.settlementAsset.symbol'
+        >) => {
+          const value =
+            data?.tradableInstrument.instrument.product.settlementAsset;
+          return value ? (
             <ButtonLink
               onClick={(e) => {
                 openAssetDetailsDialog(value.id, e.target as HTMLElement);
@@ -193,8 +195,8 @@ export const MarketListTable = forwardRef<
             </ButtonLink>
           ) : (
             ''
-          )
-        }
+          );
+        }}
       />
       <AgGridColumn headerName={t('Market ID')} field="id" />
     </AgGrid>

libs/positions/src/lib/positions-table.tsx

@@ -8,6 +8,7 @@ import type {
   TypedDataAgGrid,
   VegaICellRendererParams,
 } from '@vegaprotocol/datagrid';
+import { ProgressBarCell } from '@vegaprotocol/datagrid';
 import {
   AgGridDynamic as AgGrid,
   DateRangeFilter,
@@ -22,7 +23,6 @@ import {
   TooltipCellComponent,
   ExternalLink,
   Icon,
-  ProgressBarCell,
 } from '@vegaprotocol/ui-toolkit';
 import {
   volumePrefix,

libs/react-helpers/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@vegaprotocol/react-helpers",
-  "version": "0.2.0"
+  "version": "0.2.2"
 }

libs/react-helpers/project.json

@@ -16,6 +16,7 @@
         "external": ["react/jsx-runtime"],
         "rollupConfig": "@nrwl/react/plugins/bundle-rollup",
         "compiler": "babel",
+        "format": ["esm", "cjs"],
         "assets": [
           {
             "glob": "libs/react-helpers/README.md",

libs/react-helpers/src/hooks/use-logger.ts

@@ -1,13 +1,11 @@
 import { useRef } from 'react';
 import { BrowserTracing } from '@sentry/tracing';
 import * as Sentry from '@sentry/browser';
-import type { LocalLogger } from '@vegaprotocol/utils';
+import type { LocalLogger, LoggerConf } from '@vegaprotocol/utils';
 import { localLoggerFactory } from '@vegaprotocol/utils';
 
-interface Props {
+interface Props extends LoggerConf {
   dsn?: string;
-  application?: string;
-  tags?: string[];
 }
 
 export const useLogger = ({ dsn, ...props }: Props) => {

libs/tailwindcss-config/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@vegaprotocol/tailwindcss-config",
-  "version": "0.0.1"
+  "version": "0.0.2"
 }

libs/tailwindcss-config/project.json

@@ -6,6 +6,7 @@
     "build": {
       "executor": "@nrwl/js:tsc",
       "outputs": ["{options.outputPath}"],
+      "format": ["esm", "cjs"],
       "options": {
         "outputPath": "dist/libs/tailwindcss-config",
         "main": "libs/tailwindcss-config/src/index.js",

libs/types/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@vegaprotocol/types",
-  "version": "0.0.1"
+  "version": "0.0.2"
 }

libs/types/project.json

@@ -15,6 +15,7 @@
         "external": ["react/jsx-runtime"],
         "rollupConfig": "@nrwl/react/plugins/bundle-rollup",
         "compiler": "babel",
+        "format": ["esm", "cjs"],
         "assets": [
           {
             "glob": "libs/types/README.md",

libs/ui-toolkit/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@vegaprotocol/ui-toolkit",
-  "version": "0.11.0"
+  "version": "0.12.1"
 }

libs/ui-toolkit/project.json

@@ -16,6 +16,7 @@
         "external": ["react/jsx-runtime"],
         "rollupConfig": "@nrwl/react/plugins/bundle-rollup",
         "compiler": "babel",
+        "format": ["esm", "cjs"],
         "assets": [
           {
             "glob": "libs/ui-toolkit/README.md",

libs/ui-toolkit/src/components/checkbox/checkbox.tsx

@@ -57,7 +57,7 @@ export const Checkbox = ({
       </CheckboxPrimitive.Root>
       <label
         htmlFor={name}
-        className={classNames('text-sm', {
+        className={classNames('text-sm flex-1', {
           'dark:text-neutral-400 text-neutral-600': disabled,
         })}
       >

libs/ui-toolkit/src/components/icon/icon.tsx

@@ -16,7 +16,6 @@ export const Icon = ({ size = 4, name, className, ariaLabel }: IconProps) => {
     'inline-block',
     'fill-current',
     'align-text-bottom',
-    'fill-current',
     'shrink-0',
     // Cant just concatenate as TW wont pick up that the class is being used
     // so below syntax is required

libs/ui-toolkit/src/components/index.ts

@@ -12,6 +12,7 @@ export * from './dialog';
 export * from './drawer';
 export * from './dropdown-menu';
 export * from './form-group';
+export * from './healthbar';
 export * from './icon';
 export * from './indicator';
 export * from './input-error';
@@ -25,11 +26,11 @@ export * from './nav-dropdown';
 export * from './nav';
 export * from './navigation';
 export * from './notification';
+export * from './notification-banner';
 export * from './pagination';
 export * from './popover';
 export * from './progress-bar';
 export * from './radio-group';
-export * from './resizable-grid';
 export * from './rounded-wrapper';
 export * from './select';
 export * from './simple-grid';
@@ -49,4 +50,3 @@ export * from './traffic-light';
 export * from './vega-icons';
 export * from './vega-logo';
 export * from './viewing-as-user';
-export * from './healthbar';

libs/ui-toolkit/src/components/notification-banner/index.tsx

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

libs/ui-toolkit/src/components/notification-banner/notification-banner.stories.tsx

@@ -0,0 +1,45 @@
+/* eslint-disable jsx-a11y/accessible-emoji */
+import type { ComponentStory, ComponentMeta } from '@storybook/react';
+import { Intent } from '../../utils/intent';
+import { NotificationBanner } from './notification-banner';
+import { Button } from '../button';
+
+export default {
+  title: 'NotificationBanner',
+  component: NotificationBanner,
+} as ComponentMeta<typeof NotificationBanner>;
+
+const Template: ComponentStory<typeof NotificationBanner> = (args) => {
+  return (
+    <div className="flex flex-col gap-4">
+      <NotificationBanner
+        intent={Intent.Warning}
+        onClose={() => {
+          return;
+        }}
+      >
+        <div className="uppercase ">
+          The network will upgrade to v0.68.5 in{' '}
+          <span className="text-vega-orange-500">9234</span> blocks
+        </div>
+        <div>
+          Trading activity will be interrupted, manage your risk appropriately.
+          <a href="/">View details</a>
+        </div>
+      </NotificationBanner>
+      <NotificationBanner intent={Intent.Danger}>
+        The oracle for this market has been flagged as malicious by the
+        community.
+      </NotificationBanner>
+      <NotificationBanner>
+        Viewing as Vega user 0592X...20CKZ
+        <Button size="sm" className="ml-2">
+          Exit view as
+        </Button>
+      </NotificationBanner>
+    </div>
+  );
+};
+
+export const Default = Template.bind({});
+Default.args = {};

libs/ui-toolkit/src/components/notification-banner/notification-banner.tsx

@@ -0,0 +1,80 @@
+import classNames from 'classnames';
+import { toastIconMapping } from '../toast';
+import { Intent } from '../../utils/intent';
+import { Icon } from '../icon';
+
+interface NotificationBannerProps {
+  intent?: Intent;
+  children?: React.ReactNode;
+  onClose?: () => void;
+}
+
+export const NotificationBanner = ({
+  intent = Intent.None,
+  children,
+  onClose,
+}: NotificationBannerProps) => {
+  return (
+    <div
+      className={classNames(
+        'flex items-center p-3 border-b min-h-[56px]',
+        'text-[12px] leading-[16px] font-normal',
+        {
+          'bg-vega-light-100 dark:bg-vega-dark-100 ': intent === Intent.None,
+          'bg-vega-blue-300 dark:bg-vega-blue-700': intent === Intent.Primary,
+          'bg-vega-green-300 dark:bg-vega-green-700': intent === Intent.Success,
+          'bg-vega-orange-300 dark:bg-vega-orange-700':
+            intent === Intent.Warning,
+          'bg-vega-pink-300 dark:bg-vega-pink-700': intent === Intent.Danger,
+        },
+        {
+          'border-b-vega-light-200 dark:border-b-vega-dark-200 ':
+            intent === Intent.None,
+
+          'border-b-vega-blue-500 dark:border-b-vega-blue-500':
+            intent === Intent.Primary,
+
+          'border-b-vega-green-600 dark:border-b-vega-green-500':
+            intent === Intent.Success,
+
+          'border-b-vega-orange-500 dark:border-b-vega-orange-500':
+            intent === Intent.Warning,
+
+          'border-b-vega-pink-500 dark:border-b-vega-pink-500':
+            intent === Intent.Danger,
+        }
+      )}
+    >
+      {intent === Intent.None ? null : (
+        <Icon
+          name={toastIconMapping[intent]}
+          size={4}
+          className={classNames('mr-2', {
+            'text-vega-blue-500 dark:text-vega-blue-500':
+              intent === Intent.Primary,
+
+            'text-vega-green-600 dark:text-vega-green-500':
+              intent === Intent.Success,
+
+            'text-vega-orange-500 dark:text-vega-orange-500':
+              intent === Intent.Warning,
+
+            'text-vega-pink-500 dark:text-vega-pink-500':
+              intent === Intent.Danger,
+          })}
+        />
+      )}
+      <div className="grow">{children}</div>
+      {onClose ? (
+        <button
+          type="button"
+          data-testid="notification-banner-close"
+          onClick={onClose}
+          className="ml-2"
+        >
+          <Icon name="cross" size={4} className="dark:text-white" />
+        </button>
+      ) : null}
+    </div>
+  );
+};

libs/ui-toolkit/src/components/progress-bar/index.ts

@@ -1,2 +1 @@
-export * from './grid-progress-bar';
 export * from './progress-bar';

libs/ui-toolkit/src/components/resizable-grid/resizable-grid.stories.tsx

@@ -1,24 +0,0 @@
-import type { Story, Meta } from '@storybook/react';
-import { ResizableGrid } from './resizable-grid';
-import { Allotment } from 'allotment';
-import 'allotment/dist/style.css';
-
-export default {
-  component: ResizableGrid,
-  title: 'ResizablePanel',
-} as Meta;
-
-const Template: Story = (args) => (
-  <div className="h-48">
-    <ResizableGrid vertical={true}>
-      <Allotment.Pane minSize={20}>
-        <div>Panel 1</div>
-      </Allotment.Pane>
-      <Allotment.Pane minSize={20}>
-        <div>Panel 2</div>
-      </Allotment.Pane>
-    </ResizableGrid>
-  </div>
-);
-
-export const Default = Template.bind({});

libs/ui-toolkit/src/components/toast/toast.tsx

@@ -30,7 +30,7 @@ type ToastProps = Toast & {
   state?: ToastState;
 };
 
-const toastIconMapping: { [i in Intent]: IconName } = {
+export const toastIconMapping: { [i in Intent]: IconName } = {
   [Intent.None]: IconNames.HELP,
   [Intent.Primary]: IconNames.INFO_SIGN,
   [Intent.Success]: IconNames.TICK_CIRCLE,

libs/utils/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@vegaprotocol/utils",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "type": "commonjs"
 }

libs/utils/project.json

@@ -6,6 +6,7 @@
     "build": {
       "executor": "@nrwl/js:tsc",
       "outputs": ["{options.outputPath}"],
+      "format": ["esm", "cjs"],
       "options": {
         "outputPath": "dist/libs/utils",
         "main": "libs/utils/src/index.ts",

libs/utils/src/lib/local-logger.ts

@@ -21,7 +21,7 @@ type ConsoleMethod = {
 }[keyof Console] &
   string;
 
-interface LoggerConf {
+export interface LoggerConf {
   application?: string;
   tags?: string[];
   logLevel?: LogLevelsType;