feat(ci): try again running on ubuntu

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

@@ -7,7 +7,7 @@ on:
 jobs:
   after-release:
     runs-on: ubuntu-22.04
-    timeout-minutes: 45
+    timeout-minutes: 30
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -30,20 +30,18 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Wait for publish to complete
-        uses: lewagon/wait-on-check-action@v1.3.1
-        with:
-          ref: ${{ github.event.release.tag_name }}
-          check-name: '(CD) publish dist / trading'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          wait-interval: 10
-
       - name: resolve ipfs hashes for release
         run: |
           echo "Name: ${{ github.event.release.name }}"
           echo "Description: ${{ github.event.release.body }}"
           echo "Tag: ${{ github.event.release.tag_name }}"
-          docker run --rm vegaprotocol/trading:mainnet cat /ipfs-hash > ipfs-hash
+          commit="$(git rev-list -n 1 ${{ github.event.release.tag_name }})"
+          echo "Commit: $commit"
+          until docker pull vegaprotocol/trading:$commit; do
+            echo "Image not pushed yet, waiting 60 seconds"
+            sleep 60
+          done
+          docker run --rm vegaprotocol/trading:$commit cat /ipfs-hash > ipfs-hash
           curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
           tar -xzf kubo.tgz
           export PATH="$PATH:$PWD/kubo"

.github/workflows/publish-dist.yml

@@ -36,7 +36,7 @@ jobs:
           echo IS_PR=true >> $GITHUB_ENV
 
       - name: Is mainnet release
-        if: ${{ contains(github.ref, 'release/mainnet') && !contains(github.ref, 'mirror') }}
+        if: ${{ contains(github.ref, 'release/mainnnet') && !contains(github.ref, 'mirror') }}
         run: |
           echo IS_MAINNET_RELEASE=true >> $GITHUB_ENV
 
@@ -118,12 +118,8 @@ jobs:
           elif [ "${{ matrix.app }}" = "ui-toolkit" ]; then
             NODE_ENV=production yarn nx run ui-toolkit:build-storybook
             DIST_LOCATION=dist/storybook/ui-toolkit
-          elif [ "${{ matrix.app }}" = "static" ]; then
-            yarn nx build static || (yarn install && yarn nx build static)
           else
             $envCmd yarn nx build ${{ matrix.app }} || (yarn install && $envCmd yarn nx build ${{ matrix.app }})
-          fi
-          if [[ -z "$DIST_LOCATION" ]]; then
             DIST_LOCATION=dist/apps/${{ matrix.app }}
           fi
           mv $DIST_LOCATION dist-result

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

@@ -7,11 +7,7 @@ context('Validator page', { tags: '@smoke' }, function () {
     it('should be able to see validator tiles', function () {
       cy.getNodes().then((nodes) => {
         nodes.forEach((node) => {
-          if (node.rankingScore.performanceScore > 0) {
-            cy.get(`[validator-id="${node.id}"]`).should('be.visible');
-          } else {
-            cy.get(`[validator-id="${node.id}"]`).should('not.exist');
-          }
+          cy.get(`[validator-id="${node.id}"]`).should('be.visible');
         });
       });
     });

apps/explorer/src/app/routes/validators/Nodes.graphql

@@ -15,9 +15,6 @@ query ExplorerNodes {
         stakedByDelegates
         stakedTotal
         pendingStake
-        rankingScore {
-          performanceScore
-        }
         epochData {
           total
           offline

apps/explorer/src/app/routes/validators/__generated__/Nodes.ts

@@ -6,7 +6,7 @@ const defaultOptions = {} as const;
 export type ExplorerNodesQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type ExplorerNodesQuery = { __typename?: 'Query', nodesConnection: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, name: string, infoUrl: string, avatarUrl?: string | null, pubkey: string, tmPubkey: string, ethereumAddress: string, location: string, status: Types.NodeStatus, stakedByOperator: string, stakedByDelegates: string, stakedTotal: string, pendingStake: string, rankingScore: { __typename?: 'RankingScore', performanceScore: string }, epochData?: { __typename?: 'EpochData', total: number, offline: number, online: number } | null } } | null> | null } };
+export type ExplorerNodesQuery = { __typename?: 'Query', nodesConnection: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, name: string, infoUrl: string, avatarUrl?: string | null, pubkey: string, tmPubkey: string, ethereumAddress: string, location: string, status: Types.NodeStatus, stakedByOperator: string, stakedByDelegates: string, stakedTotal: string, pendingStake: string, epochData?: { __typename?: 'EpochData', total: number, offline: number, online: number } | null } } | null> | null } };
 
 
 export const ExplorerNodesDocument = gql`
@@ -27,9 +27,6 @@ export const ExplorerNodesDocument = gql`
         stakedByDelegates
         stakedTotal
         pendingStake
-        rankingScore {
-          performanceScore
-        }
         epochData {
           total
           offline

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

@@ -91,15 +91,7 @@ export const ValidatorsPage = () => {
   const { data: tmData } = useTendermintValidators(5000);
   const { data, loading, error, refetch } = useExplorerNodesQuery();
 
-  const validators = compact(
-    data?.nodesConnection.edges
-      ?.map((e) => e?.node)
-      .filter(
-        (node) =>
-          node?.rankingScore?.performanceScore &&
-          new BigNumber(node.rankingScore.performanceScore).isGreaterThan(0)
-      )
-  );
+  const validators = compact(data?.nodesConnection.edges?.map((e) => e?.node));
 
   // voting power
   const powers = compact(tmData?.result.validators).map(

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

@@ -218,33 +218,17 @@ describe(
       getProposalInformationFromTable('Tokens for proposal')
         .should('have.text', (1).toFixed(2))
         .and('be.visible');
-      navigateTo(navigation.proposals);
-      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() => {
-          // 3002-PROP-021
-          cy.getByTestId('user-voted-yes').should('exist');
-          cy.getByTestId(viewProposalButton).click();
-        });
-      });
       cy.getByTestId(changeVoteButton).should('be.visible').click();
       voteForProposal('against');
       cy.getByTestId(proposalVoteProgressAgainstPercentage)
         .contains('100.00%')
         .and('be.visible');
-      cy.getByTestId(voteBreakdownToggle).click();
       getProposalInformationFromTable('Tokens against proposal')
         .should('have.text', (1).toFixed(2))
         .and('be.visible');
       getProposalInformationFromTable('Number of voting parties')
         .should('have.text', '1')
         .and('be.visible');
-      navigateTo(navigation.proposals);
-      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() => {
-          cy.getByTestId('user-voted-no').should('exist');
-          cy.getByTestId(viewProposalButton).click();
-        });
-      });
     });
 
     // 3001-VOTE-042, 3001-VOTE-057, 3001-VOTE-058, 3001-VOTE-059, 3001-VOTE-060

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

@@ -26,8 +26,6 @@ const votesTable = 'votes-table';
 const openProposals = 'open-proposals';
 const proposalVoteProgressForPercentage =
   'vote-progress-indicator-percentage-for';
-const majorityVoteReached = 'majority-reached';
-const minParticipationReached = 'participation-reached';
 const proposalTimeout = { timeout: 8000 };
 
 context(
@@ -74,7 +72,7 @@ context(
       });
     });
 
-    // 3001-VOTE-020 3001-VOTE-021 3001-VOTE-046 3001-VOTE-044 3001-VOTE-074 3001-VOTE-074
+    // 3001-VOTE-046 3001-VOTE-044 3001-VOTE-074 3001-VOTE-074
     it('Able to enact proposal by voting', function () {
       const proposalTitle = 'Add New proposal with short enactment';
       const proposalTx = createUpdateNetworkProposalTxBody();
@@ -87,18 +85,10 @@ context(
         cy.contains(proposalTitle)
           .parentsUntil(proposalListItem)
           .last()
-          .within(() => {
-            // 3001-VOTE-019 time to vote is highlighted red
-            cy.getByTestId('vote-details')
-              .find('span')
-              .should('have.class', 'text-vega-pink');
-            cy.getByTestId(viewProposalButton).click();
-          });
+          .within(() => cy.getByTestId(viewProposalButton).click());
       });
       cy.getByTestId(proposalStatus).should('have.text', 'Open');
       voteForProposal('for');
-      cy.getByTestId(majorityVoteReached).should('exist');
-      cy.getByTestId(minParticipationReached).should('exist');
       cy.getByTestId(proposalStatus, proposalTimeout)
         .should('have.text', 'Passed')
         .then(() => {
@@ -114,14 +104,6 @@ context(
       cy.getByTestId(proposalVoteProgressForPercentage)
         .contains('100.00%')
         .and('be.visible');
-      navigateTo(navigation.proposals);
-      cy.contains(proposalTitle)
-        .parentsUntil(proposalListItem)
-        .last()
-        .within(() => {
-          cy.getByTestId(majorityVoteReached).should('exist');
-          cy.getByTestId(minParticipationReached).should('exist');
-        });
     });
 
     // 3001-VOTE-047

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

@@ -49,8 +49,8 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     navigateTo(navigation.proposals);
   });
 
-  // 3001-VOTE-018
   it('Newly created proposals list - proposals closest to closing date appear higher in list', function () {
+    // 3001-VOTE-005
     const proposalDays = [364, 50, 2];
     for (let index = 0; index < proposalDays.length; index++) {
       goToMakeNewProposal(governanceProposalType.RAW);
@@ -120,24 +120,16 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     submitUniqueRawProposal({ proposalTitle: proposalTitle });
     getProposalFromTitle(proposalTitle).within(() => {
       // 3001-VOTE-039
-      cy.getByTestId('participation-not-reached').should(
+      cy.getByTestId(voteStatus).should(
         'have.text',
-        'Min. participation not reached'
+        'Participation not reached'
       );
       cy.getByTestId(viewProposalButton).click();
     });
     voteForProposal('for');
     navigateTo(navigation.proposals);
     getProposalFromTitle(proposalTitle).within(() => {
-      cy.getByTestId(voteStatus).should(
-        'have.text',
-        'Currently expected to  pass'
-      );
-      cy.getByTestId('user-voted-yes').should('exist');
-      cy.getByTestId('participation-reached').should(
-        'have.text',
-        'Min. participation reached'
-      );
+      cy.getByTestId(voteStatus).should('have.text', 'Set to pass');
       cy.getByTestId(viewProposalButton).click();
     });
     cy.getByTestId(voteBreakDownToggle).click();

apps/governance-e2e/src/integration/flow/token-association-flow.cy.ts

@@ -351,12 +351,6 @@ context(
         );
         stakingPageDisassociateAllTokens();
       });
-
-      it('Able to associate over 1 million tokens', function () {
-        cy.get(ethWalletAssociateButton).click();
-        stakingPageAssociateTokens('2000000', { approve: true });
-        stakingPageDisassociateAllTokens();
-      });
     });
   }
 );

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

@@ -17,7 +17,6 @@ const governanceDocsUrl = 'https://vega.xyz/governance';
 const networkUpgradeProposalListItem = 'protocol-upgrade-proposals-list-item';
 const closedProposals = 'closed-proposals';
 const closedProposalToggle = 'closed-proposals-toggle-networkUpgrades';
-const protocolUpgradeTime = 'protocol-upgrade-time';
 
 context(
   'Governance Page - verify elements on page',
@@ -175,7 +174,6 @@ context(
       });
     });
 
-    // 3009-NTWU-003 3009-NTWU-004 3009-NTWU-007
     it('should see details of network upgrade proposal', function () {
       mockNetworkUpgradeProposal();
       navigateTo(navigation.proposals);
@@ -230,7 +228,6 @@ context(
       cy.getByTestId(closedProposalToggle).should('not.exist');
     });
 
-    // 3009-NTWU-001 3009-NTWU-002 3009-NTWU-006 3009-NTWU-009
     it('should display network upgrade banner with estimate', function () {
       mockNetworkUpgradeProposal();
       cy.visit('/');
@@ -262,18 +259,10 @@ context(
         .as('displayedEstimate');
       cy.get('@displayedEstimate').then((estimateText) => {
         // Estimated time should automatically update every second
-        cy.getByTestId(protocolUpgradeTime)
+        cy.getByTestId('protocol-upgrade-time')
           .invoke('text')
           .should('not.eq', estimateText);
       });
-      // time estimate on proposal detail
-      cy.getByTestId('protocol-upgrade-proposal').within(() => {
-        cy.get('@displayedEstimate').then((estimateText) => {
-          cy.getByTestId(protocolUpgradeTime)
-            .invoke('text')
-            .should('not.eq', estimateText);
-        });
-      });
     });
   }
 );

apps/governance/.env

@@ -16,6 +16,7 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
 
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
@@ -25,4 +26,4 @@ CYPRESS_FAIRGROUND=false
 LC_ALL="en_US.UTF-8"
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=true

apps/governance/.env.capsule

@@ -17,6 +17,7 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
+NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
@@ -25,4 +26,4 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 CYPRESS_FAIRGROUND=false
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=false

apps/governance/.env.devnet

@@ -11,10 +11,11 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 
 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=true

apps/governance/.env.mainnet

@@ -13,9 +13,10 @@ NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
+NX_VEGA_REST_URL=https://api.vega.community/api/v2/
 
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=false

apps/governance/.env.mainnet-mirror

@@ -12,9 +12,10 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-mirror-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
+NX_VEGA_REST_URL=https://api.mainnet-mirror.vega.rocks/api/v2/
 
 NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=false

apps/governance/.env.stagnet1

@@ -8,9 +8,10 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
 
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=true

apps/governance/.env.testnet

@@ -12,10 +12,11 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_SUCCESSOR_MARKETS=true

apps/governance/.env.validators-testnet

@@ -9,10 +9,11 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 
 NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.
 
 # Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_SUCCESSOR_MARKETS=false

apps/governance/src/components/json-diff/index.ts

@@ -1 +0,0 @@
-export * from './json-diff';

apps/governance/src/components/json-diff/json-diff.spec.tsx

@@ -1,30 +0,0 @@
-import { render, screen, cleanup } from '@testing-library/react';
-import { JsonDiff } from './json-diff';
-
-describe('JsonDiff', () => {
-  afterEach(cleanup);
-
-  it('renders without crashing', () => {
-    render(<JsonDiff left={{}} right={{}} />);
-    expect(screen.getByTestId('json-diff')).toBeInTheDocument();
-  });
-
-  it('shows the correct message when both objects are identical', () => {
-    render(<JsonDiff left={{}} right={{}} />);
-    expect(screen.getByText('Data is identical')).toBeInTheDocument();
-  });
-
-  it('does not show the "identical" message when both objects are not identical', () => {
-    render(
-      <JsonDiff
-        left={{
-          name: 'test',
-        }}
-        right={{
-          name: 'test2',
-        }}
-      />
-    );
-    expect(screen.queryByText('Data is identical')).not.toBeInTheDocument();
-  });
-});

apps/governance/src/components/json-diff/json-diff.tsx

@@ -1,46 +0,0 @@
-import { useState, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-import { formatters, create } from 'jsondiffpatch';
-import 'jsondiffpatch/dist/formatters-styles/html.css';
-import 'jsondiffpatch/dist/formatters-styles/annotated.css';
-
-export type JsonValue =
-  | string
-  | number
-  | boolean
-  | null
-  | JsonValue[]
-  | { [key: string]: JsonValue };
-
-interface JsonDiffProps {
-  left: JsonValue;
-  right: JsonValue;
-  objectHash?: (obj: unknown) => string | undefined;
-}
-
-export const JsonDiff = ({ right, left, objectHash }: JsonDiffProps) => {
-  const { t } = useTranslation();
-  const [html, setHtml] = useState<string | undefined>();
-
-  useEffect(() => {
-    const delta = create({
-      objectHash,
-    }).diff(left, right);
-
-    if (delta) {
-      const deltaHtml = formatters.html.format(delta, left);
-
-      formatters.html.hideUnchanged();
-
-      setHtml(deltaHtml);
-    } else {
-      setHtml(undefined);
-    }
-  }, [right, left, objectHash]);
-
-  return html ? (
-    <div data-testid="json-diff" dangerouslySetInnerHTML={{ __html: html }} />
-  ) : (
-    <p data-testid="json-diff">{t('dataIsIdentical')}</p>
-  );
-};

apps/governance/src/config/env.ts

@@ -66,6 +66,7 @@ export const ENV = {
   ethWalletMnemonic: windowOrDefault('NX_ETH_WALLET_MNEMONIC'),
   localProviderUrl: windowOrDefault('NX_LOCAL_PROVIDER_URL'),
   delegationsPagination: windowOrDefault('NX_DELEGATIONS_PAGINATION'),
+  rest: windowOrDefault('NX_VEGA_REST_URL'),
   addresses:
     ContractAddresses[(envName === 'local' ? 'CUSTOM' : envName) as Networks],
 };

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

@@ -853,7 +853,5 @@
   "consensusNodes": "consensus nodes",
   "activeNodes": "active nodes",
   "Estimated time to upgrade": "Estimated time to upgrade",
-  "Upgraded at": "Upgraded at",
-  "dataIsIdentical": "Data is identical",
-  "updatesToMarket": "Updates to market"
+  "Upgraded at": "Upgraded at"
 }

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

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

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

@@ -1,91 +0,0 @@
-import { render, fireEvent } from '@testing-library/react';
-import {
-  ProposalMarketChanges,
-  applyImmutableKeysFromEarlierVersion,
-} from './proposal-market-changes';
-import type { JsonValue } from '../../../../components/json-diff';
-
-describe('applyImmutableKeysFromEarlierVersion', () => {
-  it('returns an empty object if any argument is not an object or null', () => {
-    const earlierVersion: JsonValue = null;
-    const updatedVersion: JsonValue = null;
-    expect(
-      applyImmutableKeysFromEarlierVersion(earlierVersion, updatedVersion)
-    ).toEqual({});
-  });
-
-  it('overrides updatedVersion with values from earlierVersion for immutable keys', () => {
-    const earlierVersion: JsonValue = {
-      decimalPlaces: 2,
-      positionDecimalPlaces: 3,
-      instrument: {
-        name: 'Instrument1',
-        future: {
-          settlementAsset: 'Asset1',
-        },
-      },
-    };
-
-    const updatedVersion: JsonValue = {
-      decimalPlaces: 3, // should be overridden by 2
-      positionDecimalPlaces: 4, // should be overridden by 3
-      instrument: {
-        name: 'Instrument2', // should be overridden by 'Instrument1'
-        future: {
-          settlementAsset: 'Asset2', // should be overridden by 'Asset1'
-        },
-      },
-    };
-
-    const expected: JsonValue = {
-      decimalPlaces: 2,
-      positionDecimalPlaces: 3,
-      instrument: {
-        name: 'Instrument1',
-        future: {
-          settlementAsset: 'Asset1',
-        },
-      },
-    };
-
-    expect(
-      applyImmutableKeysFromEarlierVersion(earlierVersion, updatedVersion)
-    ).toEqual(expected);
-  });
-});
-
-describe('ProposalMarketChanges', () => {
-  it('renders correctly', () => {
-    const { getByTestId } = render(
-      <ProposalMarketChanges
-        originalProposal={{}}
-        latestEnactedProposal={{}}
-        updatedProposal={{}}
-      />
-    );
-    expect(getByTestId('proposal-market-changes')).toBeInTheDocument();
-  });
-
-  it('JsonDiff is not visible when showChanges is false', () => {
-    const { queryByTestId } = render(
-      <ProposalMarketChanges
-        originalProposal={{}}
-        latestEnactedProposal={{}}
-        updatedProposal={{}}
-      />
-    );
-    expect(queryByTestId('json-diff')).not.toBeInTheDocument();
-  });
-
-  it('JsonDiff is visible when showChanges is true', async () => {
-    const { getByTestId } = render(
-      <ProposalMarketChanges
-        originalProposal={{}}
-        latestEnactedProposal={{}}
-        updatedProposal={{}}
-      />
-    );
-    fireEvent.click(getByTestId('proposal-market-changes-toggle'));
-    expect(getByTestId('json-diff')).toBeInTheDocument();
-  });
-});

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

@@ -1,86 +0,0 @@
-import cloneDeep from 'lodash/cloneDeep';
-import set from 'lodash/set';
-import get from 'lodash/get';
-import { JsonDiff } from '../../../../components/json-diff';
-import { useTranslation } from 'react-i18next';
-import { useState } from 'react';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import { SubHeading } from '../../../../components/heading';
-import type { JsonValue } from '../../../../components/json-diff';
-
-const immutableKeys = [
-  'decimalPlaces',
-  'positionDecimalPlaces',
-  'instrument.name',
-  'instrument.future.settlementAsset',
-];
-
-export const applyImmutableKeysFromEarlierVersion = (
-  earlierVersion: JsonValue,
-  updatedVersion: JsonValue
-) => {
-  if (
-    typeof earlierVersion !== 'object' ||
-    earlierVersion === null ||
-    typeof updatedVersion !== 'object' ||
-    updatedVersion === null
-  ) {
-    // If either version is not an object or is null, return null or throw an error
-    return {};
-  }
-
-  const updatedVersionCopy = cloneDeep(updatedVersion);
-
-  // Overwrite the immutable keys in the updatedVersionCopy with the earlier values
-  immutableKeys.forEach((key) => {
-    set(updatedVersionCopy, key, get(earlierVersion, key));
-  });
-
-  return updatedVersionCopy;
-};
-
-interface ProposalMarketChangesProps {
-  originalProposal: JsonValue;
-  latestEnactedProposal: JsonValue | undefined;
-  updatedProposal: JsonValue;
-}
-
-export const ProposalMarketChanges = ({
-  originalProposal,
-  latestEnactedProposal,
-  updatedProposal,
-}: ProposalMarketChangesProps) => {
-  const { t } = useTranslation();
-  const [showChanges, setShowChanges] = useState(false);
-
-  return (
-    <section data-testid="proposal-market-changes">
-      <CollapsibleToggle
-        toggleState={showChanges}
-        setToggleState={setShowChanges}
-        dataTestId={'proposal-market-changes-toggle'}
-      >
-        <SubHeading title={t('updatesToMarket')} />
-      </CollapsibleToggle>
-
-      {showChanges && (
-        <div className="mb-6">
-          <JsonDiff
-            left={latestEnactedProposal || originalProposal}
-            right={
-              latestEnactedProposal
-                ? applyImmutableKeysFromEarlierVersion(
-                    latestEnactedProposal,
-                    updatedProposal
-                  )
-                : applyImmutableKeysFromEarlierVersion(
-                    originalProposal,
-                    updatedProposal
-                  )
-            }
-          />
-        </div>
-      )}
-    </section>
-  );
-};

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

@@ -17,7 +17,6 @@ import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import type { AssetQuery } from '@vegaprotocol/assets';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { ProposalState } from '@vegaprotocol/types';
-import { ProposalMarketChanges } from '../proposal-market-changes';
 import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
 
 export enum ProposalType {
@@ -35,10 +34,6 @@ export interface ProposalProps {
   assetData?: AssetQuery | null;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   restData: any;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  originalMarketProposalRestData?: any;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  mostRecentlyEnactedAssociatedMarketProposal?: any;
 }
 
 export const Proposal = ({
@@ -47,8 +42,6 @@ export const Proposal = ({
   restData,
   newMarketData,
   assetData,
-  originalMarketProposalRestData,
-  mostRecentlyEnactedAssociatedMarketProposal,
 }: ProposalProps) => {
   const { t } = useTranslation();
 
@@ -161,24 +154,6 @@ export const Proposal = ({
           </div>
         )}
 
-        {proposal.terms.change.__typename === 'UpdateMarket' && (
-          <div className="mb-4">
-            <ProposalMarketChanges
-              originalProposal={
-                originalMarketProposalRestData?.data?.proposal?.terms?.newMarket
-                  ?.changes || {}
-              }
-              latestEnactedProposal={
-                mostRecentlyEnactedAssociatedMarketProposal?.node?.proposal
-                  ?.terms?.updateMarket?.changes || {}
-              }
-              updatedProposal={
-                restData?.data?.proposal?.terms?.updateMarket?.changes || {}
-              }
-            />
-          </div>
-        )}
-
         {(proposal.terms.change.__typename === 'NewAsset' ||
           proposal.terms.change.__typename === 'UpdateAsset') &&
           asset && (

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

@@ -1,11 +1,12 @@
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import { useEffect, useState } from 'react';
+import { useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 
 import { Proposal } from '../components/proposal';
 import { ProposalNotFound } from '../components/proposal-not-found';
 import { useProposalQuery } from './__generated__/Proposal';
 import { useFetch } from '@vegaprotocol/react-helpers';
+import { ENV } from '../../../config';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
 import { useAssetQuery } from '@vegaprotocol/assets';
@@ -13,17 +14,9 @@ import {
   NetworkParams,
   useNetworkParams,
 } from '@vegaprotocol/network-parameters';
-import { useEnvironment } from '@vegaprotocol/environment';
 
 export const ProposalContainer = () => {
-  const { VEGA_REST_URL } = useEnvironment();
-  const REST_ENDPOINT = VEGA_REST_URL;
-  const [
-    mostRecentlyEnactedAssociatedMarketProposal,
-    setMostRecentlyEnactedAssociatedMarketProposal,
-  ] = useState(undefined);
   const params = useParams<{ proposalId: string }>();
-
   const {
     params: networkParams,
     loading: networkParamsLoading,
@@ -44,11 +37,9 @@ export const ProposalContainer = () => {
     NetworkParams.governance_proposal_updateNetParam_requiredMajority,
     NetworkParams.governance_proposal_freeform_requiredMajority,
   ]);
-
   const {
-    state: { data: restData, loading: restLoading, error: restError },
-  } = useFetch(`${REST_ENDPOINT}governance?proposalId=${params.proposalId}`);
-
+    state: { data: restData },
+  } = useFetch(`${ENV.rest}governance?proposalId=${params.proposalId}`);
   const { data, loading, error, refetch } = useProposalQuery({
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',
@@ -56,35 +47,6 @@ export const ProposalContainer = () => {
     skip: !params.proposalId,
   });
 
-  const {
-    state: {
-      data: originalMarketProposalRestData,
-      loading: originalMarketProposalRestLoading,
-      error: originalMarketProposalRestError,
-    },
-  } = useFetch(
-    `${REST_ENDPOINT}governance?proposalId=${
-      data?.proposal?.terms.change.__typename === 'UpdateMarket' &&
-      data?.proposal.terms.change.marketId
-    }`,
-    undefined,
-    true,
-    data?.proposal?.terms.change.__typename !== 'UpdateMarket'
-  );
-
-  const {
-    state: {
-      data: previouslyEnactedMarketProposalsRestData,
-      loading: previouslyEnactedMarketProposalsRestLoading,
-      error: previouslyEnactedMarketProposalsRestError,
-    },
-  } = useFetch(
-    `${REST_ENDPOINT}governances?proposalState=STATE_ENACTED&proposalType=TYPE_UPDATE_MARKET`,
-    undefined,
-    true,
-    data?.proposal?.terms.change.__typename !== 'UpdateMarket'
-  );
-
   const {
     data: newMarketData,
     loading: newMarketLoading,
@@ -117,39 +79,6 @@ export const ProposalContainer = () => {
     ),
   });
 
-  useEffect(() => {
-    if (
-      previouslyEnactedMarketProposalsRestData &&
-      data?.proposal?.terms.change.__typename === 'UpdateMarket'
-    ) {
-      const change = data?.proposal?.terms?.change as { marketId: string };
-
-      const filteredProposals =
-        // @ts-ignore rest data is not typed
-        previouslyEnactedMarketProposalsRestData.connection.edges.filter(
-          // @ts-ignore rest data is not typed
-          ({ node }) =>
-            node?.proposal?.terms?.updateMarket?.marketId === change.marketId
-        );
-
-      const sortedProposals = filteredProposals.sort(
-        // @ts-ignore rest data is not typed
-        (a, b) =>
-          new Date(a?.node?.terms?.enactmentTimestamp).getTime() -
-          new Date(b?.node?.terms?.enactmentTimestamp).getTime()
-      );
-
-      setMostRecentlyEnactedAssociatedMarketProposal(
-        sortedProposals[sortedProposals.length - 1]
-      );
-    }
-  }, [
-    previouslyEnactedMarketProposalsRestData,
-    params.proposalId,
-    data?.proposal?.terms.change.__typename,
-    data?.proposal?.terms.change,
-  ]);
-
   useEffect(() => {
     const interval = setInterval(refetch, 2000);
     return () => clearInterval(interval);
@@ -158,39 +87,14 @@ export const ProposalContainer = () => {
   return (
     <AsyncRenderer
       loading={
-        loading ||
-        newMarketLoading ||
-        assetLoading ||
-        networkParamsLoading ||
-        (restLoading ? (restLoading as boolean) : false) ||
-        (originalMarketProposalRestLoading
-          ? (originalMarketProposalRestLoading as boolean)
-          : false) ||
-        (previouslyEnactedMarketProposalsRestLoading
-          ? (previouslyEnactedMarketProposalsRestLoading as boolean)
-          : false)
-      }
-      error={
-        error ||
-        newMarketError ||
-        assetError ||
-        restError ||
-        originalMarketProposalRestError ||
-        previouslyEnactedMarketProposalsRestError ||
-        networkParamsError
+        loading || newMarketLoading || assetLoading || networkParamsLoading
       }
+      error={error || newMarketError || assetError || networkParamsError}
       data={{
         ...data,
         ...networkParams,
         ...(newMarketData ? { newMarketData } : {}),
         ...(assetData ? { assetData } : {}),
-        ...(restData ? { restData } : {}),
-        ...(originalMarketProposalRestData
-          ? { originalMarketProposalRestData }
-          : {}),
-        ...(previouslyEnactedMarketProposalsRestData
-          ? { previouslyEnactedMarketProposalsRestData }
-          : {}),
       }}
     >
       {data?.proposal ? (
@@ -200,10 +104,6 @@ export const ProposalContainer = () => {
           restData={restData}
           newMarketData={newMarketData}
           assetData={assetData}
-          originalMarketProposalRestData={originalMarketProposalRestData}
-          mostRecentlyEnactedAssociatedMarketProposal={
-            mostRecentlyEnactedAssociatedMarketProposal
-          }
         />
       ) : (
         <ProposalNotFound />

apps/governance/src/routes/staking/associate/wallet-associate.tsx

@@ -8,10 +8,9 @@ import { TxState } from '../../../hooks/transaction-reducer';
 import { useTransaction } from '../../../hooks/use-transaction';
 import { BigNumber } from '../../../lib/bignumber';
 import { AssociateInfo } from './associate-info';
-import { toBigNum } from '@vegaprotocol/utils';
+import { removeDecimal, toBigNum } from '@vegaprotocol/utils';
 import type { EthereumConfig } from '@vegaprotocol/web3';
 import { useBalances } from '../../../lib/balances/balances-store';
-import { MaxUint256 } from '@ethersproject/constants';
 
 export const WalletAssociate = ({
   perform,
@@ -43,7 +42,7 @@ export const WalletAssociate = ({
   } = useTransaction(() => {
     return token.approve(
       ethereumConfig.staking_bridge_contract.address,
-      MaxUint256.toString()
+      removeDecimal('1000000', decimals).toString()
     );
   });
 

apps/governance/src/styles.css

@@ -62,7 +62,7 @@
   cursor: pointer;
 }
 
-/* Styles required to (effectively) un-override the
+/* Styles required to (effectively) un-override the 
  * reset styles so that the Proposal description fields
  * render as you'd expect them to.
  *
@@ -97,33 +97,3 @@
 .react-markdown-container ul li {
   list-style: circle;
 }
-
-.jsondiffpatch-delta,
-.jsondiffpatch-delta pre {
-  font-family: 'Roboto Mono', monospace !important;
-}
-
-.jsondiffpatch-delta pre {
-  padding: 0 0.25em !important;
-}
-
-.jsondiffpatch-added .jsondiffpatch-property-name,
-.jsondiffpatch-added .jsondiffpatch-value pre,
-.jsondiffpatch-modified .jsondiffpatch-right-value pre,
-.jsondiffpatch-textdiff-added {
-  background: theme(colors.vega.green[650]) !important;
-  color: theme(colors.white) !important;
-}
-
-.jsondiffpatch-deleted .jsondiffpatch-property-name,
-.jsondiffpatch-deleted pre,
-.jsondiffpatch-modified .jsondiffpatch-left-value pre,
-.jsondiffpatch-textdiff-deleted {
-  background: theme(colors.vega.pink[650]) !important;
-  color: theme(colors.white) !important;
-}
-
-.jsondiffpatch-moved .jsondiffpatch-moved-destination {
-  background: theme(colors.vega.yellow[350]) !important;
-  color: theme(colors.vega.dark[200]) !important;
-}

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

@@ -127,7 +127,7 @@ describe(
         {
           name: 'Price monitoring bounds',
           infoText:
-            'Price Monitoring Bounds 1: Min 162.56291Max 182.96869Reference 172.47489',
+            'Price Monitoring Bounds: Min 162.56291Max 182.96869Reference 172.47489',
         },
       ];
 

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

@@ -17,10 +17,7 @@ import {
   usePaneLayout,
 } from '../../components/resizable-grid';
 import { TradingViews } from './trade-views';
-import {
-  MarketSuccessorBanner,
-  MarketSuccessorProposalBanner,
-} from '../../components/market-banner';
+import { MarketSuccessorBanner } from '../../components/market-banner';
 import { FLAGS } from '@vegaprotocol/environment';
 
 interface TradeGridProps {
@@ -165,12 +162,7 @@ export const TradeGrid = ({ market, pinnedAsset }: TradeGridProps) => {
   return (
     <div className={wrapperClasses}>
       <div>
-        {FLAGS.SUCCESSOR_MARKETS && (
-          <>
-            <MarketSuccessorBanner market={market} />
-            <MarketSuccessorProposalBanner marketId={market?.id} />
-          </>
-        )}
+        {FLAGS.SUCCESSOR_MARKETS && <MarketSuccessorBanner market={market} />}
         <OracleBanner marketId={market?.id || ''} />
       </div>
       <div className="min-h-0 p-0.5">

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

@@ -12,10 +12,7 @@ import { Splash } from '@vegaprotocol/ui-toolkit';
 import { NO_MARKET } from './constants';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import classNames from 'classnames';
-import {
-  MarketSuccessorBanner,
-  MarketSuccessorProposalBanner,
-} from '../../components/market-banner';
+import { MarketSuccessorBanner } from '../../components/market-banner';
 import { FLAGS } from '@vegaprotocol/environment';
 
 interface TradePanelsProps {
@@ -68,12 +65,7 @@ export const TradePanels = ({
   return (
     <div className="h-full grid grid-rows-[min-content_1fr_min-content]">
       <div>
-        {FLAGS.SUCCESSOR_MARKETS && (
-          <>
-            <MarketSuccessorBanner market={market} />
-            <MarketSuccessorProposalBanner marketId={market?.id} />
-          </>
-        )}
+        {FLAGS.SUCCESSOR_MARKETS && <MarketSuccessorBanner market={market} />}
         <OracleBanner marketId={market?.id || ''} />
       </div>
       <div className="h-full">

apps/trading/components/market-banner/index.ts

@@ -1,2 +1 @@
 export * from './market-successor-banner';
-export * from './market-successor-proposal-banner';

apps/trading/components/market-banner/market-successor-proposal-banner.spec.tsx

@@ -1,155 +0,0 @@
-import { act, render, screen, waitFor } from '@testing-library/react';
-import type { SingleExecutionResult } from '@apollo/client';
-import type { MockedResponse } from '@apollo/react-testing';
-import { MockedProvider } from '@apollo/react-testing';
-import { MarketSuccessorProposalBanner } from './market-successor-proposal-banner';
-import type { SuccessorProposalsListQuery } from '@vegaprotocol/proposals';
-import { SuccessorProposalsListDocument } from '@vegaprotocol/proposals';
-
-const marketProposalMock: MockedResponse<SuccessorProposalsListQuery> = {
-  request: {
-    query: SuccessorProposalsListDocument,
-  },
-  result: {
-    data: {
-      proposalsConnection: {
-        edges: [
-          {
-            node: {
-              __typename: 'Proposal',
-              id: 'proposal-1',
-              terms: {
-                __typename: 'ProposalTerms',
-                change: {
-                  __typename: 'NewMarket',
-                  instrument: {
-                    name: 'New proposal of the market successor',
-                  },
-                  successorConfiguration: {
-                    parentMarketId: 'marketId',
-                  },
-                },
-              },
-            },
-          },
-        ],
-      },
-    },
-  },
-};
-
-describe('MarketSuccessorProposalBanner', () => {
-  it('should display single proposal', async () => {
-    render(
-      <MockedProvider mocks={[marketProposalMock]}>
-        <MarketSuccessorProposalBanner marketId="marketId" />
-      </MockedProvider>
-    );
-    await waitFor(() => {
-      expect(
-        screen.getByText('A successors to this market has been proposed')
-      ).toBeInTheDocument();
-    });
-    expect(
-      screen
-        .getByRole('link')
-        .getAttribute('href')
-        ?.endsWith('/proposals/proposal-1') ?? false
-    ).toBe(true);
-  });
-  it('should display plural proposals', async () => {
-    const dualProposalMock = {
-      ...marketProposalMock,
-      result: {
-        ...marketProposalMock.result,
-        data: {
-          proposalsConnection: {
-            edges: [
-              ...((
-                marketProposalMock?.result as SingleExecutionResult<SuccessorProposalsListQuery>
-              )?.data?.proposalsConnection?.edges ?? []),
-              {
-                node: {
-                  __typename: 'Proposal',
-                  id: 'proposal-2',
-                  terms: {
-                    __typename: 'ProposalTerms',
-                    change: {
-                      __typename: 'NewMarket',
-                      instrument: {
-                        name: 'New second proposal of the market successor',
-                      },
-                      successorConfiguration: {
-                        parentMarketId: 'marketId',
-                      },
-                    },
-                  },
-                },
-              },
-            ],
-          },
-        },
-      },
-    };
-
-    render(
-      <MockedProvider mocks={[dualProposalMock]}>
-        <MarketSuccessorProposalBanner marketId="marketId" />
-      </MockedProvider>
-    );
-    await waitFor(() => {
-      expect(
-        screen.getByText('Successors to this market have been proposed')
-      ).toBeInTheDocument();
-    });
-    expect(
-      screen
-        .getAllByRole('link')[0]
-        .getAttribute('href')
-        ?.endsWith('/proposals/proposal-1') ?? false
-    ).toBe(true);
-    expect(
-      screen
-        .getAllByRole('link')[1]
-        .getAttribute('href')
-        ?.endsWith('/proposals/proposal-2') ?? false
-    ).toBe(true);
-  });
-
-  it('banner should be hidden because no proposals', () => {
-    const { container } = render(
-      <MockedProvider>
-        <MarketSuccessorProposalBanner marketId="marketId" />
-      </MockedProvider>
-    );
-    expect(container).toBeEmptyDOMElement();
-  });
-
-  it('banner should be hidden because no proposals for the market', () => {
-    const { container } = render(
-      <MockedProvider mocks={[marketProposalMock]}>
-        <MarketSuccessorProposalBanner marketId="otherMarketId" />
-      </MockedProvider>
-    );
-    expect(container).toBeEmptyDOMElement();
-  });
-
-  it('banner should be hidden after user close click', async () => {
-    const { container } = render(
-      <MockedProvider mocks={[marketProposalMock]}>
-        <MarketSuccessorProposalBanner marketId="marketId" />
-      </MockedProvider>
-    );
-    await waitFor(() => {
-      expect(
-        screen.getByText('A successors to this market has been proposed')
-      ).toBeInTheDocument();
-    });
-    await act(() => {
-      screen.getByTestId('notification-banner-close').click();
-    });
-    await waitFor(() => {
-      expect(container).toBeEmptyDOMElement();
-    });
-  });
-});

apps/trading/components/market-banner/market-successor-proposal-banner.tsx

@@ -1,71 +0,0 @@
-import { useState } from 'react';
-import type {
-  SuccessorProposalListFieldsFragment,
-  NewMarketSuccessorFieldsFragment,
-} from '@vegaprotocol/proposals';
-import { useSuccessorProposalsListQuery } from '@vegaprotocol/proposals';
-import {
-  ExternalLink,
-  Intent,
-  NotificationBanner,
-} from '@vegaprotocol/ui-toolkit';
-import { t } from '@vegaprotocol/i18n';
-import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
-
-export const MarketSuccessorProposalBanner = ({
-  marketId,
-}: {
-  marketId?: string;
-}) => {
-  const { data: proposals } = useSuccessorProposalsListQuery({
-    skip: !marketId,
-  });
-  const successors =
-    proposals?.proposalsConnection?.edges
-      ?.map((item) => item?.node as SuccessorProposalListFieldsFragment)
-      .filter(
-        (item: SuccessorProposalListFieldsFragment) =>
-          (item.terms?.change as NewMarketSuccessorFieldsFragment)
-            ?.successorConfiguration?.parentMarketId === marketId
-      ) ?? [];
-  const [visible, setVisible] = useState(true);
-  const tokenLink = useLinks(DApp.Token);
-  if (visible && successors.length) {
-    return (
-      <NotificationBanner
-        intent={Intent.Primary}
-        onClose={() => {
-          setVisible(false);
-        }}
-      >
-        <div className="uppercase mb-1">
-          {successors.length === 1
-            ? t('A successors to this market has been proposed')
-            : t('Successors to this market have been proposed')}
-        </div>
-        <div>
-          {successors.length === 1
-            ? t('Check out the terms of the proposal and vote:')
-            : t('Check out the terms of the proposals and vote:')}{' '}
-          {successors.map((item, i) => {
-            const externalLink = tokenLink(
-              TOKEN_PROPOSAL.replace(':id', item.id || '')
-            );
-            return (
-              <>
-                <ExternalLink href={externalLink} key={i}>
-                  {
-                    (item.terms?.change as NewMarketSuccessorFieldsFragment)
-                      ?.instrument.name
-                  }
-                </ExternalLink>
-                {i < successors.length - 1 && ', '}
-              </>
-            );
-          })}
-        </div>
-      </NotificationBanner>
-    );
-  }
-  return null;
-};

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

@@ -110,22 +110,25 @@ export class VegaDataSource implements DataSource {
         this._decimalPlaces = data.market.decimalPlaces;
         this._positionDecimalPlaces = data.market.positionDecimalPlaces;
 
-        let priceMonitoringBounds: PriceMonitoringBounds[] | undefined;
+        let priceMonitoringBounds: PriceMonitoringBounds | undefined;
 
-        if (data.market.data.priceMonitoringBounds) {
-          priceMonitoringBounds = data.market.data.priceMonitoringBounds.map(
-            (bounds) => ({
-              maxValidPrice: Number(
-                addDecimal(bounds.maxValidPrice, this._decimalPlaces)
-              ),
-              minValidPrice: Number(
-                addDecimal(bounds.minValidPrice, this._decimalPlaces)
-              ),
-              referencePrice: Number(
-                addDecimal(bounds.referencePrice, this._decimalPlaces)
-              ),
-            })
-          );
+        if (
+          data.market.data.priceMonitoringBounds &&
+          data.market.data.priceMonitoringBounds.length > 0
+        ) {
+          const bounds = data.market.data.priceMonitoringBounds[0];
+
+          priceMonitoringBounds = {
+            maxValidPrice: Number(
+              addDecimal(bounds.maxValidPrice, this._decimalPlaces)
+            ),
+            minValidPrice: Number(
+              addDecimal(bounds.minValidPrice, this._decimalPlaces)
+            ),
+            referencePrice: Number(
+              addDecimal(bounds.referencePrice, this._decimalPlaces)
+            ),
+          };
         }
 
         return {

libs/cypress/src/lib/commands/get-nodes.ts

@@ -29,9 +29,6 @@ export function addGetNodes() {
               location
               name
               pendingStake
-              rankingScore {
-                performanceScore
-              }
               pubkey
               stakedByDelegates
               stakedByOperator

libs/datagrid/src/lib/cells/centered-grid-cell.tsx

@@ -11,6 +11,6 @@ export const CenteredGridCellWrapper = ({
   <div
     className={classNames('flex h-[20px] p-0 justify-items-center', className)}
   >
-    <div className="w-full self-center">{children}</div>
+    <div className="self-center">{children}</div>
   </div>
 );

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

@@ -39,11 +39,6 @@ const VERSION = 1;
 export const STORAGE_KEY = `vega_url_${VERSION}`;
 const SUBSCRIPTION_TIMEOUT = 3000;
 
-const restApiVersion = 'v2';
-function replaceGQLWithRESTUrl(inputURL: string) {
-  return inputURL.replace('/graphql', `/api/${restApiVersion}/`);
-}
-
 export const ENV = compileEnvVars();
 export const FLAGS = compileFeatureFlags();
 
@@ -94,10 +89,6 @@ export const useEnvironment = create<EnvStore>()((set, get) => ({
     if (storedUrl) {
       if (isValidUrl(storedUrl)) {
         set({ VEGA_URL: storedUrl, status: 'success' });
-        set({
-          VEGA_REST_URL: replaceGQLWithRESTUrl(storedUrl),
-          status: 'success',
-        });
         return;
       } else {
         LocalStorage.removeItem(STORAGE_KEY);
@@ -288,10 +279,6 @@ function compileEnvVars() {
   ) as Networks;
   const env: Environment = {
     VEGA_URL: windowOrDefault('VEGA_URL', process.env['NX_VEGA_URL']),
-    VEGA_REST_URL: windowOrDefault(
-      'VEGA_REST_URL',
-      process.env['NX_VEGA_REST_URL']
-    ),
     VEGA_ENV,
     VEGA_CONFIG_URL: windowOrDefault(
       'VEGA_CONFIG_URL',

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

@@ -15,7 +15,6 @@ export enum Networks {
 export const envSchema = z
   .object({
     VEGA_URL: z.optional(z.string()),
-    VEGA_REST_URL: z.optional(z.string()),
     VEGA_WALLET_URL: z.optional(z.string()),
     VEGA_CONFIG_URL: z.optional(z.string()),
     GIT_BRANCH: z.optional(z.string()),

libs/market-depth/src/lib/orderbook-row.tsx

@@ -59,7 +59,6 @@ const CumulativeVol = memo(
   }) => {
     const volume = cumulativeValue ? (
       <NumericCell
-        testId={testId}
         value={cumulativeValue}
         valueFormatted={addDecimalsFixedFormatNumber(
           cumulativeValue,
@@ -70,6 +69,7 @@ const CumulativeVol = memo(
 
     return onClick && volume ? (
       <button
+        data-testid={testId}
         onClick={() => onClick(cumulativeValue)}
         className="hover:dark:bg-neutral-800 hover:bg-neutral-200 text-right pr-1"
       >

libs/markets/src/lib/__generated__/SuccessorMarket.ts

@@ -183,4 +183,4 @@ export function useSuccessorMarketLazyQuery(baseOptions?: Apollo.LazyQueryHookOp
         }
 export type SuccessorMarketQueryHookResult = ReturnType<typeof useSuccessorMarketQuery>;
 export type SuccessorMarketLazyQueryHookResult = ReturnType<typeof useSuccessorMarketLazyQuery>;
-export type SuccessorMarketQueryResult = Apollo.QueryResult<SuccessorMarketQuery, SuccessorMarketQueryVariables>;
+export type SuccessorMarketQueryResult = Apollo.QueryResult<SuccessorMarketQuery, SuccessorMarketQueryVariables>;

libs/proposals/src/components/proposals-list/use-column-defs.tsx

@@ -1,12 +1,7 @@
 import { useMemo } from 'react';
 import BigNumber from 'bignumber.js';
 import type { ColDef } from 'ag-grid-community';
-import {
-  CenteredGridCellWrapper,
-  COL_DEFS,
-  DateRangeFilter,
-  SetFilter,
-} from '@vegaprotocol/datagrid';
+import { COL_DEFS, DateRangeFilter, SetFilter } from '@vegaprotocol/datagrid';
 import compact from 'lodash/compact';
 import { useEnvironment, FLAGS } from '@vegaprotocol/environment';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
@@ -36,6 +31,7 @@ export const useColumnDefs = () => {
     return new BigNumber(requiredMajority).times(100);
   }, [params?.governance_proposal_market_requiredMajority]);
 
+  const cellCss = 'grid h-full items-center';
   const columnDefs: ColDef[] = useMemo(() => {
     return compact([
       {
@@ -98,6 +94,7 @@ export const useColumnDefs = () => {
       {
         colId: 'voting',
         headerName: t('Voting'),
+        cellClass: 'flex justify-between leading-tight font-mono',
         cellRenderer: ({
           data,
         }: VegaICellRendererParams<ProposalListFieldsFragment>) => {
@@ -109,12 +106,12 @@ export const useColumnDefs = () => {
               ? new BigNumber(0)
               : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
             return (
-              <CenteredGridCellWrapper>
+              <div className="uppercase flex h-full items-center justify-center">
                 <VoteProgress
                   threshold={requiredMajorityPercentage}
                   progress={yesPercentage}
                 />
-              </CenteredGridCellWrapper>
+              </div>
             );
           }
           return '-';
@@ -163,6 +160,7 @@ export const useColumnDefs = () => {
   const defaultColDef: ColDef = useMemo(() => {
     return {
       sortable: true,
+      cellClass: cellCss,
       resizable: true,
       filter: true,
       filterParams: { buttons: ['reset'] },

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

@@ -327,33 +327,3 @@ query ProposalsList($proposalType: ProposalType, $inState: ProposalState) {
     }
   }
 }
-
-fragment NewMarketSuccessorFields on NewMarket {
-  instrument {
-    name
-  }
-  successorConfiguration {
-    parentMarketId
-  }
-}
-
-fragment SuccessorProposalListFields on Proposal {
-  id
-  terms {
-    change {
-      ... on NewMarket {
-        ...NewMarketSuccessorFields
-      }
-    }
-  }
-}
-
-query SuccessorProposalsList {
-  proposalsConnection(proposalType: TYPE_NEW_MARKET, inState: STATE_OPEN) {
-    edges {
-      node {
-        ...SuccessorProposalListFields
-      }
-    }
-  }
-}

libs/react-helpers/src/hooks/use-fetch.ts

@@ -21,8 +21,7 @@ type Action<T> =
 export const useFetch = <T>(
   url: string,
   options?: RequestInit,
-  initialFetch = true,
-  skip?: boolean
+  initialFetch = true
 ): {
   state: State<T>;
   refetch: (
@@ -106,10 +105,10 @@ export const useFetch = <T>(
 
   useEffect(() => {
     cancelRequest.current = false;
-    if (initialFetch && !skip) {
+    if (initialFetch) {
       fetchCallback();
     }
-  }, [fetchCallback, initialFetch, skip, url]);
+  }, [fetchCallback, initialFetch, url]);
 
   useEffect(() => {
     // Use the cleanup function for avoiding a possibly...

package.json

@@ -67,10 +67,9 @@
     "immer": "^9.0.12",
     "iso8601-duration": "^2.1.1",
     "js-sha3": "^0.8.0",
-    "jsondiffpatch": "^0.4.1",
     "lodash": "^4.17.21",
     "next": "13.3.0",
-    "pennant": "1.10.0",
+    "pennant": "1.9.0",
     "react": "18.2.0",
     "react-copy-to-clipboard": "^5.0.4",
     "react-dom": "18.2.0",

yarn.lock

@@ -9714,18 +9714,6 @@ allotment@1.18.1:
     lodash.isequal "^4.5.0"
     use-resize-observer "^9.0.0"
 
-allotment@1.19.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/allotment/-/allotment-1.19.0.tgz#8241a2e3db45e6b1e23f6ade29e392eab4297958"
-  integrity sha512-qL/1faHUoCOvMstCFGkaGSK/nVoSAVN6NLFuIW4P6D5fvKdgxV8/KNfMFeuQUXReodILp4I6z+5a9zmuqK5t4g==
-  dependencies:
-    classnames "^2.3.0"
-    eventemitter3 "^5.0.0"
-    lodash.clamp "^4.0.0"
-    lodash.debounce "^4.0.0"
-    lodash.isequal "^4.5.0"
-    use-resize-observer "^9.0.0"
-
 alpha-lyrae@vegaprotocol/alpha-lyrae:
   version "1.0.0"
   resolved "https://codeload.github.com/vegaprotocol/alpha-lyrae/tar.gz/d7d51ca6945aebeca57077320535362a959b2ca8"
@@ -11274,7 +11262,7 @@ chalk@^1.0.0, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1:
+chalk@^2.0.0, chalk@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -12967,11 +12955,6 @@ didyoumean@^1.2.2:
   resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037"
   integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==
 
-diff-match-patch@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37"
-  integrity sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==
-
 diff-sequences@^27.5.1:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327"
@@ -17436,14 +17419,6 @@ jsonc-parser@3.2.0:
   resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76"
   integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==
 
-jsondiffpatch@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.4.1.tgz#9fb085036767f03534ebd46dcd841df6070c5773"
-  integrity sha512-t0etAxTUk1w5MYdNOkZBZ8rvYYN5iL+2dHCCx/DpkFm/bW28M6y5nUS83D4XdZiHy35Fpaw6LBb+F88fHZnVCw==
-  dependencies:
-    chalk "^2.3.0"
-    diff-match-patch "^1.0.0"
-
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
@@ -20000,10 +19975,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.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.10.0.tgz#c30bcc62f1da5a166785b9bce87727715fa28455"
-  integrity sha512-y3Oi2c8QdW6ovH+NeSwtGcEPZNr7rrHGhDIpWnYulCTEC5RvUUzRyPfOpVM2jL/D3iPUQvkSdC9hZ0jNHCyiuw==
+pennant@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/pennant/-/pennant-1.9.0.tgz#d7332548e17d5140e6655905e41bd6671bd37fc3"
+  integrity sha512-HgM82NnjH94Hc0dhq9knZMOyGT0QyMfMsGFtB4S6UMe2wlSxMpnmQKjtVYmug4PYAkXXprqPrb+mUhjcsPtm5g==
   dependencies:
     "@babel/runtime" "^7.13.10"
     "@d3fc/d3fc-technical-indicator" "^8.0.1"
@@ -20024,7 +19999,7 @@ pennant@1.10.0:
     "@types/react" "^18.0.14"
     "@types/react-dom" "^18.0.5"
     "@types/react-virtualized-auto-sizer" "^1.0.0"
-    allotment "1.19.0"
+    allotment "1.18.1"
     chroma-js "^2.4.2"
     classnames "^2.2.6"
     d3-array "2.8.0"