Include share values in rewards manifest

Cargo.toml

@@ -70,7 +70,7 @@ helium-lib = { git = "https://github.com/helium/helium-wallet-rs.git", branch =
 hextree = { git = "https://github.com/jaykickliter/HexTree", branch = "main", features = [
   "disktree",
 ] }
-helium-proto = { git = "https://github.com/helium/proto", branch = "master", features = [
+helium-proto = { git = "https://github.com/helium/proto", branch = "map/decimalize", features = [
   "services",
 ] }
 solana-client = "1.18"
@@ -82,7 +82,7 @@ reqwest = { version = "0", default-features = false, features = [
   "json",
   "rustls-tls",
 ] }
-beacon = { git = "https://github.com/helium/proto", branch = "master" }
+beacon = { git = "https://github.com/helium/proto", branch = "map/decimalize" }
 humantime = "2"
 humantime-serde = "1"
 metrics = ">=0.22"

file_store/src/error.rs

@@ -53,6 +53,10 @@ pub enum DecodeError {
     Uri(#[from] http::uri::InvalidUri),
     #[error("integer conversion error")]
     FromInt(#[from] std::num::TryFromIntError),
+    #[error("error parsing decimal")]
+    IntoDecimal(#[from] rust_decimal::Error),
+    #[error("empty field: {0}")]
+    EmptyField(&'static str),
     #[error("unsupported region, type: {0}, value: {1}")]
     UnsupportedRegion(String, i32),
     #[error("unsupported datarate, type: {0}, value: {1}")]
@@ -166,6 +170,10 @@ impl DecodeError {
     pub fn unsupported_invalidated_reason<E: ToString>(msg1: E, msg2: i32) -> Error {
         Error::Decode(Self::UnsupportedInvalidReason(msg1.to_string(), msg2))
     }
+
+    pub const fn empty_field(field: &'static str) -> Error {
+        Error::Decode(Self::EmptyField(field))
+    }
 }
 
 impl From<helium_crypto::Error> for Error {

file_store/src/reward_manifest.rs

@@ -1,12 +1,27 @@
 use crate::{error::DecodeError, traits::MsgDecode, Error};
 use chrono::{DateTime, TimeZone, Utc};
 use helium_proto as proto;
+use rust_decimal::Decimal;
 
 #[derive(Clone, Debug)]
 pub struct RewardManifest {
     pub written_files: Vec<String>,
     pub start_timestamp: DateTime<Utc>,
     pub end_timestamp: DateTime<Utc>,
+    pub reward_data: Option<RewardData>,
+}
+
+#[derive(Clone, Debug)]
+pub enum RewardData {
+    MobileRewardData {
+        poc_bones_per_coverage_point: Decimal,
+        dc_bones_per_share: Decimal,
+    },
+    IotRewardData {
+        poc_bones_per_beacon_reward_share: Decimal,
+        poc_bones_per_witness_reward_share: Decimal,
+        dc_bones_per_share: Decimal,
+    },
 }
 
 impl MsgDecode for RewardManifest {
@@ -31,6 +46,51 @@ impl TryFrom<proto::RewardManifest> for RewardManifest {
                 .ok_or(Error::Decode(DecodeError::InvalidTimestamp(
                     value.end_timestamp,
                 )))?,
+            reward_data: match value.reward_data {
+                Some(proto::reward_manifest::RewardData::MobileRewardData(reward_data)) => {
+                    Some(RewardData::MobileRewardData {
+                        poc_bones_per_coverage_point: reward_data
+                            .poc_bones_per_coverage_point
+                            .ok_or(DecodeError::empty_field("poc_bones_per_coverage_point"))?
+                            .value
+                            .parse()
+                            .map_err(DecodeError::from)?,
+                        dc_bones_per_share: reward_data
+                            .dc_bones_per_share
+                            .ok_or(DecodeError::empty_field("dc_bones_per_share"))?
+                            .value
+                            .parse()
+                            .map_err(DecodeError::from)?,
+                    })
+                }
+                Some(proto::reward_manifest::RewardData::IotRewardData(reward_data)) => {
+                    Some(RewardData::IotRewardData {
+                        poc_bones_per_beacon_reward_share: reward_data
+                            .poc_bones_per_beacon_reward_share
+                            .ok_or(DecodeError::empty_field(
+                                "poc_bones_per_beacon_reward_share",
+                            ))?
+                            .value
+                            .parse()
+                            .map_err(DecodeError::from)?,
+                        poc_bones_per_witness_reward_share: reward_data
+                            .poc_bones_per_witness_reward_share
+                            .ok_or(DecodeError::empty_field(
+                                "poc_bones_per_witness_reward_share",
+                            ))?
+                            .value
+                            .parse()
+                            .map_err(DecodeError::from)?,
+                        dc_bones_per_share: reward_data
+                            .dc_bones_per_share
+                            .ok_or(DecodeError::empty_field("dc_bones_per_share"))?
+                            .value
+                            .parse()
+                            .map_err(DecodeError::from)?,
+                    })
+                }
+                None => None,
+            },
         })
     }
 }