improve Swift bindings for public key

Author: wiyarmir

.fleet/settings.json

@@ -1,3 +1,3 @@
 {
-    "backend.maxHeapSizeMb": 2048
+    "backend.maxHeapSizeMb": 8192
 }

libs.versions.toml

@@ -11,6 +11,7 @@ detekt = "1.23.5"
 jacoco = "0.8.7"
 kotlin = "1.9.23"
 mavenPublish = "0.27.0"
+skie = "0.6.2"
 
 # Libraries
 junit5 = "5.10.2"
@@ -43,6 +44,7 @@ okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttpLoggingInterceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
 serializationCore = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }
 serializationJson = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
+skie-configurationAnnotations = { module = "co.touchlab.skie:configuration-annotations", version.ref = "skie" }
 tweetNaClJava = { module = "net.avianlabs:tweetnacl-java", version = "1.1.2" }
 
 # Test Libs
@@ -68,3 +70,5 @@ kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref =
 kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 nmcp = { id = "com.gradleup.nmcp", version = "0.0.4" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }
+multiplatform-swiftpackage = { id = "io.github.luca992.multiplatform-swiftpackage", version = "2.2.2" }
+skie = { id = "co.touchlab.skie", version.ref = "skie" }

solana-kotlin/build.gradle.kts

@@ -1,10 +1,14 @@
+import co.touchlab.skie.configuration.ClassInterop
+import co.touchlab.skie.configuration.DefaultArgumentInterop
+
 plugins {
   alias(libs.plugins.kotlinMultiplatform)
   alias(libs.plugins.kotlinSerialization)
   alias(libs.plugins.mavenPublish)
   alias(libs.plugins.dokka)
   signing
-  id("io.github.luca992.multiplatform-swiftpackage") version "2.2.2"
+  alias(libs.plugins.multiplatform.swiftpackage)
+  alias(libs.plugins.skie)
 }
 
 group = "net.avianlabs.solana"
@@ -29,6 +33,7 @@ kotlin {
     ).forEach { iosTarget ->
       iosTarget.binaries.framework {
         baseName = "SolanaKotlin"
+        export(project(":tweetnacl-multiplatform"))
         isStatic = true
       }
     }
@@ -55,6 +60,7 @@ kotlin {
         implementation(libs.ktorSerializationKotlinxJson)
         implementation(libs.kermit)
         implementation(libs.okio)
+        implementation(libs.skie.configurationAnnotations)
       }
     }
     val commonTest by getting {
@@ -77,6 +83,15 @@ kotlin {
   }
 }
 
+skie {
+  features {
+    group("net.avianlabs.solana.tweetnacl") {
+      ClassInterop.CInteropFrameworkName("TweetNaClMultiplatform")
+      DefaultArgumentInterop.Enabled(true)
+    }
+  }
+}
+
 multiplatformSwiftPackage {
   swiftToolsVersion("5.9")
   targetPlatforms {

tweetnacl-multiplatform/build.gradle.kts

@@ -1,4 +1,5 @@
 import co.touchlab.cklib.gradle.CompileToBitcode.Language
+import co.touchlab.skie.configuration.ClassInterop
 import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 plugins {
@@ -8,7 +9,8 @@ plugins {
   alias(libs.plugins.mavenPublish)
   alias(libs.plugins.dokka)
   signing
-  id("io.github.luca992.multiplatform-swiftpackage") version "2.2.2"
+  alias(libs.plugins.multiplatform.swiftpackage)
+  alias(libs.plugins.skie)
 }
 
 group = "net.avianlabs.solana"

tweetnacl-multiplatform/src/commonMain/kotlin/net/avianlabs/solana/tweetnacl/ed25519/PublicKey.kt

@@ -40,7 +40,6 @@ public data class PublicKey(public val bytes: ByteArray) {
   public fun isOnCurve(): Boolean = TweetNaCl.Signature.isOnCurve(this.bytes)
 
   public companion object {
-
     public fun fromBase58(base58: String): PublicKey = PublicKey(base58.decodeBase58())
   }
 }

tweetnacl-multiplatform/src/iosMain/kotlin/net/avianlabs/solana/tweetnacl/ed25519/PublicKey.ios.kt

@@ -0,0 +1,31 @@
+@file:OptIn(
+  ExperimentalForeignApi::class,
+  BetaInteropApi::class,
+)
+
+package net.avianlabs.solana.tweetnacl.ed25519
+
+import kotlinx.cinterop.*
+import platform.Foundation.NSData
+import platform.Foundation.create
+import platform.posix.memcpy
+
+public fun PublicKey(data: NSData): PublicKey = PublicKey(
+  bytes = ByteArray(data.length.toInt()).apply {
+    usePinned { pinned ->
+      memcpy(
+        __dst = pinned.addressOf(0),
+        __src = data.bytes,
+        __n = data.length,
+      )
+    }
+  }
+)
+
+public val PublicKey.data: NSData
+  get() = memScoped {
+    NSData.create(
+      bytes = allocArrayOf(bytes),
+      length = bytes.size.toULong(),
+    )
+  }