Use new proto branch

helium · Jun 28, 2024 · deeee63 · deeee63
1 parent 57609a1
commit deeee63
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -68,7 +68,7 @@ helium-crypto = { version = "0.8.4", features = ["sqlx-postgres", "multisig"] }
 hextree = { git = "https://github.com/jaykickliter/HexTree", branch = "main", features = [
   "disktree",
 ] }
-helium-proto = { git = "https://github.com/helium/proto", branch = "andymck/reward-manifest-additions", features = [
+helium-proto = { git = "https://github.com/helium/proto", branch = "map/decimalize", features = [
   "services",
 ] }
 solana-client = "1.16"
@@ -80,7 +80,7 @@ reqwest = { version = "0", default-features = false, features = [
   "json",
   "rustls-tls",
 ] }
-beacon = { git = "https://github.com/helium/proto", branch = "andymck/reward-manifest-additions" }
+beacon = { git = "https://github.com/helium/proto", branch = "map/decimalize" }
 humantime = "2"
 humantime-serde = "1"
 metrics = ">=0.22"

diff --git a/iot_verifier/src/rewarder.rs b/iot_verifier/src/rewarder.rs
@@ -157,9 +157,15 @@ impl Rewarder {
 
         // now that the db has been purged, safe to write out the manifest
         let reward_data = ManifestIotRewardData {
-            poc_bones_per_beacon_reward_share: poc_dc_shares.beacon_rewards_per_share.to_string(),
-            poc_bones_per_witness_reward_share: poc_dc_shares.witness_rewards_per_share.to_string(),
-            dc_bones_per_share: poc_dc_shares.dc_transfer_rewards_per_share.to_string(),
+            poc_bones_per_beacon_reward_share: Some(helium_proto::Decimal {
+                value: poc_dc_shares.beacon_rewards_per_share.to_string(),
+            }),
+            poc_bones_per_witness_reward_share: Some(helium_proto::Decimal {
+                value: poc_dc_shares.witness_rewards_per_share.to_string(),
+            }),
+            dc_bones_per_share: Some(helium_proto::Decimal {
+                value: poc_dc_shares.dc_transfer_rewards_per_share.to_string(),
+            }),
         };
         self.reward_manifests_sink
             .write(

diff --git a/mobile_verifier/src/rewarder.rs b/mobile_verifier/src/rewarder.rs
@@ -303,8 +303,12 @@ where
 
         // now that the db has been purged, safe to write out the manifest
         let reward_data = ManifestMobileRewardData {
-            poc_bones_per_coverage_point: poc_dc_shares.poc_bones_per_coverage_point.to_string(),
-            dc_bones_per_share: poc_dc_shares.dc_transfer_rewards_per_share.to_string(),
+            poc_bones_per_coverage_point: Some(helium_proto::Decimal {
+                value: poc_dc_shares.poc_bones_per_coverage_point.to_string(),
+            }),
+            dc_bones_per_share: Some(helium_proto::Decimal {
+                value: poc_dc_shares.dc_transfer_rewards_per_share.to_string(),
+            }),
         };
         self.reward_manifests
             .write(