refactor(zupass-gatekeeper): improved gatekeeper script to avoid doin…

…g conversion on config
privacy-scaling-explorations · Oct 25, 2024 · aab00a1 · aab00a1
1 parent a0a1309
commit aab00a1
Show file tree

Hide file tree

Showing 4 changed files with 212 additions and 47 deletions.
diff --git a/...d_docs/version-v2.x/technical-references/smart-contracts/solidity-docs/index.md b/...d_docs/version-v2.x/technical-references/smart-contracts/solidity-docs/index.md
@@ -2,5 +2,4 @@
 title: Solidity Docs
 sidebar_label: Solidity Docs
 ---
-
-This is a collection of the Solidity documentation for the MACI protocol. It is autogenerated with solidity-docs and should serve as a good starting point for understanding the codebase.
+This is a collection of the Solidity documentation for the MACI protocol. It is autogenerated with solidity-docs and should serve as a good starting point for understanding the codebase.
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
@@ -155,6 +155,7 @@
     "@nomicfoundation/hardhat-toolbox": "^5.0.0",
     "@openzeppelin/contracts": "^5.0.2",
     "@openzeppelin/merkle-tree": "^1.0.7",
+    "@pcd/util": "^0.8.0",
     "circomlibjs": "^0.1.7",
     "ethers": "^6.13.2",
     "hardhat": "^2.22.13",

diff --git a/packages/contracts/tasks/deploy/maci/02-gatekeepers.ts b/packages/contracts/tasks/deploy/maci/02-gatekeepers.ts
@@ -1,8 +1,9 @@
+import { hexToBigInt, uuidToBigInt } from "@pcd/util";
+
 import { HatsGatekeeperBase } from "../../../typechain-types";
 import { EDeploySteps, ESupportedChains } from "../../helpers/constants";
 import { ContractStorage } from "../../helpers/ContractStorage";
 import { Deployment } from "../../helpers/Deployment";
-import { uuidToBigInt } from "../../helpers/numericParser";
 import { EContracts, IDeployParams } from "../../helpers/types";
 
 const deployment = Deployment.getInstance();
@@ -139,9 +140,12 @@ deployment.deployTask(EDeploySteps.Gatekeepers, "Deploy gatekeepers").then((task
 
     if (!skipDeployZupassGatekeeper) {
       const eventId = deployment.getDeployConfigField<string>(EContracts.ZupassGatekeeper, "eventId", true);
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const validEventId = uuidToBigInt(eventId);
-      const validSigner1 = deployment.getDeployConfigField<string>(EContracts.ZupassGatekeeper, "signer1", true);
-      const validSigner2 = deployment.getDeployConfigField<string>(EContracts.ZupassGatekeeper, "signer2", true);
+      const signer1 = deployment.getDeployConfigField<string>(EContracts.ZupassGatekeeper, "signer1", true);
+      const validSigner1 = hexToBigInt(signer1);
+      const signer2 = deployment.getDeployConfigField<string>(EContracts.ZupassGatekeeper, "signer2", true);
+      const validSigner2 = hexToBigInt(signer2);
       let verifier = deployment.getDeployConfigField<string | undefined>(EContracts.ZupassGatekeeper, "zupassVerifier");
 
       if (!verifier) {
@@ -165,7 +169,7 @@ deployment.deployTask(EDeploySteps.Gatekeepers, "Deploy gatekeepers").then((task
       await storage.register({
         id: EContracts.ZupassGatekeeper,
         contract: ZupassGatekeeperContract,
-        args: [validEventId.toString(), validSigner1, validSigner2, verifier],
+        args: [validEventId.toString(), validSigner1.toString(), validSigner2.toString(), verifier],
         network: hre.network.name,
       });
     }