re-entry issue fixed

contracts/asset_manager/src/config.rs

@@ -8,6 +8,7 @@ pub struct ConfigData {
     pub xcall_manager: Address,
     pub native_address: Address,
     pub icon_asset_manager: String,
+    pub xcall_network_address: String,
 }
 
 pub fn set_config(e: &Env, config: ConfigData) {

contracts/asset_manager/src/contract.rs

@@ -15,12 +15,12 @@ use crate::{
     storage_types::{DataKey, POINTS},
     xcall_manager_interface::XcallManagerClient,
 };
-use soroban_rlp::balanced::address_utils::{get_address_from, is_valid_string_address};
+use soroban_rlp::balanced::address_utils::is_valid_string_address;
 use soroban_rlp::balanced::messages::{
     deposit::Deposit, deposit_revert::DepositRevert, withdraw_to::WithdrawTo,
 };
 
-use xcall::{AnyMessage, CallMessageWithRollback, Client, Envelope, NetworkAddress};
+use xcall::{AnyMessage, CallMessageWithRollback, Client, Envelope};
 
 const DEPOSIT_NAME: &str = "Deposit";
 const WITHDRAW_TO_NAME: &str = "WithdrawTo";
@@ -35,7 +35,6 @@ impl AssetManager {
         if has_registry(&env.clone()) {
             panic_with_error!(&env, ContractError::ContractAlreadyInitialized)
         }
-
         write_registry(&env, &registry);
         write_administrator(&env, &admin);
         Self::configure(env, config);
@@ -273,8 +272,7 @@ impl AssetManager {
                 message.amount,
             )?;
         } else if method == String::from_str(&e, &DEPOSIT_REVERT_NAME) {
-            let xcall_network_address = Self::xcall_client(&e, &xcall).get_network_address();
-            if xcall_network_address != from {
+            if config.xcall_network_address != from {
                 return Err(ContractError::OnlyCallService);
             }
             let message: DepositRevert = DepositRevert::decode(&e.clone(), data);

contracts/asset_manager/src/storage_types.rs

@@ -9,7 +9,7 @@ pub enum DataKey {
     Admin,
     Config,
     Tokens,
-    TokenData(Address),
+    TokenData(Address)
 }
 
 #[derive(Clone)]

contracts/asset_manager/src/tests/setup.rs

@@ -71,15 +71,17 @@ impl TestContext {
 
     pub fn init_context(&self, client: &AssetManagerClient<'static>) {
         self.env.mock_all_auths();
+        self.init_xcall_manager_context();
+        self.init_xcall_state();
         let config = ConfigData {
             xcall: self.xcall.clone(),
             xcall_manager: self.xcall_manager.clone(),
             native_address: self.native_token.clone(),
             icon_asset_manager: self.icon_asset_manager.clone(),
+            xcall_network_address: self.xcall_client.get_network_address()
         };
         client.initialize(&self.registry, &self.admin, &config);
-        self.init_xcall_manager_context();
-        self.init_xcall_state();
+
     }
 
     pub fn init_xcall_manager_context(&self) {

contracts/balanced_doller/src/balanced_dollar.rs

@@ -89,8 +89,7 @@ pub fn _handle_call_message(
         let to_network_address: Address = get_address(message.to, &e)?;
         _mint(&e, to_network_address, message.amount as i128);
     } else if method == String::from_str(&e, &CROSS_TRANSFER_REVERT) {
-        let xcall_network_address = xcall_client(&e, &xcall).get_network_address();
-        if xcall_network_address != from {
+        if config.xcall_network_address != from {
             return Err(ContractError::OnlyCallService);
         }
         let message = CrossTransferRevert::decode(&e, data);

contracts/balanced_doller/src/config.rs

@@ -8,6 +8,7 @@ pub struct ConfigData {
     pub xcall_manager: Address,
     pub nid: String,
     pub icon_bn_usd: String,
+    pub xcall_network_address: String
 }
 
 pub fn set_config(e: &Env, config: ConfigData) {

contracts/balanced_doller/src/tests/setup.rs

@@ -74,15 +74,17 @@ impl TestContext {
 
     pub fn init_context(&self, client: &BalancedDollarClient<'static>) {
         self.env.mock_all_auths();
+        self.init_xcall_manager_context();
+        self.init_xcall_state();
         let config = ConfigData {
             xcall: self.xcall.clone(),
             xcall_manager: self.xcall_manager.clone(),
             nid: self.nid.clone(),
             icon_bn_usd: self.icon_bn_usd.clone(),
+            xcall_network_address: self.xcall_client.get_network_address()
         };
         client.initialize(&self.admin, &config);
-        self.init_xcall_manager_context();
-        self.init_xcall_state();
+
     }
 
     pub fn init_xcall_manager_context(&self) {