rust: use agent for http requests

Also update ureq to latest 1.x; update to 2.x requires to bump
MSRV from 1.42.

Author: LeoComandini

subprojects/gdk_rust/Cargo.toml

@@ -25,7 +25,7 @@ chrono = "0.4.11"
 log = "0.4.8"
 android_logger = { version = "0.8.6", optional = true }
 url = "1.7.2"
-ureq = { version = "1.0.0", features = ["json"] }
+ureq = { version = "1.5.5", features = ["json", "socks-proxy"] }
 
 [dev-dependencies]
 tempdir = "0.3.7"

subprojects/gdk_rust/gdk_electrum/Cargo.toml

@@ -21,7 +21,7 @@ libc = "0.2"
 android_logger = { version = "0.8.6", optional = true }
 electrum-client = "0.7.0"
 chrono = "0.4.11"
-ureq = { version = "1.0.0", features = ["json"] }
+ureq = { version = "1.5.5", features = ["json", "socks-proxy"] }
 block-modes = "0.3.3"
 aes = "0.3.2"
 tempdir = "0.3.7"

subprojects/gdk_rust/gdk_electrum/src/lib.rs

@@ -212,6 +212,10 @@ impl ElectrumSession {
             self.wallet.as_mut().ok_or_else(|| Error::Generic("wallet not initialized".into()))?;
         Ok(wallet.write().unwrap())
     }
+
+    pub fn build_request_agent(&self) -> ureq::Agent {
+        ureq::Agent::new().build()
+    }
 }
 
 fn try_get_fee_estimates(client: &Client) -> Result<Vec<FeeEstimate>, Error> {
@@ -319,7 +323,8 @@ impl Session<Error> for ElectrumSession {
         pin: String,
         details: PinGetDetails,
     ) -> Result<Vec<Notification>, Error> {
-        let manager = PinManager::new()?;
+        let agent = self.build_request_agent();
+        let manager = PinManager::new(agent)?;
         let client_key = SecretKey::from_slice(&hex::decode(&details.pin_identifier)?)?;
         let server_key = manager.get_pin(pin.as_bytes(), &client_key)?;
         let iv = hex::decode(&details.salt)?;
@@ -622,7 +627,8 @@ impl Session<Error> for ElectrumSession {
     }
 
     fn set_pin(&self, details: &PinSetDetails) -> Result<PinGetDetails, Error> {
-        let manager = PinManager::new()?;
+        let agent = self.build_request_agent();
+        let manager = PinManager::new(agent)?;
         let client_key = SecretKey::new(&mut thread_rng());
         let server_key = manager.set_pin(details.pin.as_bytes(), &client_key)?;
         let iv = thread_rng().gen::<[u8; 16]>();
@@ -794,8 +800,9 @@ impl Session<Error> for ElectrumSession {
                 let last_modified =
                     self.get_wallet()?.store.read()?.cache.assets_last_modified.clone();
                 let base_url = self.network.registry_base_url()?;
+                let agent = self.build_request_agent();
                 thread::spawn(move || {
-                    match call_assets(base_url, registry_policy, last_modified) {
+                    match call_assets(agent, base_url, registry_policy, last_modified) {
                         Ok(p) => tx_assets.send(Some(p)),
                         Err(_) => tx_assets.send(None),
                     }
@@ -807,7 +814,8 @@ impl Session<Error> for ElectrumSession {
                 let last_modified =
                     self.get_wallet()?.store.read()?.cache.icons_last_modified.clone();
                 let base_url = self.network.registry_base_url()?;
-                thread::spawn(move || match call_icons(base_url, last_modified) {
+                let agent = self.build_request_agent();
+                thread::spawn(move || match call_icons(agent, base_url, last_modified) {
                     Ok(p) => tx_icons.send(Some(p)),
                     Err(_) => tx_icons.send(None),
                 });
@@ -907,11 +915,16 @@ impl ElectrumSession {
     }
 }
 
-fn call_icons(base_url: String, last_modified: String) -> Result<(Value, String), Error> {
+fn call_icons(
+    agent: ureq::Agent,
+    base_url: String,
+    last_modified: String,
+) -> Result<(Value, String), Error> {
     // TODO gzip encoding
     let url = format!("{}/{}", base_url, "icons.json");
     info!("START call_icons {}", &url);
-    let icons_response = ureq::get(&url)
+    let icons_response = agent
+        .get(&url)
         .timeout_connect(15_000)
         .timeout_read(15_000)
         .set("If-Modified-Since", &last_modified)
@@ -925,14 +938,16 @@ fn call_icons(base_url: String, last_modified: String) -> Result<(Value, String)
 }
 
 fn call_assets(
+    agent: ureq::Agent,
     base_url: String,
     registry_policy: String,
     last_modified: String,
 ) -> Result<(Value, String), Error> {
     // TODO add gzip encoding
     let url = format!("{}/{}", base_url, "index.json");
     info!("START call_assets {}", &url);
-    let assets_response = ureq::get(&url)
+    let assets_response = agent
+        .get(&url)
         .timeout_connect(15_000)
         .timeout_read(15_000)
         .set("If-Modified-Since", &last_modified)

subprojects/gdk_rust/gdk_electrum/src/pin/mod.rs

@@ -50,6 +50,7 @@ pub struct PinManager {
     response_encryption_key: ShaHmac,
     response_hmac_key: ShaHmac,
     rng: ThreadRng,
+    agent: ureq::Agent,
 }
 
 enum PinOp {
@@ -58,10 +59,10 @@ enum PinOp {
 }
 
 impl PinManager {
-    pub fn new() -> Result<Self, Error> {
+    pub fn new(agent: ureq::Agent) -> Result<Self, Error> {
         info!("PinManager new()");
-        let data = Self::handshake_request()?;
-        Self::with_handshake(data)
+        let data = Self::handshake_request(&agent)?;
+        Self::with_handshake(data, agent)
     }
 
     /// `set_pin` consume self, because handshake must be done for every request
@@ -74,8 +75,9 @@ impl PinManager {
         self.server_call(pin_secret, private_key, PinOp::Get).map_err(|_| Error::PinError)
     }
 
-    fn handshake_request() -> Result<Handshake, Error> {
-        let response = ureq::post(&format!("{}/start_handshake", PINSERVER_URL))
+    fn handshake_request(agent: &ureq::Agent) -> Result<Handshake, Error> {
+        let response = agent
+            .post(&format!("{}/start_handshake", PINSERVER_URL))
             .set("content-length", "0")
             .call();
         if !response.ok() {
@@ -85,7 +87,7 @@ impl PinManager {
         Ok(data)
     }
 
-    fn with_handshake(data: Handshake) -> Result<Self, Error> {
+    fn with_handshake(data: Handshake, agent: ureq::Agent) -> Result<Self, Error> {
         let mut rng = rand::thread_rng();
         let pinserver_pubkey = PublicKey::from_str(PINSERVER_PUBKEY).unwrap();
 
@@ -109,6 +111,7 @@ impl PinManager {
             request_hmac_key: Self::derive(1, &shared_secret),
             response_encryption_key: Self::derive(2, &shared_secret),
             response_hmac_key: Self::derive(3, &shared_secret),
+            agent,
         })
     }
 
@@ -165,7 +168,9 @@ impl PinManager {
             hmac_encrypted_data: hex::encode(&hmac[..]),
         };
 
-        let response = ureq::post(&format!("{}/{}", PINSERVER_URL, op))
+        let response = self
+            .agent
+            .post(&format!("{}/{}", PINSERVER_URL, op))
             .send_json(serde_json::to_value(&req).unwrap());
 
         if !response.ok() {
@@ -235,10 +240,10 @@ mod test {
         let mut rng = rand::thread_rng();
         let secret_key = SecretKey::new(&mut rng);
 
-        let manager = PinManager::new().unwrap();
+        let manager = PinManager::new(ureq::Agent::new()).unwrap();
         let pin_key_set = manager.set_pin(&[0u8; 4], &secret_key).unwrap();
 
-        let manager = PinManager::new().unwrap();
+        let manager = PinManager::new(ureq::Agent::new()).unwrap();
         let pin_key_get = manager.get_pin(&[0u8; 4], &secret_key).unwrap();
         assert_eq!(pin_key_get, pin_key_set);
     }
@@ -247,7 +252,7 @@ mod test {
     fn test_handshake() {
         // test vector taken from a random response from the production pin server
         let data = Handshake { sig: "004a58b09b6b4b6585536c5fbd662fb729a277426875a644fa56f5d05d6724281576f9d7844fc131102cd9d4fd56ca0b7f3cf9872379510407b3075f5c862c70".to_string(), ske: "032541c31f808a28750daf386e52ad70f16db153fa9e8375a6178021a0c7a74c09".to_string() };
-        assert!(PinManager::with_handshake(data).is_ok());
+        assert!(PinManager::with_handshake(data, ureq::Agent::new()).is_ok());
     }
 
     #[test]

subprojects/gdk_rust/src/lib.rs

@@ -232,7 +232,10 @@ fn fetch_cached_exchange_rates(sess: &mut GdkSession) -> Option<Vec<Ticker>> {
         debug!("hit exchange rate cache");
     } else {
         info!("missed exchange rate cache");
-        let rates = fetch_exchange_rates();
+        let agent = match sess.backend {
+            GdkBackend::Electrum(ref s) => s.build_request_agent(),
+        };
+        let rates = fetch_exchange_rates(agent);
         // still record time even if we get no results
         sess.last_xr_fetch = SystemTime::now();
         if !rates.is_empty() {
@@ -319,9 +322,9 @@ pub extern "C" fn GDKRUST_set_notification_handler(
     GA_OK
 }
 
-fn fetch_exchange_rates() -> Vec<Ticker> {
+fn fetch_exchange_rates(agent: ureq::Agent) -> Vec<Ticker> {
     if let Ok(result) =
-        ureq::get("https://api-pub.bitfinex.com/v2/tickers?symbols=tBTCUSD").call().into_json()
+        agent.get("https://api-pub.bitfinex.com/v2/tickers?symbols=tBTCUSD").call().into_json()
     {
         if let Value::Array(array) = result {
             if let Some(Value::Array(array)) = array.get(0) {