feat: Rust SignClient

.gitignore

@@ -47,6 +47,7 @@ captures/
 .idea/dictionaries
 .idea/libraries
 .idea/jarRepositories.xml
+/.idea/codeStyles/Project.xml
 # Android Studio 3 in .gitignore file.
 .idea/caches
 .idea/modules.xml

core/android/build.gradle.kts

@@ -98,6 +98,7 @@ dependencies {
     debugApi(project(":foundation"))
     releaseApi("com.reown:foundation:$FOUNDATION_VERSION")
 
+    //todo: remove yttrium from android-core - move all needed parts to sign sdk
     // Use specific yttrium version for CI builds, default version for local builds
     // Release builds use stable version, regular CI builds use CI version for e2e tests
     val yttriumVersion = if (System.getenv("IS_RELEASE_BUILD") == "true") {
@@ -107,7 +108,7 @@ dependencies {
     } else {
         "0.9.55" // Use stable version for local builds
     }
-    api("com.github.reown-com:yttrium:$yttriumVersion") //unspecified
+    api("com.github.reown-com:yttrium:unspecified") //$yttriumVersion
     implementation("net.java.dev.jna:jna:5.17.0@aar")
 
     api(libs.coroutines)

core/android/src/main/kotlin/com/reown/android/CoreProtocol.kt

@@ -5,6 +5,7 @@ import android.content.SharedPreferences
 import com.reown.android.di.coreStorageModule
 import com.reown.android.internal.common.di.AndroidCommonDITags
 import com.reown.android.internal.common.di.KEY_CLIENT_ID
+import com.reown.android.internal.common.di.coreAppKitModule
 import com.reown.android.internal.common.di.coreAndroidNetworkModule
 import com.reown.android.internal.common.di.coreCommonModule
 import com.reown.android.internal.common.di.coreCryptoModule
@@ -14,7 +15,6 @@ import com.reown.android.internal.common.di.explorerModule
 import com.reown.android.internal.common.di.keyServerModule
 import com.reown.android.internal.common.di.pulseModule
 import com.reown.android.internal.common.di.pushModule
-import com.reown.android.internal.common.di.appKitModule
 import com.reown.android.internal.common.explorer.ExplorerInterface
 import com.reown.android.internal.common.explorer.ExplorerProtocol
 import com.reown.android.internal.common.model.AppMetaData
@@ -78,6 +78,7 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter
     ) {
         try {
             require(relayServerUrl.isValidRelayServerUrl()) { "Check the schema and projectId parameter of the Server Url" }
+            //TODO: Init Sign rust client
 
             setup(
                 application = application,
@@ -89,7 +90,7 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter
                 relay = relay,
                 onError = onError,
                 metaData = metaData,
-                keyServerUrl = keyServerUrl
+                keyServerUrl = keyServerUrl,
             )
         } catch (e: Exception) {
             onError(Core.Model.Error(e))
@@ -119,7 +120,7 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter
                 relay = relay,
                 onError = onError,
                 metaData = metaData,
-                keyServerUrl = keyServerUrl
+                keyServerUrl = keyServerUrl,
             )
         } catch (e: Exception) {
             onError(Core.Model.Error(e))
@@ -136,14 +137,15 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter
         relay: RelayConnectionInterface?,
         onError: (Core.Model.Error) -> Unit,
         metaData: Core.Model.AppMetaData,
-        keyServerUrl: String?
+        keyServerUrl: String?,
     ) {
         val packageName: String = application.packageName
         val relayServerUrl = if (serverUrl.isNullOrEmpty()) "wss://relay.walletconnect.org?projectId=$projectId" else serverUrl
 
         with(koinApp) {
             androidContext(application)
             modules(
+//                module { single(named(AndroidCommonDITags.SIGN_RUST_CLIENT)) { signClient } },
                 module { single(named(AndroidCommonDITags.PACKAGE_NAME)) { packageName } },
                 module { single { ProjectId(projectId) } },
                 module { single(named(AndroidCommonDITags.TELEMETRY_ENABLED)) { TelemetryEnabled(telemetryEnabled) } },
@@ -152,6 +154,9 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter
                 coreCryptoModule(),
             )
 
+//            val (_, privateKey) = keyStore.getKeyPair()
+//            signClient = SignClient(projectId = projectId, key = privateKey.hexToBytes())
+
             if (relay == null) {
                 Relay.initialize(connectionType) { error -> onError(Core.Model.Error(error)) }
             }
@@ -180,9 +185,9 @@ class CoreProtocol(private val koinApp: KoinApplication = wcKoinApp) : CoreInter
                 coreJsonRpcModule(),
                 corePairingModule(Pairing, PairingController),
                 keyServerModule(keyServerUrl),
-                explorerModule(),
-                appKitModule(),
-                pulseModule(packageName)
+//                explorerModule(),
+//                coreAppKitModule(),
+//                pulseModule(packageName)
             )
         }
 

core/android/src/main/kotlin/com/reown/android/internal/Validator.kt

@@ -12,11 +12,12 @@ import java.net.URISyntaxException
 import java.net.URLDecoder
 
 
-internal object Validator {
+object Validator {
 
     private const val WC_URI_QUERY_KEY = "wc?uri="
+
     @JvmSynthetic
-    internal fun validateWCUri(uri: String): WalletConnectUri? {
+    fun validateWCUri(uri: String): WalletConnectUri? {
         val wcUri = getWcUri(uri)
         if (!wcUri.startsWith("wc:")) return null
 

core/android/src/main/kotlin/com/reown/android/internal/common/connection/DefaultConnectionLifecycle.kt

@@ -13,16 +13,16 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
-import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.supervisorScope
+
 
 internal class DefaultConnectionLifecycle(
     application: Application,
-    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry()
+    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(),
 ) : Lifecycle by lifecycleRegistry, ConnectionLifecycle {
     private val job = SupervisorJob()
     private var scope = CoroutineScope(job + Dispatchers.Default)
@@ -35,39 +35,27 @@ internal class DefaultConnectionLifecycle(
     }
 
     override fun reconnect() {
-        lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason())
-        lifecycleRegistry.onNext(Lifecycle.State.Started)
+//        lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason())
+//        lifecycleRegistry.onNext(Lifecycle.State.Started)
     }
 
     private inner class ActivityLifecycleCallbacks : Application.ActivityLifecycleCallbacks {
         var isResumed: Boolean = false
         var job: Job? = null
 
+
         override fun onActivityPaused(activity: Activity) {
-            isResumed = false
-
-            job = scope.launch {
-                delay(TimeUnit.SECONDS.toMillis(30))
-                if (!isResumed) {
-                    lifecycleRegistry.onNext(Lifecycle.State.Stopped.WithReason(ShutdownReason(1000, "App is paused")))
-                    job = null
-                    _onResume.value = false
-                }
-            }
+            //TODO: call method from Rust Client
         }
 
         override fun onActivityResumed(activity: Activity) {
-            isResumed = true
-
-            if (job?.isActive == true) {
-                job?.cancel()
-                job = null
-            }
-
+            println("kobe: onResume")
 
-            scope.launch {
-                _onResume.value = true
-            }
+//            scope.launch {
+//                supervisorScope {
+//                    signClient.online()
+//                }
+//            }
         }
 
         override fun onActivityStarted(activity: Activity) {}

core/android/src/main/kotlin/com/reown/android/internal/common/connection/ManualConnectionLifecycle.kt

@@ -25,6 +25,7 @@ internal class ManualConnectionLifecycle(
     private val _onResume = MutableStateFlow<Boolean?>(null)
     override val onResume: StateFlow<Boolean?> = _onResume.asStateFlow()
 
+    //TODO: call method from Rust Client
     fun connect() {
         scope.launch {
             connectionMutex.withLock {
@@ -33,6 +34,7 @@ internal class ManualConnectionLifecycle(
         }
     }
 
+    //TODO: call method from Rust Client
     fun disconnect() {
         scope.launch {
             connectionMutex.withLock {

core/android/src/main/kotlin/com/reown/android/internal/common/di/AndroidCommonDITags.kt

@@ -43,4 +43,5 @@ enum class AndroidCommonDITags {
     ENABLE_AUTHENTICATE,
     TELEMETRY_ENABLED,
     PACKAGE_NAME,
+    SIGN_RUST_CLIENT
 }

core/android/src/main/kotlin/com/reown/android/internal/common/di/AppKitModule.kt

@@ -1,5 +1,6 @@
 package com.reown.android.internal.common.di
 
+import android.os.Build
 import com.reown.android.BuildConfig
 import com.reown.android.internal.common.modal.AppKitApiRepository
 import com.reown.android.internal.common.modal.data.network.AppKitService
@@ -11,23 +12,63 @@ import com.reown.android.internal.common.modal.domain.usecase.GetSampleWalletsUs
 import com.reown.android.internal.common.modal.domain.usecase.GetSampleWalletsUseCaseInterface
 import com.reown.android.internal.common.modal.domain.usecase.GetWalletsUseCase
 import com.reown.android.internal.common.modal.domain.usecase.GetWalletsUseCaseInterface
-import com.reown.android.internal.common.model.ProjectId
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import okhttp3.Interceptor
 import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
+import java.util.concurrent.TimeUnit
 
 @JvmSynthetic
-internal fun appKitModule() = module {
+ fun coreAppKitModule(projectId: String) = module {
+
+    factory(named(AndroidCommonDITags.USER_AGENT)) {
+        """wc-2/reown-kotlin-${BuildConfig.SDK_VERSION}/android-${Build.VERSION.RELEASE}"""
+    }
+
+    single(named(AndroidCommonDITags.SHARED_INTERCEPTOR)) {
+        Interceptor { chain ->
+            val updatedRequest = chain.request().newBuilder()
+                .addHeader("User-Agent", get(named(AndroidCommonDITags.USER_AGENT)))
+                .build()
+
+            chain.proceed(updatedRequest)
+        }
+    }
+
+    single<Interceptor>(named(AndroidCommonDITags.LOGGING_INTERCEPTOR)) {
+        HttpLoggingInterceptor().apply { setLevel(HttpLoggingInterceptor.Level.BODY) }
+    }
+
+    single(named(AndroidCommonDITags.OK_HTTP)) {
+        OkHttpClient.Builder()
+            .addInterceptor(get<Interceptor>(named(AndroidCommonDITags.SHARED_INTERCEPTOR)))
+//            .authenticator((get(named(AndroidCommonDITags.AUTHENTICATOR))))
+            .writeTimeout(15_000L, TimeUnit.MILLISECONDS)
+            .readTimeout(15_000L, TimeUnit.MILLISECONDS)
+            .callTimeout(15_000L, TimeUnit.MILLISECONDS)
+            .connectTimeout(15_000L, TimeUnit.MILLISECONDS)
+            .apply {
+                if (BuildConfig.DEBUG) {
+                    val loggingInterceptor = get<Interceptor>(named(AndroidCommonDITags.LOGGING_INTERCEPTOR))
+                    addInterceptor(loggingInterceptor)
+                }
+            }
+            .retryOnConnectionFailure(true)
+            .build()
+    }
+
     single(named(AndroidCommonDITags.WEB3MODAL_URL)) { "https://api.web3modal.com/" }
 
     single(named(AndroidCommonDITags.APPKIT_INTERCEPTOR)) {
         Interceptor { chain ->
             val updatedRequest = chain.request().newBuilder()
-                .addHeader("x-project-id", get<ProjectId>().value)
+                .addHeader("x-project-id", projectId)
                 .addHeader("x-sdk-version", "kotlin-${BuildConfig.SDK_VERSION}")
                 .build()
             chain.proceed(updatedRequest)
@@ -61,6 +102,6 @@ internal fun appKitModule() = module {
 
     single<GetInstalledWalletsIdsUseCaseInterface> { GetInstalledWalletsIdsUseCase(appKitApiRepository = get()) }
     single<GetWalletsUseCaseInterface> { GetWalletsUseCase(appKitApiRepository = get()) }
-    single<GetSampleWalletsUseCaseInterface> { GetSampleWalletsUseCase(context = get()) }
+    single<GetSampleWalletsUseCaseInterface> { GetSampleWalletsUseCase(context = androidContext()) }
     single<EnableAnalyticsUseCaseInterface> { EnableAnalyticsUseCase(repository = get()) }
 }

core/android/src/main/kotlin/com/reown/android/internal/common/di/BaseStorageModule.kt

@@ -28,6 +28,7 @@ import org.koin.core.scope.Scope
 import org.koin.dsl.module
 import com.reown.android.internal.common.scope as wcScope
 
+//TODO: move to Sign module
 fun baseStorageModule(storagePrefix: String = String.Empty, packageName: String) = module {
     single<ColumnAdapter<List<String>, String>>(named(AndroidCommonDITags.COLUMN_ADAPTER_LIST)) {
         object : ColumnAdapter<List<String>, String> {

core/android/src/main/kotlin/com/reown/android/internal/common/di/CoreCryptoModule.kt

@@ -27,13 +27,20 @@ private const val ANDROID_KEY_STORE = "AndroidKeyStore"
 private const val SHARED_PREFS_FILE = "wc_key_store"
 private const val KEY_STORE_ALIAS = "wc_keystore_key"
 private const val KEY_SIZE = 256
+
 @JvmSynthetic
-fun coreCryptoModule(sharedPrefsFile: String = SHARED_PREFS_FILE, keyStoreAlias: String = KEY_STORE_ALIAS) = module {
+fun coreCryptoModule(
+    sharedPrefsFile: String = SHARED_PREFS_FILE,
+    keyStoreAlias: String = KEY_STORE_ALIAS
+) = module {
 
     @Synchronized
     fun Scope.createSharedPreferences(): SharedPreferences {
         val keyGenParameterSpec: KeyGenParameterSpec =
-            KeyGenParameterSpec.Builder(keyStoreAlias, KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT)
+            KeyGenParameterSpec.Builder(
+                keyStoreAlias,
+                KeyProperties.PURPOSE_ENCRYPT or KeyProperties.PURPOSE_DECRYPT
+            )
                 .setBlockModes(KeyProperties.BLOCK_MODE_GCM)
                 .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_NONE)
                 .setKeySize(KEY_SIZE)
@@ -69,7 +76,8 @@ fun coreCryptoModule(sharedPrefsFile: String = SHARED_PREFS_FILE, keyStoreAlias:
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                         deleteSharedPreferences(sharedPrefsFile)
                     } else {
-                        getSharedPreferences(sharedPrefsFile, Context.MODE_PRIVATE).edit().clear().apply()
+                        getSharedPreferences(sharedPrefsFile, Context.MODE_PRIVATE).edit().clear()
+                            .apply()
                         val dir = File(applicationInfo.dataDir, "shared_prefs")
                         File(dir, "$sharedPrefsFile.xml").delete()
                     }