Merge pull request #1950 from privacy-scaling-explorations/refactor/c…

…leanup

refactor: cleanup contracts folder

.gitignore

@@ -154,3 +154,5 @@ packages/cli/contractAddresses.old.json
 packages/circuits/circom/test
 
 **/ts/__benchmarks__/results/**
+
+proofs 

packages/contracts/contracts/MACI.sol

@@ -162,17 +162,14 @@ contract MACI is IMACI, DomainObjs, Params, Utilities {
     // Get the user's voice credit balance.
     uint256 voiceCreditBalance = initialVoiceCreditProxy.getVoiceCredits(msg.sender, _initialVoiceCreditProxyData);
 
-    uint256 timestamp = block.timestamp;
-
     // Create a state leaf and insert it into the tree.
-    uint256 stateLeaf = hashStateLeaf(StateLeaf(_pubKey, voiceCreditBalance, timestamp));
-    InternalLeanIMT._insert(leanIMTData, stateLeaf);
+    uint256 stateLeaf = hashStateLeaf(StateLeaf(_pubKey, voiceCreditBalance, block.timestamp));
+    uint256 stateRoot = InternalLeanIMT._insert(leanIMTData, stateLeaf);
 
     // Store the current state tree root in the array
-    uint256 stateRoot = InternalLeanIMT._root(leanIMTData);
     stateRootsOnSignUp.push(stateRoot);
 
-    emit SignUp(leanIMTData.size - 1, _pubKey.x, _pubKey.y, voiceCreditBalance, timestamp, stateLeaf);
+    emit SignUp(leanIMTData.size - 1, _pubKey.x, _pubKey.y, voiceCreditBalance, block.timestamp, stateLeaf);
   }
 
   /// @notice Deploy a new Poll contract.

packages/contracts/contracts/Poll.sol

@@ -2,7 +2,6 @@
 pragma solidity ^0.8.20;
 
 import { Params } from "./utilities/Params.sol";
-import { EmptyBallotRoots } from "./trees/EmptyBallotRoots.sol";
 import { SnarkCommon } from "./crypto/SnarkCommon.sol";
 import { LazyIMTData, InternalLazyIMT } from "./trees/LazyIMT.sol";
 import { IMACI } from "./interfaces/IMACI.sol";
@@ -252,10 +251,7 @@ contract Poll is Params, Utilities, SnarkCommon, IPoll {
   /// @dev Can only be submitted before the voting deadline
   /// @param _messages the messages
   /// @param _encPubKeys the encrypted public keys
-  function publishMessageBatch(
-    Message[] calldata _messages,
-    PubKey[] calldata _encPubKeys
-  ) public virtual isWithinVotingDeadline {
+  function publishMessageBatch(Message[] calldata _messages, PubKey[] calldata _encPubKeys) public virtual {
     if (_messages.length != _encPubKeys.length) {
       revert InvalidBatchLength();
     }

packages/contracts/contracts/Tally.sol

@@ -442,10 +442,10 @@ contract Tally is Ownable, SnarkCommon, CommonUtilities, Hasher, DomainObjs, ITa
     TallyResult storage previous = tallyResults[_voteOptionIndex];
 
     if (!previous.flag) {
+      previous.flag = true;
       totalTallyResults++;
     }
 
-    previous.flag = true;
     previous.value = _tallyResult;
   }
 }

packages/contracts/contracts/gatekeepers/AnonAadhaarGatekeeper.sol

@@ -2,8 +2,9 @@
 pragma solidity ^0.8.20;
 
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
+
 import { SignUpGatekeeper } from "./SignUpGatekeeper.sol";
-import { IAnonAadhaar } from "../interfaces/IAnonAadhaar.sol";
+import { IAnonAadhaar } from "./interfaces/IAnonAadhaar.sol";
 
 /// @title AnonAadhaarGatekeeper
 /// @notice A gatekeeper contract which allows users to sign up to MACI

packages/contracts/contracts/gatekeepers/EASGatekeeper.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 
 import { SignUpGatekeeper } from "./SignUpGatekeeper.sol";
-import { IEAS } from "../interfaces/IEAS.sol";
+import { IEAS } from "./interfaces/IEAS.sol";
 
 /// @title EASGatekeeper
 /// @notice A gatekeeper contract which allows users to sign up to MACI

packages/contracts/contracts/gatekeepers/GitcoinPassportGatekeeper.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 
 import { SignUpGatekeeper } from "./SignUpGatekeeper.sol";
-import { IGitcoinPassportDecoder } from "../interfaces/IGitcoinPassportDecoder.sol";
+import { IGitcoinPassportDecoder } from "./interfaces/IGitcoinPassportDecoder.sol";
 
 /// @title GitcoinPassportGatekeeper
 /// @notice A gatekeeper contract which allows users to sign up to MACI

packages/contracts/contracts/gatekeepers/HatsGatekeeperBase.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.10;
 
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 
-import { IHats } from "../interfaces/IHats.sol";
+import { IHats } from "./interfaces/IHats.sol";
 import { SignUpGatekeeper } from "./SignUpGatekeeper.sol";
 
 /// @title HatsGatekeeperBase

packages/contracts/contracts/gatekeepers/SemaphoreGatekeeper.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.20;
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
 
 import { SignUpGatekeeper } from "./SignUpGatekeeper.sol";
-import { ISemaphore } from "../interfaces/ISemaphore.sol";
+import { ISemaphore } from "./interfaces/ISemaphore.sol";
 
 /// @title SemaphoreGatekeeper
 /// @notice A gatekeeper contract which allows users to sign up to MACI

packages/contracts/contracts/crypto/MockVerifier.sol → packages/contracts/contracts/mocks/MockVerifier.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import { SnarkConstants } from "./SnarkConstants.sol";
-import { SnarkCommon } from "./SnarkCommon.sol";
+import { SnarkConstants } from "../crypto/SnarkConstants.sol";
+import { SnarkCommon } from "../crypto/SnarkCommon.sol";
 import { IVerifier } from "../interfaces/IVerifier.sol";
 
 /// @title MockVerifier