factory-legacy SC audit updates

multiversx · Jul 31, 2024 · 6e1623f · 6e1623f
1 parent 28030df
commit 6e1623f
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/legacy-contracts/factory-legacy/Cargo.toml b/legacy-contracts/factory-legacy/Cargo.toml
@@ -24,4 +24,7 @@ path = "../../common/common_structs"
 path = "../../common/common_errors"
 
 [dependencies.token_merge_helper]
-path = "../../common/modules/token_merge_helper"
+path = "../../common/modules/token_merge_helper"
+
+[dependencies.energy-factory]
+path = "../../locked-asset/energy-factory"
diff --git a/legacy-contracts/factory-legacy/src/migration.rs b/legacy-contracts/factory-legacy/src/migration.rs
@@ -1,23 +1,7 @@
 multiversx_sc::imports!();
 
 use common_structs::UnlockEpochAmountPairs;
-
-mod energy_factory_proxy {
-    use common_structs::UnlockEpochAmountPairs;
-
-    multiversx_sc::imports!();
-
-    #[multiversx_sc::proxy]
-    pub trait EnergyFactoryProxy {
-        #[endpoint(updateEnergyAfterOldTokenUnlock)]
-        fn update_energy_after_old_token_unlock(
-            &self,
-            original_caller: ManagedAddress,
-            initial_epoch_amount_pairs: UnlockEpochAmountPairs<Self::Api>,
-            final_epoch_amount_pairs: UnlockEpochAmountPairs<Self::Api>,
-        );
-    }
-}
+use energy_factory::migration::ProxyTrait as _;
 
 #[multiversx_sc::module]
 pub trait LockedTokenMigrationModule:
@@ -54,7 +38,7 @@ pub trait LockedTokenMigrationModule:
     fn new_factory_proxy_builder(
         &self,
         sc_address: ManagedAddress,
-    ) -> energy_factory_proxy::Proxy<Self::Api>;
+    ) -> energy_factory::Proxy<Self::Api>;
 
     #[storage_mapper("newFactoryAddress")]
     fn new_factory_address(&self) -> SingleValueMapper<ManagedAddress>;

diff --git a/legacy-contracts/factory-legacy/wasm/Cargo.lock b/legacy-contracts/factory-legacy/wasm/Cargo.lock