Merge branch 'main' into remove-scraper

markets.json

@@ -34,5 +34,25 @@
     {
         "name": "RAY/USDC",
         "address": "DZjbn4XC8qoHKikZqzmhemykVzmossoayV9ffbsUqxVj"
+    },
+    {
+        "name": "mSOL/SOL",
+        "address": "AYhLYoDr6QCtVb5n1M5hsWLG74oB8VEz378brxGTnjjn"
+    },
+    {
+        "name": "stSOL/USDC",
+        "address": "JCKa72xFYGWBEVJZ7AKZ2ofugWPBfrrouQviaGaohi3R"
+    },
+    {
+        "name": "LDO/USDC",
+        "address": "BqApFW7DwXThCDZAbK13nbHksEsv6YJMCdj58sJmRLdy"
+    },
+    {
+        "name": "stSOL/SOL",
+        "address": "GoXhYTpRF4vs4gx48S7XhbaukVbJXVycXimhGfzWNGLF"
+    },
+    {
+        "name": "JitoSOL/USDC",
+        "address": "DkbVbMhFxswS32xnn1K2UY4aoBugXooBTxdzkWWDWRkH"
     }
 ]

src/server/main.rs

@@ -55,7 +55,7 @@ async fn main() -> std::io::Result<()> {
         .unwrap();
     // For collecting metrics on the public api, excluding 404s
     let public_metrics = PrometheusMetricsBuilder::new("openbook_candles_server")
-        .registry(registry.clone())
+        .registry(registry)
         .exclude_status(StatusCode::NOT_FOUND)
         .build()
         .unwrap();

src/worker/candle_batching/mod.rs

@@ -22,7 +22,7 @@ pub async fn batch_for_market(pool: &Pool, market: &MarketInfo) -> anyhow::Resul
     loop {
         let market_clone = market.clone();
         loop {
-            sleep(Duration::milliseconds(2000).to_std()?).await;
+            sleep(Duration::milliseconds(5000).to_std()?).await;
             match batch_inner(pool, &market_clone).await {
                 Ok(_) => {}
                 Err(e) => {
@@ -63,7 +63,7 @@ async fn batch_inner(pool: &Pool, market: &MarketInfo) -> anyhow::Result<()> {
 }
 
 async fn save_candles(pool: &Pool, candles: Vec<Candle>) -> anyhow::Result<()> {
-    if candles.len() == 0 {
+    if candles.is_empty() {
         return Ok(());
     }
     let upsert_statement = build_candles_upsert_statement(&candles);