fix: reuse correct serialization function in top up (#49)

* fix: reuse correct serialization function in top up

* fmt

* fix: [rust-sdk] pass the api key in the correct header

* fmt

---------

Co-authored-by: zannis <[email protected]>

Author: zannis

crates/core/src/background_tasks/automatic_top_up_task.rs

@@ -340,10 +340,10 @@ impl AutomaticTopUpTask {
                 Ok(balance) => {
                     if balance < token_config.min_balance {
                         info!(
-                            "Address {} ERC-20 balance ({}) is below minimum ({}) for token {}, needs top-up",
+                            "Relayer {} ERC-20 balance ({}) is below minimum ({}) for token {}, needs top-up",
                             address,
-                            format_token_amount(&balance),
-                            format_token_amount(&token_config.min_balance),
+                            format_token_amount(&balance, token_config.decimals),
+                            format_token_amount(&token_config.min_balance, token_config.decimals),
                             token_config.address
                         );
                         addresses_needing_top_up.push(*address);
@@ -410,7 +410,7 @@ impl AutomaticTopUpTask {
                     info!(
                         "Topped up address {} with {} tokens ({}). Transaction: {}",
                         address,
-                        format_token_amount(&token_config.top_up_amount),
+                        format_token_amount(&token_config.top_up_amount, token_config.decimals),
                         token_config.address,
                         tx_hash
                     );
@@ -769,7 +769,7 @@ impl AutomaticTopUpTask {
         info!(
             "From address {} has ERC-20 token balance: {} for token {}",
             from_address,
-            format_token_amount(&balance),
+            format_token_amount(&balance, token_config.decimals),
             token_config.address
         );
 
@@ -780,16 +780,16 @@ impl AutomaticTopUpTask {
         info!(
             "From address {} requires {} tokens for token {}",
             from_address,
-            format_token_amount(&min_required_balance),
+            format_token_amount(&min_required_balance, token_config.decimals),
             token_config.address
         );
 
         if balance < min_required_balance {
             warn!(
                 "From address {} token balance ({}) is insufficient for top-up transaction. Required: {} for token {}",
                 from_address,
-                format_token_amount(&balance),
-                format_token_amount(&min_required_balance),
+                format_token_amount(&balance, token_config.decimals),
+                format_token_amount(&min_required_balance, token_config.decimals),
                 token_config.address
             );
             return Ok(false);
@@ -838,7 +838,7 @@ impl AutomaticTopUpTask {
             "Sending ERC-20 top-up transaction: {} -> {} ({} tokens of {}){}",
             from_address,
             relayer_address,
-            format_token_amount(&token_config.top_up_amount),
+            format_token_amount(&token_config.top_up_amount, token_config.decimals),
             token_config.address,
             if config.via_safe() { " via Safe" } else { "" }
         );

crates/core/src/shared/utils.rs

@@ -44,26 +44,24 @@ pub fn convert_blob_strings_to_blobs(
 }
 
 pub fn format_wei_to_eth(wei: &U256) -> String {
-    let eth_divisor = U256::from(10u64.pow(18));
-    let whole_eth = wei / eth_divisor;
-    let remainder = wei % eth_divisor;
+    format_token_amount(wei, 18)
+}
+
+/// Formats a token amount to a human-readable string.
+pub fn format_token_amount(amount: &U256, decimals: u8) -> String {
+    let unit_divisor = U256::from(10u64.pow(decimals.into()));
+    let whole_part = amount / unit_divisor;
+    let remainder = amount % unit_divisor;
 
     if remainder.is_zero() {
-        format!("{}", whole_eth)
+        format!("{}", whole_part)
     } else {
-        let decimal_str = format!("{:018}", remainder);
+        let decimal_str = format!("{:0width$}", remainder, width = decimals as usize);
         let decimal_trimmed = decimal_str.trim_end_matches('0');
-        format!("{}.{}", whole_eth, decimal_trimmed)
+        format!("{}.{}", whole_part, decimal_trimmed)
     }
 }
 
-/// Formats a token amount to a human-readable string.
-pub fn format_token_amount(amount: &U256) -> String {
-    // For now, use the same formatting as ETH (18 decimals)
-    // This can be enhanced to support different token decimals
-    format_wei_to_eth(amount)
-}
-
 pub async fn get_chain_id(provider_url: &str) -> Result<ChainId, String> {
     let provider = create_retry_client(provider_url)
         .await

crates/core/src/yaml.rs

@@ -13,6 +13,7 @@ use crate::gas::{
     TenderlyGasProviderSetupConfig,
 };
 use crate::network::{ChainId, Network};
+use crate::shared::utils::format_token_amount;
 use crate::transaction::types::TransactionSpeed;
 use crate::{rrelayer_error, shared::common_types::EvmAddress};
 
@@ -692,11 +693,11 @@ impl Serialize for NativeTokenConfig {
         let mut state = serializer.serialize_struct("NativeTokenConfig", 4)?;
         state.serialize_field(
             "min_balance",
-            &serialize_amount_with_decimals(&self.min_balance, self.decimals),
+            &format_token_amount(&self.min_balance, self.decimals),
         )?;
         state.serialize_field(
             "top_up_amount",
-            &serialize_amount_with_decimals(&self.top_up_amount, self.decimals),
+            &format_token_amount(&self.top_up_amount, self.decimals),
         )?;
         state.serialize_field("decimals", &self.decimals)?;
         state.end()
@@ -747,11 +748,11 @@ impl Serialize for Erc20TokenConfig {
         state.serialize_field("address", &self.address)?;
         state.serialize_field(
             "min_balance",
-            &serialize_amount_with_decimals(&self.min_balance, self.decimals),
+            &format_token_amount(&self.min_balance, self.decimals),
         )?;
         state.serialize_field(
             "top_up_amount",
-            &serialize_amount_with_decimals(&self.top_up_amount, self.decimals),
+            &format_token_amount(&self.top_up_amount, self.decimals),
         )?;
         state.serialize_field("decimals", &self.decimals)?;
         state.end()
@@ -823,20 +824,6 @@ fn default_decimals() -> u8 {
     18
 }
 
-fn serialize_amount_with_decimals(amount: &U256, decimals: u8) -> String {
-    let divisor = U256::from(10u64.pow(decimals as u32));
-    let whole_part = amount / divisor;
-    let remainder = amount % divisor;
-
-    if remainder.is_zero() {
-        format!("{}", whole_part)
-    } else {
-        let decimal_str = format!("{:0width$}", remainder, width = decimals as usize);
-        let decimal_trimmed = decimal_str.trim_end_matches('0');
-        format!("{}.{}", whole_part, decimal_trimmed)
-    }
-}
-
 #[derive(Debug, Clone)]
 pub enum AllOrNetworks {
     All,

crates/sdk/src/api/http.rs

@@ -1,7 +1,7 @@
 use base64::{Engine as _, engine::general_purpose};
 use reqwest::{
     Client,
-    header::{AUTHORIZATION, CONTENT_TYPE, HeaderMap, HeaderValue},
+    header::{AUTHORIZATION, CONTENT_TYPE, HeaderMap, HeaderName, HeaderValue},
 };
 use serde::{Serialize, de::DeserializeOwned};
 
@@ -40,10 +40,8 @@ impl HttpClient {
                 );
             }
             AuthConfig::ApiKey { api_key } => {
-                headers.insert(
-                    AUTHORIZATION,
-                    HeaderValue::from_str(&format!("Bearer {}", api_key)).unwrap(),
-                );
+                let header_name = HeaderName::from_static("x-rrelayer-api-key");
+                headers.insert(header_name, HeaderValue::from_str(api_key).unwrap());
             }
         }
 

documentation/rrelayer/docs/pages/changelog.mdx

@@ -10,6 +10,9 @@
 
 ### Bug fixes
 
+- fix: use correct serialization function for ERC20 tokens in topup flow
+- fix: Rust SDK now passes API key in `x-rrelayer-api-key` header instead of `Authorization` header
+
 ---
 
 ### Breaking changes