feat(explorer): add settlementasset option to priceinmarket component

.github/workflows/cypress-pr.yml

@@ -50,20 +50,6 @@ jobs:
           projects=[${projects// /,}]
           echo PROJECTS=$projects >> $GITHUB_ENV
 
-      # Rename required because some of the files contains the colon character (in the dates)
-      - name: Rename files to allow archive
-        if: ${{ always() }}
-        run: |
-          while read -r file; do
-            mv "${file}" "$(echo ${file} | sed 's|:|-|g')"
-          done< <(find /home/runner/.vegacapsule/testnet/logs -type f)
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ always() }}
-        with:
-          name: logs-${{ matrix.project }}
-          path: /home/runner/.vegacapsule/testnet/logs
-
     outputs:
       projects: ${{ env.PROJECTS }}
 

.github/workflows/cypress-run.yml

@@ -64,11 +64,13 @@ jobs:
       ######
 
       - name: Run Cypress tests
-        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome --env.grepTags="${{ inputs.tags }}"
+        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
         working-directory: frontend-monorepo
         env:
           CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
+          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
           CYPRESS_VEGA_WALLET_API_TOKEN: ${{ steps.setup-vega.outputs.token }}
+          CYPRESS_grepTags: ${{ inputs.tags }}
 
       ######
       ## Upload logs

.github/workflows/lint_pr.yml

@@ -8,16 +8,14 @@ jobs:
   lint_pr:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
       - name: Use Node.js 16
         id: Node
         uses: actions/setup-node@v2
         with:
           node-version: 16.14.0
-      - name: Install root dependencies
-        run: yarn install
+      - name: Install commitlint cli and config
+        run: npm install @commitlint/cli @commitlint/config-conventional
+      - name: Create config
+        run: echo "module.exports = {extends:['@commitlint/config-conventional']};" > commitlint.config.js
       - name: Check PR title
-        run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js
+        run: echo "${{ github.event.pull_request.title }}" | npx commitlint

apps/explorer/.env.devnet

@@ -6,5 +6,4 @@ NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https:
 NX_VEGA_ENV=DEVNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://dev.token.vega.xyz
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io

apps/explorer/.env.mainnet

@@ -7,4 +7,3 @@ NX_VEGA_ENV=MAINNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest/
 NX_ETHERSCAN_URL=https://etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://token.vega.xyz

apps/explorer/.env.mirror

@@ -7,7 +7,6 @@ NX_VEGA_ENV=MIRROR
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.xyz/rest/
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://mainnet-mirror.token.vega.xyz
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer/.env.sandbox

@@ -6,7 +6,6 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
-NX_TENDERMINT_URL=https://tm.sandbox.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.sandbox.vega.xyz/websocket
+NX_TENDERMINT_URL=https://tm.n01.sandbox.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.sandbox.vega.xyz/websocket
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://sandbox.token.vega.xyz

apps/explorer/.env.stagnet1

@@ -11,4 +11,3 @@ NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz

apps/explorer/.env.stagnet3

@@ -4,6 +4,4 @@ NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
-NX_VEGA_GOVERNANCE_URL=https://stagnet3.token.vega.xyz
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases/
+NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest

apps/explorer/.env.testnet

@@ -10,4 +10,3 @@ NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_NETWORKS={}
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://token.fairground.wtf

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/app.tsx

@@ -8,7 +8,6 @@ import { Main } from './components/main';
 import { TendermintWebsocketProvider } from './contexts/websocket/tendermint-websocket-provider';
 import type { InMemoryCacheConfig } from '@apollo/client';
 import { Footer } from './components/footer/footer';
-import { AnnouncementBanner, ExternalLink } from '@vegaprotocol/ui-toolkit';
 
 function App() {
   const [menuOpen, setMenuOpen] = useState(false);
@@ -41,15 +40,6 @@ function App() {
   return (
     <TendermintWebsocketProvider>
       <NetworkLoader cache={cacheConfig}>
-        <AnnouncementBanner>
-          <div className="font-alpha calt uppercase text-center text-lg text-white">
-            <span className="pr-4">The Mainnet sims are live!</span>
-            <ExternalLink href="https://fairground.wtf/">
-              Come help stress test the network
-            </ExternalLink>
-          </div>
-        </AnnouncementBanner>
-
         <div className={layoutClasses}>
           <Header menuOpen={menuOpen} setMenuOpen={setMenuOpen} />
           <Nav menuOpen={menuOpen} />

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

@@ -4,7 +4,6 @@ import { useExplorerAssetQuery } from './__generated__/Asset';
 import { Link } from 'react-router-dom';
 
 import type { ComponentProps } from 'react';
-import Hash from '../hash';
 
 export type AssetLinkProps = Partial<ComponentProps<typeof Link>> & {
   id: string;
@@ -28,7 +27,7 @@ const AssetLink = ({ id, ...props }: AssetLinkProps) => {
 
   return (
     <Link className="underline" {...props} to={`/${Routes.ASSETS}#${id}`}>
-      <Hash text={label} />
+      {label}
     </Link>
   );
 };

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

@@ -3,7 +3,6 @@ import { Routes } from '../../../routes/route-names';
 import { Link } from 'react-router-dom';
 
 import type { ComponentProps } from 'react';
-import Hash from '../hash';
 
 export type BlockLinkProps = Partial<ComponentProps<typeof Link>> & {
   height: string;
@@ -12,7 +11,7 @@ export type BlockLinkProps = Partial<ComponentProps<typeof Link>> & {
 const BlockLink = ({ height, ...props }: BlockLinkProps) => {
   return (
     <Link className="underline" {...props} to={`/${Routes.BLOCKS}/${height}`}>
-      <Hash text={height} />
+      {height}
     </Link>
   );
 };

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

@@ -1,7 +1,6 @@
 import React from 'react';
 
 import { DATA_SOURCES } from '../../../config';
-import Hash from '../hash';
 
 export enum EthExplorerLinkTypes {
   block = 'block',
@@ -28,7 +27,7 @@ export const EthExplorerLink = ({
       {...props}
       href={link}
     >
-      <Hash text={id} />
+      {id}
     </a>
   );
 };

apps/explorer/src/app/components/links/hash.tsx

@@ -1,18 +0,0 @@
-export type HashProps = {
-  text: string;
-};
-
-/**
- * A simple component that ensures long text things like hashes
- * are broken when they need to wrap. This will remove the need
- * for a lot of the overflow scrolling that currently exists.
- */
-const Hash = ({ text }: HashProps) => {
-  return (
-    <code className="break-all font-mono" style={{ wordWrap: 'break-word' }}>
-      {text}
-    </code>
-  );
-};
-
-export default Hash;

apps/explorer/src/app/components/links/market-link/Market.graphql

@@ -2,7 +2,6 @@ query ExplorerMarket($id: ID!) {
   market(id: $id) {
     id
     decimalPlaces
-    positionDecimalPlaces
     tradableInstrument {
       instrument {
         name

apps/explorer/src/app/components/links/market-link/__generated__/Market.ts

@@ -8,7 +8,7 @@ export type ExplorerMarketQueryVariables = Types.Exact<{
 }>;
 
 
-export type ExplorerMarketQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', decimals: number } } } } } | null };
+export type ExplorerMarketQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', decimals: number } } } } } | null };
 
 
 export const ExplorerMarketDocument = gql`
@@ -16,7 +16,6 @@ export const ExplorerMarketDocument = gql`
   market(id: $id) {
     id
     decimalPlaces
-    positionDecimalPlaces
     tradableInstrument {
       instrument {
         name

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

@@ -55,7 +55,6 @@ describe('Market link component', () => {
           market: {
             id: '123',
             decimalPlaces: 5,
-            positionDecimalPlaces: 2,
             state: 'irrelevant-test-data',
             tradableInstrument: {
               instrument: {

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

@@ -1,14 +1,13 @@
+import React from 'react';
 import { Routes } from '../../../routes/route-names';
 import { useExplorerMarketQuery } from './__generated__/Market';
 import { Link } from 'react-router-dom';
 
 import type { ComponentProps } from 'react';
 import { t } from '@vegaprotocol/react-helpers';
-import Hash from '../hash';
 
 export type MarketLinkProps = Partial<ComponentProps<typeof Link>> & {
   id: string;
-  showMarketName?: boolean;
 };
 
 /**
@@ -16,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 },
   });
@@ -36,31 +31,17 @@ const MarketLink = ({
           <span role="img" aria-label="Unknown market" className="img">
             ⚠️&nbsp;{t('Invalid market')}
           </span>
-          &nbsp;
-          <Hash text={id} />
+          &nbsp;{id}
         </div>
       );
     }
   }
 
-  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}`}>
-        <Hash text={id} />
-      </Link>
-    );
-  }
+  return (
+    <Link className="underline" {...props} to={`/${Routes.MARKETS}#${id}`}>
+      {label}
+    </Link>
+  );
 };
 
 export default MarketLink;

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

@@ -4,7 +4,6 @@ import { useExplorerNodeQuery } from './__generated__/Node';
 import { Link } from 'react-router-dom';
 
 import type { ComponentProps } from 'react';
-import Hash from '../hash';
 
 export type NodeLinkProps = Partial<ComponentProps<typeof Link>> & {
   id: string;
@@ -23,7 +22,7 @@ const NodeLink = ({ id, ...props }: NodeLinkProps) => {
 
   return (
     <Link className="underline" {...props} to={`/${Routes.VALIDATORS}#${id}`}>
-      <Hash text={label} />
+      <code>{label}</code>
     </Link>
   );
 };

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

@@ -1,23 +0,0 @@
-import { Routes } from '../../../routes/route-names';
-import { Link } from 'react-router-dom';
-
-import type { ComponentProps } from 'react';
-import Hash from '../hash';
-
-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}`}
-    >
-      <Hash text={id} />
-    </Link>
-  );
-};
-
-export default OracleLink;

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

@@ -2,7 +2,6 @@ import { Routes } from '../../../routes/route-names';
 import { Link } from 'react-router-dom';
 
 import type { ComponentProps } from 'react';
-import Hash from '../hash';
 
 export type PartyLinkProps = Partial<ComponentProps<typeof Link>> & {
   id: string;
@@ -15,7 +14,7 @@ const PartyLink = ({ id, ...props }: PartyLinkProps) => {
       {...props}
       to={`/${Routes.PARTIES}/${id}`}
     >
-      <Hash text={id} />
+      {id}
     </Link>
   );
 };

apps/explorer/src/app/components/links/proposal-link/Proposal.graphql

@@ -1,9 +0,0 @@
-query ExplorerProposal($id: ID!) {
-  proposal(id: $id) {
-    id
-    rationale {
-      title
-      description
-    }
-  }
-}

apps/explorer/src/app/components/links/proposal-link/__generated__/Proposal.ts

@@ -1,52 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ExplorerProposalQueryVariables = Types.Exact<{
-  id: Types.Scalars['ID'];
-}>;
-
-
-export type ExplorerProposalQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string } } | null };
-
-
-export const ExplorerProposalDocument = gql`
-    query ExplorerProposal($id: ID!) {
-  proposal(id: $id) {
-    id
-    rationale {
-      title
-      description
-    }
-  }
-}
-    `;
-
-/**
- * __useExplorerProposalQuery__
- *
- * To run a query within a React component, call `useExplorerProposalQuery` and pass it any options that fit your needs.
- * When your component renders, `useExplorerProposalQuery` 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 } = useExplorerProposalQuery({
- *   variables: {
- *      id: // value for 'id'
- *   },
- * });
- */
-export function useExplorerProposalQuery(baseOptions: Apollo.QueryHookOptions<ExplorerProposalQuery, ExplorerProposalQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ExplorerProposalQuery, ExplorerProposalQueryVariables>(ExplorerProposalDocument, options);
-      }
-export function useExplorerProposalLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerProposalQuery, ExplorerProposalQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ExplorerProposalQuery, ExplorerProposalQueryVariables>(ExplorerProposalDocument, options);
-        }
-export type ExplorerProposalQueryHookResult = ReturnType<typeof useExplorerProposalQuery>;
-export type ExplorerProposalLazyQueryHookResult = ReturnType<typeof useExplorerProposalLazyQuery>;
-export type ExplorerProposalQueryResult = Apollo.QueryResult<ExplorerProposalQuery, ExplorerProposalQueryVariables>;

apps/explorer/src/app/components/links/proposal-link/proposal-link.spec.tsx

@@ -1,82 +0,0 @@
-import { MemoryRouter } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-import type { MockedResponse } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import ProposalLink from './proposal-link';
-import { ExplorerProposalDocument } from './__generated__/Proposal';
-import { GraphQLError } from 'graphql';
-
-function renderComponent(id: string, mocks: MockedResponse[]) {
-  return (
-    <MockedProvider mocks={mocks} addTypename={false}>
-      <MemoryRouter>
-        <ProposalLink id={id} />
-      </MemoryRouter>
-    </MockedProvider>
-  );
-}
-
-describe('Proposal link component', () => {
-  it('Renders the ID at first', () => {
-    const res = render(renderComponent('123', []));
-    expect(res.getByText('123')).toBeInTheDocument();
-  });
-
-  it('Renders the ID on error', async () => {
-    const mock = {
-      request: {
-        query: ExplorerProposalDocument,
-        variables: {
-          id: '456',
-        },
-      },
-      result: {
-        errors: [new GraphQLError('No such proposal')],
-      },
-    };
-    const res = render(renderComponent('456', [mock]));
-    // The ID
-    expect(res.getByText('456')).toBeInTheDocument();
-  });
-
-  it('Renders the proposal title when the query returns a result', async () => {
-    const mock = {
-      request: {
-        query: ExplorerProposalDocument,
-        variables: {
-          id: '123',
-        },
-      },
-      result: {
-        data: {
-          proposal: {
-            id: '123',
-            rationale: {
-              title: 'test-title',
-              description: 'test description',
-            },
-          },
-        },
-      },
-    };
-
-    const res = render(renderComponent('123', [mock]));
-    expect(res.getByText('123')).toBeInTheDocument();
-    expect(await res.findByText('test-title')).toBeInTheDocument();
-  });
-
-  it('Leaves the proposal id when the market is not found', async () => {
-    const mock = {
-      request: {
-        query: ExplorerProposalDocument,
-        variables: {
-          id: '123',
-        },
-      },
-      error: new Error('No such asset'),
-    };
-
-    const res = render(renderComponent('123', [mock]));
-    expect(await res.findByText('123')).toBeInTheDocument();
-  });
-});

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

@@ -1,28 +0,0 @@
-import { useExplorerProposalQuery } from './__generated__/Proposal';
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { ENV } from '../../../config/env';
-import Hash from '../hash';
-export type ProposalLinkProps = {
-  id: string;
-};
-
-/**
- * Given a proposal ID, generates an external link over to
- * the Governance page for more information
- */
-const ProposalLink = ({ id }: ProposalLinkProps) => {
-  const { data } = useExplorerProposalQuery({
-    variables: { id },
-  });
-
-  const base = ENV.dataSources.governanceUrl;
-  const label = data?.proposal?.rationale.title || id;
-
-  return (
-    <ExternalLink href={`${base}/proposals/${id}`}>
-      <Hash text={label} />
-    </ExternalLink>
-  );
-};
-
-export default ProposalLink;

apps/explorer/src/app/components/nested-data-list/nested-data-list.tsx

@@ -117,7 +117,7 @@ const NestedDataListItem = ({
           )}
         </h4>
         {!hasChildren && (
-          <code className="text-vega-light-100 mb-2 last:mb-0 dark:text-vega-dark-100 break-all">
+          <code className="text-vega-light-400 mb-2 last:mb-0 dark:text-vega-dark-400 break-all">
             {JSON.stringify(value, null, '  ')}
           </code>
         )}

apps/explorer/src/app/components/order-details/Order.graphql

@@ -19,7 +19,6 @@ fragment ExplorerDeterministicOrderFields on Order {
   market {
     id
     decimalPlaces
-    positionDecimalPlaces
     tradableInstrument {
       instrument {
         name

apps/explorer/src/app/components/order-details/__generated__/Order.ts

@@ -3,7 +3,7 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ExplorerDeterministicOrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } };
+export type ExplorerDeterministicOrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } };
 
 export type ExplorerDeterministicOrderQueryVariables = Types.Exact<{
   orderId: Types.Scalars['ID'];
@@ -11,7 +11,7 @@ export type ExplorerDeterministicOrderQueryVariables = Types.Exact<{
 }>;
 
 
-export type ExplorerDeterministicOrderQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } } };
+export type ExplorerDeterministicOrderQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } } };
 
 export const ExplorerDeterministicOrderFieldsFragmentDoc = gql`
     fragment ExplorerDeterministicOrderFields on Order {
@@ -35,7 +35,6 @@ export const ExplorerDeterministicOrderFieldsFragmentDoc = gql`
   market {
     id
     decimalPlaces
-    positionDecimalPlaces
     tradableInstrument {
       instrument {
         name

apps/explorer/src/app/components/order-details/amend-order-details.spec.tsx

@@ -61,7 +61,6 @@ function renderExistingAmend(id: string, version: number, amend: Amend) {
               __typename: 'Market',
               id: '789',
               state: 'STATUS_ACTIVE',
-              positionDecimalPlaces: 2,
               decimalPlaces: '5',
               tradableInstrument: {
                 instrument: {
@@ -89,7 +88,6 @@ function renderExistingAmend(id: string, version: number, amend: Amend) {
           market: {
             id: '789',
             decimalPlaces: 5,
-            positionDecimalPlaces: 2,
             state: 'irrelevant-test-data',
             tradableInstrument: {
               instrument: {

apps/explorer/src/app/components/order-details/deterministic-order-details.tsx

@@ -4,7 +4,6 @@ import { MarketLink } from '../links';
 import PriceInMarket from '../price-in-market/price-in-market';
 import { Time } from '../time';
 import { sideText, statusText, tifFull, tifShort } from './lib/order-labels';
-import SizeInMarket from '../size-in-market/size-in-market';
 
 export interface DeterministicOrderDetailsProps {
   id: string;
@@ -91,7 +90,7 @@ const DeterministicOrderDetails = ({
             <div className="mb-12 md:mb-0">
               <h2 className="text-2xl font-bold text-dark mb-4">{t('Size')}</h2>
               <h5 className="text-lg font-medium text-gray-500 mb-0">
-                <SizeInMarket size={o.size} marketId={o.market.id} />
+                {o.size}
               </h5>
             </div>
 

apps/explorer/src/app/components/order-summary/order-summary.spec.tsx

@@ -38,7 +38,6 @@ const mock = {
           __typename: 'Market',
           id: '789',
           state: 'STATE_ACTIVE',
-          positionDecimalPlaces: 2,
           decimalPlaces: 2,
           tradableInstrument: {
             instrument: {

apps/explorer/src/app/components/order-summary/order-tx-summary.spec.tsx

@@ -90,7 +90,6 @@ describe('Order TX Summary component', () => {
           market: {
             id: '123',
             decimalPlaces: 2,
-            positionDecimalPlaces: 2,
             state: 'irrelevant-test-data',
             tradableInstrument: {
               instrument: {

apps/explorer/src/app/components/price-in-market/price-in-market.spec.tsx

@@ -37,7 +37,6 @@ const fullMock = {
       market: {
         id: '123',
         decimalPlaces: 2,
-        positionDecimalPlaces: 2,
         state: 'irrelevant-test-data',
         tradableInstrument: {
           instrument: {

apps/explorer/src/app/components/render-fetched/index.tsx

@@ -1,4 +1,5 @@
 import { t } from '@vegaprotocol/react-helpers';
+import React from 'react';
 import { StatusMessage } from '../status-message';
 
 interface RenderFetchedProps {

apps/explorer/src/app/components/search/search.tsx

@@ -66,9 +66,7 @@ export const Search = () => {
             className="text-white"
             hasError={Boolean(error?.message)}
             type="text"
-            placeholder={t(
-              'Enter block number, public key or transaction hash'
-            )}
+            placeholder={t('Enter block number, party id or transaction hash')}
           />
           {error?.message && (
             <div className="bg-white border border-t-0 border-accent absolute top-[100%] flex-1 w-full pb-2 px-2 rounded-b text-black">

apps/explorer/src/app/components/size-in-market/size-in-market.spec.tsx

@@ -1,69 +0,0 @@
-import { MemoryRouter } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-import type { MockedResponse } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import SizeInMarket from './size-in-market';
-import type { DecimalSource } from './size-in-market';
-import { ExplorerMarketDocument } from '../links/market-link/__generated__/Market';
-
-function renderComponent(
-  price: string,
-  marketId: string,
-  mocks: MockedResponse[],
-  decimalSource: DecimalSource = 'MARKET'
-) {
-  return (
-    <MockedProvider mocks={mocks} addTypename={false}>
-      <MemoryRouter>
-        <SizeInMarket
-          marketId={marketId}
-          size={price}
-          decimalSource={decimalSource}
-        />
-      </MemoryRouter>
-    </MockedProvider>
-  );
-}
-
-const fullMock = {
-  request: {
-    query: ExplorerMarketDocument,
-    variables: {
-      id: '123',
-    },
-  },
-  result: {
-    data: {
-      market: {
-        id: '123',
-        decimalPlaces: 2,
-        positionDecimalPlaces: 2,
-        state: 'irrelevant-test-data',
-        tradableInstrument: {
-          instrument: {
-            name: 'test dai',
-            product: {
-              __typename: 'Future',
-              quoteName: 'dai',
-              settlementAsset: {
-                decimals: 18,
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-};
-
-describe('Size in Market component', () => {
-  it('Renders the raw size when there is no market data', () => {
-    const res = render(renderComponent('100', '123', []));
-    expect(res.getByText('100')).toBeInTheDocument();
-  });
-
-  it('Renders the formatted size when market data is fetched', async () => {
-    const res = render(renderComponent('100', '123', [fullMock]));
-    expect(await res.findByText('1.00')).toBeInTheDocument();
-  });
-});

apps/explorer/src/app/components/size-in-market/size-in-market.tsx

@@ -1,41 +0,0 @@
-import { addDecimalsFormatNumber } from '@vegaprotocol/react-helpers';
-import { useExplorerMarketQuery } from '../links/market-link/__generated__/Market';
-
-export type DecimalSource = 'MARKET';
-
-export type PriceInMarketProps = {
-  marketId: string;
-  size: string | number;
-  decimalSource?: DecimalSource;
-};
-
-/**
- * Given a market ID and an order size it will fetch the market
- * order size, and format the size accordingly
- */
-const SizeInMarket = ({
-  marketId,
-  size,
-  decimalSource = 'MARKET',
-}: PriceInMarketProps) => {
-  const { data } = useExplorerMarketQuery({
-    variables: { id: marketId },
-    fetchPolicy: 'cache-first',
-  });
-
-  let label = size;
-
-  if (data) {
-    if (decimalSource === 'MARKET' && data.market?.positionDecimalPlaces) {
-      label = addDecimalsFormatNumber(size, data.market.positionDecimalPlaces);
-    }
-  }
-
-  return (
-    <label>
-      <span>{label}</span>
-    </label>
-  );
-};
-
-export default SizeInMarket;

apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-deposit.spec.tsx

@@ -63,21 +63,15 @@ describe('Chain Event: Builtin asset deposit', () => {
     expect(screen.getByText(t('Recipient'))).toBeInTheDocument();
     const partyLink = screen.getByText(`${fullMock.partyId}`);
     expect(partyLink).toBeInTheDocument();
-    if (!partyLink.parentElement) {
-      throw new Error('Party link does not exist');
-    }
-    expect(partyLink.parentElement.tagName).toEqual('A');
-    expect(partyLink.parentElement.getAttribute('href')).toEqual(
+    expect(partyLink.tagName).toEqual('A');
+    expect(partyLink.getAttribute('href')).toEqual(
       `/parties/${fullMock.partyId}`
     );
 
     const assetLink = screen.getByText(`${fullMock.vegaAssetId}`);
     expect(assetLink).toBeInTheDocument();
-    if (!assetLink.parentElement) {
-      throw new Error('Asset link does not exist');
-    }
-    expect(assetLink.parentElement.tagName).toEqual('A');
-    expect(assetLink.parentElement.getAttribute('href')).toEqual(
+    expect(assetLink.tagName).toEqual('A');
+    expect(assetLink.getAttribute('href')).toEqual(
       `/assets#${fullMock.vegaAssetId}`
     );
   });

apps/explorer/src/app/components/txs/details/chain-events/tx-builtin-withdrawal.spec.tsx

@@ -69,21 +69,15 @@ describe('Chain Event: Builtin asset withdrawal', () => {
     expect(screen.getByText(t('Recipient'))).toBeInTheDocument();
     const partyLink = screen.getByText(`${fullMock.partyId}`);
     expect(partyLink).toBeInTheDocument();
-    if (!partyLink.parentElement) {
-      throw new Error('Party link does not exist');
-    }
-    expect(partyLink.parentElement.tagName).toEqual('A');
-    expect(partyLink.parentElement.getAttribute('href')).toEqual(
+    expect(partyLink.tagName).toEqual('A');
+    expect(partyLink.getAttribute('href')).toEqual(
       `/parties/${fullMock.partyId}`
     );
 
     const assetLink = screen.getByText(`${fullMock.vegaAssetId}`);
     expect(assetLink).toBeInTheDocument();
-    if (!assetLink.parentElement) {
-      throw new Error('Asset link does not exist');
-    }
-    expect(assetLink.parentElement.tagName).toEqual('A');
-    expect(assetLink.parentElement.getAttribute('href')).toEqual(
+    expect(assetLink.tagName).toEqual('A');
+    expect(assetLink.getAttribute('href')).toEqual(
       `/assets#${fullMock.vegaAssetId}`
     );
   });

apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-delist.spec.tsx

@@ -60,11 +60,8 @@ describe('Chain Event: ERC20 Asset Delist', () => {
 
     const assetLink = screen.getByText(`${fullMock.vegaAssetId}`);
     expect(assetLink).toBeInTheDocument();
-    if (!assetLink.parentElement) {
-      throw new Error('Asset link does not exist');
-    }
-    expect(assetLink.parentElement.tagName).toEqual('A');
-    expect(assetLink.parentElement.getAttribute('href')).toEqual(
+    expect(assetLink.tagName).toEqual('A');
+    expect(assetLink.getAttribute('href')).toEqual(
       `/assets#${fullMock.vegaAssetId}`
     );
   });

apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.spec.tsx

@@ -76,20 +76,14 @@ describe('Chain Event: ERC20 Asset limits updated', () => {
     expect(screen.getByText(t('Vega asset'))).toBeInTheDocument();
     const assetLink = screen.getByText(`${fullMock.vegaAssetId}`);
     expect(assetLink).toBeInTheDocument();
-    if (!assetLink.parentElement) {
-      throw new Error('Asset link does not exist');
-    }
-    expect(assetLink.parentElement.tagName).toEqual('A');
-    expect(assetLink.parentElement.getAttribute('href')).toEqual(
+    expect(assetLink.tagName).toEqual('A');
+    expect(assetLink.getAttribute('href')).toEqual(
       `/assets#${fullMock.vegaAssetId}`
     );
 
     expect(screen.getByText(t('ERC20 asset'))).toBeInTheDocument();
     const ethLink = screen.getByText(`${fullMock.sourceEthereumAddress}`);
-    if (!ethLink.parentElement) {
-      throw new Error('ETH link does not exist');
-    }
-    expect(ethLink.parentElement.getAttribute('href')).toContain(
+    expect(ethLink.getAttribute('href')).toContain(
       `/address/${fullMock.sourceEthereumAddress}`
     );
   });

apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.spec.tsx

@@ -62,20 +62,14 @@ describe('Chain Event: ERC20 Asset List', () => {
     expect(screen.getByText(t('Added Vega asset'))).toBeInTheDocument();
     const assetLink = screen.getByText(`${fullMock.vegaAssetId}`);
     expect(assetLink).toBeInTheDocument();
-    if (!assetLink.parentElement) {
-      throw new Error('Asset link does not exist');
-    }
-    expect(assetLink.parentElement.tagName).toEqual('A');
-    expect(assetLink.parentElement.getAttribute('href')).toEqual(
+    expect(assetLink.tagName).toEqual('A');
+    expect(assetLink.getAttribute('href')).toEqual(
       `/assets#${fullMock.vegaAssetId}`
     );
 
     expect(screen.getByText(t('Source'))).toBeInTheDocument();
     const ethLink = screen.getByText(`${fullMock.assetSource}`);
-    if (!ethLink.parentElement) {
-      throw new Error('Asset link does not exist');
-    }
-    expect(ethLink.parentElement.getAttribute('href')).toContain(
+    expect(ethLink.getAttribute('href')).toContain(
       `/address/${fullMock.assetSource}`
     );
   });

apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.spec.tsx

@@ -62,30 +62,21 @@ describe('Chain Event: ERC20 asset deposit', () => {
     expect(screen.getByText(t('Recipient'))).toBeInTheDocument();
     const partyLink = screen.getByText(`${fullMock.targetPartyId}`);
     expect(partyLink).toBeInTheDocument();
-    if (!partyLink.parentElement) {
-      throw new Error('Party link does not exist');
-    }
-    expect(partyLink.parentElement.tagName).toEqual('A');
-    expect(partyLink.parentElement.getAttribute('href')).toEqual(
+    expect(partyLink.tagName).toEqual('A');
+    expect(partyLink.getAttribute('href')).toEqual(
       `/parties/${fullMock.targetPartyId}`
     );
 
     const assetLink = screen.getByText(`${fullMock.vegaAssetId}`);
     expect(assetLink).toBeInTheDocument();
-    if (!assetLink.parentElement) {
-      throw new Error('Asset link does not exist');
-    }
-    expect(assetLink.parentElement.tagName).toEqual('A');
-    expect(assetLink.parentElement.getAttribute('href')).toEqual(
+    expect(assetLink.tagName).toEqual('A');
+    expect(assetLink.getAttribute('href')).toEqual(
       `/assets#${fullMock.vegaAssetId}`
     );
 
     expect(screen.getByText(t('Source'))).toBeInTheDocument();
     const ethLink = screen.getByText(`${fullMock.sourceEthereumAddress}`);
-    if (!ethLink.parentElement) {
-      throw new Error('ETH link does not exist');
-    }
-    expect(ethLink.parentElement.getAttribute('href')).toContain(
+    expect(ethLink.getAttribute('href')).toContain(
       `/address/${fullMock.sourceEthereumAddress}`
     );
   });

apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.spec.tsx

@@ -57,20 +57,14 @@ describe('Chain Event: ERC20 asset deposit', () => {
     expect(screen.getByText(t('Asset'))).toBeInTheDocument();
     const assetLink = screen.getByText(`${fullMock.vegaAssetId}`);
     expect(assetLink).toBeInTheDocument();
-    if (!assetLink.parentElement) {
-      throw new Error('Asset link does not exist');
-    }
-    expect(assetLink.parentElement.tagName).toEqual('A');
-    expect(assetLink.parentElement.getAttribute('href')).toEqual(
+    expect(assetLink.tagName).toEqual('A');
+    expect(assetLink.getAttribute('href')).toEqual(
       `/assets#${fullMock.vegaAssetId}`
     );
 
     expect(screen.getByText(t('Recipient'))).toBeInTheDocument();
     const ethLink = screen.getByText(`${fullMock.targetEthereumAddress}`);
-    if (!ethLink.parentElement) {
-      throw new Error('ETH link does not exist');
-    }
-    expect(ethLink.parentElement.getAttribute('href')).toContain(
+    expect(ethLink.getAttribute('href')).toContain(
       `/address/${fullMock.targetEthereumAddress}`
     );
   });

apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.spec.tsx

@@ -64,20 +64,14 @@ describe('Chain Event: Stake deposit', () => {
     expect(screen.getByText(t('Recipient'))).toBeInTheDocument();
     const partyLink = screen.getByText(`${fullMock.vegaPublicKey}`);
     expect(partyLink).toBeInTheDocument();
-    if (!partyLink.parentElement) {
-      throw new Error('Party link does not exist');
-    }
-    expect(partyLink.parentElement.tagName).toEqual('A');
-    expect(partyLink.parentElement.getAttribute('href')).toEqual(
+    expect(partyLink.tagName).toEqual('A');
+    expect(partyLink.getAttribute('href')).toEqual(
       `/parties/${fullMock.vegaPublicKey}`
     );
 
     expect(screen.getByText(t('Source'))).toBeInTheDocument();
     const ethLink = screen.getByText(`${fullMock.ethereumAddress}`);
-    if (!ethLink.parentElement) {
-      throw new Error('ETH link does not exist');
-    }
-    expect(ethLink.parentElement.getAttribute('href')).toContain(
+    expect(ethLink.getAttribute('href')).toContain(
       `/address/${fullMock.ethereumAddress}`
     );
   });

apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.spec.tsx

@@ -64,20 +64,14 @@ describe('Chain Event: Stake remove', () => {
     expect(screen.getByText(t('Recipient'))).toBeInTheDocument();
     const partyLink = screen.getByText(`${fullMock.vegaPublicKey}`);
     expect(partyLink).toBeInTheDocument();
-    if (!partyLink.parentElement) {
-      throw new Error('Party link does not exist');
-    }
-    expect(partyLink.parentElement.tagName).toEqual('A');
-    expect(partyLink.parentElement.getAttribute('href')).toEqual(
+    expect(partyLink.tagName).toEqual('A');
+    expect(partyLink.getAttribute('href')).toEqual(
       `/parties/${fullMock.vegaPublicKey}`
     );
 
     expect(screen.getByText(t('Source'))).toBeInTheDocument();
     const ethLink = screen.getByText(`${fullMock.ethereumAddress}`);
-    if (!ethLink.parentElement) {
-      throw new Error('ETH link does not exist');
-    }
-    expect(ethLink.parentElement.getAttribute('href')).toContain(
+    expect(ethLink.getAttribute('href')).toContain(
       `/address/${fullMock.ethereumAddress}`
     );
   });

apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.spec.tsx

@@ -66,10 +66,7 @@ describe('Chain Event: Stake total supply change', () => {
 
     expect(screen.getByText(t('Source'))).toBeInTheDocument();
     const ethLink = screen.getByText(`${fullMock.tokenAddress}`);
-    if (!ethLink.parentElement) {
-      throw new Error('ETH link does not exist');
-    }
-    expect(ethLink.parentElement.getAttribute('href')).toContain(
+    expect(ethLink.getAttribute('href')).toContain(
       `/address/${fullMock.tokenAddress}`
     );
   });

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

@@ -7,8 +7,6 @@ import type { BlockExplorerTransactionResult } from '../../../../routes/types/bl
 import type { TendermintBlocksResponse } from '../../../../routes/blocks/tendermint-blocks-response';
 import { Time } from '../../../time';
 import { ChainResponseCode } from '../chain-response-code/chain-reponse.code';
-import { TxDataView } from '../../tx-data-view';
-import Hash from '../../../links/hash';
 
 interface TxDetailsSharedProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -48,7 +46,7 @@ export const TxDetailsShared = ({
       <TableRow modifier="bordered">
         <TableCell {...sharedHeaderProps}>{t('Hash')}</TableCell>
         <TableCell>
-          <Hash text={txData.hash} />
+          <code>{txData.hash}</code>
         </TableCell>
       </TableRow>
       <TableRow modifier="bordered">
@@ -84,12 +82,6 @@ export const TxDetailsShared = ({
           <ChainResponseCode code={txData.code} error={txData.error} />
         </TableCell>
       </TableRow>
-      <TableRow modifier="bordered">
-        <TableCell {...sharedHeaderProps}>{t('Transaction')}</TableCell>
-        <TableCell>
-          <TxDataView blockData={blockData} txData={txData} />
-        </TableCell>
-      </TableRow>
     </>
   );
 };

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

@@ -1,62 +0,0 @@
-import { t } from '@vegaprotocol/react-helpers';
-import { TxDetailsShared } from './shared/tx-details-shared';
-import { TableCell, TableRow, TableWithTbody } from '../../table';
-import { BlockLink } from '../../links';
-import { StatusMessage } from '../../status-message';
-import { ENV } from '../../../config/env';
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import type { components } from '../../../../types/explorer';
-
-interface TxDetailsProtocolUpgradeProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-/**
- * Validator event: Protocol Upgrade proposal
- */
-export const TxDetailsProtocolUpgrade = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxDetailsProtocolUpgradeProps) => {
-  if (!txData) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  const upgrade: components['schemas']['v1ProtocolUpgradeProposal'] =
-    txData.command.protocolUpgradeProposal;
-
-  if (!upgrade || !upgrade.upgradeBlockHeight || !upgrade.vegaReleaseTag) {
-    return (
-      <StatusMessage>{t('Invalid upgrade proposal format')}</StatusMessage>
-    );
-  }
-
-  const urlBase = ENV.dataSources.vegaRepoUrl;
-  const release = upgrade.vegaReleaseTag;
-
-  return (
-    <TableWithTbody className="mb-8">
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      <TableRow modifier="bordered">
-        <TableCell>{t('Upgrade at block')}</TableCell>
-        <TableCell>
-          <BlockLink height={upgrade.upgradeBlockHeight} />
-        </TableCell>
-      </TableRow>
-      <TableRow modifier="bordered">
-        <TableCell>{t('Upgrade to')}</TableCell>
-        <TableCell>
-          <ExternalLink href={`${urlBase}${release}`}>
-            {upgrade.vegaReleaseTag}
-          </ExternalLink>
-        </TableCell>
-      </TableRow>
-    </TableWithTbody>
-  );
-};

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

@@ -8,8 +8,10 @@ import { TxDetailsHeartbeat } from './tx-hearbeat';
 import { TxDetailsGeneric } from './tx-generic';
 import { TxDetailsBatch } from './tx-batch';
 import { TxDetailsChainEvent } from './tx-chain-event';
+import { TxContent } from '../../../routes/txs/id/tx-content';
 import { TxDetailsNodeVote } from './tx-node-vote';
 import { TxDetailsOrderCancel } from './tx-order-cancel';
+import get from 'lodash/get';
 import { TxDetailsOrderAmend } from './tx-order-amend';
 import { TxDetailsWithdrawSubmission } from './tx-withdraw-submission';
 import { TxDetailsDelegate } from './tx-delegation';
@@ -18,9 +20,6 @@ import { TxDetailsLiquiditySubmission } from './tx-liquidity-submission';
 import { TxDetailsLiquidityAmendment } from './tx-liquidity-amend';
 import { TxDetailsLiquidityCancellation } from './tx-liquidity-cancel';
 import { TxDetailsDataSubmission } from './tx-data-submission';
-import { TxProposalVote } from './tx-proposal-vote';
-import { TxDetailsProtocolUpgrade } from './tx-details-protocol-upgrade';
-import { TxDetailsIssueSignatures } from './tx-issue-signatures';
 
 interface TxDetailsWrapperProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -46,9 +45,23 @@ export const TxDetailsWrapper = ({
     return <>{t('Awaiting Block Explorer transaction details')}</>;
   }
 
+  const raw = get(blockData, `result.block.data.txs[${txData.index}]`);
+
   return (
     <div key={`txd-${txData.hash}`}>
       <section>{child({ txData, pubKey, blockData })}</section>
+
+      <details title={t('Decoded transaction')} className="mt-3">
+        <summary className="cursor-pointer">{t('Decoded transaction')}</summary>
+        <TxContent data={txData} />
+      </details>
+
+      {raw ? (
+        <details title={t('Raw transaction')} className="mt-3">
+          <summary className="cursor-pointer">{t('Raw transaction')}</summary>
+          <code className="break-all font-mono text-xs">{raw}</code>
+        </details>
+      ) : null}
     </div>
   );
 };
@@ -68,22 +81,16 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
 
   // These come from https://github.com/vegaprotocol/vega/blob/develop/core/txn/command.go#L72-L98
   switch (txData.type) {
-    case 'Issue Signatures':
-      return TxDetailsIssueSignatures;
     case 'Submit Order':
       return TxDetailsOrder;
     case 'Submit Oracle Data':
       return TxDetailsDataSubmission;
-    case 'Protocol Upgrade':
-      return TxDetailsProtocolUpgrade;
     case 'Cancel Order':
       return TxDetailsOrderCancel;
     case 'Amend Order':
       return TxDetailsOrderAmend;
     case 'Validator Heartbeat':
       return TxDetailsHeartbeat;
-    case 'Vote on Proposal':
-      return TxProposalVote;
     case 'Batch Market Instructions':
       return TxDetailsBatch;
     case 'Chain Event':

apps/explorer/src/app/components/txs/details/tx-eth-key-rotate.tsx

@@ -1,80 +0,0 @@
-import { t } from '@vegaprotocol/react-helpers';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import { TxDetailsShared } from './shared/tx-details-shared';
-import { TableCell, TableRow, TableWithTbody } from '../../table';
-import type { components } from '../../../../types/explorer';
-import {
-  EthExplorerLink,
-  EthExplorerLinkTypes,
-} from '../../links/eth-explorer-link/eth-explorer-link';
-import { BlockLink } from '../../links';
-
-type EthKeyRotate = components['schemas']['v1EthereumKeyRotateSubmission'];
-interface TxDetailsEthKeyRotateProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-/**
- * A node is changing ethereum key
- */
-export const TxDetailsEthKeyRotate = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxDetailsEthKeyRotateProps) => {
-  if (!txData) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  const k: EthKeyRotate = txData.command;
-
-  return (
-    <TableWithTbody className="mb-8">
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      {k.targetBlock ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Target block')}</TableCell>
-          <TableCell>
-            <BlockLink height={k.targetBlock} />
-          </TableCell>
-        </TableRow>
-      ) : null}
-      {k.currentAddress ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Old Address')}</TableCell>
-          <TableCell>
-            <EthExplorerLink
-              type={EthExplorerLinkTypes.address}
-              id={k.currentAddress}
-            />
-          </TableCell>
-        </TableRow>
-      ) : null}
-      {k.newAddress ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('New Address')}</TableCell>
-          <TableCell>
-            <EthExplorerLink
-              type={EthExplorerLinkTypes.address}
-              id={k.newAddress}
-            />
-          </TableCell>
-        </TableRow>
-      ) : null}
-      {k.submitterAddress ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Submitter address')}</TableCell>
-          <TableCell>
-            <EthExplorerLink
-              type={EthExplorerLinkTypes.address}
-              id={k.submitterAddress}
-            />
-          </TableCell>
-        </TableRow>
-      ) : null}
-    </TableWithTbody>
-  );
-};

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

@@ -11,7 +11,8 @@ interface TxDetailsGenericProps {
 }
 
 /**
- * A node is
+ * If there is not yet a custom component for a transaction, just display
+ * the basic details. This allows someone to view the decoded transaction.
  */
 export const TxDetailsGeneric = ({
   txData,

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

@@ -1,77 +0,0 @@
-import { t } from '@vegaprotocol/react-helpers';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import { TxDetailsShared } from './shared/tx-details-shared';
-import { TableRow, TableCell, TableWithTbody } from '../../table';
-
-import type { components } from '../../../../types/explorer';
-import {
-  EthExplorerLink,
-  EthExplorerLinkTypes,
-} from '../../links/eth-explorer-link/eth-explorer-link';
-import { NodeLink } from '../../links';
-
-type Command = components['schemas']['v1IssueSignatures'];
-
-const kind: Record<components['schemas']['v1NodeSignatureKind'], string> = {
-  NODE_SIGNATURE_KIND_UNSPECIFIED: 'Unspecified',
-  NODE_SIGNATURE_KIND_ASSET_NEW: 'New asset',
-  NODE_SIGNATURE_KIND_ASSET_WITHDRAWAL: 'Asset withdrawal',
-  NODE_SIGNATURE_KIND_ASSET_UPDATE: ' Asset update',
-  NODE_SIGNATURE_KIND_ERC20_MULTISIG_SIGNER_ADDED: 'Multisig signer added',
-  NODE_SIGNATURE_KIND_ERC20_MULTISIG_SIGNER_REMOVED: 'Multisig signer removed',
-};
-
-interface TxDetailsGenericProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-/**
- * If there is not yet a custom component for a transaction, just display
- * the basic details. This allows someone to view the decoded transaction.
- */
-export const TxDetailsIssueSignatures = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxDetailsGenericProps) => {
-  if (!txData) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  const cmd: Command = txData.command;
-  const k = cmd.kind ? kind[cmd.kind] : null;
-
-  return (
-    <TableWithTbody className="mb-8">
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      {k ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Kind')}</TableCell>
-          <TableCell>{k}</TableCell>
-        </TableRow>
-      ) : null}
-      {cmd.submitter ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('ETH key')}</TableCell>
-          <TableCell>
-            <EthExplorerLink
-              id={cmd.submitter}
-              type={EthExplorerLinkTypes.address}
-            />
-          </TableCell>
-        </TableRow>
-      ) : null}
-      {cmd.validatorNodeId ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Validator')}</TableCell>
-          <TableCell>
-            <NodeLink id={cmd.validatorNodeId} />
-          </TableCell>
-        </TableRow>
-      ) : null}
-    </TableWithTbody>
-  );
-};

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

@@ -1,67 +0,0 @@
-import { t } from '@vegaprotocol/react-helpers';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import { TxDetailsShared } from './shared/tx-details-shared';
-import { TableCell, TableRow, TableWithTbody } from '../../table';
-import type { components } from '../../../../types/explorer';
-import { BlockLink, PartyLink } from '../../links';
-
-type KeyRotate = components['schemas']['v1KeyRotateSubmission'];
-interface TxDetailsKeyRotateProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-/**
- * A node is changing Vega key
- */
-export const TxDetailsKeyRotate = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxDetailsKeyRotateProps) => {
-  if (!txData) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  const k: KeyRotate = txData.command;
-
-  return (
-    <TableWithTbody className="mb-8">
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      {k.targetBlock ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Target block')}</TableCell>
-          <TableCell>
-            <BlockLink height={k.targetBlock} />
-          </TableCell>
-        </TableRow>
-      ) : null}
-      {k.currentPubKeyHash ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Old Address')}</TableCell>
-          <TableCell>
-            <PartyLink id={k.currentPubKeyHash} />
-          </TableCell>
-        </TableRow>
-      ) : null}
-      {k.currentPubKeyHash ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('New Address')}</TableCell>
-          <TableCell>
-            <PartyLink id={k.currentPubKeyHash} />
-          </TableCell>
-        </TableRow>
-      ) : null}
-      {k.newPubKeyIndex ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Key index')}</TableCell>
-          <TableCell>
-            <code>{k.newPubKeyIndex}</code>
-          </TableCell>
-        </TableRow>
-      ) : null}
-    </TableWithTbody>
-  );
-};

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

@@ -1,11 +1,10 @@
 import { t } from '@vegaprotocol/react-helpers';
+import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
 import { MarketLink } from '../../links';
+import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
 import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
-
 import type { components } from '../../../../types/explorer';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
 
 export type LiquidityCancellation =
   components['schemas']['v1LiquidityProvisionCancellation'];

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

@@ -6,7 +6,6 @@ import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
 import { txSignatureToDeterministicId } from '../lib/deterministic-ids';
 import DeterministicOrderDetails from '../../order-details/deterministic-order-details';
-import Hash from '../../links/hash';
 
 interface TxDetailsOrderProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -48,13 +47,7 @@ export const TxDetailsOrder = ({
         <TableRow modifier="bordered">
           <TableCell>{t('Order')}</TableCell>
           <TableCell>
-            <Hash text={deterministicId} />
-          </TableCell>
-        </TableRow>
-        <TableRow modifier="bordered">
-          <TableCell>{t('Market ID')}</TableCell>
-          <TableCell>
-            <MarketLink id={marketId} showMarketName={false} />
+            <code>{deterministicId}</code>
           </TableCell>
         </TableRow>
         <TableRow modifier="bordered">

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

@@ -1,57 +0,0 @@
-import { t } from '@vegaprotocol/react-helpers';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import { TxDetailsShared } from './shared/tx-details-shared';
-import { TableCell, TableRow, TableWithTbody } from '../../table';
-import ProposalLink from '../../links/proposal-link/proposal-link';
-
-interface TxProposalVoteProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-/**
- * A vote on a proposal.
- *
- * One inconsistency here that feels right but should be standardised is that there are two rows
- * for the proposal ID, one that creates a link with the text of the proposal title that takes
- * a user out to the governance site, and the other that just shows the ID. Both are useful, but
- * doesn't feel quite right. This could be fixed with a separate component to display a preview
- * of the proposal and link off to the governance site, removing the title from the header. Or
- * something else. For now, this is more useful than the default view
- */
-export const TxProposalVote = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxProposalVoteProps) => {
-  if (!txData || !txData.command.voteSubmission) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  const vote = txData.command.voteSubmission.value ? '👍' : '👎';
-  return (
-    <TableWithTbody className="mb-8">
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      <TableRow modifier="bordered">
-        <TableCell>{t('Proposal ID')}</TableCell>
-        <TableCell>{txData.command.voteSubmission.proposalId}</TableCell>
-      </TableRow>
-      <TableRow modifier="bordered">
-        <TableCell>{t('Proposal details')}</TableCell>
-        <TableCell>
-          <ProposalLink id={txData.command.voteSubmission.proposalId} />
-        </TableCell>
-      </TableRow>
-      <TableRow modifier="bordered">
-        <TableCell>{t('Proposal')}</TableCell>
-        <TableCell>{txData.command.voteSubmission.proposalId}</TableCell>
-      </TableRow>
-      <TableRow modifier="bordered">
-        <TableCell>{t('Vote')}</TableCell>
-        <TableCell>{vote}</TableCell>
-      </TableRow>
-    </TableWithTbody>
-  );
-};

apps/explorer/src/app/components/txs/tx-data-view.tsx

@@ -1,75 +0,0 @@
-import { useState } from 'react';
-import { t } from '@vegaprotocol/react-helpers';
-import get from 'lodash/get';
-import { Select } from '@vegaprotocol/ui-toolkit';
-
-import type { BlockExplorerTransactionResult } from '../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../routes/blocks/tendermint-blocks-response';
-
-export function getClassName(showTxData: ShowTxDataType) {
-  const baseClasses =
-    'font-mono bg-neutral-300 text-[11px] leading-3 text-gray-900 w-full p-2 max-w-[615px]';
-  if (showTxData === 'JSON') {
-    return `${baseClasses} whitespace-pre overflow-x-scroll`;
-  } else {
-    return baseClasses;
-  }
-}
-
-export function getContents(
-  showTxData: ShowTxDataType,
-  txData: BlockExplorerTransactionResult | null,
-  blockData: TendermintBlocksResponse | null | undefined
-) {
-  if (showTxData === 'JSON') {
-    if (txData) {
-      return JSON.stringify(txData.command, undefined, 1);
-    }
-  } else {
-    if (txData && blockData) {
-      return get(blockData, `result.block.data.txs[${txData.index}]`);
-    }
-  }
-
-  return '-';
-}
-
-type ShowTxDataType = 'JSON' | 'base64';
-
-interface TxDataViewProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-export const TxDataView = ({ txData, blockData }: TxDataViewProps) => {
-  const [showTxData, setShowTxData] = useState<ShowTxDataType>('JSON');
-
-  if (!txData) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  return (
-    <details title={t('Show raw transaction')}>
-      <summary className="cursor-pointer">{t('Show raw transaction')}</summary>
-      <div className="py-4">
-        <textarea
-          readOnly={true}
-          className={getClassName(showTxData)}
-          rows={12}
-          cols={120}
-          value={getContents(showTxData, txData, blockData)}
-        />
-        <div className="w-40">
-          <Select
-            placeholder="View as..."
-            onChange={(v) => setShowTxData(v.target.value as ShowTxDataType)}
-            value={showTxData}
-          >
-            <option value={'JSON'}>JSON</option>
-            <option value={'base64'}>Base64</option>
-          </Select>
-        </div>
-      </div>
-    </details>
-  );
-};

apps/explorer/src/app/components/txs/txs-infinite-list.tsx

@@ -115,7 +115,7 @@ export const TxsInfiniteList = ({
               className="List"
               height={995}
               itemCount={itemCount}
-              itemSize={isStacked ? 134 : 50}
+              itemSize={isStacked ? 134 : 72}
               onItemsRendered={onItemsRendered}
               ref={ref}
               width={'100%'}

apps/explorer/src/app/config/env.ts

@@ -10,15 +10,12 @@ const truthy = ['1', 'true'];
 export const ENV = {
   // Data sources
   // Environment
-  env: windowOrDefault('NX_VEGA_ENV'),
   dsn: windowOrDefault('NX_EXPLORER_SENTRY_DSN'),
   dataSources: {
     blockExplorerUrl: windowOrDefault('NX_BLOCK_EXPLORER'),
     tendermintUrl: windowOrDefault('NX_TENDERMINT_URL'),
     tendermintWebsocketUrl: windowOrDefault('NX_TENDERMINT_WEBSOCKET_URL'),
     ethExplorerUrl: windowOrDefault('NX_ETHERSCAN_URL'),
-    governanceUrl: windowOrDefault('NX_VEGA_GOVERNANCE_URL'),
-    vegaRepoUrl: windowOrDefault('NX_VEGA_REPO_URL'),
   },
   flags: {
     assets: truthy.includes(windowOrDefault('NX_EXPLORER_ASSETS')),

apps/explorer/src/app/hooks/use-txs-data.ts

@@ -5,7 +5,6 @@ import type {
   BlockExplorerTransactions,
 } from '../routes/types/block-explorer-response';
 import { DATA_SOURCES } from '../config';
-import isNumber from 'lodash/isNumber';
 
 export interface TxsStateProps {
   txsData: BlockExplorerTransactionResult[];
@@ -55,15 +54,15 @@ export const useTxsData = ({ limit, filters }: IUseTxsData) => {
   } = useFetch<BlockExplorerTransactions>(url, {}, false);
 
   useEffect(() => {
-    if (data && isNumber(data?.transactions?.length)) {
+    if (data?.transactions?.length) {
       setTxsState((prev) => ({
         txsData: [...prev.txsData, ...data.transactions],
-        hasMoreTxs: data.transactions.length > 0,
+        hasMoreTxs: true,
         lastCursor:
-          data.transactions[data.transactions.length - 1]?.cursor || '',
+          data.transactions[data.transactions.length - 1].cursor || '',
       }));
     }
-  }, [setTxsState, data]);
+  }, [setTxsState, data?.transactions]);
 
   const loadTxs = useCallback(() => {
     return refetch({

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> } } } } } } } | 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 {
@@ -74,9 +67,6 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
 export const ExplorerOracleDataConnectionFragmentDoc = gql`
     fragment ExplorerOracleDataConnection on OracleSpec {
   dataConnection {
-    pageInfo {
-      hasNextPage
-    }
     edges {
       node {
         externalData {
@@ -106,18 +96,17 @@ export const ExplorerOracleDataConnectionFragmentDoc = gql`
     `;
 export const ExplorerOracleSpecsDocument = gql`
     query ExplorerOracleSpecs {
-  oracleSpecsConnection(pagination: {first: 50}) {
-    pageInfo {
-      hasNextPage
-    }
+  oracleSpecsConnection {
     edges {
       node {
         ...ExplorerOracleDataSource
+        ...ExplorerOracleDataConnection
       }
     }
   }
 }
-    ${ExplorerOracleDataSourceFragmentDoc}`;
+    ${ExplorerOracleDataSourceFragmentDoc}
+${ExplorerOracleDataConnectionFragmentDoc}`;
 
 /**
  * __useExplorerOracleSpecsQuery__
@@ -144,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'];
@@ -22,51 +20,37 @@ export type SourceType =
 interface OracleDetailsProps {
   id: string;
   dataSource: ExplorerOracleDataSourceFragment;
-  dataConnection?: ExplorerOracleDataConnectionFragment;
-  // Defaults to false. Hides the count of 'broadcasts' this oracle has seen
-  showBroadcasts?: boolean;
+  dataConnection: ExplorerOracleDataConnectionFragment;
 }
 
-/**
- * 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;
+  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 && dataConnection ? (
-        <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}
-                  showBroadcasts={false}
-                />
-                <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/parties/home/index.tsx

@@ -10,7 +10,7 @@ import { useDocumentTitle } from '../../../hooks/use-document-title';
 export const JumpToParty = () => {
   const navigate = useNavigate();
 
-  useDocumentTitle(['Public keys']);
+  useDocumentTitle(['Parties']);
 
   const handleSubmit = (e: React.SyntheticEvent) => {
     e.preventDefault();
@@ -27,8 +27,8 @@ export const JumpToParty = () => {
   };
   return (
     <JumpTo
-      label={t('Go to public key')}
-      placeholder={t('Public key')}
+      label={t('Go to party')}
+      placeholder={t('Party id')}
       inputId="party-input"
       inputType="text"
       inputName="partyId"
@@ -40,7 +40,7 @@ export const JumpToParty = () => {
 const Parties = () => {
   return (
     <section>
-      <RouteTitle data-testid="parties-header">{t('Public keys')}</RouteTitle>
+      <RouteTitle data-testid="parties-header">{t('Parties')}</RouteTitle>
       <JumpToParty />
     </section>
   );

apps/explorer/src/app/routes/parties/id/components/party-id-error.tsx

@@ -14,7 +14,7 @@ type PartyIdErrorProps = {
 const PartyIdError = ({ id, error }: PartyIdErrorProps) => {
   const end = isValidPartyId(id)
     ? t('No accounts or transactions found for: ')
-    : 'Invalid public key: ';
+    : 'Invalid party id: ';
   return (
     <section>
       <p>

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

@@ -16,7 +16,7 @@ import { PartyAccounts } from './components/party-accounts';
 const Party = () => {
   const { party } = useParams<{ party: string }>();
 
-  useDocumentTitle(['Public keys', party || '-']);
+  useDocumentTitle(['Parties', party || '-']);
   const partyId = toNonHex(party ? party : '');
   const { isMobile } = useScreenDimensions();
   const visibleChars = useMemo(() => (isMobile ? 10 : 14), [isMobile]);
@@ -44,7 +44,7 @@ const Party = () => {
     />
   ) : (
     <Panel>
-      <p>No data found for public key {party}</p>
+      <p>No party found for key {party}</p>
     </Panel>
   );
 
@@ -71,7 +71,7 @@ const Party = () => {
         className="font-alpha uppercase font-xl mb-4 text-zinc-800 dark:text-zinc-200"
         data-testid="parties-header"
       >
-        {t('Public key')}
+        {t('Party')}
       </h1>
       {partyRes.data ? (
         <>

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/explorer/src/app/routes/txs/id/index.tsx

@@ -38,7 +38,7 @@ const Tx = () => {
         to={`/${Routes.TX}`}
       >
         <Icon
-          className="text-vega-light-150 dark:text-vega-light-150"
+          className="text-vega-light-300 dark:text-vega-light-300"
           name={IconNames.CHEVRON_LEFT}
         />
         All Transactions

apps/token-e2e/.env

@@ -16,16 +16,4 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 #Test configuration variables
 CYPRESS_FAIRGROUND=false
 CYPRESS_VEGA_URL=http://localhost:3028/query
-CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
-CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
-CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf
-CYPRESS_FAUCET_URL=http://localhost:1790/api/v1/mint
-CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY=02ecea…342f65
-CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY2=7f9cf0…c25535
-CYPRESS_VEGA_ENV=CUSTOM
-CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
-CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
-CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3028/query
-CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=

apps/token-e2e/src/fixtures/proposals/new-market.json

@@ -2,59 +2,56 @@
   "changes": {
     "decimalPlaces": "5",
     "positionDecimalPlaces": "5",
-    "lpPriceRange": "10",
     "instrument": {
-      "name": "Token test market",
-      "code": "Token.24h",
+      "name": "Oranges Daily",
+      "code": "ORANGES.24h",
       "future": {
-        "settlementAsset": "fBTC",
-        "quoteName": "fBTC",
+        "settlementAsset": "8b52d4a3a4b0ffe733cddbc2b67be273816cfeb6ca4c8b339bac03ffba08e4e4",
+        "quoteName": "tEuro",
+        "settlementDataDecimals": 5,
         "dataSourceSpecForSettlementData": {
-          "external": {
-            "oracle": {
-              "signers": [
-                {
-                  "pubKey": {
-                    "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-                  }
-                }
-              ],
-              "filters": [
-                {
-                  "key": {
-                    "name": "prices.ETH.value",
-                    "type": "TYPE_INTEGER",
-                    "numberDecimalPlaces": "0"
-                  },
-                  "conditions": [
-                    {
-                      "operator": "OPERATOR_GREATER_THAN",
-                      "value": "0"
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        },
-        "dataSourceSpecForTradingTermination": {
           "signers": [
             {
-              "pubKey": {
-                "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+              "signer": {
+                "__typename": "ETHAddress",
+                "address": "0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC"
               }
             }
           ],
           "filters": [
             {
               "key": {
-                "name": "trading.terminated.ETH5",
-                "type": "TYPE_BOOLEAN"
+                "name": "prices.BTC.value",
+                "type": "TYPE_INTEGER"
               },
               "conditions": [
                 {
-                  "operator": "OPERATOR_EQUALS",
-                  "value": "true"
+                  "operator": "OPERATOR_GREATER_THAN",
+                  "value": "0"
+                }
+              ]
+            }
+          ]
+        },
+        "dataSourceSpecForTradingTermination": {
+          "signers": [
+            {
+              "signer": {
+                "__typename": "ETHAddress",
+                "address": "0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC"
+              }
+            }
+          ],
+          "filters": [
+            {
+              "key": {
+                "name": "vegaprotocol.builtin.timestamp",
+                "type": "TYPE_TIMESTAMP"
+              },
+              "conditions": [
+                {
+                  "operator": "OPERATOR_GREATER_THAN_OR_EQUAL",
+                  "value": "1648684800000000000"
                 }
               ]
             }
@@ -62,7 +59,7 @@
         },
         "dataSourceSpecBinding": {
           "settlementPriceProperty": "prices.BTC.value",
-          "tradingTerminationProperty": "trading.terminated.ETH5"
+          "tradingTerminationProperty": "vegaprotocol.builtin.timestamp"
         }
       }
     },

apps/token-e2e/src/fixtures/proposals/update-market.json

@@ -1,78 +1,83 @@
 {
-  "instrument": {
-    "code": "TEST.24h",
-    "future": {
-      "quoteName": "fUSDC",
-      "settlementDataDecimals": 5,
-      "dataSourceSpecForSettlementData": {
-        "signers": [
-          {
-            "pubKey": {
-              "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-            }
-          }
-        ],
-        "filters": [
-          {
-            "key": {
-              "name": "prices.ETH.value",
-              "type": "TYPE_INTEGER"
-            },
-            "conditions": [
-              {
-                "operator": "OPERATOR_GREATER_THAN",
-                "value": "0"
+  "marketId": "315a8e48db0a292c92b617264728048c82c20efc922c75fd292fc54e5c727c81",
+  "changes": {
+    "instrument": {
+      "code": "ORANGES.24h",
+      "future": {
+        "quoteName": "tEuro",
+        "settlementDataDecimals": 5,
+        "dataSourceSpecForSettlementData": {
+          "signers": [
+            {
+              "signer": {
+                "__typename": "ETHAddress",
+                "address": "0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC"
               }
-            ]
-          }
-        ]
-      },
-      "dataSourceSpecForTradingTermination": {
-        "signers": [
-          {
-            "pubKey": {
-              "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
             }
-          }
-        ],
-        "filters": [
-          {
-            "key": {
-              "name": "trading.terminated.ETH5",
-              "type": "TYPE_BOOLEAN"
-            },
-            "conditions": [
-              {
-                "operator": "OPERATOR_GREATER_THAN_OR_EQUAL",
-                "value": "1648684800000000000"
+          ],
+          "filters": [
+            {
+              "key": {
+                "name": "prices.BTC.value",
+                "type": "TYPE_INTEGER"
+              },
+              "conditions": [
+                {
+                  "operator": "OPERATOR_GREATER_THAN",
+                  "value": "0"
+                }
+              ]
+            }
+          ]
+        },
+        "dataSourceSpecForTradingTermination": {
+          "signers": [
+            {
+              "signer": {
+                "__typename": "ETHAddress",
+                "address": "0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC"
               }
-            ]
-          }
-        ]
-      },
-      "dataSourceSpecBinding": {
-        "settlementPriceProperty": "prices.ETH.value",
-        "tradingTerminationProperty": "trading.terminated.ETH5"
+            }
+          ],
+          "filters": [
+            {
+              "key": {
+                "name": "vegaprotocol.builtin.timestamp",
+                "type": "TYPE_TIMESTAMP"
+              },
+              "conditions": [
+                {
+                  "operator": "OPERATOR_GREATER_THAN_OR_EQUAL",
+                  "value": "1648684800000000000"
+                }
+              ]
+            }
+          ]
+        },
+        "dataSourceSpecBinding": {
+          "settlementPriceProperty": "prices.BTC.value",
+          "tradingTerminationProperty": "vegaprotocol.builtin.timestamp"
+        }
       }
-    }
-  },
-  "metadata": ["sector:energy", "sector:food", "source:docs.vega.xyz"],
-  "priceMonitoringParameters": {
-    "triggers": [
-      {
-        "horizon": "43200",
-        "probability": "0.9999999",
-        "auctionExtension": "600"
+    },
+    "metadata": ["sector:energy", "sector:food", "source:docs.vega.xyz"],
+    "priceMonitoringParameters": {
+      "triggers": [
+        {
+          "horizon": "43200",
+          "probability": "0.9999999",
+          "auctionExtension": "600"
+        }
+      ]
+    },
+    "logNormal": {
+      "tau": 0.0001140771161,
+      "riskAversionParameter": 0.001,
+      "params": {
+        "mu": 0,
+        "r": 0.016,
+        "sigma": 0.3
       }
-    ]
-  },
-  "logNormal": {
-    "tau": 0.0001140771161,
-    "riskAversionParameter": 0.001,
-    "params": {
-      "mu": 0,
-      "r": 0.016,
-      "sigma": 0.3
     }
   }
 }

apps/token-e2e/src/fixtures/wallet/passphrase

@@ -1 +1 @@
-0123245
+123

apps/token-e2e/src/integration/flow/governance-flow.cy.js

@@ -11,7 +11,6 @@ const newProposalSubmitButton = '[data-testid="proposal-submit"]';
 const dialogCloseButton = '[data-testid="dialog-close"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';
 const openProposals = '[data-testid="open-proposals"]';
-const closedProposals = '[data-testid="closed-proposals"]';
 const proposalVoteProgressForPercentage =
   '[data-testid="vote-progress-indicator-percentage-for"]';
 const proposalVoteProgressAgainstPercentage =
@@ -23,9 +22,7 @@ const proposalVoteProgressAgainstTokens =
 const changeVoteButton = '[data-testid="change-vote-button"]';
 const proposalDetailsTitle = '[data-testid="proposal-title"]';
 const proposalDetailsDescription = '[data-testid="proposal-description"]';
-const proposalStatus = '[data-testid="proposal-status"]';
 const rawProposalData = '[data-testid="proposal-data"]';
-const votesTable = '[data-testid="votes-table"]';
 const minVoteButton = '[data-testid="min-vote"]';
 const maxVoteButton = '[data-testid="max-vote"]';
 const voteButtons = '[data-testid="vote-buttons"]';
@@ -40,10 +37,6 @@ const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
 
-const minCloseDays = 2;
-const maxCloseDays = 3;
-const requiredParticipation = 0.001;
-
 const governanceProposalType = {
   NETWORK_PARAMETER: 'Network parameter',
   NEW_MARKET: 'New market',
@@ -72,6 +65,21 @@ context(
           network_parameters['governance.proposal.freeform.requiredMajority'] *
             100
         ).as('requiredMajority');
+        cy.wrap(
+          network_parameters[
+            'governance.proposal.freeform.requiredParticipation'
+          ] * 100
+        ).as('requiredParticipation');
+        cy.wrap(
+          network_parameters['governance.proposal.freeform.minClose'].split(
+            'h'
+          )[0] / 24
+        ).as('minCloseDays');
+        cy.wrap(
+          network_parameters['governance.proposal.freeform.maxClose'].split(
+            'h'
+          )[0] / 24
+        ).as('maxCloseDays');
         cy.wrap(
           network_parameters['governance.proposal.freeform.minClose'].split(
             'h'
@@ -100,6 +108,21 @@ context(
             0.00001,
             'Asserting that value is at least 0.00001 for network parameter minVoterBalance'
           );
+          assert.isAtLeast(
+            parseFloat(this.requiredParticipation),
+            0.00001,
+            'Asserting that value is at least 0.00001 for network parameter requiredParticipation'
+          );
+          assert.isAtLeast(
+            parseInt(this.minCloseDays),
+            1,
+            'Asserting that value is at least 1 for network parameter minCloseDays'
+          );
+          assert.isAtLeast(
+            parseInt(this.maxCloseDays),
+            parseInt(this.minCloseDays + 1),
+            'Asserting that network parameter maxCloseDays is at least 1 day higher than minCloseDays'
+          );
           // workaround for first eth tx hanging
           associateTokenStartOfTests();
         }
@@ -159,10 +182,10 @@ context(
           this.minProposerBalance
         );
         let proposalDays = [
-          minCloseDays + 1,
-          maxCloseDays,
-          minCloseDays + 3,
-          minCloseDays + 2,
+          this.minCloseDays + 1,
+          this.maxCloseDays,
+          this.minCloseDays + 3,
+          this.minCloseDays + 2,
         ];
         for (var index = 0; index < proposalDays.length; index++) {
           cy.go_to_make_new_proposal(governanceProposalType.RAW);
@@ -204,7 +227,6 @@ context(
         cy.navigate_to('validators');
         cy.click_on_validator_from_list(0);
         cy.staking_validator_page_add_stake('2');
-        cy.close_staking_dialog();
 
         cy.get(vegaWalletStakedBalances, txTimeout).should('contain', '2');
 
@@ -275,12 +297,10 @@ context(
         });
       });
 
-      // 3001-VOTE-071
-      it('Newly created freeform proposals list - shows proposal participation - both met and not', function () {
-        const proposalTitle = generateProposalTitle();
-        createFreeformProposal(this.minProposerBalance, proposalTitle);
-
-        cy.get_submitted_proposal_from_proposal_list(proposalTitle)
+      // Skipping test due to bug: #1320
+      it.skip('Newly created freeform proposals list - shows proposal participation - both met and not', function () {
+        createFreeformProposal(this.minProposerBalance);
+        cy.get_submitted_proposal_from_proposal_list()
           .as('submittedProposal')
           .within(() => {
             // 3001-VOTE-039
@@ -292,7 +312,7 @@ context(
           .invoke('text')
           .then((totalSupply) => {
             let tokensRequiredToAchieveResult = parseFloat(
-              (totalSupply.replace(/,/g, '') * requiredParticipation) / 100
+              (totalSupply.replace(/,/g, '') * this.requiredParticipation) / 100
             ).toFixed(2);
             cy.ensure_specified_unstaked_tokens_are_associated(
               tokensRequiredToAchieveResult
@@ -301,17 +321,16 @@ context(
             cy.get('@submittedProposal').within(() =>
               cy.get(viewProposalButton).click()
             );
-            cy.get_proposal_information_from_table('Token participation met')
+            cy.get_proposal_information_from_table('Participation met')
               .contains('👍')
               .should('be.visible');
             cy.navigate_to('proposals');
             cy.get('@submittedProposal').within(() =>
-              cy.get(voteStatus).should('have.text', 'Set to pass')
+              cy.get(voteStatus).should('have.text', 'Participation met')
             );
           });
       });
 
-      // 3001-VOTE-055
       it('Newly created raw proposal details - shows proposal title and full description', function () {
         createRawProposal(this.minProposerBalance);
         cy.get('@rawProposal').then((rawProposal) => {
@@ -338,7 +357,6 @@ context(
           });
       });
 
-      // 3001-VOTE-043
       it('Newly created freeform proposal details - shows proposed and closing dates', function () {
         const closingVoteHrs = '72';
         const proposalTitle = generateProposalTitle();
@@ -381,7 +399,6 @@ context(
       it('Newly created proposal details - shows default status set to fail', function () {
         // 3001-VOTE-037
         // 3001-VOTE-040
-        // 3001-VOTE-067
         createRawProposal(this.minProposerBalance);
         cy.get('@rawProposal').then((rawProposal) => {
           cy.get_submitted_proposal_from_proposal_list(
@@ -396,17 +413,15 @@ context(
           .should('be.visible');
         // 3001-VOTE-062
         // 3001-VOTE-040
-        // 3001-VOTE-070
         cy.get_proposal_information_from_table('Token majority met')
           .contains('👎')
           .should('be.visible');
-        // 3001-VOTE-068
         cy.get_proposal_information_from_table('Token participation met')
           .contains('👎')
           .should('be.visible');
       });
 
-      // 3001-VOTE-080 3001-VOTE-090 3001-VOTE-069 3001-VOTE-072 3001-VOTE-073
+      // 3001-VOTE-080 3001-VOTE-090
       it('Newly created proposal details - ability to vote for and against proposal - with minimum required tokens associated', function () {
         createRawProposal(this.minProposerBalance);
         cy.get('@rawProposal').then((rawProposal) => {
@@ -431,7 +446,7 @@ context(
             .contains(votedDate)
             .should('be.visible');
         });
-        cy.get(proposalVoteProgressForPercentage) // 3001-VOTE-072
+        cy.get(proposalVoteProgressForPercentage)
           .contains('100.00%')
           .and('be.visible');
         cy.get(proposalVoteProgressAgainstPercentage)
@@ -451,10 +466,10 @@ context(
           .and('be.visible');
         // 3001-VOTE-061
         cy.get_proposal_information_from_table('Participation required')
-          .contains(`${requiredParticipation}%`)
+          .contains(`${this.requiredParticipation}%`)
           .should('be.visible');
         // 3001-VOTE-066
-        cy.get_proposal_information_from_table('Majority Required') // 3001-VOTE-073
+        cy.get_proposal_information_from_table('Majority Required')
           .contains(`${parseFloat(this.requiredMajority).toFixed(2)}%`)
           .should('be.visible');
         cy.get_proposal_information_from_table('Number of voting parties')
@@ -497,7 +512,7 @@ context(
           .invoke('text')
           .then((totalSupply) => {
             let tokensRequiredToAchieveResult = parseFloat(
-              (totalSupply.replace(/,/g, '') * requiredParticipation) / 100
+              (totalSupply.replace(/,/g, '') * this.requiredParticipation) / 100
             ).toFixed(2);
             cy.ensure_specified_unstaked_tokens_are_associated(
               tokensRequiredToAchieveResult
@@ -521,11 +536,6 @@ context(
             cy.get(proposalVoteProgressAgainstTokens)
               .contains('0.00')
               .and('be.visible');
-            cy.get_proposal_information_from_table(
-              'Total tokens voted percentage'
-            )
-              .should('have.text', '0.00%')
-              .and('be.visible');
             cy.get_proposal_information_from_table('Tokens for proposal')
               .should('have.text', tokensRequiredToAchieveResult)
               .and('be.visible');
@@ -578,7 +588,6 @@ context(
         );
       });
 
-      // 3001-VOTE-006
       it('Creating a proposal - proposal rejected - able to access rejected proposals', function () {
         cy.ensure_specified_unstaked_tokens_are_associated(
           this.minProposerBalance
@@ -640,7 +649,6 @@ context(
         cy.get(dialogCloseButton).click();
       });
 
-      // 3002-PROP-009
       it('Unable to create a proposal - when some but not enough tokens are associated', function () {
         cy.ensure_specified_unstaked_tokens_are_associated(
           this.minProposerBalance - 0.000001
@@ -661,7 +669,7 @@ context(
       });
 
       it('Unable to create a freeform proposal - when json parent section contains unexpected field', function () {
-        // 3001-VOTE-038 3002-PROP-013 3002-PROP-014
+        // 3001-VOTE-038
         cy.ensure_specified_unstaked_tokens_are_associated(
           this.minProposerBalance
         );
@@ -687,9 +695,6 @@ context(
           'Invalid params: the transaction is malformed'
         );
         cy.get(dialogCloseButton).click();
-        cy.get(rawProposalData)
-          .invoke('val')
-          .should('contain', "i shouldn't be here");
       });
 
       it('Unable to create a freeform proposal - when json terms section contains unexpected field', function () {
@@ -787,107 +792,6 @@ context(
         cy.contains('You voted: Against').should('be.visible');
       });
 
-      // 3001-VOTE-006
-      it('Able to view enacted proposal', function () {
-        cy.createMarket();
-        cy.reload();
-        cy.wait_for_spinner();
-        cy.get(closedProposals).within(() => {
-          cy.get(proposalDetailsTitle).should(
-            'have.text',
-            'Add Lorem Ipsum market'
-          );
-          cy.get(proposalStatus).should('have.text', 'Enacted ');
-          cy.get(viewProposalButton).click();
-        });
-        cy.getByTestId('proposal-type').should('have.text', 'New market');
-        cy.get_proposal_information_from_table('State')
-          .contains('Enacted')
-          .and('be.visible');
-        cy.get(votesTable).within(() => {
-          cy.contains('Vote passed.').should('be.visible');
-          cy.contains('Voting has ended.').should('be.visible');
-        });
-      });
-
-      // 3001-VOTE-047
-      it('Able to enact freeform proposal', function () {
-        const proposalTitle = 'Add New free form proposal with short enactment';
-        cy.ensure_specified_unstaked_tokens_are_associated(
-          this.minProposerBalance
-        );
-        cy.sendWalletTxFreeFormProposal();
-        cy.navigate_to('proposals');
-        cy.reload();
-        cy.wait_for_spinner();
-        cy.contains(proposalTitle)
-          .parentsUntil('[data-testid="proposals-list-item"]')
-          .within(() => cy.get(viewProposalButton).click());
-        cy.get_proposal_information_from_table('State')
-          .contains('Open')
-          .and('be.visible');
-        cy.vote_for_proposal('for');
-        cy.get_proposal_information_from_table('State')
-          .contains('Enacted', epochTimeout)
-          .and('be.visible');
-      });
-
-      // 3001-VOTE-046 3001-VOTE-044 3001-VOTE-074 3001-VOTE-074
-      it('Able to enact proposal by voting', function () {
-        const proposalTitle = 'Add New proposal with short enactment';
-        cy.ensure_specified_unstaked_tokens_are_associated(
-          this.minProposerBalance
-        );
-        cy.sendWalletTxUpdateNetworkProposal();
-        cy.navigate_to('proposals');
-        cy.reload();
-        cy.wait_for_spinner();
-        cy.contains(proposalTitle)
-          .parentsUntil('[data-testid="proposals-list-item"]')
-          .within(() => cy.get(viewProposalButton).click());
-        cy.get_proposal_information_from_table('State')
-          .contains('Open')
-          .and('be.visible');
-        cy.vote_for_proposal('for');
-        cy.get_proposal_information_from_table('State') // 3001-VOTE-047
-          .contains('Passed', txTimeout)
-          .and('be.visible');
-        cy.get_proposal_information_from_table('State')
-          .contains('Enacted', epochTimeout)
-          .and('be.visible');
-        cy.get(votesTable).within(() => {
-          cy.contains('Vote passed.').should('be.visible');
-          cy.contains('Voting has ended.').should('be.visible');
-        });
-        cy.get(proposalVoteProgressForPercentage)
-          .contains('100.00%')
-          .and('be.visible');
-      });
-
-      // 3001-VOTE-048 3001-VOTE-049
-      it('Able to fail proposal due to lack of participation', function () {
-        const proposalTitle = 'Add New free form proposal with short enactment';
-        cy.ensure_specified_unstaked_tokens_are_associated(
-          this.minProposerBalance
-        );
-        cy.sendWalletTxFreeFormProposal();
-        cy.navigate_to('proposals');
-        cy.reload();
-        cy.wait_for_spinner();
-        cy.contains(proposalTitle)
-          .parentsUntil('[data-testid="proposals-list-item"]')
-          .within(() => cy.get(viewProposalButton).click());
-        cy.get_proposal_information_from_table('State')
-          .contains('Open')
-          .and('be.visible');
-        cy.get_proposal_information_from_table('State') // 3001-VOTE-047
-          .contains('Declined', txTimeout)
-          .and('be.visible');
-        cy.get_proposal_information_from_table('Rejection reason')
-          .contains('PROPOSAL_ERROR_PARTICIPATION_THRESHOLD_NOT_REACHED')
-          .and('be.visible');
-      });
-
       function createRawProposal(proposerBalance) {
         if (proposerBalance)
           cy.ensure_specified_unstaked_tokens_are_associated(proposerBalance);

apps/token-e2e/src/integration/flow/governance-forms-flow.cy.js

@@ -1,7 +1,3 @@
-const proposalListItem = '[data-testid="proposals-list-item"]';
-const openProposals = '[data-testid="open-proposals"]';
-const proposalType = '[data-testid="proposal-type"]';
-const proposalDetails = '[data-testid="proposal-details"]';
 const newProposalSubmitButton = '[data-testid="proposal-submit"]';
 const proposalVoteDeadline = '[data-testid="proposal-vote-deadline"]';
 const proposalValidationDeadline =
@@ -213,15 +209,18 @@ context(
       );
     });
 
+    // skipped because no markets available to select in capsule
     it.skip('Able to submit update market proposal', function () {
+      const marketId =
+        '315a8e48db0a292c92b617264728048c82c20efc922c75fd292fc54e5c727c81';
       cy.go_to_make_new_proposal(governanceProposalType.UPDATE_MARKET);
-      cy.get(newProposalTitle).type('Test update market proposal');
+      cy.get(newProposalTitle).type('Test update asset proposal');
       cy.get(newProposalDescription).type('E2E test for proposals');
-      cy.get(proposalMarketSelect).select('Test market 1');
+      cy.get(proposalMarketSelect).select(marketId);
       cy.get('[data-testid="update-market-details"]').within(() => {
-        cy.get('dd').eq(0).should('have.text', 'Test market 1');
-        cy.get('dd').eq(1).should('have.text', 'TEST.24h');
-        cy.get('dd').eq(2).should('not.be.empty');
+        cy.get('dd').eq(0).should('have.text', 'Oranges Daily');
+        cy.get('dd').eq(1).should('have.text', 'ORANGES.24h');
+        cy.get('dd').eq(2).should('have.text', marketId);
       });
       cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
         let newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
@@ -282,28 +281,12 @@ context(
     });
 
     it('Able to submit update asset proposal using min deadline', function () {
-      const assetId =
-        'ebcd94151ae1f0d39a4bde3b21a9c7ae81a80ea4352fb075a92e07608d9c953d';
-
       cy.go_to_make_new_proposal(governanceProposalType.UPDATE_ASSET);
       enterUpdateAssetProposalDetails();
       cy.get(minVoteDeadline).click();
       cy.get(minEnactDeadline).click();
       cy.get(newProposalSubmitButton).should('be.visible').click();
       cy.wait_for_proposal_submitted();
-      cy.navigate_to('proposals');
-      cy.get(openProposals).within(() => {
-        cy.get(proposalType)
-          .contains('Update asset')
-          .parentsUntil(proposalListItem)
-          .within(() => {
-            cy.get(proposalDetails).should('contain.text', assetId); // 3001-VOTE-029
-            cy.getByTestId('view-proposal-btn').click();
-          });
-      });
-      cy.get_proposal_information_from_table('Proposed enactment') // 3001-VOTE-044
-        .invoke('text')
-        .should('not.be.empty');
     });
 
     it('Able to submit update asset proposal using max deadline', function () {

apps/token-e2e/src/integration/flow/staking-flow.cy.js

@@ -866,10 +866,6 @@ context(
 
         cy.get(stakeTokenSubmitButton).should('contain', 'Add 1 $VEGA tokens');
       });
-
-      after('teardown wallet', function () {
-        cy.vega_wallet_teardown();
-      });
     });
   }
 );

apps/token-e2e/src/integration/flow/token-association-flow.cy.js

@@ -37,8 +37,8 @@ context(
         function () {
           cy.reload();
           cy.wait_for_spinner();
-          cy.ethereum_wallet_connect();
           cy.connectVegaWallet();
+          cy.ethereum_wallet_connect();
           cy.vega_wallet_teardown();
           cy.navigate_to('validators');
         }
@@ -57,16 +57,7 @@ context(
         //0005-ETXN-006
         //0005-ETXN-003
         //0005-ETXN-005
-        cy.staking_page_associate_tokens('2', { skipConfirmation: true });
-
-        cy.getByTestId('currency-title', txTimeout).should(
-          'have.length.above',
-          3
-        );
-        cy.validate_wallet_currency('Associated', '0.00');
-        cy.validate_wallet_currency('Pending association', '2.00');
-        cy.validate_wallet_currency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
+        cy.staking_page_associate_tokens('2');
 
         // 0005-ETXN-002
         cy.get(ethWalletAssociatedBalances, txTimeout)
@@ -107,15 +98,6 @@ context(
 
         cy.staking_page_disassociate_tokens('2');
 
-        cy.getByTestId('currency-title', txTimeout).should(
-          'have.length.above',
-          3
-        );
-        cy.validate_wallet_currency('Associated', '2.00');
-        cy.validate_wallet_currency('Pending association', '2.00');
-        cy.validate_wallet_currency('Total associated after pending', '0.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
-
         cy.get(ethWalletAssociatedBalances, txTimeout).should('not.exist');
 
         cy.get(ethWalletTotalAssociatedBalance, txTimeout)
@@ -212,19 +194,7 @@ context(
         // 1004-ASSO-024
         // 1004-ASSO-023
 
-        cy.staking_page_associate_tokens('2', {
-          type: 'contract',
-          skipConfirmation: true,
-        });
-
-        cy.getByTestId('currency-title', txTimeout).should(
-          'have.length.above',
-          3
-        );
-        cy.validate_wallet_currency('Associated', '0.00');
-        cy.validate_wallet_currency('Pending association', '2.00');
-        cy.validate_wallet_currency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
+        cy.staking_page_associate_tokens('2', { type: 'contract' });
 
         cy.get(ethWalletAssociatedBalances, txTimeout)
           .contains(vegaWalletPublicKeyShort)
@@ -240,19 +210,7 @@ context(
         });
 
         cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
-        cy.staking_page_disassociate_tokens('1', {
-          type: 'contract',
-          skipConfirmation: true,
-        });
-
-        cy.getByTestId('currency-title', txTimeout).should(
-          'have.length.above',
-          3
-        );
-        cy.validate_wallet_currency('Associated', '2.00');
-        cy.validate_wallet_currency('Pending association', '1.00');
-        cy.validate_wallet_currency('Total associated after pending', '1.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
+        cy.staking_page_disassociate_tokens('1', { type: 'contract' });
 
         cy.get(ethWalletAssociatedBalances, txTimeout)
           .contains(vegaWalletPublicKeyShort)
@@ -328,35 +286,6 @@ context(
       });
 
       // 1004-ASSO-004
-
-      it('Pending association outside of app is shown', function () {
-        cy.vega_wallet_associate('2');
-        cy.getByTestId('currency-title', txTimeout).should(
-          'have.length.above',
-          3
-        );
-        cy.validate_wallet_currency('Associated', '0.00');
-        cy.validate_wallet_currency('Pending association', '2.00');
-        cy.validate_wallet_currency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
-        cy.validate_wallet_currency('Associated', '2.00');
-      });
-
-      it('Disassociation outside of app is shown', function () {
-        cy.staking_page_associate_tokens('2');
-        cy.validate_wallet_currency('Associated', '2.00');
-        cy.vega_wallet_disassociate('2');
-        cy.getByTestId('currency-title', txTimeout).should(
-          'have.length.above',
-          3
-        );
-        cy.validate_wallet_currency('Associated', '2.00');
-        cy.validate_wallet_currency('Pending association', '2.00');
-        cy.validate_wallet_currency('Total associated after pending', '0.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
-        cy.validate_wallet_currency('Associated', '0.00');
-      });
-
       it('Able to associate tokens to different public key of connected vega wallet', function () {
         cy.get(ethWalletAssociateButton).first().click();
         cy.get(associateWalletRadioButton).click();
@@ -381,7 +310,6 @@ context(
             'vegaWalletPublicKey2Short'
           )} can now participate in governance and nominate a validator with your associated $VEGA.`
         );
-        cy.staking_page_disassociate_all_tokens();
       });
     });
   }

apps/token-e2e/src/integration/view/pubkey-view.cy.js

@@ -20,10 +20,7 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
 
   it('Able to connect public key via wallet', function () {
     verifyConnectedToPubKey();
-    cy.getByTestId('currency-title', Cypress.env('epochTimeout')).should(
-      'contain.text',
-      'USDC (fake)'
-    );
+    cy.getByTestId('currency-title').should('contain.text', 'USDC (fake)');
   });
 
   it('Able to connect public key using url', function () {

apps/token-e2e/src/integration/view/staking.cy.js

@@ -10,16 +10,6 @@ const pendingStake = '[data-testid="pending-stake"]';
 const stakedByOperator = '[data-testid="staked-by-operator"]';
 const stakedByDelegates = '[data-testid="staked-by-delegates"]';
 const stakeShare = '[data-testid="stake-percentage"]';
-const stakedByOperatorToolTip = "[data-testid='staked-operator-tooltip']";
-const stakedByDelegatesToolTip = "[data-testid='staked-delegates-tooltip']";
-const totalStakedToolTip = "[data-testid='total-staked-tooltip']";
-const unnormalisedVotingPowerToolTip =
-  "[data-testid='unnormalised-voting-power-tooltip']";
-const normalisedVotingPowerToolTip =
-  "[data-testid='normalised-voting-power-tooltip']";
-const performancePenaltyToolTip = "[data-testid='performance-penalty-tooltip']";
-const overstakedPenaltyToolTip = "[data-testid='overstaked-penalty-tooltip']";
-const totalPenaltyToolTip = "[data-testid='total-penalty-tooltip']";
 const epochCountDown = '[data-testid="epoch-countdown"]';
 const stakeNumberRegex = /^\d*\.?\d*$/;
 
@@ -66,70 +56,37 @@ context('Staking Page - verify elements on page', function () {
       });
 
       it('Should be able to see validator stake', function () {
-        cy.get('[col-id="stake"] > div > span > span')
+        cy.get('[col-id="stake"] > div > span')
           .should('have.length.at.least', 1)
           .each(($stake) => {
             cy.wrap($stake).should('not.be.empty');
           });
       });
 
-      it('Should be able to see validator stake tooltip', function () {
-        cy.get('[col-id="stake"] > div > span > span').first().realHover();
-
-        cy.get(stakedByOperatorToolTip)
-          .invoke('text')
-          .should('contain', 'Staked by operator: 0.00');
-        cy.get(stakedByDelegatesToolTip)
-          .invoke('text')
-          .should('contain', 'Staked by delegates: 0.00');
-        cy.get(totalStakedToolTip)
-          .invoke('text')
-          .should('contain', 'Total stake: 0.00');
-      });
-
       it('Should be able to see validator normalised voting power', function () {
-        cy.get('[col-id="normalisedVotingPower"] > div > span > span')
+        cy.get('[col-id="normalisedVotingPower"] > div > span')
           .should('have.length.at.least', 1)
           .each(($vPower) => {
             cy.wrap($vPower).should('not.be.empty');
           });
       });
 
-      it('Should be able to see validator voting power tooltip', function () {
-        cy.get('[col-id="normalisedVotingPower"] > div > span > span')
-          .first()
-          .realHover();
-
-        cy.get(unnormalisedVotingPowerToolTip)
-          .invoke('text')
-          .should('contain', 'Unnormalised voting power: 0.00%');
-        cy.get(normalisedVotingPowerToolTip)
-          .invoke('text')
-          .should('contain', 'Normalised voting power: 0.10%');
+      it('Should be able to see validator normalised voting power', function () {
+        cy.get('[col-id="normalisedVotingPower"] > div > span')
+          .should('have.length.at.least', 1)
+          .each(($vPower) => {
+            cy.wrap($vPower).should('not.be.empty');
+          });
       });
 
       it('Should be able to see validator total penalties', function () {
-        cy.get('[col-id="totalPenalties"] > div > span > span')
+        cy.get('[col-id="totalPenalties"] > div > span')
           .should('have.length.at.least', 1)
           .each(($penalties) => {
             cy.wrap($penalties).should('contain.text', '0%');
           });
       });
 
-      it('Should be able to see validator penalties tooltip', function () {
-        cy.get('[col-id="totalPenalties"] > div > span > span').realHover();
-
-        cy.get(performancePenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Performance penalty: 100.00%');
-        cy.get(overstakedPenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Overstaked penalty:'); // value not asserted due to #2886
-        cy.get(totalPenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Total penalties: 0.00%');
-      });
-
       it('Should be able to see validator pending stake', function () {
         cy.get('[col-id="pendingStake"] > div > span')
           .should('have.length.at.least', 1)

apps/token-e2e/src/integration/view/wallet-vega.cy.js

@@ -321,8 +321,6 @@ context(
             '200000',
             vegaWalletPublicKey
           );
-          cy.reload();
-          cy.wait_for_spinner();
           cy.connectVegaWallet();
           cy.ethereum_wallet_connect();
         });

apps/token-e2e/src/support/common.functions.js

@@ -46,6 +46,6 @@ Cypress.Commands.add('verify_page_header', (text) => {
 });
 
 Cypress.Commands.add('wait_for_spinner', () => {
-  cy.get(navigation.pageSpinner, Cypress.env('epochTimeout')).should('exist');
+  cy.get(navigation.pageSpinner).should('exist');
   cy.get(navigation.pageSpinner, { timeout: 20000 }).should('not.exist');
 });

apps/token-e2e/src/support/index.js

@@ -1,5 +1,4 @@
 import '@vegaprotocol/cypress';
-import 'cypress-real-events/support';
 
 import './common.functions.js';
 import './staking.functions.js';
@@ -7,7 +6,6 @@ import './governance.functions.js';
 import './wallet-eth.functions.js';
 import './wallet-teardown.functions.js';
 import './wallet-vega.functions.js';
-import './proposal.functions.js';
 import registerCypressGrep from '@cypress/grep';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';

apps/token-e2e/src/support/proposal.functions.js

@@ -1,103 +0,0 @@
-import { addSeconds, millisecondsToSeconds } from 'date-fns';
-
-const walletName = Cypress.env('vegaWalletName');
-const walletPubKey = Cypress.env('vegaWalletPublicKey');
-const walletLocation = Cypress.env('vegaWalletLocation');
-const walletPassphraseFile = './src/fixtures/wallet/passphrase';
-
-Cypress.Commands.add('sendWalletTxUpdateNetworkProposal', () => {
-  const MIN_CLOSE_SEC = 8;
-  const MIN_ENACT_SEC = 5;
-
-  const closingDate = addSeconds(new Date(), MIN_CLOSE_SEC);
-  const enactmentDate = addSeconds(closingDate, MIN_ENACT_SEC);
-  const closingTimestamp = millisecondsToSeconds(closingDate.getTime());
-  const enactmentTimestamp = millisecondsToSeconds(enactmentDate.getTime());
-
-  cy.exec(
-    `vegawallet transaction send --wallet ${walletName} --pubkey ${walletPubKey} -p ${walletPassphraseFile} --network DV '{
-      "proposalSubmission": {
-        "rationale": {
-          "title": "Add New proposal with short enactment",
-          "description": "E2E enactment test"
-        },
-        "terms": {
-          "updateNetworkParameter": {
-              "changes": {
-                  "key": "governance.proposal.updateNetParam.minProposerBalance",
-                  "value": "2"
-              }
-          },
-          "closingTimestamp": ${closingTimestamp},
-          "enactmentTimestamp": ${enactmentTimestamp}
-      }
-      }
-     }' --home ${walletLocation}`,
-    { failOnNonZeroExit: false }
-  )
-    .its('stderr')
-    .should('contain', '');
-});
-
-Cypress.Commands.add('sendWalletTxUpdateAssetProposal', () => {
-  const MIN_CLOSE_SEC = 8;
-  const MIN_ENACT_SEC = 5;
-
-  const closingDate = addSeconds(new Date(), MIN_CLOSE_SEC);
-  const enactmentDate = addSeconds(closingDate, MIN_ENACT_SEC);
-  const closingTimestamp = millisecondsToSeconds(closingDate.getTime());
-  const enactmentTimestamp = millisecondsToSeconds(enactmentDate.getTime());
-
-  cy.exec(
-    `vegawallet transaction send --wallet ${walletName} --pubkey ${walletPubKey} -p ${walletPassphraseFile} --network DV '{
-      "proposalSubmission": {
-        "rationale": {
-          "title": "Update Asset set to fail",
-          "description": "E2E fail test"
-        },
-        "terms": {
-          "updateAsset": {
-            "assetId": "ebcd94151ae1f0d39a4bde3b21a9c7ae81a80ea4352fb075a92e07608d9c953d",
-            "changes": {
-                "quantum": "1",
-                "erc20": {
-                    "withdrawThreshold": "10",
-                    "lifetimeLimit": "10"
-                }
-            }
-        },
-          "closingTimestamp": ${closingTimestamp},
-          "enactmentTimestamp": ${enactmentTimestamp}
-      }
-      }
-     }' --home ${walletLocation}`,
-    { failOnNonZeroExit: false }
-  )
-    .its('stderr')
-    .should('contain', '');
-});
-
-Cypress.Commands.add('sendWalletTxFreeFormProposal', () => {
-  const MIN_CLOSE_SEC = 5;
-
-  const closingDate = addSeconds(new Date(), MIN_CLOSE_SEC);
-  const closingTimestamp = millisecondsToSeconds(closingDate.getTime());
-
-  cy.exec(
-    `vegawallet transaction send --wallet ${walletName} --pubkey ${walletPubKey} -p ${walletPassphraseFile} --network DV '{
-      "proposalSubmission": {
-        "rationale": {
-          "title": "Add New free form proposal with short enactment",
-          "description": "E2E enactment test"
-        },
-        "terms": {
-          "newFreeform": {},
-        "closingTimestamp": ${closingTimestamp}
-        }
-      }
-     }' --home ${walletLocation}`,
-    { failOnNonZeroExit: false }
-  )
-    .its('stderr')
-    .should('contain', '');
-});

apps/token-e2e/src/support/staking.functions.js

@@ -58,8 +58,6 @@ Cypress.Commands.add('staking_validator_page_remove_stake', (stake) => {
 Cypress.Commands.add('staking_page_associate_tokens', (amount, options) => {
   let approve = options && options.approve ? options.approve : false;
   let type = options && options.type ? options.type : 'wallet';
-  let skipConfirmation =
-    options && options.skipConfirmation ? options.skipConfirmation : false;
 
   cy.highlight(`Associating ${amount} tokens from ${type}`);
   cy.get(ethWalletAssociateButton).first().click();
@@ -81,19 +79,16 @@ Cypress.Commands.add('staking_page_associate_tokens', (amount, options) => {
     );
   }
   cy.get(tokenSubmitButton, txTimeout).should('be.enabled').click();
-
-  if (!skipConfirmation) {
-    cy.contains(
-      `Associating with Vega key. Waiting for ${Cypress.env(
-        'blockConfirmations'
-      )} more confirmations..`,
-      txTimeout
-    ).should('be.visible');
-    cy.contains(
-      'can now participate in governance and nominate a validator',
-      txTimeout
-    ).should('be.visible');
-  }
+  cy.contains(
+    `Associating with Vega key. Waiting for ${Cypress.env(
+      'blockConfirmations'
+    )} more confirmations..`,
+    txTimeout
+  ).should('be.visible');
+  cy.contains(
+    'can now participate in governance and nominate a validator',
+    txTimeout
+  ).should('be.visible');
 });
 
 Cypress.Commands.add('staking_page_disassociate_tokens', (amount, options) => {
@@ -221,19 +216,3 @@ Cypress.Commands.add('close_staking_dialog', () => {
     cy.get('a').should('have.text', 'Back to Staking').click();
   });
 });
-
-Cypress.Commands.add(
-  'validate_wallet_currency',
-  (currencyTitle, expectedAmount) => {
-    cy.get("[data-testid='currency-title']")
-      .contains(currencyTitle)
-      .parent()
-      .parent()
-      .within(() => {
-        cy.getByTestId('currency-value', txTimeout).should(
-          'have.text',
-          expectedAmount
-        );
-      });
-  }
-);

apps/token-e2e/src/support/wallet-teardown.functions.js

@@ -8,6 +8,7 @@ import {
 import { ethers, Wallet } from 'ethers';
 
 const vegaWalletContainer = '[data-testid="vega-wallet"]';
+const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
 const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
 const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
@@ -42,11 +43,6 @@ before('Vega wallet teardown prep', function () {
   });
 });
 
-beforeEach(function () {
-  cy.wrap(this.stakingBridgeContract).as('stakingBridgeContract');
-  cy.wrap(this.vestingContract).as('vestingContract');
-});
-
 Cypress.Commands.add('deposit_asset', function (assetEthAddress) {
   cy.get('@signer', { log: false }).then((signer) => {
     // Approve asset
@@ -95,25 +91,29 @@ Cypress.Commands.add('faucet_asset', function (assetEthAddress) {
 });
 
 Cypress.Commands.add('vega_wallet_teardown', function () {
-  cy.get('[data-testid="associated-amount"]')
-    .should('be.visible')
-    .invoke('text')
-    .as('associatedAmount');
-  cy.get('body').then(($body) => {
-    if (
-      $body.find('[data-testid="eth-wallet-associated-balances"]').length ||
-      this.associatedAmount != '0.00'
-    ) {
-      cy.vega_wallet_teardown_vesting(this.vestingContract);
-      cy.vega_wallet_teardown_staking(this.stakingBridgeContract);
-    }
-  });
   cy.get(vegaWalletContainer).within(() => {
+    cy.get(vegaWalletAssociatedBalance)
+      .first()
+      .invoke('text')
+      .then((balance) => {
+        if (balance != '0.00') {
+          cy.vega_wallet_teardown_vesting(this.vestingContract);
+          cy.vega_wallet_teardown_staking(this.stakingBridgeContract);
+        }
+      });
     cy.get('[data-testid="associated-amount"]', { timeout: 30000 }).should(
       'contain.text',
       '0.00'
     );
   });
+
+  cy.get(vegaWalletContainer).within(() => {
+    cy.get(vegaWalletAssociatedBalance, { timeout: transactionTimeout }).should(
+      'contain',
+      '0.00',
+      { timeout: transactionTimeout }
+    );
+  });
 });
 
 Cypress.Commands.add(
@@ -176,22 +176,6 @@ Cypress.Commands.add('vega_wallet_teardown_vesting', (vestingContract) => {
   });
 });
 
-Cypress.Commands.add('vega_wallet_associate', (amount) => {
-  amount = amount + '0'.repeat(18);
-  cy.highlight('Associating tokens');
-  cy.get('@stakingBridgeContract').then((stakingBridgeContract) => {
-    stakingBridgeContract.stake(amount, vegaWalletPubKey);
-  });
-});
-
-Cypress.Commands.add('vega_wallet_disassociate', (amount) => {
-  amount = amount + '0'.repeat(18);
-  cy.highlight('Disassociating tokens');
-  cy.get('@stakingBridgeContract').then((stakingBridgeContract) => {
-    stakingBridgeContract.remove_stake(amount, vegaWalletPubKey);
-  });
-});
-
 Cypress.Commands.add('wait_for_transaction', (tx) => {
   cy.wrap(tx.wait(1).catch(cy.log), { timeout: transactionTimeout });
 });

apps/token-e2e/tsconfig.json

@@ -7,7 +7,7 @@
     "allowSyntheticDefaultImports": true,
     "outDir": "../../dist/out-tsc",
     "allowJs": true,
-    "types": ["cypress", "node", "cypress-real-events", "@cypress/grep"]
+    "types": ["cypress", "node", "@cypress/grep"]
   },
   "include": ["src/**/*.ts", "src/**/*.js"]
 }

apps/token/.env.testnet

@@ -1,7 +1,7 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
-NX_VEGA_URL=https://api.n08.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n10.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/token/jest.config.ts

@@ -12,10 +12,5 @@ export default {
   moduleNameMapper: {
     '^d3-(.*)$': `d3-$1/dist/d3-$1`,
   },
-  collectCoverageFrom: [
-    '**/*.{ts,tsx}',
-    '!**/node_modules/**',
-    '!**/__generated__/**',
-    '!**/__generated___/**',
-  ],
+  collectCoverageFrom: ['**/*.{ts,tsx}', '!**/node_modules/**'],
 };

apps/token/src/app.tsx

@@ -8,7 +8,6 @@ import { AppLoader } from './app-loader';
 import { NetworkInfo } from '@vegaprotocol/network-info';
 import { BalanceManager } from './components/balance-manager';
 import { EthWallet } from './components/eth-wallet';
-import { AppLayout } from './components/page-templates/app-layout';
 import { TemplateSidebar } from './components/page-templates/template-sidebar';
 import { TransactionModal } from './components/transactions-modal';
 import { VegaWallet } from './components/vega-wallet';
@@ -89,14 +88,14 @@ const Web3Container = ({
             <AppLoader>
               <BalanceManager>
                 <>
-                  <AppLayout>
+                  <div className="app w-full max-w-[1500px] mx-auto grid grid-rows-[min-content_min-content_1fr_min-content] min-h-full border-neutral-700 lg:border-l lg:border-r lg:text-body-large">
                     <TemplateSidebar sidebar={sideBar}>
                       <AppRouter />
                     </TemplateSidebar>
                     <footer className="p-4 border-t border-neutral-700">
                       <NetworkInfo />
                     </footer>
-                  </AppLayout>
+                  </div>
                   <VegaWalletDialogs />
                   <TransactionModal />
                   <WithdrawalDialog />

apps/token/src/components/balance-manager/balance-manager.tsx

@@ -2,24 +2,20 @@ import * as Sentry from '@sentry/react';
 import { toBigNum } from '@vegaprotocol/react-helpers';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import { useWeb3React } from '@web3-react/core';
-import { useEffect } from 'react';
+import React from 'react';
 
 import { useAppState } from '../../contexts/app-state/app-state-context';
 import { useContracts } from '../../contexts/contracts/contracts-context';
 import { useGetAssociationBreakdown } from '../../hooks/use-get-association-breakdown';
 import { useGetUserTrancheBalances } from '../../hooks/use-get-user-tranche-balances';
 import { useBalances } from '../../lib/balances/balances-store';
-import type { ReactElement } from 'react';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useListenForStakingEvents as useListenForAssociationEvents } from '../../hooks/use-listen-for-staking-events';
 
 interface BalanceManagerProps {
-  children: ReactElement;
+  children: React.ReactElement;
 }
 
 export const BalanceManager = ({ children }: BalanceManagerProps) => {
   const contracts = useContracts();
-  const { pubKey } = useVegaWallet();
   const { account } = useWeb3React();
   const {
     appState: { decimals },
@@ -27,20 +23,6 @@ export const BalanceManager = ({ children }: BalanceManagerProps) => {
   const { updateBalances: updateStoreBalances } = useBalances();
   const { config } = useEthereumConfig();
 
-  const numberOfConfirmations = config?.confirmations || 0;
-
-  useListenForAssociationEvents(
-    contracts?.staking.contract,
-    pubKey,
-    numberOfConfirmations
-  );
-
-  useListenForAssociationEvents(
-    contracts?.vesting.contract,
-    pubKey,
-    numberOfConfirmations
-  );
-
   const getUserTrancheBalances = useGetUserTrancheBalances(
     account || '',
     contracts?.vesting
@@ -52,7 +34,7 @@ export const BalanceManager = ({ children }: BalanceManagerProps) => {
   );
 
   // update balances on connect to Ethereum
-  useEffect(() => {
+  React.useEffect(() => {
     const updateBalances = async () => {
       if (!account || !config) return;
       try {
@@ -93,13 +75,13 @@ export const BalanceManager = ({ children }: BalanceManagerProps) => {
   ]);
 
   // This use effect hook is very expensive and is kept separate to prevent expensive reloading of data.
-  useEffect(() => {
+  React.useEffect(() => {
     if (account) {
       getUserTrancheBalances();
     }
   }, [account, getUserTrancheBalances]);
 
-  useEffect(() => {
+  React.useEffect(() => {
     if (account) {
       getAssociationBreakdown();
     }