Merge branch 'develop' into add-custom-404

nomic-io · Nov 1, 2024 · 8de1221 · 8de1221
2 parents a2d54ad + 5254ecc
commit 8de1221
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/app.rs b/src/app.rs
@@ -305,6 +305,7 @@ impl InnerApp {
     ) -> Result<()> {
         #[cfg(feature = "ethereum")]
         {
+            disable_fee();
             let signer = self.signer()?;
             let mut coins = self.bitcoin.accounts.withdraw(signer, amount)?;
 

diff --git a/src/bitcoin/mod.rs b/src/bitcoin/mod.rs
@@ -787,7 +787,7 @@ impl Bitcoin {
             );
         }
 
-        let value = Into::<u64>::into(amount) / self.config.units_per_sat;
+        let value = (Into::<u64>::into(amount) - fee_amount) / self.config.units_per_sat;
         if value < self.config.min_withdrawal_amount {
             return Err(OrgaError::App(
                 "Withdrawal is smaller than than the minimum amount".to_string(),