Update kotlin version, need to fix secretstream pull, at least in js if not everywhere

buildSrc/src/main/kotlin/Deps.kt

@@ -15,12 +15,12 @@
  */
 
 object Versions {
-    val kotlinCoroutines = "1.3.8-1.4.0-rc"
+    val kotlinCoroutines = "1.3.9"
-    val kotlin = "1.4.0-rc"
+    val kotlin = "1.4.0"
-    val kotlinSerialization = "1.0-M1-1.4.0-rc"
+    val kotlinSerialization = "1.0.0-RC"
     val atomicfu = "0.14.3-M2-2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build
     val nodePlugin = "1.3.0"
-    val dokkaPlugin = "1.4.0-M3-dev-92"
+    val dokkaPlugin = "1.4.0-rc"
     val taskTreePlugin = "1.5"
 
     val kotlinBigNumVersion = "0.1.6-1.4.0-rc-SNAPSHOT"

kotlin-multiplatform-libsodium-generator/src/main/kotlin/com/ionspin/kotlin/crypto/generator/libsodium/definitions/LibsodiumSecretStreamDefinitions.kt

@@ -69,7 +69,7 @@ fun ClassDefinition.defineSecretStreamFunctions() {
             Initialize a state and generate a random header. Both are returned inside `SecretStreamStateAndHeader` object.
         """.trimIndent(),
         returnType = CustomTypeDefinition(withPackageName("SecretStreamStateAndHeader")),
-        dynamicJsReturn = true,
+        dynamicJsReturn = false,
         isStateCreationFunction = true,
         customCodeBlockReplacesFunctionBody = listOf(jsSecretStreamInit, jvmSecretStreamInit, nativeSecretStreamInit)
     ) {

kotlin-multiplatform-libsodium-generator/src/main/kotlin/com/ionspin/kotlin/crypto/generator/libsodium/generator/SharedCreators.kt

@@ -45,6 +45,10 @@ fun generateDataClass(fileBuilder: FileSpec.Builder, dataClassDefinition: DataCl
     val dataClassConstructor = FunSpec.constructorBuilder()
     for (parameter in dataClassDefinition.parameters) {
         val parameterBuilder = ParameterSpec.builder(parameter.parameterName, parameter.parameterType.typeName)
+        val annotationBuilder =
+            AnnotationSpec.builder(ClassName("kotlin.js", "JsName"))
+                .addMember("\"${parameter.parameterName}\"")
+        parameterBuilder.addAnnotation(annotationBuilder.build())
         dataClassConstructor.addParameter(parameterBuilder.build())
     }
     dataClassBuilder.primaryConstructor(dataClassConstructor.build())

multiplatform-crypto-delegated/src/jsMain/kotlin/com/ionspin/kotlin/crypto/JsSodiumInterface.kt

@@ -50,7 +50,7 @@ interface JsSodiumInterface {
 
     //decrypt
     fun crypto_secretstream_xchacha20poly1305_init_pull(header: Uint8Array, key: Uint8Array) : dynamic
-    fun crypto_secretstream_xchacha20poly1305_pull(state: dynamic, ciphertext: Uint8Array, additionalData: Uint8Array) : dynamic
+    fun crypto_secretstream_xchacha20poly1305_pull(state: dynamic, ciphertext: Uint8Array, additionalData: Uint8Array) : Uint8Array
 
     //util
     fun memzero(array: Uint8Array)

multiplatform-crypto-libsodium-bindings/src/commonMain/kotlin/debug/test/DebugTest.kt

@@ -3,6 +3,7 @@ package debug.test
 import kotlin.Int
 import kotlin.UByte
 import kotlin.UByteArray
+import kotlin.js.JsName
 
 expect class Sha256State
 
@@ -13,7 +14,9 @@ expect class GenericHashState
 expect class SecretStreamState
 
 data class SecretStreamStateAndHeader(
+  @JsName("state")
   val state: SecretStreamState,
+  @JsName("header")
   val header: UByteArray
 )
 

multiplatform-crypto-libsodium-bindings/src/commonTest/kotlin/com/ionspin/kotlin/crypto/secretstream/SecretStreamTest.kt

@@ -1,7 +1,9 @@
 package com.ionspin.kotlin.crypto.secretstream
 
 import com.ionspin.kotlin.bignum.integer.util.hexColumsPrint
+import com.ionspin.kotlin.crypto.Initializer
 import com.ionspin.kotlin.crypto.util.encodeToUByteArray
+import com.ionspin.kotlin.crypto.util.testBlocking
 import debug.test.Crypto
 import kotlin.math.exp
 import kotlin.test.Test
@@ -14,7 +16,8 @@ import kotlin.test.assertTrue
  */
 class SecretStreamTest {
     @Test
-    fun testSecretStream() {
+    fun testSecretStream() = testBlocking {
+        Initializer.initializeWithCallback {
             assertTrue {
                 val message = ("Ladies and Gentlemen of the class of '99: If I could offer you " +
                         "only one tip for the future, sunscreen would be it.").encodeToUByteArray()
@@ -57,14 +60,17 @@ class SecretStreamTest {
                 message.hexColumsPrint()
                 val crypto = Crypto()
                 val stateAndHeader = crypto.crypto_secretstream_xchacha20poly1305_init_push(key)
-            val encrypted = crypto.crypto_secretstream_xchacha20poly1305_push(stateAndHeader.state, message, ubyteArrayOf(), 0U)
+                val encrypted =
+                    crypto.crypto_secretstream_xchacha20poly1305_push(stateAndHeader.state, message, ubyteArrayOf(), 0U)
                 encrypted.hexColumsPrint()
                 val decryptState = crypto.crypto_secretstream_xchacha20poly1305_init_pull(stateAndHeader.header, key)
-            val decrypted = crypto.crypto_secretstream_xchacha20poly1305_pull(decryptState, encrypted, ubyteArrayOf())
+                val decrypted =
+                    crypto.crypto_secretstream_xchacha20poly1305_pull(decryptState, encrypted, ubyteArrayOf()) //TODO JS pull returns a tag and a message!!!
                 decrypted.hexColumsPrint()
                 decrypted.contentEquals(message)
 
             }
         }
+    }
 
 }

multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/com/ionspin/kotlin/crypto/JsSodiumInterface.kt

@@ -50,7 +50,7 @@ interface JsSodiumInterface {
 
     //decrypt
     fun crypto_secretstream_xchacha20poly1305_init_pull(header: Uint8Array, key: Uint8Array) : dynamic
-    fun crypto_secretstream_xchacha20poly1305_pull(state: dynamic, ciphertext: Uint8Array, additionalData: Uint8Array) : dynamic
+    fun crypto_secretstream_xchacha20poly1305_pull(state: dynamic, ciphertext: Uint8Array, additionalData: Uint8Array) : Uint8Array
 
     //util
     fun memzero(array: Uint8Array)

multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/com/ionspin/kotlin/crypto/JsUtil.kt

@@ -15,6 +15,9 @@ fun UByteArray.toUInt8Array() : Uint8Array {
 
 
 fun Uint8Array.toUByteArray() : UByteArray {
+    if (length.asDynamic() == undefined) {
+        println("Error")
+    }
     val result = UByteArray(length)
     for (i in 0 until length) {
         result[i] = get(i).toUByte()

multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/debug/test/DebugTest.kt

@@ -63,7 +63,8 @@ actual class Crypto internal actual constructor() {
    * Initialize a state and generate a random header. Both are returned inside
    * `SecretStreamStateAndHeader` object.
    */
-  actual fun crypto_secretstream_xchacha20poly1305_init_push(key: UByteArray): dynamic {
+  actual fun crypto_secretstream_xchacha20poly1305_init_push(key: UByteArray):
+      SecretStreamStateAndHeader {
     println("Debug crypto_secretstream_xchacha20poly1305_init_push")
     val stateAndHeader =
         getSodium().crypto_secretstream_xchacha20poly1305_init_push(key.toUInt8Array())
@@ -76,10 +77,10 @@ actual class Crypto internal actual constructor() {
    * Initialize state from header and key. The state can then be used for decryption.
    */
   actual fun crypto_secretstream_xchacha20poly1305_init_pull(header: UByteArray, key: UByteArray):
-      dynamic {
+      SecretStreamState {
     println("Debug crypto_secretstream_xchacha20poly1305_init_pull")
     return getSodium().crypto_secretstream_xchacha20poly1305_init_pull(header.toUInt8Array(),
-        key.toUInt8Array())
+        key.toUInt8Array()) as SecretStreamState
   }
 
   /**