@maci-protocol/coordinator 0.0.0-ci.85bba2d → 0.0.0-ci.86ec64f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maci-protocol/coordinator",
-  "version": "0.0.0-ci.85bba2d",
+  "version": "0.0.0-ci.86ec64f",
   "private": false,
   "description": "Coordinator service for MACI",
   "main": "build/ts/main.js",
@@ -22,40 +22,41 @@
     "run:node": "node --import 'data:text/javascript,import { register } from \"node:module\"; import { pathToFileURL } from \"node:url\"; register(\"ts-node/esm\", pathToFileURL(\"./\"));'",
     "start": "pnpm run run:node ./ts/main.ts",
     "start:prod": "pnpm run run:node build/ts/main.js",
-    "test": "jest --testPathIgnorePatterns=e2e.aa.test.ts --forceExit",
+    "test": "jest --testPathIgnorePatterns=tests/ --forceExit",
     "test:coverage": "jest --coverage --forceExit",
-    "test:e2e": "jest ./tests/e2e.deploy.test.ts --forceExit",
-    "test:aa": "jest ./tests/e2e.aa.test.ts --forceExit",
+    "test:e2e": "jest ./tests/*.test.ts --forceExit --runInBand",
     "types": "tsc -p tsconfig.json --noEmit",
     "generate-maci-keypair": "pnpm run run:node ./scripts/generateMaciKeypair.ts",
     "generate-keypair": "pnpm run run:node ./scripts/generateKeypair.ts",
     "get-auth-header": "pnpm run run:node ./scripts/getAuthHeader.ts"
   },
   "dependencies": {
-    "@graphprotocol/graph-cli": "^0.97.0",
-    "@maci-protocol/contracts": "0.0.0-ci.85bba2d",
-    "@maci-protocol/crypto": "0.0.0-ci.85bba2d",
-    "@maci-protocol/domainobjs": "0.0.0-ci.85bba2d",
-    "@maci-protocol/sdk": "0.0.0-ci.85bba2d",
-    "@maci-protocol/subgraph": "0.0.0-ci.85bba2d",
-    "@nestjs/common": "^11.0.20",
-    "@nestjs/core": "^11.0.20",
-    "@nestjs/platform-express": "^11.0.20",
-    "@nestjs/platform-socket.io": "^11.0.20",
-    "@nestjs/swagger": "^11.1.4",
+    "@graphprotocol/graph-cli": "^0.97.1",
+    "@maci-protocol/contracts": "0.0.0-ci.86ec64f",
+    "@maci-protocol/crypto": "0.0.0-ci.86ec64f",
+    "@maci-protocol/domainobjs": "0.0.0-ci.86ec64f",
+    "@maci-protocol/sdk": "0.0.0-ci.86ec64f",
+    "@maci-protocol/subgraph": "0.0.0-ci.86ec64f",
+    "@nestjs/common": "^11.1.5",
+    "@nestjs/core": "^11.1.5",
+    "@nestjs/platform-express": "^11.1.5",
+    "@nestjs/platform-socket.io": "^11.1.6",
+    "@nestjs/schedule": "^6.0.0",
+    "@nestjs/swagger": "^11.2.0",
     "@nestjs/throttler": "^6.4.0",
-    "@nestjs/websockets": "^11.0.20",
-    "@nomicfoundation/hardhat-ethers": "^3.0.8",
-    "@nomicfoundation/hardhat-toolbox": "^5.0.0",
-    "@zerodev/ecdsa-validator": "5.4.5",
-    "@zerodev/permissions": "5.5.4",
-    "@zerodev/sdk": "5.4.26",
+    "@nestjs/websockets": "^11.1.5",
+    "@nomicfoundation/hardhat-ethers": "^3.1.0",
+    "@nomicfoundation/hardhat-toolbox": "^6.1.0",
+    "@redis/client": "^5.6.0",
+    "@zerodev/ecdsa-validator": "5.4.9",
+    "@zerodev/permissions": "5.5.14",
+    "@zerodev/sdk": "5.4.41",
     "class-transformer": "^0.5.1",
-    "class-validator": "^0.14.1",
+    "class-validator": "^0.14.2",
     "date-fns": "^4.1.0",
-    "dotenv": "^16.5.0",
-    "ethers": "^6.13.5",
-    "hardhat": "^2.23.0",
+    "dotenv": "^17.2.0",
+    "ethers": "^6.15.0",
+    "hardhat": "^2.25.0",
     "helmet": "^8.1.0",
     "lowdb": "^1.0.0",
     "mustache": "^4.2.0",
@@ -64,22 +65,22 @@
     "socket.io": "^4.7.5",
     "tar": "^7.4.1",
     "ts-node": "^10.9.1",
-    "viem": "^2.27.0"
+    "viem": "^2.33.2"
   },
   "devDependencies": {
-    "@nestjs/cli": "^11.0.6",
-    "@nestjs/schematics": "^11.0.5",
-    "@nestjs/testing": "^11.0.20",
-    "@types/express": "^5.0.1",
-    "@types/jest": "^29.5.2",
+    "@nestjs/cli": "^11.0.10",
+    "@nestjs/schematics": "^11.0.7",
+    "@nestjs/testing": "^11.1.5",
+    "@types/express": "^5.0.3",
+    "@types/jest": "^30.0.0",
     "@types/lowdb": "^1.0.15",
-    "@types/node": "^22.14.1",
+    "@types/node": "^24.2.0",
     "@types/supertest": "^6.0.2",
-    "fast-check": "^4.1.1",
-    "jest": "^29.5.0",
+    "fast-check": "^4.2.0",
+    "jest": "^30.0.4",
     "socket.io-client": "^4.7.5",
-    "supertest": "^7.0.0",
-    "ts-jest": "^29.3.2",
+    "supertest": "^7.1.4",
+    "ts-jest": "^29.4.0",
     "typescript": "^5.8.3"
   },
   "jest": {
@@ -95,6 +96,9 @@
       "<rootDir>/tests"
     ],
     "testRegex": ".*\\.test\\.ts$",
+    "moduleNameMapper": {
+      "^@openzeppelin/merkle-tree$": "<rootDir>/ts/jest/__mocks__/@openzeppelin/merkle-tree.ts"
+    },
     "transform": {
       "^.+\\.js$": [
         "<rootDir>/ts/jest/transform.js",
@@ -113,13 +117,15 @@
       "**/*.(t|j)s",
       "!<rootDir>/ts/main.ts",
       "!<rootDir>/ts/jest/*.js",
+      "!<rootDir>/tests/*.ts",
       "!<rootDir>/hardhat.config.js"
     ],
     "coveragePathIgnorePatterns": [
-      "<rootDir>/ts/sessionKeys/__tests__/utils.ts"
+      "<rootDir>/ts/sessionKeys/__tests__/utils.ts",
+      "<rootDir>/tests/*.ts"
     ],
     "coverageDirectory": "<rootDir>/coverage",
     "testEnvironment": "node"
   },
-  "gitHead": "929b02ec5a5ec745a0e2b592b4d8e867bad7ac1a"
+  "gitHead": "c60edfc68d77f84d132590938967d6ed651a591a"
 }

package/build/tests/e2e.aa.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=e2e.aa.test.d.ts.map

package/build/tests/e2e.aa.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"e2e.aa.test.d.ts","sourceRoot":"","sources":["../../tests/e2e.aa.test.ts"],"names":[],"mappings":""}

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

@@ -1,106 +0,0 @@
-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";
-import { ProofGeneratorService } from "../ts/proof/proof.service";
-import { ENTRY_POINT, generateApproval, KERNEL_VERSION } from "../ts/sessionKeys/__tests__/utils";
-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 deployerService = new DeployerService(sessionKeyService, fileService);
-    // using an already deployed maci contract
-    let maciContract = "";
-    let pollId;
-    let approval;
-    let sessionKeyAddress;
-    beforeAll(async () => {
-        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({
-                    chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
-                    config: testMaciDeploymentConfig,
-                });
-                maciContract = maciAddress;
-                expect(maciAddress).not.toBe(zeroAddress);
-            });
-        });
-        describe("deployPoll", () => {
-            it("should deploy a poll", async () => {
-                const { pollId: poll } = await deployerService.deployPoll({
-                    chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
-                    config: {
-                        ...testPollDeploymentConfig,
-                        startDate: Math.floor(Date.now() / 1000) + 100,
-                        endDate: Math.floor(Date.now() / 1000) + 200,
-                    },
-                });
-                expect(poll).toBeDefined();
-                pollId = Number.parseInt(poll, 10);
-            });
-        });
-    });
-    describe("merge", () => {
-        test("should return true when there are no errors", async () => {
-            // wait until we can complete a poll
-            await sleep(600);
-            const { sessionKeyAddress: sessionKey } = await sessionKeyService.generateSessionKey();
-            const generatedApproval = await generateApproval(sessionKey);
-            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: invalidPollId,
-                sessionKeyAddress: sessionKey,
-                approval: generatedApproval,
-                chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
-            })).rejects.toThrow(`MACI contract doesn't have any deployed poll ${invalidPollId}`);
-        });
-    });
-    describe("sessionKeys", () => {
-        it("should create a client from a session key and an approval", async () => {
-            const client = await sessionKeyService.generateClientFromSessionKey(sessionKeyAddress, approval, ESupportedNetworks.OPTIMISM_SEPOLIA);
-            expect(client).toBeDefined();
-            expect(client.transport.key).toBe("http");
-            expect(client.key).toBe("Account");
-            expect(client.account.address).not.toBe(zeroAddress);
-            expect(client.account.kernelVersion).toBe(KERNEL_VERSION);
-            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);
-            // send a transaction
-            const tx = await client.sendTransaction({
-                to: zeroAddress,
-                value: 0n,
-                data: "0x",
-            });
-            expect(tx.length).toBeGreaterThan(0);
-        });
-        it("should not allow to create a client after the session key has been deactivated", async () => {
-            sessionKeyService.deactivateSessionKey(sessionKeyAddress);
-            await expect(sessionKeyService.generateClientFromSessionKey(sessionKeyAddress, approval, ESupportedNetworks.OPTIMISM_SEPOLIA)).rejects.toThrow(ErrorCodes.SESSION_KEY_NOT_FOUND.toString());
-        });
-    });
-});
-//# sourceMappingURL=e2e.aa.test.js.map

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

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