Feature/proxy financial/update rbac

pallets/proxy-financial/Cargo.toml → pallets/fund-admin/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "pallet-proxy-financial"
+name = "pallet-fund-admin"
 version = "4.0.0-dev"
 description = "Proxy Financial Pallet"
 authors = ["Hashed <https://github.com/hashed-io"]

pallets/proxy-financial/src/functions.rs → pallets/fund-admin/src/functions.rs

@@ -87,7 +87,7 @@ impl<T: Config> Pallet<T> {
             Option<BoundedVec<FieldName, T::MaxBoundedVecs>>,
             Option<ExpenditureType>,
             Option<u64>,
-            Option<u32>,
+            Option<BoundedVec<FieldDescription, T::MaxBoundedVecs>>,
             Option<u32>,
             CUDAction,
             Option<[u8;32]>,
@@ -398,7 +398,7 @@ impl<T: Config> Pallet<T> {
                     )?;
                 },
                 CUDAction::Delete => {
-                    // Ensure admin cannot delete himself
+                    // Ensure admin cannot delete themselves
                     ensure!(user.0 != admin, Error::<T>::AdministatorsCannotDeleteThemselves);
 
                     Self::do_delete_user(
@@ -566,7 +566,7 @@ impl<T: Config> Pallet<T> {
             Option<BoundedVec<FieldName, T::MaxBoundedVecs>>, // 0: name
             Option<ExpenditureType>, // 1: type
             Option<u64>, // 2: amount
-            Option<u32>, // 3: naics code
+            Option<BoundedVec<FieldDescription, T::MaxBoundedVecs>>, // 3: naics code
             Option<u32>, // 4: jobs multiplier
             CUDAction, // 5: CUDAction
             Option<[u8;32]>, // 6: expenditure_id
@@ -639,7 +639,7 @@ impl<T: Config> Pallet<T> {
         name: BoundedVec<FieldName, T::MaxBoundedVecs>,
         expenditure_type: ExpenditureType,
         expenditure_amount: u64,
-        naics_code: Option<u32>,
+        naics_code: Option<BoundedVec<FieldDescription, T::MaxBoundedVecs>>,
         jobs_multiplier: Option<u32>,
     ) -> DispatchResult {
         //Ensure project exists
@@ -657,13 +657,21 @@ impl<T: Config> Pallet<T> {
         // Create expenditure id
         let expenditure_id = (project_id, name.clone(), expenditure_type, timestamp).using_encoded(blake2_256);
 
+        // NAICS code
+        let get_naics_code = match naics_code {
+            Some(mod_naics_code) => {
+                Some(mod_naics_code.into_inner()[0].clone())
+            },
+            None => None,
+        };
+
         // Create expenditurte data
         let expenditure_data = ExpenditureData {
             project_id,
             name: name.into_inner()[0].clone(),
             expenditure_type,
             expenditure_amount,
-            naics_code,
+            naics_code: get_naics_code,
             jobs_multiplier, 
         };
 
@@ -687,7 +695,7 @@ impl<T: Config> Pallet<T> {
         expenditure_id: [u8;32],
         name: Option<BoundedVec<FieldName, T::MaxBoundedVecs>>, 
         expenditure_amount: Option<u64>,
-        naics_code: Option<u32>,
+        naics_code: Option<BoundedVec<FieldDescription, T::MaxBoundedVecs>>,
         jobs_multiplier: Option<u32>,
     ) -> DispatchResult {
         //Ensure project exists
@@ -715,7 +723,7 @@ impl<T: Config> Pallet<T> {
                 expenditure.expenditure_amount = mod_expenditure_amount;
             }
             if let Some(mod_naics_code) = naics_code {
-                expenditure.naics_code = Some(mod_naics_code);
+                expenditure.naics_code = Some(mod_naics_code.into_inner()[0].clone());
             }
             if let Some(mod_jobs_multiplier) = jobs_multiplier {
                 expenditure.jobs_multiplier = Some(mod_jobs_multiplier);
@@ -846,6 +854,7 @@ impl<T: Config> Pallet<T> {
             <TransactionsInfo<T>>::try_mutate::<_,_,DispatchError,_>(transaction_id, |transaction_data| {
                 let transaction_data = transaction_data.as_mut().ok_or(Error::<T>::TransactionNotFound)?;
                 transaction_data.status = TransactionStatus::Submitted;
+                transaction_data.feedback = None;
                 Ok(())
             })?;
         }
@@ -1194,7 +1203,7 @@ impl<T: Config> Pallet<T> {
     // B U L K   U P L O A D   T R A N S A C T I O N S
 
     pub fn do_up_bulk_upload(
-        user: T::AccountId, //TODO: Remove underscore when permissions are implemented
+        user: T::AccountId,
         project_id: [u8;32],
         drawdown_id: [u8;32],
         description: FieldDescription,
@@ -1213,10 +1222,13 @@ impl<T: Config> Pallet<T> {
         // Ensure amount is valid
         Self::is_amount_valid(total_amount)?;
 
-        //Ensure only Construction loan & developer equity drawdowns can be bulk uploaded
+        //Ensure only Construction loan & developer equity drawdowns can call bulk uploaded
         let drawdown_data = DrawdownsInfo::<T>::get(drawdown_id).ok_or(Error::<T>::DrawdownNotFound)?;
         ensure!(drawdown_data.drawdown_type == DrawdownType::ConstructionLoan || drawdown_data.drawdown_type == DrawdownType::DeveloperEquity, Error::<T>::DrawdownTypeNotSupportedForBulkUpload);
 
+        //Ensure drawdown status is draft or rejected
+        ensure!(drawdown_data.status == DrawdownStatus::Draft || drawdown_data.status == DrawdownStatus::Rejected, Error::<T>::DrawdownStatusNotSupportedForBulkUpload);
+
         // Ensure documents is not empty
         ensure!(!documents.is_empty(), Error::<T>::DocumentsIsEmpty);
 
@@ -1230,6 +1242,7 @@ impl<T: Config> Pallet<T> {
             mod_drawdown_data.description = Some(description);
             mod_drawdown_data.documents = Some(documents);
             mod_drawdown_data.status = DrawdownStatus::Submitted;
+            mod_drawdown_data.feedback = None;
             Ok(())
         })?;
 

pallets/proxy-financial/src/lib.rs → pallets/fund-admin/src/lib.rs

@@ -127,7 +127,7 @@ pub mod pallet {
 	#[pallet::getter(fn users_info)]
 	pub(super) type UsersInfo<T: Config> = StorageMap<
 		_, 
-		Identity, 
+		Blake2_128Concat, 
 		T::AccountId, // Key account_id
 		UserData<T>,  // Value UserData<T>
 		OptionQuery,
@@ -157,7 +157,7 @@ pub mod pallet {
 	#[pallet::getter(fn projects_by_user)]
 	pub(super) type ProjectsByUser<T: Config> = StorageMap<
 		_, 
-		Identity, 
+		Blake2_128Concat, 
 		T::AccountId, // Key account_id
 		BoundedVec<[u8;32], T::MaxProjectsPerUser>,  // Value projects
 		ValueQuery,
@@ -447,6 +447,8 @@ pub mod pallet {
 		UserHasAssignedProjectsCannotUpdateRole,
 		/// Cannot delete user if the user is assigned to a project
 		UserHasAssignedProjectsCannotDelete,
+		/// Cannot send a bulkupload drawdown if the drawdown status isn't in draft or rejected
+		DrawdownStatusNotSupportedForBulkUpload,
 
 	}
 
@@ -539,7 +541,7 @@ pub mod pallet {
 				Option<BoundedVec<FieldName, T::MaxBoundedVecs>>,
 				Option<ExpenditureType>,
 				Option<u64>,
-				Option<u32>,
+				Option<BoundedVec<FieldDescription, T::MaxBoundedVecs>>,
 				Option<u32>,
 				CUDAction,
 				Option<[u8;32]>,
@@ -613,7 +615,7 @@ pub mod pallet {
 				Option<BoundedVec<FieldName, T::MaxBoundedVecs>>,
 				Option<ExpenditureType>,
 				Option<u64>,
-				Option<u32>,
+				Option<BoundedVec<FieldDescription, T::MaxBoundedVecs>>,
 				Option<u32>,
 				CUDAction,
 				Option<[u8;32]>,
@@ -698,7 +700,7 @@ pub mod pallet {
 			origin: OriginFor<T>, 
 			project_id: [u8;32],
 			drawdown_id: [u8;32],
-			bulkupdate: Option<bool>,
+			bulkupload: Option<bool>,
 			transactions: Option<BoundedVec<(
 				Option<[u8;32]>, // expenditure_id
 				Option<u64>, // amount
@@ -710,7 +712,7 @@ pub mod pallet {
 			let who = ensure_signed(origin)?; // origin need to be an admin
 
 			// Match bulkupdate
-			match bulkupdate {
+			match bulkupload {
 				Some(approval) => {
 					// Execute bulkupload flow (construction loan & developer equity)
 					match approval {

pallets/proxy-financial/src/mock.rs → pallets/fund-admin/src/mock.rs

@@ -6,11 +6,10 @@ use sp_runtime::{
 	testing::Header,
 	traits::{BlakeTwo256, IdentityLookup},
 };
-use frame_system::EnsureRoot;
-
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
+use frame_system::EnsureRoot;
 
 // Configure a mock runtime to test the pallet.
 frame_support::construct_runtime!(
@@ -20,7 +19,7 @@ frame_support::construct_runtime!(
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Proxy: pallet_proxy_financial::{Pallet, Call, Storage, Event<T>},
+		FundAdmin: pallet_proxy_financial::{Pallet, Call, Storage, Event<T>},
 		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
 		RBAC: pallet_rbac::{Pallet, Call, Storage, Event<T>},
 	}
@@ -115,13 +114,13 @@ impl pallet_timestamp::Config for Test {
 }
 
 parameter_types! {
-	pub const MaxScopesPerPallet: u32 = 2;
-	pub const MaxRolesPerPallet: u32 = 6;
-	pub const RoleMaxLen: u32 = 25;
-	pub const PermissionMaxLen: u32 = 25;
-	pub const MaxPermissionsPerRole: u32 = 11;
-	pub const MaxRolesPerUser: u32 = 2;
-	pub const MaxUsersPerRole: u32 = 2;
+	pub const MaxScopesPerPallet: u32 = 1000;
+	pub const MaxRolesPerPallet: u32 = 50;
+	pub const RoleMaxLen: u32 = 50;
+	pub const PermissionMaxLen: u32 = 50;
+	pub const MaxPermissionsPerRole: u32 = 100;
+	pub const MaxRolesPerUser: u32 = 10;
+	pub const MaxUsersPerRole: u32 = 2500;
 }
 impl pallet_rbac::Config for Test {
 	type Event = Event;
@@ -136,5 +135,7 @@ impl pallet_rbac::Config for Test {
 
 // Build genesis storage according to the mock runtime.
 pub fn new_test_ext() -> sp_io::TestExternalities {
-	system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
-}
+	let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap().into();
+	t.execute_with(|| FundAdmin::do_initial_setup().expect("Error on configuring initial setup"));
+	t
+}

pallets/fund-admin/src/tests.rs

@@ -0,0 +1,44 @@
+use crate::{mock::*, Error, types::*, Config};
+use frame_support::{assert_ok, BoundedVec, traits::ConstU32, assert_noop};
+use pallet_rbac::types::RoleBasedAccessControl;
+use sp_io::hashing::blake2_256;
+use std::vec;
+
+type RbacErr = pallet_rbac::Error<Test>;
+
+fn pallet_id() ->[u8;32]{
+	FundAdmin::pallet_id().to_id()
+}
+
+fn pallet_name()-> pallet_rbac::types::IdOrVec {
+	pallet_rbac::types::IdOrVec::Vec(
+		"pallet_test".as_bytes().to_vec()
+	)
+}
+
+fn return_field_name(name: &str) -> FieldName {
+    let name: BoundedVec<u8, ConstU32<100>> = name.as_bytes().to_vec().try_into().unwrap_or_default();
+    name
+} 
+// U S E R S
+// -----------------------------------------------------------------------------------------
+#[test]
+fn register_admin_works() {
+    new_test_ext().execute_with(|| {
+        let admin = 1;
+    });
+}
+
+// #[test]
+// fn sudo_register_administrator_account_works() {
+//     new_test_ext().execute_with(|| {
+//         // let alice_name = return_field_name("Alice Keys");
+//         // assert_ok!(FundAdmin::sudo_add_administrator(
+//         //     Origin::signed(1),
+//         //     1,
+//         //     alice_name.clone()
+//         // ));
+
+//     });
+// }
+

pallets/proxy-financial/src/types.rs → pallets/fund-admin/src/types.rs

@@ -70,7 +70,7 @@ pub struct ExpenditureData {
     pub name: FieldName,
     pub expenditure_type: ExpenditureType,
     pub expenditure_amount: u64,
-    pub naics_code: Option<u32>,
+    pub naics_code: Option<FieldDescription>,
     pub jobs_multiplier: Option<u32>,
 }
 

runtime/Cargo.toml

@@ -67,7 +67,7 @@ pallet-bitcoin-vaults = { default-features = false, path = "../pallets/bitcoin-v
 pallet-gated-marketplace = { default-features = false, path = "../pallets/gated-marketplace" }
 pallet-rbac = { default-features = false, path = "../pallets/rbac" }
 pallet-confidential-docs = { default-features = false, path = "../pallets/confidential-docs" }
-pallet-proxy-financial = { default-features = false, path = "../pallets/proxy-financial" }
+pallet-fund-admin = { default-features = false, path = "../pallets/fund-admin" }
 
 
 [build-dependencies]
@@ -107,7 +107,7 @@ std = [
 	"pallet-gated-marketplace/std",
 	"pallet-rbac/std",
 	"pallet-confidential-docs/std",
-	"pallet-proxy-financial/std",
+	"pallet-fund-admin/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",