@maci-protocol/coordinator 0.0.0-ci.ec5a063 → 0.0.0-ci.eea13a2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +18 -0
- package/build/hardhat.config.cjs +2 -3
- package/build/hardhat.config.cjs.map +1 -1
- package/build/hardhat.config.d.cts +2 -4
- package/build/scripts/generateKeypair.js +2 -2
- package/build/scripts/generateKeypair.js.map +1 -1
- package/build/tests/e2e.deploy.test.js +57 -49
- package/build/tests/e2e.deploy.test.js.map +1 -1
- package/build/tests/e2e.redis.test.d.ts +2 -0
- package/build/tests/e2e.redis.test.d.ts.map +1 -0
- package/build/tests/e2e.redis.test.js +119 -0
- package/build/tests/e2e.redis.test.js.map +1 -0
- package/build/tests/utils.d.ts.map +1 -1
- package/build/tests/utils.js +2 -2
- package/build/tests/utils.js.map +1 -1
- package/build/ts/app.module.d.ts.map +1 -1
- package/build/ts/app.module.js +6 -0
- package/build/ts/app.module.js.map +1 -1
- package/build/ts/common/__tests__/common.test.js +11 -21
- package/build/ts/common/__tests__/common.test.js.map +1 -1
- package/build/ts/common/accountAbstraction.d.ts +1 -1
- package/build/ts/common/accountAbstraction.d.ts.map +1 -1
- package/build/ts/common/accountAbstraction.js +5 -6
- package/build/ts/common/accountAbstraction.js.map +1 -1
- package/build/ts/common/chain.d.ts +4 -4
- package/build/ts/common/chain.d.ts.map +1 -1
- package/build/ts/common/chain.js +14 -16
- package/build/ts/common/chain.js.map +1 -1
- package/build/ts/common/coordinatorKeypair.d.ts +7 -0
- package/build/ts/common/coordinatorKeypair.d.ts.map +1 -0
- package/build/ts/common/coordinatorKeypair.js +14 -0
- package/build/ts/common/coordinatorKeypair.js.map +1 -0
- package/build/ts/common/errors.d.ts +16 -12
- package/build/ts/common/errors.d.ts.map +1 -1
- package/build/ts/common/errors.js +16 -12
- package/build/ts/common/errors.js.map +1 -1
- package/build/ts/deployer/__tests__/deployer.controller.test.js +17 -20
- package/build/ts/deployer/__tests__/deployer.controller.test.js.map +1 -1
- package/build/ts/deployer/__tests__/deployer.service.test.js +161 -79
- package/build/ts/deployer/__tests__/deployer.service.test.js.map +1 -1
- package/build/ts/deployer/__tests__/utils.d.ts +2 -6
- package/build/ts/deployer/__tests__/utils.d.ts.map +1 -1
- package/build/ts/deployer/__tests__/utils.js +6 -10
- package/build/ts/deployer/__tests__/utils.js.map +1 -1
- package/build/ts/deployer/deployer.service.d.ts +17 -7
- package/build/ts/deployer/deployer.service.d.ts.map +1 -1
- package/build/ts/deployer/deployer.service.js +215 -58
- package/build/ts/deployer/deployer.service.js.map +1 -1
- package/build/ts/deployer/types.d.ts +18 -14
- package/build/ts/deployer/types.d.ts.map +1 -1
- package/build/ts/file/__tests__/file.service.test.js +9 -9
- package/build/ts/file/__tests__/file.service.test.js.map +1 -1
- package/build/ts/file/file.service.d.ts +2 -2
- package/build/ts/file/file.service.d.ts.map +1 -1
- package/build/ts/file/file.service.js +9 -8
- package/build/ts/file/file.service.js.map +1 -1
- package/build/ts/file/types.d.ts +2 -2
- package/build/ts/file/types.d.ts.map +1 -1
- package/build/ts/health/__tests__/health.controller.test.d.ts +2 -0
- package/build/ts/health/__tests__/health.controller.test.d.ts.map +1 -0
- package/build/ts/health/__tests__/health.controller.test.js +52 -0
- package/build/ts/health/__tests__/health.controller.test.js.map +1 -0
- package/build/ts/health/__tests__/health.service.test.d.ts +2 -0
- package/build/ts/health/__tests__/health.service.test.d.ts.map +1 -0
- package/build/ts/health/__tests__/health.service.test.js +101 -0
- package/build/ts/health/__tests__/health.service.test.js.map +1 -0
- package/build/ts/health/health.controller.d.ts +16 -0
- package/build/ts/health/health.controller.d.ts.map +1 -0
- package/build/ts/health/health.controller.js +43 -0
- package/build/ts/health/health.controller.js.map +1 -0
- package/build/ts/health/health.module.d.ts +3 -0
- package/build/ts/health/health.module.d.ts.map +1 -0
- package/build/ts/health/health.module.js +22 -0
- package/build/ts/health/health.module.js.map +1 -0
- package/build/ts/health/health.service.d.ts +42 -0
- package/build/ts/health/health.service.d.ts.map +1 -0
- package/build/ts/health/health.service.js +176 -0
- package/build/ts/health/health.service.js.map +1 -0
- package/build/ts/health/types.d.ts +87 -0
- package/build/ts/health/types.d.ts.map +1 -0
- package/build/ts/health/types.js +2 -0
- package/build/ts/health/types.js.map +1 -0
- package/build/ts/proof/__tests__/proof.controller.test.js +0 -1
- package/build/ts/proof/__tests__/proof.controller.test.js.map +1 -1
- package/build/ts/proof/__tests__/proof.gateway.test.js +0 -1
- package/build/ts/proof/__tests__/proof.gateway.test.js.map +1 -1
- package/build/ts/proof/__tests__/proof.service.test.js +26 -72
- package/build/ts/proof/__tests__/proof.service.test.js.map +1 -1
- package/build/ts/proof/dto.d.ts +0 -4
- package/build/ts/proof/dto.d.ts.map +1 -1
- package/build/ts/proof/dto.js +1 -16
- package/build/ts/proof/dto.js.map +1 -1
- package/build/ts/proof/proof.controller.d.ts.map +1 -1
- package/build/ts/proof/proof.controller.js +1 -4
- package/build/ts/proof/proof.controller.js.map +1 -1
- package/build/ts/proof/proof.service.d.ts +2 -4
- package/build/ts/proof/proof.service.d.ts.map +1 -1
- package/build/ts/proof/proof.service.js +23 -25
- package/build/ts/proof/proof.service.js.map +1 -1
- package/build/ts/proof/types.d.ts +1 -4
- package/build/ts/proof/types.d.ts.map +1 -1
- package/build/ts/redis/__tests__/redis.service.test.d.ts +2 -0
- package/build/ts/redis/__tests__/redis.service.test.d.ts.map +1 -0
- package/build/ts/redis/__tests__/redis.service.test.js +149 -0
- package/build/ts/redis/__tests__/redis.service.test.js.map +1 -0
- package/build/ts/redis/redis.module.d.ts +3 -0
- package/build/ts/redis/redis.module.d.ts.map +1 -0
- package/build/ts/redis/redis.module.js +18 -0
- package/build/ts/redis/redis.module.js.map +1 -0
- package/build/ts/redis/redis.service.d.ts +52 -0
- package/build/ts/redis/redis.service.d.ts.map +1 -0
- package/build/ts/redis/redis.service.js +97 -0
- package/build/ts/redis/redis.service.js.map +1 -0
- package/build/ts/redis/types.d.ts +54 -0
- package/build/ts/redis/types.d.ts.map +1 -0
- package/build/ts/redis/types.js +2 -0
- package/build/ts/redis/types.js.map +1 -0
- package/build/ts/redis/utils.d.ts +20 -0
- package/build/ts/redis/utils.d.ts.map +1 -0
- package/build/ts/redis/utils.js +27 -0
- package/build/ts/redis/utils.js.map +1 -0
- package/build/ts/scheduler/__tests__/scheduler.controller.test.d.ts +2 -0
- package/build/ts/scheduler/__tests__/scheduler.controller.test.d.ts.map +1 -0
- package/build/ts/scheduler/__tests__/scheduler.controller.test.js +63 -0
- package/build/ts/scheduler/__tests__/scheduler.controller.test.js.map +1 -0
- package/build/ts/scheduler/__tests__/scheduler.service.test.d.ts +2 -0
- package/build/ts/scheduler/__tests__/scheduler.service.test.d.ts.map +1 -0
- package/build/ts/scheduler/__tests__/scheduler.service.test.js +264 -0
- package/build/ts/scheduler/__tests__/scheduler.service.test.js.map +1 -0
- package/build/ts/scheduler/dto.d.ts +42 -0
- package/build/ts/scheduler/dto.d.ts.map +1 -0
- package/build/ts/scheduler/dto.js +116 -0
- package/build/ts/scheduler/dto.js.map +1 -0
- package/build/ts/scheduler/scheduler.controller.d.ts +32 -0
- package/build/ts/scheduler/scheduler.controller.d.ts.map +1 -0
- package/build/ts/scheduler/scheduler.controller.js +111 -0
- package/build/ts/scheduler/scheduler.controller.js.map +1 -0
- package/build/ts/scheduler/scheduler.module.d.ts +3 -0
- package/build/ts/scheduler/scheduler.module.d.ts.map +1 -0
- package/build/ts/scheduler/scheduler.module.js +23 -0
- package/build/ts/scheduler/scheduler.module.js.map +1 -0
- package/build/ts/scheduler/scheduler.service.d.ts +63 -0
- package/build/ts/scheduler/scheduler.service.d.ts.map +1 -0
- package/build/ts/scheduler/scheduler.service.js +239 -0
- package/build/ts/scheduler/scheduler.service.js.map +1 -0
- package/build/ts/scheduler/types.d.ts +61 -0
- package/build/ts/scheduler/types.d.ts.map +1 -0
- package/build/ts/scheduler/types.js +2 -0
- package/build/ts/scheduler/types.js.map +1 -0
- package/build/ts/sessionKeys/__tests__/sessionKeys.controller.test.js +2 -2
- package/build/ts/sessionKeys/__tests__/sessionKeys.controller.test.js.map +1 -1
- package/build/ts/sessionKeys/__tests__/sessionKeys.service.test.js +30 -16
- package/build/ts/sessionKeys/__tests__/sessionKeys.service.test.js.map +1 -1
- package/build/ts/sessionKeys/__tests__/utils.d.ts.map +1 -1
- package/build/ts/sessionKeys/__tests__/utils.js +4 -5
- package/build/ts/sessionKeys/__tests__/utils.js.map +1 -1
- package/build/ts/sessionKeys/sessionKeys.service.d.ts.map +1 -1
- package/build/ts/sessionKeys/sessionKeys.service.js +1 -2
- package/build/ts/sessionKeys/sessionKeys.service.js.map +1 -1
- package/build/ts/subgraph/__tests__/subgraph.service.test.js +2 -3
- package/build/ts/subgraph/__tests__/subgraph.service.test.js.map +1 -1
- package/build/ts/subgraph/subgraph.service.d.ts +4 -0
- package/build/ts/subgraph/subgraph.service.d.ts.map +1 -1
- package/build/ts/subgraph/subgraph.service.js +16 -5
- package/build/ts/subgraph/subgraph.service.js.map +1 -1
- package/build/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +38 -35
- package/build/tests/e2e.aa.test.d.ts +0 -2
- package/build/tests/e2e.aa.test.d.ts.map +0 -1
- package/build/tests/e2e.aa.test.js +0 -106
- package/build/tests/e2e.aa.test.js.map +0 -1
|
@@ -7,13 +7,11 @@ 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/
|
|
11
|
-
import { PublicKey } from "@maci-protocol/domainobjs";
|
|
12
|
-
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, deployConstantInitialVoiceCreditProxyFactory, EInitialVoiceCreditProxiesFactories, } from "@maci-protocol/sdk";
|
|
13
11
|
import { Injectable } from "@nestjs/common";
|
|
14
12
|
import { BaseContract } from "ethers";
|
|
15
|
-
import path from "path";
|
|
16
13
|
import { ErrorCodes } from "../common";
|
|
14
|
+
import { getCoordinatorKeypair } from "../common/coordinatorKeypair";
|
|
17
15
|
import { FileService } from "../file/file.service";
|
|
18
16
|
import { SessionKeysService } from "../sessionKeys/sessionKeys.service";
|
|
19
17
|
/**
|
|
@@ -34,100 +32,250 @@ let DeployerService = class DeployerService {
|
|
|
34
32
|
constructor(sessionKeysService, fileService) {
|
|
35
33
|
this.sessionKeysService = sessionKeysService;
|
|
36
34
|
this.fileService = fileService;
|
|
37
|
-
this.storage = ContractStorage.getInstance(
|
|
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
|
|
43
|
+
* @param policyConfig - the policy configuration parameters
|
|
47
44
|
* @returns - the policy contract
|
|
48
45
|
*/
|
|
49
|
-
async deployAndSavePolicy(signer,
|
|
50
|
-
let
|
|
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 (
|
|
56
|
+
switch (type) {
|
|
53
57
|
case EPolicies.FreeForAll: {
|
|
54
|
-
|
|
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
|
-
|
|
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
|
-
},
|
|
86
|
+
}, factories, signer, true);
|
|
63
87
|
break;
|
|
64
88
|
}
|
|
65
89
|
case EPolicies.GitcoinPassport: {
|
|
66
|
-
|
|
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
|
-
},
|
|
103
|
+
}, factories, signer, true);
|
|
70
104
|
break;
|
|
71
105
|
}
|
|
72
106
|
case EPolicies.Hats: {
|
|
73
|
-
|
|
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
|
-
},
|
|
120
|
+
}, factories, signer, true);
|
|
77
121
|
break;
|
|
78
122
|
}
|
|
79
123
|
case EPolicies.Zupass: {
|
|
80
|
-
|
|
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
|
-
},
|
|
139
|
+
}, factories, signer, true);
|
|
86
140
|
break;
|
|
87
141
|
}
|
|
88
142
|
case EPolicies.Semaphore: {
|
|
89
|
-
|
|
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
|
-
},
|
|
156
|
+
}, factories, signer, true);
|
|
93
157
|
break;
|
|
94
158
|
}
|
|
95
159
|
case EPolicies.MerkleProof: {
|
|
96
|
-
|
|
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
|
-
},
|
|
172
|
+
}, factories, signer, true);
|
|
99
173
|
break;
|
|
100
174
|
}
|
|
101
175
|
case EPolicies.Token: {
|
|
102
|
-
|
|
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
|
-
},
|
|
188
|
+
}, factories, signer, true);
|
|
105
189
|
break;
|
|
106
190
|
}
|
|
107
191
|
case EPolicies.AnonAadhaar: {
|
|
108
|
-
|
|
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
|
-
},
|
|
205
|
+
}, factories, signer, true);
|
|
112
206
|
break;
|
|
113
207
|
}
|
|
114
208
|
case EPolicies.ERC20Votes: {
|
|
115
|
-
|
|
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
|
-
},
|
|
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:
|
|
127
|
-
|
|
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
|
});
|
|
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;
|
|
253
|
+
}
|
|
254
|
+
/**
|
|
255
|
+
* Get the voice credit proxy factory contract object
|
|
256
|
+
* always deploy and save it
|
|
257
|
+
*
|
|
258
|
+
* @param signer - the signer
|
|
259
|
+
* @param voiceCreditProxyFactoryType - the voice credit proxy factory type
|
|
260
|
+
* @param network - the network
|
|
261
|
+
* @returns - the voice credit proxy factory contract
|
|
262
|
+
*/
|
|
263
|
+
async deployAndSaveVoiceCreditProxyFactory(signer, voiceCreditProxyFactoryType, network) {
|
|
264
|
+
let contract;
|
|
265
|
+
switch (voiceCreditProxyFactoryType) {
|
|
266
|
+
case EInitialVoiceCreditProxiesFactories.Constant: {
|
|
267
|
+
contract = await deployConstantInitialVoiceCreditProxyFactory(signer, true);
|
|
268
|
+
break;
|
|
269
|
+
}
|
|
270
|
+
default:
|
|
271
|
+
throw new Error(ErrorCodes.UNSUPPORTED_VOICE_CREDIT_PROXY_FACTORY.toString());
|
|
272
|
+
}
|
|
273
|
+
this.storage.register({
|
|
274
|
+
id: voiceCreditProxyFactoryType,
|
|
275
|
+
contract,
|
|
276
|
+
args: [],
|
|
277
|
+
network,
|
|
278
|
+
});
|
|
131
279
|
return contract;
|
|
132
280
|
}
|
|
133
281
|
/**
|
|
@@ -137,16 +285,17 @@ let DeployerService = class DeployerService {
|
|
|
137
285
|
* @param signer - the signer
|
|
138
286
|
* @param voiceCreditProxyType - the voice credit proxy type
|
|
139
287
|
* @param network - the network
|
|
288
|
+
* @param initialVoiceCreditProxyFactory - the initial voice credit proxy factory
|
|
140
289
|
* @param args - the args
|
|
141
290
|
* @returns - the voice credit proxy contract
|
|
142
291
|
*/
|
|
143
|
-
async deployAndSaveVoiceCreditProxy(signer, voiceCreditProxyType, network, args) {
|
|
292
|
+
async deployAndSaveVoiceCreditProxy(signer, voiceCreditProxyType, network, initialVoiceCreditProxyFactory, args) {
|
|
144
293
|
let contract;
|
|
145
294
|
switch (voiceCreditProxyType) {
|
|
146
295
|
case EInitialVoiceCreditProxies.Constant: {
|
|
147
|
-
|
|
296
|
+
contract = await deployConstantInitialVoiceCreditProxy({
|
|
148
297
|
amount: args.amount,
|
|
149
|
-
},
|
|
298
|
+
}, initialVoiceCreditProxyFactory, signer);
|
|
150
299
|
break;
|
|
151
300
|
}
|
|
152
301
|
default:
|
|
@@ -168,31 +317,40 @@ let DeployerService = class DeployerService {
|
|
|
168
317
|
* @param mode - use QV or NON_QV
|
|
169
318
|
* @returns SetVerifyingKeysArgs
|
|
170
319
|
*/
|
|
171
|
-
async getVerifyingKeysArgs(signer, verifyingKeysRegistryAddress, verifyingKeysRegistryArgs,
|
|
172
|
-
const { zkey: pollJoiningZkeyPath } = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_POLL_JOINING_ZKEY_NAME
|
|
173
|
-
const { zkey: pollJoinedZkeyPath } = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_POLL_JOINED_ZKEY_NAME
|
|
174
|
-
const {
|
|
175
|
-
// There are only QV and Non-QV modes
|
|
176
|
-
const { zkey: tallyVotesZkeyPath } = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_TALLY_ZKEY_NAME, mode === EMode.QV ? mode : EMode.NON_QV);
|
|
177
|
-
const { pollJoiningVerifyingKey, pollJoinedVerifyingKey, processVerifyingKey, tallyVerifyingKey } = await extractAllVerifyingKeys({
|
|
320
|
+
async getVerifyingKeysArgs(signer, verifyingKeysRegistryAddress, verifyingKeysRegistryArgs, modes) {
|
|
321
|
+
const { zkey: pollJoiningZkeyPath } = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_POLL_JOINING_ZKEY_NAME);
|
|
322
|
+
const { zkey: pollJoinedZkeyPath } = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_POLL_JOINED_ZKEY_NAME);
|
|
323
|
+
const { pollJoiningVerifyingKey, pollJoinedVerifyingKey } = await extractAllVerifyingKeys({
|
|
178
324
|
pollJoiningZkeyPath,
|
|
179
325
|
pollJoinedZkeyPath,
|
|
180
|
-
processMessagesZkeyPath,
|
|
181
|
-
tallyVotesZkeyPath,
|
|
182
326
|
});
|
|
327
|
+
const processAndTallyVerifyingKeys = await Promise.all(modes.map(async (mode) => {
|
|
328
|
+
const { zkey: messageProcessorZkeyPath } = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_MESSAGE_PROCESS_ZKEY_NAME, mode);
|
|
329
|
+
// There are only QV and Non-QV modes available for tally circuit
|
|
330
|
+
const { zkey: voteTallyZkeyPath } = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_TALLY_ZKEY_NAME,
|
|
331
|
+
// if FULL use NON_QV because there are only VoteTallyQV and VoteTallyNonQV zkeys
|
|
332
|
+
mode === EMode.FULL ? EMode.NON_QV : mode);
|
|
333
|
+
const { processVerifyingKey, tallyVerifyingKey } = await extractAllVerifyingKeys({
|
|
334
|
+
messageProcessorZkeyPath,
|
|
335
|
+
voteTallyZkeyPath,
|
|
336
|
+
});
|
|
337
|
+
return { processVerifyingKey: processVerifyingKey, tallyVerifyingKey: tallyVerifyingKey };
|
|
338
|
+
}));
|
|
339
|
+
const processVerifyingKeys = processAndTallyVerifyingKeys.map((item) => item.processVerifyingKey);
|
|
340
|
+
const tallyVerifyingKeys = processAndTallyVerifyingKeys.map((item) => item.tallyVerifyingKey);
|
|
183
341
|
const { stateTreeDepth, pollStateTreeDepth, tallyProcessingStateTreeDepth, voteOptionTreeDepth, messageBatchSize } = verifyingKeysRegistryArgs;
|
|
184
342
|
return {
|
|
185
343
|
pollJoiningVerifyingKey: pollJoiningVerifyingKey,
|
|
186
344
|
pollJoinedVerifyingKey: pollJoinedVerifyingKey,
|
|
187
|
-
|
|
188
|
-
|
|
345
|
+
processMessagesVerifyingKeys: processVerifyingKeys,
|
|
346
|
+
tallyVotesVerifyingKeys: tallyVerifyingKeys,
|
|
189
347
|
stateTreeDepth: Number(stateTreeDepth),
|
|
190
348
|
tallyProcessingStateTreeDepth: Number(tallyProcessingStateTreeDepth),
|
|
191
349
|
voteOptionTreeDepth: Number(voteOptionTreeDepth),
|
|
192
350
|
messageBatchSize: Number(messageBatchSize),
|
|
193
351
|
pollStateTreeDepth: Number(pollStateTreeDepth),
|
|
194
352
|
signer,
|
|
195
|
-
|
|
353
|
+
modes,
|
|
196
354
|
verifyingKeysRegistryAddress,
|
|
197
355
|
};
|
|
198
356
|
}
|
|
@@ -206,11 +364,11 @@ let DeployerService = class DeployerService {
|
|
|
206
364
|
*/
|
|
207
365
|
async deployMaci({ approval, sessionKeyAddress, chain, config }) {
|
|
208
366
|
const signer = await this.sessionKeysService.getCoordinatorSigner(chain, sessionKeyAddress, approval);
|
|
209
|
-
const policyContract = await this.deployAndSavePolicy(signer,
|
|
367
|
+
const policyContract = await this.deployAndSavePolicy(signer, chain, config.policy);
|
|
210
368
|
const policyAddress = await policyContract.getAddress();
|
|
211
369
|
const verifierContract = await deployVerifier(signer, true);
|
|
212
370
|
const verifyingKeysRegistryAddress = await deployVerifyingKeysRegistryContract({ signer });
|
|
213
|
-
const verifyingKeysArgs = await this.getVerifyingKeysArgs(signer, verifyingKeysRegistryAddress, config.VerifyingKeysRegistry.args,
|
|
371
|
+
const verifyingKeysArgs = await this.getVerifyingKeysArgs(signer, verifyingKeysRegistryAddress, config.VerifyingKeysRegistry.args, config.MACI.modes);
|
|
214
372
|
await setVerifyingKeys(verifyingKeysArgs);
|
|
215
373
|
// deploy the smart contracts
|
|
216
374
|
const maciAddresses = await deployMaci({
|
|
@@ -269,18 +427,17 @@ let DeployerService = class DeployerService {
|
|
|
269
427
|
if (!verifyingKeysRegistryAddress) {
|
|
270
428
|
throw new Error(ErrorCodes.VERIFYING_KEYS_REGISTRY_NOT_DEPLOYED.toString());
|
|
271
429
|
}
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
if (!policyAddress) {
|
|
275
|
-
const policyContract = await this.deployAndSavePolicy(signer, config.policy.type, chain, config.policy.args);
|
|
276
|
-
policyAddress = (await policyContract.getAddress());
|
|
277
|
-
}
|
|
430
|
+
const policyContract = await this.deployAndSavePolicy(signer, chain, config.policy);
|
|
431
|
+
const policyAddress = (await policyContract.getAddress());
|
|
278
432
|
// check if initial voice credit proxy address was given
|
|
279
433
|
let initialVoiceCreditProxyAddress = config.initialVoiceCreditsProxy.address;
|
|
280
434
|
if (!initialVoiceCreditProxyAddress) {
|
|
281
|
-
const
|
|
282
|
-
|
|
435
|
+
const initialVoiceCreditProxyFactory = await this.deployAndSaveVoiceCreditProxyFactory(signer, config.initialVoiceCreditsProxy.factoryType, chain);
|
|
436
|
+
const initialVoiceCreditProxyContract = await this.deployAndSaveVoiceCreditProxy(signer, config.initialVoiceCreditsProxy.type, chain, initialVoiceCreditProxyFactory, config.initialVoiceCreditsProxy.args);
|
|
437
|
+
initialVoiceCreditProxyAddress = await initialVoiceCreditProxyContract.getAddress();
|
|
283
438
|
}
|
|
439
|
+
// instantiate the coordinator MACI keypair
|
|
440
|
+
const coordinatorKeypair = getCoordinatorKeypair();
|
|
284
441
|
const deployPollArgs = {
|
|
285
442
|
maciAddress,
|
|
286
443
|
pollStartTimestamp: config.startDate,
|
|
@@ -289,13 +446,13 @@ let DeployerService = class DeployerService {
|
|
|
289
446
|
voteOptionTreeDepth: config.voteOptionTreeDepth,
|
|
290
447
|
messageBatchSize: config.messageBatchSize,
|
|
291
448
|
stateTreeDepth: config.pollStateTreeDepth,
|
|
292
|
-
coordinatorPublicKey:
|
|
449
|
+
coordinatorPublicKey: coordinatorKeypair.publicKey,
|
|
293
450
|
verifierContractAddress: verifierAddress,
|
|
294
451
|
verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
|
|
295
452
|
mode: config.mode,
|
|
296
453
|
policyContractAddress: policyAddress,
|
|
297
454
|
initialVoiceCreditProxyContractAddress: initialVoiceCreditProxyAddress,
|
|
298
|
-
relayers: config.relayers ? config.relayers
|
|
455
|
+
relayers: config.relayers ? config.relayers : [],
|
|
299
456
|
voteOptions: Number(config.voteOptions),
|
|
300
457
|
initialVoiceCredits: Number(config.initialVoiceCreditsProxy.args.amount),
|
|
301
458
|
signer,
|
|
@@ -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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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EPolicies, EInitialVoiceCreditProxies, EMode } from "@maci-protocol/sdk";
|
|
1
|
+
import { EPolicies, EInitialVoiceCreditProxies, EMode, EInitialVoiceCreditProxiesFactories } from "@maci-protocol/sdk";
|
|
2
2
|
import { SendUserOperationParameters } from "viem/account-abstraction";
|
|
3
3
|
import type { Abi, Hex } from "viem";
|
|
4
4
|
import { ESupportedNetworks } from "../common";
|
|
@@ -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,16 +241,14 @@ 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
|
*/
|
|
238
248
|
MACI: {
|
|
239
249
|
stateTreeDepth: number;
|
|
240
250
|
policy: EPolicies;
|
|
251
|
+
modes: EMode[];
|
|
241
252
|
};
|
|
242
253
|
/**
|
|
243
254
|
* The VerifyingKeysRegistry configuration
|
|
@@ -267,10 +278,6 @@ export interface IDeployPollConfig {
|
|
|
267
278
|
* The poll's end date
|
|
268
279
|
*/
|
|
269
280
|
endDate: number;
|
|
270
|
-
/**
|
|
271
|
-
* The coordinator publicKey
|
|
272
|
-
*/
|
|
273
|
-
coordinatorPublicKey: string;
|
|
274
281
|
/**
|
|
275
282
|
* Voting mode
|
|
276
283
|
*/
|
|
@@ -294,15 +301,12 @@ export interface IDeployPollConfig {
|
|
|
294
301
|
/**
|
|
295
302
|
* The policy configuration
|
|
296
303
|
*/
|
|
297
|
-
policy:
|
|
298
|
-
type: EPolicies;
|
|
299
|
-
args?: IPolicyArgs;
|
|
300
|
-
address?: Hex;
|
|
301
|
-
};
|
|
304
|
+
policy: IDeployPolicyConfig;
|
|
302
305
|
/**
|
|
303
306
|
* The initial voice credits proxy configuration
|
|
304
307
|
*/
|
|
305
308
|
initialVoiceCreditsProxy: {
|
|
309
|
+
factoryType: EInitialVoiceCreditProxiesFactories;
|
|
306
310
|
type: EInitialVoiceCreditProxies;
|
|
307
311
|
args: IInitialVoiceCreditProxyArgs;
|
|
308
312
|
address?: Hex;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../ts/deployer/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,37 +37,37 @@ describe("FileService", () => {
|
|
|
37
37
|
});
|
|
38
38
|
test("should return zkey filepaths for tally qv properly", () => {
|
|
39
39
|
const service = new FileService();
|
|
40
|
-
const { zkey, wasm,
|
|
40
|
+
const { zkey, wasm, witnessGenerator } = service.getZkeyFilePaths(process.env.COORDINATOR_TALLY_ZKEY_NAME, EMode.QV);
|
|
41
41
|
expect(zkey).toBeDefined();
|
|
42
42
|
expect(wasm).toBeDefined();
|
|
43
|
-
expect(
|
|
43
|
+
expect(witnessGenerator).toBeDefined();
|
|
44
44
|
});
|
|
45
45
|
test("should return zkey filepaths for tally non-qv properly", () => {
|
|
46
46
|
const service = new FileService();
|
|
47
|
-
const { zkey, wasm,
|
|
47
|
+
const { zkey, wasm, witnessGenerator } = service.getZkeyFilePaths(process.env.COORDINATOR_TALLY_ZKEY_NAME, EMode.NON_QV);
|
|
48
48
|
expect(zkey).toBeDefined();
|
|
49
49
|
expect(wasm).toBeDefined();
|
|
50
|
-
expect(
|
|
50
|
+
expect(witnessGenerator).toBeDefined();
|
|
51
51
|
});
|
|
52
52
|
test("should return zkey filepaths for message process qv properly", () => {
|
|
53
53
|
const service = new FileService();
|
|
54
|
-
const { zkey, wasm,
|
|
54
|
+
const { zkey, wasm, witnessGenerator } = service.getZkeyFilePaths(process.env.COORDINATOR_MESSAGE_PROCESS_ZKEY_NAME, EMode.QV);
|
|
55
55
|
expect(zkey).toBeDefined();
|
|
56
56
|
expect(wasm).toBeDefined();
|
|
57
|
-
expect(
|
|
57
|
+
expect(witnessGenerator).toBeDefined();
|
|
58
58
|
});
|
|
59
59
|
test("should return zkey filepaths for message process non-qv properly", () => {
|
|
60
60
|
const service = new FileService();
|
|
61
|
-
const { zkey, wasm,
|
|
61
|
+
const { zkey, wasm, witnessGenerator } = service.getZkeyFilePaths(process.env.COORDINATOR_MESSAGE_PROCESS_ZKEY_NAME, EMode.NON_QV);
|
|
62
62
|
expect(zkey).toBeDefined();
|
|
63
63
|
expect(wasm).toBeDefined();
|
|
64
|
-
expect(
|
|
64
|
+
expect(witnessGenerator).toBeDefined();
|
|
65
65
|
});
|
|
66
66
|
test("should throw an error if there are no zkey filepaths", () => {
|
|
67
67
|
const service = new FileService();
|
|
68
68
|
expect(() => service.getZkeyFilePaths("unknown", EMode.NON_QV)).toThrow(ErrorCodes.FILE_NOT_FOUND.toString());
|
|
69
69
|
});
|
|
70
|
-
test("should throw an error if there are no wasm and
|
|
70
|
+
test("should throw an error if there are no wasm and witnessGenerator filepaths", () => {
|
|
71
71
|
const spyExistsSync = jest.spyOn(fs, "existsSync");
|
|
72
72
|
spyExistsSync.mockReturnValueOnce(true).mockReturnValue(false);
|
|
73
73
|
const service = new FileService();
|