Migrate utils

ReadMe.md

@@ -1,7 +1,7 @@
 # **Reown - Kotlin**
 
 The communications protocol for web3, Reown brings the ecosystem together by enabling hundreds of wallets and apps to securely connect and interact. This repository contains Kotlin implementation of
-reown protocols for Android applications.
+Reown protocols for Android applications.
 
 ####
 
@@ -78,4 +78,4 @@ dependencies {
 
 ## License
 
-reown is released under the Apache 2.0 license. [See LICENSE](/LICENSE) for details.
+Reown is released under the Apache 2.0 license. [See LICENSE](/LICENSE) for details.

build.gradle.kts

@@ -35,6 +35,7 @@ allprojects {
     }
 }
 
+//todo: change sonar cloud
 sonar {
     properties {
         properties(
@@ -333,7 +334,7 @@ private val repoIdWithVersion = listOf(
     Pair(ANDROID_CORE, CORE_VERSION),
     Pair(SIGN, SIGN_VERSION),
     Pair(NOTIFY, NOTIFY_VERSION),
-    Pair(WEB_3_WALLET, WEB_3_WALLET_VERSION),
-    Pair(WEB_3_MODAL, WEB_3_MODAL_VERSION),
+    Pair(WALLETKIT, WALLETKIT_VERSION),
+    Pair(APPKIT, APPKIT_VERSION),
     Pair(MODAL_CORE, MODAL_CORE_VERSION)
 )

buildSrc/src/main/kotlin/Versions.kt

@@ -5,13 +5,14 @@ const val KEY_PUBLISH_ARTIFACT_ID = "PUBLISH_ARTIFACT_ID"
 const val KEY_SDK_NAME = "SDK_NAME"
 
 //Latest versions
+//TODO: should reset all versions? or only wallet and app kits
 const val BOM_VERSION = "1.35.1"
 const val FOUNDATION_VERSION = "1.18.3"
 const val CORE_VERSION = "1.35.1"
 const val SIGN_VERSION = "2.35.1"
 const val NOTIFY_VERSION = "1.3.10"
-const val WEB_3_WALLET_VERSION = "1.35.1"
-const val WEB_3_MODAL_VERSION = "1.6.5"
+const val WALLETKIT_VERSION = "1.35.1"
+const val APPKIT_VERSION = "1.6.5"
 const val MODAL_CORE_VERSION = "1.6.5"
 
 //Artifact ids
@@ -20,8 +21,8 @@ const val FOUNDATION = "foundation"
 const val ANDROID_CORE = "android-core"
 const val SIGN = "sign"
 const val NOTIFY = "notify"
-const val WEB_3_WALLET = "web3wallet"
-const val WEB_3_MODAL = "web3modal"
+const val WALLETKIT = "walletkit"
+const val APPKIT = "appkit"
 const val MODAL_CORE = "modal-core"
 
 val jvmVersion = JavaVersion.VERSION_11

core/android/build.gradle.kts

@@ -90,7 +90,7 @@ sqldelight {
 
 dependencies {
     debugApi(project(":foundation"))
-    releaseApi("com.walletconnect:foundation:$FOUNDATION_VERSION")
+    releaseApi("com.reown:foundation:$FOUNDATION_VERSION")
 
     api(libs.coroutines)
     implementation(libs.scarlet.android)

core/android/src/androidTest/kotlin/com/reown/android/CacaoTest.kt

@@ -8,7 +8,7 @@ import com.reown.android.internal.common.signing.cacao.CacaoVerifier
 import com.reown.android.internal.common.signing.cacao.toCAIP222Message
 import com.reown.android.utils.cacao.CacaoSignerInterface
 import com.reown.android.utils.cacao.sign
-import com.walletconnect.util.hexToBytes
+import com.reown.util.hexToBytes
 import org.junit.Assert
 import org.junit.Ignore
 import org.junit.Test

core/android/src/debug/kotlin/com/reown/android/di/CoreStorageModule.kt

@@ -7,7 +7,7 @@ import app.cash.sqldelight.driver.android.AndroidSqliteDriver
 import com.reown.android.internal.common.di.DatabaseConfig
 import com.reown.android.internal.common.di.baseStorageModule
 import com.reown.android.sdk.core.AndroidCoreDatabase
-import com.walletconnect.utils.Empty
+import com.reown.utils.Empty
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.qualifier.named
 import org.koin.dsl.module

core/android/src/main/kotlin/com/reown/android/internal/common/crypto/Utils.kt

@@ -1,6 +1,6 @@
 package com.reown.android.internal.common.crypto
 
-import com.walletconnect.util.bytesToHex
+import com.reown.util.bytesToHex
 import java.security.MessageDigest
 
 

core/android/src/main/kotlin/com/reown/android/internal/common/crypto/codec/ChaChaPolyCodec.kt

@@ -12,9 +12,9 @@ import com.reown.android.internal.common.model.UnknownEnvelopeTypeException
 import com.reown.android.internal.utils.getParticipantTag
 import com.reown.foundation.common.model.PublicKey
 import com.reown.foundation.common.model.Topic
-import com.walletconnect.util.bytesToHex
-import com.walletconnect.util.hexToBytes
-import com.walletconnect.util.randomBytes
+import com.reown.util.bytesToHex
+import com.reown.util.hexToBytes
+import com.reown.util.randomBytes
 import org.bouncycastle.crypto.modes.ChaCha20Poly1305
 import org.bouncycastle.crypto.params.KeyParameter
 import org.bouncycastle.crypto.params.ParametersWithIV

core/android/src/main/kotlin/com/reown/android/internal/common/crypto/kmr/BouncyCastleKeyManagementRepository.kt

@@ -10,8 +10,8 @@ import com.reown.foundation.common.model.Key
 import com.reown.foundation.common.model.PrivateKey
 import com.reown.foundation.common.model.PublicKey
 import com.reown.foundation.common.model.Topic
-import com.walletconnect.util.bytesToHex
-import com.walletconnect.util.hexToBytes
+import com.reown.util.bytesToHex
+import com.reown.util.hexToBytes
 import org.bouncycastle.crypto.digests.SHA256Digest
 import org.bouncycastle.crypto.generators.HKDFBytesGenerator
 import org.bouncycastle.crypto.params.Ed25519PrivateKeyParameters

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

@@ -21,7 +21,7 @@ import com.reown.android.sdk.storage.data.dao.EventDao
 import com.reown.android.sdk.storage.data.dao.JsonRpcHistoryDao
 import com.reown.android.sdk.storage.data.dao.MetaData
 import com.reown.android.sdk.storage.data.dao.VerifyContext
-import com.walletconnect.utils.Empty
+import com.reown.utils.Empty
 import kotlinx.coroutines.launch
 import org.koin.core.qualifier.named
 import org.koin.core.scope.Scope

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

@@ -9,9 +9,7 @@ import com.reown.android.internal.common.model.type.RelayJsonRpcInteractorInterf
 import com.reown.android.internal.common.model.type.SerializableJsonRpc
 import com.reown.android.pairing.model.PairingJsonRpcMethod
 import com.reown.android.pairing.model.PairingRpc
-import com.walletconnect.utils.JsonAdapterEntry
-import com.walletconnect.utils.addDeserializerEntry
-import com.walletconnect.utils.addSerializerEntry
+import com.reown.utils.*
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.qualifier.named
 import org.koin.dsl.module

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

@@ -1,6 +1,6 @@
 package com.reown.android.internal.common.di
 
-import com.walletconnect.utils.Empty
+import com.reown.utils.Empty
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.scope.Scope
 

core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/data/JsonRpcSerializer.kt

@@ -5,7 +5,7 @@ import com.reown.android.internal.common.JsonRpcResponse
 import com.reown.android.internal.common.model.type.ClientParams
 import com.reown.android.internal.common.model.type.JsonRpcClientSync
 import com.reown.android.internal.common.model.type.SerializableJsonRpc
-import com.walletconnect.utils.JsonAdapterEntry
+import com.reown.utils.JsonAdapterEntry
 import kotlin.reflect.KClass
 import kotlin.reflect.safeCast
 

core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/link_mode/LinkModeJsonRpcInteractor.kt

@@ -22,7 +22,7 @@ import com.reown.android.internal.common.scope
 import com.reown.android.internal.common.storage.rpc.JsonRpcHistory
 import com.reown.android.internal.common.wcKoinApp
 import com.reown.foundation.common.model.Topic
-import com.walletconnect.util.Empty
+import com.reown.util.Empty
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.asSharedFlow

core/android/src/main/kotlin/com/reown/android/internal/common/json_rpc/domain/relay/RelayJsonRpcInteractor.kt

@@ -34,7 +34,7 @@ import com.reown.foundation.common.model.SubscriptionId
 import com.reown.foundation.common.model.Topic
 import com.reown.foundation.network.model.Relay
 import com.reown.foundation.util.Logger
-import com.walletconnect.utils.Empty
+import com.reown.utils.Empty
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.SharedFlow

core/android/src/main/kotlin/com/reown/android/internal/common/model/WCRequest.kt

@@ -2,7 +2,7 @@ package com.reown.android.internal.common.model
 
 import com.reown.android.internal.common.model.type.ClientParams
 import com.reown.foundation.common.model.Topic
-import com.walletconnect.utils.Empty
+import com.reown.utils.Empty
 
 data class WCRequest(
     val topic: Topic,

core/android/src/main/kotlin/com/reown/android/internal/common/signing/cacao/Utils.kt

@@ -2,7 +2,7 @@ package com.reown.android.internal.common.signing.cacao
 
 import android.util.Base64
 import com.reown.android.internal.common.signing.cacao.Cacao.Payload.Companion.RECAPS_PREFIX
-import com.walletconnect.utils.HexPrefix
+import com.reown.utils.HexPrefix
 import org.json.JSONArray
 import org.json.JSONObject
 

core/android/src/main/kotlin/com/reown/android/internal/common/signing/eip1271/EIP1271Verifier.kt

@@ -2,8 +2,8 @@ package com.reown.android.internal.common.signing.eip1271
 
 import com.reown.android.internal.common.signing.signature.Signature
 import com.reown.android.internal.common.signing.signature.toCacaoSignature
-import com.walletconnect.util.bytesToHex
-import com.walletconnect.util.generateId
+import com.reown.util.bytesToHex
+import com.reown.util.generateId
 import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient

core/android/src/main/kotlin/com/reown/android/internal/common/signing/signature/Signature.kt

@@ -7,9 +7,9 @@ import com.reown.android.internal.common.model.ProjectId
 import com.reown.android.internal.common.signing.cacao.guaranteeNoHexPrefix
 import com.reown.android.internal.common.signing.eip1271.EIP1271Verifier
 import com.reown.android.internal.common.signing.eip191.EIP191Verifier
-import com.walletconnect.util.bytesToHex
-import com.walletconnect.util.hexToBytes
-import com.walletconnect.utils.HexPrefix
+import com.reown.util.bytesToHex
+import com.reown.util.hexToBytes
+import com.reown.utils.HexPrefix
 import org.web3j.crypto.Sign
 
 @JvmSynthetic

core/android/src/main/kotlin/com/reown/android/internal/common/storage/key_chain/KeyChain.kt

@@ -4,8 +4,8 @@ package com.reown.android.internal.common.storage.key_chain
 
 import android.content.SharedPreferences
 import com.reown.foundation.common.model.Key
-import com.walletconnect.util.bytesToHex
-import com.walletconnect.util.hexToBytes
+import com.reown.util.bytesToHex
+import com.reown.util.hexToBytes
 
 internal class KeyChain(private val sharedPreferences: SharedPreferences) : KeyStore {
 

core/android/src/main/kotlin/com/reown/android/internal/common/storage/pairing/PairingStorageRepository.kt

@@ -8,7 +8,7 @@ import com.reown.android.internal.common.model.Pairing
 import com.reown.android.internal.common.model.Redirect
 import com.reown.android.sdk.storage.data.dao.PairingQueries
 import com.reown.foundation.common.model.Topic
-import com.walletconnect.utils.Empty
+import com.reown.utils.Empty
 
 class PairingStorageRepository(private val pairingQueries: PairingQueries) : PairingStorageRepositoryInterface {
 

core/android/src/main/kotlin/com/reown/android/internal/utils/UtilFunctions.kt

@@ -1,6 +1,6 @@
 @file:Suppress("PackageDirectoryMismatch")
 
-package com.walletconnect.utils
+package com.reown.utils
 
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi

core/android/src/main/kotlin/com/reown/android/keyserver/domain/IdentitiesInteractor.kt

@@ -32,8 +32,8 @@ import com.reown.foundation.util.jwt.DID_DELIMITER
 import com.reown.foundation.util.jwt.decodeDidPkh
 import com.reown.foundation.util.jwt.encodeDidPkh
 import com.reown.foundation.util.jwt.encodeEd25519DidKey
-import com.walletconnect.util.bytesToHex
-import com.walletconnect.util.randomBytes
+import com.reown.util.bytesToHex
+import com.reown.util.randomBytes
 import java.text.SimpleDateFormat
 import java.util.Calendar
 import java.util.Locale

core/android/src/main/kotlin/com/reown/android/pairing/engine/domain/PairingEngine.kt

@@ -49,8 +49,8 @@ import com.reown.android.pulse.model.properties.Props
 import com.reown.foundation.common.model.Topic
 import com.reown.foundation.common.model.Ttl
 import com.reown.foundation.util.Logger
-import com.walletconnect.util.bytesToHex
-import com.walletconnect.util.randomBytes
+import com.reown.util.bytesToHex
+import com.reown.util.randomBytes
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.TimeoutCancellationException

core/android/src/main/kotlin/com/reown/android/pairing/model/PairingRpc.kt

@@ -3,7 +3,7 @@ package com.reown.android.pairing.model
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import com.reown.android.internal.common.model.type.JsonRpcClientSync
-import com.walletconnect.util.generateId
+import com.reown.util.generateId
 
 internal sealed class PairingRpc : JsonRpcClientSync<PairingParams> {
 

core/android/src/main/kotlin/com/reown/android/pairing/model/mapper/PairingMapper.kt

@@ -7,7 +7,7 @@ import com.reown.android.internal.common.model.Pairing
 import com.reown.android.internal.common.model.Redirect
 import com.reown.android.pairing.engine.model.EngineDO
 import com.reown.foundation.common.model.Topic
-import com.walletconnect.utils.Empty
+import com.reown.utils.Empty
 
 @JvmSynthetic
 @Deprecated("This mapper has been deprecated. It will be removed soon.")

core/android/src/main/kotlin/com/reown/android/pulse/domain/SendEventUseCase.kt

@@ -9,7 +9,7 @@ import com.reown.android.pulse.model.Event
 import com.reown.android.pulse.model.SDKType
 import com.reown.android.pulse.model.properties.Props
 import com.reown.foundation.util.Logger
-import com.walletconnect.util.generateId
+import com.reown.util.generateId
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
 import org.koin.core.qualifier.named

core/android/src/main/kotlin/com/reown/android/pulse/model/Event.kt

@@ -4,7 +4,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import com.reown.android.internal.utils.currentTimeInSeconds
 import com.reown.android.pulse.model.properties.Props
-import com.walletconnect.util.generateId
+import com.reown.util.generateId
 
 @JsonClass(generateAdapter = true)
 data class Event(

core/android/src/main/kotlin/com/reown/android/pulse/model/properties/Props.kt

@@ -2,7 +2,7 @@ package com.reown.android.pulse.model.properties
 
 import com.squareup.moshi.Json
 import com.reown.android.pulse.model.EventType
-import com.walletconnect.utils.Empty
+import com.reown.utils.Empty
 
 data class Props(
     @Json(name = "event")

core/android/src/main/kotlin/com/reown/android/utils/Extensions.kt

@@ -10,7 +10,7 @@ import com.reown.android.internal.common.exception.ProjectIdDoesNotExistExceptio
 import com.reown.android.internal.common.exception.UnableToConnectToWebsocketException
 import com.reown.android.internal.common.exception.WalletConnectException
 import com.reown.android.internal.common.model.AppMetaData
-import com.walletconnect.utils.Empty
+import com.reown.utils.Empty
 import java.net.HttpURLConnection
 
 @JvmSynthetic

core/android/src/main/kotlin/com/reown/android/verify/domain/JWTRepository.kt

@@ -2,7 +2,7 @@ package com.reown.android.verify.domain
 
 import com.reown.android.verify.model.JWK
 import com.reown.foundation.util.jwt.JWT_DELIMITER
-import com.walletconnect.util.bytesToHex
+import com.reown.util.bytesToHex
 import org.bouncycastle.crypto.digests.SHA256Digest
 import org.bouncycastle.crypto.params.ECDomainParameters
 import org.bouncycastle.crypto.params.ECPublicKeyParameters

core/android/src/main/kotlin/com/reown/android/verify/domain/ResolveAttestationIdUseCase.kt

@@ -7,7 +7,7 @@ import com.reown.android.internal.common.scope
 import com.reown.android.internal.common.storage.verify.VerifyContextStorageRepository
 import com.reown.android.verify.client.VerifyInterface
 import com.reown.android.verify.model.VerifyContext
-import com.walletconnect.utils.Empty
+import com.reown.utils.Empty
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.supervisorScope
 

core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyRepository.kt

@@ -5,7 +5,7 @@ import com.reown.android.internal.common.model.Validation
 import com.reown.android.internal.utils.currentTimeInSeconds
 import com.reown.android.verify.data.VerifyService
 import com.reown.android.verify.model.VerifyClaims
-import com.walletconnect.util.hexToBytes
+import com.reown.util.hexToBytes
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob

core/android/src/main/kotlin/com/reown/android/verify/domain/VerifyUtils.kt

@@ -1,6 +1,6 @@
 package com.reown.android.verify.domain
 
 import com.reown.android.internal.common.model.Validation
-import com.walletconnect.utils.compareDomains
+import com.reown.utils.compareDomains
 
 fun getValidation(metadataUrl: String, origin: String) = if (compareDomains(metadataUrl, origin)) Validation.VALID else Validation.INVALID

core/android/src/release/kotlin/com.reown.android/di/CoreStorageModule.kt

@@ -20,8 +20,8 @@ import com.reown.android.internal.common.di.baseStorageModule
 import com.reown.android.internal.common.di.deleteDatabases
 import com.reown.android.sdk.core.AndroidCoreDatabase
 import com.reown.foundation.util.Logger
-import com.walletconnect.util.randomBytes
-import com.walletconnect.utils.Empty
+import com.reown.util.randomBytes
+import com.reown.utils.Empty
 import net.sqlcipher.database.SQLiteDatabaseHook
 import net.sqlcipher.database.SupportFactory
 import org.koin.android.ext.koin.androidContext

core/android/src/test/java/CacaoTestJvmTest.java

@@ -5,7 +5,7 @@
 import com.reown.android.internal.common.signing.cacao.CacaoType;
 import com.reown.android.internal.common.signing.cacao.CacaoVerifier;
 import com.reown.android.utils.cacao.CacaoSignerUtil;
-import com.walletconnect.util.UtilFunctionsKt;
+import com.reown.util.UtilFunctionsKt;
 
 import org.junit.Assert;
 import org.junit.Test;

core/android/src/test/kotlin/com/reown/android/internal/BouncyCastleCryptoRepositoryTest.kt

@@ -5,7 +5,7 @@ import com.reown.android.internal.common.storage.key_chain.KeyStore
 import com.reown.foundation.common.model.PrivateKey
 import com.reown.foundation.common.model.PublicKey
 import com.reown.foundation.common.model.Topic
-import com.walletconnect.utils.Empty
+import com.reown.utils.Empty
 import io.mockk.spyk
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertNotNull

core/android/src/test/kotlin/com/reown/android/internal/ChaChaPolyCodecTest.kt

@@ -10,7 +10,7 @@ import com.reown.android.internal.common.model.EnvelopeType
 import com.reown.android.internal.utils.getParticipantTag
 import com.reown.foundation.common.model.PublicKey
 import com.reown.foundation.common.model.Topic
-import com.walletconnect.utils.Empty
+import com.reown.utils.Empty
 import io.mockk.every
 import io.mockk.mockk
 import junit.framework.TestCase.assertEquals