add total_supply_balance_and_apy metric datapoint

Author: mvines

src/bin/sys-lend.rs

@@ -110,6 +110,19 @@ mod dp {
             .field("apy_bps", apy_bps as f64)
     }
 
+    pub fn total_supply_balance_and_apy(
+        address: &Pubkey,
+        maybe_token: MaybeToken,
+        ui_amount: f64,
+        apy_bps: u64,
+    ) -> metrics::Point {
+        metrics::Point::new("sys_lend::total_supply_balance_and_apy")
+            .tag("address", metrics::dp::pubkey_to_value(address))
+            .tag("token", maybe_token.name())
+            .field("amount", ui_amount)
+            .field("apy", apy_bps as f64)
+    }
+
     pub fn principal_balance_change(
         pool: &str,
         address: &Pubkey,
@@ -534,8 +547,12 @@ async fn build_instructions_for_ops<'a>(
         &address_lookup_table_accounts,
     )?;
 
-    let simulation_supply_balance =
-        pools_supply_balance(pools, token, address, &mut simulation_account_data_cache)?;
+    let simulation_supply_balance = dbg!(pools_supply_balance(
+        pools,
+        token,
+        address,
+        &mut simulation_account_data_cache
+    )?);
 
     let simulation_total_apy =
         apr_to_apy(pools_supply_balance_apr(&simulation_supply_balance).0) * 100.;
@@ -1057,6 +1074,15 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             }
 
             let (total_apr, total_balance) = pools_supply_balance_apr(&supply_balance);
+            let total_apy = apr_to_apy(total_apr) * 100.;
+
+            metrics::push(dp::total_supply_balance_and_apy(
+                &address,
+                maybe_token,
+                token.ui_amount(total_balance),
+                (total_apy * 100.) as u64,
+            ))
+            .await;
 
             if raw && total_only {
                 println!("{}", token.ui_amount(total_balance));
@@ -1066,7 +1092,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 println!(
                     "Total supply:    {} at {:.2}%",
                     token.format_amount(total_balance),
-                    apr_to_apy(total_apr) * 100.
+                    total_apy,
                 );
 
                 let wallet_balance = maybe_token.balance(rpc_client, &address)?;
@@ -1143,8 +1169,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 ui_amount => token.amount(ui_amount.parse::<f64>().unwrap()),
             };
 
-            let supply_balance =
-                pools_supply_balance(&pools, token, address, &mut account_data_cache)?;
+            let supply_balance = dbg!(pools_supply_balance(
+                &pools,
+                token,
+                address,
+                &mut account_data_cache
+            )?);
             let total_apy = apr_to_apy(pools_supply_balance_apr(&supply_balance).0) * 100.;
 
             assert_eq!(
@@ -1316,9 +1346,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                         );
                     }
 
-                    for withdraw_pool in &pools {
-                        let withdraw_pool_available_balance =
-                            supply_balance.get(withdraw_pool).unwrap().2;
+                    //for withdraw_pool in &pools {
+                    for withdraw_pool in &["solend-jlp".to_string()] {
+                        let (apr, _, withdraw_pool_available_balance) =
+                            *supply_balance.get(withdraw_pool).unwrap();
 
                         let max_requested_amount = match requested_amount {
                             u64::MAX => {
@@ -1335,6 +1366,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                         } else {
                             max_requested_amount
                         };
+                        println!("{withdraw_pool} {:.2}%", apr_to_apy(apr) * 100.);
 
                         if max_requested_amount > withdraw_pool_available_balance {
                             println!("Probing {withdraw_pool:<15}                          | FAIL | Rebalance {} failed due to an insufficient {withdraw_pool} supply balance of {}",
@@ -1496,8 +1528,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             notifier
                 .send(&format!("{} via via {signature}", operation_info.op_msg))
                 .await;
-
-            return Ok(());
         }
         _ => unreachable!(),
     }