Fix ups for hotspot info (#379)

* Make location/geo fields public * Add info_key to committedhotspotupdate * Remove unused feature from h3o
helium · Jun 21, 2024 · 094c579 · 094c579
1 parent d020676
commit 094c579
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 14 deletions.
diff --git a/helium-lib/Cargo.toml b/helium-lib/Cargo.toml
@@ -16,7 +16,7 @@ async-trait = "0"
 anchor-client = {version = "0.30.0", features = ["async"] }
 anchor-spl = { version = "0.30.0", features = ["mint", "token"] }
 url = {version = "2", features = ["serde"]}
-h3o = {version = "0", features = ["std", "serde"]}
+h3o = {version = "0", features = ["serde"]}
 helium-crypto = {workspace = true}
 itertools = "0.10.5"
 jsonrpc_client = {version = "0.7", features = ["reqwest"]}

diff --git a/helium-lib/src/hotspot.rs b/helium-lib/src/hotspot.rs
@@ -232,23 +232,27 @@ pub mod info {
                 .into_iter()
                 .map(HotspotInfoUpdate::from_ui_instruction)
                 .filter(|result| matches!(result, Ok(Some(_v))))
-                .collect::<Vec<StdResult<Option<HotspotInfoUpdate>, _>>>()
+                .collect::<Vec<StdResult<Option<(Pubkey, HotspotInfoUpdate)>, _>>>()
                 .into_iter()
-                .collect::<StdResult<Vec<Option<HotspotInfoUpdate>>, _>>()?
+                .collect::<StdResult<Vec<Option<(Pubkey, HotspotInfoUpdate)>>, _>>()?
                 .first()
                 .cloned()
                 .flatten()
-                .map(|update| Self {
+                .map(|(info_key, update)| Self {
                     timestamp,
                     signature: signature.clone(),
+                    info_key,
                     update,
                 });
             Ok(update)
         }
     }
 
     impl HotspotInfoUpdate {
-        fn from_ui_instruction(ixn: UiInstruction) -> StdResult<Option<Self>, DecodeError> {
+        fn from_ui_instruction(
+            ixn: UiInstruction,
+        ) -> StdResult<Option<(Pubkey, Self)>, DecodeError> {
+            use solana_transaction_status::UiPartiallyDecodedInstruction;
             let UiInstruction::Parsed(UiParsedInstruction::PartiallyDecoded(decoded)) = ixn else {
                 return Err(DecodeError::other("not a decoded instruction"));
             };
@@ -266,21 +270,47 @@ pub mod info {
             discriminator.copy_from_slice(&decoded_data[..8]);
             let args = &decoded_data[8..];
 
+            fn get_info_key(
+                decoded: &UiPartiallyDecodedInstruction,
+                index: usize,
+            ) -> StdResult<Pubkey, DecodeError> {
+                let account_str = decoded.accounts.get(index).ok_or_else(|| {
+                    DecodeError::other("missing info key in instruction accounts")
+                })?;
+                let account = Pubkey::from_str(account_str).map_err(DecodeError::from)?;
+                Ok(account)
+            }
+
             match discriminator {
                 UpdateMobileInfoV0::DISCRIMINATOR => {
-                    UpdateMobileInfoArgsV0::try_from_slice(args).map(Into::into)
+                    let info_key = get_info_key(&decoded, 2)?;
+                    UpdateMobileInfoArgsV0::try_from_slice(args)
+                        .map(Into::into)
+                        .map(|v| (info_key, v))
                 }
                 OnboardMobileHotspotV0::DISCRIMINATOR => {
-                    OnboardMobileHotspotArgsV0::try_from_slice(args).map(Into::into)
+                    let info_key = get_info_key(&decoded, 3)?;
+                    OnboardMobileHotspotArgsV0::try_from_slice(args)
+                        .map(Into::into)
+                        .map(|v| (info_key, v))
                 }
                 OnboardIotHotspotV0::DISCRIMINATOR => {
-                    OnboardIotHotspotArgsV0::try_from_slice(args).map(Into::into)
+                    let info_key = get_info_key(&decoded, 3)?;
+                    OnboardIotHotspotArgsV0::try_from_slice(args)
+                        .map(Into::into)
+                        .map(|v| (info_key, v))
                 }
                 UpdateIotInfoV0::DISCRIMINATOR => {
-                    UpdateIotInfoArgsV0::try_from_slice(args).map(Into::into)
+                    let info_key = get_info_key(&decoded, 2)?;
+                    UpdateIotInfoArgsV0::try_from_slice(args)
+                        .map(Into::into)
+                        .map(|v| (info_key, v))
                 }
                 OnboardDataOnlyIotHotspotV0::DISCRIMINATOR => {
-                    OnboardDataOnlyIotHotspotArgsV0::try_from_slice(args).map(Into::into)
+                    let info_key = get_info_key(&decoded, 2)?;
+                    OnboardDataOnlyIotHotspotArgsV0::try_from_slice(args)
+                        .map(Into::into)
+                        .map(|v| (info_key, v))
                 }
                 _ => return Ok(None),
             }
@@ -759,8 +789,8 @@ impl Hotspot {
 
 #[derive(Serialize, Debug, Clone, Copy)]
 pub struct HotspotGeo {
-    lat: f64,
-    lng: f64,
+    pub lat: f64,
+    pub lng: f64,
 }
 
 impl From<h3o::CellIndex> for HotspotGeo {
@@ -776,8 +806,8 @@ impl From<h3o::CellIndex> for HotspotGeo {
 #[derive(Serialize, Debug, Clone, Copy)]
 pub struct HotspotLocation {
     #[serde(with = "serde_cell_index")]
-    location: h3o::CellIndex,
-    geo: HotspotGeo,
+    pub location: h3o::CellIndex,
+    pub geo: HotspotGeo,
 }
 
 impl From<h3o::CellIndex> for HotspotLocation {
@@ -873,6 +903,8 @@ pub enum HotspotInfo {
 pub struct CommittedHotspotInfoUpdate {
     pub timestamp: chrono::DateTime<Utc>,
     pub signature: String,
+    #[serde(with = "serde_pubkey")]
+    pub info_key: Pubkey,
     pub update: HotspotInfoUpdate,
 }