chore(coprocessor): use DatabaseURL in txn-sender

Author: goshawk-3

coprocessor/fhevm-engine/transaction-sender/src/bin/transaction_sender.rs

@@ -20,7 +20,7 @@ use transaction_sender::{
 
 use fhevm_engine_common::{
     metrics_server,
-    telemetry::{self, MetricsConfig},
+    telemetry::{self, utils::DatabaseURL, MetricsConfig},
 };
 use humantime::parse_duration;
 
@@ -52,7 +52,7 @@ struct Conf {
     private_key: Option<String>,
 
     #[arg(short, long)]
-    database_url: Option<String>,
+    database_url: Option<DatabaseURL>,
 
     #[arg(long, default_value = "10")]
     database_pool_size: u32,
@@ -229,7 +229,9 @@ async fn main() -> anyhow::Result<()> {
     let wallet = EthereumWallet::new(abstract_signer.clone());
     let database_url = match conf.database_url.clone() {
         Some(url) => url,
-        None => std::env::var("DATABASE_URL").context("DATABASE_URL is undefined")?,
+        None => std::env::var("DATABASE_URL")
+            .context("DATABASE_URL is undefined")?
+            .into(),
     };
 
     let provider = loop {

coprocessor/fhevm-engine/transaction-sender/src/config.rs

@@ -1,8 +1,10 @@
 use std::time::Duration;
 
+use fhevm_engine_common::utils::DatabaseURL;
+
 #[derive(Clone, Debug)]
 pub struct ConfigSettings {
-    pub database_url: String,
+    pub database_url: DatabaseURL,
     pub database_pool_size: u32,
 
     pub verify_proof_resp_db_channel: String,
@@ -46,8 +48,7 @@ pub struct ConfigSettings {
 impl Default for ConfigSettings {
     fn default() -> Self {
         Self {
-            database_url: std::env::var("DATABASE_URL")
-                .unwrap_or("postgres://postgres:postgres@localhost/coprocessor".to_owned()),
+            database_url: DatabaseURL::default(),
             database_pool_size: 10,
             verify_proof_resp_db_channel: "event_zkpok_computed".to_owned(),
             add_ciphertexts_db_channel: "event_ciphertexts_uploaded".to_owned(),

coprocessor/fhevm-engine/transaction-sender/src/transaction_sender.rs

@@ -37,7 +37,7 @@ impl<P: Provider<Ethereum> + Clone + 'static> TransactionSender<P> {
     ) -> anyhow::Result<Self> {
         let db_pool = sqlx::postgres::PgPoolOptions::new()
             .max_connections(conf.database_pool_size)
-            .connect(&conf.database_url)
+            .connect(conf.database_url.as_str())
             .await?;
 
         let operations: Vec<Arc<dyn ops::TransactionOperation<P>>> = vec![

coprocessor/fhevm-engine/transaction-sender/tests/common.rs

@@ -81,7 +81,7 @@ impl TestEnvironment {
 
         let db_pool = PgPoolOptions::new()
             .max_connections(1)
-            .connect(&conf.database_url)
+            .connect(conf.database_url.as_str())
             .await?;
 
         Self::truncate_tables(