@maci-protocol/coordinator 0.0.0-ci.ebb44e9 → 0.0.0-ci.eea13a2

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

@@ -1 +1 @@
-{"version":3,"file":"chain.d.ts","sourceRoot":"","sources":["../../../ts/common/chain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,MAAM,EAAU,MAAM,QAAQ,CAAC;AAGzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;GAKG;AACH,eAAO,MAAM,SAAS,GAAI,SAAS,kBAAkB,KAAG,MAavD,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,SAAS,GAAI,OAAO,kBAAkB,KAAG,MAMrD,CAAC"}
+{"version":3,"file":"chain.d.ts","sourceRoot":"","sources":["../../../ts/common/chain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,MAAM,EAAU,MAAM,QAAQ,CAAC;AAGzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;GAKG;AACH,eAAO,MAAM,SAAS,GAAU,SAAS,kBAAkB,KAAG,OAAO,CAAC,MAAM,CAY3E,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,SAAS,GAAU,OAAO,kBAAkB,KAAG,OAAO,CAAC,MAAM,CASzE,CAAC"}

package/build/ts/common/chain.js

@@ -7,25 +7,26 @@ import { ESupportedNetworks } from "./networks";
  * @param network - the network we want to interact with
  * @returns the RPC url for the network
  */
-export const getRpcUrl = (network) => {
+export const getRpcUrl = async (network) => {
     const rpcUrl = process.env.COORDINATOR_RPC_URL;
     if (!rpcUrl) {
-        throw new Error(ErrorCodes.COORDINATOR_RPC_URL_NOT_SET.toString());
+        return Promise.reject(new Error(ErrorCodes.COORDINATOR_RPC_URL_NOT_SET.toString()));
     }
-    const supportedNetworks = [ESupportedNetworks.OPTIMISM_SEPOLIA, ESupportedNetworks.ETHEREUM_SEPOLIA];
-    if (!supportedNetworks.includes(network)) {
-        throw new Error(ErrorCodes.UNSUPPORTED_NETWORK.toString());
+    if (!Object.values(ESupportedNetworks).includes(network)) {
+        return Promise.reject(new Error(ErrorCodes.UNSUPPORTED_NETWORK.toString()));
     }
-    return rpcUrl;
+    return Promise.resolve(rpcUrl);
 };
 /**
  * Get a Ethers Signer given a chain and private key
  * @param chain
  * @returns
  */
-export const getSigner = (chain) => {
-    const wallet = new Wallet(process.env.PRIVATE_KEY);
-    const alchemyRpcUrl = getRpcUrl(chain);
+export const getSigner = async (chain) => {
+    const wallet = process.env.PRIVATE_KEY
+        ? new Wallet(process.env.PRIVATE_KEY)
+        : Wallet.fromPhrase(process.env.MNEMONIC);
+    const alchemyRpcUrl = await getRpcUrl(chain);
     const provider = new JsonRpcProvider(alchemyRpcUrl);
     return wallet.connect(provider);
 };

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

@@ -1 +1 @@
-{"version":3,"file":"chain.js","sourceRoot":"","sources":["../../../ts/common/chain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,OAA2B,EAAU,EAAE;IAC/D,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;IAE/C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,2BAA2B,CAAC,QAAQ,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,iBAAiB,GAAG,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IACrG,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAyB,EAAU,EAAE;IAC7D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,WAAY,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,aAAa,CAAC,CAAC;IAEpD,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAClC,CAAC,CAAC"}
+{"version":3,"file":"chain.js","sourceRoot":"","sources":["../../../ts/common/chain.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEzD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,OAA2B,EAAmB,EAAE;IAC9E,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;IAE/C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,2BAA2B,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACzD,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AACjC,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,KAAyB,EAAmB,EAAE;IAC5E,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW;QACpC,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;QACrC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,QAAS,CAAC,CAAC;IAE7C,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,aAAa,CAAC,CAAC;IAEpD,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AAClC,CAAC,CAAC"}

package/build/ts/common/errors.d.ts

@@ -17,16 +17,20 @@ export declare enum ErrorCodes {
     FAILED_TO_MERGE_STATE_TREE = 12,
     FAILED_TO_MERGE_MESSAGE_SUBTREES = 13,
     FAILED_TO_MERGE_MESSAGE_TREE = 14,
-    UNSUPPORTED_VOICE_CREDIT_PROXY = 15,
-    UNSUPPORTED_POLICY = 16,
-    FAILED_TO_DEPLOY_CONTRACT = 17,
-    FAILED_TO_SET_MACI_INSTANCE_ON_POLICY = 18,
-    MACI_NOT_DEPLOYED = 19,
-    VERIFIER_NOT_DEPLOYED = 20,
-    VERIFYING_KEYS_REGISTRY_NOT_DEPLOYED = 21,
-    FAILED_TO_SET_VERIFYING_KEYS = 22,
-    FAILED_TO_DEPLOY_MACI = 23,
-    FAILED_TO_DEPLOY_POLL = 24,
-    NOT_MERGED_MESSAGE_TREE = 25
+    UNSUPPORTED_VOICE_CREDIT_PROXY_FACTORY = 15,
+    UNSUPPORTED_VOICE_CREDIT_PROXY = 16,
+    UNSUPPORTED_POLICY = 17,
+    FAILED_TO_DEPLOY_CONTRACT = 18,
+    FAILED_TO_SET_MACI_INSTANCE_ON_POLICY = 19,
+    MACI_NOT_DEPLOYED = 20,
+    VERIFIER_NOT_DEPLOYED = 21,
+    VERIFYING_KEYS_REGISTRY_NOT_DEPLOYED = 22,
+    FAILED_TO_SET_VERIFYING_KEYS = 23,
+    FAILED_TO_DEPLOY_MACI = 24,
+    FAILED_TO_DEPLOY_POLL = 25,
+    NOT_MERGED_MESSAGE_TREE = 26,
+    FAILED_TO_UPDATE_SCHEDULED_POLL = 27,
+    POLL_ALREADY_SCHEDULED = 28,
+    POLL_ALREADY_TALLIED = 29
 }
 //# sourceMappingURL=errors.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../ts/common/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,oBAAY,UAAU;IACpB,qBAAqB,IAAA;IACrB,oBAAoB,IAAA;IACpB,cAAc,IAAA;IACd,UAAU,IAAA;IACV,UAAU,IAAA;IACV,cAAc,IAAA;IACd,eAAe,IAAA;IACf,6BAA6B,IAAA;IAC7B,qBAAqB,IAAA;IACrB,gBAAgB,IAAA;IAChB,mBAAmB,KAAA;IACnB,2BAA2B,KAAA;IAC3B,0BAA0B,KAAA;IAC1B,gCAAgC,KAAA;IAChC,4BAA4B,KAAA;IAC5B,8BAA8B,KAAA;IAC9B,kBAAkB,KAAA;IAClB,yBAAyB,KAAA;IACzB,qCAAqC,KAAA;IACrC,iBAAiB,KAAA;IACjB,qBAAqB,KAAA;IACrB,oCAAoC,KAAA;IACpC,4BAA4B,KAAA;IAC5B,qBAAqB,KAAA;IACrB,qBAAqB,KAAA;IACrB,uBAAuB,KAAA;CACxB"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../ts/common/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,oBAAY,UAAU;IACpB,qBAAqB,IAAA;IACrB,oBAAoB,IAAA;IACpB,cAAc,IAAA;IACd,UAAU,IAAA;IACV,UAAU,IAAA;IACV,cAAc,IAAA;IACd,eAAe,IAAA;IACf,6BAA6B,IAAA;IAC7B,qBAAqB,IAAA;IACrB,gBAAgB,IAAA;IAChB,mBAAmB,KAAA;IACnB,2BAA2B,KAAA;IAC3B,0BAA0B,KAAA;IAC1B,gCAAgC,KAAA;IAChC,4BAA4B,KAAA;IAC5B,sCAAsC,KAAA;IACtC,8BAA8B,KAAA;IAC9B,kBAAkB,KAAA;IAClB,yBAAyB,KAAA;IACzB,qCAAqC,KAAA;IACrC,iBAAiB,KAAA;IACjB,qBAAqB,KAAA;IACrB,oCAAoC,KAAA;IACpC,4BAA4B,KAAA;IAC5B,qBAAqB,KAAA;IACrB,qBAAqB,KAAA;IACrB,uBAAuB,KAAA;IACvB,+BAA+B,KAAA;IAC/B,sBAAsB,KAAA;IACtB,oBAAoB,KAAA;CACrB"}

package/build/ts/common/errors.js

@@ -18,16 +18,20 @@ export var ErrorCodes;
     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"] = 15] = "UNSUPPORTED_VOICE_CREDIT_PROXY";
-    ErrorCodes[ErrorCodes["UNSUPPORTED_POLICY"] = 16] = "UNSUPPORTED_POLICY";
-    ErrorCodes[ErrorCodes["FAILED_TO_DEPLOY_CONTRACT"] = 17] = "FAILED_TO_DEPLOY_CONTRACT";
-    ErrorCodes[ErrorCodes["FAILED_TO_SET_MACI_INSTANCE_ON_POLICY"] = 18] = "FAILED_TO_SET_MACI_INSTANCE_ON_POLICY";
-    ErrorCodes[ErrorCodes["MACI_NOT_DEPLOYED"] = 19] = "MACI_NOT_DEPLOYED";
-    ErrorCodes[ErrorCodes["VERIFIER_NOT_DEPLOYED"] = 20] = "VERIFIER_NOT_DEPLOYED";
-    ErrorCodes[ErrorCodes["VERIFYING_KEYS_REGISTRY_NOT_DEPLOYED"] = 21] = "VERIFYING_KEYS_REGISTRY_NOT_DEPLOYED";
-    ErrorCodes[ErrorCodes["FAILED_TO_SET_VERIFYING_KEYS"] = 22] = "FAILED_TO_SET_VERIFYING_KEYS";
-    ErrorCodes[ErrorCodes["FAILED_TO_DEPLOY_MACI"] = 23] = "FAILED_TO_DEPLOY_MACI";
-    ErrorCodes[ErrorCodes["FAILED_TO_DEPLOY_POLL"] = 24] = "FAILED_TO_DEPLOY_POLL";
-    ErrorCodes[ErrorCodes["NOT_MERGED_MESSAGE_TREE"] = 25] = "NOT_MERGED_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["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,UA2BX;AA3BD,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,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;AACzB,CAAC,EA3BW,UAAU,KAAV,UAAU,QA2BrB"}
+{"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/deployer/__tests__/deployer.controller.test.js

@@ -1,9 +1,6 @@
 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 { DeployerController } from "../deployer.controller";
 import { DeployerService } from "../deployer.service";
 import { testMaciDeploymentConfig, testPollDeploymentConfig } from "./utils";
@@ -18,15 +15,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 () => {
-        approval = await generateApproval(sessionKeyAddress);
-        sessionKeyAddress = (await sessionKeyService.generateSessionKey()).sessionKeyAddress;
-    });
+    const approval = "approval";
+    const sessionKeyAddress = zeroAddress;
     beforeEach(async () => {
         const app = await Test.createTestingModule({
             controllers: [DeployerController],
@@ -42,6 +32,9 @@ 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({
@@ -53,10 +46,12 @@ describe("DeployerController", () => {
             expect(address).toEqual(defaultDeployMaciReturn);
         });
         test("should return 400 bad request when the service throws", async () => {
-            await expect(deployerControllerFail.deployMACIContracts({
+            mockDeployerService.deployMaci.mockRejectedValue(new Error(ErrorCodes.SESSION_KEY_NOT_FOUND.toString()));
+            const controller = new DeployerController(mockDeployerService);
+            await expect(controller.deployMACIContracts({
                 chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
-                approval: "",
-                sessionKeyAddress: "0x",
+                approval: "0x123",
+                sessionKeyAddress: "0x123",
                 config: testMaciDeploymentConfig,
             })).rejects.toThrow(ErrorCodes.SESSION_KEY_NOT_FOUND.toString());
         });
@@ -65,17 +60,19 @@ 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);
         });
         test("should return 400 bad request when the service throws", async () => {
-            await expect(deployerControllerFail.deployPoll({
+            mockDeployerService.deployPoll.mockRejectedValue(new Error(ErrorCodes.SESSION_KEY_NOT_FOUND.toString()));
+            const controller = new DeployerController(mockDeployerService);
+            await expect(controller.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,68 +1,162 @@
-import { ContractStorage, EContracts, EInitialVoiceCreditProxies, EPolicies, 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, } 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 { 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", () => {
-    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 kernelClient;
-    let signer;
-    beforeAll(async () => {
-        sessionKeyAddress = (await sessionKeyService.generateSessionKey()).sessionKeyAddress;
-        approval = await generateApproval(sessionKeyAddress);
-        kernelClient = await sessionKeyService.generateClientFromSessionKey(sessionKeyAddress, approval, chain);
-        signer = await sessionKeyService.getKernelClientSigner(kernelClient);
+    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,
+            },
+        });
+        getDeployedPolicyProxyFactories.mockResolvedValue({ checker: undefined, policy: undefined });
     });
-    afterAll(() => {
-        storageInstance.cleanup(ESupportedNetworks.OPTIMISM_SEPOLIA);
-        storageInstance.cleanup(ESupportedNetworks.ARBITRUM_ONE);
+    afterEach(() => {
+        jest.clearAllMocks();
     });
     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", async () => {
-            await expect(deployerService.deployAndSavePolicy(signer, "NonExistent", chain)).rejects.toThrow(ErrorCodes.UNSUPPORTED_POLICY.toString());
+        test("should throw when the policy is not existent", async () => {
+            const deployerService = new DeployerService(sessionKeyService, fileService);
+            await expect(deployerService.deployAndSavePolicy(signer, chain, { type: "NonExistent" })).rejects.toThrow(ErrorCodes.UNSUPPORTED_POLICY.toString());
         });
         test("should deploy policy if none is stored", async () => {
-            const policy = await deployerService.deployAndSavePolicy(signer, EPolicies.FreeForAll, chain);
+            const deployerService = new DeployerService(sessionKeyService, fileService);
+            const policy = await deployerService.deployAndSavePolicy(signer, chain, { type: EPolicies.FreeForAll });
             expect(policy).toBeDefined();
             expect(await policy.getAddress()).not.toBe(zeroAddress);
         });
+        test("should save factories (policy and checker) after deploying policy", async () => {
+            const deployerService = new DeployerService(sessionKeyService, fileService);
+            await deployerService.deployAndSavePolicy(signer, chain, { type: EPolicies.FreeForAll });
+            expect(mockStorage.register).toHaveBeenCalledTimes(3);
+            expect(mockStorage.register).toHaveBeenNthCalledWith(1, {
+                id: EPolicies.FreeForAll,
+                name: EPolicies.FreeForAll,
+                contract: mockContract,
+                args: [],
+                network: chain,
+            });
+            expect(mockStorage.register).toHaveBeenNthCalledWith(2, {
+                id: EPolicyFactories.FreeForAll,
+                name: EPolicyFactories.FreeForAll,
+                contract: mockContract,
+                network: chain,
+            });
+            expect(mockStorage.register).toHaveBeenNthCalledWith(3, {
+                id: ECheckerFactories.FreeForAll,
+                name: ECheckerFactories.FreeForAll,
+                contract: mockContract,
+                network: chain,
+            });
+        });
+        test("should reuse policy factories if already stored", async () => {
+            getDeployedPolicyProxyFactories.mockResolvedValue({
+                checker: mockContract,
+                policy: mockContract,
+            });
+            const deployerService = new DeployerService(sessionKeyService, fileService);
+            await deployerService.deployAndSavePolicy(signer, chain, { type: EPolicies.FreeForAll });
+            await deployerService.deployAndSavePolicy(signer, chain, { type: EPolicies.FreeForAll });
+            expect(mockStorage.register).toHaveBeenCalledTimes(2);
+        });
     });
-    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());
         });
-        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());
+        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);
+        });
+    });
+    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,
@@ -71,44 +165,37 @@ 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,
-                approval: "0x",
+                approval: "0x123",
                 sessionKeyAddress,
             })).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,
@@ -116,13 +203,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,
@@ -130,19 +218,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,
@@ -151,8 +234,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,

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

@@ -1 +1 @@
-{"version":3,"file":"deployer.service.test.js","sourceRoot":"","sources":["../../../../ts/deployer/__tests__/deployer.service.test.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,UAAU,EACV,0BAA0B,EAC1B,SAAS,EACT,aAAa,IAAI,WAAW,EAC5B,iBAAiB,IAAI,eAAe,GACrC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAU,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAO,WAAW,EAAE,MAAM,MAAM,CAAC;AAExC,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAoB,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAE7E,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,kBAAkB,CAAC,gBAAgB,CAAC;IAElD,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;IAEtC,MAAM,eAAe,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,yBAAyB,CAAC,CAAC,CAAC;IACzG,MAAM,iBAAiB,GAAG,IAAI,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAE5E,IAAI,QAAgB,CAAC;IACrB,IAAI,iBAAsB,CAAC;IAC3B,IAAI,YAA8B,CAAC;IACnC,IAAI,MAAc,CAAC;IAEnB,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,iBAAiB,GAAG,CAAC,MAAM,iBAAiB,CAAC,kBAAkB,EAAE,CAAC,CAAC,iBAAiB,CAAC;QACrF,QAAQ,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QAErD,YAAY,GAAG,MAAM,iBAAiB,CAAC,4BAA4B,CAAC,iBAAiB,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;QACxG,MAAM,GAAG,MAAM,iBAAiB,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,GAAG,EAAE;QACZ,eAAe,CAAC,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAC7D,eAAe,CAAC,OAAO,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACnC,uEAAuE;QACvE,SAAS,CAAC,GAAG,EAAE;YACb,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QACH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC5D,MAAM,MAAM,CACV,eAAe,CAAC,mBAAmB,CAAC,MAAM,EAAE,aAAqC,EAAE,KAAK,CAAC,CAC1F,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;YACxD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,mBAAmB,CAAC,MAAM,EAAE,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;YAE9F,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;YAC7B,MAAM,CAAC,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;QAC7C,uEAAuE;QACvE,SAAS,CAAC,GAAG,EAAE;YACb,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;YACxE,MAAM,MAAM,CACV,eAAe,CAAC,6BAA6B,CAC3C,MAAM,EACN,aAAsD,EACtD,KAAK,CACN,CACF,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,8BAA8B,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1E,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YACpE,MAAM,gBAAgB,GAAG,MAAM,eAAe,CAAC,6BAA6B,CAC1E,MAAM,EACN,0BAA0B,CAAC,QAAQ,EACnC,KAAK,EACL,EAAE,MAAM,EAAE,GAAG,EAAE,CAChB,CAAC;YAEF,MAAM,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAC;YACvC,MAAM,CAAC,MAAM,gBAAgB,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,IAAI,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;YAC9E,MAAM,MAAM,CACV,eAAe,CAAC,UAAU,CAAC;gBACzB,MAAM,EAAE,wBAAwB;gBAChC,KAAK;gBACL,QAAQ;gBACR,iBAAiB,EAAE,KAAK;aACzB,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YAC7D,MAAM,MAAM,CACV,eAAe,CAAC,UAAU,CAAC;gBACzB,MAAM,EAAE,wBAAwB;gBAChC,KAAK;gBACL,QAAQ,EAAE,IAAI;gBACd,iBAAiB;aAClB,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,cAAc,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;YAC7E,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;YAEvF,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC;gBAChE,MAAM,EAAE,wBAAwB;gBAChC,KAAK;gBACL,QAAQ;gBACR,iBAAiB;aAClB,CAAC,CAAC;YAEH,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,SAAS,CAAC,GAAG,EAAE;YACb,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;YACtE,MAAM,MAAM,CACV,eAAe,CAAC,UAAU,CAAC;gBACzB,QAAQ;gBACR,iBAAiB;gBACjB,KAAK;gBACL,MAAM,EAAE,wBAAwB;aACjC,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,6EAA6E,EAAE,KAAK,IAAI,EAAE;YAC7F,MAAM,eAAe,CAAC,QAAQ,CAAC;gBAC7B,EAAE,EAAE,UAAU,CAAC,IAAI;gBACnB,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC;gBACjD,OAAO,EAAE,kBAAkB,CAAC,YAAY;gBACxC,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YACH,MAAM,MAAM,CACV,eAAe,CAAC,UAAU,CAAC;gBACzB,QAAQ;gBACR,iBAAiB;gBACjB,KAAK;gBACL,MAAM,EAAE,wBAAwB;aACjC,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,MAAM,eAAe,CAAC,QAAQ,CAAC;gBAC7B,EAAE,EAAE,UAAU,CAAC,IAAI;gBACnB,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC;gBACjD,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YAEH,MAAM,MAAM,CACV,eAAe,CAAC,UAAU,CAAC;gBACzB,QAAQ;gBACR,iBAAiB;gBACjB,KAAK;gBACL,MAAM,EAAE,wBAAwB;aACjC,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;YAC9E,MAAM,eAAe,CAAC,QAAQ,CAAC;gBAC7B,EAAE,EAAE,UAAU,CAAC,IAAI;gBACnB,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC;gBACjD,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YAEH,MAAM,eAAe,CAAC,QAAQ,CAAC;gBAC7B,EAAE,EAAE,UAAU,CAAC,QAAQ;gBACvB,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,eAAe,CAAC,GAAG,CAAC;gBACrD,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YAEH,MAAM,MAAM,CACV,eAAe,CAAC,UAAU,CAAC;gBACzB,QAAQ;gBACR,iBAAiB;gBACjB,KAAK;gBACL,MAAM,EAAE,wBAAwB;aACjC,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,oCAAoC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;YACtC,MAAM,cAAc,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;YAEvF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC;gBAClD,MAAM,EAAE,wBAAwB;gBAChC,KAAK;gBACL,QAAQ;gBACR,iBAAiB;aAClB,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"deployer.service.test.js","sourceRoot":"","sources":["../../../../ts/deployer/__tests__/deployer.service.test.ts"],"names":[],"mappings":"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"}

package/build/ts/deployer/__tests__/utils.d.ts

@@ -8,7 +8,6 @@ export declare const MODE = EMode.NON_QV;
 export declare const testMaciDeploymentConfig: IDeployMaciConfig;
 /**
  * Start date for the poll (it cannot be in the past)
- * n seconds are added to give it time until it is deployed
  */
 export declare const startDate: number;
 /**

package/build/ts/deployer/__tests__/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../ts/deployer/__tests__/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAGlF,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,EACd,0BAA0B,EAC1B,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACpB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,cAAc,KAAK,CAAC;AAEjC,eAAO,MAAM,IAAI,eAAe,CAAC;AAEjC;;GAEG;AACH,eAAO,MAAM,wBAAwB,EAAE,iBAyBtC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,SAAS,QAAsC,CAAC;AAE7D;;;GAGG;AACH,eAAO,MAAM,YAAY,KAAK,CAAC;AAE/B;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAE5C;;GAEG;AACH,eAAO,MAAM,wBAAwB,EAAE,iBAkBtC,CAAC;AAEF;;;;GAIG;AACH;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,cAIvC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,4BAA4B,EAAE,iBAK1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,+BAA+B,EAAE,oBAG7C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,EAAE,eAGxC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iCAAiC,EAAE,sBAE/C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,4BAA4B,EAAE,gBAE1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qCAAqC,EAAE,0BAGnD,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../ts/deployer/__tests__/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,KAAK,EAAuC,MAAM,oBAAoB,CAAC;AAGvH,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,EACd,0BAA0B,EAC1B,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACpB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,cAAc,KAAK,CAAC;AAEjC,eAAO,MAAM,IAAI,eAAe,CAAC;AAEjC;;GAEG;AACH,eAAO,MAAM,wBAAwB,EAAE,iBAyBtC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,QAAgC,CAAC;AAEvD;;;GAGG;AACH,eAAO,MAAM,YAAY,KAAK,CAAC;AAE/B;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAE5C;;GAEG;AACH,eAAO,MAAM,wBAAwB,EAAE,iBAmBtC,CAAC;AAEF;;;;GAIG;AACH;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,cAIvC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,4BAA4B,EAAE,iBAK1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,+BAA+B,EAAE,oBAG7C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,EAAE,eAGxC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iCAAiC,EAAE,sBAE/C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,4BAA4B,EAAE,gBAE1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qCAAqC,EAAE,0BAGnD,CAAC"}