Fix up hotspot location uses, reuse hpl key serialization (#367)

* entity key encoding reuse from hpl

keyserialization fixups

* Fix is_none not working for hotspot info

* impl FromStr for HotspotLocation

drop skip_serializing_none on enum

helium-lib/src/entity_key.rs

@@ -37,16 +37,12 @@ impl AsEntityKey for helium_crypto::PublicKey {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Copy)]
-pub enum EntityKeyEncoding {
-    String,
-    UTF8,
-}
+pub use helium_anchor_gen::helium_entity_manager::KeySerialization;
 
-pub fn from_string(str: String, encoding: EntityKeyEncoding) -> Result<Vec<u8>> {
+pub fn from_string(str: String, encoding: KeySerialization) -> Result<Vec<u8>> {
     let entity_key = match encoding {
-        EntityKeyEncoding::String => str.as_entity_key(),
-        EntityKeyEncoding::UTF8 => bs58::decode(str).into_vec().map_err(DecodeError::from)?,
+        KeySerialization::UTF8 => str.as_entity_key(),
+        KeySerialization::B58 => bs58::decode(str).into_vec().map_err(DecodeError::from)?,
     };
     Ok(entity_key)
 }

helium-lib/src/hotspot.rs

@@ -672,12 +672,12 @@ impl TryFrom<asset::AssetPage> for HotspotPage {
 }
 
 #[derive(Debug, Serialize, Clone)]
-#[skip_serializing_none]
 pub struct Hotspot {
     pub key: helium_crypto::PublicKey,
     pub name: String,
     #[serde(with = "serde_pubkey")]
     pub owner: Pubkey,
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub info: Option<HashMap<SubDao, HotspotInfo>>,
 }
 
@@ -743,6 +743,13 @@ impl TryFrom<u64> for HotspotLocation {
     }
 }
 
+impl FromStr for HotspotLocation {
+    type Err = h3o::error::InvalidCellIndex;
+    fn from_str(s: &str) -> StdResult<Self, Self::Err> {
+        s.parse::<h3o::CellIndex>().map(Into::into)
+    }
+}
+
 impl HotspotLocation {
     pub fn from_maybe<T: TryInto<HotspotLocation>>(value: Option<T>) -> Option<Self> {
         value.and_then(|v| TryInto::try_into(v).ok())
@@ -751,22 +758,26 @@ impl HotspotLocation {
 
 #[derive(Debug, Serialize, Clone)]
 #[serde(rename_all = "lowercase", untagged)]
-#[skip_serializing_none]
 pub enum HotspotInfo {
     Iot {
+        #[serde(skip_serializing_if = "Option::is_none")]
         asset: Option<String>,
         mode: HotspotMode,
         gain: Option<Decimal>,
+        #[serde(skip_serializing_if = "Option::is_none")]
         elevation: Option<i32>,
         #[serde(flatten)]
+        #[serde(skip_serializing_if = "Option::is_none")]
         location: Option<HotspotLocation>,
         #[serde(skip_serializing_if = "is_zero")]
         location_asserts: u16,
     },
     Mobile {
+        #[serde(skip_serializing_if = "Option::is_none")]
         asset: Option<String>,
         mode: HotspotMode,
         #[serde(flatten)]
+        #[serde(skip_serializing_if = "Option::is_none")]
         location: Option<HotspotLocation>,
         #[serde(skip_serializing_if = "is_zero")]
         location_asserts: u16,

helium-lib/src/reward.rs

@@ -1,7 +1,7 @@
 use crate::{
     asset,
     dao::SubDao,
-    entity_key::{self, AsEntityKey, EntityKeyEncoding},
+    entity_key::{self, AsEntityKey, KeySerialization},
     keypair::{Keypair, Pubkey, PublicKey},
     programs::SPL_ACCOUNT_COMPRESSION_PROGRAM_ID,
     result::{DecodeError, Error, Result},
@@ -60,7 +60,7 @@ pub async fn claim<C: Clone + Deref<Target = impl Signer>, E>(
     settings: &Settings,
     subdao: &SubDao,
     entity_key_string: &str,
-    entity_key_encoding: EntityKeyEncoding,
+    entity_key_encoding: KeySerialization,
     keypair: C,
 ) -> Result<solana_sdk::transaction::Transaction>
 where
@@ -214,7 +214,7 @@ pub async fn pending(
     settings: &Settings,
     subdao: &SubDao,
     entity_key_strings: &[String],
-    entity_key_encoding: EntityKeyEncoding,
+    entity_key_encoding: KeySerialization,
 ) -> Result<HashMap<String, OracleReward>> {
     fn for_entity_key(
         bulk_rewards: &HashMap<String, Vec<OracleReward>>,

helium-wallet/src/cmd/hotspots/rewards.rs

@@ -1,5 +1,5 @@
 use crate::cmd::*;
-use helium_lib::{dao::SubDao, entity_key::EntityKeyEncoding, reward};
+use helium_lib::{dao::SubDao, entity_key::KeySerialization, reward};
 
 #[derive(Debug, Clone, clap::Args)]
 pub struct Cmd {
@@ -46,7 +46,7 @@ impl PendingCmd {
             &settings,
             &self.subdao,
             &entity_key_strings,
-            EntityKeyEncoding::UTF8,
+            KeySerialization::B58,
         )
         .await?;