random uncommitted stuff

Author: wiyarmir

libs.versions.toml

@@ -32,6 +32,7 @@ coroutinesCore = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", ver
 coroutinesJdk8 = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8", version.ref = "kotlinxCoroutines" }
 kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
 kotlin-bom = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlin" }
+kotlinLogging = { module = "io.github.oshai:kotlin-logging", version = "6.0.9" }
 ktorClientContentNegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
 ktorClientCio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
 ktorClientCore = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
@@ -45,6 +46,8 @@ ktorUtils = { module = "io.ktor:ktor-utils", version.ref = "ktor" }
 okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttpLoggingInterceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
+slf4j-api = { module = "org.slf4j:slf4j-api", version = "2.0.13" }
+slf4j-simple = { module = "org.slf4j:slf4j-simple", version = "2.0.13" }
 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" }

solana-kotlin/build.gradle.kts

@@ -1,5 +1,6 @@
 import co.touchlab.skie.configuration.ClassInterop
 import co.touchlab.skie.configuration.DefaultArgumentInterop
+import org.jetbrains.kotlin.gradle.plugin.KotlinJsCompilerType
 
 plugins {
   alias(libs.plugins.kotlinMultiplatform)
@@ -41,14 +42,44 @@ kotlin {
   mingwX64()
   linuxX64()
 
+  js(KotlinJsCompilerType.IR) {
+    browser {
+      compilations.all {
+        kotlinOptions {
+          sourceMap = true
+          sourceMapEmbedSources = "always"
+        }
+      }
+      testTask {
+        useMocha {
+          timeout = "60s"
+        }
+      }
+    }
+    nodejs {
+      compilations.all {
+        kotlinOptions {
+          sourceMap = true
+          sourceMapEmbedSources = "always"
+        }
+      }
+    }
+    generateTypeScriptDefinitions()
+  }
+
   sourceSets {
     val jvmMain by getting {
       dependencies {
         implementation(libs.ktorClientOkHttp)
         implementation(libs.bouncyCastle)
+        implementation(libs.slf4j.api)
+      }
+    }
+    val jvmTest by getting {
+      dependencies {
+        implementation(libs.slf4j.simple)
       }
     }
-    val jvmTest by getting
 
     val commonMain by getting {
       dependencies {
@@ -62,6 +93,7 @@ kotlin {
         implementation(libs.kermit)
         implementation(libs.okio)
         implementation(libs.skie.configurationAnnotations)
+        implementation(libs.kotlinLogging)
       }
     }
     val commonTest by getting {
@@ -93,6 +125,12 @@ kotlin {
         implementation(libs.ktorClientWinHttp)
       }
     }
+
+    val jsMain by getting {
+      dependencies {
+        implementation(libs.ktorClientJs)
+      }
+    }
   }
 }
 

solana-kotlin/src/commonTest/kotlin/net/avianlabs/solana/domain/program/AssociatedTokenProgramTest.kt

@@ -11,7 +11,6 @@ class AssociatedTokenProgramTest {
   fun testFindProgramAddress() {
     for (i in 0..1000) {
       val programId = randomKey().publicKey
-      println("programId: $programId")
 
       val seeds = listOf(
         "Lil'".encodeToByteArray(),
@@ -21,15 +20,12 @@ class AssociatedTokenProgramTest {
         seeds = seeds,
         programId = programId,
       )
-      println("address: $address")
 
       val created = Program.createProgramAddress(
         seeds = seeds + byteArrayOf(address.nonce.toByte()),
         programId = programId,
       )
 
-      println("created: $created")
-
       assertEquals(address.address, created)
     }
   }
@@ -46,7 +42,6 @@ class AssociatedTokenProgramTest {
       val wallet = PublicKey.fromBase58(wallet)
 
       val associated = wallet.associatedTokenAddress(mint)
-      println(associated)
 
       val expectedAssociated = PublicKey.fromBase58(expectedAssociated)
 

solana-kotlin/src/commonTest/resources/simplelogger.properties

@@ -0,0 +1,27 @@
+# SLF4J's SimpleLogger configuration file
+# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
+# Default logging detail level for all instances of SimpleLogger.
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, defaults to "info".
+org.slf4j.simpleLogger.defaultLogLevel=debug
+# Logging detail level for a SimpleLogger instance named "xxxxx".
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, the default logging detail level is used.
+#org.slf4j.simpleLogger.log.xxxxx=
+# Set to true if you want the current date and time to be included in output messages.
+# Default is false, and will output the number of milliseconds elapsed since startup.
+org.slf4j.simpleLogger.showDateTime=true
+# The date and time format to be used in the output messages.
+# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
+# If the format is not specified or is invalid, the default format is used.
+# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
+org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+# Set to true if you want to output the current thread name.
+# Defaults to true.
+org.slf4j.simpleLogger.showThreadName=false
+# Set to true if you want the Logger instance name to be included in output messages.
+# Defaults to true.
+org.slf4j.simpleLogger.showLogName=false
+# Set to true if you want the last component of the name to be included in output messages.
+# Defaults to false.
+#org.slf4j.simpleLogger.showShortLogName=false

tweetnacl-multiplatform/build.gradle.kts

@@ -70,12 +70,18 @@ kotlin {
       dependencies {
         implementation(libs.tweetNaClJava)
         implementation(libs.bouncyCastle)
+        implementation(libs.slf4j.api)
+      }
+    }
+    val jvmTest by getting {
+      dependencies {
+        implementation(libs.slf4j.simple)
       }
     }
-    val jvmTest by getting
 
     val commonMain by getting {
       dependencies {
+        implementation(libs.kotlinLogging)
       }
     }
     val commonTest by getting {

tweetnacl-multiplatform/src/jsMain/kotlin/net/avianlabs/solana/tweetnacl/TweetNaCl.kt

@@ -12,7 +12,6 @@ internal actual fun isOnCurveInternal(publicKey: ByteArray): Boolean =
     Curves.ed25519.extendedPoint.fromHex(publicKey.asUint8Array())
     true
   } catch (e: Throwable) {
-    println(e.stackTraceToString())
     false
   }