From e2b1d73c94cca6e136ec425e32e2ac3a9d4e2af8 Mon Sep 17 00:00:00 2001
From: boneyard93501 <4523011+boneyard93501@users.noreply.github.com>
Date: Thu, 4 Mar 2021 01:55:21 -0600
Subject: [PATCH] update latest block  return

---
 .../air-scripts/get_latest_block_simple.clj        | 10 ++++++++--
 .../block_getter/src/eth_block_getters.rs          | 14 +++-----------
 multi-service/extract_miner_address/Cargo.toml     |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/multi-service/air-scripts/get_latest_block_simple.clj b/multi-service/air-scripts/get_latest_block_simple.clj
index cb0287f..b1c08e9 100644
--- a/multi-service/air-scripts/get_latest_block_simple.clj
+++ b/multi-service/air-scripts/get_latest_block_simple.clj
@@ -1,7 +1,13 @@
 (xor
     (seq
-        (call node_1 (service "get_latest_block") ["MC5H2NK6ZIPMR32U7D4W35AWNNVCQX1ENH"] hex_result)
-        (call %init_peer_id% (returnService "run") [hex_result])
+        (seq
+            (call relay ("op" "identity") [])
+            (call node_1 (service "get_latest_block") [api_key] hex_result)
+        )
+        (seq
+            (call relay ("op" "identity") [])
+            (call %init_peer_id% (returnService "run") [hex_result])
+        )
     )
     (seq
         (call relay ("op" "identity") [])
diff --git a/multi-service/block_getter/src/eth_block_getters.rs b/multi-service/block_getter/src/eth_block_getters.rs
index 646b727..1192981 100644
--- a/multi-service/block_getter/src/eth_block_getters.rs
+++ b/multi-service/block_getter/src/eth_block_getters.rs
@@ -33,17 +33,9 @@ pub fn get_latest_block(api_key: String) -> String {
 
     let curl_cmd:Vec<String> = vec![header.into(), url.into()];
     let response = unsafe { curl_request(curl_cmd) };
-    result_to_string(response)
-
-    /*
-    let raw_string = result_to_string(response);
-    let obj = serde_json::from_str(&raw_string);
-    let res = match obj {
-        Ok(x) => x["result"],
-        Err(_) => "",
-    };
-    String::from(res)
-    */
+    let res = result_to_string(response);
+    let obj = serde_json::from_str::<serde_json::Value>(&res).unwrap();
+    serde_json::from_value(obj["result"].clone()).unwrap()
 }
 
 #[fce]
diff --git a/multi-service/extract_miner_address/Cargo.toml b/multi-service/extract_miner_address/Cargo.toml
index 669452c..fb412eb 100644
--- a/multi-service/extract_miner_address/Cargo.toml
+++ b/multi-service/extract_miner_address/Cargo.toml
@@ -7,6 +7,6 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-fluence = { version = "=0.2.18", features = ["logger"]}
+fluence = { version = "=0.3.3", features = ["logger"] }
 log = "0.4.8"
 serde_json = "1.0.64"