fix(3661): ensure validators consensus table works without previous epoch data

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

@@ -161,7 +161,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
       cy.getByTestId('menu-drawer').should('be.visible');
     });
 
-    it.skip('should have link for proposal page', function () {
+    it('should have link for proposal page', function () {
       cy.getByTestId('menu-drawer').within(() => {
         cy.get('[href="/proposals"]')
           .should('exist')

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

@@ -54,7 +54,7 @@ context(
         });
     });
 
-    it.skip('should be able to see button for - new proposal', function () {
+    it('should be able to see button for - new proposal', function () {
       // 3001-VOTE-002
       cy.get(newProposalLink)
         .should('be.visible')
@@ -63,7 +63,7 @@ context(
         .and('equal', '/proposals/propose');
     });
 
-    it.skip('should be able to see a connect wallet button - if vega wallet disconnected and user is submitting new proposal', function () {
+    it('should be able to see a connect wallet button - if vega wallet disconnected and user is submitting new proposal', function () {
       goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
       cy.get(connectToVegaWalletButton)
         .should('be.visible')

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

@@ -46,7 +46,7 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
       .and('contain.text', 'USDC (fake)');
   });
 
-  it.skip('Unable to submit proposal with public key', function () {
+  it('Unable to submit proposal with public key', function () {
     const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;
 
     navigateTo(navigation.proposals);

apps/governance/src/app-loader.tsx

@@ -58,15 +58,9 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
           token.decimals(),
         ]);
 
-        const totalSupply = toBigNum(supply.toString(), decimals);
-        const totalWallet = toBigNum(
-          totalAssociatedWallet.toString(),
-          decimals
-        );
-        const totalVesting = toBigNum(
-          totalAssociatedVesting.toString(),
-          decimals
-        );
+        const totalSupply = toBigNum(supply, decimals);
+        const totalWallet = toBigNum(totalAssociatedWallet, decimals);
+        const totalVesting = toBigNum(totalAssociatedVesting, decimals);
 
         appDispatch({
           type: AppStateActionType.SET_TOKEN,

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

@@ -678,8 +678,6 @@
   "FilterProposalsDescription": "Filter by proposal ID or proposer ID",
   "Freeform proposal": "Freeform proposal",
   "NewProposal": "New proposal",
-  "CreateProposalAndDownloadJSONToShare": "Create proposal and download JSON to share",
-  "SubmitAnAgreedProposalFromTheForum": "Submit an agreed proposal from the forum",
   "ProposalTypeQuestion": "What type of proposal would you like to make?",
   "NetworkParameterProposal": "Update network parameter proposal",
   "parameter": "parameter",
@@ -703,7 +701,6 @@
   "AssetID": "Asset ID",
   "Freeform": "Freeform",
   "RawProposal": "Let me choose (raw proposal)",
-  "SubmitAgreedRawProposal": "Submit agreed raw proposal",
   "UseMin": "Use minimum",
   "UseMax": "Use maximum",
   "Proposal": "Proposal",

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

@@ -6,14 +6,13 @@ import { ProposalsListItem } from '../proposals-list-item';
 import { ProtocolUpgradeProposalsListItem } from '../protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import { ProposalsListFilter } from '../proposals-list-filter';
 import Routes from '../../../routes';
-import { Button, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import { Link } from 'react-router-dom';
-import { createDocsLinks, ExternalLinks } from '@vegaprotocol/utils';
+import { ExternalLinks } from '@vegaprotocol/utils';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
-import { useEnvironment } from '@vegaprotocol/environment';
 
 interface ProposalsListProps {
   proposals: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
@@ -36,7 +35,6 @@ export const ProposalsList = ({
   protocolUpgradeProposals,
   lastBlockHeight,
 }: ProposalsListProps) => {
-  const { VEGA_DOCS_URL } = useEnvironment();
   const { t } = useTranslation();
   const [filterString, setFilterString] = useState('');
   const sortedProposals = proposals.reduce(
@@ -83,18 +81,15 @@ export const ProposalsList = ({
           marginBottom={false}
           title={t('pageTitleProposals')}
         />
-        {VEGA_DOCS_URL && (
-          <div className="xs:justify-self-end" data-testid="new-proposal-link">
-            <ExternalLink href={createDocsLinks(VEGA_DOCS_URL).PROPOSALS_GUIDE}>
-              <Button variant="primary" size="sm">
-                <div className="flex items-center gap-1">
-                  {t('NewProposal')}
-                  <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={13} />
-                </div>
-              </Button>
-            </ExternalLink>
-          </div>
-        )}
+        <Link
+          className="xs:justify-self-end"
+          data-testid="new-proposal-link"
+          to={`${Routes.PROPOSALS}/propose`}
+        >
+          <Button variant="primary" size="sm">
+            {t('NewProposal')}
+          </Button>
+        </Link>
       </div>
       <p className="mb-8">
         {t(

apps/governance/src/routes/proposals/propose/freeform/propose-freeform.spec.tsx

@@ -108,7 +108,7 @@ describe('Propose Freeform', () => {
     expect(screen.getByTestId('proposal-title')).toBeTruthy();
     expect(screen.getByTestId('proposal-description')).toBeTruthy();
     expect(screen.getByTestId('proposal-vote-deadline')).toBeTruthy();
-
+    expect(screen.getByTestId('proposal-submit')).toBeTruthy();
     expect(screen.getByTestId('proposal-download-json')).toBeTruthy();
     expect(screen.getByTestId('proposal-transaction-dialog')).toBeTruthy();
   });

apps/governance/src/routes/proposals/propose/freeform/propose-freeform.tsx

@@ -9,6 +9,7 @@ import { useEnvironment } from '@vegaprotocol/environment';
 import {
   ProposalFormDescription,
   ProposalFormSubheader,
+  ProposalFormSubmit,
   ProposalFormTitle,
   ProposalFormTransactionDialog,
   ProposalFormDownloadJson,
@@ -47,7 +48,7 @@ export const ProposeFreeform = () => {
   const {
     register,
     handleSubmit,
-    formState: { errors },
+    formState: { isSubmitting, errors },
     setValue,
     watch,
   } = useForm<FreeformProposalFormFields>();
@@ -164,6 +165,7 @@ export const ProposeFreeform = () => {
                 voteMaxClose={params.governance_proposal_freeform_maxClose}
               />
 
+              <ProposalFormSubmit isSubmitting={isSubmitting} />
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}

apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.spec.tsx

@@ -111,7 +111,7 @@ describe('Propose Network Parameter', () => {
     expect(screen.getByTestId('proposal-description')).toBeTruthy();
     expect(screen.getByTestId('proposal-vote-deadline')).toBeTruthy();
     expect(screen.getByTestId('proposal-enactment-deadline')).toBeTruthy();
-
+    expect(screen.getByTestId('proposal-submit')).toBeTruthy();
     expect(screen.getByTestId('proposal-download-json')).toBeTruthy();
     expect(screen.getByTestId('proposal-transaction-dialog')).toBeTruthy();
   });

apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.tsx

@@ -16,6 +16,7 @@ import { useEnvironment } from '@vegaprotocol/environment';
 import {
   ProposalFormDescription,
   ProposalFormSubheader,
+  ProposalFormSubmit,
   ProposalFormTitle,
   ProposalFormTransactionDialog,
   ProposalFormVoteAndEnactmentDeadline,
@@ -89,7 +90,7 @@ export const ProposeNetworkParameter = () => {
   const {
     register,
     handleSubmit,
-    formState: { errors },
+    formState: { isSubmitting, errors },
     setValue,
     watch,
   } = useForm<NetworkParameterProposalFormFields>();
@@ -309,6 +310,7 @@ export const ProposeNetworkParameter = () => {
                 }
               />
 
+              <ProposalFormSubmit isSubmitting={isSubmitting} />
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}

apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.spec.tsx

@@ -109,7 +109,7 @@ describe('Propose New Asset', () => {
     expect(screen.getByTestId('proposal-vote-deadline')).toBeTruthy();
     expect(screen.getByTestId('proposal-validation-deadline')).toBeTruthy();
     expect(screen.getByTestId('proposal-enactment-deadline')).toBeTruthy();
-
+    expect(screen.getByTestId('proposal-submit')).toBeTruthy();
     expect(screen.getByTestId('proposal-download-json')).toBeTruthy();
     expect(screen.getByTestId('proposal-transaction-dialog')).toBeTruthy();
   });

apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.tsx

@@ -16,6 +16,7 @@ import {
 import {
   ProposalFormDescription,
   ProposalFormSubheader,
+  ProposalFormSubmit,
   ProposalFormTerms,
   ProposalFormTitle,
   ProposalFormTransactionDialog,
@@ -58,7 +59,7 @@ export const ProposeNewAsset = () => {
   const {
     register,
     handleSubmit,
-    formState: { errors },
+    formState: { isSubmitting, errors },
     setValue,
     watch,
   } = useForm<NewAssetProposalFormFields>();
@@ -225,6 +226,7 @@ export const ProposeNewAsset = () => {
                 }
               />
 
+              <ProposalFormSubmit isSubmitting={isSubmitting} />
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}

apps/governance/src/routes/proposals/propose/new-market/propose-new-market.spec.tsx

@@ -103,7 +103,7 @@ describe('Propose New Market', () => {
     expect(screen.getByTestId('proposal-terms')).toBeTruthy();
     expect(screen.getByTestId('proposal-vote-deadline')).toBeTruthy();
     expect(screen.getByTestId('proposal-enactment-deadline')).toBeTruthy();
-
+    expect(screen.getByTestId('proposal-submit')).toBeTruthy();
     expect(screen.getByTestId('proposal-download-json')).toBeTruthy();
     expect(screen.getByTestId('proposal-transaction-dialog')).toBeTruthy();
   });

apps/governance/src/routes/proposals/propose/new-market/propose-new-market.tsx

@@ -15,6 +15,7 @@ import {
 import {
   ProposalFormDescription,
   ProposalFormSubheader,
+  ProposalFormSubmit,
   ProposalFormTerms,
   ProposalFormTitle,
   ProposalFormTransactionDialog,
@@ -56,7 +57,7 @@ export const ProposeNewMarket = () => {
   const {
     register,
     handleSubmit,
-    formState: { errors },
+    formState: { isSubmitting, errors },
     setValue,
     watch,
   } = useForm<NewMarketProposalFormFields>();
@@ -207,6 +208,7 @@ export const ProposeNewMarket = () => {
                 enactmentMaxClose={params.governance_proposal_market_maxEnact}
               />
 
+              <ProposalFormSubmit isSubmitting={isSubmitting} />
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}

apps/governance/src/routes/proposals/propose/propose.spec.tsx

@@ -15,10 +15,10 @@ describe('Propose', () => {
     expect(baseElement).toBeTruthy();
   });
 
-  it('should render the heading, proposals title and options', () => {
+  it('should render the heading, proposal type question and options', () => {
     renderComponent();
     expect(
-      screen.getByText('Create proposal and download JSON to share')
+      screen.getByText('What type of proposal would you like to make?')
     ).toBeTruthy();
     expect(screen.getByText('Network parameter')).toBeTruthy();
     expect(screen.getByText('New market')).toBeTruthy();
@@ -26,9 +26,6 @@ describe('Propose', () => {
     expect(screen.getByText('New asset')).toBeTruthy();
     expect(screen.getByText('Update asset')).toBeTruthy();
     expect(screen.getByText('Freeform')).toBeTruthy();
-    expect(
-      screen.getByText('Submit an agreed proposal from the forum')
-    ).toBeTruthy();
-    expect(screen.getByText('Submit agreed raw proposal')).toBeTruthy();
+    expect(screen.getByText('Let me choose (raw proposal)')).toBeTruthy();
   });
 });

apps/governance/src/routes/proposals/propose/propose.tsx

@@ -39,8 +39,8 @@ export const Propose = () => {
       </section>
 
       <section>
-        <h2 className="text-h5">{t('CreateProposalAndDownloadJSONToShare')}</h2>
-        <ul className="mb-6">
+        <h2 className="text-h5">{t('ProposalTypeQuestion')}</h2>
+        <ul>
           <li>
             <p>
               <Link
@@ -101,14 +101,17 @@ export const Propose = () => {
               </Link>
             </p>
           </li>
+          <li>
+            <p>
+              <Link
+                className="underline"
+                to={`${Routes.PROPOSALS}/propose/raw`}
+              >
+                {t('RawProposal')}
+              </Link>
+            </p>
+          </li>
         </ul>
-
-        <h2 className="text-h5">{t('SubmitAnAgreedProposalFromTheForum')}</h2>
-        <p>
-          <Link className="underline" to={`${Routes.PROPOSALS}/propose/raw`}>
-            {t('SubmitAgreedRawProposal')}
-          </Link>
-        </p>
       </section>
     </>
   );

apps/governance/src/routes/proposals/propose/raw/propose-raw.tsx

@@ -18,8 +18,10 @@ import { useProposalSubmit } from '@vegaprotocol/proposals';
 import {
   ProposalFormSubmit,
   ProposalFormTransactionDialog,
+  ProposalFormDownloadJson,
 } from '../../components/propose';
 import { ProposalRawMinRequirements } from './proposal-raw-min-requirements';
+import { downloadJson } from '../../../../lib/download-json';
 
 export interface RawProposalFormFields {
   rawProposalData: string;
@@ -45,6 +47,7 @@ export const ProposeRaw = () => {
     register,
     handleSubmit,
     formState: { isSubmitting, errors },
+    watch,
   } = useForm<RawProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -54,6 +57,11 @@ export const ProposeRaw = () => {
     await submit(JSON.parse(fields.rawProposalData));
   };
 
+  const viewJson = () => {
+    const formData = watch();
+    downloadJson(JSON.stringify(formData), 'vega-raw-proposal');
+  };
+
   return (
     <AsyncRenderer
       loading={networkParamsLoading}
@@ -124,6 +132,7 @@ export const ProposeRaw = () => {
                 )}
               </FormGroup>
               <ProposalFormSubmit isSubmitting={isSubmitting} />
+              <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}
                 TransactionDialog={Dialog}

apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.spec.tsx

@@ -110,7 +110,7 @@ describe('Propose Update Asset', () => {
     expect(screen.getByTestId('proposal-terms')).toBeTruthy();
     expect(screen.getByTestId('proposal-vote-deadline')).toBeTruthy();
     expect(screen.getByTestId('proposal-enactment-deadline')).toBeTruthy();
-
+    expect(screen.getByTestId('proposal-submit')).toBeTruthy();
     expect(screen.getByTestId('proposal-download-json')).toBeTruthy();
     expect(screen.getByTestId('proposal-transaction-dialog')).toBeTruthy();
   });

apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.tsx

@@ -15,6 +15,7 @@ import {
 import {
   ProposalFormDescription,
   ProposalFormSubheader,
+  ProposalFormSubmit,
   ProposalFormTerms,
   ProposalFormTitle,
   ProposalFormTransactionDialog,
@@ -56,7 +57,7 @@ export const ProposeUpdateAsset = () => {
   const {
     register,
     handleSubmit,
-    formState: { errors },
+    formState: { isSubmitting, errors },
     setValue,
     watch,
   } = useForm<UpdateAssetProposalFormFields>();
@@ -211,6 +212,7 @@ export const ProposeUpdateAsset = () => {
                 }
               />
 
+              <ProposalFormSubmit isSubmitting={isSubmitting} />
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}

apps/governance/src/routes/proposals/propose/update-market/propose-update-market.spec.tsx

@@ -261,7 +261,7 @@ describe('Propose Update Market', () => {
     expect(screen.getByTestId('proposal-terms')).toBeTruthy();
     expect(screen.getByTestId('proposal-vote-deadline')).toBeTruthy();
     expect(screen.getByTestId('proposal-enactment-deadline')).toBeTruthy();
-
+    expect(screen.getByTestId('proposal-submit')).toBeTruthy();
     expect(screen.getByTestId('proposal-download-json')).toBeTruthy();
     expect(screen.getByTestId('proposal-transaction-dialog')).toBeTruthy();
   });

apps/governance/src/routes/proposals/propose/update-market/propose-update-market.tsx

@@ -17,6 +17,7 @@ import {
   ProposalFormDescription,
   ProposalFormDownloadJson,
   ProposalFormSubheader,
+  ProposalFormSubmit,
   ProposalFormTerms,
   ProposalFormTitle,
   ProposalFormTransactionDialog,
@@ -103,7 +104,7 @@ export const ProposeUpdateMarket = () => {
   const {
     register,
     handleSubmit,
-    formState: { errors },
+    formState: { isSubmitting, errors },
     setValue,
     watch,
   } = useForm<UpdateMarketProposalFormFields>();
@@ -316,6 +317,7 @@ export const ProposeUpdateMarket = () => {
                 }
               />
 
+              <ProposalFormSubmit isSubmitting={isSubmitting} />
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}

scripts/make-release.js

@@ -68,7 +68,7 @@ inquirer
       })
       .then(() => {
         for (const env of answers.envs) {
-          const branch = env === 'mainnet' ? 'main' : `release/${env}`;
+          const branch = env === 'mainnet' ? 'master' : `release/${env}`;
           release(answers.tag, branch);
         }
         execSync('git checkout develop');