Merge pull request #868 from multiversx/farm-staking-init-first-week-fix

first_week_start_epoch on farm staking init
multiversx · Mar 28, 2024 · 2ce5dae · 2ce5dae
2 parents 7ee6ddc + 50265d9
commit 2ce5dae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/dex/farm-with-locked-rewards/src/lib.rs b/dex/farm-with-locked-rewards/src/lib.rs
@@ -83,6 +83,9 @@ pub trait Farm:
 
     #[endpoint]
     fn upgrade(&self) {
+        let current_epoch = self.blockchain().get_block_epoch();
+        self.first_week_start_epoch().set_if_empty(current_epoch);
+
         // Farm position migration code
         let farm_token_mapper = self.farm_token();
         self.try_set_farm_position_migration_nonce(farm_token_mapper);

diff --git a/dex/farm/src/lib.rs b/dex/farm/src/lib.rs
@@ -84,6 +84,9 @@ pub trait Farm:
 
     #[endpoint]
     fn upgrade(&self) {
+        let current_epoch = self.blockchain().get_block_epoch();
+        self.first_week_start_epoch().set_if_empty(current_epoch);
+
         // Farm position migration code
         let farm_token_mapper = self.farm_token();
         self.try_set_farm_position_migration_nonce(farm_token_mapper);

diff --git a/farm-staking/farm-staking/src/lib.rs b/farm-staking/farm-staking/src/lib.rs
@@ -89,13 +89,19 @@ pub trait FarmStaking:
         );
         self.min_unbond_epochs().set_if_empty(min_unbond_epochs);
 
+        let current_epoch = self.blockchain().get_block_epoch();
+        self.first_week_start_epoch().set_if_empty(current_epoch);
+
         // Farm position migration code
         let farm_token_mapper = self.farm_token();
         self.try_set_farm_position_migration_nonce(farm_token_mapper);
     }
 
     #[endpoint]
     fn upgrade(&self) {
+        let current_epoch = self.blockchain().get_block_epoch();
+        self.first_week_start_epoch().set_if_empty(current_epoch);
+
         // Farm position migration code
         let farm_token_mapper = self.farm_token();
         self.try_set_farm_position_migration_nonce(farm_token_mapper);