Feature/add gbp currency

nyx-chain-watcher/Cargo.toml

@@ -3,7 +3,7 @@
 
 [package]
 name = "nyx-chain-watcher"
-version = "0.1.9"
+version = "0.1.10"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true

nyx-chain-watcher/migrations/004_add_gbp_column.sql

@@ -0,0 +1 @@
+ALTER TABLE price_history ADD COLUMN gbp REAL NOT NULL DEFAULT 0;

nyx-chain-watcher/src/db/models.rs

@@ -6,6 +6,7 @@ pub(crate) struct CurrencyPrices {
     pub(crate) chf: f32,
     pub(crate) usd: f32,
     pub(crate) eur: f32,
+    pub(crate) gbp: f32,
     pub(crate) btc: f32,
 }
 
@@ -27,6 +28,7 @@ pub(crate) struct PriceHistory {
     pub(crate) chf: f64,
     pub(crate) usd: f64,
     pub(crate) eur: f64,
+    pub(crate) gbp: f64,
     pub(crate) btc: f64,
 }
 

nyx-chain-watcher/src/db/queries/price.rs

@@ -11,18 +11,20 @@ pub(crate) async fn insert_nym_prices(
     let timestamp = price_data.timestamp;
     sqlx::query!(
         "INSERT INTO price_history
-                (timestamp, chf, usd, eur, btc)
+                (timestamp, chf, usd, eur, gbp, btc)
                 VALUES
-                ($1, $2, $3, $4, $5)
+                ($1, $2, $3, $4, $5, $6)
             ON CONFLICT(timestamp) DO UPDATE SET
             chf=excluded.chf,
             usd=excluded.usd,
             eur=excluded.eur,
+            gbp=excluded.gbp,
             btc=excluded.btc;",
         timestamp,
         price_data.nym.chf,
         price_data.nym.usd,
         price_data.nym.eur,
+        price_data.nym.gbp,
         price_data.nym.btc,
     )
     .execute(&mut *conn)
@@ -33,7 +35,7 @@ pub(crate) async fn insert_nym_prices(
 
 pub(crate) async fn get_latest_price(pool: &DbPool) -> anyhow::Result<PriceHistory> {
     let result = sqlx::query!(
-        "SELECT timestamp, chf, usd, eur, btc FROM price_history ORDER BY timestamp DESC LIMIT 1;"
+        "SELECT timestamp, chf, usd, eur, gbp, btc FROM price_history ORDER BY timestamp DESC LIMIT 1;"
     )
     .fetch_one(pool)
     .await?;
@@ -43,6 +45,7 @@ pub(crate) async fn get_latest_price(pool: &DbPool) -> anyhow::Result<PriceHisto
         chf: result.chf,
         usd: result.usd,
         eur: result.eur,
+        gbp: result.gbp,
         btc: result.btc,
     })
 }
@@ -52,7 +55,7 @@ pub(crate) async fn get_average_price(pool: &DbPool) -> anyhow::Result<PriceHist
     let earliest_timestamp = Local::now().sub(chrono::Duration::days(1)).timestamp();
 
     let result = sqlx::query!(
-        "SELECT timestamp, chf, usd, eur, btc FROM price_history WHERE timestamp >= $1;",
+        "SELECT timestamp, chf, usd, eur, gbp, btc FROM price_history WHERE timestamp >= $1;",
         earliest_timestamp
     )
     .fetch_all(pool)
@@ -65,20 +68,23 @@ pub(crate) async fn get_average_price(pool: &DbPool) -> anyhow::Result<PriceHist
         chf: 0f64,
         usd: 0f64,
         eur: 0f64,
+        gbp: 0f64,
         btc: 0f64,
     };
 
     for p in &result {
         price.chf += p.chf;
         price.usd += p.usd;
         price.eur += p.eur;
+        price.gbp += p.gbp;
         price.btc += p.btc;
     }
 
     if count > 0f64 {
         price.chf /= count;
         price.usd /= count;
         price.eur /= count;
+        price.gbp /= count;
         price.btc /= count;
     }
 

nyx-chain-watcher/src/price_scraper/mod.rs

@@ -11,7 +11,7 @@ use crate::db::DbPool;
 const REFRESH_DELAY: Duration = Duration::from_secs(300);
 const FAILURE_RETRY_DELAY: Duration = Duration::from_secs(60 * 2);
 const COINGECKO_API_URL: &str =
-    "https://api.coingecko.com/api/v3/simple/price?ids=nym&vs_currencies=chf,usd,eur,btc";
+    "https://api.coingecko.com/api/v3/simple/price?ids=nym&vs_currencies=chf,usd,eur,gbp,btc";
 
 pub(crate) async fn run_price_scraper(db_pool: &DbPool) -> JoinHandle<()> {
     loop {