Merge pull request #14 from trackback-blockchain/feature/tp-170/capab…

…ility-delegation-revocation

Feature/tp 170/capability delegation revocation

README.md

@@ -52,7 +52,7 @@ Purge any existing dev chain state:
 Start a dev chain:
 
 ```bash
-./target/release/trackback-node--dev
+./target/release/trackback-node --dev
 ```
 
 Or, start a dev chain with detailed logging:

node/src/chain_spec.rs

@@ -7,6 +7,7 @@ use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 use sp_core::{sr25519, Pair, Public};
 use sp_finality_grandpa::AuthorityId as GrandpaId;
 use sp_runtime::traits::{IdentifyAccount, Verify};
+use std::path::PathBuf;
 
 // The URL for the telemetry server.
 // const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
@@ -76,6 +77,11 @@ pub fn development_config() -> Result<ChainSpec, String> {
     ))
 }
 
+pub fn test_net_config() -> ChainSpec {
+    // ChainSpec::from_json_file(PathBuf::from("../chain_specs/test-net.json")).unwrap()
+    ChainSpec::from_json_bytes(&include_bytes!("../chain_specs/staging-net.json")[..]).unwrap()
+}
+
 pub fn local_testnet_config() -> Result<ChainSpec, String> {
     let wasm_binary =
         WASM_BINARY.ok_or_else(|| "Development wasm binary not available".to_string())?;

node/src/command.rs

@@ -50,6 +50,7 @@ impl SubstrateCli for Cli {
         Ok(match id {
             | "dev" => Box::new(chain_spec::development_config()?),
             | "" | "local" => Box::new(chain_spec::local_testnet_config()?),
+            | "test-net" => Box::new(chain_spec::test_net_config()),
             | path => Box::new(chain_spec::ChainSpec::from_json_file(
                 std::path::PathBuf::from(path),
             )?),

pallets/dids/Cargo.toml

@@ -22,6 +22,7 @@ sp-core = { default-features = false, version = '3.0.0' }
 sp-io = { default-features = false, version = '3.0.0' }
 sp-runtime = { default-features = false, version = '3.0.0' }
 rstest = { version = "0.11.0" }
+rand = { version = "0.8.4"}
 
 [lib]
 doctest = false

pallets/dids/src/lib.rs

@@ -86,9 +86,6 @@ pub mod pallet {
         type TimeProvider: UnixTime;
     }
 
-    #[allow(non_camel_case_types)]
-    pub type didURI  = Vec<u8>;
-
     #[pallet::pallet]
     #[pallet::generate_store(pub(super) trait Store)]
     pub struct Pallet<T>(_);
@@ -101,7 +98,7 @@ pub mod pallet {
     pub(super) type DIDDocument<T: Config> = StorageMap<
         _,
         Blake2_128Concat,
-        didURI,
+        Vec<u8>,
         DID<T>
     >;
 
@@ -217,17 +214,17 @@ pub mod pallet {
         /// DID Revocation
         /// Throws DoesNotExists for a non existing DID revocation
         #[pallet::weight(0)]
-        pub fn revoke_did(origin: OriginFor<T>, did_hash: Vec<u8>) -> DispatchResultWithPostInfo {
+        pub fn revoke_did(origin: OriginFor<T>, did_uri: Vec<u8>) -> DispatchResultWithPostInfo {
             let origin_account = ensure_signed(origin)?;
 
             ensure!(
-                DIDDocument::<T>::contains_key(&did_hash),
+                DIDDocument::<T>::contains_key(&did_uri),
                 Error::<T>::DIDDoesNotExists
             );
 
-            DIDDocument::<T>::remove(&did_hash);
+            DIDDocument::<T>::remove(&did_uri);
 
-            Self::deposit_event(Event::DIDDocumentRevoked(did_hash, origin_account));
+            Self::deposit_event(Event::DIDDocumentRevoked(did_uri, origin_account));
 
             Ok(().into())
         }
@@ -239,8 +236,8 @@ pub mod pallet {
             did_uri: Vec<u8>,
             did_resolution_metadata: Option<Vec<u8>>,
             did_document_metadata: Option<Vec<u8>>,
-            public_keys: Option<Vec<u8>>,
-            did_ref: Option<Vec<u8>>
+            did_ref: Option<Vec<u8>>,
+            public_keys: Option<Vec<Vec<u8>>>,
         ) -> DispatchResultWithPostInfo {
             let _origin_account = ensure_signed(origin)?;
 
@@ -272,8 +269,10 @@ pub mod pallet {
             did_document: Vec<u8>,
             did_document_metadata: Option<Vec<u8>>,
             did_resolution_metadata: Option<Vec<u8>>,
-            sender_account_id: <T as frame_system::Config>::AccountId,
-            did_hash: Vec<u8>,
+            sender_account_id: Vec<u8>,
+            did_uri: Vec<u8>,
+            did_ref: Option<Vec<u8>>,
+            public_keys: Option<Vec<Vec<u8>>>
         ) -> DispatchResultWithPostInfo {
             let origin_account = ensure_signed(origin)?;
 
@@ -282,25 +281,32 @@ pub mod pallet {
             let time = T::TimeProvider::now().as_secs();
 
             ensure!(
-                !DIDDocument::<T>::contains_key(&did_hash),
+                !DIDDocument::<T>::contains_key(&did_uri),
                 Error::<T>::DIDExists
             );
 
+            /// Checks the DID document contains the section `Capability Delegation`
+            /// Reference :- https://www.w3.org/TR/did-core/#capability-delegation
+
+            let doc = str::from_utf8(&did_document).unwrap();
+            let sanitised = doc.replace("\n", "").replace(" ", "");
+
+
             DIDDocument::<T>::insert(
-                did_hash.clone(),
+                did_uri.clone(),
                 DID {
                     did_document_metadata,
                     did_resolution_metadata,
                     block_number,
                     block_time_stamp: time.clone(),
                     updated_timestamp: time,
-                    did_ref: None,
+                    did_ref,
                     sender_account_id,
-                    public_keys: None
+                    public_keys,
                 },
             );
 
-            Self::deposit_event(Event::DIDDocumentCreated(did_hash, origin_account));
+            Self::deposit_event(Event::DIDDocumentCreated(did_uri, origin_account));
 
             Ok(().into())
         }

pallets/dids/src/structs.rs

@@ -33,10 +33,10 @@ pub struct DID<T: Config> {
     pub did_ref: Option<Vec<u8>>,
 
     // Sender AccountId
-    pub sender_account_id: <T as frame_system::Config>::AccountId,
+    pub sender_account_id: Vec<u8>,
 
     // public keys
-    pub public_keys: Option<Vec<u8>>
+    pub public_keys: Option<Vec<Vec<u8>>>
 
 }