refactor: deploy maci command

privacy-scaling-explorations · Feb 28, 2025 · 038ec2c · 038ec2c
1 parent dfbc410
commit 038ec2c
Show file tree

Hide file tree

Showing 21 changed files with 999 additions and 499 deletions.
diff --git a/apps/relayer/tests/deploy.ts b/apps/relayer/tests/deploy.ts
@@ -1,5 +1,5 @@
 import hardhat from "hardhat";
-import { deploy, deployVkRegistryContract } from "maci-cli";
+import { deployVkRegistryContract } from "maci-cli";
 import { Keypair } from "maci-domainobjs";
 import {
   EMode,
@@ -8,7 +8,11 @@ import {
   setVerifyingKeys,
   signup,
   joinPoll,
+  deployMaci,
   deployPoll,
+  deployFreeForAllSignUpGatekeeper,
+  deployVerifier,
+  deployConstantInitialVoiceCreditProxy,
 } from "maci-sdk";
 
 import {
@@ -24,6 +28,7 @@ import {
   pollWitgen,
   rapidsnark,
   DEFAULT_VOTE_OPTIONS,
+  DEFAULT_INITIAL_VOICE_CREDITS,
 } from "./constants.js";
 
 interface IContractsData {
@@ -92,7 +97,24 @@ export class TestDeploy {
       signer,
     });
 
-    const maciAddresses = await deploy({ stateTreeDepth: 10, signer });
+    const signupGatekeeper = await deployFreeForAllSignUpGatekeeper(signer, true);
+    const signupGatekeeperContractAddress = await signupGatekeeper.getAddress();
+
+    const maciAddresses = await deployMaci({
+      stateTreeDepth: 10,
+      signer,
+      signupGatekeeperAddress: signupGatekeeperContractAddress,
+    });
+
+    const initialVoiceCreditProxy = await deployConstantInitialVoiceCreditProxy(
+      DEFAULT_INITIAL_VOICE_CREDITS,
+      signer,
+      true,
+    );
+    const initialVoiceCreditProxyContractAddress = await initialVoiceCreditProxy.getAddress();
+
+    const verifier = await deployVerifier(signer, true);
+    const verifierContractAddress = await verifier.getAddress();
 
     const startDate = Math.floor(Date.now() / 1000) + 30;
 
@@ -106,23 +128,23 @@ export class TestDeploy {
       mode: EMode.NON_QV,
       relayers: [await signer.getAddress()],
       signer,
-      verifierContractAddress: maciAddresses.verifierAddress,
-      maciContractAddress: maciAddresses.maciAddress,
-      gatekeeperContractAddress: maciAddresses.signUpGatekeeperAddress,
-      initialVoiceCreditProxyContractAddress: maciAddresses.initialVoiceCreditProxyAddress,
+      verifierContractAddress,
+      maciContractAddress: maciAddresses.maciContractAddress,
+      gatekeeperContractAddress: signupGatekeeperContractAddress,
+      initialVoiceCreditProxyContractAddress,
       voteOptions: DEFAULT_VOTE_OPTIONS,
       vkRegistryContractAddress: vkRegistry,
     });
 
     await signup({
-      maciAddress: maciAddresses.maciAddress,
+      maciAddress: maciAddresses.maciContractAddress,
       maciPubKey: user.pubKey.serialize(),
       sgData: DEFAULT_SG_DATA,
       signer,
     });
 
     const { pollStateIndex, timestamp, voiceCredits } = await joinPoll({
-      maciAddress: maciAddresses.maciAddress,
+      maciAddress: maciAddresses.maciContractAddress,
       pollId: 0n,
       privateKey: user.privKey.serialize(),
       stateIndex: 1n,
@@ -138,13 +160,13 @@ export class TestDeploy {
 
     const maciState = await genMaciStateFromContract({
       provider: signer.provider,
-      address: maciAddresses.maciAddress,
+      address: maciAddresses.maciContractAddress,
       coordinatorKeypair,
       pollId: 0n,
     });
 
     this.contractsData.maciState = maciState;
-    this.contractsData.maciContractAddress = maciAddresses.maciAddress;
+    this.contractsData.maciContractAddress = maciAddresses.maciContractAddress;
     this.contractsData.stateLeafIndex = Number(pollStateIndex);
     this.contractsData.timestamp = Number(timestamp);
     this.contractsData.voiceCredits = Number(voiceCredits);