added flag to track the withdrawl of fund for milestones

pallets/proposals/src/impls/pallet_impls.rs

@@ -169,6 +169,11 @@ impl<T: Config> Pallet<T> {
         Projects::<T>::mutate_exists(project_key, |project| -> DispatchResult {
             if let Some(p) = project {
                 p.withdrawn_funds = p.withdrawn_funds.saturating_add(withdrawable);
+                for (_,ms) in &mut p.milestones {
+                    if ms.is_approved {
+                        ms.withdrawn = true;
+                    }
+                }
                 if p.withdrawn_funds == p.raised_funds {
                     <T as Config>::DepositHandler::return_deposit(p.deposit_id)?;
                     CompletedProjects::<T>::try_mutate(

pallets/proposals/src/lib.rs

@@ -454,6 +454,7 @@ pub mod pallet {
                     milestone_key,
                     percentage_to_unlock: milestone.percentage_to_unlock,
                     is_approved: false,
+                    withdrawn: false,
                 };
                 milestones
                     .try_insert(milestone_key, milestone)
@@ -485,6 +486,7 @@ pub mod pallet {
                 agreement_hash: brief_hash,
                 funding_type,
                 deposit_id,
+                payment_address: [0; 20],
             };
 
             Projects::<T>::insert(project_key, project);
@@ -527,6 +529,7 @@ pub struct Milestone {
     pub milestone_key: MilestoneKey,
     pub percentage_to_unlock: Percent,
     pub is_approved: bool,
+    pub withdrawn: bool,
 }
 
 /// The vote struct is used to
@@ -562,6 +565,7 @@ pub struct Project<T: Config> {
     pub cancelled: bool,
     pub funding_type: FundingType,
     pub deposit_id: DepositIdOf<T>,
+    pub payment_address: [u8; 20],
 }
 
 /// The contribution users made to a proposal project.

pallets/proposals/src/migration.rs

@@ -273,6 +273,7 @@ pub mod v3 {
                             milestone.percentage_to_unlock as u8,
                         ),
                         is_approved: milestone.is_approved,
+                        withdrawn: milestone.withdrawn
                     },
                 );
             });
@@ -296,6 +297,7 @@ pub mod v3 {
                         funding_type: FundingType::Proposal,
                         // A deposit_id of u32::MAX is ignored.
                         deposit_id: u32::MAX.into(),
+                        payment_address: project.payment_address,
                     };
                     Some(migrated_project)
                 } else {
@@ -680,6 +682,7 @@ pub mod v6 {
 
 #[cfg(test)]
 mod test {
+    use std::io::Read;
     use super::*;
     use mock::*;
     use test_utils::*;

pallets/proposals/src/test_utils.rs

@@ -101,6 +101,7 @@ pub fn create_project<T: Config>(
             milestone_key,
             percentage_to_unlock: ms.percentage_to_unlock,
             is_approved: false,
+            withdrawn: false,
         };
         milestones.insert(milestone_key, milestone);
         let _ = bounded_milestone_keys.try_push(milestone_key);
@@ -122,6 +123,7 @@ pub fn create_project<T: Config>(
         agreement_hash,
         funding_type: FundingType::Brief,
         deposit_id,
+        payment_address: [0;20],
     };
 
     crate::Projects::<T>::insert(project_key, project);

pallets/proposals/src/tests/pallet.rs

@@ -601,6 +601,9 @@ fn withdraw_only_transfers_approved_milestones() {
             RuntimeOrigin::signed(*ALICE),
             project_key
         ));
+        //validating the withdrawn flag set to true once the fund for the milestone is being withdrawn
+        assert_eq!(Projects::<Test>::get(project_key).unwrap().milestones.get(&milestone_key).unwrap().withdrawn,true);
+
         let alice_after = <Test as Config>::MultiCurrency::free_balance(CurrencyId::Native, &ALICE);
         let expected_fee = <Test as Config>::ImbueFee::get().mul_floor(per_contribution * 2 / 10);
         // total_contribution / number of milestones - fee