fix: updating namespace in UDL to correctly map to generated binaries

Signed-off-by: Ahmed Moussa <ahmed.moussa@iohk.io>
input-output-hk · Apr 30, 2024 · ce6d28f · ce6d28f
1 parent ff54776
commit ce6d28f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 42 deletions.
diff --git a/apollo/build.gradle.kts b/apollo/build.gradle.kts
@@ -89,7 +89,7 @@ fun KotlinNativeTarget.secp256k1CInterop(target: String) {
 fun KotlinNativeTarget.ed25519Bip32CInterop(target: String) {
     compilations.getByName("main") {
         cinterops {
-            val ed25519_bip32 by creating {
+            val ed25519_bip32_wrapper by creating {
                 val crate = this.name
                 packageName("$crate.cinterop")
                 header(
@@ -682,39 +682,6 @@ android {
     }
 }
 
-afterEvaluate {
-    tasks.withType<KotlinCompile> {
-        dependsOn(
-            ":iOSLibs:buildIOHKCryptoKitIphoneos",
-            ":iOSLibs:buildIOHKCryptoKitIphonesimulator",
-            ":iOSLibs:buildIOHKCryptoKitMacosx",
-            ":iOSLibs:buildIOHKSecureRandomGenerationIphoneos",
-            ":iOSLibs:buildIOHKSecureRandomGenerationIphonesimulator",
-            ":iOSLibs:buildIOHKSecureRandomGenerationMacosx"
-        )
-    }
-    tasks.withType<ProcessResources> {
-        dependsOn(
-            ":iOSLibs:buildIOHKCryptoKitIphoneos",
-            ":iOSLibs:buildIOHKCryptoKitIphonesimulator",
-            ":iOSLibs:buildIOHKCryptoKitMacosx",
-            ":iOSLibs:buildIOHKSecureRandomGenerationIphoneos",
-            ":iOSLibs:buildIOHKSecureRandomGenerationIphonesimulator",
-            ":iOSLibs:buildIOHKSecureRandomGenerationMacosx"
-        )
-    }
-    tasks.withType<CInteropProcess> {
-        dependsOn(
-            ":iOSLibs:buildIOHKCryptoKitIphoneos",
-            ":iOSLibs:buildIOHKCryptoKitIphonesimulator",
-            ":iOSLibs:buildIOHKCryptoKitMacosx",
-            ":iOSLibs:buildIOHKSecureRandomGenerationIphoneos",
-            ":iOSLibs:buildIOHKSecureRandomGenerationIphonesimulator",
-            ":iOSLibs:buildIOHKSecureRandomGenerationMacosx"
-        )
-    }
-}
-
 ktlint {
     filter {
         exclude {
@@ -804,17 +771,41 @@ npmPublish {
 
 // Workaround for a bug in Gradle
 afterEvaluate {
-    tasks.getByName<Delete>("clean") {
-        // dependsOn(cleanEd25519Bip32)
+    tasks.withType<KotlinCompile> {
+        dependsOn(
+            ":iOSLibs:buildIOHKCryptoKitIphoneos",
+            ":iOSLibs:buildIOHKCryptoKitIphonesimulator",
+            ":iOSLibs:buildIOHKCryptoKitMacosx",
+            ":iOSLibs:buildIOHKSecureRandomGenerationIphoneos",
+            ":iOSLibs:buildIOHKSecureRandomGenerationIphonesimulator",
+            ":iOSLibs:buildIOHKSecureRandomGenerationMacosx",
+            buildEd25519Bip32Task
+        )
     }
     tasks.withType<ProcessResources> {
-        dependsOn(buildEd25519Bip32Task)
+        dependsOn(
+            ":iOSLibs:buildIOHKCryptoKitIphoneos",
+            ":iOSLibs:buildIOHKCryptoKitIphonesimulator",
+            ":iOSLibs:buildIOHKCryptoKitMacosx",
+            ":iOSLibs:buildIOHKSecureRandomGenerationIphoneos",
+            ":iOSLibs:buildIOHKSecureRandomGenerationIphonesimulator",
+            ":iOSLibs:buildIOHKSecureRandomGenerationMacosx",
+            buildEd25519Bip32Task
+        )
     }
     tasks.withType<CInteropProcess> {
-        dependsOn(copyEd25519Bip32GeneratedTask)
+        dependsOn(
+            ":iOSLibs:buildIOHKCryptoKitIphoneos",
+            ":iOSLibs:buildIOHKCryptoKitIphonesimulator",
+            ":iOSLibs:buildIOHKCryptoKitMacosx",
+            ":iOSLibs:buildIOHKSecureRandomGenerationIphoneos",
+            ":iOSLibs:buildIOHKSecureRandomGenerationIphonesimulator",
+            ":iOSLibs:buildIOHKSecureRandomGenerationMacosx",
+            copyEd25519Bip32GeneratedTask
+        )
     }
-    tasks.withType<KotlinCompile> {
-        dependsOn(buildEd25519Bip32Task)
+    tasks.getByName<Delete>("clean") {
+        // dependsOn(cleanEd25519Bip32)
     }
     tasks.withType<KtLintCheckTask> {
         dependsOn(buildEd25519Bip32Task)

diff --git a/apollo/src/allButJSMain/kotlin/io/iohk/atala/prism/apollo/derivation/EdHDKey.kt b/apollo/src/allButJSMain/kotlin/io/iohk/atala/prism/apollo/derivation/EdHDKey.kt
@@ -1,7 +1,7 @@
 package io.iohk.atala.prism.apollo.derivation
 
 import com.ionspin.kotlin.bignum.integer.toBigInteger
-import ed25519_bip32.XPrvWrapper
+import ed25519_bip32_wrapper.XPrvWrapper
 import io.iohk.atala.prism.apollo.utils.ECConfig
 
 /**

diff --git a/.../nativeInterop/cinterop/ed25519_bip32.def → ...nterop/cinterop/ed25519_bip32_wrapper.def b/.../nativeInterop/cinterop/ed25519_bip32.def → ...nterop/cinterop/ed25519_bip32_wrapper.def
diff --git a/rust-ed25519-bip32 b/rust-ed25519-bip32