Added function to get caller and caller shard id

Signed-off-by: Andrei Baltariu <[email protected]>
multiversx · Jan 29, 2025 · ad3b623 · ad3b623
1 parent 7111310
commit ad3b623
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/sovereign-forge/src/common/utils.rs b/sovereign-forge/src/common/utils.rs
@@ -66,6 +66,12 @@ pub trait UtilsModule: super::storage::StorageModule {
         );
     }
 
+    fn get_caller_and_shard_id(&self) -> (u32, ManagedAddress) {
+        let blockchain_api = self.blockchain();
+        let caller = blockchain_api.get_caller();
+        (blockchain_api.get_shard_of_address(&caller), caller)
+    }
+
     fn is_contract_deployed(&self, sovereign_creator: &ManagedAddress, sc_id: ScArray) -> bool {
         let chain_id = self.sovereigns_mapper(sovereign_creator).get();
         self.sovereign_deployed_contracts(&chain_id)

diff --git a/sovereign-forge/src/phases.rs b/sovereign-forge/src/phases.rs
@@ -39,9 +39,7 @@ pub trait PhasesModule:
             );
         }
 
-        let blockchain_api = self.blockchain();
-        let caller = blockchain_api.get_caller();
-        let caller_shard_id = blockchain_api.get_shard_of_address(&caller);
+        let (caller_shard_id, _) = self.get_caller_and_shard_id();
 
         let chain_factory_address = self.chain_factories(caller_shard_id).get();
 
@@ -68,9 +66,7 @@ pub trait PhasesModule:
 
         let chain_id = self.generate_chain_id(opt_preferred_chain_id);
 
-        let blockchain_api = self.blockchain();
-        let caller = blockchain_api.get_caller();
-        let caller_shard_id = blockchain_api.get_shard_of_address(&caller);
+        let (caller_shard_id, caller) = self.get_caller_and_shard_id();
 
         let chain_factories_mapper = self.chain_factories(caller_shard_id);
         require!(
@@ -132,10 +128,7 @@ pub trait PhasesModule:
         let esdt_safe_contract_info =
             ContractInfo::new(ScArray::ESDTSafe, esdt_safe_address.clone());
 
-        let blockchain_api = self.blockchain();
-        let caller = blockchain_api.get_caller();
-        let caller_shard_id = blockchain_api.get_shard_of_address(&caller);
-
+        let (caller_shard_id, _) = self.get_caller_and_shard_id();
         let chain_factory_address = self.chain_factories(caller_shard_id).get();
 
         self.tx()