From f828bdd89e848934fabf4c88c9ba35cb667108a7 Mon Sep 17 00:00:00 2001
From: Mario Zupan <mario@zupzup.org>
Date: Thu, 23 Apr 2026 10:13:09 +0200
Subject: [PATCH] Fix Derive Address Validation

---
 Cargo.toml                                |  2 +-
 crates/bcr-ebill-api/src/external/mint.rs | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index bac077d8..b62693b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -68,7 +68,7 @@ bcr-ebill-core = { path = "./crates/bcr-ebill-core" }
 bcr-ebill-api = { path = "./crates/bcr-ebill-api" }
 bcr-ebill-persistence = { path = "./crates/bcr-ebill-persistence" }
 bcr-ebill-transport = { path = "./crates/bcr-ebill-transport" }
-bcr-common = { git = "https://github.com/BitcreditProtocol/bcr-common", rev = "4430a779c606603f558673a05134e8188de4676f" }
+bcr-common = { git = "https://github.com/BitcreditProtocol/bcr-common", rev = "682bb3fafc234b8244f1f072aca2aa7c291061f8" }
 surrealdb = { version = "2.3", default-features = false }
 strum = { version = "0.27", features = ["derive"] }
 url = { version = "2.5" }
diff --git a/crates/bcr-ebill-api/src/external/mint.rs b/crates/bcr-ebill-api/src/external/mint.rs
index ea449c9c..15762e69 100644
--- a/crates/bcr-ebill-api/src/external/mint.rs
+++ b/crates/bcr-ebill-api/src/external/mint.rs
@@ -369,6 +369,10 @@ impl MintClientApi for MintClient {
         block_id: BlockId,
         previous_block_hash: &Sha256Hash,
     ) -> Result<()> {
+        let mint_info = self.client(mint_url)?.get_info().await.map_err(|e| {
+            log::error!("Error getting mint clowder info on mint {mint_url}: {e}");
+            Error::ClowderClient
+        })?;
         let betas = self.client(mint_url)?.get_betas().await.map_err(|e| {
             log::error!("Error getting betas on mint {mint_url}: {e}");
             Error::ClowderClient
@@ -380,6 +384,7 @@ impl MintClientApi for MintClient {
         let beta_url =
             url::Url::from_str(&random_beta.mint.to_string()).map_err(|_| Error::InvalidMintUrl)?;
         let req = DeriveEbillPaymentAddressRequest {
+            alpha_node_id: *mint_info.node_id,
             bill_id: bill_id.to_owned(),
             block_id: block_id.inner(),
             previous_block_hash: sha256::Hash::from_byte_array(
@@ -396,6 +401,13 @@ impl MintClientApi for MintClient {
             })?;
 
         if address_to_validate != &derived_payment_address_from_beta.payment_address {
+            log::error!(
+                "Error deriving payment address on mint {beta_url}: Addresses don't match: to_validate: {}, derived: {}",
+                address_to_validate.assume_checked_ref(),
+                derived_payment_address_from_beta
+                    .payment_address
+                    .assume_checked_ref()
+            );
             return Err(Error::InvalidMintRequestToPayPaymentAddress.into());
         }