feat(agent): add mediation and ability to send messages

hyperledger · Feb 15, 2023 · 6eb95d2 · 6eb95d2
1 parent 93884d5
commit 6eb95d2
Show file tree

Hide file tree

Showing 88 changed files with 1,135 additions and 236 deletions.
diff --git a/...tala/prism/walletsdk/castor/CastorImpl.kt → ...tala.prism.walletsdk.castor/CastorImpl.kt b/...tala/prism/walletsdk/castor/CastorImpl.kt → ...tala.prism.walletsdk.castor/CastorImpl.kt
@@ -21,7 +21,7 @@ actual class CastorImpl actual constructor(apollo: Apollo) : Castor {
         this.apollo = apollo
         this.resolvers = arrayOf(
             PeerDIDResolver(),
-            LongFormPrismDIDResolver(this.apollo)
+            LongFormPrismDIDResolver(this.apollo),
         )
     }
 
@@ -31,18 +31,18 @@ actual class CastorImpl actual constructor(apollo: Apollo) : Castor {
 
     actual override fun createPrismDID(
         masterPublicKey: PublicKey,
-        services: Array<DIDDocument.Service>?
+        services: Array<DIDDocument.Service>?,
     ): DID {
         TODO("Not yet implemented")
     }
 
     actual override fun createPeerDID(
         keyPairs: Array<KeyPair>,
-        services: Array<DIDDocument.Service>
+        services: Array<DIDDocument.Service>,
     ): DID {
         return CastorShared.createPeerDID(
             keyPairs = keyPairs,
-            services = services
+            services = services,
         )
     }
 

diff --git a/...tor/resolvers/LongFormPrismDIDResolver.kt → ...tor/resolvers/LongFormPrismDIDResolver.kt b/...tor/resolvers/LongFormPrismDIDResolver.kt → ...tor/resolvers/LongFormPrismDIDResolver.kt
@@ -13,7 +13,7 @@ actual class LongFormPrismDIDResolver(
     override suspend fun resolve(didString: String): DIDDocument {
         return CastorShared.resolveLongFormPrismDID(
             apollo = apollo,
-            didString = didString
+            didString = didString,
         )
     }
 }
diff --git a/...etsdk/castor/resolvers/PeerDIDResolver.kt → ...etsdk.castor/resolvers/PeerDIDResolver.kt b/...etsdk/castor/resolvers/PeerDIDResolver.kt → ...etsdk.castor/resolvers/PeerDIDResolver.kt
diff --git a/...prism/walletsdk/castor/DIDResolverTest.kt → ...prism.walletsdk.castor/DIDResolverTest.kt b/...prism/walletsdk/castor/DIDResolverTest.kt → ...prism.walletsdk.castor/DIDResolverTest.kt
diff --git a/...dk/castor/DIDSignatureVerificationTest.kt → ...dk.castor/DIDSignatureVerificationTest.kt b/...dk/castor/DIDSignatureVerificationTest.kt → ...dk.castor/DIDSignatureVerificationTest.kt
diff --git a/...tala/prism/walletsdk/castor/CastorImpl.kt → ...tala.prism.walletsdk.castor/CastorImpl.kt b/...tala/prism/walletsdk/castor/CastorImpl.kt → ...tala.prism.walletsdk.castor/CastorImpl.kt
diff --git a/...a/prism/walletsdk/castor/did/DIDParser.kt → ...a.prism.walletsdk.castor/did/DIDParser.kt b/...a/prism/walletsdk/castor/did/DIDParser.kt → ...a.prism.walletsdk.castor/did/DIDParser.kt
diff --git a/...walletsdk/castor/did/DIDParserListener.kt → ...walletsdk.castor/did/DIDParserListener.kt b/...walletsdk/castor/did/DIDParserListener.kt → ...walletsdk.castor/did/DIDParserListener.kt
diff --git a/...rism/walletsdk/castor/did/DIDUrlParser.kt → ...rism.walletsdk.castor/did/DIDUrlParser.kt b/...rism/walletsdk/castor/did/DIDUrlParser.kt → ...rism.walletsdk.castor/did/DIDUrlParser.kt
@@ -32,7 +32,7 @@ object DIDUrlParser {
             did,
             listener.path ?: emptyArray(),
             listener.query,
-            listener.fragment
+            listener.fragment,
         )
     }
 }
diff --git a/...letsdk/castor/did/DIDUrlParserListener.kt → ...letsdk.castor/did/DIDUrlParserListener.kt b/...letsdk/castor/did/DIDUrlParserListener.kt → ...letsdk.castor/did/DIDUrlParserListener.kt
diff --git a/...ism/walletsdk/castor/did/ErrorStrategy.kt → ...ism.walletsdk.castor/did/ErrorStrategy.kt b/...ism/walletsdk/castor/did/ErrorStrategy.kt → ...ism.walletsdk.castor/did/ErrorStrategy.kt
diff --git a/...etsdk/castor/did/InvalidDIDStringError.kt → ...etsdk.castor/did/InvalidDIDStringError.kt b/...etsdk/castor/did/InvalidDIDStringError.kt → ...etsdk.castor/did/InvalidDIDStringError.kt
diff --git a/...k/castor/did/PrismDID/LongFormPrismDID.kt → ...k.castor/did/PrismDID/LongFormPrismDID.kt b/...k/castor/did/PrismDID/LongFormPrismDID.kt → ...k.castor/did/PrismDID/LongFormPrismDID.kt
@@ -1,6 +1,5 @@
-package io.iohk.atala.prism.walletsdk.castor.io.iohk.atala.prism.walletsdk.castor.did.prismdid
+package io.iohk.atala.prism.walletsdk.castor.did.prismdid
 
-import io.iohk.atala.prism.walletsdk.castor.did.prismdid.PrismDIDMethodId
 import io.iohk.atala.prism.walletsdk.domain.models.CastorError
 import io.iohk.atala.prism.walletsdk.domain.models.DID
 
@@ -12,7 +11,7 @@ LongFormPrismDID(val did: DID) {
 
     init {
         val methodId = PrismDIDMethodId(
-            did.methodId
+            did.methodId,
         )
 
         if (methodId.sections.size !== 2) {

diff --git a/...k/castor/did/PrismDID/PrismDIDMethodId.kt → ...k.castor/did/PrismDID/PrismDIDMethodId.kt b/...k/castor/did/PrismDID/PrismDIDMethodId.kt → ...k.castor/did/PrismDID/PrismDIDMethodId.kt
diff --git a/.../castor/did/PrismDID/PrismDIDPublicKey.kt → ....castor/did/PrismDID/PrismDIDPublicKey.kt b/.../castor/did/PrismDID/PrismDIDPublicKey.kt → ....castor/did/PrismDID/PrismDIDPublicKey.kt
@@ -17,7 +17,7 @@ class PrismDIDPublicKey {
         CAPABILITY_DELEGATION_KEY("capabilityDelegationKey"),
         CAPABILITY_INVOCATION_KEY("capabilityInvocationKey"),
         KEY_AGREEMENT_KEY("keyAgreementKey"),
-        UNKNOWN_KEY("unknownKey")
+        UNKNOWN_KEY("unknownKey"),
     }
 
     private val apollo: Apollo
@@ -53,8 +53,8 @@ class PrismDIDPublicKey {
             id = id,
             usage = usage.toProto(),
             keyData = io.iohk.atala.prism.protos.PublicKey.KeyData.CompressedEcKeyData(
-                compressed.toProto()
-            )
+                compressed.toProto(),
+            ),
         )
     }
 }
@@ -76,7 +76,7 @@ fun KeyUsage.fromProto(): PrismDIDPublicKey.Usage {
 fun CompressedPublicKey.toProto(): CompressedECKeyData {
     return CompressedECKeyData(
         curve = uncompressed.curve.curve.value,
-        data = ByteArr(value)
+        data = ByteArr(value),
     )
 }
 

diff --git a/...tor/resolvers/LongFormPrismDIDResolver.kt → ...tor/resolvers/LongFormPrismDIDResolver.kt b/...tor/resolvers/LongFormPrismDIDResolver.kt → ...tor/resolvers/LongFormPrismDIDResolver.kt
diff --git a/...etsdk/castor/resolvers/PeerDIDResolver.kt → ...etsdk.castor/resolvers/PeerDIDResolver.kt b/...etsdk/castor/resolvers/PeerDIDResolver.kt → ...etsdk.castor/resolvers/PeerDIDResolver.kt
diff --git a/...m/walletsdk/castor/shared/CastorShared.kt → ...m.walletsdk.castor/shared/CastorShared.kt b/...m/walletsdk/castor/shared/CastorShared.kt → ...m.walletsdk.castor/shared/CastorShared.kt
@@ -18,8 +18,8 @@ import io.iohk.atala.prism.mercury.didpeer.createPeerDIDNumalgo2
 import io.iohk.atala.prism.protos.AtalaOperation
 import io.iohk.atala.prism.walletsdk.castor.did.DIDParser
 import io.iohk.atala.prism.walletsdk.castor.did.DIDUrlParser
+import io.iohk.atala.prism.walletsdk.castor.did.prismdid.LongFormPrismDID
 import io.iohk.atala.prism.walletsdk.castor.did.prismdid.PrismDIDPublicKey
-import io.iohk.atala.prism.walletsdk.castor.io.iohk.atala.prism.walletsdk.castor.did.prismdid.LongFormPrismDID
 import io.iohk.atala.prism.walletsdk.domain.buildingBlocks.Apollo
 import io.iohk.atala.prism.walletsdk.domain.models.CastorError
 import io.iohk.atala.prism.walletsdk.domain.models.Curve
@@ -59,16 +59,16 @@ internal class CastorShared {
                     urls = arrayOf(didString),
                     verificationMethods = peerDIDDocument.authentication.map {
                         fromVerificationMethodPeerDID(didString, it)
-                    }.toTypedArray()
-                )
+                    }.toTypedArray(),
+                ),
             )
             coreProperties.add(
                 DIDDocument.KeyAgreement(
                     urls = arrayOf(didString),
                     verificationMethods = peerDIDDocument.keyAgreement.map {
                         fromVerificationMethodPeerDID(didString, it)
-                    }.toTypedArray()
-                )
+                    }.toTypedArray(),
+                ),
             )
 
             val peerDIDServices = peerDIDDocument.service ?: listOf()
@@ -84,30 +84,30 @@ internal class CastorShared {
                                 serviceEndpoint = DIDDocument.ServiceEndpoint(
                                     uri = service.serviceEndpoint,
                                     accept = service.accept.toTypedArray(),
-                                    routingKeys = service.routingKeys.toTypedArray()
-                                )
-                            )
+                                    routingKeys = service.routingKeys.toTypedArray(),
+                                ),
+                            ),
                         )
                     }
                 }
             }
 
             coreProperties.add(
                 DIDDocument.Services(
-                    services.toTypedArray()
-                )
+                    services.toTypedArray(),
+                ),
             )
 
             val did = DIDParser.parse(didString)
 
             return DIDDocument(
                 id = did,
-                coreProperties = coreProperties.toTypedArray()
+                coreProperties = coreProperties.toTypedArray(),
             )
         }
         fun fromVerificationMethodPeerDID(
             did: String,
-            verificationMethod: VerificationMethodPeerDID
+            verificationMethod: VerificationMethodPeerDID,
         ): DIDDocument.VerificationMethod {
             val didUrl = DIDUrlParser.parse(did)
             val controller = DIDParser.parse(verificationMethod.controller)
@@ -139,7 +139,7 @@ internal class CastorShared {
                         didUrl,
                         controller,
                         type,
-                        Json.decodeFromString<Map<String, String>>(verificationMethod.verMaterial.value as String)
+                        Json.decodeFromString<Map<String, String>>(verificationMethod.verMaterial.value as String),
                     )
                 }
 
@@ -149,7 +149,7 @@ internal class CastorShared {
                         controller,
                         type,
                         null,
-                        verificationMethod.verMaterial.value as String
+                        verificationMethod.verMaterial.value as String,
                     )
                 }
 
@@ -159,7 +159,7 @@ internal class CastorShared {
                         controller,
                         type,
                         null,
-                        verificationMethod.verMaterial.value as String
+                        verificationMethod.verMaterial.value as String,
                     )
                 }
             }
@@ -174,7 +174,7 @@ internal class CastorShared {
                     apollo = apollo,
                     did = did,
                     stateHash = prismDID.stateHash,
-                    encodedData = prismDID.encodedState.base64UrlDecodedBytes
+                    encodedData = prismDID.encodedState.base64UrlDecodedBytes,
                 )
             } catch (e: Throwable) {
                 // TODO: Add logger here
@@ -188,7 +188,7 @@ internal class CastorShared {
             val authenticate = verificationMethods.entries.map {
                 DIDDocument.Authentication(
                     urls = arrayOf(it.key),
-                    verificationMethods = verificationMethods.values.toTypedArray()
+                    verificationMethods = verificationMethods.values.toTypedArray(),
                 )
             }
 
@@ -201,7 +201,7 @@ internal class CastorShared {
 
             return DIDDocument(
                 id = did,
-                coreProperties = coreProperties.toTypedArray()
+                coreProperties = coreProperties.toTypedArray(),
             )
         }
         fun decodeState(
@@ -210,7 +210,6 @@ internal class CastorShared {
             stateHash: String,
             encodedData: ByteArray,
         ): Pair<Map<String, DIDDocument.VerificationMethod>, List<DIDDocument.Service>> {
-
             val sha256 = SHA256()
             val verifyEncodedState = sha256.digest(encodedData)
             val verifyEncodedStateHex = verifyEncodedState.toHexString()
@@ -234,22 +233,22 @@ internal class CastorShared {
                     it.id,
                     arrayOf(it.type),
                     DIDDocument.ServiceEndpoint(
-                        uri = it.serviceEndpoint.first()
-                    )
+                        uri = it.serviceEndpoint.first(),
+                    ),
                 )
             } ?: listOf()
 
             val verificationMethods =
                 publicKeys.fold(emptyMap<String, DIDDocument.VerificationMethod>()) { partialResult, publicKey ->
                     val didUrl = DIDUrl(
                         did = did,
-                        fragment = publicKey.id
+                        fragment = publicKey.id,
                     )
                     val method = DIDDocument.VerificationMethod(
                         id = didUrl,
                         controller = did,
                         type = publicKey.keyData.curve.curve.value,
-                        publicKeyMultibase = publicKey.keyData.value.base64Encoded
+                        publicKeyMultibase = publicKey.keyData.value.base64Encoded,
                     )
                     partialResult + (didUrl.string() to method)
                 }
@@ -270,15 +269,15 @@ internal class CastorShared {
                     it.publicKeyMultibase?.let { publicKey ->
                         PublicKey(
                             curve = KeyCurve(DIDDocument.VerificationMethod.getCurveByType(it.type)),
-                            value = publicKey.encodeToByteArray()
+                            value = publicKey.encodeToByteArray(),
                         )
                     }
                 }
         }
 
         fun createPeerDID(
             keyPairs: Array<KeyPair>,
-            services: Array<DIDDocument.Service>
+            services: Array<DIDDocument.Service>,
         ): DID {
             val encryptionKeys: MutableList<VerificationMaterialAgreement> = mutableListOf()
             val signingKeys: MutableList<VerificationMaterialAuthentication> = mutableListOf()
@@ -293,8 +292,8 @@ internal class CastorShared {
                                 VerificationMaterialAgreement(
                                     format = VerificationMaterialFormatPeerDID.MULTIBASE,
                                     value = it.publicKey.value.decodeToString(),
-                                    type = VerificationMethodTypeAgreement.X25519_KEY_AGREEMENT_KEY_2020
-                                )
+                                    type = VerificationMethodTypeAgreement.X25519_KEY_AGREEMENT_KEY_2020,
+                                ),
                             )
                         }
 
@@ -303,8 +302,8 @@ internal class CastorShared {
                                 VerificationMaterialAuthentication(
                                     format = VerificationMaterialFormatPeerDID.MULTIBASE,
                                     value = it.publicKey.value.decodeToString(),
-                                    type = VerificationMethodTypeAuthentication.ED25519_VERIFICATION_KEY_2020
-                                )
+                                    type = VerificationMethodTypeAuthentication.ED25519_VERIFICATION_KEY_2020,
+                                ),
                             )
                         }
 
@@ -329,10 +328,10 @@ internal class CastorShared {
                             type = it.type[0],
                             serviceEndpoint = it.serviceEndpoint.uri,
                             routingKeys = listOf(),
-                            accept = it.serviceEndpoint.accept?.asList() ?: listOf()
-                        ).toDict().toJsonElement()
+                            accept = it.serviceEndpoint.accept?.asList() ?: listOf(),
+                        ).toDict().toJsonElement(),
                     )
-                }.first()
+                }.first(),
             )
 
             return DIDParser.parse(peerDID)

diff --git a/...tala/prism/walletsdk/castor/CastorImpl.kt → ...tala.prism.walletsdk.castor/CastorImpl.kt b/...tala/prism/walletsdk/castor/CastorImpl.kt → ...tala.prism.walletsdk.castor/CastorImpl.kt
@@ -24,7 +24,7 @@ actual class CastorImpl actual constructor(apollo: Apollo) : Castor {
         this.apollo = apollo
         this.resolvers = arrayOf(
             PeerDIDResolver(),
-            LongFormPrismDIDResolver(this.apollo)
+            LongFormPrismDIDResolver(this.apollo),
         )
     }
 
@@ -34,18 +34,18 @@ actual class CastorImpl actual constructor(apollo: Apollo) : Castor {
 
     actual override fun createPrismDID(
         masterPublicKey: PublicKey,
-        services: Array<DIDDocument.Service>?
+        services: Array<DIDDocument.Service>?,
     ): DID {
         TODO("Not yet implemented")
     }
 
     actual override fun createPeerDID(
         keyPairs: Array<KeyPair>,
-        services: Array<DIDDocument.Service>
+        services: Array<DIDDocument.Service>,
     ): DID {
         return CastorShared.createPeerDID(
             keyPairs = keyPairs,
-            services = services
+            services = services,
         )
     }
 

diff --git a/...tor/resolvers/LongFormPrismDIDResolver.kt → ...tor/resolvers/LongFormPrismDIDResolver.kt b/...tor/resolvers/LongFormPrismDIDResolver.kt → ...tor/resolvers/LongFormPrismDIDResolver.kt
@@ -18,7 +18,7 @@ actual class LongFormPrismDIDResolver(
         return GlobalScope.promise {
             CastorShared.resolveLongFormPrismDID(
                 apollo = apollo,
-                didString = didString
+                didString = didString,
             )
         }
     }

diff --git a/...etsdk/castor/resolvers/PeerDIDResolver.kt → ...etsdk.castor/resolvers/PeerDIDResolver.kt b/...etsdk/castor/resolvers/PeerDIDResolver.kt → ...etsdk.castor/resolvers/PeerDIDResolver.kt
diff --git a/...walletsdk/domain/buildingBlocks/Castor.kt → ...walletsdk.domain/buildingBlocks/Castor.kt b/...walletsdk/domain/buildingBlocks/Castor.kt → ...walletsdk.domain/buildingBlocks/Castor.kt
@@ -9,12 +9,12 @@ actual interface Castor {
     actual fun parseDID(did: String): DID
     actual fun createPrismDID(
         masterPublicKey: PublicKey,
-        services: Array<DIDDocument.Service>?
+        services: Array<DIDDocument.Service>?,
     ): DID
 
     actual fun createPeerDID(
         keyPairs: Array<KeyPair>,
-        services: Array<DIDDocument.Service>
+        services: Array<DIDDocument.Service>,
     ): DID
 
     @Throws() // TODO: Add throw classes
@@ -24,6 +24,6 @@ actual interface Castor {
     suspend fun verifySignature(
         did: DID,
         challenge: ByteArray,
-        signature: ByteArray
+        signature: ByteArray,
     ): Boolean
 }
diff --git a/...in/src/allButJSMain/kotlin/io.iohk.atala.prism.walletsdk.domain/buildingBlocks/Mercury.kt b/...in/src/allButJSMain/kotlin/io.iohk.atala.prism.walletsdk.domain/buildingBlocks/Mercury.kt
@@ -0,0 +1,16 @@
+package io.iohk.atala.prism.walletsdk.domain.buildingBlocks
+
+import io.iohk.atala.prism.walletsdk.domain.models.Message
+
+actual interface Mercury {
+
+    actual fun packMessage(message: Message): String
+
+    actual fun unpackMessage(message: String): Message
+
+    @Throws() // TODO: Add throw classes
+    suspend fun sendMessage(message: Message): ByteArray?
+
+    @Throws() // TODO: Add throw classes
+    suspend fun sendMessageParseMessage(message: Message): Message?
+}
diff --git a/...sm/walletsdk/domain/models/DIDResolver.kt → ...sm.walletsdk.domain/models/DIDResolver.kt b/...sm/walletsdk/domain/models/DIDResolver.kt → ...sm.walletsdk.domain/models/DIDResolver.kt
diff --git a/...prism/walletsdk/domain/models/Platform.kt → ...prism.walletsdk.domain/models/Platform.kt b/...prism/walletsdk/domain/models/Platform.kt → ...prism.walletsdk.domain/models/Platform.kt