@maci-protocol/relayer 0.0.0-ci.044d30d → 0.0.0-ci.0bef05d
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/build/tests/messageBatches.test.js +6 -6
- package/build/tests/messageBatches.test.js.map +1 -1
- package/build/tests/messages.test.js +7 -7
- package/build/tests/messages.test.js.map +1 -1
- package/build/tests/onchain.test.js +5 -5
- 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.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.service.js +2 -2
- package/build/ts/messageBatch/messageBatch.service.js.map +1 -1
- package/build/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +18 -18
|
@@ -1,6 +1,6 @@
|
|
|
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";
|
|
@@ -24,7 +24,7 @@ describe("Integration message batches", () => {
|
|
|
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,11 +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
40
|
});
|
|
41
|
-
const { proof } = await
|
|
41
|
+
const { proof } = await generateProofSnarkjs({
|
|
42
42
|
inputs: circuitInputs,
|
|
43
43
|
zkeyPath: pollJoinedZkey,
|
|
44
44
|
wasmPath: pollJoinedWasm,
|
|
@@ -50,7 +50,7 @@ describe("Integration message batches", () => {
|
|
|
50
50
|
messages: [
|
|
51
51
|
{
|
|
52
52
|
data: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
|
53
|
-
publicKey: keypair.
|
|
53
|
+
publicKey: keypair.publicKey.serialize(),
|
|
54
54
|
},
|
|
55
55
|
],
|
|
56
56
|
poll: 0,
|
|
@@ -98,7 +98,7 @@ describe("Integration message batches", () => {
|
|
|
98
98
|
skip: 0,
|
|
99
99
|
poll: 0,
|
|
100
100
|
maciContractAddress,
|
|
101
|
-
publicKeys: [user.keypair.
|
|
101
|
+
publicKeys: [user.keypair.publicKey.serialize()],
|
|
102
102
|
})
|
|
103
103
|
.expect(HttpStatus.OK);
|
|
104
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,6 +1,6 @@
|
|
|
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";
|
|
@@ -25,12 +25,12 @@ describe("Integration messages", () => {
|
|
|
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
36
|
});
|
|
@@ -54,7 +54,7 @@ describe("Integration messages", () => {
|
|
|
54
54
|
messages: [
|
|
55
55
|
{
|
|
56
56
|
data: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
|
57
|
-
publicKey: keypair.
|
|
57
|
+
publicKey: keypair.publicKey.serialize(),
|
|
58
58
|
},
|
|
59
59
|
],
|
|
60
60
|
};
|
|
@@ -76,7 +76,7 @@ describe("Integration messages", () => {
|
|
|
76
76
|
});
|
|
77
77
|
});
|
|
78
78
|
test("should throw an error if dto is invalid", async () => {
|
|
79
|
-
const { proof } = await
|
|
79
|
+
const { proof } = await generateProofSnarkjs({
|
|
80
80
|
inputs: circuitInputs,
|
|
81
81
|
zkeyPath: pollJoinedZkey,
|
|
82
82
|
wasmPath: pollJoinedWasm,
|
|
@@ -103,7 +103,7 @@ describe("Integration messages", () => {
|
|
|
103
103
|
});
|
|
104
104
|
});
|
|
105
105
|
test("should throw an error if messages dto is invalid", async () => {
|
|
106
|
-
const { proof } = await
|
|
106
|
+
const { proof } = await generateProofSnarkjs({
|
|
107
107
|
inputs: circuitInputs,
|
|
108
108
|
zkeyPath: pollJoinedZkey,
|
|
109
109
|
wasmPath: pollJoinedWasm,
|
|
@@ -125,7 +125,7 @@ describe("Integration messages", () => {
|
|
|
125
125
|
});
|
|
126
126
|
});
|
|
127
127
|
test("should publish user messages properly", async () => {
|
|
128
|
-
const { proof } = await
|
|
128
|
+
const { proof } = await generateProofSnarkjs({
|
|
129
129
|
inputs: circuitInputs,
|
|
130
130
|
zkeyPath: pollJoinedZkey,
|
|
131
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":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,8BAA8B,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,cAAc,EAAyB,MAAM,gBAAgB,CAAC;AACnF,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,OAAO,MAAM,WAAW,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EACL,cAAc,EACd,cAAc,EACd,QAAQ,EAER,uBAAuB,EACvB,eAAe,EACf,4BAA4B,EAC5B,UAAU,EACV,UAAU,GACX,MAAM,gBAAgB,CAAC;AAExB,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAElC,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,IAAI,GAA2B,CAAC;IAChC,IAAI,aAAqC,CAAC;IAC1C,IAAI,cAAsB,CAAC;IAC3B,IAAI,mBAA2B,CAAC;IAEhC,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC;YAChD,mBAAmB,EAAE,eAAe;YACpC,kBAAkB,EAAE,cAAc;YAClC,uBAAuB,EAAE,4BAA4B;YACrD,kBAAkB,EAAE,uBAAuB;YAC3C,QAAQ;YACR,UAAU;YACV,UAAU;SACX,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,UAAU,CAAC,aAAa,CAAC,SAAU,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAE/D,IAAK,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,SAAU,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAEhF,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,aAAa,CAAC,KAAM,CAAC;QAE/C,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAE7C,mBAAmB,GAAG,UAAU,CAAC,aAAa,CAAC,mBAAoB,CAAC;QAEpE,aAAa,GAAG,IAAK,CAAC,mBAAmB,CAAC;YACxC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;YACvC,cAAc,EAAE,IAAI,CAAC,cAAe;YACpC,mBAAmB,EAAE,IAAI,CAAC,kBAAkB;SAC7C,CAAoC,CAAC;QAEtC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC;YACnD,OAAO,EAAE,CAAC,SAAS,CAAC;SACrB,CAAC,CAAC,OAAO,EAAE,CAAC;QAEb,GAAG,GAAG,aAAa,CAAC,qBAAqB,EAAE,CAAC;QAC5C,GAAG,CAAC,cAAc,CAAC,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,KAAK,IAAI,EAAE;QAClB,YAAY,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;QACpC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QAE9B,MAAM,uBAAuB,GAAG;YAC9B,mBAAmB;YACnB,IAAI,EAAE,CAAC;YACP,cAAc;YACd,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,OAAO,CAAC,SAAS,CAAC,SAAS,EAAE;iBACzC;aACF;SACF,CAAC;QAEF,IAAI,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAClE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;iBAC9C,IAAI,CAAC,sBAAsB,CAAC;iBAC5B,IAAI,CAAC;gBACJ,GAAG,uBAAuB;gBAC1B,mBAAmB;gBACnB,cAAc;gBACd,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;aAChD,CAAC;iBACD,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YAEhC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC;gBAChC,KAAK,EAAE,WAAW;gBAClB,UAAU,EAAE,UAAU,CAAC,SAAS;gBAChC,OAAO,EAAE,oBAAoB;aAC9B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YACzD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,oBAAoB,CAAC;gBAC3C,MAAM,EAAE,aAAa;gBACrB,QAAQ,EAAE,cAAc;gBACxB,QAAQ,EAAE,cAAc;aACzB,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;iBAC9C,IAAI,CAAC,sBAAsB,CAAC;iBAC5B,IAAI,CAAC;gBACJ,cAAc;gBACd,KAAK,EAAE,8BAA8B,CAAC,KAAK,CAAC;gBAC5C,mBAAmB,EAAE,SAAS;gBAC9B,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,EAAE;aACb,CAAC;iBACD,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAElC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC;gBAChC,KAAK,EAAE,aAAa;gBACpB,UAAU,EAAE,UAAU,CAAC,WAAW;gBAClC,OAAO,EAAE;oBACP,8BAA8B;oBAC9B,gCAAgC;oBAChC,iDAAiD;oBACjD,2CAA2C;iBAC5C;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAClE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,oBAAoB,CAAC;gBAC3C,MAAM,EAAE,aAAa;gBACrB,QAAQ,EAAE,cAAc;gBACxB,QAAQ,EAAE,cAAc;aACzB,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;iBAC9C,IAAI,CAAC,sBAAsB,CAAC;iBAC5B,IAAI,CAAC;gBACJ,GAAG,uBAAuB;gBAC1B,mBAAmB;gBACnB,cAAc;gBACd,KAAK,EAAE,8BAA8B,CAAC,KAAK,CAAC;gBAC5C,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;aAC/C,CAAC;iBACD,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAElC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC;gBAChC,KAAK,EAAE,aAAa;gBACpB,UAAU,EAAE,UAAU,CAAC,WAAW;gBAClC,OAAO,EAAE,CAAC,mDAAmD,EAAE,kCAAkC,CAAC;aACnG,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,oBAAoB,CAAC;gBAC3C,MAAM,EAAE,aAAa;gBACrB,QAAQ,EAAE,cAAc;gBACxB,QAAQ,EAAE,cAAc;aACzB,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;iBAC9C,IAAI,CAAC,sBAAsB,CAAC;iBAC5B,IAAI,CAAC;gBACJ,GAAG,uBAAuB;gBAC1B,mBAAmB;gBACnB,cAAc;gBACd,KAAK,EAAE,8BAA8B,CAAC,KAAK,CAAC;aAC7C,CAAC;iBACD,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAE9B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
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";
|
|
@@ -27,12 +27,12 @@ describe("Integration message publishing", () => {
|
|
|
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
38
|
});
|
|
@@ -58,11 +58,11 @@ describe("Integration message publishing", () => {
|
|
|
58
58
|
messages: [
|
|
59
59
|
{
|
|
60
60
|
data: ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"],
|
|
61
|
-
publicKey: keypair.
|
|
61
|
+
publicKey: keypair.publicKey.serialize(),
|
|
62
62
|
},
|
|
63
63
|
],
|
|
64
64
|
};
|
|
65
|
-
const { proof } = await
|
|
65
|
+
const { proof } = await generateProofSnarkjs({
|
|
66
66
|
inputs: circuitInputs,
|
|
67
67
|
zkeyPath: pollJoinedZkey,
|
|
68
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"}
|
|
@@ -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"}
|
|
@@ -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 MessageBatchService_1;
|
|
11
|
-
import {
|
|
11
|
+
import { PublicKey } from "@maci-protocol/domainobjs";
|
|
12
12
|
import { Injectable, Logger } from "@nestjs/common";
|
|
13
13
|
import { validate } from "class-validator";
|
|
14
14
|
import flatten from "lodash/flatten.js";
|
|
@@ -69,7 +69,7 @@ let MessageBatchService = MessageBatchService_1 = class MessageBatchService {
|
|
|
69
69
|
data: message.data,
|
|
70
70
|
hash: message.hash,
|
|
71
71
|
maciAddress: message.maciContractAddress,
|
|
72
|
-
publicKey:
|
|
72
|
+
publicKey: PublicKey.deserialize(message.publicKey).asArray().map(String),
|
|
73
73
|
}));
|
|
74
74
|
const ipfsHash = await this.ipfsService.add(allMessages).catch((error) => {
|
|
75
75
|
this.logger.error(`Upload message batches to ipfs error:`, error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"messageBatch.service.js","sourceRoot":"","sources":["../../../ts/messageBatch/messageBatch.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"messageBatch.service.js","sourceRoot":"","sources":["../../../ts/messageBatch/messageBatch.service.ts"],"names":[],"mappings":"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"}
|