chore: remove closed markets

Co-authored-by: Madalina Raicu <madalina@raygroup.uk>

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

@@ -5,6 +5,7 @@ on:
     branches:
       - release/*
       - develop
+      - main
   pull_request:
     types:
       - opened
@@ -178,10 +179,33 @@ jobs:
   #   with:
   #     github-sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
-  cypress:
+  check-e2e-needed:
+    runs-on: ubuntu-latest
     needs: build-sources
+    name: '(CI) check if e2e needed'
+    outputs:
+      run-tests: ${{ steps.check-test.outputs.e2e-needed }}
+    steps:
+      - name: Check branch
+        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, 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:

.github/workflows/cypress-run.yml

@@ -21,11 +21,11 @@ jobs:
       - name: Check branch
         id: step
         run: |
-          if [ ${{ github.base_ref }} == 'main' ]; then
+          if [[ "${{ github.base_ref }}" == "main" ]]; then
             echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [ ${{ github.base_ref }} == 'develop' ] && [ ${{ github.ref_name }} == 'main' ]; then
+          elif [[ "${{ github.base_ref }}" == "develop" && "${{ github.ref_name }}" == "main" ]]; then
             echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [ ${{ github.event_name }} == 'push' ] && [ ${{ contains(github.ref_name, 'release/mainnet') }} ]; then
+          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
@@ -85,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/publish-dist.yml

@@ -63,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
 
@@ -195,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' || env.IS_MAIN_IMAGE == 'true && main' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }}
 
       - name: Publish dist as docker image (ghcr - retry)
         uses: docker/build-push-action@v3
@@ -222,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' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true && main' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }}
 
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3

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/__generated__/Oracles.ts

@@ -5,19 +5,19 @@ import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
 
-export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec' } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
+export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: '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?: 'EthCallSpec' } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };
+export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: '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?: 'EthCallSpec' } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };
+export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: '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/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/governance-e2e/.env

@@ -22,6 +22,7 @@ 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/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/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/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,85 +0,0 @@
-{
-  "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/integration/flow/proposal-details.cy.ts

@@ -60,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 () {
@@ -298,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)
@@ -309,14 +317,9 @@ describe(
             cy.getByTestId(viewProposalButton).click();
           });
       });
-      getProposalInformationFromTable('ID')
-        .invoke('text')
-        .as('parentMarketId')
-        .then(() => {
-          cy.VegaWalletSubmitProposal(
-            createSuccessorMarketProposalTxBody(this.parentMarketId)
-          );
-        });
+      cy.VegaWalletSubmitProposal(
+        createSuccessorMarketProposalTxBody(this.parentMarketId)
+      );
       navigateTo(navigation.proposals);
       cy.reload();
       getProposalFromTitle('Test successor market proposal details').within(
@@ -434,5 +437,87 @@ describe(
         'Minimum Probability Of Trading LP Orders'
       ).should('contain.text', '1e-8');
     });
+
+    it('Able to see suspended market proposal', function () {
+      const proposalPath = 'src/fixtures/proposals/suspend-market-raw.json';
+      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
+      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
+      submitUniqueRawProposal({
+        proposalBody: proposalPath,
+        updateMarketId: this.parentMarketId,
+        enactmentTimestamp: enactmentTimestamp,
+        closingTimestamp: closingTimestamp,
+      });
+      getProposalFromTitle('Market suspended test').within(() => {
+        cy.getByTestId(marketProposalType).should(
+          'have.text',
+          'Suspend market'
+        );
+        cy.getByTestId(viewProposalButton).click();
+      });
+      cy.getByTestId(marketProposalType).should('have.text', 'Suspend market');
+      cy.getByTestId(marketDataToggle).click();
+      cy.getByTestId('proposal-update-market-state').within(() => {
+        getProposalInformationFromTable('Market ID')
+          .invoke('text')
+          .and('eq', this.parentMarketId);
+      });
+    });
+
+    it('Able to see resume market proposal', function () {
+      const proposalPath = 'src/fixtures/proposals/resume-market-raw.json';
+      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
+      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
+      submitUniqueRawProposal({
+        proposalBody: proposalPath,
+        updateMarketId: this.parentMarketId,
+        enactmentTimestamp: enactmentTimestamp,
+        closingTimestamp: closingTimestamp,
+      });
+      getProposalFromTitle('Market resume test').within(() => {
+        cy.getByTestId(marketProposalType).should('have.text', 'Resume market');
+        cy.getByTestId(viewProposalButton).click();
+      });
+      cy.getByTestId(marketProposalType).should('have.text', 'Resume market');
+      cy.getByTestId(marketDataToggle).click();
+      cy.getByTestId('proposal-update-market-state').within(() => {
+        getProposalInformationFromTable('Market ID')
+          .invoke('text')
+          .and('eq', this.parentMarketId);
+      });
+    });
+
+    it('Able to see terminate market proposal', function () {
+      const proposalPath = 'src/fixtures/proposals/terminate-market-raw.json';
+      const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
+      const closingTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
+      submitUniqueRawProposal({
+        proposalBody: proposalPath,
+        updateMarketId: this.parentMarketId,
+        enactmentTimestamp: enactmentTimestamp,
+        closingTimestamp: closingTimestamp,
+      });
+      getProposalFromTitle('Market terminate test').within(() => {
+        cy.getByTestId(marketProposalType).should(
+          'have.text',
+          'Terminate market'
+        );
+        cy.getByTestId(viewProposalButton).click();
+      });
+      cy.getByTestId(marketProposalType).should(
+        'have.text',
+        'Terminate market'
+      );
+      cy.getByTestId(marketDataToggle).click();
+      cy.getByTestId('proposal-update-market-state').within(() => {
+        getProposalInformationFromTable('Market ID')
+          .invoke('text')
+          .and('eq', this.parentMarketId);
+        getProposalDetailsValue('Termination Price').should(
+          'contain.text',
+          '0.001 fUSDC'
+        );
+      });
+    });
   }
 );

apps/governance-e2e/src/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 (

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
 
@@ -34,3 +35,4 @@ NX_SUCCESSOR_MARKETS=true
 NX_METAMASK_SNAPS=true
 NX_PRODUCT_PERPETUALS=false
 NX_UPDATE_MARKET_STATE=false
+NX_GOVERNANCE_TRANSFERS=false

apps/governance/.env.mainnet

@@ -17,7 +17,7 @@ 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
 

apps/governance/.env.stagnet1

@@ -10,6 +10,7 @@ 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
@@ -22,3 +23,4 @@ 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

@@ -15,6 +15,7 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 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

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

@@ -888,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/proposals/components/proposal-detail-header/proposal-header.tsx

@@ -7,12 +7,17 @@ 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,
@@ -147,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 (
@@ -224,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-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/proposal.tsx

@@ -20,6 +20,11 @@ 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: ProposalQuery['proposal'];
@@ -99,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">
@@ -187,6 +220,8 @@ export const Proposal = ({
           </div>
         )}
 
+      {governanceTransferDetails}
+
       <div className="mb-10">
         <RoundedWrapper paddingBottom={true}>
           <UserVote

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

@@ -11,60 +11,8 @@ describe('accounts', { tags: '@smoke' }, () => {
     cy.visit('/#/markets/market-0');
   });
 
-  it('renders accounts', () => {
-    // 7001-COLL-001
-    // 7001-COLL-002
-    // 7001-COLL-003
-    // 7001-COLL-004
-    // 7001-COLL-005
-    // 7001-COLL-006
-    // 7001-COLL-007
-    // 1003-TRAN-001
-    // 7001-COLL-012
-
-    const tradingAccountRowId = '[row-id="t-0"]';
-    cy.getByTestId('Collateral').click();
-
-    cy.getByTestId('tab-accounts').should('be.visible');
-
-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[col-id="asset.symbol"]')
-      .should('have.text', 'AST0');
-
-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[col-id="used"]')
-      .should('have.text', '1.01' + '1.00%');
-
-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[col-id="available"]')
-      .should('have.text', '100.00');
-
-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[col-id="total"]')
-      .should('have.text', '101.01');
-
-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[col-id="accounts-actions"]')
-      .should('have.text', '');
-
-    cy.getByTestId('tab-accounts')
-      .get('[col-id="accounts-actions"]')
-      .find('[data-testid="dropdown-menu"]')
-      .eq(1)
-      .click();
-    cy.getByTestId('deposit').should('be.visible');
-    cy.getByTestId('withdraw').should('be.visible');
-    cy.getByTestId('transfer').should('be.visible');
-    cy.getByTestId('breakdown').should('be.visible');
-    cy.getByTestId('Collateral').click({ force: true });
-  });
-
   it('should open usage breakdown dialog when clicked on used', () => {
+    cy.getByTestId('Collateral').click();
     // 7001-COLL-009
     cy.get('[col-id="used"]').contains('1.01').click();
     const headers = ['Market', 'Account type', 'Balance', 'Margin health'];

apps/trading/.env

@@ -12,6 +12,7 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_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

apps/trading/.env.devnet

@@ -15,6 +15,7 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true

apps/trading/.env.mainnet

@@ -16,6 +16,7 @@ NX_VEGA_CONSOLE_URL=https://console.vega.xyz
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-mainnet/codfcglpplgmmlokgilfkpcjnmkbfiel
 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
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true

apps/trading/.env.stagnet1

@@ -16,7 +16,7 @@ NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true

apps/trading/.env.testnet

@@ -17,6 +17,7 @@ NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true

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

@@ -0,0 +1,5 @@
+import MarketPage from '../market';
+
+export const ClosedMarketPage = () => {
+  return <MarketPage closed />;
+};

apps/trading/client-pages/closed-market/index.ts

@@ -0,0 +1 @@
+export { ClosedMarketPage as default } from './closed-market';

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

@@ -9,9 +9,10 @@ import { useGlobalStore, usePageTitleStore } from '../../stores';
 import { TradeGrid } from './trade-grid';
 import { TradePanels } from './trade-panels';
 import { useNavigate, useParams } from 'react-router-dom';
-import { Links } from '../../lib/links';
+import { Links, Routes } from '../../lib/links';
 import { ViewType, useSidebar } from '../../components/sidebar';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
+import { MarketState } from '@vegaprotocol/types';
 
 const calculatePrice = (markPrice?: string, decimalPlaces?: number) => {
   return markPrice && decimalPlaces
@@ -56,7 +57,7 @@ const TitleUpdater = ({
   return null;
 };
 
-export const MarketPage = () => {
+export const MarketPage = ({ closed }: { closed?: boolean }) => {
   const { marketId } = useParams();
   const navigate = useNavigate();
   const currentRouteId = useGetCurrentRouteId();
@@ -70,16 +71,33 @@ export const MarketPage = () => {
   const { data, error, loading } = useMarket(marketId);
 
   useEffect(() => {
-    if (data?.id && data.id !== lastMarketId) {
+    if (
+      data?.state &&
+      [
+        MarketState.STATE_SETTLED,
+        MarketState.STATE_TRADING_TERMINATED,
+      ].includes(data.state) &&
+      currentRouteId !== Routes.CLOSED_MARKETS &&
+      marketId
+    ) {
+      navigate(Links.CLOSED_MARKETS(marketId));
+    }
+  }, [data?.state, currentRouteId, navigate, marketId]);
+
+  useEffect(() => {
+    if (data?.id && data.id !== lastMarketId && !closed) {
       update({ marketId: data.id });
     }
-  }, [update, lastMarketId, data?.id]);
+  }, [update, lastMarketId, data?.id, closed]);
 
   useEffect(() => {
     if (largeScreen && view === undefined) {
-      setViews({ type: ViewType.Order }, currentRouteId);
+      setViews(
+        { type: closed ? ViewType.Info : ViewType.Order },
+        currentRouteId
+      );
     }
-  }, [setViews, view, currentRouteId, largeScreen]);
+  }, [setViews, view, currentRouteId, largeScreen, closed]);
 
   const pinnedAsset = data && getAsset(data);
 

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

@@ -136,7 +136,7 @@ const MainGrid = memo(
                 </Tab>
               ) : null}
               <Tab id="fills" name={t('Fills')}>
-                <TradingViews.fills.component marketId={marketId} />
+                <TradingViews.fills.component />
               </Tab>
               <Tab
                 id="accounts"

apps/trading/client-pages/markets/closed.spec.tsx

@@ -1,4 +1,4 @@
-import { act, render, screen, within } from '@testing-library/react';
+import { act, render, screen, waitFor, within } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import { Closed } from './closed';
 import { MarketStateMapping, PropertyKeyType } from '@vegaprotocol/types';
@@ -300,9 +300,11 @@ describe('Closed', () => {
       ].includes(m.node.state);
     });
 
-    // check rows length is correct
-    const rows = container.getAllByRole('row');
-    expect(rows).toHaveLength(expectedRows.length);
+    await waitFor(() => {
+      // check rows length is correct
+      const rows = container.getAllByRole('row');
+      expect(rows).toHaveLength(expectedRows.length);
+    });
 
     // check that only included ids are shown
     const cells = screen

apps/trading/client-pages/markets/closed.tsx

@@ -22,6 +22,8 @@ import { SettlementPriceCell } from './settlement-price-cell';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { MarketCodeCell } from './market-code-cell';
 import { MarketActionsDropdown } from './market-table-actions';
+import type { CellClickedEvent } from 'ag-grid-community';
+import { useClosedMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
 type SettlementAsset = Pick<
   Asset,
@@ -125,6 +127,7 @@ const ClosedMarketsDataGrid = ({
   rowData: Row[];
   error: Error | undefined;
 }) => {
+  const handleOnSelect = useClosedMarketClickHandler();
   const openAssetDialog = useAssetDetailsDialogStore((store) => store.open);
 
   const colDefs = useMemo(() => {
@@ -281,6 +284,27 @@ const ClosedMarketsDataGrid = ({
       overlayNoRowsTemplate={error ? error.message : t('No markets')}
       components={components}
       rowHeight={45}
+      onCellClicked={({ data, column, event }: CellClickedEvent<Row>) => {
+        if (!data) return;
+
+        // prevent navigating to the market page if any of the below cells are clicked
+        // event.preventDefault or event.stopPropagation dont seem to apply for aggird
+        const colId = column.getColId();
+
+        if (
+          [
+            'settlementDate',
+            'settlementDataOracleId',
+            'settlementAsset',
+            'market-actions',
+          ].includes(colId)
+        ) {
+          return;
+        }
+
+        // @ts-ignore metaKey exists
+        handleOnSelect(data.id, event ? event.metaKey : false);
+      }}
     />
   );
 };

apps/trading/components/fills-container/fills-container.tsx

@@ -9,7 +9,7 @@ import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
-export const FillsContainer = ({ marketId }: { marketId?: string }) => {
+export const FillsContainer = () => {
   const onMarketClick = useMarketClickHandler(true);
   const { pubKey } = useVegaWallet();
 
@@ -31,7 +31,6 @@ export const FillsContainer = ({ marketId }: { marketId?: string }) => {
   return (
     <FillsManager
       partyId={pubKey}
-      marketId={marketId}
       onMarketClick={onMarketClick}
       gridProps={gridStoreCallbacks}
     />

apps/trading/components/layouts/layout-with-sidebar.tsx

@@ -23,6 +23,10 @@ export const LayoutWithSidebar = () => {
       <div className="col-span-full">
         <Routes>
           <Route path="markets/:marketId" element={<MarketHeader />} />
+          <Route
+            path="markets/all/closed/:marketId"
+            element={<MarketHeader />}
+          />
           <Route path="liquidity/:marketId" element={<LiquidityHeader />} />
         </Routes>
       </div>

apps/trading/components/market-state/market-state.tsx

@@ -7,6 +7,8 @@ import * as Schema from '@vegaprotocol/types';
 import { HeaderStat } from '../header';
 import { useCallback, useRef, useState } from 'react';
 import * as constants from '../constants';
+import { DocsLinks } from '@vegaprotocol/environment';
+import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 
 export const MarketState = ({ market }: { market: Market | null }) => {
   const [marketState, setMarketState] = useState<Schema.MarketState | null>(
@@ -90,5 +92,20 @@ const getMarketStateTooltip = (state: Schema.MarketState | null) => {
     );
   }
 
+  if (state === Schema.MarketState.STATE_SUSPENDED_VIA_GOVERNANCE) {
+    return (
+      <p>
+        {t(
+          `This market has been suspended via a governance vote and can be resumed or terminated by further votes.`
+        )}
+        {DocsLinks && (
+          <ExternalLink href={DocsLinks.MARKET_LIFECYCLE} className="ml-1">
+            {t('Find out more')}
+          </ExternalLink>
+        )}
+      </p>
+    );
+  }
+
   return undefined;
 };

apps/trading/components/sidebar/sidebar.tsx

@@ -135,6 +135,21 @@ export const Sidebar = () => {
               </>
             }
           />
+          <Route
+            path="markets/all/closed/:marketId"
+            element={
+              <>
+                <AssetSidebarButtons />
+                <SidebarDivider />
+                <SidebarButton
+                  view={ViewType.Info}
+                  icon={VegaIconNames.BREAKDOWN}
+                  tooltip={t('Market specification')}
+                  routeId={currentRouteId}
+                />
+              </>
+            }
+          />
         </Routes>
       </nav>
       <nav className={classNames(navClasses, 'ml-auto lg:mt-auto lg:ml-0')}>

apps/trading/lib/hooks/use-market-click-handler.ts

@@ -20,3 +20,16 @@ export const useMarketLiquidityClickHandler = () => {
     window.open(`/#/liquidity/${selectedId}`, metaKey ? '_blank' : '_self');
   }, []);
 };
+
+export const useClosedMarketClickHandler = (replace = false) => {
+  const navigate = useNavigate();
+
+  return (selectedId: string, metaKey?: boolean) => {
+    const link = Links.CLOSED_MARKETS(selectedId);
+    if (metaKey) {
+      window.open(`/#${link}`, '_blank');
+    } else {
+      navigate(link, { replace });
+    }
+  };
+};

apps/trading/lib/links.ts

@@ -5,6 +5,7 @@ import trimEnd from 'lodash/trimEnd';
 export const Routes = {
   HOME: '/',
   MARKETS: '/markets/all',
+  CLOSED_MARKETS: '/markets/all/closed/:marketId',
   MARKET: '/markets/:marketId',
   LIQUIDITY: '/liquidity/:marketId',
   PORTFOLIO: '/portfolio',
@@ -28,6 +29,8 @@ export const Links: ConsoleLinks = {
   MARKET: (marketId: string) =>
     trimEnd(Routes.MARKET.replace(':marketId', marketId)),
   MARKETS: () => Routes.MARKETS,
+  CLOSED_MARKETS: (marketId: string) =>
+    trimEnd(Routes.CLOSED_MARKETS.replace(':marketId', marketId)),
   PORTFOLIO: () => Routes.PORTFOLIO,
   LIQUIDITY: (marketId: string) =>
     trimEnd(Routes.LIQUIDITY.replace(':marketId', marketId)),

apps/trading/lib/utils/index.ts

@@ -5,6 +5,7 @@ const MARKET_TEMPLATE = [
   MarketState.STATE_ACTIVE,
   MarketState.STATE_SUSPENDED,
   MarketState.STATE_PENDING,
+  MarketState.STATE_SUSPENDED_VIA_GOVERNANCE,
 ];
 
 export const isMarketActive = (state: MarketState) => {

apps/trading/pages/client-router.tsx

@@ -26,6 +26,7 @@ import { FLAGS } from '@vegaprotocol/environment';
 // These must remain dynamically imported as pennant cannot be compiled by nextjs due to ESM
 // Using dynamic imports is a workaround for this until pennant is published as ESM
 const MarketPage = lazy(() => import('../client-pages/market'));
+const ClosedMarketPage = lazy(() => import('../client-pages/closed-market'));
 const Portfolio = lazy(() => import('../client-pages/portfolio'));
 
 const NotFound = () => (
@@ -101,6 +102,11 @@ export const routerConfig: RouteObject[] = compact([
             element: <MarketPage />,
             id: Routes.MARKET,
           },
+          {
+            path: 'all/closed/:marketId',
+            element: <ClosedMarketPage />,
+            id: Routes.CLOSED_MARKETS,
+          },
         ],
       },
       {

libs/accounts/src/lib/accounts-actions-dropdown.spec.tsx

@@ -0,0 +1,75 @@
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+import { AccountsActionsDropdown } from './accounts-actions-dropdown';
+import userEvent from '@testing-library/user-event';
+
+describe('AccountsActionsDropdown', () => {
+  let onClickDeposit: jest.Mock;
+  let onClickWithdraw: jest.Mock;
+  let onClickBreakdown: jest.Mock;
+  let onClickTransfer: jest.Mock;
+
+  beforeEach(() => {
+    onClickDeposit = jest.fn();
+    onClickWithdraw = jest.fn();
+    onClickBreakdown = jest.fn();
+    onClickTransfer = jest.fn();
+  });
+
+  it('should render dropdown items correctly', async () => {
+    // 7001-COLL-005
+    // 7001-COLL-006
+    // 1003-TRAN-001
+    render(
+      <AccountsActionsDropdown
+        assetId="testAssetId"
+        assetContractAddress="testAssetContractAddress"
+        onClickDeposit={onClickDeposit}
+        onClickWithdraw={onClickWithdraw}
+        onClickBreakdown={onClickBreakdown}
+        onClickTransfer={onClickTransfer}
+      />
+    );
+
+    await userEvent.click(screen.getByTestId('icon-kebab'));
+
+    expect(screen.getByTestId('deposit')).toHaveTextContent('Deposit');
+    expect(screen.getByTestId('withdraw')).toHaveTextContent('Withdraw');
+    expect(screen.getByTestId('transfer')).toHaveTextContent('Transfer');
+    expect(screen.getByTestId('breakdown')).toHaveTextContent(
+      'View usage breakdown'
+    );
+    expect(screen.getByText('View asset details')).toBeInTheDocument();
+    expect(screen.getByText('Copy asset ID')).toBeInTheDocument();
+    expect(screen.getByText('View on Etherscan')).toBeInTheDocument();
+  });
+
+  it('should call callback functions on click', async () => {
+    render(
+      <AccountsActionsDropdown
+        assetId="testAssetId"
+        assetContractAddress="testAssetContractAddress"
+        onClickDeposit={onClickDeposit}
+        onClickWithdraw={onClickWithdraw}
+        onClickBreakdown={onClickBreakdown}
+        onClickTransfer={onClickTransfer}
+      />
+    );
+
+    await userEvent.click(screen.getByTestId('icon-kebab'));
+    await userEvent.click(screen.getByTestId('deposit'));
+    expect(onClickDeposit).toHaveBeenCalledTimes(1);
+
+    await userEvent.click(screen.getByTestId('icon-kebab'));
+    await userEvent.click(screen.getByTestId('withdraw'));
+    expect(onClickWithdraw).toHaveBeenCalledTimes(1);
+
+    await userEvent.click(screen.getByTestId('icon-kebab'));
+    await userEvent.click(screen.getByTestId('transfer'));
+    expect(onClickTransfer).toHaveBeenCalledTimes(1);
+
+    await userEvent.click(screen.getByTestId('icon-kebab'));
+    await userEvent.click(screen.getByTestId('breakdown'));
+    expect(onClickBreakdown).toHaveBeenCalledTimes(1);
+  });
+});

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

@@ -26,6 +26,13 @@ const singleRowData = [singleRow];
 
 describe('AccountsTable', () => {
   it('should render correct columns', async () => {
+    // 7001-COLL-001
+    // 7001-COLL-002
+    // 7001-COLL-003
+    // 7001-COLL-004
+    // 7001-COLL-007
+    // 1003-TRAN-001
+    // 7001-COLL-012
     await act(async () => {
       render(
         <AccountTable

libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx

@@ -264,7 +264,11 @@ export const DealTicket = ({
     orders,
     collateralAvailable:
       marginAccountBalance || generalAccountBalance ? balance : undefined,
-    skip: !normalizedOrder,
+    skip:
+      !normalizedOrder ||
+      (normalizedOrder.type !== Schema.OrderType.TYPE_MARKET &&
+        (!normalizedOrder.price || normalizedOrder.price === '0')) ||
+      normalizedOrder.size === '0',
   });
 
   const assetSymbol = getAsset(market).symbol;

libs/deal-ticket/src/components/trading-mode-tooltip/trading-mode-tooltip.tsx

@@ -114,6 +114,20 @@ export const TradingModeTooltip = ({
         </section>
       );
     }
+    case Schema.MarketTradingMode.TRADING_MODE_SUSPENDED_VIA_GOVERNANCE: {
+      return (
+        <section data-testid="trading-mode-suspended-via-governance">
+          {t(
+            `This market has been suspended via a governance vote and can be resumed or terminated by further votes.`
+          )}
+          {DocsLinks && (
+            <ExternalLink href={DocsLinks.MARKET_LIFECYCLE} className="ml-1">
+              {t('Find out more')}
+            </ExternalLink>
+          )}
+        </section>
+      );
+    }
     case Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION: {
       switch (trigger) {
         case Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET: {

libs/deal-ticket/src/hooks/use-position-estimate.ts

@@ -30,9 +30,11 @@ export const usePositionEstimate = ({
     fetchPolicy: 'no-cache',
   });
   useEffect(() => {
-    if (data) {
+    if (skip) {
+      setEstimates(undefined);
+    } else if (data) {
       setEstimates(data);
     }
-  }, [data]);
+  }, [data, skip]);
   return estimates;
 };

libs/environment/src/hooks/use-environment.ts

@@ -423,6 +423,12 @@ function compileFeatureFlags(): FeatureFlags {
         process.env['NX_UPDATE_MARKET_STATE']
       ) as string
     ),
+    GOVERNANCE_TRANSFERS: TRUTHY.includes(
+      windowOrDefault(
+        'NX_GOVERNANCE_TRANSFERS',
+        process.env['NX_GOVERNANCE_TRANSFERS']
+      ) as string
+    ),
   };
   const EXPLORER_FLAGS = {
     EXPLORER_ASSETS: TRUTHY.includes(

libs/environment/src/hooks/use-links.ts

@@ -80,6 +80,7 @@ export const DocsLinks = VEGA_DOCS_URL
       LIQUIDITY: `${VEGA_DOCS_URL}/concepts/liquidity/provision`,
       WITHDRAWAL_LIMITS: `${VEGA_DOCS_URL}/concepts/assets/deposits-withdrawals#withdrawal-limits`,
       VALIDATOR_SCORES_REWARDS: `${VEGA_DOCS_URL}/concepts/vega-chain/validator-scores-and-rewards`,
+      MARKET_LIFECYCLE: `${VEGA_DOCS_URL}/concepts/trading-on-vega/market-lifecycle`,
     }
   : undefined;
 

libs/environment/src/types.ts

@@ -25,6 +25,7 @@ export type CosmicElevatorFlags = Pick<
   | 'METAMASK_SNAPS'
   | 'REFERRALS'
   | 'UPDATE_MARKET_STATE'
+  | 'GOVERNANCE_TRANSFERS'
 >;
 export type Configuration = z.infer<typeof tomlConfigSchema>;
 export const CUSTOM_NODE_KEY = 'custom' as const;

libs/environment/src/utils/validate-environment.ts

@@ -80,6 +80,7 @@ const COSMIC_ELEVATOR_FLAGS = {
   METAMASK_SNAPS: z.optional(z.boolean()),
   REFERRALS: z.optional(z.boolean()),
   UPDATE_MARKET_STATE: z.optional(z.boolean()),
+  GOVERNANCE_TRANSFERS: z.optional(z.boolean()),
 };
 
 const EXPLORER_FLAGS = {

libs/fills/src/lib/fills-manager.tsx

@@ -9,14 +9,12 @@ import { fillsWithMarketProvider } from './fills-data-provider';
 
 interface FillsManagerProps {
   partyId: string;
-  marketId?: string;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
   gridProps: ReturnType<typeof useDataGridEvents>;
 }
 
 export const FillsManager = ({
   partyId,
-  marketId,
   onMarketClick,
   gridProps,
 }: FillsManagerProps) => {
@@ -24,9 +22,6 @@ export const FillsManager = ({
   const filter: Schema.TradesFilter | Schema.TradesSubscriptionFilter = {
     partyIds: [partyId],
   };
-  if (marketId) {
-    filter.marketIds = [marketId];
-  }
   const { data, error } = useDataProvider({
     dataProvider: fillsWithMarketProvider,
     update: ({ data }) => {

libs/markets/src/lib/components/market-info/MarketInfo.graphql

@@ -4,6 +4,10 @@ fragment DataSourceFilter on Filter {
     type
     numberDecimalPlaces
   }
+  conditions {
+    value
+    operator
+  }
 }
 
 fragment DataSource on DataSourceSpec {
@@ -12,6 +16,37 @@ fragment DataSource on DataSourceSpec {
     sourceType {
       ... on DataSourceDefinitionExternal {
         sourceType {
+          ... on EthCallSpec {
+            abi
+            address
+            args
+            method
+            requiredConfirmations
+            normalisers {
+              name
+              expression
+            }
+            trigger {
+              trigger {
+                ... on EthTimeTrigger {
+                  initial
+                  every
+                  until
+                }
+              }
+            }
+            filters {
+              key {
+                name
+                type
+                numberDecimalPlaces
+              }
+              conditions {
+                value
+                operator
+              }
+            }
+          }
           ... on DataSourceSpecConfiguration {
             signers {
               signer {

libs/markets/src/lib/components/market-info/market-info-panels.tsx

@@ -6,13 +6,21 @@ import { t } from '@vegaprotocol/i18n';
 import { marketDataProvider } from '../../market-data-provider';
 import { totalFeesPercentage } from '../../market-utils';
 import {
+  Accordion,
+  AccordionChevron,
+  AccordionPanel,
+  CopyWithTooltip,
   ExternalLink,
   Intent,
+  KeyValueTable,
+  KeyValueTableRow,
   Lozenge,
   Splash,
+  SyntaxHighlighter,
   Tooltip,
   VegaIcon,
   VegaIconNames,
+  truncateMiddle,
 } from '@vegaprotocol/ui-toolkit';
 import {
   addDecimalsFormatNumber,
@@ -31,6 +39,7 @@ import { Last24hVolume } from '../last-24h-volume';
 import BigNumber from 'bignumber.js';
 import type {
   DataSourceDefinition,
+  EthCallSpec,
   MarketTradingMode,
   SignerKind,
 } from '@vegaprotocol/types';
@@ -40,6 +49,7 @@ import {
 } from '@vegaprotocol/types';
 import {
   DApp,
+  EtherscanLink,
   FLAGS,
   TOKEN_PROPOSAL,
   useEnvironment,
@@ -65,6 +75,7 @@ import {
 } from '@vegaprotocol/network-parameters';
 import type { DataSourceFragment } from './__generated__/MarketInfo';
 import { formatDuration } from 'date-fns';
+import * as AccordionPrimitive from '@radix-ui/react-accordion';
 
 type MarketInfoProps = {
   market: MarketInfo;
@@ -659,6 +670,97 @@ export const LiquidityMonitoringParametersInfoPanel = ({
   return <MarketInfoTable data={marketData} parentData={parentMarketData} />;
 };
 
+export const EthOraclePanel = ({ sourceType }: { sourceType: EthCallSpec }) => {
+  const abis = sourceType.abi?.map((abi) => JSON.parse(abi));
+  const header = 'uppercase my-1 text-left';
+  return (
+    <>
+      <h3 className={header}>{t('Ethereum Oracle')}</h3>
+      {sourceType.address && (
+        <>
+          <KeyValueTable>
+            <KeyValueTableRow noBorder>
+              <div>{t('Address')}</div>
+              <CopyWithTooltip text={sourceType.address}>
+                <button
+                  data-testid="copy-eth-oracle-address"
+                  className="uppercase text-right"
+                >
+                  <span className="flex gap-1">
+                    {truncateMiddle(sourceType.address)}
+                    <VegaIcon name={VegaIconNames.COPY} size={16} />
+                  </span>
+                </button>
+              </CopyWithTooltip>
+            </KeyValueTableRow>
+          </KeyValueTable>
+
+          <div className="my-2">
+            <EtherscanLink address={sourceType.address}>
+              {t('View on Etherscan')}
+            </EtherscanLink>
+          </div>
+        </>
+      )}
+
+      <MarketInfoTable
+        key="eth-call-spec"
+        data={{
+          method: sourceType.method,
+          requiredConfirmations: sourceType.requiredConfirmations,
+        }}
+      />
+      <Accordion>
+        <AccordionPanel
+          itemId="abi"
+          trigger={
+            <AccordionPrimitive.Trigger
+              data-testid="accordion-toggle"
+              className={classNames(
+                'w-full pt-2',
+                'flex items-center gap-2',
+                'group'
+              )}
+            >
+              <div
+                data-testid={`abi-dropdown`}
+                key={'value-dropdown'}
+                className="flex items-center gap-2 w-full"
+              >
+                <div className="underline underline-offset-4 mb-1 uppercase">
+                  {t('ABI specification')}
+                </div>
+                <AccordionChevron size={14} />
+                <div className="flex items-center gap-1"></div>
+              </div>
+            </AccordionPrimitive.Trigger>
+          }
+        >
+          <SyntaxHighlighter data={abis} />
+        </AccordionPanel>
+      </Accordion>
+
+      <h3 className={header}>{t('Normalisers')}</h3>
+      {sourceType.normalisers?.map((normaliser, i) => (
+        <MarketInfoTable key={i} data={normaliser} />
+      ))}
+      <h3 className={header}>{t('Filters')}</h3>
+      <h3 className={header}>{t('Key')}</h3>
+      {sourceType.filters?.map((filter, i) => (
+        <>
+          <MarketInfoTable key={i} data={filter.key} />
+          <h3 className={header}>{t('Conditions')}</h3>
+          {filter.conditions?.map((condition, i) => (
+            <span>
+              {ConditionOperatorMapping[condition.operator]} {condition.value}
+            </span>
+          ))}
+        </>
+      ))}
+    </>
+  );
+};
+
 export const LiquidityPriceRangeInfoPanel = ({
   market,
   parentMarket,
@@ -782,7 +884,7 @@ export const LiquiditySLAParametersInfoPanel = ({
           market.liquiditySLAParameters?.slaCompetitionFactor
         ).times(100)
       ),
-    commitmentMinimumTimeFraction:
+    commitmentMinTimeFraction:
       market.liquiditySLAParameters?.commitmentMinTimeFraction &&
       formatNumberPercentage(
         new BigNumber(
@@ -797,7 +899,7 @@ export const LiquiditySLAParametersInfoPanel = ({
           parentMarket.liquiditySLAParameters?.performanceHysteresisEpochs,
         slaCompetitionFactor:
           parentMarket.liquiditySLAParameters?.slaCompetitionFactor,
-        commitmentMinimumTimeFraction:
+        commitmentMinTimeFraction:
           parentMarket.liquiditySLAParameters?.commitmentMinTimeFraction,
       }
     : undefined;
@@ -823,13 +925,13 @@ export const LiquiditySLAParametersInfoPanel = ({
       networkParams['market_liquidity_nonPerformanceBondPenaltySlope'],
     nonPerformanceBondPenaltyMax:
       networkParams['market_liquidity_sla_nonPerformanceBondPenaltyMax'],
-    maximumLiquidityFeeFactorLevel:
+    maxLiquidityFeeFactorLevel:
       networkParams['market_liquidity_maximumLiquidityFeeFactorLevel'],
     stakeToCCYVolume: networkParams['market_liquidity_stakeToCcyVolume'],
     earlyExitPenalty: networkParams['market_liquidity_earlyExitPenalty'],
     probabilityOfTradingTauScaling:
       networkParams['market_liquidity_probabilityOfTrading_tau_scaling'],
-    minimumProbabilityOfTradingLPOrders:
+    minProbabilityOfTradingLPOrders:
       networkParams['market_liquidity_minimum_probabilityOfTrading_lpOrders'],
     feeCalculationTimeStep:
       networkParams['market_liquidity_feeCalculationTimeStep'] &&
@@ -931,6 +1033,10 @@ export const OracleInfoPanel = ({
         </Lozenge>
       )}
 
+      {dataSourceSpec?.sourceType.sourceType.__typename === 'EthCallSpec' && (
+        <EthOraclePanel sourceType={dataSourceSpec?.sourceType.sourceType} />
+      )}
+
       <div className={wrapperClasses}>
         {shouldShowParentData &&
           parentDataSourceSpec &&
@@ -945,6 +1051,13 @@ export const OracleInfoPanel = ({
                 dataSourceSpecId={parentDataSourceSpecId}
               />
 
+              {parentDataSourceSpec?.sourceType.sourceType.__typename ===
+                'EthCallSpec' && (
+                <EthOraclePanel
+                  sourceType={parentDataSourceSpec?.sourceType.sourceType}
+                />
+              )}
+
               {dataSourceSpecId && (
                 <ExternalLink
                   data-testid="oracle-spec-links"

libs/markets/src/lib/components/market-info/tooltip-mapping.tsx

@@ -106,7 +106,7 @@ export const tooltipMapping: Record<string, ReactNode> = {
   insurancePoolFraction: t(
     'The fraction of the insurance pool balance that is carried over from the parent market to the successor.'
   ),
-  commitmentMinimumTimeFraction: t(
+  commitmentMinTimeFraction: t(
     `Specifies the minimum fraction of time LPs must spend 'on the book' providing their committed liquidity. This is a market parameter.`
   ),
   feeCalculationTimeStep: t(
@@ -127,7 +127,7 @@ export const tooltipMapping: Record<string, ReactNode> = {
   nonPerformanceBondPenaltyMax: t(
     `The maximum amount, as a fraction, that an LP's bond can be slashed by if they fail to reach the minimum SLA. This is a network parameter.`
   ),
-  maximumLiquidityFeeFactorLevel: t(
+  maxLiquidityFeeFactorLevel: t(
     'Maximum value that a proposed fee amount can be, which is submitted as part of the LP commitment transaction. Note that a value of 0.05 = 5%. This is a network parameter.'
   ),
   stakeToCCYVolume: t(
@@ -137,12 +137,12 @@ export const tooltipMapping: Record<string, ReactNode> = {
     'How long an epoch is. LP rewards from liquidity fees are paid out once per epoch. How much they receive depends on whether they met the liquidity SLA and their previous performance in recent epochs. This is a network parameter.'
   ),
   earlyExitPenalty: t(
-    `How much an LP forfeits of their bond if they reduce their commitment while the market is below target stake, expressed as a factor. If set to 0 there is no penalty for early exit. If set to 1 an LP's entire bond is forfeited when an LP removes their full commitment. This is a network parameter.`
+    `The percentage of their bond an LP forfeits if they reduce their commitment while the market is below target stake. If 100%, an LP's entire bond is forfeited when they cancel their full commitment. This is a network parameter.`
   ),
   probabilityOfTradingTauScaling: t(
     `Determines how the probability of trading is scaled from the risk model, and is used to measure the relative competitiveness of an LP's supplied volume. This is a network parameter.`
   ),
-  minimumProbabilityOfTradingLPOrders: t(
+  minProbabilityOfTradingLPOrders: t(
     'The lower bound for the probability of trading calculation, used to measure liquidity available on a market to determine if LPs are meeting their commitment. This is a network parameter.'
   ),
 };

libs/markets/src/lib/markets.mock.ts

@@ -96,6 +96,7 @@ export const createMarketFragment = (
                   filters: [
                     {
                       __typename: 'Filter',
+                      conditions: [],
                       key: {
                         __typename: 'PropertyKey',
                         name: 'settlement-data-property',
@@ -129,6 +130,7 @@ export const createMarketFragment = (
                   filters: [
                     {
                       __typename: 'Filter',
+                      conditions: [],
                       key: {
                         __typename: 'PropertyKey',
                         name: 'settlement-data-property',

libs/proposals/src/lib/proposals-data-provider/Proposals.graphql

@@ -334,6 +334,36 @@ fragment UpdateNetworkParameterFields on UpdateNetworkParameter {
   }
 }
 
+fragment NewTransferFields on NewTransfer {
+  source
+  sourceType
+  destination
+  destinationType
+  asset {
+    id
+    symbol
+    decimals
+    quantum
+  }
+  fraction_of_balance
+  amount
+  transferType
+  kind {
+    __typename
+    ... on OneOffGovernanceTransfer {
+      deliverOn
+    }
+    ... on RecurringGovernanceTransfer {
+      startEpoch
+      endEpoch
+    }
+  }
+}
+
+fragment CancelTransferFields on CancelTransfer {
+  transferId
+}
+
 fragment ProposalListFields on Proposal {
   id
   rationale {

libs/proposals/src/lib/proposals-hooks/Proposal.graphql

@@ -67,3 +67,29 @@ query InstrumentDetails($marketId: ID!) {
     }
   }
 }
+
+query NewTransferDetails($proposalId: ID!) {
+  proposal(id: $proposalId) {
+    id
+    terms {
+      change {
+        ... on NewTransfer {
+          ...NewTransferFields
+        }
+      }
+    }
+  }
+}
+
+query CancelTransferDetails($proposalId: ID!) {
+  proposal(id: $proposalId) {
+    id
+    terms {
+      change {
+        ... on CancelTransfer {
+          ...CancelTransferFields
+        }
+      }
+    }
+  }
+}

libs/proposals/src/lib/proposals-hooks/__generated__/Proposal.ts

@@ -1,7 +1,7 @@
 import * as Types from '@vegaprotocol/types';
 
 import { gql } from '@apollo/client';
-import { UpdateNetworkParameterFieldsFragmentDoc } from '../../proposals-data-provider/__generated__/Proposals';
+import { UpdateNetworkParameterFieldsFragmentDoc, NewTransferFieldsFragmentDoc, CancelTransferFieldsFragmentDoc } from '../../proposals-data-provider/__generated__/Proposals';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type ProposalEventFieldsFragment = { __typename?: 'Proposal', id?: string | null, reference: string, state: Types.ProposalState, rejectionReason?: Types.ProposalRejectionReason | null, errorDetails?: string | null };
@@ -41,6 +41,20 @@ export type InstrumentDetailsQueryVariables = Types.Exact<{
 
 export type InstrumentDetailsQuery = { __typename?: 'Query', market?: { __typename?: 'Market', tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', code: string, name: string } } } | null };
 
+export type NewTransferDetailsQueryVariables = Types.Exact<{
+  proposalId: Types.Scalars['ID'];
+}>;
+
+
+export type NewTransferDetailsQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer' } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer', source: string, sourceType: Types.AccountType, destination: string, destinationType: Types.AccountType, fraction_of_balance: string, amount: string, transferType: Types.GovernanceTransferType, asset: { __typename?: 'Asset', id: string, symbol: string, decimals: number, quantum: string }, kind: { __typename: 'OneOffGovernanceTransfer', deliverOn?: any | null } | { __typename: 'RecurringGovernanceTransfer', startEpoch: number, endEpoch?: number | null } } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } } | null };
+
+export type CancelTransferDetailsQueryVariables = Types.Exact<{
+  proposalId: Types.Scalars['ID'];
+}>;
+
+
+export type CancelTransferDetailsQuery = { __typename?: 'Query', proposal?: { __typename?: 'Proposal', id?: string | null, terms: { __typename?: 'ProposalTerms', change: { __typename?: 'CancelTransfer', transferId: string } | { __typename?: 'NewAsset' } | { __typename?: 'NewFreeform' } | { __typename?: 'NewMarket' } | { __typename?: 'NewSpotMarket' } | { __typename?: 'NewTransfer' } | { __typename?: 'UpdateAsset' } | { __typename?: 'UpdateMarket' } | { __typename?: 'UpdateMarketState' } | { __typename?: 'UpdateNetworkParameter' } | { __typename?: 'UpdateReferralProgram' } | { __typename?: 'UpdateSpotMarket' } | { __typename?: 'UpdateVolumeDiscountProgram' } } } | null };
+
 export const ProposalEventFieldsFragmentDoc = gql`
     fragment ProposalEventFields on Proposal {
   id
@@ -246,4 +260,88 @@ export function useInstrumentDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHook
         }
 export type InstrumentDetailsQueryHookResult = ReturnType<typeof useInstrumentDetailsQuery>;
 export type InstrumentDetailsLazyQueryHookResult = ReturnType<typeof useInstrumentDetailsLazyQuery>;
-export type InstrumentDetailsQueryResult = Apollo.QueryResult<InstrumentDetailsQuery, InstrumentDetailsQueryVariables>;
+export type InstrumentDetailsQueryResult = Apollo.QueryResult<InstrumentDetailsQuery, InstrumentDetailsQueryVariables>;
+export const NewTransferDetailsDocument = gql`
+    query NewTransferDetails($proposalId: ID!) {
+  proposal(id: $proposalId) {
+    id
+    terms {
+      change {
+        ... on NewTransfer {
+          ...NewTransferFields
+        }
+      }
+    }
+  }
+}
+    ${NewTransferFieldsFragmentDoc}`;
+
+/**
+ * __useNewTransferDetailsQuery__
+ *
+ * To run a query within a React component, call `useNewTransferDetailsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useNewTransferDetailsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useNewTransferDetailsQuery({
+ *   variables: {
+ *      proposalId: // value for 'proposalId'
+ *   },
+ * });
+ */
+export function useNewTransferDetailsQuery(baseOptions: Apollo.QueryHookOptions<NewTransferDetailsQuery, NewTransferDetailsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<NewTransferDetailsQuery, NewTransferDetailsQueryVariables>(NewTransferDetailsDocument, options);
+      }
+export function useNewTransferDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<NewTransferDetailsQuery, NewTransferDetailsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<NewTransferDetailsQuery, NewTransferDetailsQueryVariables>(NewTransferDetailsDocument, options);
+        }
+export type NewTransferDetailsQueryHookResult = ReturnType<typeof useNewTransferDetailsQuery>;
+export type NewTransferDetailsLazyQueryHookResult = ReturnType<typeof useNewTransferDetailsLazyQuery>;
+export type NewTransferDetailsQueryResult = Apollo.QueryResult<NewTransferDetailsQuery, NewTransferDetailsQueryVariables>;
+export const CancelTransferDetailsDocument = gql`
+    query CancelTransferDetails($proposalId: ID!) {
+  proposal(id: $proposalId) {
+    id
+    terms {
+      change {
+        ... on CancelTransfer {
+          ...CancelTransferFields
+        }
+      }
+    }
+  }
+}
+    ${CancelTransferFieldsFragmentDoc}`;
+
+/**
+ * __useCancelTransferDetailsQuery__
+ *
+ * To run a query within a React component, call `useCancelTransferDetailsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useCancelTransferDetailsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useCancelTransferDetailsQuery({
+ *   variables: {
+ *      proposalId: // value for 'proposalId'
+ *   },
+ * });
+ */
+export function useCancelTransferDetailsQuery(baseOptions: Apollo.QueryHookOptions<CancelTransferDetailsQuery, CancelTransferDetailsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<CancelTransferDetailsQuery, CancelTransferDetailsQueryVariables>(CancelTransferDetailsDocument, options);
+      }
+export function useCancelTransferDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<CancelTransferDetailsQuery, CancelTransferDetailsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<CancelTransferDetailsQuery, CancelTransferDetailsQueryVariables>(CancelTransferDetailsDocument, options);
+        }
+export type CancelTransferDetailsQueryHookResult = ReturnType<typeof useCancelTransferDetailsQuery>;
+export type CancelTransferDetailsLazyQueryHookResult = ReturnType<typeof useCancelTransferDetailsLazyQuery>;
+export type CancelTransferDetailsQueryResult = Apollo.QueryResult<CancelTransferDetailsQuery, CancelTransferDetailsQueryVariables>;

libs/proposals/src/lib/proposals-hooks/index.ts

@@ -4,3 +4,5 @@ export * from './use-proposal-submit';
 export * from './use-update-proposal';
 export * from './use-update-network-paramaters-toasts';
 export * from './use-successor-market-proposal-details';
+export * from './use-new-transfer-proposal-details';
+export * from './use-cancel-transfer-proposal-details';

libs/proposals/src/lib/proposals-hooks/use-cancel-transfer-proposal-details.ts

@@ -0,0 +1,19 @@
+import type { CancelTransferFieldsFragment } from '../proposals-data-provider';
+import { useCancelTransferDetailsQuery } from './__generated__/Proposal';
+
+export const useCancelTransferProposalDetails = (
+  proposalId?: string | null
+) => {
+  const { data } = useCancelTransferDetailsQuery({
+    variables: {
+      proposalId: proposalId || '',
+    },
+    skip: !proposalId || proposalId.length === 0,
+  });
+
+  if (data?.proposal?.terms.change.__typename === 'CancelTransfer') {
+    return data?.proposal?.terms.change as CancelTransferFieldsFragment;
+  }
+
+  return undefined;
+};

libs/proposals/src/lib/proposals-hooks/use-new-transfer-proposal-details.ts

@@ -0,0 +1,17 @@
+import type { NewTransferFieldsFragment } from '../proposals-data-provider';
+import { useNewTransferDetailsQuery } from './__generated__/Proposal';
+
+export const useNewTransferProposalDetails = (proposalId?: string | null) => {
+  const { data } = useNewTransferDetailsQuery({
+    variables: {
+      proposalId: proposalId || '',
+    },
+    skip: !proposalId || proposalId.length === 0,
+  });
+
+  if (data?.proposal?.terms.change.__typename === 'NewTransfer') {
+    return data?.proposal?.terms.change as NewTransferFieldsFragment;
+  }
+
+  return undefined;
+};

libs/types/src/__generated__/types.ts

@@ -505,6 +505,29 @@ export type CoreSnapshotEdge = {
   node: CoreSnapshotData;
 };
 
+/** Referral program information reported by data node with additional endedAt timestamp. */
+export type CurrentReferralProgram = {
+  __typename?: 'CurrentReferralProgram';
+  /** Defined tiers in increasing order. First element will give Tier 1, second element will give Tier 2, etc. */
+  benefitTiers: Array<BenefitTier>;
+  /** Timestamp as RFC3339Nano, after which when the current epoch ends, the program will end and benefits will be disabled. */
+  endOfProgramTimestamp: Scalars['Timestamp'];
+  /** Timestamp as RFC3339Nano when the program ended. If present, the current program has ended and no program is currently running. */
+  endedAt?: Maybe<Scalars['Timestamp']>;
+  /** Unique ID generated from the proposal that created this program. */
+  id: Scalars['ID'];
+  /**
+   * Defined staking tiers in increasing order. First element will give Tier 1,
+   * second element will give Tier 2, and so on. Determines the level of
+   * benefit a party can expect based on their staking.
+   */
+  stakingTiers: Array<StakingTier>;
+  /** Incremental version of the program. It is incremented each time the referral program is edited. */
+  version: Scalars['Int'];
+  /** Number of epochs over which to evaluate a referral set's running volume. */
+  windowLength: Scalars['Int'];
+};
+
 /** A data source contains the data sent by a data source */
 export type Data = {
   __typename?: 'Data';
@@ -1607,6 +1630,8 @@ export type LiquidityProvider = {
   marketId: Scalars['ID'];
   /** Party ID of the liquidity provider */
   partyId: Scalars['ID'];
+  /** SLA performance statistics */
+  sla?: Maybe<LiquidityProviderSLA>;
 };
 
 /** Connection type for retrieving cursor-based paginated liquidity provider information */
@@ -1642,6 +1667,29 @@ export type LiquidityProviderFeeShare = {
   virtualStake: Scalars['String'];
 };
 
+/** The SLA statistics for each liquidity provider */
+export type LiquidityProviderSLA = {
+  __typename?: 'LiquidityProviderSLA';
+  /** Indicates how often LP meets the commitment during the current epoch. */
+  currentEpochFractionOfTimeOnBook: Scalars['String'];
+  /** Determines how the fee penalties from past epochs affect future fee revenue. */
+  hysteresisPeriodFeePenalties?: Maybe<Array<Scalars['String']>>;
+  /** Indicates the bond penalty amount applied in the previous epoch. */
+  lastEpochBondPenalty: Scalars['String'];
+  /** Indicates the fee penalty amount applied in the previous epoch. */
+  lastEpochFeePenalty: Scalars['String'];
+  /** Indicates how often LP met the commitment in the previous epoch. */
+  lastEpochFractionOfTimeOnBook: Scalars['String'];
+  /** Notional volume of orders within the range provided on the buy side of the book. */
+  notionalVolumeBuys: Scalars['String'];
+  /** Notional volume of orders within the range provided on the sell side of the book. */
+  notionalVolumeSells: Scalars['String'];
+  /** The liquidity provider party ID */
+  party: Party;
+  /** Represents the total amount of funds LP must supply. The amount to be supplied is in the market’s settlement currency, spread on both buy and sell sides of the order book within a defined range. */
+  requiredLiquidity: Scalars['String'];
+};
+
 /** The command to be sent to the chain for a liquidity provision submission */
 export type LiquidityProvision = {
   __typename?: 'LiquidityProvision';
@@ -2030,6 +2078,8 @@ export type MarketData = {
   lastTradedPrice: Scalars['String'];
   /** The equity like share of liquidity fee for each liquidity provider */
   liquidityProviderFeeShare?: Maybe<Array<LiquidityProviderFeeShare>>;
+  /** SLA performance statistics */
+  liquidityProviderSla?: Maybe<Array<LiquidityProviderSLA>>;
   /** The mark price (an unsigned integer) */
   markPrice: Scalars['String'];
   /** Market of the associated mark price */
@@ -2562,6 +2612,29 @@ export type ObservableLiquidityProviderFeeShare = {
   partyId: Scalars['ID'];
 };
 
+/** The SLA statistics for each liquidity provider */
+export type ObservableLiquidityProviderSLA = {
+  __typename?: 'ObservableLiquidityProviderSLA';
+  /** Indicates how often LP meets the commitment during the current epoch. */
+  currentEpochFractionOfTimeOnBook: Scalars['String'];
+  /** Determines how the fee penalties from past epochs affect future fee revenue. */
+  hysteresisPeriodFeePenalties?: Maybe<Array<Scalars['String']>>;
+  /** Indicates the bond penalty amount applied in the previous epoch. */
+  lastEpochBondPenalty: Scalars['String'];
+  /** Indicates the fee penalty amount applied in the previous epoch. */
+  lastEpochFeePenalty: Scalars['String'];
+  /** Indicates how often LP meets the commitment during last epoch. */
+  lastEpochFractionOfTimeOnBook: Scalars['String'];
+  /** Notional volume of orders within the range provided on the buy side of the book. */
+  notionalVolumeBuys: Scalars['String'];
+  /** Notional volume of orders within the range provided on the sell side of the book. */
+  notionalVolumeSells: Scalars['String'];
+  /** The liquidity provider party ID */
+  party: Scalars['ID'];
+  /** Represents the total amount of funds LP must supply. The amount to be supplied is in the market’s settlement currency, spread on both buy and sell sides of the order book within a defined range. */
+  requiredLiquidity: Scalars['String'];
+};
+
 /** Live data of a Market */
 export type ObservableMarketData = {
   __typename?: 'ObservableMarketData';
@@ -2595,6 +2668,8 @@ export type ObservableMarketData = {
   lastTradedPrice: Scalars['String'];
   /** The equity like share of liquidity fee for each liquidity provider */
   liquidityProviderFeeShare?: Maybe<Array<ObservableLiquidityProviderFeeShare>>;
+  /** SLA performance statistics */
+  liquidityProviderSla?: Maybe<Array<ObservableLiquidityProviderSLA>>;
   /** The mark price (an unsigned integer) */
   markPrice: Scalars['String'];
   /** The market growth factor for the last market time window */
@@ -3289,6 +3364,15 @@ export type PartyActivityStreak = {
   tradedVolume: Scalars['String'];
 };
 
+/** An amount received by a party as a reward or a discount */
+export type PartyAmount = {
+  __typename?: 'PartyAmount';
+  /** Amount received by the party */
+  amount: Scalars['String'];
+  /** Id of the party that received the payment */
+  partyId: Scalars['String'];
+};
+
 /** Connection type for retrieving cursor-based paginated party information */
 export type PartyConnection = {
   __typename?: 'PartyConnection';
@@ -3861,6 +3945,8 @@ export type ProposalTerms = {
 
 /** Various proposal types that are supported by Vega */
 export enum ProposalType {
+  /** Proposal to cancel a transfer */
+  TYPE_CANCEL_TRANSFER = 'TYPE_CANCEL_TRANSFER',
   /** Proposal to change Vega network parameters */
   TYPE_NETWORK_PARAMETERS = 'TYPE_NETWORK_PARAMETERS',
   /** Proposal to add a new asset */
@@ -3869,10 +3955,22 @@ export enum ProposalType {
   TYPE_NEW_FREE_FORM = 'TYPE_NEW_FREE_FORM',
   /** Propose a new market */
   TYPE_NEW_MARKET = 'TYPE_NEW_MARKET',
+  /** Propose a new spot market */
+  TYPE_NEW_SPOT_MARKET = 'TYPE_NEW_SPOT_MARKET',
+  /** Propose a new transfer */
+  TYPE_NEW_TRANSFER = 'TYPE_NEW_TRANSFER',
   /** Proposal to update an existing asset */
   TYPE_UPDATE_ASSET = 'TYPE_UPDATE_ASSET',
   /** Update an existing market */
-  TYPE_UPDATE_MARKET = 'TYPE_UPDATE_MARKET'
+  TYPE_UPDATE_MARKET = 'TYPE_UPDATE_MARKET',
+  /** Proposal for updating the state of a market */
+  TYPE_UPDATE_MARKET_STATE = 'TYPE_UPDATE_MARKET_STATE',
+  /** Proposal to update the referral program */
+  TYPE_UPDATE_REFERRAL_PROGRAM = 'TYPE_UPDATE_REFERRAL_PROGRAM',
+  /** Update an existing spot market */
+  TYPE_UPDATE_SPOT_MARKET = 'TYPE_UPDATE_SPOT_MARKET',
+  /** Proposal to update the volume discount program */
+  TYPE_UPDATE_VOLUME_DISCOUNT_PROGRAM = 'TYPE_UPDATE_VOLUME_DISCOUNT_PROGRAM'
 }
 
 export type ProposalVote = {
@@ -3998,7 +4096,7 @@ export type Query = {
   /** List core snapshots */
   coreSnapshots?: Maybe<CoreSnapshotConnection>;
   /** Get the current referral program */
-  currentReferralProgram?: Maybe<ReferralProgram>;
+  currentReferralProgram?: Maybe<CurrentReferralProgram>;
   /** Find a deposit using its ID */
   deposit?: Maybe<Deposit>;
   /** Fetch all deposits */
@@ -4095,6 +4193,8 @@ export type Query = {
   protocolUpgradeProposals?: Maybe<ProtocolUpgradeProposalConnection>;
   /** Flag indicating whether the data-node is ready to begin the protocol upgrade */
   protocolUpgradeStatus?: Maybe<ProtocolUpgradeStatus>;
+  /** Get referrer fee and discount stats */
+  referralFeeStats?: Maybe<ReferralSetFeeStats>;
   referralSetReferees: ReferralSetRefereeConnection;
   /** List referral sets */
   referralSets: ReferralSetConnection;
@@ -4259,6 +4359,7 @@ export type QueryestimatePositionArgs = {
   marketId: Scalars['ID'];
   openVolume: Scalars['String'];
   orders?: InputMaybe<Array<OrderInfo>>;
+  scaleLiquidationPriceToMarketDecimals?: InputMaybe<Scalars['Boolean']>;
 };
 
 
@@ -4450,6 +4551,14 @@ export type QueryprotocolUpgradeProposalsArgs = {
 };
 
 
+/** Queries allow a caller to read data and filter data via GraphQL. */
+export type QueryreferralFeeStatsArgs = {
+  assetId?: InputMaybe<Scalars['ID']>;
+  epoch?: InputMaybe<Scalars['Int']>;
+  marketId?: InputMaybe<Scalars['ID']>;
+};
+
+
 /** Queries allow a caller to read data and filter data via GraphQL. */
 export type QueryreferralSetRefereesArgs = {
   id?: InputMaybe<Scalars['ID']>;
@@ -4595,6 +4704,8 @@ export type RefereeStats = {
   __typename?: 'RefereeStats';
   /** Discount factor applied to the party. */
   discountFactor: Scalars['String'];
+  /** Current referee notional taker volume */
+  epochNotionalTakerVolume: Scalars['String'];
   /** Unique ID of the party. */
   partyId: Scalars['ID'];
   /** Reward factor applied to the party. */
@@ -4606,10 +4717,8 @@ export type ReferralProgram = {
   __typename?: 'ReferralProgram';
   /** Defined tiers in increasing order. First element will give Tier 1, second element will give Tier 2, etc. */
   benefitTiers: Array<BenefitTier>;
-  /** Timestamp as RFC3339Nano, after which when the current epoch ends, the programs status will become STATE_CLOSED and benefits will be disabled. */
-  endOfProgramTimestamp: Scalars['Timestamp'];
-  /** Timestamp as RFC3339Nano when the program ended. If present, the current program has ended and no program is currently running. */
-  endedAt?: Maybe<Scalars['Timestamp']>;
+  /** Timestamp as RFC3339, after which when the current epoch ends, the programs will end and benefits will be disabled. */
+  endOfProgramTimestamp: Scalars['String'];
   /** Unique ID generated from the proposal that created this program. */
   id: Scalars['ID'];
   /**
@@ -4667,6 +4776,25 @@ export type ReferralSetEdge = {
   node: ReferralSet;
 };
 
+/** Referral rewards and discounts that have been applied on a specific market/asset up to the given epoch. */
+export type ReferralSetFeeStats = {
+  __typename?: 'ReferralSetFeeStats';
+  /** The settlement asset of the market. */
+  assetId: Scalars['String'];
+  /** The epoch for which these stats were valid. */
+  epoch: Scalars['Int'];
+  /** The market the fees were paid in */
+  marketId: Scalars['String'];
+  /** The total referral discounts applied to all referee taker fees */
+  refereesDiscountApplied: Array<PartyAmount>;
+  /** The total referral rewards generated by all referee taker fees. */
+  referrerRewardsGenerated: Array<ReferrerRewardsGenerated>;
+  /** The total referral rewards paid to the referrer of the referral set. */
+  totalRewardsPaid: Array<PartyAmount>;
+  /** The total volume discounts applied to all referee taker fees */
+  volumeDiscountApplied: Array<PartyAmount>;
+};
+
 /** Data relating to referees that have joined a referral set */
 export type ReferralSetReferee = {
   __typename?: 'ReferralSetReferee';
@@ -4710,6 +4838,15 @@ export type ReferralSetStats = {
   setId: Scalars['ID'];
 };
 
+/** Rewards generated for referrers by each of their referees */
+export type ReferrerRewardsGenerated = {
+  __typename?: 'ReferrerRewardsGenerated';
+  /** The amount of rewards generated per party */
+  generatedReward: Array<PartyAmount>;
+  /** ID of the referral set's referrer */
+  referrerId: Scalars['String'];
+};
+
 /** Reward information for a single party */
 export type Reward = {
   __typename?: 'Reward';
@@ -5152,10 +5289,10 @@ export enum StopOrderRejectionReason {
   REJECTION_REASON_MAX_STOP_ORDERS_PER_PARTY_REACHED = 'REJECTION_REASON_MAX_STOP_ORDERS_PER_PARTY_REACHED',
   /** Stop orders submission must be reduce only */
   REJECTION_REASON_MUST_BE_REDUCE_ONLY = 'REJECTION_REASON_MUST_BE_REDUCE_ONLY',
-  /** This stop order does not close the position */
-  REJECTION_REASON_STOP_ORDER_DOES_NOT_CLOSE_POSITION = 'REJECTION_REASON_STOP_ORDER_DOES_NOT_CLOSE_POSITION',
   /** Stop orders are not allowed without a position */
   REJECTION_REASON_STOP_ORDER_NOT_ALLOWED_WITHOUT_A_POSITION = 'REJECTION_REASON_STOP_ORDER_NOT_ALLOWED_WITHOUT_A_POSITION',
+  /** This stop order does not close the position */
+  REJECTION_REASON_STOP_ORDER_NOT_CLOSING_THE_POSITION = 'REJECTION_REASON_STOP_ORDER_NOT_CLOSING_THE_POSITION',
   /** Trading is not allowed yet */
   REJECTION_REASON_TRADING_NOT_ALLOWED = 'REJECTION_REASON_TRADING_NOT_ALLOWED'
 }
@@ -5942,18 +6079,7 @@ export type UpdateProductConfiguration = UpdateFutureProduct | UpdatePerpetualPr
 
 export type UpdateReferralProgram = {
   __typename?: 'UpdateReferralProgram';
-  /** Benefit tiers for the program */
-  benefitTiers: Array<BenefitTier>;
-  /** The end time of the program */
-  endOfProgramTimestamp: Scalars['Timestamp'];
-  /** ID of the proposal that created the referral program */
-  id: Scalars['ID'];
-  /** Determines the level of benefit a party can expect based on their staking */
-  stakingTiers: Array<StakingTier>;
-  /** Current version of the referral program */
-  version: Scalars['Int'];
-  /** The window legnth to consider for the referral program */
-  windowLength: Scalars['Int'];
+  changes: ReferralProgram;
 };
 
 /** Update an existing spot market on Vega */

libs/types/src/global-types-mappings.ts

@@ -1,4 +1,9 @@
-import type { ConditionOperator, PeggedReference } from './__generated__/types';
+import type {
+  ConditionOperator,
+  GovernanceTransferKind,
+  GovernanceTransferType,
+  PeggedReference,
+} from './__generated__/types';
 import type { AccountType } from './__generated__/types';
 import type {
   AuctionTrigger,
@@ -519,6 +524,34 @@ export const DescriptionTransferTypeMapping: TransferTypeMap = {
   TRANSFER_TYPE_SUCCESSOR_INSURANCE_FRACTION: 'Successor insurance fraction',
 };
 
+/**
+ * Governance transfers
+ */
+type GovernanceTransferTypeMap = {
+  [T in GovernanceTransferType]: string;
+};
+export const GovernanceTransferTypeMapping: GovernanceTransferTypeMap = {
+  GOVERNANCE_TRANSFER_TYPE_ALL_OR_NOTHING: 'All or nothing',
+  GOVERNANCE_TRANSFER_TYPE_BEST_EFFORT: 'Best effort',
+  GOVERNANCE_TRANSFER_TYPE_UNSPECIFIED: 'Unspecified',
+};
+export const DescriptionGovernanceTransferTypeMapping: GovernanceTransferTypeMap =
+  {
+    GOVERNANCE_TRANSFER_TYPE_ALL_OR_NOTHING:
+      'Transfers the specified amount or does not transfer anything',
+    GOVERNANCE_TRANSFER_TYPE_BEST_EFFORT:
+      'Transfers the specified amount or the max allowable amount if this is less than the specified amount',
+    GOVERNANCE_TRANSFER_TYPE_UNSPECIFIED: 'Default value, always invalid',
+  };
+
+type GovernanceTransferKindMap = {
+  [T in NonNullable<GovernanceTransferKind['__typename']>]: string;
+};
+export const GovernanceTransferKindMapping: GovernanceTransferKindMap = {
+  OneOffGovernanceTransfer: 'One off',
+  RecurringGovernanceTransfer: 'Recurring',
+};
+
 type DispatchMetricLabel = {
   [T in DispatchMetric]: string;
 };

libs/ui-toolkit/src/components/copy-with-tooltip/copy-with-tooltip.tsx

@@ -15,7 +15,7 @@ export function CopyWithTooltip({ children, text }: CopyWithTooltipProps) {
 
   return (
     <CopyToClipboard text={text} onCopy={() => setCopied(true)}>
-      {/* Needs this wrapping div as tooltip component interfers with element used to capture click for copy */}
+      {/* Needs this wrapping div as tooltip component interferes with element used to capture click for copy */}
       <span>
         <Tooltip description="Copied" open={copied} align="center">
           {children}

libs/wallet/src/connect-dialog/injected-connector-form.tsx

@@ -131,7 +131,12 @@ const Error = ({
   );
 
   if (error) {
-    if (error.message === InjectedConnectorErrors.INVALID_CHAIN.message) {
+    if (error.message === InjectedConnectorErrors.USER_REJECTED.message) {
+      title = t('User rejected');
+      text = t('The user rejected the wallet connection');
+    } else if (
+      error.message === InjectedConnectorErrors.INVALID_CHAIN.message
+    ) {
       title = t('Wrong network');
       text = t(
         'To complete your wallet connection, set your wallet network in your app to "%s".',

libs/wallet/src/connectors/injected-connector.ts

@@ -42,6 +42,7 @@ declare global {
 }
 
 export const InjectedConnectorErrors = {
+  USER_REJECTED: new Error('Connection denied'),
   VEGA_UNDEFINED: new Error('window.vega not found'),
   INVALID_CHAIN: new Error('Invalid chain'),
 };

package.json

@@ -71,7 +71,7 @@
     "jsondiffpatch": "^0.4.1",
     "lodash": "^4.17.21",
     "next": "13.3.0",
-    "pennant": "1.12.0",
+    "pennant": "1.13.2",
     "react": "18.2.0",
     "react-copy-to-clipboard": "^5.0.4",
     "react-dom": "18.2.0",

yarn.lock

@@ -20500,10 +20500,10 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
-pennant@1.12.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.12.0.tgz#e12707d5f1aac554d81bad060637e608335e0b50"
-  integrity sha512-xosg5erRf+Ke9iORdqyv+SOGcD3uJX1dgf990q1DvHuzz36w2txCZsfnvcXhRO++HYVKS9sU/YLPRLJgolFGtA==
+pennant@1.13.2:
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.13.2.tgz#8ae0cf23ecee35a7e8baddaa9477e94006581e3b"
+  integrity sha512-gdzTUfuvR3Jse247+++mUdJJcDrExtoxljZ6TjVjnvOD7Y0Cx7yiA47VKzztcw5JmoEHbMoDeX3ySznAjIpi7Q==
   dependencies:
     "@babel/runtime" "^7.13.10"
     "@d3fc/d3fc-technical-indicator" "^8.0.1"