Merge branch 'rc/v3.0.1'

multiversx · Oct 3, 2024 · 2b0ec52 · 2b0ec52
2 parents 3d3b44a + 58e2809
commit 2b0ec52
Show file tree

Hide file tree

Showing 181 changed files with 1,466 additions and 1,046 deletions.
diff --git a/Cargo.lock b/Cargo.lock
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.52.3"
+version = "=0.53.2"
 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.52.3"
+version = "=0.53.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
@@ -23,5 +23,5 @@ path = "../../pausable"
 path = "../../permissions_module"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.2"
 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.52.3"
+version = "=0.53.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.52.3"
+version = "=0.53.2"
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.52.3"
+version = "=0.53.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
@@ -50,11 +50,11 @@ path = "../../../traits/mergeable"
 path = "../../../traits/fixed-supply-token"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.52.3"
+version = "=0.53.2"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.52.3"
+version = "=0.53.2"
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.52.3"
+version = "=0.53.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.52.3"
+version = "=0.53.2"
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.52.3"
+version = "=0.53.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.52.3"
+version = "=0.53.2"
 
 [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.52.3"
+version = "=0.53.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.52.3"
+version = "=0.53.2"
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.52.3"
+version = "=0.53.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
@@ -8,7 +8,7 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.simple-lock]

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.52.3"
+version = "=0.53.2"
 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.52.3"
+version = "=0.53.2"
 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.52.3"
+version = "=0.53.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
@@ -11,5 +11,5 @@ path = "src/sc_whitelist_module.rs"
 path = "../../common_errors"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.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
@@ -11,5 +11,5 @@ path = "src/lib.rs"
 path = "../../common_errors"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/token_send/Cargo.toml b/common/modules/token_send/Cargo.toml
@@ -14,5 +14,5 @@ path = "../../common_structs"
 path = "../../common_errors"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/modules/utils/Cargo.toml b/common/modules/utils/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.common_structs]

diff --git a/common/traits/fixed-supply-token/Cargo.toml b/common/traits/fixed-supply-token/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.2"
diff --git a/common/traits/mergeable/Cargo.toml b/common/traits/mergeable/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/common/traits/unwrappable/Cargo.toml b/common/traits/unwrappable/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 path = "src/lib.rs"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.2"
 features = ["esdt-token-payment-legacy-decode"]
diff --git a/dex/Cargo.toml b/dex/Cargo.toml
@@ -5,17 +5,17 @@ edition = "2021"
 publish = false
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dev-dependencies]
 num-bigint = "0.4.2"
 
 [dev-dependencies.multiversx-sc-modules]
-version = "=0.52.3"
+version = "=0.53.2"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.52.3"
+version = "=0.53.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
@@ -75,17 +75,17 @@ path = "../../locked-asset/energy-factory"
 path = "../../energy-integration/common-modules/energy-query"
 
 [dependencies.multiversx-sc]
-version = "=0.52.3"
+version = "=0.53.2"
 features = ["esdt-token-payment-legacy-decode"]
 
 [dependencies.multiversx-sc-modules]
-version = "=0.52.3"
+version = "=0.53.2"
 
 [dev-dependencies]
 num-bigint = "0.4.2"
 
 [dev-dependencies.multiversx-sc-scenario]
-version = "=0.52.3"
+version = "=0.53.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
@@ -9,5 +9,5 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.52.3"
+version = "0.53.2"
 default-features = false
diff --git a/dex/farm-with-locked-rewards/src/lib.rs b/dex/farm-with-locked-rewards/src/lib.rs
@@ -226,6 +226,11 @@ pub trait Farm:
             );
         }
 
+        require!(
+            !self.user_total_farm_position(user).is_empty(),
+            "User total farm position is empty!"
+        );
+
         let mut storage_cache = StorageCache::new(self);
         self.validate_contract_state(storage_cache.contract_state, &storage_cache.farm_token_id);
         NoMintWrapper::<Self>::generate_aggregated_rewards(self, &mut storage_cache);
@@ -266,7 +271,6 @@ pub trait Farm:
         require!(percentage <= MAX_PERCENT, "Invalid percentage");
 
         let mut storage_cache = StorageCache::new(self);
-        self.validate_contract_state(storage_cache.contract_state, &storage_cache.farm_token_id);
         NoMintWrapper::<Self>::generate_aggregated_rewards(self, &mut storage_cache);
 
         self.boosted_yields_rewards_percentage().set(percentage);

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,7 +1,8 @@
 #![allow(deprecated)]
 
 use common_structs::FarmTokenAttributes;
-use multiversx_sc::codec::Empty;
+use farm_with_locked_rewards::Farm;
+use multiversx_sc::{codec::Empty, imports::OptionalValue};
 use multiversx_sc_scenario::{managed_address, managed_biguint, rust_biguint, DebugApi};
 use simple_lock::locked_token::LockedTokenAttributes;
 
@@ -503,11 +504,19 @@ fn claim_boosted_rewards_with_zero_position_test() {
     farm_setup.b_mock.set_block_nonce(20);
     farm_setup.b_mock.set_block_epoch(13);
 
-    let second_week_received_reward_amt =
-        farm_setup.claim_boosted_rewards_for_user(&temp_user, &temp_user, 0);
+    farm_setup
+        .b_mock
+        .execute_tx(
+            &temp_user,
+            &farm_setup.farm_wrapper,
+            &rust_biguint!(0),
+            |sc| {
+                sc.claim_boosted_rewards(OptionalValue::Some(managed_address!(&temp_user)));
+            },
+        )
+        .assert_error(4, "User total farm position is empty!");
 
-    assert_eq!(second_week_received_reward_amt, 0);
-    farm_setup.check_farm_rps(150_000_000u64);
+    farm_setup.check_farm_rps(75_000_000u64);
 
     // advance 1 week
     let boosted_rewards = 2_500;
@@ -517,14 +526,52 @@ fn claim_boosted_rewards_with_zero_position_test() {
     let third_week_received_reward_amt =
         farm_setup.claim_boosted_rewards_for_user(&first_user, &first_user, 1);
 
-    assert_eq!(third_week_received_reward_amt, boosted_rewards * 2); // user receives rewards for weeks 1 and 2)
+    assert_eq!(third_week_received_reward_amt, boosted_rewards);
     farm_setup.check_farm_rps(225_000_000u64);
 
     farm_setup.b_mock.check_nft_balance::<Empty>(
         &first_user,
         LOCKED_REWARD_TOKEN_ID,
         1,
-        &rust_biguint!(boosted_rewards * 2),
+        &rust_biguint!(boosted_rewards),
         None,
     );
 }
+
+#[test]
+fn claim_boosted_rewards_user_energy_not_registered_test() {
+    DebugApi::dummy();
+    let mut farm_setup = FarmSetup::new(
+        farm_with_locked_rewards::contract_obj,
+        energy_factory::contract_obj,
+    );
+
+    farm_setup.set_boosted_yields_rewards_percentage(BOOSTED_YIELDS_PERCENTAGE);
+    farm_setup.set_boosted_yields_factors();
+    farm_setup.b_mock.set_block_epoch(2);
+
+    let first_user = farm_setup.first_user.clone();
+    let farm_in_amount = 100_000_000;
+
+    farm_setup.set_user_energy(&first_user, 1_000, 2, 1);
+
+    // Attempt to claim boosted rewards without entering the farm
+    farm_setup
+        .b_mock
+        .execute_tx(
+            &first_user,
+            &farm_setup.farm_wrapper,
+            &rust_biguint!(0),
+            |sc| {
+                sc.claim_boosted_rewards(OptionalValue::Some(managed_address!(&first_user)));
+            },
+        )
+        .assert_error(4, "User total farm position is empty!");
+
+    // User enters the farm
+    farm_setup.enter_farm(&first_user, farm_in_amount);
+
+    // Now the user should be able to claim boosted rewards
+    // Rewards computation is out of scope
+    farm_setup.claim_boosted_rewards_for_user(&first_user, &first_user, 0);
+}