@maci-protocol/coordinator 0.0.0-ci.7f7ef53 → 0.0.0-ci.7faea84

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 (234) hide show
  1. package/LICENSE +1 -2
  2. package/README.md +71 -10
  3. package/build/hardhat.config.cjs +17 -9
  4. package/build/hardhat.config.cjs.map +1 -1
  5. package/build/hardhat.config.d.cts +15 -12
  6. package/build/hardhat.config.d.cts.map +1 -1
  7. package/build/scripts/generateKeypair.js +2 -2
  8. package/build/scripts/generateKeypair.js.map +1 -1
  9. package/build/scripts/generateMaciKeyPair.js +2 -2
  10. package/build/scripts/generateMaciKeyPair.js.map +1 -1
  11. package/build/tests/constants.d.ts +3 -4
  12. package/build/tests/constants.d.ts.map +1 -1
  13. package/build/tests/constants.js +5 -4
  14. package/build/tests/constants.js.map +1 -1
  15. package/build/tests/e2e.deploy.test.js +132 -102
  16. package/build/tests/e2e.deploy.test.js.map +1 -1
  17. package/build/tests/e2e.redis.test.d.ts +2 -0
  18. package/build/tests/e2e.redis.test.d.ts.map +1 -0
  19. package/build/tests/e2e.redis.test.js +118 -0
  20. package/build/tests/e2e.redis.test.js.map +1 -0
  21. package/build/tests/utils.d.ts +7 -1
  22. package/build/tests/utils.d.ts.map +1 -1
  23. package/build/tests/utils.js +17 -6
  24. package/build/tests/utils.js.map +1 -1
  25. package/build/ts/app.module.d.ts.map +1 -1
  26. package/build/ts/app.module.js +6 -0
  27. package/build/ts/app.module.js.map +1 -1
  28. package/build/ts/common/__tests__/common.test.js +44 -46
  29. package/build/ts/common/__tests__/common.test.js.map +1 -1
  30. package/build/ts/common/accountAbstraction.d.ts +7 -24
  31. package/build/ts/common/accountAbstraction.d.ts.map +1 -1
  32. package/build/ts/common/accountAbstraction.js +22 -49
  33. package/build/ts/common/accountAbstraction.js.map +1 -1
  34. package/build/ts/common/chain.d.ts +22 -0
  35. package/build/ts/common/chain.d.ts.map +1 -0
  36. package/build/ts/common/chain.js +37 -0
  37. package/build/ts/common/chain.js.map +1 -0
  38. package/build/ts/common/coordinatorKeypair.d.ts +7 -0
  39. package/build/ts/common/coordinatorKeypair.d.ts.map +1 -0
  40. package/build/ts/common/coordinatorKeypair.js +14 -0
  41. package/build/ts/common/coordinatorKeypair.js.map +1 -0
  42. package/build/ts/common/errors.d.ts +13 -10
  43. package/build/ts/common/errors.d.ts.map +1 -1
  44. package/build/ts/common/errors.js +12 -9
  45. package/build/ts/common/errors.js.map +1 -1
  46. package/build/ts/common/http.d.ts +6 -0
  47. package/build/ts/common/http.d.ts.map +1 -0
  48. package/build/ts/common/http.js +49 -0
  49. package/build/ts/common/http.js.map +1 -0
  50. package/build/ts/common/index.d.ts +3 -1
  51. package/build/ts/common/index.d.ts.map +1 -1
  52. package/build/ts/common/index.js +3 -1
  53. package/build/ts/common/index.js.map +1 -1
  54. package/build/ts/common/networks.d.ts +2 -21
  55. package/build/ts/common/networks.d.ts.map +1 -1
  56. package/build/ts/common/networks.js +39 -48
  57. package/build/ts/common/networks.js.map +1 -1
  58. package/build/ts/common/types.d.ts +3 -4
  59. package/build/ts/common/types.d.ts.map +1 -1
  60. package/build/ts/deployer/__tests__/deployer.controller.test.js +23 -25
  61. package/build/ts/deployer/__tests__/deployer.controller.test.js.map +1 -1
  62. package/build/ts/deployer/__tests__/deployer.service.test.js +182 -337
  63. package/build/ts/deployer/__tests__/deployer.service.test.js.map +1 -1
  64. package/build/ts/deployer/__tests__/utils.d.ts +31 -6
  65. package/build/ts/deployer/__tests__/utils.d.ts.map +1 -1
  66. package/build/ts/deployer/__tests__/utils.js +47 -23
  67. package/build/ts/deployer/__tests__/utils.js.map +1 -1
  68. package/build/ts/deployer/deployer.controller.d.ts.map +1 -1
  69. package/build/ts/deployer/deployer.controller.js +19 -6
  70. package/build/ts/deployer/deployer.controller.js.map +1 -1
  71. package/build/ts/deployer/deployer.service.d.ts +26 -53
  72. package/build/ts/deployer/deployer.service.d.ts.map +1 -1
  73. package/build/ts/deployer/deployer.service.js +344 -468
  74. package/build/ts/deployer/deployer.service.js.map +1 -1
  75. package/build/ts/deployer/dto.d.ts +7 -7
  76. package/build/ts/deployer/dto.d.ts.map +1 -1
  77. package/build/ts/deployer/dto.js +14 -6
  78. package/build/ts/deployer/dto.js.map +1 -1
  79. package/build/ts/deployer/types.d.ts +83 -46
  80. package/build/ts/deployer/types.d.ts.map +1 -1
  81. package/build/ts/file/__tests__/file.service.test.js +12 -11
  82. package/build/ts/file/__tests__/file.service.test.js.map +1 -1
  83. package/build/ts/file/file.service.d.ts +4 -3
  84. package/build/ts/file/file.service.d.ts.map +1 -1
  85. package/build/ts/file/file.service.js +16 -10
  86. package/build/ts/file/file.service.js.map +1 -1
  87. package/build/ts/file/types.d.ts +2 -2
  88. package/build/ts/file/types.d.ts.map +1 -1
  89. package/build/ts/health/__tests__/health.controller.test.d.ts +2 -0
  90. package/build/ts/health/__tests__/health.controller.test.d.ts.map +1 -0
  91. package/build/ts/health/__tests__/health.controller.test.js +52 -0
  92. package/build/ts/health/__tests__/health.controller.test.js.map +1 -0
  93. package/build/ts/health/__tests__/health.service.test.d.ts +2 -0
  94. package/build/ts/health/__tests__/health.service.test.d.ts.map +1 -0
  95. package/build/ts/health/__tests__/health.service.test.js +101 -0
  96. package/build/ts/health/__tests__/health.service.test.js.map +1 -0
  97. package/build/ts/health/health.controller.d.ts +16 -0
  98. package/build/ts/health/health.controller.d.ts.map +1 -0
  99. package/build/ts/health/health.controller.js +43 -0
  100. package/build/ts/health/health.controller.js.map +1 -0
  101. package/build/ts/health/health.module.d.ts +3 -0
  102. package/build/ts/health/health.module.d.ts.map +1 -0
  103. package/build/ts/health/health.module.js +22 -0
  104. package/build/ts/health/health.module.js.map +1 -0
  105. package/build/ts/health/health.service.d.ts +42 -0
  106. package/build/ts/health/health.service.d.ts.map +1 -0
  107. package/build/ts/health/health.service.js +176 -0
  108. package/build/ts/health/health.service.js.map +1 -0
  109. package/build/ts/health/types.d.ts +87 -0
  110. package/build/ts/health/types.d.ts.map +1 -0
  111. package/build/ts/health/types.js +2 -0
  112. package/build/ts/health/types.js.map +1 -0
  113. package/build/ts/jest/__mocks__/@openzeppelin/merkle-tree.d.ts +11 -0
  114. package/build/ts/jest/__mocks__/@openzeppelin/merkle-tree.d.ts.map +1 -0
  115. package/build/ts/jest/__mocks__/@openzeppelin/merkle-tree.js +12 -0
  116. package/build/ts/jest/__mocks__/@openzeppelin/merkle-tree.js.map +1 -0
  117. package/build/ts/main.js +1 -1
  118. package/build/ts/proof/__tests__/proof.controller.test.js +8 -7
  119. package/build/ts/proof/__tests__/proof.controller.test.js.map +1 -1
  120. package/build/ts/proof/__tests__/proof.gateway.test.js +5 -3
  121. package/build/ts/proof/__tests__/proof.gateway.test.js.map +1 -1
  122. package/build/ts/proof/__tests__/proof.service.test.js +31 -75
  123. package/build/ts/proof/__tests__/proof.service.test.js.map +1 -1
  124. package/build/ts/proof/dto.d.ts +15 -18
  125. package/build/ts/proof/dto.d.ts.map +1 -1
  126. package/build/ts/proof/dto.js +55 -49
  127. package/build/ts/proof/dto.js.map +1 -1
  128. package/build/ts/proof/proof.controller.d.ts +3 -2
  129. package/build/ts/proof/proof.controller.d.ts.map +1 -1
  130. package/build/ts/proof/proof.controller.js +38 -15
  131. package/build/ts/proof/proof.controller.js.map +1 -1
  132. package/build/ts/proof/proof.module.d.ts.map +1 -1
  133. package/build/ts/proof/proof.module.js +1 -0
  134. package/build/ts/proof/proof.module.js.map +1 -1
  135. package/build/ts/proof/proof.service.d.ts +4 -6
  136. package/build/ts/proof/proof.service.d.ts.map +1 -1
  137. package/build/ts/proof/proof.service.js +48 -130
  138. package/build/ts/proof/proof.service.js.map +1 -1
  139. package/build/ts/proof/types.d.ts +21 -17
  140. package/build/ts/proof/types.d.ts.map +1 -1
  141. package/build/ts/proof/types.js.map +1 -1
  142. package/build/ts/redis/__tests__/redis.service.test.d.ts +2 -0
  143. package/build/ts/redis/__tests__/redis.service.test.d.ts.map +1 -0
  144. package/build/ts/redis/__tests__/redis.service.test.js +148 -0
  145. package/build/ts/redis/__tests__/redis.service.test.js.map +1 -0
  146. package/build/ts/redis/redis.module.d.ts +3 -0
  147. package/build/ts/redis/redis.module.d.ts.map +1 -0
  148. package/build/ts/redis/redis.module.js +18 -0
  149. package/build/ts/redis/redis.module.js.map +1 -0
  150. package/build/ts/redis/redis.service.d.ts +53 -0
  151. package/build/ts/redis/redis.service.d.ts.map +1 -0
  152. package/build/ts/redis/redis.service.js +99 -0
  153. package/build/ts/redis/redis.service.js.map +1 -0
  154. package/build/ts/redis/types.d.ts +66 -0
  155. package/build/ts/redis/types.d.ts.map +1 -0
  156. package/build/ts/redis/types.js +2 -0
  157. package/build/ts/redis/types.js.map +1 -0
  158. package/build/ts/redis/utils.d.ts +20 -0
  159. package/build/ts/redis/utils.d.ts.map +1 -0
  160. package/build/ts/redis/utils.js +27 -0
  161. package/build/ts/redis/utils.js.map +1 -0
  162. package/build/ts/scheduler/__tests__/scheduler.controller.test.d.ts +2 -0
  163. package/build/ts/scheduler/__tests__/scheduler.controller.test.d.ts.map +1 -0
  164. package/build/ts/scheduler/__tests__/scheduler.controller.test.js +62 -0
  165. package/build/ts/scheduler/__tests__/scheduler.controller.test.js.map +1 -0
  166. package/build/ts/scheduler/__tests__/scheduler.service.test.d.ts +2 -0
  167. package/build/ts/scheduler/__tests__/scheduler.service.test.d.ts.map +1 -0
  168. package/build/ts/scheduler/__tests__/scheduler.service.test.js +369 -0
  169. package/build/ts/scheduler/__tests__/scheduler.service.test.js.map +1 -0
  170. package/build/ts/scheduler/dto.d.ts +41 -0
  171. package/build/ts/scheduler/dto.d.ts.map +1 -0
  172. package/build/ts/scheduler/dto.js +115 -0
  173. package/build/ts/scheduler/dto.js.map +1 -0
  174. package/build/ts/scheduler/scheduler.controller.d.ts +32 -0
  175. package/build/ts/scheduler/scheduler.controller.d.ts.map +1 -0
  176. package/build/ts/scheduler/scheduler.controller.js +118 -0
  177. package/build/ts/scheduler/scheduler.controller.js.map +1 -0
  178. package/build/ts/scheduler/scheduler.module.d.ts +3 -0
  179. package/build/ts/scheduler/scheduler.module.d.ts.map +1 -0
  180. package/build/ts/scheduler/scheduler.module.js +24 -0
  181. package/build/ts/scheduler/scheduler.module.js.map +1 -0
  182. package/build/ts/scheduler/scheduler.service.d.ts +71 -0
  183. package/build/ts/scheduler/scheduler.service.d.ts.map +1 -0
  184. package/build/ts/scheduler/scheduler.service.js +297 -0
  185. package/build/ts/scheduler/scheduler.service.js.map +1 -0
  186. package/build/ts/scheduler/types.d.ts +65 -0
  187. package/build/ts/scheduler/types.d.ts.map +1 -0
  188. package/build/ts/scheduler/types.js +2 -0
  189. package/build/ts/scheduler/types.js.map +1 -0
  190. package/build/ts/sessionKeys/__tests__/sessionKeys.controller.test.js +2 -2
  191. package/build/ts/sessionKeys/__tests__/sessionKeys.controller.test.js.map +1 -1
  192. package/build/ts/sessionKeys/__tests__/sessionKeys.service.test.js +34 -19
  193. package/build/ts/sessionKeys/__tests__/sessionKeys.service.test.js.map +1 -1
  194. package/build/ts/sessionKeys/__tests__/utils.d.ts +1 -1
  195. package/build/ts/sessionKeys/__tests__/utils.d.ts.map +1 -1
  196. package/build/ts/sessionKeys/__tests__/utils.js +7 -6
  197. package/build/ts/sessionKeys/__tests__/utils.js.map +1 -1
  198. package/build/ts/sessionKeys/provider/KernelEIP1193Provider.d.ts +53 -0
  199. package/build/ts/sessionKeys/provider/KernelEIP1193Provider.d.ts.map +1 -0
  200. package/build/ts/sessionKeys/provider/KernelEIP1193Provider.js +105 -0
  201. package/build/ts/sessionKeys/provider/KernelEIP1193Provider.js.map +1 -0
  202. package/build/ts/sessionKeys/sessionKeys.service.d.ts +16 -4
  203. package/build/ts/sessionKeys/sessionKeys.service.d.ts.map +1 -1
  204. package/build/ts/sessionKeys/sessionKeys.service.js +23 -6
  205. package/build/ts/sessionKeys/sessionKeys.service.js.map +1 -1
  206. package/build/ts/subgraph/__tests__/subgraph.controller.test.js +3 -3
  207. package/build/ts/subgraph/__tests__/subgraph.controller.test.js.map +1 -1
  208. package/build/ts/subgraph/__tests__/subgraph.gateway.test.js +2 -2
  209. package/build/ts/subgraph/__tests__/subgraph.gateway.test.js.map +1 -1
  210. package/build/ts/subgraph/__tests__/subgraph.service.test.js +5 -5
  211. package/build/ts/subgraph/__tests__/subgraph.service.test.js.map +1 -1
  212. package/build/ts/subgraph/dto.d.ts +2 -2
  213. package/build/ts/subgraph/dto.d.ts.map +1 -1
  214. package/build/ts/subgraph/dto.js +3 -3
  215. package/build/ts/subgraph/dto.js.map +1 -1
  216. package/build/ts/subgraph/subgraph.controller.d.ts.map +1 -1
  217. package/build/ts/subgraph/subgraph.controller.js +8 -3
  218. package/build/ts/subgraph/subgraph.controller.js.map +1 -1
  219. package/build/ts/subgraph/subgraph.service.d.ts +4 -0
  220. package/build/ts/subgraph/subgraph.service.d.ts.map +1 -1
  221. package/build/ts/subgraph/subgraph.service.js +23 -10
  222. package/build/ts/subgraph/subgraph.service.js.map +1 -1
  223. package/build/ts/subgraph/types.d.ts +2 -2
  224. package/build/ts/subgraph/types.d.ts.map +1 -1
  225. package/build/tsconfig.build.tsbuildinfo +1 -1
  226. package/package.json +45 -38
  227. package/build/tests/e2e.aa.test.d.ts +0 -2
  228. package/build/tests/e2e.aa.test.d.ts.map +0 -1
  229. package/build/tests/e2e.aa.test.js +0 -103
  230. package/build/tests/e2e.aa.test.js.map +0 -1
  231. package/build/ts/deployer/utils.d.ts +0 -8
  232. package/build/ts/deployer/utils.d.ts.map +0 -1
  233. package/build/ts/deployer/utils.js +0 -9
  234. package/build/ts/deployer/utils.js.map +0 -1
@@ -7,29 +7,19 @@ 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
- var DeployerService_1;
11
- import { PubKey, VerifyingKey } from "@maci-protocol/domainobjs";
12
- import { ConstantInitialVoiceCreditProxy__factory as ConstantInitialVoiceCreditProxyFactory, ContractStorage, EPolicies, FreeForAllPolicy__factory as FreeForAllPolicyFactory, EASPolicy__factory as EASPolicyFactory, ZupassPolicy__factory as ZupassPolicyFactory, HatsPolicy__factory as HatsPolicyFactory, SemaphorePolicy__factory as SemaphorePolicyFactory, GitcoinPassportPolicy__factory as GitcoinPassportPolicyFactory, Verifier__factory as VerifierFactory, PoseidonT3__factory as PoseidonT3Factory, PoseidonT4__factory as PoseidonT4Factory, PoseidonT5__factory as PoseidonT5Factory, PoseidonT6__factory as PoseidonT6Factory, VkRegistry__factory as VkRegistryFactory, TallyFactory__factory as TallyFactoryFactory, PollFactory__factory as PollFactoryFactory, MessageProcessorFactory__factory as MessageProcessorFactoryFactory, MessageProcessor__factory as MessageProcessorFactory, ERC20VotesPolicy__factory as ERC20VotesPolicyFactory, ERC20Policy__factory as ERC20PolicyFactory, Tally__factory as TallyFactory, Poll__factory as PollFactory, MACI__factory as MACIFactory, EContracts, EInitialVoiceCreditProxies, EMode, deployPoll, extractAllVks, extractVk, genEmptyBallotRoots, } from "@maci-protocol/sdk";
13
- import { Injectable, Logger } from "@nestjs/common";
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, deployConstantInitialVoiceCreditProxyFactory, EInitialVoiceCreditProxiesFactories, } from "@maci-protocol/sdk";
11
+ import { Injectable } from "@nestjs/common";
14
12
  import { BaseContract } from "ethers";
15
- import { encodeFunctionData } from "viem";
16
- import path from "path";
17
13
  import { ErrorCodes } from "../common";
18
- import { getBundlerClient, getDeployedContractAddress, getPublicClient } from "../common/accountAbstraction";
14
+ import { getCoordinatorKeypair } from "../common/coordinatorKeypair";
19
15
  import { FileService } from "../file/file.service";
20
16
  import { SessionKeysService } from "../sessionKeys/sessionKeys.service";
21
- import { MAX_GAS_LIMIT } from "./constants";
22
- import { estimateExtraGasLimit } from "./utils";
23
17
  /**
24
18
  * DeployerService is responsible for deploying contracts.
25
19
  */
26
- let DeployerService = DeployerService_1 = class DeployerService {
20
+ let DeployerService = class DeployerService {
27
21
  sessionKeysService;
28
22
  fileService;
29
- /**
30
- * Logger
31
- */
32
- logger = new Logger(DeployerService_1.name);
33
23
  /**
34
24
  * Contract storage instance
35
25
  */
@@ -42,314 +32,334 @@ let DeployerService = DeployerService_1 = class DeployerService {
42
32
  constructor(sessionKeysService, fileService) {
43
33
  this.sessionKeysService = sessionKeysService;
44
34
  this.fileService = fileService;
45
- this.logger = new Logger(DeployerService_1.name);
46
- this.storage = ContractStorage.getInstance(path.join(process.cwd(), "deployed-contracts.json"));
35
+ this.storage = ContractStorage.getInstance();
47
36
  }
48
37
  /**
49
- * Get the policy abi and bytecode based on the policy type
50
- * and also check if there is already an instance deployed
38
+ * Get the policy contract object
39
+ * always deploy and save it
51
40
  *
52
- * @param policyType - the policy type
41
+ * @param signer - the signer
53
42
  * @param network - the network
54
- * @param args - the policy args
55
- * @returns - the policy abi and bytecode
43
+ * @param policyConfig - the policy configuration parameters
44
+ * @returns - the policy contract
56
45
  */
57
- getPolicyData(policyType, network, args) {
58
- const address = this.storage.getAddress(policyType, network);
59
- let storedArgs;
60
- let isAlreadyDeployed;
46
+ async deployAndSavePolicy(signer, network, policyConfig) {
47
+ let policyContract;
48
+ let checkerContract;
49
+ let policyFactory;
50
+ let checkFactory;
51
+ let policyFactoryName;
52
+ let checkFactoryName;
53
+ let factoryIsSaved;
54
+ let checkerIsSaved;
55
+ const { policyType, checkerType, args } = policyConfig;
61
56
  // based on the policy type, we need to deploy the correct policy
62
57
  switch (policyType) {
63
58
  case EPolicies.FreeForAll: {
64
- return {
65
- address,
66
- abi: FreeForAllPolicyFactory.abi,
67
- bytecode: FreeForAllPolicyFactory.bytecode,
68
- alreadyDeployed: !!address,
69
- };
59
+ policyFactoryName = EPolicyFactories.FreeForAll;
60
+ checkFactoryName = ECheckerFactories.FreeForAll;
61
+ const factories = await getDeployedPolicyProxyFactories({
62
+ policy: policyFactoryName,
63
+ checker: checkFactoryName,
64
+ network,
65
+ signer,
66
+ });
67
+ factoryIsSaved = !!factories.policy;
68
+ checkerIsSaved = !!factories.checker;
69
+ [policyContract, checkerContract, policyFactory, checkFactory] = await deployFreeForAllSignUpPolicy(factories, signer, true);
70
+ break;
70
71
  }
71
72
  case EPolicies.EAS: {
72
- storedArgs = this.storage.getContractArgs(policyType, network);
73
- isAlreadyDeployed =
74
- !!storedArgs &&
75
- storedArgs.length === 3 &&
76
- storedArgs[0] === args.easAddress &&
77
- storedArgs[1] === args.schema &&
78
- storedArgs[2] === args.attester;
79
- return {
80
- address: isAlreadyDeployed ? address : undefined,
81
- abi: EASPolicyFactory.abi,
82
- bytecode: EASPolicyFactory.bytecode,
83
- alreadyDeployed: isAlreadyDeployed,
84
- };
73
+ policyFactoryName = EPolicyFactories.EAS;
74
+ checkFactoryName = ECheckerFactories.EAS;
75
+ const factories = await getDeployedPolicyProxyFactories({
76
+ policy: policyFactoryName,
77
+ checker: checkFactoryName,
78
+ network,
79
+ signer,
80
+ });
81
+ factoryIsSaved = !!factories.policy;
82
+ checkerIsSaved = !!factories.checker;
83
+ [policyContract, checkerContract, policyFactory, checkFactory] = await deployEASSignUpPolicy({
84
+ eas: args.easAddress,
85
+ attester: args.attester,
86
+ schema: args.schema,
87
+ }, factories, signer, true);
88
+ break;
85
89
  }
86
- case EPolicies.Zupass: {
87
- storedArgs = this.storage.getContractArgs(policyType, network);
88
- isAlreadyDeployed =
89
- !!storedArgs &&
90
- storedArgs.length === 4 &&
91
- storedArgs[0] === args.signer1 &&
92
- storedArgs[1] === args.signer2 &&
93
- storedArgs[2] === args.eventId &&
94
- storedArgs[3] === args.zupassVerifier;
95
- return {
96
- address: isAlreadyDeployed ? address : undefined,
97
- abi: ZupassPolicyFactory.abi,
98
- bytecode: ZupassPolicyFactory.bytecode,
99
- alreadyDeployed: isAlreadyDeployed,
100
- };
90
+ case EPolicies.GitcoinPassport: {
91
+ policyFactoryName = EPolicyFactories.GitcoinPassport;
92
+ checkFactoryName = ECheckerFactories.GitcoinPassport;
93
+ const factories = await getDeployedPolicyProxyFactories({
94
+ policy: policyFactoryName,
95
+ checker: checkFactoryName,
96
+ network,
97
+ signer,
98
+ });
99
+ factoryIsSaved = !!factories.policy;
100
+ checkerIsSaved = !!factories.checker;
101
+ [policyContract, checkerContract, policyFactory, checkFactory] = await deployGitcoinPassportPolicy({
102
+ decoderAddress: args.decoderAddress,
103
+ minimumScore: Number(args.passingScore),
104
+ }, factories, signer, true);
105
+ break;
101
106
  }
102
107
  case EPolicies.Hats: {
103
- storedArgs = this.storage.getContractArgs(policyType, network);
104
- isAlreadyDeployed =
105
- !!storedArgs &&
106
- storedArgs.length === 2 &&
107
- storedArgs[0] === args.hatsProtocolAddress &&
108
- JSON.stringify(storedArgs[1]) === JSON.stringify(args.critrionHats);
109
- return {
110
- address: isAlreadyDeployed ? address : undefined,
111
- abi: HatsPolicyFactory.abi,
112
- bytecode: HatsPolicyFactory.bytecode,
113
- alreadyDeployed: isAlreadyDeployed,
114
- };
108
+ policyFactoryName = EPolicyFactories.Hats;
109
+ checkFactoryName = ECheckerFactories.Hats;
110
+ const factories = await getDeployedPolicyProxyFactories({
111
+ policy: policyFactoryName,
112
+ checker: checkFactoryName,
113
+ network,
114
+ signer,
115
+ });
116
+ factoryIsSaved = !!factories.policy;
117
+ checkerIsSaved = !!factories.checker;
118
+ [policyContract, checkerContract, policyFactory, checkFactory] = await deployHatsSignupPolicy({
119
+ hats: args.hatsProtocolAddress,
120
+ criterionHats: args.critrionHats.map((c) => BigInt(c)),
121
+ }, factories, signer, true);
122
+ break;
123
+ }
124
+ case EPolicies.Zupass: {
125
+ policyFactoryName = EPolicyFactories.Zupass;
126
+ checkFactoryName = ECheckerFactories.Zupass;
127
+ const factories = await getDeployedPolicyProxyFactories({
128
+ policy: policyFactoryName,
129
+ checker: checkFactoryName,
130
+ network,
131
+ signer,
132
+ });
133
+ factoryIsSaved = !!factories.policy;
134
+ checkerIsSaved = !!factories.checker;
135
+ [policyContract, checkerContract, policyFactory, checkFactory] = await deployZupassSignUpPolicy({
136
+ eventId: args.eventId,
137
+ signer1: args.signer1,
138
+ signer2: args.signer2,
139
+ verifier: args.zupassVerifier,
140
+ }, factories, signer, true);
141
+ break;
115
142
  }
116
143
  case EPolicies.Semaphore: {
117
- storedArgs = this.storage.getContractArgs(policyType, network);
118
- isAlreadyDeployed =
119
- !!storedArgs &&
120
- storedArgs.length === 2 &&
121
- storedArgs[0] === args.semaphoreContract &&
122
- storedArgs[1] === args.groupId;
123
- return {
124
- address: isAlreadyDeployed ? address : undefined,
125
- abi: SemaphorePolicyFactory.abi,
126
- bytecode: SemaphorePolicyFactory.bytecode,
127
- alreadyDeployed: isAlreadyDeployed,
128
- };
144
+ policyFactoryName = EPolicyFactories.Semaphore;
145
+ checkFactoryName = ECheckerFactories.Semaphore;
146
+ const factories = await getDeployedPolicyProxyFactories({
147
+ policy: policyFactoryName,
148
+ checker: checkFactoryName,
149
+ network,
150
+ signer,
151
+ });
152
+ factoryIsSaved = !!factories.policy;
153
+ checkerIsSaved = !!factories.checker;
154
+ [policyContract, checkerContract, policyFactory, checkFactory] = await deploySemaphoreSignupPolicy({
155
+ semaphore: args.semaphoreContract,
156
+ groupId: BigInt(args.groupId),
157
+ }, factories, signer, true);
158
+ break;
129
159
  }
130
- case EPolicies.GitcoinPassport: {
131
- storedArgs = this.storage.getContractArgs(policyType, network);
132
- isAlreadyDeployed =
133
- !!storedArgs &&
134
- storedArgs.length === 2 &&
135
- storedArgs[0] === args.decoderAddress &&
136
- storedArgs[1] === args.passingScore;
137
- return {
138
- address: isAlreadyDeployed ? address : undefined,
139
- abi: GitcoinPassportPolicyFactory.abi,
140
- bytecode: GitcoinPassportPolicyFactory.bytecode,
141
- alreadyDeployed: isAlreadyDeployed,
142
- };
160
+ case EPolicies.MerkleProof: {
161
+ policyFactoryName = EPolicyFactories.MerkleProof;
162
+ checkFactoryName = ECheckerFactories.MerkleProof;
163
+ const factories = await getDeployedPolicyProxyFactories({
164
+ policy: policyFactoryName,
165
+ checker: checkFactoryName,
166
+ network,
167
+ signer,
168
+ });
169
+ factoryIsSaved = !!factories.policy;
170
+ checkerIsSaved = !!factories.checker;
171
+ [policyContract, checkerContract, policyFactory, checkFactory] = await deployMerkleProofPolicy({
172
+ root: args.root,
173
+ }, factories, signer, true);
174
+ break;
143
175
  }
144
- case EPolicies.ERC20Votes: {
145
- storedArgs = this.storage.getContractArgs(policyType, network);
146
- isAlreadyDeployed =
147
- !!storedArgs &&
148
- storedArgs.length === 3 &&
149
- storedArgs[0] === args.token &&
150
- storedArgs[1] === args.factor &&
151
- storedArgs[2] === args.snapshotBlock;
152
- return {
153
- address: isAlreadyDeployed ? address : undefined,
154
- abi: ERC20VotesPolicyFactory.abi,
155
- bytecode: ERC20VotesPolicyFactory.bytecode,
156
- alreadyDeployed: isAlreadyDeployed,
157
- };
176
+ case EPolicies.Token: {
177
+ policyFactoryName = EPolicyFactories.Token;
178
+ checkFactoryName = ECheckerFactories.Token;
179
+ const factories = await getDeployedPolicyProxyFactories({
180
+ policy: policyFactoryName,
181
+ checker: checkFactoryName,
182
+ network,
183
+ signer,
184
+ });
185
+ factoryIsSaved = !!factories.policy;
186
+ checkerIsSaved = !!factories.checker;
187
+ [policyContract, checkerContract, policyFactory, checkFactory] = await deploySignupTokenPolicy({
188
+ token: args.token,
189
+ }, factories, signer, true);
190
+ break;
158
191
  }
159
- case EPolicies.ERC20: {
160
- storedArgs = this.storage.getContractArgs(policyType, network);
161
- isAlreadyDeployed =
162
- !!storedArgs &&
163
- storedArgs.length === 2 &&
164
- storedArgs[0] === args.token &&
165
- storedArgs[1] === args.threshold;
166
- return {
167
- address: isAlreadyDeployed ? address : undefined,
168
- abi: ERC20PolicyFactory.abi,
169
- bytecode: ERC20PolicyFactory.bytecode,
170
- alreadyDeployed: isAlreadyDeployed,
171
- };
192
+ case EPolicies.AnonAadhaar: {
193
+ policyFactoryName = EPolicyFactories.AnonAadhaar;
194
+ checkFactoryName = ECheckerFactories.AnonAadhaar;
195
+ const factories = await getDeployedPolicyProxyFactories({
196
+ policy: policyFactoryName,
197
+ checker: checkFactoryName,
198
+ network,
199
+ signer,
200
+ });
201
+ factoryIsSaved = !!factories.policy;
202
+ checkerIsSaved = !!factories.checker;
203
+ [policyContract, checkerContract, policyFactory, checkFactory] = await deployAnonAadhaarPolicy({
204
+ verifierAddress: args.verifier,
205
+ nullifierSeed: args.nullifierSeed,
206
+ }, factories, signer, true);
207
+ break;
208
+ }
209
+ case EPolicies.ERC20Votes: {
210
+ policyFactoryName = EPolicyFactories.ERC20Votes;
211
+ checkFactoryName = ECheckerFactories.ERC20Votes;
212
+ const factories = await getDeployedPolicyProxyFactories({
213
+ policy: policyFactoryName,
214
+ checker: checkFactoryName,
215
+ network,
216
+ signer,
217
+ });
218
+ factoryIsSaved = !!factories.policy;
219
+ checkerIsSaved = !!factories.checker;
220
+ [policyContract, checkerContract, policyFactory, checkFactory] = await deployERC20VotesPolicy({
221
+ snapshotBlock: BigInt(args.snapshotBlock),
222
+ threshold: BigInt(args.threshold),
223
+ token: args.token,
224
+ }, factories, signer, true);
225
+ break;
172
226
  }
173
227
  default:
174
228
  throw new Error(ErrorCodes.UNSUPPORTED_POLICY.toString());
175
229
  }
230
+ await this.storage.register({
231
+ id: policyType,
232
+ name: policyType,
233
+ contract: policyContract,
234
+ args: [await checkerContract.getAddress()],
235
+ network,
236
+ });
237
+ await this.storage.register({
238
+ id: checkerType,
239
+ name: checkerType,
240
+ contract: checkerContract,
241
+ args: args ? Object.values(args).map((arg) => String(arg)) : [],
242
+ network,
243
+ });
244
+ if (!factoryIsSaved) {
245
+ await this.storage.register({
246
+ id: policyFactoryName,
247
+ name: policyFactoryName,
248
+ contract: policyFactory,
249
+ network,
250
+ });
251
+ }
252
+ if (!checkerIsSaved) {
253
+ await this.storage.register({
254
+ id: checkFactoryName,
255
+ name: checkFactoryName,
256
+ contract: checkFactory,
257
+ network,
258
+ });
259
+ }
260
+ return policyContract;
176
261
  }
177
262
  /**
178
- * Get the voice credit proxy abi and bytecode based on the voice credit proxy type
179
- * and also check if there is already an instance deployed
263
+ * Get the voice credit proxy factory contract object
264
+ * always deploy and save it
180
265
  *
181
- * @param voiceCreditProxyType - the voice credit proxy type
266
+ * @param signer - the signer
267
+ * @param voiceCreditProxyFactoryType - the voice credit proxy factory type
182
268
  * @param network - the network
183
- * @param args - the voice credit proxy args
184
- * @returns - the voice credit proxy abi and bytecode
269
+ * @returns - the voice credit proxy factory contract
185
270
  */
186
- getVoiceCreditProxyData(voiceCreditProxyType, network, args) {
187
- let storedArgs;
188
- let isAlreadyDeployed;
189
- const address = this.storage.getAddress(voiceCreditProxyType, network);
190
- switch (voiceCreditProxyType) {
191
- case EInitialVoiceCreditProxies.Constant: {
192
- storedArgs = this.storage.getContractArgs(voiceCreditProxyType, network);
193
- isAlreadyDeployed = !!storedArgs && storedArgs[0] === args.amount;
194
- return {
195
- address: isAlreadyDeployed ? address : undefined,
196
- abi: ConstantInitialVoiceCreditProxyFactory.abi,
197
- bytecode: ConstantInitialVoiceCreditProxyFactory.bytecode,
198
- alreadyDeployed: isAlreadyDeployed,
199
- };
271
+ async deployAndSaveVoiceCreditProxyFactory(signer, voiceCreditProxyFactoryType, network) {
272
+ let contract;
273
+ switch (voiceCreditProxyFactoryType) {
274
+ case EInitialVoiceCreditProxiesFactories.Constant: {
275
+ contract = await deployConstantInitialVoiceCreditProxyFactory(signer, true);
276
+ break;
200
277
  }
201
278
  default:
202
- throw new Error(ErrorCodes.UNSUPPORTED_VOICE_CREDIT_PROXY.toString());
279
+ throw new Error(ErrorCodes.UNSUPPORTED_VOICE_CREDIT_PROXY_FACTORY.toString());
203
280
  }
204
- }
205
- /**
206
- * @param abi - the abi
207
- * @param bytecode - the bytecode
208
- * @param args - the args
209
- * @param publicClient - the public client
210
- * @returns - the address
211
- */
212
- async deployAndGetAddress(kernelClient, abi, bytecode, args, bundlerClient, publicClient) {
213
- const deployCallData = await kernelClient.account.encodeDeployCallData({
214
- abi,
215
- args,
216
- bytecode,
217
- });
218
- const gasPrice = await kernelClient.getUserOperationGasPrice();
219
- const opEstimate = await kernelClient.prepareUserOperation({
220
- callData: deployCallData,
221
- sender: kernelClient.account.address,
222
- maxFeePerGas: gasPrice.maxFeePerGas,
223
- maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
281
+ this.storage.register({
282
+ id: voiceCreditProxyFactoryType,
283
+ contract,
284
+ args: [],
285
+ network,
224
286
  });
225
- const callGasLimitMultiplier = estimateExtraGasLimit(opEstimate.callGasLimit);
226
- const tx = await kernelClient.sendUserOperation({
227
- callData: deployCallData,
228
- sender: kernelClient.account.address,
229
- maxFeePerGas: gasPrice.maxFeePerGas,
230
- maxPriorityFeePerGas: gasPrice.maxPriorityFeePerGas,
231
- callGasLimit: opEstimate.callGasLimit + callGasLimitMultiplier < MAX_GAS_LIMIT
232
- ? opEstimate.callGasLimit + callGasLimitMultiplier
233
- : MAX_GAS_LIMIT,
234
- });
235
- const receipt = await bundlerClient.waitForUserOperationReceipt({
236
- hash: tx,
237
- });
238
- const txReceipt = await publicClient.getTransactionReceipt({
239
- hash: receipt.receipt.transactionHash,
240
- });
241
- return getDeployedContractAddress(txReceipt);
287
+ return contract;
242
288
  }
243
289
  /**
244
- * Deploy a contract and store the address
290
+ * Get the voice credit proxy contract object
291
+ * always deploy and save it
245
292
  *
246
- * @param contract - the contract to deploy
293
+ * @param signer - the signer
294
+ * @param voiceCreditProxyType - the voice credit proxy type
295
+ * @param network - the network
296
+ * @param initialVoiceCreditProxyFactory - the initial voice credit proxy factory
247
297
  * @param args - the args
248
- * @param abi - the abi
249
- * @param bytecode - the bytecode
250
- * @param kernelClient - the kernel client
251
- * @param publicClient - the public client
252
- * @param chain - the chain
253
- * @returns - the address of the deployed contract
298
+ * @returns - the voice credit proxy contract
254
299
  */
255
- async deployAndStore(contract, args, abi, bytecode, kernelClient, bundlerClient, publicClient, chain) {
256
- let address = this.storage.getAddress(contract, chain);
257
- if (!address) {
258
- address = await this.deployAndGetAddress(kernelClient, abi, bytecode, args, bundlerClient, publicClient);
259
- if (!address) {
260
- this.logger.error(`Failed to deploy contract: ${contract}`);
261
- throw new Error(`${ErrorCodes.FAILED_TO_DEPLOY_CONTRACT} ${contract}`);
300
+ async deployAndSaveVoiceCreditProxy(signer, voiceCreditProxyType, network, initialVoiceCreditProxyFactory, args) {
301
+ let contract;
302
+ switch (voiceCreditProxyType) {
303
+ case EInitialVoiceCreditProxies.Constant: {
304
+ contract = await deployConstantInitialVoiceCreditProxy({
305
+ amount: args.amount,
306
+ }, initialVoiceCreditProxyFactory, signer);
307
+ break;
262
308
  }
263
- await this.storage.register({
264
- id: contract,
265
- contract: new BaseContract(address, abi),
266
- args: args.map((arg) => {
267
- if (Array.isArray(arg)) {
268
- return arg.map((a) => String(a));
269
- }
270
- return String(arg);
271
- }),
272
- network: chain,
273
- });
309
+ default:
310
+ throw new Error(ErrorCodes.UNSUPPORTED_VOICE_CREDIT_PROXY.toString());
274
311
  }
275
- return address;
276
- }
277
- /**
278
- * Estimate gas, add a bit extra and send the user operation (aka. transaction)
279
- * @param to - the to address of the user operation
280
- * @param value - the value of the user operation
281
- * @param abi - the abi
282
- * @param functionName - the function name
283
- * @param args - the args
284
- * @param errorMessage - the error message
285
- * @param kernelClient - the kernel client
286
- * @param bundlerClient - the bundler client
287
- */
288
- async estimateGasAndSend(to, value, abi, functionName, args, errorMessage, kernelClient, bundlerClient) {
289
- const gasEstimates = await kernelClient.getUserOperationGasPrice();
290
- const userOperation = {
291
- sender: kernelClient.account.address,
292
- maxFeePerGas: gasEstimates.maxFeePerGas,
293
- maxPriorityFeePerGas: gasEstimates.maxPriorityFeePerGas,
294
- callData: await kernelClient.account.encodeCalls([
295
- {
296
- to,
297
- value,
298
- data: encodeFunctionData({
299
- abi,
300
- functionName,
301
- args,
302
- }),
303
- },
304
- ]),
305
- };
306
- const opEstimate = await kernelClient.prepareUserOperation(userOperation);
307
- const callGasLimitMultiplier = estimateExtraGasLimit(opEstimate.callGasLimit);
308
- const userOperationHash = await kernelClient.sendUserOperation({
309
- ...userOperation,
310
- callGasLimit: opEstimate.callGasLimit + callGasLimitMultiplier < MAX_GAS_LIMIT
311
- ? opEstimate.callGasLimit + callGasLimitMultiplier
312
- : MAX_GAS_LIMIT,
312
+ await this.storage.register({
313
+ id: voiceCreditProxyType,
314
+ contract,
315
+ args: args ? Object.values(args).map((arg) => String(arg)) : [],
316
+ network,
313
317
  });
314
- const receipt = await bundlerClient.waitForUserOperationReceipt({ hash: userOperationHash });
315
- if (!receipt.success) {
316
- throw new Error(errorMessage);
317
- }
318
- return receipt;
318
+ return contract;
319
319
  }
320
320
  /**
321
321
  * Get verifying keys arguments (specially zkey paths)
322
322
  * @param signer - the signer
323
- * @param vkRegistryContract - the deployed vk registry contract
324
- * @param vkRegistryArgs - the arguments send to the endpoint
323
+ * @param verifyingKeysRegistryContract - the deployed verifyingKey registry contract
324
+ * @param verifyingKeysRegistryArgs - the arguments send to the endpoint
325
325
  * @param mode - use QV or NON_QV
326
326
  * @returns SetVerifyingKeysArgs
327
327
  */
328
- async getVerifyingKeysArgs(signer, vkRegistryContract, vkRegistryArgs, mode) {
329
- const pollJoiningZkeyPath = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_POLL_JOINING_ZKEY_NAME, true).zkey;
330
- const pollJoinedZkeyPath = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_POLL_JOINED_ZKEY_NAME, true).zkey;
331
- const processMessagesZkeyPath = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_MESSAGE_PROCESS_ZKEY_NAME, mode === EMode.QV).zkey;
332
- const tallyVotesZkeyPath = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_TALLY_ZKEY_NAME, mode === EMode.QV).zkey;
333
- const { pollJoiningVk, pollJoinedVk, processVk, tallyVk } = await extractAllVks({
328
+ async getVerifyingKeysArgs(signer, verifyingKeysRegistryAddress, verifyingKeysRegistryArgs, modes) {
329
+ const { zkey: pollJoiningZkeyPath } = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_POLL_JOINING_ZKEY_NAME);
330
+ const { zkey: pollJoinedZkeyPath } = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_POLL_JOINED_ZKEY_NAME);
331
+ const { pollJoiningVerifyingKey, pollJoinedVerifyingKey } = await extractAllVerifyingKeys({
334
332
  pollJoiningZkeyPath,
335
333
  pollJoinedZkeyPath,
336
- processMessagesZkeyPath,
337
- tallyVotesZkeyPath,
338
334
  });
339
- const { stateTreeDepth, intStateTreeDepth, voteOptionTreeDepth, pollStateTreeDepth, messageBatchSize } = vkRegistryArgs;
335
+ const processAndTallyVerifyingKeys = await Promise.all(modes.map(async (mode) => {
336
+ const { zkey: messageProcessorZkeyPath } = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_MESSAGE_PROCESS_ZKEY_NAME, mode);
337
+ // There are only QV and Non-QV modes available for tally circuit
338
+ const { zkey: voteTallyZkeyPath } = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_TALLY_ZKEY_NAME,
339
+ // if FULL use NON_QV because there are only VoteTallyQV and VoteTallyNonQV zkeys
340
+ mode === EMode.FULL ? EMode.NON_QV : mode);
341
+ const { processVerifyingKey, tallyVerifyingKey } = await extractAllVerifyingKeys({
342
+ messageProcessorZkeyPath,
343
+ voteTallyZkeyPath,
344
+ });
345
+ return { processVerifyingKey: processVerifyingKey, tallyVerifyingKey: tallyVerifyingKey };
346
+ }));
347
+ const processVerifyingKeys = processAndTallyVerifyingKeys.map((item) => item.processVerifyingKey);
348
+ const tallyVerifyingKeys = processAndTallyVerifyingKeys.map((item) => item.tallyVerifyingKey);
349
+ const { stateTreeDepth, pollStateTreeDepth, tallyProcessingStateTreeDepth, voteOptionTreeDepth, messageBatchSize } = verifyingKeysRegistryArgs;
340
350
  return {
341
- pollJoiningVk: pollJoiningVk,
342
- pollJoinedVk: pollJoinedVk,
343
- processMessagesVk: processVk,
344
- tallyVotesVk: tallyVk,
351
+ pollJoiningVerifyingKey: pollJoiningVerifyingKey,
352
+ pollJoinedVerifyingKey: pollJoinedVerifyingKey,
353
+ processMessagesVerifyingKeys: processVerifyingKeys,
354
+ tallyVotesVerifyingKeys: tallyVerifyingKeys,
345
355
  stateTreeDepth: Number(stateTreeDepth),
346
- intStateTreeDepth: Number(intStateTreeDepth),
356
+ tallyProcessingStateTreeDepth: Number(tallyProcessingStateTreeDepth),
347
357
  voteOptionTreeDepth: Number(voteOptionTreeDepth),
348
358
  messageBatchSize: Number(messageBatchSize),
349
359
  pollStateTreeDepth: Number(pollStateTreeDepth),
350
360
  signer,
351
- mode,
352
- vkRegistryAddress: await vkRegistryContract.getAddress(),
361
+ modes,
362
+ verifyingKeysRegistryAddress,
353
363
  };
354
364
  }
355
365
  /**
@@ -361,162 +371,47 @@ let DeployerService = DeployerService_1 = class DeployerService {
361
371
  * @returns the address of the deployed maci contract
362
372
  */
363
373
  async deployMaci({ approval, sessionKeyAddress, chain, config }) {
364
- const publicClient = getPublicClient(chain);
365
- const bundlerClient = getBundlerClient(chain);
366
- const kernelClient = await this.sessionKeysService.generateClientFromSessionKey(sessionKeyAddress, approval, chain);
367
- let policyAddress = this.storage.getAddress(config.policy.type, chain);
368
- const policyData = this.getPolicyData(config.policy.type, chain, config.policy.args);
369
- // if the policy is not already deployed, we need to deploy it
370
- if (!policyData.alreadyDeployed) {
371
- policyAddress = await this.deployAndStore(config.policy.type, config.policy.args ? Object.values(config.policy.args) : [], policyData.abi, policyData.bytecode, kernelClient, bundlerClient, publicClient, chain);
372
- }
373
- // deploy all maci contracts
374
- // (we are not using Promise.all because the write tx nonce should be sequential)
375
- // 1. verifier
376
- await this.deployAndStore(EContracts.Verifier, [], VerifierFactory.abi, VerifierFactory.bytecode, kernelClient, bundlerClient, publicClient, chain);
377
- // 2. poseidon
378
- let poseidonT3Address;
379
- let poseidonT4Address;
380
- let poseidonT5Address;
381
- let poseidonT6Address;
382
- if (config.Poseidon) {
383
- // Some times the poseidon contracts are already deployed so we don't need to deploy them again
384
- poseidonT3Address = config.Poseidon.poseidonT3;
385
- poseidonT4Address = config.Poseidon.poseidonT4;
386
- poseidonT5Address = config.Poseidon.poseidonT5;
387
- poseidonT6Address = config.Poseidon.poseidonT6;
388
- }
389
- else {
390
- poseidonT3Address = await this.deployAndStore(EContracts.PoseidonT3, [], PoseidonT3Factory.abi, PoseidonT3Factory.bytecode, kernelClient, bundlerClient, publicClient, chain);
391
- poseidonT4Address = await this.deployAndStore(EContracts.PoseidonT4, [], PoseidonT4Factory.abi, PoseidonT4Factory.bytecode, kernelClient, bundlerClient, publicClient, chain);
392
- poseidonT5Address = await this.deployAndStore(EContracts.PoseidonT5, [], PoseidonT5Factory.abi, PoseidonT5Factory.bytecode, kernelClient, bundlerClient, publicClient, chain);
393
- poseidonT6Address = await this.deployAndStore(EContracts.PoseidonT6, [], PoseidonT6Factory.abi, PoseidonT6Factory.bytecode, kernelClient, bundlerClient, publicClient, chain);
394
- }
395
- // 3. factories
396
- const pollFactoryAddress = await this.deployAndStore(EContracts.PollFactory, [], PollFactoryFactory.abi, PollFactoryFactory.linkBytecode({
397
- "contracts/crypto/PoseidonT3.sol:PoseidonT3": poseidonT3Address,
398
- "contracts/crypto/PoseidonT4.sol:PoseidonT4": poseidonT4Address,
399
- "contracts/crypto/PoseidonT5.sol:PoseidonT5": poseidonT5Address,
400
- "contracts/crypto/PoseidonT6.sol:PoseidonT6": poseidonT6Address,
401
- }), kernelClient, bundlerClient, publicClient, chain);
402
- const tallyFactoryAddress = await this.deployAndStore(EContracts.TallyFactory, [], TallyFactoryFactory.abi, TallyFactoryFactory.linkBytecode({
403
- "contracts/crypto/PoseidonT3.sol:PoseidonT3": poseidonT3Address,
404
- "contracts/crypto/PoseidonT4.sol:PoseidonT4": poseidonT4Address,
405
- "contracts/crypto/PoseidonT5.sol:PoseidonT5": poseidonT5Address,
406
- "contracts/crypto/PoseidonT6.sol:PoseidonT6": poseidonT6Address,
407
- }), kernelClient, bundlerClient, publicClient, chain);
408
- const messageProcessorFactoryAddress = await this.deployAndStore(EContracts.MessageProcessorFactory, [], MessageProcessorFactoryFactory.abi, MessageProcessorFactoryFactory.linkBytecode({
409
- "contracts/crypto/PoseidonT3.sol:PoseidonT3": poseidonT3Address,
410
- "contracts/crypto/PoseidonT4.sol:PoseidonT4": poseidonT4Address,
411
- "contracts/crypto/PoseidonT5.sol:PoseidonT5": poseidonT5Address,
412
- "contracts/crypto/PoseidonT6.sol:PoseidonT6": poseidonT6Address,
413
- }), kernelClient, bundlerClient, publicClient, chain);
414
- // 4. VkRegistry
415
- const vkRegistryAddress = await this.deployAndStore(EContracts.VkRegistry, [], VkRegistryFactory.abi, VkRegistryFactory.bytecode, kernelClient, bundlerClient, publicClient, chain);
416
- try {
417
- const processMessagesZkeyPathQv = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_MESSAGE_PROCESS_ZKEY_NAME, true);
418
- const tallyVotesZkeyPathQv = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_TALLY_ZKEY_NAME, true);
419
- const processMessagesZkeyPathNonQv = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_MESSAGE_PROCESS_ZKEY_NAME, false);
420
- const tallyVotesZkeyPathNonQv = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_TALLY_ZKEY_NAME, false);
421
- const pollJoiningZkeyPath = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_POLL_JOINING_ZKEY_NAME, true);
422
- const pollJoinedZkeyPath = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_POLL_JOINED_ZKEY_NAME, true);
423
- const [qvProcessVk, qvTallyVk, nonQvProcessVk, nonQvTallyVk, pollJoiningVk, pollJoinedVk] = await Promise.all([
424
- extractVk(processMessagesZkeyPathQv.zkey),
425
- extractVk(tallyVotesZkeyPathQv.zkey),
426
- extractVk(processMessagesZkeyPathNonQv.zkey),
427
- extractVk(tallyVotesZkeyPathNonQv.zkey),
428
- extractVk(pollJoiningZkeyPath.zkey),
429
- extractVk(pollJoinedZkeyPath.zkey),
430
- ]).then((vks) => vks.map((vk) => vk && VerifyingKey.fromObj(vk).asContractParam()));
431
- const processZkeys = [qvProcessVk, nonQvProcessVk].filter(Boolean);
432
- const tallyZkeys = [qvTallyVk, nonQvTallyVk].filter(Boolean);
433
- // check if the keys are already set
434
- const [isProcessVkSet, isProcessNonQvVkSet, isTallyVkSet, isTallyNonQvVkSet] = await Promise.all([
435
- publicClient.readContract({
436
- address: vkRegistryAddress,
437
- abi: VkRegistryFactory.abi,
438
- functionName: "hasProcessVk",
439
- args: [
440
- config.VkRegistry.args.stateTreeDepth,
441
- config.VkRegistry.args.voteOptionTreeDepth,
442
- config.VkRegistry.args.messageBatchSize,
443
- EMode.QV,
444
- ],
445
- }),
446
- publicClient.readContract({
447
- address: vkRegistryAddress,
448
- abi: VkRegistryFactory.abi,
449
- functionName: "hasProcessVk",
450
- args: [
451
- config.VkRegistry.args.stateTreeDepth,
452
- config.VkRegistry.args.voteOptionTreeDepth,
453
- config.VkRegistry.args.messageBatchSize,
454
- EMode.NON_QV,
455
- ],
456
- }),
457
- publicClient.readContract({
458
- address: vkRegistryAddress,
459
- abi: VkRegistryFactory.abi,
460
- functionName: "hasTallyVk",
461
- args: [
462
- config.VkRegistry.args.stateTreeDepth,
463
- config.VkRegistry.args.intStateTreeDepth,
464
- config.VkRegistry.args.voteOptionTreeDepth,
465
- EMode.QV,
466
- ],
467
- }),
468
- publicClient.readContract({
469
- address: vkRegistryAddress,
470
- abi: VkRegistryFactory.abi,
471
- functionName: "hasTallyVk",
472
- args: [
473
- config.VkRegistry.args.stateTreeDepth,
474
- config.VkRegistry.args.intStateTreeDepth,
475
- config.VkRegistry.args.voteOptionTreeDepth,
476
- EMode.NON_QV,
477
- ],
478
- }),
479
- ]);
480
- if (isProcessVkSet && isProcessNonQvVkSet && isTallyVkSet && isTallyNonQvVkSet) {
481
- this.logger.debug("Verifying keys are already set on the vk registry");
482
- }
483
- else {
484
- await this.estimateGasAndSend(vkRegistryAddress, 0n, VkRegistryFactory.abi, "setVerifyingKeysBatch", [
485
- config.VkRegistry.args.stateTreeDepth,
486
- config.VkRegistry.args.pollStateTreeDepth,
487
- config.VkRegistry.args.intStateTreeDepth,
488
- config.VkRegistry.args.voteOptionTreeDepth,
489
- config.VkRegistry.args.messageBatchSize,
490
- [EMode.QV, EMode.NON_QV],
491
- pollJoiningVk,
492
- pollJoinedVk,
493
- processZkeys,
494
- tallyZkeys,
495
- ], ErrorCodes.FAILED_TO_SET_VERIFYING_KEYS_ON_VK_REGISTRY.toString(), kernelClient, bundlerClient);
496
- }
497
- }
498
- catch (error) {
499
- this.logger.error("Failed to set verifying keys on vk registry: ", error);
500
- throw error;
501
- }
502
- // 5. maci (here we don't check whether one is already deployed, we just deploy it)
503
- const emptyBallotRoots = genEmptyBallotRoots(config.MACI.stateTreeDepth);
504
- const maciAddress = await this.deployAndStore(EContracts.MACI, [
505
- pollFactoryAddress,
506
- messageProcessorFactoryAddress,
507
- tallyFactoryAddress,
508
- policyAddress,
509
- config.MACI.stateTreeDepth,
510
- emptyBallotRoots,
511
- ], MACIFactory.abi, MACIFactory.linkBytecode({
512
- "contracts/crypto/PoseidonT3.sol:PoseidonT3": "0x07490eba00dc4ACA6721D052Fa4C5002Aa077233",
513
- "contracts/crypto/PoseidonT4.sol:PoseidonT4": "0xbb0e724CE02e5E7eDd31e632dc6e59F229a1126d",
514
- "contracts/crypto/PoseidonT5.sol:PoseidonT5": "0xE0398F7DFAC494c530F6404AfEaC8669ABeD2679",
515
- "contracts/crypto/PoseidonT6.sol:PoseidonT6": "0xfD77833F10a29c76A6a0ede235Eb651D744d0E2F",
516
- }), kernelClient, bundlerClient, publicClient, chain);
517
- // set the gate on the policy
518
- await this.estimateGasAndSend(policyAddress, 0n, policyData.abi, "setTarget", [maciAddress], ErrorCodes.FAILED_TO_SET_MACI_INSTANCE_ON_POLICY.toString(), kernelClient, bundlerClient);
519
- return { address: maciAddress };
374
+ const signer = await this.sessionKeysService.getCoordinatorSigner(chain, sessionKeyAddress, approval);
375
+ const policyContract = await this.deployAndSavePolicy(signer, chain, config.policy);
376
+ const policyAddress = await policyContract.getAddress();
377
+ const verifierContract = await deployVerifier(signer, true);
378
+ const verifyingKeysRegistryAddress = await deployVerifyingKeysRegistryContract({ signer });
379
+ const verifyingKeysArgs = await this.getVerifyingKeysArgs(signer, verifyingKeysRegistryAddress, config.VerifyingKeysRegistry.args, config.MACI.modes);
380
+ await setVerifyingKeys(verifyingKeysArgs);
381
+ // deploy the smart contracts
382
+ const maciAddresses = await deployMaci({
383
+ stateTreeDepth: config.MACI.stateTreeDepth,
384
+ signer,
385
+ signupPolicyAddress: policyAddress,
386
+ poseidonAddresses: config.Poseidon,
387
+ });
388
+ // store the contracts
389
+ await Promise.all([
390
+ this.storage.register({
391
+ id: EContracts.Verifier,
392
+ contract: verifierContract,
393
+ network: chain,
394
+ }),
395
+ this.storage.register({
396
+ id: EContracts.VerifyingKeysRegistry,
397
+ contract: new BaseContract(verifyingKeysRegistryAddress, VerifyingKeysRegistryFactory.abi),
398
+ network: chain,
399
+ }),
400
+ this.storage.register({
401
+ id: EContracts.MACI,
402
+ contract: new BaseContract(maciAddresses.maciContractAddress, MACIFactory.abi),
403
+ args: [
404
+ maciAddresses.pollFactoryContractAddress,
405
+ maciAddresses.messageProcessorFactoryContractAddress,
406
+ maciAddresses.tallyFactoryContractAddress,
407
+ policyAddress,
408
+ config.MACI.stateTreeDepth,
409
+ generateEmptyBallotRoots(config.MACI.stateTreeDepth).map((root) => root.toString()),
410
+ ],
411
+ network: chain,
412
+ }),
413
+ ]);
414
+ return { address: maciAddresses.maciContractAddress };
520
415
  }
521
416
  /**
522
417
  * Deploy a poll
@@ -525,10 +420,7 @@ let DeployerService = DeployerService_1 = class DeployerService {
525
420
  * @returns poll id
526
421
  */
527
422
  async deployPoll({ approval, sessionKeyAddress, chain, config }) {
528
- const publicClient = getPublicClient(chain);
529
- const bundlerClient = getBundlerClient(chain);
530
- const kernelClient = await this.sessionKeysService.generateClientFromSessionKey(sessionKeyAddress, approval, chain);
531
- const signer = await this.sessionKeysService.getKernelClientSigner(kernelClient);
423
+ const signer = await this.sessionKeysService.getCoordinatorSigner(chain, sessionKeyAddress, approval);
532
424
  // check if there is a maci contract deployed on this chain
533
425
  const maciAddress = this.storage.getAddress(EContracts.MACI, chain);
534
426
  if (!maciAddress) {
@@ -539,90 +431,74 @@ let DeployerService = DeployerService_1 = class DeployerService {
539
431
  if (!verifierAddress) {
540
432
  throw new Error(ErrorCodes.VERIFIER_NOT_DEPLOYED.toString());
541
433
  }
542
- // check if there is a vk registry deployed on this chain
543
- const vkRegistryAddress = this.storage.getAddress(EContracts.VkRegistry, chain);
544
- if (!vkRegistryAddress) {
545
- throw new Error(ErrorCodes.VK_REGISTRY_NOT_DEPLOYED.toString());
546
- }
547
- // check if policy address was given
548
- let policyAddress = config.policy.address;
549
- if (!policyAddress) {
550
- const policyData = this.getPolicyData(config.policy.type, chain, config.policy.args);
551
- policyAddress = policyData.address;
552
- // if the policy is not already deployed, we need to deploy it
553
- if (!policyData.alreadyDeployed) {
554
- policyAddress = await this.deployAndStore(config.policy.type, config.policy.args ? Object.values(config.policy.args) : [], policyData.abi, policyData.bytecode, kernelClient, bundlerClient, publicClient, chain);
555
- }
434
+ // check if there is a verifyingKey registry deployed on this chain
435
+ const verifyingKeysRegistryAddress = this.storage.getAddress(EContracts.VerifyingKeysRegistry, chain);
436
+ if (!verifyingKeysRegistryAddress) {
437
+ throw new Error(ErrorCodes.VERIFYING_KEYS_REGISTRY_NOT_DEPLOYED.toString());
556
438
  }
439
+ const policyContract = await this.deployAndSavePolicy(signer, chain, config.policy);
440
+ const policyAddress = (await policyContract.getAddress());
557
441
  // check if initial voice credit proxy address was given
558
442
  let initialVoiceCreditProxyAddress = config.initialVoiceCreditsProxy.address;
559
443
  if (!initialVoiceCreditProxyAddress) {
560
- const voiceCreditProxyData = this.getVoiceCreditProxyData(config.initialVoiceCreditsProxy.type, chain, config.initialVoiceCreditsProxy.args);
561
- initialVoiceCreditProxyAddress = voiceCreditProxyData.address;
562
- // if the voice credit proxy is not already deployed, we need to deploy it
563
- if (!voiceCreditProxyData.alreadyDeployed) {
564
- initialVoiceCreditProxyAddress = await this.deployAndStore(config.initialVoiceCreditsProxy.type, Object.values(config.initialVoiceCreditsProxy.args), voiceCreditProxyData.abi, voiceCreditProxyData.bytecode, kernelClient, bundlerClient, publicClient, chain);
565
- }
444
+ const initialVoiceCreditProxyFactory = await this.deployAndSaveVoiceCreditProxyFactory(signer, config.initialVoiceCreditsProxy.factoryType, chain);
445
+ const initialVoiceCreditProxyContract = await this.deployAndSaveVoiceCreditProxy(signer, config.initialVoiceCreditsProxy.type, chain, initialVoiceCreditProxyFactory, config.initialVoiceCreditsProxy.args);
446
+ initialVoiceCreditProxyAddress = await initialVoiceCreditProxyContract.getAddress();
566
447
  }
567
- const mode = config.useQuadraticVoting ? EMode.QV : EMode.NON_QV;
448
+ // instantiate the coordinator MACI keypair
449
+ const coordinatorKeypair = getCoordinatorKeypair();
568
450
  const deployPollArgs = {
569
451
  maciAddress,
570
452
  pollStartTimestamp: config.startDate,
571
453
  pollEndTimestamp: config.endDate,
572
- intStateTreeDepth: config.intStateTreeDepth,
454
+ tallyProcessingStateTreeDepth: config.tallyProcessingStateTreeDepth,
573
455
  voteOptionTreeDepth: config.voteOptionTreeDepth,
574
456
  messageBatchSize: config.messageBatchSize,
575
457
  stateTreeDepth: config.pollStateTreeDepth,
576
- coordinatorPubKey: PubKey.deserialize(config.coordinatorPubkey),
458
+ coordinatorPublicKey: coordinatorKeypair.publicKey,
577
459
  verifierContractAddress: verifierAddress,
578
- vkRegistryContractAddress: vkRegistryAddress,
579
- mode,
460
+ verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
461
+ mode: config.mode,
580
462
  policyContractAddress: policyAddress,
581
463
  initialVoiceCreditProxyContractAddress: initialVoiceCreditProxyAddress,
582
- relayers: config.relayers ? config.relayers.map((address) => address) : [],
464
+ relayers: config.relayers ? config.relayers : [],
583
465
  voteOptions: Number(config.voteOptions),
584
466
  initialVoiceCredits: Number(config.initialVoiceCreditsProxy.args.amount),
585
467
  signer,
586
468
  };
587
469
  const { pollContractAddress, messageProcessorContractAddress, tallyContractAddress, pollId } = await deployPoll(deployPollArgs);
588
470
  const poll = PollFactory.connect(pollContractAddress, signer);
589
- // read the emptyBallotRoot and extContracts
590
- const emptyBallotRoot = await poll.emptyBallotRoot();
591
- const extContracts = await poll.extContracts();
592
471
  // store to storage
593
472
  await Promise.all([
594
473
  this.storage.register({
595
474
  id: EContracts.Poll,
596
475
  key: `poll-${pollId}`,
597
476
  contract: poll,
598
- args: [
599
- {
600
- ...deployPollArgs,
601
- extContracts,
602
- emptyBallotRoot: emptyBallotRoot.toString(),
603
- },
604
- ],
477
+ // clones do not have args for verification
478
+ args: [],
605
479
  network: chain,
606
480
  }),
607
481
  this.storage.register({
608
482
  id: EContracts.MessageProcessor,
609
483
  key: `poll-${pollId}`,
610
- contract: new BaseContract(messageProcessorContractAddress, MessageProcessorFactory.abi),
611
- args: [verifierAddress, vkRegistryAddress, pollContractAddress, mode],
484
+ contract: MessageProcessorFactory.connect(messageProcessorContractAddress, signer),
485
+ // clones do not have args for verification
486
+ args: [],
612
487
  network: chain,
613
488
  }),
614
489
  this.storage.register({
615
490
  id: EContracts.Tally,
616
491
  key: `poll-${pollId}`,
617
- contract: new BaseContract(tallyContractAddress, TallyFactory.abi),
618
- args: [verifierAddress, vkRegistryAddress, pollContractAddress, messageProcessorContractAddress, mode],
492
+ contract: TallyFactory.connect(tallyContractAddress, signer),
493
+ // clones do not have args for verification
494
+ args: [],
619
495
  network: chain,
620
496
  }),
621
497
  ]);
622
498
  return { pollId: pollId.toString() };
623
499
  }
624
500
  };
625
- DeployerService = DeployerService_1 = __decorate([
501
+ DeployerService = __decorate([
626
502
  Injectable(),
627
503
  __metadata("design:paramtypes", [SessionKeysService,
628
504
  FileService])