@maci-protocol/contracts 0.0.0-ci.d0dddbc → 0.0.0-ci.d4be71b

package/contracts/interfaces/ITally.sol

@@ -2,16 +2,8 @@
 pragma solidity ^0.8.28;
 
 /// @title ITally
-/// @notice Complete Tally interface
+/// @notice Tally interface
 interface ITally {
-  /// @notice Tally result
-  struct TallyResult {
-    /// Tally results value from tally.json
-    uint256 value;
-    /// Flag that this value was set and initialized
-    bool isSet;
-  }
-
   /// @notice tally result args
   struct AddTallyResultsArgs {
     /// @param voteOptionIndices Vote option index.
@@ -35,67 +27,6 @@ interface ITally {
     uint256 perVOSpentVoiceCreditsHash;
   }
 
-  /// @notice Add and verify tally results by batch.
-  /// @param args add tally result args
-  function addTallyResults(AddTallyResultsArgs calldata args) external;
-
-  /// @notice Update the state and ballot root commitment
-  function updateSbCommitment() external;
-
-  /// @notice Verify the result of a tally batch
-  /// @param _newTallyCommitment the new tally commitment to be verified
-  /// @param _proof the proof generated after tallying this batch
-  function tallyVotes(uint256 _newTallyCommitment, uint256[8] calldata _proof) external;
-
-  /// @notice Check if all ballots are tallied
-  /// @return tallied whether all ballots are tallied
-  function isTallied() external view returns (bool tallied);
-
-  /// @notice Get the tally commitment
-  /// @return The current tally commitment
-  function tallyCommitment() external view returns (uint256);
-
-  /// @notice Get the tally batch number
-  /// @return The current tally batch number
-  function tallyBatchNum() external view returns (uint256);
-
-  /// @notice Get the final state and ballot commitment
-  /// @return The sb commitment
-  function sbCommitment() external view returns (uint256);
-
-  /// @notice Get tally results for a specific index
-  /// @param index The index to query
-  /// @return The tally result
-  function getTallyResults(uint256 index) external view returns (TallyResult memory);
-
-  /// @notice Get the total number of tally results
-  /// @return The total tally results count
-  function totalTallyResults() external view returns (uint256);
-
-  /// @notice Get the total spent voice credits
-  /// @return The total spent amount
-  function totalSpent() external view returns (uint256);
-
-  /// @notice Get public circuit inputs.
-  /// @param _batchStartIndex the batch start index
-  /// @param _newTallyCommitment the new tally commitment to be verified
-  /// @return publicInputs public circuit inputs
-  function getPublicCircuitInputs(
-    uint256 _batchStartIndex,
-    uint256 _newTallyCommitment
-  ) external view returns (uint256[] memory publicInputs);
-
-  /// @notice Verify the tally proof using the verifying key
-  /// @param _batchStartIndex the batch start index
-  /// @param _newTallyCommitment the new tally commitment to be verified
-  /// @param _proof the proof generated after processing all messages
-  /// @return isValid whether the proof is valid
-  function verifyTallyProof(
-    uint256 _batchStartIndex,
-    uint256 _newTallyCommitment,
-    uint256[8] calldata _proof
-  ) external view returns (bool isValid);
-
   /// @notice Verify the number of spent voice credits per vote option from the tally.json
   /// @param _voteOptionIndex the index of the vote option where credits were spent
   /// @param _spent the spent voice credits for a given vote option index
@@ -114,38 +45,17 @@ interface ITally {
     uint8 _voteOptionTreeDepth,
     uint256 _spentVoiceCreditsHash,
     uint256 _resultCommitment
-  ) external view returns (bool isValid);
+  ) external view returns (bool);
 
   /// @notice Verify the number of spent voice credits from the tally.json
   /// @param _totalSpent spent field retrieved in the totalSpentVoiceCredits object
   /// @param _totalSpentSalt the corresponding salt in the totalSpentVoiceCredit object
   /// @param _resultCommitment hashLeftRight(merkle root of the results.tally, results.salt) in tally.json file
   /// @param _perVoteOptionSpentVoiceCreditsHash only for QV - hashLeftRight(merkle root of the no spent voice credits, salt)
-  /// @return isValid Whether the provided values are valid
   function verifySpentVoiceCredits(
     uint256 _totalSpent,
     uint256 _totalSpentSalt,
     uint256 _resultCommitment,
     uint256 _perVoteOptionSpentVoiceCreditsHash
-  ) external view returns (bool isValid);
-
-  /// @notice Verify the result generated from the tally.json
-  /// @param _voteOptionIndex the index of the vote option to verify the correctness of the tally
-  /// @param _tallyResult Flattened array of the tally
-  /// @param _tallyResultProof Corresponding proof of the tally result
-  /// @param _tallyResultSalt the respective salt in the results object in the tally.json
-  /// @param _voteOptionTreeDepth depth of the vote option tree
-  /// @param _spentVoiceCreditsHash hashLeftRight(number of spent voice credits, spent salt)
-  /// @param _perVoteOptionSpentVoiceCreditsHash hashLeftRight(merkle root of the no spent voice
-  /// credits per vote option, perVoteOptionSpentVoiceCredits salt)
-  /// @return isValid Whether the provided proof is valid
-  function verifyTallyResult(
-    uint256 _voteOptionIndex,
-    uint256 _tallyResult,
-    uint256[][] calldata _tallyResultProof,
-    uint256 _tallyResultSalt,
-    uint8 _voteOptionTreeDepth,
-    uint256 _spentVoiceCreditsHash,
-    uint256 _perVoteOptionSpentVoiceCreditsHash
-  ) external view returns (bool isValid);
+  ) external view returns (bool);
 }

package/contracts/mocks/MockTally.sol

@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+import { ITally } from "../interfaces/ITally.sol";
+
+contract MockTally is ITally {
+  bool public returnValue = true;
+
+  /// @notice Flip the return value
+  /// @dev used for mock testing
+  function flipReturnValue() external {
+    returnValue = !returnValue;
+  }
+
+  /// @inheritdoc ITally
+  function verifyPerVoteOptionSpentVoiceCredits(
+    uint256 _voteOptionIndex,
+    uint256 _spent,
+    uint256[][] calldata _spentProof,
+    uint256 _spentSalt,
+    uint8 _voteOptionTreeDepth,
+    uint256 _spentVoiceCreditsHash,
+    uint256 _resultCommitment
+  ) external view returns (bool) {
+    return returnValue;
+  }
+
+  /// @inheritdoc ITally
+  function verifySpentVoiceCredits(
+    uint256 _totalSpent,
+    uint256 _totalSpentSalt,
+    uint256 _resultCommitment,
+    uint256 _perVoteOptionSpentVoiceCreditsHash
+  ) external view returns (bool) {
+    return returnValue;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maci-protocol/contracts",
-  "version": "0.0.0-ci.d0dddbc",
+  "version": "0.0.0-ci.d4be71b",
   "private": false,
   "description": "Solidity Smart Contracts for MACI (Minimal Anti-Collusion Infrastructure)",
   "main": "build/ts/index.js",
@@ -222,9 +222,9 @@
   },
   "dependencies": {
     "@excubiae/contracts": "^0.11.0",
-    "@maci-protocol/core": "0.0.0-ci.d0dddbc",
-    "@maci-protocol/crypto": "0.0.0-ci.d0dddbc",
-    "@maci-protocol/domainobjs": "0.0.0-ci.d0dddbc",
+    "@maci-protocol/core": "0.0.0-ci.d4be71b",
+    "@maci-protocol/crypto": "0.0.0-ci.d4be71b",
+    "@maci-protocol/domainobjs": "0.0.0-ci.d4be71b",
     "@nomicfoundation/hardhat-ethers": "^3.0.9",
     "@nomicfoundation/hardhat-toolbox": "^5.0.0",
     "@nomicfoundation/hardhat-verify": "^2.0.14",
@@ -249,7 +249,7 @@
     "@types/circomlibjs": "^0.1.6",
     "@types/lowdb": "^1.0.15",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^24.0.1",
+    "@types/node": "^22.15.17",
     "@types/sinon": "^17.0.4",
     "@types/snarkjs": "^0.7.9",
     "@types/uuid": "^10.0.0",
@@ -262,5 +262,5 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.8.3"
   },
-  "gitHead": "f41939d7f430a8b5c9b3729d6d12ca15d94cf181"
+  "gitHead": "e23a1a52f7a9ede9c18c13cadd7aebb27a66aa88"
 }