@maci-protocol/coordinator 0.0.0-ci.4e43951 → 0.0.0-ci.50675b0

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.
Files changed (41) hide show
  1. package/build/scripts/generateKeypair.js +2 -2
  2. package/build/scripts/generateKeypair.js.map +1 -1
  3. package/build/tests/e2e.deploy.test.js +20 -17
  4. package/build/tests/e2e.deploy.test.js.map +1 -1
  5. package/build/tests/utils.d.ts.map +1 -1
  6. package/build/tests/utils.js.map +1 -1
  7. package/build/ts/common/__tests__/common.test.js +1 -11
  8. package/build/ts/common/__tests__/common.test.js.map +1 -1
  9. package/build/ts/common/chain.d.ts.map +1 -1
  10. package/build/ts/common/chain.js +3 -1
  11. package/build/ts/common/chain.js.map +1 -1
  12. package/build/ts/deployer/__tests__/deployer.controller.test.js +7 -7
  13. package/build/ts/deployer/__tests__/deployer.controller.test.js.map +1 -1
  14. package/build/ts/deployer/__tests__/deployer.service.test.js +54 -8
  15. package/build/ts/deployer/__tests__/deployer.service.test.js.map +1 -1
  16. package/build/ts/deployer/__tests__/utils.d.ts +0 -1
  17. package/build/ts/deployer/__tests__/utils.d.ts.map +1 -1
  18. package/build/ts/deployer/__tests__/utils.js +1 -2
  19. package/build/ts/deployer/__tests__/utils.js.map +1 -1
  20. package/build/ts/deployer/deployer.service.d.ts +4 -5
  21. package/build/ts/deployer/deployer.service.d.ts.map +1 -1
  22. package/build/ts/deployer/deployer.service.js +155 -38
  23. package/build/ts/deployer/deployer.service.js.map +1 -1
  24. package/build/ts/deployer/types.d.ts +15 -9
  25. package/build/ts/deployer/types.d.ts.map +1 -1
  26. package/build/ts/proof/__tests__/proof.service.test.js +28 -54
  27. package/build/ts/proof/__tests__/proof.service.test.js.map +1 -1
  28. package/build/ts/sessionKeys/__tests__/sessionKeys.controller.test.js +2 -2
  29. package/build/ts/sessionKeys/__tests__/sessionKeys.controller.test.js.map +1 -1
  30. package/build/ts/subgraph/__tests__/subgraph.service.test.js +2 -3
  31. package/build/ts/subgraph/__tests__/subgraph.service.test.js.map +1 -1
  32. package/build/ts/subgraph/subgraph.service.d.ts +4 -0
  33. package/build/ts/subgraph/subgraph.service.d.ts.map +1 -1
  34. package/build/ts/subgraph/subgraph.service.js +16 -5
  35. package/build/ts/subgraph/subgraph.service.js.map +1 -1
  36. package/build/tsconfig.build.tsbuildinfo +1 -1
  37. package/package.json +16 -16
  38. package/build/tests/e2e.aa.test.d.ts +0 -2
  39. package/build/tests/e2e.aa.test.d.ts.map +0 -1
  40. package/build/tests/e2e.aa.test.js +0 -96
  41. package/build/tests/e2e.aa.test.js.map +0 -1
@@ -7,11 +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 { deployVerifier } from "@maci-protocol/contracts";
11
- import { ContractStorage, EPolicies, VerifyingKeysRegistry__factory as VerifyingKeysRegistryFactory, MessageProcessor__factory as MessageProcessorFactory, Tally__factory as TallyFactory, Poll__factory as PollFactory, MACI__factory as MACIFactory, EContracts, EInitialVoiceCreditProxies, EMode, deployPoll, extractAllVerifyingKeys, deployConstantInitialVoiceCreditProxy, deployFreeForAllSignUpPolicy, deployERC20VotesPolicy, deployAnonAadhaarPolicy, deploySignupTokenPolicy, deployMerkleProofPolicy, deploySemaphoreSignupPolicy, deployZupassSignUpPolicy, deployGitcoinPassportPolicy, deployEASSignUpPolicy, deployHatsSignupPolicy, deployMaci, setVerifyingKeys, deployVerifyingKeysRegistryContract, generateEmptyBallotRoots, } from "@maci-protocol/sdk";
10
+ import { ContractStorage, EPolicies, VerifyingKeysRegistry__factory as VerifyingKeysRegistryFactory, MessageProcessor__factory as MessageProcessorFactory, Tally__factory as TallyFactory, Poll__factory as PollFactory, MACI__factory as MACIFactory, EContracts, EInitialVoiceCreditProxies, EMode, deployPoll, extractAllVerifyingKeys, deployConstantInitialVoiceCreditProxy, deployFreeForAllSignUpPolicy, deployERC20VotesPolicy, deployAnonAadhaarPolicy, deploySignupTokenPolicy, deployMerkleProofPolicy, deploySemaphoreSignupPolicy, deployZupassSignUpPolicy, deployGitcoinPassportPolicy, deployEASSignUpPolicy, deployHatsSignupPolicy, deployMaci, setVerifyingKeys, deployVerifyingKeysRegistryContract, generateEmptyBallotRoots, getDeployedPolicyProxyFactories, deployVerifier, ECheckerFactories, EPolicyFactories, } from "@maci-protocol/sdk";
12
11
  import { Injectable } from "@nestjs/common";
13
12
  import { BaseContract } from "ethers";
14
- import path from "path";
15
13
  import { ErrorCodes } from "../common";
16
14
  import { getCoordinatorKeypair } from "../common/coordinatorKeypair";
17
15
  import { FileService } from "../file/file.service";
@@ -34,101 +32,224 @@ let DeployerService = class DeployerService {
34
32
  constructor(sessionKeysService, fileService) {
35
33
  this.sessionKeysService = sessionKeysService;
36
34
  this.fileService = fileService;
37
- this.storage = ContractStorage.getInstance(path.join(process.cwd(), "deployed-contracts.json"));
35
+ this.storage = ContractStorage.getInstance();
38
36
  }
39
37
  /**
40
38
  * Get the policy contract object
41
39
  * always deploy and save it
42
40
  *
43
41
  * @param signer - the signer
44
- * @param policyType - the policy type
45
42
  * @param network - the network
46
- * @param args - the policy args
43
+ * @param policyConfig - the policy configuration parameters
47
44
  * @returns - the policy contract
48
45
  */
49
- async deployAndSavePolicy(signer, policyType, network, args) {
50
- let contract;
46
+ async deployAndSavePolicy(signer, network, policyConfig) {
47
+ let policyContract;
48
+ let policyFactory;
49
+ let checkFactory;
50
+ let policyFactoryName;
51
+ let checkFactoryName;
52
+ let factoryIsSaved;
53
+ let checkerIsSaved;
54
+ const { type, args } = policyConfig;
51
55
  // based on the policy type, we need to deploy the correct policy
52
- switch (policyType) {
56
+ switch (type) {
53
57
  case EPolicies.FreeForAll: {
54
- [contract] = await deployFreeForAllSignUpPolicy({}, signer, true);
58
+ policyFactoryName = EPolicyFactories.FreeForAll;
59
+ checkFactoryName = ECheckerFactories.FreeForAll;
60
+ const factories = await getDeployedPolicyProxyFactories({
61
+ policy: policyFactoryName,
62
+ checker: checkFactoryName,
63
+ network,
64
+ signer,
65
+ });
66
+ factoryIsSaved = !!factories.policy;
67
+ checkerIsSaved = !!factories.checker;
68
+ [policyContract, , policyFactory, checkFactory] = await deployFreeForAllSignUpPolicy(factories, signer, true);
55
69
  break;
56
70
  }
57
71
  case EPolicies.EAS: {
58
- [contract] = await deployEASSignUpPolicy({
72
+ policyFactoryName = EPolicyFactories.EAS;
73
+ checkFactoryName = ECheckerFactories.EAS;
74
+ const factories = await getDeployedPolicyProxyFactories({
75
+ policy: policyFactoryName,
76
+ checker: checkFactoryName,
77
+ network,
78
+ signer,
79
+ });
80
+ factoryIsSaved = !!factories.policy;
81
+ checkerIsSaved = !!factories.checker;
82
+ [policyContract, , policyFactory, checkFactory] = await deployEASSignUpPolicy({
59
83
  eas: args.easAddress,
60
84
  attester: args.attester,
61
85
  schema: args.schema,
62
- }, {}, signer, true);
86
+ }, factories, signer, true);
63
87
  break;
64
88
  }
65
89
  case EPolicies.GitcoinPassport: {
66
- [contract] = await deployGitcoinPassportPolicy({
90
+ policyFactoryName = EPolicyFactories.GitcoinPassport;
91
+ checkFactoryName = ECheckerFactories.GitcoinPassport;
92
+ const factories = await getDeployedPolicyProxyFactories({
93
+ policy: policyFactoryName,
94
+ checker: checkFactoryName,
95
+ network,
96
+ signer,
97
+ });
98
+ factoryIsSaved = !!factories.policy;
99
+ checkerIsSaved = !!factories.checker;
100
+ [policyContract, , policyFactory, checkFactory] = await deployGitcoinPassportPolicy({
67
101
  decoderAddress: args.decoderAddress,
68
102
  minimumScore: Number(args.passingScore),
69
- }, {}, signer, true);
103
+ }, factories, signer, true);
70
104
  break;
71
105
  }
72
106
  case EPolicies.Hats: {
73
- [contract] = await deployHatsSignupPolicy({
107
+ policyFactoryName = EPolicyFactories.Hats;
108
+ checkFactoryName = ECheckerFactories.Hats;
109
+ const factories = await getDeployedPolicyProxyFactories({
110
+ policy: policyFactoryName,
111
+ checker: checkFactoryName,
112
+ network,
113
+ signer,
114
+ });
115
+ factoryIsSaved = !!factories.policy;
116
+ checkerIsSaved = !!factories.checker;
117
+ [policyContract, , policyFactory, checkFactory] = await deployHatsSignupPolicy({
74
118
  hats: args.hatsProtocolAddress,
75
119
  criterionHats: args.critrionHats.map((c) => BigInt(c)),
76
- }, {}, signer, true);
120
+ }, factories, signer, true);
77
121
  break;
78
122
  }
79
123
  case EPolicies.Zupass: {
80
- [contract] = await deployZupassSignUpPolicy({
124
+ policyFactoryName = EPolicyFactories.Zupass;
125
+ checkFactoryName = ECheckerFactories.Zupass;
126
+ const factories = await getDeployedPolicyProxyFactories({
127
+ policy: policyFactoryName,
128
+ checker: checkFactoryName,
129
+ network,
130
+ signer,
131
+ });
132
+ factoryIsSaved = !!factories.policy;
133
+ checkerIsSaved = !!factories.checker;
134
+ [policyContract, , policyFactory, checkFactory] = await deployZupassSignUpPolicy({
81
135
  eventId: args.eventId,
82
136
  signer1: args.signer1,
83
137
  signer2: args.signer2,
84
138
  verifier: args.zupassVerifier,
85
- }, {}, signer, true);
139
+ }, factories, signer, true);
86
140
  break;
87
141
  }
88
142
  case EPolicies.Semaphore: {
89
- [contract] = await deploySemaphoreSignupPolicy({
143
+ policyFactoryName = EPolicyFactories.Semaphore;
144
+ checkFactoryName = ECheckerFactories.Semaphore;
145
+ const factories = await getDeployedPolicyProxyFactories({
146
+ policy: policyFactoryName,
147
+ checker: checkFactoryName,
148
+ network,
149
+ signer,
150
+ });
151
+ factoryIsSaved = !!factories.policy;
152
+ checkerIsSaved = !!factories.checker;
153
+ [policyContract, , policyFactory, checkFactory] = await deploySemaphoreSignupPolicy({
90
154
  semaphore: args.semaphoreContract,
91
155
  groupId: BigInt(args.groupId),
92
- }, {}, signer, true);
156
+ }, factories, signer, true);
93
157
  break;
94
158
  }
95
159
  case EPolicies.MerkleProof: {
96
- [contract] = await deployMerkleProofPolicy({
160
+ policyFactoryName = EPolicyFactories.MerkleProof;
161
+ checkFactoryName = ECheckerFactories.MerkleProof;
162
+ const factories = await getDeployedPolicyProxyFactories({
163
+ policy: policyFactoryName,
164
+ checker: checkFactoryName,
165
+ network,
166
+ signer,
167
+ });
168
+ factoryIsSaved = !!factories.policy;
169
+ checkerIsSaved = !!factories.checker;
170
+ [policyContract, , policyFactory, checkFactory] = await deployMerkleProofPolicy({
97
171
  root: args.root,
98
- }, {}, signer, true);
172
+ }, factories, signer, true);
99
173
  break;
100
174
  }
101
175
  case EPolicies.Token: {
102
- [contract] = await deploySignupTokenPolicy({
176
+ policyFactoryName = EPolicyFactories.Token;
177
+ checkFactoryName = ECheckerFactories.Token;
178
+ const factories = await getDeployedPolicyProxyFactories({
179
+ policy: policyFactoryName,
180
+ checker: checkFactoryName,
181
+ network,
182
+ signer,
183
+ });
184
+ factoryIsSaved = !!factories.policy;
185
+ checkerIsSaved = !!factories.checker;
186
+ [policyContract, , policyFactory, checkFactory] = await deploySignupTokenPolicy({
103
187
  token: args.token,
104
- }, {}, signer, true);
188
+ }, factories, signer, true);
105
189
  break;
106
190
  }
107
191
  case EPolicies.AnonAadhaar: {
108
- [contract] = await deployAnonAadhaarPolicy({
192
+ policyFactoryName = EPolicyFactories.AnonAadhaar;
193
+ checkFactoryName = ECheckerFactories.AnonAadhaar;
194
+ const factories = await getDeployedPolicyProxyFactories({
195
+ policy: policyFactoryName,
196
+ checker: checkFactoryName,
197
+ network,
198
+ signer,
199
+ });
200
+ factoryIsSaved = !!factories.policy;
201
+ checkerIsSaved = !!factories.checker;
202
+ [policyContract, , policyFactory, checkFactory] = await deployAnonAadhaarPolicy({
109
203
  verifierAddress: args.verifier,
110
204
  nullifierSeed: args.nullifierSeed,
111
- }, {}, signer, true);
205
+ }, factories, signer, true);
112
206
  break;
113
207
  }
114
208
  case EPolicies.ERC20Votes: {
115
- [contract] = await deployERC20VotesPolicy({
209
+ policyFactoryName = EPolicyFactories.ERC20Votes;
210
+ checkFactoryName = ECheckerFactories.ERC20Votes;
211
+ const factories = await getDeployedPolicyProxyFactories({
212
+ policy: policyFactoryName,
213
+ checker: checkFactoryName,
214
+ network,
215
+ signer,
216
+ });
217
+ factoryIsSaved = !!factories.policy;
218
+ checkerIsSaved = !!factories.checker;
219
+ [policyContract, , policyFactory, checkFactory] = await deployERC20VotesPolicy({
116
220
  snapshotBlock: BigInt(args.snapshotBlock),
117
221
  threshold: BigInt(args.threshold),
118
222
  token: args.token,
119
- }, {}, signer, true);
223
+ }, factories, signer, true);
120
224
  break;
121
225
  }
122
226
  default:
123
227
  throw new Error(ErrorCodes.UNSUPPORTED_POLICY.toString());
124
228
  }
125
229
  await this.storage.register({
126
- id: policyType,
127
- contract,
230
+ id: type,
231
+ name: type,
232
+ contract: policyContract,
128
233
  args: args ? Object.values(args).map((arg) => String(arg)) : [],
129
234
  network,
130
235
  });
131
- return contract;
236
+ if (!factoryIsSaved) {
237
+ await this.storage.register({
238
+ id: policyFactoryName,
239
+ name: policyFactoryName,
240
+ contract: policyFactory,
241
+ network,
242
+ });
243
+ }
244
+ if (!checkerIsSaved) {
245
+ await this.storage.register({
246
+ id: checkFactoryName,
247
+ name: checkFactoryName,
248
+ contract: checkFactory,
249
+ network,
250
+ });
251
+ }
252
+ return policyContract;
132
253
  }
133
254
  /**
134
255
  * Get the voice credit proxy contract object
@@ -208,7 +329,7 @@ let DeployerService = class DeployerService {
208
329
  */
209
330
  async deployMaci({ approval, sessionKeyAddress, chain, config }) {
210
331
  const signer = await this.sessionKeysService.getCoordinatorSigner(chain, sessionKeyAddress, approval);
211
- const policyContract = await this.deployAndSavePolicy(signer, config.policy.type, chain, config.policy.args);
332
+ const policyContract = await this.deployAndSavePolicy(signer, chain, config.policy);
212
333
  const policyAddress = await policyContract.getAddress();
213
334
  const verifierContract = await deployVerifier(signer, true);
214
335
  const verifyingKeysRegistryAddress = await deployVerifyingKeysRegistryContract({ signer });
@@ -271,12 +392,8 @@ let DeployerService = class DeployerService {
271
392
  if (!verifyingKeysRegistryAddress) {
272
393
  throw new Error(ErrorCodes.VERIFYING_KEYS_REGISTRY_NOT_DEPLOYED.toString());
273
394
  }
274
- // check if policy address was given
275
- let policyAddress = config.policy.address;
276
- if (!policyAddress) {
277
- const policyContract = await this.deployAndSavePolicy(signer, config.policy.type, chain, config.policy.args);
278
- policyAddress = (await policyContract.getAddress());
279
- }
395
+ const policyContract = await this.deployAndSavePolicy(signer, chain, config.policy);
396
+ const policyAddress = (await policyContract.getAddress());
280
397
  // check if initial voice credit proxy address was given
281
398
  let initialVoiceCreditProxyAddress = config.initialVoiceCreditsProxy.address;
282
399
  if (!initialVoiceCreditProxyAddress) {
@@ -1 +1 @@
1
- {"version":3,"file":"deployer.service.js","sourceRoot":"","sources":["../../../ts/deployer/deployer.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deployer.service.js","sourceRoot":"","sources":["../../../ts/deployer/deployer.service.ts"],"names":[],"mappings":"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"}
@@ -220,6 +220,19 @@ export interface IVerifyingKeysRegistryArgs {
220
220
  * IPolicyArgs represents the arguments for deploying a policy
221
221
  */
222
222
  export type IPolicyArgs = IEASPolicyArgs | IZupassPolicyArgs | IHatsPolicyArgs | ISemaphorePolicyArgs | IMerkleProofPolicyArgs | ITokenPolicyArgs | IAnonAadhaarPolicyArgs | IGitcoinPassportPolicyArgs | IERC20VotesPolicyArgs | IERC20PolicyArgs;
223
+ /**
224
+ * IDeployPolicyConfig represents the configuration for deploying a policy
225
+ */
226
+ export interface IDeployPolicyConfig {
227
+ /**
228
+ * The policy type (e.g. FreeForAll, ERC20Votes, etc)
229
+ */
230
+ type: EPolicies;
231
+ /**
232
+ * The policy arguments depending on each policy
233
+ */
234
+ args?: IPolicyArgs;
235
+ }
223
236
  export type IInitialVoiceCreditProxyArgs = IConstantInitialVoiceCreditProxyArgs;
224
237
  /**
225
238
  * DeployMaciConfig is the configuration for deploying MACI
@@ -228,10 +241,7 @@ export interface IDeployMaciConfig {
228
241
  /**
229
242
  * The policy configuration
230
243
  */
231
- policy: {
232
- type: EPolicies;
233
- args?: IPolicyArgs;
234
- };
244
+ policy: IDeployPolicyConfig;
235
245
  /**
236
246
  * The MACI configuration
237
247
  */
@@ -291,11 +301,7 @@ export interface IDeployPollConfig {
291
301
  /**
292
302
  * The policy configuration
293
303
  */
294
- policy: {
295
- type: EPolicies;
296
- args?: IPolicyArgs;
297
- address?: Hex;
298
- };
304
+ policy: IDeployPolicyConfig;
299
305
  /**
300
306
  * The initial voice credits proxy configuration
301
307
  */
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../ts/deployer/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,0BAA0B,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAEvE,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAErC,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,iBAAiB,CAAC,EAAE,GAAG,CAAC;IAExB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,KAAK,EAAE,kBAAkB,CAAC;IAE1B;;OAEG;IACH,MAAM,EAAE,iBAAiB,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,iBAAiB,CAAC,EAAE,GAAG,CAAC;IAExB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,KAAK,EAAE,kBAAkB,CAAC;IAE1B;;OAEG;IACH,MAAM,EAAE,iBAAiB,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,oCAAoC;IACnD;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,iBAAiB,EAAE,MAAM,CAAC;IAE1B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAE3B;;OAEG;IACH,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC;;OAEG;IACH,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC;IAEhC;;OAEG;IACH,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC;;OAEG;IACH,6BAA6B,EAAE,MAAM,GAAG,MAAM,CAAC;IAE/C;;OAEG;IACH,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GACnB,cAAc,GACd,iBAAiB,GACjB,eAAe,GACf,oBAAoB,GACpB,sBAAsB,GACtB,gBAAgB,GAChB,sBAAsB,GACtB,0BAA0B,GAC1B,qBAAqB,GACrB,gBAAgB,CAAC;AAErB,MAAM,MAAM,4BAA4B,GAAG,oCAAoC,CAAC;AAChF;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,MAAM,EAAE;QACN,IAAI,EAAE,SAAS,CAAC;QAChB,IAAI,CAAC,EAAE,WAAW,CAAC;KACpB,CAAC;IAEF;;OAEG;IACH,IAAI,EAAE;QACJ,cAAc,EAAE,MAAM,CAAC;QACvB,MAAM,EAAE,SAAS,CAAC;QAClB,IAAI,EAAE,KAAK,CAAC;KACb,CAAC;IAEF;;OAEG;IACH,qBAAqB,EAAE;QACrB,IAAI,EAAE,0BAA0B,CAAC;KAClC,CAAC;IAEF;;OAEG;IACH,QAAQ,CAAC,EAAE;QACT,UAAU,EAAE,GAAG,CAAC;QAChB,UAAU,EAAE,GAAG,CAAC;QAChB,UAAU,EAAE,GAAG,CAAC;QAChB,UAAU,EAAE,GAAG,CAAC;KACjB,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,IAAI,EAAE,KAAK,CAAC;IAEZ;;OAEG;IACH,6BAA6B,EAAE,MAAM,CAAC;IAEtC;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,MAAM,EAAE;QACN,IAAI,EAAE,SAAS,CAAC;QAChB,IAAI,CAAC,EAAE,WAAW,CAAC;QACnB,OAAO,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;IAEF;;OAEG;IACH,wBAAwB,EAAE;QACxB,IAAI,EAAE,0BAA0B,CAAC;QACjC,IAAI,EAAE,4BAA4B,CAAC;QACnC,OAAO,CAAC,EAAE,GAAG,CAAC;KACf,CAAC;IAEF;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IAEpB;;OAEG;IACH,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAE5B;;OAEG;IACH,GAAG,EAAE,GAAG,CAAC;IAET;;OAEG;IACH,QAAQ,EAAE,GAAG,CAAC;IAEd;;OAEG;IACH,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,2BAA2B,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../ts/deployer/types.ts"],"names":[],"mappings":"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"}
@@ -1,36 +1,30 @@
1
1
  import { Keypair, PrivateKey } from "@maci-protocol/domainobjs";
2
- import { Deployment, EMode, ProofGenerator } from "@maci-protocol/sdk";
2
+ import { Deployment, EMode } from "@maci-protocol/sdk";
3
3
  import dotenv from "dotenv";
4
4
  import { zeroAddress } from "viem";
5
5
  import { ErrorCodes, ESupportedNetworks } from "../../common";
6
+ import { getCoordinatorKeypair } from "../../common/coordinatorKeypair";
6
7
  import { FileService } from "../../file/file.service";
8
+ import { generateApproval } from "../../sessionKeys/__tests__/utils";
7
9
  import { SessionKeysService } from "../../sessionKeys/sessionKeys.service";
8
10
  import { ProofGeneratorService } from "../proof.service";
9
11
  dotenv.config();
10
- jest.mock("hardhat", () => ({
11
- network: {
12
- name: "localhost",
13
- config: {
14
- chain: { id: 0x1 },
15
- },
16
- },
17
- }));
18
- jest.mock("@maci-protocol/contracts", () => ({
19
- ...jest.requireActual("@maci-protocol/contracts"),
12
+ jest.mock("@maci-protocol/sdk", () => ({
13
+ ...jest.requireActual("@maci-protocol/sdk"),
20
14
  Deployment: {
21
15
  getInstance: jest.fn(),
22
16
  },
23
- ProofGenerator: jest.fn(),
17
+ getPoll: jest.fn().mockResolvedValue({
18
+ address: "0x123",
19
+ }),
20
+ generateProofs: jest.fn().mockResolvedValue({
21
+ processProofs: [1],
22
+ tallyProofs: [1],
23
+ tallyData: {},
24
+ }),
24
25
  }));
25
26
  describe("ProofGeneratorService", () => {
26
- const defaultProofArgs = {
27
- poll: 1,
28
- maciContractAddress: zeroAddress,
29
- mode: EMode.NON_QV,
30
- sessionKeyAddress: "0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e",
31
- approval: "0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e",
32
- chain: ESupportedNetworks.LOCALHOST,
33
- };
27
+ let defaultProofArgs;
34
28
  let mockContract = {
35
29
  polls: jest.fn(),
36
30
  getMainRoot: jest.fn(),
@@ -39,18 +33,26 @@ describe("ProofGeneratorService", () => {
39
33
  stateMerged: jest.fn(),
40
34
  coordinatorPublicKey: jest.fn(),
41
35
  };
42
- let defaultProofGenerator = {
43
- generateMpProofs: jest.fn(),
44
- generateTallyProofs: jest.fn(),
45
- merge: jest.fn(),
46
- };
47
36
  const defaultDeploymentService = {
48
37
  setHre: jest.fn(),
49
38
  getDeployer: jest.fn(() => Promise.resolve({})),
50
39
  getContract: jest.fn(() => Promise.resolve(mockContract)),
51
40
  };
41
+ const coordinatorPublicKey = getCoordinatorKeypair().publicKey.asContractParam();
52
42
  const fileService = new FileService();
53
43
  const sessionKeysService = new SessionKeysService(fileService);
44
+ beforeAll(async () => {
45
+ const { sessionKeyAddress } = await sessionKeysService.generateSessionKey();
46
+ const approval = await generateApproval(sessionKeyAddress);
47
+ defaultProofArgs = {
48
+ poll: 1,
49
+ maciContractAddress: zeroAddress,
50
+ mode: EMode.NON_QV,
51
+ sessionKeyAddress,
52
+ approval,
53
+ chain: ESupportedNetworks.OPTIMISM_SEPOLIA,
54
+ };
55
+ });
54
56
  beforeEach(() => {
55
57
  mockContract = {
56
58
  polls: jest.fn(() => Promise.resolve({ poll: zeroAddress.replace("0x0", "0x1"), messageProcessor: zeroAddress, tally: zeroAddress })),
@@ -58,47 +60,19 @@ describe("ProofGeneratorService", () => {
58
60
  treeDepths: jest.fn(() => Promise.resolve([1, 2, 3])),
59
61
  extContracts: jest.fn(() => Promise.resolve({ messageAq: zeroAddress })),
60
62
  stateMerged: jest.fn(() => Promise.resolve(true)),
61
- coordinatorPublicKey: jest.fn(() => Promise.resolve({
62
- x: 21424602586933317770306541383681754745261216801634012235464162098738462892814n,
63
- y: 11917647526382221762393892566678210317414189429046519403585863973939713533473n,
64
- })),
65
- };
66
- defaultProofGenerator = {
67
- generateMpProofs: jest.fn(() => Promise.resolve([1])),
68
- generateTallyProofs: jest.fn(() => Promise.resolve({ proofs: [1], tallyData: {} })),
69
- merge: jest.fn(() => Promise.resolve(true)),
63
+ coordinatorPublicKey: jest.fn(() => Promise.resolve(coordinatorPublicKey)),
70
64
  };
71
65
  Deployment.getInstance.mockReturnValue(defaultDeploymentService);
72
- ProofGenerator.mockReturnValue(defaultProofGenerator);
73
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
74
- // @ts-expect-error
75
- ProofGenerator.prepareState = jest.fn(() => Promise.resolve({
76
- polls: new Map([[1n, {}]]),
77
- }));
78
66
  });
79
67
  afterEach(() => {
80
68
  jest.clearAllMocks();
81
69
  });
82
- test("should throw error if state is not merged yet", async () => {
83
- mockContract.stateMerged.mockResolvedValue(false);
84
- const service = new ProofGeneratorService(fileService, sessionKeysService);
85
- await expect(service.generate(defaultProofArgs)).rejects.toThrow(ErrorCodes.NOT_MERGED_STATE_TREE.toString());
86
- });
87
70
  test("should throw error if private key is wrong", async () => {
88
71
  const keypair = new Keypair(new PrivateKey(0n));
89
72
  mockContract.coordinatorPublicKey.mockResolvedValue(keypair.publicKey.asContractParam());
90
73
  const service = new ProofGeneratorService(fileService, sessionKeysService);
91
74
  await expect(service.generate(defaultProofArgs)).rejects.toThrow(ErrorCodes.PRIVATE_KEY_MISMATCH.toString());
92
75
  });
93
- test("should throw error if poll is not found", async () => {
94
- const service = new ProofGeneratorService(fileService, sessionKeysService);
95
- await expect(service.generate({ ...defaultProofArgs, poll: 2 })).rejects.toThrow(ErrorCodes.POLL_NOT_FOUND.toString());
96
- });
97
- test("should throw error if poll is not found in maci contract", async () => {
98
- mockContract.polls.mockResolvedValue({ poll: zeroAddress });
99
- const service = new ProofGeneratorService(fileService, sessionKeysService);
100
- await expect(service.generate({ ...defaultProofArgs, poll: 2 })).rejects.toThrow(ErrorCodes.POLL_NOT_FOUND.toString());
101
- });
102
76
  test("should generate proofs properly for NonQv", async () => {
103
77
  const service = new ProofGeneratorService(fileService, sessionKeysService);
104
78
  const data = await service.generate(defaultProofArgs);
@@ -1 +1 @@
1
- {"version":3,"file":"proof.service.test.js","sourceRoot":"","sources":["../../../../ts/proof/__tests__/proof.service.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"proof.service.test.js","sourceRoot":"","sources":["../../../../ts/proof/__tests__/proof.service.test.ts"],"names":[],"mappings":"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"}
@@ -29,8 +29,8 @@ describe("SessionKeysController", () => {
29
29
  jest.clearAllMocks();
30
30
  });
31
31
  describe("v1/session-keys/generate", () => {
32
- test("should return a session key address", () => {
33
- const data = sessionKeysController.generateSessionKey();
32
+ test("should return a session key address", async () => {
33
+ const data = await sessionKeysController.generateSessionKey();
34
34
  expect(data).toStrictEqual(defaultGenerateSessionKeyReturn);
35
35
  });
36
36
  });
@@ -1 +1 @@
1
- {"version":3,"file":"sessionKeys.controller.test.js","sourceRoot":"","sources":["../../../../ts/sessionKeys/__tests__/sessionKeys.controller.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAInC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,IAAI,qBAA4C,CAAC;IAEjD,MAAM,sBAAsB,GAAG;QAC7B,kBAAkB,EAAE,IAAI,CAAC,EAAE,EAAE;QAC7B,oBAAoB,EAAE,IAAI,CAAC,EAAE,EAAE;KAChC,CAAC;IAEF,MAAM,+BAA+B,GAA8B;QACjE,iBAAiB,EAAE,WAAW;KAC/B,CAAC;IAEF,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC;YACzC,WAAW,EAAE,CAAC,qBAAqB,CAAC;SACrC,CAAC;aACC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;YACnB,IAAI,KAAK,KAAK,kBAAkB,EAAE,CAAC;gBACjC,sBAAsB,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,+BAA+B,CAAC,CAAC;gBAC7F,OAAO,sBAAsB,CAAC;YAChC,CAAC;YAED,OAAO,IAAI,CAAC,EAAE,EAAE,CAAC;QACnB,CAAC,CAAC;aACD,OAAO,EAAE,CAAC;QAEb,qBAAqB,GAAG,GAAG,CAAC,GAAG,CAAwB,qBAAqB,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;QACxC,IAAI,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC/C,MAAM,IAAI,GAAG,qBAAqB,CAAC,kBAAkB,EAAE,CAAC;YACxD,MAAM,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,+BAA+B,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACvC,qBAAqB,CAAC,oBAAoB,CAAC,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC,CAAC;YAC/E,MAAM,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACxF,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"sessionKeys.controller.test.js","sourceRoot":"","sources":["../../../../ts/sessionKeys/__tests__/sessionKeys.controller.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAInC,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,IAAI,qBAA4C,CAAC;IAEjD,MAAM,sBAAsB,GAAG;QAC7B,kBAAkB,EAAE,IAAI,CAAC,EAAE,EAAE;QAC7B,oBAAoB,EAAE,IAAI,CAAC,EAAE,EAAE;KAChC,CAAC;IAEF,MAAM,+BAA+B,GAA8B;QACjE,iBAAiB,EAAE,WAAW;KAC/B,CAAC;IAEF,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC;YACzC,WAAW,EAAE,CAAC,qBAAqB,CAAC;SACrC,CAAC;aACC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE;YACnB,IAAI,KAAK,KAAK,kBAAkB,EAAE,CAAC;gBACjC,sBAAsB,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,+BAA+B,CAAC,CAAC;gBAC7F,OAAO,sBAAsB,CAAC;YAChC,CAAC;YAED,OAAO,IAAI,CAAC,EAAE,EAAE,CAAC;QACnB,CAAC,CAAC;aACD,OAAO,EAAE,CAAC;QAEb,qBAAqB,GAAG,GAAG,CAAC,GAAG,CAAwB,qBAAqB,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,0BAA0B,EAAE,GAAG,EAAE;QACxC,IAAI,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACrD,MAAM,IAAI,GAAG,MAAM,qBAAqB,CAAC,kBAAkB,EAAE,CAAC;YAC9D,MAAM,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,+BAA+B,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACtC,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;YACvC,qBAAqB,CAAC,oBAAoB,CAAC,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC,CAAC;YAC/E,MAAM,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QACxF,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -40,12 +40,11 @@ describe("SubgraphService", () => {
40
40
  await expect(service.deploy(defaultArgs)).rejects.toThrow(ErrorCodes.SUBGRAPH_DEPLOY.toString());
41
41
  });
42
42
  test("should throw error if network is invalid", async () => {
43
- childProcess.execFile.mockRejectedValue(new Error());
44
43
  const service = new SubgraphService();
45
- await expect(service.deploy({ ...defaultArgs, network: "unknown" })).rejects.toThrow(ErrorCodes.SUBGRAPH_DEPLOY.toString());
44
+ await expect(service.deploy({ ...defaultArgs, network: "unknown" })).rejects.toThrow(ErrorCodes.UNSUPPORTED_NETWORK.toString());
46
45
  });
47
46
  test("should throw error if there is no subgraph url", async () => {
48
- childProcess.execFile.mockResolvedValue({ stdout: "" });
47
+ childProcess.execFile.mockResolvedValue({ stdout: "", stderr: "" });
49
48
  const service = new SubgraphService();
50
49
  await expect(service.deploy(defaultArgs)).rejects.toThrow(ErrorCodes.SUBGRAPH_DEPLOY.toString());
51
50
  });
@@ -1 +1 @@
1
- {"version":3,"file":"subgraph.service.test.js","sourceRoot":"","sources":["../../../../ts/subgraph/__tests__/subgraph.service.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"subgraph.service.test.js","sourceRoot":"","sources":["../../../../ts/subgraph/__tests__/subgraph.service.test.ts"],"names":[],"mappings":"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"}