added OriginalOwnerHelperModule

common/modules/original_owner_helper/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "original_owner_helper"
+version = "0.0.0"
+authors = ["MultiversX <[email protected]>"]
+edition = "2021"
+
+[lib]
+path = "src/lib.rs"
+
+[dependencies.multiversx-sc]
+version = "=0.53.2"
+features = ["esdt-token-payment-legacy-decode"]
+
+[dependencies.common_structs]
+path = "../../common_structs"

common/modules/original_owner_helper/src/lib.rs

@@ -0,0 +1,62 @@
+#![no_std]
+
+multiversx_sc::imports!();
+
+use common_structs::{FarmToken, PaymentsVec};
+
+#[multiversx_sc::module]
+pub trait OriginalOwnerHelperModule {
+    fn check_and_return_original_owner<T: FarmToken<Self::Api> + TopDecode>(
+        &self,
+        payments: &PaymentsVec<Self::Api>,
+        farm_token_mapper: &NonFungibleTokenMapper,
+    ) -> ManagedAddress {
+        let mut original_owner = ManagedAddress::zero();
+        for payment in payments.iter() {
+            let attributes: T = farm_token_mapper.get_token_attributes(payment.token_nonce);
+            let payment_original_owner = attributes.get_original_owner();
+
+            if original_owner.is_zero() {
+                original_owner = payment_original_owner;
+            } else {
+                require!(
+                    original_owner == payment_original_owner,
+                    "All position must have the same original owner"
+                );
+            }
+        }
+
+        require!(
+            !original_owner.is_zero(),
+            "Original owner could not be identified"
+        );
+
+        original_owner
+    }
+
+    fn check_additional_payments_original_owner<T: FarmToken<Self::Api> + TopDecode>(
+        &self,
+        user: &ManagedAddress,
+        payments: &PaymentsVec<Self::Api>,
+        farm_token_mapper: &NonFungibleTokenMapper,
+    ) {
+        if payments.len() == 1 {
+            return;
+        }
+
+        let farm_token_id = farm_token_mapper.get_token_id();
+        for payment in payments.into_iter() {
+            if payment.token_identifier != farm_token_id {
+                continue;
+            }
+
+            let attributes: T = farm_token_mapper.get_token_attributes(payment.token_nonce);
+            let payment_original_owner = attributes.get_original_owner();
+
+            require!(
+                user == &payment_original_owner,
+                "Provided address is not the same as the original owner"
+            );
+        }
+    }
+}

common/modules/utils/src/lib.rs

@@ -2,7 +2,7 @@
 
 multiversx_sc::imports!();
 
-use common_structs::{FarmToken, PaymentAttributesPair, PaymentsVec};
+use common_structs::{PaymentAttributesPair, PaymentsVec};
 use fixed_supply_token::FixedSupplyToken;
 use mergeable::Mergeable;
 
@@ -116,60 +116,6 @@ pub trait UtilsModule {
         }
     }
 
-    fn check_and_return_original_owner<T: FarmToken<Self::Api> + TopDecode>(
-        &self,
-        payments: &PaymentsVec<Self::Api>,
-        farm_token_mapper: &NonFungibleTokenMapper,
-    ) -> ManagedAddress {
-        let mut original_owner = ManagedAddress::zero();
-        for payment in payments.iter() {
-            let attributes: T = farm_token_mapper.get_token_attributes(payment.token_nonce);
-            let payment_original_owner = attributes.get_original_owner();
-
-            if original_owner.is_zero() {
-                original_owner = payment_original_owner;
-            } else {
-                require!(
-                    original_owner == payment_original_owner,
-                    "All position must have the same original owner"
-                );
-            }
-        }
-
-        require!(
-            !original_owner.is_zero(),
-            "Original owner could not be identified"
-        );
-
-        original_owner
-    }
-
-    fn check_additional_payments_original_owner<T: FarmToken<Self::Api> + TopDecode>(
-        &self,
-        user: &ManagedAddress,
-        payments: &PaymentsVec<Self::Api>,
-        farm_token_mapper: &NonFungibleTokenMapper,
-    ) {
-        if payments.len() == 1 {
-            return;
-        }
-
-        let farm_token_id = farm_token_mapper.get_token_id();
-        for payment in payments.into_iter() {
-            if payment.token_identifier != farm_token_id {
-                continue;
-            }
-
-            let attributes: T = farm_token_mapper.get_token_attributes(payment.token_nonce);
-            let payment_original_owner = attributes.get_original_owner();
-
-            require!(
-                user == &payment_original_owner,
-                "Provided address is not the same as the original owner"
-            );
-        }
-    }
-
     fn require_valid_token_id(&self, token_id: &TokenIdentifier) {
         require!(token_id.is_valid_esdt_identifier(), "Invalid token ID");
     }

dex/farm-with-locked-rewards/Cargo.toml

@@ -44,6 +44,9 @@ path = "../../common/modules/permissions_module"
 [dependencies.permissions_hub_module]
 path = "../../common/modules/permissions_hub_module"
 
+[dependencies.original_owner_helper]
+path = "../../common/modules/original_owner_helper"
+
 [dependencies.sc_whitelist_module]
 path = "../../common/modules/sc_whitelist_module"
 

dex/farm-with-locked-rewards/src/external_interaction.rs

@@ -17,6 +17,7 @@ pub trait ExternalInteractionsModule:
     + pausable::PausableModule
     + permissions_module::PermissionsModule
     + permissions_hub_module::PermissionsHubModule
+    + original_owner_helper::OriginalOwnerHelperModule
     + sc_whitelist_module::SCWhitelistModule
     + events::EventsModule
     + multiversx_sc_modules::default_issue_callbacks::DefaultIssueCallbacksModule

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

@@ -30,6 +30,7 @@ pub trait Farm:
     + pausable::PausableModule
     + permissions_module::PermissionsModule
     + permissions_hub_module::PermissionsHubModule
+    + original_owner_helper::OriginalOwnerHelperModule
     + sc_whitelist_module::SCWhitelistModule
     + events::EventsModule
     + multiversx_sc_modules::default_issue_callbacks::DefaultIssueCallbacksModule

dex/farm/Cargo.toml

@@ -41,6 +41,9 @@ path = "../../common/modules/permissions_module"
 [dependencies.permissions_hub_module]
 path = "../../common/modules/permissions_hub_module"
 
+[dependencies.original_owner_helper]
+path = "../../common/modules/original_owner_helper"
+
 [dependencies.sc_whitelist_module]
 path = "../../common/modules/sc_whitelist_module"
 

dex/farm/src/external_interaction.rs

@@ -16,6 +16,7 @@ pub trait ExternalInteractionsModule:
     + pausable::PausableModule
     + permissions_module::PermissionsModule
     + permissions_hub_module::PermissionsHubModule
+    + original_owner_helper::OriginalOwnerHelperModule
     + sc_whitelist_module::SCWhitelistModule
     + events::EventsModule
     + multiversx_sc_modules::default_issue_callbacks::DefaultIssueCallbacksModule

dex/farm/src/lib.rs

@@ -31,6 +31,7 @@ pub trait Farm:
     + pausable::PausableModule
     + permissions_module::PermissionsModule
     + permissions_hub_module::PermissionsHubModule
+    + original_owner_helper::OriginalOwnerHelperModule
     + sc_whitelist_module::SCWhitelistModule
     + events::EventsModule
     + multiversx_sc_modules::default_issue_callbacks::DefaultIssueCallbacksModule

farm-staking/farm-staking/Cargo.toml

@@ -56,6 +56,9 @@ path = "../../common/modules/permissions_module"
 [dependencies.permissions_hub_module]
 path = "../../common/modules/permissions_hub_module"
 
+[dependencies.original_owner_helper]
+path = "../../common/modules/original_owner_helper"
+
 [dependencies.sc_whitelist_module]
 path = "../../common/modules/sc_whitelist_module"
 

farm-staking/farm-staking/src/external_interaction.rs

@@ -20,6 +20,7 @@ pub trait ExternalInteractionsModule:
     + pausable::PausableModule
     + permissions_module::PermissionsModule
     + permissions_hub_module::PermissionsHubModule
+    + original_owner_helper::OriginalOwnerHelperModule
     + multiversx_sc_modules::default_issue_callbacks::DefaultIssueCallbacksModule
     + farm_base_impl::base_farm_init::BaseFarmInitModule
     + farm_base_impl::base_farm_validation::BaseFarmValidationModule

farm-staking/farm-staking/src/lib.rs

@@ -37,6 +37,7 @@ pub trait FarmStaking:
     + pausable::PausableModule
     + permissions_module::PermissionsModule
     + permissions_hub_module::PermissionsHubModule
+    + original_owner_helper::OriginalOwnerHelperModule
     + multiversx_sc_modules::default_issue_callbacks::DefaultIssueCallbacksModule
     + farm_base_impl::base_farm_init::BaseFarmInitModule
     + farm_base_impl::base_farm_validation::BaseFarmValidationModule