multiversx · dorin-iancu · Sep 5, 2023 · Aug 25, 2023 · Aug 25, 2023 · Aug 25, 2023
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,6 @@
 [workspace]
+resolver = "2"
+
 members = [
   "dex",
   "dex/farm",

diff --git a/common/common_errors/Cargo.toml b/common/common_errors/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 [lib]
 path = "src/lib.rs"
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/common_structs/Cargo.toml b/common/common_structs/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 [lib]
 path = "src/lib.rs"
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.mergeable]

diff --git a/common/modules/farm/config/Cargo.toml b/common/modules/farm/config/Cargo.toml
@@ -22,5 +22,5 @@ path = "../../pausable"
 path = "../../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/farm/contexts/Cargo.toml b/common/modules/farm/contexts/Cargo.toml
@@ -34,8 +34,8 @@ path = "../../pausable"
 path = "../../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.39.4"
+version = "=0.43.2"
diff --git a/common/modules/farm/contexts/src/claim_rewards_context.rs b/common/modules/farm/contexts/src/claim_rewards_context.rs
@@ -3,6 +3,7 @@ multiversx_sc::derive_imports!();
 
 use common_errors::{ERROR_BAD_PAYMENTS, ERROR_EMPTY_PAYMENTS};
 use common_structs::PaymentAttributesPair;
+use multiversx_sc::api::BlockchainApi;
 use multiversx_sc::contract_base::BlockchainWrapper;
 
 pub struct ClaimRewardsContext<M, T>

diff --git a/common/modules/farm/contexts/src/exit_farm_context.rs b/common/modules/farm/contexts/src/exit_farm_context.rs
@@ -3,6 +3,7 @@ multiversx_sc::derive_imports!();
 
 use common_errors::ERROR_BAD_PAYMENTS;
 use common_structs::PaymentAttributesPair;
+use multiversx_sc::api::BlockchainApi;
 use multiversx_sc::contract_base::BlockchainWrapper;
 
 pub struct ExitFarmContext<M, T>

diff --git a/common/modules/farm/events/Cargo.toml b/common/modules/farm/events/Cargo.toml
@@ -13,5 +13,5 @@ path = "../../../common_structs"
 path = "../contexts"
 
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 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
@@ -49,10 +49,10 @@ path = "../../../traits/mergeable"
 path = "../../../traits/fixed-supply-token"
 
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.39.4"
+version = "=0.43.2"
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.39.4"
+version = "=0.43.2"
diff --git a/common/modules/farm/farm_base_impl/src/base_farm_init.rs b/common/modules/farm/farm_base_impl/src/base_farm_init.rs
@@ -1,6 +1,6 @@
 multiversx_sc::imports!();
 
-use common_errors::{ERROR_NOT_AN_ESDT, ERROR_SAME_TOKEN_IDS, ERROR_ZERO_AMOUNT};
+use common_errors::{ERROR_NOT_AN_ESDT, ERROR_ZERO_AMOUNT};
 use pausable::State;
 use permissions_module::Permissions;
 
@@ -30,10 +30,6 @@ pub trait BaseFarmInitModule:
         );
         require!(division_safety_constant != 0u64, ERROR_ZERO_AMOUNT);
 
-        let farm_token = self.farm_token().get_token_id();
-        require!(reward_token_id != farm_token, ERROR_SAME_TOKEN_IDS);
-        require!(farming_token_id != farm_token, ERROR_SAME_TOKEN_IDS);
-
         self.state().set(State::Inactive);
         self.division_safety_constant()
             .set_if_empty(&division_safety_constant);

diff --git a/common/modules/farm/farm_token/Cargo.toml b/common/modules/farm/farm_token/Cargo.toml
@@ -25,8 +25,8 @@ path = "../../pausable"
 path = "../../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.39.4"
+version = "=0.43.2"
diff --git a/common/modules/farm/farm_token/src/farm_token.rs b/common/modules/farm/farm_token/src/farm_token.rs
@@ -20,7 +20,7 @@ pub trait FarmTokenModule:
     ) {
         self.require_caller_has_owner_or_admin_permissions();
 
-        let payment_amount = self.call_value().egld_value();
+        let payment_amount = self.call_value().egld_value().clone_value();
         self.farm_token().issue_and_set_all_roles(
             EsdtTokenType::Meta,
             payment_amount,

diff --git a/common/modules/farm/farm_token_merge/Cargo.toml b/common/modules/farm/farm_token_merge/Cargo.toml
@@ -22,8 +22,8 @@ path = "../../token_merge_helper"
 path = "../farm_token"
 
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.39.4"
+version = "=0.43.2"
diff --git a/common/modules/farm/rewards/Cargo.toml b/common/modules/farm/rewards/Cargo.toml
@@ -28,8 +28,8 @@ path = "../../pausable"
 path = "../../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.39.4"
+version = "=0.43.2"
diff --git a/common/modules/legacy_token_decode_module/Cargo.toml b/common/modules/legacy_token_decode_module/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [lib]
 path = "src/lib.rs"
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 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
@@ -7,7 +7,7 @@ edition = "2021"
 [lib]
 path = "src/lib.rs"
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.simple-lock]

diff --git a/common/modules/math/Cargo.toml b/common/modules/math/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 [lib]
 path = "src/lib.rs"
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/pausable/Cargo.toml b/common/modules/pausable/Cargo.toml
@@ -10,5 +10,5 @@ path = "src/pausable.rs"
 path = "../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/permissions_module/Cargo.toml b/common/modules/permissions_module/Cargo.toml
@@ -14,5 +14,5 @@ bitflags = "1.3.2"
 path = "../../common_errors"
 
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/sc_whitelist_module/Cargo.toml b/common/modules/sc_whitelist_module/Cargo.toml
@@ -10,5 +10,5 @@ path = "src/sc_whitelist_module.rs"
 path = "../../common_errors"
 
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/token_merge_helper/Cargo.toml b/common/modules/token_merge_helper/Cargo.toml
@@ -10,5 +10,5 @@ path = "src/lib.rs"
 path = "../../common_errors"
 
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/token_send/Cargo.toml b/common/modules/token_send/Cargo.toml
@@ -13,5 +13,5 @@ path = "../../common_structs"
 path = "../../common_errors"
 
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/utils/Cargo.toml b/common/modules/utils/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 [lib]
 path = "src/lib.rs"
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.common_structs]

diff --git a/common/modules/utils/src/lib.rs b/common/modules/utils/src/lib.rs
@@ -32,7 +32,7 @@ pub trait UtilsModule {
         let payments = self.call_value().all_esdt_transfers();
         require!(!payments.is_empty(), ERR_EMPTY_PAYMENTS);
 
-        payments
+        payments.clone_value()
     }
 
     fn pop_first_payment(

diff --git a/common/traits/fixed-supply-token/Cargo.toml b/common/traits/fixed-supply-token/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 [lib]
 path = "src/lib.rs"
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
diff --git a/common/traits/mergeable/Cargo.toml b/common/traits/mergeable/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 [lib]
 path = "src/lib.rs"
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/traits/unwrappable/Cargo.toml b/common/traits/unwrappable/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 [lib]
 path = "src/lib.rs"
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/dex/Cargo.toml b/dex/Cargo.toml
@@ -4,17 +4,17 @@ version = "0.0.0"
 edition = "2021"
 publish = false
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dev-dependencies]
 num-bigint = "0.4.2"
 
 [dev-dependencies.multiversx-sc-modules]
-version = "=0.39.4"
+version = "=0.43.2"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.39.4"
+version = "=0.43.2"
 
 [dev-dependencies.config]
 path = "../common/modules/farm/config"

diff --git a/dex/farm-with-locked-rewards/Cargo.toml b/dex/farm-with-locked-rewards/Cargo.toml
@@ -74,17 +74,17 @@ path = "../../locked-asset/energy-factory"
 path = "../../energy-integration/common-modules/energy-query"
 
 [dependencies.multiversx-sc]
-version = "=0.39.4"
+version = "=0.43.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.39.4"
+version = "=0.43.2"
 
 [dev-dependencies]
 num-bigint = "0.4.2"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.39.4"
+version = "=0.43.2"
 
 [dev-dependencies.simple-lock]
 path = "../../locked-asset/simple-lock"
diff --git a/dex/farm-with-locked-rewards/meta/Cargo.toml b/dex/farm-with-locked-rewards/meta/Cargo.toml
@@ -8,4 +8,4 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.39.4"
+version = "0.43.2"
diff --git a/dex/farm-with-locked-rewards/src/lib.rs b/dex/farm-with-locked-rewards/src/lib.rs
@@ -121,7 +121,7 @@ pub trait Farm:
         let caller = self.blockchain().get_caller();
         let orig_caller = self.get_orig_caller_from_opt(&caller, opt_orig_caller);
 
-        let payments = self.call_value().all_esdt_transfers();
+        let payments = self.call_value().all_esdt_transfers().clone_value();
         let base_claim_rewards_result =
             self.claim_rewards_base::<NoMintWrapper<Self>>(orig_caller.clone(), payments);
         let output_farm_token_payment = base_claim_rewards_result.new_farm_token.payment.clone();

diff --git a/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_setup/mod.rs b/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_setup/mod.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use common_structs::FarmTokenAttributes;
 use config::ConfigModule;
 use multiversx_sc::{
@@ -7,7 +9,7 @@ use multiversx_sc::{
 };
 use multiversx_sc_scenario::{
     managed_address, managed_biguint, managed_token_id, rust_biguint,
-    whitebox::{BlockchainStateWrapper, ContractObjWrapper},
+    whitebox_legacy::{BlockchainStateWrapper, ContractObjWrapper},
     DebugApi,
 };
 
@@ -25,6 +27,7 @@ use multiversx_sc_modules::pause::PauseModule;
 use pausable::{PausableModule, State};
 use sc_whitelist_module::SCWhitelistModule;
 use simple_lock::locked_token::LockedTokenModule;
+use week_timekeeping::Epoch;
 
 pub static REWARD_TOKEN_ID: &[u8] = b"MEX-123456";
 pub static LOCKED_REWARD_TOKEN_ID: &[u8] = b"LOCKED-123456";
@@ -46,6 +49,14 @@ pub const EPOCHS_IN_YEAR: u64 = 360;
 pub static LOCK_OPTIONS: &[u64] = &[EPOCHS_IN_YEAR, 2 * EPOCHS_IN_YEAR, 4 * EPOCHS_IN_YEAR];
 pub static PENALTY_PERCENTAGES: &[u64] = &[4_000, 6_000, 8_000];
 
+pub struct RawFarmTokenAttributes {
+    pub reward_per_share_bytes: Vec<u8>,
+    pub entering_epoch: Epoch,
+    pub compounded_reward_bytes: Vec<u8>,
+    pub current_farm_amount_bytes: Vec<u8>,
+    pub original_owner_bytes: [u8; 32],
+}
+
 pub struct FarmSetup<FarmObjBuilder, EnergyFactoryBuilder>
 where
     FarmObjBuilder: 'static + Copy + Fn() -> farm_with_locked_rewards::ContractObj<DebugApi>,
@@ -300,12 +311,50 @@ where
         attributes: FarmTokenAttributes<DebugApi>,
     ) -> u64 {
         let mut result = 0;
+
+        let raw_attributes = RawFarmTokenAttributes {
+            reward_per_share_bytes: attributes
+                .reward_per_share
+                .to_bytes_be()
+                .as_slice()
+                .to_vec(),
+            entering_epoch: attributes.entering_epoch,
+            compounded_reward_bytes: attributes
+                .compounded_reward
+                .to_bytes_be()
+                .as_slice()
+                .to_vec(),
+            current_farm_amount_bytes: attributes
+                .current_farm_amount
+                .to_bytes_be()
+                .as_slice()
+                .to_vec(),
+            original_owner_bytes: attributes.original_owner.to_byte_array(),
+        };
+
         self.b_mock
             .execute_query(&self.farm_wrapper, |sc| {
+                let attributes_managed = FarmTokenAttributes {
+                    reward_per_share: multiversx_sc::types::BigUint::<DebugApi>::from_bytes_be(
+                        &raw_attributes.reward_per_share_bytes,
+                    ),
+                    entering_epoch: raw_attributes.entering_epoch,
+                    compounded_reward: multiversx_sc::types::BigUint::<DebugApi>::from_bytes_be(
+                        &raw_attributes.compounded_reward_bytes,
+                    ),
+                    current_farm_amount: multiversx_sc::types::BigUint::<DebugApi>::from_bytes_be(
+                        &raw_attributes.current_farm_amount_bytes,
+                    ),
+                    original_owner:
+                        multiversx_sc::types::ManagedAddress::<DebugApi>::new_from_bytes(
+                            &raw_attributes.original_owner_bytes,
+                        ),
+                };
+
                 let result_managed = sc.calculate_rewards_for_given_position(
                     managed_address!(user),
                     managed_biguint!(farm_token_amount),
-                    attributes,
+                    attributes_managed,
                 );
                 result = result_managed.to_u64().unwrap();
             })

diff --git a/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_test.rs b/dex/farm-with-locked-rewards/tests/farm_with_locked_rewards_test.rs
@@ -1,3 +1,5 @@
+#![allow(deprecated)]
+
 use common_structs::FarmTokenAttributes;
 use multiversx_sc_scenario::{managed_address, managed_biguint, rust_biguint, DebugApi};
 use simple_lock::locked_token::LockedTokenAttributes;

diff --git a/dex/farm-with-locked-rewards/wasm/Cargo.toml b/dex/farm-with-locked-rewards/wasm/Cargo.toml
@@ -23,4 +23,4 @@ default-features = false
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "=0.39.4"
+version = "=0.43.2"