Merge pull request #2 from Karuzzzo/master

minor fixes

Author: Vourhey

README.md

@@ -30,6 +30,9 @@ Current proof-of-concept runtime includes functions:
 # Build and run
 
 ```bash
+# install rust and all required dependencies
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+
 # clone project from repo
 git clone https://github.com/DistributedSky/distributed-sky-substrate.git
 cd distributed-sky-substrate

node/src/chain_spec.rs

@@ -4,7 +4,7 @@ use node_dsky_runtime::{
 };
 use sc_service::ChainType;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
-use sp_core::{crypto::Ss58Codec, sr25519, Pair, Public};
+use sp_core::{sr25519, Pair, Public};
 use sp_finality_grandpa::AuthorityId as GrandpaId;
 use sp_runtime::traits::{IdentifyAccount, Verify};
 
@@ -47,10 +47,6 @@ pub fn development_config() -> Result<ChainSpec, String> {
         "dev",
         ChainType::Development,
         move || {
-            let master_account_id: AccountId =
-                Ss58Codec::from_ss58check("5Gn6YMyoNZVZx9jCpANYDRPMB2p4FwyUTy1tKgfPTZz4vQFL").unwrap();
-            let registrar_account_id: AccountId =
-                Ss58Codec::from_ss58check("5GQvJoe3uQFFKPjCQLLfdf1nTPbPP6NKRHtEeRtvLBDBpMuX").unwrap();
             testnet_genesis(
                 wasm_binary,
                 // Initial PoA authorities
@@ -59,8 +55,6 @@ pub fn development_config() -> Result<ChainSpec, String> {
                 get_account_id_from_seed::<sr25519::Public>("Alice"),
                 // Pre-funded accounts
                 vec![
-                    master_account_id,
-                    registrar_account_id,
                     get_account_id_from_seed::<sr25519::Public>("Alice"),
                     get_account_id_from_seed::<sr25519::Public>("Bob"),
                     get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
@@ -93,8 +87,6 @@ pub fn local_testnet_config() -> Result<ChainSpec, String> {
         "local_testnet",
         ChainType::Local,
         move || {
-            let master_account_id: AccountId =
-                Ss58Codec::from_ss58check("5Gn6YMyoNZVZx9jCpANYDRPMB2p4FwyUTy1tKgfPTZz4vQFL").unwrap();
             testnet_genesis(
                 wasm_binary,
                 // Initial PoA authorities
@@ -103,11 +95,9 @@ pub fn local_testnet_config() -> Result<ChainSpec, String> {
                     authority_keys_from_seed("Bob"),
                 ],
                 // Sudo account
-                // get_account_id_from_seed::<sr25519::Public>("Alice"),
-                master_account_id.clone(),
+                get_account_id_from_seed::<sr25519::Public>("Alice"),
                 // Pre-funded accounts
                 vec![
-                    master_account_id,
                     get_account_id_from_seed::<sr25519::Public>("Alice"),
                     get_account_id_from_seed::<sr25519::Public>("Bob"),
                     get_account_id_from_seed::<sr25519::Public>("Charlie"),

pallets/ds-accounts/src/lib.rs

@@ -173,6 +173,7 @@ decl_event!(
         AccountId = <T as frame_system::Config>::AccountId,
         Balance = BalanceOf<T>,
         AccountRole = <T as Trait>::AccountRole,
+        MetaIPFS = <T as Trait>::MetaIPFS,
     {
         // Event documentation should end with an array that provides descriptive names for event parameters.
         /// New account has been created [who, account, role]
@@ -181,10 +182,10 @@ decl_event!(
         AccountDisabled(AccountId, AccountId),
         /// Lock balance [who, balance]
         BalanceLocked(AccountId, Balance),
-        /// Pilot has been registered [who, account]
-        PilotRegistered(AccountId, AccountId),
-        /// UAV has been registered [who, account] (do we need ipfs link here?)
-        UAVRegistred(AccountId, AccountId),
+        /// Pilot has been registered [who, account, license_ipfs_hash]
+        PilotRegistered(AccountId, AccountId, MetaIPFS),
+        /// UAV has been registered [who, account, license_ipfs_hash]
+        UAVRegistred(AccountId, AccountId, MetaIPFS),
         // add other events here
     }
 );
@@ -256,7 +257,7 @@ decl_module! {
 
         /// Register an entry in account registry with PILOT role.
         #[weight = <T as Trait>::WeightInfo::register_pilot()]
-        pub fn register_pilot(origin, account: T::AccountId) -> dispatch::DispatchResult {
+        pub fn register_pilot(origin, account: T::AccountId, metadata_ipfs_hash: T::MetaIPFS) -> dispatch::DispatchResult {
             let who = ensure_signed(origin)?;
             ensure!(Self::account_is(&who, REGISTRAR_ROLE.into()), Error::<T>::NotAuthorized);
             ensure!(!UAVRegistry::<T>::contains_key(&account), Error::<T>::AddressAlreadyUsed);
@@ -274,7 +275,7 @@ decl_module! {
             });
 
             if update_storage_result.is_ok() {
-                Self::deposit_event(RawEvent::PilotRegistered(who, account));
+                Self::deposit_event(RawEvent::PilotRegistered(who, account, metadata_ipfs_hash));
             }
 
             update_storage_result
@@ -289,9 +290,9 @@ decl_module! {
             ensure!(Self::account_is(&who, (REGISTRAR_ROLE | PILOT_ROLE).into()), Error::<T>::NotAuthorized);
             ensure!(!AccountRegistry::<T>::contains_key(&uav_address), Error::<T>::AddressAlreadyUsed);
 
-            UAVRegistry::<T>::insert(&uav_address, UAVOf::<T>::new(serial_number, meta, &who));
+            UAVRegistry::<T>::insert(&uav_address, UAVOf::<T>::new(serial_number, meta.clone(), &who));
 
-            Self::deposit_event(RawEvent::UAVRegistred(who, uav_address));
+            Self::deposit_event(RawEvent::UAVRegistred(who, uav_address, meta));
             Ok(())
         }
 

pallets/ds-accounts/src/tests.rs

@@ -152,7 +152,8 @@ fn it_register_pilot_by_registrar() {
         ));
         assert_ok!(DSAccountsModule::register_pilot(
                 Origin::signed(REGISTRAR_1_ACCOUNT_ID), 
-                PILOT_1_ACCOUNT_ID
+                PILOT_1_ACCOUNT_ID,
+                vec![0],
         ));
 
         let account = DSAccountsModule::account_registry(PILOT_1_ACCOUNT_ID);
@@ -169,7 +170,8 @@ fn it_try_register_pilot_not_by_registrar() {
         assert_noop!(
             DSAccountsModule::register_pilot(
                 Origin::signed(ADMIN_ACCOUNT_ID), 
-                PILOT_1_ACCOUNT_ID
+                PILOT_1_ACCOUNT_ID,
+                vec![0],
             ),
             Error::NotAuthorized
         );
@@ -189,7 +191,8 @@ fn it_try_register_same_pilot_twice() {
 
         assert_ok!(DSAccountsModule::register_pilot(
                 Origin::signed(REGISTRAR_1_ACCOUNT_ID),
-                PILOT_1_ACCOUNT_ID
+                PILOT_1_ACCOUNT_ID,
+                vec![0],
         ));
 
         let account = DSAccountsModule::account_registry(PILOT_1_ACCOUNT_ID);
@@ -207,7 +210,8 @@ fn it_try_register_same_pilot_twice() {
         assert_noop!(
             DSAccountsModule::register_pilot(
                 Origin::signed(REGISTRAR_2_ACCOUNT_ID),
-                PILOT_1_ACCOUNT_ID
+                PILOT_1_ACCOUNT_ID,
+                vec![0],
             ),
             Error::AlreadyRegistered,
         );
@@ -226,6 +230,7 @@ fn it_try_to_add_admin_account_role_pilot() {
             DSAccountsModule::register_pilot(
                 Origin::signed(REGISTRAR_1_ACCOUNT_ID), 
                 ADMIN_ACCOUNT_ID, 
+                vec![0],
             )
         );
     });
@@ -299,6 +304,7 @@ fn it_try_to_add_new_uav_with_allowed_roles() {
         assert_ok!(DSAccountsModule::register_pilot(
             Origin::signed(REGISTRAR_1_ACCOUNT_ID),
             PILOT_1_ACCOUNT_ID,
+            vec![0],
         ));
 
         assert_ok!(DSAccountsModule::register_uav(
@@ -345,6 +351,7 @@ fn it_try_register_uav_on_wrong_addr() {
         assert_ok!(DSAccountsModule::register_pilot(
             Origin::signed(REGISTRAR_1_ACCOUNT_ID),
             PILOT_1_ACCOUNT_ID,
+            vec![0],
         ));
         assert_noop!(
             DSAccountsModule::register_uav(
@@ -386,6 +393,7 @@ fn it_try_register_user_on_uav_addr() {
             DSAccountsModule::register_pilot(
                 Origin::signed(REGISTRAR_1_ACCOUNT_ID),
                 UAV_1_ACCOUNT_ID,
+                vec![0],
             ), 
             Error::AddressAlreadyUsed
         );

pallets/ds-maps/src/lib.rs

@@ -25,7 +25,7 @@ use sp_std::{
 use dsky_utils::{CastToType, FromRaw, IntDiv, Signed, ToBigCoord, FromBigCoord, GetEpsilon};
 use frame_system::ensure_signed;
 use pallet_ds_accounts as accounts;
-use accounts::REGISTRAR_ROLE;
+use accounts::{REGISTRAR_ROLE, PILOT_ROLE};
 
 mod default_weight;
 #[cfg(test)]
@@ -1767,7 +1767,7 @@ decl_module! {
                         root_id: RootId) -> dispatch::DispatchResult {
             let who = ensure_signed(origin)?;
             // TODO consider role for route addition
-            ensure!(<accounts::Module<T>>::account_is(&who, REGISTRAR_ROLE.into()), Error::<T>::NotAuthorized);
+            ensure!(<accounts::Module<T>>::account_is(&who, (PILOT_ROLE | REGISTRAR_ROLE).into()), Error::<T>::NotAuthorized);
             ensure!(RootBoxes::<T>::contains_key(root_id), Error::<T>::RootDoesNotExist);
             ensure!(waypoints.len() >= 2, Error::<T>::InvalidData);
             let start_waypoint = &waypoints.first().unwrap();