@maci-protocol/coordinator 0.0.0-ci.6ccbb3c → 0.0.0-ci.6f654a0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -2
- package/README.md +31 -6
- package/build/hardhat.config.cjs +3 -0
- package/build/hardhat.config.cjs.map +1 -1
- package/build/hardhat.config.d.cts +3 -0
- package/build/tests/constants.d.ts +0 -1
- package/build/tests/constants.d.ts.map +1 -1
- package/build/tests/constants.js +0 -1
- package/build/tests/constants.js.map +1 -1
- package/build/tests/e2e.aa.test.js +18 -25
- package/build/tests/e2e.aa.test.js.map +1 -1
- package/build/tests/e2e.deploy.test.js +120 -77
- package/build/tests/e2e.deploy.test.js.map +1 -1
- package/build/tests/utils.d.ts +6 -0
- package/build/tests/utils.d.ts.map +1 -1
- package/build/tests/utils.js +12 -3
- package/build/tests/utils.js.map +1 -1
- package/build/ts/common/__tests__/common.test.js +9 -13
- package/build/ts/common/__tests__/common.test.js.map +1 -1
- package/build/ts/common/accountAbstraction.d.ts +2 -19
- package/build/ts/common/accountAbstraction.d.ts.map +1 -1
- package/build/ts/common/accountAbstraction.js +15 -44
- package/build/ts/common/accountAbstraction.js.map +1 -1
- package/build/ts/common/chain.d.ts +16 -0
- package/build/ts/common/chain.d.ts.map +1 -0
- package/build/ts/common/chain.js +32 -0
- package/build/ts/common/chain.js.map +1 -0
- package/build/ts/common/coordinatorKeypair.d.ts +7 -0
- package/build/ts/common/coordinatorKeypair.d.ts.map +1 -0
- package/build/ts/common/coordinatorKeypair.js +14 -0
- package/build/ts/common/coordinatorKeypair.js.map +1 -0
- package/build/ts/common/errors.d.ts +17 -18
- package/build/ts/common/errors.d.ts.map +1 -1
- package/build/ts/common/errors.js +17 -18
- package/build/ts/common/errors.js.map +1 -1
- package/build/ts/common/index.d.ts +2 -0
- package/build/ts/common/index.d.ts.map +1 -1
- package/build/ts/common/index.js +2 -0
- package/build/ts/common/index.js.map +1 -1
- package/build/ts/common/types.d.ts +2 -3
- package/build/ts/common/types.d.ts.map +1 -1
- package/build/ts/deployer/__tests__/deployer.service.test.js +28 -287
- package/build/ts/deployer/__tests__/deployer.service.test.js.map +1 -1
- package/build/ts/deployer/__tests__/utils.d.ts +27 -1
- package/build/ts/deployer/__tests__/utils.d.ts.map +1 -1
- package/build/ts/deployer/__tests__/utils.js +39 -10
- package/build/ts/deployer/__tests__/utils.js.map +1 -1
- package/build/ts/deployer/deployer.service.d.ts +15 -51
- package/build/ts/deployer/deployer.service.d.ts.map +1 -1
- package/build/ts/deployer/deployer.service.js +164 -459
- package/build/ts/deployer/deployer.service.js.map +1 -1
- package/build/ts/deployer/dto.d.ts +4 -4
- package/build/ts/deployer/dto.d.ts.map +1 -1
- package/build/ts/deployer/dto.js +9 -1
- package/build/ts/deployer/dto.js.map +1 -1
- package/build/ts/deployer/types.d.ts +48 -21
- package/build/ts/deployer/types.d.ts.map +1 -1
- package/build/ts/file/__tests__/file.service.test.js +12 -11
- package/build/ts/file/__tests__/file.service.test.js.map +1 -1
- package/build/ts/file/file.service.d.ts +4 -3
- package/build/ts/file/file.service.d.ts.map +1 -1
- package/build/ts/file/file.service.js +14 -9
- package/build/ts/file/file.service.js.map +1 -1
- package/build/ts/file/types.d.ts +2 -2
- package/build/ts/file/types.d.ts.map +1 -1
- package/build/ts/proof/__tests__/proof.controller.test.js +5 -3
- package/build/ts/proof/__tests__/proof.controller.test.js.map +1 -1
- package/build/ts/proof/__tests__/proof.gateway.test.js +6 -3
- package/build/ts/proof/__tests__/proof.gateway.test.js.map +1 -1
- package/build/ts/proof/__tests__/proof.service.test.js +13 -26
- package/build/ts/proof/__tests__/proof.service.test.js.map +1 -1
- package/build/ts/proof/dto.d.ts +13 -15
- package/build/ts/proof/dto.d.ts.map +1 -1
- package/build/ts/proof/dto.js +51 -44
- package/build/ts/proof/dto.js.map +1 -1
- package/build/ts/proof/proof.controller.d.ts +3 -2
- package/build/ts/proof/proof.controller.d.ts.map +1 -1
- package/build/ts/proof/proof.controller.js +1 -4
- package/build/ts/proof/proof.controller.js.map +1 -1
- package/build/ts/proof/proof.service.d.ts +4 -6
- package/build/ts/proof/proof.service.d.ts.map +1 -1
- package/build/ts/proof/proof.service.js +48 -130
- package/build/ts/proof/proof.service.js.map +1 -1
- package/build/ts/proof/types.d.ts +19 -14
- package/build/ts/proof/types.d.ts.map +1 -1
- package/build/ts/sessionKeys/provider/KernelEIP1193Provider.d.ts +53 -0
- package/build/ts/sessionKeys/provider/KernelEIP1193Provider.d.ts.map +1 -0
- package/build/ts/sessionKeys/provider/KernelEIP1193Provider.js +105 -0
- package/build/ts/sessionKeys/provider/KernelEIP1193Provider.js.map +1 -0
- package/build/ts/sessionKeys/sessionKeys.service.d.ts +13 -2
- package/build/ts/sessionKeys/sessionKeys.service.d.ts.map +1 -1
- package/build/ts/sessionKeys/sessionKeys.service.js +22 -4
- package/build/ts/sessionKeys/sessionKeys.service.js.map +1 -1
- package/build/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +26 -26
- package/build/ts/deployer/utils.d.ts +0 -8
- package/build/ts/deployer/utils.d.ts.map +0 -1
- package/build/ts/deployer/utils.js +0 -9
- package/build/ts/deployer/utils.js.map +0 -1
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Keypair, PrivateKey } from "@maci-protocol/domainobjs";
|
|
2
|
-
import { Deployment, ProofGenerator } from "@maci-protocol/sdk";
|
|
2
|
+
import { Deployment, EMode, ProofGenerator } from "@maci-protocol/sdk";
|
|
3
3
|
import dotenv from "dotenv";
|
|
4
4
|
import { zeroAddress } from "viem";
|
|
5
|
-
import { ErrorCodes } from "../../common";
|
|
5
|
+
import { ErrorCodes, ESupportedNetworks } from "../../common";
|
|
6
6
|
import { FileService } from "../../file/file.service";
|
|
7
7
|
import { SessionKeysService } from "../../sessionKeys/sessionKeys.service";
|
|
8
8
|
import { ProofGeneratorService } from "../proof.service";
|
|
@@ -22,18 +22,14 @@ jest.mock("@maci-protocol/contracts", () => ({
|
|
|
22
22
|
},
|
|
23
23
|
ProofGenerator: jest.fn(),
|
|
24
24
|
}));
|
|
25
|
-
jest.mock("../../crypto/crypto.service", () => ({
|
|
26
|
-
CryptoService: {
|
|
27
|
-
getInstance: jest.fn(),
|
|
28
|
-
},
|
|
29
|
-
}));
|
|
30
25
|
describe("ProofGeneratorService", () => {
|
|
31
26
|
const defaultProofArgs = {
|
|
32
27
|
poll: 1,
|
|
33
28
|
maciContractAddress: zeroAddress,
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
29
|
+
mode: EMode.NON_QV,
|
|
30
|
+
sessionKeyAddress: "0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e",
|
|
31
|
+
approval: "0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e",
|
|
32
|
+
chain: ESupportedNetworks.LOCALHOST,
|
|
37
33
|
};
|
|
38
34
|
let mockContract = {
|
|
39
35
|
polls: jest.fn(),
|
|
@@ -48,9 +44,6 @@ describe("ProofGeneratorService", () => {
|
|
|
48
44
|
generateTallyProofs: jest.fn(),
|
|
49
45
|
merge: jest.fn(),
|
|
50
46
|
};
|
|
51
|
-
const defaultCryptoService = {
|
|
52
|
-
decrypt: jest.fn(),
|
|
53
|
-
};
|
|
54
47
|
const defaultDeploymentService = {
|
|
55
48
|
setHre: jest.fn(),
|
|
56
49
|
getDeployer: jest.fn(() => Promise.resolve({})),
|
|
@@ -75,7 +68,6 @@ describe("ProofGeneratorService", () => {
|
|
|
75
68
|
generateTallyProofs: jest.fn(() => Promise.resolve({ proofs: [1], tallyData: {} })),
|
|
76
69
|
merge: jest.fn(() => Promise.resolve(true)),
|
|
77
70
|
};
|
|
78
|
-
defaultCryptoService.decrypt = jest.fn(() => "macisk.6d5efa8ebc6f7a6ee3e9bf573346af2df29b007b29ef420c030aa4a7f3410182");
|
|
79
71
|
Deployment.getInstance.mockReturnValue(defaultDeploymentService);
|
|
80
72
|
ProofGenerator.mockReturnValue(defaultProofGenerator);
|
|
81
73
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
@@ -89,38 +81,33 @@ describe("ProofGeneratorService", () => {
|
|
|
89
81
|
});
|
|
90
82
|
test("should throw error if state is not merged yet", async () => {
|
|
91
83
|
mockContract.stateMerged.mockResolvedValue(false);
|
|
92
|
-
const service = new ProofGeneratorService(
|
|
84
|
+
const service = new ProofGeneratorService(fileService, sessionKeysService);
|
|
93
85
|
await expect(service.generate(defaultProofArgs)).rejects.toThrow(ErrorCodes.NOT_MERGED_STATE_TREE.toString());
|
|
94
86
|
});
|
|
95
87
|
test("should throw error if private key is wrong", async () => {
|
|
96
88
|
const keypair = new Keypair(new PrivateKey(0n));
|
|
97
89
|
mockContract.coordinatorPublicKey.mockResolvedValue(keypair.publicKey.asContractParam());
|
|
98
|
-
const service = new ProofGeneratorService(
|
|
90
|
+
const service = new ProofGeneratorService(fileService, sessionKeysService);
|
|
99
91
|
await expect(service.generate(defaultProofArgs)).rejects.toThrow(ErrorCodes.PRIVATE_KEY_MISMATCH.toString());
|
|
100
92
|
});
|
|
101
93
|
test("should throw error if poll is not found", async () => {
|
|
102
|
-
const service = new ProofGeneratorService(
|
|
94
|
+
const service = new ProofGeneratorService(fileService, sessionKeysService);
|
|
103
95
|
await expect(service.generate({ ...defaultProofArgs, poll: 2 })).rejects.toThrow(ErrorCodes.POLL_NOT_FOUND.toString());
|
|
104
96
|
});
|
|
105
97
|
test("should throw error if poll is not found in maci contract", async () => {
|
|
106
98
|
mockContract.polls.mockResolvedValue({ poll: zeroAddress });
|
|
107
|
-
const service = new ProofGeneratorService(
|
|
99
|
+
const service = new ProofGeneratorService(fileService, sessionKeysService);
|
|
108
100
|
await expect(service.generate({ ...defaultProofArgs, poll: 2 })).rejects.toThrow(ErrorCodes.POLL_NOT_FOUND.toString());
|
|
109
101
|
});
|
|
110
|
-
test("should throw error if coordinator key cannot be decrypted", async () => {
|
|
111
|
-
defaultCryptoService.decrypt.mockReturnValue("unknown");
|
|
112
|
-
const service = new ProofGeneratorService(defaultCryptoService, fileService, sessionKeysService);
|
|
113
|
-
await expect(service.generate({ ...defaultProofArgs, encryptedCoordinatorPrivateKey: "unknown" })).rejects.toThrow("Cannot convert 0x to a BigInt");
|
|
114
|
-
});
|
|
115
102
|
test("should generate proofs properly for NonQv", async () => {
|
|
116
|
-
const service = new ProofGeneratorService(
|
|
103
|
+
const service = new ProofGeneratorService(fileService, sessionKeysService);
|
|
117
104
|
const data = await service.generate(defaultProofArgs);
|
|
118
105
|
expect(data.processProofs).toHaveLength(1);
|
|
119
106
|
expect(data.tallyProofs).toHaveLength(1);
|
|
120
107
|
});
|
|
121
108
|
test("should generate proofs properly for Qv", async () => {
|
|
122
|
-
const service = new ProofGeneratorService(
|
|
123
|
-
const data = await service.generate({ ...defaultProofArgs,
|
|
109
|
+
const service = new ProofGeneratorService(fileService, sessionKeysService);
|
|
110
|
+
const data = await service.generate({ ...defaultProofArgs, mode: EMode.QV });
|
|
124
111
|
expect(data.processProofs).toHaveLength(1);
|
|
125
112
|
expect(data.tallyProofs).toHaveLength(1);
|
|
126
113
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proof.service.test.js","sourceRoot":"","sources":["../../../../ts/proof/__tests__/proof.service.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"proof.service.test.js","sourceRoot":"","sources":["../../../../ts/proof/__tests__/proof.service.test.ts"],"names":[],"mappings":"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"}
|
package/build/ts/proof/dto.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { EMode } from "@maci-protocol/sdk";
|
|
1
2
|
import type { Hex } from "viem";
|
|
2
3
|
import { ESupportedNetworks } from "../common";
|
|
3
4
|
/**
|
|
@@ -13,17 +14,9 @@ export declare class GenerateProofDto {
|
|
|
13
14
|
*/
|
|
14
15
|
maciContractAddress: string;
|
|
15
16
|
/**
|
|
16
|
-
*
|
|
17
|
+
* Voting mode
|
|
17
18
|
*/
|
|
18
|
-
|
|
19
|
-
/**
|
|
20
|
-
* Whether to use Qv or NonQv
|
|
21
|
-
*/
|
|
22
|
-
useQuadraticVoting: boolean;
|
|
23
|
-
/**
|
|
24
|
-
* Encrypted coordinator private key with RSA public key (see .env.example)
|
|
25
|
-
*/
|
|
26
|
-
encryptedCoordinatorPrivateKey: string;
|
|
19
|
+
mode: EMode;
|
|
27
20
|
/**
|
|
28
21
|
* Start block for event processing
|
|
29
22
|
*/
|
|
@@ -36,6 +29,12 @@ export declare class GenerateProofDto {
|
|
|
36
29
|
* Blocks per batch for event processing
|
|
37
30
|
*/
|
|
38
31
|
blocksPerBatch?: number;
|
|
32
|
+
sessionKeyAddress?: Hex;
|
|
33
|
+
approval?: string;
|
|
34
|
+
/**
|
|
35
|
+
* Chain Name
|
|
36
|
+
*/
|
|
37
|
+
chain: ESupportedNetworks;
|
|
39
38
|
}
|
|
40
39
|
/**
|
|
41
40
|
* Data transfer object for merge trees
|
|
@@ -46,8 +45,8 @@ export declare class MergeTreesDto {
|
|
|
46
45
|
*/
|
|
47
46
|
poll: number;
|
|
48
47
|
maciContractAddress: string;
|
|
49
|
-
sessionKeyAddress
|
|
50
|
-
approval
|
|
48
|
+
sessionKeyAddress?: string;
|
|
49
|
+
approval?: string;
|
|
51
50
|
/**
|
|
52
51
|
* Chain Name
|
|
53
52
|
*/
|
|
@@ -62,9 +61,8 @@ export declare class SubmitProofsDto {
|
|
|
62
61
|
*/
|
|
63
62
|
pollId: number;
|
|
64
63
|
maciContractAddress: Hex;
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
approval: string;
|
|
64
|
+
sessionKeyAddress?: Hex;
|
|
65
|
+
approval?: string;
|
|
68
66
|
/**
|
|
69
67
|
* Chain Name
|
|
70
68
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dto.d.ts","sourceRoot":"","sources":["../../../ts/proof/dto.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dto.d.ts","sourceRoot":"","sources":["../../../ts/proof/dto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAI3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C;;GAEG;AACH,qBAAa,gBAAgB;IAC3B;;OAEG;IAQH,IAAI,EAAG,MAAM,CAAC;IAEd;;OAEG;IAMH,mBAAmB,EAAG,MAAM,CAAC;IAE7B;;OAEG;IAMH,IAAI,EAAG,KAAK,CAAC;IAEb;;OAEG;IASH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IASH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IAWH,cAAc,CAAC,EAAE,MAAM,CAAC;IASxB,iBAAiB,CAAC,EAAE,GAAG,CAAC;IASxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IAMH,KAAK,EAAG,kBAAkB,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,aAAa;IACxB;;OAEG;IAQH,IAAI,EAAG,MAAM,CAAC;IAOd,mBAAmB,EAAG,MAAM,CAAC;IAS7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAS3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IAMH,KAAK,EAAG,kBAAkB,CAAC;CAC5B;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B;;OAEG;IAQH,MAAM,EAAG,MAAM,CAAC;IAOhB,mBAAmB,EAAG,GAAG,CAAC;IAS1B,iBAAiB,CAAC,EAAE,GAAG,CAAC;IASxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IAMH,KAAK,EAAG,kBAAkB,CAAC;CAC5B"}
|
package/build/ts/proof/dto.js
CHANGED
|
@@ -7,8 +7,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
+
import { EMode } from "@maci-protocol/sdk";
|
|
10
11
|
import { ApiProperty } from "@nestjs/swagger";
|
|
11
|
-
import {
|
|
12
|
+
import { IsEnum, IsEthereumAddress, IsInt, IsOptional, IsString, Max, Min } from "class-validator";
|
|
12
13
|
import { ESupportedNetworks } from "../common";
|
|
13
14
|
/**
|
|
14
15
|
* Data transfer object for generate proof
|
|
@@ -23,17 +24,9 @@ export class GenerateProofDto {
|
|
|
23
24
|
*/
|
|
24
25
|
maciContractAddress;
|
|
25
26
|
/**
|
|
26
|
-
*
|
|
27
|
+
* Voting mode
|
|
27
28
|
*/
|
|
28
|
-
|
|
29
|
-
/**
|
|
30
|
-
* Whether to use Qv or NonQv
|
|
31
|
-
*/
|
|
32
|
-
useQuadraticVoting;
|
|
33
|
-
/**
|
|
34
|
-
* Encrypted coordinator private key with RSA public key (see .env.example)
|
|
35
|
-
*/
|
|
36
|
-
encryptedCoordinatorPrivateKey;
|
|
29
|
+
mode;
|
|
37
30
|
/**
|
|
38
31
|
* Start block for event processing
|
|
39
32
|
*/
|
|
@@ -46,6 +39,12 @@ export class GenerateProofDto {
|
|
|
46
39
|
* Blocks per batch for event processing
|
|
47
40
|
*/
|
|
48
41
|
blocksPerBatch;
|
|
42
|
+
sessionKeyAddress;
|
|
43
|
+
approval;
|
|
44
|
+
/**
|
|
45
|
+
* Chain Name
|
|
46
|
+
*/
|
|
47
|
+
chain;
|
|
49
48
|
}
|
|
50
49
|
__decorate([
|
|
51
50
|
ApiProperty({
|
|
@@ -67,31 +66,12 @@ __decorate([
|
|
|
67
66
|
], GenerateProofDto.prototype, "maciContractAddress", void 0);
|
|
68
67
|
__decorate([
|
|
69
68
|
ApiProperty({
|
|
70
|
-
description: "
|
|
71
|
-
type:
|
|
72
|
-
}),
|
|
73
|
-
IsEthereumAddress(),
|
|
74
|
-
__metadata("design:type", String)
|
|
75
|
-
], GenerateProofDto.prototype, "tallyContractAddress", void 0);
|
|
76
|
-
__decorate([
|
|
77
|
-
ApiProperty({
|
|
78
|
-
description: "Whether to use quadratic voting or not",
|
|
79
|
-
type: Boolean,
|
|
80
|
-
}),
|
|
81
|
-
IsBoolean(),
|
|
82
|
-
__metadata("design:type", Boolean)
|
|
83
|
-
], GenerateProofDto.prototype, "useQuadraticVoting", void 0);
|
|
84
|
-
__decorate([
|
|
85
|
-
ApiProperty({
|
|
86
|
-
description: "Encrypted coordinator private key with RSA public key (see README.md)",
|
|
87
|
-
minimum: 1,
|
|
88
|
-
maximum: 1024,
|
|
89
|
-
type: String,
|
|
69
|
+
description: "Voting mode (qv: 0, non-qv: 1, full: 2)",
|
|
70
|
+
type: Number,
|
|
90
71
|
}),
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
], GenerateProofDto.prototype, "encryptedCoordinatorPrivateKey", void 0);
|
|
72
|
+
IsEnum(EMode),
|
|
73
|
+
__metadata("design:type", Number)
|
|
74
|
+
], GenerateProofDto.prototype, "mode", void 0);
|
|
95
75
|
__decorate([
|
|
96
76
|
ApiProperty({
|
|
97
77
|
description: "Start block for event parsing",
|
|
@@ -127,6 +107,34 @@ __decorate([
|
|
|
127
107
|
IsOptional(),
|
|
128
108
|
__metadata("design:type", Number)
|
|
129
109
|
], GenerateProofDto.prototype, "blocksPerBatch", void 0);
|
|
110
|
+
__decorate([
|
|
111
|
+
ApiProperty({
|
|
112
|
+
description: "Session key address",
|
|
113
|
+
type: String,
|
|
114
|
+
required: false,
|
|
115
|
+
}),
|
|
116
|
+
IsOptional(),
|
|
117
|
+
IsEthereumAddress(),
|
|
118
|
+
__metadata("design:type", String)
|
|
119
|
+
], GenerateProofDto.prototype, "sessionKeyAddress", void 0);
|
|
120
|
+
__decorate([
|
|
121
|
+
ApiProperty({
|
|
122
|
+
description: "Approval",
|
|
123
|
+
type: String,
|
|
124
|
+
required: false,
|
|
125
|
+
}),
|
|
126
|
+
IsOptional(),
|
|
127
|
+
IsString(),
|
|
128
|
+
__metadata("design:type", String)
|
|
129
|
+
], GenerateProofDto.prototype, "approval", void 0);
|
|
130
|
+
__decorate([
|
|
131
|
+
ApiProperty({
|
|
132
|
+
description: "Chain to which to deploy the contract(s)",
|
|
133
|
+
enum: ESupportedNetworks,
|
|
134
|
+
}),
|
|
135
|
+
IsEnum(ESupportedNetworks),
|
|
136
|
+
__metadata("design:type", String)
|
|
137
|
+
], GenerateProofDto.prototype, "chain", void 0);
|
|
130
138
|
/**
|
|
131
139
|
* Data transfer object for merge trees
|
|
132
140
|
*/
|
|
@@ -165,7 +173,9 @@ __decorate([
|
|
|
165
173
|
ApiProperty({
|
|
166
174
|
description: "Session key address",
|
|
167
175
|
type: String,
|
|
176
|
+
required: false,
|
|
168
177
|
}),
|
|
178
|
+
IsOptional(),
|
|
169
179
|
IsEthereumAddress(),
|
|
170
180
|
__metadata("design:type", String)
|
|
171
181
|
], MergeTreesDto.prototype, "sessionKeyAddress", void 0);
|
|
@@ -173,7 +183,9 @@ __decorate([
|
|
|
173
183
|
ApiProperty({
|
|
174
184
|
description: "Approval",
|
|
175
185
|
type: String,
|
|
186
|
+
required: false,
|
|
176
187
|
}),
|
|
188
|
+
IsOptional(),
|
|
177
189
|
IsString(),
|
|
178
190
|
__metadata("design:type", String)
|
|
179
191
|
], MergeTreesDto.prototype, "approval", void 0);
|
|
@@ -194,7 +206,6 @@ export class SubmitProofsDto {
|
|
|
194
206
|
*/
|
|
195
207
|
pollId;
|
|
196
208
|
maciContractAddress;
|
|
197
|
-
tallyContractAddress;
|
|
198
209
|
sessionKeyAddress;
|
|
199
210
|
approval;
|
|
200
211
|
/**
|
|
@@ -220,19 +231,13 @@ __decorate([
|
|
|
220
231
|
IsEthereumAddress(),
|
|
221
232
|
__metadata("design:type", String)
|
|
222
233
|
], SubmitProofsDto.prototype, "maciContractAddress", void 0);
|
|
223
|
-
__decorate([
|
|
224
|
-
ApiProperty({
|
|
225
|
-
description: "Tally contract address",
|
|
226
|
-
type: String,
|
|
227
|
-
}),
|
|
228
|
-
IsEthereumAddress(),
|
|
229
|
-
__metadata("design:type", String)
|
|
230
|
-
], SubmitProofsDto.prototype, "tallyContractAddress", void 0);
|
|
231
234
|
__decorate([
|
|
232
235
|
ApiProperty({
|
|
233
236
|
description: "Session key address",
|
|
234
237
|
type: String,
|
|
238
|
+
required: false,
|
|
235
239
|
}),
|
|
240
|
+
IsOptional(),
|
|
236
241
|
IsEthereumAddress(),
|
|
237
242
|
__metadata("design:type", String)
|
|
238
243
|
], SubmitProofsDto.prototype, "sessionKeyAddress", void 0);
|
|
@@ -240,7 +245,9 @@ __decorate([
|
|
|
240
245
|
ApiProperty({
|
|
241
246
|
description: "Approval",
|
|
242
247
|
type: String,
|
|
248
|
+
required: false,
|
|
243
249
|
}),
|
|
250
|
+
IsOptional(),
|
|
244
251
|
IsString(),
|
|
245
252
|
__metadata("design:type", String)
|
|
246
253
|
], SubmitProofsDto.prototype, "approval", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dto.js","sourceRoot":"","sources":["../../../ts/proof/dto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dto.js","sourceRoot":"","sources":["../../../ts/proof/dto.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { IGenerateData, IMergeArgs } from "./types";
|
|
2
|
-
import type {
|
|
2
|
+
import type { ITallyData } from "@maci-protocol/sdk";
|
|
3
3
|
import { FileService } from "../file/file.service";
|
|
4
|
+
import { IGetPublicKeyData } from "../file/types";
|
|
4
5
|
import { GenerateProofDto, SubmitProofsDto } from "./dto";
|
|
5
6
|
import { ProofGeneratorService } from "./proof.service";
|
|
6
7
|
export declare class ProofController {
|
|
@@ -35,7 +36,7 @@ export declare class ProofController {
|
|
|
35
36
|
* Submit proofs on-chain api method
|
|
36
37
|
* @param args - submit proofs on-chain args
|
|
37
38
|
*/
|
|
38
|
-
submit(args: SubmitProofsDto): Promise<
|
|
39
|
+
submit(args: SubmitProofsDto): Promise<ITallyData>;
|
|
39
40
|
/**
|
|
40
41
|
* Get RSA public key for authorization setup
|
|
41
42
|
*
|
|
@@ -1 +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,
|
|
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,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"}
|
|
@@ -12,9 +12,8 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
12
12
|
};
|
|
13
13
|
var ProofController_1;
|
|
14
14
|
/* eslint-disable @typescript-eslint/no-shadow */
|
|
15
|
-
import { Body, Controller, Get, HttpException, HttpStatus, Logger, Post
|
|
15
|
+
import { Body, Controller, Get, HttpException, HttpStatus, Logger, Post } from "@nestjs/common";
|
|
16
16
|
import { ApiBearerAuth, ApiBody, ApiResponse, ApiTags } from "@nestjs/swagger";
|
|
17
|
-
import { AccountSignatureGuard, Public } from "../auth/AccountSignatureGuard.service";
|
|
18
17
|
import { FileService } from "../file/file.service";
|
|
19
18
|
import { GenerateProofDto, MergeTreesDto, SubmitProofsDto } from "./dto";
|
|
20
19
|
import { ProofGeneratorService } from "./proof.service";
|
|
@@ -117,7 +116,6 @@ __decorate([
|
|
|
117
116
|
__decorate([
|
|
118
117
|
ApiResponse({ status: HttpStatus.OK, description: "Public key was successfully returned" }),
|
|
119
118
|
ApiResponse({ status: HttpStatus.BAD_REQUEST, description: "BadRequest" }),
|
|
120
|
-
Public(),
|
|
121
119
|
Get("publicKey"),
|
|
122
120
|
__metadata("design:type", Function),
|
|
123
121
|
__metadata("design:paramtypes", []),
|
|
@@ -127,7 +125,6 @@ ProofController = ProofController_1 = __decorate([
|
|
|
127
125
|
ApiTags("v1/proof"),
|
|
128
126
|
ApiBearerAuth(),
|
|
129
127
|
Controller("v1/proof"),
|
|
130
|
-
UseGuards(AccountSignatureGuard),
|
|
131
128
|
__metadata("design:paramtypes", [ProofGeneratorService,
|
|
132
129
|
FileService])
|
|
133
130
|
], ProofController);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proof.controller.js","sourceRoot":"","sources":["../../../ts/proof/proof.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,iDAAiD;AACjD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"proof.controller.js","sourceRoot":"","sources":["../../../ts/proof/proof.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,12 @@
|
|
|
1
1
|
import { type IGenerateProofsOptions } from "@maci-protocol/sdk";
|
|
2
|
-
import { IProof } from "@maci-protocol/sdk";
|
|
2
|
+
import { IProof, ITallyData } from "@maci-protocol/sdk";
|
|
3
3
|
import type { IGenerateArgs, IGenerateData, IMergeArgs, ISubmitProofsArgs } from "./types";
|
|
4
|
-
import { CryptoService } from "../crypto/crypto.service";
|
|
5
4
|
import { FileService } from "../file/file.service";
|
|
6
5
|
import { SessionKeysService } from "../sessionKeys/sessionKeys.service";
|
|
7
6
|
/**
|
|
8
7
|
* ProofGeneratorService is responsible for generating message processing and tally proofs.
|
|
9
8
|
*/
|
|
10
9
|
export declare class ProofGeneratorService {
|
|
11
|
-
private readonly cryptoService;
|
|
12
10
|
private readonly fileService;
|
|
13
11
|
private readonly sessionKeysService;
|
|
14
12
|
/**
|
|
@@ -22,7 +20,7 @@ export declare class ProofGeneratorService {
|
|
|
22
20
|
/**
|
|
23
21
|
* Proof generator initialization
|
|
24
22
|
*/
|
|
25
|
-
constructor(
|
|
23
|
+
constructor(fileService: FileService, sessionKeysService: SessionKeysService);
|
|
26
24
|
/**
|
|
27
25
|
* Read and parse proofs
|
|
28
26
|
* @param folder - folder path to read proofs from
|
|
@@ -36,7 +34,7 @@ export declare class ProofGeneratorService {
|
|
|
36
34
|
* @param args - generate proofs arguments
|
|
37
35
|
* @returns - generated proofs for message processing and tally
|
|
38
36
|
*/
|
|
39
|
-
generate({
|
|
37
|
+
generate({ approval, sessionKeyAddress, chain, poll, maciContractAddress, mode, startBlock, endBlock, blocksPerBatch, useWasm, }: IGenerateArgs, options?: IGenerateProofsOptions): Promise<IGenerateData>;
|
|
40
38
|
/**
|
|
41
39
|
* Merge state and message trees
|
|
42
40
|
*
|
|
@@ -49,6 +47,6 @@ export declare class ProofGeneratorService {
|
|
|
49
47
|
*
|
|
50
48
|
* @param args - submit proofs on-chain arguments
|
|
51
49
|
*/
|
|
52
|
-
submit({ maciContractAddress, pollId, chain }: ISubmitProofsArgs): Promise<
|
|
50
|
+
submit({ maciContractAddress, pollId, sessionKeyAddress, approval, chain, }: ISubmitProofsArgs): Promise<ITallyData>;
|
|
53
51
|
}
|
|
54
52
|
//# sourceMappingURL=proof.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proof.service.d.ts","sourceRoot":"","sources":["../../../ts/proof/proof.service.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"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;IAsEzB;;;;;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"}
|