@maci-protocol/coordinator 0.0.0-ci.7f7ef53 → 0.0.0-ci.7fb2610
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -2
- package/README.md +31 -6
- package/build/hardhat.config.cjs +3 -0
- package/build/hardhat.config.cjs.map +1 -1
- package/build/hardhat.config.d.cts +3 -0
- package/build/scripts/generateMaciKeyPair.js +2 -2
- package/build/scripts/generateMaciKeyPair.js.map +1 -1
- package/build/tests/constants.d.ts +0 -1
- package/build/tests/constants.d.ts.map +1 -1
- package/build/tests/constants.js +0 -1
- package/build/tests/constants.js.map +1 -1
- package/build/tests/e2e.deploy.test.js +145 -89
- package/build/tests/e2e.deploy.test.js.map +1 -1
- package/build/tests/utils.d.ts +6 -0
- package/build/tests/utils.d.ts.map +1 -1
- package/build/tests/utils.js +12 -3
- package/build/tests/utils.js.map +1 -1
- package/build/ts/app.module.d.ts.map +1 -1
- package/build/ts/app.module.js +2 -0
- package/build/ts/app.module.js.map +1 -1
- package/build/ts/common/__tests__/common.test.js +7 -21
- package/build/ts/common/__tests__/common.test.js.map +1 -1
- package/build/ts/common/accountAbstraction.d.ts +2 -19
- package/build/ts/common/accountAbstraction.d.ts.map +1 -1
- package/build/ts/common/accountAbstraction.js +15 -44
- package/build/ts/common/accountAbstraction.js.map +1 -1
- package/build/ts/common/chain.d.ts +16 -0
- package/build/ts/common/chain.d.ts.map +1 -0
- package/build/ts/common/chain.js +31 -0
- package/build/ts/common/chain.js.map +1 -0
- 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 +17 -18
- package/build/ts/common/errors.d.ts.map +1 -1
- package/build/ts/common/errors.js +17 -18
- package/build/ts/common/errors.js.map +1 -1
- package/build/ts/common/index.d.ts +2 -0
- package/build/ts/common/index.d.ts.map +1 -1
- package/build/ts/common/index.js +2 -0
- package/build/ts/common/index.js.map +1 -1
- package/build/ts/common/types.d.ts +2 -3
- package/build/ts/common/types.d.ts.map +1 -1
- package/build/ts/deployer/__tests__/deployer.controller.test.js +7 -7
- package/build/ts/deployer/__tests__/deployer.controller.test.js.map +1 -1
- package/build/ts/deployer/__tests__/deployer.service.test.js +73 -286
- package/build/ts/deployer/__tests__/deployer.service.test.js.map +1 -1
- package/build/ts/deployer/__tests__/utils.d.ts +26 -1
- package/build/ts/deployer/__tests__/utils.d.ts.map +1 -1
- package/build/ts/deployer/__tests__/utils.js +39 -11
- package/build/ts/deployer/__tests__/utils.js.map +1 -1
- package/build/ts/deployer/deployer.service.d.ts +18 -55
- package/build/ts/deployer/deployer.service.d.ts.map +1 -1
- package/build/ts/deployer/deployer.service.js +302 -471
- package/build/ts/deployer/deployer.service.js.map +1 -1
- package/build/ts/deployer/dto.d.ts +4 -4
- package/build/ts/deployer/dto.d.ts.map +1 -1
- package/build/ts/deployer/dto.js +9 -1
- package/build/ts/deployer/dto.js.map +1 -1
- package/build/ts/deployer/types.d.ts +68 -35
- package/build/ts/deployer/types.d.ts.map +1 -1
- package/build/ts/file/__tests__/file.service.test.js +12 -11
- package/build/ts/file/__tests__/file.service.test.js.map +1 -1
- package/build/ts/file/file.service.d.ts +4 -3
- package/build/ts/file/file.service.d.ts.map +1 -1
- package/build/ts/file/file.service.js +14 -9
- 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 +22 -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 +77 -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 +21 -0
- package/build/ts/health/health.module.js.map +1 -0
- package/build/ts/health/health.service.d.ts +35 -0
- package/build/ts/health/health.service.d.ts.map +1 -0
- package/build/ts/health/health.service.js +169 -0
- package/build/ts/health/health.service.js.map +1 -0
- package/build/ts/health/types.d.ts +79 -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 +5 -3
- package/build/ts/proof/__tests__/proof.controller.test.js.map +1 -1
- package/build/ts/proof/__tests__/proof.gateway.test.js +6 -3
- package/build/ts/proof/__tests__/proof.gateway.test.js.map +1 -1
- package/build/ts/proof/__tests__/proof.service.test.js +37 -76
- package/build/ts/proof/__tests__/proof.service.test.js.map +1 -1
- package/build/ts/proof/dto.d.ts +13 -15
- package/build/ts/proof/dto.d.ts.map +1 -1
- package/build/ts/proof/dto.js +51 -44
- package/build/ts/proof/dto.js.map +1 -1
- package/build/ts/proof/proof.controller.d.ts +3 -2
- 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 +4 -6
- package/build/ts/proof/proof.service.d.ts.map +1 -1
- package/build/ts/proof/proof.service.js +48 -130
- package/build/ts/proof/proof.service.js.map +1 -1
- package/build/ts/proof/types.d.ts +19 -14
- package/build/ts/proof/types.d.ts.map +1 -1
- 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/provider/KernelEIP1193Provider.d.ts +53 -0
- package/build/ts/sessionKeys/provider/KernelEIP1193Provider.d.ts.map +1 -0
- package/build/ts/sessionKeys/provider/KernelEIP1193Provider.js +105 -0
- package/build/ts/sessionKeys/provider/KernelEIP1193Provider.js.map +1 -0
- package/build/ts/sessionKeys/sessionKeys.service.d.ts +13 -2
- package/build/ts/sessionKeys/sessionKeys.service.d.ts.map +1 -1
- package/build/ts/sessionKeys/sessionKeys.service.js +22 -4
- 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 +36 -36
- 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 -103
- package/build/tests/e2e.aa.test.js.map +0 -1
- package/build/ts/deployer/utils.d.ts +0 -8
- package/build/ts/deployer/utils.d.ts.map +0 -1
- package/build/ts/deployer/utils.js +0 -9
- package/build/ts/deployer/utils.js.map +0 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ContractStorage, ECheckerFactories, EContracts, EInitialVoiceCreditProxies, EPolicies, EPolicyFactories, getDeployedPolicyProxyFactories, MACI__factory as MACIFactory, Verifier__factory as VerifierFactory, } from "@maci-protocol/sdk";
|
|
2
2
|
import dotenv from "dotenv";
|
|
3
|
-
import { BaseContract
|
|
3
|
+
import { BaseContract } from "ethers";
|
|
4
4
|
import { zeroAddress } from "viem";
|
|
5
5
|
import path from "path";
|
|
6
6
|
import { ErrorCodes, ESupportedNetworks } from "../../common";
|
|
@@ -8,7 +8,6 @@ import { FileService } from "../../file/file.service";
|
|
|
8
8
|
import { generateApproval } from "../../sessionKeys/__tests__/utils";
|
|
9
9
|
import { SessionKeysService } from "../../sessionKeys/sessionKeys.service";
|
|
10
10
|
import { DeployerService } from "../deployer.service";
|
|
11
|
-
import { estimateExtraGasLimit } from "../utils";
|
|
12
11
|
import { testMaciDeploymentConfig, testPollDeploymentConfig } from "./utils";
|
|
13
12
|
dotenv.config();
|
|
14
13
|
describe("DeployerService", () => {
|
|
@@ -22,296 +21,90 @@ describe("DeployerService", () => {
|
|
|
22
21
|
const deployerService = new DeployerService(sessionKeyService, fileService);
|
|
23
22
|
let approval;
|
|
24
23
|
let sessionKeyAddress;
|
|
24
|
+
let signer;
|
|
25
25
|
beforeAll(async () => {
|
|
26
|
-
approval = await generateApproval(sessionKeyAddress);
|
|
27
26
|
sessionKeyAddress = (await sessionKeyService.generateSessionKey()).sessionKeyAddress;
|
|
27
|
+
approval = await generateApproval(sessionKeyAddress);
|
|
28
|
+
signer = await sessionKeyService.getCoordinatorSigner(chain);
|
|
28
29
|
});
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
amount: "50",
|
|
33
|
-
});
|
|
34
|
-
expect(voiceCreditProxyData).toBeDefined();
|
|
35
|
-
expect(voiceCreditProxyData.alreadyDeployed).toBe(false);
|
|
36
|
-
expect(voiceCreditProxyData.abi).toBeDefined();
|
|
37
|
-
expect(voiceCreditProxyData.bytecode).toBeDefined();
|
|
38
|
-
});
|
|
39
|
-
test("should return the voice credit proxy data and that the voice credit proxy is already deployed", async () => {
|
|
40
|
-
await storageInstance.register({
|
|
41
|
-
id: EInitialVoiceCreditProxies.Constant,
|
|
42
|
-
contract: new BaseContract("0x", VoiceCreditProxyFactory.abi),
|
|
43
|
-
network: chain,
|
|
44
|
-
args: ["50"],
|
|
45
|
-
});
|
|
46
|
-
const voiceCreditProxyData = deployerService.getVoiceCreditProxyData(EInitialVoiceCreditProxies.Constant, chain, {
|
|
47
|
-
amount: "50",
|
|
48
|
-
});
|
|
49
|
-
expect(voiceCreditProxyData).toBeDefined();
|
|
50
|
-
expect(voiceCreditProxyData.alreadyDeployed).toBe(true);
|
|
51
|
-
expect(voiceCreditProxyData.abi).toBeDefined();
|
|
52
|
-
expect(voiceCreditProxyData.bytecode).toBeDefined();
|
|
53
|
-
storageInstance.cleanup(chain);
|
|
54
|
-
});
|
|
55
|
-
it("should throw when the voice credits proxy is not existent", () => {
|
|
56
|
-
expect(() => deployerService.getVoiceCreditProxyData("NotExistent", chain, {
|
|
57
|
-
amount: "50",
|
|
58
|
-
})).toThrow(ErrorCodes.UNSUPPORTED_VOICE_CREDIT_PROXY.toString());
|
|
59
|
-
});
|
|
30
|
+
afterAll(() => {
|
|
31
|
+
storageInstance.cleanup(ESupportedNetworks.OPTIMISM_SEPOLIA);
|
|
32
|
+
storageInstance.cleanup(ESupportedNetworks.ARBITRUM_ONE);
|
|
60
33
|
});
|
|
61
|
-
describe("
|
|
34
|
+
describe("deployAndSavePolicy", () => {
|
|
62
35
|
// we cleanup after each test so we don't have leftover saved contracts
|
|
63
36
|
afterEach(() => {
|
|
64
37
|
storageInstance.cleanup(chain);
|
|
65
38
|
});
|
|
66
|
-
|
|
67
|
-
expect((
|
|
39
|
+
test("should throw when the policy is not existent", async () => {
|
|
40
|
+
await expect(deployerService.deployAndSavePolicy(signer, chain, { type: "NonExistent" })).rejects.toThrow(ErrorCodes.UNSUPPORTED_POLICY.toString());
|
|
68
41
|
});
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
expect(policyData.alreadyDeployed).toBe(false);
|
|
74
|
-
expect(policyData.abi).toBeDefined();
|
|
75
|
-
expect(policyData.bytecode).toBeDefined();
|
|
76
|
-
});
|
|
77
|
-
it("should return the policy data and that the policy is already deployed", async () => {
|
|
78
|
-
await storageInstance.register({
|
|
79
|
-
id: EPolicies.FreeForAll,
|
|
80
|
-
contract: new BaseContract("0x", FreeForAllPolicyFactory.abi),
|
|
81
|
-
network: chain,
|
|
82
|
-
args: [],
|
|
83
|
-
});
|
|
84
|
-
const policyData = deployerService.getPolicyData(EPolicies.FreeForAll, chain);
|
|
85
|
-
expect(policyData).toBeDefined();
|
|
86
|
-
expect(policyData.alreadyDeployed).toBe(true);
|
|
87
|
-
expect(policyData.abi).toBeDefined();
|
|
88
|
-
expect(policyData.bytecode).toBeDefined();
|
|
89
|
-
});
|
|
42
|
+
test("should deploy policy if none is stored", async () => {
|
|
43
|
+
const policy = await deployerService.deployAndSavePolicy(signer, chain, { type: EPolicies.FreeForAll });
|
|
44
|
+
expect(policy).toBeDefined();
|
|
45
|
+
expect(await policy.getAddress()).not.toBe(zeroAddress);
|
|
90
46
|
});
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
const policyData = deployerService.getPolicyData(EPolicies.EAS, chain, {
|
|
107
|
-
easAddress: zeroAddress,
|
|
108
|
-
schema: zeroPadBytes("0x", 32),
|
|
109
|
-
attester: zeroAddress,
|
|
110
|
-
});
|
|
111
|
-
expect(policyData).toBeDefined();
|
|
112
|
-
expect(policyData.alreadyDeployed).toBe(true);
|
|
113
|
-
expect(policyData.abi).toBeDefined();
|
|
114
|
-
expect(policyData.bytecode).toBeDefined();
|
|
115
|
-
});
|
|
116
|
-
it("should return that the policy is not deployed when the args are different", async () => {
|
|
117
|
-
await storageInstance.register({
|
|
118
|
-
id: EPolicies.EAS,
|
|
119
|
-
contract: new BaseContract("0x", EASPolicyFactory.abi),
|
|
120
|
-
network: chain,
|
|
121
|
-
args: [zeroAddress, zeroPadBytes("0x", 32), zeroAddress.replace("0x0", "0x1")],
|
|
122
|
-
});
|
|
123
|
-
const policyData = deployerService.getPolicyData(EPolicies.EAS, chain, {
|
|
124
|
-
easAddress: zeroAddress,
|
|
125
|
-
schema: zeroPadBytes("0x", 32),
|
|
126
|
-
attester: zeroAddress,
|
|
127
|
-
});
|
|
128
|
-
expect(policyData).toBeDefined();
|
|
129
|
-
expect(policyData.alreadyDeployed).toBe(false);
|
|
130
|
-
expect(policyData.abi).toBeDefined();
|
|
131
|
-
expect(policyData.bytecode).toBeDefined();
|
|
47
|
+
test("should save factories (policy and checker) after deploying policy", async () => {
|
|
48
|
+
const { checker: initialChecker, policy: initialPolicy } = await getDeployedPolicyProxyFactories({
|
|
49
|
+
policy: EPolicyFactories.FreeForAll,
|
|
50
|
+
checker: ECheckerFactories.FreeForAll,
|
|
51
|
+
network: chain,
|
|
52
|
+
signer,
|
|
53
|
+
});
|
|
54
|
+
expect(initialChecker).not.toBeDefined();
|
|
55
|
+
expect(initialPolicy).not.toBeDefined();
|
|
56
|
+
await deployerService.deployAndSavePolicy(signer, chain, { type: EPolicies.FreeForAll });
|
|
57
|
+
const { checker, policy } = await getDeployedPolicyProxyFactories({
|
|
58
|
+
policy: EPolicyFactories.FreeForAll,
|
|
59
|
+
checker: ECheckerFactories.FreeForAll,
|
|
60
|
+
network: chain,
|
|
61
|
+
signer,
|
|
132
62
|
});
|
|
63
|
+
expect(checker).toBeDefined();
|
|
64
|
+
expect(policy).toBeDefined();
|
|
133
65
|
});
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
signer2: zeroAddress,
|
|
157
|
-
eventId: "0x",
|
|
158
|
-
zupassVerifier: zeroAddress,
|
|
159
|
-
});
|
|
160
|
-
expect(policyData).toBeDefined();
|
|
161
|
-
expect(policyData.alreadyDeployed).toBe(true);
|
|
162
|
-
expect(policyData.abi).toBeDefined();
|
|
163
|
-
expect(policyData.bytecode).toBeDefined();
|
|
164
|
-
});
|
|
165
|
-
it("should return that the policy is not deployed when the args are different", async () => {
|
|
166
|
-
await storageInstance.register({
|
|
167
|
-
id: EPolicies.Zupass,
|
|
168
|
-
contract: new BaseContract("0x", ZupassPolicyFactory.abi),
|
|
169
|
-
network: chain,
|
|
170
|
-
args: [zeroAddress, zeroAddress, "0x", zeroAddress.replace("0x0", "0x1")],
|
|
171
|
-
});
|
|
172
|
-
const policyData = deployerService.getPolicyData(EPolicies.Zupass, chain, {
|
|
173
|
-
signer1: zeroAddress,
|
|
174
|
-
signer2: zeroAddress,
|
|
175
|
-
eventId: "0x",
|
|
176
|
-
zupassVerifier: zeroAddress,
|
|
177
|
-
});
|
|
178
|
-
expect(policyData).toBeDefined();
|
|
179
|
-
expect(policyData.alreadyDeployed).toBe(false);
|
|
180
|
-
expect(policyData.abi).toBeDefined();
|
|
181
|
-
expect(policyData.bytecode).toBeDefined();
|
|
66
|
+
test("should reuse policy factories if already stored", async () => {
|
|
67
|
+
const firstPolicy = await deployerService.deployAndSavePolicy(signer, chain, { type: EPolicies.FreeForAll });
|
|
68
|
+
const { checker: firstCheckerFactory, policy: firstPolicyFactory } = await getDeployedPolicyProxyFactories({
|
|
69
|
+
policy: EPolicyFactories.FreeForAll,
|
|
70
|
+
checker: ECheckerFactories.FreeForAll,
|
|
71
|
+
network: chain,
|
|
72
|
+
signer,
|
|
73
|
+
});
|
|
74
|
+
expect(firstCheckerFactory).toBeDefined();
|
|
75
|
+
expect(firstPolicyFactory).toBeDefined();
|
|
76
|
+
const firstCheckerFactoryAddress = await firstCheckerFactory.getAddress();
|
|
77
|
+
const firstPolicyFactoryAddress = await firstPolicyFactory.getAddress();
|
|
78
|
+
expect(firstCheckerFactoryAddress).not.toBe(zeroAddress);
|
|
79
|
+
expect(firstPolicyFactoryAddress).not.toBe(zeroAddress);
|
|
80
|
+
const secondPolicy = await deployerService.deployAndSavePolicy(signer, chain, {
|
|
81
|
+
type: EPolicies.FreeForAll,
|
|
82
|
+
});
|
|
83
|
+
const { checker: secondCheckerFactory, policy: secondPolicyFactory } = await getDeployedPolicyProxyFactories({
|
|
84
|
+
policy: EPolicyFactories.FreeForAll,
|
|
85
|
+
checker: ECheckerFactories.FreeForAll,
|
|
86
|
+
network: chain,
|
|
87
|
+
signer,
|
|
182
88
|
});
|
|
89
|
+
expect(secondCheckerFactory).toBeDefined();
|
|
90
|
+
expect(secondPolicyFactory).toBeDefined();
|
|
91
|
+
expect(await secondCheckerFactory.getAddress()).toBe(firstCheckerFactoryAddress);
|
|
92
|
+
expect(await secondPolicyFactory.getAddress()).toBe(firstPolicyFactoryAddress);
|
|
93
|
+
expect(await firstPolicy.getAddress()).not.toBe(await secondPolicy.getAddress());
|
|
183
94
|
});
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
});
|
|
190
|
-
expect(policyData).toBeDefined();
|
|
191
|
-
expect(policyData.alreadyDeployed).toBe(false);
|
|
192
|
-
expect(policyData.abi).toBeDefined();
|
|
193
|
-
expect(policyData.bytecode).toBeDefined();
|
|
194
|
-
});
|
|
195
|
-
it("should return the policy data and that the policy is already deployed", async () => {
|
|
196
|
-
await storageInstance.register({
|
|
197
|
-
id: EPolicies.Semaphore,
|
|
198
|
-
contract: new BaseContract("0x", SemaphorePolicyFactory.abi),
|
|
199
|
-
network: chain,
|
|
200
|
-
args: [zeroAddress, "0"],
|
|
201
|
-
});
|
|
202
|
-
const policyData = deployerService.getPolicyData(EPolicies.Semaphore, chain, {
|
|
203
|
-
semaphoreContract: zeroAddress,
|
|
204
|
-
groupId: "0",
|
|
205
|
-
});
|
|
206
|
-
expect(policyData).toBeDefined();
|
|
207
|
-
expect(policyData.alreadyDeployed).toBe(true);
|
|
208
|
-
expect(policyData.abi).toBeDefined();
|
|
209
|
-
expect(policyData.bytecode).toBeDefined();
|
|
210
|
-
});
|
|
211
|
-
it("should return that the policy is not deployed when the args are different", async () => {
|
|
212
|
-
await storageInstance.register({
|
|
213
|
-
id: EPolicies.Semaphore,
|
|
214
|
-
contract: new BaseContract("0x", SemaphorePolicyFactory.abi),
|
|
215
|
-
network: chain,
|
|
216
|
-
args: [zeroAddress, "0"],
|
|
217
|
-
});
|
|
218
|
-
const policyData = deployerService.getPolicyData(EPolicies.Semaphore, chain, {
|
|
219
|
-
semaphoreContract: zeroAddress,
|
|
220
|
-
groupId: "1",
|
|
221
|
-
});
|
|
222
|
-
expect(policyData).toBeDefined();
|
|
223
|
-
expect(policyData.alreadyDeployed).toBe(false);
|
|
224
|
-
expect(policyData.abi).toBeDefined();
|
|
225
|
-
expect(policyData.bytecode).toBeDefined();
|
|
226
|
-
});
|
|
95
|
+
});
|
|
96
|
+
describe("deployAndSaveVoiceCreditProxy", () => {
|
|
97
|
+
// we cleanup after each test so we don't have leftover saved contracts
|
|
98
|
+
afterEach(() => {
|
|
99
|
+
storageInstance.cleanup(chain);
|
|
227
100
|
});
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
const policyData = deployerService.getPolicyData(EPolicies.Hats, chain, {
|
|
231
|
-
hatsProtocolAddress: zeroAddress,
|
|
232
|
-
critrionHats: [zeroAddress],
|
|
233
|
-
});
|
|
234
|
-
expect(policyData).toBeDefined();
|
|
235
|
-
expect(policyData.alreadyDeployed).toBe(false);
|
|
236
|
-
expect(policyData.abi).toBeDefined();
|
|
237
|
-
expect(policyData.bytecode).toBeDefined();
|
|
238
|
-
});
|
|
239
|
-
it("should return the policy data and that the policy is already deployed", async () => {
|
|
240
|
-
await storageInstance.register({
|
|
241
|
-
id: EPolicies.Hats,
|
|
242
|
-
contract: new BaseContract("0x", HatsPolicyFactory.abi),
|
|
243
|
-
network: chain,
|
|
244
|
-
args: [zeroAddress, [zeroAddress]],
|
|
245
|
-
});
|
|
246
|
-
const policyData = deployerService.getPolicyData(EPolicies.Hats, chain, {
|
|
247
|
-
hatsProtocolAddress: zeroAddress,
|
|
248
|
-
critrionHats: [zeroAddress],
|
|
249
|
-
});
|
|
250
|
-
expect(policyData).toBeDefined();
|
|
251
|
-
expect(policyData.alreadyDeployed).toBe(true);
|
|
252
|
-
expect(policyData.abi).toBeDefined();
|
|
253
|
-
expect(policyData.bytecode).toBeDefined();
|
|
254
|
-
});
|
|
255
|
-
it("should return that the policy is not deployed when the args are different", async () => {
|
|
256
|
-
await storageInstance.register({
|
|
257
|
-
id: EPolicies.Hats,
|
|
258
|
-
contract: new BaseContract("0x", HatsPolicyFactory.abi),
|
|
259
|
-
network: chain,
|
|
260
|
-
args: [zeroAddress, ["0x"]],
|
|
261
|
-
});
|
|
262
|
-
const policyData = deployerService.getPolicyData(EPolicies.Hats, chain, {
|
|
263
|
-
hatsProtocolAddress: zeroAddress,
|
|
264
|
-
critrionHats: ["0x1"],
|
|
265
|
-
});
|
|
266
|
-
expect(policyData).toBeDefined();
|
|
267
|
-
expect(policyData.alreadyDeployed).toBe(false);
|
|
268
|
-
expect(policyData.abi).toBeDefined();
|
|
269
|
-
expect(policyData.bytecode).toBeDefined();
|
|
270
|
-
});
|
|
101
|
+
it("should throw when the voice credit proxy is not existent", async () => {
|
|
102
|
+
await expect(deployerService.deployAndSaveVoiceCreditProxy(signer, "NonExistent", chain)).rejects.toThrow(ErrorCodes.UNSUPPORTED_VOICE_CREDIT_PROXY.toString());
|
|
271
103
|
});
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
passingScore: "0",
|
|
277
|
-
});
|
|
278
|
-
expect(policyData).toBeDefined();
|
|
279
|
-
expect(policyData.alreadyDeployed).toBe(false);
|
|
280
|
-
expect(policyData.abi).toBeDefined();
|
|
281
|
-
expect(policyData.bytecode).toBeDefined();
|
|
282
|
-
});
|
|
283
|
-
it("should return the policy data and that the policy is already deployed", async () => {
|
|
284
|
-
await storageInstance.register({
|
|
285
|
-
id: EPolicies.GitcoinPassport,
|
|
286
|
-
contract: new BaseContract("0x", GitcoinPassportPolicyFactory.abi),
|
|
287
|
-
network: chain,
|
|
288
|
-
args: [zeroAddress, "0"],
|
|
289
|
-
});
|
|
290
|
-
const policyData = deployerService.getPolicyData(EPolicies.GitcoinPassport, chain, {
|
|
291
|
-
decoderAddress: zeroAddress,
|
|
292
|
-
passingScore: "0",
|
|
293
|
-
});
|
|
294
|
-
expect(policyData).toBeDefined();
|
|
295
|
-
expect(policyData.alreadyDeployed).toBe(true);
|
|
296
|
-
expect(policyData.abi).toBeDefined();
|
|
297
|
-
expect(policyData.bytecode).toBeDefined();
|
|
298
|
-
});
|
|
299
|
-
it("should return that the policy is not deployed when the args are different", async () => {
|
|
300
|
-
await storageInstance.register({
|
|
301
|
-
id: EPolicies.GitcoinPassport,
|
|
302
|
-
contract: new BaseContract("0x", GitcoinPassportPolicyFactory.abi),
|
|
303
|
-
network: chain,
|
|
304
|
-
args: [zeroAddress, "0"],
|
|
305
|
-
});
|
|
306
|
-
const policyData = deployerService.getPolicyData(EPolicies.GitcoinPassport, chain, {
|
|
307
|
-
decoderAddress: zeroAddress,
|
|
308
|
-
passingScore: "1",
|
|
309
|
-
});
|
|
310
|
-
expect(policyData).toBeDefined();
|
|
311
|
-
expect(policyData.alreadyDeployed).toBe(false);
|
|
312
|
-
expect(policyData.abi).toBeDefined();
|
|
313
|
-
expect(policyData.bytecode).toBeDefined();
|
|
314
|
-
});
|
|
104
|
+
test("should deploy voice credit proxy if none is stored", async () => {
|
|
105
|
+
const voiceCreditProxy = await deployerService.deployAndSaveVoiceCreditProxy(signer, EInitialVoiceCreditProxies.Constant, chain, { amount: 100 });
|
|
106
|
+
expect(voiceCreditProxy).toBeDefined();
|
|
107
|
+
expect(await voiceCreditProxy.getAddress()).not.toBe(zeroAddress);
|
|
315
108
|
});
|
|
316
109
|
});
|
|
317
110
|
describe("deployMaci", () => {
|
|
@@ -327,7 +120,7 @@ describe("DeployerService", () => {
|
|
|
327
120
|
await expect(deployerService.deployMaci({
|
|
328
121
|
config: testMaciDeploymentConfig,
|
|
329
122
|
chain,
|
|
330
|
-
approval: "
|
|
123
|
+
approval: "0x123",
|
|
331
124
|
sessionKeyAddress,
|
|
332
125
|
})).rejects.toThrow(ErrorCodes.INVALID_APPROVAL.toString());
|
|
333
126
|
});
|
|
@@ -383,7 +176,7 @@ describe("DeployerService", () => {
|
|
|
383
176
|
config: testPollDeploymentConfig,
|
|
384
177
|
})).rejects.toThrow(ErrorCodes.VERIFIER_NOT_DEPLOYED.toString());
|
|
385
178
|
});
|
|
386
|
-
it("should throw when there is no
|
|
179
|
+
it("should throw when there is no verifying keys registry deployed", async () => {
|
|
387
180
|
await storageInstance.register({
|
|
388
181
|
id: EContracts.MACI,
|
|
389
182
|
contract: new BaseContract("0x", MACIFactory.abi),
|
|
@@ -401,7 +194,7 @@ describe("DeployerService", () => {
|
|
|
401
194
|
sessionKeyAddress,
|
|
402
195
|
chain,
|
|
403
196
|
config: testPollDeploymentConfig,
|
|
404
|
-
})).rejects.toThrow(ErrorCodes.
|
|
197
|
+
})).rejects.toThrow(ErrorCodes.VERIFYING_KEYS_REGISTRY_NOT_DEPLOYED.toString());
|
|
405
198
|
});
|
|
406
199
|
test("should deploy a poll", async () => {
|
|
407
200
|
const mockDeployPoll = jest.fn().mockResolvedValue({ pollId: "0" });
|
|
@@ -415,11 +208,5 @@ describe("DeployerService", () => {
|
|
|
415
208
|
expect(pollId).toBe("0");
|
|
416
209
|
});
|
|
417
210
|
});
|
|
418
|
-
describe("estimateExtraGasLimit", () => {
|
|
419
|
-
it("should return the extra gas limit", () => {
|
|
420
|
-
const extraGasLimit = estimateExtraGasLimit(100n);
|
|
421
|
-
expect(extraGasLimit.toString()).toBe("5");
|
|
422
|
-
});
|
|
423
|
-
});
|
|
424
211
|
});
|
|
425
212
|
//# sourceMappingURL=deployer.service.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployer.service.test.js","sourceRoot":"","sources":["../../../../ts/deployer/__tests__/deployer.service.test.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iCAAiC,IAAI,uBAAuB,EAC5D,eAAe,EACf,UAAU,EACV,0BAA0B,EAC1B,SAAS,EACT,yBAAyB,IAAI,uBAAuB,EACpD,kBAAkB,IAAI,gBAAgB,EACtC,qBAAqB,IAAI,mBAAmB,EAC5C,wBAAwB,IAAI,sBAAsB,EAClD,mBAAmB,IAAI,iBAAiB,EACxC,8BAA8B,IAAI,4BAA4B,EAC9D,aAAa,IAAI,WAAW,EAC5B,iBAAiB,IAAI,eAAe,GACrC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACpD,OAAO,EAAO,WAAW,EAAE,MAAM,MAAM,CAAC;AAExC,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEjD,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAE7E,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,kBAAkB,CAAC,gBAAgB,CAAC;IAElD,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;IAEtC,MAAM,eAAe,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,yBAAyB,CAAC,CAAC,CAAC;IACzG,MAAM,iBAAiB,GAAG,IAAI,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,IAAI,eAAe,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAE5E,IAAI,QAAgB,CAAC;IACrB,IAAI,iBAAsB,CAAC;IAE3B,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,QAAQ,GAAG,MAAM,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;QACrD,iBAAiB,GAAG,CAAC,MAAM,iBAAiB,CAAC,kBAAkB,EAAE,CAAC,CAAC,iBAAiB,CAAC;IACvF,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;YACrD,MAAM,oBAAoB,GAAG,eAAe,CAAC,uBAAuB,CAAC,0BAA0B,CAAC,QAAQ,EAAE,KAAK,EAAE;gBAC/G,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;YAEH,MAAM,CAAC,oBAAoB,CAAC,CAAC,WAAW,EAAE,CAAC;YAC3C,MAAM,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzD,MAAM,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;YAC/C,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,+FAA+F,EAAE,KAAK,IAAI,EAAE;YAC/G,MAAM,eAAe,CAAC,QAAQ,CAAC;gBAC7B,EAAE,EAAE,0BAA0B,CAAC,QAAiC;gBAChE,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,uBAAuB,CAAC,GAAG,CAAC;gBAC7D,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,CAAC,IAAI,CAAC;aACb,CAAC,CAAC;YACH,MAAM,oBAAoB,GAAG,eAAe,CAAC,uBAAuB,CAAC,0BAA0B,CAAC,QAAQ,EAAE,KAAK,EAAE;gBAC/G,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;YAEH,MAAM,CAAC,oBAAoB,CAAC,CAAC,WAAW,EAAE,CAAC;YAC3C,MAAM,CAAC,oBAAoB,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxD,MAAM,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;YAC/C,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAEpD,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;YACnE,MAAM,CAAC,GAAG,EAAE,CACV,eAAe,CAAC,uBAAuB,CAAC,aAAsD,EAAE,KAAK,EAAE;gBACrG,MAAM,EAAE,IAAI;aACb,CAAC,CACH,CAAC,OAAO,CAAC,UAAU,CAAC,8BAA8B,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,uEAAuE;QACvE,SAAS,CAAC,GAAG,EAAE;YACb,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACtD,MAAM,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,aAAqC,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAC/F,UAAU,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CACzC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;YAChC,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;gBAC3E,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;gBAC9E,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;gBACrF,MAAM,eAAe,CAAC,QAAQ,CAAC;oBAC7B,EAAE,EAAE,SAAS,CAAC,UAAmC;oBACjD,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,uBAAuB,CAAC,GAAG,CAAC;oBAC7D,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,EAAE;iBACT,CAAC,CAAC;gBACH,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;gBAC9E,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;YACzB,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;gBAC3E,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;gBACvE,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;gBACrF,MAAM,eAAe,CAAC,QAAQ,CAAC;oBAC7B,EAAE,EAAE,SAAS,CAAC,GAA4B;oBAC1C,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,gBAAgB,CAAC,GAAG,CAAC;oBACtD,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,WAAW,CAAC;iBACzD,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE;oBACrE,UAAU,EAAE,WAAW;oBACvB,MAAM,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;oBAC9B,QAAQ,EAAE,WAAW;iBACtB,CAAC,CAAC;gBAEH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;gBACzF,MAAM,eAAe,CAAC,QAAQ,CAAC;oBAC7B,EAAE,EAAE,SAAS,CAAC,GAA4B;oBAC1C,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,gBAAgB,CAAC,GAAG,CAAC;oBACtD,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;iBAC/E,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE;oBACrE,UAAU,EAAE,WAAW;oBACvB,MAAM,EAAE,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;oBAC9B,QAAQ,EAAE,WAAW;iBACtB,CAAC,CAAC;gBAEH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;YAC5B,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;gBAC3E,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE;oBACxE,OAAO,EAAE,WAAW;oBACpB,OAAO,EAAE,WAAW;oBACpB,OAAO,EAAE,IAAI;oBACb,cAAc,EAAE,WAAW;iBAC5B,CAAC,CAAC;gBACH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;gBACrF,MAAM,eAAe,CAAC,QAAQ,CAAC;oBAC7B,EAAE,EAAE,SAAS,CAAC,MAA+B;oBAC7C,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,mBAAmB,CAAC,GAAG,CAAC;oBACzD,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC;iBACpD,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE;oBACxE,OAAO,EAAE,WAAW;oBACpB,OAAO,EAAE,WAAW;oBACpB,OAAO,EAAE,IAAI;oBACb,cAAc,EAAE,WAAW;iBAC5B,CAAC,CAAC;gBAEH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;gBACzF,MAAM,eAAe,CAAC,QAAQ,CAAC;oBAC7B,EAAE,EAAE,SAAS,CAAC,MAA+B;oBAC7C,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,mBAAmB,CAAC,GAAG,CAAC;oBACzD,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,CAAC,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;iBAC1E,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE;oBACxE,OAAO,EAAE,WAAW;oBACpB,OAAO,EAAE,WAAW;oBACpB,OAAO,EAAE,IAAI;oBACb,cAAc,EAAE,WAAW;iBAC5B,CAAC,CAAC;gBAEH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;YAC/B,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;gBAC3E,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,EAAE;oBAC3E,iBAAiB,EAAE,WAAW;oBAC9B,OAAO,EAAE,GAAG;iBACb,CAAC,CAAC;gBAEH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;gBACrF,MAAM,eAAe,CAAC,QAAQ,CAAC;oBAC7B,EAAE,EAAE,SAAS,CAAC,SAAkC;oBAChD,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,sBAAsB,CAAC,GAAG,CAAC;oBAC5D,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,CAAC,WAAW,EAAE,GAAG,CAAC;iBACzB,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,EAAE;oBAC3E,iBAAiB,EAAE,WAAW;oBAC9B,OAAO,EAAE,GAAG;iBACb,CAAC,CAAC;gBAEH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;gBACzF,MAAM,eAAe,CAAC,QAAQ,CAAC;oBAC7B,EAAE,EAAE,SAAS,CAAC,SAAkC;oBAChD,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,sBAAsB,CAAC,GAAG,CAAC;oBAC5D,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,CAAC,WAAW,EAAE,GAAG,CAAC;iBACzB,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,SAAS,EAAE,KAAK,EAAE;oBAC3E,iBAAiB,EAAE,WAAW;oBAC9B,OAAO,EAAE,GAAG;iBACb,CAAC,CAAC;gBAEH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;YAC1B,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;gBAC3E,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE;oBACtE,mBAAmB,EAAE,WAAW;oBAChC,YAAY,EAAE,CAAC,WAAW,CAAC;iBAC5B,CAAC,CAAC;gBACH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;gBACrF,MAAM,eAAe,CAAC,QAAQ,CAAC;oBAC7B,EAAE,EAAE,SAAS,CAAC,IAA6B;oBAC3C,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,iBAAiB,CAAC,GAAG,CAAC;oBACvD,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,WAAW,CAAC,CAAC;iBACnC,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE;oBACtE,mBAAmB,EAAE,WAAW;oBAChC,YAAY,EAAE,CAAC,WAAW,CAAC;iBAC5B,CAAC,CAAC;gBAEH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;gBACzF,MAAM,eAAe,CAAC,QAAQ,CAAC;oBAC7B,EAAE,EAAE,SAAS,CAAC,IAA6B;oBAC3C,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,iBAAiB,CAAC,GAAG,CAAC;oBACvD,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC;iBAC5B,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE;oBACtE,mBAAmB,EAAE,WAAW;oBAChC,YAAY,EAAE,CAAC,KAAK,CAAC;iBACtB,CAAC,CAAC;gBAEH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;YACrC,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;gBAC3E,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,EAAE;oBACjF,cAAc,EAAE,WAAW;oBAC3B,YAAY,EAAE,GAAG;iBAClB,CAAC,CAAC;gBAEH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;gBACrF,MAAM,eAAe,CAAC,QAAQ,CAAC;oBAC7B,EAAE,EAAE,SAAS,CAAC,eAAwC;oBACtD,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,4BAA4B,CAAC,GAAG,CAAC;oBAClE,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,CAAC,WAAW,EAAE,GAAG,CAAC;iBACzB,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,EAAE;oBACjF,cAAc,EAAE,WAAW;oBAC3B,YAAY,EAAE,GAAG;iBAClB,CAAC,CAAC;gBAEH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;gBACzF,MAAM,eAAe,CAAC,QAAQ,CAAC;oBAC7B,EAAE,EAAE,SAAS,CAAC,eAAwC;oBACtD,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,4BAA4B,CAAC,GAAG,CAAC;oBAClE,OAAO,EAAE,KAAK;oBACd,IAAI,EAAE,CAAC,WAAW,EAAE,GAAG,CAAC;iBACzB,CAAC,CAAC;gBAEH,MAAM,UAAU,GAAG,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,eAAe,EAAE,KAAK,EAAE;oBACjF,cAAc,EAAE,WAAW;oBAC3B,YAAY,EAAE,GAAG;iBAClB,CAAC,CAAC;gBAEH,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,CAAC;gBACjC,MAAM,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAC/C,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;gBACrC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;YAC5C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,IAAI,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;YAC9E,MAAM,MAAM,CACV,eAAe,CAAC,UAAU,CAAC;gBACzB,MAAM,EAAE,wBAAwB;gBAChC,KAAK;gBACL,QAAQ;gBACR,iBAAiB,EAAE,KAAK;aACzB,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;YAC7D,MAAM,MAAM,CACV,eAAe,CAAC,UAAU,CAAC;gBACzB,MAAM,EAAE,wBAAwB;gBAChC,KAAK;gBACL,QAAQ,EAAE,IAAI;gBACd,iBAAiB;aAClB,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,cAAc,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;YAC7E,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;YAEvF,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC;gBAChE,MAAM,EAAE,wBAAwB;gBAChC,KAAK;gBACL,QAAQ;gBACR,iBAAiB;aAClB,CAAC,CAAC;YAEH,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;QAC1B,SAAS,CAAC,GAAG,EAAE;YACb,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;YACtE,MAAM,MAAM,CACV,eAAe,CAAC,UAAU,CAAC;gBACzB,QAAQ;gBACR,iBAAiB;gBACjB,KAAK;gBACL,MAAM,EAAE,wBAAwB;aACjC,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,6EAA6E,EAAE,KAAK,IAAI,EAAE;YAC7F,MAAM,eAAe,CAAC,QAAQ,CAAC;gBAC7B,EAAE,EAAE,UAAU,CAAC,IAAI;gBACnB,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC;gBACjD,OAAO,EAAE,kBAAkB,CAAC,YAAY;gBACxC,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YACH,MAAM,MAAM,CACV,eAAe,CAAC,UAAU,CAAC;gBACzB,QAAQ;gBACR,iBAAiB;gBACjB,KAAK;gBACL,MAAM,EAAE,wBAAwB;aACjC,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,MAAM,eAAe,CAAC,QAAQ,CAAC;gBAC7B,EAAE,EAAE,UAAU,CAAC,IAAI;gBACnB,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC;gBACjD,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YAEH,MAAM,MAAM,CACV,eAAe,CAAC,UAAU,CAAC;gBACzB,QAAQ;gBACR,iBAAiB;gBACjB,KAAK;gBACL,MAAM,EAAE,wBAAwB;aACjC,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,MAAM,eAAe,CAAC,QAAQ,CAAC;gBAC7B,EAAE,EAAE,UAAU,CAAC,IAAI;gBACnB,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC;gBACjD,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YAEH,MAAM,eAAe,CAAC,QAAQ,CAAC;gBAC7B,EAAE,EAAE,UAAU,CAAC,QAAQ;gBACvB,QAAQ,EAAE,IAAI,YAAY,CAAC,IAAI,EAAE,eAAe,CAAC,GAAG,CAAC;gBACrD,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,EAAE;aACT,CAAC,CAAC;YAEH,MAAM,MAAM,CACV,eAAe,CAAC,UAAU,CAAC;gBACzB,QAAQ;gBACR,iBAAiB;gBACjB,KAAK;gBACL,MAAM,EAAE,wBAAwB;aACjC,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,wBAAwB,CAAC,QAAQ,EAAE,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,sBAAsB,EAAE,KAAK,IAAI,EAAE;YACtC,MAAM,cAAc,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YACpE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;YAEvF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC;gBAClD,MAAM,EAAE,wBAAwB;gBAChC,KAAK;gBACL,QAAQ;gBACR,iBAAiB;aAClB,CAAC,CAAC;YAEH,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YAC3C,MAAM,aAAa,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAClD,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"deployer.service.test.js","sourceRoot":"","sources":["../../../../ts/deployer/__tests__/deployer.service.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,26 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { EMode } from "@maci-protocol/sdk";
|
|
2
|
+
import { IDeployMaciConfig, IDeployPollConfig, IEASPolicyArgs, IGitcoinPassportPolicyArgs, IHatsPolicyArgs, IMerkleProofPolicyArgs, ISemaphorePolicyArgs, ITokenPolicyArgs, IZupassPolicyArgs } from "../types";
|
|
2
3
|
export declare const MSG_BATCH_SIZE = 20;
|
|
4
|
+
export declare const MODE = EMode.NON_QV;
|
|
3
5
|
/**
|
|
4
6
|
* MACI deployment configuration for testing
|
|
5
7
|
*/
|
|
6
8
|
export declare const testMaciDeploymentConfig: IDeployMaciConfig;
|
|
9
|
+
/**
|
|
10
|
+
* Start date for the poll (it cannot be in the past)
|
|
11
|
+
*/
|
|
12
|
+
export declare const startDate: number;
|
|
13
|
+
/**
|
|
14
|
+
* Poll duration in seconds
|
|
15
|
+
* n seconds are added to the poll start date
|
|
16
|
+
*/
|
|
17
|
+
export declare const pollDuration = 60;
|
|
18
|
+
/**
|
|
19
|
+
* Poll start date extra seconds
|
|
20
|
+
* n seconds are added to the poll start date
|
|
21
|
+
* to give it time until it the previous poll contracts are deployed
|
|
22
|
+
*/
|
|
23
|
+
export declare const pollStartDateExtraSeconds = 60;
|
|
7
24
|
/**
|
|
8
25
|
* Poll deployment configuration for testing
|
|
9
26
|
*/
|
|
@@ -29,6 +46,14 @@ export declare const SemaphorePolicyDeploymentConfig: ISemaphorePolicyArgs;
|
|
|
29
46
|
* HatsPolicy deployment configuration for testing
|
|
30
47
|
*/
|
|
31
48
|
export declare const HatsPolicyDeploymentConfig: IHatsPolicyArgs;
|
|
49
|
+
/**
|
|
50
|
+
* MerkleProofPolicy deployment configuration for testing
|
|
51
|
+
*/
|
|
52
|
+
export declare const MerkleProofPolicyDeploymentConfig: IMerkleProofPolicyArgs;
|
|
53
|
+
/**
|
|
54
|
+
* SignUpPolicy deployment configuration for testing
|
|
55
|
+
*/
|
|
56
|
+
export declare const SignUpPolicyDeploymentConfig: ITokenPolicyArgs;
|
|
32
57
|
/**
|
|
33
58
|
* GitcoinPassportPolicy deployment configuration for testing
|
|
34
59
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../ts/deployer/__tests__/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../ts/deployer/__tests__/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAGlF,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,EACd,0BAA0B,EAC1B,eAAe,EACf,sBAAsB,EACtB,oBAAoB,EACpB,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAElB,eAAO,MAAM,cAAc,KAAK,CAAC;AAEjC,eAAO,MAAM,IAAI,eAAe,CAAC;AAEjC;;GAEG;AACH,eAAO,MAAM,wBAAwB,EAAE,iBAyBtC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,SAAS,QAAgC,CAAC;AAEvD;;;GAGG;AACH,eAAO,MAAM,YAAY,KAAK,CAAC;AAE/B;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAE5C;;GAEG;AACH,eAAO,MAAM,wBAAwB,EAAE,iBAkBtC,CAAC;AAEF;;;;GAIG;AACH;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,cAIvC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,4BAA4B,EAAE,iBAK1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,+BAA+B,EAAE,oBAG7C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,0BAA0B,EAAE,eAGxC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iCAAiC,EAAE,sBAE/C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,4BAA4B,EAAE,gBAE1C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,qCAAqC,EAAE,0BAGnD,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { EPolicies, EInitialVoiceCreditProxies, EMode } from "@maci-protocol/sdk";
|
|
2
|
+
import { zeroHash } from "viem";
|
|
3
3
|
export const MSG_BATCH_SIZE = 20;
|
|
4
|
+
export const MODE = EMode.NON_QV;
|
|
4
5
|
/**
|
|
5
6
|
* MACI deployment configuration for testing
|
|
6
7
|
*/
|
|
@@ -11,14 +12,15 @@ export const testMaciDeploymentConfig = {
|
|
|
11
12
|
MACI: {
|
|
12
13
|
policy: EPolicies.FreeForAll,
|
|
13
14
|
stateTreeDepth: 10,
|
|
15
|
+
mode: MODE,
|
|
14
16
|
},
|
|
15
|
-
|
|
17
|
+
VerifyingKeysRegistry: {
|
|
16
18
|
args: {
|
|
17
19
|
stateTreeDepth: 10n,
|
|
18
20
|
pollStateTreeDepth: 10n,
|
|
19
21
|
messageBatchSize: MSG_BATCH_SIZE,
|
|
20
22
|
voteOptionTreeDepth: 2n,
|
|
21
|
-
|
|
23
|
+
tallyProcessingStateTreeDepth: 1n,
|
|
22
24
|
},
|
|
23
25
|
},
|
|
24
26
|
Poseidon: {
|
|
@@ -29,15 +31,29 @@ export const testMaciDeploymentConfig = {
|
|
|
29
31
|
poseidonT6: "0xfD77833F10a29c76A6a0ede235Eb651D744d0E2F",
|
|
30
32
|
},
|
|
31
33
|
};
|
|
34
|
+
/**
|
|
35
|
+
* Start date for the poll (it cannot be in the past)
|
|
36
|
+
*/
|
|
37
|
+
export const startDate = Math.floor(Date.now() / 1000);
|
|
38
|
+
/**
|
|
39
|
+
* Poll duration in seconds
|
|
40
|
+
* n seconds are added to the poll start date
|
|
41
|
+
*/
|
|
42
|
+
export const pollDuration = 60;
|
|
43
|
+
/**
|
|
44
|
+
* Poll start date extra seconds
|
|
45
|
+
* n seconds are added to the poll start date
|
|
46
|
+
* to give it time until it the previous poll contracts are deployed
|
|
47
|
+
*/
|
|
48
|
+
export const pollStartDateExtraSeconds = 60;
|
|
32
49
|
/**
|
|
33
50
|
* Poll deployment configuration for testing
|
|
34
51
|
*/
|
|
35
52
|
export const testPollDeploymentConfig = {
|
|
36
|
-
startDate
|
|
37
|
-
endDate:
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
intStateTreeDepth: 1,
|
|
53
|
+
startDate,
|
|
54
|
+
endDate: startDate + pollDuration,
|
|
55
|
+
mode: MODE,
|
|
56
|
+
tallyProcessingStateTreeDepth: 1,
|
|
41
57
|
messageBatchSize: MSG_BATCH_SIZE,
|
|
42
58
|
pollStateTreeDepth: 10,
|
|
43
59
|
voteOptionTreeDepth: 2,
|
|
@@ -47,7 +63,7 @@ export const testPollDeploymentConfig = {
|
|
|
47
63
|
initialVoiceCreditsProxy: {
|
|
48
64
|
type: EInitialVoiceCreditProxies.Constant,
|
|
49
65
|
args: {
|
|
50
|
-
amount:
|
|
66
|
+
amount: 100,
|
|
51
67
|
},
|
|
52
68
|
},
|
|
53
69
|
voteOptions: 2n,
|
|
@@ -62,8 +78,8 @@ export const testPollDeploymentConfig = {
|
|
|
62
78
|
*/
|
|
63
79
|
export const EASPolicyDeploymentConfig = {
|
|
64
80
|
easAddress: "0xC2679fBD37d54388Ce493F1DB75320D236e1815e",
|
|
65
|
-
schema: "0xe2636f31239f7948afdd9a9c477048b7fc2a089c347af60e3aa1251e5bf63e5c",
|
|
66
81
|
attester: "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
|
|
82
|
+
schema: "0xe2636f31239f7948afdd9a9c477048b7fc2a089c347af60e3aa1251e5bf63e5c",
|
|
67
83
|
};
|
|
68
84
|
/**
|
|
69
85
|
* Zupass Policy deployment configuration for testing
|
|
@@ -88,6 +104,18 @@ export const HatsPolicyDeploymentConfig = {
|
|
|
88
104
|
hatsProtocolAddress: "0x3bc1A0Ad72417f2d411118085256fC53CBdDd137",
|
|
89
105
|
critrionHats: ["26960358043289970096177553829315270011263390106506980876069447401472"],
|
|
90
106
|
};
|
|
107
|
+
/**
|
|
108
|
+
* MerkleProofPolicy deployment configuration for testing
|
|
109
|
+
*/
|
|
110
|
+
export const MerkleProofPolicyDeploymentConfig = {
|
|
111
|
+
root: zeroHash,
|
|
112
|
+
};
|
|
113
|
+
/**
|
|
114
|
+
* SignUpPolicy deployment configuration for testing
|
|
115
|
+
*/
|
|
116
|
+
export const SignUpPolicyDeploymentConfig = {
|
|
117
|
+
token: "0x5fd84259d66Cd46123540766Be93DFE6D43130D7", // OP Sepolia USDC
|
|
118
|
+
};
|
|
91
119
|
/**
|
|
92
120
|
* GitcoinPassportPolicy deployment configuration for testing
|
|
93
121
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../ts/deployer/__tests__/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../ts/deployer/__tests__/utils.ts"],"names":[],"mappings":"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"}
|