@maci-protocol/relayer 0.0.0-ci.f4bc8a6 → 0.0.0-ci.f4e2c46
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/build/tests/constants.d.ts +5 -5
- package/build/tests/constants.d.ts.map +1 -1
- package/build/tests/constants.js +5 -5
- package/build/tests/constants.js.map +1 -1
- package/build/tests/messageBatches.test.js +10 -11
- package/build/tests/messageBatches.test.js.map +1 -1
- package/build/tests/messages.test.js +11 -12
- package/build/tests/messages.test.js.map +1 -1
- package/build/tests/onchain.test.js +9 -10
- package/build/tests/onchain.test.js.map +1 -1
- package/build/ts/message/__tests__/message.guard.test.js +1 -1
- package/build/ts/message/__tests__/message.guard.test.js.map +1 -1
- package/build/ts/message/__tests__/message.repository.test.js +1 -1
- package/build/ts/message/__tests__/message.repository.test.js.map +1 -1
- package/build/ts/message/__tests__/message.service.test.js +1 -1
- package/build/ts/message/__tests__/utils.js +1 -1
- package/build/ts/message/__tests__/utils.js.map +1 -1
- package/build/ts/message/__tests__/validation.test.js +1 -1
- package/build/ts/message/__tests__/validation.test.js.map +1 -1
- package/build/ts/message/message.guard.js +1 -1
- package/build/ts/message/message.guard.js.map +1 -1
- package/build/ts/message/message.schema.d.ts +2 -2
- package/build/ts/message/message.service.js +2 -2
- package/build/ts/message/message.service.js.map +1 -1
- package/build/ts/message/validation.js +3 -3
- package/build/ts/message/validation.js.map +1 -1
- package/build/ts/messageBatch/__tests__/utils.js +2 -2
- package/build/ts/messageBatch/__tests__/utils.js.map +1 -1
- package/build/ts/messageBatch/messageBatch.schema.d.ts +2 -2
- package/build/ts/messageBatch/messageBatch.service.d.ts.map +1 -1
- package/build/ts/messageBatch/messageBatch.service.js +3 -3
- package/build/ts/messageBatch/messageBatch.service.js.map +1 -1
- package/build/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +29 -29
package/LICENSE
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
MIT License
|
|
2
2
|
|
|
3
|
-
Copyright (c)
|
|
4
|
-
Cory Dickson, Han Jian, Chih-Cheng Liang, and Koh Wei Jie
|
|
3
|
+
Copyright (c) 2025 Ethereum Foundation
|
|
5
4
|
|
|
6
5
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
6
|
of this software and associated documentation files (the "Software"), to deal
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type request from "supertest";
|
|
2
2
|
export declare const STATE_TREE_DEPTH = 10;
|
|
3
|
-
export declare const
|
|
3
|
+
export declare const TALLY_PROCESSING_STATE_TREE_DEPTH = 1;
|
|
4
4
|
export declare const VOTE_OPTION_TREE_DEPTH = 2;
|
|
5
5
|
export declare const MESSAGE_BATCH_SIZE = 20;
|
|
6
6
|
export declare const DEFAULT_INITIAL_VOICE_CREDITS = 99;
|
|
@@ -9,11 +9,11 @@ export declare const dirname: string;
|
|
|
9
9
|
export declare const pollJoiningZkey: string;
|
|
10
10
|
export declare const pollJoinedZkey: string;
|
|
11
11
|
export declare const pollWasm: string;
|
|
12
|
-
export declare const
|
|
12
|
+
export declare const pollWitnessGenerator: string;
|
|
13
13
|
export declare const pollJoinedWasm: string;
|
|
14
|
-
export declare const
|
|
14
|
+
export declare const pollJoinedWitnessGenerator: string;
|
|
15
15
|
export declare const rapidsnark: string;
|
|
16
|
-
export declare const
|
|
17
|
-
export declare const
|
|
16
|
+
export declare const messageProcessorZkeyPathNonQv: string;
|
|
17
|
+
export declare const voteTallyZkeyPathNonQv: string;
|
|
18
18
|
export type TApp = Parameters<typeof request>[0];
|
|
19
19
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../tests/constants.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AAErC,eAAO,MAAM,gBAAgB,KAAK,CAAC;AACnC,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../tests/constants.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AAErC,eAAO,MAAM,gBAAgB,KAAK,CAAC;AACnC,eAAO,MAAM,iCAAiC,IAAI,CAAC;AACnD,eAAO,MAAM,sBAAsB,IAAI,CAAC;AACxC,eAAO,MAAM,kBAAkB,KAAK,CAAC;AACrC,eAAO,MAAM,6BAA6B,KAAK,CAAC;AAChD,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC,eAAO,MAAM,OAAO,QAAmD,CAAC;AAExE,eAAO,MAAM,eAAe,QAAmF,CAAC;AAChH,eAAO,MAAM,cAAc,QAAiF,CAAC;AAC7G,eAAO,MAAM,QAAQ,QAGpB,CAAC;AACF,eAAO,MAAM,oBAAoB,QAGhC,CAAC;AACF,eAAO,MAAM,cAAc,QAG1B,CAAC;AACF,eAAO,MAAM,0BAA0B,QAGtC,CAAC;AACF,eAAO,MAAM,UAAU,QAAyC,CAAC;AACjE,eAAO,MAAM,6BAA6B,QAGzC,CAAC;AACF,eAAO,MAAM,sBAAsB,QAGlC,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC"}
|
package/build/tests/constants.js
CHANGED
|
@@ -2,7 +2,7 @@ import { homedir } from "os";
|
|
|
2
2
|
import path from "path";
|
|
3
3
|
import url from "url";
|
|
4
4
|
export const STATE_TREE_DEPTH = 10;
|
|
5
|
-
export const
|
|
5
|
+
export const TALLY_PROCESSING_STATE_TREE_DEPTH = 1;
|
|
6
6
|
export const VOTE_OPTION_TREE_DEPTH = 2;
|
|
7
7
|
export const MESSAGE_BATCH_SIZE = 20;
|
|
8
8
|
export const DEFAULT_INITIAL_VOICE_CREDITS = 99;
|
|
@@ -11,10 +11,10 @@ export const dirname = url.fileURLToPath(new URL(".", import.meta.url));
|
|
|
11
11
|
export const pollJoiningZkey = path.resolve(dirname, "../zkeys/PollJoining_10_test/PollJoining_10_test.0.zkey");
|
|
12
12
|
export const pollJoinedZkey = path.resolve(dirname, "../zkeys/PollJoined_10_test/PollJoined_10_test.0.zkey");
|
|
13
13
|
export const pollWasm = path.resolve(dirname, "../zkeys/PollJoining_10_test/PollJoining_10_test_js/PollJoining_10_test.wasm");
|
|
14
|
-
export const
|
|
14
|
+
export const pollWitnessGenerator = path.resolve(dirname, "../zkeys/PollJoining_10_test/PollJoining_10_test_cpp/PollJoining_10_test");
|
|
15
15
|
export const pollJoinedWasm = path.resolve(dirname, "../zkeys/PollJoined_10_test/PollJoined_10_test_js/PollJoined_10_test.wasm");
|
|
16
|
-
export const
|
|
16
|
+
export const pollJoinedWitnessGenerator = path.resolve(dirname, "../zkeys/PollJoined_10_test/PollJoined_10_test_cpp/PollJoined_10_test");
|
|
17
17
|
export const rapidsnark = `${homedir()}/rapidsnark/build/prover`;
|
|
18
|
-
export const
|
|
19
|
-
export const
|
|
18
|
+
export const messageProcessorZkeyPathNonQv = path.resolve(dirname, "../zkeys/MessageProcessorNonQv_10-20-2_test/MessageProcessorNonQv_10-20-2_test.0.zkey");
|
|
19
|
+
export const voteTallyZkeyPathNonQv = path.resolve(dirname, "../zkeys/VoteTallyNonQv_10-1-2_test/VoteTallyNonQv_10-1-2_test.0.zkey");
|
|
20
20
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../tests/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,GAAG,MAAM,KAAK,CAAC;AAItB,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AACnC,MAAM,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../tests/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,GAAG,MAAM,KAAK,CAAC;AAItB,MAAM,CAAC,MAAM,gBAAgB,GAAG,EAAE,CAAC;AACnC,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAAC,CAAC;AACnD,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AACxC,MAAM,CAAC,MAAM,kBAAkB,GAAG,EAAE,CAAC;AACrC,MAAM,CAAC,MAAM,6BAA6B,GAAG,EAAE,CAAC;AAChD,MAAM,CAAC,MAAM,oBAAoB,GAAG,EAAE,CAAC;AAEvC,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,yDAAyD,CAAC,CAAC;AAChH,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,uDAAuD,CAAC,CAAC;AAC7G,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAClC,OAAO,EACP,8EAA8E,CAC/E,CAAC;AACF,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAC9C,OAAO,EACP,0EAA0E,CAC3E,CAAC;AACF,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CACxC,OAAO,EACP,2EAA2E,CAC5E,CAAC;AACF,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,CAAC,OAAO,CACpD,OAAO,EACP,uEAAuE,CACxE,CAAC;AACF,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,OAAO,EAAE,0BAA0B,CAAC;AACjE,MAAM,CAAC,MAAM,6BAA6B,GAAG,IAAI,CAAC,OAAO,CACvD,OAAO,EACP,uFAAuF,CACxF,CAAC;AACF,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,CAAC,OAAO,CAChD,OAAO,EACP,uEAAuE,CACxE,CAAC"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { jest } from "@jest/globals";
|
|
2
2
|
import { Keypair } from "@maci-protocol/domainobjs";
|
|
3
|
-
import { formatProofForVerifierContract,
|
|
3
|
+
import { formatProofForVerifierContract, generateProofSnarkjs } from "@maci-protocol/sdk";
|
|
4
4
|
import { TestingClass } from "@maci-protocol/testing";
|
|
5
5
|
import { HttpStatus, ValidationPipe } from "@nestjs/common";
|
|
6
6
|
import { Test } from "@nestjs/testing";
|
|
7
7
|
import request from "supertest";
|
|
8
8
|
import { AppModule } from "../ts/app.module.js";
|
|
9
|
-
import { pollJoinedWasm, pollJoinedZkey, pollJoiningZkey, pollWasm,
|
|
9
|
+
import { pollJoinedWasm, pollJoinedZkey, pollJoiningZkey, pollWasm, pollWitnessGenerator, messageProcessorZkeyPathNonQv, rapidsnark, voteTallyZkeyPathNonQv, } from "./constants.js";
|
|
10
10
|
jest.unmock("@maci-protocol/sdk");
|
|
11
11
|
describe("Integration message batches", () => {
|
|
12
12
|
let app;
|
|
@@ -17,14 +17,14 @@ describe("Integration message batches", () => {
|
|
|
17
17
|
const testDeploy = await TestingClass.getInstance({
|
|
18
18
|
pollJoiningZkeyPath: pollJoiningZkey,
|
|
19
19
|
pollJoinedZkeyPath: pollJoinedZkey,
|
|
20
|
-
|
|
21
|
-
|
|
20
|
+
messageProcessorZkeyPath: messageProcessorZkeyPathNonQv,
|
|
21
|
+
voteTallyZkeyPath: voteTallyZkeyPathNonQv,
|
|
22
22
|
pollWasm,
|
|
23
|
-
|
|
23
|
+
pollWitnessGenerator,
|
|
24
24
|
rapidsnark,
|
|
25
25
|
});
|
|
26
26
|
const poll = testDeploy.contractsData.maciState.polls.get(0n);
|
|
27
|
-
poll.updatePoll(BigInt(testDeploy.contractsData.maciState.
|
|
27
|
+
poll.updatePoll(BigInt(testDeploy.contractsData.maciState.publicKeys.length));
|
|
28
28
|
maciContractAddress = testDeploy.contractsData.maciContractAddress;
|
|
29
29
|
[user] = testDeploy.contractsData.users;
|
|
30
30
|
const moduleFixture = await Test.createTestingModule({
|
|
@@ -34,12 +34,11 @@ describe("Integration message batches", () => {
|
|
|
34
34
|
app.useGlobalPipes(new ValidationPipe({ transform: true }));
|
|
35
35
|
await app.listen(3001);
|
|
36
36
|
const circuitInputs = poll.joinedCircuitInputs({
|
|
37
|
-
|
|
37
|
+
maciPrivateKey: user.keypair.privateKey,
|
|
38
38
|
stateLeafIndex: user.stateLeafIndex,
|
|
39
39
|
voiceCreditsBalance: user.voiceCreditBalance,
|
|
40
|
-
joinTimestamp: user.timestamp,
|
|
41
40
|
});
|
|
42
|
-
const { proof } = await
|
|
41
|
+
const { proof } = await generateProofSnarkjs({
|
|
43
42
|
inputs: circuitInputs,
|
|
44
43
|
zkeyPath: pollJoinedZkey,
|
|
45
44
|
wasmPath: pollJoinedWasm,
|
|
@@ -51,7 +50,7 @@ describe("Integration message batches", () => {
|
|
|
51
50
|
messages: [
|
|
52
51
|
{
|
|
53
52
|
data: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
|
54
|
-
publicKey: keypair.
|
|
53
|
+
publicKey: keypair.publicKey.serialize(),
|
|
55
54
|
},
|
|
56
55
|
],
|
|
57
56
|
poll: 0,
|
|
@@ -99,7 +98,7 @@ describe("Integration message batches", () => {
|
|
|
99
98
|
skip: 0,
|
|
100
99
|
poll: 0,
|
|
101
100
|
maciContractAddress,
|
|
102
|
-
publicKeys: [user.keypair.
|
|
101
|
+
publicKeys: [user.keypair.publicKey.serialize()],
|
|
103
102
|
})
|
|
104
103
|
.expect(HttpStatus.OK);
|
|
105
104
|
expect(result.status).toBe(HttpStatus.OK);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messageBatches.test.js","sourceRoot":"","sources":["../../tests/messageBatches.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,8BAA8B,EAAE,
|
|
1
|
+
{"version":3,"file":"messageBatches.test.js","sourceRoot":"","sources":["../../tests/messageBatches.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { jest } from "@jest/globals";
|
|
2
2
|
import { Keypair } from "@maci-protocol/domainobjs";
|
|
3
|
-
import { formatProofForVerifierContract,
|
|
3
|
+
import { formatProofForVerifierContract, generateProofSnarkjs } from "@maci-protocol/sdk";
|
|
4
4
|
import { TestingClass } from "@maci-protocol/testing";
|
|
5
5
|
import { HttpStatus, ValidationPipe } from "@nestjs/common";
|
|
6
6
|
import { Test } from "@nestjs/testing";
|
|
7
7
|
import request from "supertest";
|
|
8
8
|
import { AppModule } from "../ts/app.module.js";
|
|
9
|
-
import { pollJoinedWasm, pollJoinedZkey, pollWasm,
|
|
9
|
+
import { pollJoinedWasm, pollJoinedZkey, pollWasm, voteTallyZkeyPathNonQv, pollJoiningZkey, messageProcessorZkeyPathNonQv, pollWitnessGenerator, rapidsnark, } from "./constants.js";
|
|
10
10
|
jest.unmock("@maci-protocol/sdk");
|
|
11
11
|
describe("Integration messages", () => {
|
|
12
12
|
let app;
|
|
@@ -18,22 +18,21 @@ describe("Integration messages", () => {
|
|
|
18
18
|
const testDeploy = await TestingClass.getInstance({
|
|
19
19
|
pollJoiningZkeyPath: pollJoiningZkey,
|
|
20
20
|
pollJoinedZkeyPath: pollJoinedZkey,
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
messageProcessorZkeyPath: messageProcessorZkeyPathNonQv,
|
|
22
|
+
voteTallyZkeyPath: voteTallyZkeyPathNonQv,
|
|
23
23
|
pollWasm,
|
|
24
|
-
|
|
24
|
+
pollWitnessGenerator,
|
|
25
25
|
rapidsnark,
|
|
26
26
|
});
|
|
27
27
|
const poll = testDeploy.contractsData.maciState.polls.get(0n);
|
|
28
|
-
poll.updatePoll(BigInt(testDeploy.contractsData.maciState.
|
|
28
|
+
poll.updatePoll(BigInt(testDeploy.contractsData.maciState.publicKeys.length));
|
|
29
29
|
const [user] = testDeploy.contractsData.users;
|
|
30
30
|
stateLeafIndex = Number(user.stateLeafIndex);
|
|
31
31
|
maciContractAddress = testDeploy.contractsData.maciContractAddress;
|
|
32
32
|
circuitInputs = poll.joinedCircuitInputs({
|
|
33
|
-
|
|
33
|
+
maciPrivateKey: user.keypair.privateKey,
|
|
34
34
|
stateLeafIndex: user.stateLeafIndex,
|
|
35
35
|
voiceCreditsBalance: user.voiceCreditBalance,
|
|
36
|
-
joinTimestamp: user.timestamp,
|
|
37
36
|
});
|
|
38
37
|
const moduleFixture = await Test.createTestingModule({
|
|
39
38
|
imports: [AppModule],
|
|
@@ -55,7 +54,7 @@ describe("Integration messages", () => {
|
|
|
55
54
|
messages: [
|
|
56
55
|
{
|
|
57
56
|
data: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
|
58
|
-
publicKey: keypair.
|
|
57
|
+
publicKey: keypair.publicKey.serialize(),
|
|
59
58
|
},
|
|
60
59
|
],
|
|
61
60
|
};
|
|
@@ -77,7 +76,7 @@ describe("Integration messages", () => {
|
|
|
77
76
|
});
|
|
78
77
|
});
|
|
79
78
|
test("should throw an error if dto is invalid", async () => {
|
|
80
|
-
const { proof } = await
|
|
79
|
+
const { proof } = await generateProofSnarkjs({
|
|
81
80
|
inputs: circuitInputs,
|
|
82
81
|
zkeyPath: pollJoinedZkey,
|
|
83
82
|
wasmPath: pollJoinedWasm,
|
|
@@ -104,7 +103,7 @@ describe("Integration messages", () => {
|
|
|
104
103
|
});
|
|
105
104
|
});
|
|
106
105
|
test("should throw an error if messages dto is invalid", async () => {
|
|
107
|
-
const { proof } = await
|
|
106
|
+
const { proof } = await generateProofSnarkjs({
|
|
108
107
|
inputs: circuitInputs,
|
|
109
108
|
zkeyPath: pollJoinedZkey,
|
|
110
109
|
wasmPath: pollJoinedWasm,
|
|
@@ -126,7 +125,7 @@ describe("Integration messages", () => {
|
|
|
126
125
|
});
|
|
127
126
|
});
|
|
128
127
|
test("should publish user messages properly", async () => {
|
|
129
|
-
const { proof } = await
|
|
128
|
+
const { proof } = await generateProofSnarkjs({
|
|
130
129
|
inputs: circuitInputs,
|
|
131
130
|
zkeyPath: pollJoinedZkey,
|
|
132
131
|
wasmPath: pollJoinedWasm,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messages.test.js","sourceRoot":"","sources":["../../tests/messages.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,8BAA8B,EAAE,
|
|
1
|
+
{"version":3,"file":"messages.test.js","sourceRoot":"","sources":["../../tests/messages.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { jest } from "@jest/globals";
|
|
2
2
|
import { Keypair } from "@maci-protocol/domainobjs";
|
|
3
|
-
import { formatProofForVerifierContract,
|
|
3
|
+
import { formatProofForVerifierContract, generateProofSnarkjs, getDefaultSigner, getPollContracts, } from "@maci-protocol/sdk";
|
|
4
4
|
import { TestingClass } from "@maci-protocol/testing";
|
|
5
5
|
import { HttpStatus, ValidationPipe } from "@nestjs/common";
|
|
6
6
|
import { SchedulerRegistry } from "@nestjs/schedule";
|
|
7
7
|
import { Test } from "@nestjs/testing";
|
|
8
8
|
import request from "supertest";
|
|
9
9
|
import { AppModule } from "../ts/app.module.js";
|
|
10
|
-
import { pollJoinedWasm, pollJoinedZkey, pollWasm,
|
|
10
|
+
import { pollJoinedWasm, pollJoinedZkey, pollWasm, voteTallyZkeyPathNonQv, pollJoiningZkey, messageProcessorZkeyPathNonQv, pollWitnessGenerator, rapidsnark, } from "./constants.js";
|
|
11
11
|
jest.unmock("@maci-protocol/sdk");
|
|
12
12
|
describe("Integration message publishing", () => {
|
|
13
13
|
let app;
|
|
@@ -20,22 +20,21 @@ describe("Integration message publishing", () => {
|
|
|
20
20
|
const testDeploy = await TestingClass.getInstance({
|
|
21
21
|
pollJoiningZkeyPath: pollJoiningZkey,
|
|
22
22
|
pollJoinedZkeyPath: pollJoinedZkey,
|
|
23
|
-
|
|
24
|
-
|
|
23
|
+
messageProcessorZkeyPath: messageProcessorZkeyPathNonQv,
|
|
24
|
+
voteTallyZkeyPath: voteTallyZkeyPathNonQv,
|
|
25
25
|
pollWasm,
|
|
26
|
-
|
|
26
|
+
pollWitnessGenerator,
|
|
27
27
|
rapidsnark,
|
|
28
28
|
});
|
|
29
29
|
const poll = testDeploy.contractsData.maciState.polls.get(0n);
|
|
30
|
-
poll.updatePoll(BigInt(testDeploy.contractsData.maciState.
|
|
30
|
+
poll.updatePoll(BigInt(testDeploy.contractsData.maciState.publicKeys.length));
|
|
31
31
|
const [user] = testDeploy.contractsData.users;
|
|
32
32
|
stateLeafIndex = Number(user.stateLeafIndex);
|
|
33
33
|
maciContractAddress = testDeploy.contractsData.maciContractAddress;
|
|
34
34
|
circuitInputs = poll.joinedCircuitInputs({
|
|
35
|
-
|
|
35
|
+
maciPrivateKey: user.keypair.privateKey,
|
|
36
36
|
stateLeafIndex: user.stateLeafIndex,
|
|
37
37
|
voiceCreditsBalance: user.voiceCreditBalance,
|
|
38
|
-
joinTimestamp: user.timestamp,
|
|
39
38
|
});
|
|
40
39
|
const moduleFixture = await Test.createTestingModule({
|
|
41
40
|
imports: [AppModule],
|
|
@@ -59,11 +58,11 @@ describe("Integration message publishing", () => {
|
|
|
59
58
|
messages: [
|
|
60
59
|
{
|
|
61
60
|
data: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
|
62
|
-
publicKey: keypair.
|
|
61
|
+
publicKey: keypair.publicKey.serialize(),
|
|
63
62
|
},
|
|
64
63
|
],
|
|
65
64
|
};
|
|
66
|
-
const { proof } = await
|
|
65
|
+
const { proof } = await generateProofSnarkjs({
|
|
67
66
|
inputs: circuitInputs,
|
|
68
67
|
zkeyPath: pollJoinedZkey,
|
|
69
68
|
wasmPath: pollJoinedWasm,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onchain.test.js","sourceRoot":"","sources":["../../tests/onchain.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EACL,8BAA8B,EAC9B,
|
|
1
|
+
{"version":3,"file":"onchain.test.js","sourceRoot":"","sources":["../../tests/onchain.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.guard.test.js","sourceRoot":"","sources":["../../../../ts/message/__tests__/message.guard.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,aAAa,IAAI,WAAW,EAAE,aAAa,IAAI,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAChG,OAAO,EAAE,aAAa,EAAyB,MAAM,gBAAgB,CAAC;AAEtE,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAEhF,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,IAAI,CAAC,IAAI,CAAC,0CAA0C,EAAE,GAAY,EAAE,CAAC,CAAC;IACpE,aAAa,EAAE;QACb,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE;KACnB;IACD,aAAa,EAAE;QACb,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE;KACnB;CACF,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,MAAM,WAAW,GAAG;QAClB,IAAI,EAAE;YACJ,cAAc,EAAE,CAAC;YACjB,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;YAC/C,IAAI,EAAE,CAAC;YACP,mBAAmB,EAAE,WAAW;YAChC,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;oBACxD,SAAS,EAAE,IAAI,OAAO,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"message.guard.test.js","sourceRoot":"","sources":["../../../../ts/message/__tests__/message.guard.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { defaultSaveMessagesArgs } from "./utils.js";
|
|
|
6
6
|
describe("MessageRepository", () => {
|
|
7
7
|
const defaultMessages = [
|
|
8
8
|
{
|
|
9
|
-
publicKey: new Keypair().
|
|
9
|
+
publicKey: new Keypair().publicKey.serialize(),
|
|
10
10
|
data: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
|
11
11
|
hash: "hash",
|
|
12
12
|
maciContractAddress: ZeroAddress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.repository.test.js","sourceRoot":"","sources":["../../../../ts/message/__tests__/message.repository.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAGrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAErD,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACjC,MAAM,eAAe,GAAc;QACjC;YACE,SAAS,EAAE,IAAI,OAAO,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"message.repository.test.js","sourceRoot":"","sources":["../../../../ts/message/__tests__/message.repository.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ describe("MessageService", () => {
|
|
|
17
17
|
polls: jest.fn().mockImplementation(() => Promise.resolve({ poll: ZeroAddress })),
|
|
18
18
|
};
|
|
19
19
|
const mockPollContract = {
|
|
20
|
-
|
|
20
|
+
hashMessageAndPublicKey: jest.fn().mockImplementation(() => Promise.resolve("hash")),
|
|
21
21
|
relayMessagesBatch: jest
|
|
22
22
|
.fn()
|
|
23
23
|
.mockImplementation(() => Promise.resolve({ wait: jest.fn().mockImplementation(() => Promise.resolve()) })),
|
|
@@ -10,7 +10,7 @@ defaultSaveMessagesDto.poll = 0;
|
|
|
10
10
|
defaultSaveMessagesDto.messages = [
|
|
11
11
|
{
|
|
12
12
|
data: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
|
13
|
-
publicKey: keypair.
|
|
13
|
+
publicKey: keypair.publicKey.serialize(),
|
|
14
14
|
},
|
|
15
15
|
];
|
|
16
16
|
export const defaultSaveMessagesArgs = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../ts/message/__tests__/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAIrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,MAAM,CAAC,MAAM,eAAe,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;AAEjE,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,kBAAkB,EAAE,CAAC;AAC/D,sBAAsB,CAAC,mBAAmB,GAAG,WAAW,CAAC;AACzD,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAC;AAChC,sBAAsB,CAAC,QAAQ,GAAG;IAChC;QACE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACxD,SAAS,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../ts/message/__tests__/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAIrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,MAAM,CAAC,MAAM,eAAe,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;AAEjE,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,kBAAkB,EAAE,CAAC;AAC/D,sBAAsB,CAAC,mBAAmB,GAAG,WAAW,CAAC;AACzD,sBAAsB,CAAC,IAAI,GAAG,CAAC,CAAC;AAChC,sBAAsB,CAAC,QAAQ,GAAG;IAChC;QACE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;QACxD,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE;KACzC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAoB;IACtD,mBAAmB,EAAE,sBAAsB,CAAC,mBAAmB;IAC/D,IAAI,EAAE,sBAAsB,CAAC,IAAI;IACjC,QAAQ,EAAE;QACR;YACE,IAAI,EAAE,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;YAC7C,IAAI,EAAE,GAAG;YACT,SAAS,EAAE,sBAAsB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;SACxD;KACF;CACF,CAAC"}
|
|
@@ -4,7 +4,7 @@ describe("PublicKeyValidator", () => {
|
|
|
4
4
|
test("should validate valid public key", () => {
|
|
5
5
|
const keypair = new Keypair();
|
|
6
6
|
const validator = new PublicKeyValidator();
|
|
7
|
-
const result = validator.validate(keypair.
|
|
7
|
+
const result = validator.validate(keypair.publicKey.serialize());
|
|
8
8
|
expect(result).toBe(true);
|
|
9
9
|
});
|
|
10
10
|
test("should validate invalid public key", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.test.js","sourceRoot":"","sources":["../../../../ts/message/__tests__/validation.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC5C,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAE3C,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"validation.test.js","sourceRoot":"","sources":["../../../../ts/message/__tests__/validation.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAEpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC5C,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAE3C,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC;QAEjE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC9C,MAAM,SAAS,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAE3C,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE7C,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,wCAAwC,EAAE,GAAG,EAAE;QAClD,MAAM,SAAS,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAE3C,MAAM,MAAM,GAAG,SAAS,CAAC,cAAc,EAAE,CAAC;QAE1C,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -60,7 +60,7 @@ let MessageGuard = MessageGuard_1 = class MessageGuard {
|
|
|
60
60
|
: [];
|
|
61
61
|
const messageErrors = await Promise.all(map(messages, (message) => validate(Object.assign(new MessageContractParamsDto(), message)))).then((errors) => flatten(errors));
|
|
62
62
|
const dto = Object.assign(new PublishMessagesDto(), request.body);
|
|
63
|
-
const dtoErrors = await validate(dto);
|
|
63
|
+
const dtoErrors = await validate(dto, { forbidUnknownValues: false });
|
|
64
64
|
if (dtoErrors.length > 0 || messageErrors.length > 0) {
|
|
65
65
|
this.logger.warn("Invalid body: ", dtoErrors);
|
|
66
66
|
throw new HttpException({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.guard.js","sourceRoot":"","sources":["../../../ts/message/message.guard.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,aAAa,IAAI,WAAW,EAAE,aAAa,IAAI,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAChG,OAAO,EACL,MAAM,EAEN,UAAU,EACV,WAAW,EAGX,aAAa,EACb,UAAU,GACX,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,OAAO,MAAM,mBAAmB,CAAC;AACxC,OAAO,GAAG,MAAM,eAAe,CAAC;AAChC,OAAO,MAAM,MAAM,kBAAkB,CAAC;AAItC,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE9F;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,UAAU,CAAC;AAE9C;;;;GAIG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,GAAoB,EAAE,CAAC,WAAW,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;AAG7E,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAWM;IAV7B;;OAEG;IACc,MAAM,CAAS;IAEhC;;;;OAIG;IACH,YAA6B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;QAC/C,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,cAAY,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CAAC,GAAqB;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAU,mBAAmB,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC;QAEpF,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,OAAO,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAsD,CAAC;QAEpG,MAAM,QAAQ,GACZ,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,YAAY;YACnF,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ;YACvB,CAAC,CAAC,EAAE,CAAC;QAET,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,wBAAwB,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAC7F,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QAEpC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,kBAAkB,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"message.guard.js","sourceRoot":"","sources":["../../../ts/message/message.guard.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,11 +40,11 @@ export declare class Message {
|
|
|
40
40
|
/**
|
|
41
41
|
* Message schema
|
|
42
42
|
*/
|
|
43
|
-
export declare const MessageSchema: mongoose.Schema<Message, mongoose.Model<Message, any, any, any, mongoose.Document<unknown, any, Message> & Message & {
|
|
43
|
+
export declare const MessageSchema: mongoose.Schema<Message, mongoose.Model<Message, any, any, any, mongoose.Document<unknown, any, Message, any> & Message & {
|
|
44
44
|
_id: mongoose.Types.ObjectId;
|
|
45
45
|
} & {
|
|
46
46
|
__v: number;
|
|
47
|
-
}, any>, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, Message, mongoose.Document<unknown, {}, mongoose.FlatRecord<Message
|
|
47
|
+
}, any>, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, Message, mongoose.Document<unknown, {}, mongoose.FlatRecord<Message>, {}> & mongoose.FlatRecord<Message> & {
|
|
48
48
|
_id: mongoose.Types.ObjectId;
|
|
49
49
|
} & {
|
|
50
50
|
__v: number;
|
|
@@ -8,7 +8,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
10
|
var MessageService_1;
|
|
11
|
-
import {
|
|
11
|
+
import { PublicKey } from "@maci-protocol/domainobjs";
|
|
12
12
|
import { getDefaultSigner, MACI__factory as MACIFactory, Poll__factory as PollFactory } from "@maci-protocol/sdk";
|
|
13
13
|
import { Injectable, Logger } from "@nestjs/common";
|
|
14
14
|
import { Cron, CronExpression } from "@nestjs/schedule";
|
|
@@ -45,7 +45,7 @@ let MessageService = MessageService_1 = class MessageService {
|
|
|
45
45
|
const maciContract = MACIFactory.connect(args.maciContractAddress, signer);
|
|
46
46
|
const pollAddresses = await maciContract.polls(args.poll);
|
|
47
47
|
const pollContract = PollFactory.connect(pollAddresses.poll, signer);
|
|
48
|
-
const hashes = await Promise.all(args.messages.map(({ data, publicKey }) => pollContract.
|
|
48
|
+
const hashes = await Promise.all(args.messages.map(({ data, publicKey }) => pollContract.hashMessageAndPublicKey({ data }, PublicKey.deserialize(publicKey).asContractParam())));
|
|
49
49
|
const messages = args.messages.map((message, index) => ({ ...message, hash: hashes[index].toString() }));
|
|
50
50
|
return this.messageRepository.create({ ...args, messages }).catch((error) => {
|
|
51
51
|
this.logger.error(`Save messages error:`, error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.service.js","sourceRoot":"","sources":["../../../ts/message/message.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"message.service.js","sourceRoot":"","sources":["../../../ts/message/message.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
4
4
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
6
|
};
|
|
7
|
-
import {
|
|
7
|
+
import { PublicKey } from "@maci-protocol/domainobjs";
|
|
8
8
|
import { ValidatorConstraint } from "class-validator";
|
|
9
9
|
/**
|
|
10
10
|
* Validate public key
|
|
@@ -18,8 +18,8 @@ let PublicKeyValidator = class PublicKeyValidator {
|
|
|
18
18
|
*/
|
|
19
19
|
validate(text) {
|
|
20
20
|
try {
|
|
21
|
-
const [x, y] =
|
|
22
|
-
return Boolean(new
|
|
21
|
+
const [x, y] = PublicKey.deserialize(text).asArray();
|
|
22
|
+
return Boolean(new PublicKey([x, y]));
|
|
23
23
|
}
|
|
24
24
|
catch (error) {
|
|
25
25
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../ts/message/validation.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../ts/message/validation.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,mBAAmB,EAAgC,MAAM,iBAAiB,CAAC;AAEpF;;GAEG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B;;;;;OAKG;IACH,QAAQ,CAAC,IAAY;QACnB,IAAI,CAAC;YACH,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;YACrD,OAAO,OAAO,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,cAAc;QACZ,OAAO,uBAAuB,CAAC;IACjC,CAAC;CACF,CAAA;AAxBY,kBAAkB;IAD9B,mBAAmB,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;GAC5C,kBAAkB,CAwB9B"}
|
|
@@ -8,7 +8,7 @@ const defaultMessageBatch = new MessageBatchDto();
|
|
|
8
8
|
const defaultMessage = new Message();
|
|
9
9
|
defaultMessage.data = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
|
|
10
10
|
defaultMessage.hash = "0";
|
|
11
|
-
defaultMessage.publicKey = keypair.
|
|
11
|
+
defaultMessage.publicKey = keypair.publicKey.serialize();
|
|
12
12
|
defaultMessage.maciContractAddress = ZeroAddress;
|
|
13
13
|
defaultMessage.poll = 0;
|
|
14
14
|
defaultMessageBatch.messages = [defaultMessage];
|
|
@@ -20,5 +20,5 @@ defaultGetMessageBatchesDto.maciContractAddress = ZeroAddress;
|
|
|
20
20
|
defaultGetMessageBatchesDto.poll = 0;
|
|
21
21
|
defaultGetMessageBatchesDto.ipfsHashes = [defaultIpfsHash];
|
|
22
22
|
defaultGetMessageBatchesDto.messageHashes = ["0"];
|
|
23
|
-
defaultGetMessageBatchesDto.publicKeys = [keypair.
|
|
23
|
+
defaultGetMessageBatchesDto.publicKeys = [keypair.publicKey.serialize()];
|
|
24
24
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../ts/messageBatch/__tests__/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE7F,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,MAAM,CAAC,MAAM,eAAe,GAAG,gDAAgD,CAAC;AAEhF,MAAM,mBAAmB,GAAG,IAAI,eAAe,EAAE,CAAC;AAClD,MAAM,cAAc,GAAG,IAAI,OAAO,EAAE,CAAC;AACrC,cAAc,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AACzE,cAAc,CAAC,IAAI,GAAG,GAAG,CAAC;AAC1B,cAAc,CAAC,SAAS,GAAG,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../ts/messageBatch/__tests__/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE7F,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,MAAM,CAAC,MAAM,eAAe,GAAG,gDAAgD,CAAC;AAEhF,MAAM,mBAAmB,GAAG,IAAI,eAAe,EAAE,CAAC;AAClD,MAAM,cAAc,GAAG,IAAI,OAAO,EAAE,CAAC;AACrC,cAAc,CAAC,IAAI,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AACzE,cAAc,CAAC,IAAI,GAAG,GAAG,CAAC;AAC1B,cAAc,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;AACzD,cAAc,CAAC,mBAAmB,GAAG,WAAW,CAAC;AACjD,cAAc,CAAC,IAAI,GAAG,CAAC,CAAC;AACxB,mBAAmB,CAAC,QAAQ,GAAG,CAAC,cAAc,CAAC,CAAC;AAChD,mBAAmB,CAAC,QAAQ,GAAG,eAAe,CAAC;AAE/C,MAAM,CAAC,MAAM,qBAAqB,GAAsB,CAAC,mBAAmB,CAAC,CAAC;AAE9E,MAAM,CAAC,MAAM,2BAA2B,GAAG,IAAI,oBAAoB,EAAE,CAAC;AACtE,2BAA2B,CAAC,KAAK,GAAG,YAAY,CAAC;AACjD,2BAA2B,CAAC,mBAAmB,GAAG,WAAW,CAAC;AAC9D,2BAA2B,CAAC,IAAI,GAAG,CAAC,CAAC;AACrC,2BAA2B,CAAC,UAAU,GAAG,CAAC,eAAe,CAAC,CAAC;AAC3D,2BAA2B,CAAC,aAAa,GAAG,CAAC,GAAG,CAAC,CAAC;AAClD,2BAA2B,CAAC,UAAU,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC,CAAC"}
|