all points in issues #246 & #247 except voting weights

pallets/asset_management/src/functions.rs

@@ -300,7 +300,7 @@ impl<T: Config> Pallet<T> {
 
 					//check how many rents were payed
 					let payed = (time as u128 - remaining_p as u128) * rent.clone();
-					let asset_account = tenant.asset_account.unwrap();
+					let asset_account = tenant.asset_account.clone().unwrap();
 					let asset_account_free_balance =
 						<T as Config>::Currency::free_balance(&asset_account);
 
@@ -337,6 +337,15 @@ impl<T: Config> Pallet<T> {
 						//Reserve maintenance fees
 						let reservation =
 							<T as Config>::Currency::reserve(&asset_account, maintenance.into());
+
+							//Emmit maintenance fee payment event
+						Self::deposit_event(Event::MaintenanceFeesPayment {
+							tenant: tenant.account_id.clone(),
+							when: now,
+							asset_account: tenant.asset_account.unwrap(),
+							amount: maintenance.clone(),
+
+						});
 
 						debug_assert!(reservation.is_ok());
 

pallets/asset_management/src/lib.rs

@@ -228,6 +228,15 @@ pub mod pallet {
 			amount: Payment::BalanceOf<T>,
 			when: BlockNumberOf<T>,
 		},
+
+			//Asset maintenance fees, have been taken from the rent received, and reserved 
+			MaintenanceFeesPayment
+			{
+				tenant: T::AccountId,
+				when: BlockNumberOf<T>,
+				asset_account: T::AccountId,
+				amount: BalanceOf<T>,
+			},
 	}
 
 	// Errors inform users that something went wrong.

runtime/src/lib.rs

@@ -174,7 +174,7 @@ parameter_types! {
 
 impl frame_system::Config for Runtime {
 	/// The basic call filter to use in dispatchable.
-	type BaseCallFilter = frame_support::traits::Everything;
+	type BaseCallFilter = DontAllowCollectiveAndDemocracy;
 	/// Block & extrinsics weights: base values and limits.
 	type BlockWeights = RuntimeBlockWeights;
 	/// The maximum length of a block (in bytes).