fix PR requested changes

hyperledger · Sep 22, 2023 · a5b62eb · a5b62eb
1 parent a7abb20
commit a5b62eb
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 20 deletions.
diff --git a/...-sdk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/apollo/utils/JVMBigIntegerExt.kt b/...-sdk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/apollo/utils/JVMBigIntegerExt.kt
@@ -4,7 +4,8 @@ import com.ionspin.kotlin.bignum.integer.Sign
 import java.math.BigInteger
 
 fun BigInteger.toUnsignedByteArray(): ByteArray {
-    return toByteArray().dropWhile { it == 0.toByte() }.toByteArray()
+    val comparedValue = 0.toByte()
+    return toByteArray().dropWhile { it == comparedValue }.toByteArray()
 }
 
 fun BigInteger.toKotlinBigInteger(): com.ionspin.kotlin.bignum.integer.BigInteger {

diff --git a/...dk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/apollo/utils/Secp256k1PublicKey.kt b/...dk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/apollo/utils/Secp256k1PublicKey.kt
@@ -9,7 +9,7 @@ import io.iohk.atala.prism.apollo.utils.KMMECPoint
 import io.iohk.atala.prism.apollo.utils.KMMECSecp256k1PublicKey
 import io.iohk.atala.prism.apollo.utils.KMMEllipticCurve
 import io.iohk.atala.prism.walletsdk.apollo.config.ECConfig
-import io.iohk.atala.prism.walletsdk.apollo.utils.ec._ECPoint
+import io.iohk.atala.prism.walletsdk.apollo.utils.ec.KMMECPoint
 import io.iohk.atala.prism.walletsdk.domain.models.Curve
 import io.iohk.atala.prism.walletsdk.domain.models.keyManagement.CurveKey
 import io.iohk.atala.prism.walletsdk.domain.models.keyManagement.CustomKey
@@ -93,9 +93,9 @@ class Secp256k1PublicKey(nativeValue: ByteArray) : PublicKey(), VerifiableKey {
     }
 
     companion object {
-        fun computeCurvePoint(key: BCECPublicKey): _ECPoint {
+        fun computeCurvePoint(key: BCECPublicKey): io.iohk.atala.prism.walletsdk.apollo.utils.ec.KMMECPoint {
             val javaPoint = key.w
-            return _ECPoint(javaPoint.affineX.toKotlinBigInteger(), javaPoint.affineY.toKotlinBigInteger())
+            return KMMECPoint(javaPoint.affineX.toKotlinBigInteger(), javaPoint.affineY.toKotlinBigInteger())
         }
 
         fun secp256k1FromCompressed(compressed: ByteArray): Secp256k1PublicKey {

diff --git a/...alletsdk/apollo/utils/ec/_ECCoordinate.kt → ...letsdk/apollo/utils/ec/KMMECCoordinate.kt b/...alletsdk/apollo/utils/ec/_ECCoordinate.kt → ...letsdk/apollo/utils/ec/KMMECCoordinate.kt
@@ -3,7 +3,7 @@ package io.iohk.atala.prism.walletsdk.apollo.utils.ec
 import com.ionspin.kotlin.bignum.integer.BigInteger
 import io.iohk.atala.prism.walletsdk.apollo.helpers.padStart
 
-class _ECCoordinate(val coordinate: BigInteger) {
+class KMMECCoordinate(val coordinate: BigInteger) {
 
     fun bytes(): ByteArray = coordinate.toByteArray().padStart(PRIVATE_KEY_BYTE_SIZE, 0)
 

diff --git a/...ism-sdk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/apollo/utils/ec/KMMECPoint.kt b/...ism-sdk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/apollo/utils/ec/KMMECPoint.kt
@@ -0,0 +1,15 @@
+package io.iohk.atala.prism.walletsdk.apollo.utils.ec
+
+import com.ionspin.kotlin.bignum.integer.BigInteger
+
+class KMMECPoint(val x: KMMECCoordinate, val y: KMMECCoordinate) {
+    constructor(x: String, y: String) : this(
+        KMMECCoordinate(BigInteger.parseString(x)),
+        KMMECCoordinate(BigInteger.parseString(y))
+    )
+
+    constructor(x: BigInteger, y: BigInteger) : this(
+        KMMECCoordinate(x),
+        KMMECCoordinate(y)
+    )
+}
diff --git a/...prism-sdk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/apollo/utils/ec/_ECPoint.kt b/...prism-sdk/src/commonMain/kotlin/io/iohk/atala/prism/walletsdk/apollo/utils/ec/_ECPoint.kt
diff --git a/...commonMain/kotlin/io/iohk/atala/prism/walletsdk/domain/models/keyManagement/PrivateKey.kt b/...commonMain/kotlin/io/iohk/atala/prism/walletsdk/domain/models/keyManagement/PrivateKey.kt
@@ -1,11 +1,21 @@
 package io.iohk.atala.prism.walletsdk.domain.models.keyManagement
 
+import io.iohk.atala.prism.walletsdk.domain.models.Curve
+
 abstract class PrivateKey : Key() {
 
     fun getCurve(): String {
         return this.getProperty(CurveKey().property)
     }
 
+    fun getCurveInstance(): Curve? {
+        return try {
+            Curve.valueOf(this.getProperty(CurveKey().property))
+        } catch (e: Exception) {
+            null
+        }
+    }
+
     fun getIndex(): String {
         return this.getProperty(IndexKey().property)
     }

diff --git a/.../commonMain/kotlin/io/iohk/atala/prism/walletsdk/domain/models/keyManagement/PublicKey.kt b/.../commonMain/kotlin/io/iohk/atala/prism/walletsdk/domain/models/keyManagement/PublicKey.kt
@@ -1,11 +1,21 @@
 package io.iohk.atala.prism.walletsdk.domain.models.keyManagement
 
+import io.iohk.atala.prism.walletsdk.domain.models.Curve
+
 abstract class PublicKey : Key() {
 
     fun getCurve(): String {
         return this.getProperty(CurveKey().property)
     }
 
+    fun getCurveInstance(): Curve? {
+        return try {
+            Curve.valueOf(this.getProperty(CurveKey().property))
+        } catch (e: Exception) {
+            null
+        }
+    }
+
     fun getValue(): ByteArray {
         return this.raw
     }