@maci-protocol/coordinator 0.0.0-ci.35d370f → 0.0.0-ci.35e2fb7

package/build/ts/common/errors.js

@@ -12,23 +12,26 @@ export var ErrorCodes;
     ErrorCodes[ErrorCodes["SUBGRAPH_DEPLOY"] = 6] = "SUBGRAPH_DEPLOY";
     ErrorCodes[ErrorCodes["SUBGRAPH_DEPLOY_KEY_NOT_FOUND"] = 7] = "SUBGRAPH_DEPLOY_KEY_NOT_FOUND";
     ErrorCodes[ErrorCodes["SESSION_KEY_NOT_FOUND"] = 8] = "SESSION_KEY_NOT_FOUND";
-    ErrorCodes[ErrorCodes["PIMLICO_API_KEY_NOT_SET"] = 9] = "PIMLICO_API_KEY_NOT_SET";
-    ErrorCodes[ErrorCodes["INVALID_APPROVAL"] = 10] = "INVALID_APPROVAL";
-    ErrorCodes[ErrorCodes["UNSUPPORTED_NETWORK"] = 11] = "UNSUPPORTED_NETWORK";
-    ErrorCodes[ErrorCodes["RPC_API_KEY_NOT_SET"] = 12] = "RPC_API_KEY_NOT_SET";
-    ErrorCodes[ErrorCodes["FAILED_TO_MERGE_STATE_TREE"] = 13] = "FAILED_TO_MERGE_STATE_TREE";
-    ErrorCodes[ErrorCodes["FAILED_TO_MERGE_MESSAGE_SUBTREES"] = 14] = "FAILED_TO_MERGE_MESSAGE_SUBTREES";
-    ErrorCodes[ErrorCodes["FAILED_TO_MERGE_MESSAGE_TREE"] = 15] = "FAILED_TO_MERGE_MESSAGE_TREE";
+    ErrorCodes[ErrorCodes["INVALID_APPROVAL"] = 9] = "INVALID_APPROVAL";
+    ErrorCodes[ErrorCodes["UNSUPPORTED_NETWORK"] = 10] = "UNSUPPORTED_NETWORK";
+    ErrorCodes[ErrorCodes["COORDINATOR_RPC_URL_NOT_SET"] = 11] = "COORDINATOR_RPC_URL_NOT_SET";
+    ErrorCodes[ErrorCodes["FAILED_TO_MERGE_STATE_TREE"] = 12] = "FAILED_TO_MERGE_STATE_TREE";
+    ErrorCodes[ErrorCodes["FAILED_TO_MERGE_MESSAGE_SUBTREES"] = 13] = "FAILED_TO_MERGE_MESSAGE_SUBTREES";
+    ErrorCodes[ErrorCodes["FAILED_TO_MERGE_MESSAGE_TREE"] = 14] = "FAILED_TO_MERGE_MESSAGE_TREE";
+    ErrorCodes[ErrorCodes["UNSUPPORTED_VOICE_CREDIT_PROXY_FACTORY"] = 15] = "UNSUPPORTED_VOICE_CREDIT_PROXY_FACTORY";
     ErrorCodes[ErrorCodes["UNSUPPORTED_VOICE_CREDIT_PROXY"] = 16] = "UNSUPPORTED_VOICE_CREDIT_PROXY";
     ErrorCodes[ErrorCodes["UNSUPPORTED_POLICY"] = 17] = "UNSUPPORTED_POLICY";
     ErrorCodes[ErrorCodes["FAILED_TO_DEPLOY_CONTRACT"] = 18] = "FAILED_TO_DEPLOY_CONTRACT";
     ErrorCodes[ErrorCodes["FAILED_TO_SET_MACI_INSTANCE_ON_POLICY"] = 19] = "FAILED_TO_SET_MACI_INSTANCE_ON_POLICY";
     ErrorCodes[ErrorCodes["MACI_NOT_DEPLOYED"] = 20] = "MACI_NOT_DEPLOYED";
     ErrorCodes[ErrorCodes["VERIFIER_NOT_DEPLOYED"] = 21] = "VERIFIER_NOT_DEPLOYED";
-    ErrorCodes[ErrorCodes["VK_REGISTRY_NOT_DEPLOYED"] = 22] = "VK_REGISTRY_NOT_DEPLOYED";
-    ErrorCodes[ErrorCodes["FAILED_TO_SET_VERIFYING_KEYS_ON_VK_REGISTRY"] = 23] = "FAILED_TO_SET_VERIFYING_KEYS_ON_VK_REGISTRY";
+    ErrorCodes[ErrorCodes["VERIFYING_KEYS_REGISTRY_NOT_DEPLOYED"] = 22] = "VERIFYING_KEYS_REGISTRY_NOT_DEPLOYED";
+    ErrorCodes[ErrorCodes["FAILED_TO_SET_VERIFYING_KEYS"] = 23] = "FAILED_TO_SET_VERIFYING_KEYS";
     ErrorCodes[ErrorCodes["FAILED_TO_DEPLOY_MACI"] = 24] = "FAILED_TO_DEPLOY_MACI";
     ErrorCodes[ErrorCodes["FAILED_TO_DEPLOY_POLL"] = 25] = "FAILED_TO_DEPLOY_POLL";
     ErrorCodes[ErrorCodes["NOT_MERGED_MESSAGE_TREE"] = 26] = "NOT_MERGED_MESSAGE_TREE";
+    ErrorCodes[ErrorCodes["FAILED_TO_UPDATE_SCHEDULED_POLL"] = 27] = "FAILED_TO_UPDATE_SCHEDULED_POLL";
+    ErrorCodes[ErrorCodes["POLL_ALREADY_SCHEDULED"] = 28] = "POLL_ALREADY_SCHEDULED";
+    ErrorCodes[ErrorCodes["POLL_ALREADY_TALLIED"] = 29] = "POLL_ALREADY_TALLIED";
 })(ErrorCodes || (ErrorCodes = {}));
 //# sourceMappingURL=errors.js.map

package/build/ts/common/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../ts/common/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAN,IAAY,UA4BX;AA5BD,WAAY,UAAU;IACpB,6EAAqB,CAAA;IACrB,2EAAoB,CAAA;IACpB,+DAAc,CAAA;IACd,uDAAU,CAAA;IACV,uDAAU,CAAA;IACV,+DAAc,CAAA;IACd,iEAAe,CAAA;IACf,6FAA6B,CAAA;IAC7B,6EAAqB,CAAA;IACrB,iFAAuB,CAAA;IACvB,oEAAgB,CAAA;IAChB,0EAAmB,CAAA;IACnB,0EAAmB,CAAA;IACnB,wFAA0B,CAAA;IAC1B,oGAAgC,CAAA;IAChC,4FAA4B,CAAA;IAC5B,gGAA8B,CAAA;IAC9B,wEAAkB,CAAA;IAClB,sFAAyB,CAAA;IACzB,8GAAqC,CAAA;IACrC,sEAAiB,CAAA;IACjB,8EAAqB,CAAA;IACrB,oFAAwB,CAAA;IACxB,0HAA2C,CAAA;IAC3C,8EAAqB,CAAA;IACrB,8EAAqB,CAAA;IACrB,kFAAuB,CAAA;AACzB,CAAC,EA5BW,UAAU,KAAV,UAAU,QA4BrB"}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../ts/common/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,CAAN,IAAY,UA+BX;AA/BD,WAAY,UAAU;IACpB,6EAAqB,CAAA;IACrB,2EAAoB,CAAA;IACpB,+DAAc,CAAA;IACd,uDAAU,CAAA;IACV,uDAAU,CAAA;IACV,+DAAc,CAAA;IACd,iEAAe,CAAA;IACf,6FAA6B,CAAA;IAC7B,6EAAqB,CAAA;IACrB,mEAAgB,CAAA;IAChB,0EAAmB,CAAA;IACnB,0FAA2B,CAAA;IAC3B,wFAA0B,CAAA;IAC1B,oGAAgC,CAAA;IAChC,4FAA4B,CAAA;IAC5B,gHAAsC,CAAA;IACtC,gGAA8B,CAAA;IAC9B,wEAAkB,CAAA;IAClB,sFAAyB,CAAA;IACzB,8GAAqC,CAAA;IACrC,sEAAiB,CAAA;IACjB,8EAAqB,CAAA;IACrB,4GAAoC,CAAA;IACpC,4FAA4B,CAAA;IAC5B,8EAAqB,CAAA;IACrB,8EAAqB,CAAA;IACrB,kFAAuB,CAAA;IACvB,kGAA+B,CAAA;IAC/B,gFAAsB,CAAA;IACtB,4EAAoB,CAAA;AACtB,CAAC,EA/BW,UAAU,KAAV,UAAU,QA+BrB"}

package/build/ts/common/index.d.ts

@@ -1,4 +1,6 @@
 export { ErrorCodes } from "./errors";
 export { ESupportedNetworks } from "./networks";
+export * from "./chain";
+export * from "./accountAbstraction";
 export * from "./types";
 //# sourceMappingURL=index.d.ts.map

package/build/ts/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../ts/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../ts/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,cAAc,SAAS,CAAC;AACxB,cAAc,sBAAsB,CAAC;AACrC,cAAc,SAAS,CAAC"}

package/build/ts/common/index.js

@@ -1,4 +1,6 @@
 export { ErrorCodes } from "./errors";
 export { ESupportedNetworks } from "./networks";
+export * from "./chain";
+export * from "./accountAbstraction";
 export * from "./types";
 //# sourceMappingURL=index.js.map

package/build/ts/common/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../ts/common/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,cAAc,SAAS,CAAC;AACxB,cAAc,sBAAsB,CAAC;AACrC,cAAc,SAAS,CAAC"}

package/build/ts/common/types.d.ts

@@ -1,9 +1,8 @@
 import { CreateKernelAccountReturnType, KernelAccountClient } from "@zerodev/sdk";
-import { BundlerClient } from "permissionless";
-import { ENTRYPOINT_ADDRESS_V07_TYPE } from "permissionless/types";
+import { BundlerClient } from "viem/account-abstraction";
 import type { Chain, HttpTransport, PublicClient, Transport } from "viem";
 export type KernelClientType = KernelAccountClient<Transport, Chain, CreateKernelAccountReturnType>;
-export type BundlerClientType = BundlerClient<ENTRYPOINT_ADDRESS_V07_TYPE>;
+export type BundlerClientType = BundlerClient;
 export type PublicClientType = PublicClient<Transport, Chain>;
 export type PublicClientHTTPType = PublicClient<HttpTransport, Chain>;
 //# sourceMappingURL=types.d.ts.map

package/build/ts/common/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../ts/common/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AAEnE,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAE1E,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,SAAS,EAAE,KAAK,EAAE,6BAA6B,CAAC,CAAC;AAEpG,MAAM,MAAM,iBAAiB,GAAG,aAAa,CAAC,2BAA2B,CAAC,CAAC;AAE3E,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAE9D,MAAM,MAAM,oBAAoB,GAAG,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../ts/common/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAE1E,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,SAAS,EAAE,KAAK,EAAE,6BAA6B,CAAC,CAAC;AAEpG,MAAM,MAAM,iBAAiB,GAAG,aAAa,CAAC;AAE9C,MAAM,MAAM,gBAAgB,GAAG,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;AAE9D,MAAM,MAAM,oBAAoB,GAAG,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC"}

package/build/ts/deployer/__tests__/deployer.controller.test.js

@@ -24,8 +24,8 @@ describe("DeployerController", () => {
     let approval;
     let sessionKeyAddress;
     beforeAll(async () => {
-        approval = await generateApproval(sessionKeyAddress);
         sessionKeyAddress = (await sessionKeyService.generateSessionKey()).sessionKeyAddress;
+        approval = await generateApproval(sessionKeyAddress);
     });
     beforeEach(async () => {
         const app = await Test.createTestingModule({
@@ -55,8 +55,8 @@ describe("DeployerController", () => {
         test("should return 400 bad request when the service throws", async () => {
             await expect(deployerControllerFail.deployMACIContracts({
                 chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
-                approval: "",
-                sessionKeyAddress: "0x",
+                approval: "0x123",
+                sessionKeyAddress: "0x123",
                 config: testMaciDeploymentConfig,
             })).rejects.toThrow(ErrorCodes.SESSION_KEY_NOT_FOUND.toString());
         });
@@ -65,8 +65,8 @@ describe("DeployerController", () => {
         test("should deploy a new poll", async () => {
             const { pollId } = await deployerController.deployPoll({
                 chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
-                approval: "",
-                sessionKeyAddress: "0x",
+                approval,
+                sessionKeyAddress,
                 config: testPollDeploymentConfig,
             });
             expect(pollId).toEqual(defaultDeployPollReturn);
@@ -74,8 +74,8 @@ describe("DeployerController", () => {
         test("should return 400 bad request when the service throws", async () => {
             await expect(deployerControllerFail.deployPoll({
                 chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
-                approval: "",
-                sessionKeyAddress: "0x",
+                approval: "0x123",
+                sessionKeyAddress: "0x123",
                 config: testPollDeploymentConfig,
             })).rejects.toThrow(ErrorCodes.SESSION_KEY_NOT_FOUND.toString());
         });

package/build/ts/deployer/__tests__/deployer.controller.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployer.controller.test.js","sourceRoot":"","sources":["../../../../ts/deployer/__tests__/deployer.controller.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"deployer.controller.test.js","sourceRoot":"","sources":["../../../../ts/deployer/__tests__/deployer.controller.test.ts"],"names":[],"mappings":"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"}

package/build/ts/deployer/__tests__/deployer.service.test.js

@@ -1,6 +1,6 @@
-import { IInitialVoiceCreditProxy__factory as VoiceCreditProxyFactory, ContractStorage, EContracts, EInitialVoiceCreditProxies, EPolicies, FreeForAllPolicy__factory as FreeForAllPolicyFactory, EASPolicy__factory as EASPolicyFactory, ZupassPolicy__factory as ZupassPolicyFactory, SemaphorePolicy__factory as SemaphorePolicyFactory, HatsPolicy__factory as HatsPolicyFactory, GitcoinPassportPolicy__factory as GitcoinPassportPolicyFactory, MACI__factory as MACIFactory, Verifier__factory as VerifierFactory, } from "@maci-protocol/sdk";
+import { ContractStorage, ECheckerFactories, EContracts, EInitialVoiceCreditProxies, EInitialVoiceCreditProxiesFactories, EPolicies, EPolicyFactories, getDeployedPolicyProxyFactories, MACI__factory as MACIFactory, Verifier__factory as VerifierFactory, } from "@maci-protocol/sdk";
 import dotenv from "dotenv";
-import { BaseContract, zeroPadBytes } from "ethers";
+import { BaseContract } from "ethers";
 import { zeroAddress } from "viem";
 import path from "path";
 import { ErrorCodes, ESupportedNetworks } from "../../common";
@@ -8,7 +8,6 @@ import { FileService } from "../../file/file.service";
 import { generateApproval } from "../../sessionKeys/__tests__/utils";
 import { SessionKeysService } from "../../sessionKeys/sessionKeys.service";
 import { DeployerService } from "../deployer.service";
-import { estimateExtraGasLimit } from "../utils";
 import { testMaciDeploymentConfig, testPollDeploymentConfig } from "./utils";
 dotenv.config();
 describe("DeployerService", () => {
@@ -22,296 +21,104 @@ describe("DeployerService", () => {
     const deployerService = new DeployerService(sessionKeyService, fileService);
     let approval;
     let sessionKeyAddress;
+    let signer;
     beforeAll(async () => {
-        approval = await generateApproval(sessionKeyAddress);
         sessionKeyAddress = (await sessionKeyService.generateSessionKey()).sessionKeyAddress;
+        approval = await generateApproval(sessionKeyAddress);
+        signer = await sessionKeyService.getCoordinatorSigner(chain);
     });
-    describe("getVoiceCreditProxyData", () => {
-        test("should return the voice credit proxy data", () => {
-            const voiceCreditProxyData = deployerService.getVoiceCreditProxyData(EInitialVoiceCreditProxies.Constant, chain, {
-                amount: "50",
-            });
-            expect(voiceCreditProxyData).toBeDefined();
-            expect(voiceCreditProxyData.alreadyDeployed).toBe(false);
-            expect(voiceCreditProxyData.abi).toBeDefined();
-            expect(voiceCreditProxyData.bytecode).toBeDefined();
-        });
-        test("should return the voice credit proxy data and that the voice credit proxy is already deployed", async () => {
-            await storageInstance.register({
-                id: EInitialVoiceCreditProxies.Constant,
-                contract: new BaseContract("0x", VoiceCreditProxyFactory.abi),
-                network: chain,
-                args: ["50"],
-            });
-            const voiceCreditProxyData = deployerService.getVoiceCreditProxyData(EInitialVoiceCreditProxies.Constant, chain, {
-                amount: "50",
-            });
-            expect(voiceCreditProxyData).toBeDefined();
-            expect(voiceCreditProxyData.alreadyDeployed).toBe(true);
-            expect(voiceCreditProxyData.abi).toBeDefined();
-            expect(voiceCreditProxyData.bytecode).toBeDefined();
-            storageInstance.cleanup(chain);
-        });
-        it("should throw when the voice credits proxy is not existent", () => {
-            expect(() => deployerService.getVoiceCreditProxyData("NotExistent", chain, {
-                amount: "50",
-            })).toThrow(ErrorCodes.UNSUPPORTED_VOICE_CREDIT_PROXY.toString());
-        });
+    afterAll(() => {
+        storageInstance.cleanup(ESupportedNetworks.OPTIMISM_SEPOLIA);
+        storageInstance.cleanup(ESupportedNetworks.ARBITRUM_ONE);
     });
-    describe("getPolicyData", () => {
+    describe("deployAndSavePolicy", () => {
         // we cleanup after each test so we don't have leftover saved contracts
         afterEach(() => {
             storageInstance.cleanup(chain);
         });
-        it("should throw when the policy is not existent", () => {
-            expect(() => deployerService.getPolicyData("NotExistent", chain)).toThrow(ErrorCodes.UNSUPPORTED_POLICY.toString());
+        test("should throw when the policy is not existent", async () => {
+            await expect(deployerService.deployAndSavePolicy(signer, chain, { type: "NonExistent" })).rejects.toThrow(ErrorCodes.UNSUPPORTED_POLICY.toString());
         });
-        describe("FreeForAllPolicy", () => {
-            it("should return the policy data and that the policy is not deployed", () => {
-                const policyData = deployerService.getPolicyData(EPolicies.FreeForAll, chain);
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(false);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
-            it("should return the policy data and that the policy is already deployed", async () => {
-                await storageInstance.register({
-                    id: EPolicies.FreeForAll,
-                    contract: new BaseContract("0x", FreeForAllPolicyFactory.abi),
-                    network: chain,
-                    args: [],
-                });
-                const policyData = deployerService.getPolicyData(EPolicies.FreeForAll, chain);
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(true);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
+        test("should deploy policy if none is stored", async () => {
+            const policy = await deployerService.deployAndSavePolicy(signer, chain, { type: EPolicies.FreeForAll });
+            expect(policy).toBeDefined();
+            expect(await policy.getAddress()).not.toBe(zeroAddress);
         });
-        describe("EASPolicy", () => {
-            it("should return the policy data and that the policy is not deployed", () => {
-                const policyData = deployerService.getPolicyData(EPolicies.EAS, chain);
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(false);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
-            it("should return the policy data and that the policy is already deployed", async () => {
-                await storageInstance.register({
-                    id: EPolicies.EAS,
-                    contract: new BaseContract("0x", EASPolicyFactory.abi),
-                    network: chain,
-                    args: [zeroAddress, zeroPadBytes("0x", 32), zeroAddress],
-                });
-                const policyData = deployerService.getPolicyData(EPolicies.EAS, chain, {
-                    easAddress: zeroAddress,
-                    schema: zeroPadBytes("0x", 32),
-                    attester: zeroAddress,
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(true);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
-            it("should return that the policy is not deployed when the args are different", async () => {
-                await storageInstance.register({
-                    id: EPolicies.EAS,
-                    contract: new BaseContract("0x", EASPolicyFactory.abi),
-                    network: chain,
-                    args: [zeroAddress, zeroPadBytes("0x", 32), zeroAddress.replace("0x0", "0x1")],
-                });
-                const policyData = deployerService.getPolicyData(EPolicies.EAS, chain, {
-                    easAddress: zeroAddress,
-                    schema: zeroPadBytes("0x", 32),
-                    attester: zeroAddress,
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(false);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
+        test("should save factories (policy and checker) after deploying policy", async () => {
+            const { checker: initialChecker, policy: initialPolicy } = await getDeployedPolicyProxyFactories({
+                policy: EPolicyFactories.FreeForAll,
+                checker: ECheckerFactories.FreeForAll,
+                network: chain,
+                signer,
+            });
+            expect(initialChecker).not.toBeDefined();
+            expect(initialPolicy).not.toBeDefined();
+            await deployerService.deployAndSavePolicy(signer, chain, { type: EPolicies.FreeForAll });
+            const { checker, policy } = await getDeployedPolicyProxyFactories({
+                policy: EPolicyFactories.FreeForAll,
+                checker: ECheckerFactories.FreeForAll,
+                network: chain,
+                signer,
             });
+            expect(checker).toBeDefined();
+            expect(policy).toBeDefined();
         });
-        describe("ZupassPolicy", () => {
-            it("should return the policy data and that the policy is not deployed", () => {
-                const policyData = deployerService.getPolicyData(EPolicies.Zupass, chain, {
-                    signer1: zeroAddress,
-                    signer2: zeroAddress,
-                    eventId: "0x",
-                    zupassVerifier: zeroAddress,
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(false);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
-            it("should return the policy data and that the policy is already deployed", async () => {
-                await storageInstance.register({
-                    id: EPolicies.Zupass,
-                    contract: new BaseContract("0x", ZupassPolicyFactory.abi),
-                    network: chain,
-                    args: [zeroAddress, zeroAddress, "0x", zeroAddress],
-                });
-                const policyData = deployerService.getPolicyData(EPolicies.Zupass, chain, {
-                    signer1: zeroAddress,
-                    signer2: zeroAddress,
-                    eventId: "0x",
-                    zupassVerifier: zeroAddress,
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(true);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
-            it("should return that the policy is not deployed when the args are different", async () => {
-                await storageInstance.register({
-                    id: EPolicies.Zupass,
-                    contract: new BaseContract("0x", ZupassPolicyFactory.abi),
-                    network: chain,
-                    args: [zeroAddress, zeroAddress, "0x", zeroAddress.replace("0x0", "0x1")],
-                });
-                const policyData = deployerService.getPolicyData(EPolicies.Zupass, chain, {
-                    signer1: zeroAddress,
-                    signer2: zeroAddress,
-                    eventId: "0x",
-                    zupassVerifier: zeroAddress,
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(false);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
+        test("should reuse policy factories if already stored", async () => {
+            const firstPolicy = await deployerService.deployAndSavePolicy(signer, chain, { type: EPolicies.FreeForAll });
+            const { checker: firstCheckerFactory, policy: firstPolicyFactory } = await getDeployedPolicyProxyFactories({
+                policy: EPolicyFactories.FreeForAll,
+                checker: ECheckerFactories.FreeForAll,
+                network: chain,
+                signer,
+            });
+            expect(firstCheckerFactory).toBeDefined();
+            expect(firstPolicyFactory).toBeDefined();
+            const firstCheckerFactoryAddress = await firstCheckerFactory.getAddress();
+            const firstPolicyFactoryAddress = await firstPolicyFactory.getAddress();
+            expect(firstCheckerFactoryAddress).not.toBe(zeroAddress);
+            expect(firstPolicyFactoryAddress).not.toBe(zeroAddress);
+            const secondPolicy = await deployerService.deployAndSavePolicy(signer, chain, {
+                type: EPolicies.FreeForAll,
+            });
+            const { checker: secondCheckerFactory, policy: secondPolicyFactory } = await getDeployedPolicyProxyFactories({
+                policy: EPolicyFactories.FreeForAll,
+                checker: ECheckerFactories.FreeForAll,
+                network: chain,
+                signer,
             });
+            expect(secondCheckerFactory).toBeDefined();
+            expect(secondPolicyFactory).toBeDefined();
+            expect(await secondCheckerFactory.getAddress()).toBe(firstCheckerFactoryAddress);
+            expect(await secondPolicyFactory.getAddress()).toBe(firstPolicyFactoryAddress);
+            expect(await firstPolicy.getAddress()).not.toBe(await secondPolicy.getAddress());
         });
-        describe("SemaphorePolicy", () => {
-            it("should return the policy data and that the policy is not deployed", () => {
-                const policyData = deployerService.getPolicyData(EPolicies.Semaphore, chain, {
-                    semaphoreContract: zeroAddress,
-                    groupId: "0",
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(false);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
-            it("should return the policy data and that the policy is already deployed", async () => {
-                await storageInstance.register({
-                    id: EPolicies.Semaphore,
-                    contract: new BaseContract("0x", SemaphorePolicyFactory.abi),
-                    network: chain,
-                    args: [zeroAddress, "0"],
-                });
-                const policyData = deployerService.getPolicyData(EPolicies.Semaphore, chain, {
-                    semaphoreContract: zeroAddress,
-                    groupId: "0",
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(true);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
-            it("should return that the policy is not deployed when the args are different", async () => {
-                await storageInstance.register({
-                    id: EPolicies.Semaphore,
-                    contract: new BaseContract("0x", SemaphorePolicyFactory.abi),
-                    network: chain,
-                    args: [zeroAddress, "0"],
-                });
-                const policyData = deployerService.getPolicyData(EPolicies.Semaphore, chain, {
-                    semaphoreContract: zeroAddress,
-                    groupId: "1",
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(false);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
+    });
+    describe("deployAndSaveVoiceCreditProxyFactory", () => {
+        afterEach(() => {
+            storageInstance.cleanup(chain);
         });
-        describe("HatsPolicy", () => {
-            it("should return the policy data and that the policy is not deployed", () => {
-                const policyData = deployerService.getPolicyData(EPolicies.Hats, chain, {
-                    hatsProtocolAddress: zeroAddress,
-                    critrionHats: [zeroAddress],
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(false);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
-            it("should return the policy data and that the policy is already deployed", async () => {
-                await storageInstance.register({
-                    id: EPolicies.Hats,
-                    contract: new BaseContract("0x", HatsPolicyFactory.abi),
-                    network: chain,
-                    args: [zeroAddress, [zeroAddress]],
-                });
-                const policyData = deployerService.getPolicyData(EPolicies.Hats, chain, {
-                    hatsProtocolAddress: zeroAddress,
-                    critrionHats: [zeroAddress],
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(true);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
-            it("should return that the policy is not deployed when the args are different", async () => {
-                await storageInstance.register({
-                    id: EPolicies.Hats,
-                    contract: new BaseContract("0x", HatsPolicyFactory.abi),
-                    network: chain,
-                    args: [zeroAddress, ["0x"]],
-                });
-                const policyData = deployerService.getPolicyData(EPolicies.Hats, chain, {
-                    hatsProtocolAddress: zeroAddress,
-                    critrionHats: ["0x1"],
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(false);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
+        it("should throw when the voice credit proxy factory is not existent", async () => {
+            await expect(deployerService.deployAndSaveVoiceCreditProxyFactory(signer, "NonExistent", chain)).rejects.toThrow(ErrorCodes.UNSUPPORTED_VOICE_CREDIT_PROXY_FACTORY.toString());
         });
-        describe("GitcoinPassportPolicy", () => {
-            it("should return the policy data and that the policy is not deployed", () => {
-                const policyData = deployerService.getPolicyData(EPolicies.GitcoinPassport, chain, {
-                    decoderAddress: zeroAddress,
-                    passingScore: "0",
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(false);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
-            it("should return the policy data and that the policy is already deployed", async () => {
-                await storageInstance.register({
-                    id: EPolicies.GitcoinPassport,
-                    contract: new BaseContract("0x", GitcoinPassportPolicyFactory.abi),
-                    network: chain,
-                    args: [zeroAddress, "0"],
-                });
-                const policyData = deployerService.getPolicyData(EPolicies.GitcoinPassport, chain, {
-                    decoderAddress: zeroAddress,
-                    passingScore: "0",
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(true);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
-            it("should return that the policy is not deployed when the args are different", async () => {
-                await storageInstance.register({
-                    id: EPolicies.GitcoinPassport,
-                    contract: new BaseContract("0x", GitcoinPassportPolicyFactory.abi),
-                    network: chain,
-                    args: [zeroAddress, "0"],
-                });
-                const policyData = deployerService.getPolicyData(EPolicies.GitcoinPassport, chain, {
-                    decoderAddress: zeroAddress,
-                    passingScore: "1",
-                });
-                expect(policyData).toBeDefined();
-                expect(policyData.alreadyDeployed).toBe(false);
-                expect(policyData.abi).toBeDefined();
-                expect(policyData.bytecode).toBeDefined();
-            });
+        test("should deploy voice credit proxy factory if none is stored", async () => {
+            const constantInitialVoiceCreditProxyFactory = await deployerService.deployAndSaveVoiceCreditProxyFactory(signer, EInitialVoiceCreditProxiesFactories.Constant, chain);
+            expect(constantInitialVoiceCreditProxyFactory).toBeDefined();
+            expect(await constantInitialVoiceCreditProxyFactory.getAddress()).not.toBe(zeroAddress);
+        });
+    });
+    describe("deployAndSaveVoiceCreditProxy", () => {
+        afterEach(() => {
+            storageInstance.cleanup(chain);
+        });
+        it("should throw when the voice credit proxy is not existent", async () => {
+            const constantInitialVoiceCreditProxyFactory = await deployerService.deployAndSaveVoiceCreditProxyFactory(signer, EInitialVoiceCreditProxiesFactories.Constant, chain);
+            await expect(deployerService.deployAndSaveVoiceCreditProxy(signer, "NonExistent", chain, constantInitialVoiceCreditProxyFactory)).rejects.toThrow(ErrorCodes.UNSUPPORTED_VOICE_CREDIT_PROXY.toString());
+        });
+        test("should deploy voice credit proxy if none is stored", async () => {
+            const constantInitialVoiceCreditProxyFactory = await deployerService.deployAndSaveVoiceCreditProxyFactory(signer, EInitialVoiceCreditProxiesFactories.Constant, chain);
+            const voiceCreditProxy = await deployerService.deployAndSaveVoiceCreditProxy(signer, EInitialVoiceCreditProxies.Constant, chain, constantInitialVoiceCreditProxyFactory, { amount: 100 });
+            expect(voiceCreditProxy).toBeDefined();
+            expect(await voiceCreditProxy.getAddress()).not.toBe(zeroAddress);
         });
     });
     describe("deployMaci", () => {
@@ -327,7 +134,7 @@ describe("DeployerService", () => {
             await expect(deployerService.deployMaci({
                 config: testMaciDeploymentConfig,
                 chain,
-                approval: "0x",
+                approval: "0x123",
                 sessionKeyAddress,
             })).rejects.toThrow(ErrorCodes.INVALID_APPROVAL.toString());
         });
@@ -383,7 +190,7 @@ describe("DeployerService", () => {
                 config: testPollDeploymentConfig,
             })).rejects.toThrow(ErrorCodes.VERIFIER_NOT_DEPLOYED.toString());
         });
-        it("should throw when there is no vk registry deployed", async () => {
+        it("should throw when there is no verifying keys registry deployed", async () => {
             await storageInstance.register({
                 id: EContracts.MACI,
                 contract: new BaseContract("0x", MACIFactory.abi),
@@ -401,7 +208,7 @@ describe("DeployerService", () => {
                 sessionKeyAddress,
                 chain,
                 config: testPollDeploymentConfig,
-            })).rejects.toThrow(ErrorCodes.VK_REGISTRY_NOT_DEPLOYED.toString());
+            })).rejects.toThrow(ErrorCodes.VERIFYING_KEYS_REGISTRY_NOT_DEPLOYED.toString());
         });
         test("should deploy a poll", async () => {
             const mockDeployPoll = jest.fn().mockResolvedValue({ pollId: "0" });
@@ -415,11 +222,5 @@ describe("DeployerService", () => {
             expect(pollId).toBe("0");
         });
     });
-    describe("estimateExtraGasLimit", () => {
-        it("should return the extra gas limit", () => {
-            const extraGasLimit = estimateExtraGasLimit(100n);
-            expect(extraGasLimit.toString()).toBe("5");
-        });
-    });
 });
 //# sourceMappingURL=deployer.service.test.js.map