Landtype Boosting

Cargo.toml

@@ -62,13 +62,13 @@ sqlx = {version = "0", features = [
 helium-anchor-gen = {git = "https://github.com/helium/helium-anchor-gen.git"}
 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 = "master", features = ["services"]}
+helium-proto = {git = "https://github.com/helium/proto", branch = "mj/landtype", features = ["services"]}
 solana-client = "1.16"
 solana-sdk = "1.16"
 solana-program = "1.16"
 spl-token = "3.5.0"
 reqwest = {version = "0", default-features=false, features = ["gzip", "json", "rustls-tls"]}
-beacon = { git = "https://github.com/helium/proto", branch = "master" }
+beacon = { git = "https://github.com/helium/proto", branch = "mj/landtype" }
 humantime = "2"
 metrics = "0.21"
 metrics-exporter-prometheus = "0"

mobile_verifier/migrations/32_landtype.sql

@@ -0,0 +1 @@
+ALTER TABLE hexes ADD COLUMN landtype oracle_assignment;

mobile_verifier/src/boosting_oracles/assignment.rs

@@ -3,6 +3,13 @@ use rust_decimal::Decimal;
 use rust_decimal_macros::dec;
 use std::fmt;
 
+#[derive(Debug, Clone, PartialEq, Eq, sqlx::FromRow)]
+pub struct HexAssignments {
+    pub footfall: Assignment,
+    pub landtype: Assignment,
+    pub urbanized: Assignment,
+}
+
 #[derive(Copy, Clone, PartialEq, Eq, Debug, sqlx::Type)]
 #[sqlx(type_name = "oracle_assignment")]
 #[sqlx(rename_all = "lowercase")]
@@ -28,6 +35,19 @@ impl From<Assignment> for i32 {
     }
 }
 
+impl TryFrom<i32> for Assignment {
+    type Error = anyhow::Error;
+
+    fn try_from(value: i32) -> Result<Self, Self::Error> {
+        match value {
+            0 => Ok(Assignment::A),
+            1 => Ok(Assignment::B),
+            2 => Ok(Assignment::C),
+            other => Err(anyhow::anyhow!("could not make Assignment from {other}")),
+        }
+    }
+}
+
 impl fmt::Display for Assignment {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         use Assignment::*;
@@ -40,59 +60,53 @@ impl fmt::Display for Assignment {
     }
 }
 
-pub fn footfall_and_urbanization_multiplier(
-    footfall: Assignment,
-    urbanization: Assignment,
-) -> Decimal {
-    use Assignment::*;
+impl HexAssignments {
+    pub fn boosting_multiplier(&self) -> Decimal {
+        let HexAssignments {
+            footfall,
+            urbanized,
+            landtype,
+        } = self;
 
-    match (footfall, urbanization) {
-        (A, A) => dec!(1.0),
-        (A, B) => dec!(1.0),
-        (B, A) => dec!(0.75),
-        (B, B) => dec!(0.50),
-        (C, A) => dec!(0.40),
-        (C, B) => dec!(0.10),
-        (A, C) => dec!(0.00),
-        (B, C) => dec!(0.00),
-        (C, C) => dec!(0.00),
+        use Assignment::*;
+        match (footfall, landtype, urbanized) {
+            // yellow - POI ≥ 1 Urbanized
+            (A, A, A) => dec!(1.00),
+            (A, B, A) => dec!(1.00),
+            (A, C, A) => dec!(1.00),
+            // orange - POI ≥ 1 Not Urbanized
+            (A, A, B) => dec!(1.00),
+            (A, B, B) => dec!(1.00),
+            (A, C, B) => dec!(1.00),
+            // light green - Point of Interest Urbanized
+            (B, A, A) => dec!(0.70),
+            (B, B, A) => dec!(0.70),
+            (B, C, A) => dec!(0.70),
+            // dark green - Point of Interest Not Urbanized
+            (B, A, B) => dec!(0.50),
+            (B, B, B) => dec!(0.50),
+            (B, C, B) => dec!(0.50),
+            // light blue - No POI Urbanized
+            (C, A, A) => dec!(0.40),
+            (C, B, A) => dec!(0.30),
+            (C, C, A) => dec!(0.05),
+            // dark blue - No POI Not Urbanized
+            (C, A, B) => dec!(0.20),
+            (C, B, B) => dec!(0.15),
+            (C, C, B) => dec!(0.03),
+            // gray - Outside of USA
+            (_, _, C) => dec!(0.00),
+        }
     }
 }
 
-#[allow(dead_code)]
-pub fn boosting_oracles_multiplier(
-    footfall: Assignment,
-    landtype: Assignment,
-    urbanization: Assignment,
-) -> Decimal {
-    use Assignment::*;
-
-    match (footfall, landtype, urbanization) {
-        // POI ≥ 1 Urbanized
-        (A, A, A) => dec!(1.00),
-        (A, B, A) => dec!(1.00),
-        (A, C, A) => dec!(1.00),
-        // POI ≥ 1 Not Urbanized
-        (A, A, B) => dec!(1.00),
-        (A, B, B) => dec!(1.00),
-        (A, C, B) => dec!(1.00),
-        // Point of Interest Urbanized
-        (B, A, A) => dec!(0.70),
-        (B, B, A) => dec!(0.70),
-        (B, C, A) => dec!(0.70),
-        // Point of Interest Not Urbanized
-        (B, A, B) => dec!(0.50),
-        (B, B, B) => dec!(0.50),
-        (B, C, B) => dec!(0.50),
-        // No POI Urbanized
-        (C, A, A) => dec!(0.40),
-        (C, B, A) => dec!(0.30),
-        (C, C, A) => dec!(0.05),
-        // No POI Not Urbanized
-        (C, A, B) => dec!(0.20),
-        (C, B, B) => dec!(0.15),
-        (C, C, B) => dec!(0.03),
-        // Outside of USA
-        (_, _, C) => dec!(0.00),
+#[cfg(test)]
+impl HexAssignments {
+    pub fn test_best() -> Self {
+        Self {
+            footfall: Assignment::A,
+            urbanized: Assignment::A,
+            landtype: Assignment::A,
+        }
     }
 }