keep reference to Ethereum address in kotlin class

Author: luca992

gradle.properties

@@ -2,6 +2,8 @@ kotlin.code.style=official
 #kotlin.mpp.enableGranularSourceSetsMetadata=true
 kotlin.native.enableDependencyPropagation=false
 kotlin.mpp.enableCInteropCommonization=true
+kotlin.native.binary.memoryModel=experimental
+
 
 kotlin.native.cacheKind=none
 

src/commonMain/kotlin/Web3.kt

@@ -2,6 +2,7 @@ package io.eqoty.web3
 
 expect object Web3 {
 
-    fun getAddress(privKey: String): String
+    fun importAccount(privKey: String)
+    fun getAddress(): String?
 
 }

src/commonTest/kotlin/Web3Tests.kt

@@ -4,22 +4,27 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 
 class Web3Tests {
+
+
     @Test fun `hex prefixed private key to address`() {
 
+
         val privKey = "0xeff8ddb99a4fa276e8e70f4c375d99964511b2ac1506ee7e48dcff43d6bc04b9"
+        Web3.importAccount(privKey)
         val expectedAddress = "0x2AD093baD5b62F51A2145B87bB0F2295b1f9d4Fd".lowercase()
 
 
-        assertEquals(expectedAddress, Web3.getAddress(privKey) )
+        assertEquals(expectedAddress, Web3.getAddress())
     }
 
     @Test fun `private key to address`() {
 
         val privKey = "eff8ddb99a4fa276e8e70f4c375d99964511b2ac1506ee7e48dcff43d6bc04b9"
+        Web3.importAccount(privKey)
         val expectedAddress = "0x2AD093baD5b62F51A2145B87bB0F2295b1f9d4Fd".lowercase()
 
 
-        assertEquals(expectedAddress, Web3.getAddress(privKey) )
+        assertEquals(expectedAddress, Web3.getAddress())
     }
 
 }

src/darwinMain/kotlin/io/eqoty/web3/Web3.kt

@@ -1,11 +1,18 @@
+@file:Suppress("VARIABLE_IN_SINGLETON_WITHOUT_THREAD_LOCAL")
+
 package io.eqoty.web3
 
 import swift.web3swift.Web3Swift
 
 actual object Web3 {
-    actual fun getAddress(privKey: String): String {
-        return Web3Swift.getAddressWithPrivKey(privKey)
+    var ethereumAccount: Any? = null
+
+    actual fun importAccount(privKey: String) {
+        ethereumAccount = Web3Swift.importAccountWithPrivKey(privKey)
     }
 
+    actual fun getAddress(): String? {
+        return Web3Swift.getAddressWithEthereumAccount(ethereumAccount!!)
+    }
 
 }

web3swift/web3swift/Web3Swift.swift

@@ -1,14 +1,18 @@
 import Foundation
-import CryptoKit
 import web3
 
 
 @objc public class Web3Swift : NSObject {
 
-    @objc public class func getAddress(privKey: String) -> String {
+    
+    @objc public class func importAccount(privKey: String) -> Any {
         let keyStorage = EthereumKeyLocalStorage()
-        let account = try! EthereumAccount.importAccount(keyStorage: keyStorage, privateKey: privKey, keystorePassword: "password")
-        return account.address.value
+        return try! EthereumAccount.importAccount(keyStorage: keyStorage, privateKey: privKey, keystorePassword: "password")
+    }
+
+    
+    @objc public class func getAddress(ethereumAccount : Any) -> String? {
+        return (ethereumAccount as! EthereumAccount).address.value
     }
 
 }