Make ethSyncStatus coherent

lib/ain-cpp-imports/src/bridge.rs

@@ -42,8 +42,7 @@ pub mod ffi {
         fn getMinRelayTxFee() -> u64;
         fn getEthPrivKey(key: String) -> [u8; 32];
         fn getStateInputJSON() -> String;
-        fn getHighestBlock() -> i32;
-        fn getCurrentHeight() -> i32;
+        fn getEthSyncStatus() -> [i64; 2];
         fn getAttributeValues(mnview_ptr: usize) -> Attributes;
         fn CppLogPrintf(message: String);
         fn getDST20Tokens(mnview_ptr: usize) -> Vec<DST20Token>;

lib/ain-cpp-imports/src/lib.rs

@@ -71,10 +71,7 @@ mod ffi {
     pub fn getStateInputJSON() -> String {
         unimplemented!("{}", UNIMPL_MSG)
     }
-    pub fn getHighestBlock() -> i32 {
-        unimplemented!("{}", UNIMPL_MSG)
-    }
-    pub fn getCurrentHeight() -> i32 {
+    pub fn getEthSyncStatus() -> [i64; 2] {
         unimplemented!("{}", UNIMPL_MSG)
     }
     pub fn getAttributeValues(_mnview_ptr: usize) -> Attributes {
@@ -194,9 +191,8 @@ pub fn get_state_input_json() -> Option<String> {
 
 /// Returns current DVM block height and highest DVM block header seen
 pub fn get_sync_status() -> Result<(i32, i32), Box<dyn Error>> {
-    let current_block = ffi::getCurrentHeight();
-    let highest_block = ffi::getHighestBlock();
-    Ok((current_block, highest_block))
+    let [current_block, highest_block] = ffi::getEthSyncStatus();
+    Ok((current_block as i32, highest_block as i32))
 }
 
 pub fn get_attribute_defaults(mnview_ptr: Option<usize>) -> ffi::Attributes {

src/ffi/ffiexports.cpp

@@ -7,6 +7,8 @@
 #include <logging.h>
 #include <net.h>
 #include <util/system.h>
+#include <array>
+#include <cstdint>
 
 // TODO: Later switch this to u8 so we skip the
 // conversion and is more efficient.
@@ -255,19 +257,19 @@ rust::string getStateInputJSON() {
     return gArgs.GetArg("-ethstartstate", "");
 }
 
-int getHighestBlock() {
-    return pindexBestHeader ? pindexBestHeader->nHeight
-                            : (int)::ChainActive().Height();  // return current block count if no peers
-}
-
 // Returns Major, Minor, Revision in format: "X.Y.Z"
 rust::string getClientVersion() {
     return rust::String(FormatVersionAndSuffix());
 }
 
-int getCurrentHeight() {
+std::array<int64_t, 2> getEthSyncStatus() {
     LOCK(cs_main);
-    return ::ChainActive().Height() ? (int)::ChainActive().Height() : -1;
+
+    auto currentHeight = ::ChainActive().Height() ? (int)::ChainActive().Height() : -1;
+    auto highestBlock = pindexBestHeader ? pindexBestHeader->nHeight
+                                         : (int)::ChainActive().Height();  // return current block count if no peers
+
+    return std::array<int64_t, 2>{currentHeight, highestBlock};
 }
 
 Attributes getAttributeValues(std::size_t mnview_ptr) {

src/ffi/ffiexports.h

@@ -71,8 +71,7 @@ uint64_t getNativeTxSize(rust::Vec<uint8_t> rawTransaction);
 uint64_t getMinRelayTxFee();
 std::array<uint8_t, 32> getEthPrivKey(rust::string key);
 rust::string getStateInputJSON();
-int getHighestBlock();
-int getCurrentHeight();
+std::array<int64_t, 2> getEthSyncStatus();
 Attributes getAttributeValues(std::size_t mnview_ptr);
 void CppLogPrintf(rust::string message);
 rust::vec<DST20Token> getDST20Tokens(std::size_t mnview_ptr);