Merge pull request #966 from multiversx/remove-farm-exit-fee

Remove farm penalty code
multiversx · Dec 2, 2024 · 3951ff2 · 3951ff2
2 parents 17b9601 + 76f1a4d
commit 3951ff2
Show file tree

Hide file tree

Showing 135 changed files with 2,805 additions and 1,896 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,6 +31,8 @@ members = [
   "energy-integration/fees-collector/meta",
   "energy-integration/governance-v2",
   "energy-integration/governance-v2/meta",
+  "energy-integration/timestamp-oracle",
+  "energy-integration/timestamp-oracle/meta",
 
   "farm-staking/farm-staking",
   "farm-staking/farm-staking/meta",

diff --git a/common/common_structs/src/alias_types.rs b/common/common_structs/src/alias_types.rs
@@ -6,6 +6,7 @@ pub type Nonce = u64;
 pub type Epoch = u64;
 pub type Week = usize;
 pub type Percent = u64;
+pub type Timestamp = u64;
 pub type PaymentsVec<M> = ManagedVec<M, EsdtTokenPayment<M>>;
 pub type UnlockPeriod<M> = UnlockSchedule<M>;
 pub type OldLockedTokenAttributes<M> = LockedAssetTokenAttributesEx<M>;

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
@@ -185,22 +185,6 @@ pub trait FarmContract {
         new_attributes.into()
     }
 
-    fn get_exit_penalty(
-        _sc: &Self::FarmSc,
-        _total_exit_amount: &BigUint<<Self::FarmSc as ContractBase>::Api>,
-        _token_attributes: &Self::AttributesType,
-    ) -> BigUint<<Self::FarmSc as ContractBase>::Api> {
-        BigUint::zero()
-    }
-
-    fn apply_penalty(
-        _sc: &Self::FarmSc,
-        _total_exit_amount: &mut BigUint<<Self::FarmSc as ContractBase>::Api>,
-        _token_attributes: &Self::AttributesType,
-        _storage_cache: &StorageCache<Self::FarmSc>,
-    ) {
-    }
-
     fn check_and_update_user_farm_position(
         sc: &Self::FarmSc,
         user: &ManagedAddress<<Self::FarmSc as ContractBase>::Api>,

diff --git a/common/modules/permissions_module/src/permissions.rs b/common/modules/permissions_module/src/permissions.rs
@@ -34,14 +34,14 @@ impl TopDecode for Permissions {
 
 impl TypeAbiFrom<Self> for Permissions {}
 
- impl TypeAbi for Permissions {
-     type Unmanaged = Self;
+impl TypeAbi for Permissions {
+    type Unmanaged = Self;
 
-     fn type_name() -> multiversx_sc::abi::TypeName {
-         core::any::type_name::<u32>().into()
-     }
+    fn type_name() -> multiversx_sc::abi::TypeName {
+        core::any::type_name::<u32>().into()
+    }
 
-     fn type_name_rust() -> multiversx_sc::abi::TypeName {
-         core::any::type_name::<u32>().into()
-     }
- }
+    fn type_name_rust() -> multiversx_sc::abi::TypeName {
+        core::any::type_name::<u32>().into()
+    }
+}
diff --git a/dex/farm-with-locked-rewards/Cargo.toml b/dex/farm-with-locked-rewards/Cargo.toml
@@ -92,3 +92,6 @@ version = "=0.53.2"
 
 [dev-dependencies.simple-lock]
 path = "../../locked-asset/simple-lock"
+
+[dev-dependencies.timestamp-oracle]
+path = "../../energy-integration/timestamp-oracle"
diff --git a/dex/farm-with-locked-rewards/src/external_interaction.rs b/dex/farm-with-locked-rewards/src/external_interaction.rs
@@ -3,7 +3,7 @@ multiversx_sc::imports!();
 use common_structs::FarmTokenAttributes;
 use farm::{
     base_functions::{self, ClaimRewardsResultType},
-    exit_penalty, EnterFarmResultType,
+    EnterFarmResultType,
 };
 
 use crate::NoMintWrapper;
@@ -20,7 +20,6 @@ pub trait ExternalInteractionsModule:
     + events::EventsModule
     + multiversx_sc_modules::default_issue_callbacks::DefaultIssueCallbacksModule
     + base_functions::BaseFunctionsModule
-    + exit_penalty::ExitPenaltyModule
     + locking_module::lock_with_energy_module::LockWithEnergyModule
     + farm_base_impl::base_farm_init::BaseFarmInitModule
     + farm_base_impl::base_farm_validation::BaseFarmValidationModule
@@ -30,6 +29,7 @@ pub trait ExternalInteractionsModule:
     + farm_base_impl::exit_farm::BaseExitFarmModule
     + farm_boosted_yields::FarmBoostedYieldsModule
     + farm_boosted_yields::boosted_yields_factors::BoostedYieldsFactorsModule
+    + farm_boosted_yields::custom_reward_logic::CustomRewardLogicModule
     + week_timekeeping::WeekTimekeepingModule
     + weekly_rewards_splitting::WeeklyRewardsSplittingModule
     + weekly_rewards_splitting::events::WeeklyRewardsSplittingEventsModule