Merge branch 'feat/anon-poll-joining' into feat/anon-poll-joining

privacy-scaling-explorations · Aug 8, 2024 · 9f64bb5 · 9f64bb5
2 parents dd21e4d + e84f610
commit 9f64bb5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/circuits/ts/__tests__/ProcessMessages.test.ts b/circuits/ts/__tests__/ProcessMessages.test.ts
@@ -505,6 +505,7 @@ describe("ProcessMessage circuit", function test() {
 
       // The new roots, which should differ, since at least one of the
       // messages modified a Ballot or State Leaf
+
       const newStateRoot = poll.pollStateTree?.root;
       const newBallotRoot = poll.ballotTree?.root;
 

diff --git a/cli/tests/constants.ts b/cli/tests/constants.ts
@@ -22,6 +22,7 @@ export const MESSAGE_BATCH_SIZE = 20;
 const coordinatorKeypair = new Keypair();
 export const coordinatorPubKey = coordinatorKeypair.pubKey.serialize();
 export const coordinatorPrivKey = coordinatorKeypair.privKey.serialize();
+
 export const pollJoiningTestZkeyPath = "./zkeys/PollJoining_10_test/PollJoining_10_test.0.zkey";
 export const processMessageTestZkeyPath = "./zkeys/ProcessMessages_10-20-2_test/ProcessMessages_10-20-2_test.0.zkey";
 export const tallyVotesTestZkeyPath = "./zkeys/TallyVotes_10-1-2_test/TallyVotes_10-1-2_test.0.zkey";

diff --git a/contracts/contracts/Poll.sol b/contracts/contracts/Poll.sol
@@ -77,6 +77,7 @@ contract Poll is Params, Utilities, SnarkCommon, EmptyBallotRoots, IPoll {
 
   ///  @notice flag for batch padding
   bool public isBatchHashesPadded;
+
   /// @notice Poll state tree for anonymous joining
   LazyIMTData public pollStateTree;
 

diff --git a/contracts/contracts/interfaces/IMACI.sol b/contracts/contracts/interfaces/IMACI.sol
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
+
 import { IVerifier } from "./IVerifier.sol";
 import { IVkRegistry } from "./IVkRegistry.sol";
 import { DomainObjs } from "../utilities/DomainObjs.sol";