Backport Thunder 0.15.0

app/Cargo.toml

@@ -40,7 +40,7 @@ tokio-util = { workspace = true, features = ["rt"] }
 tonic = { workspace = true }
 tonic-health = { workspace = true }
 tower = { workspace = true }
-tower-http = { workspace = true, features = ["request-id", "trace"] }
+tower-http = { workspace = true, features = ["cors", "request-id", "trace"] }
 tracing = { workspace = true }
 tracing-appender = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter", "json"] }

app/app.rs

@@ -281,30 +281,29 @@ impl App {
         Ok(())
     }
 
-    pub fn get_new_main_address(
+    pub async fn get_new_main_address(
         &self,
     ) -> Result<bitcoin::Address<bitcoin::address::NetworkChecked>, Error> {
         let Some(miner) = self.miner.as_ref() else {
             return Err(Error::NoCusfMainchainWalletClient);
         };
-        let address = self.runtime.block_on({
-            let miner = miner.clone();
-            async move {
-                let mut miner_write = miner.write().await;
-                let cusf_mainchain = &mut miner_write.cusf_mainchain;
-                let mainchain_info = cusf_mainchain.get_chain_info().await?;
-                let cusf_mainchain_wallet =
-                    &mut miner_write.cusf_mainchain_wallet;
-                let res = cusf_mainchain_wallet
-                    .create_new_address()
-                    .await?
-                    .require_network(mainchain_info.network)
-                    .unwrap();
-                drop(miner_write);
-                Result::<_, Error>::Ok(res)
-            }
-        })?;
-        Ok(address)
+        let mut miner_write = miner.write().await;
+        let cusf_mainchain = &mut miner_write.cusf_mainchain;
+        let mainchain_info = cusf_mainchain.get_chain_info().await?;
+        let cusf_mainchain_wallet = &mut miner_write.cusf_mainchain_wallet;
+        let res = cusf_mainchain_wallet
+            .create_new_address()
+            .await?
+            .require_network(mainchain_info.network)
+            .unwrap();
+        drop(miner_write);
+        Ok(res)
+    }
+
+    pub fn get_new_main_address_blocking(
+        &self,
+    ) -> Result<bitcoin::Address<bitcoin::address::NetworkChecked>, Error> {
+        self.runtime.block_on(self.get_new_main_address())
     }
 
     /** Get all paymail.
@@ -614,7 +613,7 @@ impl App {
         Ok(())
     }
 
-    pub fn deposit(
+    pub async fn deposit(
         &self,
         address: Address,
         amount: bitcoin::Amount,
@@ -623,15 +622,22 @@ impl App {
         let Some(miner) = self.miner.as_ref() else {
             return Err(Error::NoCusfMainchainWalletClient);
         };
-        self.runtime.block_on(async {
-            let mut miner_write = miner.write().await;
-            let txid = miner_write
-                .cusf_mainchain_wallet
-                .create_deposit_tx(address, amount.to_sat(), fee.to_sat())
-                .await?;
-            drop(miner_write);
-            Ok(txid)
-        })
+        let mut miner_write = miner.write().await;
+        let txid = miner_write
+            .cusf_mainchain_wallet
+            .create_deposit_tx(address, amount.to_sat(), fee.to_sat())
+            .await?;
+        drop(miner_write);
+        Ok(txid)
+    }
+
+    pub fn deposit_blocking(
+        &self,
+        address: Address,
+        amount: bitcoin::Amount,
+        fee: bitcoin::Amount,
+    ) -> Result<bitcoin::Txid, Error> {
+        self.runtime.block_on(self.deposit(address, amount, fee))
     }
 }