feat: add support for EcdsaSecp256k1Signature2019Proof and fix pk encoding for EddsaJcs2022Proof

build.sbt

@@ -122,6 +122,9 @@ lazy val D = new {
 
   val jwtCirce = "com.github.jwt-scala" %% "jwt-circe" % V.jwtCirceVersion
   val jsonCanonicalization: ModuleID = "io.github.erdtman" % "java-json-canonicalization" % "1.1"
+  val titaniumJsonLd: ModuleID = "com.apicatalog" % "titanium-json-ld" % "1.4.0"
+  val jakartaJson: ModuleID = "org.glassfish" % "jakarta.json" % "2.0.1"
+  val ironVC: ModuleID = "com.apicatalog" % "iron-verifiable-credentials" % "0.14.0"
   val scodecBits: ModuleID = "org.scodec" %% "scodec-bits" % "1.1.38"
 
   // https://mvnrepository.com/artifact/org.didcommx/didcomm/0.3.2
@@ -184,6 +187,9 @@ lazy val D_Shared = new {
       D.zioCatsInterop,
       D.zioPrelude,
       D.jsonCanonicalization,
+      D.titaniumJsonLd,
+      D.jakartaJson,
+      D.ironVC,
       D.scodecBits,
     )
 }

cloud-agent/service/server/src/main/scala/org/hyperledger/identus/credentialstatus/controller/http/StatusListCredential.scala

@@ -38,9 +38,6 @@ case class StatusListCredential(
 )
 
 case class CredentialSubject(
-    @description(annotations.credentialSubject.id.description)
-    @encodedExample(annotations.credentialSubject.id.example)
-    id: String,
     @description(annotations.credentialSubject.`type`.description)
     @encodedExample(annotations.credentialSubject.`type`.example)
     `type`: String,

pollux/core/src/main/scala/org/hyperledger/identus/pollux/core/repository/CredentialStatusListRepositoryInMemory.scala

@@ -102,7 +102,6 @@ class CredentialStatusListRepositoryInMemory(
       emptyJwtCredential <- VCStatusList2021
         .build(
           vcId = s"$statusListRegistryUrl/credential-status/$id",
-          slId = "",
           revocationData = bitString,
           jwtIssuer = jwtIssuer
         )

pollux/sql-doobie/src/main/scala/org/hyperledger/identus/pollux/sql/repository/JdbcCredentialStatusListRepository.scala

@@ -92,7 +92,6 @@ class JdbcCredentialStatusListRepository(xa: Transactor[ContextAwareTask], xb: T
       emptyStatusListCredential <- VCStatusList2021
         .build(
           vcId = s"$statusListRegistryUrl/credential-status/$id",
-          slId = "",
           revocationData = bitString,
           jwtIssuer = jwtIssuer
         )

pollux/vc-jwt/src/main/scala/org/hyperledger/identus/pollux/vc/jwt/DidJWT.scala

@@ -11,6 +11,9 @@ import org.hyperledger.identus.shared.models.KeyId
 import zio.*
 
 import java.security.*
+import java.security.interfaces.ECPublicKey
+import java.util.Base64
+import scala.jdk.CollectionConverters.*
 
 opaque type JWT = String
 
@@ -53,7 +56,11 @@ class ES256KSigner(privateKey: PrivateKey, keyId: Option[KeyId] = None) extends
   }
 
   override def generateProofForJson(payload: Json, pk: PublicKey): Task[Proof] = {
-    EcdsaJcs2019ProofGenerator.generateProof(payload, privateKey, pk)
+    val err = Throwable("Public key must be secp256k1 EC public key")
+    pk match
+      case pk: ECPublicKey =>
+        EcdsaSecp256k1Signature2019ProofGenerator.generateProof(payload, signer, pk)
+      case _ => ZIO.fail(err)
   }
 
   override def encode(claim: Json): JWT = {

pollux/vc-jwt/src/main/scala/org/hyperledger/identus/pollux/vc/jwt/DidResolver.scala

@@ -12,7 +12,6 @@ import org.hyperledger.identus.castor.core.model.did.w3c.{
 }
 import org.hyperledger.identus.castor.core.service.DIDService
 import zio.*
-import zio.json.{DeriveJsonDecoder, DeriveJsonEncoder, JsonDecoder, JsonEncoder}
 
 import java.time.Instant
 import scala.annotation.unused
@@ -79,24 +78,7 @@ case class VerificationMethod(
     blockchainAccountId: Option[String] = Option.empty,
     ethereumAddress: Option[String] = Option.empty
 )
-case class JsonWebKey(
-    alg: Option[String] = Option.empty,
-    crv: Option[String] = Option.empty,
-    e: Option[String] = Option.empty,
-    d: Option[String] = Option.empty,
-    ext: Option[Boolean] = Option.empty,
-    key_ops: Vector[String] = Vector.empty,
-    kid: Option[String] = Option.empty,
-    kty: String,
-    n: Option[String] = Option.empty,
-    use: Option[String] = Option.empty,
-    x: Option[String] = Option.empty,
-    y: Option[String] = Option.empty
-)
-object JsonWebKey {
-  given encoder: JsonEncoder[JsonWebKey] = DeriveJsonEncoder.gen[JsonWebKey]
-  given decoder: JsonDecoder[JsonWebKey] = DeriveJsonDecoder.gen[JsonWebKey]
-}
+
 case class Service(id: String, `type`: String | Seq[String], serviceEndpoint: Json)
 
 /** An adapter for translating Castor resolver to resolver defined in JWT library */

pollux/vc-jwt/src/main/scala/org/hyperledger/identus/pollux/vc/jwt/EcdsaSecp256k1VerificationKey2019.scala

@@ -0,0 +1,50 @@
+package org.hyperledger.identus.pollux.vc.jwt
+
+import io.circe.*
+import io.circe.syntax.*
+
+import java.time.Instant
+import java.time.ZoneOffset
+
+case class EcdsaSecp256k1VerificationKey2019(
+    publicKeyJwk: JsonWebKey,
+    id: Option[String] = None,
+    controller: Option[String] = None,
+    expires: Option[Instant] = None
+) {
+  val `type`: String = "EcdsaSecp256k1VerificationKey2019"
+  val `@context`: Set[String] =
+    Set("https://w3id.org/security/v1")
+}
+
+object EcdsaSecp256k1VerificationKey2019 {
+  given ecdsaSecp256k1VerificationKey2019Encoder: Encoder[EcdsaSecp256k1VerificationKey2019] =
+    (key: EcdsaSecp256k1VerificationKey2019) =>
+      Json
+        .obj(
+          ("@context", key.`@context`.asJson),
+          ("type", key.`type`.asJson),
+          ("id", key.id.asJson),
+          ("controller", key.controller.asJson),
+          ("publicKeyJwk", key.publicKeyJwk.asJson.dropNullValues),
+          ("expires", key.expires.map(_.atOffset(ZoneOffset.UTC)).asJson)
+        )
+
+  given ecdsaSecp256k1VerificationKey2019Decoder: Decoder[EcdsaSecp256k1VerificationKey2019] =
+    (c: HCursor) =>
+      for {
+        id <- c.downField("id").as[Option[String]]
+        `type` <- c.downField("type").as[String]
+        controller <- c.downField("controller").as[Option[String]]
+        publicKeyJwk <- c.downField("publicKeyJwk").as[JsonWebKey]
+        expires <- c.downField("expires").as[Option[Instant]]
+      } yield {
+        EcdsaSecp256k1VerificationKey2019(
+          id = id,
+          publicKeyJwk = publicKeyJwk,
+          controller = controller,
+          expires = expires
+        )
+      }
+
+}

pollux/vc-jwt/src/main/scala/org/hyperledger/identus/pollux/vc/jwt/JsonWebKey.scala

@@ -0,0 +1,32 @@
+package org.hyperledger.identus.pollux.vc.jwt
+
+import io.circe.*
+import io.circe.generic.semiauto.*
+import io.circe.syntax.*
+import zio.json.{DeriveJsonDecoder, DeriveJsonEncoder, JsonDecoder, JsonEncoder}
+
+case class JsonWebKey(
+    alg: Option[String] = Option.empty,
+    crv: Option[String] = Option.empty,
+    e: Option[String] = Option.empty,
+    d: Option[String] = Option.empty,
+    ext: Option[Boolean] = Option.empty,
+    key_ops: Vector[String] = Vector.empty,
+    kid: Option[String] = Option.empty,
+    kty: String,
+    n: Option[String] = Option.empty,
+    use: Option[String] = Option.empty,
+    x: Option[String] = Option.empty,
+    y: Option[String] = Option.empty
+)
+
+object JsonWebKey {
+  given jsonWebKeyEncoderCirce: Encoder[JsonWebKey] = deriveEncoder[JsonWebKey]
+
+  given jsonWebKeyDecoderCirce: Decoder[JsonWebKey] = deriveDecoder[JsonWebKey]
+
+  given jsonWebKeyEncoderCirceZioJson: JsonEncoder[JsonWebKey] = DeriveJsonEncoder.gen[JsonWebKey]
+
+  given jsonWebKeyDecoderCirceZioJson: JsonDecoder[JsonWebKey] = DeriveJsonDecoder.gen[JsonWebKey]
+
+}