@maci-protocol/coordinator 0.0.0-ci.e0aedb2 → 0.0.0-ci.e2759dd

package/LICENSE

@@ -1,7 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Barry WhiteHat, Kendrick Tan, Kobi Gurkan, Kirill Goncharov
-Cory Dickson, Han Jian, Chih-Cheng Liang, and Koh Wei Jie
+Copyright (c) 2025 Ethereum Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -2,16 +2,23 @@
 
 Please refer to [Offchain relayer service documentation](https://maci.pse.dev/docs/category/offchain-relayer) for more information.
 
+## Requirements
+
+1. [Node.js](https://nodejs.org/en) version 20.0.0.
+2. [pnpm](https://pnpm.io/installation) package manager.
+3. [rapidsnark](https://github.com/iden3/rapidsnark) program.
+
 ## Instructions
 
 1. Add `.env` file (see `.env.example`).
-2. Generate RSA key pair with `pnpm run generate-keypair`.
-3. Download zkey files using `pnpm run download-zkeys:{type}` (only test type is available for now).
-4. Make sure you copied RSA public key to your application. This will be needed for encrypting `Authorization` header and coordinator private key for proof generation. Also it can be accessed through API method `GET v1/proof/publicKey`.
-5. Run `pnpm run start` to run the service.
-6. All API calls must be called with `Authorization` header, where the value is encrypted with RSA public key you generated before. Header value contains message signature and message digest created by `COORDINATOR_ADDRESSES`. The format is `publicEncrypt({signature}:{digest})`.
+2. Remember to set up the rapidsnark file variable.
+3. Generate RSA key pair with `pnpm run generate-keypair`.
+4. Download zkey files using `pnpm run download-zkeys:{type}` (only test type is available for now).
+5. Make sure you copied RSA public key to your application. This will be needed for encrypting `Authorization` header and coordinator private key for proof generation. Also it can be accessed through API method `GET v1/proof/publicKey`.
+6. Run `pnpm run start` to run the service.
+7. All API calls must be called with `Authorization` header, where the value is encrypted with RSA public key you generated before. Header value contains message signature and message digest created by `COORDINATOR_ADDRESSES`. The format is `publicEncrypt({signature}:{digest})`.
    Make sure you set `COORDINATOR_ADDRESSES` env variable and sign any message with the addresses from your application (see [AccountSignatureGuard](./ts/auth/AccountSignatureGuard.service.ts)).
-7. Proofs can be generated with `POST v1/proof/generate` API method or with Websockets (see [dto spec](./ts/proof/dto.ts), [controller](./ts/app.controller.ts) and [wsgateway](./ts/events/events.gateway.ts)).
+8. Proofs can be generated with `POST v1/proof/generate` API method or with Websockets (see [dto spec](./ts/proof/dto.ts), [controller](./ts/app.controller.ts) and [wsgateway](./ts/events/events.gateway.ts)).
 
 ## Subgraph deployment
 
@@ -40,3 +47,21 @@ After deployment, subgraph url will be available in studio dashboard and you can
 ```
 https://api.studio.thegraph.com/.../{SUBGRAPH_NAME}/version/latest
 ```
+
+## Docker
+
+Remember to run it from the monorepo root directory.
+
+```bash
+# Build docker
+docker-compose -f apps/coordinator/docker-compose.yml build
+
+# Run container detached
+docker-compose -f apps/coordinator/docker-compose.yml up -d
+
+# Enter the container
+docker-compose -f apps/coordinator/docker-compose.yml exec coordinator-service /bin/sh
+
+# Stop container
+docker-compose -f apps/coordinator/docker-compose.yml down
+```

package/build/hardhat.config.cjs

@@ -23,6 +23,9 @@ module.exports = {
             loggingEnabled: false,
         },
     },
+    solidity: {
+        version: "0.8.28",
+    },
     paths: {
         sources: path.resolve(__dirname, parentDir, "./node_modules/@maci-protocol/sdk/node_modules/@maci-protocol/contracts/contracts"),
         artifacts: path.resolve(__dirname, parentDir, "./node_modules/@maci-protocol/sdk/node_modules/@maci-protocol/contracts/artifacts"),

package/build/hardhat.config.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"hardhat.config.cjs","sourceRoot":"","sources":["../hardhat.config.cjs"],"names":[],"mappings":";AAAA,uDAAuD;AACvD,OAAO,CAAC,kCAAkC,CAAC,CAAC;AAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEjC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AAC1D,MAAM,aAAa,GAAG,6DAA6D,CAAC;AAEpF,MAAM,CAAC,OAAO,GAAG;IACf,cAAc,EAAE,SAAS;IACzB,QAAQ,EAAE;QACR,OAAO,EAAE;YACP,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,uBAAuB;YAC/D,QAAQ,EAAE;gBACR,QAAQ,EAAE,aAAa;gBACvB,IAAI,EAAE,gBAAgB;gBACtB,YAAY,EAAE,CAAC;gBACf,KAAK,EAAE,EAAE;aACV;YACD,cAAc,EAAE,KAAK;SACtB;QACD,OAAO,EAAE;YACP,cAAc,EAAE,KAAK;SACtB;KACF;IACD,KAAK,EAAE;QACL,OAAO,EAAE,IAAI,CAAC,OAAO,CACnB,SAAS,EACT,SAAS,EACT,mFAAmF,CACpF;QACD,SAAS,EAAE,IAAI,CAAC,OAAO,CACrB,SAAS,EACT,SAAS,EACT,mFAAmF,CACpF;KACF;CACF,CAAC"}
+{"version":3,"file":"hardhat.config.cjs","sourceRoot":"","sources":["../hardhat.config.cjs"],"names":[],"mappings":";AAAA,uDAAuD;AACvD,OAAO,CAAC,kCAAkC,CAAC,CAAC;AAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AAEjC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;AAC1D,MAAM,aAAa,GAAG,6DAA6D,CAAC;AAEpF,MAAM,CAAC,OAAO,GAAG;IACf,cAAc,EAAE,SAAS;IACzB,QAAQ,EAAE;QACR,OAAO,EAAE;YACP,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,uBAAuB;YAC/D,QAAQ,EAAE;gBACR,QAAQ,EAAE,aAAa;gBACvB,IAAI,EAAE,gBAAgB;gBACtB,YAAY,EAAE,CAAC;gBACf,KAAK,EAAE,EAAE;aACV;YACD,cAAc,EAAE,KAAK;SACtB;QACD,OAAO,EAAE;YACP,cAAc,EAAE,KAAK;SACtB;KACF;IACD,QAAQ,EAAE;QACR,OAAO,EAAE,QAAQ;KAClB;IACD,KAAK,EAAE;QACL,OAAO,EAAE,IAAI,CAAC,OAAO,CACnB,SAAS,EACT,SAAS,EACT,mFAAmF,CACpF;QACD,SAAS,EAAE,IAAI,CAAC,OAAO,CACrB,SAAS,EACT,SAAS,EACT,mFAAmF,CACpF;KACF;CACF,CAAC"}

package/build/hardhat.config.d.cts

@@ -16,6 +16,9 @@ export namespace networks {
         export { loggingEnabled_1 as loggingEnabled };
     }
 }
+export namespace solidity {
+    let version: string;
+}
 export namespace paths {
     let sources: string;
     let artifacts: string;

package/build/scripts/generateMaciKeyPair.js

@@ -1,3 +1,3 @@
-import { genKeypair } from "@maci-protocol/crypto";
-genKeypair();
+import { generateKeypair } from "@maci-protocol/crypto";
+generateKeypair();
 //# sourceMappingURL=generateMaciKeyPair.js.map

package/build/scripts/generateMaciKeyPair.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateMaciKeyPair.js","sourceRoot":"","sources":["../../scripts/generateMaciKeyPair.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,UAAU,EAAE,CAAC"}
+{"version":3,"file":"generateMaciKeyPair.js","sourceRoot":"","sources":["../../scripts/generateMaciKeyPair.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,eAAe,EAAE,CAAC"}

package/build/tests/constants.d.ts

@@ -4,5 +4,4 @@ export declare const testPollJoiningWitnessPath = "./zkeys/PollJoining_10_test/P
 export declare const testRapidsnarkPath: string;
 export declare const zeroUint256Encoded: string;
 export declare const oneUint256Encoded: string;
-export declare const pollDuration = 10;
 //# sourceMappingURL=constants.d.ts.map

package/build/tests/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../tests/constants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,uBAAuB,2DAA2D,CAAC;AAChG,eAAO,MAAM,uBAAuB,gFAAgF,CAAC;AACrH,eAAO,MAAM,0BAA0B,4EAA4E,CAAC;AACpH,eAAO,MAAM,kBAAkB,QAAyC,CAAC;AAEzE,eAAO,MAAM,kBAAkB,QAAsD,CAAC;AACtF,eAAO,MAAM,iBAAiB,QAAsD,CAAC;AAErF,eAAO,MAAM,YAAY,KAAK,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../tests/constants.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,uBAAuB,2DAA2D,CAAC;AAChG,eAAO,MAAM,uBAAuB,gFAAgF,CAAC;AACrH,eAAO,MAAM,0BAA0B,4EAA4E,CAAC;AACpH,eAAO,MAAM,kBAAkB,QAAyC,CAAC;AAEzE,eAAO,MAAM,kBAAkB,QAAsD,CAAC;AACtF,eAAO,MAAM,iBAAiB,QAAsD,CAAC"}

package/build/tests/constants.js

@@ -6,5 +6,4 @@ export const testPollJoiningWitnessPath = "./zkeys/PollJoining_10_test/PollJoini
 export const testRapidsnarkPath = `${homedir()}/rapidsnark/build/prover`;
 export const zeroUint256Encoded = AbiCoder.defaultAbiCoder().encode(["uint256"], [0]);
 export const oneUint256Encoded = AbiCoder.defaultAbiCoder().encode(["uint256"], [1]);
-export const pollDuration = 10; // 100 seconds (added to unix timestamp of start date)
 //# sourceMappingURL=constants.js.map

package/build/tests/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../tests/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,MAAM,CAAC,MAAM,uBAAuB,GAAG,wDAAwD,CAAC;AAChG,MAAM,CAAC,MAAM,uBAAuB,GAAG,6EAA6E,CAAC;AACrH,MAAM,CAAC,MAAM,0BAA0B,GAAG,yEAAyE,CAAC;AACpH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,OAAO,EAAE,0BAA0B,CAAC;AAEzE,MAAM,CAAC,MAAM,kBAAkB,GAAG,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AACtF,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAErF,MAAM,CAAC,MAAM,YAAY,GAAG,EAAE,CAAC,CAAC,sDAAsD"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../tests/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,MAAM,CAAC,MAAM,uBAAuB,GAAG,wDAAwD,CAAC;AAChG,MAAM,CAAC,MAAM,uBAAuB,GAAG,6EAA6E,CAAC;AACrH,MAAM,CAAC,MAAM,0BAA0B,GAAG,yEAAyE,CAAC;AACpH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,OAAO,EAAE,0BAA0B,CAAC;AAEzE,MAAM,CAAC,MAAM,kBAAkB,GAAG,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AACtF,MAAM,CAAC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC"}

package/build/tests/e2e.aa.test.js

@@ -1,6 +1,6 @@
+import { sleep } from "@maci-protocol/sdk";
 import { zeroAddress } from "viem";
 import { ErrorCodes, ESupportedNetworks } from "../ts/common";
-import { CryptoService } from "../ts/crypto/crypto.service";
 import { testMaciDeploymentConfig, testPollDeploymentConfig } from "../ts/deployer/__tests__/utils";
 import { DeployerService } from "../ts/deployer/deployer.service";
 import { FileService } from "../ts/file/file.service";
@@ -10,68 +10,61 @@ import { SessionKeysService } from "../ts/sessionKeys/sessionKeys.service";
 describe("E2E Account Abstraction Tests", () => {
     const fileService = new FileService();
     const sessionKeyService = new SessionKeysService(fileService);
-    const cryptoService = new CryptoService();
-    const proofService = new ProofGeneratorService(cryptoService, fileService, sessionKeyService);
+    const proofService = new ProofGeneratorService(fileService, sessionKeyService);
     const deployerService = new DeployerService(sessionKeyService, fileService);
     // using an already deployed maci contract
-    const maciContract = "0xf281870519822f302B13c07252d0f6A71E8D023e";
-    const pollId = 2;
+    let maciContract = "";
+    let pollId;
     let approval;
     let sessionKeyAddress;
     beforeAll(async () => {
-        approval = await generateApproval(sessionKeyAddress);
         sessionKeyAddress = (await sessionKeyService.generateSessionKey()).sessionKeyAddress;
+        approval = await generateApproval(sessionKeyAddress);
     });
     describe("deploy", () => {
         describe("deployMaci", () => {
             it("should deploy all maci related contracts", async () => {
                 const { address: maciAddress } = await deployerService.deployMaci({
-                    approval,
-                    sessionKeyAddress,
                     chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
                     config: testMaciDeploymentConfig,
                 });
+                maciContract = maciAddress;
                 expect(maciAddress).not.toBe(zeroAddress);
             });
         });
         describe("deployPoll", () => {
             it("should deploy a poll", async () => {
-                // Serialize the config with the custom serializer
-                const serializedConfig = JSON.stringify(testPollDeploymentConfig);
-                const pollConfig = JSON.parse(serializedConfig);
                 const { pollId: poll } = await deployerService.deployPoll({
-                    approval,
-                    sessionKeyAddress,
                     chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
-                    config: pollConfig,
+                    config: {
+                        ...testPollDeploymentConfig,
+                        startDate: Math.floor(Date.now() / 1000) + 50,
+                        endDate: Math.floor(Date.now() / 1000) + 85,
+                    },
                 });
                 expect(poll).toBeDefined();
+                pollId = Number.parseInt(poll, 10);
             });
         });
     });
     describe("merge", () => {
         test("should return true when there are no errors", async () => {
-            const { sessionKeyAddress: sessionKey } = await sessionKeyService.generateSessionKey();
-            const generatedApproval = await generateApproval(sessionKey);
+            // wait until we can complete a poll
+            await sleep(90 * 1000); // 50 start + 35 end + 5 seconds of grace time
             const merged = await proofService.merge({
                 maciContractAddress: maciContract,
                 pollId,
-                sessionKeyAddress: sessionKey,
-                approval: generatedApproval,
                 chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
             });
             expect(merged).toBe(true);
         });
         test("should throw when given an invalid pollId", async () => {
-            const { sessionKeyAddress: sessionKey } = await sessionKeyService.generateSessionKey();
-            const generatedApproval = await generateApproval(sessionKey);
+            const invalidPollId = 50000;
             await expect(proofService.merge({
                 maciContractAddress: maciContract,
-                pollId: 50000,
-                sessionKeyAddress: sessionKey,
-                approval: generatedApproval,
+                pollId: invalidPollId,
                 chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
-            })).rejects.toThrow(ErrorCodes.POLL_NOT_FOUND.toString());
+            })).rejects.toThrow(`MACI contract doesn't have any deployed poll ${invalidPollId}`);
         });
     });
     describe("sessionKeys", () => {
@@ -82,7 +75,7 @@ describe("E2E Account Abstraction Tests", () => {
             expect(client.key).toBe("Account");
             expect(client.account.address).not.toBe(zeroAddress);
             expect(client.account.kernelVersion).toBe(KERNEL_VERSION);
-            expect(client.account.entryPoint).toBe(ENTRY_POINT);
+            expect(client.account.entryPoint.version).toBe(ENTRY_POINT.version);
             // this is an account with limited permissions so no sudo validator
             expect(client.account.kernelPluginManager.address).toBe(zeroAddress);
             expect(client.account.kernelPluginManager.sudoValidator).toBe(undefined);

package/build/tests/e2e.aa.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"e2e.aa.test.js","sourceRoot":"","sources":["../../tests/e2e.aa.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"e2e.aa.test.js","sourceRoot":"","sources":["../../tests/e2e.aa.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAO,WAAW,EAAE,MAAM,MAAM,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AACpG,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAClG,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC7C,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;IACtC,MAAM,iBAAiB,GAAG,IAAI,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,IAAI,qBAAqB,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;IAC/E,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAE5E,0CAA0C;IAC1C,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IAAI,MAAc,CAAC;IAEnB,IAAI,QAAgB,CAAC;IACrB,IAAI,iBAAsB,CAAC;IAE3B,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;IACvD,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;YAC1B,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;gBACxD,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC;oBAChE,KAAK,EAAE,kBAAkB,CAAC,gBAAgB;oBAC1C,MAAM,EAAE,wBAAwB;iBACjC,CAAC,CAAC;gBAEH,YAAY,GAAG,WAAW,CAAC;gBAC3B,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC5C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;YAC1B,EAAE,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;gBACpC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC;oBACxD,KAAK,EAAE,kBAAkB,CAAC,gBAAgB;oBAC1C,MAAM,EAAE;wBACN,GAAG,wBAAwB;wBAC3B,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE;wBAC7C,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE;qBAC5C;iBACF,CAAC,CAAC;gBAEH,MAAM,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;gBAC3B,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;QACrB,IAAI,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YAC7D,oCAAoC;YACpC,MAAM,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,8CAA8C;YAEtE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,KAAK,CAAC;gBACtC,mBAAmB,EAAE,YAAY;gBACjC,MAAM;gBACN,KAAK,EAAE,kBAAkB,CAAC,gBAAgB;aAC3C,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;YAC3D,MAAM,aAAa,GAAG,KAAK,CAAC;YAC5B,MAAM,MAAM,CACV,YAAY,CAAC,KAAK,CAAC;gBACjB,mBAAmB,EAAE,YAAY;gBACjC,MAAM,EAAE,aAAa;gBACrB,KAAK,EAAE,kBAAkB,CAAC,gBAAgB;aAC3C,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,gDAAgD,aAAa,EAAE,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;YACzE,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,4BAA4B,CACjE,iBAAiB,EACjB,QAAQ,EACR,kBAAkB,CAAC,gBAAgB,CACpC,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;YAC7B,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1C,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACnC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACrD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC1D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACpE,mEAAmE;YACnE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACrE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAEzE,qBAAqB;YACrB,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC;gBACtC,EAAE,EAAE,WAAW;gBACf,KAAK,EAAE,EAAE;gBACT,IAAI,EAAE,IAAI;aACX,CAAC,CAAC;YAEH,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gFAAgF,EAAE,KAAK,IAAI,EAAE;YAC9F,iBAAiB,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;YAE1D,MAAM,MAAM,CACV,iBAAiB,CAAC,4BAA4B,CAC5C,iBAAiB,EACjB,QAAQ,EACR,kBAAkB,CAAC,gBAAgB,CACpC,CACF,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/build/tests/e2e.deploy.test.js

@@ -1,59 +1,64 @@
-// To only run this file: pnpm exec jest --testPathPattern=tests/e2e.deploy.test.ts
-import { genRandomSalt } from "@maci-protocol/crypto";
 import { Keypair } from "@maci-protocol/domainobjs";
-import { joinPoll, publish, signup, sleep } from "@maci-protocol/sdk";
+import { ContractStorage, isArm, joinPoll, signup, sleep } from "@maci-protocol/sdk";
 import { ValidationPipe } from "@nestjs/common";
 import { Test } from "@nestjs/testing";
 import dotenv from "dotenv";
-import hardhat from "hardhat";
 import { io } from "socket.io-client";
 import { zeroAddress } from "viem";
+import path from "path";
 import { AppModule } from "../ts/app.module";
-import { ESupportedNetworks } from "../ts/common";
+import { ESupportedNetworks, getSigner } from "../ts/common";
 import { getPublicClient } from "../ts/common/accountAbstraction";
-import { testMaciDeploymentConfig, testPollDeploymentConfig } from "../ts/deployer/__tests__/utils";
+import { pollDuration, pollStartDateExtraSeconds, testMaciDeploymentConfig, testPollDeploymentConfig, } from "../ts/deployer/__tests__/utils";
+import { DeployerModule } from "../ts/deployer/deployer.module";
 import { FileModule } from "../ts/file/file.module";
-import { generateApproval, getKernelAccount } from "../ts/sessionKeys/__tests__/utils";
-import { pollDuration, pollJoiningTestZkeyPath, testPollJoiningWasmPath, testPollJoiningWitnessPath, testRapidsnarkPath, zeroUint256Encoded, } from "./constants";
+import { ProofModule } from "../ts/proof/proof.module";
+import { getKernelAccount } from "../ts/sessionKeys/__tests__/utils";
+import { SessionKeysModule } from "../ts/sessionKeys/sessionKeys.module";
+import { pollJoiningTestZkeyPath, testPollJoiningWasmPath, testPollJoiningWitnessPath, testRapidsnarkPath, zeroUint256Encoded, } from "./constants";
 import { getAuthorizationHeader, rechargeGasIfNeeded } from "./utils";
 dotenv.config();
-const LOCALHOST = "http://localhost:3000";
+jest.setTimeout(700000); // Sets timeout to 700 seconds
+const PORT = process.env.COORDINATOR_PORT || 3000;
+const TEST_URL = `http://localhost:${PORT}/v1`;
+const CHAIN = ESupportedNetworks.OPTIMISM_SEPOLIA;
+const REGEX_SUBGRAPH = /^https:\/\/api\.studio\.thegraph\.com\/query\/\d+\/maci-subgraph\/v0\.0\.\d+$/;
 const NUM_USERS = 1;
-const voteOptions = {
+const VOTE_OPTIONS = {
     "0": 0,
     "1": 0,
 };
 describe("E2E Deployment Tests", () => {
     let signer;
     let encryptedHeader;
-    let coordinatorKeypair;
     let sessionKeyAddress;
-    let approval;
     let app;
     let socket;
-    const publicClient = getPublicClient(ESupportedNetworks.OPTIMISM_SEPOLIA);
+    const publicClient = getPublicClient(CHAIN);
     let maciAddress;
+    let maciCreatedAt;
     let pollId;
     // set up coordinator address
     beforeAll(async () => {
-        [signer] = await hardhat.ethers.getSigners();
+        signer = getSigner(CHAIN);
         encryptedHeader = await getAuthorizationHeader(signer);
-        coordinatorKeypair = new Keypair();
         process.env.COORDINATOR_ADDRESSES = await signer.getAddress();
         await rechargeGasIfNeeded(process.env.COORDINATOR_ADDRESSES, "0.007", "0.007");
     });
     // set up NestJS app
     beforeAll(async () => {
         const moduleFixture = await Test.createTestingModule({
-            imports: [AppModule, FileModule],
+            imports: [AppModule, FileModule, DeployerModule, ProofModule, SessionKeysModule],
         }).compile();
         app = moduleFixture.createNestApplication();
         app.useGlobalPipes(new ValidationPipe({ transform: true }));
         await app.init();
-        await app.listen(3000);
+        await app.listen(PORT);
     });
     afterAll(async () => {
         await app.close();
+        const storageInstance = ContractStorage.getInstance(path.join(process.cwd(), "deployed-contracts.json"));
+        storageInstance.cleanup(CHAIN);
     });
     // set up auth header in WS connection
     beforeEach(async () => {
@@ -75,8 +80,17 @@ describe("E2E Deployment Tests", () => {
         socket.disconnect();
     });
     // run tests
+    test("should retrieve RSA public key", async () => {
+        const response = await fetch(`${TEST_URL}/proof/publicKey`, {
+            method: "GET",
+        });
+        const body = (await response.json());
+        expect(response.status).toBe(200);
+        expect(body.publicKey).toBeDefined();
+        // this RSA should be used in the encrypted auth header
+    });
     test("should retrieve the session key address", async () => {
-        const response = await fetch(`${LOCALHOST}/v1/session-keys/generate`, {
+        const response = await fetch(`${TEST_URL}/session-keys/generate`, {
             method: "GET",
             headers: {
                 Authorization: encryptedHeader,
@@ -87,25 +101,26 @@ describe("E2E Deployment Tests", () => {
         expect(body.sessionKeyAddress).not.toBe(zeroAddress);
         // save them for next tests
         sessionKeyAddress = body.sessionKeyAddress;
-        approval = await generateApproval(sessionKeyAddress);
         const sessionKeyAccount = await getKernelAccount(sessionKeyAddress);
         await rechargeGasIfNeeded(sessionKeyAccount.address, "0.03", "0.03");
     });
     test("should deploy MACI correctly", async () => {
         const config = testMaciDeploymentConfig;
-        config.VkRegistry.args.stateTreeDepth = config.VkRegistry.args.stateTreeDepth.toString();
-        config.VkRegistry.args.intStateTreeDepth = config.VkRegistry.args.intStateTreeDepth.toString();
-        config.VkRegistry.args.voteOptionTreeDepth = config.VkRegistry.args.voteOptionTreeDepth.toString();
-        const response = await fetch(`${LOCALHOST}/v1/deploy/maci`, {
+        config.VerifyingKeysRegistry.args.stateTreeDepth = config.VerifyingKeysRegistry.args.stateTreeDepth.toString();
+        config.VerifyingKeysRegistry.args.pollStateTreeDepth =
+            config.VerifyingKeysRegistry.args.pollStateTreeDepth.toString();
+        config.VerifyingKeysRegistry.args.tallyProcessingStateTreeDepth =
+            config.VerifyingKeysRegistry.args.tallyProcessingStateTreeDepth.toString();
+        config.VerifyingKeysRegistry.args.voteOptionTreeDepth =
+            config.VerifyingKeysRegistry.args.voteOptionTreeDepth.toString();
+        const response = await fetch(`${TEST_URL}/deploy/maci`, {
             method: "POST",
             headers: {
                 Authorization: encryptedHeader,
                 "Content-Type": "application/json",
             },
             body: JSON.stringify({
-                approval,
-                sessionKeyAddress,
-                chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
+                chain: CHAIN,
                 config,
             }),
         });
@@ -113,25 +128,24 @@ describe("E2E Deployment Tests", () => {
         expect(response.status).toBe(201);
         expect(body.address).not.toBe(zeroAddress);
         // save them for next tests
+        const blockNumber = await publicClient.getBlockNumber();
+        maciCreatedAt = blockNumber;
         maciAddress = body.address;
     });
     test("should deploy a poll correctly", async () => {
         const config = testPollDeploymentConfig;
-        config.coordinatorPubkey = coordinatorKeypair.pubKey.serialize();
         config.voteOptions = config.voteOptions.toString();
-        const startDate = Math.floor(Date.now() / 1000) + 10;
+        const startDate = Math.floor(Date.now() / 1000) + pollStartDateExtraSeconds;
         config.startDate = startDate;
         config.endDate = startDate + pollDuration;
-        const response = await fetch(`${LOCALHOST}/v1/deploy/poll`, {
+        const response = await fetch(`${TEST_URL}/deploy/poll`, {
             method: "POST",
             headers: {
                 Authorization: encryptedHeader,
                 "Content-Type": "application/json",
             },
             body: JSON.stringify({
-                approval,
-                sessionKeyAddress,
-                chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
+                chain: CHAIN,
                 config,
             }),
         });
@@ -141,41 +155,19 @@ describe("E2E Deployment Tests", () => {
         // save them for next tests
         pollId = BigInt(body.pollId);
     });
-    test("should deploy a subgraph correctly", async () => {
-        const blockNumber = Number(await publicClient.getBlockNumber());
-        const response = await fetch(`${LOCALHOST}/v1/subgraph/deploy`, {
-            method: "POST",
-            headers: {
-                Authorization: encryptedHeader,
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                maciContractAddress: maciAddress,
-                startBlock: blockNumber,
-                network: ESupportedNetworks.OPTIMISM_SEPOLIA,
-                name: process.env.SUBGRAPH_NAME,
-                tag: `v0.0.${blockNumber}`, // different versions per test using block number
-            }),
-        });
-        const body = (await response.json());
-        const { url } = body;
-        const regex = /^https:\/\/api\.studio\.thegraph\.com\/query\/\d+\/maci-subgraph\/v0\.0\.\d+$/;
-        expect(response.status).toBe(201);
-        expect(body.url).toBeDefined();
-        expect(regex.test(url)).toBe(true);
-    });
     test("should allow voting on a poll", async () => {
+        await sleep(pollStartDateExtraSeconds * 1000);
         for (let i = 0; i < NUM_USERS; i += 1) {
             const keypairUser = new Keypair();
-            const pubkeyUser = keypairUser.pubKey.serialize();
-            const privkeyUser = keypairUser.privKey.serialize();
+            const userPublicKey = keypairUser.publicKey.serialize();
+            const userPrivateKey = keypairUser.privateKey.serialize();
             const vote = i % 2;
-            voteOptions[String(vote)] += 1;
+            VOTE_OPTIONS[String(vote)] += 1;
             // user signs up to MACI
             // eslint-disable-next-line no-await-in-loop
             await signup({
                 maciAddress,
-                maciPubKey: pubkeyUser,
+                maciPublicKey: userPublicKey,
                 sgData: zeroUint256Encoded,
                 signer,
             });
@@ -183,49 +175,102 @@ describe("E2E Deployment Tests", () => {
             // eslint-disable-next-line no-await-in-loop
             await joinPoll({
                 maciAddress,
-                privateKey: privkeyUser,
-                stateIndex: 1n,
+                privateKey: userPrivateKey,
                 pollId: BigInt(pollId),
                 pollJoiningZkey: pollJoiningTestZkeyPath,
                 useWasm: true,
                 pollWasm: testPollJoiningWasmPath,
-                pollWitgen: testPollJoiningWitnessPath,
+                pollWitnessGenerator: testPollJoiningWitnessPath,
                 rapidsnark: testRapidsnarkPath,
                 sgDataArg: zeroUint256Encoded,
                 ivcpDataArg: zeroUint256Encoded,
                 signer,
             });
-            // user publishes a vote
-            // eslint-disable-next-line no-await-in-loop
-            const publishData = await publish({
-                pubkey: pubkeyUser,
-                stateIndex: 1n,
-                voteOptionIndex: BigInt(vote),
-                nonce: 1n,
-                pollId: BigInt(pollId),
-                newVoteWeight: 1n,
-                maciAddress,
-                salt: genRandomSalt(),
-                privateKey: privkeyUser,
-                signer,
-            });
-            expect(publishData.hash).not.toBe(zeroAddress);
         }
     });
+    test("should deploy a subgraph correctly", async () => {
+        const response = await fetch(`${TEST_URL}/subgraph/deploy`, {
+            method: "POST",
+            headers: {
+                Authorization: encryptedHeader,
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({
+                maciContractAddress: maciAddress,
+                startBlock: Number(maciCreatedAt),
+                network: CHAIN,
+                name: process.env.SUBGRAPH_NAME,
+                tag: `v0.0.${maciCreatedAt}`, // different versions per test using block number
+            }),
+        });
+        const body = await response.json();
+        if (response.status === 400) {
+            const errorMessage = body.message;
+            if (errorMessage.includes("api.thegraph.com | 502: Bad gateway")) {
+                // eslint-disable-next-line no-console
+                console.info("It looks like there was a problem with The Graph endpoint. We are passing this test.");
+                return;
+            }
+        }
+        const { url } = body;
+        expect(response.status).toBe(201);
+        expect(url).toBeDefined();
+        expect(REGEX_SUBGRAPH.test(url)).toBe(true);
+    });
     test("should merge correctly", async () => {
-        await sleep(10000);
-        const response = await fetch(`${LOCALHOST}/v1/proof/merge`, {
+        await sleep(pollDuration * 1000);
+        const response = await fetch(`${TEST_URL}/proof/merge`, {
+            method: "POST",
+            headers: {
+                Authorization: encryptedHeader,
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({
+                maciContractAddress: maciAddress,
+                pollId: Number(pollId),
+                chain: CHAIN,
+            }),
+        });
+        expect(response.status).toBe(201);
+    });
+    test("should generate proofs correctly", async () => {
+        const useWasm = isArm(); // Use WASM on ARM devices, otherwise use rapidsnark
+        const response = await fetch(`${TEST_URL}/proof/generate`, {
             method: "POST",
             headers: {
                 Authorization: encryptedHeader,
                 "Content-Type": "application/json",
             },
             body: JSON.stringify({
+                poll: Number(pollId),
                 maciContractAddress: maciAddress,
+                mode: testPollDeploymentConfig.mode,
+                startBlock: Number(maciCreatedAt),
+                blocksPerBatch: 500,
+                chain: CHAIN,
+                useWasm,
+            }),
+        });
+        const body = (await response.json());
+        expect(response.status).toBe(201);
+        expect(body.processProofs).toBeDefined();
+        expect(body.processProofs.length).toBeGreaterThan(0);
+        expect(body.tallyProofs).toBeDefined();
+        expect(body.tallyProofs.length).toBeGreaterThan(0);
+        expect(body.tallyData).toBeDefined();
+        expect(body.tallyData.results).toBeDefined();
+    });
+    test("should submit results on-chain correctly", async () => {
+        const response = await fetch(`${TEST_URL}/proof/submit`, {
+            method: "POST",
+            headers: {
+                Authorization: encryptedHeader,
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({
                 pollId: Number(pollId),
-                approval,
-                sessionKeyAddress,
-                chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
+                maciContractAddress: maciAddress,
+                chain: CHAIN,
             }),
         });
         expect(response.status).toBe(201);