feat: add ui to handle code creation and stake requirements

.github/workflows/ci-cd-trigger.yml

@@ -10,11 +10,10 @@ on:
       - opened
       - ready_for_review
       - reopened
+      - edited
       - synchronize
 jobs:
   node-modules:
-    # All jobs depend on node_modules, so none should run if the PR is in draft
-    if: github.event.pull_request.draft == false
     runs-on: ubuntu-22.04
     name: 'Cache yarn modules'
     steps:
@@ -43,6 +42,13 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         run: yarn install --pure-lockfile
 
+  lint-pr-title:
+    needs: node-modules
+    if: ${{ github.event_name == 'pull_request' }}
+    name: Verify PR title
+    uses: ./.github/workflows/lint-pr.yml
+    secrets: inherit
+
   lint-format:
     timeout-minutes: 20
     needs: node-modules
@@ -169,14 +175,14 @@ jobs:
       preview_explorer: ${{ env.PREVIEW_EXPLORER }}
       preview_tools: ${{ env.PREVIEW_TOOLS }}
 
-  # console-e2e:
-  #   needs: build-sources
-  #   name: '(CI) console python'
-  #   uses: ./.github/workflows/console-test-run.yml
-  #   secrets: inherit
-  #   if: ${{ contains(fromJSON(needs.build-sources.outputs.projects), 'trading') && github.event_name == 'pull_request' }}
-  #   with:
-  #     github-sha: ${{ github.event.pull_request.head.sha || github.sha }}
+  console-e2e:
+    needs: build-sources
+    name: '(CI) console python'
+    uses: ./.github/workflows/console-test-run.yml
+    secrets: inherit
+    if: ${{ contains(fromJSON(needs.build-sources.outputs.projects), 'trading') && github.event_name == 'pull_request' }}
+    with:
+      github-sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
   cypress:
     needs: build-sources

.github/workflows/console-test-run.yml

@@ -9,37 +9,23 @@ on:
       github-sha:
         required: true
         type: string
-  workflow_dispatch:
-    inputs:
-      console-test-branch:
-        type: choice
-        description: 'main: v0.72.14, develop: v0.73.0-preview7'
-        options:
-          - main
-          - develop
 
 jobs:
   run-tests:
     name: run-tests
-    runs-on: 8-cores
-    timeout-minutes: 20
+    runs-on: console-test
+    timeout-minutes: 40
     steps:
       #----------------------------------------------
       #       check-out frontend-monorepo
       #----------------------------------------------
-      - name: Checkout frontend-monorepo
+      - name: Checkout console test repo
         uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.github-sha || github.sha }}
+          ref: ${{ inputs.github-sha }}
       #----------------------------------------------
       #       cache node modules
       #----------------------------------------------
-      - name: setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-          cache: yarn
-
       - name: Cache node modules
         id: cache
         uses: actions/cache@v3
@@ -82,18 +68,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: vegaprotocol/console-test
-          ref: ${{ inputs.console-test-branch }}
           path: './console-test'
-
-      - name: Load console test envs
-        id: console-test-env
-        uses: falti/dotenv-action@v1.0.4
-        with:
-          path: './console-test/.env.${{ inputs.console-test-branch }}'
-          export-variables: true
-          keys-case: upper
-          log-variables: true
-
       #----------------------------------------------
       #       install dependencies
       #----------------------------------------------
@@ -121,7 +96,8 @@ jobs:
       #----------------------------------------------
       - name: Install vega binaries
         working-directory: ./console-test
-        run: poetry run python -m vega_sim.tools.load_binaries --force --version ${{ env.VEGA_VERSION }}
+        if: steps.vega_binaries_cache.outputs.cache-hit != 'true'
+        run: poetry run python -m vega_sim.tools.load_binaries --force --version $VEGA_VERSION
       #----------------------------------------------
       # install playwright
       #----------------------------------------------
@@ -133,7 +109,7 @@ jobs:
       #----------------------------------------------
       - name: Run tests
         working-directory: ./console-test
-        run: poetry run pytest -v -s --numprocesses 4 --dist loadfile --durations=15
+        run: poetry run pytest -v -s --numprocesses 2 --dist loadfile --durations=20
       - name: Check files
         run: |
           ls -al .
@@ -148,13 +124,3 @@ jobs:
           name: playwright-trace
           path: ./traces/
           retention-days: 15
-      #----------------------------------------------
-      #  -----  upload logs  -----
-      #----------------------------------------------
-      - name: Upload worker logs
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: worker-logs
-          path: ./logs/
-          retention-days: 15

.github/workflows/cypress-run.yml

@@ -13,35 +13,13 @@ on:
         type: string
 
 jobs:
-  runner-choice:
-    runs-on: ubuntu-latest
-    outputs:
-      runner: ${{ steps.step.outputs.runner }}
-    steps:
-      - name: Check branch
-        id: step
-        run: |
-          if [ ${{ github.base_ref }} == 'main' ]; then
-            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [ ${{ github.base_ref }} == 'develop' ] && [ ${{ github.ref_name }} == 'main' ]; then
-            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [ ${{ github.event_name }} == 'push' ] && [ ${{ contains(github.ref_name, 'release/mainnet') }} ]; then
-            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          else
-            echo "runner=self-hosted-runner" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Print runner
-        run: echo ${{ steps.step.outputs.runner }}
-
   e2e:
     strategy:
       fail-fast: false
       matrix:
         project: ${{ fromJSON(inputs.projects) }}
     name: ${{ matrix.project }}
-    needs: runner-choice
-    runs-on: ${{ needs.runner-choice.outputs.runner }}
+    runs-on: self-hosted-runner
     timeout-minutes: 120
     steps:
       # Checks if skip cache was requested

.github/workflows/lint-pr.yml

@@ -2,12 +2,7 @@
 name: Verify PR title
 
 on:
-  pull_request:
-    types:
-      - opened
-      - edited
-      - reopened
-      - synchronize
+  workflow_call:
 
 jobs:
   lint_pr:
@@ -16,16 +11,21 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version-file: '.nvmrc'
+          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
+          cache: yarn
 
-      - name: Install dependencies
-        run: |
-          rm package.json 
-          npm install --no-save @commitlint/cli @commitlint/config-conventional @commitlint/config-nx-scopes nx
+      - name: Cache node modules
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
 
       - name: Check PR title
         run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js

.github/workflows/publish-dist.yml

@@ -30,18 +30,12 @@ jobs:
           echo IS_IPFS_RELEASE=false >> $GITHUB_ENV
           echo IS_S3_RELEASE=false >> $GITHUB_ENV
           echo IS_DEV_IMAGE=false >> $GITHUB_ENV
-          echo IS_MAIN_IMAGE=false >> $GITHUB_ENV
 
       - name: Is dev image
-        if: ${{ github.ref_name == 'develop' && github.event_name == 'push' && matrix.app == 'trading' }}
+        if: ${{ contains(github.ref, 'develop') && github.event_name == 'push' && matrix.app == 'trading' }}
         run: |
           echo IS_DEV_IMAGE=true >> $GITHUB_ENV
 
-      - name: Is main image
-        if: ${{ github.ref_name == 'main' && github.event_name == 'push' && matrix.app == 'trading' }}
-        run: |
-          echo IS_MAIN_IMAGE=true >> $GITHUB_ENV
-
       - name: Is PR
         if: ${{ github.event_name == 'pull_request' }}
         run: |
@@ -87,7 +81,7 @@ jobs:
 
       - name: Log in to the Container registry (docker hub)
         uses: docker/login-action@v2
-        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' || env.IS_MAIN_IMAGE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' }}
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -161,10 +155,10 @@ jobs:
       - name: Sanity check docker image
         run: |
           echo "Check ipfs-hash"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local /bin/sh -c 'cat /ipfs-hash'
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local /bin/sh -c 'cat /ipfs-hash' > ${{ matrix.app }}-ipfs-hash
+          docker run --rm --entrypoint /bin/sh ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local -c 'cat /ipfs-hash'
+          docker run --rm --entrypoint /bin/sh ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local -c 'cat /ipfs-hash' > ${{ matrix.app }}-ipfs-hash
           echo "List html directory"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local /bin/sh -c 'apk add --update tree; tree /usr/share/nginx/html'
+          docker run --rm --entrypoint /bin/sh ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local -c 'apk add --update tree; tree /usr/share/nginx/html'
 
       - name: Publish dist as docker image (ghcr)
         uses: docker/build-push-action@v3
@@ -185,7 +179,7 @@ jobs:
         uses: docker/build-push-action@v3
         continue-on-error: true
         id: dockerhub-push
-        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' || env.IS_MAIN_IMAGE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true'  }}
         with:
           context: .
           file: docker/node-outside-docker.Dockerfile
@@ -195,7 +189,7 @@ jobs:
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true && main' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || '' }}
 
       - name: Publish dist as docker image (ghcr - retry)
         uses: docker/build-push-action@v3
@@ -222,7 +216,7 @@ jobs:
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true && main' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || '' }}
 
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3
@@ -335,9 +329,7 @@ jobs:
             fi
 
             # create commit
-            if ! git diff --cached --exit-code; then
-              commit_msg="Automated hash update from ${{ github.ref }}"
-              git commit -m "$commit_msg"
-              git push -u origin "main"
-            fi
+            commit_msg="Automated hash update from ${{ github.ref }}"
+            git commit -m "$commit_msg"
+            git push -u origin "main"
           )

README.md

@@ -118,7 +118,7 @@ On top of that there are two possible scenarios for running docker image - using
 to run ipfs on port 3000:
 
 ```bash
-docker run -p 3000:80 [TAG] /run-ipfs.sh
+docker run -p 3000:80 [TAG] ipfs
 ```
 
 to run nginx on port 3000:

apps/explorer-e2e/src/integration/market.cy.js

@@ -87,6 +87,7 @@ context('Market page', { tags: '@regression' }, function () {
       // Liquidity
       cy.validate_element_from_table('Target Stake', '0.00 fUSDC');
       cy.validate_element_from_table('Supplied Stake', '0.00 fUSDC');
+      cy.validate_element_from_table('Market Value Proxy', '0.00 fUSDC');
       // Liquidity price range
       cy.validate_element_from_table(
         'Liquidity Price Range',
@@ -94,6 +95,7 @@ context('Market page', { tags: '@regression' }, function () {
       );
       cy.validate_element_from_table('Lowest Price', '0.00 fUSDC');
       cy.validate_element_from_table('Highest Price', '0.00 fUSDC');
+
       cy.getByTestId('oracle-spec-links')
         .should('have.attr', 'href')
         .and(
@@ -142,8 +144,11 @@ context('Market page', { tags: '@regression' }, function () {
         .as('successorMarketId');
       cy.contains('Token test market').click();
       cy.getByTestId(marketHeaders).should('have.text', 'Token test market');
+      cy.validate_proposal_change_type('Triggering Ratio', 'Added');
       cy.validate_element_from_table('Triggering Ratio', '0.7');
+      cy.validate_proposal_change_type('Time Window', 'Added');
       cy.validate_element_from_table('Time Window', '3,600');
+      cy.validate_proposal_change_type('Scaling Factor', 'Added');
       cy.validate_element_from_table('Scaling Factor', '10');
 
       cy.getByTestId(successionLineItem)

apps/explorer-e2e/src/support/governance.functions.js

@@ -26,6 +26,7 @@ function getSuccessorTxBody(parentMarketId) {
             positionDecimalPlaces: '5',
             linearSlippageFactor: '0.001',
             quadraticSlippageFactor: '0',
+            lpPriceRange: '10',
             instrument: {
               name: 'Token test market',
               code: 'TEST.24h',
@@ -129,12 +130,6 @@ function getSuccessorTxBody(parentMarketId) {
               parentMarketId: parentMarketId,
               insurancePoolFraction: '0.75',
             },
-            liquiditySlaParameters: {
-              priceRange: '0.95',
-              commitmentMinTimeFraction: '0.5',
-              performanceHysteresisEpochs: 2,
-              slaCompetitionFactor: '0.75',
-            },
           },
         },
         closingTimestamp,

apps/explorer/src/app/components/assets/assets-table.tsx

@@ -4,7 +4,7 @@ import { AssetTypeMapping, AssetStatusMapping } from '@vegaprotocol/assets';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
-import { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type { VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';

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

@@ -13,12 +13,6 @@ query ExplorerMarket($id: ID!) {
               decimals
             }
           }
-          ... on Perpetual {
-            quoteName
-            settlementAsset {
-              decimals
-            }
-          }
         }
       }
     }

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 } } | { __typename?: 'Perpetual', quoteName: string, settlementAsset: { __typename?: 'Asset', decimals: number } } | { __typename?: 'Spot' } } } } | null };
+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 const ExplorerMarketDocument = gql`
@@ -27,12 +27,6 @@ export const ExplorerMarketDocument = gql`
               decimals
             }
           }
-          ... on Perpetual {
-            quoteName
-            settlementAsset {
-              decimals
-            }
-          }
         }
       }
     }

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

@@ -61,7 +61,6 @@ describe('Market link component', () => {
               instrument: {
                 name: 'test-label',
                 product: {
-                  __typename: 'Future',
                   quoteName: 'dai',
                 },
               },

apps/explorer/src/app/components/markets/market-details.tsx

@@ -1,18 +1,15 @@
 import { t } from '@vegaprotocol/i18n';
 import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import {
-  LiquidityPriceRangeInfoPanel,
-  LiquiditySLAParametersInfoPanel,
   PriceMonitoringBoundsInfoPanel,
   SuccessionLineInfoPanel,
-  getDataSourceSpecForSettlementData,
-  getDataSourceSpecForTradingTermination,
 } from '@vegaprotocol/markets';
 import {
   LiquidityInfoPanel,
   LiquidityMonitoringParametersInfoPanel,
   InstrumentInfoPanel,
   KeyDetailsInfoPanel,
+  LiquidityPriceRangeInfoPanel,
   MetadataInfoPanel,
   OracleInfoPanel,
   RiskFactorsInfoPanel,
@@ -21,21 +18,20 @@ import {
   SettlementAssetInfoPanel,
 } from '@vegaprotocol/markets';
 import { MarketInfoTable } from '@vegaprotocol/markets';
-import type { DataSourceFragment } from '@vegaprotocol/markets';
+import type { DataSourceDefinition } from '@vegaprotocol/types';
 import isEqual from 'lodash/isEqual';
 
 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
   if (!market) return null;
-  const { product } = market.tradableInstrument.instrument;
-  const settlementDataSource = getDataSourceSpecForSettlementData(product);
-  const terminationDataSource = getDataSourceSpecForTradingTermination(product);
 
-  const getSigners = ({ data }: DataSourceFragment) => {
+  const settlementData = market.tradableInstrument.instrument.product
+    .dataSourceSpecForSettlementData.data as DataSourceDefinition;
+  const terminationData = market.tradableInstrument.instrument.product
+    .dataSourceSpecForTradingTermination.data as DataSourceDefinition;
+
+  const getSigners = (data: DataSourceDefinition) => {
     if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {
-      const signers =
-        ('signers' in data.sourceType.sourceType &&
-          data.sourceType.sourceType.signers) ||
-        [];
+      const signers = data.sourceType.sourceType.signers || [];
 
       return signers.map(({ signer }, i) => {
         return (
@@ -47,13 +43,10 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
     return [];
   };
 
-  const showTwoOracles =
-    settlementDataSource &&
-    terminationDataSource &&
-    isEqual(
-      getSigners(settlementDataSource),
-      getSigners(terminationDataSource)
-    );
+  const showTwoOracles = isEqual(
+    getSigners(settlementData),
+    getSigners(terminationData)
+  );
 
   const headerClassName = 'font-alpha calt text-xl mt-4 border-b-2 pb-2';
 
@@ -96,12 +89,10 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
       )}
       <h2 className={headerClassName}>{t('Liquidity monitoring')}</h2>
       <LiquidityMonitoringParametersInfoPanel market={market} />
-      <h2 className={headerClassName}>{t('Liquidity price range')}</h2>
-      <LiquidityPriceRangeInfoPanel market={market} />
-      <h2 className={headerClassName}>{t('Liquidity SLA protocol')}</h2>
-      <LiquiditySLAParametersInfoPanel market={market} />
       <h2 className={headerClassName}>{t('Liquidity')}</h2>
       <LiquidityInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Liquidity price range')}</h2>
+      <LiquidityPriceRangeInfoPanel market={market} />
       {showTwoOracles ? (
         <>
           <h2 className={headerClassName}>{t('Settlement oracle')}</h2>

apps/explorer/src/app/components/markets/markets-table.tsx

@@ -1,10 +1,10 @@
 import { useMemo } from 'react';
-import { getAsset, type MarketFieldsFragment } from '@vegaprotocol/markets';
+import type { MarketFieldsFragment } from '@vegaprotocol/markets';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
-import { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
   VegaICellRendererParams,
   VegaValueGetterParams,
@@ -73,7 +73,8 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
           MarketFieldsFragment,
           'tradableInstrument.instrument.product.settlementAsset.symbol'
         >) => {
-          const value = data && getAsset(data);
+          const value =
+            data?.tradableInstrument.instrument.product.settlementAsset;
           return value ? (
             <ButtonLink
               onClick={(e) => {

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

@@ -31,9 +31,6 @@ fragment ExplorerDeterministicOrderFields on Order {
           ... on Future {
             quoteName
           }
-          ... on Perpetual {
-            quoteName
-          }
         }
       }
     }

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, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | 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 } | { __typename?: 'Perpetual', quoteName: string } | { __typename?: 'Spot' } } } } };
+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, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | 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 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, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | 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 } | { __typename?: 'Perpetual', quoteName: string } | { __typename?: 'Spot' } } } } } };
+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, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | 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 const ExplorerDeterministicOrderFieldsFragmentDoc = gql`
     fragment ExplorerDeterministicOrderFields on Order {
@@ -47,9 +47,6 @@ export const ExplorerDeterministicOrderFieldsFragmentDoc = gql`
           ... on Future {
             quoteName
           }
-          ... on Perpetual {
-            quoteName
-          }
         }
       }
     }

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

@@ -150,7 +150,6 @@ function renderExistingAmend(
               instrument: {
                 name: 'test-label',
                 product: {
-                  __typename: 'Future',
                   quoteName: 'dai',
                 },
               },

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

@@ -33,8 +33,6 @@ const PriceInMarket = ({
       label = addDecimalsFormatNumber(price, data.market.decimalPlaces);
     } else if (
       decimalSource === 'SETTLEMENT_ASSET' &&
-      data.market &&
-      'settlementAsset' in data.market.tradableInstrument.instrument.product &&
       data.market?.tradableInstrument.instrument.product.settlementAsset
     ) {
       label = addDecimalsFormatNumber(

apps/explorer/src/app/components/proposals/proposals-table.tsx

@@ -2,7 +2,7 @@ import type { ProposalListFieldsFragment } from '@vegaprotocol/proposals';
 import { VoteProgress } from '@vegaprotocol/proposals';
 import type { AgGridReact } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
@@ -105,7 +105,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
               ? new BigNumber(0)
               : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
             return (
-              <div className="flex items-center justify-center h-full pt-2 uppercase">
+              <div className="uppercase flex h-full items-center justify-center pt-2">
                 <VoteProgress
                   threshold={requiredMajorityPercentage}
                   progress={yesPercentage}

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

@@ -49,37 +49,6 @@ fragment ExplorerOracleDataSource on OracleSpec {
           }
           ... on DataSourceDefinitionExternal {
             sourceType {
-              ... on EthCallSpec {
-                abi
-                args
-                method
-                requiredConfirmations
-                address
-                normalisers {
-                  name
-                  expression
-                }
-                trigger {
-                  trigger {
-                    ... on EthTimeTrigger {
-                      initial
-                      every
-                      until
-                    }
-                  }
-                }
-                filters {
-                  key {
-                    name
-                    type
-                    numberDecimalPlaces
-                  }
-                  conditions {
-                    value
-                    operator
-                  }
-                }
-              }
               ... on DataSourceSpecConfiguration {
                 signers {
                   signer {

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

@@ -11,14 +11,6 @@ fragment ExplorerOracleForMarketsMarket on Market {
             id
           }
         }
-        ... on Perpetual {
-          dataSourceSpecForSettlementData {
-            id
-          }
-          dataSourceSpecForSettlementSchedule {
-            id
-          }
-        }
       }
     }
   }

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

@@ -5,19 +5,19 @@ import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 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 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, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, 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> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, 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 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, numberDecimalPlaces?: number | null }, 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 } };
 
 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, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, 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> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, 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 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, numberDecimalPlaces?: number | null }, 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 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, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, 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> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, 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 };
+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, numberDecimalPlaces?: number | null }, 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 };
 
 export const ExplorerOracleDataConnectionFragmentDoc = gql`
     fragment ExplorerOracleDataConnection on OracleSpec {
@@ -72,37 +72,6 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
           }
           ... on DataSourceDefinitionExternal {
             sourceType {
-              ... on EthCallSpec {
-                abi
-                args
-                method
-                requiredConfirmations
-                address
-                normalisers {
-                  name
-                  expression
-                }
-                trigger {
-                  trigger {
-                    ... on EthTimeTrigger {
-                      initial
-                      every
-                      until
-                    }
-                  }
-                }
-                filters {
-                  key {
-                    name
-                    type
-                    numberDecimalPlaces
-                  }
-                  conditions {
-                    value
-                    operator
-                  }
-                }
-              }
               ... on DataSourceSpecConfiguration {
                 signers {
                   signer {

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

@@ -3,12 +3,12 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ExplorerOracleForMarketsMarketFragment = { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Spot' } } } };
+export type ExplorerOracleForMarketsMarketFragment = { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string } } } } };
 
 export type ExplorerOracleFormMarketsQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type ExplorerOracleFormMarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Spot' } } } } }> } | null };
+export type ExplorerOracleFormMarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string } } } } } }> } | null };
 
 export const ExplorerOracleForMarketsMarketFragmentDoc = gql`
     fragment ExplorerOracleForMarketsMarket on Market {
@@ -24,14 +24,6 @@ export const ExplorerOracleForMarketsMarketFragmentDoc = gql`
             id
           }
         }
-        ... on Perpetual {
-          dataSourceSpecForSettlementData {
-            id
-          }
-          dataSourceSpecForSettlementSchedule {
-            id
-          }
-        }
       }
     }
   }

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

@@ -10,7 +10,7 @@ interface OracleMarketsProps {
 }
 
 /**
- * Slightly misleading names, OracleMarkets lists the market (almost always singular)
+ * Slightly misleadlingly names, OracleMarkets lists the market (almost always singular)
  * to which an oracle is attached. It also checks what it triggers, by checking on the
  * market whether it is attached to the dataSourceSpecForSettlementData or ..TradingTermination
  */
@@ -27,10 +27,8 @@ export function OracleMarkets({ id }: OracleMarketsProps) {
     const m = markets.find((m) => {
       const p = m.tradableInstrument.instrument.product;
       if (
-        ((p.__typename === 'Future' || p.__typename === 'Perpetual') &&
-          p.dataSourceSpecForSettlementData.id === id) ||
-        ('dataSourceSpecForTradingTermination' in p &&
-          p.dataSourceSpecForTradingTermination.id === id)
+        p?.dataSourceSpecForSettlementData?.id === id ||
+        p?.dataSourceSpecForTradingTermination?.id === id
       ) {
         return true;
       }
@@ -63,32 +61,8 @@ export function getLabel(
   m: ExplorerOracleForMarketsMarketFragment | null
 ): string {
   const settlementId =
-    ((m?.tradableInstrument?.instrument?.product?.__typename === 'Future' ||
-      m?.tradableInstrument?.instrument?.product?.__typename === 'Perpetual') &&
-      m?.tradableInstrument?.instrument?.product
-        ?.dataSourceSpecForSettlementData?.id) ||
-    null;
+    m?.tradableInstrument?.instrument?.product?.dataSourceSpecForSettlementData
+      ?.id || null;
 
-  const terminationId =
-    (m?.tradableInstrument?.instrument?.product?.__typename === 'Future' &&
-      m?.tradableInstrument?.instrument?.product
-        ?.dataSourceSpecForTradingTermination?.id) ||
-    null;
-
-  const settlementScheduleId =
-    (m?.tradableInstrument?.instrument?.product?.__typename === 'Perpetual' &&
-      m?.tradableInstrument?.instrument?.product
-        ?.dataSourceSpecForSettlementSchedule?.id) ||
-    null;
-
-  switch (id) {
-    case settlementId:
-      return 'Settlement for';
-    case terminationId:
-      return 'Termination for';
-    case settlementScheduleId:
-      return 'Settlement schedule for';
-    default:
-      return 'Unknown';
-  }
+  return id === settlementId ? 'Settlement for' : 'Termination for';
 }

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

@@ -67,9 +67,6 @@ export function OracleSigners({ sourceType }: OracleDetailsSignersProps) {
   if (sourceType.__typename !== 'DataSourceDefinitionExternal') {
     return null;
   }
-  if (!('signers' in sourceType.sourceType)) {
-    return null;
-  }
   const signers = sourceType.sourceType.signers;
 
   if (!signers || signers.length === 0) {

apps/explorer/src/app/routes/parties/id/Party-assets.graphql

@@ -23,9 +23,6 @@ fragment ExplorerPartyAssetsAccounts on AccountBalance {
           ... on Future {
             quoteName
           }
-          ... on Perpetual {
-            quoteName
-          }
         }
       }
     }

apps/explorer/src/app/routes/parties/id/__generated__/Party-assets.ts

@@ -3,14 +3,14 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ExplorerPartyAssetsAccountsFragment = { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } | { __typename?: 'Perpetual', quoteName: string } | { __typename?: 'Spot' } } } } | null };
+export type ExplorerPartyAssetsAccountsFragment = { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } | null };
 
 export type ExplorerPartyAssetsQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
 }>;
 
 
-export type ExplorerPartyAssetsQuery = { __typename?: 'Query', partiesConnection?: { __typename?: 'PartyConnection', edges: Array<{ __typename?: 'PartyEdge', node: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string, linkings: { __typename?: 'StakesConnection', edges?: Array<{ __typename?: 'StakeLinkingEdge', node: { __typename?: 'StakeLinking', type: Types.StakeLinkingType, status: Types.StakeLinkingStatus, amount: string } } | null> | null } }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } | { __typename?: 'Perpetual', quoteName: string } | { __typename?: 'Spot' } } } } | null } } | null> | null } | null } }> } | null };
+export type ExplorerPartyAssetsQuery = { __typename?: 'Query', partiesConnection?: { __typename?: 'PartyConnection', edges: Array<{ __typename?: 'PartyEdge', node: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string, linkings: { __typename?: 'StakesConnection', edges?: Array<{ __typename?: 'StakeLinkingEdge', node: { __typename?: 'StakeLinking', type: Types.StakeLinkingType, status: Types.StakeLinkingStatus, amount: string } } | null> | null } }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } | null } } | null> | null } | null } }> } | null };
 
 export const ExplorerPartyAssetsAccountsFragmentDoc = gql`
     fragment ExplorerPartyAssetsAccounts on AccountBalance {
@@ -38,9 +38,6 @@ export const ExplorerPartyAssetsAccountsFragmentDoc = gql`
           ... on Future {
             quoteName
           }
-          ... on Perpetual {
-            quoteName
-          }
         }
       }
     }

apps/explorer/src/types/explorer.d.ts

@@ -1453,6 +1453,11 @@ export interface components {
       readonly liquidityMonitoringParameters?: components['schemas']['vegaLiquidityMonitoringParameters'];
       /** @description Log normal risk model parameters, valid only if MODEL_LOG_NORMAL is selected. */
       readonly logNormal?: components['schemas']['vegaLogNormalRiskModel'];
+      /**
+       * @description Percentage move up and down from the mid price which specifies the range of
+       * price levels over which automated liquidity provision orders will be deployed.
+       */
+      readonly lpPriceRange?: string;
       /** @description Optional new futures market metadata, tags. */
       readonly metadata?: readonly string[];
       /**
@@ -1848,6 +1853,11 @@ export interface components {
       readonly liquidityMonitoringParameters?: components['schemas']['vegaLiquidityMonitoringParameters'];
       /** @description Log normal risk model parameters, valid only if MODEL_LOG_NORMAL is selected. */
       readonly logNormal?: components['schemas']['vegaLogNormalRiskModel'];
+      /**
+       * @description Percentage move up and down from the mid price which specifies the range of
+       * price levels over which automated liquidity provision orders will be deployed.
+       */
+      readonly lpPriceRange?: string;
       /** @description Optional futures market metadata, tags. */
       readonly metadata?: readonly string[];
       /** @description Price monitoring parameters. */

apps/governance-e2e/.env

@@ -21,8 +21,6 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 NX_SUCCESSOR_MARKETS=true
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true
 
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn

apps/governance-e2e/.env.devnet

@@ -4,5 +4,3 @@ NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true

apps/governance-e2e/.env.mainnet

@@ -4,5 +4,3 @@ NX_VEGA_URL=https://api.vega.community/graphql
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_PRODUCT_PERPETUALS=false
-NX_UPDATE_MARKET_STATE=false

apps/governance-e2e/.env.testnet

@@ -4,5 +4,3 @@ NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true

apps/governance-e2e/src/fixtures/proposals/asset.json

@@ -0,0 +1,21 @@
+{
+  "rationale": {
+    "title": "Add USDT Coin (USDT)",
+    "description": "Proposal to add USDT Coin (USDT) as an asset"
+  },
+  "terms": {
+    "newAsset": {
+      "changes": {
+        "name": "USDT Coin",
+        "symbol": "USDT",
+        "decimals": "18",
+        "quantum": "1",
+        "erc20": {
+          "contractAddress": "0xb404c51bbc10dcbe948077f18a4b8e553d160084"
+        }
+      }
+    },
+    "closingTimestamp": 1662374250,
+    "enactmentTimestamp": 1662460650
+  }
+}

apps/governance-e2e/src/fixtures/proposals/new-market-perpetual-raw.json

@@ -1,138 +0,0 @@
-{
-  "rationale": {
-    "description": "## Summary\n\nThis proposal requests to list BTC PERPS Incentive as a market with USD-P as a settlement asset on the Vega Network as discussed in: https://community.vega.xyz/.\n\n## Rationale\n\n- BTC is the largest Crypto asset with the highest volume and Marketcap.\n- Given the price, 1 decimal places will be used for price due to the number of valid digits in asset price. \n- Position decimal places will be set to 4 considering the value per contract\n- USDT is chosen as settlement asset due to its stability.",
-    "title": "perpetual market proposal"
-  },
-  "terms": {
-    "closingTimestamp": 0,
-    "enactmentTimestamp": 0,
-    "newMarket": {
-      "changes": {
-        "instrument": {
-          "name": "Token test market",
-          "code": "TEST.24h",
-          "perpetual": {
-            "clampLowerBound": "0",
-            "clampUpperBound": "0",
-            "interestRate": "0",
-            "marginFundingFactor": "0.1",
-            "settlementAsset": "73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0",
-            "quoteName": "fBTC",
-            "dataSourceSpecForSettlementData": {
-              "external": {
-                "ethOracle": {
-                  "address": "0x1b44F3514812d835EB1BDB0acB33d3fA3351Ee43",
-                  "abi": "[{\"inputs\":[],\"name\":\"latestAnswer\",\"outputs\":[{\"internalType\":\"int256\",\"name\":\"\",\"type\":\"int256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
-                  "method": "latestAnswer",
-                  "normalisers": [
-                    {
-                      "name": "btc.price",
-                      "expression": "$[0]"
-                    }
-                  ],
-                  "requiredConfirmations": 3,
-                  "trigger": {
-                    "timeTrigger": {
-                      "every": 30
-                    }
-                  },
-                  "filters": [
-                    {
-                      "key": {
-                        "name": "btc.price",
-                        "type": "TYPE_INTEGER",
-                        "numberDecimalPlaces": 8
-                      },
-                      "conditions": [
-                        {
-                          "operator": "OPERATOR_GREATER_THAN_OR_EQUAL",
-                          "value": "0"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              }
-            },
-            "dataSourceSpecForSettlementSchedule": {
-              "internal": {
-                "timeTrigger": {
-                  "conditions": [
-                    {
-                      "operator": "OPERATOR_GREATER_THAN_OR_EQUAL",
-                      "value": "0"
-                    }
-                  ],
-                  "triggers": [
-                    {
-                      "every": 1800
-                    }
-                  ]
-                }
-              }
-            },
-            "dataSourceSpecBinding": {
-              "settlementDataProperty": "btc.price",
-              "settlementScheduleProperty": "vegaprotocol.builtin.timetrigger"
-            }
-          }
-        },
-        "metadata": [
-          "base:BTC",
-          "quote:USD-P",
-          "class:fx/crypto",
-          "quarterly",
-          "sector:defi",
-          "enactment:2023-06-15T14:00:00Z",
-          "settlement:2023-09-30T08:00:00Z"
-        ],
-        "priceMonitoringParameters": {
-          "triggers": [
-            {
-              "horizon": "3600",
-              "probability": "0.9999",
-              "auctionExtension": "120"
-            },
-            {
-              "horizon": "14400",
-              "probability": "0.9999",
-              "auctionExtension": "180"
-            },
-            {
-              "horizon": "43200",
-              "probability": "0.9999",
-              "auctionExtension": "300"
-            }
-          ]
-        },
-        "liquidityMonitoringParameters": {
-          "targetStakeParameters": {
-            "timeWindow": "3600",
-            "scalingFactor": 1
-          },
-          "triggeringRatio": "0.7",
-          "auctionExtension": "1"
-        },
-
-        "liquiditySlaParameters": {
-          "priceRange": "0.05",
-          "commitmentMinTimeFraction": "0.95",
-          "performanceHysteresisEpochs": 1,
-          "slaCompetitionFactor": "0.95"
-        },
-
-        "logNormal": {
-          "riskAversionParameter": 0.000001,
-          "tau": 0.0001140771161,
-          "params": {
-            "sigma": 1.5
-          }
-        },
-        "decimalPlaces": "1",
-        "positionDecimalPlaces": "4",
-        "linearSlippageFactor": "0.001",
-        "quadraticSlippageFactor": "0.0"
-      }
-    }
-  }
-}

apps/governance-e2e/src/fixtures/proposals/new-market-raw.json

@@ -10,6 +10,7 @@
         "positionDecimalPlaces": "5",
         "linearSlippageFactor": "0.001",
         "quadraticSlippageFactor": "0",
+        "lpPriceRange": "10",
         "instrument": {
           "name": "Token test market",
           "code": "TEST.24h",
@@ -103,12 +104,6 @@
             "r": 0.016,
             "sigma": 0.5
           }
-        },
-        "liquiditySlaParameters": {
-          "priceRange": "0.95",
-          "commitmentMinTimeFraction": "0.5",
-          "performanceHysteresisEpochs": 2,
-          "slaCompetitionFactor": "0.75"
         }
       }
     },

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

@@ -4,6 +4,7 @@
     "positionDecimalPlaces": "5",
     "linearSlippageFactor": "0.001",
     "quadraticSlippageFactor": "0",
+    "lpPriceRange": "10",
     "instrument": {
       "name": "Token test market",
       "code": "Token.24h",
@@ -97,12 +98,6 @@
         "r": 0.016,
         "sigma": 0.8
       }
-    },
-    "liquiditySlaParameters": {
-      "priceRange": "0.95",
-      "commitmentMinTimeFraction": "0.5",
-      "performanceHysteresisEpochs": 2,
-      "slaCompetitionFactor": "0.75"
     }
   }
 }

apps/governance-e2e/src/fixtures/proposals/resume-market-raw.json

@@ -1,16 +0,0 @@
-{
-  "rationale": {
-    "title": "Market resume test",
-    "description": "E2E test for market resume proposal"
-  },
-  "terms": {
-    "updateMarketState": {
-      "changes": {
-        "marketId": "b33bb4157e12355db22e41f277ddd0c10104dec29a4d6960bbcb96d186c40cbd",
-        "updateType": "MARKET_STATE_UPDATE_TYPE_RESUME"
-      }
-    },
-    "closingTimestamp": 0,
-    "enactmentTimestamp": 0
-  }
-}

apps/governance-e2e/src/fixtures/proposals/successor-market.json

@@ -4,6 +4,7 @@
     "positionDecimalPlaces": "5",
     "linearSlippageFactor": "0.001",
     "quadraticSlippageFactor": "0",
+    "lpPriceRange": "10",
     "instrument": {
       "name": "Token test market",
       "code": "Token.24h",
@@ -98,12 +99,6 @@
         "sigma": 0.8
       }
     },
-    "liquiditySlaParameters": {
-      "priceRange": "0.95",
-      "commitmentMinTimeFraction": "0.5",
-      "performanceHysteresisEpochs": 2,
-      "slaCompetitionFactor": "0.75"
-    },
     "successor": {
       "parentMarketId": "",
       "insurancePoolFraction": "0.75"

apps/governance-e2e/src/fixtures/proposals/suspend-market-raw.json

@@ -1,16 +0,0 @@
-{
-  "rationale": {
-    "title": "Market suspended test",
-    "description": "E2E test for market suspended proposal"
-  },
-  "terms": {
-    "updateMarketState": {
-      "changes": {
-        "marketId": "",
-        "updateType": "MARKET_STATE_UPDATE_TYPE_SUSPEND"
-      }
-    },
-    "closingTimestamp": 0,
-    "enactmentTimestamp": 0
-  }
-}

apps/governance-e2e/src/fixtures/proposals/terminate-market-raw.json

@@ -1,17 +0,0 @@
-{
-  "rationale": {
-    "title": "Market terminate test",
-    "description": "E2E test for market terminate proposal"
-  },
-  "terms": {
-    "updateMarketState": {
-      "changes": {
-        "marketId": "",
-        "updateType": "MARKET_STATE_UPDATE_TYPE_TERMINATE",
-        "price": "100"
-      }
-    },
-    "closingTimestamp": 0,
-    "enactmentTimestamp": 0
-  }
-}

apps/governance-e2e/src/fixtures/proposals/update-market-old.json

@@ -0,0 +1,86 @@
+{
+  "lpPriceRange": "11",
+  "instrument": {
+    "code": "Token.24h",
+    "future": {
+      "quoteName": "fBTC",
+      "dataSourceSpecForSettlementData": {
+        "external": {
+          "oracle": {
+            "signers": [
+              {
+                "pubKey": {
+                  "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                }
+              }
+            ],
+            "filters": [
+              {
+                "key": {
+                  "name": "prices.BTC.value",
+                  "type": "TYPE_INTEGER"
+                },
+                "conditions": [
+                  {
+                    "operator": "OPERATOR_GREATER_THAN",
+                    "value": "0"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      },
+      "dataSourceSpecForTradingTermination": {
+        "external": {
+          "oracle": {
+            "signers": [
+              {
+                "pubKey": {
+                  "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                }
+              }
+            ],
+            "filters": [
+              {
+                "key": {
+                  "name": "trading.terminated.ETH5",
+                  "type": "TYPE_BOOLEAN"
+                },
+                "conditions": [
+                  {
+                    "operator": "OPERATOR_GREATER_THAN_OR_EQUAL",
+                    "value": "1648684800000000000"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      },
+      "dataSourceSpecBinding": {
+        "settlementDataProperty": "prices.BTC.value",
+        "tradingTerminationProperty": "trading.terminated.ETH5"
+      }
+    }
+  },
+  "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
+    }
+  }
+}

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

@@ -1,4 +1,5 @@
 {
+  "lpPriceRange": "10",
   "linearSlippageFactor": "0.001",
   "quadraticSlippageFactor": "0",
   "instrument": {
@@ -97,11 +98,5 @@
       "r": 0.016,
       "sigma": 0.3
     }
-  },
-  "liquiditySlaParameters": {
-    "priceRange": "0.95",
-    "commitmentMinTimeFraction": "0.5",
-    "performanceHysteresisEpochs": 2,
-    "slaCompetitionFactor": "0.75"
   }
 }

apps/governance-e2e/src/integration/flow/proposal-details.cy.ts

@@ -9,7 +9,6 @@ import {
   createTenDigitUnixTimeStampForSpecifiedDays,
   generateFreeFormProposalTitle,
   getDateFormatForSpecifiedDays,
-  getProposalDetailsValue,
   getProposalFromTitle,
   getProposalInformationFromTable,
   goToMakeNewProposal,
@@ -51,7 +50,6 @@ const openProposals = 'open-proposals';
 const viewProposalButton = 'view-proposal-btn';
 const proposalTermsToggle = 'proposal-json-toggle';
 const marketDataToggle = 'proposal-market-data-toggle';
-const marketProposalType = 'proposal-type';
 
 describe(
   'Governance flow for proposal details',
@@ -60,17 +58,6 @@ describe(
     before('connect wallets and set approval limit', function () {
       cy.visit('/');
       ethereumWalletConnect();
-      cy.createMarket();
-      navigateTo(navigation.proposals);
-      cy.getByTestId('closed-proposals').within(() => {
-        cy.contains('Add Lorem Ipsum market')
-          .parentsUntil(proposalListItem)
-          .last()
-          .within(() => {
-            cy.getByTestId(viewProposalButton).click();
-          });
-      });
-      getProposalInformationFromTable('ID').invoke('text').as('parentMarketId');
     });
 
     beforeEach('visit proposals tab', function () {
@@ -309,6 +296,9 @@ describe(
     });
 
     it('Able to see successor market details with new and updated values', function () {
+      cy.createMarket();
+      cy.reload();
+      waitForSpinner();
       cy.getByTestId('closed-proposals').within(() => {
         cy.contains('Add Lorem Ipsum market')
           .parentsUntil(proposalListItem)
@@ -317,9 +307,14 @@ describe(
             cy.getByTestId(viewProposalButton).click();
           });
       });
-      cy.VegaWalletSubmitProposal(
-        createSuccessorMarketProposalTxBody(this.parentMarketId)
-      );
+      getProposalInformationFromTable('ID')
+        .invoke('text')
+        .as('parentMarketId')
+        .then(() => {
+          cy.VegaWalletSubmitProposal(
+            createSuccessorMarketProposalTxBody(this.parentMarketId)
+          );
+        });
       navigateTo(navigation.proposals);
       cy.reload();
       getProposalFromTitle('Test successor market proposal details').within(
@@ -377,147 +372,19 @@ describe(
       });
 
       // 3003-PMAN-011
-      cy.contains('Parent Market ID').realHover();
+      cy.get('.underline').contains('Parent Market ID').realHover();
       cy.getByTestId('tooltip-content', { timeout: 8000 }).should(
         'contain.text',
         'The ID of the market this market succeeds.'
       );
-      cy.contains('Insurance Pool Fraction').realMouseUp().realHover();
+      cy.get('.underline')
+        .contains('Insurance Pool Fraction')
+        .realMouseUp()
+        .realHover();
       cy.getByTestId('tooltip-content', { timeout: 8000 }).should(
         'contain.text',
         'The fraction of the insurance pool balance that is carried over from the parent market to the successor.'
       );
     });
-
-    it('Able to see perpetual market', function () {
-      const proposalPath =
-        'src/fixtures/proposals/new-market-perpetual-raw.json';
-      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
-      submitUniqueRawProposal({
-        proposalBody: proposalPath,
-        enactmentTimestamp: enactmentTimestamp,
-        closingTimestamp: closingTimestamp,
-      });
-      getProposalFromTitle('perpetual market proposal').within(() => {
-        cy.getByTestId(marketProposalType).should(
-          'have.text',
-          'New market - perpetual'
-        );
-        cy.getByTestId(viewProposalButton).click();
-      });
-      cy.getByTestId(marketDataToggle).click();
-      getProposalDetailsValue('Product Type').should(
-        'contain.text',
-        'Perpetual'
-      );
-      cy.getByTestId(marketProposalType).should(
-        'have.text',
-        'New market - perpetual'
-      );
-      // Liquidity SLA protocols
-      getProposalDetailsValue('Performance Hysteresis Epochs').should(
-        'contain.text',
-        '1'
-      );
-      getProposalDetailsValue('SLA Competition Factor').should(
-        'contain.text',
-        '95.00%'
-      );
-      getProposalDetailsValue('Epoch Length').should('contain.text', '5s');
-      getProposalDetailsValue('Non Performance Bond Penalty Max').should(
-        'contain.text',
-        '0.05'
-      );
-      getProposalDetailsValue('Stake To CCY Volume').should(
-        'contain.text',
-        '0.3'
-      );
-      getProposalDetailsValue(
-        'Minimum Probability Of Trading LP Orders'
-      ).should('contain.text', '1e-8');
-    });
-
-    it('Able to see suspended market proposal', function () {
-      const proposalPath = 'src/fixtures/proposals/suspend-market-raw.json';
-      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
-      submitUniqueRawProposal({
-        proposalBody: proposalPath,
-        updateMarketId: this.parentMarketId,
-        enactmentTimestamp: enactmentTimestamp,
-        closingTimestamp: closingTimestamp,
-      });
-      getProposalFromTitle('Market suspended test').within(() => {
-        cy.getByTestId(marketProposalType).should(
-          'have.text',
-          'Suspend market'
-        );
-        cy.getByTestId(viewProposalButton).click();
-      });
-      cy.getByTestId(marketProposalType).should('have.text', 'Suspend market');
-      cy.getByTestId(marketDataToggle).click();
-      cy.getByTestId('proposal-update-market-state').within(() => {
-        getProposalInformationFromTable('Market ID')
-          .invoke('text')
-          .and('eq', this.parentMarketId);
-      });
-    });
-
-    it('Able to see resume market proposal', function () {
-      const proposalPath = 'src/fixtures/proposals/resume-market-raw.json';
-      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
-      submitUniqueRawProposal({
-        proposalBody: proposalPath,
-        updateMarketId: this.parentMarketId,
-        enactmentTimestamp: enactmentTimestamp,
-        closingTimestamp: closingTimestamp,
-      });
-      getProposalFromTitle('Market resume test').within(() => {
-        cy.getByTestId(marketProposalType).should('have.text', 'Resume market');
-        cy.getByTestId(viewProposalButton).click();
-      });
-      cy.getByTestId(marketProposalType).should('have.text', 'Resume market');
-      cy.getByTestId(marketDataToggle).click();
-      cy.getByTestId('proposal-update-market-state').within(() => {
-        getProposalInformationFromTable('Market ID')
-          .invoke('text')
-          .and('eq', this.parentMarketId);
-      });
-    });
-
-    it('Able to see terminate market proposal', function () {
-      const proposalPath = 'src/fixtures/proposals/terminate-market-raw.json';
-      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
-      submitUniqueRawProposal({
-        proposalBody: proposalPath,
-        updateMarketId: this.parentMarketId,
-        enactmentTimestamp: enactmentTimestamp,
-        closingTimestamp: closingTimestamp,
-      });
-      getProposalFromTitle('Market terminate test').within(() => {
-        cy.getByTestId(marketProposalType).should(
-          'have.text',
-          'Terminate market'
-        );
-        cy.getByTestId(viewProposalButton).click();
-      });
-      cy.getByTestId(marketProposalType).should(
-        'have.text',
-        'Terminate market'
-      );
-      cy.getByTestId(marketDataToggle).click();
-      cy.getByTestId('proposal-update-market-state').within(() => {
-        getProposalInformationFromTable('Market ID')
-          .invoke('text')
-          .and('eq', this.parentMarketId);
-        getProposalDetailsValue('Termination Price').should(
-          'contain.text',
-          '0.001 fUSDC'
-        );
-      });
-    });
   }
 );

apps/governance-e2e/src/integration/flow/proposal-enacted.cy.ts

@@ -65,10 +65,7 @@ context(
             cy.getByTestId(viewProposalButton).click();
           });
       });
-      cy.getByTestId('proposal-type').should(
-        'have.text',
-        'New market - future'
-      );
+      cy.getByTestId('proposal-type').should('have.text', 'New market');
       cy.getByTestId(proposalStatus).should('have.text', 'Enacted');
       cy.getByTestId(votesTable).within(() => {
         cy.contains('Voting has ended.').should('be.visible');

apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts

@@ -36,7 +36,6 @@ const proposalType = 'proposal-type';
 const proposalDetails = 'proposal-details';
 const newProposalSubmitButton = 'proposal-submit';
 const proposalVoteDeadline = 'proposal-vote-deadline';
-const proposalEnactmentDeadline = 'proposal-enactment-deadline';
 const proposalParameterSelect = 'proposal-parameter-select';
 const proposalMarketSelect = 'proposal-market-select';
 const newProposalTitle = 'proposal-title';
@@ -228,8 +227,6 @@ context(
             parseSpecialCharSequences: false,
             delay: 2,
           });
-          cy.getByTestId(proposalVoteDeadline).clear().type('2');
-          cy.getByTestId(proposalEnactmentDeadline).clear().type('3');
         });
         cy.getByTestId(proposalDownloadBtn)
           .should('be.visible')
@@ -637,8 +634,6 @@ context(
           parseSpecialCharSequences: false,
           delay: 2,
         });
-        cy.getByTestId(proposalVoteDeadline).clear().type('2');
-        cy.getByTestId(proposalEnactmentDeadline).clear().type('3');
       });
       cy.getByTestId(proposalDownloadBtn)
         .should('be.visible')

apps/governance-e2e/src/integration/flow/proposal-list.cy.ts

@@ -89,12 +89,11 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
 
   it('Newly created proposals list - shows title and portion of summary', function () {
     const proposalPath = 'src/fixtures/proposals/new-market-raw.json';
-    const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-    const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
+    const proposalTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
     submitUniqueRawProposal({
       proposalBody: proposalPath,
-      enactmentTimestamp: enactmentTimestamp,
-      closingTimestamp: closingTimestamp,
+      enactmentTimestamp: proposalTimestamp,
+      closingTimestamp: proposalTimestamp,
     }); // 3001-VOTE-052
     // 3001-VOTE-008
     // 3001-VOTE-034

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

@@ -54,7 +54,6 @@ export function submitUniqueRawProposal(proposalFields: {
   proposalBody?: string;
   proposalTitle?: string;
   proposalDescription?: string;
-  updateMarketId?: string;
   closingTimestamp?: number;
   enactmentTimestamp?: number;
   submit?: boolean;
@@ -72,10 +71,6 @@ export function submitUniqueRawProposal(proposalFields: {
     if (proposalFields.proposalDescription) {
       rawProposal.rationale.description = proposalFields.proposalDescription;
     }
-    if (proposalFields.updateMarketId) {
-      rawProposal.terms.updateMarketState.changes.marketId =
-        proposalFields.updateMarketId;
-    }
     if (proposalFields.closingTimestamp) {
       rawProposal.terms.closingTimestamp = proposalFields.closingTimestamp;
     } else if (
@@ -237,25 +232,21 @@ export function getDownloadedProposalJsonPath(proposalType: string) {
   return filepath;
 }
 
-export function getProposalDetailsValue(RowName: string) {
-  return cy
-    .contains(RowName)
-    .parentsUntil(proposalInformationTableRows)
-    .parent()
-    .first();
-}
-
 export function validateProposalDetailsDiff(
   RowName: string,
   changeType: proposalChangeType,
   newValue: string,
   oldValue?: string
 ) {
-  getProposalDetailsValue(RowName).within(() => {
-    cy.contains(changeType).should('be.visible');
-    cy.contains(newValue).should('be.visible');
-    if (oldValue) cy.contains(oldValue).should('have.class', 'line-through');
-  });
+  cy.contains(RowName)
+    .parentsUntil(proposalInformationTableRows)
+    .parent()
+    .first()
+    .within(() => {
+      cy.contains(changeType).should('be.visible');
+      cy.contains(newValue).should('be.visible');
+      if (oldValue) cy.contains(oldValue).should('have.class', 'line-through');
+    });
 }
 
 function getFormattedTime() {

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

@@ -105,13 +105,8 @@ export function createNewMarketProposalTxBody(): ProposalSubmissionBody {
             decimalPlaces: '5',
             positionDecimalPlaces: '5',
             linearSlippageFactor: '0.001',
-            liquiditySlaParameters: {
-              priceRange: '0.5',
-              commitmentMinTimeFraction: '0.1',
-              performanceHysteresisEpochs: 2,
-              slaCompetitionFactor: '0.1',
-            },
             quadraticSlippageFactor: '0',
+            lpPriceRange: '10',
             instrument: {
               name: 'Token test market',
               code: 'TEST.24h',
@@ -240,12 +235,7 @@ export function createSuccessorMarketProposalTxBody(
             positionDecimalPlaces: '5',
             linearSlippageFactor: '0.001',
             quadraticSlippageFactor: '0',
-            liquiditySlaParameters: {
-              priceRange: '0.5',
-              commitmentMinTimeFraction: '0.1',
-              performanceHysteresisEpochs: 2,
-              slaCompetitionFactor: '0.1',
-            },
+            lpPriceRange: '10',
             instrument: {
               name: 'Token test market',
               code: 'TEST.24h',

apps/governance/.env

@@ -32,5 +32,3 @@ LC_ALL="en_US.UTF-8"
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
-NX_PRODUCT_PERPETUALS=false
-NX_UPDATE_MARKET_STATE=false

apps/governance/.env.capsule

@@ -33,5 +33,3 @@ CYPRESS_FAIRGROUND=false
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true

apps/governance/.env.devnet

@@ -25,5 +25,3 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true

apps/governance/.env.mainnet

@@ -24,5 +24,3 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=false
-NX_UPDATE_MARKET_STATE=false

apps/governance/.env.mainnet-mirror

@@ -23,5 +23,3 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=false
-NX_UPDATE_MARKET_STATE=false

apps/governance/.env.stagnet1

@@ -20,5 +20,3 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true

apps/governance/.env.testnet

@@ -25,5 +25,3 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
-NX_PRODUCT_PERPETUALS=true
-NX_UPDATE_MARKET_STATE=true

apps/governance/.env.validators-testnet

@@ -22,5 +22,3 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
 NX_METAMASK_SNAPS=false
-NX_PRODUCT_PERPETUALS=false
-NX_UPDATE_MARKET_STATE=false

apps/governance/src/app.tsx

@@ -308,7 +308,7 @@ const AppContainer = () => {
     <Router>
       <ScrollToTop />
       <AppStateProvider>
-        <div className="min-h-full text-white grid">
+        <div className="min-h-full text-white">
           <NodeGuard
             skeleton={<div>{t('Loading')}</div>}
             failure={

apps/governance/src/i18n/translations/dev.json

@@ -613,9 +613,6 @@
   "proposalDetails": "Proposal details",
   "marketSpecification": "Market specification",
   "viewMarketJson": "View market JSON",
-  "marketId": "Market ID",
-  "marketName": "Market name",
-  "marketCode": "Market code",
   "proposalDescription": "Description",
   "currentlySetTo": "Currently expected to ",
   "currently": "currently",
@@ -708,17 +705,10 @@
   "parameter": "parameter",
   "NewMarketProposal": "New market proposal",
   "UpdateMarketProposal": "Update market proposal",
-  "UpdateMarketStateProposal": "Update market state proposal",
-  "MarketChange": "Market change",
-  "MarketStateChange": "Market state change",
-  "MarketDetails": "Market details",
   "NewAssetProposal": "New asset proposal",
   "UpdateAssetProposal": "Update asset proposal",
   "NewFreeformProposal": "New freeform proposal",
   "NewRawProposal": "New proposal",
-  "MARKET_STATE_UPDATE_TYPE_RESUME": "Resume market",
-  "MARKET_STATE_UPDATE_TYPE_SUSPEND": "Suspend market",
-  "MARKET_STATE_UPDATE_TYPE_TERMINATE": "Terminate market",
   "MinProposalRequirements": "You must have at least {{value}} VEGA associated to make a proposal",
   "MinProposalVoteRequirements": "You must have at least {{value}} VEGA associated to vote on this proposal",
   "totalSupply": "Total Supply",
@@ -727,11 +717,7 @@
   "ProposalDocsPrefix": "For guidance on how to make proposals, see",
   "NetworkParameter": "Network parameter",
   "NewMarket": "New market",
-  "NewMarketPerpetualProduct": "New market - perpetual",
-  "NewMarketFutureProduct": "New market - future",
-  "NewMarketSpotProduct": "New market - spot",
   "UpdateMarket": "Update market",
-  "UpdateMarketState": "Update market state",
   "NewAsset": "New asset",
   "UpdateAsset": "Update asset",
   "AssetID": "Asset ID",

apps/governance/src/routes/home/index.tsx

@@ -12,7 +12,7 @@ import { useRefreshAfterEpoch } from '../../hooks/use-refresh-after-epoch';
 import { ProposalsListItem } from '../proposals/components/proposals-list-item';
 import { ProtocolUpgradeProposalsListItem } from '../proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import Routes from '../routes';
-import { ExternalLinks, FLAGS } from '@vegaprotocol/environment';
+import { ExternalLinks } from '@vegaprotocol/environment';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { useNodesQuery } from '../staking/home/__generated__/Nodes';
 import { useProposalsQuery } from '../proposals/proposals/__generated__/Proposals';
@@ -23,6 +23,7 @@ import {
 import { Heading, SubHeading } from '../../components/heading';
 import * as Schema from '@vegaprotocol/types';
 import type { RouteChildProps } from '..';
+import type { ProposalFieldsFragment } from '../proposals/proposals/__generated__/Proposals';
 import type { NodesFragmentFragment } from '../staking/home/__generated__/Nodes';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
@@ -31,7 +32,6 @@ import {
   orderByUpgradeBlockHeight,
 } from '../proposals/components/proposals-list/proposals-list';
 import { BigNumber } from '../../lib/bignumber';
-import type { ProposalQuery } from '../proposals/proposal/__generated__/Proposal';
 
 const nodesToShow = 6;
 
@@ -39,7 +39,7 @@ const HomeProposals = ({
   proposals,
   protocolUpgradeProposals,
 }: {
-  proposals: ProposalQuery['proposal'][];
+  proposals: ProposalFieldsFragment[];
   protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
 }) => {
   const { t } = useTranslation();
@@ -60,12 +60,9 @@ const HomeProposals = ({
           <ProtocolUpgradeProposalsListItem key={index} proposal={proposal} />
         ))}
 
-        {proposals.map(
-          (proposal) =>
-            proposal?.id && (
-              <ProposalsListItem key={proposal.id} proposal={proposal} />
-            )
-        )}
+        {proposals.map((proposal) => (
+          <ProposalsListItem key={proposal.id} proposal={proposal} />
+        ))}
       </ul>
 
       <div className="mt-6">
@@ -185,10 +182,6 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
     pollInterval: 5000,
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',
-    variables: {
-      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
-      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
-    },
   });
 
   const {
@@ -213,9 +206,7 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
   const proposals = useMemo(
     () =>
       proposalsData
-        ? getNotRejectedProposals(
-            removePaginationWrapper(proposalsData.proposalsConnection?.edges)
-          )
+        ? getNotRejectedProposals(proposalsData.proposalsConnection)
         : [],
     [proposalsData]
   );

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.tsx

@@ -3,6 +3,7 @@ import { Lozenge, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { shorten } from '@vegaprotocol/utils';
 import { Heading, SubHeading } from '../../../../components/heading';
 import type { ReactNode } from 'react';
+import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { truncateMiddle } from '../../../../lib/truncate-middle';
 import { CurrentProposalState } from '../current-proposal-state';
@@ -19,7 +20,7 @@ export const ProposalHeader = ({
   isListItem = true,
   voteState,
 }: {
-  proposal: ProposalQuery['proposal'];
+  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
   isListItem?: boolean;
   voteState?: VoteState | null;
 }) => {
@@ -36,10 +37,7 @@ export const ProposalHeader = ({
 
   switch (change?.__typename) {
     case 'NewMarket': {
-      proposalType =
-        FLAGS.PRODUCT_PERPETUALS && change?.instrument?.product?.__typename
-          ? `NewMarket${change?.instrument?.product?.__typename}`
-          : 'NewMarket';
+      proposalType = 'NewMarket';
       fallbackTitle = t('NewMarketProposal');
       details = (
         <>
@@ -63,31 +61,12 @@ export const ProposalHeader = ({
       );
       break;
     }
-    case 'UpdateMarketState': {
-      proposalType =
-        FLAGS.UPDATE_MARKET_STATE && change?.updateType
-          ? t(change.updateType)
-          : 'UpdateMarketState';
-      fallbackTitle = t('UpdateMarketStateProposal');
-      details = (
-        <span>
-          {FLAGS.UPDATE_MARKET_STATE &&
-          change?.market?.id &&
-          change.updateType ? (
-            <>
-              {t(change.updateType)}: {truncateMiddle(change.market.id)}
-            </>
-          ) : null}
-        </span>
-      );
-      break;
-    }
     case 'UpdateMarket': {
       proposalType = 'UpdateMarket';
       fallbackTitle = t('UpdateMarketProposal');
       details = (
         <>
-          <span>{t('MarketChange')}:</span>{' '}
+          <span>{t('Market change')}:</span>{' '}
           <span>{truncateMiddle(change.marketId)}</span>
         </>
       );

apps/governance/src/routes/proposals/components/proposal-market-data/proposal-market-data.tsx

@@ -6,7 +6,6 @@ import {
   KeyDetailsInfoPanel,
   LiquidityMonitoringParametersInfoPanel,
   LiquidityPriceRangeInfoPanel,
-  LiquiditySLAParametersInfoPanel,
   MetadataInfoPanel,
   OracleInfoPanel,
   PriceMonitoringBoundsInfoPanel,
@@ -14,10 +13,6 @@ import {
   RiskModelInfoPanel,
   RiskParametersInfoPanel,
   SettlementAssetInfoPanel,
-  getDataSourceSpecForSettlementSchedule,
-  getDataSourceSpecForSettlementData,
-  getDataSourceSpecForTradingTermination,
-  getSigners,
 } from '@vegaprotocol/markets';
 import {
   Button,
@@ -29,6 +24,7 @@ import {
 import { SubHeading } from '../../../../components/heading';
 import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
 import type { MarketInfo } from '@vegaprotocol/markets';
+import type { DataSourceDefinition } from '@vegaprotocol/types';
 import { create } from 'zustand';
 
 type MarketDataDialogState = {
@@ -63,31 +59,20 @@ export const ProposalMarketData = ({
     return null;
   }
 
-  const { product } = marketData.tradableInstrument.instrument;
-
-  const settlementData = getDataSourceSpecForSettlementData(product);
-  const settlementScheduleData =
-    getDataSourceSpecForSettlementSchedule(product);
-  const terminationData = getDataSourceSpecForTradingTermination(product);
-
-  const parentProduct = parentMarketData?.tradableInstrument.instrument.product;
+  const settlementData = marketData.tradableInstrument.instrument.product
+    .dataSourceSpecForSettlementData.data as DataSourceDefinition;
   const parentSettlementData =
-    parentProduct && getDataSourceSpecForSettlementData(parentProduct);
-  const parentSettlementScheduleData =
-    parentProduct && getDataSourceSpecForSettlementSchedule(parentProduct);
+    parentMarketData?.tradableInstrument.instrument?.product
+      ?.dataSourceSpecForSettlementData?.data;
+  const terminationData = marketData.tradableInstrument.instrument.product
+    .dataSourceSpecForTradingTermination.data as DataSourceDefinition;
   const parentTerminationData =
-    parentProduct && getDataSourceSpecForTradingTermination(parentProduct);
-
-  // TODO add settlementScheduleData for Perp Proposal
+    parentMarketData?.tradableInstrument.instrument?.product
+      ?.dataSourceSpecForTradingTermination?.data;
 
   const isParentSettlementDataEqual =
     parentSettlementData !== undefined &&
     isEqual(settlementData, parentSettlementData);
-
-  const isParentSettlementScheduleDataEqual =
-    parentSettlementData !== undefined &&
-    isEqual(settlementScheduleData, parentSettlementScheduleData);
-
   const isParentTerminationDataEqual =
     parentTerminationData !== undefined &&
     isEqual(terminationData, parentTerminationData);
@@ -100,6 +85,20 @@ export const ProposalMarketData = ({
       parentMarketData?.priceMonitoringSettings?.parameters?.triggers
     );
 
+  const getSigners = (data: DataSourceDefinition) => {
+    if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {
+      const signers = data.sourceType.sourceType.signers || [];
+
+      return signers.map(({ signer }) => {
+        return (
+          (signer.__typename === 'ETHAddress' && signer.address) ||
+          (signer.__typename === 'PubKey' && signer.key)
+        );
+      });
+    }
+    return [];
+  };
+
   return (
     <section className="relative" data-testid="proposal-market-data">
       <CollapsibleToggle
@@ -130,9 +129,10 @@ export const ProposalMarketData = ({
               parentMarket={parentMarketData}
             />
 
-            {settlementData &&
-            terminationData &&
-            isEqual(getSigners(settlementData), getSigners(terminationData)) ? (
+            {isEqual(
+              getSigners(settlementData),
+              getSigners(terminationData)
+            ) ? (
               <>
                 <h2 className={marketDataHeaderStyles}>{t('Oracle')}</h2>
 
@@ -140,17 +140,14 @@ export const ProposalMarketData = ({
                   market={marketData}
                   type="settlementData"
                   parentMarket={
-                    isParentSettlementDataEqual ||
-                    isParentSettlementScheduleDataEqual
-                      ? undefined
-                      : parentMarketData
+                    isParentSettlementDataEqual ? undefined : parentMarketData
                   }
                 />
               </>
             ) : (
               <>
                 <h2 className={marketDataHeaderStyles}>
-                  {t('Settlement oracle')}
+                  {t('Settlement Oracle')}
                 </h2>
                 <OracleInfoPanel
                   market={marketData}
@@ -160,41 +157,16 @@ export const ProposalMarketData = ({
                   }
                 />
 
-                {marketData.tradableInstrument.instrument.product.__typename ===
-                  'Future' && (
-                  <div>
-                    <h2 className={marketDataHeaderStyles}>
-                      {t('Termination oracle')}
-                    </h2>
-                    <OracleInfoPanel
-                      market={marketData}
-                      type="termination"
-                      parentMarket={
-                        isParentTerminationDataEqual
-                          ? undefined
-                          : parentMarketData
-                      }
-                    />
-                  </div>
-                )}
-
-                {marketData.tradableInstrument.instrument.product.__typename ===
-                  'Perpetual' && (
-                  <div>
-                    <h2 className={marketDataHeaderStyles}>
-                      {t('Settlement schedule oracle')}
-                    </h2>
-                    <OracleInfoPanel
-                      market={marketData}
-                      type="settlementSchedule"
-                      parentMarket={
-                        isParentSettlementScheduleDataEqual
-                          ? undefined
-                          : parentMarketData
-                      }
-                    />
-                  </div>
-                )}
+                <h2 className={marketDataHeaderStyles}>
+                  {t('Termination Oracle')}
+                </h2>
+                <OracleInfoPanel
+                  market={marketData}
+                  type="termination"
+                  parentMarket={
+                    isParentTerminationDataEqual ? undefined : parentMarketData
+                  }
+                />
               </>
             )}
 
@@ -272,6 +244,7 @@ export const ProposalMarketData = ({
               market={marketData}
               parentMarket={parentMarketData}
             />
+
             <h2 className={marketDataHeaderStyles}>
               {t('Liquidity price range')}
             </h2>
@@ -279,14 +252,6 @@ export const ProposalMarketData = ({
               market={marketData}
               parentMarket={parentMarketData}
             />
-
-            <h2 className={marketDataHeaderStyles}>
-              {t('Liquidity SLA protocol')}
-            </h2>
-            <LiquiditySLAParametersInfoPanel
-              market={marketData}
-              parentMarket={parentMarketData}
-            />
           </div>
         </>
       )}

apps/governance/src/routes/proposals/components/proposal-update-market-state/index.tsx

@@ -1 +0,0 @@
-export * from './proposal-update-market-state';

apps/governance/src/routes/proposals/components/proposal-update-market-state/proposal-update-market-state.spec.tsx

@@ -1,123 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react';
-import { ProposalUpdateMarketState } from './proposal-update-market-state';
-import { generateProposal } from '../../test-helpers/generate-proposals';
-import { MarketUpdateType } from '@vegaprotocol/types';
-
-describe('<ProposalUpdateMarketState />', () => {
-  const suspendProposal = generateProposal({
-    terms: {
-      change: {
-        __typename: 'UpdateMarketState',
-        market: {
-          id: '1',
-          decimalPlaces: 0,
-          tradableInstrument: {
-            instrument: {
-              name: 'suspendProposal Name',
-              code: 'suspendProposal Code',
-              product: {
-                __typename: 'Future',
-                quoteName: 'USD',
-              },
-            },
-          },
-        },
-        updateType: MarketUpdateType.MARKET_STATE_UPDATE_TYPE_SUSPEND,
-      },
-    },
-  });
-
-  const resumeProposal = generateProposal({
-    terms: {
-      change: {
-        __typename: 'UpdateMarketState',
-        market: {
-          id: '1',
-          decimalPlaces: 0,
-          tradableInstrument: {
-            instrument: {
-              name: 'resumeProposal Name',
-              code: 'resumeProposal Code',
-              product: {
-                __typename: 'Future',
-                quoteName: 'USD',
-              },
-            },
-          },
-        },
-        updateType: MarketUpdateType.MARKET_STATE_UPDATE_TYPE_RESUME,
-      },
-    },
-  });
-
-  const terminateProposal = generateProposal({
-    terms: {
-      change: {
-        __typename: 'UpdateMarketState',
-        market: {
-          id: '1',
-          decimalPlaces: 0,
-          tradableInstrument: {
-            instrument: {
-              name: 'terminateProposal Name',
-              code: 'terminateProposal Code',
-              product: {
-                __typename: 'Future',
-                quoteName: 'USD',
-              },
-            },
-          },
-        },
-        updateType: MarketUpdateType.MARKET_STATE_UPDATE_TYPE_TERMINATE,
-        price: '123',
-      },
-    },
-  });
-
-  it('should render nothing if proposal is null', () => {
-    render(<ProposalUpdateMarketState proposal={null} />);
-    expect(screen.queryByTestId('proposal-update-market-state')).toBeNull();
-  });
-
-  it('should toggle details when CollapsibleToggle is clicked', () => {
-    render(<ProposalUpdateMarketState proposal={suspendProposal} />);
-
-    expect(
-      screen.queryByTestId('proposal-update-market-state-table')
-    ).toBeNull();
-
-    fireEvent.click(screen.getByTestId('proposal-market-data-toggle'));
-
-    expect(
-      screen.getByTestId('proposal-update-market-state-table')
-    ).toBeInTheDocument();
-  });
-
-  it('should display suspend market information when showDetails is true', () => {
-    render(<ProposalUpdateMarketState proposal={suspendProposal} />);
-
-    fireEvent.click(screen.getByTestId('proposal-market-data-toggle'));
-
-    expect(screen.getByText('suspendProposal Name')).toBeInTheDocument();
-    expect(screen.getByText('suspendProposal Code')).toBeInTheDocument();
-  });
-
-  it('should display resume market information when showDetails is true', () => {
-    render(<ProposalUpdateMarketState proposal={resumeProposal} />);
-
-    fireEvent.click(screen.getByTestId('proposal-market-data-toggle'));
-
-    expect(screen.getByText('resumeProposal Name')).toBeInTheDocument();
-    expect(screen.getByText('resumeProposal Code')).toBeInTheDocument();
-  });
-
-  it('should display terminate market information when showDetails is true', () => {
-    render(<ProposalUpdateMarketState proposal={terminateProposal} />);
-
-    fireEvent.click(screen.getByTestId('proposal-market-data-toggle'));
-
-    expect(screen.getByText('terminateProposal Name')).toBeInTheDocument();
-    expect(screen.getByText('terminateProposal Code')).toBeInTheDocument();
-    expect(screen.getByText('123 USD')).toBeInTheDocument();
-  });
-});

apps/governance/src/routes/proposals/components/proposal-update-market-state/proposal-update-market-state.tsx

@@ -1,84 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import {
-  KeyValueTable,
-  KeyValueTableRow,
-  RoundedWrapper,
-} from '@vegaprotocol/ui-toolkit';
-import { Row } from '@vegaprotocol/markets';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import { useState } from 'react';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import { SubHeading } from '../../../../components/heading';
-
-interface ProposalUpdateMarketStateProps {
-  proposal: ProposalQuery['proposal'];
-}
-
-export const ProposalUpdateMarketState = ({
-  proposal,
-}: ProposalUpdateMarketStateProps) => {
-  const { t } = useTranslation();
-  const [showDetails, setShowDetails] = useState(false);
-  let market;
-  let isTerminate = false;
-
-  if (!proposal) {
-    return null;
-  }
-
-  if (proposal?.terms.change.__typename === 'UpdateMarketState') {
-    market = proposal?.terms?.change?.market;
-    isTerminate =
-      proposal?.terms?.change?.updateType ===
-      'MARKET_STATE_UPDATE_TYPE_TERMINATE';
-  }
-
-  return (
-    <section className="relative" data-testid="proposal-update-market-state">
-      <CollapsibleToggle
-        toggleState={showDetails}
-        setToggleState={setShowDetails}
-        dataTestId="proposal-market-data-toggle"
-      >
-        <SubHeading title={t('MarketDetails')} />
-      </CollapsibleToggle>
-
-      {showDetails && (
-        <RoundedWrapper paddingBottom={true} marginBottomLarge={true}>
-          {proposal?.terms.change.__typename === 'UpdateMarketState' && (
-            <KeyValueTable data-testid="proposal-update-market-state-table">
-              <KeyValueTableRow>
-                {t('marketId')}
-                {market?.id}
-              </KeyValueTableRow>
-              <KeyValueTableRow>
-                {t('marketName')}
-                {market?.tradableInstrument?.instrument?.name}
-              </KeyValueTableRow>
-              <KeyValueTableRow noBorder={!isTerminate}>
-                {t('marketCode')}
-                {market?.tradableInstrument?.instrument?.code}
-              </KeyValueTableRow>
-              {isTerminate && (
-                <Row
-                  field="termination-price"
-                  value={proposal?.terms?.change?.price}
-                  assetSymbol={
-                    market?.tradableInstrument?.instrument?.product
-                      ?.__typename === 'Future' ||
-                    market?.tradableInstrument?.instrument?.product
-                      ?.__typename === 'Perpetual'
-                      ? market?.tradableInstrument?.instrument?.product
-                          ?.quoteName
-                      : undefined
-                  }
-                  decimalPlaces={market?.decimalPlaces}
-                />
-              )}
-            </KeyValueTable>
-          )}
-        </RoundedWrapper>
-      )}
-    </section>
-  );
-};

apps/governance/src/routes/proposals/components/proposal/proposal.tsx

@@ -10,21 +10,21 @@ import { UserVote } from '../vote-details';
 import { ListAsset } from '../list-asset';
 import Routes from '../../../routes';
 import { ProposalMarketData } from '../proposal-market-data';
+import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { MarketInfo } from '@vegaprotocol/markets';
 import type { AssetQuery } from '@vegaprotocol/assets';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { ProposalState } from '@vegaprotocol/types';
 import { ProposalMarketChanges } from '../proposal-market-changes';
-import { ProposalUpdateMarketState } from '../proposal-update-market-state';
 import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
 import { useVoteSubmit } from '@vegaprotocol/proposals';
 import { useUserVote } from '../vote-details/use-user-vote';
 
 export interface ProposalProps {
-  proposal: ProposalQuery['proposal'];
+  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
   networkParams: Partial<NetworkParamsResult>;
-  marketData?: MarketInfo | null;
+  newMarketData?: MarketInfo | null;
   parentMarketData?: MarketInfo | null;
   assetData?: AssetQuery | null;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -39,7 +39,7 @@ export const Proposal = ({
   proposal,
   networkParams,
   restData,
-  marketData,
+  newMarketData,
   parentMarketData,
   assetData,
   originalMarketProposalRestData,
@@ -74,15 +74,14 @@ export const Proposal = ({
 
   if (networkParams) {
     switch (proposal.terms.change.__typename) {
-      case 'UpdateMarket':
-      case 'UpdateMarketState':
-        minVoterBalance =
-          networkParams.governance_proposal_updateMarket_minVoterBalance;
-        break;
       case 'NewMarket':
         minVoterBalance =
           networkParams.governance_proposal_market_minVoterBalance;
         break;
+      case 'UpdateMarket':
+        minVoterBalance =
+          networkParams.governance_proposal_updateMarket_minVoterBalance;
+        break;
       case 'NewAsset':
         minVoterBalance =
           networkParams.governance_proposal_asset_minVoterBalance;
@@ -146,21 +145,15 @@ export const Proposal = ({
         <ProposalDescription description={proposal.rationale.description} />
       </div>
 
-      {marketData && (
+      {newMarketData && (
         <div className="mb-4">
           <ProposalMarketData
-            marketData={marketData}
+            marketData={newMarketData}
             parentMarketData={parentMarketData ? parentMarketData : undefined}
           />
         </div>
       )}
 
-      {proposal.terms.change.__typename === 'UpdateMarketState' && (
-        <div className="mb-4">
-          <ProposalUpdateMarketState proposal={proposal} />
-        </div>
-      )}
-
       {proposal.terms.change.__typename === 'UpdateMarket' && (
         <div className="mb-4">
           <ProposalMarketChanges

apps/governance/src/routes/proposals/components/proposals-list-item/proposals-list-item.tsx

@@ -2,10 +2,11 @@ import { RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import { ProposalsListItemDetails } from './proposals-list-item-details';
 import { useUserVote } from '../vote-details/use-user-vote';
+import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 
 interface ProposalsListItemProps {
-  proposal?: ProposalQuery['proposal'] | null;
+  proposal?: ProposalFieldsFragment | ProposalQuery['proposal'] | null;
 }
 
 export const ProposalsListItem = ({ proposal }: ProposalsListItemProps) => {

apps/governance/src/routes/proposals/components/proposals-list/proposals-list.tsx

@@ -16,14 +16,14 @@ import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/propos
 import { ExternalLinks } from '@vegaprotocol/environment';
 
 interface ProposalsListProps {
-  proposals: Array<ProposalQuery['proposal']>;
+  proposals: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
   protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
   lastBlockHeight?: string;
 }
 
 interface SortedProposalsProps {
-  open: ProposalQuery['proposal'][];
-  closed: ProposalQuery['proposal'][];
+  open: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
+  closed: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
 }
 
 interface SortedProtocolUpgradeProposalsProps {
@@ -31,7 +31,7 @@ interface SortedProtocolUpgradeProposalsProps {
   closed: ProtocolUpgradeProposalFieldsFragment[];
 }
 
-export const orderByDate = (arr: ProposalQuery['proposal'][]) =>
+export const orderByDate = (arr: ProposalFieldsFragment[]) =>
   orderBy(
     arr,
     [
@@ -92,12 +92,12 @@ export const ProposalsList = ({
     return {
       open:
         initialSorting.open.length > 0
-          ? orderByDate(initialSorting.open as ProposalQuery['proposal'][])
+          ? orderByDate(initialSorting.open as ProposalFieldsFragment[])
           : [],
       closed:
         initialSorting.closed.length > 0
           ? orderByDate(
-              initialSorting.closed as ProposalQuery['proposal'][]
+              initialSorting.closed as ProposalFieldsFragment[]
             ).reverse()
           : [],
     };

apps/governance/src/routes/proposals/components/proposals-list/rejected-proposals-list.tsx

@@ -3,17 +3,20 @@ import { useTranslation } from 'react-i18next';
 import { Heading } from '../../../../components/heading';
 import { ProposalsListItem } from '../proposals-list-item';
 import { ProposalsListFilter } from '../proposals-list-filter';
+import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 
 interface ProposalsListProps {
-  proposals: ProposalQuery['proposal'][];
+  proposals: Array<ProposalQuery['proposal'] | ProposalFieldsFragment>;
 }
 
 export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
   const { t } = useTranslation();
   const [filterString, setFilterString] = useState('');
 
-  const filterPredicate = (p: ProposalQuery['proposal']) =>
+  const filterPredicate = (
+    p: ProposalFieldsFragment | ProposalQuery['proposal']
+  ) =>
     p?.id?.includes(filterString) ||
     p?.party?.id?.toString().includes(filterString);
 

apps/governance/src/routes/proposals/hooks/use-proposal-network-params.ts

@@ -28,20 +28,17 @@ export const useProposalNetworkParams = ({
     NetworkParams.governance_proposal_freeform_requiredParticipation,
   ]);
 
-  const fallback = {
-    requiredMajority: new BigNumber(1),
-    requiredMajorityLP: new BigNumber(0),
-    requiredParticipation: new BigNumber(1),
-    requiredParticipationLP: new BigNumber(0),
-  };
-
   if (!params) {
-    return fallback;
+    return {
+      requiredMajority: new BigNumber(1),
+      requiredMajorityLP: new BigNumber(0),
+      requiredParticipation: new BigNumber(1),
+      requiredParticipationLP: new BigNumber(0),
+    };
   }
 
   switch (proposal?.terms.change.__typename) {
     case 'UpdateMarket':
-    case 'UpdateMarketState':
       return {
         requiredMajority:
           params.governance_proposal_updateMarket_requiredMajority,
@@ -92,6 +89,6 @@ export const useProposalNetworkParams = ({
         ),
       };
     default:
-      return fallback;
+      throw new Error('Unknown proposal type');
   }
 };

apps/governance/src/routes/proposals/proposal/Proposal.graphql

@@ -1,53 +1,4 @@
-fragment NewMarketProductField on Proposal {
-  terms {
-    change {
-      ... on NewMarket {
-        instrument {
-          product {
-            __typename
-          }
-        }
-      }
-    }
-  }
-}
-
-fragment UpdateMarketState on Proposal {
-  terms {
-    change {
-      ... on UpdateMarketState {
-        updateType
-        market {
-          decimalPlaces
-          id
-          tradableInstrument {
-            instrument {
-              product {
-                __typename
-                ... on Future {
-                  quoteName
-                }
-                ... on Perpetual {
-                  quoteName
-                }
-              }
-              name
-              code
-            }
-          }
-        }
-        updateType
-        price
-      }
-    }
-  }
-}
-
-query Proposal(
-  $proposalId: ID!
-  $includeNewMarketProductField: Boolean!
-  $includeUpdateMarketState: Boolean!
-) {
+query Proposal($proposalId: ID!) {
   proposal(id: $proposalId) {
     id
     rationale {
@@ -62,8 +13,6 @@ query Proposal(
       id
     }
     errorDetails
-    ...NewMarketProductField @include(if: $includeNewMarketProductField)
-    ...UpdateMarketState @include(if: $includeUpdateMarketState)
     terms {
       closingDatetime
       enactmentDatetime
@@ -71,6 +20,7 @@ query Proposal(
         ... on NewMarket {
           decimalPlaces
           metadata
+          lpPriceRange
           riskParameters {
             ... on LogNormalRiskModel {
               riskAversionParameter
@@ -202,6 +152,7 @@ query Proposal(
             }
           }
           positionDecimalPlaces
+          lpPriceRange
           linearSlippageFactor
           quadraticSlippageFactor
         }
@@ -211,13 +162,37 @@ query Proposal(
             instrument {
               code
               product {
-                ... on UpdateFutureProduct {
-                  quoteName
-                  dataSourceSpecForSettlementData {
-                    sourceType {
-                      ... on DataSourceDefinitionInternal {
-                        sourceType {
-                          ... on DataSourceSpecConfigurationTime {
+                quoteName
+                dataSourceSpecForSettlementData {
+                  sourceType {
+                    ... on DataSourceDefinitionInternal {
+                      sourceType {
+                        ... on DataSourceSpecConfigurationTime {
+                          conditions {
+                            operator
+                            value
+                          }
+                        }
+                      }
+                    }
+                    ... on DataSourceDefinitionExternal {
+                      sourceType {
+                        ... on DataSourceSpecConfiguration {
+                          signers {
+                            signer {
+                              ... on PubKey {
+                                key
+                              }
+                              ... on ETHAddress {
+                                address
+                              }
+                            }
+                          }
+                          filters {
+                            key {
+                              name
+                              type
+                            }
                             conditions {
                               operator
                               value
@@ -225,125 +200,52 @@ query Proposal(
                           }
                         }
                       }
-                      ... on DataSourceDefinitionExternal {
-                        sourceType {
-                          ... on DataSourceSpecConfiguration {
-                            signers {
-                              signer {
-                                ... on PubKey {
-                                  key
-                                }
-                                ... on ETHAddress {
-                                  address
-                                }
-                              }
-                            }
-                            filters {
-                              key {
-                                name
-                                type
-                              }
-                              conditions {
-                                operator
-                                value
-                              }
-                            }
-                          }
-                        }
-                      }
                     }
                   }
-                  # dataSourceSpecForTradingTermination {
-                  #   sourceType {
-                  #     ... on DataSourceDefinitionInternal {
-                  #       sourceType {
-                  #         ... on DataSourceSpecConfigurationTime {
-                  #           conditions {
-                  #             operator
-                  #             value
-                  #           }
-                  #         }
-                  #       }
-                  #     }
-                  #     ... on DataSourceDefinitionExternal {
-                  #       sourceType {
-                  #         ... on DataSourceSpecConfiguration {
-                  #           signers {
-                  #             signer {
-                  #               ... on PubKey {
-                  #                 key
-                  #               }
-                  #               ... on ETHAddress {
-                  #                 address
-                  #               }
-                  #             }
-                  #           }
-                  #           filters {
-                  #             key {
-                  #               name
-                  #               type
-                  #             }
-                  #             conditions {
-                  #               operator
-                  #               value
-                  #             }
-                  #           }
-                  #         }
-                  #       }
-                  #     }
-                  #   }
-                  # }
-                  dataSourceSpecBinding {
-                    settlementDataProperty
-                    tradingTerminationProperty
-                  }
                 }
-                ... on UpdatePerpetualProduct {
-                  quoteName
-                  dataSourceSpecForSettlementData {
-                    sourceType {
-                      ... on DataSourceDefinitionInternal {
-                        sourceType {
-                          ... on DataSourceSpecConfigurationTime {
-                            conditions {
-                              operator
-                              value
-                            }
-                          }
-                        }
-                      }
-                      ... on DataSourceDefinitionExternal {
-                        sourceType {
-                          ... on DataSourceSpecConfiguration {
-                            signers {
-                              signer {
-                                ... on PubKey {
-                                  key
-                                }
-                                ... on ETHAddress {
-                                  address
-                                }
-                              }
-                            }
-                            filters {
-                              key {
-                                name
-                                type
-                              }
-                              conditions {
-                                operator
-                                value
-                              }
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                  dataSourceSpecBinding {
-                    settlementDataProperty
-                    settlementScheduleProperty
-                  }
+                # dataSourceSpecForTradingTermination {
+                #   sourceType {
+                #     ... on DataSourceDefinitionInternal {
+                #       sourceType {
+                #         ... on DataSourceSpecConfigurationTime {
+                #           conditions {
+                #             operator
+                #             value
+                #           }
+                #         }
+                #       }
+                #     }
+                #     ... on DataSourceDefinitionExternal {
+                #       sourceType {
+                #         ... on DataSourceSpecConfiguration {
+                #           signers {
+                #             signer {
+                #               ... on PubKey {
+                #                 key
+                #               }
+                #               ... on ETHAddress {
+                #                 address
+                #               }
+                #             }
+                #           }
+                #           filters {
+                #             key {
+                #               name
+                #               type
+                #             }
+                #             conditions {
+                #               operator
+                #               value
+                #             }
+                #           }
+                #         }
+                #       }
+                #     }
+                #   }
+                # }
+                dataSourceSpecBinding {
+                  settlementDataProperty
+                  tradingTerminationProperty
                 }
               }
             }

apps/governance/src/routes/proposals/proposal/proposal-container.spec.tsx

@@ -6,11 +6,6 @@ import { MockedProvider } from '@apollo/client/testing';
 import { MemoryRouter, Route, Routes } from 'react-router-dom';
 import { ProposalDocument } from './__generated__/Proposal';
 
-jest.mock('@vegaprotocol/data-provider', () => ({
-  ...jest.requireActual('@vegaprotocol/data-provider'),
-  useDataProvider: jest.fn(() => ({ data: [], loading: false })),
-}));
-
 jest.mock('../components/proposal', () => ({
   Proposal: () => <div data-testid="proposal" />,
 }));
@@ -49,9 +44,7 @@ const renderComponent = (
   );
 };
 
-// These tests are broken due to schema changes. NewMarket.futureProduct -> NewMarket.product union
-// eslint-disable-next-line jest/no-disabled-tests
-describe.skip('Proposal container', () => {
+describe('Proposal container', () => {
   it('Renders not found if the proposal is not found', async () => {
     render(renderComponent(null, 'foo'));
     await waitFor(() => {

apps/governance/src/routes/proposals/proposal/proposal-container.tsx

@@ -53,11 +53,7 @@ export const ProposalContainer = () => {
   const { data, loading, error, refetch } = useProposalQuery({
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',
-    variables: {
-      proposalId: params.proposalId || '',
-      includeNewMarketProductField: !!FLAGS.PRODUCT_PERPETUALS,
-      includeUpdateMarketState: !!FLAGS.UPDATE_MARKET_STATE,
-    },
+    variables: { proposalId: params.proposalId || '' },
     skip: !params.proposalId,
   });
 
@@ -95,9 +91,9 @@ export const ProposalContainer = () => {
   );
 
   const {
-    data: marketData,
-    loading: marketLoading,
-    error: marketError,
+    data: newMarketData,
+    loading: newMarketLoading,
+    error: newMarketError,
   } = useDataProvider({
     dataProvider: marketInfoProvider,
     skipUpdates: true,
@@ -113,9 +109,9 @@ export const ProposalContainer = () => {
     error: parentMarketIdError,
   } = useParentMarketIdQuery({
     variables: {
-      marketId: marketData?.id || '',
+      marketId: newMarketData?.id || '',
     },
-    skip: !FLAGS.SUCCESSOR_MARKETS || !isSuccessor || !marketData?.id,
+    skip: !FLAGS.SUCCESSOR_MARKETS || !isSuccessor || !newMarketData?.id,
   });
 
   const {
@@ -195,7 +191,7 @@ export const ProposalContainer = () => {
     <AsyncRenderer
       loading={
         loading ||
-        marketLoading ||
+        newMarketLoading ||
         assetLoading ||
         networkParamsLoading ||
         parentMarketIdLoading ||
@@ -210,7 +206,7 @@ export const ProposalContainer = () => {
       }
       error={
         error ||
-        marketError ||
+        newMarketError ||
         assetError ||
         networkParamsError ||
         parentMarketIdError ||
@@ -222,7 +218,7 @@ export const ProposalContainer = () => {
       data={{
         ...data,
         ...networkParams,
-        ...(marketData ? { newMarketData: marketData } : {}),
+        ...(newMarketData ? { newMarketData } : {}),
         ...(parentMarketData ? { parentMarketData } : {}),
         ...(assetData ? { assetData } : {}),
         ...(restData ? { restData } : {}),
@@ -239,7 +235,7 @@ export const ProposalContainer = () => {
           proposal={data.proposal}
           networkParams={networkParams}
           restData={restData}
-          marketData={marketData}
+          newMarketData={newMarketData}
           parentMarketData={parentMarketData}
           assetData={assetData}
           originalMarketProposalRestData={originalMarketProposalRestData}

apps/governance/src/routes/proposals/proposals/Proposals.graphql

@@ -1,48 +1,3 @@
-fragment NewMarketProductFields on Proposal {
-  terms {
-    change {
-      ... on NewMarket {
-        instrument {
-          product {
-            __typename
-          }
-        }
-      }
-    }
-  }
-}
-
-fragment UpdateMarketStates on Proposal {
-  terms {
-    change {
-      ... on UpdateMarketState {
-        updateType
-        market {
-          decimalPlaces
-          id
-          tradableInstrument {
-            instrument {
-              product {
-                __typename
-                ... on Future {
-                  quoteName
-                }
-                ... on Perpetual {
-                  quoteName
-                }
-              }
-              name
-              code
-            }
-          }
-        }
-        updateType
-        price
-      }
-    }
-  }
-}
-
 fragment ProposalFields on Proposal {
   id
   rationale {
@@ -124,16 +79,11 @@ fragment ProposalFields on Proposal {
   }
 }
 
-query Proposals(
-  $includeNewMarketProductFields: Boolean!
-  $includeUpdateMarketStates: Boolean!
-) {
+query Proposals {
   proposalsConnection {
     edges {
       node {
         ...ProposalFields
-        ...NewMarketProductFields @include(if: $includeNewMarketProductFields)
-        ...UpdateMarketStates @include(if: $includeUpdateMarketStates)
       }
     }
   }

apps/governance/src/routes/proposals/proposals/__generated__/Proposals.ts

@@ -3,67 +3,13 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type NewMarketProductFieldsFragment = { __typename?: 'Proposal', terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', product?: { __typename: 'FutureProduct' } | { __typename: 'PerpetualProduct' } | { __typename: 'SpotProduct' } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } };
+export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } };
 
-export type UpdateMarketStatesFragment = { __typename?: 'Proposal', terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState', updateType: Types.MarketUpdateType, price?: string | null, market: { __typename?: 'Market', decimalPlaces: number, id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string, product: { __typename: 'Future', quoteName: string } | { __typename: 'Perpetual', quoteName: string } | { __typename: 'Spot' } } } } } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } };
-
-export type ProposalFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } };
-
-export type ProposalsQueryVariables = Types.Exact<{
-  includeNewMarketProductFields: Types.Scalars['Boolean'];
-  includeUpdateMarketStates: Types.Scalars['Boolean'];
-}>;
+export type ProposalsQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null, product?: { __typename: 'FutureProduct' } | { __typename: 'PerpetualProduct' } | { __typename: 'SpotProduct' } | null } } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateMarketState', updateType: Types.MarketUpdateType, price?: string | null, market: { __typename?: 'Market', decimalPlaces: number, id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string, product: { __typename: 'Future', quoteName: string } | { __typename: 'Perpetual', quoteName: string } | { __typename: 'Spot' } } } } } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };
+export type ProposalsQuery = { __typename?: 'Query', proposalsConnection?: { __typename?: 'ProposalsConnection', edges?: Array<{ __typename?: 'ProposalEdge', node: { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, datetime: any, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string }, party: { __typename?: 'Party', id: string }, terms: { __typename?: 'ProposalTerms', closingDatetime: any, enactmentDatetime?: any | null, change: { __typename?: 'CancelTransfer' } | { __typename: 'NewAsset', name: string, symbol: string, decimals: number, quantum: string, source: { __typename?: 'BuiltinAsset', maxFaucetAmountMint: string } | { __typename?: 'ERC20', contractAddress: string, withdrawThreshold: string, lifetimeLimit: string } } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket', instrument: { __typename?: 'InstrumentConfiguration', name: string, code: string, futureProduct?: { __typename?: 'FutureProduct', settlementAsset: { __typename?: 'Asset', symbol: string } } | null } } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset', quantum: string, assetId: string, source: { __typename?: 'UpdateERC20', lifetimeLimit: string, withdrawThreshold: string } } | { __typename?: 'UpdateMarket', marketId: string } | { __typename?: 'UpdateNetworkParameter', networkParameter: { __typename?: 'NetworkParameter', key: string, value: string } } }, votes: { __typename?: 'ProposalVotes', yes: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string }, no: { __typename?: 'ProposalVoteSide', totalTokens: string, totalNumber: string, totalEquityLikeShareWeight: string } } } } | null> | null } | null };
 
-export const NewMarketProductFieldsFragmentDoc = gql`
-    fragment NewMarketProductFields on Proposal {
-  terms {
-    change {
-      ... on NewMarket {
-        instrument {
-          product {
-            __typename
-          }
-        }
-      }
-    }
-  }
-}
-    `;
-export const UpdateMarketStatesFragmentDoc = gql`
-    fragment UpdateMarketStates on Proposal {
-  terms {
-    change {
-      ... on UpdateMarketState {
-        updateType
-        market {
-          decimalPlaces
-          id
-          tradableInstrument {
-            instrument {
-              product {
-                __typename
-                ... on Future {
-                  quoteName
-                }
-                ... on Perpetual {
-                  quoteName
-                }
-              }
-              name
-              code
-            }
-          }
-        }
-        updateType
-        price
-      }
-    }
-  }
-}
-    `;
 export const ProposalFieldsFragmentDoc = gql`
     fragment ProposalFields on Proposal {
   id
@@ -147,20 +93,16 @@ export const ProposalFieldsFragmentDoc = gql`
 }
     `;
 export const ProposalsDocument = gql`
-    query Proposals($includeNewMarketProductFields: Boolean!, $includeUpdateMarketStates: Boolean!) {
+    query Proposals {
   proposalsConnection {
     edges {
       node {
         ...ProposalFields
-        ...NewMarketProductFields @include(if: $includeNewMarketProductFields)
-        ...UpdateMarketStates @include(if: $includeUpdateMarketStates)
       }
     }
   }
 }
-    ${ProposalFieldsFragmentDoc}
-${NewMarketProductFieldsFragmentDoc}
-${UpdateMarketStatesFragmentDoc}`;
+    ${ProposalFieldsFragmentDoc}`;
 
 /**
  * __useProposalsQuery__
@@ -174,12 +116,10 @@ ${UpdateMarketStatesFragmentDoc}`;
  * @example
  * const { data, loading, error } = useProposalsQuery({
  *   variables: {
- *      includeNewMarketProductFields: // value for 'includeNewMarketProductFields'
- *      includeUpdateMarketStates: // value for 'includeUpdateMarketStates'
  *   },
  * });
  */
-export function useProposalsQuery(baseOptions: Apollo.QueryHookOptions<ProposalsQuery, ProposalsQueryVariables>) {
+export function useProposalsQuery(baseOptions?: Apollo.QueryHookOptions<ProposalsQuery, ProposalsQueryVariables>) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<ProposalsQuery, ProposalsQueryVariables>(ProposalsDocument, options);
       }

apps/governance/src/routes/proposals/proposals/proposals-container.tsx

@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { SplashLoader } from '../../../components/splash-loader';
 import { ProposalsList } from '../components/proposals-list';
 import { useProposalsQuery } from './__generated__/Proposals';
-import { getNodes, removePaginationWrapper } from '@vegaprotocol/utils';
+import { getNodes } from '@vegaprotocol/utils';
 import {
   ProposalState,
   ProtocolUpgradeProposalStatus,
@@ -15,13 +15,14 @@ import type { NodeConnection, NodeEdge } from '@vegaprotocol/utils';
 import type { ProposalFieldsFragment } from './__generated__/Proposals';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
-import { FLAGS } from '@vegaprotocol/environment';
 
-export function getNotRejectedProposals(data?: ProposalFieldsFragment[]) {
+export function getNotRejectedProposals<T extends ProposalFieldsFragment>(
+  data?: NodeConnection<NodeEdge<T>> | null
+): T[] {
   return flow([
     (data) =>
-      data.filter(
-        (p: ProposalFieldsFragment) => p?.state !== ProposalState.STATE_REJECTED
+      getNodes<ProposalFieldsFragment>(data, (p) =>
+        p ? p.state !== ProposalState.STATE_REJECTED : false
       ),
   ])(data);
 }
@@ -46,10 +47,6 @@ export const ProposalsContainer = () => {
     pollInterval: 5000,
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',
-    variables: {
-      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
-      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
-    },
   });
 
   const {
@@ -63,10 +60,7 @@ export const ProposalsContainer = () => {
   });
 
   const proposals = useMemo(
-    () =>
-      getNotRejectedProposals(
-        removePaginationWrapper(data?.proposalsConnection?.edges)
-      ),
+    () => getNotRejectedProposals(data?.proposalsConnection),
     [data]
   );
 

apps/governance/src/routes/proposals/rejected/rejected-proposals-container.tsx

@@ -6,11 +6,11 @@ import { SplashLoader } from '../../../components/splash-loader';
 import { RejectedProposalsList } from '../components/proposals-list';
 import type { ProposalFieldsFragment } from '../proposals/__generated__/Proposals';
 import { useProposalsQuery } from '../proposals/__generated__/Proposals';
-import { removePaginationWrapper } from '@vegaprotocol/utils';
+import type { NodeConnection, NodeEdge } from '@vegaprotocol/utils';
+import { getNodes } from '@vegaprotocol/utils';
 import flow from 'lodash/flow';
 import orderBy from 'lodash/orderBy';
 import { ProposalState } from '@vegaprotocol/types';
-import { FLAGS } from '@vegaprotocol/environment';
 
 const orderByDate = (arr: ProposalFieldsFragment[]) =>
   orderBy(
@@ -22,11 +22,13 @@ const orderByDate = (arr: ProposalFieldsFragment[]) =>
     ['desc', 'desc']
   );
 
-export function getRejectedProposals(data?: ProposalFieldsFragment[] | null) {
+export function getRejectedProposals<T extends ProposalFieldsFragment>(
+  data?: NodeConnection<NodeEdge<ProposalFieldsFragment>> | null
+): T[] {
   return flow([
     (data) =>
-      data.filter(
-        (p: ProposalFieldsFragment) => p?.state === ProposalState.STATE_REJECTED
+      getNodes<ProposalFieldsFragment>(data, (p) =>
+        p ? p?.state === ProposalState.STATE_REJECTED : false
       ),
     orderByDate,
   ])(data);
@@ -34,21 +36,11 @@ export function getRejectedProposals(data?: ProposalFieldsFragment[] | null) {
 
 export const RejectedProposalsContainer = () => {
   const { t } = useTranslation();
-  const { data, loading, error } = useProposalsQuery({
-    pollInterval: 5000,
-    fetchPolicy: 'network-only',
-    errorPolicy: 'ignore',
-    variables: {
-      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
-      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
-    },
-  });
+  const { data, loading, error } = useProposalsQuery();
 
   const proposals = useMemo(
     () =>
-      getRejectedProposals(
-        removePaginationWrapper(data?.proposalsConnection?.edges)
-      ),
+      getRejectedProposals<ProposalFieldsFragment>(data?.proposalsConnection),
     [data]
   );
 

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards.tsx

@@ -1,4 +1,4 @@
-import { useMemo, useEffect, useState, useCallback, useRef } from 'react';
+import { useMemo, useEffect, useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
@@ -86,18 +86,12 @@ export const EpochIndividualRewards = ({
     [epochId, page, refetch, delegationsPagination, pubKey]
   );
 
-  const prevEpochIdRef = useRef<number | null>(null);
-
   useEffect(() => {
-    if (prevEpochIdRef.current === null) {
-      prevEpochIdRef.current = epochId;
-    } else if (epochId !== prevEpochIdRef.current) {
-      // When the epoch changes, we want to refetch the data to update the current page
+    // when the epoch changes, we want to refetch the data to update the current page
+    if (data) {
       refetchData();
     }
-
-    prevEpochIdRef.current = epochId;
-  }, [epochId, refetchData]);
+  }, [epochId, data, refetchData]);
 
   return (
     <AsyncRenderer

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

@@ -3,7 +3,7 @@ import { forwardRef, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { Button, Icon } from '@vegaprotocol/ui-toolkit';
-import { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
@@ -85,17 +85,17 @@ const TopThirdCellRenderer = (
       }}
       className="grid grid-cols-[60px_1fr] w-full h-full py-4 px-0 text-sm text-white text-center overflow-scroll"
     >
-      <div className="px-3 text-xs text-left">
+      <div className="text-xs text-left px-3">
         {params?.data?.rankingDisplay}
       </div>
-      <div className="px-3 whitespace-normal">
+      <div className="whitespace-normal px-3">
         <div className="mb-4">
           <Button
             data-testid="show-all-validators"
             rightIcon={
               <Icon
                 name="arrow-right"
-                className="mr-2 align-text-top fill-current"
+                className="fill-current mr-2 align-text-top"
               />
             }
             className="inline-flex items-center"
@@ -103,7 +103,7 @@ const TopThirdCellRenderer = (
             {t('Reveal top validators')}
           </Button>
         </div>
-        <p className="mb-0 font-semibold text-white">
+        <p className="font-semibold text-white mb-0">
           {t(
             'Validators with too great a stake share will have the staking rewards for their delegators penalised.'
           )}

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

@@ -1,7 +1,7 @@
 import { forwardRef, useMemo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
-import { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {

apps/liquidity-provision-dashboard/src/app/components/dashboard/market-list/market-list.tsx

@@ -35,7 +35,6 @@ import { HealthDialog } from '../../health-dialog';
 import { Status } from '../../status';
 import { intentForStatus } from '../../../lib/utils';
 import { formatDistanceToNow } from 'date-fns';
-import { getAsset } from '@vegaprotocol/markets';
 
 export const MarketList = () => {
   const { data, error, loading } = useMarketsLiquidity();
@@ -52,7 +51,12 @@ export const MarketList = () => {
           return (
             <>
               <span className="leading-3">{value}</span>
-              <span className="leading-3">{getAsset(data).symbol}</span>
+              <span className="leading-3">
+                {
+                  data?.tradableInstrument?.instrument?.product?.settlementAsset
+                    ?.symbol
+                }
+              </span>
             </>
           );
         },
@@ -83,7 +87,12 @@ export const MarketList = () => {
           value,
           data,
         }: VegaValueFormatterParams<Market, 'data.markPrice'>) =>
-          value && data ? formatWithAsset(value, getAsset(data)) : '-',
+          value && data
+            ? formatWithAsset(
+                value,
+                data.tradableInstrument.instrument.product.settlementAsset
+              )
+            : '-',
       },
 
       {
@@ -114,7 +123,8 @@ export const MarketList = () => {
           value && data
             ? `${addDecimalsFormatNumber(
                 value,
-                getAsset(data).decimals || 0
+                data.tradableInstrument.instrument.product.settlementAsset
+                  .decimals
               )} (${displayChange(data.volumeChange)})`
             : '-',
         headerTooltip: t('The trade volume over the last 24h'),
@@ -128,7 +138,10 @@ export const MarketList = () => {
           data,
         }: VegaValueFormatterParams<Market, 'liquidityCommitted'>) =>
           data && value
-            ? formatWithAsset(value.toString(), getAsset(data))
+            ? formatWithAsset(
+                value.toString(),
+                data.tradableInstrument.instrument.product.settlementAsset
+              )
             : '-',
         headerTooltip: t('The amount of funds allocated to provide liquidity'),
       },
@@ -140,7 +153,12 @@ export const MarketList = () => {
           value,
           data,
         }: VegaValueFormatterParams<Market, 'target'>) =>
-          data && value ? formatWithAsset(value, getAsset(data)) : '-',
+          data && value
+            ? formatWithAsset(
+                value,
+                data.tradableInstrument.instrument.product.settlementAsset
+              )
+            : '-',
         headerTooltip: t(
           'The ideal committed liquidity to operate the market.  If total commitment currently below this level then LPs can set the fee level with new commitment.'
         ),
@@ -212,7 +230,10 @@ export const MarketList = () => {
         }) => (
           <HealthBar
             target={data.target}
-            decimals={getAsset(data).decimals || 0}
+            decimals={
+              data.tradableInstrument.instrument.product.settlementAsset
+                .decimals
+            }
             levels={data.feeLevels}
             intent={intentForStatus(value)}
           />

apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx

@@ -9,7 +9,7 @@ import {
   sumLiquidityCommitted,
   lpAggregatedDataProvider,
 } from '@vegaprotocol/liquidity';
-import { getAsset, marketWithDataProvider } from '@vegaprotocol/markets';
+import { marketWithDataProvider } from '@vegaprotocol/markets';
 import type { MarketWithData } from '@vegaprotocol/markets';
 
 import { Market } from './market';
@@ -19,8 +19,10 @@ import { LPProvidersGrid } from './providers';
 const formatMarket = (market: MarketWithData) => {
   return {
     name: market?.tradableInstrument.instrument.name,
-    symbol: getAsset(market).symbol,
-    settlementAsset: getAsset(market),
+    symbol:
+      market?.tradableInstrument.instrument.product.settlementAsset.symbol,
+    settlementAsset:
+      market?.tradableInstrument.instrument.product.settlementAsset,
     targetStake: market?.data?.targetStake,
     tradingMode: market?.data?.marketTradingMode,
     trigger: market?.data?.trigger,

apps/liquidity-provision-dashboard/src/app/lib/utils.tsx

@@ -7,7 +7,6 @@ const marketTradingModeStyle = {
   [Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION]: '#0046CD',
   [Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION]: '#CF0064',
   [Schema.MarketTradingMode.TRADING_MODE_NO_TRADING]: '#CF0064',
-  [Schema.MarketTradingMode.TRADING_MODE_SUSPENDED_VIA_GOVERNANCE]: '#CF0064',
 };
 
 export const getColorForStatus = (status: Schema.MarketTradingMode) =>
@@ -19,8 +18,6 @@ const marketTradingModeIntent = {
   [Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION]: Intent.Primary,
   [Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION]: Intent.Danger,
   [Schema.MarketTradingMode.TRADING_MODE_NO_TRADING]: Intent.Danger,
-  [Schema.MarketTradingMode.TRADING_MODE_SUSPENDED_VIA_GOVERNANCE]:
-    Intent.Danger,
 };
 
 export const intentForStatus = (status: Schema.MarketTradingMode) => {

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

@@ -64,6 +64,48 @@ describe('accounts', { tags: '@smoke' }, () => {
     cy.getByTestId('Collateral').click({ force: true });
   });
 
+  it('should open asset details dialog when clicked on symbol', () => {
+    // 7001-COLL-008
+    // 6501-ASSE-001
+    // 6501-ASSE-002
+    // 6501-ASSE-003
+    // 6501-ASSE-004
+    // 6501-ASSE-005
+    // 6501-ASSE-006
+    // 6501-ASSE-007
+    // 6501-ASSE-008
+    // 6501-ASSE-009
+    // 6501-ASSE-010
+    // 6501-ASSE-011
+    // 6501-ASSE-012
+    // 6501-ASSE-013
+    const titles = [
+      'ID',
+      'Type',
+      'Name',
+      'Symbol',
+      'Decimals',
+      'Quantum',
+      'Status',
+      'Contract address',
+      'Withdrawal threshold',
+      'Lifetime limit',
+      'Infrastructure fee account balance',
+      'Global reward pool account balance',
+      'Maker paid fees account balance',
+      'Maker received fees account balance',
+      'Liquidity provision fee reward account balance',
+      'Market proposer reward account balance',
+    ];
+    cy.get('[col-id="asset.symbol"]').contains('tEURO').click();
+    cy.get('[data-testid$="_label"]').should('have.length', 16);
+    cy.get('[data-testid$="_label"]').each((element, index) => {
+      cy.wrap(element).should('have.text', titles[index]);
+    });
+    cy.getByTestId(dialogClose).click();
+    cy.getByTestId(dialogClose).should('not.exist');
+  });
+
   it('should open usage breakdown dialog when clicked on used', () => {
     // 7001-COLL-009
     cy.get('[col-id="used"]').contains('1.01').click();

apps/trading-e2e/src/integration/trading-deal-ticket-basics.cy.ts

@@ -0,0 +1,106 @@
+import * as Schema from '@vegaprotocol/types';
+import { mockConnectWallet } from '@vegaprotocol/cypress';
+import {
+  orderPriceField,
+  placeOrderBtn,
+  toggleLimit,
+  toggleLong,
+  toggleMarket,
+  toggleShort,
+} from '../support/deal-ticket';
+
+describe('deal ticket basics', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.clearAllLocalStorage();
+    cy.setOnBoardingViewed();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must show place order button and connect wallet if wallet is not connected', () => {
+    // 0003-WTXN-001
+    cy.getByTestId('connect-vega-wallet'); // Not connected
+    cy.getByTestId(placeOrderBtn).should('exist');
+    cy.getByTestId('order-connect-wallet').should('exist');
+  });
+
+  it('must be able to select order direction - long/short', function () {
+    // 7002-SORD-004
+    cy.getByTestId(toggleShort).click().next('input').should('be.checked');
+    cy.getByTestId(toggleLong).click().next('input').should('be.checked');
+  });
+
+  it('must be able to select order type - limit/market', function () {
+    // 7002-SORD-005
+    // 7002-SORD-006
+    // 7002-SORD-007
+    cy.getByTestId(toggleLimit).click().next('input').should('be.checked');
+    cy.getByTestId(toggleMarket).click().next('input').should('be.checked');
+  });
+
+  it('order connect vega wallet button should connect', () => {
+    mockConnectWallet();
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('101');
+    cy.getByTestId('order-connect-wallet').click();
+    cy.getByTestId('dialog-content').should('be.visible');
+    cy.getByTestId('connectors-list')
+      .find('[data-testid="connector-jsonRpc"]')
+      .click();
+    cy.wait('@walletReq');
+    cy.getByTestId(placeOrderBtn).should('be.visible');
+    cy.getByTestId(toggleLimit).next('input').should('be.checked');
+    cy.getByTestId(orderPriceField).should('have.value', '101');
+  });
+
+  it('sidebar should be open after reload', () => {
+    cy.mockTradingPage();
+    cy.getByTestId('deal-ticket-form').should('be.visible');
+    cy.getByTestId('Order').click();
+    cy.getByTestId('deal-ticket-form').should('not.exist');
+    cy.reload();
+    cy.getByTestId('deal-ticket-form').should('be.visible');
+  });
+});
+
+describe(
+  'market states not accepting orders',
+  { tags: '@smoke', testIsolation: true },
+  function () {
+    //7002-SORD-062
+    //7002-SORD-063
+    //7002-SORD-066
+
+    const states = [
+      Schema.MarketState.STATE_REJECTED,
+      Schema.MarketState.STATE_CANCELLED,
+      Schema.MarketState.STATE_CLOSED,
+      Schema.MarketState.STATE_SETTLED,
+      Schema.MarketState.STATE_TRADING_TERMINATED,
+    ];
+
+    states.forEach((marketState) => {
+      describe(marketState, function () {
+        beforeEach(function () {
+          cy.mockTradingPage(marketState);
+          cy.mockSubscription();
+          cy.setVegaWallet();
+          cy.visit('/#/markets/market-0');
+        });
+        it('must display that market is not accepting orders', function () {
+          cy.getByTestId('deal-ticket-error-message-summary').should(
+            'have.text',
+            `This market is ${marketState
+              .split('_')
+              .pop()
+              ?.toLowerCase()} and not accepting orders`
+          );
+          // 7002-SORD-060
+          cy.getByTestId('place-order').should('be.enabled');
+        });
+      });
+    });
+  }
+);

apps/trading-e2e/src/integration/trading-deal-ticket-order.cy.ts

@@ -0,0 +1,134 @@
+import {
+  orderPriceField,
+  orderSizeField,
+  orderTIFDropDown,
+  placeOrderBtn,
+  toggleLimit,
+  toggleMarket,
+} from '../support/deal-ticket';
+
+describe('deal ticker order validation', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+
+    cy.get('[data-testid="deal-ticket-form"]').then(($form) => {
+      if (!$form.length) {
+        cy.getByTestId('Order').click();
+      }
+    });
+  });
+
+  beforeEach(() => {
+    cy.mockTradingPage();
+    cy.getByTestId('deal-ticket-fee-margin-required').click();
+  });
+
+  describe('limit order', () => {
+    before(() => {
+      cy.getByTestId(toggleLimit).click();
+    });
+
+    it('must see the price unit', function () {
+      // 7002-SORD-018
+      cy.getByTestId(orderPriceField).next().should('have.text', 'DAI');
+    });
+
+    it('must see warning when placing an order with expiry date in past', () => {
+      const expiresAt = new Date(Date.now() - 24 * 60 * 60 * 1000);
+      const expiresAtInputValue = expiresAt.toISOString().substring(0, 16);
+      cy.getByTestId(toggleLimit).click();
+      cy.getByTestId(orderPriceField).clear().type('0.1');
+      cy.getByTestId(orderSizeField).clear().type('1');
+      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
+
+      cy.log('choosing yesterday');
+      cy.getByTestId('date-picker-field').type(expiresAtInputValue);
+
+      cy.getByTestId(placeOrderBtn).click();
+
+      cy.getByTestId('deal-ticket-error-message-expiry').should(
+        'have.text',
+        'The expiry date that you have entered appears to be in the past'
+      );
+    });
+
+    it('must see warning if price has too many digits after decimal place', function () {
+      // 7002-SORD-059
+      cy.getByTestId(toggleLimit).click();
+      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
+      cy.getByTestId(orderSizeField).clear().type('1');
+      cy.getByTestId(orderPriceField).clear().type('1.123456');
+      cy.getByTestId(placeOrderBtn).click();
+      cy.getByTestId('deal-ticket-error-message-price').should(
+        'have.text',
+        'Price accepts up to 5 decimal places'
+      );
+    });
+  });
+
+  describe('market order', () => {
+    before(() => {
+      cy.getByTestId(toggleMarket).click();
+      cy.getByTestId(placeOrderBtn).click();
+    });
+
+    it('must not see the price unit', function () {
+      // 7002-SORD-019
+      cy.getByTestId(orderPriceField).should('not.exist');
+    });
+
+    it('must warn if order size input has too many digits after the decimal place', function () {
+      // 7002-SORD-016
+      cy.getByTestId(orderSizeField).clear().type('1.234');
+      // 7002-SORD-060
+      cy.getByTestId(placeOrderBtn).should('be.enabled');
+      cy.getByTestId('deal-ticket-error-message-size').should(
+        'have.text',
+        'Size must be whole numbers for this market'
+      );
+    });
+
+    it('must warn if order size is set to 0', function () {
+      cy.getByTestId(orderSizeField).clear().type('0');
+      cy.getByTestId(placeOrderBtn).should('be.enabled');
+      cy.getByTestId('deal-ticket-error-message-size').should(
+        'have.text',
+        'Size cannot be lower than 1'
+      );
+    });
+
+    it('must have total margin available', () => {
+      // 7001-COLL-011
+      cy.getByTestId('deal-ticket-fee-total-margin-available').within(() => {
+        cy.get('[data-state="closed"]').should(
+          'have.text',
+          'Total margin available100.01 tDAI'
+        );
+      });
+      cy.getByTestId('deal-ticket-fee-margin-required').click();
+    });
+
+    it('must have current margin allocation', () => {
+      cy.getByTestId('deal-ticket-fee-current-margin-allocation').within(() => {
+        cy.get('[data-state="closed"]:first').should(
+          'have.text',
+          'Current margin allocation'
+        );
+      });
+      cy.getByTestId('deal-ticket-fee-margin-required').click();
+    });
+
+    it('should open usage breakdown dialog when clicked on current margin allocation', () => {
+      cy.getByTestId('deal-ticket-fee-current-margin-allocation').within(() => {
+        cy.get('button').click();
+      });
+      cy.getByTestId('usage-breakdown').should('exist');
+      cy.getByTestId('dialog-close').click();
+      cy.getByTestId('deal-ticket-fee-margin-required').click();
+    });
+  });
+});

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

@@ -9,7 +9,7 @@ import {
   testOrderAmendment,
 } from '../support/order-validation';
 
-const orderSymbol = 'instrument-code';
+const orderSymbol = 'market.tradableInstrument.instrument.code';
 const orderSize = 'size';
 const orderType = 'type';
 const orderStatus = 'status';
@@ -229,7 +229,10 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
       status: Schema.OrderStatus.STATUS_FILLED,
     });
     cy.getByTestId(`order-status-${orderId}`).should('have.text', 'Filled');
-    cy.get(`[col-id="${orderSymbol}"]`).contains('[title="Future"]', 'Futr');
+    cy.get('[col-id="market.tradableInstrument.instrument.code"]').contains(
+      '[title="Future"]',
+      'Futr'
+    );
   });
 
   it('must see a rejected order', () => {

apps/trading-e2e/src/support/trading.ts

@@ -122,7 +122,6 @@ const mockTradingPage = (
         tradableInstrument: {
           instrument: {
             product: {
-              __typename: 'Future',
               dataSourceSpecForSettlementData: {
                 data: {
                   sourceType: {

apps/trading/.env

@@ -3,29 +3,27 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
-NX_VEGA_ENV=STAGNET1
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
+NX_VEGA_ENV=TESTNET
+NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
-NX_VEGA_TOKEN_URL=https://governance.stagnet1.vega.rocks
+NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
-
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
-NX_METAMASK_SNAPS=true
-NX_REFERRALS=true
+NX_METAMASK_SNAPS=false
 
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket

apps/trading/.env.capsule

@@ -24,7 +24,6 @@ NX_STOP_ORDERS=false
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=false
-NX_REFERRALS=false
 
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket

apps/trading/.env.devnet

@@ -15,7 +15,6 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
@@ -23,7 +22,6 @@ NX_STOP_ORDERS=true
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true
-NX_REFERRALS=true
 
 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket

apps/trading/.env.mainnet

@@ -17,13 +17,16 @@ NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-ma
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
+
+# TAG name of the current app version - TODO: bump to the latest upon release
+NX_APP_VERSION=v0.21.2-core-0.72.14
+
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true
-NX_REFERRALS=false
 
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

apps/trading/.env.mainnet-mirror

@@ -24,7 +24,6 @@ NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=false
-NX_REFERRALS=false
 
 NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket

apps/trading/.env.stagnet1

@@ -24,4 +24,3 @@ NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true
-NX_REFERRALS=true

apps/trading/.env.testnet

@@ -24,7 +24,6 @@ NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true
-NX_REFERRALS=true
 
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket

apps/trading/.env.validators-testnet

@@ -25,7 +25,6 @@ NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=false
-NX_REFERRALS=false
 
 NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket

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

@@ -1,31 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { Links } from '../../lib/links';
-import classNames from 'classnames';
-import { NavLink, Outlet } from 'react-router-dom';
-
-export const Assets = () => {
-  const linkClasses = ({ isActive }: { isActive: boolean }) => {
-    return classNames('border-b-2 border-transparent', {
-      'border-vega-yellow': isActive,
-    });
-  };
-
-  return (
-    <div className="max-w-[500px] px-4 mx-auto my-8">
-      <nav className="flex mb-6 text-lg gap-4">
-        <NavLink to={Links.DEPOSIT()} className={linkClasses}>
-          {t('Deposit')}
-        </NavLink>
-        <NavLink to={Links.WITHDRAW()} className={linkClasses}>
-          {t('Withdraw')}
-        </NavLink>
-        <NavLink to={Links.TRANSFER()} className={linkClasses}>
-          {t('Transfer')}
-        </NavLink>
-      </nav>
-      <div className="pt-4 border-t md:p-6 md:border md:rounded-xl border-default">
-        <Outlet />
-      </div>
-    </div>
-  );
-};

apps/trading/client-pages/assets/index.ts

@@ -1 +0,0 @@
-export { Assets } from './assets';

apps/trading/client-pages/deposit/deposit-get-started.tsx

@@ -1,44 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { Intent, TradingAnchorButton } from '@vegaprotocol/ui-toolkit';
-import { GetStartedCheckList } from '../../components/welcome-dialog';
-import {
-  useGetOnboardingStep,
-  useOnboardingStore,
-  OnboardingStep,
-} from '../../components/welcome-dialog/use-get-onboarding-step';
-import { Links } from '../../lib/links';
-import classNames from 'classnames';
-
-export const DepositGetStarted = () => {
-  const onboardingDismissed = useOnboardingStore((store) => store.dismissed);
-  const dismiss = useOnboardingStore((store) => store.dismiss);
-  const step = useGetOnboardingStep();
-  const wrapperClasses = classNames(
-    'flex flex-col py-4 px-6 gap-4 rounded',
-    'bg-vega-blue-300 dark:bg-vega-blue-700',
-    'border border-vega-blue-350 dark:border-vega-blue-650'
-  );
-
-  // Dont show unless still onboarding
-  if (onboardingDismissed) {
-    return null;
-  }
-
-  return (
-    <div className="pt-6 border-t border-default">
-      <div className={wrapperClasses}>
-        <h3 className="text-lg">{t('Get started')}</h3>
-        <GetStartedCheckList />
-        {step > OnboardingStep.ONBOARDING_DEPOSIT_STEP && (
-          <TradingAnchorButton
-            href={Links.HOME()}
-            onClick={() => dismiss()}
-            intent={Intent.Info}
-          >
-            {t('Start trading')}
-          </TradingAnchorButton>
-        )}
-      </div>
-    </div>
-  );
-};

apps/trading/client-pages/deposit/deposit.spec.tsx

@@ -1,30 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { MemoryRouter } from 'react-router-dom';
-import { Deposit } from './deposit';
-
-jest.mock('@vegaprotocol/deposits', () => ({
-  DepositContainer: ({ assetId }: { assetId?: string }) => (
-    <div data-testid="assetId">{assetId}</div>
-  ),
-}));
-
-jest.mock('./deposit-get-started', () => ({
-  DepositGetStarted: () => <div>DepositGetStarted</div>,
-}));
-
-const renderJsx = (route = '/deposit') => {
-  render(
-    <MemoryRouter initialEntries={[route]}>
-      <Deposit />
-    </MemoryRouter>
-  );
-};
-
-describe('Deposit page', () => {
-  it('assetId should be passed down', () => {
-    const assetId = 'foo';
-    const route = '/deposit?assetId=' + assetId;
-    renderJsx(route);
-    expect(screen.getByTestId('assetId')).toHaveTextContent(assetId);
-  });
-});