Merge branch 'develop' of github.com:ergoplatform/ergo-node-interface-rust into deregister-scan

Author: sethdusek

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ergo-node-interface"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["Robert Kornacki <11645932+robkorn@users.noreply.github.com>"]
 edition = "2018"
 license = "MIT"

src/node_interface.rs

@@ -77,6 +77,14 @@ impl NodeInterface {
         }
     }
 
+    pub fn from_url_str(api_key: &str, url: &str) -> Result<Self> {
+        let url = Url::parse(url).map_err(|e| NodeError::InvalidUrl(e.to_string()))?;
+        Ok(NodeInterface {
+            api_key: api_key.to_string(),
+            url,
+        })
+    }
+
     /// Get all addresses from the node wallet
     pub fn wallet_addresses(&self) -> Result<Vec<P2PKAddressString>> {
         let endpoint = "/wallet/addresses";
@@ -367,6 +375,23 @@ impl NodeInterface {
             Err(NodeError::FailedParsingWalletStatus(res_json.pretty(2)))
         }
     }
+
+    /// Unlock wallet
+    pub fn wallet_unlock(&self, password: &str) -> Result<bool> {
+        let endpoint = "/wallet/unlock";
+        let body = object! {
+            pass: password,
+        };
+
+        let res = self.send_post_req(endpoint, body.to_string())?;
+
+        if res.status().is_success() {
+            Ok(true)
+        } else {
+            let json = self.parse_response_to_json(Ok(res))?;
+            Err(NodeError::BadRequest(json["error"].to_string()))
+        }
+    }
 }
 
 #[serde_as]

src/transactions.rs

@@ -141,6 +141,20 @@ impl NodeInterface {
 
         Ok(res_json)
     }
+
+    /// Gets the recommended fee for a transaction.
+    /// bytes - size of the transaction in bytes
+    /// wait_time - minutes to wait for the transaction to be included in the blockchain
+    pub fn get_recommended_fee(&self, bytes: u64, wait_time: u64) -> Result<u64> {
+        let endpoint = format!(
+            "/transactions/getFee?bytes={}&waitTime={}",
+            bytes, wait_time
+        );
+        let res = self.send_get_req(&endpoint);
+        let res_json = self.parse_response_to_json(res);
+        let fee = res_json?.as_u64().unwrap();
+        Ok(fee)
+    }
 }
 
 fn parse_tx_id_unsafe(mut res_json: JsonValue) -> TxId {