0.7.24-pre.0

kb_lib/src/dex_detect.rs

@@ -839,6 +839,25 @@ impl KbDexDetectService {
             Ok(base_token_id) => base_token_id,
             Err(error) => return Err(error),
         };
+        let payload_value_result = kb_parse_payload_json(decoded_event.payload_json.as_str());
+        let payload_value = match payload_value_result {
+            Ok(payload_value) => payload_value,
+            Err(error) => return Err(error),
+        };
+        let vault_addresses = kb_extract_pump_swap_vault_addresses(&payload_value);
+        let token_a_vault_address = vault_addresses.0;
+        let token_b_vault_address = vault_addresses.1;
+
+        let base_vault_address = if base_is_token_a {
+            token_a_vault_address.clone()
+        } else {
+            token_b_vault_address.clone()
+        };
+        let quote_vault_address = if base_is_token_a {
+            token_b_vault_address.clone()
+        } else {
+            token_a_vault_address.clone()
+        };
         let quote_token_id_result = self.ensure_token(quote_mint.as_str()).await;
         let quote_token_id = match quote_token_id_result {
             Ok(quote_token_id) => quote_token_id,
@@ -920,7 +939,7 @@ impl KbDexDetectService {
                 pool_id,
                 base_token_id,
                 crate::KbPoolTokenRole::Base,
-                None,
+                base_vault_address,
                 Some(0),
             ),
         )
@@ -934,7 +953,7 @@ impl KbDexDetectService {
                 pool_id,
                 quote_token_id,
                 crate::KbPoolTokenRole::Quote,
-                None,
+                quote_vault_address,
                 Some(1),
             ),
         )
@@ -961,11 +980,6 @@ impl KbDexDetectService {
                 }
             }
         };
-        let payload_value_result = kb_parse_payload_json(decoded_event.payload_json.as_str());
-        let payload_value = match payload_value_result {
-            Ok(payload_value) => payload_value,
-            Err(error) => return Err(error),
-        };
         if created_pool {
             let signal_result = self
                 .record_detection_signal(
@@ -2845,6 +2859,46 @@ fn kb_parse_payload_json(payload_json: &str) -> Result<serde_json::Value, crate:
     }
 }
 
+fn kb_extract_string_from_array_index(
+    values: &[serde_json::Value],
+    index: usize,
+) -> std::option::Option<std::string::String> {
+    if index >= values.len() {
+        return None;
+    }
+    let value = &values[index];
+    let text_option = value.as_str();
+    let text = match text_option {
+        Some(text) => text.trim(),
+        None => return None,
+    };
+    if text.is_empty() {
+        return None;
+    }
+    Some(text.to_string())
+}
+
+fn kb_extract_pump_swap_vault_addresses(
+    payload_value: &serde_json::Value,
+) -> (
+    std::option::Option<std::string::String>,
+    std::option::Option<std::string::String>,
+) {
+    let accounts_option = payload_value.get("accounts");
+    let accounts = match accounts_option {
+        Some(accounts) => accounts,
+        None => return (None, None),
+    };
+    let accounts_array_option = accounts.as_array();
+    let accounts_array = match accounts_array_option {
+        Some(accounts_array) => accounts_array,
+        None => return (None, None),
+    };
+    let token_a_vault_address = kb_extract_string_from_array_index(accounts_array, 7);
+    let token_b_vault_address = kb_extract_string_from_array_index(accounts_array, 8);
+    (token_a_vault_address, token_b_vault_address)
+}
+
 #[cfg(test)]
 mod tests {
     async fn make_database() -> std::sync::Arc<crate::KbDatabase> {