adding steps log

Author: erhant

Cargo.lock

@@ -2,14 +2,12 @@
 resolver = "2"
 members = ["compute", "p2p", "workflows", "utils"]
 
-# FIXME: removing this breaks the workflows
-# compute node is the default member, until Oracle comes in
-# then, a Launcher will be the default member
+# removing this breaks the workflows
 default-members = ["compute"]
 
 [workspace.package]
 edition = "2021"
-version = "0.3.7"
+version = "0.3.8"
 license = "Apache-2.0"
 readme = "README.md"
 

Cargo.toml

@@ -18,7 +18,7 @@ pub struct DriaComputeNodeConfig {
     pub secret_key: SecretKey,
     /// Wallet public key, derived from the secret key.
     pub public_key: PublicKey,
-    /// Wallet address in hex, derived from the public key.
+    /// Wallet address in hex without `0x` prefix, derived from the public key.
     pub address: String,
     /// Peer ID of the node.
     pub peer_id: PeerId,

compute/src/config.rs

@@ -2,7 +2,7 @@ use dkn_p2p::libp2p::multiaddr::Protocol;
 use std::time::Duration;
 use tokio::time::Instant;
 
-use crate::{refresh_dria_nodes, DriaComputeNode, DRIA_COMPUTE_NODE_VERSION};
+use crate::{refresh_dria_nodes, utils::get_steps, DriaComputeNode, DRIA_COMPUTE_NODE_VERSION};
 
 /// Number of seconds such that if the last ping is older than this, the node is considered unreachable.
 const PING_LIVENESS_SECS: u64 = 150;
@@ -29,12 +29,13 @@ impl DriaComputeNode {
             Err(e) => log::error!("Error getting peer counts: {:?}", e),
         }
 
-        // print tasks count
-        let [single, batch] = self.get_pending_task_count();
-        diagnostics.push(format!(
-            "Pending Tasks (single/batch): {} / {}",
-            single, batch
-        ));
+        // print steps
+        if let Ok(steps) = get_steps(&self.config.address).await {
+            diagnostics.push(format!(
+                "Steps: {} (top {}%)",
+                steps.score, steps.percentile
+            ));
+        }
 
         // completed tasks count is printed as well in debug
         if log::log_enabled!(log::Level::Debug) {

compute/src/node/diagnostic.rs

@@ -9,3 +9,6 @@ pub use nodes::*;
 
 mod specs;
 pub use specs::*;
+
+mod steps;
+pub use steps::*;

compute/src/utils/mod.rs

@@ -0,0 +1,42 @@
+use eyre::Context;
+use serde::{Deserialize, Serialize};
+
+const STEPS_API_BASE_URL: &str = "https://dkn.dria.co/dashboard/supply/v0/leaderboard/steps";
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct StepsScore {
+    /// Indicates in which top percentile your steps are.
+    pub percentile: String,
+    /// The total number of steps you have accumulated.
+    pub score: u64,
+}
+
+/// Returns the steps for the given address.
+pub async fn get_steps(address: &str) -> eyre::Result<StepsScore> {
+    // the address can have 0x or not, we add it ourselves here
+    let url = format!(
+        "{}?address=0x{}",
+        STEPS_API_BASE_URL,
+        address.trim_start_matches("0x")
+    );
+
+    reqwest::get(&url)
+        .await
+        .wrap_err("could not make request")?
+        .json::<StepsScore>()
+        .await
+        .wrap_err("could not parse steps body")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn test_get_steps() {
+        let steps = get_steps("0xa43536a6032a3907ccf60e8109429ee1047b207c")
+            .await
+            .unwrap();
+        println!("{:?}", steps);
+    }
+}