@maci-protocol/testing 0.0.0-ci.f4bc8a6 → 0.0.0-ci.f54316d
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/build/ts/__tests__/e2e.nonQv.test.js +28 -28
- package/build/ts/__tests__/e2e.nonQv.test.js.map +1 -1
- package/build/ts/__tests__/e2e.test.js +236 -236
- package/build/ts/__tests__/e2e.test.js.map +1 -1
- package/build/ts/__tests__/integration.test.js +47 -42
- package/build/ts/__tests__/integration.test.js.map +1 -1
- package/build/ts/__tests__/keyChange.test.js +70 -61
- package/build/ts/__tests__/keyChange.test.js.map +1 -1
- package/build/ts/__tests__/maciKeys.test.d.ts +2 -0
- package/build/ts/__tests__/maciKeys.test.d.ts.map +1 -0
- package/build/ts/__tests__/{maci-keys.test.js → maciKeys.test.js} +35 -35
- package/build/ts/__tests__/maciKeys.test.js.map +1 -0
- package/build/ts/__tests__/unit/joinPoll.test.js +91 -16
- package/build/ts/__tests__/unit/joinPoll.test.js.map +1 -1
- package/build/ts/__tests__/unit/poll.test.js +7 -7
- package/build/ts/__tests__/unit/poll.test.js.map +1 -1
- package/build/ts/__tests__/unit/publish.test.js +13 -10
- package/build/ts/__tests__/unit/publish.test.js.map +1 -1
- package/build/ts/__tests__/unit/signup.test.js +9 -9
- package/build/ts/__tests__/unit/signup.test.js.map +1 -1
- package/build/ts/__tests__/unit/utils.test.js +12 -12
- package/build/ts/__tests__/unit/utils.test.js.map +1 -1
- package/build/ts/constants.d.ts +9 -6
- package/build/ts/constants.d.ts.map +1 -1
- package/build/ts/constants.js +37 -17
- package/build/ts/constants.js.map +1 -1
- package/build/ts/testingClass.d.ts.map +1 -1
- package/build/ts/testingClass.js +23 -18
- package/build/ts/testingClass.js.map +1 -1
- package/build/ts/types.d.ts +4 -4
- package/build/ts/types.d.ts.map +1 -1
- package/build/ts/user.d.ts +5 -9
- package/build/ts/user.d.ts.map +1 -1
- package/build/ts/user.js +5 -6
- package/build/ts/user.js.map +1 -1
- package/build/ts/utils.d.ts +2 -2
- package/build/ts/utils.d.ts.map +1 -1
- package/build/ts/utils.js +4 -4
- package/build/ts/utils.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +13 -13
- package/build/ts/__tests__/maci-keys.test.d.ts +0 -2
- package/build/ts/__tests__/maci-keys.test.d.ts.map +0 -1
- package/build/ts/__tests__/maci-keys.test.js.map +0 -1
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const domainobjs_1 = require("@maci-protocol/domainobjs");
|
|
4
4
|
const sdk_1 = require("@maci-protocol/sdk");
|
|
5
|
+
const browser_1 = require("@maci-protocol/sdk/browser");
|
|
5
6
|
const chai_1 = require("chai");
|
|
6
7
|
const constants_1 = require("../../constants");
|
|
7
8
|
describe("joinPoll", function test() {
|
|
@@ -9,28 +10,26 @@ describe("joinPoll", function test() {
|
|
|
9
10
|
let maciAddresses;
|
|
10
11
|
let initialVoiceCreditProxyContractAddress;
|
|
11
12
|
let verifierContractAddress;
|
|
12
|
-
const
|
|
13
|
-
const userPrivateKey = user.privKey.serialize();
|
|
14
|
-
const userPublicKey = user.pubKey.serialize();
|
|
13
|
+
const users = new Array(3).fill(undefined).map(() => new domainobjs_1.Keypair());
|
|
15
14
|
const mockStateIndex = 1n;
|
|
16
15
|
const mockPollId = 9000n;
|
|
17
16
|
this.timeout(900000);
|
|
18
|
-
// before all tests we deploy the
|
|
17
|
+
// before all tests we deploy the verifying keys registry contract and set the verifying keys
|
|
19
18
|
before(async () => {
|
|
20
19
|
signer = await (0, sdk_1.getDefaultSigner)();
|
|
21
|
-
const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
|
|
20
|
+
const [signupPolicy, , signupPolicyFactory, signupCheckerFactory] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
|
|
22
21
|
const signupPolicyContractAddress = await signupPolicy.getAddress();
|
|
23
|
-
const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
|
|
22
|
+
const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({ policy: signupPolicyFactory, checker: signupCheckerFactory }, signer, true);
|
|
24
23
|
const pollPolicyContractAddress = await pollPolicy.getAddress();
|
|
25
24
|
const [initialVoiceCreditProxy] = await (0, sdk_1.deployConstantInitialVoiceCreditProxy)({ amount: constants_1.DEFAULT_INITIAL_VOICE_CREDITS }, signer, undefined, true);
|
|
26
25
|
initialVoiceCreditProxyContractAddress = await initialVoiceCreditProxy.getAddress();
|
|
27
26
|
const verifier = await (0, sdk_1.deployVerifier)(signer, true);
|
|
28
27
|
verifierContractAddress = await verifier.getAddress();
|
|
29
28
|
const startDate = await (0, sdk_1.getBlockTimestamp)(signer);
|
|
30
|
-
// we deploy the
|
|
31
|
-
const
|
|
29
|
+
// we deploy the verifying keys registry contract
|
|
30
|
+
const verifyingKeysRegistryAddress = await (0, sdk_1.deployVerifyingKeysRegistryContract)({ signer });
|
|
32
31
|
// we set the verifying keys
|
|
33
|
-
await (0, sdk_1.setVerifyingKeys)({ ...(await (0, constants_1.verifyingKeysArgs)(signer)),
|
|
32
|
+
await (0, sdk_1.setVerifyingKeys)({ ...(await (0, constants_1.verifyingKeysArgs)(signer)), verifyingKeysRegistryAddress });
|
|
34
33
|
// deploy the smart contracts
|
|
35
34
|
maciAddresses = await (0, sdk_1.deployMaci)({
|
|
36
35
|
...constants_1.deployArgs,
|
|
@@ -40,7 +39,19 @@ describe("joinPoll", function test() {
|
|
|
40
39
|
// signup the user
|
|
41
40
|
await (0, sdk_1.signup)({
|
|
42
41
|
maciAddress: maciAddresses.maciContractAddress,
|
|
43
|
-
|
|
42
|
+
maciPublicKey: users[0].publicKey.serialize(),
|
|
43
|
+
sgData: constants_1.DEFAULT_SG_DATA,
|
|
44
|
+
signer,
|
|
45
|
+
});
|
|
46
|
+
await (0, sdk_1.signup)({
|
|
47
|
+
maciAddress: maciAddresses.maciContractAddress,
|
|
48
|
+
maciPublicKey: users[1].publicKey.serialize(),
|
|
49
|
+
sgData: constants_1.DEFAULT_SG_DATA,
|
|
50
|
+
signer,
|
|
51
|
+
});
|
|
52
|
+
await (0, sdk_1.signup)({
|
|
53
|
+
maciAddress: maciAddresses.maciContractAddress,
|
|
54
|
+
maciPublicKey: users[2].publicKey.serialize(),
|
|
44
55
|
sgData: constants_1.DEFAULT_SG_DATA,
|
|
45
56
|
signer,
|
|
46
57
|
});
|
|
@@ -53,7 +64,7 @@ describe("joinPoll", function test() {
|
|
|
53
64
|
relayers: [await signer.getAddress()],
|
|
54
65
|
maciAddress: maciAddresses.maciContractAddress,
|
|
55
66
|
verifierContractAddress,
|
|
56
|
-
|
|
67
|
+
verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
|
|
57
68
|
policyContractAddress: pollPolicyContractAddress,
|
|
58
69
|
initialVoiceCreditProxyContractAddress,
|
|
59
70
|
});
|
|
@@ -62,7 +73,7 @@ describe("joinPoll", function test() {
|
|
|
62
73
|
const startBlock = await signer.provider?.getBlockNumber();
|
|
63
74
|
await (0, sdk_1.joinPoll)({
|
|
64
75
|
maciAddress: maciAddresses.maciContractAddress,
|
|
65
|
-
privateKey:
|
|
76
|
+
privateKey: users[0].privateKey.serialize(),
|
|
66
77
|
stateIndex: 1n,
|
|
67
78
|
signer,
|
|
68
79
|
pollId: 0n,
|
|
@@ -77,17 +88,81 @@ describe("joinPoll", function test() {
|
|
|
77
88
|
const registeredUserData = await (0, sdk_1.getJoinedUserData)({
|
|
78
89
|
maciAddress: maciAddresses.maciContractAddress,
|
|
79
90
|
pollId: 0n,
|
|
80
|
-
|
|
91
|
+
pollPublicKey: users[0].publicKey.serialize(),
|
|
81
92
|
signer,
|
|
82
93
|
startBlock: startBlock || 0,
|
|
83
94
|
});
|
|
84
95
|
(0, chai_1.expect)(registeredUserData.isJoined).to.eq(true);
|
|
85
96
|
(0, chai_1.expect)(BigInt(registeredUserData.pollStateIndex)).to.eq(1);
|
|
86
97
|
});
|
|
98
|
+
it("should allow to join the poll and return the user data using a downloaded zKey", async () => {
|
|
99
|
+
const startBlock = await signer.provider?.getBlockNumber();
|
|
100
|
+
const { zKey, wasm } = await (0, browser_1.downloadPollJoiningArtifactsBrowser)({
|
|
101
|
+
testing: true,
|
|
102
|
+
stateTreeDepth: 10,
|
|
103
|
+
});
|
|
104
|
+
await (0, browser_1.joinPoll)({
|
|
105
|
+
maciAddress: maciAddresses.maciContractAddress,
|
|
106
|
+
privateKey: users[1].privateKey.serialize(),
|
|
107
|
+
stateIndex: 2n,
|
|
108
|
+
signer,
|
|
109
|
+
pollId: 0n,
|
|
110
|
+
pollJoiningZkey: zKey,
|
|
111
|
+
useWasm: true,
|
|
112
|
+
pollWasm: wasm,
|
|
113
|
+
sgDataArg: constants_1.DEFAULT_SG_DATA,
|
|
114
|
+
ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
|
|
115
|
+
useLatestStateIndex: true,
|
|
116
|
+
});
|
|
117
|
+
const registeredUserData = await (0, sdk_1.getJoinedUserData)({
|
|
118
|
+
maciAddress: maciAddresses.maciContractAddress,
|
|
119
|
+
pollId: 0n,
|
|
120
|
+
pollPublicKey: users[1].publicKey.serialize(),
|
|
121
|
+
signer,
|
|
122
|
+
startBlock: startBlock || 0,
|
|
123
|
+
});
|
|
124
|
+
(0, chai_1.expect)(registeredUserData.isJoined).to.eq(true);
|
|
125
|
+
(0, chai_1.expect)(BigInt(registeredUserData.pollStateIndex)).to.eq(2);
|
|
126
|
+
});
|
|
127
|
+
it("should allow to join the poll using a precomputed inclusion proof", async () => {
|
|
128
|
+
const startBlock = await signer.provider?.getBlockNumber();
|
|
129
|
+
const maciContract = sdk_1.MACI__factory.connect(maciAddresses.maciContractAddress, signer);
|
|
130
|
+
const stateTree = await (0, sdk_1.genMaciStateTreeWithEndKey)({
|
|
131
|
+
maciContract,
|
|
132
|
+
signer,
|
|
133
|
+
userPublicKey: users[2].publicKey,
|
|
134
|
+
});
|
|
135
|
+
const inclusionProof = stateTree.signUpTree.generateProof(3);
|
|
136
|
+
const { zKey, wasm } = await (0, browser_1.downloadPollJoiningArtifactsBrowser)({
|
|
137
|
+
testing: true,
|
|
138
|
+
stateTreeDepth: 10,
|
|
139
|
+
});
|
|
140
|
+
await (0, browser_1.joinPoll)({
|
|
141
|
+
maciAddress: maciAddresses.maciContractAddress,
|
|
142
|
+
privateKey: users[2].privateKey.serialize(),
|
|
143
|
+
stateIndex: 3n,
|
|
144
|
+
signer,
|
|
145
|
+
pollId: 0n,
|
|
146
|
+
inclusionProof,
|
|
147
|
+
pollJoiningZkey: zKey,
|
|
148
|
+
pollWasm: wasm,
|
|
149
|
+
sgDataArg: constants_1.DEFAULT_SG_DATA,
|
|
150
|
+
ivcpDataArg: constants_1.DEFAULT_IVCP_DATA,
|
|
151
|
+
});
|
|
152
|
+
const registeredUserData = await (0, sdk_1.getJoinedUserData)({
|
|
153
|
+
maciAddress: maciAddresses.maciContractAddress,
|
|
154
|
+
pollId: 0n,
|
|
155
|
+
pollPublicKey: users[2].publicKey.serialize(),
|
|
156
|
+
signer,
|
|
157
|
+
startBlock: startBlock || 0,
|
|
158
|
+
});
|
|
159
|
+
(0, chai_1.expect)(registeredUserData.isJoined).to.eq(true);
|
|
160
|
+
(0, chai_1.expect)(BigInt(registeredUserData.pollStateIndex)).to.eq(3);
|
|
161
|
+
});
|
|
87
162
|
it("should throw error if poll does not exist", async () => {
|
|
88
163
|
await (0, chai_1.expect)((0, sdk_1.joinPoll)({
|
|
89
164
|
maciAddress: maciAddresses.maciContractAddress,
|
|
90
|
-
privateKey:
|
|
165
|
+
privateKey: users[0].privateKey.serialize(),
|
|
91
166
|
stateIndex: mockStateIndex,
|
|
92
167
|
signer,
|
|
93
168
|
pollId: mockPollId,
|
|
@@ -100,7 +175,7 @@ describe("joinPoll", function test() {
|
|
|
100
175
|
const keypair = new domainobjs_1.Keypair();
|
|
101
176
|
await (0, chai_1.expect)((0, sdk_1.joinPoll)({
|
|
102
177
|
maciAddress: maciAddresses.maciContractAddress,
|
|
103
|
-
privateKey: keypair.
|
|
178
|
+
privateKey: keypair.privateKey.serialize(),
|
|
104
179
|
stateIndex: -1n,
|
|
105
180
|
signer,
|
|
106
181
|
pollId: 0n,
|
|
@@ -112,7 +187,7 @@ describe("joinPoll", function test() {
|
|
|
112
187
|
it("should throw error if current poll id is invalid", async () => {
|
|
113
188
|
await (0, chai_1.expect)((0, sdk_1.joinPoll)({
|
|
114
189
|
maciAddress: maciAddresses.maciContractAddress,
|
|
115
|
-
privateKey:
|
|
190
|
+
privateKey: users[0].privateKey.serialize(),
|
|
116
191
|
stateIndex: mockStateIndex,
|
|
117
192
|
signer,
|
|
118
193
|
pollId: -1n,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"joinPoll.test.js","sourceRoot":"","sources":["../../../../ts/__tests__/unit/joinPoll.test.ts"],"names":[],"mappings":";;AAAA,0DAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"joinPoll.test.js","sourceRoot":"","sources":["../../../../ts/__tests__/unit/joinPoll.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,21 +10,21 @@ describe("poll", function test() {
|
|
|
10
10
|
let verifierContractAddress;
|
|
11
11
|
let pollAddresses;
|
|
12
12
|
let signer;
|
|
13
|
-
// before all tests we deploy the
|
|
13
|
+
// before all tests we deploy the verifying keys registry contract and set the verifying keys
|
|
14
14
|
before(async () => {
|
|
15
15
|
signer = await (0, sdk_1.getDefaultSigner)();
|
|
16
|
-
const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
|
|
16
|
+
const [signupPolicy, , signupPolicyFactory, signupCheckerFactory] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
|
|
17
17
|
const signupPolicyContractAddress = await signupPolicy.getAddress();
|
|
18
|
-
const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
|
|
18
|
+
const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({ policy: signupPolicyFactory, checker: signupCheckerFactory }, signer, true);
|
|
19
19
|
const pollPolicyContractAddress = await pollPolicy.getAddress();
|
|
20
20
|
const [initialVoiceCreditProxy] = await (0, sdk_1.deployConstantInitialVoiceCreditProxy)({ amount: constants_1.DEFAULT_INITIAL_VOICE_CREDITS }, signer, undefined, true);
|
|
21
21
|
initialVoiceCreditProxyContractAddress = await initialVoiceCreditProxy.getAddress();
|
|
22
22
|
const verifier = await (0, sdk_1.deployVerifier)(signer, true);
|
|
23
23
|
verifierContractAddress = await verifier.getAddress();
|
|
24
|
-
// we deploy the
|
|
25
|
-
const
|
|
24
|
+
// we deploy the verifying keys registry contract
|
|
25
|
+
const verifyingKeysRegistryAddress = await (0, sdk_1.deployVerifyingKeysRegistryContract)({ signer });
|
|
26
26
|
// we set the verifying keys
|
|
27
|
-
await (0, sdk_1.setVerifyingKeys)({ ...(await (0, constants_1.verifyingKeysArgs)(signer)),
|
|
27
|
+
await (0, sdk_1.setVerifyingKeys)({ ...(await (0, constants_1.verifyingKeysArgs)(signer)), verifyingKeysRegistryAddress });
|
|
28
28
|
const startDate = await (0, sdk_1.getBlockTimestamp)(signer);
|
|
29
29
|
// deploy the smart contracts
|
|
30
30
|
maciAddresses = await (0, sdk_1.deployMaci)({
|
|
@@ -41,7 +41,7 @@ describe("poll", function test() {
|
|
|
41
41
|
relayers: [await signer.getAddress()],
|
|
42
42
|
maciAddress: maciAddresses.maciContractAddress,
|
|
43
43
|
verifierContractAddress,
|
|
44
|
-
|
|
44
|
+
verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
|
|
45
45
|
policyContractAddress: pollPolicyContractAddress,
|
|
46
46
|
initialVoiceCreditProxyContractAddress,
|
|
47
47
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poll.test.js","sourceRoot":"","sources":["../../../../ts/__tests__/unit/poll.test.ts"],"names":[],"mappings":";;AAAA,4CAe4B;AAC5B,+BAA8B;AAI9B,+CAMyB;AAEzB,QAAQ,CAAC,MAAM,EAAE,SAAS,IAAI;IAC5B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAErB,IAAI,aAA6B,CAAC;IAClC,IAAI,sCAA8C,CAAC;IACnD,IAAI,uBAA+B,CAAC;IACpC,IAAI,aAAiC,CAAC;IACtC,IAAI,MAAc,CAAC;IAEnB,
|
|
1
|
+
{"version":3,"file":"poll.test.js","sourceRoot":"","sources":["../../../../ts/__tests__/unit/poll.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,21 +27,24 @@ describe("publish", function test() {
|
|
|
27
27
|
newVoteWeight: 1n,
|
|
28
28
|
},
|
|
29
29
|
];
|
|
30
|
-
// before all tests we deploy the
|
|
30
|
+
// before all tests we deploy the verifying keys registry contract and set the verifying keys
|
|
31
31
|
before(async () => {
|
|
32
32
|
signer = await (0, sdk_1.getDefaultSigner)();
|
|
33
|
-
const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
|
|
33
|
+
const [signupPolicy, , signupPolicyFactory, signupCheckerFactory] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
|
|
34
34
|
const signupPolicyContractAddress = await signupPolicy.getAddress();
|
|
35
|
-
const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(
|
|
35
|
+
const [pollPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({
|
|
36
|
+
policy: signupPolicyFactory,
|
|
37
|
+
checker: signupCheckerFactory,
|
|
38
|
+
}, signer, true);
|
|
36
39
|
const pollPolicyContractAddress = await pollPolicy.getAddress();
|
|
37
40
|
const [initialVoiceCreditProxy] = await (0, sdk_1.deployConstantInitialVoiceCreditProxy)({ amount: constants_1.DEFAULT_INITIAL_VOICE_CREDITS }, signer, undefined, true);
|
|
38
41
|
initialVoiceCreditProxyContractAddress = await initialVoiceCreditProxy.getAddress();
|
|
39
42
|
const verifier = await (0, sdk_1.deployVerifier)(signer, true);
|
|
40
43
|
verifierContractAddress = await verifier.getAddress();
|
|
41
|
-
// we deploy the
|
|
42
|
-
const
|
|
44
|
+
// we deploy the verifying keys registry contract
|
|
45
|
+
const verifyingKeysRegistryAddress = await (0, sdk_1.deployVerifyingKeysRegistryContract)({ signer });
|
|
43
46
|
// we set the verifying keys
|
|
44
|
-
await (0, sdk_1.setVerifyingKeys)({ ...(await (0, constants_1.verifyingKeysArgs)(signer)),
|
|
47
|
+
await (0, sdk_1.setVerifyingKeys)({ ...(await (0, constants_1.verifyingKeysArgs)(signer)), verifyingKeysRegistryAddress });
|
|
45
48
|
const startDate = await (0, sdk_1.getBlockTimestamp)(signer);
|
|
46
49
|
// deploy the smart contracts
|
|
47
50
|
maciAddresses = await (0, sdk_1.deployMaci)({
|
|
@@ -58,7 +61,7 @@ describe("publish", function test() {
|
|
|
58
61
|
relayers: [await signer.getAddress()],
|
|
59
62
|
maciAddress: maciAddresses.maciContractAddress,
|
|
60
63
|
verifierContractAddress,
|
|
61
|
-
|
|
64
|
+
verifyingKeysRegistryContractAddress: verifyingKeysRegistryAddress,
|
|
62
65
|
policyContractAddress: pollPolicyContractAddress,
|
|
63
66
|
initialVoiceCreditProxyContractAddress,
|
|
64
67
|
});
|
|
@@ -69,15 +72,15 @@ describe("publish", function test() {
|
|
|
69
72
|
before(async () => {
|
|
70
73
|
defaultArgs = {
|
|
71
74
|
maciAddress: maciAddresses.maciContractAddress,
|
|
72
|
-
publicKey: user.
|
|
73
|
-
privateKey: user.
|
|
75
|
+
publicKey: user.publicKey.serialize(),
|
|
76
|
+
privateKey: user.privateKey.serialize(),
|
|
74
77
|
messages,
|
|
75
78
|
pollId: 0n,
|
|
76
79
|
signer,
|
|
77
80
|
};
|
|
78
81
|
await (0, sdk_1.signup)({
|
|
79
82
|
maciAddress: maciAddresses.maciContractAddress,
|
|
80
|
-
|
|
83
|
+
maciPublicKey: user.publicKey.serialize(),
|
|
81
84
|
sgData: constants_1.DEFAULT_SG_DATA,
|
|
82
85
|
signer,
|
|
83
86
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish.test.js","sourceRoot":"","sources":["../../../../ts/__tests__/unit/publish.test.ts"],"names":[],"mappings":";;AAAA,kDAAyD;AACzD,0DAAoD;AACpD,4CAiB4B;AAC5B,+BAA8B;AAI9B,+CAOyB;AAEzB,QAAQ,CAAC,SAAS,EAAE,SAAS,IAAI;IAC/B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAErB,IAAI,aAA6B,CAAC;IAClC,IAAI,sCAA8C,CAAC;IACnD,IAAI,uBAA+B,CAAC;IACpC,IAAI,aAAiC,CAAC;IACtC,IAAI,MAAc,CAAC;IAEnB,MAAM,QAAQ,GAAsB;QAClC;YACE,UAAU,EAAE,EAAE;YACd,eAAe,EAAE,EAAE;YACnB,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,EAAE;YACjB,IAAI,EAAE,EAAE;SACT;QACD;YACE,UAAU,EAAE,EAAE;YACd,eAAe,EAAE,EAAE;YACnB,KAAK,EAAE,EAAE;YACT,aAAa,EAAE,EAAE;SAClB;KACF,CAAC;IAEF,
|
|
1
|
+
{"version":3,"file":"publish.test.js","sourceRoot":"","sources":["../../../../ts/__tests__/unit/publish.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,15 +9,15 @@ describe("signup", function test() {
|
|
|
9
9
|
let signer;
|
|
10
10
|
let maciAddresses;
|
|
11
11
|
const user = new domainobjs_1.Keypair();
|
|
12
|
-
// before all tests we deploy the
|
|
12
|
+
// before all tests we deploy the verifying keys registry contract and set the verifying keys
|
|
13
13
|
before(async () => {
|
|
14
14
|
signer = await (0, sdk_1.getDefaultSigner)();
|
|
15
|
-
const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)(signer, true);
|
|
15
|
+
const [signupPolicy] = await (0, sdk_1.deployFreeForAllSignUpPolicy)({}, signer, true);
|
|
16
16
|
const signupPolicyContractAddress = await signupPolicy.getAddress();
|
|
17
|
-
// we deploy the
|
|
18
|
-
const
|
|
17
|
+
// we deploy the verifying keys registry contract
|
|
18
|
+
const verifyingKeysRegistryAddress = await (0, sdk_1.deployVerifyingKeysRegistryContract)({ signer });
|
|
19
19
|
// we set the verifying keys
|
|
20
|
-
await (0, sdk_1.setVerifyingKeys)({ ...(await (0, constants_1.verifyingKeysArgs)(signer)),
|
|
20
|
+
await (0, sdk_1.setVerifyingKeys)({ ...(await (0, constants_1.verifyingKeysArgs)(signer)), verifyingKeysRegistryAddress });
|
|
21
21
|
// deploy the smart contracts
|
|
22
22
|
maciAddresses = await (0, sdk_1.deployMaci)({
|
|
23
23
|
...constants_1.deployArgs,
|
|
@@ -29,14 +29,14 @@ describe("signup", function test() {
|
|
|
29
29
|
const startBlock = await signer.provider?.getBlockNumber();
|
|
30
30
|
const signUpData = await (0, sdk_1.signup)({
|
|
31
31
|
maciAddress: maciAddresses.maciContractAddress,
|
|
32
|
-
|
|
32
|
+
maciPublicKey: user.publicKey.serialize(),
|
|
33
33
|
sgData: constants_1.DEFAULT_SG_DATA,
|
|
34
34
|
signer,
|
|
35
35
|
});
|
|
36
36
|
const registeredUserData = await (0, sdk_1.getSignedupUserData)({
|
|
37
37
|
maciAddress: maciAddresses.maciContractAddress,
|
|
38
38
|
startBlock,
|
|
39
|
-
|
|
39
|
+
maciPublicKey: user.publicKey.serialize(),
|
|
40
40
|
signer,
|
|
41
41
|
});
|
|
42
42
|
(0, chai_1.expect)(registeredUserData.isRegistered).to.eq(true);
|
|
@@ -46,7 +46,7 @@ describe("signup", function test() {
|
|
|
46
46
|
const registeredUserData = await (0, sdk_1.getSignedupUserData)({
|
|
47
47
|
maciAddress: maciAddresses.maciContractAddress,
|
|
48
48
|
startBlock: await signer.provider?.getBlockNumber(),
|
|
49
|
-
|
|
49
|
+
maciPublicKey: new domainobjs_1.Keypair().publicKey.serialize(),
|
|
50
50
|
signer,
|
|
51
51
|
});
|
|
52
52
|
(0, chai_1.expect)(registeredUserData.isRegistered).to.eq(false);
|
|
@@ -54,7 +54,7 @@ describe("signup", function test() {
|
|
|
54
54
|
it("should start fetchig from block zero if the start block is not provided", async () => {
|
|
55
55
|
const registeredUserData = await (0, sdk_1.getSignedupUserData)({
|
|
56
56
|
maciAddress: maciAddresses.maciContractAddress,
|
|
57
|
-
|
|
57
|
+
maciPublicKey: user.publicKey.serialize(),
|
|
58
58
|
signer,
|
|
59
59
|
});
|
|
60
60
|
(0, chai_1.expect)(registeredUserData.isRegistered).to.eq(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signup.test.js","sourceRoot":"","sources":["../../../../ts/__tests__/unit/signup.test.ts"],"names":[],"mappings":";;AAAA,0DAAoD;AACpD,4CAS4B;AAC5B,+BAA8B;AAG9B,+CAAiF;AAEjF,QAAQ,CAAC,QAAQ,EAAE,SAAS,IAAI;IAC9B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAErB,IAAI,MAAc,CAAC;IACnB,IAAI,aAA6B,CAAC;IAElC,MAAM,IAAI,GAAG,IAAI,oBAAO,EAAE,CAAC;IAC3B,
|
|
1
|
+
{"version":3,"file":"signup.test.js","sourceRoot":"","sources":["../../../../ts/__tests__/unit/signup.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,23 +10,23 @@ const chai_1 = require("chai");
|
|
|
10
10
|
const fs_1 = __importDefault(require("fs"));
|
|
11
11
|
const path_1 = __importDefault(require("path"));
|
|
12
12
|
describe("utils", () => {
|
|
13
|
-
describe("
|
|
14
|
-
it("should return true for two equal
|
|
15
|
-
const
|
|
16
|
-
const
|
|
17
|
-
(0, chai_1.expect)((0, sdk_1.
|
|
13
|
+
describe("verifying keys", () => {
|
|
14
|
+
it("should return true for two equal verifying keys", async () => {
|
|
15
|
+
const verifyingKeyPath = path_1.default.resolve(__dirname, "..", "data", "testVk.json");
|
|
16
|
+
const verifyingKey = domainobjs_1.VerifyingKey.fromJSON(await fs_1.default.promises.readFile(verifyingKeyPath).then((res) => res.toString()));
|
|
17
|
+
(0, chai_1.expect)((0, sdk_1.compareVerifyingKeys)(verifyingKey, verifyingKey.asContractParam())).to.eq(true);
|
|
18
18
|
});
|
|
19
|
-
it("should return false for two unequal
|
|
20
|
-
const
|
|
21
|
-
const
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
(0, chai_1.expect)((0, sdk_1.
|
|
19
|
+
it("should return false for two unequal verifying keys", async () => {
|
|
20
|
+
const verifyingKeyPath = path_1.default.resolve(__dirname, "..", "data", "testVk.json");
|
|
21
|
+
const verifyingKey = domainobjs_1.VerifyingKey.fromJSON(await fs_1.default.promises.readFile(verifyingKeyPath).then((res) => res.toString()));
|
|
22
|
+
const verifyingKeyCopy = verifyingKey.asContractParam();
|
|
23
|
+
verifyingKeyCopy.alpha1.x = 9999n;
|
|
24
|
+
(0, chai_1.expect)((0, sdk_1.compareVerifyingKeys)(verifyingKey, verifyingKeyCopy)).to.eq(false);
|
|
25
25
|
});
|
|
26
26
|
});
|
|
27
27
|
describe("validateSalt", () => {
|
|
28
28
|
it("should return true for a valid salt", () => {
|
|
29
|
-
(0, chai_1.expect)((0, sdk_1.validateSalt)((0, crypto_1.
|
|
29
|
+
(0, chai_1.expect)((0, sdk_1.validateSalt)((0, crypto_1.generateRandomSalt)())).to.eq(true);
|
|
30
30
|
});
|
|
31
31
|
it("should return false for an invalid salt", () => {
|
|
32
32
|
(0, chai_1.expect)((0, sdk_1.validateSalt)(crypto_1.SNARK_FIELD_SIZE)).to.eq(false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../../ts/__tests__/unit/utils.test.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../../../ts/__tests__/unit/utils.test.ts"],"names":[],"mappings":";;;;;AAAA,kDAA6E;AAC7E,0DAAyD;AACzD,4CAAwE;AACxE,+BAA8B;AAE9B,4CAAoB;AACpB,gDAAwB;AAExB,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACrB,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,MAAM,gBAAgB,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;YAC9E,MAAM,YAAY,GAAG,yBAAY,CAAC,QAAQ,CACxC,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAC3E,CAAC;YAEF,IAAA,aAAM,EAAC,IAAA,0BAAoB,EAAC,YAAY,EAAE,YAAY,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QACzF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,MAAM,gBAAgB,GAAG,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;YAC9E,MAAM,YAAY,GAAG,yBAAY,CAAC,QAAQ,CACxC,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAC3E,CAAC;YAEF,MAAM,gBAAgB,GAAG,YAAY,CAAC,eAAe,EAAE,CAAC;YACxD,gBAAgB,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,CAAC;YAClC,IAAA,aAAM,EAAC,IAAA,0BAAoB,EAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC7C,IAAA,aAAM,EAAC,IAAA,kBAAY,EAAC,IAAA,2BAAkB,GAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACjD,IAAA,aAAM,EAAC,IAAA,kBAAY,EAAC,yBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/build/ts/constants.d.ts
CHANGED
|
@@ -2,7 +2,8 @@ import { Keypair } from "@maci-protocol/domainobjs";
|
|
|
2
2
|
import { EMode, type ICheckVerifyingKeysArgs, type IDeployPollArgs, type ISetVerifyingKeysArgs, type IMergeSignupsArgs, type IVerifyArgs, type IProveOnChainArgs, type ITimeTravelArgs, type IDeployMaciArgs } from "@maci-protocol/sdk";
|
|
3
3
|
import type { Signer } from "ethers";
|
|
4
4
|
export declare const STATE_TREE_DEPTH = 10;
|
|
5
|
-
export declare const
|
|
5
|
+
export declare const POLL_STATE_TREE_DEPTH = 10;
|
|
6
|
+
export declare const TALLY_PROCESSING_STATE_TREE_DEPTH = 1;
|
|
6
7
|
export declare const VOTE_OPTION_TREE_DEPTH = 2;
|
|
7
8
|
export declare const MESSAGE_BATCH_SIZE = 20;
|
|
8
9
|
export declare const DEFAULT_INITIAL_VOICE_CREDITS = 100;
|
|
@@ -10,8 +11,8 @@ export declare const DEFAULT_VOTE_OPTIONS = 25;
|
|
|
10
11
|
export declare const DEFAULT_SG_DATA = "0x0000000000000000000000000000000000000000000000000000000000000000";
|
|
11
12
|
export declare const DEFAULT_IVCP_DATA = "0x0000000000000000000000000000000000000000000000000000000000000000";
|
|
12
13
|
export declare const coordinatorKeypair: Keypair;
|
|
13
|
-
export declare const
|
|
14
|
-
export declare const
|
|
14
|
+
export declare const coordinatorPublicKey: string;
|
|
15
|
+
export declare const coordinatorPrivateKey: string;
|
|
15
16
|
export declare const pollDuration = 2000;
|
|
16
17
|
export declare const maxMessages = 25;
|
|
17
18
|
export declare const maxVoteOptions = 25;
|
|
@@ -20,7 +21,9 @@ export declare const pollJoinedTestZkeyPath = "./zkeys/PollJoined_10_test/PollJo
|
|
|
20
21
|
export declare const processMessageTestZkeyPath = "./zkeys/ProcessMessages_10-20-2_test/ProcessMessages_10-20-2_test.0.zkey";
|
|
21
22
|
export declare const tallyVotesTestZkeyPath = "./zkeys/TallyVotes_10-1-2_test/TallyVotes_10-1-2_test.0.zkey";
|
|
22
23
|
export declare const processMessageTestNonQvZkeyPath = "./zkeys/ProcessMessagesNonQv_10-20-2_test/ProcessMessagesNonQv_10-20-2_test.0.zkey";
|
|
24
|
+
export declare const processMessageTestFullZkeyPath = "./zkeys/MessageProcessorFull_10-20-2_test/MessageProcessorFull_10-20-2_test.0.zkey";
|
|
23
25
|
export declare const tallyVotesTestNonQvZkeyPath = "./zkeys/TallyVotesNonQv_10-1-2_test/TallyVotesNonQv_10-1-2_test.0.zkey";
|
|
26
|
+
export declare const tallyVotesTestFullZkeyPath = "./zkeys/TallyVotesNonQv_10-1-2_test/TallyVotesNonQv_10-1-2_test.0.zkey";
|
|
24
27
|
export declare const testTallyFilePath = "./tally.json";
|
|
25
28
|
export declare const testProofsDirPath = "./proofs";
|
|
26
29
|
export declare const testPollJoiningWitnessPath = "./zkeys/PollJoining_10_test/PollJoining_10_test_cpp/PollJoining_10_test";
|
|
@@ -66,14 +69,14 @@ export declare const pollJoinedWitgen: string;
|
|
|
66
69
|
export declare const rapidsnark: string;
|
|
67
70
|
export declare const processMessagesZkeyPathNonQv: string;
|
|
68
71
|
export declare const tallyVotesZkeyPathNonQv: string;
|
|
69
|
-
export declare const checkVerifyingKeysArgs: Omit<ICheckVerifyingKeysArgs, "
|
|
72
|
+
export declare const checkVerifyingKeysArgs: Omit<ICheckVerifyingKeysArgs, "verifyingKeysRegistry" | "signer">;
|
|
70
73
|
export declare const timeTravelArgs: Omit<ITimeTravelArgs, "signer">;
|
|
71
74
|
export declare const mergeSignupsArgs: Omit<IMergeSignupsArgs, "maciAddress" | "signer">;
|
|
72
75
|
export declare const proveOnChainArgs: Omit<IProveOnChainArgs, "maciAddress" | "signer">;
|
|
73
76
|
export declare const verifyArgs: (signer: Signer) => Promise<IVerifyArgs>;
|
|
74
|
-
export declare const verifyingKeysArgs: (signer: Signer, mode?: EMode) => Promise<Omit<ISetVerifyingKeysArgs, "
|
|
77
|
+
export declare const verifyingKeysArgs: (signer: Signer, mode?: EMode) => Promise<Omit<ISetVerifyingKeysArgs, "verifyingKeysRegistryAddress">>;
|
|
75
78
|
export declare const deployArgs: Omit<IDeployMaciArgs, "signer" | "signupPolicyAddress">;
|
|
76
|
-
export declare const deployPollArgs: Omit<IDeployPollArgs, "relayers" | "signer" | "pollStartTimestamp" | "pollEndTimestamp" | "maciAddress" | "verifierContractAddress" | "
|
|
79
|
+
export declare const deployPollArgs: Omit<IDeployPollArgs, "relayers" | "signer" | "pollStartTimestamp" | "pollEndTimestamp" | "maciAddress" | "verifierContractAddress" | "verifyingKeysRegistryContractAddress" | "policyContractAddress" | "initialVoiceCreditProxyContractAddress">;
|
|
77
80
|
export declare const invalidVote: {
|
|
78
81
|
voteWeight: bigint;
|
|
79
82
|
nonce: bigint;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../ts/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EACL,KAAK,EAIL,KAAK,uBAAuB,EAC5B,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAE1B,KAAK,iBAAiB,EACtB,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACpB,KAAK,eAAe,EACrB,MAAM,oBAAoB,CAAC;AAK5B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIrC,eAAO,MAAM,gBAAgB,KAAK,CAAC;AACnC,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../ts/constants.ts"],"names":[],"mappings":"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"}
|