feat: crisp use param set 512_10_1

.github/workflows/ci.yml

@@ -27,6 +27,30 @@ permissions:
   packages: write
 
 jobs:
+  crisp_rust_unit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust 1.86.0
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: 1.86.0
+
+        # We must install foundry in order to be able to test anvil
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
+      - name: Install solc
+        run: |
+          sudo add-apt-repository ppa:ethereum/ethereum \
+          && sudo apt-get update -y \
+          && sudo apt-get install -y solc
+
+      - name: Run CRISP Unit Tests
+        working-directory: ./examples/CRISP
+        run: "cargo test"
+
   rust_unit:
     runs-on: ubuntu-latest
     steps:

crates/bfv-helpers/src/client.rs

@@ -125,7 +125,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use crate::BfvParams;
+    use crate::BfvParamSets;
 
     use super::*;
 
@@ -135,7 +135,7 @@ mod tests {
         use fhe::bfv::{Ciphertext, PublicKey, SecretKey};
         use fhe_traits::{DeserializeParametrized, FheDecrypter, Serialize};
 
-        let param_set = BfvParams::InsecureSet2048_1032193_1.into();
+        let param_set = BfvParamSets::InsecureSet2048_1032193_1.into();
         let params = build_bfv_params_from_set_arc(param_set);
         let degree = param_set.degree;
         let plaintext_modulus = param_set.plaintext_modulus;
@@ -160,7 +160,7 @@ mod tests {
         use fhe::bfv::{Ciphertext, PublicKey, SecretKey};
         use fhe_traits::{DeserializeParametrized, FheDecrypter, Serialize};
 
-        let param_set = BfvParams::InsecureSet2048_1032193_1.into();
+        let param_set = BfvParamSets::InsecureSet2048_1032193_1.into();
         let params = build_bfv_params_from_set_arc(param_set);
         let degree = param_set.degree;
         let plaintext_modulus = param_set.plaintext_modulus;
@@ -192,7 +192,7 @@ mod tests {
         use fhe::bfv::{Ciphertext, PublicKey, SecretKey};
         use fhe_traits::{DeserializeParametrized, FheDecrypter, Serialize};
 
-        let param_set = BfvParams::InsecureSet2048_1032193_1.into();
+        let param_set = BfvParamSets::InsecureSet2048_1032193_1.into();
         let params = build_bfv_params_from_set_arc(param_set);
         let degree = param_set.degree;
         let plaintext_modulus = param_set.plaintext_modulus;
@@ -223,7 +223,7 @@ mod tests {
         use fhe::bfv::{Ciphertext, PublicKey, SecretKey};
         use fhe_traits::{DeserializeParametrized, FheDecrypter, Serialize};
 
-        let param_set = BfvParams::InsecureSet2048_1032193_1.into();
+        let param_set = BfvParamSets::InsecureSet2048_1032193_1.into();
         let params = build_bfv_params_from_set_arc(param_set);
         let degree = param_set.degree;
         let plaintext_modulus = param_set.plaintext_modulus;

crates/bfv-helpers/src/lib.rs

@@ -34,7 +34,7 @@ type Result<T> = std::result::Result<T, Error>;
 /// Predefined BFV parameters for common use cases
 /// Note that 10 is the default value for both error1 and error2 variance
 /// for both BFV and TRBFV (if not explicitly set).
-pub enum BfvParams {
+pub enum BfvParamSets {
     // List parameter strings and variants here
     //
     /// Standard BFV development parameters set (DO NOT USE IN PRODUCTION).
@@ -77,17 +77,17 @@ pub enum BfvParams {
 }
 
 // Map for getters
-impl BfvParams {
+impl BfvParamSets {
     /// Return the given param set based on the input key &str.
     pub fn get_params_by_str(key: &str) -> Result<BfvParamSet> {
-        key.parse::<BfvParams>()
+        key.parse::<BfvParamSets>()
             .map(|k| k.into())
             .map_err(|_| Error::UnknownParamSet(key.to_string()))
     }
 
     /// List all the available parameter keys
     pub fn get_params_list() -> Vec<String> {
-        BfvParams::iter()
+        BfvParamSets::iter()
             .map(|key| {
                 let s: &'static str = key.into();
                 s.to_string()
@@ -96,9 +96,9 @@ impl BfvParams {
     }
 }
 
-impl From<BfvParams> for BfvParamSet {
-    fn from(value: BfvParams) -> Self {
-        use BfvParams as B;
+impl From<BfvParamSets> for BfvParamSet {
+    fn from(value: BfvParamSets) -> Self {
+        use BfvParamSets as B;
         match value {
             // List each new parameter set here
             B::InsecureSet2048_1032193_1 => BfvParamSet {
@@ -158,6 +158,18 @@ pub struct BfvParamSet {
     pub error1_variance: Option<&'static str>,
 }
 
+impl BfvParamSet {
+    /// Build the BfvParamSet into an fhe.rs BfvParameters struct
+    pub fn build(self) -> BfvParameters {
+        build_bfv_params_from_set(self)
+    }
+
+    /// Build the BfvParamSet into an fhe.rs Arc<BfvParameters> struct
+    pub fn build_arc(self) -> Arc<BfvParameters> {
+        Arc::new(self.build())
+    }
+}
+
 /// Builds BFV parameters from a `BfvParamSet`.
 ///
 /// This is a convenience function that consumes a `BfvParamSet` struct
@@ -618,15 +630,15 @@ mod tests {
 
         #[test]
         fn test_params_constant() {
-            let param_set: BfvParamSet = BfvParams::InsecureSet2048_1032193_1.into();
+            let param_set: BfvParamSet = BfvParamSets::InsecureSet2048_1032193_1.into();
             assert_eq!(param_set.degree, 2048);
             assert_eq!(param_set.plaintext_modulus, 1032193);
             assert_eq!(param_set.moduli, &[0x3FFFFFFF000001]);
         }
 
         #[test]
         fn test_params_function() {
-            let param_set = BfvParams::InsecureSet2048_1032193_1.into();
+            let param_set = BfvParamSets::InsecureSet2048_1032193_1.into();
             let params = build_bfv_params_from_set(param_set);
 
             assert_eq!(params.degree(), param_set.degree);
@@ -636,7 +648,7 @@ mod tests {
 
         #[test]
         fn test_params_arc_function() {
-            let param_set = BfvParams::InsecureSet2048_1032193_1.into();
+            let param_set = BfvParamSets::InsecureSet2048_1032193_1.into();
             let params = build_bfv_params_from_set_arc(param_set);
 
             assert_eq!(params.degree(), param_set.degree);
@@ -646,7 +658,7 @@ mod tests {
 
         #[test]
         fn test_params_encoding_roundtrip() {
-            let param_set = BfvParams::InsecureSet2048_1032193_1.into();
+            let param_set = BfvParamSets::InsecureSet2048_1032193_1.into();
             let params = build_bfv_params_from_set(param_set);
             let encoded = encode_bfv_params(&params);
             let decoded = decode_bfv_params(&encoded);
@@ -660,7 +672,7 @@ mod tests {
 
         #[test]
         fn test_params_arc_encoding_roundtrip() {
-            let param_set = BfvParams::InsecureSet2048_1032193_1.into();
+            let param_set = BfvParamSets::InsecureSet2048_1032193_1.into();
             let params = build_bfv_params_from_set_arc(param_set);
             let encoded = encode_bfv_params(&params);
             let decoded = decode_bfv_params_arc(&encoded);
@@ -674,7 +686,7 @@ mod tests {
 
         #[test]
         fn test_params_trbfv_encoding_roundtrip() {
-            let param_set = BfvParams::Set8192_1000_4.into();
+            let param_set = BfvParamSets::Set8192_1000_4.into();
             let params = build_bfv_params_from_set(param_set);
             let encoded = encode_bfv_params(&params);
             let decoded = decode_bfv_params(&encoded);

crates/evm/src/helpers.rs

@@ -9,7 +9,7 @@ use alloy::{
     providers::{
         fillers::{
             BlobGasFiller, ChainIdFiller, FillProvider, GasFiller, JoinFill, NonceFiller,
-            WalletFiller,
+            SimpleNonceManager, WalletFiller,
         },
         Identity, Provider, ProviderBuilder, RootProvider,
     },
@@ -99,8 +99,11 @@ pub type ConcreteReadProvider = FillProvider<
 pub type ConcreteWriteProvider = FillProvider<
     JoinFill<
         JoinFill<
-            Identity,
-            JoinFill<GasFiller, JoinFill<BlobGasFiller, JoinFill<NonceFiller, ChainIdFiller>>>,
+            JoinFill<
+                alloy::providers::Identity,
+                JoinFill<GasFiller, JoinFill<BlobGasFiller, JoinFill<NonceFiller, ChainIdFiller>>>,
+            >,
+            NonceFiller<SimpleNonceManager>,
         >,
         WalletFiller<EthereumWallet>,
     >,
@@ -133,12 +136,14 @@ impl ProviderConfig {
 
         let provider = if self.rpc.is_websocket() {
             ProviderBuilder::new()
+                .with_simple_nonce_management()
                 .wallet(wallet)
                 .connect_ws(self.create_ws_connect()?)
                 .await
                 .context("Failed to connect to WebSocket RPC. Check if the node is running and URL is correct.")?
         } else {
             ProviderBuilder::new()
+                .with_simple_nonce_management()
                 .wallet(wallet)
                 .connect_client(self.create_http_client()?)
         };

crates/sdk/Cargo.toml

@@ -7,6 +7,13 @@ description = "E3 - Enclave SDK"
 repository = "https://github.com/gnosisguild/enclave/crates/sdk"
 
 [dependencies]
-e3-evm-helpers.workspace = true
-e3-bfv-helpers.workspace = true
-e3-indexer.workspace = true
+e3-evm-helpers = { workspace = true, optional = true }
+e3-bfv-helpers = { workspace = true, optional = true }
+e3-indexer = { workspace = true, optional = true }
+
+[features]
+default = ["full"]
+full = ["evm", "bfv", "indexer"]
+indexer = ["dep:e3-indexer"]
+evm = ["dep:e3-evm-helpers"]
+bfv = ["dep:e3-bfv-helpers"]

crates/sdk/src/lib.rs

@@ -4,6 +4,11 @@
 // without even the implied warranty of MERCHANTABILITY
 // or FITNESS FOR A PARTICULAR PURPOSE.
 
+#[cfg(feature = "bfv")]
 pub use e3_bfv_helpers as bfv_helpers;
+
+#[cfg(feature = "evm")]
 pub use e3_evm_helpers as evm_helpers;
+
+#[cfg(feature = "indexer")]
 pub use e3_indexer as indexer;

crates/test-helpers/src/bin/fake_encrypt.rs

@@ -8,7 +8,7 @@
 use clap::Parser;
 use e3_sdk::bfv_helpers::build_bfv_params_from_set_arc;
 use e3_sdk::bfv_helpers::decode_bfv_params;
-use e3_sdk::bfv_helpers::BfvParams;
+use e3_sdk::bfv_helpers::BfvParamSets;
 use fhe::bfv::{Encoding, Plaintext, PublicKey};
 use fhe_traits::{DeserializeParametrized, FheEncoder, FheEncrypter, Serialize};
 use rand::SeedableRng;
@@ -55,7 +55,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let params = if let Some(params_bytes) = args.params {
         Arc::new(decode_bfv_params(&params_bytes.0))
     } else {
-        build_bfv_params_from_set_arc(BfvParams::InsecureSet2048_1032193_1.into())
+        build_bfv_params_from_set_arc(BfvParamSets::InsecureSet2048_1032193_1.into())
     };
     let pubkey = PublicKey::from_bytes(&bytes, &params)?;
     let raw_plaintext = args.plaintext;

crates/test-helpers/src/lib.rs

@@ -19,7 +19,7 @@ use e3_events::{
 };
 use e3_fhe::{create_crp, setup_crp_params, ParamsWithCrp};
 use e3_net::{DocumentPublisher, NetEventTranslator};
-use e3_sdk::bfv_helpers::{BfvParamSet, BfvParams};
+use e3_sdk::bfv_helpers::{BfvParamSet, BfvParamSets};
 use e3_utils::SharedRng;
 use fhe::bfv::{BfvParameters, Ciphertext, Encoding, Plaintext, PublicKey};
 use fhe::mbfv::CommonRandomPoly;
@@ -87,7 +87,7 @@ pub fn get_common_setup(
 
     let rng = create_shared_rng_from_u64(42);
     let seed = create_seed_from_u64(123);
-    let param_set = param_set.unwrap_or(BfvParams::InsecureSet2048_1032193_1.into());
+    let param_set = param_set.unwrap_or(BfvParamSets::InsecureSet2048_1032193_1.into());
     let degree = param_set.degree;
     let plaintext_modulus = param_set.plaintext_modulus;
     let moduli = param_set.moduli;

crates/wasm/src/lib.rs

@@ -6,7 +6,7 @@
 
 use e3_bfv_helpers::{
     client::{bfv_encrypt, bfv_verifiable_encrypt},
-    BfvParamSet, BfvParams,
+    BfvParamSet, BfvParamSets,
 };
 use serde::{Deserialize, Serialize};
 use wasm_bindgen::prelude::*;
@@ -164,7 +164,7 @@ pub fn bfv_verifiable_encrypt_vector(
 /// Returns error if the parameter set name is invalid or serialization fails.
 pub fn get_bfv_params(name: &str) -> Result<JsValue, JsValue> {
     let params =
-        BfvParams::get_params_by_str(name).map_err(|e| JsValue::from_str(&e.to_string()))?;
+        BfvParamSets::get_params_by_str(name).map_err(|e| JsValue::from_str(&e.to_string()))?;
     let js_params = BfvParamSetJs::from(&params);
     let serializer =
         serde_wasm_bindgen::Serializer::new().serialize_large_number_types_as_bigints(true);
@@ -181,7 +181,7 @@ pub fn get_bfv_params(name: &str) -> Result<JsValue, JsValue> {
 /// Includes both production-ready sets (e.g., "SET_8192_1000_4") and
 /// insecure sets for testing (prefixed with "INSECURE_").
 pub fn get_bfv_params_list() -> Vec<String> {
-    BfvParams::get_params_list()
+    BfvParamSets::get_params_list()
 }
 
 #[derive(Serialize, Deserialize)]

examples/CRISP/Cargo.toml

@@ -5,7 +5,8 @@ members = [
   "program",
   "crates/zk-inputs",
   "crates/zk-inputs-wasm",
-  "crates/evm_helpers"
+  "crates/evm_helpers",
+  "crates/crisp-constants"
 ]
 resolver = "3"
 
@@ -18,6 +19,7 @@ repository = "https://github.com/gnosisguild/enclave"
 
 [workspace.dependencies]
 e3-user-program = { path = "./program" }
+crisp-constants = { path = "./crates/crisp-constants" }
 
 alloy = { version = "=1.0.41", features = ["full", "rpc-types-eth"] }
 alloy-primitives = { version = "=1.3.0", default-features = false, features = [
@@ -34,7 +36,7 @@ derivative = "=2.2.0"
 e3-compute-provider = { path = "../../crates/compute-provider" }
 e3-program-server = { path = "../../crates/program-server" }
 e3-bfv-helpers = { path = "../../crates/bfv-helpers" }
-e3-sdk = { path = "../../crates/sdk" }
+e3-sdk = { path = "../../crates/sdk", default-features = false }
 eyre = "=0.6.12"
 env_logger = "=0.11.8"
 hex = { version = "=0.4.3" }