@maci-protocol/relayer 0.0.0-ci.2a2b6ab → 0.0.0-ci.2cc4cdc

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.
@@ -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 pollWitgen: string;
12
+ export declare const pollWitnessGenerator: string;
13
13
  export declare const pollJoinedWasm: string;
14
- export declare const pollJoinedWitgen: string;
14
+ export declare const pollJoinedWitnessGenerator: string;
15
15
  export declare const rapidsnark: string;
16
- export declare const processMessagesZkeyPathNonQv: string;
17
- export declare const tallyVotesZkeyPathNonQv: string;
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,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,UAAU,QAGtB,CAAC;AACF,eAAO,MAAM,cAAc,QAG1B,CAAC;AACF,eAAO,MAAM,gBAAgB,QAG5B,CAAC;AACF,eAAO,MAAM,UAAU,QAAyC,CAAC;AACjE,eAAO,MAAM,4BAA4B,QAGxC,CAAC;AACF,eAAO,MAAM,uBAAuB,QAGnC,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC"}
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"}
@@ -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 pollWitgen = path.resolve(dirname, "../zkeys/PollJoining_10_test/PollJoining_10_test_cpp/PollJoining_10_test");
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 pollJoinedWitgen = path.resolve(dirname, "../zkeys/PollJoined_10_test/PollJoined_10_test_cpp/PollJoined_10_test");
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 processMessagesZkeyPathNonQv = path.resolve(dirname, "../zkeys/ProcessMessagesNonQv_10-20-2_test/ProcessMessagesNonQv_10-20-2_test.0.zkey");
19
- export const tallyVotesZkeyPathNonQv = path.resolve(dirname, "../zkeys/TallyVotesNonQv_10-1-2_test/TallyVotesNonQv_10-1-2_test.0.zkey");
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,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,UAAU,GAAG,IAAI,CAAC,OAAO,CACpC,OAAO,EACP,0EAA0E,CAC3E,CAAC;AACF,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CACxC,OAAO,EACP,2EAA2E,CAC5E,CAAC;AACF,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAC1C,OAAO,EACP,uEAAuE,CACxE,CAAC;AACF,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,OAAO,EAAE,0BAA0B,CAAC;AACjE,MAAM,CAAC,MAAM,4BAA4B,GAAG,IAAI,CAAC,OAAO,CACtD,OAAO,EACP,qFAAqF,CACtF,CAAC;AACF,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,CAAC,OAAO,CACjD,OAAO,EACP,yEAAyE,CAC1E,CAAC"}
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"}
@@ -6,7 +6,7 @@ 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, pollWitgen, processMessagesZkeyPathNonQv, rapidsnark, tallyVotesZkeyPathNonQv, } from "./constants.js";
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,10 +17,10 @@ describe("Integration message batches", () => {
17
17
  const testDeploy = await TestingClass.getInstance({
18
18
  pollJoiningZkeyPath: pollJoiningZkey,
19
19
  pollJoinedZkeyPath: pollJoinedZkey,
20
- processMessagesZkeyPath: processMessagesZkeyPathNonQv,
21
- tallyVotesZkeyPath: tallyVotesZkeyPathNonQv,
20
+ messageProcessorZkeyPath: messageProcessorZkeyPathNonQv,
21
+ voteTallyZkeyPath: voteTallyZkeyPathNonQv,
22
22
  pollWasm,
23
- pollWitgen,
23
+ pollWitnessGenerator,
24
24
  rapidsnark,
25
25
  });
26
26
  const poll = testDeploy.contractsData.maciState.polls.get(0n);
@@ -1 +1 @@
1
- {"version":3,"file":"messageBatches.test.js","sourceRoot":"","sources":["../../tests/messageBatches.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"messageBatches.test.js","sourceRoot":"","sources":["../../tests/messageBatches.test.ts"],"names":[],"mappings":"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"}
@@ -6,7 +6,7 @@ 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, tallyVotesZkeyPathNonQv, pollJoiningZkey, processMessagesZkeyPathNonQv, pollWitgen, rapidsnark, } from "./constants.js";
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,10 +18,10 @@ describe("Integration messages", () => {
18
18
  const testDeploy = await TestingClass.getInstance({
19
19
  pollJoiningZkeyPath: pollJoiningZkey,
20
20
  pollJoinedZkeyPath: pollJoinedZkey,
21
- processMessagesZkeyPath: processMessagesZkeyPathNonQv,
22
- tallyVotesZkeyPath: tallyVotesZkeyPathNonQv,
21
+ messageProcessorZkeyPath: messageProcessorZkeyPathNonQv,
22
+ voteTallyZkeyPath: voteTallyZkeyPathNonQv,
23
23
  pollWasm,
24
- pollWitgen,
24
+ pollWitnessGenerator,
25
25
  rapidsnark,
26
26
  });
27
27
  const poll = testDeploy.contractsData.maciState.polls.get(0n);
@@ -1 +1 @@
1
- {"version":3,"file":"messages.test.js","sourceRoot":"","sources":["../../tests/messages.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"messages.test.js","sourceRoot":"","sources":["../../tests/messages.test.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@ 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, tallyVotesZkeyPathNonQv, pollJoiningZkey, processMessagesZkeyPathNonQv, pollWitgen, rapidsnark, } from "./constants.js";
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,10 +20,10 @@ describe("Integration message publishing", () => {
20
20
  const testDeploy = await TestingClass.getInstance({
21
21
  pollJoiningZkeyPath: pollJoiningZkey,
22
22
  pollJoinedZkeyPath: pollJoinedZkey,
23
- processMessagesZkeyPath: processMessagesZkeyPathNonQv,
24
- tallyVotesZkeyPath: tallyVotesZkeyPathNonQv,
23
+ messageProcessorZkeyPath: messageProcessorZkeyPathNonQv,
24
+ voteTallyZkeyPath: voteTallyZkeyPathNonQv,
25
25
  pollWasm,
26
- pollWitgen,
26
+ pollWitnessGenerator,
27
27
  rapidsnark,
28
28
  });
29
29
  const poll = testDeploy.contractsData.maciState.polls.get(0n);
@@ -1 +1 @@
1
- {"version":3,"file":"onchain.test.js","sourceRoot":"","sources":["../../tests/onchain.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"onchain.test.js","sourceRoot":"","sources":["../../tests/onchain.test.ts"],"names":[],"mappings":"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"}