switch to lib + cleanup

gradle/libs.versions.toml

@@ -19,6 +19,7 @@ ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref =
 ktor-client-cio = { group = "io.ktor", name = "ktor-client-cio", version.ref = "ktor" }
 multimult = { group = "io.github.funkatronics", name = "multimult", version = "0.2.3" }
 rpc-core = { group = "com.solanamobile", name = "rpc-core", version = "0.2.5" }
+salkt = { group = "io.github.funkatronics", name = "salkt", version = "0.1.0" }
 
 [plugins]
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }

solana/build.gradle.kts

@@ -33,6 +33,7 @@ kotlin {
                 implementation(libs.kotlinx.serialization.json)
                 implementation(libs.borsh)
                 implementation(libs.multimult)
+                implementation(libs.salkt)
             }
         }
         val commonTest by getting {

solana/src/commonMain/kotlin/com/solana/programs/Program.kt

@@ -1,10 +1,10 @@
 package com.solana.programs
 
 import com.funkatronics.hash.Sha256
+import com.funkatronics.salt.isOnCurve
 import com.solana.publickey.ProgramDerivedAddress
 import com.solana.publickey.PublicKey
 import com.solana.publickey.SolanaPublicKey
-import com.solana.salt.TweetNaclFast
 import kotlin.jvm.JvmStatic
 
 interface Program {
@@ -23,19 +23,19 @@ interface Program {
 
         @JvmStatic
         suspend fun createProgramAddress(seeds: List<ByteArray>, programId: PublicKey): Result<SolanaPublicKey> {
-            val publicKeyBytes = Sha256.hash(
+            val address = Sha256.hash(
                 seeds.foldIndexed(ByteArray(0)) { i, a, s ->
                     require(s.size <= 32) { "Seed length must be <= 32 bytes" }; a + s
                 } + programId.bytes + "ProgramDerivedAddress".encodeToByteArray()
             )
 
-            if (TweetNaclFast.is_on_curve(publicKeyBytes)) {
+            if (address.isOnCurve()) {
                 return Result.failure(
                     IllegalArgumentException("Invalid seeds, address must fall off curve")
                 )
             }
 
-            return Result.success(SolanaPublicKey(publicKeyBytes))
+            return Result.success(SolanaPublicKey(address))
         }
     }
 }

solana/src/commonMain/kotlin/com/solana/publickey/Extensions.kt

@@ -0,0 +1,5 @@
+package com.solana.publickey
+
+import com.funkatronics.salt.isOnCurve
+
+suspend fun PublicKey.isOnCurve() = bytes.isOnCurve()

solana/src/commonMain/kotlin/com/solana/publickey/ProgramDerivedAddress.kt

@@ -1,11 +1,20 @@
 package com.solana.publickey
 
+import com.funkatronics.salt.isOnCurve
 import com.solana.programs.Program
 import kotlin.jvm.JvmStatic
 
-class ProgramDerivedAddress(bytes: ByteArray, val nonce: UByte) : SolanaPublicKey(bytes) {
+class ProgramDerivedAddress private constructor(bytes: ByteArray, val nonce: UByte) : SolanaPublicKey(bytes) {
 
-    constructor(publicKey: PublicKey, nonce: UByte) : this(publicKey.bytes, nonce)
+    private constructor(publicKey: PublicKey, nonce: UByte) : this(publicKey.bytes, nonce)
+
+    suspend fun ProgramDerivedAddress(bytes: ByteArray, nonce: UByte) {
+        require(!bytes.isOnCurve()) { "Provided public key is not a PDA, address must be off Ed25519 curve" }
+        return ProgramDerivedAddress(bytes, nonce)
+    }
+
+    suspend fun ProgramDerivedAddress(publicKey: PublicKey, nonce: UByte) =
+        ProgramDerivedAddress(publicKey.bytes, nonce)
 
     companion object {
         @JvmStatic