@crisp-e3/contracts 0.10.0 → 0.11.0

package/README.md

@@ -29,28 +29,29 @@ Local deploy is driven by **`../../crisp.dev.env`** (see
   `CRISP_PROOF_AGGREGATION_ENABLED=true`
 - `pnpm dev:up` → `scripts/crisp_deploy.sh` — sets `ENABLE_ZK_VERIFICATION` from the same file
 
-### CRISP-only deploy (Enclave already deployed)
+### CRISP-only deploy (Interfold already deployed)
 
 ```bash
 pnpm deploy:contracts          # production RISC0 verifier
-pnpm deploy:contracts:full     # also deploy Enclave stack (no ZK unless ENABLE_ZK_VERIFICATION=true)
+pnpm deploy:contracts:full     # also deploy Interfold stack (no ZK unless ENABLE_ZK_VERIFICATION=true)
 ```
 
 ## CRISP Program
 
-This is the main logic of CRISP - an enclave program for secure voting.
+This is the main logic of CRISP - an interfold program for secure voting.
 
 It exposes two main functions:
 
-- `validate` - that is called when a new E3 instance is requested on Enclave (`Enclave.request`).
-- `verify` - that is called when the ciphertext output is published on Enclave
-  (`Enclave.publishCiphertextOutput`). This function ensures that the ciphertext output is valid.
+- `validate` - that is called when a new E3 instance is requested on Interfold
+  (`Interfold.request`).
+- `verify` - that is called when the ciphertext output is published on Interfold
+  (`Interfold.publishCiphertextOutput`). This function ensures that the ciphertext output is valid.
   CRISP uses Risc0 as the compute provider for running the FHE program, thus the proof will be a
   Risc0 proof.
 - `validateInput` - validate the input data that is submitted to the E3 instance. It is called by
-  the Enclave contract when a new input is published (`Enclave.publishInput`). In CRISP, the data
-  providers (the ones submitting the inputs) are the voters, and the input submitted is the vote
-  itself. The logic checks that gating conditions are satisfied and that the ciphertext is
+  the Interfold contract when a new input is published (`Interfold.publishInput`). In CRISP, the
+  data providers (the ones submitting the inputs) are the voters, and the input submitted is the
+  vote itself. The logic checks that gating conditions are satisfied and that the ciphertext is
   constructed correctly using
-  [Greco](https://github.com/gnosisguild/enclave/tree/main/circuits/crates/libs/greco). See the
+  [Greco](https://github.com/gnosisguild/interfold/tree/main/circuits/crates/libs/greco). See the
   Greco [paper](https://eprint.iacr.org/2024/594).

package/contracts/CRISPProgram.sol

@@ -7,9 +7,9 @@ pragma solidity >=0.8.27;
 
 import { IRiscZeroVerifier } from "risc0/IRiscZeroVerifier.sol";
 import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
-import { IE3Program } from "@enclave-e3/contracts/contracts/interfaces/IE3Program.sol";
-import { IEnclave } from "@enclave-e3/contracts/contracts/interfaces/IEnclave.sol";
-import { E3 } from "@enclave-e3/contracts/contracts/interfaces/IE3.sol";
+import { IE3Program } from "@interfold/contracts/contracts/interfaces/IE3Program.sol";
+import { IInterfold } from "@interfold/contracts/contracts/interfaces/IInterfold.sol";
+import { E3 } from "@interfold/contracts/contracts/interfaces/IE3.sol";
 import { LazyIMTData, InternalLazyIMT } from "@zk-kit/lazy-imt.sol/InternalLazyIMT.sol";
 import { HonkVerifier } from "./CRISPVerifier.sol";
 
@@ -42,7 +42,7 @@ contract CRISPProgram is IE3Program, Ownable {
   /// @notice Maximum number of bits allocated for vote counts in the plaintext output per option.
   uint256 constant MAX_VOTE_BITS = 50;
   // State variables
-  IEnclave public enclave;
+  IInterfold public interfold;
   IRiscZeroVerifier public risc0Verifier;
   bytes32 public imageId;
   HonkVerifier private immutable honkVerifier;
@@ -53,7 +53,7 @@ contract CRISPProgram is IE3Program, Ownable {
   // Errors
   error CallerNotAuthorized();
   error E3AlreadyInitialized();
-  error EnclaveAddressZero();
+  error InterfoldAddressZero();
   error Risc0VerifierAddressZero();
   error InvalidHonkVerifier();
   error EmptyInputData();
@@ -72,16 +72,16 @@ contract CRISPProgram is IE3Program, Ownable {
   event InputPublished(uint256 indexed e3Id, bytes encryptedVote, uint256 index);
 
   /// @notice Initialize the contract, binding it to a specified RISC Zero verifier.
-  /// @param _enclave The enclave address
+  /// @param _interfold The interfold address
   /// @param _risc0Verifier The RISC Zero verifier address
   /// @param _honkVerifier The honk verifier address
   /// @param _imageId The image ID for the guest program
-  constructor(IEnclave _enclave, IRiscZeroVerifier _risc0Verifier, HonkVerifier _honkVerifier, bytes32 _imageId) Ownable(msg.sender) {
-    if (address(_enclave) == address(0)) revert EnclaveAddressZero();
+  constructor(IInterfold _interfold, IRiscZeroVerifier _risc0Verifier, HonkVerifier _honkVerifier, bytes32 _imageId) Ownable(msg.sender) {
+    if (address(_interfold) == address(0)) revert InterfoldAddressZero();
     if (address(_risc0Verifier) == address(0)) revert Risc0VerifierAddressZero();
     if (address(_honkVerifier) == address(0)) revert InvalidHonkVerifier();
 
-    enclave = _enclave;
+    interfold = _interfold;
     risc0Verifier = _risc0Verifier;
     honkVerifier = _honkVerifier;
     imageId = _imageId;
@@ -125,7 +125,7 @@ contract CRISPProgram is IE3Program, Ownable {
     bytes calldata,
     bytes calldata customParams
   ) external returns (bytes32) {
-    if (msg.sender != address(enclave) && msg.sender != owner()) revert CallerNotAuthorized();
+    if (msg.sender != address(interfold) && msg.sender != owner()) revert CallerNotAuthorized();
     if (e3Data[e3Id].paramsHash != bytes32(0)) revert E3AlreadyInitialized();
 
     // decode custom params to get the number of options
@@ -147,11 +147,11 @@ contract CRISPProgram is IE3Program, Ownable {
 
   /// @inheritdoc IE3Program
   function publishInput(uint256 e3Id, bytes memory data) external {
-    E3 memory e3 = enclave.getE3(e3Id);
+    E3 memory e3 = interfold.getE3(e3Id);
 
     // check that we are in the correct stage
-    IEnclave.E3Stage stage = enclave.getE3Stage(e3Id);
-    if (stage != IEnclave.E3Stage.KeyPublished) {
+    IInterfold.E3Stage stage = interfold.getE3Stage(e3Id);
+    if (stage != IInterfold.E3Stage.KeyPublished) {
       revert KeyNotPublished(e3Id);
     }
 
@@ -199,7 +199,7 @@ contract CRISPProgram is IE3Program, Ownable {
   /// @param e3Id The E3 program ID
   /// @return votes - an array of vote counts for each option
   function decodeTally(uint256 e3Id) public view returns (uint256[] memory votes) {
-    E3 memory e3 = enclave.getE3(e3Id);
+    E3 memory e3 = interfold.getE3(e3Id);
 
     uint256 numOptions = e3Data[e3Id].numOptions;
 

package/contracts/Mocks/{MockEnclave.sol → MockInterfold.sol}

@@ -5,13 +5,13 @@
 // or FITNESS FOR A PARTICULAR PURPOSE.
 pragma solidity >=0.8.27;
 
-import { E3 } from "@enclave-e3/contracts/contracts/interfaces/IE3.sol";
-import { IEnclave } from "@enclave-e3/contracts/contracts/interfaces/IEnclave.sol";
-import { IE3Program } from "@enclave-e3/contracts/contracts/interfaces/IE3Program.sol";
-import { IDecryptionVerifier } from "@enclave-e3/contracts/contracts/interfaces/IDecryptionVerifier.sol";
-import { IPkVerifier } from "@enclave-e3/contracts/contracts/interfaces/IPkVerifier.sol";
+import { E3 } from "@interfold/contracts/contracts/interfaces/IE3.sol";
+import { IInterfold } from "@interfold/contracts/contracts/interfaces/IInterfold.sol";
+import { IE3Program } from "@interfold/contracts/contracts/interfaces/IE3Program.sol";
+import { IDecryptionVerifier } from "@interfold/contracts/contracts/interfaces/IDecryptionVerifier.sol";
+import { IPkVerifier } from "@interfold/contracts/contracts/interfaces/IPkVerifier.sol";
 
-contract MockEnclave {
+contract MockInterfold {
   bytes public plaintextOutput;
   bytes32 public committeePublicKey;
 
@@ -22,7 +22,7 @@ contract MockEnclave {
   function request(address program) external {
     e3s[nextE3Id] = E3({
       seed: 0,
-      committeeSize: IEnclave.CommitteeSize.Micro,
+      committeeSize: IInterfold.CommitteeSize.Minimum,
       requestBlock: 0,
       inputWindow: [uint256(0), uint256(0)],
       encryptionSchemeId: bytes32(0),
@@ -51,15 +51,15 @@ contract MockEnclave {
     committeePublicKey = publicKeyHash;
   }
 
-  function getE3Stage(uint256) external view returns (IEnclave.E3Stage) {
-    return IEnclave.E3Stage.KeyPublished;
+  function getE3Stage(uint256) external view returns (IInterfold.E3Stage) {
+    return IInterfold.E3Stage.KeyPublished;
   }
 
   function getE3(uint256) external view returns (E3 memory) {
     return
       E3({
         seed: 0,
-        committeeSize: IEnclave.CommitteeSize.Micro,
+        committeeSize: IInterfold.CommitteeSize.Minimum,
         requestBlock: 0,
         inputWindow: [uint256(0), block.timestamp + 100],
         encryptionSchemeId: bytes32(0),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crisp-e3/contracts",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "type": "module",
   "files": [
     "contracts",
@@ -31,19 +31,12 @@
     "@zk-kit/lazy-imt.sol": "2.0.0-beta.12",
     "poseidon-solidity": "^0.0.5",
     "solady": "^0.1.13",
-    "@enclave-e3/contracts": "0.1.15"
+    "@interfold/contracts": "0.3.0"
   },
   "devDependencies": {
-    "@nomicfoundation/hardhat-ethers": "4",
-    "@nomicfoundation/hardhat-ethers-chai-matchers": "^3.0.0",
-    "@nomicfoundation/hardhat-network-helpers": "3",
-    "@nomicfoundation/hardhat-toolbox": "^5.0.0",
     "@nomicfoundation/hardhat-toolbox-mocha-ethers": "3.0.0",
-    "@nomicfoundation/hardhat-typechain": "3",
-    "@nomicfoundation/hardhat-verify": "^3.0.1",
     "@openzeppelin/contracts": "^5.0.2",
     "@typechain/ethers-v6": "^0.5.0",
-    "@typechain/hardhat": "^9.0.0",
     "@types/chai": "^4.2.0",
     "@types/mocha": ">=9.1.0",
     "@types/node": "^22.18.0",
@@ -51,7 +44,7 @@
     "dotenv": "^16.4.5",
     "ethers": "^6.15.0",
     "forge-std": "github:foundry-rs/forge-std#v1.9.4",
-    "hardhat": "^3.0.1",
+    "hardhat": "3.0.11",
     "hardhat-deploy": "^0.12.4",
     "hardhat-gas-reporter": "^1.0.8",
     "solidity-coverage": "^0.8.1",
@@ -59,8 +52,8 @@
     "typechain": "^8.3.0",
     "typescript": "5.8.3",
     "viem": "2.30.6",
-    "@crisp-e3/sdk": "^0.10.0",
-    "@crisp-e3/zk-inputs": "^0.10.0"
+    "@crisp-e3/zk-inputs": "^0.11.0",
+    "@crisp-e3/sdk": "^0.11.0"
   },
   "scripts": {
     "compile": "hardhat compile",
@@ -70,8 +63,8 @@
     "clean:deployments": "hardhat utils:clean-deployments",
     "deploy:contracts": "hardhat run deploy/deploy.ts",
     "deploy:contracts:mock": "export USE_MOCKS=true PRINT_ENV_VARS=true && pnpm deploy:contracts",
-    "deploy:contracts:full": "export DEPLOY_ENCLAVE=true && pnpm deploy:contracts",
-    "deploy:contracts:full:mock": "export DEPLOY_ENCLAVE=true USE_MOCKS=true PRINT_ENV_VARS=true && pnpm deploy:contracts",
+    "deploy:contracts:full": "export DEPLOY_INTERFOLD=true && pnpm deploy:contracts",
+    "deploy:contracts:full:mock": "export DEPLOY_INTERFOLD=true USE_MOCKS=true PRINT_ENV_VARS=true && pnpm deploy:contracts",
     "test": "hardhat test mocha",
     "verify": "hardhat run deploy/verify.ts",
     "updateSubmissionWindow": "hardhat ciphernode:window"