farm position functionality

common/modules/farm/config/src/config.rs

@@ -8,6 +8,22 @@ use pausable::State;
 
 pub const DEFAULT_NFT_DEPOSIT_MAX_LEN: usize = 10;
 
+#[derive(
+    ManagedVecItem,
+    TopEncode,
+    TopDecode,
+    NestedEncode,
+    NestedDecode,
+    TypeAbi,
+    Clone,
+    PartialEq,
+    Debug,
+)]
+pub struct UserTotalFarmPositionStruct<M: ManagedTypeApi> {
+    pub total_farm_position: BigUint<M>,
+    pub allow_external_claim_boosted_rewards: bool,
+}
+
 #[multiversx_sc::module]
 pub trait ConfigModule: pausable::PausableModule + permissions_module::PermissionsModule {
     #[inline]
@@ -16,6 +32,24 @@ pub trait ConfigModule: pausable::PausableModule + permissions_module::Permissio
         state == State::Active
     }
 
+    fn get_user_total_farm_position(&self, user: &ManagedAddress) -> BigUint {
+        self.user_total_farm_position(user)
+            .set_if_empty(UserTotalFarmPositionStruct {
+                total_farm_position: BigUint::zero(),
+                allow_external_claim_boosted_rewards: false,
+            });
+
+        self.user_total_farm_position(user)
+            .get()
+            .total_farm_position
+    }
+
+    fn get_allow_external_claim_boosted_rewards(&self, user: &ManagedAddress) -> bool {
+        self.user_total_farm_position(user)
+            .get()
+            .allow_external_claim_boosted_rewards
+    }
+
     #[view(getFarmingTokenId)]
     #[storage_mapper("farming_token_id")]
     fn farming_token_id(&self) -> SingleValueMapper<TokenIdentifier>;
@@ -41,13 +75,8 @@ pub trait ConfigModule: pausable::PausableModule + permissions_module::Permissio
 
     #[view(getUserTotalFarmPosition)]
     #[storage_mapper("userTotalFarmPosition")]
-    fn user_total_farm_position(&self, user: &ManagedAddress) -> SingleValueMapper<BigUint>;
-
-    #[view(getAllowExternalClaimBoostedRewards)]
-    #[storage_mapper("allowExternalClaimBoostedRewards")]
-    fn allow_external_claim_boosted_rewards(
+    fn user_total_farm_position(
         &self,
         user: &ManagedAddress,
-    ) -> SingleValueMapper<bool>;
-
+    ) -> SingleValueMapper<UserTotalFarmPositionStruct<Self::Api>>;
 }

common/modules/farm/farm_base_impl/src/base_traits_impl.rs

@@ -210,20 +210,23 @@ pub trait FarmContract {
             }
         }
 
-        if sc.user_total_farm_position(user).get() == 0 {
+        let user_total_farm_position = sc.get_user_total_farm_position(user);
+        if user_total_farm_position == BigUint::zero() {
             Self::increase_user_farm_position(sc, user, &total_farm_position);
         } else if farm_position_increase > 0 {
             Self::increase_user_farm_position(sc, user, &farm_position_increase);
         }
     }
-#[inline]
+    #[inline]
     fn increase_user_farm_position(
         sc: &Self::FarmSc,
         user: &ManagedAddress<<Self::FarmSc as ContractBase>::Api>,
         new_farm_position_amount: &BigUint<<Self::FarmSc as ContractBase>::Api>,
     ) {
         sc.user_total_farm_position(user)
-            .update(|user_farm_position| *user_farm_position += new_farm_position_amount);
+            .update(|user_farm_position_struct| {
+                user_farm_position_struct.total_farm_position += new_farm_position_amount
+            });
     }
 
     fn decrease_user_farm_position(
@@ -235,12 +238,15 @@ pub trait FarmContract {
             farm_token_mapper.get_token_attributes(farm_position.token_nonce);
 
         sc.user_total_farm_position(&token_attributes.original_owner)
-            .update(|user_farm_position| {
-                if *user_farm_position > farm_position.amount {
-                    *user_farm_position -= &farm_position.amount;
+            .update(|user_farm_position_struct| {
+                let mut user_total_farm_position =
+                    user_farm_position_struct.total_farm_position.clone();
+                if user_total_farm_position > farm_position.amount {
+                    user_total_farm_position -= &farm_position.amount;
                 } else {
-                    *user_farm_position = BigUint::zero();
+                    user_total_farm_position = BigUint::zero();
                 }
+                user_farm_position_struct.total_farm_position = user_total_farm_position;
             });
     }
 }

common/modules/farm/farm_base_impl/src/enter_farm.rs

@@ -45,11 +45,16 @@ pub trait BaseEnterFarmModule:
         );
 
         // The order is important - first check and update, then increase position
-        FC::check_and_update_user_farm_position(self, 
+        FC::check_and_update_user_farm_position(
+            self,
             &caller,
             &enter_farm_context.additional_farm_tokens,
         );
-        FC::increase_user_farm_position(self, &caller, &enter_farm_context.farming_token_payment.amount);
+        FC::increase_user_farm_position(
+            self,
+            &caller,
+            &enter_farm_context.farming_token_payment.amount,
+        );
 
         FC::generate_aggregated_rewards(self, &mut storage_cache);
 

dex/farm-with-locked-rewards/wasm/src/lib.rs

@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           65
+// Endpoints:                           64
 // Async Callback:                       1
-// Total number of exported functions:  67
+// Total number of exported functions:  66
 
 #![no_std]
 #![feature(alloc_error_handler, lang_items)]
@@ -34,7 +34,6 @@ multiversx_sc_wasm_adapter::endpoints! {
         getLastRewardBlockNonce
         getDivisionSafetyConstant
         getUserTotalFarmPosition
-        getAllowExternalClaimBoostedRewards
         setLockingScAddress
         setLockEpochs
         getLockingScAddress

dex/farm/src/base_functions.rs

@@ -13,7 +13,6 @@ use contexts::storage_cache::StorageCache;
 use farm_base_impl::base_traits_impl::{DefaultFarmWrapper, FarmContract};
 use fixed_supply_token::FixedSupplyToken;
 
-
 use crate::exit_penalty;
 
 pub type DoubleMultiPayment<M> = MultiValue2<EsdtTokenPayment<M>, EsdtTokenPayment<M>>;
@@ -241,16 +240,18 @@ where
         caller: &ManagedAddress<<<Self as FarmContract>::FarmSc as ContractBase>::Api>,
         token_attributes: &<Self as FarmContract>::AttributesType,
     ) -> BigUint<<<Self as FarmContract>::FarmSc as ContractBase>::Api> {
-        if &token_attributes.original_owner != caller {
+        let original_owner = &token_attributes.original_owner;
+
+        if original_owner != caller {
             sc.update_energy_and_progress(caller);
         }
 
-        let user_total_farm_position_mapper = sc.user_total_farm_position(caller);
-        if user_total_farm_position_mapper.is_empty() {
+        let user_total_farm_position = sc.get_user_total_farm_position(original_owner);
+        if user_total_farm_position == BigUint::zero() {
             return BigUint::zero();
         }
 
-        sc.claim_boosted_yields_rewards(caller, user_total_farm_position_mapper.get())
+        sc.claim_boosted_yields_rewards(caller, user_total_farm_position)
     }
 }
 

dex/farm/src/claim_boost_only.rs

@@ -1,7 +1,5 @@
 multiversx_sc::imports!();
 
-
-
 use crate::base_functions::Wrapper;
 
 #[multiversx_sc::module]
@@ -37,12 +35,12 @@ pub trait ClaimBoostOnlyModule:
     #[endpoint(claimBoostedRewards)]
     fn claim_boosted_rewards(
         &self,
-        opt_user: OptionalValue<ManagedAddress>
+        opt_user: OptionalValue<ManagedAddress>,
     ) -> EsdtTokenPayment<Self::Api> {
         let user = match opt_user {
             OptionalValue::Some(user) => {
                 require!(
-                    self.allow_external_claim_boosted_rewards(&user).get(),
+                    self.get_allow_external_claim_boosted_rewards(&user),
                     "Cannot claim rewards for this address"
                 );
                 user
@@ -51,14 +49,13 @@ pub trait ClaimBoostOnlyModule:
         };
 
         let reward_token_id = self.reward_token_id().get();
-        
-        let user_total_farm_position_mapper = self.user_total_farm_position(&user);
-        if user_total_farm_position_mapper.is_empty() {
+
+        let user_total_farm_position = self.get_user_total_farm_position(&user);
+        if user_total_farm_position == BigUint::zero() {
             return EsdtTokenPayment::new(reward_token_id, 0, BigUint::zero());
         }
 
-        let reward =
-            self.claim_boosted_yields_rewards(&user, user_total_farm_position_mapper.get());
+        let reward = self.claim_boosted_yields_rewards(&user, user_total_farm_position);
         if reward > 0 {
             self.reward_reserve().update(|reserve| *reserve -= &reward);
         }

dex/farm/wasm/src/lib.rs

@@ -5,9 +5,9 @@
 ////////////////////////////////////////////////////
 
 // Init:                                 1
-// Endpoints:                           62
+// Endpoints:                           61
 // Async Callback:                       1
-// Total number of exported functions:  64
+// Total number of exported functions:  63
 
 #![no_std]
 #![feature(alloc_error_handler, lang_items)]
@@ -35,7 +35,6 @@ multiversx_sc_wasm_adapter::endpoints! {
         getLastRewardBlockNonce
         getDivisionSafetyConstant
         getUserTotalFarmPosition
-        getAllowExternalClaimBoostedRewards
         registerFarmToken
         getFarmTokenId
         getFarmTokenSupply

dex/governance/src/weight.rs

@@ -27,9 +27,7 @@ pub trait Lib: config::Config {
         if let Some(provider) = self.price_providers().get(&payment.token_identifier) {
             let call_result: MultiValue2<EsdtTokenPayment<Self::Api>, EsdtTokenPayment<Self::Api>> =
                 self.price_provider_proxy(provider)
-                    .get_tokens_for_given_position_with_safe_price(
-                        payment.amount.clone(),
-                    )
+                    .get_tokens_for_given_position_with_safe_price(payment.amount.clone())
                     .execute_on_dest_context();
             let (token1, token2) = call_result.into_tuple();
 

energy-integration/fees-collector/src/config.rs

@@ -81,9 +81,5 @@ pub trait ConfigModule {
 
     #[view(getAllowExternalClaimRewards)]
     #[storage_mapper("allowExternalClaimRewards")]
-    fn allow_external_claim_rewards(
-        &self,
-        user: &ManagedAddress,
-    ) -> SingleValueMapper<bool>;
-
+    fn allow_external_claim_rewards(&self, user: &ManagedAddress) -> SingleValueMapper<bool>;
 }

energy-integration/fees-collector/src/lib.rs

@@ -64,7 +64,6 @@ pub trait FeesCollector:
             OptionalValue::None => self.blockchain().get_caller(),
         };
 
-
         let wrapper = FeesCollectorWrapper::new();
         let mut rewards = self.claim_multi(&wrapper, &original_caller);
         if rewards.is_empty() {

energy-integration/governance-v2/src/lib.rs

@@ -37,7 +37,7 @@ pub trait GovernanceV2:
     /// - `quorum_percentage` - the minimum number of (`votes` minus `downvotes`) at the end of voting period  
     /// - `votingDelayInBlocks` - Number of blocks to wait after a block is proposed before being able to vote/downvote that proposal
     /// - `votingPeriodInBlocks` - Number of blocks the voting period lasts (voting delay does not count towards this)  
-    /// - `withdraw_percentage_defeated` - Percetange of the fee to be returned if proposal defetead 
+    /// - `withdraw_percentage_defeated` - Percetange of the fee to be returned if proposal defetead
     /// - `energy_factory_address`
     /// - `fees_collector_address`
     /// - `fee_token` - The token used to pay the fee

farm-staking/farm-staking/src/base_impl_wrapper.rs

@@ -52,12 +52,12 @@ where
         if &token_attributes.original_owner != caller {
             sc.update_energy_and_progress(caller);
         }
-        let user_total_farm_position_mapper = sc.user_total_farm_position(caller);
-        if user_total_farm_position_mapper.is_empty() {
+        let user_total_farm_position = sc.get_user_total_farm_position(caller);
+        if user_total_farm_position == BigUint::zero() {
             return BigUint::zero();
         }
 
-        sc.claim_boosted_yields_rewards(caller, user_total_farm_position_mapper.get())
+        sc.claim_boosted_yields_rewards(caller, user_total_farm_position)
     }
 }
 
@@ -136,11 +136,7 @@ where
     ) -> BigUint<<Self::FarmSc as ContractBase>::Api> {
         let base_farm_reward =
             Self::calculate_base_farm_rewards(farm_token_amount, token_attributes, storage_cache);
-        let boosted_yield_rewards = Self::calculate_boosted_rewards(
-            sc,
-            caller,
-            token_attributes,
-        );
+        let boosted_yield_rewards = Self::calculate_boosted_rewards(sc, caller, token_attributes);
 
         base_farm_reward + boosted_yield_rewards
     }
@@ -190,7 +186,6 @@ where
         }
     }
 
-
     fn check_and_update_user_farm_position(
         sc: &Self::FarmSc,
         user: &ManagedAddress<<Self::FarmSc as ContractBase>::Api>,
@@ -211,8 +206,8 @@ where
                 farm_position_increase += &farm_position.amount;
             }
         }
-
-        if sc.user_total_farm_position(user).get() == 0 {
+        let user_total_farm_position = sc.get_user_total_farm_position(user);
+        if user_total_farm_position == BigUint::zero() {
             Self::increase_user_farm_position(sc, user, &total_farm_position);
         } else if farm_position_increase > 0 {
             Self::increase_user_farm_position(sc, user, &farm_position_increase);
@@ -225,7 +220,9 @@ where
         new_farm_position_amount: &BigUint<<Self::FarmSc as ContractBase>::Api>,
     ) {
         sc.user_total_farm_position(user)
-            .update(|user_farm_position| *user_farm_position += new_farm_position_amount);
+            .update(|user_farm_position_struct| {
+                user_farm_position_struct.total_farm_position += new_farm_position_amount
+            });
     }
 
     fn decrease_user_farm_position(
@@ -237,13 +234,15 @@ where
             farm_token_mapper.get_token_attributes(farm_position.token_nonce);
 
         sc.user_total_farm_position(&token_attributes.original_owner)
-            .update(|user_farm_position| {
-                if *user_farm_position > farm_position.amount {
-                    *user_farm_position -= &farm_position.amount;
+            .update(|user_farm_position_struct| {
+                let mut user_total_farm_position =
+                    user_farm_position_struct.total_farm_position.clone();
+                if user_total_farm_position > farm_position.amount {
+                    user_total_farm_position -= &farm_position.amount;
                 } else {
-                    *user_farm_position = BigUint::zero();
+                    user_total_farm_position = BigUint::zero();
                 }
+                user_farm_position_struct.total_farm_position = user_total_farm_position;
             });
     }
-
 }