Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(pollux): minor changes related to connect implementation #171

Merged
merged 37 commits into from
Nov 25, 2022
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
086f28a
Added first version of open api spec for connect
mineme0110 Nov 15, 2022
09b8f99
Added first version of open api spec for connect
mineme0110 Nov 15, 2022
2aa3f5b
Added protocol onnect
mineme0110 Nov 16, 2022
11773c4
updated the protocol connect
mineme0110 Nov 16, 2022
c39f3c5
Added the Agent for connect
mineme0110 Nov 17, 2022
188818c
chore(prism-agent): update OAS for Connect
bvoiturier Nov 18, 2022
26a7bb9
feat(prism-agent): add mock implementation for Connect OAS
bvoiturier Nov 18, 2022
6ac41b4
Merge branch 'main' into ATL-2287-OpenApiSpec-Connect
bvoiturier Nov 21, 2022
809ee86
chore(connect): Fix typo in class names
bvoiturier Nov 22, 2022
58a4d48
chore(prism-agent): return '201' when creating new connection record
bvoiturier Nov 22, 2022
5a6237f
chore(connect): bump mercury version to 0.7.0
bvoiturier Nov 22, 2022
9421235
chore(pollux): bump version to 0.4.0-SNAPSHOT
bvoiturier Nov 22, 2022
014e122
chore(pollux): bump mercury version to 0.7.0
bvoiturier Nov 22, 2022
9187287
chore(prism-agent): add connect dependency
bvoiturier Nov 22, 2022
61ae6b4
chore(connect): Fix typo in class names
bvoiturier Nov 22, 2022
2ee2ad8
chore(prism-agent): configure connect Api and DB layers
bvoiturier Nov 22, 2022
99e451f
Merge branch 'main' into ATL-2287-OpenApiSpec-Connect
bvoiturier Nov 22, 2022
8311a0e
chore(prism-agent): fix compilation warning
bvoiturier Nov 22, 2022
7196966
chore(connect): implement all phases of the connection flow
bvoiturier Nov 22, 2022
6c7fc58
chore(connect): decode and parse raw invitation in ConnectionService
bvoiturier Nov 23, 2022
a46c035
chore(prism-agent): align connect OAS with DIDComm v2 OOB invitation …
bvoiturier Nov 23, 2022
bb71650
chore(prism-agent): execute connect db migrations at startup
bvoiturier Nov 23, 2022
206f3e5
chore(prism-agent): add connect DB app config
bvoiturier Nov 23, 2022
dd7e870
feat(prism-agent): implement create/get connection(s) + accept invita…
bvoiturier Nov 23, 2022
ad7cee5
chore(connect): disable Doobie log handler
bvoiturier Nov 23, 2022
046b1f1
chore(connect): implement connection request acceptance by inviter
bvoiturier Nov 23, 2022
23d681f
chore(prism-agent): return 'myDid' and 'theirDid' in REST api reponse
bvoiturier Nov 23, 2022
e4132bc
feat(prism-agent): implement background job for Connect protocol
bvoiturier Nov 23, 2022
82b7026
feat(prism-agent): implement DIDComm service endpoint for Connect pro…
bvoiturier Nov 23, 2022
dc113dc
chore(prism-agent): improve code formatting
bvoiturier Nov 23, 2022
8364f74
Merge branch 'main' into ATL-2287-OpenApiSpec-Connect
bvoiturier Nov 25, 2022
6395306
chore(prism-agent): move connect API spec to server project
bvoiturier Nov 25, 2022
da2fb0f
chore(pollux): downgrade to shared 0.1.0
bvoiturier Nov 25, 2022
233128a
chore(connect): downgrade to shared 0.1.0
bvoiturier Nov 25, 2022
7fefbf2
chore(prism-agent): add removed connect dependency
bvoiturier Nov 25, 2022
1fe35bf
chore(pollux): split PR
bvoiturier Nov 25, 2022
ccbd97d
Merge branch 'main' into features/atl-2287-pollux-implementation
bvoiturier Nov 25, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.iohk.atala.mercury

import scala.jdk.CollectionConverters.*
import zio.*

import zio._
import zio.http._
Expand Down Expand Up @@ -47,14 +48,14 @@ object AgentCli extends ZIOAppDefault {
}

val startLogo = Console.printLine("""
| ███╗ ███╗███████╗██████╗ ██████╗██╗ ██╗██████╗ ██╗ ██╗ ██████╗██╗ ██╗
bvoiturier marked this conversation as resolved.
Show resolved Hide resolved
| ████╗ ████║██╔════╝██╔══██╗██╔════╝██║ ██║██╔══██╗╚██╗ ██╔╝ ██╔════╝██║ ██║
| ██╔████╔██║█████╗ ██████╔╝██║ ██║ ██║██████╔╝ ╚████╔╝ █████╗██║ ██║ ██║
| ██║╚██╔╝██║██╔══╝ ██╔══██╗██║ ██║ ██║██╔══██╗ ╚██╔╝ ╚════╝██║ ██║ ██║
| ██║ ╚═╝ ██║███████╗██║ ██║╚██████╗╚██████╔╝██║ ██║ ██║ ╚██████╗███████╗██║
| ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝╚═╝
|DID Comm V2 Agent - CLI tool for debugging - Build by Atala (IOHK)
|""".stripMargin)
| ███╗ ███╗███████╗██████╗ ██████╗██╗ ██╗██████╗ ██╗ ██╗ ██████╗██╗ ██╗
| ████╗ ████║██╔════╝██╔══██╗██╔════╝██║ ██║██╔══██╗╚██╗ ██╔╝ ██╔════╝██║ ██║
| ██╔████╔██║█████╗ ██████╔╝██║ ██║ ██║██████╔╝ ╚████╔╝ █████╗██║ ██║ ██║
| ██║╚██╔╝██║██╔══╝ ██╔══██╗██║ ██║ ██║██╔══██╗ ╚██╔╝ ╚════╝██║ ██║ ██║
| ██║ ╚═╝ ██║███████╗██║ ██║╚██████╗╚██████╔╝██║ ██║ ██║ ╚██████╗███████╗██║
| ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝╚═╝
|DID Comm V2 Agent - CLI tool for debugging - Build by Atala (IOHK)
|""".stripMargin)

// val env = zio.http.Client.default ++ zio.Scope.default

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ object InvitationPrograms {
"https://didcomm.org/out-of-band/2.0/invitation",
getNewMsgId,
merdiator.myDid,
Body("request-mediate", "RequestMediate", Seq("didcomm/v2", "didcomm/aip2;env=rfc587")),
None
Body("request-mediate", "RequestMediate", Seq("didcomm/v2", "didcomm/aip2;env=rfc587"))
)
_ <- ZIO.log(s"createInvitationV2 from '${merdiator.myDid}'")
result = invitation.asJson.deepDropNullValues
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ class OutOfBandSpec extends FunSuite {
"did:peer:2.Ez6LSmLmWmTvwjgLSuUaEQHdHSFWPwyibgzomWjFmnC6FhLnU.Vz6MktNgLh4N1u9KNhDiqe8KZ8bsLzLcqsifoNiUtBoSs9jxf.SeyJpZCI6Im5ldy1pZCIsInQiOiJkbSIsInMiOiJodHRwOi8vMTI3LjAuMC4xOjgwMDAiLCJhIjpbImRpZGNvbW0vdjIiXX0"
),
Body("request-mediate", "RequestMediate", Seq("didcomm/v2", "didcomm/aip2;env=rfc587")),
None
)

assertEquals(ret, Right(expected))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ See [https://github.com/hyperledger/aries-rfcs/tree/main/features/0454-present-p

## PIURI

Version 2.0: `https://didcomm.org/present-proof/2.0/propose-presentation`
bvoiturier marked this conversation as resolved.
Show resolved Hide resolved
Version 2.0: `https://didcomm.org/present-proof/3.0/propose-presentation`

Version 2.0: `https://didcomm.org/present-proof/2.0/request-presentation`
Version .0: `https://didcomm.org/present-proof/3.0/request-presentation`

Version 2.0: `https://didcomm.org/present-proof/2.0/presentation`
Version 3.0: `https://didcomm.org/present-proof/3.0/presentation`

### Roles

Expand Down
4 changes: 2 additions & 2 deletions pollux/lib/project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ object Dependencies {
val zioCatsInterop = "3.3.0"
val prismSdk = "v1.4.1"
val iris = "0.1.0"
val shared = "0.2.0"
val mercury = "0.6.0"
val shared = "0.1.0"
val mercury = "0.7.0"
val flyway = "9.7.0"
}

Expand Down
2 changes: 1 addition & 1 deletion pollux/lib/version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ThisBuild / version := "0.3.0-SNAPSHOT"
ThisBuild / version := "0.4.0-SNAPSHOT"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This need to be reverted

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess it will be overridden by the automated release process, no?

Copy link
Contributor

@FabioPinheiro FabioPinheiro Nov 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But the next version will be 0.5.0 instead of 0.4.0. No?