fix: fix candles.mock

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

apps/explorer/project.json

@@ -70,7 +70,7 @@
       "executor": "@nrwl/workspace:run-commands",
       "options": {
         "commands": [
-          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.67.3/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
+          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.66.1/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
         ]
       }
     },

apps/explorer/src/app/components/links/market-link/market-link.tsx

@@ -1,3 +1,4 @@
+import React from 'react';
 import { Routes } from '../../../routes/route-names';
 import { useExplorerMarketQuery } from './__generated__/Market';
 import { Link } from 'react-router-dom';
@@ -7,7 +8,6 @@ import { t } from '@vegaprotocol/react-helpers';
 
 export type MarketLinkProps = Partial<ComponentProps<typeof Link>> & {
   id: string;
-  showMarketName?: boolean;
 };
 
 /**
@@ -15,11 +15,7 @@ export type MarketLinkProps = Partial<ComponentProps<typeof Link>> & {
  * with a link to the markets list. If the name does not come back
  * it will use the ID instead
  */
-const MarketLink = ({
-  id,
-  showMarketName = true,
-  ...props
-}: MarketLinkProps) => {
+const MarketLink = ({ id, ...props }: MarketLinkProps) => {
   const { data, error, loading } = useExplorerMarketQuery({
     variables: { id },
   });
@@ -41,24 +37,11 @@ const MarketLink = ({
     }
   }
 
-  if (showMarketName) {
-    return (
-      <Link
-        className="underline"
-        {...props}
-        to={`/${Routes.MARKETS}#${id}`}
-        title={id}
-      >
-        {label}
-      </Link>
-    );
-  } else {
-    return (
-      <Link className="underline" {...props} to={`/${Routes.MARKETS}#${id}`}>
-        {id}
-      </Link>
-    );
-  }
+  return (
+    <Link className="underline" {...props} to={`/${Routes.MARKETS}#${id}`}>
+      {label}
+    </Link>
+  );
 };
 
 export default MarketLink;

apps/explorer/src/app/components/links/oracle-link/oracle-link.tsx

@@ -1,22 +0,0 @@
-import { Routes } from '../../../routes/route-names';
-import { Link } from 'react-router-dom';
-
-import type { ComponentProps } from 'react';
-
-export type OracleLinkProps = Partial<ComponentProps<typeof Link>> & {
-  id: string;
-};
-
-const OracleLink = ({ id, ...props }: OracleLinkProps) => {
-  return (
-    <Link
-      className="underline font-mono"
-      {...props}
-      to={`/${Routes.ORACLES}/${id}`}
-    >
-      {id}
-    </Link>
-  );
-};
-
-export default OracleLink;

apps/explorer/src/app/components/txs/details/tx-order.tsx

@@ -50,12 +50,6 @@ export const TxDetailsOrder = ({
             <code>{deterministicId}</code>
           </TableCell>
         </TableRow>
-        <TableRow modifier="bordered">
-          <TableCell>{t('Market ID')}</TableCell>
-          <TableCell>
-            <MarketLink id={marketId} showMarketName={false} />
-          </TableCell>
-        </TableRow>
         <TableRow modifier="bordered">
           <TableCell>{t('Market')}</TableCell>
           <TableCell>

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

@@ -51,9 +51,6 @@ fragment ExplorerOracleDataSource on OracleSpec {
 
 fragment ExplorerOracleDataConnection on OracleSpec {
   dataConnection {
-    pageInfo {
-      hasNextPage
-    }
     edges {
       node {
         externalData {
@@ -82,21 +79,12 @@ fragment ExplorerOracleDataConnection on OracleSpec {
 }
 
 query ExplorerOracleSpecs {
-  oracleSpecsConnection(pagination: { first: 50 }) {
-    pageInfo {
-      hasNextPage
-    }
+  oracleSpecsConnection {
     edges {
       node {
         ...ExplorerOracleDataSource
+        ...ExplorerOracleDataConnection
       }
     }
   }
 }
-
-query ExplorerOracleSpecById($id: ID!) {
-  oracleSpec(oracleSpecId: $id) {
-    ...ExplorerOracleDataSource
-    ...ExplorerOracleDataConnection
-  }
-}

apps/explorer/src/app/routes/oracles/__generated__/Oracles.ts

@@ -5,19 +5,12 @@ import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } } };
 
-export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
+export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
 
 export type ExplorerOracleSpecsQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };
-
-export type ExplorerOracleSpecByIdQueryVariables = Types.Exact<{
-  id: Types.Scalars['ID'];
-}>;
-
-
-export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };
+export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };
 
 export const ExplorerOracleDataSourceFragmentDoc = gql`
     fragment ExplorerOracleDataSource on OracleSpec {
@@ -73,10 +66,7 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
     `;
 export const ExplorerOracleDataConnectionFragmentDoc = gql`
     fragment ExplorerOracleDataConnection on OracleSpec {
-  dataConnection(pagination: {first: 1}) {
-    pageInfo {
-      hasNextPage
-    }
+  dataConnection {
     edges {
       node {
         externalData {
@@ -106,10 +96,7 @@ export const ExplorerOracleDataConnectionFragmentDoc = gql`
     `;
 export const ExplorerOracleSpecsDocument = gql`
     query ExplorerOracleSpecs {
-  oracleSpecsConnection(pagination: {first: 50}) {
-    pageInfo {
-      hasNextPage
-    }
+  oracleSpecsConnection {
     edges {
       node {
         ...ExplorerOracleDataSource
@@ -146,41 +133,4 @@ export function useExplorerOracleSpecsLazyQuery(baseOptions?: Apollo.LazyQueryHo
         }
 export type ExplorerOracleSpecsQueryHookResult = ReturnType<typeof useExplorerOracleSpecsQuery>;
 export type ExplorerOracleSpecsLazyQueryHookResult = ReturnType<typeof useExplorerOracleSpecsLazyQuery>;
-export type ExplorerOracleSpecsQueryResult = Apollo.QueryResult<ExplorerOracleSpecsQuery, ExplorerOracleSpecsQueryVariables>;
-export const ExplorerOracleSpecByIdDocument = gql`
-    query ExplorerOracleSpecById($id: ID!) {
-  oracleSpec(oracleSpecId: $id) {
-    ...ExplorerOracleDataSource
-    ...ExplorerOracleDataConnection
-  }
-}
-    ${ExplorerOracleDataSourceFragmentDoc}
-${ExplorerOracleDataConnectionFragmentDoc}`;
-
-/**
- * __useExplorerOracleSpecByIdQuery__
- *
- * To run a query within a React component, call `useExplorerOracleSpecByIdQuery` and pass it any options that fit your needs.
- * When your component renders, `useExplorerOracleSpecByIdQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useExplorerOracleSpecByIdQuery({
- *   variables: {
- *      id: // value for 'id'
- *   },
- * });
- */
-export function useExplorerOracleSpecByIdQuery(baseOptions: Apollo.QueryHookOptions<ExplorerOracleSpecByIdQuery, ExplorerOracleSpecByIdQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ExplorerOracleSpecByIdQuery, ExplorerOracleSpecByIdQueryVariables>(ExplorerOracleSpecByIdDocument, options);
-      }
-export function useExplorerOracleSpecByIdLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerOracleSpecByIdQuery, ExplorerOracleSpecByIdQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ExplorerOracleSpecByIdQuery, ExplorerOracleSpecByIdQueryVariables>(ExplorerOracleSpecByIdDocument, options);
-        }
-export type ExplorerOracleSpecByIdQueryHookResult = ReturnType<typeof useExplorerOracleSpecByIdQuery>;
-export type ExplorerOracleSpecByIdLazyQueryHookResult = ReturnType<typeof useExplorerOracleSpecByIdLazyQuery>;
-export type ExplorerOracleSpecByIdQueryResult = Apollo.QueryResult<ExplorerOracleSpecByIdQuery, ExplorerOracleSpecByIdQueryVariables>;
+export type ExplorerOracleSpecsQueryResult = Apollo.QueryResult<ExplorerOracleSpecsQuery, ExplorerOracleSpecsQueryVariables>;

apps/explorer/src/app/routes/oracles/components/oracle-data.spec.tsx

@@ -37,7 +37,7 @@ describe('Oracle Data view', () => {
         dataConnection: {
           edges: [],
         },
-      } as unknown as ExplorerOracleDataConnectionFragment)
+      } as ExplorerOracleDataConnectionFragment)
     );
     expect(res.container).toBeEmptyDOMElement();
   });

apps/explorer/src/app/routes/oracles/components/oracle-signers.spec.tsx

@@ -67,7 +67,7 @@ describe('Oracle Signers component', () => {
             __typename: 'Signer',
             signer: {
               __typename: 'PubKey',
-              key: '1234567891234567789123456789123456778912345678912345677891234567',
+              key: '123',
             },
           },
         ],

apps/explorer/src/app/routes/oracles/components/oracle-signers.tsx

@@ -4,7 +4,6 @@ import {
   EthExplorerLinkTypes,
 } from '../../../components/links/eth-explorer-link/eth-explorer-link';
 import { TableRow, TableCell, TableHeader } from '../../../components/table';
-import { remove0x } from '@vegaprotocol/react-helpers';
 
 import type { SourceType } from './oracle';
 
@@ -15,15 +14,7 @@ export type Signer = {
 };
 
 export function getAddressTypeLabel(signer: Signer) {
-  const res = signer.__typename === 'ETHAddress' ? 'ETH' : 'Vega';
-
-  // This is a hack: some older oracles were submitted before proper checks stopped
-  // ETH addresses being returned as Vega addresses
-  if (res === 'Vega' && signer?.key?.length !== 64) {
-    return 'ETH';
-  } else {
-    return res;
-  }
+  return signer.__typename === 'ETHAddress' ? 'ETH' : 'Vega';
 }
 
 export function getAddress(signer: Signer) {
@@ -38,16 +29,6 @@ export function getAddressLink(signer: Signer) {
 
   if (signer.__typename === 'ETHAddress') {
     return <EthExplorerLink id={address} type={EthExplorerLinkTypes.address} />;
-  } else if (signer.__typename === 'PubKey' && address.length !== 64) {
-    // This is a hack: some older oracles were submitted before proper checks stopped
-    // ETH addresses being returned as Vega addresses
-    // Hacky 0x prefixing as a bonus
-    return (
-      <EthExplorerLink
-        id={`0x${remove0x(address)}`}
-        type={EthExplorerLinkTypes.address}
-      />
-    );
   } else if (signer.__typename === 'PubKey') {
     return <PartyLink id={address} />;
   }

apps/explorer/src/app/routes/oracles/components/oracle.tsx

@@ -13,8 +13,6 @@ import { OracleData } from './oracle-data';
 import { OracleFilter } from './oracle-filter';
 import { OracleDetailsType } from './oracle-details-type';
 import { OracleMarkets } from './oracle-markets';
-import { OracleSigners } from './oracle-signers';
-import OracleLink from '../../../components/links/oracle-link/oracle-link';
 
 export type SourceType =
   ExplorerOracleDataSourceFragment['dataSourceSpec']['spec']['data']['sourceType'];
@@ -23,47 +21,36 @@ interface OracleDetailsProps {
   id: string;
   dataSource: ExplorerOracleDataSourceFragment;
   dataConnection: ExplorerOracleDataConnectionFragment;
-  // Defaults to false. Hides the count of 'broadcasts' this oracle has seen
-  showBroadcasts?: boolean;
 }
 
-/**
- * Notes:
- * - Matched data is really 'Data that matched this oracle' and given oracles are unique
- *   to each market, and each serves either as trading termination or settlement, really
- *   they will only ever see 1 match (most likely). So it should be more like 'Has seen
- *   data' vs 'Has not yet seen data'
- */
 export const OracleDetails = ({
   id,
   dataSource,
   dataConnection,
-  showBroadcasts = false,
 }: OracleDetailsProps) => {
   const sourceType = dataSource.dataSourceSpec.spec.data.sourceType;
   const reportsCount: number = dataConnection.dataConnection.edges?.length || 0;
 
   return (
     <div>
-      <TableWithTbody className="mb-2">
+      <TableWithTbody>
         <TableRow modifier="bordered">
           <TableHeader scope="row">{t('ID')}</TableHeader>
-          <TableCell modifier="bordered">
-            <OracleLink id={id} />
-          </TableCell>
+          <TableCell modifier="bordered">{id}</TableCell>
         </TableRow>
         <OracleDetailsType type={sourceType.__typename} />
-        <OracleSigners sourceType={sourceType} />
+        {
+          // Disabled until https://github.com/vegaprotocol/vega/issues/7286 is released
+          /*<OracleSigners sourceType={sourceType} />*/
+        }
         <OracleMarkets id={id} />
         <TableRow modifier="bordered">
-          <TableHeader scope="row">{t('Matched data')}</TableHeader>
-          <TableCell modifier="bordered">
-            {showBroadcasts ? reportsCount : reportsCount > 0 ? '✅' : '❌'}
-          </TableCell>
+          <TableHeader scope="row">{t('Broadcasts')}</TableHeader>
+          <TableCell modifier="bordered">{reportsCount}</TableCell>
         </TableRow>
       </TableWithTbody>
       <OracleFilter data={dataSource} />
-      {showBroadcasts ? <OracleData data={dataConnection} /> : null}
+      <OracleData data={dataConnection} />
     </div>
   );
 };

apps/explorer/src/app/routes/oracles/home/index.tsx

@@ -1,45 +0,0 @@
-import { Loader, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
-import { RouteTitle } from '../../../components/route-title';
-import { t } from '@vegaprotocol/react-helpers';
-import { useExplorerOracleSpecsQuery } from '../__generated__/Oracles';
-import { useDocumentTitle } from '../../../hooks/use-document-title';
-import { OracleDetails } from '../components/oracle';
-import { useScrollToLocation } from '../../../hooks/scroll-to-location';
-import filter from 'recursive-key-filter';
-
-const Oracles = () => {
-  const { data, loading } = useExplorerOracleSpecsQuery();
-
-  useDocumentTitle(['Oracles']);
-  useScrollToLocation();
-
-  return (
-    <section>
-      <RouteTitle data-testid="oracle-specs-heading">{t('Oracles')}</RouteTitle>
-      {loading ? <Loader /> : null}
-      {data?.oracleSpecsConnection?.edges
-        ? data.oracleSpecsConnection.edges.map((o) => {
-            const id = o?.node.dataSourceSpec.spec.id;
-            if (!id) {
-              return null;
-            }
-            return (
-              <div id={id} key={id} className="mb-10">
-                <OracleDetails
-                  id={id}
-                  dataSource={o?.node}
-                  dataConnection={o?.node}
-                />
-                <details>
-                  <summary className="pointer">JSON</summary>
-                  <SyntaxHighlighter data={filter(o, ['__typename'])} />
-                </details>
-              </div>
-            );
-          })
-        : null}
-    </section>
-  );
-};
-
-export default Oracles;

apps/explorer/src/app/routes/oracles/id/index.tsx

@@ -1,49 +0,0 @@
-import { RouteTitle } from '../../../components/route-title';
-import { RenderFetched } from '../../../components/render-fetched';
-import { t, truncateByChars } from '@vegaprotocol/react-helpers';
-import { useDocumentTitle } from '../../../hooks/use-document-title';
-import { useParams } from 'react-router-dom';
-import { useExplorerOracleSpecByIdQuery } from '../__generated__/Oracles';
-import { OracleDetails } from '../components/oracle';
-import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
-import filter from 'recursive-key-filter';
-import { TruncateInline } from '../../../components/truncate/truncate';
-
-export const Oracle = () => {
-  const { id } = useParams<{ id: string }>();
-
-  useDocumentTitle(['Oracle', `Oracle #${truncateByChars(id || '1', 5, 5)}`]);
-
-  const { data, error, loading } = useExplorerOracleSpecByIdQuery({
-    variables: {
-      id: id || '1',
-    },
-  });
-
-  return (
-    <section>
-      <RouteTitle data-testid="block-header">
-        {t(`Oracle `)}
-        <TruncateInline startChars={5} endChars={5} text={id || '1'} />
-      </RouteTitle>
-      <RenderFetched error={error} loading={loading}>
-        {data?.oracleSpec ? (
-          <div id={id} key={id} className="mb-10">
-            <OracleDetails
-              id={id || ''}
-              dataSource={data?.oracleSpec}
-              dataConnection={data?.oracleSpec}
-              showBroadcasts={true}
-            />
-            <details>
-              <summary className="pointer">JSON</summary>
-              <SyntaxHighlighter data={filter(data, ['__typename'])} />
-            </details>
-          </div>
-        ) : (
-          <span></span>
-        )}
-      </RenderFetched>
-    </section>
-  );
-};

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

@@ -1,7 +1,45 @@
-import { Outlet } from 'react-router-dom';
+import { Loader, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { RouteTitle } from '../../components/route-title';
+import { t } from '@vegaprotocol/react-helpers';
+import { useExplorerOracleSpecsQuery } from './__generated__/Oracles';
+import { useDocumentTitle } from '../../hooks/use-document-title';
+import { OracleDetails } from './components/oracle';
+import { useScrollToLocation } from '../../hooks/scroll-to-location';
+import filter from 'recursive-key-filter';
 
-const OraclePage = () => {
-  return <Outlet />;
+const Oracles = () => {
+  const { data, loading } = useExplorerOracleSpecsQuery();
+
+  useDocumentTitle(['Oracles']);
+  useScrollToLocation();
+
+  return (
+    <section>
+      <RouteTitle data-testid="oracle-specs-heading">{t('Oracles')}</RouteTitle>
+      {loading ? <Loader /> : null}
+      {data?.oracleSpecsConnection?.edges
+        ? data.oracleSpecsConnection.edges.map((o) => {
+            const id = o?.node.dataSourceSpec.spec.id;
+            if (!id) {
+              return null;
+            }
+            return (
+              <div id={id} key={id} className="mb-10 cursor-pointer">
+                <OracleDetails
+                  id={id}
+                  dataSource={o?.node}
+                  dataConnection={o?.node}
+                />
+                <details>
+                  <summary className="pointer">JSON</summary>
+                  <SyntaxHighlighter data={filter(o, ['__typename'])} />
+                </details>
+              </div>
+            );
+          })
+        : null}
+    </section>
+  );
 };
 
-export default OraclePage;
+export default Oracles;

apps/explorer/src/app/routes/router-config.tsx

@@ -3,9 +3,7 @@ import BlockPage from './blocks';
 import Governance from './governance';
 import Home from './home';
 import Markets from './markets';
-import OraclePage from './oracles';
-import Oracles from './oracles/home';
-import { Oracle } from './oracles/id';
+import Oracles from './oracles';
 import Party from './parties';
 import { Parties } from './parties/home';
 import { Party as PartySingle } from './parties/id';
@@ -87,6 +85,17 @@ const marketsRoutes = flags.markets
     ]
   : [];
 
+const oraclesRoutes = flags.oracles
+  ? [
+      {
+        path: Routes.ORACLES,
+        name: 'Oracles',
+        text: t('Oracles'),
+        element: <Oracles />,
+      },
+    ]
+  : [];
+
 const networkParametersRoutes = flags.networkParameters
   ? [
       {
@@ -152,27 +161,12 @@ const routerConfig = [
       },
     ],
   },
-  {
-    path: Routes.ORACLES,
-    name: 'Oracles',
-    text: t('Oracles'),
-    element: <OraclePage />,
-    children: [
-      {
-        index: true,
-        element: <Oracles />,
-      },
-      {
-        path: ':id',
-        element: <Oracle />,
-      },
-    ],
-  },
   ...partiesRoutes,
   ...assetsRoutes,
   ...genesisRoutes,
   ...governanceRoutes,
   ...marketsRoutes,
+  ...oraclesRoutes,
   ...networkParametersRoutes,
   ...validators,
 ];

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

@@ -5,7 +5,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "74258.786503446150969076",
+    "locked_amount": "74199.563434561395345826",
     "deposits": [
       {
         "amount": "86666.297",
@@ -71,7 +71,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "1727.2674374236875",
+    "locked_amount": "1723.8413207163205",
     "deposits": [
       {
         "amount": "2500",
@@ -450,7 +450,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "74191.034704360551619635",
+    "locked_amount": "74131.865669074416617715",
     "deposits": [
       {
         "amount": "129999.45",
@@ -516,7 +516,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "37687.78451293759754",
+    "locked_amount": "37645.00705225773502",
     "deposits": [
       {
         "amount": "10000",
@@ -709,7 +709,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "3201.987252663623",
+    "locked_amount": "3198.570522577372",
     "deposits": [
       {
         "amount": "5000",
@@ -920,7 +920,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "97499.58",
     "total_removed": "0",
-    "locked_amount": "15996.695460391807156518",
+    "locked_amount": "15938.65614862105375962",
     "deposits": [
       {
         "amount": "97499.58",
@@ -953,7 +953,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "135173.4239508",
     "total_removed": "98230.390980249184455396",
-    "locked_amount": "21864.72098009665615105475826",
+    "locked_amount": "21785.391260975192260443858312",
     "deposits": [
       {
         "amount": "135173.4239508",
@@ -999,7 +999,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "32499.86",
     "total_removed": "0",
-    "locked_amount": "6729.5335320322971613732",
+    "locked_amount": "6705.1173958556428760904",
     "deposits": [
       {
         "amount": "32499.86",
@@ -1032,7 +1032,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "10833.29",
     "total_removed": "0",
-    "locked_amount": "2190.3978628288399953154",
+    "locked_amount": "2182.4506474319168306297",
     "deposits": [
       {
         "amount": "10833.29",
@@ -1065,7 +1065,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "22749.93",
     "total_removed": "0",
-    "locked_amount": "8188.196427781414655436",
+    "locked_amount": "8158.48796164921464204",
     "deposits": [
       {
         "amount": "6500",
@@ -1204,7 +1204,7 @@
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
     "total_removed": "3539.640404325",
-    "locked_amount": "11777.70200276243025",
+    "locked_amount": "11746.696593001842",
     "deposits": [
       {
         "amount": "7500",
@@ -1369,7 +1369,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "928642.9598472029154",
-    "locked_amount": "673633.855453009978788326",
+    "locked_amount": "672308.21312078634624765",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -1721,7 +1721,7 @@
     "tranche_end": "2023-02-01T00:00:00.000Z",
     "total_added": "42500",
     "total_removed": "24434.0787288",
-    "locked_amount": "1326.9861488526576875",
+    "locked_amount": "1269.3752516103057225",
     "deposits": [
       {
         "amount": "12500",
@@ -33096,8 +33096,8 @@
     "tranche_start": "2022-03-05T00:00:00.000Z",
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
-    "total_removed": "441714.6865497406814",
-    "locked_amount": "1059642.026162241096318288545",
+    "total_removed": "442882.3484327902809",
+    "locked_amount": "1057604.97543725296329993117",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -33276,6 +33276,11 @@
         "user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
         "tx": "0x63016a4e870bc38285eac8057aab58aa9fe896f1659f4f2e7e4e8de19c1202db"
       },
+      {
+        "amount": "1167.6618830495995",
+        "user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
+        "tx": "0xdd0c8931e8c9ec3205ab9e4cdbb30dd5a6f43253c388f2e05b5bb5fd847ed8fb"
+      },
       {
         "amount": "1906.7742941475005",
         "user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
@@ -33622,6 +33627,12 @@
             "tranche_id": 1,
             "tx": "0x63016a4e870bc38285eac8057aab58aa9fe896f1659f4f2e7e4e8de19c1202db"
           },
+          {
+            "amount": "1167.6618830495995",
+            "user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
+            "tranche_id": 1,
+            "tx": "0xdd0c8931e8c9ec3205ab9e4cdbb30dd5a6f43253c388f2e05b5bb5fd847ed8fb"
+          },
           {
             "amount": "1906.7742941475005",
             "user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
@@ -33870,8 +33881,8 @@
           }
         ],
         "total_tokens": "187637.95",
-        "withdrawn_tokens": "133256.984196977461",
-        "remaining_tokens": "54380.965803022539"
+        "withdrawn_tokens": "134424.6460800270605",
+        "remaining_tokens": "53213.3039199729395"
       },
       {
         "address": "0x1A71e3ED1996CAbB91bB043f880CE963D601707e",
@@ -34377,8 +34388,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
-    "total_removed": "545472.50137003958740452",
-    "locked_amount": "9057110.1748913212147136818156133914679643",
+    "total_removed": "545536.65519596862040452",
+    "locked_amount": "9049886.9238116721047082457828299231170587",
     "deposits": [
       {
         "amount": "16249.93",
@@ -34982,6 +34993,11 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x6d913b124af23621f8b97087a51d4cd912c6a8d9cca325cb756b56d4970f3f62"
       },
+      {
+        "amount": "64.153825929033",
+        "user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
+        "tx": "0x33446fce935f9568b7d6e796e6a9a73049585fc7225f935e343acbb5c68a60b7"
+      },
       {
         "amount": "434.254023685890375",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -38806,6 +38822,12 @@
             "tranche_id": 2,
             "tx": "0x55802ccf2bf20a0bf6ffffa5add678cacd8d31450517a2ac65ff384ee5f71f22"
           },
+          {
+            "amount": "64.153825929033",
+            "user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
+            "tranche_id": 2,
+            "tx": "0x33446fce935f9568b7d6e796e6a9a73049585fc7225f935e343acbb5c68a60b7"
+          },
           {
             "amount": "104.762232778042",
             "user": "0xE6CacAE56Cca8dFdB7910b5A13578719D4E57DA0",
@@ -39036,8 +39058,8 @@
           }
         ],
         "total_tokens": "12362.05",
-        "withdrawn_tokens": "5246.0507139289135",
-        "remaining_tokens": "7115.9992860710865"
+        "withdrawn_tokens": "5310.2045398579465",
+        "remaining_tokens": "7051.8454601420535"
       },
       {
         "address": "0xb091D456d0dFCB94dcba6f355379056C5bb995fC",
@@ -39669,7 +39691,7 @@
     "tranche_end": "2023-05-05T00:00:00.000Z",
     "total_added": "14597706.0446472999",
     "total_removed": "3706973.15022981060693393",
-    "locked_amount": "2640021.056974879537814880156060444",
+    "locked_amount": "2633352.597699040729631521134098664",
     "deposits": [
       {
         "amount": "129284.449",
@@ -46370,7 +46392,7 @@
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "5778205.3912159303",
     "total_removed": "2622261.560853924298939789",
-    "locked_amount": "726184.882785013826953223512050056",
+    "locked_amount": "723550.13419462381518165594274868",
     "deposits": [
       {
         "amount": "552496.6455",
@@ -48265,7 +48287,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
     "total_removed": "29683.1054262326685",
-    "locked_amount": "167906.33621746181228223152663622",
+    "locked_amount": "167583.553885809073086558333536292",
     "deposits": [
       {
         "amount": "3000",

apps/token/src/routes/rewards/home/__generated__/Rewards.ts

@@ -97,4 +97,4 @@ export function useRewardsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<Re
         }
 export type RewardsQueryHookResult = ReturnType<typeof useRewardsQuery>;
 export type RewardsLazyQueryHookResult = ReturnType<typeof useRewardsLazyQuery>;
-export type RewardsQueryResult = Apollo.QueryResult<RewardsQuery, RewardsQueryVariables>;
+export type RewardsQueryResult = Apollo.QueryResult<RewardsQuery, RewardsQueryVariables>;

apps/trading/lib/hooks/use-ethereum-transaction-toasts.tsx

@@ -27,7 +27,7 @@ const isWithdrawTransaction = (tx: EthStoredTxState) =>
   tx.methodName === 'withdraw_asset';
 
 const isDepositTransaction = (tx: EthStoredTxState) =>
-  tx.methodName === 'withdraw_asset';
+  tx.methodName === 'deposit_asset';
 
 const EthTransactionDetails = ({ tx }: { tx: EthStoredTxState }) => {
   const { data: assets } = useAssetsDataProvider();
@@ -150,11 +150,11 @@ const EthTxCompletedToastContent = ({ tx }: EthTxToastContentProps) => {
   return (
     <div>
       <h3 className="font-bold">
-        {t('Processing')} {isDeposit && 'deposit'}
+        {t('Processing')} {isDeposit && t('deposit')}
       </h3>
       <p>
         {t('Your transaction has been completed.')}
-        {isDeposit && t('Waiting for deposit confirmation')}
+        {isDeposit && t('Waiting for deposit confirmation.')}
       </p>
       <EtherscanLink tx={tx} />
       <EthTransactionDetails tx={tx} />

libs/candles-chart/src/lib/Candles.graphql

@@ -12,6 +12,7 @@ query Candles($marketId: ID!, $interval: Interval!, $since: String!) {
   market(id: $marketId) {
     id
     decimalPlaces
+    positionDecimalPlaces
     tradableInstrument {
       instrument {
         id

libs/candles-chart/src/lib/__generated__/Candles.ts

@@ -12,7 +12,7 @@ export type CandlesQueryVariables = Types.Exact<{
 }>;
 
 
-export type CandlesQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string } }, candlesConnection?: { __typename?: 'CandleDataConnection', edges?: Array<{ __typename?: 'CandleEdge', node: { __typename?: 'Candle', periodStart: any, lastUpdateInPeriod: any, high: string, low: string, open: string, close: string, volume: string } } | null> | null } | null } | null };
+export type CandlesQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string } }, candlesConnection?: { __typename?: 'CandleDataConnection', edges?: Array<{ __typename?: 'CandleEdge', node: { __typename?: 'Candle', periodStart: any, lastUpdateInPeriod: any, high: string, low: string, open: string, close: string, volume: string } } | null> | null } | null } | null };
 
 export type CandlesEventsSubscriptionVariables = Types.Exact<{
   marketId: Types.Scalars['ID'];
@@ -38,6 +38,7 @@ export const CandlesDocument = gql`
   market(id: $marketId) {
     id
     decimalPlaces
+    positionDecimalPlaces
     tradableInstrument {
       instrument {
         id

libs/candles-chart/src/lib/candles.mock.ts

@@ -14,6 +14,7 @@ export const candlesQuery = (
     market: {
       id: 'market-0',
       decimalPlaces: 5,
+      positionDecimalPlaces: 0,
       tradableInstrument: {
         instrument: {
           id: '',

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

@@ -49,6 +49,7 @@ export class VegaDataSource implements DataSource {
   marketId: string;
   partyId: null | string;
   _decimalPlaces = 0;
+  _positionDecimalPlaces = 0;
 
   candlesSub: Subscription | null = null;
 
@@ -60,6 +61,14 @@ export class VegaDataSource implements DataSource {
     return this._decimalPlaces;
   }
 
+  /**
+   * Indicates the number of position decimal places that an integer must be shifted by in order to get a correct
+   * number denominated in the unit size of the Market.
+   */
+  get positionDecimalPlaces(): number {
+    return this._positionDecimalPlaces;
+  }
+
   /**
    *
    * @param client - An ApolloClient instance.
@@ -145,11 +154,14 @@ export class VegaDataSource implements DataSource {
 
       if (data?.market?.candlesConnection?.edges) {
         const decimalPlaces = data.market.decimalPlaces;
+        const positionDecimalPlaces = data.market.positionDecimalPlaces;
 
         const candles = data.market.candlesConnection.edges
           .map((edge) => edge?.node)
           .filter((node): node is CandleFieldsFragment => !!node)
-          .map((node) => parseCandle(node, decimalPlaces));
+          .map((node) =>
+            parseCandle(node, decimalPlaces, positionDecimalPlaces)
+          );
 
         return candles;
       } else {
@@ -180,7 +192,11 @@ export class VegaDataSource implements DataSource {
 
     this.candlesSub = res.subscribe(({ data }) => {
       if (data) {
-        const candle = parseCandle(data.candles, this.decimalPlaces);
+        const candle = parseCandle(
+          data.candles,
+          this.decimalPlaces,
+          this.positionDecimalPlaces
+        );
 
         onSubscriptionData(candle);
       }
@@ -197,7 +213,8 @@ export class VegaDataSource implements DataSource {
 
 function parseCandle(
   candle: CandleFieldsFragment,
-  decimalPlaces: number
+  decimalPlaces: number,
+  positionDecimalPlaces: number
 ): Candle {
   return {
     date: new Date(candle.periodStart),
@@ -205,6 +222,6 @@ function parseCandle(
     low: Number(addDecimal(candle.low, decimalPlaces)),
     open: Number(addDecimal(candle.open, decimalPlaces)),
     close: Number(addDecimal(candle.close, decimalPlaces)),
-    volume: Number(candle.volume),
+    volume: Number(addDecimal(candle.volume, positionDecimalPlaces)),
   };
 }

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

@@ -86,17 +86,18 @@ export const RichSelect = forwardRef<
               'z-20',
               'bg-white dark:bg-black',
               'border border-neutral-500 focus:border-black dark:focus:border-white',
-              'overflow-hidden'
+              'overflow-hidden',
+              'shadow-lg'
             )}
-            position={'popper'}
+            position={'item-aligned'}
             side={'bottom'}
             align={'center'}
           >
-            <SelectPrimitive.ScrollUpButton className="flex items-center justify-center p-1 bg-neutral-50 dark:bg-neutral-900">
+            <SelectPrimitive.ScrollUpButton className="flex items-center justify-center p-1 absolute w-full h-6 z-20 bg-gradient-to-t from-transparent to-neutral-50 dark:to-neutral-900">
               <Icon name="chevron-up" />
             </SelectPrimitive.ScrollUpButton>
             <SelectPrimitive.Viewport>{children}</SelectPrimitive.Viewport>
-            <SelectPrimitive.ScrollDownButton className="flex items-center justify-center p-1 bg-neutral-50 dark:bg-neutral-900">
+            <SelectPrimitive.ScrollDownButton className="flex items-center justify-center p-1 absolute bottom-0 w-full h-6 z-20 bg-gradient-to-b from-transparent to-neutral-50 dark:to-neutral-900">
               <Icon name="chevron-down" />
             </SelectPrimitive.ScrollDownButton>
           </SelectPrimitive.Content>