@maci-protocol/relayer 0.0.0-ci.fb960ed → 0.0.0-ci.fc91dc9
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/messageBatches.test.js +3 -3
- package/build/tests/messageBatches.test.js.map +1 -1
- package/build/tests/messages.test.js +5 -5
- package/build/tests/messages.test.js.map +1 -1
- package/build/tests/onchain.test.js +3 -3
- package/build/tests/onchain.test.js.map +1 -1
- package/build/ts/message/__tests__/message.service.test.js +1 -1
- package/build/ts/message/message.schema.d.ts +2 -2
- package/build/ts/message/message.service.js +1 -1
- package/build/ts/messageBatch/messageBatch.schema.d.ts +2 -2
- package/build/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +12 -12
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 { 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({
|
|
@@ -38,7 +38,7 @@ describe("Integration message batches", () => {
|
|
|
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,
|
|
@@ -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,7 +25,7 @@ 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;
|
|
@@ -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":"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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, 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,7 +27,7 @@ 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;
|
|
@@ -62,7 +62,7 @@ describe("Integration message publishing", () => {
|
|
|
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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"}
|
|
@@ -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()) })),
|
|
@@ -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;
|
|
@@ -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);
|
|
@@ -24,11 +24,11 @@ export declare class MessageBatch {
|
|
|
24
24
|
/**
|
|
25
25
|
* Message batch schema
|
|
26
26
|
*/
|
|
27
|
-
export declare const MessageBatchSchema: mongoose.Schema<MessageBatch, mongoose.Model<MessageBatch, any, any, any, mongoose.Document<unknown, any, MessageBatch> & MessageBatch & {
|
|
27
|
+
export declare const MessageBatchSchema: mongoose.Schema<MessageBatch, mongoose.Model<MessageBatch, any, any, any, mongoose.Document<unknown, any, MessageBatch, any> & MessageBatch & {
|
|
28
28
|
_id: mongoose.Types.ObjectId;
|
|
29
29
|
} & {
|
|
30
30
|
__v: number;
|
|
31
|
-
}, any>, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, MessageBatch, mongoose.Document<unknown, {}, mongoose.FlatRecord<MessageBatch
|
|
31
|
+
}, any>, {}, {}, {}, {}, mongoose.DefaultSchemaOptions, MessageBatch, mongoose.Document<unknown, {}, mongoose.FlatRecord<MessageBatch>, {}> & mongoose.FlatRecord<MessageBatch> & {
|
|
32
32
|
_id: mongoose.Types.ObjectId;
|
|
33
33
|
} & {
|
|
34
34
|
__v: number;
|