@maci-protocol/coordinator 0.0.0-ci.153b117 → 0.0.0-ci.16f78c8

package/build/ts/common/networks.js

@@ -1,26 +1,6 @@
-import { arbitrum, arbitrumSepolia, base, baseSepolia, bsc, gnosis, holesky, linea, lineaSepolia, localhost, mainnet, optimism, optimismSepolia, polygon, scroll, scrollSepolia, sepolia, } from "viem/chains";
+import { ESupportedChains } from "@maci-protocol/sdk";
+import { arbitrum, arbitrumSepolia, base, baseSepolia, gnosis, gnosisChiado, hardhat, linea, lineaSepolia, localhost, mainnet, optimism, optimismSepolia, polygon, polygonAmoy, polygonZkEvm, polygonZkEvmCardona, scroll, scrollSepolia, sepolia, zksync, zksyncSepoliaTestnet, } from "viem/chains";
 import { ErrorCodes } from "./errors";
-export var ESupportedNetworks;
-(function (ESupportedNetworks) {
-    ESupportedNetworks["ETHEREUM"] = "mainnet";
-    ESupportedNetworks["OPTIMISM"] = "optimism";
-    ESupportedNetworks["OPTIMISM_SEPOLIA"] = "optimism-sepolia";
-    ESupportedNetworks["BSC"] = "bsc";
-    ESupportedNetworks["BSC_CHAPEL"] = "chapel";
-    ESupportedNetworks["GNOSIS_CHAIN"] = "gnosis";
-    ESupportedNetworks["POLYGON"] = "matic";
-    ESupportedNetworks["ARBITRUM_ONE"] = "arbitrum-one";
-    ESupportedNetworks["HOLESKY"] = "holesky";
-    ESupportedNetworks["LINEA_SEPOLIA"] = "linea-sepolia";
-    ESupportedNetworks["BASE_SEPOLIA"] = "base-sepolia";
-    ESupportedNetworks["ETHEREUM_SEPOLIA"] = "sepolia";
-    ESupportedNetworks["ARBITRUM_SEPOLIA"] = "arbitrum-sepolia";
-    ESupportedNetworks["LINEA"] = "linea";
-    ESupportedNetworks["BASE"] = "base";
-    ESupportedNetworks["SCROLL_SEPOLIA"] = "scroll-sepolia";
-    ESupportedNetworks["SCROLL"] = "scroll";
-    ESupportedNetworks["LOCALHOST"] = "localhost";
-})(ESupportedNetworks || (ESupportedNetworks = {}));
 /**
  * Get the Viem chain for a given network
  *
@@ -29,39 +9,50 @@ export var ESupportedNetworks;
  */
 export const viemChain = (network) => {
     switch (network) {
-        case ESupportedNetworks.ETHEREUM:
+        case ESupportedChains.Mainnet:
             return mainnet;
-        case ESupportedNetworks.ETHEREUM_SEPOLIA:
+        case ESupportedChains.Sepolia:
             return sepolia;
-        case ESupportedNetworks.ARBITRUM_ONE:
+        case ESupportedChains.Optimism:
+            return optimism;
+        case ESupportedChains.OptimismSepolia:
+            return optimismSepolia;
+        case ESupportedChains.Scroll:
+            return scroll;
+        case ESupportedChains.ScrollSepolia:
+            return scrollSepolia;
+        case ESupportedChains.Arbitrum:
             return arbitrum;
-        case ESupportedNetworks.ARBITRUM_SEPOLIA:
+        case ESupportedChains.ArbitrumSepolia:
             return arbitrumSepolia;
-        case ESupportedNetworks.BASE_SEPOLIA:
-            return baseSepolia;
-        case ESupportedNetworks.LINEA_SEPOLIA:
-            return lineaSepolia;
-        case ESupportedNetworks.SCROLL_SEPOLIA:
-            return scrollSepolia;
-        case ESupportedNetworks.SCROLL:
-            return scroll;
-        case ESupportedNetworks.BASE:
+        case ESupportedChains.Base:
             return base;
-        case ESupportedNetworks.HOLESKY:
-            return holesky;
-        case ESupportedNetworks.LINEA:
-            return linea;
-        case ESupportedNetworks.BSC:
-            return bsc;
-        case ESupportedNetworks.GNOSIS_CHAIN:
+        case ESupportedChains.BaseSepolia:
+            return baseSepolia;
+        case ESupportedChains.Gnosis:
             return gnosis;
-        case ESupportedNetworks.POLYGON:
+        case ESupportedChains.GnosisChiado:
+            return gnosisChiado;
+        case ESupportedChains.Polygon:
             return polygon;
-        case ESupportedNetworks.OPTIMISM:
-            return optimism;
-        case ESupportedNetworks.OPTIMISM_SEPOLIA:
-            return optimismSepolia;
-        case ESupportedNetworks.LOCALHOST:
+        case ESupportedChains.PolygonAmoy:
+            return polygonAmoy;
+        case ESupportedChains.Linea:
+            return linea;
+        case ESupportedChains.LineaSepolia:
+            return lineaSepolia;
+        case ESupportedChains.ZkSyncEra:
+            return zksync;
+        case ESupportedChains.ZkSyncSepolia:
+            return zksyncSepoliaTestnet;
+        case ESupportedChains.PolygonZkEvm:
+            return polygonZkEvm;
+        case ESupportedChains.PolygonCardonaZkEvm:
+            return polygonZkEvmCardona;
+        // coverage is not supported by viem and it wont be used in the coordinator
+        case ESupportedChains.Hardhat:
+            return hardhat;
+        case ESupportedChains.Localhost:
             return localhost;
         default:
             throw new Error(ErrorCodes.UNSUPPORTED_NETWORK.toString());

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

@@ -1 +1 @@
-{"version":3,"file":"networks.js","sourceRoot":"","sources":["../../../ts/common/networks.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,eAAe,EACf,IAAI,EACJ,WAAW,EACX,GAAG,EAEH,MAAM,EACN,OAAO,EACP,KAAK,EACL,YAAY,EACZ,SAAS,EACT,OAAO,EACP,QAAQ,EACR,eAAe,EACf,OAAO,EACP,MAAM,EACN,aAAa,EACb,OAAO,GACR,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,MAAM,CAAN,IAAY,kBAmBX;AAnBD,WAAY,kBAAkB;IAC5B,0CAAoB,CAAA;IACpB,2CAAqB,CAAA;IACrB,2DAAqC,CAAA;IACrC,iCAAW,CAAA;IACX,2CAAqB,CAAA;IACrB,6CAAuB,CAAA;IACvB,uCAAiB,CAAA;IACjB,mDAA6B,CAAA;IAC7B,yCAAmB,CAAA;IACnB,qDAA+B,CAAA;IAC/B,mDAA6B,CAAA;IAC7B,kDAA4B,CAAA;IAC5B,2DAAqC,CAAA;IACrC,qCAAe,CAAA;IACf,mCAAa,CAAA;IACb,uDAAiC,CAAA;IACjC,uCAAiB,CAAA;IACjB,6CAAuB,CAAA;AACzB,CAAC,EAnBW,kBAAkB,KAAlB,kBAAkB,QAmB7B;AAED;;;;;GAKG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAA2B,EAAS,EAAE;IAC9D,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,kBAAkB,CAAC,QAAQ;YAC9B,OAAO,OAAO,CAAC;QACjB,KAAK,kBAAkB,CAAC,gBAAgB;YACtC,OAAO,OAAO,CAAC;QACjB,KAAK,kBAAkB,CAAC,YAAY;YAClC,OAAO,QAAQ,CAAC;QAClB,KAAK,kBAAkB,CAAC,gBAAgB;YACtC,OAAO,eAAe,CAAC;QACzB,KAAK,kBAAkB,CAAC,YAAY;YAClC,OAAO,WAAW,CAAC;QACrB,KAAK,kBAAkB,CAAC,aAAa;YACnC,OAAO,YAAY,CAAC;QACtB,KAAK,kBAAkB,CAAC,cAAc;YACpC,OAAO,aAAa,CAAC;QACvB,KAAK,kBAAkB,CAAC,MAAM;YAC5B,OAAO,MAAM,CAAC;QAChB,KAAK,kBAAkB,CAAC,IAAI;YAC1B,OAAO,IAAI,CAAC;QACd,KAAK,kBAAkB,CAAC,OAAO;YAC7B,OAAO,OAAO,CAAC;QACjB,KAAK,kBAAkB,CAAC,KAAK;YAC3B,OAAO,KAAK,CAAC;QACf,KAAK,kBAAkB,CAAC,GAAG;YACzB,OAAO,GAAG,CAAC;QACb,KAAK,kBAAkB,CAAC,YAAY;YAClC,OAAO,MAAM,CAAC;QAChB,KAAK,kBAAkB,CAAC,OAAO;YAC7B,OAAO,OAAO,CAAC;QACjB,KAAK,kBAAkB,CAAC,QAAQ;YAC9B,OAAO,QAAQ,CAAC;QAClB,KAAK,kBAAkB,CAAC,gBAAgB;YACtC,OAAO,eAAe,CAAC;QACzB,KAAK,kBAAkB,CAAC,SAAS;YAC/B,OAAO,SAAS,CAAC;QACnB;YACE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"networks.js","sourceRoot":"","sources":["../../../ts/common/networks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACL,QAAQ,EACR,eAAe,EACf,IAAI,EACJ,WAAW,EAEX,MAAM,EACN,YAAY,EACZ,OAAO,EACP,KAAK,EACL,YAAY,EACZ,SAAS,EACT,OAAO,EACP,QAAQ,EACR,eAAe,EACf,OAAO,EACP,WAAW,EACX,YAAY,EACZ,mBAAmB,EACnB,MAAM,EACN,aAAa,EACb,OAAO,EACP,MAAM,EACN,oBAAoB,GACrB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAAyB,EAAS,EAAE;IAC5D,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,gBAAgB,CAAC,OAAO;YAC3B,OAAO,OAAO,CAAC;QACjB,KAAK,gBAAgB,CAAC,OAAO;YAC3B,OAAO,OAAO,CAAC;QACjB,KAAK,gBAAgB,CAAC,QAAQ;YAC5B,OAAO,QAAQ,CAAC;QAClB,KAAK,gBAAgB,CAAC,eAAe;YACnC,OAAO,eAAe,CAAC;QACzB,KAAK,gBAAgB,CAAC,MAAM;YAC1B,OAAO,MAAM,CAAC;QAChB,KAAK,gBAAgB,CAAC,aAAa;YACjC,OAAO,aAAa,CAAC;QACvB,KAAK,gBAAgB,CAAC,QAAQ;YAC5B,OAAO,QAAQ,CAAC;QAClB,KAAK,gBAAgB,CAAC,eAAe;YACnC,OAAO,eAAe,CAAC;QACzB,KAAK,gBAAgB,CAAC,IAAI;YACxB,OAAO,IAAI,CAAC;QACd,KAAK,gBAAgB,CAAC,WAAW;YAC/B,OAAO,WAAW,CAAC;QACrB,KAAK,gBAAgB,CAAC,MAAM;YAC1B,OAAO,MAAM,CAAC;QAChB,KAAK,gBAAgB,CAAC,YAAY;YAChC,OAAO,YAAY,CAAC;QACtB,KAAK,gBAAgB,CAAC,OAAO;YAC3B,OAAO,OAAO,CAAC;QACjB,KAAK,gBAAgB,CAAC,WAAW;YAC/B,OAAO,WAAW,CAAC;QACrB,KAAK,gBAAgB,CAAC,KAAK;YACzB,OAAO,KAAK,CAAC;QACf,KAAK,gBAAgB,CAAC,YAAY;YAChC,OAAO,YAAY,CAAC;QACtB,KAAK,gBAAgB,CAAC,SAAS;YAC7B,OAAO,MAAM,CAAC;QAChB,KAAK,gBAAgB,CAAC,aAAa;YACjC,OAAO,oBAAoB,CAAC;QAC9B,KAAK,gBAAgB,CAAC,YAAY;YAChC,OAAO,YAAY,CAAC;QACtB,KAAK,gBAAgB,CAAC,mBAAmB;YACvC,OAAO,mBAAmB,CAAC;QAC7B,2EAA2E;QAC3E,KAAK,gBAAgB,CAAC,OAAO;YAC3B,OAAO,OAAO,CAAC;QACjB,KAAK,gBAAgB,CAAC,SAAS;YAC7B,OAAO,SAAS,CAAC;QACnB;YACE,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC/D,CAAC;AACH,CAAC,CAAC"}

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

@@ -1,5 +1,5 @@
-import { CreateKernelAccountReturnType, KernelAccountClient } from "@zerodev/sdk";
-import { BundlerClient } from "viem/account-abstraction";
+import { type CreateKernelAccountReturnType, type KernelAccountClient } from "@zerodev/sdk";
+import { type BundlerClient } from "viem/account-abstraction";
 import type { Chain, HttpTransport, PublicClient, Transport } from "viem";
 export type KernelClientType = KernelAccountClient<Transport, Chain, CreateKernelAccountReturnType>;
 export type BundlerClientType = BundlerClient;

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,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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../ts/common/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,6BAA6B,EAAE,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE9D,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

@@ -1,9 +1,7 @@
+import { ESupportedChains } from "@maci-protocol/sdk";
 import { Test } from "@nestjs/testing";
 import { zeroAddress } from "viem";
-import { ErrorCodes, ESupportedNetworks } from "../../common";
-import { FileService } from "../../file/file.service";
-import { generateApproval } from "../../sessionKeys/__tests__/utils";
-import { SessionKeysService } from "../../sessionKeys/sessionKeys.service";
+import { ErrorCodes } from "../../common";
 import { DeployerController } from "../deployer.controller";
 import { DeployerService } from "../deployer.service";
 import { testMaciDeploymentConfig, testPollDeploymentConfig } from "./utils";
@@ -18,15 +16,8 @@ describe("DeployerController", () => {
     };
     const defaultDeployMaciReturn = zeroAddress;
     const defaultDeployPollReturn = "0";
-    const deployerControllerFail = new DeployerController(new DeployerService(new SessionKeysService(new FileService()), new FileService()));
-    const fileService = new FileService();
-    const sessionKeyService = new SessionKeysService(fileService);
-    let approval;
-    let sessionKeyAddress;
-    beforeAll(async () => {
-        sessionKeyAddress = (await sessionKeyService.generateSessionKey()).sessionKeyAddress;
-        approval = await generateApproval(sessionKeyAddress);
-    });
+    const approval = "approval";
+    const sessionKeyAddress = zeroAddress;
     beforeEach(async () => {
         const app = await Test.createTestingModule({
             controllers: [DeployerController],
@@ -42,10 +33,13 @@ describe("DeployerController", () => {
             .compile();
         deployerController = app.get(DeployerController);
     });
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
     describe("v1/deploy/maci", () => {
         test("should deploy all contracts", async () => {
             const { address } = await deployerController.deployMACIContracts({
-                chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
+                chain: ESupportedChains.OptimismSepolia,
                 approval,
                 sessionKeyAddress,
                 config: testMaciDeploymentConfig,
@@ -53,8 +47,10 @@ describe("DeployerController", () => {
             expect(address).toEqual(defaultDeployMaciReturn);
         });
         test("should return 400 bad request when the service throws", async () => {
-            await expect(deployerControllerFail.deployMACIContracts({
-                chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
+            mockDeployerService.deployMaci.mockRejectedValue(new Error(ErrorCodes.SESSION_KEY_NOT_FOUND.toString()));
+            const controller = new DeployerController(mockDeployerService);
+            await expect(controller.deployMACIContracts({
+                chain: ESupportedChains.OptimismSepolia,
                 approval: "0x123",
                 sessionKeyAddress: "0x123",
                 config: testMaciDeploymentConfig,
@@ -64,7 +60,7 @@ describe("DeployerController", () => {
     describe("v1/deploy/poll", () => {
         test("should deploy a new poll", async () => {
             const { pollId } = await deployerController.deployPoll({
-                chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
+                chain: ESupportedChains.OptimismSepolia,
                 approval,
                 sessionKeyAddress,
                 config: testPollDeploymentConfig,
@@ -72,8 +68,10 @@ describe("DeployerController", () => {
             expect(pollId).toEqual(defaultDeployPollReturn);
         });
         test("should return 400 bad request when the service throws", async () => {
-            await expect(deployerControllerFail.deployPoll({
-                chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
+            mockDeployerService.deployPoll.mockRejectedValue(new Error(ErrorCodes.SESSION_KEY_NOT_FOUND.toString()));
+            const controller = new DeployerController(mockDeployerService);
+            await expect(controller.deployPoll({
+                chain: ESupportedChains.OptimismSepolia,
                 approval: "0x123",
                 sessionKeyAddress: "0x123",
                 config: testPollDeploymentConfig,

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,114 +1,186 @@
-import { ContractStorage, ECheckerFactories, EContracts, EInitialVoiceCreditProxies, EPolicies, EPolicyFactories, getDeployedPolicyProxyFactories, MACI__factory as MACIFactory, Verifier__factory as VerifierFactory, } from "@maci-protocol/sdk";
+import { ContractStorage, deployFreeForAllSignUpPolicy, deployPoll, deployVerifier, deployVerifyingKeysRegistryContract, deployMaci, deployConstantInitialVoiceCreditProxyFactory, deployConstantInitialVoiceCreditProxy, getDeployedPolicyProxyFactories, ECheckerFactories, EContracts, EInitialVoiceCreditProxies, EInitialVoiceCreditProxiesFactories, EPolicies, EPolicyFactories, ESupportedChains, ECheckers, } from "@maci-protocol/sdk";
 import dotenv from "dotenv";
-import { BaseContract } from "ethers";
 import { zeroAddress } from "viem";
-import path from "path";
-import { ErrorCodes, ESupportedNetworks } from "../../common";
-import { FileService } from "../../file/file.service";
-import { generateApproval } from "../../sessionKeys/__tests__/utils";
-import { SessionKeysService } from "../../sessionKeys/sessionKeys.service";
+import { ErrorCodes } from "../../common";
 import { DeployerService } from "../deployer.service";
 import { testMaciDeploymentConfig, testPollDeploymentConfig } from "./utils";
 dotenv.config();
+jest.mock("@maci-protocol/sdk", () => ({
+    ...jest.requireActual("@maci-protocol/sdk"),
+    ContractStorage: {
+        getInstance: jest.fn(),
+    },
+    deployFreeForAllSignUpPolicy: jest.fn(),
+    deployPoll: jest.fn(),
+    deployVerifyingKeysRegistryContract: jest.fn(),
+    deployVerifier: jest.fn(),
+    getDeployedPolicyProxyFactories: jest.fn(),
+    setVerifyingKeys: jest.fn(),
+    deployMaci: jest.fn(),
+    deployConstantInitialVoiceCreditProxyFactory: jest.fn(),
+    deployConstantInitialVoiceCreditProxy: jest.fn(),
+}));
 describe("DeployerService", () => {
+    const chain = ESupportedChains.OptimismSepolia;
+    const signer = {
+        getAddress: jest.fn().mockResolvedValue(zeroAddress),
+    };
+    const approval = "approval";
+    const sessionKeyAddress = zeroAddress;
+    const mockStorage = {
+        register: jest.fn(),
+        getAddress: jest.fn(),
+    };
+    const mockContract = {
+        deploymentTransaction: jest.fn(),
+        getAddress: jest.fn().mockResolvedValue(zeroAddress.replace("0x0", "0x1")),
+    };
+    const fileService = {
+        getZkeyFilePaths: jest.fn(),
+    };
+    const sessionKeyService = {
+        getCoordinatorSigner: jest.fn().mockResolvedValue(signer),
+    };
+    beforeEach(() => {
+        mockStorage.getAddress = jest.fn().mockReturnValue(zeroAddress);
+        sessionKeyService.getCoordinatorSigner = jest.fn().mockResolvedValue(signer);
+        fileService.getZkeyFilePaths = jest.fn().mockReturnValue({ zkey: "" });
+        ContractStorage.getInstance.mockReturnValue(mockStorage);
+        deployFreeForAllSignUpPolicy.mockResolvedValue([
+            mockContract,
+            mockContract,
+            mockContract,
+            mockContract,
+        ]);
+        deployVerifier.mockResolvedValue(mockContract);
+        deployVerifyingKeysRegistryContract.mockResolvedValue(mockContract);
+        deployConstantInitialVoiceCreditProxyFactory.mockResolvedValue(mockContract);
+        deployConstantInitialVoiceCreditProxy.mockResolvedValue(mockContract);
+        deployPoll.mockResolvedValue({
+            pollContractAddress: zeroAddress,
+            messageProcessorContractAddress: zeroAddress,
+            tallyContractAddress: zeroAddress,
+            pollId: 0n,
+        });
+        deployMaci.mockResolvedValue({
+            maciContractAddress: zeroAddress.replace("0x0", "0x1"),
+            pollFactoryContractAddress: zeroAddress,
+            messageProcessorFactoryContractAddress: zeroAddress,
+            tallyFactoryContractAddress: zeroAddress,
+            poseidonAddresses: {
+                poseidonT3: zeroAddress,
+                poseidonT4: zeroAddress,
+                poseidonT5: zeroAddress,
+                poseidonT6: zeroAddress,
+            },
+            verifierContractAddress: zeroAddress,
+            verifyingKeysRegistryContractAddress: zeroAddress,
+        });
+        getDeployedPolicyProxyFactories.mockResolvedValue({ checker: undefined, policy: undefined });
+    });
     afterEach(() => {
         jest.clearAllMocks();
     });
-    const chain = ESupportedNetworks.OPTIMISM_SEPOLIA;
-    const fileService = new FileService();
-    const storageInstance = ContractStorage.getInstance(path.join(process.cwd(), "deployed-contracts.json"));
-    const sessionKeyService = new SessionKeysService(fileService);
-    const deployerService = new DeployerService(sessionKeyService, fileService);
-    let approval;
-    let sessionKeyAddress;
-    let signer;
-    beforeAll(async () => {
-        sessionKeyAddress = (await sessionKeyService.generateSessionKey()).sessionKeyAddress;
-        approval = await generateApproval(sessionKeyAddress);
-        signer = await sessionKeyService.getCoordinatorSigner(chain);
-    });
-    afterAll(() => {
-        storageInstance.cleanup(ESupportedNetworks.OPTIMISM_SEPOLIA);
-        storageInstance.cleanup(ESupportedNetworks.ARBITRUM_ONE);
-    });
     describe("deployAndSavePolicy", () => {
-        // we cleanup after each test so we don't have leftover saved contracts
-        afterEach(() => {
-            storageInstance.cleanup(chain);
-        });
         test("should throw when the policy is not existent", async () => {
-            await expect(deployerService.deployAndSavePolicy(signer, chain, { type: "NonExistent" })).rejects.toThrow(ErrorCodes.UNSUPPORTED_POLICY.toString());
+            const deployerService = new DeployerService(sessionKeyService, fileService);
+            await expect(deployerService.deployAndSavePolicy(signer, chain, {
+                policyType: "NonExistent",
+                checkerType: "NonExistent",
+            })).rejects.toThrow(ErrorCodes.UNSUPPORTED_POLICY.toString());
         });
         test("should deploy policy if none is stored", async () => {
-            const policy = await deployerService.deployAndSavePolicy(signer, chain, { type: EPolicies.FreeForAll });
+            const deployerService = new DeployerService(sessionKeyService, fileService);
+            const policy = await deployerService.deployAndSavePolicy(signer, chain, {
+                policyType: EPolicies.FreeForAll,
+                checkerType: ECheckers.FreeForAll,
+            });
             expect(policy).toBeDefined();
             expect(await policy.getAddress()).not.toBe(zeroAddress);
         });
         test("should save factories (policy and checker) after deploying policy", async () => {
-            const { checker: initialChecker, policy: initialPolicy } = await getDeployedPolicyProxyFactories({
-                policy: EPolicyFactories.FreeForAll,
-                checker: ECheckerFactories.FreeForAll,
+            const deployerService = new DeployerService(sessionKeyService, fileService);
+            await deployerService.deployAndSavePolicy(signer, chain, {
+                policyType: EPolicies.FreeForAll,
+                checkerType: ECheckers.FreeForAll,
+            });
+            expect(mockStorage.register).toHaveBeenCalledTimes(4);
+            expect(mockStorage.register).toHaveBeenNthCalledWith(1, {
+                id: EPolicies.FreeForAll,
+                name: EPolicies.FreeForAll,
+                contract: mockContract,
+                args: [await mockContract.getAddress()],
+                network: chain,
+            });
+            expect(mockStorage.register).toHaveBeenNthCalledWith(2, {
+                id: ECheckers.FreeForAll,
+                name: ECheckers.FreeForAll,
+                contract: mockContract,
+                args: [],
                 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,
+            expect(mockStorage.register).toHaveBeenNthCalledWith(3, {
+                id: EPolicyFactories.FreeForAll,
+                name: EPolicyFactories.FreeForAll,
+                contract: mockContract,
+                network: chain,
+            });
+            expect(mockStorage.register).toHaveBeenNthCalledWith(4, {
+                id: ECheckerFactories.FreeForAll,
+                name: ECheckerFactories.FreeForAll,
+                contract: mockContract,
                 network: chain,
-                signer,
             });
-            expect(checker).toBeDefined();
-            expect(policy).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,
+            getDeployedPolicyProxyFactories.mockResolvedValue({
+                checker: mockContract,
+                policy: mockContract,
             });
-            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 deployerService = new DeployerService(sessionKeyService, fileService);
+            await deployerService.deployAndSavePolicy(signer, chain, {
+                policyType: EPolicies.FreeForAll,
+                checkerType: ECheckers.FreeForAll,
             });
-            const { checker: secondCheckerFactory, policy: secondPolicyFactory } = await getDeployedPolicyProxyFactories({
-                policy: EPolicyFactories.FreeForAll,
-                checker: ECheckerFactories.FreeForAll,
-                network: chain,
-                signer,
+            await deployerService.deployAndSavePolicy(signer, chain, {
+                policyType: EPolicies.FreeForAll,
+                checkerType: ECheckers.FreeForAll,
             });
-            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());
+            expect(mockStorage.register).toHaveBeenCalledTimes(4);
         });
     });
-    describe("deployAndSaveVoiceCreditProxy", () => {
-        // we cleanup after each test so we don't have leftover saved contracts
-        afterEach(() => {
-            storageInstance.cleanup(chain);
+    describe("deployAndSaveVoiceCreditProxyFactory", () => {
+        test("should throw when the voice credit proxy factory is not existent", async () => {
+            const deployerService = new DeployerService(sessionKeyService, fileService);
+            await expect(deployerService.deployAndSaveVoiceCreditProxyFactory(signer, "NonExistent", chain)).rejects.toThrow(ErrorCodes.UNSUPPORTED_VOICE_CREDIT_PROXY_FACTORY.toString());
+        });
+        test("should deploy voice credit proxy factory if none is stored", async () => {
+            const deployerService = new DeployerService(sessionKeyService, fileService);
+            const constantInitialVoiceCreditProxyFactory = await deployerService.deployAndSaveVoiceCreditProxyFactory(signer, EInitialVoiceCreditProxiesFactories.Constant, chain);
+            expect(constantInitialVoiceCreditProxyFactory).toBeDefined();
+            expect(await constantInitialVoiceCreditProxyFactory.getAddress()).not.toBe(zeroAddress);
         });
-        it("should throw when the voice credit proxy is not existent", async () => {
-            await expect(deployerService.deployAndSaveVoiceCreditProxy(signer, "NonExistent", chain)).rejects.toThrow(ErrorCodes.UNSUPPORTED_VOICE_CREDIT_PROXY.toString());
+    });
+    describe("deployAndSaveVoiceCreditProxy", () => {
+        test("should throw when the voice credit proxy is not existent", async () => {
+            const deployerService = new DeployerService(sessionKeyService, fileService);
+            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 voiceCreditProxy = await deployerService.deployAndSaveVoiceCreditProxy(signer, EInitialVoiceCreditProxies.Constant, chain, { amount: 100 });
+            const deployerService = new DeployerService(sessionKeyService, fileService);
+            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", () => {
         test("should throw when passing a non existent session key address", async () => {
+            sessionKeyService.getCoordinatorSigner = jest
+                .fn()
+                .mockRejectedValue(new Error(ErrorCodes.SESSION_KEY_NOT_FOUND.toString()));
+            const deployerService = new DeployerService(sessionKeyService, fileService);
             await expect(deployerService.deployMaci({
                 config: testMaciDeploymentConfig,
                 chain,
@@ -117,6 +189,10 @@ describe("DeployerService", () => {
             })).rejects.toThrow(ErrorCodes.SESSION_KEY_NOT_FOUND.toString());
         });
         test("should throw when the approval is not valid", async () => {
+            sessionKeyService.getCoordinatorSigner = jest
+                .fn()
+                .mockRejectedValue(new Error(ErrorCodes.INVALID_APPROVAL.toString()));
+            const deployerService = new DeployerService(sessionKeyService, fileService);
             await expect(deployerService.deployMaci({
                 config: testMaciDeploymentConfig,
                 chain,
@@ -125,36 +201,25 @@ describe("DeployerService", () => {
             })).rejects.toThrow(ErrorCodes.INVALID_APPROVAL.toString());
         });
         test("should deploy all new contracts", async () => {
-            const mockDeployMaci = jest.fn().mockResolvedValue({ address: zeroAddress });
-            jest.spyOn(DeployerService.prototype, "deployMaci").mockImplementation(mockDeployMaci);
+            const deployerService = new DeployerService(sessionKeyService, fileService);
             const { address: maciAddress } = await deployerService.deployMaci({
                 config: testMaciDeploymentConfig,
                 chain,
                 approval,
                 sessionKeyAddress,
             });
-            expect(maciAddress).toBe(zeroAddress);
+            expect(maciAddress).toBe(zeroAddress.replace("0x0", "0x1"));
         });
     });
     describe("deployPoll", () => {
-        afterEach(() => {
-            storageInstance.cleanup(chain);
-        });
         test("should throw when there is no maci contract deployed", async () => {
-            await expect(deployerService.deployPoll({
-                approval,
-                sessionKeyAddress,
-                chain,
-                config: testPollDeploymentConfig,
-            })).rejects.toThrow(ErrorCodes.MACI_NOT_DEPLOYED.toString());
-        });
-        test("should throw when there is no maci contract deployed to this specific chain", async () => {
-            await storageInstance.register({
-                id: EContracts.MACI,
-                contract: new BaseContract("0x", MACIFactory.abi),
-                network: ESupportedNetworks.ARBITRUM_ONE,
-                args: [],
+            ContractStorage.getInstance.mockReturnValue({
+                ...mockStorage,
+                getAddress: jest
+                    .fn()
+                    .mockImplementation((key) => (key !== EContracts.MACI ? zeroAddress : undefined)),
             });
+            const deployerService = new DeployerService(sessionKeyService, fileService);
             await expect(deployerService.deployPoll({
                 approval,
                 sessionKeyAddress,
@@ -162,13 +227,14 @@ describe("DeployerService", () => {
                 config: testPollDeploymentConfig,
             })).rejects.toThrow(ErrorCodes.MACI_NOT_DEPLOYED.toString());
         });
-        it("should throw when there is no verifier deployed", async () => {
-            await storageInstance.register({
-                id: EContracts.MACI,
-                contract: new BaseContract("0x", MACIFactory.abi),
-                network: chain,
-                args: [],
+        test("should throw when there is no verifier deployed", async () => {
+            ContractStorage.getInstance.mockReturnValue({
+                ...mockStorage,
+                getAddress: jest
+                    .fn()
+                    .mockImplementation((key) => (key !== EContracts.Verifier ? zeroAddress : undefined)),
             });
+            const deployerService = new DeployerService(sessionKeyService, fileService);
             await expect(deployerService.deployPoll({
                 approval,
                 sessionKeyAddress,
@@ -176,19 +242,14 @@ describe("DeployerService", () => {
                 config: testPollDeploymentConfig,
             })).rejects.toThrow(ErrorCodes.VERIFIER_NOT_DEPLOYED.toString());
         });
-        it("should throw when there is no verifying keys registry deployed", async () => {
-            await storageInstance.register({
-                id: EContracts.MACI,
-                contract: new BaseContract("0x", MACIFactory.abi),
-                network: chain,
-                args: [],
-            });
-            await storageInstance.register({
-                id: EContracts.Verifier,
-                contract: new BaseContract("0x", VerifierFactory.abi),
-                network: chain,
-                args: [],
+        test("should throw when there is no verifying keys registry deployed", async () => {
+            ContractStorage.getInstance.mockReturnValue({
+                ...mockStorage,
+                getAddress: jest
+                    .fn()
+                    .mockImplementation((key) => key !== EContracts.VerifyingKeysRegistry ? zeroAddress : undefined),
             });
+            const deployerService = new DeployerService(sessionKeyService, fileService);
             await expect(deployerService.deployPoll({
                 approval,
                 sessionKeyAddress,
@@ -197,8 +258,7 @@ describe("DeployerService", () => {
             })).rejects.toThrow(ErrorCodes.VERIFYING_KEYS_REGISTRY_NOT_DEPLOYED.toString());
         });
         test("should deploy a poll", async () => {
-            const mockDeployPoll = jest.fn().mockResolvedValue({ pollId: "0" });
-            jest.spyOn(DeployerService.prototype, "deployPoll").mockImplementation(mockDeployPoll);
+            const deployerService = new DeployerService(sessionKeyService, fileService);
             const { pollId } = await deployerService.deployPoll({
                 config: testPollDeploymentConfig,
                 chain,