Corrected DID Document building

Signed-off-by: artem.ivanov <[email protected]>
hyperledger · Jan 30, 2024 · 9bb3ad1 · 9bb3ad1
1 parent 4952bd3
commit 9bb3ad1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/vdr/src/contracts/did/types/did_doc.rs b/vdr/src/contracts/did/types/did_doc.rs
@@ -108,6 +108,7 @@ pub enum VerificationKeyType {
     JsonWebKey2020,
     EcdsaSecp256k1VerificationKey2019,
     EcdsaSecp256k1VerificationKey2020,
+    EcdsaSecp256k1RecoveryMethod2020,
 }
 
 impl ToString for VerificationKeyType {
@@ -130,6 +131,9 @@ impl ToString for VerificationKeyType {
             | VerificationKeyType::EcdsaSecp256k1VerificationKey2020 => {
                 "EcdsaSecp256k1VerificationKey2019".to_string()
             }
+            VerificationKeyType::EcdsaSecp256k1RecoveryMethod2020 => {
+                "EcdsaSecp256k1RecoveryMethod2020".to_string()
+            }
         }
     }
 }
@@ -144,6 +148,9 @@ impl TryFrom<&str> for VerificationKeyType {
             "Ed25519VerificationKey2020" => Ok(VerificationKeyType::Ed25519VerificationKey2020),
             "X25519KeyAgreementKey2020" => Ok(VerificationKeyType::X25519KeyAgreementKey2020),
             "JsonWebKey2020" => Ok(VerificationKeyType::JsonWebKey2020),
+            "EcdsaSecp256k1RecoveryMethod2020" => {
+                Ok(VerificationKeyType::EcdsaSecp256k1RecoveryMethod2020)
+            }
             "EcdsaSecp256k1VerificationKey2019" => {
                 Ok(VerificationKeyType::EcdsaSecp256k1VerificationKey2020)
             }

diff --git a/vdr/src/contracts/did/types/did_doc_builder.rs b/vdr/src/contracts/did/types/did_doc_builder.rs
@@ -78,7 +78,7 @@ impl DidDocumentBuilder {
     ) -> DidDocumentBuilder {
         let id = id.map(String::from).unwrap_or_else(|| {
             format!(
-                "{}:delegate-{}",
+                "{}+delegate-{}",
                 self.id.as_ref(),
                 self.verification_method.len()
             )
@@ -186,7 +186,7 @@ impl DidDocumentBuilder {
     ) -> DidDocumentBuilder {
         let id = id
             .map(String::from)
-            .unwrap_or_else(|| format!("#service-{}", self.service.len() + 1));
+            .unwrap_or_else(|| format!("#{}#service-{}", self.id.as_ref(), self.service.len() + 1));
         let service = Service {
             id,
             type_: type_.to_string(),