feat(#2258): add support for submitting new governance actions inside wrapper

MSzalowski · MSzalowski · commit eaf0ed5acf47 · 2025-02-07T11:23:57.000+01:00
diff --git a/govtool/frontend/src/components/organisms/CreateGovernanceActionSteps/CreateGovernanceActionForm.tsx b/govtool/frontend/src/components/organisms/CreateGovernanceActionSteps/CreateGovernanceActionForm.tsx
@@ -47,6 +47,9 @@ export const CreateGovernanceActionForm = ({
         type! as
           | GovernanceActionType.InfoAction
           | GovernanceActionType.TreasuryWithdrawals
+          | GovernanceActionType.NewCommittee
+          | GovernanceActionType.NewConstitution
+          | GovernanceActionType.NoConfidence
       ],
     ).some(
       (field) => !watch(field as unknown as Parameters<typeof watch>[0]),
@@ -67,6 +70,9 @@ export const CreateGovernanceActionForm = ({
         type! as
           | GovernanceActionType.InfoAction
           | GovernanceActionType.TreasuryWithdrawals
+          | GovernanceActionType.NewCommittee
+          | GovernanceActionType.NewConstitution
+          | GovernanceActionType.NoConfidence
       ],
     ).map(([key, field]) => {
       const fieldProps = {
diff --git a/govtool/frontend/src/consts/governanceAction/fields.ts b/govtool/frontend/src/consts/governanceAction/fields.ts
@@ -97,6 +97,92 @@ export const sharedGovernanceActionFields: SharedGovernanceActionFieldSchema = {
 
 export const GOVERNANCE_ACTION_FIELDS: GovernanceActionFields = {
   [GovernanceActionType.InfoAction]: sharedGovernanceActionFields,
+  [GovernanceActionType.NoConfidence]: sharedGovernanceActionFields,
+  [GovernanceActionType.NewCommittee]: {
+    ...sharedGovernanceActionFields,
+    numerator: {
+      component: GovernanceActionField.Input,
+      labelI18nKey:
+        "createGovernanceAction.fields.declarations.numerator.label",
+      placeholderI18nKey:
+        "createGovernanceAction.fields.declarations.numerator.placeholder",
+      rules: {
+        required: {
+          value: true,
+          message: I18n.t("createGovernanceAction.fields.validations.required"),
+        },
+        validate: numberValidation,
+      },
+    },
+    denominator: {
+      component: GovernanceActionField.Input,
+      labelI18nKey:
+        "createGovernanceAction.fields.declarations.denominator.label",
+      placeholderI18nKey:
+        "createGovernanceAction.fields.declarations.denominator.placeholder",
+      rules: {
+        required: {
+          value: true,
+          message: I18n.t("createGovernanceAction.fields.validations.required"),
+        },
+        validate: numberValidation,
+      },
+    },
+    newCommitteeHash: {
+      component: GovernanceActionField.Input,
+      labelI18nKey: "createGovernanceAction.fields.declarations.members.label",
+      placeholderI18nKey:
+        "createGovernanceAction.fields.declarations.members.placeholder",
+      tipI18nKey: "createGovernanceAction.fields.declarations.members.tip",
+      rules: {
+        required: {
+          value: true,
+          message: I18n.t("createGovernanceAction.fields.validations.required"),
+        },
+        maxLength: {
+          value: 500,
+          message: I18n.t(
+            "createGovernanceAction.fields.validations.maxLength",
+            {
+              maxLength: 500,
+            },
+          ),
+        },
+      },
+    },
+    newCommitteeExpiryEpoch: {
+      component: GovernanceActionField.Input,
+      labelI18nKey:
+        "createGovernanceAction.fields.declarations.expiryEpoch.label",
+      placeholderI18nKey:
+        "createGovernanceAction.fields.declarations.expiryEpoch.placeholder",
+      rules: {
+        required: {
+          value: true,
+          message: I18n.t("createGovernanceAction.fields.validations.required"),
+        },
+        validate: numberValidation,
+      },
+    },
+    removeCommitteeHash: {
+      component: GovernanceActionField.Input,
+      labelI18nKey: "createGovernanceAction.fields.declarations.remove.label",
+      placeholderI18nKey:
+        "createGovernanceAction.fields.declarations.remove.placeholder",
+      tipI18nKey: "createGovernanceAction.fields.declarations.remove.tip",
+      rules: {
+        maxLength: {
+          value: 500,
+          message: I18n.t(
+            "createGovernanceAction.fields.validations.maxLength",
+            {
+              maxLength: 500,
+            },
+          ),
+        },
+      },
+    },
+  },
   [GovernanceActionType.TreasuryWithdrawals]: {
     ...sharedGovernanceActionFields,
     receivingAddress: {
@@ -123,6 +209,59 @@ export const GOVERNANCE_ACTION_FIELDS: GovernanceActionFields = {
       },
     },
   },
+  [GovernanceActionType.NewConstitution]: {
+    ...sharedGovernanceActionFields,
+    prevGovernanceActionHash: {
+      component: GovernanceActionField.Input,
+      labelI18nKey:
+        "createGovernanceAction.fields.declarations.prevGovernanceActionHash.label",
+      placeholderI18nKey:
+        "createGovernanceAction.fields.declarations.prevGovernanceActionHash.placeholder",
+    },
+    prevGovernanceActionIndex: {
+      component: GovernanceActionField.Input,
+      labelI18nKey:
+        "createGovernanceAction.fields.declarations.prevGovernanceActionIndex.label",
+      placeholderI18nKey:
+        "createGovernanceAction.fields.declarations.prevGovernanceActionIndex.placeholder",
+      rules: {
+        validate: numberValidation,
+      },
+    },
+    constitutionUrl: {
+      component: GovernanceActionField.Input,
+      labelI18nKey:
+        "createGovernanceAction.fields.declarations.constitutionUrl.label",
+      placeholderI18nKey:
+        "createGovernanceAction.fields.declarations.constitutionUrl.placeholder",
+      rules: {
+        required: {
+          value: true,
+          message: I18n.t("createGovernanceAction.fields.validations.required"),
+        },
+      },
+    },
+    constitutionHash: {
+      component: GovernanceActionField.Input,
+      labelI18nKey:
+        "createGovernanceAction.fields.declarations.constitutionHash.label",
+      placeholderI18nKey:
+        "createGovernanceAction.fields.declarations.constitutionHash.placeholder",
+      rules: {
+        required: {
+          value: true,
+          message: I18n.t("createGovernanceAction.fields.validations.required"),
+        },
+      },
+    },
+    scriptHash: {
+      component: GovernanceActionField.Input,
+      labelI18nKey:
+        "createGovernanceAction.fields.declarations.scriptHash.label",
+      placeholderI18nKey:
+        "createGovernanceAction.fields.declarations.scriptHash.placeholder",
+    },
+  },
 } as const;
 
 export const GOVERNANCE_ACTION_CONTEXT = {
diff --git a/govtool/frontend/src/context/wallet.tsx b/govtool/frontend/src/context/wallet.tsx
@@ -136,35 +136,35 @@ type ProtocolParameterChangeProps = {
 
 type HardForkInitiationProps = {
   prevGovernanceActionHash: string;
-  prevGovernanceActionIndex: number;
-  major: number;
-  minor: number;
+  prevGovernanceActionIndex: string;
+  major: string;
+  minor: string;
 } & VotingAnchor;
 
 type NewConstitutionProps = {
-  prevGovernanceActionHash: string;
-  prevGovernanceActionIndex: number;
+  prevGovernanceActionHash?: string;
+  prevGovernanceActionIndex?: string;
   constitutionUrl: string;
   constitutionHash: string;
-  scriptHash: string;
+  scriptHash?: string;
 } & VotingAnchor;
 
 type UpdateCommitteeProps = {
   prevGovernanceActionHash?: string;
-  prevGovernanceActionIndex?: number;
+  prevGovernanceActionIndex?: string;
   quorumThreshold: QuorumThreshold;
   newCommittee?: CommitteeToAdd[];
   removeCommittee?: string[];
 } & VotingAnchor;
 
 export type CommitteeToAdd = {
-  expiryEpoch: number;
+  expiryEpoch: string;
   committee: string;
 };
 
 export type QuorumThreshold = {
-  numerator: number;
-  denominator: number;
+  numerator: string;
+  denominator: string;
 };
 
 type ProtocolParamsUpdate = {
@@ -1060,7 +1060,7 @@ const CardanoProvider = (props: Props) => {
         if (prevGovernanceActionHash && prevGovernanceActionIndex) {
           const prevGovernanceActionId = GovernanceActionId.new(
             TransactionHash.from_hex(prevGovernanceActionHash),
-            prevGovernanceActionIndex,
+            Number(prevGovernanceActionIndex),
           );
           newConstitution = NewConstitutionAction.new_with_action_id(
             prevGovernanceActionId,
@@ -1112,14 +1112,13 @@ const CardanoProvider = (props: Props) => {
           BigNum.from_str(quorumThreshold.numerator.toString()),
           BigNum.from_str(quorumThreshold.denominator.toString()),
         );
-
         const committeeToAdd = Committee.new(threshold);
         if (newCommittee) {
           newCommittee.forEach(async (member) => {
             const credential = await buildCredentialFromBech32Key(
               member.committee,
             );
-            committeeToAdd.add_member(credential, member.expiryEpoch);
+            committeeToAdd.add_member(credential, Number(member.expiryEpoch));
           });
         }
         const committeeToRemoveCredentials = Credentials.new();
@@ -1134,7 +1133,7 @@ const CardanoProvider = (props: Props) => {
         if (prevGovernanceActionHash && prevGovernanceActionIndex) {
           const prevGovernanceActionId = GovernanceActionId.new(
             TransactionHash.from_hex(prevGovernanceActionHash),
-            prevGovernanceActionIndex,
+            Number(prevGovernanceActionIndex),
           );
           updateCommitteeAction = UpdateCommitteeAction.new_with_action_id(
             prevGovernanceActionId,
@@ -1393,13 +1392,16 @@ const CardanoProvider = (props: Props) => {
     }: HardForkInitiationProps) => {
       const govActionBuilder = VotingProposalBuilder.new();
       try {
-        const newProtocolVersion = ProtocolVersion.new(major, minor);
+        const newProtocolVersion = ProtocolVersion.new(
+          Number(major),
+          Number(minor),
+        );
 
         let hardForkInitiationAction;
         if (prevGovernanceActionHash && prevGovernanceActionIndex) {
           const prevGovernanceActionId = GovernanceActionId.new(
             TransactionHash.from_hex(prevGovernanceActionHash),
-            prevGovernanceActionIndex,
+            Number(prevGovernanceActionIndex),
           );
           hardForkInitiationAction =
             HardForkInitiationAction.new_with_action_id(
diff --git a/govtool/frontend/src/hooks/forms/useCreateGovernanceActionForm.ts b/govtool/frontend/src/hooks/forms/useCreateGovernanceActionForm.ts
@@ -10,7 +10,7 @@ import {
   PATHS,
   storageInformationErrorModals,
 } from "@consts";
-import { useCardano, useModal, useAppContext } from "@context";
+import { useCardano, useModal, useAppContext, QuorumThreshold } from "@context";
 import {
   correctAdaFormat,
   downloadJson,
@@ -56,6 +56,9 @@ export const useCreateGovernanceActionForm = (
   const {
     buildNewInfoGovernanceAction,
     buildTreasuryGovernanceAction,
+    buildNoConfidenceGovernanceAction,
+    buildNewConstitutionGovernanceAction,
+    buildUpdateCommitteeGovernanceAction,
     buildSignSubmitConwayCertTx,
   } = useCardano();
 
@@ -131,6 +134,64 @@ export const useCreateGovernanceActionForm = (
       switch (govActionType) {
         case GovernanceActionType.InfoAction:
           return buildNewInfoGovernanceAction(commonGovActionDetails);
+        case GovernanceActionType.NoConfidence:
+          return buildNoConfidenceGovernanceAction(commonGovActionDetails);
+        case GovernanceActionType.NewConstitution: {
+          if (
+            data.constitutionUrl === undefined ||
+            data.constitutionHash === undefined
+          ) {
+            throw new Error(
+              t("errors.invalidNewCommitteeGovernanceActionType"),
+            );
+          }
+
+          return buildNewConstitutionGovernanceAction({
+            ...commonGovActionDetails,
+            constitutionUrl: data.constitutionUrl,
+            constitutionHash: data.constitutionHash,
+            scriptHash: data.scriptHash,
+            prevGovernanceActionHash: data.prevGovernanceActionHash,
+            prevGovernanceActionIndex: data.prevGovernanceActionIndex,
+          });
+        }
+        case GovernanceActionType.NewCommittee: {
+          if (
+            data.newCommitteeHash === undefined ||
+            data.newCommitteeExpiryEpoch === undefined
+          ) {
+            throw new Error(
+              t("errors.invalidUpdateCommitteeGovernanceActionType"),
+            );
+          }
+
+          let quorumThreshold: QuorumThreshold = {
+            numerator: "1",
+            denominator: "2",
+          };
+          if (data.numerator !== undefined && data.denominator !== undefined) {
+            quorumThreshold = {
+              numerator: data.numerator,
+              denominator: data.denominator,
+            };
+          }
+
+          return buildUpdateCommitteeGovernanceAction({
+            ...commonGovActionDetails,
+            newCommittee: [
+              {
+                committee: data.newCommitteeHash,
+                expiryEpoch: data.newCommitteeExpiryEpoch,
+              },
+            ],
+            removeCommittee: data.removeCommitteeHash
+              ? [data.removeCommitteeHash]
+              : [],
+            quorumThreshold,
+            prevGovernanceActionHash: data.prevGovernanceActionHash,
+            prevGovernanceActionIndex: data.prevGovernanceActionIndex,
+          });
+        }
         case GovernanceActionType.TreasuryWithdrawals: {
           if (
             data.amount === undefined ||
diff --git a/govtool/frontend/src/i18n/locales/en.json b/govtool/frontend/src/i18n/locales/en.json
diff --git a/govtool/frontend/src/types/governanceAction.ts b/govtool/frontend/src/types/governanceAction.ts
