multiversx · dorin-iancu · Feb 27, 2025 · Feb 27, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dex/farm-with-locked-rewards/src/external_interaction.rs b/dex/farm-with-locked-rewards/src/external_interaction.rs
@@ -32,6 +32,7 @@ pub trait ExternalInteractionsModule:
     + farm_base_impl::exit_farm::BaseExitFarmModule
     + farm_boosted_yields::FarmBoostedYieldsModule
     + farm_boosted_yields::boosted_yields_factors::BoostedYieldsFactorsModule
+    + farm_boosted_yields::undistributed_rewards::UndistributedRewardsModule
     + week_timekeeping::WeekTimekeepingModule
     + weekly_rewards_splitting::WeeklyRewardsSplittingModule
     + weekly_rewards_splitting::events::WeeklyRewardsSplittingEventsModule

diff --git a/dex/farm-with-locked-rewards/src/lib.rs b/dex/farm-with-locked-rewards/src/lib.rs
@@ -45,6 +45,7 @@ pub trait Farm:
     + farm_base_impl::exit_farm::BaseExitFarmModule
     + farm_boosted_yields::FarmBoostedYieldsModule
     + farm_boosted_yields::boosted_yields_factors::BoostedYieldsFactorsModule
+    + farm_boosted_yields::undistributed_rewards::UndistributedRewardsModule
     + week_timekeeping::WeekTimekeepingModule
     + weekly_rewards_splitting::WeeklyRewardsSplittingModule
     + weekly_rewards_splitting::events::WeeklyRewardsSplittingEventsModule

diff --git a/dex/farm-with-locked-rewards/wasm/Cargo.lock b/dex/farm-with-locked-rewards/wasm/Cargo.lock
diff --git a/dex/farm-with-locked-rewards/wasm/src/lib.rs b/dex/farm-with-locked-rewards/wasm/src/lib.rs
@@ -6,9 +6,9 @@
 
 // Init:                                 1
 // Upgrade:                              1
-// Endpoints:                           68
+// Endpoints:                           69
 // Async Callback:                       1
-// Total number of exported functions:  71
+// Total number of exported functions:  72
 
 #![no_std]
 
@@ -69,13 +69,14 @@ multiversx_sc_wasm_adapter::endpoints! {
         getPairContractManagedAddress => pair_contract_address
         enterFarmOnBehalf => enter_farm_on_behalf
         claimRewardsOnBehalf => claim_rewards_on_behalf
-        collectUndistributedBoostedRewards => collect_undistributed_boosted_rewards
         getBoostedYieldsRewardsPercentage => boosted_yields_rewards_percentage
         getAccumulatedRewardsForWeek => accumulated_rewards_for_week
         getFarmSupplyForWeek => farm_supply_for_week
-        getRemainingBoostedRewardsToDistribute => remaining_boosted_rewards_to_distribute
         setBoostedYieldsFactors => set_boosted_yields_factors
         getBoostedYieldsFactors => get_boosted_yields_factors
+        setMultisigAddress => set_multisig_address
+        collectUndistributedBoostedRewards => collect_undistributed_boosted_rewards
+        getRemainingBoostedRewardsToDistribute => remaining_boosted_rewards_to_distribute
         getCurrentWeek => get_current_week
         getFirstWeekStartEpoch => first_week_start_epoch
         getLastActiveWeekForUser => get_last_active_week_for_user_view

diff --git a/dex/farm/src/base_functions.rs b/dex/farm/src/base_functions.rs
@@ -62,6 +62,7 @@ pub trait BaseFunctionsModule:
     + utils::UtilsModule
     + farm_boosted_yields::FarmBoostedYieldsModule
     + farm_boosted_yields::boosted_yields_factors::BoostedYieldsFactorsModule
+    + farm_boosted_yields::undistributed_rewards::UndistributedRewardsModule
     + week_timekeeping::WeekTimekeepingModule
     + weekly_rewards_splitting::WeeklyRewardsSplittingModule
     + weekly_rewards_splitting::events::WeeklyRewardsSplittingEventsModule

diff --git a/dex/farm/src/external_interaction.rs b/dex/farm/src/external_interaction.rs
@@ -30,6 +30,7 @@ pub trait ExternalInteractionsModule:
     + farm_base_impl::exit_farm::BaseExitFarmModule
     + farm_boosted_yields::FarmBoostedYieldsModule
     + farm_boosted_yields::boosted_yields_factors::BoostedYieldsFactorsModule
+    + farm_boosted_yields::undistributed_rewards::UndistributedRewardsModule
     + week_timekeeping::WeekTimekeepingModule
     + weekly_rewards_splitting::WeeklyRewardsSplittingModule
     + weekly_rewards_splitting::events::WeeklyRewardsSplittingEventsModule

diff --git a/dex/farm/src/lib.rs b/dex/farm/src/lib.rs
@@ -46,6 +46,7 @@ pub trait Farm:
     + farm_base_impl::exit_farm::BaseExitFarmModule
     + farm_boosted_yields::FarmBoostedYieldsModule
     + farm_boosted_yields::boosted_yields_factors::BoostedYieldsFactorsModule
+    + farm_boosted_yields::undistributed_rewards::UndistributedRewardsModule
     + week_timekeeping::WeekTimekeepingModule
     + weekly_rewards_splitting::WeeklyRewardsSplittingModule
     + weekly_rewards_splitting::events::WeeklyRewardsSplittingEventsModule

diff --git a/dex/farm/tests/farm_multi_user_test.rs b/dex/farm/tests/farm_multi_user_test.rs
@@ -696,14 +696,12 @@ fn farm_multiple_claim_weeks_with_collect_undistributed_rewards_test() {
 
     farm_setup.check_error_collect_undistributed_boosted_rewards(
         "Current week must be higher than the week offset",
-        1,
-        4,
     );
 
     // advance to week 6
     farm_setup.b_mock.set_block_epoch(36);
 
-    farm_setup.collect_undistributed_boosted_rewards(1, 1);
+    farm_setup.collect_undistributed_boosted_rewards();
     farm_setup.check_undistributed_boosted_rewards(1);
     farm_setup.check_remaining_boosted_rewards_to_distribute(1, 0);
     farm_setup.check_remaining_boosted_rewards_to_distribute(2, 1);
@@ -712,13 +710,18 @@ fn farm_multiple_claim_weeks_with_collect_undistributed_rewards_test() {
     // advance to week 8
     farm_setup.b_mock.set_block_epoch(50);
 
-    farm_setup.collect_undistributed_boosted_rewards(1, 3);
+    farm_setup.collect_undistributed_boosted_rewards();
     farm_setup.check_undistributed_boosted_rewards(3);
 
     farm_setup.check_remaining_boosted_rewards_to_distribute(1, 0);
     farm_setup.check_remaining_boosted_rewards_to_distribute(2, 0);
     farm_setup.check_remaining_boosted_rewards_to_distribute(3, 0);
 
+    // collecting multiple times has no effect
+    farm_setup.collect_undistributed_boosted_rewards();
+    farm_setup.collect_undistributed_boosted_rewards();
+    farm_setup.collect_undistributed_boosted_rewards();
+
     // check entries are not empty
     farm_setup
         .b_mock
@@ -976,7 +979,7 @@ fn farm_claim_with_minimum_tokens() {
     let remaining_boosted_yields_rewards =
         total_boosted_yields_rewards - first_boosted_amt - second_boosted_amt;
     farm_setup.check_undistributed_boosted_rewards(0);
-    farm_setup.collect_undistributed_boosted_rewards(1, 1);
+    farm_setup.collect_undistributed_boosted_rewards();
     farm_setup.check_undistributed_boosted_rewards(remaining_boosted_yields_rewards);
     farm_setup.check_remaining_boosted_rewards_to_distribute(1, 0);
     farm_setup.check_remaining_boosted_rewards_to_distribute(2, 0);

diff --git a/dex/farm/tests/farm_setup/multi_user_farm_setup.rs b/dex/farm/tests/farm_setup/multi_user_farm_setup.rs
@@ -4,6 +4,7 @@
 use common_structs::FarmTokenAttributes;
 use config::ConfigModule;
 use farm::external_interaction::ExternalInteractionsModule;
+use farm_boosted_yields::undistributed_rewards::UndistributedRewardsModule;
 use multiversx_sc::codec::multi_types::OptionalValue;
 use multiversx_sc::{
     storage::mappers::StorageTokenWrapper,
@@ -21,18 +22,17 @@ use energy_query::{Energy, EnergyQueryModule};
 use energy_update::EnergyUpdate;
 use farm::Farm;
 use farm_boosted_yields::boosted_yields_factors::BoostedYieldsFactorsModule;
-use farm_boosted_yields::FarmBoostedYieldsModule;
 use farm_token::FarmTokenModule;
 use pausable::{PausableModule, State};
 use permissions_hub::PermissionsHub;
 use permissions_hub_module::PermissionsHubModule;
 use sc_whitelist_module::SCWhitelistModule;
-use week_timekeeping::{Epoch, Week};
+use week_timekeeping::Epoch;
 use weekly_rewards_splitting::update_claim_progress_energy::UpdateClaimProgressEnergyModule;
 
 use super::single_user_farm_setup::MEX_TOKEN_ID;
 
-pub static REWARD_TOKEN_ID: &[u8] = b"REW-123456";
+pub static REWARD_TOKEN_ID: &[u8] = MEX_TOKEN_ID;
 pub static FARMING_TOKEN_ID: &[u8] = b"LPTOK-123456";
 pub static FARM_TOKEN_ID: &[u8] = b"FARM-123456";
 pub const DIV_SAFETY: u64 = 1_000_000_000_000;
@@ -187,6 +187,9 @@ where
                 sc.set_permissions_hub_address(managed_address!(
                     permissions_hub_wrapper.address_ref()
                 ));
+
+                sc.multisig_address()
+                    .set(managed_address!(&undistributed_rew_dest));
             })
             .assert_ok();
 
@@ -829,33 +832,18 @@ where
             .assert_ok();
     }
 
-    pub fn check_error_collect_undistributed_boosted_rewards(
-        &mut self,
-        expected_message: &str,
-        start_week: Week,
-        end_week: Week,
-    ) {
-        let dest_address = self.undistributed_rew_dest.clone();
+    pub fn check_error_collect_undistributed_boosted_rewards(&mut self, expected_message: &str) {
         self.b_mock
             .execute_tx(&self.owner, &self.farm_wrapper, &rust_biguint!(0), |sc| {
-                sc.collect_undistributed_boosted_rewards(
-                    start_week,
-                    end_week,
-                    managed_address!(&dest_address),
-                );
+                sc.collect_undistributed_boosted_rewards();
             })
             .assert_error(4, expected_message)
     }
 
-    pub fn collect_undistributed_boosted_rewards(&mut self, start_week: Week, end_week: Week) {
-        let dest_address = self.undistributed_rew_dest.clone();
+    pub fn collect_undistributed_boosted_rewards(&mut self) {
         self.b_mock
             .execute_tx(&self.owner, &self.farm_wrapper, &rust_biguint!(0), |sc| {
-                sc.collect_undistributed_boosted_rewards(
-                    start_week,
-                    end_week,
-                    managed_address!(&dest_address),
-                );
+                sc.collect_undistributed_boosted_rewards();
             })
             .assert_ok();
     }

diff --git a/dex/farm/wasm/Cargo.lock b/dex/farm/wasm/Cargo.lock
diff --git a/dex/farm/wasm/src/lib.rs b/dex/farm/wasm/src/lib.rs
@@ -6,9 +6,9 @@
 
 // Init:                                 1
 // Upgrade:                              1
-// Endpoints:                           65
+// Endpoints:                           66
 // Async Callback:                       1
-// Total number of exported functions:  68
+// Total number of exported functions:  69
 
 #![no_std]
 
@@ -66,13 +66,14 @@ multiversx_sc_wasm_adapter::endpoints! {
         getPairContractManagedAddress => pair_contract_address
         enterFarmOnBehalf => enter_farm_on_behalf
         claimRewardsOnBehalf => claim_rewards_on_behalf
-        collectUndistributedBoostedRewards => collect_undistributed_boosted_rewards
         getBoostedYieldsRewardsPercentage => boosted_yields_rewards_percentage
         getAccumulatedRewardsForWeek => accumulated_rewards_for_week
         getFarmSupplyForWeek => farm_supply_for_week
-        getRemainingBoostedRewardsToDistribute => remaining_boosted_rewards_to_distribute
         setBoostedYieldsFactors => set_boosted_yields_factors
         getBoostedYieldsFactors => get_boosted_yields_factors
+        setMultisigAddress => set_multisig_address
+        collectUndistributedBoostedRewards => collect_undistributed_boosted_rewards
+        getRemainingBoostedRewardsToDistribute => remaining_boosted_rewards_to_distribute
         getCurrentWeek => get_current_week
         getFirstWeekStartEpoch => first_week_start_epoch
         getLastActiveWeekForUser => get_last_active_week_for_user_view

diff --git a/dex/proxy-deployer/wasm/Cargo.lock b/dex/proxy-deployer/wasm/Cargo.lock
diff --git a/energy-integration/energy-update/wasm/Cargo.lock b/energy-integration/energy-update/wasm/Cargo.lock
diff --git a/energy-integration/farm-boosted-yields/src/lib.rs b/energy-integration/farm-boosted-yields/src/lib.rs
@@ -8,11 +8,10 @@ use boosted_yields_factors::BoostedYieldsConfig;
 use common_types::PaymentsVec;
 use multiversx_sc::api::ErrorApi;
 use week_timekeeping::Week;
-use weekly_rewards_splitting::{
-    base_impl::WeeklyRewardsSplittingTraitsModule, USER_MAX_CLAIM_WEEKS,
-};
+use weekly_rewards_splitting::base_impl::WeeklyRewardsSplittingTraitsModule;
 
 pub mod boosted_yields_factors;
+pub mod undistributed_rewards;
 
 const MAX_PERCENT: u64 = 10_000;
 
@@ -30,16 +29,6 @@ impl<M: ManagedTypeApi> SplitReward<M> {
     }
 }
 
-mod energy_factory_proxy_send_rew {
-    multiversx_sc::imports!();
-
-    #[multiversx_sc::proxy]
-    pub trait EnergyFactorySendRewProxy {
-        #[endpoint(transferUnlockedToken)]
-        fn transfer_unlocked_token(&self, dest: ManagedAddress, amount: BigUint);
-    }
-}
-
 #[multiversx_sc::module]
 pub trait FarmBoostedYieldsModule:
     boosted_yields_factors::BoostedYieldsFactorsModule
@@ -53,44 +42,8 @@ pub trait FarmBoostedYieldsModule:
     + weekly_rewards_splitting::locked_token_buckets::WeeklyRewardsLockedTokenBucketsModule
     + weekly_rewards_splitting::update_claim_progress_energy::UpdateClaimProgressEnergyModule
     + energy_query::EnergyQueryModule
+    + undistributed_rewards::UndistributedRewardsModule
 {
-    #[only_owner]
-    #[endpoint(collectUndistributedBoostedRewards)]
-    fn collect_undistributed_boosted_rewards(
-        &self,
-        start_week: Week,
-        end_week: Week,
-        dest_address: ManagedAddress,
-    ) {
-        let collect_rewards_offset = USER_MAX_CLAIM_WEEKS + 1;
-        let current_week = self.get_current_week();
-        require!(
-            current_week > collect_rewards_offset,
-            "Current week must be higher than the week offset"
-        );
-        require!(start_week <= end_week, "Invalid week numbers");
-        require!(
-            end_week <= current_week - collect_rewards_offset,
-            "Invalid end week"
-        );
-
-        let mut total_rewards = BigUint::zero();
-        for week in start_week..=end_week {
-            let rewards_to_distribute = self.remaining_boosted_rewards_to_distribute(week).take();
-            total_rewards += rewards_to_distribute;
-        }
-
-        if total_rewards == 0 {
-            return;
-        }
-
-        let energy_factory = self.energy_factory_address().get();
-        let _: () = self
-            .energy_factory_send_rew_proxy_obj(energy_factory)
-            .transfer_unlocked_token(dest_address, total_rewards)
-            .execute_on_dest_context();
-    }
-
     fn take_reward_slice(&self, full_reward: BigUint) -> SplitReward<Self::Api> {
         let percentage = self.boosted_yields_rewards_percentage().get();
         if percentage == 0 {
@@ -165,16 +118,6 @@ pub trait FarmBoostedYieldsModule:
     #[view(getFarmSupplyForWeek)]
     #[storage_mapper("farmSupplyForWeek")]
     fn farm_supply_for_week(&self, week: Week) -> SingleValueMapper<BigUint>;
-
-    #[view(getRemainingBoostedRewardsToDistribute)]
-    #[storage_mapper("remainingBoostedRewardsToDistribute")]
-    fn remaining_boosted_rewards_to_distribute(&self, week: Week) -> SingleValueMapper<BigUint>;
-
-    #[proxy]
-    fn energy_factory_send_rew_proxy_obj(
-        &self,
-        sc_address: ManagedAddress,
-    ) -> energy_factory_proxy_send_rew::Proxy<Self::Api>;
 }
 
 pub struct FarmBoostedYieldsWrapper<T: FarmBoostedYieldsModule> {