@maci-protocol/sdk 0.0.0-ci.f9da2fc → 0.0.0-ci.fb960ed

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (74) hide show
  1. package/build/ts/browser/joinPoll.js +3 -3
  2. package/build/ts/browser/joinPoll.js.map +1 -1
  3. package/build/ts/deploy/poll.d.ts +1 -1
  4. package/build/ts/deploy/poll.d.ts.map +1 -1
  5. package/build/ts/deploy/poll.js +4 -3
  6. package/build/ts/deploy/poll.js.map +1 -1
  7. package/build/ts/deploy/types.d.ts +6 -2
  8. package/build/ts/deploy/types.d.ts.map +1 -1
  9. package/build/ts/maci/state.js +2 -2
  10. package/build/ts/maci/state.js.map +1 -1
  11. package/build/ts/maciKeys/__tests__/keypair.test.js +7 -7
  12. package/build/ts/maciKeys/__tests__/keypair.test.js.map +1 -1
  13. package/build/ts/maciKeys/__tests__/publicKeys.test.js +4 -4
  14. package/build/ts/maciKeys/__tests__/publicKeys.test.js.map +1 -1
  15. package/build/ts/maciKeys/keypair.js +3 -3
  16. package/build/ts/maciKeys/keypair.js.map +1 -1
  17. package/build/ts/maciKeys/publicKeys.d.ts +2 -2
  18. package/build/ts/maciKeys/publicKeys.d.ts.map +1 -1
  19. package/build/ts/maciKeys/publicKeys.js +6 -6
  20. package/build/ts/maciKeys/publicKeys.js.map +1 -1
  21. package/build/ts/poll/types.d.ts +3 -3
  22. package/build/ts/poll/types.d.ts.map +1 -1
  23. package/build/ts/proof/__tests__/download.test.js +2 -2
  24. package/build/ts/proof/__tests__/download.test.js.map +1 -1
  25. package/build/ts/proof/generate.js +2 -2
  26. package/build/ts/proof/generate.js.map +1 -1
  27. package/build/ts/relayer/__tests__/messages.test.js +1 -1
  28. package/build/ts/relayer/__tests__/messages.test.js.map +1 -1
  29. package/build/ts/relayer/__tests__/utils.test.js +3 -3
  30. package/build/ts/relayer/__tests__/utils.test.js.map +1 -1
  31. package/build/ts/relayer/utils.js +1 -1
  32. package/build/ts/relayer/utils.js.map +1 -1
  33. package/build/ts/trees/stateTree.js +2 -2
  34. package/build/ts/trees/stateTree.js.map +1 -1
  35. package/build/ts/trees/types.d.ts +2 -2
  36. package/build/ts/trees/types.d.ts.map +1 -1
  37. package/build/ts/user/joinPoll.js +3 -3
  38. package/build/ts/user/joinPoll.js.map +1 -1
  39. package/build/ts/user/signup.d.ts +3 -3
  40. package/build/ts/user/signup.d.ts.map +1 -1
  41. package/build/ts/user/signup.js +7 -7
  42. package/build/ts/user/signup.js.map +1 -1
  43. package/build/ts/user/types.d.ts +12 -12
  44. package/build/ts/user/types.d.ts.map +1 -1
  45. package/build/ts/user/utils.d.ts +5 -5
  46. package/build/ts/user/utils.d.ts.map +1 -1
  47. package/build/ts/user/utils.js +12 -12
  48. package/build/ts/user/utils.js.map +1 -1
  49. package/build/ts/verifyingKeys/setVerifyingKeys.d.ts +1 -1
  50. package/build/ts/verifyingKeys/setVerifyingKeys.d.ts.map +1 -1
  51. package/build/ts/verifyingKeys/setVerifyingKeys.js +13 -2
  52. package/build/ts/verifyingKeys/setVerifyingKeys.js.map +1 -1
  53. package/build/ts/verifyingKeys/types.d.ts +4 -0
  54. package/build/ts/verifyingKeys/types.d.ts.map +1 -1
  55. package/build/ts/vote/generate.d.ts +1 -1
  56. package/build/ts/vote/generate.d.ts.map +1 -1
  57. package/build/ts/vote/generate.js +3 -3
  58. package/build/ts/vote/generate.js.map +1 -1
  59. package/build/ts/vote/invalidate.js +3 -3
  60. package/build/ts/vote/invalidate.js.map +1 -1
  61. package/build/ts/vote/publish.d.ts +1 -1
  62. package/build/ts/vote/publish.d.ts.map +1 -1
  63. package/build/ts/vote/publish.js +18 -18
  64. package/build/ts/vote/publish.js.map +1 -1
  65. package/build/ts/vote/submit.js +2 -2
  66. package/build/ts/vote/submit.js.map +1 -1
  67. package/build/ts/vote/types.d.ts +6 -6
  68. package/build/ts/vote/types.d.ts.map +1 -1
  69. package/build/ts/vote/utils.d.ts +2 -2
  70. package/build/ts/vote/utils.d.ts.map +1 -1
  71. package/build/ts/vote/utils.js +2 -2
  72. package/build/ts/vote/utils.js.map +1 -1
  73. package/build/tsconfig.build.tsbuildinfo +1 -1
  74. package/package.json +6 -6
@@ -11,35 +11,35 @@ const utils_1 = require("./utils");
11
11
  * @param {IPublishArgs} args - The arguments for the publish command
12
12
  * @returns {IPublishData} The ephemeral private key used to encrypt the message, transaction hash
13
13
  */
14
- const publish = async ({ pubkey, stateIndex, voteOptionIndex, nonce, pollId, newVoteWeight, maciAddress, salt, privateKey, signer, }) => {
15
- if (!domainobjs_1.PubKey.isValidSerializedPubKey(pubkey)) {
14
+ const publish = async ({ stateIndex, voteOptionIndex, nonce, pollId, newVoteWeight, maciAddress, salt, publicKey: serializedPublicKey, privateKey: serializedPrivateKey, signer, }) => {
15
+ if (!domainobjs_1.PublicKey.isValidSerializedPubKey(serializedPublicKey)) {
16
16
  throw new Error("Invalid MACI public key");
17
17
  }
18
- if (!domainobjs_1.PrivKey.isValidSerializedPrivKey(privateKey)) {
18
+ if (!domainobjs_1.PrivateKey.isValidSerializedPrivKey(serializedPrivateKey)) {
19
19
  throw new Error("Invalid MACI private key");
20
20
  }
21
21
  const { poll: pollContract } = await (0, poll_1.getPollContracts)({ maciAddress, pollId, signer });
22
- const votePubKey = domainobjs_1.PubKey.deserialize(pubkey);
23
- const privKey = domainobjs_1.PrivKey.deserialize(privateKey);
22
+ const votePubKey = domainobjs_1.PublicKey.deserialize(serializedPublicKey);
23
+ const privateKey = domainobjs_1.PrivateKey.deserialize(serializedPrivateKey);
24
24
  const [maxVoteOption, pollAddress] = await Promise.all([pollContract.voteOptions(), pollContract.getAddress()]);
25
- const coordinatorPubKey = await (0, utils_1.getCoordinatorPubKey)(pollAddress, signer);
25
+ const coordinatorPublicKey = await (0, utils_1.getCoordinatorPubKey)(pollAddress, signer);
26
26
  const vote = (0, generate_1.generateVote)({
27
27
  pollId,
28
28
  voteOptionIndex,
29
29
  salt,
30
30
  nonce,
31
- privateKey: privKey,
31
+ privateKey,
32
32
  stateIndex,
33
33
  voteWeight: newVoteWeight,
34
- coordinatorPubKey,
34
+ coordinatorPublicKey,
35
35
  maxVoteOption,
36
- newPubKey: votePubKey,
36
+ newPublicKey: votePubKey,
37
37
  });
38
38
  const txHash = await (0, submit_1.submitVote)({ pollAddress, vote, signer });
39
39
  return {
40
40
  hash: txHash,
41
41
  encryptedMessage: vote.message,
42
- privateKey: vote.ephemeralKeypair.privKey.serialize(),
42
+ privateKey: vote.ephemeralKeypair.privateKey.serialize(),
43
43
  };
44
44
  };
45
45
  exports.publish = publish;
@@ -49,17 +49,17 @@ exports.publish = publish;
49
49
  * @returns {IPublishBatchData} The ephemeral private key used to encrypt the message, transaction hash
50
50
  */
51
51
  const publishBatch = async ({ messages, pollId, maciAddress, publicKey, privateKey, signer, }) => {
52
- if (!domainobjs_1.PubKey.isValidSerializedPubKey(publicKey)) {
52
+ if (!domainobjs_1.PublicKey.isValidSerializedPubKey(publicKey)) {
53
53
  throw new Error("Invalid MACI public key");
54
54
  }
55
- if (!domainobjs_1.PrivKey.isValidSerializedPrivKey(privateKey)) {
55
+ if (!domainobjs_1.PrivateKey.isValidSerializedPrivKey(privateKey)) {
56
56
  throw new Error("Invalid MACI private key");
57
57
  }
58
58
  const { poll: pollContract } = await (0, poll_1.getPollContracts)({ maciAddress, pollId, signer });
59
- const userMaciPubKey = domainobjs_1.PubKey.deserialize(publicKey);
60
- const userMaciPrivKey = domainobjs_1.PrivKey.deserialize(privateKey);
59
+ const userMaciPubKey = domainobjs_1.PublicKey.deserialize(publicKey);
60
+ const userMaciPrivKey = domainobjs_1.PrivateKey.deserialize(privateKey);
61
61
  const [maxVoteOption, pollAddress] = await Promise.all([pollContract.voteOptions(), pollContract.getAddress()]);
62
- const coordinatorPubKey = await (0, utils_1.getCoordinatorPubKey)(pollAddress, signer);
62
+ const coordinatorPublicKey = await (0, utils_1.getCoordinatorPubKey)(pollAddress, signer);
63
63
  // validate the vote options index against the max leaf index on-chain
64
64
  const votes = messages.map(({ stateIndex, voteOptionIndex, salt, nonce, newVoteWeight }) => (0, generate_1.generateVote)({
65
65
  pollId,
@@ -70,8 +70,8 @@ const publishBatch = async ({ messages, pollId, maciAddress, publicKey, privateK
70
70
  maxVoteOption: BigInt(maxVoteOption),
71
71
  salt,
72
72
  voteWeight: newVoteWeight,
73
- coordinatorPubKey,
74
- newPubKey: userMaciPubKey,
73
+ coordinatorPublicKey,
74
+ newPublicKey: userMaciPubKey,
75
75
  }));
76
76
  const txHash = await (0, submit_1.submitVoteBatch)({
77
77
  pollAddress,
@@ -81,7 +81,7 @@ const publishBatch = async ({ messages, pollId, maciAddress, publicKey, privateK
81
81
  return {
82
82
  hash: txHash,
83
83
  encryptedMessages: votes.map((vote) => vote.message),
84
- privateKeys: votes.map((vote) => vote.ephemeralKeypair.privKey.serialize()),
84
+ privateKeys: votes.map((vote) => vote.ephemeralKeypair.privateKey.serialize()),
85
85
  };
86
86
  };
87
87
  exports.publishBatch = publishBatch;
@@ -1 +1 @@
1
- {"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../ts/vote/publish.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../ts/vote/publish.ts"],"names":[],"mappings":"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"}
@@ -9,7 +9,7 @@ const typechain_types_1 = require("@maci-protocol/contracts/typechain-types");
9
9
  const submitVote = async ({ pollAddress, vote, signer }) => {
10
10
  const pollContract = typechain_types_1.Poll__factory.connect(pollAddress, signer);
11
11
  const receipt = await pollContract
12
- .publishMessage(vote.message, vote.ephemeralKeypair.pubKey.asContractParam())
12
+ .publishMessage(vote.message, vote.ephemeralKeypair.publicKey.asContractParam())
13
13
  .then((tx) => tx.wait());
14
14
  if (receipt?.status === 0) {
15
15
  throw new Error("Failed to submit the vote");
@@ -25,7 +25,7 @@ exports.submitVote = submitVote;
25
25
  const submitVoteBatch = async ({ pollAddress, votes, signer, }) => {
26
26
  const pollContract = typechain_types_1.Poll__factory.connect(pollAddress, signer);
27
27
  const receipt = await pollContract
28
- .publishMessageBatch(votes.map((vote) => vote.message), votes.map((vote) => vote.ephemeralKeypair.pubKey.asContractParam()))
28
+ .publishMessageBatch(votes.map((vote) => vote.message), votes.map((vote) => vote.ephemeralKeypair.publicKey.asContractParam()))
29
29
  .then((tx) => tx.wait());
30
30
  if (receipt?.status === 0) {
31
31
  throw new Error("Failed to submit the batch of votes");
@@ -1 +1 @@
1
- {"version":3,"file":"submit.js","sourceRoot":"","sources":["../../../ts/vote/submit.ts"],"names":[],"mappings":";;;AAAA,8EAAwF;AAIxF;;;GAGG;AACI,MAAM,UAAU,GAAG,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAmB,EAA+B,EAAE;IAC9G,MAAM,YAAY,GAAG,+BAAW,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAG,MAAM,YAAY;SAC/B,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;SAC5E,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAE3B,IAAI,OAAO,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,OAAO,EAAE,IAAI,CAAC;AACvB,CAAC,CAAC;AAZW,QAAA,UAAU,cAYrB;AAEF;;;;GAIG;AACI,MAAM,eAAe,GAAG,KAAK,EAAE,EACpC,WAAW,EACX,KAAK,EACL,MAAM,GACe,EAA+B,EAAE;IACtD,MAAM,YAAY,GAAG,+BAAW,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAG,MAAM,YAAY;SAC/B,mBAAmB,CAClB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EACjC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CACpE;SACA,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAE3B,IAAI,OAAO,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;IAED,OAAO,OAAO,EAAE,IAAI,CAAC;AACvB,CAAC,CAAC;AAnBW,QAAA,eAAe,mBAmB1B"}
1
+ {"version":3,"file":"submit.js","sourceRoot":"","sources":["../../../ts/vote/submit.ts"],"names":[],"mappings":";;;AAAA,8EAAwF;AAIxF;;;GAGG;AACI,MAAM,UAAU,GAAG,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAmB,EAA+B,EAAE;IAC9G,MAAM,YAAY,GAAG,+BAAW,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAG,MAAM,YAAY;SAC/B,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC;SAC/E,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAE3B,IAAI,OAAO,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IAED,OAAO,OAAO,EAAE,IAAI,CAAC;AACvB,CAAC,CAAC;AAZW,QAAA,UAAU,cAYrB;AAEF;;;;GAIG;AACI,MAAM,eAAe,GAAG,KAAK,EAAE,EACpC,WAAW,EACX,KAAK,EACL,MAAM,GACe,EAA+B,EAAE;IACtD,MAAM,YAAY,GAAG,+BAAW,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAE9D,MAAM,OAAO,GAAG,MAAM,YAAY;SAC/B,mBAAmB,CAClB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EACjC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC,CACvE;SACA,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAE3B,IAAI,OAAO,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;IAED,OAAO,OAAO,EAAE,IAAI,CAAC;AACvB,CAAC,CAAC;AAnBW,QAAA,eAAe,mBAmB1B"}
@@ -1,4 +1,4 @@
1
- import type { IMessageContractParams, Keypair, Message, PrivKey, PubKey } from "@maci-protocol/domainobjs";
1
+ import type { IMessageContractParams, Keypair, Message, PrivateKey, PublicKey } from "@maci-protocol/domainobjs";
2
2
  import type { Signer } from "ethers";
3
3
  /**
4
4
  * Interface for the arguments for the generateVote function
@@ -23,7 +23,7 @@ export interface IGenerateVoteArgs {
23
23
  /**
24
24
  * The private key for the vote
25
25
  */
26
- privateKey: PrivKey;
26
+ privateKey: PrivateKey;
27
27
  /**
28
28
  * The state index for the vote
29
29
  */
@@ -35,7 +35,7 @@ export interface IGenerateVoteArgs {
35
35
  /**
36
36
  * The coordinator public key
37
37
  */
38
- coordinatorPubKey: PubKey;
38
+ coordinatorPublicKey: PublicKey;
39
39
  /**
40
40
  * The largest vote option index
41
41
  */
@@ -47,7 +47,7 @@ export interface IGenerateVoteArgs {
47
47
  /**
48
48
  * New key in case of key change message
49
49
  */
50
- newPubKey?: PubKey;
50
+ newPublicKey?: PublicKey;
51
51
  }
52
52
  /**
53
53
  * Interface for the vote object
@@ -175,7 +175,7 @@ export interface IPublishArgs extends IPublishMessage {
175
175
  /**
176
176
  * The poll public key
177
177
  */
178
- pubkey: string;
178
+ publicKey: string;
179
179
  /**
180
180
  * The poll private key
181
181
  */
@@ -229,7 +229,7 @@ export interface IInvalidateVotesArgs {
229
229
  /**
230
230
  * MACI private key
231
231
  */
232
- maciPrivateKey: PrivKey;
232
+ maciPrivateKey: PrivateKey;
233
233
  /**
234
234
  * State index
235
235
  */
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../ts/vote/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../ts/vote/types.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { PubKey } from "@maci-protocol/domainobjs";
1
+ import { PublicKey } from "@maci-protocol/domainobjs";
2
2
  import type { Signer } from "ethers";
3
3
  /**
4
4
  * Run both format check and size check on a salt value
@@ -12,5 +12,5 @@ export declare const validateSalt: (salt: bigint) => boolean;
12
12
  * @param signer - the signer to use
13
13
  * @returns the coordinator public key
14
14
  */
15
- export declare const getCoordinatorPubKey: (pollAddress: string, signer: Signer) => Promise<PubKey>;
15
+ export declare const getCoordinatorPubKey: (pollAddress: string, signer: Signer) => Promise<PublicKey>;
16
16
  //# sourceMappingURL=utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../ts/vote/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAEnD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC;;;;GAIG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,KAAG,OAAkC,CAAC;AAE/E;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAU,aAAa,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,MAAM,CAM9F,CAAC"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../ts/vote/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC;;;;GAIG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,KAAG,OAAkC,CAAC;AAE/E;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAU,aAAa,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,SAAS,CAMjG,CAAC"}
@@ -19,8 +19,8 @@ exports.validateSalt = validateSalt;
19
19
  */
20
20
  const getCoordinatorPubKey = async (pollAddress, signer) => {
21
21
  const pollContract = typechain_types_1.Poll__factory.connect(pollAddress, signer);
22
- const coordinatorPubKey = await pollContract.coordinatorPubKey();
23
- return new domainobjs_1.PubKey([coordinatorPubKey.x, coordinatorPubKey.y]);
22
+ const coordinatorPublicKey = await pollContract.coordinatorPublicKey();
23
+ return new domainobjs_1.PublicKey([coordinatorPublicKey.x, coordinatorPublicKey.y]);
24
24
  };
25
25
  exports.getCoordinatorPubKey = getCoordinatorPubKey;
26
26
  //# sourceMappingURL=utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../ts/vote/utils.ts"],"names":[],"mappings":";;;AAAA,8EAAwF;AACxF,kDAAyD;AACzD,0DAAmD;AAInD;;;;GAIG;AACI,MAAM,YAAY,GAAG,CAAC,IAAY,EAAW,EAAE,CAAC,IAAI,GAAG,yBAAgB,CAAC;AAAlE,QAAA,YAAY,gBAAsD;AAE/E;;;;;GAKG;AACI,MAAM,oBAAoB,GAAG,KAAK,EAAE,WAAmB,EAAE,MAAc,EAAmB,EAAE;IACjG,MAAM,YAAY,GAAG,+BAAW,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAE9D,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,iBAAiB,EAAE,CAAC;IAEjE,OAAO,IAAI,mBAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;AAChE,CAAC,CAAC;AANW,QAAA,oBAAoB,wBAM/B"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../ts/vote/utils.ts"],"names":[],"mappings":";;;AAAA,8EAAwF;AACxF,kDAAyD;AACzD,0DAAsD;AAItD;;;;GAIG;AACI,MAAM,YAAY,GAAG,CAAC,IAAY,EAAW,EAAE,CAAC,IAAI,GAAG,yBAAgB,CAAC;AAAlE,QAAA,YAAY,gBAAsD;AAE/E;;;;;GAKG;AACI,MAAM,oBAAoB,GAAG,KAAK,EAAE,WAAmB,EAAE,MAAc,EAAsB,EAAE;IACpG,MAAM,YAAY,GAAG,+BAAW,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAE9D,MAAM,oBAAoB,GAAG,MAAM,YAAY,CAAC,oBAAoB,EAAE,CAAC;IAEvE,OAAO,IAAI,sBAAS,CAAC,CAAC,oBAAoB,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;AACzE,CAAC,CAAC;AANW,QAAA,oBAAoB,wBAM/B"}