Add lock instruction; Allow manual execution for locked instructions; Add simplified transfer

Author: HenriqueNogara

pallets/asset/src/lib.rs

@@ -3293,8 +3293,8 @@ impl<T: AssetConfig> Pallet<T> {
         )?;
 
         // Updates the balance in the asset pallet
-        let sender_new_balance = sender_current_balance - transfer_value;
-        let receiver_new_balance = receiver_current_balance + transfer_value;
+        let sender_new_balance = sender_current_balance.saturating_sub(transfer_value);
+        let receiver_new_balance = receiver_current_balance.saturating_add(transfer_value);
         BalanceOf::<T>::insert(asset_id, sender_portfolio.did, sender_new_balance);
         BalanceOf::<T>::insert(asset_id, receiver_portfolio.did, receiver_new_balance);
 
@@ -3461,6 +3461,39 @@ impl<T: AssetConfig> Pallet<T> {
             }
         })
     }
+
+    /// Transfers `transfer_value` of `asset_id` from `sender_pid` to `receiver_pid`.
+    /// Note: This functions skips all compliance and statistics checks, only checking for balance.
+    pub fn simplified_fungible_transfer(
+        asset_id: AssetId,
+        sender_pid: PortfolioId,
+        receiver_pid: PortfolioId,
+        transfer_value: Balance,
+        inst_id: InstructionId,
+        inst_memo: Option<Memo>,
+        caller_did: IdentityId,
+        weight_meter: &mut WeightMeter,
+    ) -> DispatchResult {
+        ensure!(
+            BalanceOf::<T>::get(&asset_id, &sender_pid.did) >= transfer_value,
+            Error::<T>::InsufficientBalance
+        );
+        Portfolio::<T>::ensure_portfolio_validity(&receiver_pid)?;
+        Portfolio::<T>::ensure_sufficient_balance(&sender_pid, &asset_id, transfer_value)?;
+
+        Self::unverified_transfer_asset(
+            sender_pid,
+            receiver_pid,
+            asset_id,
+            transfer_value,
+            Some(inst_id),
+            inst_memo,
+            caller_did,
+            weight_meter,
+        )?;
+
+        Ok(())
+    }
 }
 
 //==========================================================================

pallets/nft/src/lib.rs

@@ -712,10 +712,10 @@ impl<T: Config> Pallet<T> {
         // Update the balance of the sender and the receiver
         let transferred_amount = nfts.len() as u64;
         NumberOfNFTs::<T>::mutate(nfts.asset_id(), sender_portfolio.did, |balance| {
-            *balance -= transferred_amount
+            *balance = balance.saturating_sub(transferred_amount)
         });
         NumberOfNFTs::<T>::mutate(nfts.asset_id(), receiver_portfolio.did, |balance| {
-            *balance += transferred_amount
+            *balance = balance.saturating_add(transferred_amount)
         });
         // Update the portfolio of the sender and the receiver
         for nft_id in nfts.ids() {
@@ -870,6 +870,43 @@ impl<T: Config> Pallet<T> {
             }
         })
     }
+
+    /// Transfers all `nfts` from `sender_pid` to `receiver_pid`.
+    /// Note: This functions skips all compliance checks and only checks for onwership.
+    pub fn simplified_nft_transfer(
+        sender_pid: PortfolioId,
+        receiver_pid: PortfolioId,
+        nfts: NFTs,
+        inst_id: InstructionId,
+        inst_memo: Option<Memo>,
+        caller_did: IdentityId,
+    ) -> DispatchResult {
+        Portfolio::<T>::ensure_portfolio_validity(&receiver_pid)?;
+        Self::ensure_sender_owns_nfts(&sender_pid, &nfts)?;
+        Self::unverified_nfts_transfer(&sender_pid, &receiver_pid, &nfts);
+        Self::deposit_event(Event::NFTPortfolioUpdated(
+            caller_did,
+            nfts,
+            Some(sender_pid),
+            Some(receiver_pid),
+            PortfolioUpdateReason::Transferred {
+                instruction_id: Some(inst_id),
+                instruction_memo: inst_memo,
+            },
+        ));
+        Ok(())
+    }
+
+    /// Returns `Ok` if `sender_pid` holds all nfts.
+    fn ensure_sender_owns_nfts(sender_pid: &PortfolioId, nfts: &NFTs) -> DispatchResult {
+        for nft_id in nfts.ids() {
+            ensure!(
+                PortfolioNFT::<T>::contains_key(sender_pid, (nfts.asset_id(), nft_id)),
+                Error::<T>::InvalidNFTTransferNFTNotOwned
+            );
+        }
+        Ok(())
+    }
 }
 
 impl<T: Config> NFTTrait<T::RuntimeOrigin> for Pallet<T> {

pallets/runtime/common/src/runtime.rs

@@ -556,6 +556,7 @@ macro_rules! misc_pallet_impls {
             type MaxNumberOfPortfolios = MaxNumberOfPortfolios;
             type MaxNumberOfVenueSigners = MaxNumberOfVenueSigners;
             type MaxInstructionMediators = MaxInstructionMediators;
+            type MaximumLockPeriod = MaximumLockPeriod;
         }
 
         impl pallet_sto::Config for Runtime {

pallets/runtime/develop/src/runtime.rs

@@ -94,6 +94,7 @@ parameter_types! {
     pub const MaxNumberOfPortfolios: u32 = (10 + 100) * 2;
     pub const MaxNumberOfVenueSigners: u32 = 50;
     pub const MaxInstructionMediators: u32 = 4;
+    pub const MaximumLockPeriod: Moment = 1_440_000; // 24 hours
 
     // Multisig
     pub const MaxMultiSigSigners: u32 = 50;

pallets/runtime/mainnet/src/runtime.rs

@@ -92,6 +92,7 @@ parameter_types! {
     pub const MaxNumberOfPortfolios: u32 = (10 + 100) * 2;
     pub const MaxNumberOfVenueSigners: u32 = 50;
     pub const MaxInstructionMediators: u32 = 4;
+    pub const MaximumLockPeriod: Moment = 1_440_000; // 24 hours
 
     // Multisig
     pub const MaxMultiSigSigners: u32 = 50;

pallets/runtime/testnet/src/runtime.rs

@@ -95,6 +95,7 @@ parameter_types! {
     pub const MaxNumberOfPortfolios: u32 = (10 + 100) * 2;
     pub const MaxNumberOfVenueSigners: u32 = 50;
     pub const MaxInstructionMediators: u32 = 4;
+    pub const MaximumLockPeriod: Moment = 1_440_000; // 24 hours
 
     // Multisig
     pub const MaxMultiSigSigners: u32 = 50;

pallets/runtime/tests/src/storage.rs

@@ -214,6 +214,7 @@ parameter_types! {
     pub const MaxNumberOfFungibleAssets: u32 = 100;
     pub const MaxNumberOfNFTsPerLeg: u32 = 10;
     pub const MaxNumberOfNFTs: u32 = 100;
+    pub const MaximumLockPeriod: Moment = 2;
 
     // Multisig
     pub const MaxMultiSigSigners: u32 = 50;