fix(maci): reverted a fix and fixed test suits

Reverted the fix related to updating a state variable in a for loop for AccQueue. Also fixed the tests by adding the `NOTHING_UP_MY_SLEEVE` hash on the local MaciState instance.
privacy-scaling-explorations · Sep 20, 2022 · 8300cc5 · 8300cc5
1 parent 76c991a
commit 8300cc5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/circuits/package-lock.json b/circuits/package-lock.json
diff --git a/contracts/contracts/trees/AccQueue.sol b/contracts/contracts/trees/AccQueue.sol
@@ -9,6 +9,7 @@ import { MerkleZeros as MerkleQuinary0 } from "./zeros/MerkleQuinary0.sol";
 import { MerkleZeros as MerkleQuinaryMaci } from "./zeros/MerkleQuinaryMaci.sol";
 import { MerkleZeros as MerkleQuinaryBlankSl } from "./zeros/MerkleQuinaryBlankSl.sol";
 import { MerkleZeros as MerkleQuinaryMaciWithSha256 } from "./zeros/MerkleQuinaryMaciWithSha256.sol";
+import "hardhat/console.sol";
 
 /*
  * This contract defines a Merkle tree where each leaf insertion only updates a
@@ -315,9 +316,7 @@ abstract contract AccQueue is Ownable, Hasher {
         uint256 depth = calcMinHeight();
 
         uint256 queueOpsPerformed = 0;
-        uint256 _nextSubRootIndex = nextSubRootIndex;
-        for (uint256 i = _nextSubRootIndex; i < currentSubtreeIndex; i ++) {
-
+        for (uint256 i = nextSubRootIndex; i < currentSubtreeIndex; i ++) {
             if (_numSrQueueOps != 0 && queueOpsPerformed == _numSrQueueOps) {
                 // If the limit is not 0, stop if the limit has been reached
                 return;
@@ -331,14 +330,12 @@ abstract contract AccQueue is Ownable, Hasher {
             );
 
             // Increment the next subroot counter
-            _nextSubRootIndex ++;
+            nextSubRootIndex ++;
 
             // Increment the ops counter
             queueOpsPerformed ++;
         }
-
-        _nextSubRootIndex = nextSubRootIndex;
-
+
         // The height of the tree of subroots
         uint256 m = hashLength ** depth;
 

diff --git a/core/ts/MaciState.ts b/core/ts/MaciState.ts
@@ -140,6 +140,7 @@ class Poll {
         )
 
         this.messageAq.enqueue(NOTHING_UP_MY_SLEEVE);
+        this.messageTree.insert(NOTHING_UP_MY_SLEEVE);
 
         for (let i = 0; i < this.maxValues.maxVoteOptions; i ++) {
             this.results.push(BigInt(0))

diff --git a/crypto/package-lock.json b/crypto/package-lock.json
diff --git a/crypto/ts/AccQueue.ts b/crypto/ts/AccQueue.ts
@@ -545,4 +545,4 @@ class AccQueue {
 
 export {
     AccQueue,
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -545,4 +545,4 @@ class AccQueue { @@
     export {
         AccQueue,
-    }
+    }