chore(coprocessor): use DatabaseURL in zkproof-worker

Author: goshawk-3

coprocessor/fhevm-engine/zkproof-worker/src/bin/zkproof_worker.rs

@@ -1,7 +1,9 @@
 use clap::{command, Parser};
+use fhevm_engine_common::telemetry;
 use fhevm_engine_common::telemetry::{self, MetricsConfig};
-use fhevm_engine_common::{healthz_server::HttpServer, metrics_server};
+use fhevm_engine_common::{healthz_server::HttpServer, metrics_server, utils::DatabaseURL};
 use humantime::parse_duration;
+use sqlx::Database;
 use std::{sync::Arc, time::Duration};
 use tokio::{join, task};
 use tokio_util::sync::CancellationToken;
@@ -41,7 +43,7 @@ pub struct Args {
     /// Postgres database url. If unspecified DATABASE_URL environment variable
     /// is used
     #[arg(long)]
-    pub database_url: Option<String>,
+    pub database_url: Option<DatabaseURL>,
 
     /// Number of zkproof workers to process proofs in parallel
     #[arg(long, default_value_t = 8)]
@@ -90,10 +92,7 @@ async fn main() {
         .with_max_level(args.log_level)
         .init();
 
-    let database_url = args
-        .database_url
-        .clone()
-        .unwrap_or_else(|| std::env::var("DATABASE_URL").expect("DATABASE_URL is undefined"));
+    let database_url = args.database_url.clone().unwrap_or_default();
 
     let conf = zkproof_worker::Config {
         database_url,

coprocessor/fhevm-engine/zkproof-worker/src/lib.rs

@@ -5,6 +5,7 @@ mod tests;
 
 pub mod verifier;
 use std::{
+    fmt::{self, Display},
     io,
     sync::{LazyLock, OnceLock},
     time::Duration,
@@ -16,7 +17,10 @@ use fhevm_engine_common::{
     types::FhevmError,
 };
 use prometheus::Histogram;
+
+use fhevm_engine_common::{pg_pool::ServiceError, types::FhevmError, utils::DatabaseURL};
 use thiserror::Error;
+use tracing_subscriber::registry::Data;
 
 /// The highest index of an input is 254,
 /// cause 255 (0xff) is reserved for handles originating from the FHE operations
@@ -77,7 +81,7 @@ impl From<ExecutionError> for ServiceError {
 
 #[derive(Default, Debug, Clone)]
 pub struct Config {
-    pub database_url: String,
+    pub database_url: DatabaseURL,
     pub listen_database_channel: String,
     pub notify_database_channel: String,
     pub pg_pool_connections: u32,
@@ -96,3 +100,19 @@ pub static ZKVERIFY_OP_LATENCY_HISTOGRAM: LazyLock<Histogram> = LazyLock::new(||
         "ZK verification latencies in seconds",
     )
 });
+impl Display for Config {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "Config {{ database_url: {}, listen_database_channel: {}, notify_database_channel: {}, pg_pool_connections: {}, pg_polling_interval: {}, pg_timeout: {:?}, pg_auto_explain_with_min_duration: {:?}, worker_thread_count: {} }}",
+            self.database_url,
+            self.listen_database_channel,
+            self.notify_database_channel,
+            self.pg_pool_connections,
+            self.pg_polling_interval,
+            self.pg_timeout,
+            self.pg_auto_explain_with_min_duration,
+            self.worker_thread_count
+        )
+    }
+}

coprocessor/fhevm-engine/zkproof-worker/src/tests/utils.rs

@@ -15,7 +15,7 @@ pub async fn setup() -> anyhow::Result<(PostgresPoolManager, DBInstance)> {
         .expect("valid db instance");
 
     let conf = crate::Config {
-        database_url: test_instance.db_url().to_owned(),
+        database_url: test_instance.db_url.clone(),
         listen_database_channel: "fhevm".to_string(),
         notify_database_channel: "notify".to_string(),
         pg_pool_connections: 10,

coprocessor/fhevm-engine/zkproof-worker/src/verifier.rs

@@ -125,7 +125,7 @@ pub async fn execute_verify_proofs_loop(
     conf: Config,
     last_active_at: Arc<RwLock<SystemTime>>,
 ) -> Result<(), ExecutionError> {
-    info!(conf = ?conf, "Starting with config");
+    info!(conf = %conf, "Starting with config");
 
     // Tenants key cache is shared amongst all workers
     let tenant_key_cache = Arc::new(RwLock::new(LruCache::new(