build: internal dependency updates (#1126)

Signed-off-by: Hyperledger Bot <[email protected]> Signed-off-by: Pat Losoponkul <[email protected]> Co-authored-by: Hyperledger Bot <[email protected]> Co-authored-by: patlo-iog <[email protected]>
hyperledger · Jun 7, 2024 · d6e65e2 · d6e65e2
1 parent 22f0448
commit d6e65e2
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 24 deletions.
diff --git a/build.sbt b/build.sbt
@@ -84,7 +84,7 @@ lazy val V = new {
   val jwtCirceVersion = "9.4.6"
   val zioPreludeVersion = "1.0.0-RC24"
 
-  val apollo = "1.2.16"
+  val apollo = "1.3.4"
   val jsonSchemaValidator = "1.3.2" // scala-steward:off //TODO 1.3.2 need to fix:
   // [error] 	org.hyperledger.identus.pollux.core.model.schema.AnoncredSchemaTypeSpec
   // [error] 	org.hyperledger.identus.pollux.core.model.schema.CredentialSchemaSpec

diff --git a/...erver/src/main/scala/org/hyperledger/identus/agent/server/jobs/BackgroundJobsHelper.scala b/...erver/src/main/scala/org/hyperledger/identus/agent/server/jobs/BackgroundJobsHelper.scala
@@ -13,14 +13,18 @@ import org.hyperledger.identus.pollux.core.model.error.PresentationError
 import org.hyperledger.identus.pollux.sdjwt.SDJWT.*
 import org.hyperledger.identus.pollux.vc.jwt.{DIDResolutionFailed, DIDResolutionSucceeded, ES256KSigner, EdSigner, *}
 import org.hyperledger.identus.pollux.vc.jwt.{DidResolver as JwtDidResolver, Issuer as JwtIssuer}
-import org.hyperledger.identus.shared.crypto.{Ed25519KeyPair, Ed25519PublicKey, KmpEd25519KeyOps}
-import org.hyperledger.identus.shared.crypto.KmpEd25519KeyOps
-import org.hyperledger.identus.shared.crypto.Secp256k1KeyPair
-import org.hyperledger.identus.shared.crypto.X25519KeyPair
+import org.hyperledger.identus.shared.crypto.{
+  Ed25519KeyPair,
+  Ed25519PublicKey,
+  KmpEd25519KeyOps,
+  Secp256k1KeyPair,
+  X25519KeyPair
+}
 import org.hyperledger.identus.shared.models.WalletAccessContext
 import zio.{ZIO, ZLayer}
 
 import java.util.Base64
+
 trait BackgroundJobsHelper {
 
   def getLongForm(

diff --git a/...edger/identus/pollux/credentialdefinition/controller/CredentialDefinitionController.scala b/...edger/identus/pollux/credentialdefinition/controller/CredentialDefinitionController.scala
@@ -2,7 +2,6 @@ package org.hyperledger.identus.pollux.credentialdefinition.controller
 
 import org.hyperledger.identus.api.http.*
 import org.hyperledger.identus.api.http.model.{Order, Pagination}
-import org.hyperledger.identus.pollux.core.service.CredentialDefinitionServiceError
 import org.hyperledger.identus.pollux.credentialdefinition.http.{
   CredentialDefinitionInput,
   CredentialDefinitionResponse,

diff --git a/...g/hyperledger/identus/pollux/credentialschema/controller/CredentialSchemaController.scala b/...g/hyperledger/identus/pollux/credentialschema/controller/CredentialSchemaController.scala
@@ -2,7 +2,6 @@ package org.hyperledger.identus.pollux.credentialschema.controller
 
 import org.hyperledger.identus.api.http.*
 import org.hyperledger.identus.api.http.model.{Order, Pagination}
-import org.hyperledger.identus.pollux.core.service.CredentialSchemaServiceError
 import org.hyperledger.identus.pollux.credentialschema.http.{
   CredentialSchemaInput,
   CredentialSchemaResponse,

diff --git a/...in/scala/org/hyperledger/identus/verification/controller/http/VcVerificationRequest.scala b/...in/scala/org/hyperledger/identus/verification/controller/http/VcVerificationRequest.scala
@@ -4,9 +4,8 @@ import org.hyperledger.identus.api.http.{Annotation, ErrorResponse}
 import org.hyperledger.identus.pollux.core.service.verification.VcVerificationRequest as ServiceVcVerificationRequest
 import sttp.tapir.Schema
 import sttp.tapir.Schema.annotations.{description, encodedExample}
-import zio.{IO, *}
+import zio.*
 import zio.json.*
-import zio.json.{DeriveJsonDecoder, DeriveJsonEncoder, JsonDecoder, JsonEncoder}
 import zio.json.ast.Json
 import zio.json.ast.Json.*
 

diff --git a/.../main/scala/org/hyperledger/identus/pollux/core/service/CredentialDefinitionService.scala b/.../main/scala/org/hyperledger/identus/pollux/core/service/CredentialDefinitionService.scala
@@ -1,6 +1,5 @@
 package org.hyperledger.identus.pollux.core.service
 
-import org.hyperledger.identus.pollux.core.model.error.CredentialSchemaError
 import org.hyperledger.identus.pollux.core.model.schema.CredentialDefinition
 import org.hyperledger.identus.pollux.core.model.schema.CredentialDefinition.*
 import org.hyperledger.identus.shared.models.WalletAccessContext

diff --git a/.../src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialSchemaService.scala b/.../src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialSchemaService.scala
@@ -1,9 +1,8 @@
 package org.hyperledger.identus.pollux.core.service
 
-import org.hyperledger.identus.pollux.core.model.error.CredentialSchemaError
 import org.hyperledger.identus.pollux.core.model.schema.CredentialSchema
 import org.hyperledger.identus.pollux.core.model.schema.CredentialSchema.*
-import org.hyperledger.identus.shared.models.{Failure, StatusCode, WalletAccessContext}
+import org.hyperledger.identus.shared.models.WalletAccessContext
 import zio.{IO, ZIO}
 
 import java.util.UUID

diff --git a/...re/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImpl.scala b/...re/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImpl.scala
@@ -1,6 +1,5 @@
 package org.hyperledger.identus.pollux.core.service
 
-import com.nimbusds.jose.jwk.OctetKeyPair
 import io.circe.syntax.*
 import io.circe.Json
 import org.hyperledger.identus.agent.walletapi.model.{ManagedDIDState, PublicationState}
@@ -40,7 +39,6 @@ import zio.prelude.ZValidation
 import java.net.URI
 import java.rmi.UnexpectedException
 import java.time.{Instant, ZoneId}
-import java.time.temporal.ChronoUnit
 import java.util.UUID
 import scala.language.implicitConversions
 
@@ -609,7 +607,6 @@ private class CredentialServiceImpl(
     for {
       ed25519keyPair <- getEd25519SigningKeyPair(jwtIssuerDID, verificationRelationship)
     } yield {
-      val octetKeyPair = ed25519keyPair.toOctetKeyPair
       JwtIssuer(
         org.hyperledger.identus.pollux.vc.jwt.DID(jwtIssuerDID.toString),
         EdSigner(ed25519keyPair),

diff --git a/...rc/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceNotifier.scala b/...rc/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceNotifier.scala
@@ -9,7 +9,6 @@ import org.hyperledger.identus.pollux.core.model.{DidCommID, IssueCredentialReco
 import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
 import org.hyperledger.identus.shared.models.WalletAccessContext
 import zio.{Duration, IO, URLayer, ZIO, ZLayer}
-import zio.{IO, URLayer, ZIO, ZLayer}
 
 import java.util.UUID
 

diff --git a/...re/src/main/scala/org/hyperledger/identus/pollux/core/service/MockCredentialService.scala b/...re/src/main/scala/org/hyperledger/identus/pollux/core/service/MockCredentialService.scala
@@ -8,7 +8,6 @@ import org.hyperledger.identus.pollux.core.model.{DidCommID, IssueCredentialReco
 import org.hyperledger.identus.pollux.core.model.error.CredentialServiceError
 import org.hyperledger.identus.shared.models.WalletAccessContext
 import zio.{mock, Duration, IO, URLayer, ZIO, ZLayer}
-import zio.{mock, IO, URLayer, ZIO, ZLayer}
 import zio.mock.{Mock, Proxy}
 
 import java.util.UUID

diff --git a/pollux/vc-jwt/src/main/scala/org/hyperledger/identus/pollux/vc/jwt/DidJWT.scala b/pollux/vc-jwt/src/main/scala/org/hyperledger/identus/pollux/vc/jwt/DidJWT.scala
@@ -3,14 +3,13 @@ package org.hyperledger.identus.pollux.vc.jwt
 import com.nimbusds.jose.{JWSAlgorithm, JWSHeader}
 import com.nimbusds.jose.crypto.{ECDSASigner, Ed25519Signer}
 import com.nimbusds.jose.crypto.bc.BouncyCastleProviderSingleton
-import com.nimbusds.jose.jwk.{Curve, ECKey, OctetKeyPair}
+import com.nimbusds.jose.jwk.{Curve, ECKey}
 import com.nimbusds.jwt.{JWTClaimsSet, SignedJWT}
 import io.circe.*
 import org.hyperledger.identus.shared.crypto.Ed25519KeyPair
 import zio.*
 
 import java.security.*
-import java.util.Base64
 
 opaque type JWT = String
 

diff --git a/shared/crypto/src/main/scala/org/hyperledger/identus/shared/crypto/KmpApollo.scala b/shared/crypto/src/main/scala/org/hyperledger/identus/shared/crypto/KmpApollo.scala
@@ -1,10 +1,10 @@
 package org.hyperledger.identus.shared.crypto
 
-import io.iohk.atala.prism.apollo.derivation
-import io.iohk.atala.prism.apollo.derivation.MnemonicHelper
-import io.iohk.atala.prism.apollo.secp256k1.Secp256k1Lib
-import io.iohk.atala.prism.apollo.securerandom.SecureRandom
-import io.iohk.atala.prism.apollo.utils.{
+import org.hyperledger.identus.apollo.derivation
+import org.hyperledger.identus.apollo.derivation.MnemonicHelper
+import org.hyperledger.identus.apollo.secp256k1.Secp256k1Lib
+import org.hyperledger.identus.apollo.securerandom.SecureRandom
+import org.hyperledger.identus.apollo.utils.{
   KMMECSecp256k1PrivateKey,
   KMMECSecp256k1PublicKey,
   KMMEdKeyPair,