@maci-protocol/coordinator 0.0.0-ci.533e19d → 0.0.0-ci.53702dc

package/build/ts/proof/dto.js

@@ -7,9 +7,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import { ESupportedChains, EMode } from "@maci-protocol/sdk";
 import { ApiProperty } from "@nestjs/swagger";
-import { IsBoolean, IsEnum, IsEthereumAddress, IsInt, IsOptional, IsString, Length, Max, Min } from "class-validator";
-import { ESupportedNetworks } from "../common";
+import { IsEnum, IsEthereumAddress, IsInt, IsOptional, IsString, Max, Min } from "class-validator";
 /**
  * Data transfer object for generate proof
  */
@@ -23,17 +23,9 @@ export class GenerateProofDto {
      */
     maciContractAddress;
     /**
-     * Tally contract address
+     * Voting mode
      */
-    tallyContractAddress;
-    /**
-     * Whether to use Qv or NonQv
-     */
-    useQuadraticVoting;
-    /**
-     * Encrypted coordinator private key with RSA public key (see .env.example)
-     */
-    encryptedCoordinatorPrivateKey;
+    mode;
     /**
      * Start block for event processing
      */
@@ -46,6 +38,12 @@ export class GenerateProofDto {
      * Blocks per batch for event processing
      */
     blocksPerBatch;
+    sessionKeyAddress;
+    approval;
+    /**
+     * Chain Name
+     */
+    chain;
 }
 __decorate([
     ApiProperty({
@@ -67,31 +65,12 @@ __decorate([
 ], GenerateProofDto.prototype, "maciContractAddress", void 0);
 __decorate([
     ApiProperty({
-        description: "Tally contract address",
-        type: String,
-    }),
-    IsEthereumAddress(),
-    __metadata("design:type", String)
-], GenerateProofDto.prototype, "tallyContractAddress", void 0);
-__decorate([
-    ApiProperty({
-        description: "Whether to use quadratic voting or not",
-        type: Boolean,
-    }),
-    IsBoolean(),
-    __metadata("design:type", Boolean)
-], GenerateProofDto.prototype, "useQuadraticVoting", void 0);
-__decorate([
-    ApiProperty({
-        description: "Encrypted coordinator private key with RSA public key (see README.md)",
-        minimum: 1,
-        maximum: 1024,
-        type: String,
+        description: "Voting mode (qv: 0, non-qv: 1, full: 2)",
+        type: Number,
     }),
-    IsString(),
-    Length(1, 1024),
-    __metadata("design:type", String)
-], GenerateProofDto.prototype, "encryptedCoordinatorPrivateKey", void 0);
+    IsEnum(EMode),
+    __metadata("design:type", Number)
+], GenerateProofDto.prototype, "mode", void 0);
 __decorate([
     ApiProperty({
         description: "Start block for event parsing",
@@ -127,6 +106,34 @@ __decorate([
     IsOptional(),
     __metadata("design:type", Number)
 ], GenerateProofDto.prototype, "blocksPerBatch", void 0);
+__decorate([
+    ApiProperty({
+        description: "Session key address",
+        type: String,
+        required: false,
+    }),
+    IsOptional(),
+    IsEthereumAddress(),
+    __metadata("design:type", String)
+], GenerateProofDto.prototype, "sessionKeyAddress", void 0);
+__decorate([
+    ApiProperty({
+        description: "Approval",
+        type: String,
+        required: false,
+    }),
+    IsOptional(),
+    IsString(),
+    __metadata("design:type", String)
+], GenerateProofDto.prototype, "approval", void 0);
+__decorate([
+    ApiProperty({
+        description: "Chain to which to deploy the contract(s)",
+        enum: ESupportedChains,
+    }),
+    IsEnum(ESupportedChains),
+    __metadata("design:type", String)
+], GenerateProofDto.prototype, "chain", void 0);
 /**
  * Data transfer object for merge trees
  */
@@ -165,7 +172,9 @@ __decorate([
     ApiProperty({
         description: "Session key address",
         type: String,
+        required: false,
     }),
+    IsOptional(),
     IsEthereumAddress(),
     __metadata("design:type", String)
 ], MergeTreesDto.prototype, "sessionKeyAddress", void 0);
@@ -173,16 +182,18 @@ __decorate([
     ApiProperty({
         description: "Approval",
         type: String,
+        required: false,
     }),
+    IsOptional(),
     IsString(),
     __metadata("design:type", String)
 ], MergeTreesDto.prototype, "approval", void 0);
 __decorate([
     ApiProperty({
         description: "Chain to which to deploy the contract(s)",
-        enum: ESupportedNetworks,
+        enum: ESupportedChains,
     }),
-    IsEnum(ESupportedNetworks),
+    IsEnum(ESupportedChains),
     __metadata("design:type", String)
 ], MergeTreesDto.prototype, "chain", void 0);
 /**
@@ -194,7 +205,6 @@ export class SubmitProofsDto {
      */
     pollId;
     maciContractAddress;
-    tallyContractAddress;
     sessionKeyAddress;
     approval;
     /**
@@ -220,19 +230,13 @@ __decorate([
     IsEthereumAddress(),
     __metadata("design:type", String)
 ], SubmitProofsDto.prototype, "maciContractAddress", void 0);
-__decorate([
-    ApiProperty({
-        description: "Tally contract address",
-        type: String,
-    }),
-    IsEthereumAddress(),
-    __metadata("design:type", String)
-], SubmitProofsDto.prototype, "tallyContractAddress", void 0);
 __decorate([
     ApiProperty({
         description: "Session key address",
         type: String,
+        required: false,
     }),
+    IsOptional(),
     IsEthereumAddress(),
     __metadata("design:type", String)
 ], SubmitProofsDto.prototype, "sessionKeyAddress", void 0);
@@ -240,16 +244,18 @@ __decorate([
     ApiProperty({
         description: "Approval",
         type: String,
+        required: false,
     }),
+    IsOptional(),
     IsString(),
     __metadata("design:type", String)
 ], SubmitProofsDto.prototype, "approval", void 0);
 __decorate([
     ApiProperty({
         description: "Chain to which to deploy the contract(s)",
-        enum: ESupportedNetworks,
+        enum: ESupportedChains,
     }),
-    IsEnum(ESupportedNetworks),
+    IsEnum(ESupportedChains),
     __metadata("design:type", String)
 ], SubmitProofsDto.prototype, "chain", void 0);
 //# sourceMappingURL=dto.js.map

package/build/ts/proof/dto.js.map

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

package/build/ts/proof/proof.controller.d.ts

@@ -1,6 +1,7 @@
 import type { IGenerateData, IMergeArgs } from "./types";
-import type { IGetPublicKeyData } from "../file/types";
+import type { ITallyData } from "@maci-protocol/sdk";
 import { FileService } from "../file/file.service";
+import { IGetPublicKeyData } from "../file/types";
 import { GenerateProofDto, SubmitProofsDto } from "./dto";
 import { ProofGeneratorService } from "./proof.service";
 export declare class ProofController {
@@ -35,7 +36,7 @@ export declare class ProofController {
      * Submit proofs on-chain api method
      * @param args - submit proofs on-chain args
      */
-    submit(args: SubmitProofsDto): Promise<boolean>;
+    submit(args: SubmitProofsDto): Promise<ITallyData>;
     /**
      * Get RSA public key for authorization setup
      *

package/build/ts/proof/proof.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proof.controller.d.ts","sourceRoot":"","sources":["../../../ts/proof/proof.controller.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGvD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,gBAAgB,EAAiB,eAAe,EAAE,MAAM,OAAO,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,qBAIa,eAAe;IAaxB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAb9B;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAE3D;;;;;OAKG;gBAEgB,qBAAqB,EAAE,qBAAqB,EAC5C,WAAW,EAAE,WAAW;IAG3C;;;;;OAKG;IAMG,QAAQ,CAAS,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAOtE;;;;;OAKG;IAMG,KAAK,CAAS,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAOvD;;;OAGG;IAMG,MAAM,CAAS,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IAO7D;;;;OAIG;IAKG,YAAY,IAAI,OAAO,CAAC,iBAAiB,CAAC;CAMjD"}
+{"version":3,"file":"proof.controller.d.ts","sourceRoot":"","sources":["../../../ts/proof/proof.controller.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAElD,OAAO,EAAE,gBAAgB,EAAiB,eAAe,EAAE,MAAM,OAAO,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,qBAGa,eAAe;IAaxB,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAb9B;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAE3D;;;;;OAKG;gBAEgB,qBAAqB,EAAE,qBAAqB,EAC5C,WAAW,EAAE,WAAW;IAG3C;;;;;OAKG;IAMG,QAAQ,CAAS,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAOtE;;;;;OAKG;IAMG,KAAK,CAAS,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAOvD;;;OAGG;IAMG,MAAM,CAAS,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC;IAOhE;;;;OAIG;IAIG,YAAY,IAAI,OAAO,CAAC,iBAAiB,CAAC;CAMjD"}

package/build/ts/proof/proof.controller.js

@@ -12,9 +12,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 var ProofController_1;
 /* eslint-disable @typescript-eslint/no-shadow */
-import { Body, Controller, Get, HttpException, HttpStatus, Logger, Post, UseGuards } from "@nestjs/common";
+import { Body, Controller, Get, HttpException, HttpStatus, Logger, Post } from "@nestjs/common";
 import { ApiBearerAuth, ApiBody, ApiResponse, ApiTags } from "@nestjs/swagger";
-import { AccountSignatureGuard, Public } from "../auth/AccountSignatureGuard.service";
 import { FileService } from "../file/file.service";
 import { GenerateProofDto, MergeTreesDto, SubmitProofsDto } from "./dto";
 import { ProofGeneratorService } from "./proof.service";
@@ -117,7 +116,6 @@ __decorate([
 __decorate([
     ApiResponse({ status: HttpStatus.OK, description: "Public key was successfully returned" }),
     ApiResponse({ status: HttpStatus.BAD_REQUEST, description: "BadRequest" }),
-    Public(),
     Get("publicKey"),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
@@ -127,7 +125,6 @@ ProofController = ProofController_1 = __decorate([
     ApiTags("v1/proof"),
     ApiBearerAuth(),
     Controller("v1/proof"),
-    UseGuards(AccountSignatureGuard),
     __metadata("design:paramtypes", [ProofGeneratorService,
         FileService])
 ], ProofController);

package/build/ts/proof/proof.controller.js.map

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

package/build/ts/proof/proof.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proof.module.d.ts","sourceRoot":"","sources":["../../../ts/proof/proof.module.ts"],"names":[],"mappings":"AAUA,qBAKa,WAAW;CAAG"}
+{"version":3,"file":"proof.module.d.ts","sourceRoot":"","sources":["../../../ts/proof/proof.module.ts"],"names":[],"mappings":"AAUA,qBAMa,WAAW;CAAG"}

package/build/ts/proof/proof.module.js

@@ -18,6 +18,7 @@ ProofModule = __decorate([
         imports: [FileModule, CryptoModule, SessionKeysModule],
         controllers: [ProofController],
         providers: [ProofGeneratorService, ProofGateway],
+        exports: [ProofGeneratorService],
     })
 ], ProofModule);
 export { ProofModule };

package/build/ts/proof/proof.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"proof.module.js","sourceRoot":"","sources":["../../../ts/proof/proof.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAOjD,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,WAAW;IALvB,MAAM,CAAC;QACN,OAAO,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,iBAAiB,CAAC;QACtD,WAAW,EAAE,CAAC,eAAe,CAAC;QAC9B,SAAS,EAAE,CAAC,qBAAqB,EAAE,YAAY,CAAC;KACjD,CAAC;GACW,WAAW,CAAG"}
+{"version":3,"file":"proof.module.js","sourceRoot":"","sources":["../../../ts/proof/proof.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAQjD,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,WAAW;IANvB,MAAM,CAAC;QACN,OAAO,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,iBAAiB,CAAC;QACtD,WAAW,EAAE,CAAC,eAAe,CAAC;QAC9B,SAAS,EAAE,CAAC,qBAAqB,EAAE,YAAY,CAAC;QAChD,OAAO,EAAE,CAAC,qBAAqB,CAAC;KACjC,CAAC;GACW,WAAW,CAAG"}

package/build/ts/proof/proof.service.d.ts

@@ -1,14 +1,12 @@
 import { type IGenerateProofsOptions } from "@maci-protocol/sdk";
-import { IProof } from "@maci-protocol/sdk";
+import { IProof, ITallyData } from "@maci-protocol/sdk";
 import type { IGenerateArgs, IGenerateData, IMergeArgs, ISubmitProofsArgs } from "./types";
-import { CryptoService } from "../crypto/crypto.service";
 import { FileService } from "../file/file.service";
 import { SessionKeysService } from "../sessionKeys/sessionKeys.service";
 /**
  * ProofGeneratorService is responsible for generating message processing and tally proofs.
  */
 export declare class ProofGeneratorService {
-    private readonly cryptoService;
     private readonly fileService;
     private readonly sessionKeysService;
     /**
@@ -22,7 +20,7 @@ export declare class ProofGeneratorService {
     /**
      * Proof generator initialization
      */
-    constructor(cryptoService: CryptoService, fileService: FileService, sessionKeysService: SessionKeysService);
+    constructor(fileService: FileService, sessionKeysService: SessionKeysService);
     /**
      * Read and parse proofs
      * @param folder - folder path to read proofs from
@@ -36,7 +34,7 @@ export declare class ProofGeneratorService {
      * @param args - generate proofs arguments
      * @returns - generated proofs for message processing and tally
      */
-    generate({ poll, maciContractAddress, tallyContractAddress, useQuadraticVoting, encryptedCoordinatorPrivateKey, startBlock, endBlock, blocksPerBatch, }: IGenerateArgs, options?: IGenerateProofsOptions): Promise<IGenerateData>;
+    generate({ approval, sessionKeyAddress, chain, poll, maciContractAddress, mode, startBlock, endBlock, blocksPerBatch, useWasm, }: IGenerateArgs, options?: IGenerateProofsOptions): Promise<IGenerateData>;
     /**
      * Merge state and message trees
      *
@@ -49,6 +47,6 @@ export declare class ProofGeneratorService {
      *
      * @param args - submit proofs on-chain arguments
      */
-    submit({ maciContractAddress, pollId, chain }: ISubmitProofsArgs): Promise<boolean>;
+    submit({ maciContractAddress, pollId, sessionKeyAddress, approval, chain, }: ISubmitProofsArgs): Promise<ITallyData>;
 }
 //# sourceMappingURL=proof.service.d.ts.map

package/build/ts/proof/proof.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proof.service.d.ts","sourceRoot":"","sources":["../../../ts/proof/proof.service.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,sBAAsB,EAU5B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAc,MAAM,oBAAoB,CAAC;AASxD,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAI3F,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE;;GAEG;AACH,qBACa,qBAAqB;IAe9B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAhBrC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IAExC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAEhC;;OAEG;gBAEgB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,WAAW,EACxB,kBAAkB,EAAE,kBAAkB;IAOzD;;;;;OAKG;IACG,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAY9E;;;;;OAKG;IACG,QAAQ,CACZ,EACE,IAAI,EACJ,mBAAmB,EACnB,oBAAoB,EACpB,kBAAkB,EAClB,8BAA8B,EAC9B,UAAU,EACV,QAAQ,EACR,cAAc,GACf,EAAE,aAAa,EAChB,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,aAAa,CAAC;IAgGzB;;;;;OAKG;IACG,KAAK,CAAC,EAAE,mBAAmB,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,KAAK,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAc9G;;;;OAIG;IACG,MAAM,CAAC,EAAE,mBAAmB,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC;CA4E1F"}
+{"version":3,"file":"proof.service.d.ts","sourceRoot":"","sources":["../../../ts/proof/proof.service.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,sBAAsB,EAI5B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,UAAU,EAAgC,MAAM,oBAAoB,CAAC;AAOtF,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAI3F,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE;;GAEG;AACH,qBACa,qBAAqB;IAe9B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IAfrC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAa;IAExC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAEhC;;OAEG;gBAEgB,WAAW,EAAE,WAAW,EACxB,kBAAkB,EAAE,kBAAkB;IAOzD;;;;;OAKG;IACG,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAY9E;;;;;OAKG;IACG,QAAQ,CACZ,EACE,QAAQ,EACR,iBAAiB,EACjB,KAAK,EACL,IAAI,EACJ,mBAAmB,EACnB,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,cAAc,EACd,OAAO,GACR,EAAE,aAAa,EAChB,OAAO,CAAC,EAAE,sBAAsB,GAC/B,OAAO,CAAC,aAAa,CAAC;IAuEzB;;;;;OAKG;IACG,KAAK,CAAC,EAAE,mBAAmB,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,KAAK,EAAE,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAY9G;;;;OAIG;IACG,MAAM,CAAC,EACX,mBAAmB,EACnB,MAAM,EACN,iBAAiB,EACjB,QAAQ,EACR,KAAK,GACN,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC;CAiB3C"}

package/build/ts/proof/proof.service.js

@@ -8,23 +8,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 var ProofGeneratorService_1;
-import { Keypair, PrivKey, PubKey } from "@maci-protocol/domainobjs";
-import { Deployment, EContracts, ProofGenerator, Poll__factory as PollFactory, MACI__factory as MACIFactory, Prover, getPoll, mergeSignups, } from "@maci-protocol/sdk";
+import { PublicKey } from "@maci-protocol/domainobjs";
+import { Deployment, EContracts, getPoll, mergeSignups, EMode, } from "@maci-protocol/sdk";
+import { generateProofs, proveOnChain } from "@maci-protocol/sdk";
 import { Logger, Injectable } from "@nestjs/common";
-import { ZeroAddress } from "ethers";
 import hre from "hardhat";
 import fs from "fs";
 import path from "path";
 import { ErrorCodes } from "../common";
-import { getPublicClient } from "../common/accountAbstraction";
-import { CryptoService } from "../crypto/crypto.service";
+import { getCoordinatorKeypair } from "../common/coordinatorKeypair";
 import { FileService } from "../file/file.service";
 import { SessionKeysService } from "../sessionKeys/sessionKeys.service";
 /**
  * ProofGeneratorService is responsible for generating message processing and tally proofs.
  */
 let ProofGeneratorService = ProofGeneratorService_1 = class ProofGeneratorService {
-    cryptoService;
     fileService;
     sessionKeysService;
     /**
@@ -38,8 +36,7 @@ let ProofGeneratorService = ProofGeneratorService_1 = class ProofGeneratorServic
     /**
      * Proof generator initialization
      */
-    constructor(cryptoService, fileService, sessionKeysService) {
-        this.cryptoService = cryptoService;
+    constructor(fileService, sessionKeysService) {
         this.fileService = fileService;
         this.sessionKeysService = sessionKeysService;
         this.deployment = Deployment.getInstance({ hre });
@@ -65,13 +62,9 @@ let ProofGeneratorService = ProofGeneratorService_1 = class ProofGeneratorServic
      * @param args - generate proofs arguments
      * @returns - generated proofs for message processing and tally
      */
-    async generate({ poll, maciContractAddress, tallyContractAddress, useQuadraticVoting, encryptedCoordinatorPrivateKey, startBlock, endBlock, blocksPerBatch, }, options) {
+    async generate({ approval, sessionKeyAddress, chain, poll, maciContractAddress, mode, startBlock, endBlock, blocksPerBatch, useWasm, }, options) {
         try {
-            const maciContract = await this.deployment.getContract({
-                name: EContracts.MACI,
-                address: maciContractAddress,
-            });
-            const signer = await this.deployment.getDeployer();
+            const signer = await this.sessionKeysService.getCoordinatorSigner(chain, sessionKeyAddress, approval);
             const pollData = await getPoll({
                 maciAddress: maciContractAddress,
                 pollId: poll,
@@ -81,58 +74,41 @@ let ProofGeneratorService = ProofGeneratorService_1 = class ProofGeneratorServic
                 name: EContracts.Poll,
                 address: pollData.address,
             });
-            const [coordinatorPublicKey, isStateAqMerged] = await Promise.all([
-                pollContract.coordinatorPubKey(),
-                pollContract.stateMerged(),
-            ]);
-            if (!isStateAqMerged) {
-                this.logger.error(`Error: ${ErrorCodes.NOT_MERGED_STATE_TREE}, state tree is not merged`);
-                throw new Error(ErrorCodes.NOT_MERGED_STATE_TREE.toString());
-            }
-            const { privateKey } = await this.fileService.getPrivateKey();
-            const maciPrivateKey = PrivKey.deserialize(this.cryptoService.decrypt(privateKey, encryptedCoordinatorPrivateKey));
-            const coordinatorKeypair = new Keypair(maciPrivateKey);
-            const publicKey = new PubKey([
-                BigInt(coordinatorPublicKey.x.toString()),
-                BigInt(coordinatorPublicKey.y.toString()),
+            const publicKeyOnChain = await pollContract.coordinatorPublicKey();
+            const coordinatorPublicKeyOnChain = new PublicKey([
+                BigInt(publicKeyOnChain.x.toString()),
+                BigInt(publicKeyOnChain.y.toString()),
             ]);
-            if (!coordinatorKeypair.pubKey.equals(publicKey)) {
+            const coordinatorKeypair = getCoordinatorKeypair();
+            if (!coordinatorKeypair.publicKey.equals(coordinatorPublicKeyOnChain)) {
                 this.logger.error(`Error: ${ErrorCodes.PRIVATE_KEY_MISMATCH}, wrong private key`);
                 throw new Error(ErrorCodes.PRIVATE_KEY_MISMATCH.toString());
             }
-            const outputDir = path.resolve("./proofs");
-            const maciState = await ProofGenerator.prepareState({
-                maciContract,
-                pollContract,
-                maciPrivateKey,
-                coordinatorKeypair,
-                pollId: poll,
+            // There are only QV and Non-QV modes available for tally circuit
+            const tally = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_TALLY_ZKEY_NAME, 
+            // if FULL use NON_QV because there are only VoteTallyQV and VoteTallyNonQV zkeys
+            mode === EMode.FULL ? EMode.NON_QV : mode);
+            const messageProcessor = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_MESSAGE_PROCESS_ZKEY_NAME, mode);
+            const { processProofs, tallyProofs, tallyData } = await generateProofs({
+                outputDir: path.resolve("./proofs"),
+                coordinatorPrivateKey: coordinatorKeypair.privateKey.serialize(),
                 signer,
-                outputDir,
-                options: {
-                    startBlock,
-                    endBlock,
-                    blocksPerBatch,
-                },
-            });
-            const foundPoll = maciState.polls.get(BigInt(poll));
-            if (!foundPoll) {
-                this.logger.error(`Error: ${ErrorCodes.POLL_NOT_FOUND}, Poll ${poll} not found in maci state`);
-                throw new Error(ErrorCodes.POLL_NOT_FOUND.toString());
-            }
-            const proofGenerator = new ProofGenerator({
-                poll: foundPoll,
-                maciContractAddress,
-                tallyContractAddress,
-                tally: this.fileService.getZkeyFilePaths(process.env.COORDINATOR_TALLY_ZKEY_NAME, useQuadraticVoting),
-                mp: this.fileService.getZkeyFilePaths(process.env.COORDINATOR_MESSAGE_PROCESS_ZKEY_NAME, useQuadraticVoting),
+                maciAddress: maciContractAddress,
+                pollId: BigInt(poll),
+                startBlock,
+                endBlock,
+                blocksPerBatch,
+                useWasm,
                 rapidsnark: process.env.COORDINATOR_RAPIDSNARK_EXE,
-                outputDir,
-                tallyOutputFile: path.resolve("./tally.json"),
-                useQuadraticVoting,
+                mode,
+                voteTallyZkey: tally.zkey,
+                voteTallyWitnessGenerator: tally.witnessGenerator,
+                voteTallyWasm: tally.wasm,
+                messageProcessorZkey: messageProcessor.zkey,
+                messageProcessorWitnessGenerator: messageProcessor.witnessGenerator,
+                messageProcessorWasm: messageProcessor.wasm,
+                tallyFile: path.resolve("./tally.json"),
             });
-            const processProofs = await proofGenerator.generateMpProofs(options);
-            const { proofs: tallyProofs, tallyData } = await proofGenerator.generateTallyProofs(hre.network.name, String(hre.network.config.chainId || 1), options);
             return {
                 processProofs,
                 tallyProofs,
@@ -151,9 +127,7 @@ let ProofGeneratorService = ProofGeneratorService_1 = class ProofGeneratorServic
      * @returns whether the proofs were successfully merged
      */
     async merge({ maciContractAddress, pollId, approval, sessionKeyAddress, chain }) {
-        // get a kernel client
-        const kernelClient = await this.sessionKeysService.generateClientFromSessionKey(sessionKeyAddress, approval, chain);
-        const signer = await this.sessionKeysService.getKernelClientSigner(kernelClient);
+        const signer = await this.sessionKeysService.getCoordinatorSigner(chain, sessionKeyAddress, approval);
         await mergeSignups({
             maciAddress: maciContractAddress,
             pollId: BigInt(pollId),
@@ -166,80 +140,24 @@ let ProofGeneratorService = ProofGeneratorService_1 = class ProofGeneratorServic
      *
      * @param args - submit proofs on-chain arguments
      */
-    async submit({ maciContractAddress, pollId, chain }) {
-        const publicClient = getPublicClient(chain);
-        // get the poll address
-        const pollContracts = await publicClient.readContract({
-            address: maciContractAddress,
-            abi: MACIFactory.abi,
-            functionName: "getPoll",
-            args: [BigInt(pollId)],
-        });
-        const pollAddress = pollContracts.poll;
-        if (pollAddress.toLowerCase() === ZeroAddress.toLowerCase()) {
-            this.logger.error(`Error: ${ErrorCodes.POLL_NOT_FOUND}, Poll ${pollId} not found`);
-            throw new Error(ErrorCodes.POLL_NOT_FOUND.toString());
-        }
-        // check if state tree has been merged
-        const isStateMerged = await publicClient.readContract({
-            address: pollAddress,
-            abi: PollFactory.abi,
-            functionName: "stateMerged",
+    async submit({ maciContractAddress, pollId, sessionKeyAddress, approval, chain, }) {
+        const signer = await this.sessionKeysService.getCoordinatorSigner(chain, sessionKeyAddress, approval);
+        const tallyData = await proveOnChain({
+            pollId: BigInt(pollId),
+            maciAddress: maciContractAddress,
+            proofDir: "./proofs",
+            tallyFile: "./tally.json",
+            signer,
         });
-        if (!isStateMerged) {
-            this.logger.error(`Error: ${ErrorCodes.NOT_MERGED_STATE_TREE}, state tree is not merged`);
-            throw new Error(ErrorCodes.NOT_MERGED_STATE_TREE.toString());
+        if (!tallyData) {
+            throw new Error("Tally data is undefined");
         }
-        const [maciContract, mpContract, pollContract, tallyContract, vkRegistryContract, verifierContract] = await Promise.all([
-            this.deployment.getContract({
-                name: EContracts.MACI,
-                address: maciContractAddress,
-            }),
-            this.deployment.getContract({
-                name: EContracts.MessageProcessor,
-                address: pollContracts.messageProcessor,
-            }),
-            this.deployment.getContract({
-                name: EContracts.Poll,
-                address: pollContracts.poll,
-            }),
-            this.deployment.getContract({
-                name: EContracts.Tally,
-                address: pollContracts.tally,
-            }),
-            this.deployment.getContract({ name: EContracts.VkRegistry }),
-            this.deployment.getContract({ name: EContracts.Verifier }),
-        ]);
-        const prover = new Prover({
-            maciContract,
-            mpContract,
-            pollContract,
-            tallyContract,
-            vkRegistryContract,
-            verifierContract,
-        });
-        const data = {
-            processProofs: await this.readProofs(path.resolve("./proofs"), "process"),
-            tallyProofs: await this.readProofs(path.resolve("./proofs"), "tally"),
-        };
-        // prove message processing
-        await prover.proveMessageProcessing(data.processProofs);
-        // read tally data
-        const tallyData = await fs.promises
-            .readFile("./tally.json", "utf8")
-            .then((result) => JSON.parse(result));
-        // prove tally
-        await prover.proveTally(data.tallyProofs);
-        // submit results
-        const voteOptions = Number(await pollContract.voteOptions());
-        await prover.submitResults(tallyData, voteOptions);
-        return true;
+        return tallyData;
     }
 };
 ProofGeneratorService = ProofGeneratorService_1 = __decorate([
     Injectable(),
-    __metadata("design:paramtypes", [CryptoService,
-        FileService,
+    __metadata("design:paramtypes", [FileService,
         SessionKeysService])
 ], ProofGeneratorService);
 export { ProofGeneratorService };