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.

Sign up for GitHub

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

build: internal dependency updates #1126

Merged
merged 5 commits into from
Jun 7, 2024
Merged

build: internal dependency updates #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9f8f97
Update apollo-jvm to 1.3.4 in main
hyperledger-bot Jun 2, 2024
b0e57f7
Merge branch 'main' into update/main/internal
Jun 6, 2024
02eb05c
Merge branch 'main' into update/main/internal
Jun 7, 2024
cf50dd3
chore: rename apollo pakcage after verion upgrade
Jun 7, 2024
d25aac2
Merge branch 'main' into update/main/internal
Jun 7, 2024
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
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 8 additions & 4 deletions ...erver/src/main/scala/org/hyperledger/identus/agent/server/jobs/BackgroundJobsHelper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
1 change: 0 additions & 1 deletion ...edger/identus/pollux/credentialdefinition/controller/CredentialDefinitionController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion ...g/hyperledger/identus/pollux/credentialschema/controller/CredentialSchemaController.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions ...in/scala/org/hyperledger/identus/verification/controller/http/VcVerificationRequest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
1 change: 0 additions & 1 deletion .../main/scala/org/hyperledger/identus/pollux/core/service/CredentialDefinitionService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions .../src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialSchemaService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions ...re/src/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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),
Expand Down
1 change: 0 additions & 1 deletion ...rc/main/scala/org/hyperledger/identus/pollux/core/service/CredentialServiceNotifier.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion ...re/src/main/scala/org/hyperledger/identus/pollux/core/service/MockCredentialService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions pollux/vc-jwt/src/main/scala/org/hyperledger/identus/pollux/vc/jwt/DidJWT.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions shared/crypto/src/main/scala/org/hyperledger/identus/shared/crypto/KmpApollo.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Loading