Feat: Updated AutoSwap service

src/config.rs

@@ -16,6 +16,11 @@ pub struct Configuration {
     pub app_port: u16,
     pub db_str: String,
     pub db_pool_max_size: u32,
+    pub rpc_url: String,
+    pub private_key: String,
+    pub owner_address: String,
+    pub autoswap_contract: String,
+    pub token_address: String,
 }
 
 // Environment application is running in.
@@ -46,13 +51,28 @@ impl Configuration {
         // 0.0.0.0 + Port to support containerisation.
         let listen_address = SocketAddr::from((Ipv6Addr::UNSPECIFIED, app_port));
 
+        let rpc_url = env_var("STARKNET_RPC_URL")
+            .parse::<String>()
+            .expect("Unable to parse the value of the STARKNET_RPC_URL environment variable. Please make sure it is a valid string.");
+
+        let autoswap_contract = env_var("AUTOSWAP_CONTRACT_ADDRESS")
+            .parse::<String>()
+            .expect("Unable to parse the value of the EKUBO_CONTRACT environment variable. Please make sure it is a valid string.");
+
+        let token_address = env_var("TOKEN_ADDRESS");
+
         // Configuration values to be safely shared across requests.
         Arc::new(Configuration {
             env,
             listen_address,
             app_port,
             db_str,
             db_pool_max_size,
+            rpc_url,
+            private_key: env_var("PRIVATE_KEY"),
+            owner_address: env_var("OWNER_ADDRESS"),
+            autoswap_contract,
+            token_address,
         })
     }
 

src/http/mod.rs

@@ -9,8 +9,6 @@ mod subscription;
 mod transaction_logs;
 mod types;
 mod unsubscription;
-mod auto_swap;
-mod utils;
 use crate::AppState;
 
 // Application router.

src/http/types.rs

@@ -33,30 +33,29 @@ pub struct ActivityLogGetResponse {
 
 #[derive(FromRow, Debug, Serialize)]
 pub struct SubscriptionData {
-    pub wallet_address: String, 
+    pub wallet_address: String,
     pub to_token: String,
-    pub is_active: bool
+    pub is_active: bool,
 }
 
 #[derive(FromRow, Debug, Serialize)]
 pub struct SwapSubscriptionFromTokenData {
-    pub wallet_address: String, 
+    pub wallet_address: String,
     pub from_token: String,
-    pub percentage: i16
+    pub percentage: i16,
 }
 
-
 #[derive(Debug, Serialize, Deserialize)]
 pub struct AutoSwapRequest {
-    pub from : String,
-    pub to : String,
-    pub value : i64
+    pub from: String,
+    pub to: String,
+    pub value: i64,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct AutoSwapResponse {
     pub status: String,
-    pub message: String
+    pub message: String,
 }
 
 #[derive(Debug, Deserialize)]

src/main.rs

@@ -1,5 +1,5 @@
-use autoswappr_backend::{telemetry, Configuration, Db};
-use tokio::net::TcpListener;
+use autoswappr_backend::{service::auto_swap::swap, telemetry, Configuration, Db};
+use tokio::{net::TcpListener, task};
 
 #[tokio::main]
 async fn main() {
@@ -23,6 +23,16 @@ async fn main() {
     tracing::debug!("Running Migrations");
     db.migrate().await.expect("Failed to run migrations");
 
+    tracing::info!("Running swap service");
+    task::spawn(async move {
+        if let Err(e) = swap().await {
+            tracing::error!("Swap function failed: {}", e);
+            Err(e) // Return the error
+        } else {
+            Ok(()) // Return Ok if no error
+        }
+    });
+
     // Listen for requests on specified port.
     tracing::info!("Starting server on {}", config.listen_address);
     let listener = TcpListener::bind(&config.listen_address)