Update/scala did 0.1.0 m18

.github/workflows/integration-tests.yml

@@ -25,8 +25,8 @@ jobs:
       ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }}
       ATALA_GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }}
       REPORTS_DIR: "didcomm-v2-mediator-test-suite/target/site/serenity"
-      DIDCOMM_V2_TESTSUITE_VERSION: "13882b256bfdbe8ba738c2798dffc0ce25ca52e4"
-      MEDIATOR_DID: "did:peer:2.Ez6LSghwSE437wnDE1pt3X6hVDUQzSjsHzinpX3XFvMjRAm7y.Vz6Mkhh1e5CEYYq6JBUcTZ6Cp2ranCWRrv7Yax3Le4N59R6dd.SeyJ0IjoiZG0iLCJzIjoiaHR0cDovL2xvY2FsaG9zdDo4MDgwIiwiciI6W10sImEiOlsiZGlkY29tbS92MiJdfQ.SeyJ0IjoiZG0iLCJzIjoid3M6Ly9sb2NhbGhvc3Q6ODA4MC93cyIsInIiOltdLCJhIjpbImRpZGNvbW0vdjIiXX0"
+      DIDCOMM_V2_TESTSUITE_VERSION: "58e0f9684b5bc001703bb9a7972793978659809a"
+      MEDIATOR_DID: "did:peer:2.Ez6LSghwSE437wnDE1pt3X6hVDUQzSjsHzinpX3XFvMjRAm7y.Vz6Mkhh1e5CEYYq6JBUcTZ6Cp2ranCWRrv7Yax3Le4N59R6dd.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHA6Ly9sb2NhbGhvc3Q6ODA4MCIsImEiOlsiZGlkY29tbS92MiJdfX0.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6IndzOi8vbG9jYWxob3N0OjgwODAvd3MiLCJhIjpbImRpZGNvbW0vdjIiXX19"
     steps:
       - name: Checkout mediator
         uses: actions/checkout@v3

README.md

@@ -114,11 +114,14 @@ By default mediator will start on port 8080
 You can open the `http://localhost:8080/` URL in a web browser, and it will show a QR code that serves as an out-of-band invitation for the Mediator.
 
 ## How to run mediator as docker image
+
 ### Docker only
+
 It is possible to run everything with a single command with Docker compose docker-compose.yml
 The latest stable image version is available in the IOHK repositories.
-To build a docker image locally, run NODE_OPTIONS=--openssl-legacy-provider sbt docker:publishLocal.
-```
+To build a docker image locally, run `NODE_OPTIONS=--openssl-legacy-provider sbt docker:publishLocal`.
+
+```shell
 shell> cd atala-prism-mediator
 shell> NODE_OPTIONS=--openssl-legacy-provider sbt docker:publishLocal
 shell> MEDIATOR_VERSION=$(sbt "print mediator/version" --error) docker compose up

build.sbt

@@ -9,7 +9,7 @@ inThisBuild(
 
 /** Versions */
 lazy val V = new {
-  val scalaDID = "0.1.0-M16"
+  val scalaDID = "0.1.0-M18"
 
   // FIXME another bug in the test framework https://github.com/scalameta/munit/issues/554
   val munit = "1.0.0-M11" // "0.7.29"

make-trust-ping-example-kotlin.md

@@ -11,7 +11,7 @@ Using  Docker
 
 ```shell
 docker:publishLocal # Compile and create the mediator image
-docker compose up #docker run -p 8080:8080 ghcr.io/input-output-hk/mediator:0.1.0-SNAPSHOT
+docker-compose up #docker run -p 8080:8080 ghcr.io/input-output-hk/atala-prism-mediator:0.1.0-SNAPSHOT
 ```
 
 

make-trust-ping-example.md

@@ -5,7 +5,7 @@
 
 ```shell
 docker:publishLocal # Compile and create the mediator image
-docker compose up #docker run -p 8080:8080 ghcr.io/input-output-hk/mediator:0.1.0-SNAPSHOT
+docker-compose up #docker run -p 8080:8080 ghcr.io/input-output-hk/atala-prism-mediator:0.1.0-SNAPSHOT
 ```
 
 ## Run the client

mediator/src/main/scala/io/iohk/atala/mediator/MediatorStandalone.scala

@@ -25,7 +25,11 @@ import scala.io.Source
 case class MediatorConfig(endpoints: String, keyAgreement: OKPPrivateKey, keyAuthentication: OKPPrivateKey) {
   val did = DIDPeer2.makeAgent(
     Seq(keyAgreement, keyAuthentication),
-    endpoints.split(";").toSeq.map(e => DIDPeerServiceEncoded(s = e.toString))
+    endpoints
+      .split(";")
+      .toSeq
+      .map { endpoint => fmgp.util.Base64.encode(s"""{"t":"dm","s":{"uri":"$endpoint","a":["didcomm/v2"]}}""") }
+      .map(DIDPeerServiceEncodedNew(_))
   )
   val agentLayer: ZLayer[Any, Nothing, MediatorAgent] =
     ZLayer(MediatorAgent.make(id = did.id, keyStore = did.keyStore))

mediator/src/test/scala/io/iohk/atala/mediator/db/DidAccountStubSetup.scala

@@ -5,40 +5,50 @@ import fmgp.did.method.peer.{DIDPeer2, DIDPeerServiceEncoded}
 //import io.iohk.atala.mediator.db.AgentStub.{keyAgreement, keyAuthentication}
 import zio.json.*
 trait DidAccountStubSetup {
+
+  /** alice localhost 8080 (http + ws) in the new did peer format */
   val alice =
     DIDSubject(
-      "did:peer:2.Ez6LSghwSE437wnDE1pt3X6hVDUQzSjsHzinpX3XFvMjRAm7y.Vz6Mkhh1e5CEYYq6JBUcTZ6Cp2ranCWRrv7Yax3Le4N59R6dd.SeyJ0IjoiZG0iLCJzIjoiaHR0cDovL2xvY2FsaG9zdDo4MDgwIiwiciI6W10sImEiOlsiZGlkY29tbS92MiJdfQ"
+      "did:peer:2.Ez6LSghwSE437wnDE1pt3X6hVDUQzSjsHzinpX3XFvMjRAm7y.Vz6Mkhh1e5CEYYq6JBUcTZ6Cp2ranCWRrv7Yax3Le4N59R6dd.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHA6Ly9sb2NhbGhvc3Q6ODA4MCIsImEiOlsiZGlkY29tbS92MiJdfX0"
     )
+
+  /** bob (https://bob.did.fmgp.app/) in the new did peer format */
   val bob =
     DIDSubject(
-      "did:peer:2.Ez6LSkGy3e2z54uP4U9HyXJXRpaF2ytsnTuVgh6SNNmCyGZQZ.Vz6Mkjdwvf9hWc6ibZndW9B97si92DSk9hWAhGYBgP9kUFk8Z.SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9ib2IuZGlkLmZtZ3AuYXBwLyIsInIiOltdLCJhIjpbImRpZGNvbW0vdjIiXX0"
+      "did:peer:2.Ez6LSkGy3e2z54uP4U9HyXJXRpaF2ytsnTuVgh6SNNmCyGZQZ.Vz6Mkjdwvf9hWc6ibZndW9B97si92DSk9hWAhGYBgP9kUFk8Z.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHBzOi8vYm9iLmRpZC5mbWdwLmFwcC8iLCJhIjpbImRpZGNvbW0vdjIiXX19"
     )
 
+  /** trust-ping from Alice to Bob */
   val encryptedMessageAlice: Either[String, EncryptedMessage] =
     """{
-      |	"ciphertext": "L8wzawffzL7kbVyDcMiHgQMwlqLUqWDYOwH4f0VOFK7sJL8vO-H_JBDCADu7gvH1MDHdVJDXQmSv5dDXp6JYubagcSfBqyZGKGOQDQz-1Ir6-sqZ9K5xRPMt76dYbSswrxhaROVJvtAXyrTmN3KEv8SgP_vt8za5QU6B8cM6gp2CycJKoIhETnhVEVjHnrX0YcyzBsLhd-ZKb8e1Nlz_XSh-3cw1oIQMFjXHnU3PSjrqXcrC-4qSGpVVpHvMSOF3o2EbLGEpP-8UbI0psgSLd9a2VUF9xV55r7Bvn_zJp6tC3-KZKNLO0Rc2K-6JRgyyZjo7O_8aj7Ns6Lx0OjUXoKLiA6B79goHiv8qxJ04k5EWD_h8gt4M3_oByH_cVXH35RDK5SwNV6cVl6zRqiHUR9Ilivh6kfOLGqM2sXCKpXE78qRgHOBeOtl08JHFQO5oFkt1ob8iDqczX0nu-qwlckiibnPK1VvhFnmgLyc9lIUsi_xlCNKqIBZCKoi03xrjNobcM1dWFG7yE04nT-sSiakRNwVHBmNCyA5JhEFQ92d1xpXFGM1ojtiHCPkN5nqe7lMYVM2r7QFnN1xTHwaDWddKprW3vkz_RP7tpoPlWk6X8rLoYUvYc3MqNdbj91QMlho5rU472EX3gprIDeNV7VQiKWoAksFe1hdt62zLH8mJJjUZ3lyq4YjOmrqg7g6RArUWC6KbPgmnuJCqwigpjlwRUCBTPISzaZETAisyluIyuMW8QlRCSQdWnfPZAU2fpLBcviMODMzZTULECvRBef05Fvtd_xRCCbpKpDkGxAY",
-      |	"protected": "eyJlcGsiOnsia3R5IjoiT0tQIiwiY3J2IjoiWDI1NTE5IiwieCI6Ikp2TXhvYXZJaUxaUWVrNDA2eXNtWThQOGpkZGFHSjVIaVNRR0ltWHZWQ2MifSwiYXB2IjoiLWNOQ3l0eFVrSHpSRE5SckV2Vm05S0VmZzhZcUtQVnVVcVg1a0VLbU9yMCIsInNraWQiOiJkaWQ6cGVlcjoyLkV6NkxTa0d5M2UyejU0dVA0VTlIeVhKWFJwYUYyeXRzblR1VmdoNlNOTm1DeUdaUVouVno2TWtqZHd2ZjloV2M2aWJabmRXOUI5N3NpOTJEU2s5aFdBaEdZQmdQOWtVRms4Wi5TZXlKMElqb2laRzBpTENKeklqb2lhSFIwY0hNNkx5OWliMkl1Wkdsa0xtWnRaM0F1WVhCd0x5SXNJbklpT2x0ZExDSmhJanBiSW1ScFpHTnZiVzB2ZGpJaVhYMCM2TFNrR3kzZTJ6NTR1UDRVOUh5WEpYUnBhRjJ5dHNuVHVWZ2g2U05ObUN5R1pRWiIsImFwdSI6IlpHbGtPbkJsWlhJNk1pNUZlalpNVTJ0SGVUTmxNbm8xTkhWUU5GVTVTSGxZU2xoU2NHRkdNbmwwYzI1VWRWWm5hRFpUVGs1dFEzbEhXbEZhTGxaNk5rMXJhbVIzZG1ZNWFGZGpObWxpV201a1Z6bENPVGR6YVRreVJGTnJPV2hYUVdoSFdVSm5VRGxyVlVack9Gb3VVMlY1U2pCSmFtOXBXa2N3YVV4RFNucEphbTlwWVVoU01HTklUVFpNZVRscFlqSkpkVnBIYkd0TWJWcDBXak5CZFZsWVFuZE1lVWx6U1c1SmFVOXNkR1JNUTBwb1NXcHdZa2x0VW5CYVIwNTJZbGN3ZG1ScVNXbFlXREFqTmt4VGEwZDVNMlV5ZWpVMGRWQTBWVGxJZVZoS1dGSndZVVl5ZVhSemJsUjFWbWRvTmxOT1RtMURlVWRhVVZvIiwidHlwIjoiYXBwbGljYXRpb24vZGlkY29tbS1lbmNyeXB0ZWQranNvbiIsImVuYyI6IkEyNTZDQkMtSFM1MTIiLCJhbGciOiJFQ0RILTFQVStBMjU2S1cifQ",
-      |	"recipients": [{
-      |		"encrypted_key": "eFHcJkoUle7ZkksvZjvhJHLagF7y5B5gDQX11tc1kus2xa3Vn_QmzyVwFzScOHTCEjWRUe7r63rHBFBw0El2ukZW2tcitxr8",
-      |		"header": {
-      |			"kid": "did:peer:2.Ez6LSghwSE437wnDE1pt3X6hVDUQzSjsHzinpX3XFvMjRAm7y.Vz6Mkhh1e5CEYYq6JBUcTZ6Cp2ranCWRrv7Yax3Le4N59R6dd.SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9hbGljZS5kaWQuZm1ncC5hcHAvIiwiciI6W10sImEiOlsiZGlkY29tbS92MiJdfQ#6LSghwSE437wnDE1pt3X6hVDUQzSjsHzinpX3XFvMjRAm7y"
-      |		}
-      |	}],
-      |	"tag": "6MUE-lIZFVRId9qX-0If18EsPcfld_a3r2gQXXq4ms4",
-      |	"iv": "plEK7sqstAIkIxVKyfuuYg"
+      |  "ciphertext" : "1EIFz3Vc-5JJeWFLsPZXYtglzB9AeFu_KrazoUxW0aTaTDejhiZgaZoBib1ztjKPGCB7co7U76GgcAOo3kMqS7O_C3G_Kb5WsLoH8WlvUmJndrOsFaYJ2gWefjw2G9qIBWTP6vnNQ2srvn3w0tXhRf2CI9FxVYwPlN_ZAX9wQOnRSKhKWP-D7Srsqw7YRSQLg68dBNpo_Iyf-VhOs5CYgsvoY-Lo9EtEDGHb1VA-GANFIinLCATa7gKGm7G25i5ZuBdp3j_hVVFbhjOxPcBp15jgtVPNmBqSrJ7z8xEpZDmkUacR6YNQB6-aXRS4bFyBbpD3PiEjcNcrmRcea3BxJwnV3m9ye71fMsXPRFJfcm4K2yWHRXHC8WmJULK-a-Nx9c_DyeGbUjocCt97t5ZmFY_VbNTksWCcTrIo3btG3aYnJ1OwXp76QoNYQYPsO-zw-6ORUDU5EAcFmRya4tlL1gj1wz72OmylW4O2QOsmYTGXpqz6-HX17nzm2FNzW9HwxT7SeeUnogPztrnGpdV5zOaN46AU8uGXGsA-l55a2mUyA3Y8sCRPxbAAhnuvaxu3Jfkj7ChxxtAAWEB2jlWbf5i9KlDlmLLN98bCq3pHOLWIe42W4gym8T1khZDUXe4xpOEJJX5Gw0ZnCHqkk1IJ9QaEfBTCPH5T4vicLiE8AVY1gyjy7vd_Al8NyOIVmenPf-YaGU08rTXzj2T9EZBLF_0f5EYU6Uzhuk9Dr3LlQjisTNPMpq6BxolNFMN3l2FrrlzwmImU4QKJl9pU5Bsw5dRWFYgeq5g_BWCj-tMObU3QHDhNtck8wfb-Mf609vw5eGnwd8w_zY5oe04bvoU1GoxDoXIA4UWJOnbUYW4ciCyCB0_s6ZSk2sNdYqee7JozRp5b4OQ5OrA7TuKh1KBs0eEqTTwUdPFpkNOg9ex27VE",
+      |  "protected" : "eyJlcGsiOnsia3R5IjoiT0tQIiwiY3J2IjoiWDI1NTE5IiwieCI6Ik1GamVvT2FXb3ExeHBYOTgzMGI5MEdPN2lDWm52X3lVSENIQXV0VFh1MjQifSwiYXB2IjoiWHRocHNxZE52dEcwUFdmLXoxZm9LNFBiT1dybW1JMEhwTGh6NDFUX2N3USIsInNraWQiOiJkaWQ6cGVlcjoyLkV6NkxTZ2h3U0U0Mzd3bkRFMXB0M1g2aFZEVVF6U2pzSHppbnBYM1hGdk1qUkFtN3kuVno2TWtoaDFlNUNFWVlxNkpCVWNUWjZDcDJyYW5DV1JydjdZYXgzTGU0TjU5UjZkZC5TZXlKMElqb2laRzBpTENKeklqcDdJblZ5YVNJNkltaDBkSEE2THk5c2IyTmhiR2h2YzNRNk9EQTRNQ0lzSW1FaU9sc2laR2xrWTI5dGJTOTJNaUpkZlgwLlNleUowSWpvaVpHMGlMQ0p6SWpwN0luVnlhU0k2SW5kek9pOHZiRzlqWVd4b2IzTjBPamd3T0RBdmQzTWlMQ0poSWpwYkltUnBaR052YlcwdmRqSWlYWDE5I2tleS0xIiwiYXB1IjoiWkdsa09uQmxaWEk2TWk1RmVqWk1VMmRvZDFORk5ETTNkMjVFUlRGd2RETllObWhXUkZWUmVsTnFjMGg2YVc1d1dETllSblpOYWxKQmJUZDVMbFo2TmsxcmFHZ3haVFZEUlZsWmNUWktRbFZqVkZvMlEzQXljbUZ1UTFkU2NuWTNXV0Y0TTB4bE5FNDFPVkkyWkdRdVUyVjVTakJKYW05cFdrY3dhVXhEU25wSmFuQTNTVzVXZVdGVFNUWkpiV2d3WkVoQk5reDVPWE5pTWs1b1lrZG9kbU16VVRaUFJFRTBUVU5KYzBsdFJXbFBiSE5wV2tkc2Exa3lPWFJpVXpreVRXbEtaR1pZTUM1VFpYbEtNRWxxYjJsYVJ6QnBURU5LZWtscWNEZEpibFo1WVZOSk5rbHVaSHBQYVRoMllrYzVhbGxYZUc5aU0wNHdUMnBuZDA5RVFYWmtNMDFwVEVOS2FFbHFjR0pKYlZKd1drZE9kbUpYTUhaa2FrbHBXRmd4T1NOclpYa3RNUSIsInR5cCI6ImFwcGxpY2F0aW9uL2RpZGNvbW0tZW5jcnlwdGVkK2pzb24iLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIiwiYWxnIjoiRUNESC0xUFUrQTI1NktXIn0",
+      |  "recipients" : [
+      |    {
+      |      "encrypted_key" : "UKna2AYb5bH66LO8aATaObubaRgt3Eeu742p28-1YPl7irvY3SgopKRHJf1d3oYn0Gs2Kim_Zv5Y8CpJqCwAiPwtJ_qnSd9k",
+      |      "header" : {
+      |        "kid" : "did:peer:2.Ez6LSkGy3e2z54uP4U9HyXJXRpaF2ytsnTuVgh6SNNmCyGZQZ.Vz6Mkjdwvf9hWc6ibZndW9B97si92DSk9hWAhGYBgP9kUFk8Z.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHBzOi8vYm9iLmRpZC5mbWdwLmFwcC8iLCJhIjpbImRpZGNvbW0vdjIiXX19#key-1"
+      |      }
+      |    }
+      |  ],
+      |  "tag" : "uRH0gB3-fGvyqMulg9L9JbIVt4AIaeBJxRYhzuyhUlo",
+      |  "iv" : "G8MpH-4mTlA3s59nBmnfkw"
       |}""".stripMargin.fromJson[EncryptedMessage]
+
   val encryptedMessageBob: Either[String, EncryptedMessage] =
     """{
-     |	"ciphertext": "-dyjeU0aRQ8F87yAJFbOmmuon0UtEhQpmDQhYclMiTAqi06wH2bLTjtJNIOFG9sJ12uIyaQahPzCFBUyR2X22Oyl-1-Un0LOCAoRP584JuN19NdgKIytmSm4pg4VeSJ56SKO5D3Qe3G8XQa_7vO8O9-b_6V9mQXXZDkknNbphuiD7S53ss_VJzbgQVLRxkBrbnU1PL7yC6AhkAZNkUNCS8GGYbdEKFeRsdWjoROEnuQ1zzPN28eO3T4Wmt2APQ10vHum3Bl1RTiPRGCx3C-fSi05F-521jyP0rwyLeMZdBLruDz2IrUudtimFI3CKQ8_BcmuXTlLa1vw2hKlhk1_ppAmggW-qrjyZPiC9-XIN02OxZox5Xzba-cmg05Dj2zmEXryrxqFfyJlrV5FKSvWDfqeNAA9QNE0aUsgpKK9gOmu5pJRCuYNL96lbxdSCR4BiuX1G_ma2gagdIIY-70d22UPGcrZTw7Blet574i5U_bIDpZw4Az0UxoKNDbCDPOpn-Shojo5n_5FFbaPky0H0N99-9cx-Ns-3NMQecpupPQ9QJ-A2KWBTLYrJofLCBWv_ysqJ3Cde9fQ3xi5DTB13dhbxKVCgzdHKlwnqPC0C3mjFs_eZ1jnzBiUAKLvD_aWMwqx7y8GUhSfXlX3hImqtXaKBu2Koc1esUOvQwadHUj5pSmsNKJJcQLzsOcuYz8U9peRevrft3sy7fm9Ne2L3SSsoCFJP1N8U8bRLmyhY0CDuCNlvXxy_VFoSdPms40d1BNZObhgwO9Ca8kp1r0ITl22repvpMQYcQ83m9fkTXg",
-     |	"protected": "eyJlcGsiOnsia3R5IjoiT0tQIiwiY3J2IjoiWDI1NTE5IiwieCI6ImNKRzZVeVJRbnhOM2RCa3ZQcndmZXZabFBwRzA0SzFyTzZHTjdnQkNyVFUifSwiYXB2IjoiLWNOQ3l0eFVrSHpSRE5SckV2Vm05S0VmZzhZcUtQVnVVcVg1a0VLbU9yMCIsInNraWQiOiJkaWQ6cGVlcjoyLkV6NkxTa0d5M2UyejU0dVA0VTlIeVhKWFJwYUYyeXRzblR1VmdoNlNOTm1DeUdaUVouVno2TWtqZHd2ZjloV2M2aWJabmRXOUI5N3NpOTJEU2s5aFdBaEdZQmdQOWtVRms4Wi5TZXlKMElqb2laRzBpTENKeklqb2lhSFIwY0hNNkx5OWliMkl1Wkdsa0xtWnRaM0F1WVhCd0x5SXNJbklpT2x0ZExDSmhJanBiSW1ScFpHTnZiVzB2ZGpJaVhYMCM2TFNrR3kzZTJ6NTR1UDRVOUh5WEpYUnBhRjJ5dHNuVHVWZ2g2U05ObUN5R1pRWiIsImFwdSI6IlpHbGtPbkJsWlhJNk1pNUZlalpNVTJ0SGVUTmxNbm8xTkhWUU5GVTVTSGxZU2xoU2NHRkdNbmwwYzI1VWRWWm5hRFpUVGs1dFEzbEhXbEZhTGxaNk5rMXJhbVIzZG1ZNWFGZGpObWxpV201a1Z6bENPVGR6YVRreVJGTnJPV2hYUVdoSFdVSm5VRGxyVlVack9Gb3VVMlY1U2pCSmFtOXBXa2N3YVV4RFNucEphbTlwWVVoU01HTklUVFpNZVRscFlqSkpkVnBIYkd0TWJWcDBXak5CZFZsWVFuZE1lVWx6U1c1SmFVOXNkR1JNUTBwb1NXcHdZa2x0VW5CYVIwNTJZbGN3ZG1ScVNXbFlXREFqTmt4VGEwZDVNMlV5ZWpVMGRWQTBWVGxJZVZoS1dGSndZVVl5ZVhSemJsUjFWbWRvTmxOT1RtMURlVWRhVVZvIiwidHlwIjoiYXBwbGljYXRpb24vZGlkY29tbS1lbmNyeXB0ZWQranNvbiIsImVuYyI6IkEyNTZDQkMtSFM1MTIiLCJhbGciOiJFQ0RILTFQVStBMjU2S1cifQ",
-     |	"recipients": [{
-     |		"encrypted_key": "KCjv83os8FnpVaIUgcuYV-5TIw4VYuGIoHozQ0JVlIwK2sEkxwWg10yh0UlbbcnNVfF_OBr4OkJUczj7pB0spRhvjoDHBM_s",
-     |		"header": {
-     |			"kid": "did:peer:2.Ez6LSghwSE437wnDE1pt3X6hVDUQzSjsHzinpX3XFvMjRAm7y.Vz6Mkhh1e5CEYYq6JBUcTZ6Cp2ranCWRrv7Yax3Le4N59R6dd.SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9hbGljZS5kaWQuZm1ncC5hcHAvIiwiciI6W10sImEiOlsiZGlkY29tbS92MiJdfQ#6LSghwSE437wnDE1pt3X6hVDUQzSjsHzinpX3XFvMjRAm7y"
-     |		}
-     |	}],
-     |	"tag": "iR0meUd8R3X5dleMywNHq5NaGJ4g0h2tok414SJ7UGI",
-     |	"iv": "T-I0b4fIktFXVhAIFoSmQg"
-    |}""".stripMargin.fromJson[EncryptedMessage]
+      |  "ciphertext" : "vnxtXHZRAeP3s4_vqTLyXphlqb4s_pWXs42WuqDalio62mE9gZNAO4HcYHDMYMaYs4bfAV0flwXl1rv32MIHIu2toE5EkvfR9josZYq4ocYVMx0NpGCmqyJURfScp-8oJKvYe9A7Si_P7F7yMHZuuJFxSfA0i5bSPs0GGRoK4Zc_u8WCDr3O9kvZJ7YVAt6kwobmdIncORolq_hMpXAwqlaOxkJ-irAdIAq_qbutEhk9EviDtYkCmD1z0JC9RIKx4qMwcDZrt-1dVSXqaIKt2K84jyW_--Qz_3Ifq2aeO_9Led-PRRYQUVzMMFn_6n9sOmWxqWt3BQDinNLPGu9v6CiHAL8CpemjQMbjfsocTUpHg5kqlFd1llkIchfp0t1-7E7YfMfYRRRnJ6eAlJsP3VsnAP_qghA6iNYLoD20pwvGPqA7qsXUVHC059h3SknS6FQJzwiHRO56IXKQfErFOkFqdXwxK_6swHqHWP5gcCVi87ogxQaBVEXlCWjXtalA02lS-kXag8r6SQS8A4LB4xAJrA6W3JTuZD41-zkJaaw6Lg0f6WkJxrGdBEqlQi8HRmXW06eb5HFJg7QXTuRRXgUdM4BTPyjLUoAm-I-LpvRwSVYC_xDRpI5-v8FAgHkVat2jQzXuNrHrZeSb5pb_CYpy1Nz8WLESV3rGThI366SLbmhugga_qjcLv6MpHcHAwfUZuNC68JrlDsMh7rHQ-iCN8CAKnd8xygD2zdKWTkUkWlHIJEXBnmQgo-jZPYT4cq05dm8wK_EEqNPzYF5XwYS8DoHlatdI-boPNQjAClBkJE4pAOUbFh-MJ2re36aTjmuD0SmEIm54EXJskvQLz3YszKtnC8zjkHFqQ3Dh8Rgrmx7RGQmqKPMnEg4aYSJwNsSSmvyMYw8v2-ZkW_Qe-BQbB-yxDdQL_2lAdhDGcXeyByyiYP9wkr8yuaX6iS98",
+      |  "protected" : "eyJlcGsiOnsia3R5IjoiT0tQIiwiY3J2IjoiWDI1NTE5IiwieCI6InZjNi1WcG81SXRiUHcwVFRfSVMxX3plM1BWa0RlZ0ZuUWpvVGNkcWhwVTQifSwiYXB2IjoiM1ZUUW85TzUwakpOLWxBZ0JwSFFKTFYzTmVibE9uMklxSXZZS3U3UHQzbyIsInNraWQiOiJkaWQ6cGVlcjoyLkV6NkxTa0d5M2UyejU0dVA0VTlIeVhKWFJwYUYyeXRzblR1VmdoNlNOTm1DeUdaUVouVno2TWtqZHd2ZjloV2M2aWJabmRXOUI5N3NpOTJEU2s5aFdBaEdZQmdQOWtVRms4Wi5TZXlKMElqb2laRzBpTENKeklqcDdJblZ5YVNJNkltaDBkSEJ6T2k4dlltOWlMbVJwWkM1bWJXZHdMbUZ3Y0M4aUxDSmhJanBiSW1ScFpHTnZiVzB2ZGpJaVhYMTkja2V5LTEiLCJhcHUiOiJaR2xrT25CbFpYSTZNaTVGZWpaTVUydEhlVE5sTW5vMU5IVlFORlU1U0hsWVNsaFNjR0ZHTW5sMGMyNVVkVlpuYURaVFRrNXRRM2xIV2xGYUxsWjZOazFyYW1SM2RtWTVhRmRqTm1saVdtNWtWemxDT1RkemFUa3lSRk5yT1doWFFXaEhXVUpuVURsclZVWnJPRm91VTJWNVNqQkphbTlwV2tjd2FVeERTbnBKYW5BM1NXNVdlV0ZUU1RaSmJXZ3daRWhDZWs5cE9IWlpiVGxwVEcxU2NGcEROVzFpVjJSM1RHMUdkMk5ET0dsTVEwcG9TV3B3WWtsdFVuQmFSMDUyWWxjd2RtUnFTV2xZV0RFNUkydGxlUzB4IiwidHlwIjoiYXBwbGljYXRpb24vZGlkY29tbS1lbmNyeXB0ZWQranNvbiIsImVuYyI6IkEyNTZDQkMtSFM1MTIiLCJhbGciOiJFQ0RILTFQVStBMjU2S1cifQ",
+      |  "recipients" : [
+      |    {
+      |      "encrypted_key" : "CtMxsvs8c2WefiEqs83jTSVNekUhtbiddZTxRaMAc_wDgJ-ZmllZn63six7HvfkHQE25W8IyS-jCHdsaIa09xPqr4R7SzXCe",
+      |      "header" : {
+      |        "kid" : "did:peer:2.Ez6LSghwSE437wnDE1pt3X6hVDUQzSjsHzinpX3XFvMjRAm7y.Vz6Mkhh1e5CEYYq6JBUcTZ6Cp2ranCWRrv7Yax3Le4N59R6dd.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6Imh0dHA6Ly9sb2NhbGhvc3Q6ODA4MCIsImEiOlsiZGlkY29tbS92MiJdfX0.SeyJ0IjoiZG0iLCJzIjp7InVyaSI6IndzOi8vbG9jYWxob3N0OjgwODAvd3MiLCJhIjpbImRpZGNvbW0vdjIiXX19#key-1"
+      |      }
+      |    }
+      |  ],
+      |  "tag" : "PBWjww23CnAmuE-y-LxDMErye0mo5lO72Ox9d4vxzHA",
+      |  "iv" : "5p68gZa0ZPaWDG7OCnI8nQ"
+      |}""".stripMargin.fromJson[EncryptedMessage]
 
 }

mediator/src/test/scala/io/iohk/atala/mediator/protocols/MessageSetup.scala

@@ -1,14 +1,15 @@
 package io.iohk.atala.mediator.protocols
 
 import fmgp.did.comm.{EncryptedMessage, PlaintextMessage}
-import io.iohk.atala.mediator.db.UserAccountRepo
+import io.iohk.atala.mediator.db.*
 import reactivemongo.api.bson.BSONDocument
 import zio.ZIO
 import zio.json.*
 import fmgp.did.comm
 import reactivemongo.api.indexes.{Index, IndexType}
 import fmgp.did.DIDSubject
-trait MessageSetup {
+
+trait MessageSetup extends DidAccountStubSetup {
 
   val index = Index(
     key = Seq("alias" -> IndexType.Ascending),
@@ -30,9 +31,7 @@ trait MessageSetup {
     } yield {}
   }
 
-  val mediatorDid = DIDSubject(
-    "did:peer:2.Ez6LSkGy3e2z54uP4U9HyXJXRpaF2ytsnTuVgh6SNNmCyGZQZ.Vz6Mkjdwvf9hWc6ibZndW9B97si92DSk9hWAhGYBgP9kUFk8Z.SeyJ0IjoiZG0iLCJzIjoiaHR0cHM6Ly9ib2IuZGlkLmZtZ3AuYXBwLyIsInIiOltdLCJhIjpbImRpZGNvbW0vdjIiXX0"
-  )
+  def mediatorDid = bob
 
   val plaintextForwardNotEnrolledDidMessage: Either[String, PlaintextMessage] =
     """{
@@ -81,15 +80,15 @@ trait MessageSetup {
      |}""".stripMargin.fromJson[PlaintextMessage]
 
   val plaintextForwardEnrolledDidMessage: Either[String, PlaintextMessage] =
-    """{
+    s"""{
       |  "id" : "5fbd421d-a2d6-458e-a232-396411b7a793",
       |  "type" : "https://didcomm.org/routing/2.0/forward",
       |  "to" : [
-      |    "did:peer:2.Ez6LSghwSE437wnDE1pt3X6hVDUQzSjsHzinpX3XFvMjRAm7y.Vz6Mkhh1e5CEYYq6JBUcTZ6Cp2ranCWRrv7Yax3Le4N59R6dd.SeyJ0IjoiZG0iLCJzIjoiaHR0cDovL2xvY2FsaG9zdDo4MDgwIiwiciI6W10sImEiOlsiZGlkY29tbS92MiJdfQ"
+      |    "${alice}"
       |  ],
       |  "expires_time" : 987654321,
       |  "body" : {
-      |    "next" : "did:peer:2.Ez6LSghwSE437wnDE1pt3X6hVDUQzSjsHzinpX3XFvMjRAm7y.Vz6Mkhh1e5CEYYq6JBUcTZ6Cp2ranCWRrv7Yax3Le4N59R6dd.SeyJ0IjoiZG0iLCJzIjoiaHR0cDovL2xvY2FsaG9zdDo4MDgwIiwiciI6W10sImEiOlsiZGlkY29tbS92MiJdfQ"
+      |    "next" : "${alice}"
       |  },
       |  "attachments" : [
       |    {