feat: Add Predicate and Attribute through API (#802)

Signed-off-by: Bassam Riman <[email protected]>
hyperledger · Dec 20, 2023 · b430d6c · b430d6c
1 parent d641d83
commit b430d6c
Show file tree

Hide file tree

Showing 20 changed files with 747 additions and 148 deletions.
diff --git a/build.sbt b/build.sbt
@@ -136,6 +136,7 @@ lazy val D = new {
     "com.github.dasniko" % "testcontainers-keycloak" % V.testContainersJavaKeycloak % Test
 
   val doobiePostgres: ModuleID = "org.tpolecat" %% "doobie-postgres" % V.doobie
+  val doobiePostgresCirce: ModuleID = "org.tpolecat" %% "doobie-postgres-circe" % V.doobie
   val doobieHikari: ModuleID = "org.tpolecat" %% "doobie-hikari" % V.doobie
   val flyway: ModuleID = "org.flywaydb" % "flyway-core" % V.flyway
 
@@ -152,7 +153,7 @@ lazy val D = new {
 
   // LIST of Dependencies
   val doobieDependencies: Seq[ModuleID] =
-    Seq(doobiePostgres, doobieHikari, flyway)
+    Seq(doobiePostgres, doobiePostgresCirce, doobieHikari, flyway)
 }
 
 lazy val D_Shared = new {

diff --git a/pollux/lib/anoncreds/src/main/scala/io/iohk/atala/pollux/anoncreds/Models.scala b/pollux/lib/anoncreds/src/main/scala/io/iohk/atala/pollux/anoncreds/Models.scala
@@ -1,6 +1,20 @@
 package io.iohk.atala.pollux.anoncreds
 
-import uniffi.anoncreds_wrapper.{Nonce, Credential as UniffiCredential, CredentialDefinition as UniffiCredentialDefinition, CredentialDefinitionPrivate as UniffiCredentialDefinitionPrivate, CredentialKeyCorrectnessProof as UniffiCredentialKeyCorrectnessProof, CredentialOffer as UniffiCredentialOffer, CredentialRequest as UniffiCredentialRequest, CredentialRequestMetadata as UniffiCredentialRequestMetadata, CredentialRequests as UniffiCredentialRequests, LinkSecret as UniffiLinkSecret, Presentation as UniffiPresentation, PresentationRequest as UniffiPresentationRequest, Schema as UniffiSchema}
+import uniffi.anoncreds_wrapper.{
+  Nonce,
+  Credential as UniffiCredential,
+  CredentialDefinition as UniffiCredentialDefinition,
+  CredentialDefinitionPrivate as UniffiCredentialDefinitionPrivate,
+  CredentialKeyCorrectnessProof as UniffiCredentialKeyCorrectnessProof,
+  CredentialOffer as UniffiCredentialOffer,
+  CredentialRequest as UniffiCredentialRequest,
+  CredentialRequestMetadata as UniffiCredentialRequestMetadata,
+  CredentialRequests as UniffiCredentialRequests,
+  LinkSecret as UniffiLinkSecret,
+  Presentation as UniffiPresentation,
+  PresentationRequest as UniffiPresentationRequest,
+  Schema as UniffiSchema
+}
 import zio.json.{DeriveJsonDecoder, DeriveJsonEncoder, JsonDecoder, JsonEncoder}
 
 import scala.jdk.CollectionConverters.*

diff --git a/pollux/lib/core/src/main/scala/io/iohk/atala/pollux/core/model/PresentationRecord.scala b/pollux/lib/core/src/main/scala/io/iohk/atala/pollux/core/model/PresentationRecord.scala
@@ -1,13 +1,13 @@
 package io.iohk.atala.pollux.core.model
 
-import io.iohk.atala.mercury.protocol.presentproof.ProposePresentation
-import io.iohk.atala.mercury.protocol.presentproof.RequestPresentation
-import io.iohk.atala.mercury.protocol.presentproof.Presentation
 import io.iohk.atala.mercury.model.DidId
+import io.iohk.atala.mercury.protocol.presentproof.{Presentation, ProposePresentation, RequestPresentation}
 
 import java.time.Instant
 import java.time.temporal.ChronoUnit
 
+type AnoncredCredentialProofs = zio.json.ast.Json
+
 final case class PresentationRecord(
     id: DidCommID,
     createdAt: Instant,
@@ -23,6 +23,8 @@ final case class PresentationRecord(
     proposePresentationData: Option[ProposePresentation],
     presentationData: Option[Presentation],
     credentialsToUse: Option[List[String]],
+    anoncredCredentialsToUseJsonSchemaId: Option[String],
+    anoncredCredentialsToUse: Option[AnoncredCredentialProofs],
     metaRetries: Int,
     metaNextRetry: Option[Instant],
     metaLastFailure: Option[String],

diff --git a/...b/core/src/main/scala/io/iohk/atala/pollux/core/model/schema/validator/SchemaSerDes.scala b/...b/core/src/main/scala/io/iohk/atala/pollux/core/model/schema/validator/SchemaSerDes.scala
@@ -12,10 +12,14 @@ class SchemaSerDes[S](jsonSchemaSchemaStr: String) {
   def initialiseJsonSchema: IO[JsonSchemaError, JsonSchema] =
     JsonSchemaUtils.jsonSchema(jsonSchemaSchemaStr)
 
-  def serialize(instance: S)(using encoder: JsonEncoder[S]): String = {
+  def serializeToJsonString(instance: S)(using encoder: JsonEncoder[S]): String = {
     instance.toJson
   }
 
+  def serialize(instance: S)(using encoder: JsonEncoder[S]): Either[String, Json] = {
+    instance.toJsonAST
+  }
+
   def deserialize(
       schema: zio.json.ast.Json
   )(using decoder: JsonDecoder[S]): IO[JsonSchemaError, S] = {

diff --git a/...lib/core/src/main/scala/io/iohk/atala/pollux/core/repository/PresentationRepository.scala b/...lib/core/src/main/scala/io/iohk/atala/pollux/core/repository/PresentationRepository.scala
@@ -51,6 +51,13 @@ trait PresentationRepository {
       protocolState: ProtocolState
   ): RIO[WalletAccessContext, Int]
 
+  def updateAnoncredPresentationWithCredentialsToUse(
+      recordId: DidCommID,
+      anoncredCredentialsToUseJsonSchemaId: Option[String],
+      anoncredCredentialsToUse: Option[AnoncredCredentialProofs],
+      protocolState: ProtocolState
+  ): RIO[WalletAccessContext, Int]
+
   def updateAfterFail(
       recordId: DidCommID,
       failReason: Option[String]

diff --git a/.../src/main/scala/io/iohk/atala/pollux/core/repository/PresentationRepositoryInMemory.scala b/.../src/main/scala/io/iohk/atala/pollux/core/repository/PresentationRepositoryInMemory.scala
@@ -1,11 +1,10 @@
 package io.iohk.atala.pollux.core.repository
 
-import io.iohk.atala.mercury.protocol.presentproof._
+import io.iohk.atala.mercury.protocol.presentproof.*
+import io.iohk.atala.pollux.core.model.*
 import io.iohk.atala.pollux.core.model.PresentationRecord.ProtocolState
-import io.iohk.atala.pollux.core.model._
-import io.iohk.atala.pollux.core.model.error.PresentationError._
-import io.iohk.atala.shared.models.WalletAccessContext
-import io.iohk.atala.shared.models.WalletId
+import io.iohk.atala.pollux.core.model.error.PresentationError.*
+import io.iohk.atala.shared.models.{WalletAccessContext, WalletId}
 import zio.*
 
 import java.time.Instant
@@ -114,6 +113,37 @@ class PresentationRepositoryInMemory(
     } yield count
   }
 
+  def updateAnoncredPresentationWithCredentialsToUse(
+      recordId: DidCommID,
+      anoncredCredentialsToUseJsonSchemaId: Option[String],
+      anoncredCredentialsToUse: Option[AnoncredCredentialProofs],
+      protocolState: ProtocolState
+  ): RIO[WalletAccessContext, Int] = {
+    for {
+      storeRef <- walletStoreRef
+      maybeRecord <- getPresentationRecord(recordId)
+      count <- maybeRecord
+        .map(record =>
+          for {
+            _ <- storeRef.update(r =>
+              r.updated(
+                recordId,
+                record.copy(
+                  updatedAt = Some(Instant.now),
+                  anoncredCredentialsToUseJsonSchemaId = anoncredCredentialsToUseJsonSchemaId,
+                  anoncredCredentialsToUse = anoncredCredentialsToUse,
+                  protocolState = protocolState,
+                  metaRetries = maxRetries,
+                  metaLastFailure = None,
+                )
+              )
+            )
+          } yield 1
+        )
+        .getOrElse(ZIO.succeed(0))
+    } yield count
+  }
+
   override def updateWithPresentation(
       recordId: DidCommID,
       presentation: Presentation,

diff --git a/...x/lib/core/src/main/scala/io/iohk/atala/pollux/core/service/MockPresentationService.scala b/...x/lib/core/src/main/scala/io/iohk/atala/pollux/core/service/MockPresentationService.scala
@@ -6,7 +6,7 @@ import io.iohk.atala.pollux.anoncreds.AnoncredPresentation
 import io.iohk.atala.pollux.core.model.error.PresentationError
 import io.iohk.atala.pollux.core.model.presentation.Options
 import io.iohk.atala.pollux.core.model.{DidCommID, PresentationRecord}
-import io.iohk.atala.pollux.core.service.serdes.AnoncredPresentationRequestV1
+import io.iohk.atala.pollux.core.service.serdes.{AnoncredCredentialProofsV1, AnoncredPresentationRequestV1}
 import io.iohk.atala.pollux.vc.jwt.{Issuer, PresentationPayload, W3cCredentialPayload}
 import io.iohk.atala.shared.models.WalletAccessContext
 import zio.mock.{Mock, Proxy}
@@ -45,6 +45,13 @@ object MockPresentationService extends Mock[PresentationService] {
 
   object AcceptRequestPresentation extends Effect[(DidCommID, Seq[String]), PresentationError, PresentationRecord]
 
+  object AcceptAnoncredRequestPresentation
+      extends Effect[
+        (DidCommID, AnoncredCredentialProofsV1),
+        PresentationError,
+        PresentationRecord
+      ]
+
   object RejectRequestPresentation extends Effect[DidCommID, PresentationError, PresentationRecord]
 
   object MarkPresentationGenerated extends Effect[(DidCommID, Presentation), PresentationError, PresentationRecord]
@@ -95,6 +102,12 @@ object MockPresentationService extends Mock[PresentationService] {
       ): IO[PresentationError, PresentationRecord] =
         proxy(AcceptRequestPresentation, (recordId, credentialsToUse))
 
+      override def acceptAnoncredRequestPresentation(
+          recordId: DidCommID,
+          credentialsToUse: AnoncredCredentialProofsV1
+      ): IO[PresentationError, PresentationRecord] =
+        proxy(AcceptAnoncredRequestPresentation, (recordId, credentialsToUse))
+
       override def rejectRequestPresentation(recordId: DidCommID): IO[PresentationError, PresentationRecord] =
         proxy(RejectRequestPresentation, recordId)
 
@@ -152,6 +165,7 @@ object MockPresentationService extends Mock[PresentationService] {
       override def createAnoncredPresentationPayloadFromRecord(
           record: DidCommID,
           issuer: Issuer,
+          anoncredCredentialProof: AnoncredCredentialProofsV1,
           issuanceDate: Instant
       ): IO[PresentationError, AnoncredPresentation] = ???
 

diff --git a/pollux/lib/core/src/main/scala/io/iohk/atala/pollux/core/service/PresentationService.scala b/pollux/lib/core/src/main/scala/io/iohk/atala/pollux/core/service/PresentationService.scala
@@ -6,7 +6,7 @@ import io.iohk.atala.pollux.anoncreds.AnoncredPresentation
 import io.iohk.atala.pollux.core.model.*
 import io.iohk.atala.pollux.core.model.error.PresentationError
 import io.iohk.atala.pollux.core.model.presentation.*
-import io.iohk.atala.pollux.core.service.serdes.AnoncredPresentationRequestV1
+import io.iohk.atala.pollux.core.service.serdes.{AnoncredCredentialProofsV1, AnoncredPresentationRequestV1}
 import io.iohk.atala.pollux.vc.jwt.*
 import io.iohk.atala.shared.models.WalletAccessContext
 import zio.*
@@ -16,7 +16,6 @@ import java.util as ju
 import java.util.UUID
 
 trait PresentationService {
-
   def extractIdFromCredential(credential: W3cCredentialPayload): Option[UUID]
 
   def createJwtPresentationRecord(
@@ -49,6 +48,7 @@ trait PresentationService {
   def createAnoncredPresentationPayloadFromRecord(
       record: DidCommID,
       issuer: Issuer,
+      anoncredCredentialProof: AnoncredCredentialProofsV1,
       issuanceDate: Instant
   ): ZIO[WalletAccessContext, PresentationError, AnoncredPresentation]
 
@@ -82,6 +82,11 @@ trait PresentationService {
       credentialsToUse: Seq[String]
   ): ZIO[WalletAccessContext, PresentationError, PresentationRecord]
 
+  def acceptAnoncredRequestPresentation(
+      recordId: DidCommID,
+      credentialsToUse: AnoncredCredentialProofsV1
+  ): ZIO[WalletAccessContext, PresentationError, PresentationRecord]
+
   def rejectRequestPresentation(recordId: DidCommID): ZIO[WalletAccessContext, PresentationError, PresentationRecord]
 
   def receiveProposePresentation(