Skip to content

Commit 48a7856

Browse files
FabioPinheiroFabioPinheiro
committed
push everything commit
1 parent 11935fd commit 48a7856

File tree

15 files changed

+78
-75
lines changed

15 files changed

+78
-75
lines changed

‎common/src/main/scala/identus/apollo/Apollo.scala

+4
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,10 @@ final case class ECPoint(x: BigInt, y: BigInt)
152152

153153
// secp256k1
154154
final case class Secp256k1KeyPair(publicKey: Secp256k1PublicKey, privateKey: Secp256k1PrivateKey) extends MyKeyPair
155+
156+
object Secp256k1KeyPair {
157+
def generateKeyPair: Secp256k1KeyPair = ???
158+
}
155159
trait Secp256k1PublicKey extends PublicKey with Verifiable {
156160
def getEncodedCompressed: Array[Byte]
157161

‎common/src/main/scala/io/iohk/atala/prism/auth/utils/DIDUtils.scala

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ object DIDUtils {
5252
}
5353
}
5454

55+
// FIXME ECConfig.getCURVE_NAME
5556
private def verifyPublicKey(
5657
curve: String,
5758
publicKey: ECPublicKey

‎common/src/test/scala/io/iohk/atala/prism/DIDUtil.scala

+19-18
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import com.google.protobuf.ByteString
44
import io.iohk.atala.prism.auth.SignedRpcRequest
55
import io.iohk.atala.prism.crypto.{Sha256, Sha256Digest}
66
import io.iohk.atala.prism.crypto.EC.{INSTANCE => EC}
7-
import io.iohk.atala.prism.crypto.keys.{ECKeyPair, ECPublicKey}
8-
import io.iohk.atala.prism.crypto.ECConfig.{INSTANCE => ECConfig}
97
import io.iohk.atala.prism.identity.{PrismDid => DID}
108
import io.iohk.atala.prism.identity.PrismDid.{getDEFAULT_MASTER_KEY_ID => masterKeyId}
119
import io.iohk.atala.prism.protos.node_api.{GetDidDocumentRequest, GetDidDocumentResponse}
@@ -14,22 +12,25 @@ import io.iohk.atala.prism.protos.node_models
1412
import io.iohk.atala.prism.protos.node_models.DIDData
1513
import org.mockito.IdiomaticMockito._
1614
import scalapb.GeneratedMessage
15+
import identus.apollo.PublicKey
1716

1817
import scala.concurrent.Future
18+
import identus.apollo.MyKeyPair
19+
import identus.apollo.Secp256k1KeyPair
1920

2021
trait DIDUtil {
2122
protected def nodeMock: NodeService
2223

23-
private def publicKeyToProto(key: ECPublicKey): node_models.ECKeyData = {
24-
val point = key.getCurvePoint
24+
private def publicKeyToProto(key: PublicKey): node_models.ECKeyData = {
25+
val point = key.toCurvePoint
2526
node_models.ECKeyData(
26-
curve = ECConfig.getCURVE_NAME,
27-
x = ByteString.copyFrom(point.getX.bytes()),
28-
y = ByteString.copyFrom(point.getY.bytes())
27+
curve = key.curveName,
28+
x = ByteString.copyFrom(point.x),
29+
y = ByteString.copyFrom(point.y)
2930
)
3031
}
3132

32-
def generateDid(masterPublicKey: ECPublicKey): DID = {
33+
def generateDid(masterPublicKey: PublicKey): DID = {
3334
val publicKey = node_models.PublicKey(
3435
id = masterKeyId,
3536
usage = node_models.KeyUsage.MASTER_KEY,
@@ -65,22 +66,22 @@ trait DIDUtil {
6566

6667
def prepareSignedRequest[R <: GeneratedMessage](
6768
request: R
68-
): (ECPublicKey, SignedRpcRequest[R]) = {
69-
val keys = EC.generateKeyPair()
70-
val did = generateDid(keys.getPublicKey)
71-
(keys.getPublicKey, SignedRpcRequest.generate(keys, did, request))
69+
): (PublicKey, SignedRpcRequest[R]) = {
70+
val keys = Secp256k1KeyPair.generateKeyPair
71+
val did = generateDid(keys.publicKey)
72+
(keys.publicKey, SignedRpcRequest.generate(keys, did, request))
7273
}
7374

7475
def prepareSignedUnpublishedDidRequest[R <: GeneratedMessage](
7576
request: R
76-
): (ECPublicKey, SignedRpcRequest[R]) = {
77-
val keys = EC.generateKeyPair()
78-
val did = DID.buildLongFormFromMasterPublicKey(keys.getPublicKey)
79-
(keys.getPublicKey, SignedRpcRequest.generate(keys, did, request))
77+
): (PublicKey, SignedRpcRequest[R]) = {
78+
val keys = MyKeyPair.generateKeyPair
79+
val did = DID.buildLongFormFromMasterPublicKey(keys.publicKey)
80+
(keys.publicKey, SignedRpcRequest.generate(keys, did, request))
8081
}
8182

82-
def createDid: (ECKeyPair, DID) = {
83-
val keyPair = EC.generateKeyPair()
83+
def createDid: (KeyPair, DID) = {
84+
val keyPair = MyKeyPair.generateKeyPair
8485
val publicKey = keyPair.getPublicKey
8586
val did = generateDid(publicKey)
8687
(keyPair, did)

‎common/src/test/scala/io/iohk/atala/prism/auth/SignedRpcRequest.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package io.iohk.atala.prism.auth
22

33
import io.iohk.atala.prism.auth
44
import io.iohk.atala.prism.crypto.EC.{INSTANCE => EC}
5-
import io.iohk.atala.prism.crypto.keys.ECKeyPair
65
import io.iohk.atala.prism.crypto.signature.ECSignature
76
import io.iohk.atala.prism.identity.{PrismDid => DID}
87
import scalapb.GeneratedMessage
8+
import identus.apollo.Secp256k1KeyPair
99

1010
import java.util.UUID
1111

@@ -19,11 +19,11 @@ final case class SignedRpcRequest[R <: GeneratedMessage](
1919

2020
object SignedRpcRequest {
2121
def generate[R <: GeneratedMessage](
22-
keyPair: ECKeyPair,
22+
keyPair: Secp256k1KeyPair,
2323
did: DID,
2424
request: R
2525
): SignedRpcRequest[R] = {
26-
val privateKey = keyPair.getPrivateKey
26+
val privateKey = keyPair.privateKey
2727
val requestNonce = UUID.randomUUID().toString.getBytes.toVector
2828
val signature = EC.signBytes(
2929
auth.model.RequestNonce(requestNonce).mergeWith(request.toByteArray).toArray,

‎node/src/main/scala/io/iohk/atala/prism/node/repositories/daos/PublicKeysDAO.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import java.time.Instant
1414

1515
object PublicKeysDAO {
1616
def insert(key: DIDPublicKey, ledgerData: LedgerData): ConnectionIO[Unit] = {
17-
val curveName = ECConfig.getCURVE_NAME
17+
val curveName = ECConfig.getCURVE_NAME // FIXME
1818

1919
// The Master key must be of the type Secp256k1
2020
val companion = new io.iohk.atala.prism.apollo.utils.KMMECSecp256k1PublicKey.Companion

‎node/src/main/scala/io/iohk/atala/prism/node/repositories/daos/package.scala

+2-4
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,12 @@ package object daos extends BaseDAO {
8686
Option[Int]
8787
)
8888
].contramap { key =>
89-
val curveName = ECConfig.getCURVE_NAME
90-
val compressed = key.key.getEncodedCompressed
9189
(
9290
key.didSuffix,
9391
key.keyId,
9492
key.keyUsage,
95-
curveName,
96-
compressed,
93+
key.key.curveName,
94+
key.key.getEncodedCompressed,
9795
key.addedOn.timestampInfo.getAtalaBlockTimestamp.toInstant,
9896
key.addedOn.timestampInfo.getAtalaBlockSequenceNumber,
9997
key.addedOn.timestampInfo.getOperationSequenceNumber,

‎node/src/test/scala/io/iohk/atala/prism/node/migrations/V19MigrationSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class V19MigrationSpec extends PostgresMigrationSpec("db.migration.V19") with Ba
3939
)
4040

4141
private def insertPublicKey(key: DIDPublicKey, ledgerData: LedgerData) = {
42-
val curveName = ECConfig.getCURVE_NAME
42+
val curveName = key.key.curveName
4343
val point = key.key.toCurvePoint
4444
val addedOn = ledgerData.timestampInfo
4545
sql"""

‎node/src/test/scala/io/iohk/atala/prism/node/poc/EncodedSizes.scala

+12-13
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ package io.iohk.atala.prism.node.poc
22

33
import java.util.Base64
44
import com.google.protobuf.ByteString
5-
import io.iohk.atala.prism.crypto.EC.{INSTANCE => EC}
6-
import io.iohk.atala.prism.crypto.keys.ECPublicKey
7-
import io.iohk.atala.prism.crypto.ECConfig.{INSTANCE => ECConfig}
85
import io.iohk.atala.prism.crypto.Sha256
96
import io.iohk.atala.prism.models.DidSuffix
107
import io.iohk.atala.prism.protos.node_models
8+
import identus.apollo.MyKeyPair
9+
import identus.apollo.PublicKey
1110

1211
object EncodedSizes {
1312
def main(args: Array[String]): Unit = {
@@ -18,9 +17,9 @@ object EncodedSizes {
1817

1918
val data = for {
2019
_ <- 1 to n
21-
masterPublicKey1 = EC.generateKeyPair().getPublicKey
22-
masterPublicKey2 = EC.generateKeyPair().getPublicKey
23-
masterPublicKey3 = EC.generateKeyPair().getPublicKey
20+
masterPublicKey1 = MyKeyPair.generateKeyPair.publicKey
21+
masterPublicKey2 = MyKeyPair.generateKeyPair.publicKey
22+
masterPublicKey3 = MyKeyPair.generateKeyPair.publicKey
2423
did = createDID(
2524
List(masterPublicKey1, masterPublicKey2, masterPublicKey3)
2625
)
@@ -40,8 +39,8 @@ object EncodedSizes {
4039

4140
}
4241

43-
def createDID(masterPublicKeys: List[ECPublicKey]): String = {
44-
def keyElement(publicKey: ECPublicKey, index: Int): node_models.PublicKey =
42+
def createDID(masterPublicKeys: List[PublicKey]): String = {
43+
def keyElement(publicKey: PublicKey, index: Int): node_models.PublicKey =
4544
node_models.PublicKey(
4645
id = s"master$index",
4746
usage = node_models.KeyUsage.MASTER_KEY,
@@ -68,12 +67,12 @@ object EncodedSizes {
6867
s"did:prism:${didSuffix.getValue}:$encodedOperation"
6968
}
7069

71-
private def publicKeyToProto(key: ECPublicKey): node_models.ECKeyData = {
72-
val point = key.getCurvePoint
70+
private def publicKeyToProto(key: PublicKey): node_models.ECKeyData = {
71+
val point = key.toCurvePoint
7372
node_models.ECKeyData(
74-
curve = ECConfig.getCURVE_NAME,
75-
x = ByteString.copyFrom(point.getX.bytes()),
76-
y = ByteString.copyFrom(point.getY.bytes())
73+
curve = key.curveName,
74+
x = ByteString.copyFrom(point.x),
75+
y = ByteString.copyFrom(point.y)
7776
)
7877
}
7978
}

‎node/src/test/scala/io/iohk/atala/prism/node/poc/Wallet.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,12 @@ case class Wallet(node: node_api.NodeServiceGrpc.NodeServiceBlockingStub) {
226226
)
227227
}
228228

229-
private def publicKeyToProto(key: ECPublicKey): node_models.ECKeyData = {
230-
val point = key.getCurvePoint
229+
private def publicKeyToProto(key: PublicKey): node_models.ECKeyData = {
230+
val point = key.toCurvePoint
231231
node_models.ECKeyData(
232-
curve = ECConfig.getCURVE_NAME,
233-
x = ByteString.copyFrom(point.getX.bytes()),
234-
y = ByteString.copyFrom(point.getY.bytes())
232+
curve = key.curveName,
233+
x = ByteString.copyFrom(point.x),
234+
y = ByteString.copyFrom(point.y)
235235
)
236236
}
237237
}

‎node/src/test/scala/io/iohk/atala/prism/node/poc/endorsements/EndorsementsService.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,12 @@ object EndorsementsService {
236236
signingKeyId: String
237237
)
238238

239-
def publicKeyToProto(key: ECPublicKey): node_models.ECKeyData = {
240-
val point = key.getCurvePoint
239+
private def publicKeyToProto(key: PublicKey): node_models.ECKeyData = {
240+
val point = key.toCurvePoint
241241
node_models.ECKeyData(
242-
curve = ECConfig.getCURVE_NAME,
243-
x = ByteString.copyFrom(point.getX.bytes()),
244-
y = ByteString.copyFrom(point.getY.bytes())
242+
curve = key.curveName,
243+
x = ByteString.copyFrom(point.x),
244+
y = ByteString.copyFrom(point.y)
245245
)
246246
}
247247
}

‎node/src/test/scala/io/iohk/atala/prism/node/poc/estimations/CardanoFeeEstimator.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,12 @@ class CardanoFeeEstimator(
212212
)
213213
}
214214

215-
private def publicKeyToProto(key: ECPublicKey): node_models.ECKeyData = {
216-
val point = key.getCurvePoint
215+
private def publicKeyToProto(key: PublicKey): node_models.ECKeyData = {
216+
val point = key.toCurvePoint
217217
node_models.ECKeyData(
218-
curve = ECConfig.getCURVE_NAME,
219-
x = ByteString.copyFrom(point.getX.bytes()),
220-
y = ByteString.copyFrom(point.getY.bytes())
218+
curve = key.curveName,
219+
x = ByteString.copyFrom(point.x),
220+
y = ByteString.copyFrom(point.y)
221221
)
222222
}
223223
}

‎node/src/test/scala/io/iohk/atala/prism/node/repositories/DIDDataRepositorySpec.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package io.iohk.atala.prism.node.repositories
33
import cats.effect.IO
44
import cats.effect.unsafe.implicits.global
55
import io.iohk.atala.prism.AtalaWithPostgresSpec
6-
import io.iohk.atala.prism.crypto.EC.{INSTANCE => EC}
76
import io.iohk.atala.prism.crypto.Sha256Digest
87
import io.iohk.atala.prism.models.{Ledger, TransactionId}
98
import io.iohk.atala.prism.node.models.nodeState.LedgerData
@@ -15,6 +14,7 @@ import io.iohk.atala.prism.protos.models.TimestampInfo
1514
import io.iohk.atala.prism.node.DataPreparation
1615
import tofu.logging.Logging.Make
1716
import tofu.logging.Logging
17+
import identus.apollo.MyKeyPair
1818

1919
class DIDDataRepositorySpec extends AtalaWithPostgresSpec {
2020
val logs: Make[IO] = Logging.Make.plain[IO]
@@ -29,25 +29,25 @@ class DIDDataRepositorySpec extends AtalaWithPostgresSpec {
2929
didSuffix = didSuffix,
3030
keyId = "master",
3131
keyUsage = KeyUsage.MasterKey,
32-
key = EC.generateKeyPair().getPublicKey
32+
key = MyKeyPair.generateKeyPair.publicKey
3333
),
3434
DIDPublicKey(
3535
didSuffix = didSuffix,
3636
keyId = "issuing",
3737
keyUsage = KeyUsage.IssuingKey,
38-
key = EC.generateKeyPair().getPublicKey
38+
key = MyKeyPair.generateKeyPair.publicKey
3939
),
4040
DIDPublicKey(
4141
didSuffix = didSuffix,
4242
keyId = "authentication",
4343
keyUsage = KeyUsage.AuthenticationKey,
44-
key = EC.generateKeyPair().getPublicKey
44+
key = MyKeyPair.generateKeyPair.publicKey
4545
),
4646
DIDPublicKey(
4747
didSuffix = didSuffix,
4848
keyId = "keyAgreement",
4949
keyUsage = KeyUsage.KeyAgreementKey,
50-
key = EC.generateKeyPair().getPublicKey
50+
key = MyKeyPair.generateKeyPair.publicKey
5151
)
5252
)
5353

‎node/src/test/scala/io/iohk/atala/prism/node/repositories/daos/ContextDAOSpec.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import cats.effect.IO
55
import cats.effect.unsafe.implicits.global
66
import doobie.implicits._
77
import io.iohk.atala.prism.AtalaWithPostgresSpec
8-
import io.iohk.atala.prism.crypto.EC.{INSTANCE => EC}
98
import io.iohk.atala.prism.models.{Ledger, TransactionId}
109
import io.iohk.atala.prism.node.DataPreparation
1110
import io.iohk.atala.prism.node.models.nodeState.LedgerData
1211
import io.iohk.atala.prism.node.models.{DIDData, DIDPublicKey, KeyUsage}
1312
import io.iohk.atala.prism.node.repositories.{didSuffixFromDigest, digestGen}
1413
import io.iohk.atala.prism.protos.models.TimestampInfo
14+
import identus.apollo.MyKeyPair
1515
import org.scalatest.OptionValues._
1616

1717
import java.time.Instant
@@ -26,25 +26,25 @@ class ContextDAOSpec extends AtalaWithPostgresSpec {
2626
didSuffix = didSuffix,
2727
keyId = "master",
2828
keyUsage = KeyUsage.MasterKey,
29-
key = EC.generateKeyPair().getPublicKey
29+
key = MyKeyPair.generateKeyPair.publicKey
3030
),
3131
DIDPublicKey(
3232
didSuffix = didSuffix,
3333
keyId = "issuing",
3434
keyUsage = KeyUsage.IssuingKey,
35-
key = EC.generateKeyPair().getPublicKey
35+
key = MyKeyPair.generateKeyPair.publicKey
3636
),
3737
DIDPublicKey(
3838
didSuffix = didSuffix,
3939
keyId = "authentication",
4040
keyUsage = KeyUsage.AuthenticationKey,
41-
key = EC.generateKeyPair().getPublicKey
41+
key = MyKeyPair.generateKeyPair.publicKey
4242
),
4343
DIDPublicKey(
4444
didSuffix = didSuffix,
4545
keyId = "keyAgreement",
4646
keyUsage = KeyUsage.KeyAgreementKey,
47-
key = EC.generateKeyPair().getPublicKey
47+
key = MyKeyPair.generateKeyPair.publicKey
4848
)
4949
)
5050

0 commit comments

Comments
 (0)