0.7.24-pre.0

kb_lib/src/db/queries.rs

@@ -109,6 +109,7 @@ pub use pool_token::upsert_pool_token;
 pub use swap::list_recent_swaps;
 pub use swap::upsert_swap;
 pub use token::get_token_by_mint;
+pub use token::list_tokens;
 pub use token::upsert_token;
 pub use token_burn_event::list_recent_token_burn_events;
 pub use token_burn_event::upsert_token_burn_event;

kb_lib/src/db/queries/token.rs

@@ -119,3 +119,51 @@ LIMIT 1
         }
     }
 }
+
+
+/// Lists all normalized token rows ordered by mint.
+pub async fn list_tokens(
+    database: &crate::KbDatabase,
+) -> Result<std::vec::Vec<crate::KbTokenDto>, crate::KbError> {
+    match database.connection() {
+        crate::KbDatabaseConnection::Sqlite(pool) => {
+            let query_result = sqlx::query_as::<sqlx::Sqlite, crate::KbTokenEntity>(
+                r#"
+SELECT
+    id,
+    mint,
+    symbol,
+    name,
+    decimals,
+    token_program,
+    is_quote_token,
+    first_seen_at,
+    updated_at
+FROM kb_tokens
+ORDER BY mint ASC, id ASC
+                "#,
+            )
+            .fetch_all(pool)
+            .await;
+            let entities = match query_result {
+                Ok(entities) => entities,
+                Err(error) => {
+                    return Err(crate::KbError::Db(format!(
+                        "cannot list kb_tokens on sqlite: {}",
+                        error
+                    )));
+                }
+            };
+            let mut dtos = std::vec::Vec::new();
+            for entity in entities {
+                let dto_result = crate::KbTokenDto::try_from(entity);
+                let dto = match dto_result {
+                    Ok(dto) => dto,
+                    Err(error) => return Err(error),
+                };
+                dtos.push(dto);
+            }
+            Ok(dtos)
+        }
+    }
+}

kb_lib/src/db/queries/trade_event.rs

@@ -33,6 +33,10 @@ INSERT INTO kb_trade_events (
 )
 VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 ON CONFLICT(decoded_event_id) DO UPDATE SET
+    base_amount_raw = COALESCE(excluded.base_amount_raw, kb_trade_events.base_amount_raw),
+    quote_amount_raw = COALESCE(excluded.quote_amount_raw, kb_trade_events.quote_amount_raw),
+    price_quote_per_base = COALESCE(excluded.price_quote_per_base, kb_trade_events.price_quote_per_base),
+    payload_json = excluded.payload_json,
     updated_at = excluded.updated_at
                 "#,
             )