fix: update usage of the bip32ed25519 wrapper. (#174)

hyperledger · Jun 10, 2024 · d1ee804 · d1ee804
1 parent ef2ae86
commit d1ee804
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/apollo/src/androidMain/kotlin/org/hyperledger/identus/apollo/derivation/EdHDKey.kt b/apollo/src/androidMain/kotlin/org/hyperledger/identus/apollo/derivation/EdHDKey.kt
@@ -2,7 +2,7 @@ package org.hyperledger.identus.apollo.derivation
 
 import com.ionspin.kotlin.bignum.integer.toBigInteger
 import ed25519_bip32_wrapper.deriveBytes
-import ed25519_bip32_wrapper.fromNonextendedNoforce
+import ed25519_bip32_wrapper.fromNonextended
 import org.hyperledger.identus.apollo.utils.ECConfig
 
 /**
@@ -83,7 +83,7 @@ actual class EdHDKey actual constructor(
 
             val keySlice = seed.sliceArray(0 until 32)
             val chainCodeSlice = seed.sliceArray(32 until seed.size)
-            val result = fromNonextendedNoforce(keySlice, chainCodeSlice)
+            val result = fromNonextended(keySlice, chainCodeSlice)
             val secretKey = result["secret_key"]
             val chainCode = result["chain_code"]
 

diff --git a/apollo/src/appleMain/kotlin/org/hyperledger/identus/apollo/derivation/EdHDKey.kt b/apollo/src/appleMain/kotlin/org/hyperledger/identus/apollo/derivation/EdHDKey.kt
@@ -2,7 +2,7 @@ package org.hyperledger.identus.apollo.derivation
 
 import com.ionspin.kotlin.bignum.integer.toBigInteger
 import ed25519_bip32_wrapper.deriveBytes
-import ed25519_bip32_wrapper.fromNonextendedNoforce
+import ed25519_bip32_wrapper.fromNonextended
 import org.hyperledger.identus.apollo.utils.ECConfig
 
 /**
@@ -83,7 +83,7 @@ actual class EdHDKey actual constructor(
 
             val keySlice = seed.sliceArray(0 until 32)
             val chainCodeSlice = seed.sliceArray(32 until seed.size)
-            val result = fromNonextendedNoforce(keySlice, chainCodeSlice)
+            val result = fromNonextended(keySlice, chainCodeSlice)
             val secretKey = result["secret_key"]
             val chainCode = result["chain_code"]
 

diff --git a/apollo/src/jsMain/kotlin/org/hyperledger/identus/apollo/derivation/EdHDKey.kt b/apollo/src/jsMain/kotlin/org/hyperledger/identus/apollo/derivation/EdHDKey.kt
@@ -77,7 +77,7 @@ actual class EdHDKey actual constructor(
 
             val key = seed.sliceArray(0 until 32)
             val chainCode = seed.sliceArray(32 until seed.size)
-            val result = ed25519_bip32.from_nonextended_noforce(key, chainCode)
+            val result = ed25519_bip32.from_nonextended(key, chainCode)
 
             return EdHDKey(
                 privateKey = result[0],

diff --git a/apollo/src/jsMain/kotlin/org/hyperledger/identus/apollo/utils/external/Ed25519_Bip32.kt b/apollo/src/jsMain/kotlin/org/hyperledger/identus/apollo/utils/external/Ed25519_Bip32.kt
@@ -1,7 +1,7 @@
 package org.hyperledger.identus.apollo.utils.external
 
 external interface ed25519_bip32_export {
-    fun from_nonextended_noforce(key: ByteArray, chain_code: ByteArray): Array<ByteArray>
+    fun from_nonextended(key: ByteArray, chain_code: ByteArray): Array<ByteArray>
 
     fun derive_bytes(key: ByteArray, chain_code: ByteArray, index: Any): Array<ByteArray>
 }

diff --git a/apollo/src/jvmMain/kotlin/org/hyperledger/identus/apollo/derivation/EdHDKey.kt b/apollo/src/jvmMain/kotlin/org/hyperledger/identus/apollo/derivation/EdHDKey.kt
@@ -2,7 +2,7 @@ package org.hyperledger.identus.apollo.derivation
 
 import com.ionspin.kotlin.bignum.integer.toBigInteger
 import ed25519_bip32_wrapper.deriveBytes
-import ed25519_bip32_wrapper.fromNonextendedNoforce
+import ed25519_bip32_wrapper.fromNonextended
 import org.hyperledger.identus.apollo.utils.ECConfig
 
 /**
@@ -83,7 +83,7 @@ actual class EdHDKey actual constructor(
 
             val keySlice = seed.sliceArray(0 until 32)
             val chainCodeSlice = seed.sliceArray(32 until seed.size)
-            val result = fromNonextendedNoforce(keySlice, chainCodeSlice)
+            val result = fromNonextended(keySlice, chainCodeSlice)
             val secretKey = result["secret_key"]
             val chainCode = result["chain_code"]
 

diff --git a/rust-ed25519-bip32 b/rust-ed25519-bip32