multiversx · andrei-marinica · Apr 13, 2024 · Apr 13, 2024 · Apr 16, 2024 · Apr 16, 2024
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -60,4 +60,6 @@ members = [
 
   "pause-all",
   "pause-all/meta",
+
+  "dex/interactor"
 ]
diff --git a/common/common_errors/Cargo.toml b/common/common_errors/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/common_structs/Cargo.toml b/common/common_structs/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.mergeable]

diff --git a/common/modules/farm/config/Cargo.toml b/common/modules/farm/config/Cargo.toml
@@ -23,5 +23,5 @@ path = "../../pausable"
 path = "../../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/farm/contexts/Cargo.toml b/common/modules/farm/contexts/Cargo.toml
@@ -35,8 +35,8 @@ path = "../../pausable"
 path = "../../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.48.1"
+version = "=0.50.3"
diff --git a/common/modules/farm/contexts/src/mod.rs b/common/modules/farm/contexts/src/mod.rs
@@ -1,5 +1,4 @@
 #![no_std]
-#![feature(trait_alias)]
 
 pub mod claim_rewards_context;
 pub mod enter_farm_context;

diff --git a/common/modules/farm/contexts/src/storage_cache.rs b/common/modules/farm/contexts/src/storage_cache.rs
@@ -3,8 +3,15 @@ multiversx_sc::derive_imports!();
 
 use pausable::State;
 
-pub trait FarmContracTraitBounds =
-    config::ConfigModule + rewards::RewardsModule + farm_token::FarmTokenModule;
+pub trait FarmContracTraitBounds:
+    config::ConfigModule + rewards::RewardsModule + farm_token::FarmTokenModule
+{
+}
+
+impl<T> FarmContracTraitBounds for T where
+    T: config::ConfigModule + rewards::RewardsModule + farm_token::FarmTokenModule
+{
+}
 
 pub struct StorageCache<'a, C: FarmContracTraitBounds> {
     sc_ref: &'a C,

diff --git a/common/modules/farm/events/Cargo.toml b/common/modules/farm/events/Cargo.toml
@@ -14,5 +14,5 @@ path = "../../../common_structs"
 path = "../contexts"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/farm/farm_base_impl/Cargo.toml b/common/modules/farm/farm_base_impl/Cargo.toml
@@ -50,11 +50,11 @@ path = "../../../traits/mergeable"
 path = "../../../traits/fixed-supply-token"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.48.1"
+version = "=0.50.3"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.48.1"
+version = "=0.50.3"
diff --git a/common/modules/farm/farm_base_impl/src/base_traits_impl.rs b/common/modules/farm/farm_base_impl/src/base_traits_impl.rs
@@ -4,18 +4,31 @@ use common_structs::{FarmToken, FarmTokenAttributes, Nonce};
 use config::ConfigModule;
 use contexts::storage_cache::StorageCache;
 use core::marker::PhantomData;
+use farm_token::FarmTokenModule;
 use fixed_supply_token::FixedSupplyToken;
 use mergeable::Mergeable;
 use multiversx_sc_modules::transfer_role_proxy::PaymentsVec;
 use rewards::RewardsModule;
 
-pub trait AllBaseFarmImplTraits =
+pub trait AllBaseFarmImplTraits:
     rewards::RewardsModule
+    + config::ConfigModule
+    + farm_token::FarmTokenModule
+    + permissions_module::PermissionsModule
+    + pausable::PausableModule
+    + multiversx_sc_modules::default_issue_callbacks::DefaultIssueCallbacksModule
+{
+}
+
+impl<T> AllBaseFarmImplTraits for T where
+    T: rewards::RewardsModule
         + config::ConfigModule
         + farm_token::FarmTokenModule
         + permissions_module::PermissionsModule
         + pausable::PausableModule
-        + multiversx_sc_modules::default_issue_callbacks::DefaultIssueCallbacksModule;
+        + multiversx_sc_modules::default_issue_callbacks::DefaultIssueCallbacksModule
+{
+}
 
 pub trait FarmContract {
     type FarmSc: AllBaseFarmImplTraits;
@@ -30,8 +43,7 @@ pub trait FarmContract {
         + FixedSupplyToken<<Self::FarmSc as ContractBase>::Api>
         + FarmToken<<Self::FarmSc as ContractBase>::Api>
         + From<FarmTokenAttributes<<Self::FarmSc as ContractBase>::Api>>
-        + Into<FarmTokenAttributes<<Self::FarmSc as ContractBase>::Api>> =
-        FarmTokenAttributes<<Self::FarmSc as ContractBase>::Api>;
+        + Into<FarmTokenAttributes<<Self::FarmSc as ContractBase>::Api>>;
 
     #[inline]
     fn mint_rewards(
@@ -259,4 +271,6 @@ where
     T: AllBaseFarmImplTraits,
 {
     type FarmSc = T;
+
+    type AttributesType = FarmTokenAttributes<<Self::FarmSc as ContractBase>::Api>;
 }
diff --git a/common/modules/farm/farm_base_impl/src/lib.rs b/common/modules/farm/farm_base_impl/src/lib.rs
@@ -1,8 +1,5 @@
 #![no_std]
 #![allow(clippy::too_many_arguments)]
-#![feature(exact_size_is_empty)]
-#![feature(trait_alias)]
-#![feature(associated_type_defaults)]
 
 multiversx_sc::imports!();
 multiversx_sc::derive_imports!();

diff --git a/common/modules/farm/farm_token/Cargo.toml b/common/modules/farm/farm_token/Cargo.toml
@@ -26,8 +26,8 @@ path = "../../pausable"
 path = "../../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.48.1"
+version = "=0.50.3"
diff --git a/common/modules/farm/farm_token_merge/Cargo.toml b/common/modules/farm/farm_token_merge/Cargo.toml
@@ -23,11 +23,11 @@ path = "../../token_merge_helper"
 path = "../farm_token"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.48.1"
+version = "=0.50.3"
 
 [workspace]
 members = ["."]
diff --git a/common/modules/farm/rewards/Cargo.toml b/common/modules/farm/rewards/Cargo.toml
@@ -29,8 +29,8 @@ path = "../../pausable"
 path = "../../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.48.1"
+version = "=0.50.3"
diff --git a/common/modules/legacy_token_decode_module/Cargo.toml b/common/modules/legacy_token_decode_module/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.common_structs]

diff --git a/common/modules/locking_module/Cargo.toml b/common/modules/locking_module/Cargo.toml
@@ -8,11 +8,5 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]
-
-[dependencies.simple-lock]
-path = "../../../locked-asset/simple-lock"
-
-[dependencies.energy-factory]
-path = "../../../locked-asset/energy-factory"
diff --git a/common/modules/locking_module/src/energy_factory_lock_proxy.rs b/common/modules/locking_module/src/energy_factory_lock_proxy.rs
@@ -0,0 +1,89 @@
+use multiversx_sc::proxy_imports::*;
+
+pub struct SimpleLockEnergyProxy;
+
+impl<Env, From, To, Gas> TxProxyTrait<Env, From, To, Gas> for SimpleLockEnergyProxy
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    type TxProxyMethods = SimpleLockEnergyProxyMethods<Env, From, To, Gas>;
+
+    fn proxy_methods(self, tx: Tx<Env, From, To, (), Gas, (), ()>) -> Self::TxProxyMethods {
+        SimpleLockEnergyProxyMethods { wrapped_tx: tx }
+    }
+}
+
+pub struct SimpleLockEnergyProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    wrapped_tx: Tx<Env, From, To, (), Gas, (), ()>,
+}
+
+#[rustfmt::skip]
+impl<Env, From, To, Gas> SimpleLockEnergyProxyMethods<Env, From, To, Gas>
+where
+    Env: TxEnv,
+    Env::Api: VMApi,
+    From: TxFrom<Env>,
+    To: TxTo<Env>,
+    Gas: TxGas<Env>,
+{
+    /// Locks a whitelisted token until `unlock_epoch` and receive meta ESDT LOCKED tokens 
+    /// on a 1:1 ratio. Accepted input tokens: 
+    /// - base asset token 
+    /// - old factory token -> extends all periods to the provided option 
+    /// - previously locked token -> extends period to the provided option 
+    ///  
+    /// Arguments: 
+    /// - lock_epochs - Number of epochs for which the tokens are locked for. 
+    ///     Caller may only choose from the available options, 
+    ///     which can be seen by querying getLockOptions 
+    /// - opt_destination - OPTIONAL: destination address for the LOCKED tokens. Default is caller. 
+    ///  
+    /// Output payment: LOCKED tokens 
+    pub fn lock_tokens_endpoint<
+        Arg0: ProxyArg<u64>,
+        Arg1: ProxyArg<OptionalValue<ManagedAddress<Env::Api>>>,
+    >(
+        self,
+        lock_epochs: Arg0,
+        opt_destination: Arg1,
+    ) -> TxProxyCall<Env, From, To, Gas, EsdtTokenPayment<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("lockTokens")
+            .argument(&lock_epochs)
+            .argument(&opt_destination)
+            .original_result()
+    }
+
+    pub fn lock_virtual<
+        Arg0: ProxyArg<TokenIdentifier<Env::Api>>,
+        Arg1: ProxyArg<BigUint<Env::Api>>,
+        Arg2: ProxyArg<u64>,
+        Arg3: ProxyArg<ManagedAddress<Env::Api>>,
+        Arg4: ProxyArg<ManagedAddress<Env::Api>>,
+    >(
+        self,
+        token_id: Arg0,
+        amount: Arg1,
+        lock_epochs: Arg2,
+        dest_address: Arg3,
+        energy_address: Arg4,
+    ) -> TxProxyCall<Env, From, To, Gas, EsdtTokenPayment<Env::Api>> {
+        self.wrapped_tx
+            .raw_call("lockVirtual")
+            .argument(&token_id)
+            .argument(&amount)
+            .argument(&lock_epochs)
+            .argument(&dest_address)
+            .argument(&energy_address)
+            .original_result()
+    }
+}
diff --git a/common/modules/locking_module/src/lib.rs b/common/modules/locking_module/src/lib.rs
@@ -1,4 +1,5 @@
 #![no_std]
 
+mod energy_factory_lock_proxy;
 pub mod lock_with_energy_module;
 pub mod locking_module;
diff --git a/common/modules/locking_module/src/lock_with_energy_module.rs b/common/modules/locking_module/src/lock_with_energy_module.rs
@@ -1,6 +1,6 @@
-multiversx_sc::imports!();
+use crate::energy_factory_lock_proxy;
 
-use energy_factory::virtual_lock::ProxyTrait as _;
+multiversx_sc::imports!();
 
 #[multiversx_sc::module]
 pub trait LockWithEnergyModule {
@@ -29,21 +29,16 @@ pub trait LockWithEnergyModule {
         energy_address: ManagedAddress,
     ) -> EsdtTokenPayment {
         let lock_epochs = self.lock_epochs().get();
-        let mut proxy_instance = self.get_locking_sc_proxy_instance();
+        let locking_sc_address = self.locking_sc_address().get();
 
-        proxy_instance
+        self.tx()
+            .to(locking_sc_address)
+            .typed(energy_factory_lock_proxy::SimpleLockEnergyProxy)
             .lock_virtual(token_id, amount, lock_epochs, dest_address, energy_address)
-            .execute_on_dest_context()
+            .returns(ReturnsResult)
+            .sync_call()
     }
 
-    fn get_locking_sc_proxy_instance(&self) -> energy_factory::Proxy<Self::Api> {
-        let locking_sc_address = self.locking_sc_address().get();
-        self.locking_sc_proxy_obj(locking_sc_address)
-    }
-
-    #[proxy]
-    fn locking_sc_proxy_obj(&self, sc_address: ManagedAddress) -> energy_factory::Proxy<Self::Api>;
-
     #[view(getLockingScAddress)]
     #[storage_mapper("lockingScAddress")]
     fn locking_sc_address(&self) -> SingleValueMapper<ManagedAddress>;

diff --git a/common/modules/locking_module/src/locking_module.rs b/common/modules/locking_module/src/locking_module.rs
@@ -1,3 +1,5 @@
+use crate::energy_factory_lock_proxy;
+
 multiversx_sc::imports!();
 
 #[multiversx_sc::module]
@@ -45,22 +47,20 @@ pub trait LockingModule {
         amount: BigUint,
     ) -> EgldOrEsdtTokenPayment<Self::Api> {
         let unlock_epoch = self.unlock_epoch().get();
-        let mut proxy_instance = self.get_locking_sc_proxy_instance();
+        let locking_sc_address = self.locking_sc_address().get();
 
-        proxy_instance
+        let tokens = self
+            .tx()
+            .to(locking_sc_address)
+            .typed(energy_factory_lock_proxy::SimpleLockEnergyProxy)
             .lock_tokens_endpoint(unlock_epoch, opt_dest)
-            .with_egld_or_single_esdt_transfer((token_id, 0, amount))
-            .execute_on_dest_context()
-    }
+            .egld_or_single_esdt(&token_id, 0, &amount)
+            .returns(ReturnsResult)
+            .sync_call();
 
-    fn get_locking_sc_proxy_instance(&self) -> simple_lock::Proxy<Self::Api> {
-        let locking_sc_address = self.locking_sc_address().get();
-        self.locking_sc_proxy_obj(locking_sc_address)
+        EgldOrEsdtTokenPayment::from(tokens)
     }
 
-    #[proxy]
-    fn locking_sc_proxy_obj(&self, sc_address: ManagedAddress) -> simple_lock::Proxy<Self::Api>;
-
     #[view(getLockingScAddress)]
     #[storage_mapper("lockingScAddress")]
     fn locking_sc_address(&self) -> SingleValueMapper<ManagedAddress>;

diff --git a/common/modules/math/Cargo.toml b/common/modules/math/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/pausable/Cargo.toml b/common/modules/pausable/Cargo.toml
@@ -11,5 +11,5 @@ path = "src/pausable.rs"
 path = "../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/permissions_module/Cargo.toml b/common/modules/permissions_module/Cargo.toml
@@ -17,5 +17,5 @@ bitflags = "2.4.1"
 path = "../../common_errors"
 
 [dependencies.multiversx-sc]
-version = "=0.48.1"
+version = "=0.50.3"
 features = ["esdt-token-payment-legacy-decode"]