chore: minor release 0.6.0 changes

* change versions to 0.6.0 in Cargo.toml file * correct images and versions in docker-compose.yml * fix a circular dependency test failure * remove unused imports and variables * fix coprocessor tests compilation * log worker polling messages in debug instead of info
zama-ai · Dec 6, 2024 · b0ad273 · b0ad273
1 parent abfb330
commit b0ad273
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 45 deletions.
diff --git a/fhevm-engine/Cargo.lock b/fhevm-engine/Cargo.lock
diff --git a/fhevm-engine/coprocessor/Cargo.toml b/fhevm-engine/coprocessor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "coprocessor"
-version = "0.1.2"
+version = "0.6.0"
 default-run = "coprocessor"
 authors.workspace = true
 edition.workspace = true

diff --git a/fhevm-engine/coprocessor/docker-compose.yml b/fhevm-engine/coprocessor/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   migration:
       container_name: migration
-      image: ghcr.io/zama-ai/fhevm-db-migration:v1.1
+      image: ghcr.io/zama-ai/fhevm-db-migration:v0.6.0
       environment:
         DATABASE_URL: postgresql://postgres:postgres@db:5432/coprocessor
       depends_on:
@@ -29,7 +29,7 @@ services:
 
   coprocessor:
     container_name: coprocessor
-    image: ghcr.io/zama-ai/fhevm-coprocessor:v0.1.0-3
+    image: ghcr.io/zama-ai/fhevm-coprocessor:v0.6.0
     environment:
       DATABASE_URL: postgresql://postgres:postgres@db:5432/coprocessor
     ports:
@@ -47,7 +47,7 @@ services:
 
   geth:
     container_name: geth
-    image: ghcr.io/zama-ai/geth-coprocessor-devnode:v8
+    image: ghcr.io/zama-ai/go-ethereum-coprocessor-dev:v0.1.1
     environment:
       FHEVM_COPROCESSOR_API_KEY: a1503fb6-d79b-4e9e-826d-44cf262f3e05
       FHEVM_COPROCESSOR_URL: coprocessor:50051

diff --git a/fhevm-engine/coprocessor/src/tests/scheduling_bench.rs b/fhevm-engine/coprocessor/src/tests/scheduling_bench.rs
@@ -3,14 +3,12 @@ use crate::server::common::FheOperation;
 use crate::server::coprocessor::{async_computation_input::Input, AsyncComputationInput};
 use crate::server::coprocessor::{
     fhevm_coprocessor_client::FhevmCoprocessorClient, AsyncComputation, AsyncComputeRequest,
-    InputToUpload, InputUploadBatch, TrivialEncryptBatch, TrivialEncryptRequestSingle,
+    InputToUpload, InputUploadBatch,
 };
 use crate::tests::utils::{
     decrypt_ciphertexts, default_api_key, default_tenant_id, random_handle, setup_test_app,
     wait_until_all_ciphertexts_computed,
 };
-use alloy::primitives::keccak256;
-use bigdecimal::num_bigint::BigInt;
 use fhevm_engine_common::utils::safe_serialize;
 use std::str::FromStr;
 use std::time::SystemTime;
@@ -26,24 +24,6 @@ pub fn test_random_contract_address() -> String {
     "0x76c222560Db6b8937B291196eAb4Dad8930043aE".to_string()
 }
 
-fn supported_bits_to_bit_type_in_db(inp: i32) -> i32 {
-    match inp {
-        1 => 0, // 1 bit - boolean
-        4 => 1,
-        8 => 2,
-        16 => 3,
-        32 => 4,
-        64 => 5,
-        128 => 6,
-        160 => 7,
-        256 => 8,
-        512 => 9,
-        1024 => 10,
-        2048 => 11,
-        other => panic!("unknown supported bits: {other}"),
-    }
-}
-
 #[tokio::test]
 async fn schedule_multi_erc20() -> Result<(), Box<dyn std::error::Error>> {
     let app = setup_test_app().await?;
@@ -87,7 +67,6 @@ async fn schedule_multi_erc20() -> Result<(), Box<dyn std::error::Error>> {
         .unwrap();
 
     let serialized = safe_serialize(&the_list);
-    let input_bytes = keccak256(&serialized);
     println!("Encrypting inputs...");
     let mut input_request = tonic::Request::new(InputUploadBatch {
         input_ciphertexts: vec![InputToUpload {

diff --git a/fhevm-engine/coprocessor/src/tests/utils.rs b/fhevm-engine/coprocessor/src/tests/utils.rs
@@ -85,6 +85,7 @@ async fn setup_test_app_existing_db() -> Result<TestInstance, Box<dyn std::error
 async fn start_coprocessor(rx: Receiver<bool>, app_port: u16, db_url: &str) {
     let args: Args = Args {
         run_bg_worker: true,
+        worker_polling_interval_ms: 1000,
         run_server: true,
         generate_fhe_keys: false,
         server_maximum_ciphertexts_to_schedule: 5000,

diff --git a/fhevm-engine/coprocessor/src/tfhe_worker.rs b/fhevm-engine/coprocessor/src/tfhe_worker.rs
@@ -12,7 +12,7 @@ use std::{
     collections::{BTreeSet, HashMap},
     num::NonZeroUsize,
 };
-use tracing::{error, info};
+use tracing::{debug, error, info};
 
 lazy_static! {
     static ref WORKER_ERRORS_COUNTER: IntCounter =
@@ -87,7 +87,7 @@ async fn tfhe_worker_cycle(
                 },
                 _ = tokio::time::sleep(tokio::time::Duration::from_millis(args.worker_polling_interval_ms)) => {
                     WORK_ITEMS_POLL_COUNTER.inc();
-                    info!(target: "tfhe_worker", "Polling the database for more work on timer");
+                    debug!(target: "tfhe_worker", "Polling the database for more work on timer");
                 },
             };
         }

diff --git a/fhevm-engine/executor/Cargo.toml b/fhevm-engine/executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "executor"
-version = "0.1.1"
+version = "0.6.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

diff --git a/fhevm-engine/executor/src/server.rs b/fhevm-engine/executor/src/server.rs
@@ -148,9 +148,7 @@ impl FhevmExecutor for FhevmExecutorService {
 
 impl FhevmExecutorService {
     fn new(keys: FhevmKeys) -> Self {
-        FhevmExecutorService {
-            keys,
-        }
+        FhevmExecutorService { keys }
     }
 
     #[allow(dead_code)]
@@ -264,9 +262,7 @@ impl FhevmExecutorService {
                         let ct = state.ciphertexts.get(h).ok_or(FhevmError::BadInputs)?;
                         Ok(ct.expanded.clone())
                     }
-                    Input::Scalar(s) => {
-                        Ok(SupportedFheCiphertexts::Scalar(s.clone()))
-                    }
+                    Input::Scalar(s) => Ok(SupportedFheCiphertexts::Scalar(s.clone())),
                 },
                 None => Err(FhevmError::BadInputs.into()),
             })
@@ -316,9 +312,9 @@ pub fn build_taskgraph_from_request(
                             Ok(DFGTaskInput::Dependence(None))
                         }
                     }
-                    Input::Scalar(s) => Ok(DFGTaskInput::Value(
-                        SupportedFheCiphertexts::Scalar(s.clone()),
-                    )),
+                    Input::Scalar(s) => Ok(DFGTaskInput::Value(SupportedFheCiphertexts::Scalar(
+                        s.clone(),
+                    ))),
                 },
                 None => Err(SyncComputeError::BadInputs),
             })
@@ -347,7 +343,7 @@ pub fn build_taskgraph_from_request(
                 if !state.ciphertexts.contains_key(input) {
                     if let Some(producer_index) = produced_handles.get(input) {
                         dfg.add_dependence(*producer_index, index, input_idx)
-                            .or_else(|_| Err(SyncComputeError::ComputationFailed))?;
+                            .or_else(|_| Err(SyncComputeError::UnsatisfiedDependence))?;
                     } else {
                         return Err(SyncComputeError::ComputationFailed);
                     }

diff --git a/fhevm-engine/fhevm-engine-common/Cargo.toml b/fhevm-engine/fhevm-engine-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fhevm-engine-common"
-version = "0.6.0-6"
+version = "0.6.0"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

diff --git a/fhevm-engine/scheduler/Cargo.toml b/fhevm-engine/scheduler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "scheduler"
-version = "0.1.0"
+version = "0.6.0"
 edition = "2021"
 
 [dependencies]