Merge remote-tracking branch 'origin/main' into chore/update-develop

chore(ci,governance): update develop with latest main changes

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 # Related issues 🔗
 
-Issue: #[Issue number here]
+Closes #[Issue number here]
 
 # Description ℹ️
 

.github/workflows/add-ipfs-notes-to-release.yml

@@ -82,3 +82,38 @@ jobs:
             https://${{ env.IPFS_V1 }}.ipfs.dweb.link/
             https://${{ env.IPFS_V1 }}.ipfs.cf-ipfs.com/
             ipfs://${{ env.IPFS_V0 }}/
+
+      - name: Ensure 'Released' label exists
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          REPO="${{ github.repository }}"
+          LABEL_EXIST=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
+                            -H "Accept: application/vnd.github.v3+json" \
+                            "https://api.github.com/repos/$REPO/labels/Released")
+          if [[ "$LABEL_EXIST" == *"Not Found"* ]]; then
+            curl -s -H "Authorization: token $GITHUB_TOKEN" \
+                  -H "Accept: application/vnd.github.v3+json" \
+                  -X POST "https://api.github.com/repos/$REPO/labels" \
+                  -d '{"name": "Released", "color": "FFFFFF"}'
+          fi
+
+      - name: Extract issues from release notes
+        id: extract-issues
+        run: |
+          ISSUES=$(echo "${{ github.event.release.body }}" | grep -o -E '#[0-9]+' | tr -d '#' | jq -R . | jq -cs .)
+          echo "Issues to label: $ISSUES"
+          echo "::set-output name=issue_numbers::$ISSUES"
+
+      - name: Add 'Released' label to issues
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          ISSUE_NUMBERS="${{ steps.extract-issues.outputs.issue_numbers }}"
+          REPO="${{ github.repository }}"
+          for ISSUE in $(echo "$ISSUE_NUMBERS" | jq -r '.[]'); do
+            curl -s -H "Authorization: token $GITHUB_TOKEN" \
+                  -H "Accept: application/vnd.github.v3+json" \
+                  -X POST "https://api.github.com/repos/$REPO/issues/$ISSUE/labels" \
+                  -d '{"labels": ["Released"]}'
+          done

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

@@ -5,15 +5,17 @@ on:
     branches:
       - release/*
       - develop
+      - main
   pull_request:
     types:
       - 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:
@@ -42,13 +44,6 @@ 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
@@ -175,25 +170,48 @@ jobs:
       preview_explorer: ${{ env.PREVIEW_EXPLORER }}
       preview_tools: ${{ env.PREVIEW_TOOLS }}
 
-  console-e2e:
+  check-e2e-needed:
+    runs-on: ubuntu-latest
     needs: build-sources
-    name: '(CI) console python'
+    name: '(CI) check if e2e needed'
-    uses: ./.github/workflows/console-test-run.yml
+    outputs:
-    secrets: inherit
+      run-tests: ${{ steps.check-test.outputs.e2e-needed }}
-    if: ${{ contains(fromJSON(needs.build-sources.outputs.projects), 'trading') && github.event_name == 'pull_request' }}
+    steps:
-    with:
+      - name: Check branch
-      github-sha: ${{ github.event.pull_request.head.sha || github.sha }}
+        id: check-test
+        run: |
+          if [[ "${{ github.base_ref }}" == "develop" ]]; then
+            echo "e2e-needed=true" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.base_ref }}" == "main" ]]; then 
+            echo "e2e-needed=true" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.event_name }}" == "push"  &&  "${{ github.ref_name }}" == *"release/"* ]]; then
+            echo "e2e-needed=true" >> $GITHUB_OUTPUT
+          else
+            echo "e2e-needed=false" >> $GITHUB_OUTPUT
+          fi
+      - name: Print result
+        run: |
+          echo "e2e-needed: ${{ steps.check-test.outputs.e2e-needed }}"
 
   cypress:
-    needs: build-sources
+    needs: [build-sources, check-e2e-needed]
     name: '(CI) cypress'
-    # if: ${{ needs.build-sources.outputs.projects-e2e != '[]' }}
+    if: ${{ needs.check-e2e-needed.outputs.run-tests == 'true' }}
     uses: ./.github/workflows/cypress-run.yml
     secrets: inherit
     with:
       projects: ${{ needs.build-sources.outputs.projects-e2e }}
       tags: '@smoke'
 
+  console-e2e:
+    needs: [build-sources, check-e2e-needed]
+    name: '(CI) console python'
+    uses: ./.github/workflows/console-test-run.yml
+    secrets: inherit
+    if: ${{ needs.check-e2e-needed.outputs.run-tests == 'true' }} && ${{ contains(fromJSON(needs.build-sources.outputs.projects), 'trading') }}
+    with:
+      github-sha: ${{ github.event.pull_request.head.sha || github.sha }}
+
   publish-dist:
     needs: build-sources
     name: '(CD) publish dist'

.github/workflows/clear-cache.yml

@@ -0,0 +1,29 @@
+# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#managing-caches
+name: cleanup caches by a branch
+on:
+  pull_request:
+    types:
+      - closed
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 )
+
+          ## Setting this to not fail the workflow while deleting cache keys.
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+          BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge

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

@@ -6,23 +6,37 @@ 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:
+  create-docker-image:
-    name: run-tests
+    name: Create docker image for console-test
-    runs-on: console-test
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     steps:
       #----------------------------------------------
       #       check-out frontend-monorepo
       #----------------------------------------------
-      - name: Checkout console test repo
+      - name: Checkout frontend-monorepo
         uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.github-sha }}
+          ref: ${{ inputs.github-sha || 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
@@ -41,23 +55,105 @@ jobs:
       #----------------------------------------------
       #       build trading
       #----------------------------------------------
-      - name: Build affected spec
+      - name: Build trading app
         run: |
           yarn env-cmd -f ./apps/trading/.env.stagnet1 yarn nx export trading
+          DIST_LOCATION=dist/apps/trading/exported
+          mv $DIST_LOCATION dist-result
+          tree dist-result
+
       #----------------------------------------------
-      #       run trading server
+      #       export trading app docker image
       #----------------------------------------------
-      - name: Run trading server
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and export to local Docker
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: docker/node-outside-docker.Dockerfile
+          load: true
+          build-args: |
+            APP=trading
+            ENV_NAME=stagnet1
+          tags: ci/trading:local
+          outputs: type=docker,dest=/tmp/console-image.tar
+
+      - name: Verify docker image created
         run: |
-          docker run -d -p 80:4200 -v $PWD/docker/nginx.conf:/etc/nginx/conf.d/default.conf -v $PWD/dist/apps/trading/exported:/usr/share/nginx/html nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
+          echo ${{ steps.docker_build.outputs.digest }}
-          sleep 5
+          echo ${{ steps.docker_build.outputs.imageid }}
-          docker ps
+
-      #----------------------------------------------
+      - name: Upload docker image for console-test usage
-      #       check if container persists between runs
+        uses: actions/upload-artifact@v3
-      #----------------------------------------------
+        with:
-      - name: Check server
+          name: console-image
+          path: /tmp/console-image.tar
+
+  console-test-branch:
+    name: Choose console-test branch to run on
+    runs-on: ubuntu-22.04
+    timeout-minutes: 5
+    outputs:
+      console-branch: ${{ steps.output-step.outputs.branch }}
+    steps:
+      - name: Workflow dispatch input
+        id: dispatch-step
+        if: github.event_name == 'workflow_dispatch'
+        run: echo "branch=${{ inputs.console-test-branch }}" >> $GITHUB_OUTPUT
+
+      - name: Print Workflow dispatch input
+        if: github.event_name == 'workflow_dispatch'
+        run: echo ${{ steps.dispatch-step.outputs.branch }}
+
+      - name: Workflow_call input
+        id: workflow_call-step
+        if: github.event_name != 'workflow_dispatch'
         run: |
-          docker ps
+          if [[ "${{ github.base_ref }}" == "main" ]]; then
+            echo "branch=main" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.base_ref }}" == "develop" && "${{ github.ref_name }}" == "main" ]]; then
+            echo "branch=main" >> $GITHUB_OUTPUT
+          elif [[ "${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == *"release/mainnet"* ]]; then
+            echo "branch=main" >> $GITHUB_OUTPUT
+          else
+            echo "branch=develop" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Print Workflow_call input
+        if: github.event_name != 'workflow_dispatch'
+        run: echo ${{ steps.workflow_call-step.outputs.branch }}
+
+      - name: Set output
+        id: output-step
+        run: echo "branch=${{ steps.dispatch-step.outputs.branch || steps.workflow_call-step.outputs.branch }}" >> $GITHUB_OUTPUT
+
+      - name: Print final output
+        run: echo ${{ steps.output-step.outputs.branch }}
+
+  run-tests:
+    name: run-tests
+    runs-on: 8-cores
+    needs: [create-docker-image, console-test-branch]
+    timeout-minutes: 20
+    steps:
+      #----------------------------------------------
+      #       load docker image
+      #----------------------------------------------
+      - name: Download docker image from previous job
+        uses: actions/download-artifact@v3
+        with:
+          name: console-image
+          path: /tmp
+
+      - name: Load Docker image
+        run: |
+          docker load --input /tmp/console-image.tar
+          docker image ls -a
+
       #----------------------------------------------
       #       check-out tests repo
       #----------------------------------------------
@@ -65,36 +161,55 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: vegaprotocol/console-test
-          path: './console-test'
+          ref: ${{ needs.console-test-branch.outputs.console-branch }}
+
+      - name: Load console test envs
+        id: console-test-env
+        uses: falti/dotenv-action@v1.0.4
+        with:
+          path: '.env.${{ needs.console-test-branch.outputs.console-branch  }}'
+          export-variables: true
+          keys-case: upper
+          log-variables: true
+
       #----------------------------------------------
-      # install dependencies if cache does not exist
+      #  -----  Setup python  -----
+      #----------------------------------------------
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+      #----------------------------------------------
+      #  -----  install & configure poetry  -----
+      #----------------------------------------------
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+          virtualenvs-path: .venv
+
+      #----------------------------------------------
+      # install python dependencies
       #----------------------------------------------
       - name: Install dependencies
-        working-directory: ./console-test
-        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
         run: poetry install --no-interaction --no-root
       #----------------------------------------------
       # install vega binaries
       #----------------------------------------------
       - name: Install vega binaries
-        working-directory: ./console-test
+        run: poetry run python -m vega_sim.tools.load_binaries --force --version ${{ env.VEGA_VERSION }}
-        run: poetry run python -m vega_sim.tools.load_binaries --force
       #----------------------------------------------
       # install playwright
       #----------------------------------------------
       - name: install playwright
-        run: poetry run playwright install
+        run: poetry run playwright install --with-deps chromium
-        working-directory: ./console-test
       #----------------------------------------------
       # run tests
       #----------------------------------------------
       - name: Run tests
-        working-directory: ./console-test
+        run: CONSOLE_IMAGE_NAME=ci/trading:local 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 .
-          ls -al console-test
       #----------------------------------------------
       # upload traces
       #----------------------------------------------
@@ -105,3 +220,13 @@ 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,13 +13,35 @@ 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" && "${{ 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 }}
-    runs-on: self-hosted-runner
+    needs: runner-choice
+    runs-on: ${{ needs.runner-choice.outputs.runner }}
     timeout-minutes: 120
     steps:
       # Checks if skip cache was requested
@@ -63,6 +85,7 @@ jobs:
       - name: Run Vegacapsule network and Vega wallet
         id: setup-vega
         uses: ./frontend-monorepo/.github/actions/run-vegacapsule
+        timeout-minutes: 10
 
       ######
       ## Run some tests

.github/workflows/lint-pr.yml

@@ -2,7 +2,12 @@
 name: Verify PR title
 
 on:
-  workflow_call:
+  pull_request:
+    types:
+      - opened
+      - edited
+      - reopened
+      - synchronize
 
 jobs:
   lint_pr:
@@ -11,21 +16,16 @@ 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-file: '.nvmrc'
+          node-version: 16
-          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
-          cache: yarn
 
-      - name: Cache node modules
+      - name: Install dependencies
-        uses: actions/cache@v3
+        run: |
-        with:
+          rm package.json 
-          path: node_modules
+          npm install --no-save @commitlint/cli @commitlint/config-conventional @commitlint/config-nx-scopes nx
-          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,12 +30,18 @@ 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: ${{ contains(github.ref, 'develop') && github.event_name == 'push' && matrix.app == 'trading' }}
+        if: ${{ github.ref_name == '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: |
@@ -57,7 +63,7 @@ jobs:
           echo IS_IPFS_RELEASE=true >> $GITHUB_ENV
 
       - name: Is S3 Release
-        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' && github.ref_name != 'main'}}
         run: |
           echo IS_S3_RELEASE=true >> $GITHUB_ENV
 
@@ -81,7 +87,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' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' || env.IS_MAIN_IMAGE == 'true' }}
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -155,10 +161,10 @@ jobs:
       - name: Sanity check docker image
         run: |
           echo "Check ipfs-hash"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /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 cat /ipfs-hash > ${{ matrix.app }}-ipfs-hash
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local /bin/sh -c 'cat /ipfs-hash' > ${{ matrix.app }}-ipfs-hash
           echo "List html directory"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree /usr/share/nginx/html'
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local /bin/sh -c 'apk add --update tree; tree /usr/share/nginx/html'
 
       - name: Publish dist as docker image (ghcr)
         uses: docker/build-push-action@v3
@@ -179,7 +185,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'  }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' || env.IS_MAIN_IMAGE == 'true' }}
         with:
           context: .
           file: docker/node-outside-docker.Dockerfile
@@ -189,7 +195,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' || '' }}
+            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' || '' }}
 
       - name: Publish dist as docker image (ghcr - retry)
         uses: docker/build-push-action@v3
@@ -216,7 +222,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' || '' }}
+            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' || '' }}
 
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3
@@ -329,7 +335,9 @@ jobs:
             fi
 
             # create commit
-            commit_msg="Automated hash update from ${{ github.ref }}"
+            if ! git diff --cached --exit-code; then
-            git commit -m "$commit_msg"
+              commit_msg="Automated hash update from ${{ github.ref }}"
-            git push -u origin "main"
+              git commit -m "$commit_msg"
+              git push -u origin "main"
+            fi
           )

README.md

@@ -113,6 +113,20 @@ In order to run a container on port 3000:
 docker run -p 3000:80 [TAG]
 ```
 
+On top of that there are two possible scenarios for running docker image - using nginx server (default) of ipfs daemon.
+
+to run ipfs on port 3000:
+
+```bash
+docker run -p 3000:80 [TAG] /run-ipfs.sh
+```
+
+to run nginx on port 3000:
+
+```bash
+docker run -p 3000:80 [TAG]
+```
+
 ## Build instructions
 
 The [`docker`](./docker) subfolder has some docker configurations for easily setting up your own hosted version of Console either for the web, or ready for pinning on IPFS.
@@ -150,7 +164,7 @@ As a prerequisite you need to perform build of `dist` directory and move its con
 You can build any of the containers locally with the following command:
 
 ```bash
-docker build --dockerfile docker/node-outside-docker.Dockerfile . --tag=[TAG]
+docker build -f docker/node-outside-docker.Dockerfile . --tag=[TAG]
 ```
 
 ### Verifying ipfs-hash of existing current application version

apps/explorer-e2e/.env.devnet

@@ -4,6 +4,8 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_ENV=DEVNET
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer-e2e/.env.mainnet

@@ -4,6 +4,7 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocke
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer-e2e/.env.testnet

@@ -4,6 +4,7 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://lb.testnet.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 # App flags
 NX_EXPLORER_ASSETS=1

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

@@ -36,7 +36,7 @@ context('Market page', { tags: '@regression' }, function () {
 
     it('Able to go to market details page', function () {
       cy.navigate_to('markets');
-      cy.get_element_by_col_id('actions').eq(1).click();
+      cy.contains('Test market 1').click();
       cy.getByTestId(marketHeaders).should('have.text', 'Test market 1');
       cy.validate_element_from_table('Name', 'Test market 1');
       cy.validate_element_from_table('Market ID', this.createdMarketId);
@@ -87,15 +87,13 @@ 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',
-        '1,000.00% of mid price'
+        '95.00% of mid price'
       );
       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(
@@ -144,11 +142,8 @@ 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/integration/node-switcher.cy.js

@@ -40,7 +40,7 @@ context.skip('Node switcher', { tags: '@regression' }, function () {
       const errorTypeTxt = 'Error: invalid url';
       const nodeErrorTxt = 'fakeUrl is not a valid url.';
 
-      cy.getByTestId('node-url-custom').click();
+      cy.getByTestId('node-url-custom').click({ force: true });
 
       cy.getByTestId(customNodeBtn).within(() => {
         cy.get('input').clear().type('fakeUrl');

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

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

apps/explorer/.env.capsule

@@ -3,6 +3,7 @@ NX_VEGA_ENV=CUSTOM
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_EXPLORER_URL=/
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 # App flags
 NX_EXPLORER_TXS_LIST=0

apps/explorer/.env.devnet

@@ -8,6 +8,7 @@ NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=/
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket

apps/explorer/.env.mainnet

@@ -9,6 +9,7 @@ NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

apps/explorer/.env.mainnet-mirror

@@ -9,6 +9,7 @@ NX_VEGA_GOVERNANCE_URL=https://governance.mainnet-mirror.vega.rocks
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks/
 NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket

apps/explorer/.env.stagnet1

@@ -1,2 +1,3 @@
 # .env is stagnet1, so there are no overrides required
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz","STAGNET1":"https://stagnet1.explorer.vega.xyz"}'
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

apps/explorer/.env.testnet

@@ -9,6 +9,7 @@ NX_VEGA_GOVERNANCE_URL=https://governance.fairground.wtf
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket

apps/explorer/.env.validators-testnet

@@ -11,6 +11,7 @@ NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
 NX_VEGA_GOVERNANCE_URL=https://governance.validators-testnet.vega.rocks
 NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
 NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks/
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket

apps/explorer/.env.vegacapsule

@@ -5,4 +5,5 @@ NX_VEGA_ENV=CUSTOM
 NX_BLOCK_EXPLORER=
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
-NX_VEGA_EXPLORER_URL=/
+NX_VEGA_EXPLORER_URL=/
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

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

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

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

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

@@ -1,15 +1,18 @@
 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,
@@ -18,20 +21,21 @@ import {
   SettlementAssetInfoPanel,
 } from '@vegaprotocol/markets';
 import { MarketInfoTable } from '@vegaprotocol/markets';
-import type { DataSourceDefinition } from '@vegaprotocol/types';
+import type { DataSourceFragment } from '@vegaprotocol/markets';
 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 settlementData = market.tradableInstrument.instrument.product
+  const getSigners = ({ data }: DataSourceFragment) => {
-    .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 = data.sourceType.sourceType.signers || [];
+      const signers =
+        ('signers' in data.sourceType.sourceType &&
+          data.sourceType.sourceType.signers) ||
+        [];
 
       return signers.map(({ signer }, i) => {
         return (
@@ -43,10 +47,13 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
     return [];
   };
 
-  const showTwoOracles = isEqual(
+  const showTwoOracles =
-    getSigners(settlementData),
+    settlementDataSource &&
-    getSigners(terminationData)
+    terminationDataSource &&
-  );
+    isEqual(
+      getSigners(settlementDataSource),
+      getSigners(terminationDataSource)
+    );
 
   const headerClassName = 'font-alpha calt text-xl mt-4 border-b-2 pb-2';
 
@@ -89,10 +96,12 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
       )}
       <h2 className={headerClassName}>{t('Liquidity monitoring')}</h2>
       <LiquidityMonitoringParametersInfoPanel market={market} />
-      <h2 className={headerClassName}>{t('Liquidity')}</h2>
-      <LiquidityInfoPanel 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} />
       {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 type { MarketFieldsFragment } from '@vegaprotocol/markets';
+import { getAsset, 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 { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import type {
   VegaICellRendererParams,
   VegaValueGetterParams,
@@ -73,8 +73,7 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
           MarketFieldsFragment,
           'tradableInstrument.instrument.product.settlementAsset.symbol'
         >) => {
-          const value =
+          const value = data && getAsset(data);
-            data?.tradableInstrument.instrument.product.settlementAsset;
           return value ? (
             <ButtonLink
               onClick={(e) => {

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

@@ -31,6 +31,9 @@ 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 } } } } };
+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 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 } } } } } };
+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 const ExplorerDeterministicOrderFieldsFragmentDoc = gql`
     fragment ExplorerDeterministicOrderFields on Order {
@@ -47,6 +47,9 @@ export const ExplorerDeterministicOrderFieldsFragmentDoc = gql`
           ... on Future {
             quoteName
           }
+          ... on Perpetual {
+            quoteName
+          }
         }
       }
     }

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

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

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

@@ -33,6 +33,8 @@ 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 { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGrid } from '@vegaprotocol/datagrid';
 import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
@@ -33,7 +33,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
   const { params } = useNetworkParams([
     NetworkParams.governance_proposal_market_requiredMajority,
   ]);
-  const tokenLink = useLinks(DApp.Token);
+  const tokenLink = useLinks(DApp.Governance);
   const requiredMajorityPercentage = useMemo(() => {
     const requiredMajority =
       params?.governance_proposal_market_requiredMajority ?? 1;
@@ -105,7 +105,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
               ? new BigNumber(0)
               : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
             return (
-              <div className="uppercase flex h-full items-center justify-center pt-2">
+              <div className="flex items-center justify-center h-full pt-2 uppercase">
                 <VoteProgress
                   threshold={requiredMajorityPercentage}
                   progress={yesPercentage}

apps/explorer/src/app/components/txs/details/proposal/signature-bundle/bundle-signers.tsx

@@ -35,7 +35,7 @@ export const BundleSigners = ({
   tx,
   id,
 }: BundleSignersProps) => {
-  const tokenLink = useLinks(DApp.Token);
+  const tokenLink = useLinks(DApp.Governance);
 
   const bridgeFunction: BridgeFunction =
     tx?.changes?.erc20 && 'contractAddress' in tx.changes.erc20

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

@@ -49,6 +49,37 @@ 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,6 +11,14 @@ 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?: '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 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 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?: '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 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 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?: '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 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 const ExplorerOracleDataConnectionFragmentDoc = gql`
     fragment ExplorerOracleDataConnection on OracleSpec {
@@ -72,6 +72,37 @@ 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 } } } } };
+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 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 } } } } } }> } | 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 } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Spot' } } } } }> } | null };
 
 export const ExplorerOracleForMarketsMarketFragmentDoc = gql`
     fragment ExplorerOracleForMarketsMarket on Market {
@@ -24,6 +24,14 @@ 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 misleadlingly names, OracleMarkets lists the market (almost always singular)
+ * Slightly misleading 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,8 +27,10 @@ export function OracleMarkets({ id }: OracleMarketsProps) {
     const m = markets.find((m) => {
       const p = m.tradableInstrument.instrument.product;
       if (
-        p?.dataSourceSpecForSettlementData?.id === id ||
+        ((p.__typename === 'Future' || p.__typename === 'Perpetual') &&
-        p?.dataSourceSpecForTradingTermination?.id === id
+          p.dataSourceSpecForSettlementData.id === id) ||
+        ('dataSourceSpecForTradingTermination' in p &&
+          p.dataSourceSpecForTradingTermination.id === id)
       ) {
         return true;
       }
@@ -61,8 +63,32 @@ export function getLabel(
   m: ExplorerOracleForMarketsMarketFragment | null
 ): string {
   const settlementId =
-    m?.tradableInstrument?.instrument?.product?.dataSourceSpecForSettlementData
+    ((m?.tradableInstrument?.instrument?.product?.__typename === 'Future' ||
-      ?.id || null;
+      m?.tradableInstrument?.instrument?.product?.__typename === 'Perpetual') &&
+      m?.tradableInstrument?.instrument?.product
+        ?.dataSourceSpecForSettlementData?.id) ||
+    null;
 
-  return id === settlementId ? 'Settlement for' : 'Termination for';
+  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';
+  }
 }

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

@@ -67,6 +67,9 @@ 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/oracles/home/index.tsx

@@ -8,7 +8,9 @@ import { useScrollToLocation } from '../../../hooks/scroll-to-location';
 import filter from 'recursive-key-filter';
 
 const Oracles = () => {
-  const { data, loading, error } = useExplorerOracleSpecsQuery();
+  const { data, loading, error } = useExplorerOracleSpecsQuery({
+    errorPolicy: 'ignore',
+  });
 
   useDocumentTitle(['Oracles']);
   useScrollToLocation();

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

@@ -23,6 +23,9 @@ 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 } } } } | 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 } | { __typename?: 'Perpetual', quoteName: string } | { __typename?: 'Spot' } } } } | 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 } } } } | 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 } | { __typename?: 'Perpetual', quoteName: string } | { __typename?: 'Spot' } } } } | null } } | null> | null } | null } }> } | null };
 
 export const ExplorerPartyAssetsAccountsFragmentDoc = gql`
     fragment ExplorerPartyAssetsAccounts on AccountBalance {
@@ -38,6 +38,9 @@ export const ExplorerPartyAssetsAccountsFragmentDoc = gql`
           ... on Future {
             quoteName
           }
+          ... on Perpetual {
+            quoteName
+          }
         }
       }
     }

apps/explorer/src/app/routes/validators/validators-page.tsx

@@ -139,7 +139,7 @@ export const ValidatorsPage = () => {
   const [vegaDialog, setVegaDialog] = useState<boolean>(false);
   const [tmDialog, setTmDialog] = useState<boolean>(false);
 
-  const tokenLink = useLinks(DApp.Token);
+  const tokenLink = useLinks(DApp.Governance);
 
   return (
     <>

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

@@ -1453,11 +1453,6 @@ 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[];
       /**
@@ -1853,11 +1848,6 @@ 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

@@ -14,11 +14,15 @@ NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 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

@@ -3,3 +3,6 @@ NX_VEGA_ENV=DEVNET
 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

@@ -3,3 +3,6 @@ NX_VEGA_ENV=MAINNET
 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

@@ -3,3 +3,6 @@ NX_VEGA_ENV=TESTNET
 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/mocks/network-upgrade.ts

@@ -19,7 +19,22 @@ export const upgradeProposalsData = {
       },
       {
         node: {
-          upgradeBlockHeight: '1955065',
+          upgradeBlockHeight: '10001',
+          vegaReleaseTag: 'v0.71.0+dev-12156-bca1d57e',
+          approvers: [
+            '02a6531716b7a6d82779b7793c3ad2fcb47290ea2ff0912c56f61219bd9675ff',
+            '121934387281812a2d5e6913e5d57c0f85a8f169e2752347ee2e23b52d46623c',
+            '65c80e2f5f84e2109eec30810f137ba04cbbecaba8f27706c146cc6c6f90db29',
+            'bd6339d2428c79ac3bc9011771236d17bac92bcb1806423388d52fb440043aef',
+          ],
+          status: 'PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED',
+          __typename: 'ProtocolUpgradeProposal',
+        },
+        __typename: 'ProtocolUpgradeProposalEdge',
+      },
+      {
+        node: {
+          upgradeBlockHeight: '20',
           vegaReleaseTag: 'v0.71.0+dev-12156-bca1d57e',
           approvers: [
             '02a6531716b7a6d82779b7793c3ad2fcb47290ea2ff0912c56f61219bd9675ff',

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

@@ -1,21 +0,0 @@
-{
-  "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

@@ -0,0 +1,138 @@
+{
+  "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,7 +10,6 @@
         "positionDecimalPlaces": "5",
         "linearSlippageFactor": "0.001",
         "quadraticSlippageFactor": "0",
-        "lpPriceRange": "10",
         "instrument": {
           "name": "Token test market",
           "code": "TEST.24h",
@@ -104,6 +103,12 @@
             "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,7 +4,6 @@
     "positionDecimalPlaces": "5",
     "linearSlippageFactor": "0.001",
     "quadraticSlippageFactor": "0",
-    "lpPriceRange": "10",
     "instrument": {
       "name": "Token test market",
       "code": "Token.24h",
@@ -98,6 +97,12 @@
         "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

@@ -0,0 +1,16 @@
+{
+  "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,7 +4,6 @@
     "positionDecimalPlaces": "5",
     "linearSlippageFactor": "0.001",
     "quadraticSlippageFactor": "0",
-    "lpPriceRange": "10",
     "instrument": {
       "name": "Token test market",
       "code": "Token.24h",
@@ -99,6 +98,12 @@
         "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

@@ -0,0 +1,16 @@
+{
+  "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

@@ -0,0 +1,17 @@
+{
+  "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

@@ -1,86 +0,0 @@
-{
-  "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,5 +1,4 @@
 {
-  "lpPriceRange": "10",
   "linearSlippageFactor": "0.001",
   "quadraticSlippageFactor": "0",
   "instrument": {
@@ -98,5 +97,11 @@
       "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,6 +9,7 @@ import {
   createTenDigitUnixTimeStampForSpecifiedDays,
   generateFreeFormProposalTitle,
   getDateFormatForSpecifiedDays,
+  getProposalDetailsValue,
   getProposalFromTitle,
   getProposalInformationFromTable,
   goToMakeNewProposal,
@@ -50,6 +51,7 @@ 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',
@@ -58,6 +60,17 @@ 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 () {
@@ -296,9 +309,6 @@ 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)
@@ -307,14 +317,9 @@ describe(
             cy.getByTestId(viewProposalButton).click();
           });
       });
-      getProposalInformationFromTable('ID')
+      cy.VegaWalletSubmitProposal(
-        .invoke('text')
+        createSuccessorMarketProposalTxBody(this.parentMarketId)
-        .as('parentMarketId')
+      );
-        .then(() => {
-          cy.VegaWalletSubmitProposal(
-            createSuccessorMarketProposalTxBody(this.parentMarketId)
-          );
-        });
       navigateTo(navigation.proposals);
       cy.reload();
       getProposalFromTitle('Test successor market proposal details').within(
@@ -372,19 +377,148 @@ describe(
       });
 
       // 3003-PMAN-011
-      cy.get('.underline').contains('Parent Market ID').realHover();
+      cy.contains('Parent Market ID').realHover();
       cy.getByTestId('tooltip-content', { timeout: 8000 }).should(
         'contain.text',
         'The ID of the market this market succeeds.'
       );
-      cy.get('.underline')
+      cy.contains('Insurance Pool Fraction').realMouseUp().realHover();
-        .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('Min 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,7 +65,10 @@ context(
             cy.getByTestId(viewProposalButton).click();
           });
       });
-      cy.getByTestId('proposal-type').should('have.text', 'New market');
+      cy.getByTestId('proposal-type').should(
+        'have.text',
+        'New market - future'
+      );
       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,6 +36,7 @@ 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';
@@ -227,6 +228,8 @@ context(
             parseSpecialCharSequences: false,
             delay: 2,
           });
+          cy.getByTestId(proposalVoteDeadline).clear().type('2');
+          cy.getByTestId(proposalEnactmentDeadline).clear().type('3');
         });
         cy.getByTestId(proposalDownloadBtn)
           .should('be.visible')
@@ -634,6 +637,8 @@ 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,11 +89,12 @@ 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 proposalTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
+    const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
+    const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
     submitUniqueRawProposal({
       proposalBody: proposalPath,
-      enactmentTimestamp: proposalTimestamp,
+      enactmentTimestamp: enactmentTimestamp,
-      closingTimestamp: proposalTimestamp,
+      closingTimestamp: closingTimestamp,
     }); // 3001-VOTE-052
     // 3001-VOTE-008
     // 3001-VOTE-034

apps/governance-e2e/src/integration/flow/staking-flow.cy.ts

@@ -212,7 +212,7 @@ context(
         closeStakingDialog();
         navigateTo(navigation.validators);
         cy.get(`[row-id="${0}"]`)
-          .eq(1)
+          .first()
           .within(() => {
             cy.getByTestId(stakeValidatorListTotalStake)
               .should('have.text', '3,002.00')
@@ -222,7 +222,7 @@ context(
               .and('be.visible');
           });
         cy.get(`[row-id="${1}"]`)
-          .eq(1)
+          .first()
           .within(() => {
             cy.getByTestId(stakeValidatorListTotalStake)
               .scrollIntoView()
@@ -262,10 +262,10 @@ context(
             '2'
           );
           waitForBeginningOfEpoch();
-          cy.getByTestId(stakeValidatorListStakePercentage).should(
+          cy.getByTestId(
-            'have.text',
+            stakeValidatorListStakePercentage,
-            '50.02%'
+            epochTimeout
-          );
+          ).should('have.text', '50.02%');
           navigateTo(navigation.validators);
           validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
         }
@@ -310,7 +310,9 @@ context(
         closeStakingDialog();
         navigateTo(navigation.validators);
         clickOnValidatorFromList(0);
-        cy.getByTestId(stakeRemoveStakeRadioButton, txTimeout).click();
+        cy.getByTestId(stakeRemoveStakeRadioButton, txTimeout).click({
+          force: true,
+        });
         cy.getByTestId(stakeTokenAmountInputBox).type('-0.1');
         cy.contains('Waiting for next epoch to start', epochTimeout);
         cy.getByTestId(stakeTokenSubmitButton)
@@ -331,7 +333,7 @@ context(
         closeStakingDialog();
         navigateTo(navigation.validators);
         clickOnValidatorFromList(0);
-        cy.getByTestId(stakeRemoveStakeRadioButton).click();
+        cy.getByTestId(stakeRemoveStakeRadioButton).click({ force: true });
         cy.getByTestId(stakeTokenAmountInputBox).type('4');
         cy.contains('Waiting for next epoch to start', epochTimeout);
         cy.getByTestId(stakeTokenSubmitButton)
@@ -422,7 +424,7 @@ context(
         validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
       });
 
-      it('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {
+      it.skip('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {
         // 1002-STKE-004
         stakingPageAssociateTokens('3');
         verifyUnstakedBalance(3.0);
@@ -436,7 +438,7 @@ context(
         verifyStakedBalance(7.0);
       });
 
-      it('Associating vesting contract tokens - when some already staked - auto stakes tokens to staked validator', function () {
+      it.skip('Associating vesting contract tokens - when some already staked - auto stakes tokens to staked validator', function () {
         // 1002-STKE-004
         stakingPageAssociateTokens('3', { type: 'contract' });
         verifyUnstakedBalance(3.0);
@@ -450,7 +452,7 @@ context(
         verifyStakedBalance(7.0);
       });
 
-      it('Associating vesting contract tokens - when wallet tokens already staked - auto stakes tokens to staked validator', function () {
+      it.skip('Associating vesting contract tokens - when wallet tokens already staked - auto stakes tokens to staked validator', function () {
         // 1002-STKE-004
         stakingPageAssociateTokens('3', { type: 'wallet' });
         verifyUnstakedBalance(3.0);
@@ -464,7 +466,7 @@ context(
         verifyStakedBalance(7.0);
       });
 
-      it('Associating tokens - with multiple validators already staked - auto stakes to staked validators - abiding by existing stake ratio', function () {
+      it.skip('Associating tokens - with multiple validators already staked - auto stakes to staked validators - abiding by existing stake ratio', function () {
         // 1002-STKE-004
         stakingPageAssociateTokens('6');
         verifyUnstakedBalance(6.0);

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

@@ -156,7 +156,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
         cy.getByTestId('subscription-cell').should('have.text', 'Yes');
       });
       cy.getByTestId('connect').should('be.disabled');
-      cy.getByTestId('node-url-custom').click();
+      cy.getByTestId('node-url-custom').click({ force: true });
       cy.get('input').should('exist');
       cy.getByTestId('connect').should('be.disabled');
       cy.getByTestId('icon-cross').click();

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

@@ -15,6 +15,7 @@ const proposalDocumentationLink = 'proposal-documentation-link';
 const connectToVegaWalletButton = 'connect-to-vega-wallet-btn';
 const governanceDocsUrl = 'https://vega.xyz/governance';
 const networkUpgradeProposalListItem = 'protocol-upgrade-proposals-list-item';
+const proposalUpgradeBlockHeight = 'protocol-upgrade-proposal-block-height';
 const closedProposals = 'closed-proposals';
 const closedProposalToggle = 'closed-proposals-toggle-networkUpgrades';
 const protocolUpgradeTime = 'protocol-upgrade-time';
@@ -73,25 +74,12 @@ context(
     });
 
     it('should be able to see a working link for - find out more about Vega governance', function () {
-      // 3001-VOTE-001
+      // 3001-VOTE-001  // 3002-PROP-001
       cy.getByTestId(proposalDocumentationLink)
         .should('be.visible')
         .and('have.text', 'Find out more about Vega governance')
         .and('have.attr', 'href')
         .and('equal', governanceDocsUrl);
-
-      // 3002-PROP-001
-      cy.request(governanceDocsUrl)
-        .its('body')
-        .then((body) => {
-          if (!body.includes('Govern the network')) {
-            assert.include(
-              body,
-              'Govern the network',
-              `Checking that governance link destination includes 'Govern the network' text`
-            );
-          }
-        });
     });
 
     // 3007-PNE-021
@@ -184,7 +172,7 @@ context(
               'have.text',
               'Vega release tag: v1'
             );
-            cy.getByTestId('protocol-upgrade-proposal-block-height').should(
+            cy.getByTestId(proposalUpgradeBlockHeight).should(
               'have.text',
               'Upgrade block height: 2015942'
             );
@@ -199,7 +187,15 @@ context(
       });
       cy.getByTestId(closedProposalToggle).click();
       cy.getByTestId(closedProposals).within(() => {
-        cy.getByTestId(networkUpgradeProposalListItem).should('have.length', 1);
+        cy.getByTestId(networkUpgradeProposalListItem).should('have.length', 2);
+        cy.getByTestId(networkUpgradeProposalListItem)
+          .first()
+          .within(() => {
+            cy.getByTestId(proposalUpgradeBlockHeight).should(
+              'contain.text',
+              '10001'
+            );
+          });
       });
     });
 

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

@@ -11,7 +11,6 @@ import {
   waitForBeginningOfEpoch,
 } from '../../support/staking.functions';
 import { previousEpochData } from '../../fixtures/mocks/previous-epoch';
-import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';
 
 const guideLink = 'staking-guide-link';
 const validatorTitle = 'validator-node-title';
@@ -38,17 +37,11 @@ const txTimeout = Cypress.env('txTimeout');
 
 context('Validators Page - verify elements on page', function () {
   before('navigate to validators page', () => {
-    cy.mockGQL((req) => {
+    cy.mockChainId();
-      aliasGQLQuery(req, 'ChainId', chainIdQuery());
-      aliasGQLQuery(req, 'Statistics', statisticsQuery());
-    });
     cy.visit('/validators');
   });
   beforeEach(() => {
-    cy.mockGQL((req) => {
+    cy.mockChainId();
-      aliasGQLQuery(req, 'ChainId', chainIdQuery());
-      aliasGQLQuery(req, 'Statistics', statisticsQuery());
-    });
   });
 
   describe('with wallets disconnected', { tags: '@smoke' }, function () {
@@ -189,10 +182,7 @@ context('Validators Page - verify elements on page', function () {
     { tags: '@smoke' },
     function () {
       before('connect wallets and click on validator', function () {
-        cy.mockGQL((req) => {
+        cy.mockChainId();
-          aliasGQLQuery(req, 'ChainId', chainIdQuery());
-          aliasGQLQuery(req, 'Statistics', statisticsQuery());
-        });
         cy.visit('/validators');
         cy.connectVegaWallet();
         clickOnValidatorFromList(0);

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

@@ -4,8 +4,6 @@ import {
   vegaWalletFaucetAssetsWithoutCheck,
   vegaWalletTeardown,
 } from '../../support/wallet-functions';
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';
 
 const walletContainer = 'aside [data-testid="vega-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
@@ -88,10 +86,7 @@ context(
 
     describe('when vega wallet connected', function () {
       before('connect vega wallet', function () {
-        cy.mockGQL((req) => {
+        cy.mockChainId();
-          aliasGQLQuery(req, 'ChainId', chainIdQuery());
-          aliasGQLQuery(req, 'Statistics', statisticsQuery());
-        });
         cy.visit('/');
         cy.wait('@ChainId');
         cy.connectVegaWallet();
@@ -276,10 +271,7 @@ context(
         ];
 
         before('faucet assets to connected vega wallet', function () {
-          cy.mockGQL((req) => {
+          cy.mockChainId();
-            aliasGQLQuery(req, 'ChainId', chainIdQuery());
-            aliasGQLQuery(req, 'Statistics', statisticsQuery());
-          });
           for (const { id, amount } of assets) {
             vegaWalletFaucetAssetsWithoutCheck(id, amount, vegaWalletPublicKey);
           }

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

@@ -54,6 +54,7 @@ export function submitUniqueRawProposal(proposalFields: {
   proposalBody?: string;
   proposalTitle?: string;
   proposalDescription?: string;
+  updateMarketId?: string;
   closingTimestamp?: number;
   enactmentTimestamp?: number;
   submit?: boolean;
@@ -71,6 +72,10 @@ 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 (
@@ -232,21 +237,25 @@ 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
 ) {
-  cy.contains(RowName)
+  getProposalDetailsValue(RowName).within(() => {
-    .parentsUntil(proposalInformationTableRows)
+    cy.contains(changeType).should('be.visible');
-    .parent()
+    cy.contains(newValue).should('be.visible');
-    .first()
+    if (oldValue) cy.contains(oldValue).should('have.class', 'line-through');
-    .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/index.js

@@ -9,8 +9,6 @@ import './wallet-functions.ts';
 import './proposal.functions.ts';
 import 'cypress-mochawesome-reporter/register';
 import registerCypressGrep from '@cypress/grep';
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';
 import { turnTelemetryOff } from './common.functions.ts';
 registerCypressGrep();
 
@@ -29,10 +27,7 @@ before(() => {
   // // Ensuring the telemetry modal doesn't disrupt the tests
   turnTelemetryOff();
   // Mock chainId fetch which happens on every page for wallet connection
-  cy.mockGQL((req) => {
+  cy.mockChainId();
-    aliasGQLQuery(req, 'ChainId', chainIdQuery());
-    aliasGQLQuery(req, 'Statistics', statisticsQuery());
-  });
   // Self stake validators so they are displayed
   cy.validatorsSelfDelegate();
 });

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

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

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

@@ -46,7 +46,7 @@ export function stakingValidatorPageAddStake(stake: string) {
 
 export function stakingValidatorPageRemoveStake(stake: string) {
   cy.highlight(`Removing a stake of ${stake}`);
-  cy.get(removeStakeRadioButton, epochTimeout).click();
+  cy.get(removeStakeRadioButton, epochTimeout).click({ force: true });
   cy.get(tokenAmountInputBox).type(stake);
   waitForBeginningOfEpoch();
   cy.get(tokenSubmitButton)
@@ -70,9 +70,13 @@ export function stakingPageAssociateTokens(
   cy.highlight(`Associating ${amount} tokens from ${type}`);
   cy.get(ethWalletAssociateButton).first().click();
   if (type === 'wallet') {
-    cy.get(associateWalletRadioButton, { timeout: 30000 }).click();
+    cy.get(associateWalletRadioButton, { timeout: 30000 }).click({
+      force: true,
+    });
   } else if (type === 'contract') {
-    cy.get(associateContractRadioButton, { timeout: 30000 }).click();
+    cy.get(associateContractRadioButton, { timeout: 30000 }).click({
+      force: true,
+    });
   } else {
     cy.highlight(`${type} is not association option`);
   }
@@ -170,21 +174,20 @@ export function clickOnValidatorFromList(
   validatorName = null
 ) {
   cy.contains('Loading...', epochTimeout).should('not.exist');
-  waitForBeginningOfEpoch();
   // below is to ensure validator list is shown
   cy.get(stakeValidatorListName, { timeout: 10000 }).should('exist');
   cy.get(stakeValidatorListPendingStake, txTimeout).should(
     'not.contain',
     '2,000,000,000,000,000,000.00' // number due to bug #936
   );
+  waitForBeginningOfEpoch();
   if (validatorName) {
     cy.contains(validatorName).click();
   } else {
     cy.get(`[row-id="${validatorNumber}"]`)
       .should('be.visible')
       .first()
-      .as('validatorOnList');
+      .click();
-    cy.get('@validatorOnList').click();
   }
 }
 
@@ -196,7 +199,7 @@ export function validateValidatorListTotalStakeAndShare(
   cy.contains('Loading...', epochTimeout).should('not.exist');
   waitForBeginningOfEpoch();
   cy.get(`[row-id="${positionOnList}"]`)
-    .eq(1)
+    .first()
     .within(() => {
       cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
         'have.text',

apps/governance/.env

@@ -8,6 +8,7 @@ NX_FAIRGROUND=false
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://governance.stagnet1.vega.rocks","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
@@ -32,3 +33,6 @@ 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
+NX_GOVERNANCE_TRANSFERS=false

apps/governance/.env.capsule

@@ -22,6 +22,8 @@ NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 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
+
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 
@@ -31,3 +33,5 @@ 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

@@ -19,7 +19,11 @@ NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fa
 
 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
+NX_PRODUCT_PERPETUALS=true
+NX_UPDATE_MARKET_STATE=true

apps/governance/.env.mainnet

@@ -16,10 +16,13 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.vega.community/api/v2/
 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-mainnet
-
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_TENDERMINT_URL=https://be.vega.community
 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

@@ -15,6 +15,7 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.mainnet-mirror.vega.rocks/api/v2/
 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-mainnet
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
@@ -22,3 +23,5 @@ 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

@@ -9,6 +9,8 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 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
@@ -19,3 +21,6 @@ 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
+NX_GOVERNANCE_TRANSFERS=true

apps/governance/.env.testnet

@@ -14,6 +14,8 @@ NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 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
@@ -24,3 +26,5 @@ 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

@@ -11,6 +11,7 @@ NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 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
@@ -21,3 +22,5 @@ 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

@@ -26,11 +26,11 @@ import {
 } from '@vegaprotocol/web3';
 import { Web3Provider } from '@vegaprotocol/web3';
 import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
+import { VegaWalletProvider } from '@vegaprotocol/wallet';
 import {
   useVegaTransactionManager,
   useVegaTransactionUpdater,
-  VegaWalletProvider,
+} from '@vegaprotocol/web3';
-} from '@vegaprotocol/wallet';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import {
@@ -308,7 +308,7 @@ const AppContainer = () => {
     <Router>
       <ScrollToTop />
       <AppStateProvider>
-        <div className="min-h-full text-white">
+        <div className="min-h-full text-white grid">
           <NodeGuard
             skeleton={<div>{t('Loading')}</div>}
             failure={

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

@@ -613,6 +613,9 @@
   "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",
@@ -705,10 +708,17 @@
   "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",
@@ -717,7 +727,11 @@
   "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",
@@ -874,5 +888,7 @@
   "HowToPropose": "How to make a proposal",
   "HowToProposeRawStep1": "1. Sense check your proposal with the community on the forum:",
   "HowToProposeRawStep2": "2. Use the appropriate proposal template in the docs:",
-  "HowToProposeRawStep3": "3. Submit on-chain below"
+  "HowToProposeRawStep3": "3. Submit on-chain below",
+  "proposalTransferDetails": "New governance transfer details",
+  "proposalCancelTransferDetails": "Cancel governance transfer details"
 }

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 } from '@vegaprotocol/environment';
+import { ExternalLinks, FLAGS } from '@vegaprotocol/environment';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { useNodesQuery } from '../staking/home/__generated__/Nodes';
 import { useProposalsQuery } from '../proposals/proposals/__generated__/Proposals';
@@ -23,7 +23,6 @@ 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';
@@ -32,6 +31,7 @@ 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,13 +39,13 @@ const HomeProposals = ({
   proposals,
   protocolUpgradeProposals,
 }: {
-  proposals: ProposalFieldsFragment[];
+  proposals: ProposalQuery['proposal'][];
   protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
 }) => {
   const { t } = useTranslation();
 
   return (
-    <section className="mb-16" data-testid="home-proposals">
+    <section className="mb-16 break-all" data-testid="home-proposals">
       <Heading title={t('vegaGovernance')} />
       <h3 className="mb-6">{t('homeProposalsIntro')}</h3>
       <div className="mb-8">
@@ -60,9 +60,12 @@ const HomeProposals = ({
           <ProtocolUpgradeProposalsListItem key={index} proposal={proposal} />
         ))}
 
-        {proposals.map((proposal) => (
+        {proposals.map(
-          <ProposalsListItem key={proposal.id} proposal={proposal} />
+          (proposal) =>
-        ))}
+            proposal?.id && (
+              <ProposalsListItem key={proposal.id} proposal={proposal} />
+            )
+        )}
       </ul>
 
       <div className="mt-6">
@@ -182,6 +185,10 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
     pollInterval: 5000,
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',
+    variables: {
+      includeNewMarketProductFields: !!FLAGS.PRODUCT_PERPETUALS,
+      includeUpdateMarketStates: !!FLAGS.UPDATE_MARKET_STATE,
+    },
   });
 
   const {
@@ -206,7 +213,9 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
   const proposals = useMemo(
     () =>
       proposalsData
-        ? getNotRejectedProposals(proposalsData.proposalsConnection)
+        ? getNotRejectedProposals(
+            removePaginationWrapper(proposalsData.proposalsConnection?.edges)
+          )
         : [],
     [proposalsData]
   );

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

@@ -3,24 +3,28 @@ 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';
 import { ProposalInfoLabel } from '../proposal-info-label';
-import { useSuccessorMarketProposalDetails } from '@vegaprotocol/proposals';
+import {
+  useCancelTransferProposalDetails,
+  useNewTransferProposalDetails,
+  useSuccessorMarketProposalDetails,
+} from '@vegaprotocol/proposals';
 import { FLAGS } from '@vegaprotocol/environment';
 import Routes from '../../../routes';
 import { Link } from 'react-router-dom';
 import type { VoteState } from '../vote-details/use-user-vote';
 import { VoteBreakdown } from '../vote-breakdown';
+import { GovernanceTransferKindMapping } from '@vegaprotocol/types';
 
 export const ProposalHeader = ({
   proposal,
   isListItem = true,
   voteState,
 }: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  proposal: ProposalQuery['proposal'];
   isListItem?: boolean;
   voteState?: VoteState | null;
 }) => {
@@ -37,7 +41,10 @@ export const ProposalHeader = ({
 
   switch (change?.__typename) {
     case 'NewMarket': {
-      proposalType = 'NewMarket';
+      proposalType =
+        FLAGS.PRODUCT_PERPETUALS && change?.instrument?.product?.__typename
+          ? `NewMarket${change?.instrument?.product?.__typename}`
+          : 'NewMarket';
       fallbackTitle = t('NewMarketProposal');
       details = (
         <>
@@ -61,12 +68,31 @@ 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('Market change')}:</span>{' '}
+          <span>{t('MarketChange')}:</span>{' '}
           <span>{truncateMiddle(change.marketId)}</span>
         </>
       );
@@ -126,6 +152,20 @@ export const ProposalHeader = ({
       );
       break;
     }
+    case 'NewTransfer':
+      proposalType = 'NewTransfer';
+      fallbackTitle = t('NewTransferProposal');
+      details = FLAGS.GOVERNANCE_TRANSFERS ? (
+        <NewTransferSummary proposalId={proposal?.id} />
+      ) : null;
+      break;
+    case 'CancelTransfer':
+      proposalType = 'CancelTransfer';
+      fallbackTitle = t('CancelTransferProposal');
+      details = FLAGS.GOVERNANCE_TRANSFERS ? (
+        <CancelTransferSummary proposalId={proposal?.id} />
+      ) : null;
+      break;
   }
 
   return (
@@ -203,3 +243,36 @@ const SuccessorCode = ({ proposalId }: { proposalId?: string | null }) => {
     </span>
   ) : null;
 };
+
+const NewTransferSummary = ({ proposalId }: { proposalId?: string | null }) => {
+  const { t } = useTranslation();
+  const details = useNewTransferProposalDetails(proposalId);
+
+  if (!details) return null;
+
+  return (
+    <span>
+      {GovernanceTransferKindMapping[details.kind.__typename]}{' '}
+      {t('transfer from')} <Lozenge>{truncateMiddle(details.source)}</Lozenge>{' '}
+      {t('to')} <Lozenge>{truncateMiddle(details.destination)}</Lozenge>
+    </span>
+  );
+};
+
+const CancelTransferSummary = ({
+  proposalId,
+}: {
+  proposalId?: string | null;
+}) => {
+  const { t } = useTranslation();
+  const details = useCancelTransferProposalDetails(proposalId);
+
+  if (!details) return null;
+
+  return (
+    <span>
+      {t('Cancel transfer: ')}{' '}
+      <Lozenge>{truncateMiddle(details.transferId)}</Lozenge>
+    </span>
+  );
+};

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

@@ -6,6 +6,7 @@ import {
   KeyDetailsInfoPanel,
   LiquidityMonitoringParametersInfoPanel,
   LiquidityPriceRangeInfoPanel,
+  LiquiditySLAParametersInfoPanel,
   MetadataInfoPanel,
   OracleInfoPanel,
   PriceMonitoringBoundsInfoPanel,
@@ -13,6 +14,10 @@ import {
   RiskModelInfoPanel,
   RiskParametersInfoPanel,
   SettlementAssetInfoPanel,
+  getDataSourceSpecForSettlementSchedule,
+  getDataSourceSpecForSettlementData,
+  getDataSourceSpecForTradingTermination,
+  getSigners,
 } from '@vegaprotocol/markets';
 import {
   Button,
@@ -24,7 +29,6 @@ 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 = {
@@ -59,20 +63,31 @@ export const ProposalMarketData = ({
     return null;
   }
 
-  const settlementData = marketData.tradableInstrument.instrument.product
+  const { product } = marketData.tradableInstrument.instrument;
-    .dataSourceSpecForSettlementData.data as DataSourceDefinition;
+
+  const settlementData = getDataSourceSpecForSettlementData(product);
+  const settlementScheduleData =
+    getDataSourceSpecForSettlementSchedule(product);
+  const terminationData = getDataSourceSpecForTradingTermination(product);
+
+  const parentProduct = parentMarketData?.tradableInstrument.instrument.product;
   const parentSettlementData =
-    parentMarketData?.tradableInstrument.instrument?.product
+    parentProduct && getDataSourceSpecForSettlementData(parentProduct);
-      ?.dataSourceSpecForSettlementData?.data;
+  const parentSettlementScheduleData =
-  const terminationData = marketData.tradableInstrument.instrument.product
+    parentProduct && getDataSourceSpecForSettlementSchedule(parentProduct);
-    .dataSourceSpecForTradingTermination.data as DataSourceDefinition;
   const parentTerminationData =
-    parentMarketData?.tradableInstrument.instrument?.product
+    parentProduct && getDataSourceSpecForTradingTermination(parentProduct);
-      ?.dataSourceSpecForTradingTermination?.data;
+
+  // TODO add settlementScheduleData for Perp Proposal
 
   const isParentSettlementDataEqual =
     parentSettlementData !== undefined &&
     isEqual(settlementData, parentSettlementData);
+
+  const isParentSettlementScheduleDataEqual =
+    parentSettlementData !== undefined &&
+    isEqual(settlementScheduleData, parentSettlementScheduleData);
+
   const isParentTerminationDataEqual =
     parentTerminationData !== undefined &&
     isEqual(terminationData, parentTerminationData);
@@ -85,20 +100,6 @@ 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
@@ -129,10 +130,9 @@ export const ProposalMarketData = ({
               parentMarket={parentMarketData}
             />
 
-            {isEqual(
+            {settlementData &&
-              getSigners(settlementData),
+            terminationData &&
-              getSigners(terminationData)
+            isEqual(getSigners(settlementData), getSigners(terminationData)) ? (
-            ) ? (
               <>
                 <h2 className={marketDataHeaderStyles}>{t('Oracle')}</h2>
 
@@ -140,14 +140,17 @@ export const ProposalMarketData = ({
                   market={marketData}
                   type="settlementData"
                   parentMarket={
-                    isParentSettlementDataEqual ? undefined : parentMarketData
+                    isParentSettlementDataEqual ||
+                    isParentSettlementScheduleDataEqual
+                      ? undefined
+                      : parentMarketData
                   }
                 />
               </>
             ) : (
               <>
                 <h2 className={marketDataHeaderStyles}>
-                  {t('Settlement Oracle')}
+                  {t('Settlement oracle')}
                 </h2>
                 <OracleInfoPanel
                   market={marketData}
@@ -157,16 +160,41 @@ export const ProposalMarketData = ({
                   }
                 />
 
-                <h2 className={marketDataHeaderStyles}>
+                {marketData.tradableInstrument.instrument.product.__typename ===
-                  {t('Termination Oracle')}
+                  'Future' && (
-                </h2>
+                  <div>
-                <OracleInfoPanel
+                    <h2 className={marketDataHeaderStyles}>
-                  market={marketData}
+                      {t('Termination oracle')}
-                  type="termination"
+                    </h2>
-                  parentMarket={
+                    <OracleInfoPanel
-                    isParentTerminationDataEqual ? undefined : parentMarketData
+                      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>
+                )}
               </>
             )}
 
@@ -244,7 +272,6 @@ export const ProposalMarketData = ({
               market={marketData}
               parentMarket={parentMarketData}
             />
-
             <h2 className={marketDataHeaderStyles}>
               {t('Liquidity price range')}
             </h2>
@@ -252,6 +279,14 @@ 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-transfer/index.ts

@@ -0,0 +1,2 @@
+export * from './proposal-transfer-details';
+export * from './proposal-cancel-transfer-details';

apps/governance/src/routes/proposals/components/proposal-transfer/proposal-cancel-transfer-details.tsx

@@ -0,0 +1,37 @@
+import { useTranslation } from 'react-i18next';
+import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
+import { useCancelTransferProposalDetails } from '@vegaprotocol/proposals';
+import {
+  KeyValueTable,
+  KeyValueTableRow,
+  RoundedWrapper,
+} from '@vegaprotocol/ui-toolkit';
+import { SubHeading } from '../../../../components/heading';
+
+export const ProposalCancelTransferDetails = ({
+  proposal,
+}: {
+  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+}) => {
+  const { t } = useTranslation();
+  const details = useCancelTransferProposalDetails(proposal?.id);
+
+  if (!details) {
+    return null;
+  }
+
+  return (
+    <>
+      <SubHeading title={t('proposalCancelTransferDetails')} />
+      <RoundedWrapper paddingBottom={true}>
+        <KeyValueTable data-testid="proposal-cancel-transfer-details-table">
+          <KeyValueTableRow noBorder={true}>
+            {t('transferId')}
+            {details.transferId}
+          </KeyValueTableRow>
+        </KeyValueTable>
+      </RoundedWrapper>
+    </>
+  );
+};

apps/governance/src/routes/proposals/components/proposal-transfer/proposal-transfer-details.tsx

@@ -0,0 +1,145 @@
+import { useState } from 'react';
+import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
+import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
+import { SubHeading } from '../../../../components/heading';
+import { useTranslation } from 'react-i18next';
+import {
+  KeyValueTable,
+  KeyValueTableRow,
+  RoundedWrapper,
+  Tooltip,
+} from '@vegaprotocol/ui-toolkit';
+import { useNewTransferProposalDetails } from '@vegaprotocol/proposals';
+import {
+  AccountTypeMapping,
+  DescriptionGovernanceTransferTypeMapping,
+  GovernanceTransferKindMapping,
+  GovernanceTransferTypeMapping,
+} from '@vegaprotocol/types';
+import {
+  addDecimalsFormatNumberQuantum,
+  formatDateWithLocalTimezone,
+} from '@vegaprotocol/utils';
+
+export const ProposalTransferDetails = ({
+  proposal,
+}: {
+  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+}) => {
+  const { t } = useTranslation();
+  const [show, setShow] = useState(false);
+
+  const details = useNewTransferProposalDetails(proposal?.id);
+  if (!details) {
+    return null;
+  }
+
+  return (
+    <>
+      <CollapsibleToggle
+        toggleState={show}
+        setToggleState={setShow}
+        dataTestId="proposal-transfer-details"
+      >
+        <SubHeading title={t('proposalTransferDetails')} />
+      </CollapsibleToggle>
+      {show && (
+        <RoundedWrapper paddingBottom={true}>
+          <KeyValueTable data-testid="proposal-transfer-details-table">
+            {/* The source account */}
+            <KeyValueTableRow>
+              {t('Source')}
+              {details.source}
+            </KeyValueTableRow>
+
+            {/* The type of source account */}
+            <KeyValueTableRow>
+              {t('Source Type')}
+              {AccountTypeMapping[details.sourceType]}
+            </KeyValueTableRow>
+
+            {/* The destination account */}
+            <KeyValueTableRow>
+              {t('Destination')}
+              {details.destination}
+            </KeyValueTableRow>
+
+            {/* The type of destination account */}
+            <KeyValueTableRow>
+              {t('Destination Type')}
+              {AccountTypeMapping[details.destinationType]}
+            </KeyValueTableRow>
+
+            {/* The asset to transfer */}
+            <KeyValueTableRow>
+              {t('Asset')}
+              {details.asset.symbol}
+            </KeyValueTableRow>
+
+            {/*The fraction of the balance to be transfer */}
+            <KeyValueTableRow>
+              {t('Fraction Of Balance')}
+              {`${Number(details.fraction_of_balance) * 100}%`}
+            </KeyValueTableRow>
+
+            {/* The maximum amount to be transferred */}
+            <KeyValueTableRow>
+              {t('Amount')}
+              {addDecimalsFormatNumberQuantum(
+                details.amount,
+                details.asset.decimals,
+                details.asset.quantum
+              )}
+            </KeyValueTableRow>
+
+            {/* The type of the governance transfer */}
+            <KeyValueTableRow>
+              {t('Transfer Type')}
+              <Tooltip
+                description={
+                  DescriptionGovernanceTransferTypeMapping[details.transferType]
+                }
+              >
+                <span>
+                  {GovernanceTransferTypeMapping[details.transferType]}
+                </span>
+              </Tooltip>
+            </KeyValueTableRow>
+
+            {/* The type of governance transfer being made, i.e. a one-off or recurring trans */}
+            <KeyValueTableRow>
+              {t('Kind')}
+              {GovernanceTransferKindMapping[details.kind.__typename]}
+            </KeyValueTableRow>
+
+            {details.kind.__typename === 'OneOffGovernanceTransfer' &&
+              details.kind.deliverOn && (
+                <KeyValueTableRow noBorder={true}>
+                  {t('Deliver On')}
+                  {formatDateWithLocalTimezone(
+                    new Date(details.kind.deliverOn)
+                  )}
+                </KeyValueTableRow>
+              )}
+
+            {details.kind.__typename === 'RecurringGovernanceTransfer' && (
+              <>
+                <KeyValueTableRow noBorder={!details.kind.endEpoch}>
+                  {t('Start On')}
+                  <span>{details.kind.startEpoch}</span>
+                </KeyValueTableRow>
+                {details.kind.endEpoch && (
+                  <KeyValueTableRow noBorder={true}>
+                    {t('End on')}
+                    {details.kind.endEpoch}
+                  </KeyValueTableRow>
+                )}
+              </>
+            )}
+          </KeyValueTable>
+        </RoundedWrapper>
+      )}
+    </>
+  );
+};

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

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

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

@@ -0,0 +1,123 @@
+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

@@ -0,0 +1,84 @@
+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,26 @@ 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';
+import {
+  ProposalCancelTransferDetails,
+  ProposalTransferDetails,
+} from '../proposal-transfer';
+import { FLAGS } from '@vegaprotocol/environment';
 
 export interface ProposalProps {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  proposal: ProposalQuery['proposal'];
   networkParams: Partial<NetworkParamsResult>;
-  newMarketData?: MarketInfo | null;
+  marketData?: MarketInfo | null;
   parentMarketData?: MarketInfo | null;
   assetData?: AssetQuery | null;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -39,7 +44,7 @@ export const Proposal = ({
   proposal,
   networkParams,
   restData,
-  newMarketData,
+  marketData,
   parentMarketData,
   assetData,
   originalMarketProposalRestData,
@@ -74,14 +79,15 @@ 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;
@@ -98,9 +104,37 @@ export const Proposal = ({
         minVoterBalance =
           networkParams.governance_proposal_freeform_minVoterBalance;
         break;
+      case 'NewTransfer':
+        // TODO: check minVoterBalance for 'NewTransfer'
+        minVoterBalance =
+          networkParams.governance_proposal_freeform_minVoterBalance;
+        break;
+      case 'CancelTransfer':
+        // TODO: check minVoterBalance for 'CancelTransfer'
+        minVoterBalance =
+          networkParams.governance_proposal_freeform_minVoterBalance;
     }
   }
 
+  // Show governance transfer details only if the GOVERNANCE_TRANSFERS flag is on.
+  const governanceTransferDetails = FLAGS.GOVERNANCE_TRANSFERS && (
+    <>
+      {proposal.terms.change.__typename === 'NewTransfer' && (
+        /** Governance New Transfer Details */
+        <div className="mb-4">
+          <ProposalTransferDetails proposal={proposal} />
+        </div>
+      )}
+
+      {proposal.terms.change.__typename === 'CancelTransfer' && (
+        /** Governance Cancel Transfer Details */
+        <div className="mb-4">
+          <ProposalCancelTransferDetails proposal={proposal} />
+        </div>
+      )}
+    </>
+  );
+
   return (
     <section data-testid="proposal">
       <div className="flex items-center gap-1 mb-6">
@@ -127,7 +161,7 @@ export const Proposal = ({
         voteState={voteState}
       />
 
-      <div className="my-10">
+      <div className="my-10 break-all">
         <ProposalChangeTable proposal={proposal} />
       </div>
 
@@ -145,15 +179,21 @@ export const Proposal = ({
         <ProposalDescription description={proposal.rationale.description} />
       </div>
 
-      {newMarketData && (
+      {marketData && (
         <div className="mb-4">
           <ProposalMarketData
-            marketData={newMarketData}
+            marketData={marketData}
             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
@@ -180,6 +220,8 @@ export const Proposal = ({
           </div>
         )}
 
+      {governanceTransferDetails}
+
       <div className="mb-10">
         <RoundedWrapper paddingBottom={true}>
           <UserVote

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

@@ -2,11 +2,10 @@ 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?: ProposalFieldsFragment | ProposalQuery['proposal'] | null;
+  proposal?: 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<ProposalFieldsFragment | ProposalQuery['proposal']>;
+  proposals: Array<ProposalQuery['proposal']>;
   protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
   lastBlockHeight?: string;
 }
 
 interface SortedProposalsProps {
-  open: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
+  open: ProposalQuery['proposal'][];
-  closed: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
+  closed: ProposalQuery['proposal'][];
 }
 
 interface SortedProtocolUpgradeProposalsProps {
@@ -31,7 +31,7 @@ interface SortedProtocolUpgradeProposalsProps {
   closed: ProtocolUpgradeProposalFieldsFragment[];
 }
 
-export const orderByDate = (arr: ProposalFieldsFragment[]) =>
+export const orderByDate = (arr: ProposalQuery['proposal'][]) =>
   orderBy(
     arr,
     [
@@ -92,12 +92,12 @@ export const ProposalsList = ({
     return {
       open:
         initialSorting.open.length > 0
-          ? orderByDate(initialSorting.open as ProposalFieldsFragment[])
+          ? orderByDate(initialSorting.open as ProposalQuery['proposal'][])
           : [],
       closed:
         initialSorting.closed.length > 0
           ? orderByDate(
-              initialSorting.closed as ProposalFieldsFragment[]
+              initialSorting.closed as ProposalQuery['proposal'][]
             ).reverse()
           : [],
     };

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

@@ -3,20 +3,17 @@ 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: Array<ProposalQuery['proposal'] | ProposalFieldsFragment>;
+  proposals: ProposalQuery['proposal'][];
 }
 
 export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
   const { t } = useTranslation();
   const [filterString, setFilterString] = useState('');
 
-  const filterPredicate = (
+  const filterPredicate = (p: ProposalQuery['proposal']) =>
-    p: ProposalFieldsFragment | ProposalQuery['proposal']
-  ) =>
     p?.id?.includes(filterString) ||
     p?.party?.id?.toString().includes(filterString);
 

apps/governance/src/routes/proposals/components/propose/proposal-form-transaction-dialog.tsx

@@ -4,7 +4,7 @@ import {
   getProposalDialogTitle,
 } from '@vegaprotocol/proposals';
 import type { ProposalEventFieldsFragment } from '@vegaprotocol/proposals';
-import type { DialogProps } from '@vegaprotocol/wallet';
+import type { DialogProps } from '@vegaprotocol/proposals';
 
 interface ProposalFormTransactionDialogProps {
   finalizedProposal: ProposalEventFieldsFragment | null;

apps/governance/src/routes/proposals/components/vote-details/user-vote.tsx

@@ -6,7 +6,7 @@ import { ConnectToVega } from '../../../../components/connect-to-vega';
 import { VoteButtonsContainer } from './vote-buttons';
 import { SubHeading } from '../../../../components/heading';
 import type { VoteValue } from '@vegaprotocol/types';
-import type { DialogProps, VegaTxState } from '@vegaprotocol/wallet';
+import type { DialogProps, VegaTxState } from '@vegaprotocol/proposals';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { VoteState } from './use-user-vote';

apps/governance/src/routes/proposals/components/vote-details/vega-transaction-dialog.spec.tsx

@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { VoteTransactionDialog } from './vote-transaction-dialog';
 import { VoteState } from './use-user-vote';
-import { VegaTxStatus } from '@vegaprotocol/wallet';
+import { VegaTxStatus } from '@vegaprotocol/proposals';
 
 describe('VoteTransactionDialog', () => {
   const mockTransactionDialog = jest.fn(({ title, content }) => (