Merge pull request #46 from sicpa-dlab/main

Release 0.5.0
sicpa-dlab · Jan 29, 2024 · 9e53b3d · 9e53b3d
2 parents e0f2c5f + 6c34001
commit 9e53b3d
Show file tree

Hide file tree

Showing 11 changed files with 616 additions and 183 deletions.
diff --git a/README.md b/README.md
@@ -69,59 +69,152 @@ Example code:
     val didDocAlgo2 = DIDDocPeerDID.fromJson(didDocAlgo2Json)
 
 Example of DID documents:
+# DIDDoc algo 0:
 
-    # DIDDoc algo 0:
     {
         "id": "did:peer:0z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V",
         "authentication": [
             {
-                "id": "did:peer:0z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V#6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V",
+                "id": "did:peer:0z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V#key-1",
                 "type": "Ed25519VerificationKey2020",
                 "controller": "did:peer:0z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V",
-                "publicKeyMultibase": "ByHnpUCFb1vAfh9CFZ8ZkmUZguURW8nSw889hy6rD8L7"
+                "publicKeyMultibase": "z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V"
             }
         ]
     }
 
     # did_doc_algo_2
-        {
-           "id": "did:peer:2.Ez6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg.SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCIsInIiOlsiZGlkOmV4YW1wbGU6c29tZW1lZGlhdG9yI3NvbWVrZXkiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX0",
-           "authentication": [
-               {
-                   "id": "did:peer:2.Ez6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg.SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCIsInIiOlsiZGlkOmV4YW1wbGU6c29tZW1lZGlhdG9yI3NvbWVrZXkiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX0#6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V",
-                   "type": "Ed25519VerificationKey2020",
-                   "controller": "did:peer:2.Ez6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg.SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCIsInIiOlsiZGlkOmV4YW1wbGU6c29tZW1lZGlhdG9yI3NvbWVrZXkiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX0",
-                   "publicKeyMultibase": "z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V"
-               },
-               {
-                   "id": "did:peer:2.Ez6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg.SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCIsInIiOlsiZGlkOmV4YW1wbGU6c29tZW1lZGlhdG9yI3NvbWVrZXkiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX0#6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg",
-                   "type": "Ed25519VerificationKey2020",
-                   "controller": "did:peer:2.Ez6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg.SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCIsInIiOlsiZGlkOmV4YW1wbGU6c29tZW1lZGlhdG9yI3NvbWVrZXkiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX0",
-                   "publicKeyMultibase": "z6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg"
-               }
-           ],
-           "keyAgreement": [
-               {
-                   "id": "did:peer:2.Ez6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg.SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCIsInIiOlsiZGlkOmV4YW1wbGU6c29tZW1lZGlhdG9yI3NvbWVrZXkiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX0#6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc",
-                   "type": "X25519KeyAgreementKey2020",
-                   "controller": "did:peer:2.Ez6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg.SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCIsInIiOlsiZGlkOmV4YW1wbGU6c29tZW1lZGlhdG9yI3NvbWVrZXkiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX0",
-                   "publicKeyMultibase": "z6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc"
-               }
-           ],
-           "service": [
-               {
-                   "id": "did:peer:2.Ez6LSbysY2xFMRpGMhb7tFTLMpeuPRaqaWM1yECx2AtzE3KCc.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.Vz6MkgoLTnTypo3tDRwCkZXSccTPHRLhF4ZnjhueYAFpEX6vg.SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9leGFtcGxlLmNvbS9lbmRwb2ludCIsInIiOlsiZGlkOmV4YW1wbGU6c29tZW1lZGlhdG9yI3NvbWVrZXkiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX0#didcommmessaging-0",
-                   "type": "DIDCommMessaging",
-                   "serviceEndpoint": "https://example.com/endpoint",
-                   "routingKeys": [
-                       "did:example:somemediator#somekey"
-                   ],
-                   "accept": [
+    {
+        "id": "did:peer:2.Ez6LSpSrLxbAhg2SHwKk7kwpsH7DM7QjFS5iK6qP87eViohud.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHBzOi8vZXhhbXBsZS5jb20vZW5kcG9pbnQxIiwiciI6WyJkaWQ6ZXhhbXBsZTpzb21lbWVkaWF0b3Ijc29tZWtleTEiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX19",
+        "authentication": [
+            {
+                "id": "did:peer:2.Ez6LSpSrLxbAhg2SHwKk7kwpsH7DM7QjFS5iK6qP87eViohud.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHBzOi8vZXhhbXBsZS5jb20vZW5kcG9pbnQxIiwiciI6WyJkaWQ6ZXhhbXBsZTpzb21lbWVkaWF0b3Ijc29tZWtleTEiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX19#key-2",
+                "type": "Ed25519VerificationKey2020",
+                "controller": "did:peer:2.Ez6LSpSrLxbAhg2SHwKk7kwpsH7DM7QjFS5iK6qP87eViohud.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHBzOi8vZXhhbXBsZS5jb20vZW5kcG9pbnQxIiwiciI6WyJkaWQ6ZXhhbXBsZTpzb21lbWVkaWF0b3Ijc29tZWtleTEiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX19",
+                "publicKeyMultibase": "z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V"
+            }
+        ],
+        "keyAgreement": [
+            {
+                "id": "did:peer:2.Ez6LSpSrLxbAhg2SHwKk7kwpsH7DM7QjFS5iK6qP87eViohud.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHBzOi8vZXhhbXBsZS5jb20vZW5kcG9pbnQxIiwiciI6WyJkaWQ6ZXhhbXBsZTpzb21lbWVkaWF0b3Ijc29tZWtleTEiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX19#key-1",
+                "type": "X25519KeyAgreementKey2020",
+                "controller": "did:peer:2.Ez6LSpSrLxbAhg2SHwKk7kwpsH7DM7QjFS5iK6qP87eViohud.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHBzOi8vZXhhbXBsZS5jb20vZW5kcG9pbnQxIiwiciI6WyJkaWQ6ZXhhbXBsZTpzb21lbWVkaWF0b3Ijc29tZWtleTEiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX19",
+                "publicKeyMultibase": "z6LSpSrLxbAhg2SHwKk7kwpsH7DM7QjFS5iK6qP87eViohud"
+            }
+        ],
+        "service": [
+            {
+                "id": "#service",
+                "type": "DIDCommMessaging",
+                "serviceEndpoint": {
+                    "uri": "https://example.com/endpoint1",
+                    "routingKeys": [
+                        "did:example:somemediator#somekey1"
+                    ],
+                    "accept": [
                         "didcomm/v2", "didcomm/aip2;env=rfc587"
-                   ]
-               }
-           ]
-       }
+                    ]
+                }
+            }
+        ]
+    }
+
+
+Example code:
+    Based the new PeerDid Spec https://identity.foundation/peer-did-method-spec/
+
+    val encryptionKeys = listOf(
+        VerificationMaterialAgreement(
+            type = VerificationMethodTypeAgreement.X25519_KEY_AGREEMENT_KEY_2019,
+            format = VerificationMaterialFormatPeerDID.BASE58,
+            value = "DmgBSHMqaZiYqwNMEJJuxWzsGGC8jUYADrfSdBrC6L8s",
+        )
+    )
+    val signingKeys = listOf(
+        VerificationMaterialAuthentication(
+            type = VerificationMethodTypeAuthentication.ED25519_VERIFICATION_KEY_2018,
+            format = VerificationMaterialFormatPeerDID.BASE58,
+            value = "ByHnpUCFb1vAfh9CFZ8ZkmUZguURW8nSw889hy6rD8L7",
+        )
+    )
+    val service =
+        """
+            {
+              "type": "DIDCommMessaging",
+              "serviceEndpoint": {
+                "uri": "https://example.com/endpoint1",
+                "routingKeys": [
+                  "did:example:somemediator#somekey1"
+                ],
+                "accept": [
+                  "didcomm/v2",
+                  "didcomm/aip2;env=rfc587"
+                ]
+              }
+            }
+        """
+
+    val peerDIDAlgo0 = createPeerDIDNumalgo0(signingKeys[0])
+    val peerDIDAlgo2 = createPeerDIDNumalgo2(
+        encryptionKeys, signingKeys, service
+    )
+
+    val didDocAlgo0Json = resolvePeerDID(peerDIDAlgo0)
+    val didDocAlgo2Json = resolvePeerDID(peerDIDAlgo2)
+
+    val didDocAlgo0 = DIDDocPeerDID.fromJson(didDocAlgo0Json)
+    val didDocAlgo2 = DIDDocPeerDID.fromJson(didDocAlgo2Json)
+
+Example of DID documents:
+
+    # DIDDoc algo 0:
+    {
+        "id": "did:peer:0z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V",
+        "authentication": [
+            {
+              "id": "did:peer:0z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V#key-1",
+              "type": "Ed25519VerificationKey2020",
+              "controller": "did:peer:0z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V",
+              "publicKeyMultibase": "z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V"
+            }
+        ]
+    }
+
+    # did_doc_algo_2
+    {
+        "id": "did:peer:2.Ez6LSpSrLxbAhg2SHwKk7kwpsH7DM7QjFS5iK6qP87eViohud.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHBzOi8vZXhhbXBsZS5jb20vZW5kcG9pbnQxIiwiciI6WyJkaWQ6ZXhhbXBsZTpzb21lbWVkaWF0b3Ijc29tZWtleTEiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX19",
+        "authentication": [
+            {
+                "id": "did:peer:2.Ez6LSpSrLxbAhg2SHwKk7kwpsH7DM7QjFS5iK6qP87eViohud.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHBzOi8vZXhhbXBsZS5jb20vZW5kcG9pbnQxIiwiciI6WyJkaWQ6ZXhhbXBsZTpzb21lbWVkaWF0b3Ijc29tZWtleTEiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX19#key-2",
+                "type": "Ed25519VerificationKey2020",
+                "controller": "did:peer:2.Ez6LSpSrLxbAhg2SHwKk7kwpsH7DM7QjFS5iK6qP87eViohud.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHBzOi8vZXhhbXBsZS5jb20vZW5kcG9pbnQxIiwiciI6WyJkaWQ6ZXhhbXBsZTpzb21lbWVkaWF0b3Ijc29tZWtleTEiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX19",
+                "publicKeyMultibase": "z6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V"
+            }
+        ],
+        "keyAgreement": [
+            {
+                "id": "did:peer:2.Ez6LSpSrLxbAhg2SHwKk7kwpsH7DM7QjFS5iK6qP87eViohud.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHBzOi8vZXhhbXBsZS5jb20vZW5kcG9pbnQxIiwiciI6WyJkaWQ6ZXhhbXBsZTpzb21lbWVkaWF0b3Ijc29tZWtleTEiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX19#key-1",
+                "type": "X25519KeyAgreementKey2020",
+                "controller": "did:peer:2.Ez6LSpSrLxbAhg2SHwKk7kwpsH7DM7QjFS5iK6qP87eViohud.Vz6MkqRYqQiSgvZQdnBytw86Qbs2ZWUkGv22od935YF4s8M7V.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHBzOi8vZXhhbXBsZS5jb20vZW5kcG9pbnQxIiwiciI6WyJkaWQ6ZXhhbXBsZTpzb21lbWVkaWF0b3Ijc29tZWtleTEiXSwiYSI6WyJkaWRjb21tL3YyIiwiZGlkY29tbS9haXAyO2Vudj1yZmM1ODciXX19",
+                "publicKeyMultibase": "z6LSpSrLxbAhg2SHwKk7kwpsH7DM7QjFS5iK6qP87eViohud"
+            }
+        ],
+        "service": [
+            {
+                "id": "#service",
+                "type": "DIDCommMessaging",
+                "serviceEndpoint": {
+                    "uri": "https://example.com/endpoint1",
+                    "routingKeys": [
+                        "did:example:somemediator#somekey1"
+                    ],
+                    "accept": [
+                        "didcomm/v2", "didcomm/aip2;env=rfc587"
+                    ]
+                }
+            }
+        ]
+    }
 
 ## Assumptions and limitations
 - Only static layers [1, 2a, 2b](https://identity.foundation/peer-did-method-spec/#layers-of-support) are supported

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 # Project-wide Gradle settings.
 
-version=0.4.1
+version=0.5.0
 group=org.didcommx
 
 # Kotlin code style for this project: "official" or "obsolete":

diff --git a/lib/src/main/kotlin/org/didcommx/peerdid/DIDDoc.kt b/lib/src/main/kotlin/org/didcommx/peerdid/DIDDoc.kt
@@ -88,25 +88,29 @@ data class VerificationMethodPeerDID(
 
 sealed interface Service
 
+data class ServiceEndpoint(
+    val uri: String,
+    val routingKeys: List<String>,
+    val accept: List<String>
+)
 data class OtherService(val data: Map<String, Any>) : Service
 
 data class DIDCommServicePeerDID(
     val id: String,
     val type: String,
-    val serviceEndpoint: String,
-    val routingKeys: List<String>,
-    val accept: List<String>
+    val serviceEndpoint: ServiceEndpoint,
 ) : Service {
 
-    fun toDict(): MutableMap<String, Any> {
-        val res = mutableMapOf<String, Any>(
+    fun toDict(): Map<String, Any> {
+        return mapOf(
             SERVICE_ID to id,
             SERVICE_TYPE to type,
+            SERVICE_ENDPOINT to mapOf(
+                SERVICE_URI to serviceEndpoint.uri,
+                SERVICE_ROUTING_KEYS to serviceEndpoint.routingKeys,
+                SERVICE_ACCEPT to serviceEndpoint.accept
+            )
         )
-        res[SERVICE_ENDPOINT] = serviceEndpoint
-        res[SERVICE_ROUTING_KEYS] = routingKeys
-        res[SERVICE_ACCEPT] = accept
-        return res
     }
 }
 
@@ -122,3 +126,4 @@ const val SERVICE_ENDPOINT = "serviceEndpoint"
 const val SERVICE_DIDCOMM_MESSAGING = "DIDCommMessaging"
 const val SERVICE_ROUTING_KEYS = "routingKeys"
 const val SERVICE_ACCEPT = "accept"
+const val SERVICE_URI = "uri"
diff --git a/lib/src/main/kotlin/org/didcommx/peerdid/PeerDIDResolver.kt b/lib/src/main/kotlin/org/didcommx/peerdid/PeerDIDResolver.kt
@@ -38,7 +38,7 @@ private fun buildDIDDocNumalgo0(peerDID: PeerDID, format: VerificationMaterialFo
     val decodedEncumbasis = decodeMultibaseEncnumbasisAuth(inceptionKey, format)
     return DIDDocPeerDID(
         did = peerDID,
-        authentication = listOf(getVerificationMethod(peerDID, decodedEncumbasis))
+        authentication = listOf(getVerificationMethod(1, peerDID, decodedEncumbasis))
     )
 }
 
@@ -49,22 +49,22 @@ private fun buildDIDDocNumalgo2(peerDID: PeerDID, format: VerificationMaterialFo
     val authentications = mutableListOf<VerificationMethodPeerDID>()
     val keyAgreement = mutableListOf<VerificationMethodPeerDID>()
 
-    keys.split(".").forEach {
-        val prefix = it[0]
-        val value = it.drop(1)
+    keys.split(".").withIndex().forEach { (index, keyIt) ->
+        val prefix = keyIt[0]
+        val value = keyIt.drop(1)
 
         when (prefix) {
             Numalgo2Prefix.SERVICE.prefix -> {
                 encodedServicesJson.add(value)
             }
             Numalgo2Prefix.AUTHENTICATION.prefix -> {
                 val decodedEncumbasis = decodeMultibaseEncnumbasisAuth(value, format)
-                authentications.add(getVerificationMethod(peerDID, decodedEncumbasis))
+                authentications.add(getVerificationMethod(index + 1, peerDID, decodedEncumbasis))
             }
 
             Numalgo2Prefix.KEY_AGREEMENT.prefix -> {
                 val decodedEncumbasis = decodeMultibaseEncnumbasisAgreement(value, format)
-                keyAgreement.add(getVerificationMethod(peerDID, decodedEncumbasis))
+                keyAgreement.add(getVerificationMethod(index + 1, peerDID, decodedEncumbasis))
             }
 
             else -> throw IllegalArgumentException("Unsupported transform part of PeerDID: $prefix")

diff --git a/lib/src/main/kotlin/org/didcommx/peerdid/core/DIDDocHelper.kt b/lib/src/main/kotlin/org/didcommx/peerdid/core/DIDDocHelper.kt
@@ -5,13 +5,12 @@ import org.didcommx.peerdid.DIDCommServicePeerDID
 import org.didcommx.peerdid.DIDDocPeerDID
 import org.didcommx.peerdid.OtherService
 import org.didcommx.peerdid.PublicKeyField
-import org.didcommx.peerdid.SERVICE_ACCEPT
 import org.didcommx.peerdid.SERVICE_DIDCOMM_MESSAGING
 import org.didcommx.peerdid.SERVICE_ENDPOINT
 import org.didcommx.peerdid.SERVICE_ID
-import org.didcommx.peerdid.SERVICE_ROUTING_KEYS
 import org.didcommx.peerdid.SERVICE_TYPE
 import org.didcommx.peerdid.Service
+import org.didcommx.peerdid.ServiceEndpoint
 import org.didcommx.peerdid.VerificationMaterialFormatPeerDID
 import org.didcommx.peerdid.VerificationMaterialPeerDID
 import org.didcommx.peerdid.VerificationMethodPeerDID
@@ -100,16 +99,21 @@ internal fun serviceFromJson(jsonObject: JsonObject): Service {
     if (type != SERVICE_DIDCOMM_MESSAGING)
         return OtherService(serviceMap)
 
-    val endpoint = jsonObject.get(SERVICE_ENDPOINT)?.asString
-    val routingKeys = jsonObject.get(SERVICE_ROUTING_KEYS)?.asJsonArray?.map { it.asString }
-    val accept = jsonObject.get(SERVICE_ACCEPT)?.asJsonArray?.map { it.asString }
+    val serviceEndpointObject = jsonObject.getAsJsonObject(SERVICE_ENDPOINT)
+    val uri = serviceEndpointObject?.get("uri")?.asString ?: ""
+    val routingKeys = serviceEndpointObject?.getAsJsonArray("routingKeys")?.map { it.asString } ?: emptyList()
+    val accept = serviceEndpointObject?.getAsJsonArray("accept")?.map { it.asString } ?: emptyList()
+
+    val serviceEndpoint = ServiceEndpoint(
+        uri = uri,
+        routingKeys = routingKeys,
+        accept = accept
+    )
 
     return DIDCommServicePeerDID(
         id = id,
         type = type,
-        serviceEndpoint = endpoint ?: "",
-        routingKeys = routingKeys ?: emptyList(),
-        accept = accept ?: emptyList()
+        serviceEndpoint = serviceEndpoint
     )
 }