Fix/doteenv

.env.bak

@@ -0,0 +1,14 @@
+# INFRA
+MONGO_URL=mongodb://127.0.0.1:27017
+REDIS_URL=redis://localhost:6379
+
+# API_KEYS
+BUNGEE_API_KEY=
+COVALENT_API_KEY=
+COINGECKO_API_KEY=
+
+# RPC_URLS
+ETHEREUM_RPC_URL=https://rpc.ankr.com/eth
+ARBITRUM_RPC_URL=https://arbitrum.llamarpc.com
+OPTIMISM_RPC_URL=https://mainnet.optimism.io
+BASE_RPC_URL=https://mainnet.base.org

.github/workflows/pr.yaml

@@ -34,13 +34,13 @@ jobs:
       ETHEREUM_RPC_URL: ${{ secrets.ETHEREUM_RPC_URL }}
       ARBITRUM_RPC_URL: ${{ secrets.ARBITRUM_RPC_URL }}
       OPTIMISM_RPC_URL: ${{ secrets.OPTIMISM_RPC_URL }}
-      BAE_RPC_URL: ${{ secrets.BASE_RPC_URL }}
+      BASE_RPC_URL: ${{ secrets.BASE_RPC_URL }}
       MONGO_URL: ${{ secrets.MONGO_URL }}
       REDIS_URL: ${{ secrets.REDIS_URL }}
     environment: Testing
-          
+
   container_img_build_push_gar:
-    needs: [test]
+    needs: [ test ]
     # Allow the job to fetch a GitHub ID token
     permissions:
       id-token: write
@@ -49,7 +49,7 @@ jobs:
     strategy:
       matrix:
         image:
-          - us-docker.pkg.dev/biconomy-prod/biconomy-prod/reflux 
+          - us-docker.pkg.dev/biconomy-prod/biconomy-prod/reflux
           # LOCATION-docker.pkg.dev/PROJECT-ID/REPOSITORY/IMAGE
           # {owner}/{repo}/.github/workflows/{filename}@{ref}
     uses: bcnmy/devops/.github/workflows/container_img_build_push_gar.yaml@master

.gitignore

@@ -22,4 +22,4 @@ target/
 
 *.env
 *.swp
-# *.yaml
+*.log

bin/reflux/src/main.rs

@@ -6,6 +6,7 @@ use axum::http::Method;
 use clap::Parser;
 use dotenv::dotenv;
 use log::{debug, error, info};
+use tokio::sync::Mutex;
 use tower_http::cors::{Any, CorsLayer};
 
 use account_aggregation::service::AccountAggregationService;
@@ -35,7 +36,9 @@ struct Args {
 
 #[tokio::main]
 async fn main() {
-    dotenv().expect("Failed to read .env");
+    if let Err(e) = dotenv() {
+        error!("Failed to load .env file: {}", e);
+    }
     simple_logger::SimpleLogger::new().env().init().unwrap();
 
     let mut args = Args::parse();
@@ -119,16 +122,16 @@ async fn run_solver(config: Arc<Config>) {
     let erc20_instance_map = generate_erc20_instance_map(&config).unwrap();
     let bungee_client = BungeeClient::new(&config.bungee.base_url, &config.bungee.api_key)
         .expect("Failed to Instantiate Bungee Client");
-    let token_price_provider = CoingeckoClient::new(
+    let token_price_provider = Arc::new(Mutex::new(CoingeckoClient::new(
         config.coingecko.base_url.clone(),
         config.coingecko.api_key.clone(),
         redis_client.clone(),
         Duration::from_secs(config.coingecko.expiry_sec),
-    );
+    )));
     let settlement_engine = Arc::new(SettlementEngine::new(
         Arc::clone(&config),
         bungee_client,
-        token_price_provider,
+        Arc::clone(&token_price_provider),
         erc20_instance_map,
     ));
 
@@ -205,12 +208,12 @@ async fn run_indexer(config: Arc<Config>) {
     let bungee_client = BungeeClient::new(&config.bungee.base_url, &config.bungee.api_key)
         .expect("Failed to Instantiate Bungee Client");
 
-    let token_price_provider = CoingeckoClient::new(
+    let token_price_provider = Arc::new(Mutex::new(CoingeckoClient::new(
         config.coingecko.base_url.clone(),
         config.coingecko.api_key.clone(),
         redis_provider.clone(),
         Duration::from_secs(config.coingecko.expiry_sec),
-    );
+    )));
 
     let indexer: Indexer<BungeeClient, RedisClient, RedisClient, CoingeckoClient<RedisClient>> =
         Indexer::new(