feat(demotion_monitor): add geo to alert

ultrasoundmoney · Sep 4, 2024 · f7007c3 · f7007c3
1 parent 81a25f5
commit f7007c3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/phoenix/demotion_monitor.rs b/src/phoenix/demotion_monitor.rs
@@ -21,6 +21,7 @@ use super::{
 
 #[derive(Debug, Clone)]
 pub struct BuilderDemotion {
+    pub geo: String,
     pub builder_pubkey: String,
     pub builder_id: Option<String>,
     pub slot: i64,
@@ -34,6 +35,7 @@ pub async fn get_builder_demotions(
 ) -> Result<Vec<BuilderDemotion>> {
     let query = "
         SELECT
+            bd.geo,
             bd.builder_pubkey,
             bb.builder_id,
             bd.slot,
@@ -54,6 +56,7 @@ pub async fn get_builder_demotions(
         .map(|rows| {
             rows.iter()
                 .map(|row| BuilderDemotion {
+                    geo: row.get("geo"),
                     builder_pubkey: row.get("builder_pubkey"),
                     builder_id: row.try_get("builder_id").ok(),
                     slot: row.get("slot"),
@@ -110,11 +113,13 @@ fn format_demotion_message(demotion: &BuilderDemotion) -> String {
     let escaped_builder_id = telegram::escape_str(builder_id);
     let builder_pubkey = &demotion.builder_pubkey;
     let error = telegram::escape_code_block(&demotion.sim_error);
-    let slot = demotion.slot;
+    let slot = &demotion.slot;
+    let geo = &demotion.geo;
     formatdoc!(
         "
         [beaconcha\\.in/slot/{slot}]({explorer_url}/slot/{slot})
         slot: `{slot}`
+        geo: `{geo}`
         builder\\_id: `{escaped_builder_id}`
         builder\\_pubkey: `{builder_pubkey}`
         ```

diff --git a/src/phoenix/promotion_monitor.rs b/src/phoenix/promotion_monitor.rs
@@ -165,12 +165,14 @@ mod tests {
     fn test_get_eligible_builders_all_eligible() {
         let demotions = vec![
             BuilderDemotion {
+                geo: "rbx".to_string(),
                 builder_pubkey: "pubkey1".to_string(),
                 sim_error: "json error: request timeout hit before processing".to_string(),
                 slot: 1,
                 builder_id: Some("builder1".to_string()),
             },
             BuilderDemotion {
+                geo: "rbx".to_string(),
                 builder_pubkey: "pubkey2".to_string(),
                 sim_error: "simulation failed: unknown ancestor".to_string(),
                 slot: 2,
@@ -187,12 +189,14 @@ mod tests {
     fn test_get_eligible_builders_none_eligible() {
         let demotions = vec![
             BuilderDemotion {
+                geo: "rbx".to_string(),
                 builder_pubkey: "pubkey1".to_string(),
                 sim_error: "invalid error".to_string(),
                 slot: 1,
                 builder_id: Some("builder1".to_string()),
             },
             BuilderDemotion {
+                geo: "rbx".to_string(),
                 builder_pubkey: "pubkey2".to_string(),
                 sim_error: "simulation failed: unknown ancestor".to_string(),
                 slot: 2,
@@ -210,18 +214,21 @@ mod tests {
     fn test_get_eligible_builders_some_eligible() {
         let demotions = vec![
             BuilderDemotion {
+                geo: "rbx".to_string(),
                 builder_pubkey: "pubkey1".to_string(),
                 sim_error: "json error: request timeout hit before processing".to_string(),
                 slot: 1,
                 builder_id: Some("builder1".to_string()),
             },
             BuilderDemotion {
+                geo: "rbx".to_string(),
                 builder_pubkey: "pubkey2".to_string(),
                 sim_error: "invalid error".to_string(),
                 slot: 2,
                 builder_id: Some("builder2".to_string()),
             },
             BuilderDemotion {
+                geo: "rbx".to_string(),
                 builder_pubkey: "pubkey2".to_string(),
                 sim_error: "simulation failed: unknown ancestor".to_string(),
                 slot: 3,
@@ -239,18 +246,21 @@ mod tests {
     fn test_same_slot_both_valid_and_invalid() {
         let demotions = vec![
             BuilderDemotion {
+                geo: "rbx".to_string(),
                 builder_pubkey: "pubkey2".to_string(),
                 sim_error: "invalid error".to_string(),
                 slot: 2,
                 builder_id: Some("builder2".to_string()),
             },
             BuilderDemotion {
+                geo: "rbx".to_string(),
                 builder_pubkey: "pubkey1".to_string(),
                 sim_error: "json error: request timeout hit before processing".to_string(),
                 slot: 1,
                 builder_id: Some("builder1".to_string()),
             },
             BuilderDemotion {
+                geo: "rbx".to_string(),
                 builder_pubkey: "pubkey2".to_string(),
                 sim_error: "simulation failed: unknown ancestor".to_string(),
                 slot: 2,