MESH-2195: Check DID & Portfolio for settlements (#1724)

* Check DID & Portfolio for settlements * Fix linting * Fix mocks * Fix mocks again --------- Co-authored-by: Robert Gabriel Jakabosky <[email protected]>
PolymeshAssociation · Sep 17, 2024 · 5414c35 · 5414c35
1 parent 6a479a8
commit 5414c35
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/pallets/common/src/traits/portfolio.rs b/pallets/common/src/traits/portfolio.rs
@@ -38,6 +38,12 @@ pub trait PortfolioSubTrait<AccountId> {
     /// * `custodian` - DID of the custodian
     fn ensure_portfolio_custody(portfolio: PortfolioId, custodian: IdentityId) -> DispatchResult;
 
+    /// Ensure that the `portfolio` exists.
+    ///
+    /// # Arguments
+    /// * `portfolio` - Portfolio to check
+    fn ensure_portfolio_validity(portfolio: &PortfolioId) -> DispatchResult;
+
     /// Locks some tokens of a portfolio
     ///
     /// # Arguments

diff --git a/pallets/identity/src/keys.rs b/pallets/identity/src/keys.rs
@@ -76,7 +76,7 @@ impl<T: Config> Module<T> {
     }
 
     /// Returns `Err(DidDoesNotExist)` unless `id` has an associated record.
-    pub(crate) fn ensure_id_record_exists(id: IdentityId) -> DispatchResult {
+    pub fn ensure_id_record_exists(id: IdentityId) -> DispatchResult {
         ensure!(Self::is_identity_exists(&id), Error::<T>::DidDoesNotExist);
         Ok(())
     }

diff --git a/pallets/portfolio/src/lib.rs b/pallets/portfolio/src/lib.rs
@@ -933,6 +933,11 @@ impl<T: Config> PortfolioSubTrait<T::AccountId> for Module<T> {
         Ok(())
     }
 
+    /// Ensure that the `portfolio` exists.
+    fn ensure_portfolio_validity(portfolio: &PortfolioId) -> DispatchResult {
+        Self::ensure_portfolio_validity(portfolio)
+    }
+
     /// Ensures that the portfolio's custody is with the provided identity
     fn ensure_portfolio_custody(portfolio: PortfolioId, custodian: IdentityId) -> DispatchResult {
         Self::ensure_portfolio_custody(portfolio, custodian)

diff --git a/pallets/runtime/tests/src/staking/mock.rs b/pallets/runtime/tests/src/staking/mock.rs
@@ -451,6 +451,10 @@ impl PortfolioSubTrait<AccountId> for Test {
         unimplemented!()
     }
 
+    fn ensure_portfolio_validity(_: &PortfolioId) -> DispatchResult {
+        unimplemented!()
+    }
+
     fn lock_tokens(_: &PortfolioId, _: &AssetID, _: Balance) -> DispatchResult {
         unimplemented!()
     }

diff --git a/pallets/settlement/src/lib.rs b/pallets/settlement/src/lib.rs
@@ -1104,6 +1104,10 @@ impl<T: Config> Module<T> {
                     Leg::OffChain { .. } => continue,
                 }
             };
+            Identity::<T>::ensure_id_record_exists(sender.did)?;
+            Identity::<T>::ensure_id_record_exists(receiver.did)?;
+            T::Portfolio::ensure_portfolio_validity(sender)?;
+            T::Portfolio::ensure_portfolio_validity(receiver)?;
 
             portfolios_pending_approval.insert(*sender);
             if T::Portfolio::skip_portfolio_affirmation(receiver, asset_id) {