formatter almost done

db/block.json

@@ -1,3 +1 @@
-{
-  "last_processsed_block": 226449
-}
+{"last_processsed_block":226449,"twitterRefreshToken":"SXdiVTZra0kxaEtQa2pqMkNXLTBVMkEtSmctbEx5bmZfQ0Q1QXluNlBHelNmOjE2OTUxMjYxNDYxNTM6MToxOnJ0OjE"}

src/api.rs

@@ -78,7 +78,6 @@ pub async fn fetch_coin(coin_id: &str) -> Result<f64, reqwest::Error> {
         .json()
         .await?;
 
-    println!("{}:{}", coin_info.data.name, coin_info.data.price_usd);
     Ok(coin_info.data.price_usd.parse().unwrap())
 }
 

src/formatter.rs

@@ -1,41 +1,92 @@
+use bigdecimal::ToPrimitive;
+use chrono::format::format;
+use num_bigint::BigUint;
 use starknet::core::types::{EmittedEvent, FieldElement};
 
-use crate::{api::Token, to_u256};
+use crate::{
+    api::{fetch_coin, Token},
+    to_u256,
+};
 
-fn get_formatted_text(emitted_event: EmittedEvent, token: Token) -> String {
+async fn get_formatted_text(emitted_event: EmittedEvent, token: Token) -> String {
     // TODO Update "from" and "to" to use starknet ID and reduce ID
     let from = emitted_event.data[0];
     let to = emitted_event.data[1];
     let amount = to_u256(
         emitted_event.data[2].try_into().unwrap(),
         emitted_event.data[3].try_into().unwrap(),
     );
+    let amount = amount / 10_u128.pow(token.decimals.into());
+    let amount_string = amount
+        .to_string()
+        .as_bytes()
+        .rchunks(3)
+        .rev()
+        .map(std::str::from_utf8)
+        .collect::<Result<Vec<&str>, _>>()
+        .unwrap()
+        .join(".");
+    let rate = fetch_coin(token.rate_api_id).await.unwrap();
+    let rate = BigUint::new(vec![rate.to_u32().unwrap()]);
+    let usd_value = amount * rate;
+    let usd_value_string = usd_value
+        .to_string()
+        .as_bytes()
+        .rchunks(3)
+        .rev()
+        .map(std::str::from_utf8)
+        .collect::<Result<Vec<&str>, _>>()
+        .unwrap()
+        .join(".");
 
     let first_line = format!(
-        "{} #{} {} (usd value) USD",
-        amount, token.symbol, token.logo
+        "{:} #{} {} ({} USD)",
+        amount_string, token.symbol, token.logo, usd_value_string
     );
     let second_line = if to == FieldElement::ZERO {
-        format!("{} bridged to Ethereum L1", from)
+        let from_hex = format!("{:#x}", from);
+        format!(
+            "{}...{} bridged to Ethereum L1",
+            &from_hex[0..5],
+            &from_hex[from_hex.len() - 4..]
+        )
     } else if from == FieldElement::ZERO {
-        format!("{} bridged to Starknet L2", to)
+        let to_hex = format!("{:#x}", to);
+        format!(
+            "{}...{} bridged to Starknet L2",
+            &to_hex[0..5],
+            &to_hex[to_hex.len() - 4..]
+        )
     } else {
-        format!("From ${} to ${}", from, to)
+        let from_hex = format!("{:#x}", from);
+        let to_hex = format!("{:#x}", to);
+
+        format!(
+            "From {}...{} to {}...{}",
+            &from_hex[0..5],
+            &from_hex[from_hex.len() - 4..],
+            &to_hex[0..5],
+            &to_hex[from_hex.len() - 4..]
+        )
     };
 
-    let third_line = format!("https://starkscan.co/tx/{}", emitted_event.transaction_hash);
+    let third_line = format!(
+        "https://starkscan.co/tx/{}",
+        format!("{:#x}", emitted_event.transaction_hash)
+    );
     format!("{}\n{}\n{}", first_line, second_line, third_line)
 }
 
 #[cfg(test)]
 mod tests {
     use starknet::core::types::{EmittedEvent, FieldElement};
 
-    use crate::ETH;
+    use crate::USDC;
 
     use super::get_formatted_text;
-    #[test]
-    fn test_get_formatted_text() {
+
+    #[tokio::test]
+    async fn test_get_formatted_text() {
         let keys = vec![FieldElement::from_hex_be(
             "0x99cd8bde557814842a3121e8ddfd433a539b8c9f14bf31ebf108d12e6196e9",
         )
@@ -66,13 +117,11 @@ mod tests {
             )
             .unwrap(),
         };
-        let response = get_formatted_text(emitted_event, ETH);
+        let response = get_formatted_text(emitted_event, USDC).await;
         println!("LAMA\n{response}");
         assert!(
             response
-                == "1.000.000,00 #USDC $ (1,000,326 USD)
-        0x6e1...b3ce bridged to Starknet L2
-        https://starkscan.co/tx/0x732b09d901fb0075d283ac23cbaae4f8c486123a88a621eeaa05d0b5ddfb8d8",
+                == "1.000.000 #USDC $ (1.000.000 USD)\n0x6e1...b3ce bridged to Starknet L2\nhttps://starkscan.co/tx/0x732b09d901fb0075d283ac23cbaae4f8c486123a88a621eeaa05d0b5ddfb8d8",
             "Should be https://twitter.com/StarkWhaleAlert/status/1703701997629722850"
         );
     }

src/main.rs

@@ -179,7 +179,7 @@ const ORBITER_FINANCE_BRIDGE_2: AddressToName = AddressToName {
 };
 
 const TOKENS: &'static [Token] = &[ETH, USDC, USDT];
-const address_list: &'static [AddressToName] = &[
+const ADDRESS_LIST: &'static [AddressToName] = &[
     LAYER_SWAP,
     ZKLEND_MARKET,
     BRIQ_FACTORY,
@@ -193,7 +193,7 @@ const address_list: &'static [AddressToName] = &[
 ];
 
 fn ends_with(a: &str) -> Option<&AddressToName> {
-    address_list.iter().find(|item| a.ends_with(item.address))
+    ADDRESS_LIST.iter().find(|item| a.ends_with(item.address))
 }
 #[cfg(test)]
 mod tests {